Merge pull request #152 from yangby-cryptape/pr/support-capella-fork

feat: support the Capella fork
synapseweb3 · Apr 25, 2023 · 3dabdf1 · 3dabdf1
2 parents e1be14f + b6a659e
commit 3dabdf1
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 61 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,6 +18,7 @@ members = [
 ]
 
 [patch.crates-io]
+arbitrary = { git = "https://github.com/michaelsproul/arbitrary", rev="f002b99989b561ddce62e4cf2887b0f8860ae991" }
 # ibc-proto                        = { git = "https://github.com/cosmos/ibc-proto-rs.git",       branch = "main" }
 # tendermint                       = { git = "https://github.com/informalsystems/tendermint-rs", branch = "main" }
 # tendermint-rpc                   = { git = "https://github.com/informalsystems/tendermint-rs", branch = "main" }

diff --git a/crates/relayer-storage/Cargo.toml b/crates/relayer-storage/Cargo.toml
@@ -14,5 +14,5 @@ description  = "The storage part of SynapseWeb3 IBC Relayer"
 [dependencies]
 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 = "307ade9", package = "types" }
-eth_light_client_in_ckb-verification = { version = "0.1.0-alpha.0", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", rev = "e94ec1a" }
+eth2_types = { git = "https://github.com/synapseweb3/lighthouse", rev = "2c246d6", package = "types" }
+eth_light_client_in_ckb-verification = { version = "0.1.0", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", rev = "054d9ae" }
diff --git a/crates/relayer-types/Cargo.toml b/crates/relayer-types/Cargo.toml
@@ -45,10 +45,10 @@ itertools = { version = "0.10.3", default-features = false, features = ["use_all
 primitive-types = { version = "0.12.1", default-features = false, features = ["serde_no_std"] }
 dyn-clone = "1.0.8"
 num-rational = "0.4.1"
-eth2_ssz_types   = { git = "https://github.com/synapseweb3/lighthouse", rev = "307ade9" }
-bls              = { git = "https://github.com/synapseweb3/lighthouse", rev = "307ade9" }
-tree_hash        = { git = "https://github.com/synapseweb3/lighthouse", rev = "307ade9" }
-tree_hash_derive = { git = "https://github.com/synapseweb3/lighthouse", rev = "307ade9" }
+eth2_ssz_types   = { git = "https://github.com/synapseweb3/lighthouse", rev = "2c246d6" }
+bls              = { git = "https://github.com/synapseweb3/lighthouse", rev = "2c246d6" }
+tree_hash        = { git = "https://github.com/synapseweb3/lighthouse", rev = "2c246d6" }
+tree_hash_derive = { git = "https://github.com/synapseweb3/lighthouse", rev = "2c246d6" }
 thiserror = "1.0"
 ethereum-types = "0.14.1"
 hex = "0.4"

diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml
@@ -26,11 +26,11 @@ ibc-telemetry     = { version = "0.23.0", path = "../telemetry", optional = true
 ibc-relayer-types = { version = "0.23.0", path = "../relayer-types", features = ["mocks"] }
 ibc-relayer-storage = { version = "0.1.0",  path = "../relayer-storage" }
 
-eth2_types       = { git = "https://github.com/synapseweb3/lighthouse", rev = "307ade9", package = "types" }
-tree_hash_derive = { git = "https://github.com/synapseweb3/lighthouse", rev = "307ade9" }
-tree_hash        = { git = "https://github.com/synapseweb3/lighthouse", rev = "307ade9" }
+eth2_types       = { git = "https://github.com/synapseweb3/lighthouse", rev = "2c246d6", package = "types" }
+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.1.0-alpha.0", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", rev = "e94ec1a" }
+eth_light_client_in_ckb-verification = { version = "0.1.0", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", rev = "054d9ae" }
 
 subtle-encoding = "0.5"
 humantime-serde = "1.1.1"

diff --git a/tools/forcerelay-test/Cargo.toml b/tools/forcerelay-test/Cargo.toml
@@ -9,5 +9,5 @@ ckb-jsonrpc-types = "0.106.0"
 ckb-types = "0.106.0"
 hex = "0.4"
 
-eth_light_client_in_ckb-verification = { version = "0.1.0-alpha.0", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", rev = "e94ec1a" }
+eth_light_client_in_ckb-verification = { version = "0.1.0", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", rev = "054d9ae" }
 relayer = {version = "*", package = "ibc-relayer", path = "../../crates/relayer"}