diff --git a/.github/workflows/forcrerelay-test.yaml b/.github/workflows/forcrerelay-test.yaml index 07f7bf9fd..4e2bb8daf 100644 --- a/.github/workflows/forcrerelay-test.yaml +++ b/.github/workflows/forcrerelay-test.yaml @@ -43,10 +43,10 @@ jobs: - name: prepare-ckb run: | if [ ! -f "/tmp/ckb.tar.gz" ]; then - curl -L https://github.com/nervosnetwork/ckb/releases/download/v0.107.0/ckb_v0.107.0_x86_64-unknown-linux-gnu.tar.gz -o /tmp/ckb.tar.gz + curl -L https://github.com/nervosnetwork/ckb/releases/download/v0.111.0/ckb_v0.111.0_x86_64-unknown-linux-gnu.tar.gz -o /tmp/ckb.tar.gz fi tar -zxf /tmp/ckb.tar.gz -C /tmp - echo "/tmp/ckb_v0.107.0_x86_64-unknown-linux-gnu" >> $GITHUB_PATH + echo "/tmp/ckb_v0.111.0_x86_64-unknown-linux-gnu" >> $GITHUB_PATH - uses: actions/setup-python@v4 with: python-version: '3.10' diff --git a/.github/workflows/ibc-test.yaml b/.github/workflows/ibc-test.yaml index b777771e9..50195ec04 100644 --- a/.github/workflows/ibc-test.yaml +++ b/.github/workflows/ibc-test.yaml @@ -64,10 +64,10 @@ jobs: - name: Prepare CKB run: | if [ ! -f "/tmp/ckb.tar.gz" ]; then - curl -L https://github.com/nervosnetwork/ckb/releases/download/v0.110.0/ckb_v0.110.0_x86_64-unknown-linux-gnu.tar.gz -o /tmp/ckb.tar.gz + curl -L https://github.com/nervosnetwork/ckb/releases/download/v0.111.0/ckb_v0.111.0_x86_64-unknown-linux-gnu.tar.gz -o /tmp/ckb.tar.gz fi tar -zxf /tmp/ckb.tar.gz -C /tmp - echo "/tmp/ckb_v0.110.0_x86_64-unknown-linux-gnu" >> $GITHUB_PATH + echo "/tmp/ckb_v0.111.0_x86_64-unknown-linux-gnu" >> $GITHUB_PATH - name: Prepare Axon source run: git clone --recursive https://github.com/axonweb3/axon.git $SRC_DIR/axon && cd $SRC_DIR/axon && git checkout $AXON_COMMIT diff --git a/Cargo.lock b/Cargo.lock index f9eb8e308..7223e905f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -570,6 +570,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95916998c798756098a4eb1b3f2cd510659705a9817bf203d61abd30fbec3e7b" +[[package]] +name = "blake2b-ref" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "294d17c72e0ba59fad763caa112368d0672083779cdebbb97164f4bb4c1e339a" + [[package]] name = "blake2b-rs" version = "0.2.0" @@ -605,15 +611,34 @@ source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f dependencies = [ "arbitrary", "blst", - "eth2_hashing", - "eth2_serde_utils", - "eth2_ssz", + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "eth2_serde_utils 0.1.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "eth2_ssz 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "ethereum-types", + "hex", + "rand 0.7.3", + "serde", + "serde_derive", + "tree_hash 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "zeroize", +] + +[[package]] +name = "bls" +version = "0.2.0" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "arbitrary", + "blst", + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "eth2_serde_utils 0.1.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "eth2_ssz 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", "ethereum-types", "hex", "rand 0.7.3", "serde", "serde_derive", - "tree_hash", + "tree_hash 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", "zeroize", ] @@ -746,13 +771,27 @@ name = "cached_tree_hash" version = "0.1.0" source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ - "eth2_hashing", - "eth2_ssz", - "eth2_ssz_derive", - "eth2_ssz_types", + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "eth2_ssz 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "eth2_ssz_derive 0.3.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "eth2_ssz_types 0.2.2 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", "ethereum-types", "smallvec 1.11.0", - "tree_hash", + "tree_hash 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", +] + +[[package]] +name = "cached_tree_hash" +version = "0.1.0" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "eth2_ssz 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "eth2_ssz_derive 0.3.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "eth2_ssz_types 0.2.2 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "ethereum-types", + "smallvec 1.11.0", + "tree_hash 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", ] [[package]] @@ -891,15 +930,15 @@ dependencies = [ [[package]] name = "ckb-chain-spec" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78df45446aaa86b06a77b8b145cffa79950e7ede293cebcd114a62e74c29dbf" +checksum = "dbd58081d4ac4f08d068b52c5a07f0b379d93aad0dfa8344c6890429a9b73c2b" dependencies = [ "ckb-constant", "ckb-crypto", "ckb-dao-utils", "ckb-error", - "ckb-hash 0.108.0", + "ckb-hash 0.111.0", "ckb-jsonrpc-types", "ckb-pow", "ckb-rational", @@ -913,26 +952,26 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "920f26cc48cadcaf6f7bcc3960fde9f9f355633b6361da8ef31e1e1c00fc8858" +checksum = "701e6829c3dcbae46dd2442de63d080046480a6c2bb4951dbf419ad092459402" dependencies = [ "crossbeam-channel 0.5.8", ] [[package]] name = "ckb-constant" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302566408e5b296663ac5e8245bf71824ca2c7c2ef19a57fcc15939dd66527e9" +checksum = "9d5c980d4724770f72a37bceffa26ea64dd914891e45e856e2a3792fdb4a5a18" [[package]] name = "ckb-crypto" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac31177b0a8bf3acd563c042775e40494e437b2bbbae96ac2473eec3a4da95d" +checksum = "df80db694e42b64a5774ae551daff3c8310cd99bb528643dbe0dd409abb298e7" dependencies = [ - "ckb-fixed-hash 0.108.0", + "ckb-fixed-hash 0.111.0", "faster-hex 0.6.1", "lazy_static", "rand 0.7.3", @@ -942,9 +981,9 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1929c9627923fe1d22151361d74f5a5aa0dda77016d020307a54486eae11cb3c" +checksum = "5e158ce5a4e9d1fcd08d9dee87332474572c629c6273cca0aea80ba24892a403" dependencies = [ "byteorder", "ckb-error", @@ -953,9 +992,9 @@ dependencies = [ [[package]] name = "ckb-error" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446a519d8a847d97f1c8ece739dc1748751a9a2179249c96c45cced0825a7aa5" +checksum = "34cfd733cabcb4262ee679c02733864b13c8fa879e3aabc078fe0ec727cd95d6" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -965,29 +1004,29 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.108.0" +version = "0.110.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00cbbc455b23748b32e06d16628a03e30d56ffa057f17093fdf5b42d4fb6c879" +checksum = "f5072b9497962b0d0f64d2894081aee85f84a72e0dbda4bb6511a5fc50256e92" dependencies = [ - "ckb-fixed-hash-core 0.108.0", - "ckb-fixed-hash-macros 0.108.0", + "ckb-fixed-hash-core 0.110.1", + "ckb-fixed-hash-macros 0.110.1", ] [[package]] name = "ckb-fixed-hash" -version = "0.110.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5072b9497962b0d0f64d2894081aee85f84a72e0dbda4bb6511a5fc50256e92" +checksum = "3b1dfab045fffa31cae9680d73e1f09833ca1abfb807dc4b9544739c94c23fd0" dependencies = [ - "ckb-fixed-hash-core 0.110.1", - "ckb-fixed-hash-macros 0.110.1", + "ckb-fixed-hash-core 0.111.0", + "ckb-fixed-hash-macros 0.111.0", ] [[package]] name = "ckb-fixed-hash-core" -version = "0.108.0" +version = "0.110.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e644a4e026625b4be5a04cdf6c02043080e79feaf77d9cdbb2f0e6553f751" +checksum = "aa3b9a17c00132cfa9d414d091a8ec7c3fd7b711056140b9771d3429192e1a37" dependencies = [ "faster-hex 0.6.1", "serde", @@ -996,9 +1035,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.110.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa3b9a17c00132cfa9d414d091a8ec7c3fd7b711056140b9771d3429192e1a37" +checksum = "bdd1727a6ecd4d0bcab604cb1ef707fe92e939fa6e9a438f9f25bf05208cb080" dependencies = [ "faster-hex 0.6.1", "serde", @@ -1007,11 +1046,11 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.108.0" +version = "0.110.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cfc980ef88c217825172eb46df269f47890f5e78a38214416f13b3bd17a4b4" +checksum = "0152fab35135f64a05ec83b36320e2d36f168e99b4b7e132e3b46a3b35d2b131" dependencies = [ - "ckb-fixed-hash-core 0.108.0", + "ckb-fixed-hash-core 0.110.1", "proc-macro2", "quote", "syn 1.0.109", @@ -1019,33 +1058,48 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.110.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0152fab35135f64a05ec83b36320e2d36f168e99b4b7e132e3b46a3b35d2b131" +checksum = "7b5da34c32585c35715fcde4e3a1dd3b0346d7af43506c5e51c613f01483e4f9" dependencies = [ - "ckb-fixed-hash-core 0.110.1", + "ckb-fixed-hash-core 0.111.0", "proc-macro2", "quote", "syn 1.0.109", ] +[[package]] +name = "ckb-gen-types" +version = "0.111.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3bc54ca99b09e1eb5fc6c49bb1156644ce57fce9c6f52b5c13110b9a3143f7e" +dependencies = [ + "cfg-if 1.0.0", + "ckb-error", + "ckb-fixed-hash 0.111.0", + "ckb-hash 0.111.0", + "ckb-occupied-capacity", + "molecule", + "numext-fixed-uint", +] + [[package]] name = "ckb-hash" version = "0.106.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "038ad6840c4a89f4cd76b50621c4e6d82ca5f0d09fba707b1025016218d4a2d8" dependencies = [ - "blake2b-ref", + "blake2b-ref 0.2.1", "blake2b-rs", ] [[package]] name = "ckb-hash" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d9b683e89ae4ffdd5aaf4172eab00b6bbe7ea24e2abf77d3eb850ba36e8983" +checksum = "8c88e5e2d6454be488fa5cf8b49175879353c6af969ff210dd6416f315b53120" dependencies = [ - "blake2b-ref", + "blake2b-ref 0.3.1", "blake2b-rs", ] @@ -1063,9 +1117,9 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac087657eaf964e729f40b3c929d3dac74a2cd8bb38d5e588756e2495711f810" +checksum = "d789a71538da07871c11aecbd28d6c632bb426bdfeed5fc2fa1b455e31152468" dependencies = [ "ckb-types", "faster-hex 0.6.1", @@ -1089,9 +1143,9 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "911c4695ddf82f78da8f514b359092bbe231f58c2669c93b1cfc9a2030b125bb" +checksum = "939fa09ca3534248d3d452552546f016fc7e11346644fbc5b55d2ad38d3e80e7" dependencies = [ "log", ] @@ -1105,11 +1159,32 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "ckb-merkle-mountain-range" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15193decfa1e0b151ce19e42d118db048459a27720fb3de7d3103c30adccb12" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "ckb-mock-tx-types" +version = "0.111.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcd5b156c36f03ad6053e174e26a874088c8e9098c3a2e80ec93dc9831ecfac3" +dependencies = [ + "ckb-jsonrpc-types", + "ckb-traits", + "ckb-types", + "serde", +] + [[package]] name = "ckb-occupied-capacity" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2a1dd0d4ba5dafba1e30d437c1148b20f42edb76b6794323e05bda626754eb" +checksum = "358ad364465a5a359575642c12952ba8735a148382789d65ddd5231cd21899fc" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -1117,18 +1192,18 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ebba3d564098a84c83f4740e1dce48a5e2da759becdb47e3c7965f0808e6e92" +checksum = "de2dc06db98f8a995cb7145bc56dbd17bb0c8ab2e59a07aaa40f2c956c2451dd" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6321bba85cdf9724029d8c906851dd4a90906869b42f9100b16645a1261d4c" +checksum = "b1709e0f101026c4ef29b1593692e480b03cdb4e0dace1e348494c6554d50d35" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -1137,12 +1212,12 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9167b427f42874e68e20e6946d5211709979ff1d86c0061a71c2f6a6aa17659" +checksum = "481e76388993d7e6e0dd797e8532c60398901787e28d0638ca114254257b8813" dependencies = [ "byteorder", - "ckb-hash 0.108.0", + "ckb-hash 0.111.0", "ckb-types", "eaglesong", "log", @@ -1151,9 +1226,9 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2519249f8d47fa758d3fb3cf3049327c69ce0f2acd79d61427482c8661d3dbd" +checksum = "bd3959391a4fb05d6a2578aa8db75732ada1ce381fb34d6eeaf09d395702e63c" dependencies = [ "numext-fixed-uint", "serde", @@ -1161,9 +1236,9 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3abddc968d7f1e70584ab04180c347380a44acbe0b60e26cc96208ec8885279" +checksum = "03222b0613cf3f55cb181471d7a84879b6fba5e920e2e1c7ba2c2315614bd387" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -1187,14 +1262,14 @@ dependencies = [ [[package]] name = "ckb-script" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b4754a2f0ccea5ea1934822bd18a3a66c46344d8c3872cb20ffdcf0851fab9" +checksum = "8c9075ad901eae97925f491b6be675d7b19bf7b10eaa94a88f6e8070c0cd00ba" dependencies = [ "byteorder", "ckb-chain-spec", "ckb-error", - "ckb-hash 0.108.0", + "ckb-hash 0.111.0", "ckb-logger", "ckb-traits", "ckb-types", @@ -1205,23 +1280,27 @@ dependencies = [ [[package]] name = "ckb-sdk" -version = "2.5.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b201220ac5762353f9313fbbc3c4cee2a6a924c16c17df51517644991575cc1" +checksum = "9ded3042867b04f20456f17a1f752f2604a24659f3aeec1928917d9ee6b659d4" dependencies = [ "anyhow", "bech32 0.8.1", "bitflags 1.3.2", "bytes", + "ckb-chain-spec", "ckb-crypto", "ckb-dao-utils", - "ckb-hash 0.108.0", + "ckb-hash 0.111.0", "ckb-jsonrpc-types", + "ckb-mock-tx-types", "ckb-resource", "ckb-script", "ckb-traits", "ckb-types", "dashmap", + "derive-getters", + "dyn-clone", "enum-repr-derive", "futures", "jsonrpc-core", @@ -1256,40 +1335,44 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9d5827f20a396dfb785398db484fe50de93d76c02e1e32287832604a9dda91" +checksum = "ca049aba2cb2d1208c6044accb497b17290ad56de629f6a4b95eded67a43fd40" dependencies = [ "ckb-types", ] [[package]] name = "ckb-types" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c22b3b1ca8f88a8f48e2f73321c0605281c9c6f1e1c4d651c6138265c22291e" +checksum = "b6ec737e4957418bbd0f4091e8565a89bbd8f6fc37a20360820e44d1f1e44e58" dependencies = [ "bit-vec", "bytes", "ckb-channel", + "ckb-constant", "ckb-error", - "ckb-fixed-hash 0.108.0", - "ckb-hash 0.108.0", - "ckb-merkle-mountain-range", + "ckb-fixed-hash 0.111.0", + "ckb-gen-types", + "ckb-hash 0.111.0", + "ckb-merkle-mountain-range 0.5.2", "ckb-occupied-capacity", "ckb-rational", "derive_more", + "golomb-coded-set", "merkle-cbt", "molecule", "numext-fixed-uint", "once_cell", + "paste", ] [[package]] name = "ckb-util" -version = "0.108.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d165c6958601dfbfa4cd00c9263ecfb013b4ccb6d9e1d3187bfa62801abc7d" +checksum = "011b907b18aa706fc224a1309f14eadd9cc14c42cf2258ca3010d1324bc20f10" dependencies = [ "linked-hash-map", "once_cell", @@ -1299,9 +1382,9 @@ dependencies = [ [[package]] name = "ckb-vm" -version = "0.22.2" +version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1223acc8054ce96f91c5d99d4942898d0bdadd618c3b14f1acd3e67212991d8e" +checksum = "0cc004a826b9bc9319ffae0b8415690e1b5f1482266d55fbd43843aa40ddcd63" dependencies = [ "byteorder", "bytes", @@ -1317,9 +1400,12 @@ dependencies = [ [[package]] name = "ckb-vm-definitions" -version = "0.22.2" +version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4af800ae2b6c54b70efa398dab015a09a52eeac2dd1ac3ad32c9bbe224974225" +checksum = "c4ced3ff9d79b53d93c106720f6c1f855694290e33581850e05c859500eee83f" +dependencies = [ + "paste", +] [[package]] name = "clang-sys" @@ -1507,6 +1593,11 @@ name = "compare_fields" version = "0.2.0" source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" +[[package]] +name = "compare_fields" +version = "0.2.0" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" + [[package]] name = "compare_fields_derive" version = "0.2.0" @@ -1516,6 +1607,15 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "compare_fields_derive" +version = "0.2.0" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "console" version = "0.15.7" @@ -1912,6 +2012,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive-getters" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0122f262bf9c9a367829da84f808d9fb128c10ef283bbe7b0922a77cf07b2747" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "derive_arbitrary" version = "1.3.0" @@ -2331,13 +2442,39 @@ dependencies = [ "sha2 0.10.7", ] +[[package]] +name = "eth2_hashing" +version = "0.3.0" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "cpufeatures", + "lazy_static", + "ring", + "sha2 0.10.7", +] + [[package]] name = "eth2_interop_keypairs" version = "0.2.0" source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ - "bls", - "eth2_hashing", + "bls 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "hex", + "lazy_static", + "num-bigint", + "serde", + "serde_derive", + "serde_yaml 0.8.26", +] + +[[package]] +name = "eth2_interop_keypairs" +version = "0.2.0" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "bls 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", "hex", "lazy_static", "num-bigint", @@ -2358,6 +2495,18 @@ dependencies = [ "serde_json", ] +[[package]] +name = "eth2_serde_utils" +version = "0.1.1" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "ethereum-types", + "hex", + "serde", + "serde_derive", + "serde_json", +] + [[package]] name = "eth2_ssz" version = "0.4.1" @@ -2368,6 +2517,16 @@ dependencies = [ "smallvec 1.11.0", ] +[[package]] +name = "eth2_ssz" +version = "0.4.1" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "ethereum-types", + "itertools 0.10.5", + "smallvec 1.11.0", +] + [[package]] name = "eth2_ssz_derive" version = "0.3.1" @@ -2379,6 +2538,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "eth2_ssz_derive" +version = "0.3.1" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "darling 0.13.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "eth2_ssz_types" version = "0.2.2" @@ -2386,47 +2556,86 @@ source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f dependencies = [ "arbitrary", "derivative", - "eth2_serde_utils", - "eth2_ssz", + "eth2_serde_utils 0.1.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "eth2_ssz 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", "serde", "serde_derive", "smallvec 1.11.0", - "tree_hash", + "tree_hash 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "typenum", +] + +[[package]] +name = "eth2_ssz_types" +version = "0.2.2" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "arbitrary", + "derivative", + "eth2_serde_utils 0.1.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "eth2_ssz 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "serde", + "serde_derive", + "smallvec 1.11.0", + "tree_hash 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", "typenum", ] [[package]] name = "eth_light_client_in_ckb-prover" -version = "0.2.1" -source = "git+https://github.com/synapseweb3/eth-light-client-in-ckb?tag=v0.2.1#5e8549d20f8c91da7362cb1c87823c53fd7cd205" +version = "0.3.0-alpha" +source = "git+https://github.com/synapseweb3/eth-light-client-in-ckb#3812d220a7cf9da8cb3da35ebb19ead2c7fd7657" dependencies = [ "cita_trie", - "eth_light_client_in_ckb-verification", + "eth_light_client_in_ckb-verification 0.3.0-alpha", "ethers-core", "hasher", - "merkle_proof", - "tree_hash", - "types", + "merkle_proof 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "tree_hash 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "types 0.2.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", ] [[package]] name = "eth_light_client_in_ckb-verification" version = "0.2.1" -source = "git+https://github.com/synapseweb3/eth-light-client-in-ckb?tag=v0.2.1#5e8549d20f8c91da7362cb1c87823c53fd7cd205" +source = "git+https://github.com/wenyuanhust/eth-light-client-in-ckb.git?branch=v0.2.1#e5a28c7cf59882c7b0942b304677bca031e5a931" dependencies = [ - "ckb-merkle-mountain-range", - "eth2_hashing", - "eth2_ssz", - "eth2_ssz_derive", - "eth2_ssz_types", + "ckb-merkle-mountain-range 0.6.0", + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "eth2_ssz 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "eth2_ssz_derive 0.3.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "eth2_ssz_types 0.2.2 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", "log", - "merkle_proof", + "merkle_proof 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", "molecule", "rlp", "tiny-keccak", - "tree_hash", - "tree_hash_derive", - "types", + "tree_hash 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "tree_hash_derive 0.4.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "types 0.2.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", +] + +[[package]] +name = "eth_light_client_in_ckb-verification" +version = "0.3.0-alpha" +source = "git+https://github.com/synapseweb3/eth-light-client-in-ckb#3812d220a7cf9da8cb3da35ebb19ead2c7fd7657" +dependencies = [ + "bls 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "ckb-merkle-mountain-range 0.6.0", + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "eth2_ssz 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "eth2_ssz_derive 0.3.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "eth2_ssz_types 0.2.2 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "ethereum-types", + "faster-hex 0.6.1", + "log", + "merkle_proof 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "molecule", + "rlp", + "tiny-keccak", + "tree_hash 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "tree_hash_derive 0.4.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "types 0.2.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", ] [[package]] @@ -2859,12 +3068,12 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "forcerelay-ckb-sdk" version = "0.1.0" -source = "git+https://github.com/synapseweb3/forcerelay-ckb-sdk?rev=cd82be97#cd82be972ad85fbcbd9807dd221d8ee42c1bc718" +source = "git+https://github.com/synapseweb3/forcerelay-ckb-sdk?branch=ckb-0.111#096ed02333c631fec061847e60a759238c961eca" dependencies = [ "anyhow", "async-stream", "bytes", - "ckb-fixed-hash 0.108.0", + "ckb-fixed-hash 0.111.0", "ckb-ics-axon", "ckb-jsonrpc-types", "ckb-sdk", @@ -2887,7 +3096,7 @@ dependencies = [ "ckb-jsonrpc-types", "ckb-sdk", "ckb-types", - "eth_light_client_in_ckb-verification", + "eth_light_client_in_ckb-verification 0.2.1", "hex", "ibc-relayer", ] @@ -3175,6 +3384,15 @@ dependencies = [ "scroll", ] +[[package]] +name = "golomb-coded-set" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7076c0cd6257d84b785b0f22c36443dd47a5e86a1256d7ef82c8cb88ea9a7e" +dependencies = [ + "siphasher", +] + [[package]] name = "group" version = "0.12.1" @@ -3668,7 +3886,7 @@ dependencies = [ "bitcoin", "bs58 0.4.0", "bytes", - "ckb-hash 0.108.0", + "ckb-hash 0.111.0", "ckb-ics-axon", "ckb-jsonrpc-types", "ckb-sdk", @@ -3682,7 +3900,7 @@ dependencies = [ "ed25519-dalek-bip32", "env_logger 0.10.0", "eth_light_client_in_ckb-prover", - "eth_light_client_in_ckb-verification", + "eth_light_client_in_ckb-verification 0.2.1", "ethers", "eyre", "flex-error", @@ -3738,9 +3956,9 @@ dependencies = [ "tonic", "tracing", "tracing-subscriber", - "tree_hash", - "tree_hash_derive", - "types", + "tree_hash 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "tree_hash_derive 0.4.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "types 0.2.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", "uuid 1.4.1", ] @@ -3804,9 +4022,9 @@ name = "ibc-relayer-storage" version = "0.1.0" dependencies = [ "ckb-rocksdb", - "eth_light_client_in_ckb-verification", + "eth_light_client_in_ckb-verification 0.2.1", "thiserror", - "types", + "types 0.2.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", ] [[package]] @@ -3814,13 +4032,13 @@ name = "ibc-relayer-types" version = "0.23.0" dependencies = [ "axon-tools", - "bls", + "bls 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", "bytes", "derive_more", "dyn-clone", "env_logger 0.10.0", "erased-serde", - "eth2_ssz_types", + "eth2_ssz_types 0.2.2 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", "ethereum-types", "flex-error", "hex", @@ -3846,8 +4064,8 @@ dependencies = [ "time", "tracing", "tracing-subscriber", - "tree_hash", - "tree_hash_derive", + "tree_hash 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "tree_hash_derive 0.4.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", "uint", ] @@ -4120,6 +4338,14 @@ dependencies = [ "bytes", ] +[[package]] +name = "int_to_bytes" +version = "0.2.0" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "bytes", +] + [[package]] name = "io-lifetimes" version = "1.0.11" @@ -4572,10 +4798,21 @@ name = "merkle_proof" version = "0.2.0" source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ - "eth2_hashing", + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "ethereum-types", + "lazy_static", + "safe_arith 0.1.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", +] + +[[package]] +name = "merkle_proof" +version = "0.2.0" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", "ethereum-types", "lazy_static", - "safe_arith", + "safe_arith 0.1.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", ] [[package]] @@ -4669,9 +4906,9 @@ dependencies = [ [[package]] name = "molecule" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc8276c02a006bddad7d1c28c1a88f30421e1b5f0ba0ca96ceb8077c7d20c01" +checksum = "d4fd9767ab5e5f2ea40f71ff4c8bdb633c50509052e093c2fdd0e390a749dfa3" dependencies = [ "bytes", "cfg-if 1.0.0", @@ -6510,6 +6747,11 @@ name = "safe_arith" version = "0.1.0" source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" +[[package]] +name = "safe_arith" +version = "0.1.0" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" + [[package]] name = "safemem" version = "0.3.3" @@ -7319,7 +7561,16 @@ name = "swap_or_not_shuffle" version = "0.2.0" source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ - "eth2_hashing", + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "ethereum-types", +] + +[[package]] +name = "swap_or_not_shuffle" +version = "0.2.0" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", "ethereum-types", ] @@ -7607,6 +7858,15 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "test_random_derive" +version = "0.2.0" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "textwrap" version = "0.16.0" @@ -7748,9 +8008,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -8126,7 +8386,17 @@ name = "tree_hash" version = "0.4.1" source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ - "eth2_hashing", + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "ethereum-types", + "smallvec 1.11.0", +] + +[[package]] +name = "tree_hash" +version = "0.4.1" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", "ethereum-types", "smallvec 1.11.0", ] @@ -8141,6 +8411,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "tree_hash_derive" +version = "0.4.0" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "darling 0.13.4", + "quote", + "syn 1.0.109", +] + [[package]] name = "triomphe" version = "0.1.9" @@ -8215,25 +8495,73 @@ version = "0.2.1" source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ "arbitrary", - "bls", - "cached_tree_hash", - "compare_fields", - "compare_fields_derive", + "bls 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "cached_tree_hash 0.1.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "compare_fields 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "compare_fields_derive 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "derivative", + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "eth2_interop_keypairs 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "eth2_serde_utils 0.1.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "eth2_ssz 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "eth2_ssz_derive 0.3.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "eth2_ssz_types 0.2.2 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "ethereum-types", + "hex", + "int_to_bytes 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "itertools 0.10.5", + "lazy_static", + "log", + "maplit", + "merkle_proof 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "metastruct", + "parking_lot 0.12.1", + "rand 0.8.5", + "rand_xorshift", + "rayon", + "regex", + "rusqlite", + "safe_arith 0.1.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "serde", + "serde_derive", + "serde_json", + "serde_with 1.14.0", + "serde_yaml 0.8.26", + "slog", + "smallvec 1.11.0", + "superstruct", + "swap_or_not_shuffle 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "tempfile", + "test_random_derive 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "tree_hash 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", + "tree_hash_derive 0.4.0 (git+https://github.com/synapseweb3/lighthouse?rev=2c246d6)", +] + +[[package]] +name = "types" +version = "0.2.1" +source = "git+https://github.com/synapseweb3/lighthouse?rev=be911e6#be911e6bd3f54ae84b01310b411be19e2b274634" +dependencies = [ + "arbitrary", + "bls 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "cached_tree_hash 0.1.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "compare_fields 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "compare_fields_derive 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", "derivative", - "eth2_hashing", - "eth2_interop_keypairs", - "eth2_serde_utils", - "eth2_ssz", - "eth2_ssz_derive", - "eth2_ssz_types", + "eth2_hashing 0.3.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "eth2_interop_keypairs 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "eth2_serde_utils 0.1.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "eth2_ssz 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "eth2_ssz_derive 0.3.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "eth2_ssz_types 0.2.2 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", "ethereum-types", "hex", - "int_to_bytes", + "int_to_bytes 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", "itertools 0.10.5", "lazy_static", "log", "maplit", - "merkle_proof", + "merkle_proof 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", "metastruct", "parking_lot 0.12.1", "rand 0.8.5", @@ -8241,7 +8569,7 @@ dependencies = [ "rayon", "regex", "rusqlite", - "safe_arith", + "safe_arith 0.1.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", "serde", "serde_derive", "serde_json", @@ -8250,11 +8578,11 @@ dependencies = [ "slog", "smallvec 1.11.0", "superstruct", - "swap_or_not_shuffle", + "swap_or_not_shuffle 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", "tempfile", - "test_random_derive", - "tree_hash", - "tree_hash_derive", + "test_random_derive 0.2.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "tree_hash 0.4.1 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", + "tree_hash_derive 0.4.0 (git+https://github.com/synapseweb3/lighthouse?rev=be911e6)", ] [[package]] diff --git a/crates/relayer-storage/Cargo.toml b/crates/relayer-storage/Cargo.toml index 0bed16bdb..785b553fd 100644 --- a/crates/relayer-storage/Cargo.toml +++ b/crates/relayer-storage/Cargo.toml @@ -15,4 +15,4 @@ description = "The storage part of SynapseWeb3 IBC Relayer" thiserror = "1.0.37" rocksdb = { package = "ckb-rocksdb", version ="=0.19.0", default-features = false, features = ["snappy"] } eth2_types = { git = "https://github.com/synapseweb3/lighthouse", rev = "2c246d6", package = "types" } -eth_light_client_in_ckb-verification = { version = "0.2.1", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", tag = "v0.2.1" } \ No newline at end of file +eth_light_client_in_ckb-verification = { git = "https://github.com/wenyuanhust/eth-light-client-in-ckb.git", version = "0.2.1", branch = "v0.2.1" } diff --git a/crates/relayer-storage/src/prelude.rs b/crates/relayer-storage/src/prelude.rs index acadfbe77..d61c0e7ed 100644 --- a/crates/relayer-storage/src/prelude.rs +++ b/crates/relayer-storage/src/prelude.rs @@ -27,7 +27,11 @@ pub trait StorageWriter: Send + Sync + Sized { } pub trait StorageAsMMRStore: - mmr::lib::MMRStore + StorageReader + StorageWriter + Clone + mmr::lib::MMRStoreReadOps + + mmr::lib::MMRStoreWriteOps + + StorageReader + + StorageWriter + + Clone { /// Checks if there is any data in the MMR. fn is_initialized(&self) -> Result { diff --git a/crates/relayer-storage/src/storage/mmr.rs b/crates/relayer-storage/src/storage/mmr.rs index 0f927d7ba..3ce6556ab 100644 --- a/crates/relayer-storage/src/storage/mmr.rs +++ b/crates/relayer-storage/src/storage/mmr.rs @@ -1,13 +1,13 @@ use eth2_types::EthSpec; use eth_light_client_in_ckb_verification::{ - mmr::lib::{Error as MMRError, MMRStore, Result as MMRResult}, + mmr::lib::{Error as MMRError, MMRStoreReadOps, MMRStoreWriteOps, Result as MMRResult}, types::packed, }; use super::Storage; use crate::prelude::*; -impl MMRStore for Storage +impl MMRStoreReadOps for Storage where S: EthSpec, { @@ -19,7 +19,12 @@ where )) }) } +} +impl MMRStoreWriteOps for Storage +where + S: EthSpec, +{ fn append(&mut self, pos: u64, elems: Vec) -> MMRResult<()> { for (offset, elem) in elems.iter().enumerate() { let pos: u64 = pos + (offset as u64); diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml index f631601a8..836574e8e 100644 --- a/crates/relayer/Cargo.toml +++ b/crates/relayer/Cargo.toml @@ -32,8 +32,8 @@ eth2_types = { git = "https://github.com/synapseweb3/lighthouse", rev = "2c246d6 tree_hash_derive = { git = "https://github.com/synapseweb3/lighthouse", rev = "2c246d6" } tree_hash = { git = "https://github.com/synapseweb3/lighthouse", rev = "2c246d6" } -eth_light_client_in_ckb-verification = { version = "0.2.1", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", tag = "v0.2.1" } -eth_light_client_in_ckb-prover = { version = "0.2.1", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", tag = "v0.2.1" } +eth_light_client_in_ckb-verification = { git = "https://github.com/wenyuanhust/eth-light-client-in-ckb.git", version = "0.2.1", branch = "v0.2.1" } +eth_light_client_in_ckb-prover = { version = "0.3.0-alpha", git = "https://github.com/synapseweb3/eth-light-client-in-ckb" } axon-tools = { git = "https://github.com/axonweb3/axon.git", package = "axon-tools", rev = "68aa8a", version = "0.1.1", features = [ "impl-serde", "proof", @@ -95,10 +95,10 @@ reqwest-middleware = "0.1" reqwest-retry = "0.1" eyre = "0.6" ethers = { version = "2.0.2", features = ["rustls", "ws"] } -ckb-sdk = "2.5.0" -ckb-hash = "0.108.0" -ckb-types = "0.108.0" -ckb-jsonrpc-types = "0.108.0" +ckb-sdk = "3.0.0" +ckb-hash = "0.111.0" +ckb-types = "0.111.0" +ckb-jsonrpc-types = "0.111.0" jsonrpc-core = "18.0" strum = { version = "0.24.1", features = ["derive"] } lazy_static = "1.4.0" diff --git a/crates/relayer/src/chain/ckb/mock_rpc_client.rs b/crates/relayer/src/chain/ckb/mock_rpc_client.rs index 03835895c..2f85a8d39 100644 --- a/crates/relayer/src/chain/ckb/mock_rpc_client.rs +++ b/crates/relayer/src/chain/ckb/mock_rpc_client.rs @@ -111,6 +111,7 @@ impl CkbReader for RpcClient { transaction: Some(transaction), tx_status: TxStatus::committed(hash.clone()), cycles: None, + time_added_to_pool: None, }; Box::pin(async { Ok(Some(resp)) }) } diff --git a/tools/forcerelay-test/Cargo.toml b/tools/forcerelay-test/Cargo.toml index e1e080b3b..28b9fee83 100644 --- a/tools/forcerelay-test/Cargo.toml +++ b/tools/forcerelay-test/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" [dev-dependencies] -ckb-sdk = "2.5.0" -ckb-jsonrpc-types = "0.108.0" -ckb-types = "0.108.0" +ckb-sdk = "3.0.0" +ckb-jsonrpc-types = "0.111.0" +ckb-types = "0.111.0" hex = "0.4" -eth_light_client_in_ckb-verification = { version = "0.2.1", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", tag = "v0.2.1" } +eth_light_client_in_ckb-verification = { git = "https://github.com/wenyuanhust/eth-light-client-in-ckb.git", version = "0.2.1", branch = "v0.2.1" } relayer = { version = "*", package = "ibc-relayer", path = "../../crates/relayer" } diff --git a/tools/forcerelay-test/ckb/dev.toml b/tools/forcerelay-test/ckb/dev.toml index 96ad2af1f..5087566c8 100644 --- a/tools/forcerelay-test/ckb/dev.toml +++ b/tools/forcerelay-test/ckb/dev.toml @@ -103,13 +103,7 @@ genesis_epoch_length = 1000 permanent_difficulty_in_dummy = true [params.hardfork] -rfc_0028 = 0 -rfc_0029 = 0 -rfc_0030 = 0 -rfc_0031 = 0 -rfc_0032 = 0 -rfc_0036 = 0 -rfc_0038 = 0 +ckb2023 = 0 [pow] func = "Dummy" diff --git a/tools/forcerelay-test/src/lib.rs b/tools/forcerelay-test/src/lib.rs index 2e38d5716..bc8d269b2 100644 --- a/tools/forcerelay-test/src/lib.rs +++ b/tools/forcerelay-test/src/lib.rs @@ -105,6 +105,8 @@ mod tests { println!("Deploy multi-client and always-success contracts"); std::fs::create_dir(working_dir.join("migrations")).unwrap(); let res = Command::new("ckb-cli") + .arg("--url") + .arg("http://127.0.0.1:8114") .arg("deploy") .arg("apply-txs") .arg("--migration-dir") @@ -146,7 +148,7 @@ mod tests { .arg("--ckb-chain-id") .arg("ibc-ckb-0") .current_dir(&working_dir) - .env("RUST_LOG", "info") + .env("RUST_LOG", "debug") .stdout(Stdio::piped()) .stderr(Stdio::piped()) .spawn() @@ -185,7 +187,7 @@ mod tests { sleep(80); - let mut indexer_rpc = IndexerRpcClient::new("http://127.0.0.1:8114"); + let indexer_rpc = IndexerRpcClient::new("http://127.0.0.1:8114"); let type_script = packed::Script::new_builder() .code_hash(TYPE_ID_CODE_HASH.0.pack()) .hash_type(ScriptHashType::Type.into()) diff --git a/tools/ibc-test/Cargo.toml b/tools/ibc-test/Cargo.toml index e5278f611..cbc8280a5 100644 --- a/tools/ibc-test/Cargo.toml +++ b/tools/ibc-test/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" [dev-dependencies] -ckb-sdk = "2.5.0" -ckb-jsonrpc-types = "0.108.0" -ckb-types = "0.108.0" -ckb-chain-spec = "0.108.0" +ckb-sdk = "3.0.0" +ckb-jsonrpc-types = "0.111.0" +ckb-types = "0.111.0" +ckb-chain-spec = "0.111.0" hex = "0.4" eyre = "0.6.8" @@ -45,7 +45,7 @@ toml_edit = "0.19.14" lazy_static = "1.4.0" ethers = { version = "2.0.2", features = ["rustls", "ws"] } -forcerelay-ckb-sdk = { git = "https://github.com/synapseweb3/forcerelay-ckb-sdk", rev = "cd82be97" } +forcerelay-ckb-sdk = { git = "https://github.com/synapseweb3/forcerelay-ckb-sdk", branch = "ckb-0.111" } [dependencies] bytes = "1.5.0" diff --git a/tools/ibc-test/src/tests/ibc/sudt_erc20_transfer.rs b/tools/ibc-test/src/tests/ibc/sudt_erc20_transfer.rs index 9d61766f6..2e9b4a371 100644 --- a/tools/ibc-test/src/tests/ibc/sudt_erc20_transfer.rs +++ b/tools/ibc-test/src/tests/ibc/sudt_erc20_transfer.rs @@ -446,7 +446,7 @@ fn complete_tx( // * HeaderDepResolver // * CellCollector // * TransactionDependencyProvider - let mut ckb_client = CkbRpcClient::new(ckb_rpc); + let ckb_client = CkbRpcClient::new(ckb_rpc); let cell_dep_resolver = { let genesis_block = ckb_client.get_block_by_number(0.into())?.unwrap(); DefaultCellDepResolver::from_genesis(&BlockView::from(genesis_block))? @@ -516,7 +516,7 @@ pub struct FungibleTokenPacketData { } fn send_transaction(url: &str, tx: TransactionView) -> eyre::Result<[u8; 32]> { - let mut client = CkbRpcClient::new(url); + let client = CkbRpcClient::new(url); let tx_hash = client.send_transaction( tx.data().into(), Some(ckb_jsonrpc_types::OutputsValidator::Passthrough),