diff --git a/Cargo.lock b/Cargo.lock index ae8c11718..5396cef3c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -160,9 +160,8 @@ checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "arbitrary" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e90af4de65aa7b293ef2d09daff88501eb254f58edde2e1ac02c82d873eadad" +version = "1.3.0" +source = "git+https://github.com/michaelsproul/arbitrary?rev=f002b99989b561ddce62e4cf2887b0f8860ae991#f002b99989b561ddce62e4cf2887b0f8860ae991" dependencies = [ "derive_arbitrary", ] @@ -570,8 +569,9 @@ dependencies = [ [[package]] name = "bls" version = "0.2.0" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ + "arbitrary", "blst", "eth2_hashing", "eth2_serde_utils", @@ -710,7 +710,7 @@ dependencies = [ [[package]] name = "cached_tree_hash" version = "0.1.0" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ "eth2_hashing", "eth2_ssz", @@ -1417,12 +1417,12 @@ dependencies = [ [[package]] name = "compare_fields" version = "0.2.0" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" [[package]] name = "compare_fields_derive" version = "0.2.0" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ "quote", "syn 1.0.109", @@ -1756,7 +1756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.12.3", + "hashbrown", "lock_api", "once_cell", "parking_lot_core 0.9.7", @@ -1801,9 +1801,8 @@ dependencies = [ [[package]] name = "derive_arbitrary" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8beee4701e2e229e8098bbdecdca12449bc3e322f137d269182fa1291e20bd00" +version = "1.3.0" +source = "git+https://github.com/michaelsproul/arbitrary?rev=f002b99989b561ddce62e4cf2887b0f8860ae991#f002b99989b561ddce62e4cf2887b0f8860ae991" dependencies = [ "proc-macro2", "quote", @@ -2172,7 +2171,7 @@ dependencies = [ [[package]] name = "eth2_hashing" version = "0.3.0" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ "cpufeatures", "lazy_static", @@ -2183,7 +2182,7 @@ dependencies = [ [[package]] name = "eth2_interop_keypairs" version = "0.2.0" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ "bls", "eth2_hashing", @@ -2198,7 +2197,7 @@ dependencies = [ [[package]] name = "eth2_serde_utils" version = "0.1.1" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ "ethereum-types", "hex", @@ -2210,7 +2209,7 @@ dependencies = [ [[package]] name = "eth2_ssz" version = "0.4.1" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ "ethereum-types", "itertools", @@ -2219,8 +2218,8 @@ dependencies = [ [[package]] name = "eth2_ssz_derive" -version = "0.3.0" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +version = "0.3.1" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ "darling", "proc-macro2", @@ -2231,7 +2230,7 @@ dependencies = [ [[package]] name = "eth2_ssz_types" version = "0.2.2" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ "arbitrary", "derivative", @@ -2246,8 +2245,8 @@ dependencies = [ [[package]] name = "eth_light_client_in_ckb-verification" -version = "0.1.0-alpha.0" -source = "git+https://github.com/synapseweb3/eth-light-client-in-ckb?rev=e94ec1a#e94ec1ab13667eb1d3a1fba09abf495198254147" +version = "0.1.0" +source = "git+https://github.com/synapseweb3/eth-light-client-in-ckb?rev=054d9ae#054d9aeb8c7c405deb10db53ccf28bb78296a31f" dependencies = [ "ckb-merkle-mountain-range", "eth2_hashing", @@ -2651,6 +2650,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ + "arbitrary", "byteorder", "rand 0.8.5", "rustc-hex", @@ -3046,15 +3046,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -3075,11 +3066,11 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" +checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" dependencies = [ - "hashbrown 0.11.2", + "hashbrown", ] [[package]] @@ -3764,7 +3755,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", - "hashbrown 0.12.3", + "hashbrown", ] [[package]] @@ -3823,7 +3814,7 @@ dependencies = [ [[package]] name = "int_to_bytes" version = "0.2.0" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ "bytes", ] @@ -4008,9 +3999,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.22.2" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d" +checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" dependencies = [ "cc", "pkg-config", @@ -4066,7 +4057,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" dependencies = [ - "hashbrown 0.12.3", + "hashbrown", ] [[package]] @@ -4212,7 +4203,7 @@ dependencies = [ [[package]] name = "merkle_proof" version = "0.2.0" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ "eth2_hashing", "ethereum-types", @@ -4737,7 +4728,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" dependencies = [ "dlv-list", - "hashbrown 0.12.3", + "hashbrown", ] [[package]] @@ -5694,16 +5685,15 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.25.4" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4b1eaf239b47034fb450ee9cdedd7d0226571689d8823030c4b6c2cb407152" +checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" dependencies = [ "bitflags", "fallible-iterator", "fallible-streaming-iterator", "hashlink", "libsqlite3-sys", - "memchr", "smallvec", ] @@ -5887,7 +5877,7 @@ dependencies = [ [[package]] name = "safe_arith" version = "0.1.0" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" [[package]] name = "safemem" @@ -6562,9 +6552,9 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" [[package]] name = "superstruct" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a99807a055ff4ff5d249bb84c80d9eabb55ca3c452187daae43fd5b51ef695" +checksum = "75b9e5728aa1a87141cefd4e7509903fc01fa0dcb108022b1e841a67c5159fc5" dependencies = [ "darling", "itertools", @@ -6608,7 +6598,7 @@ dependencies = [ [[package]] name = "swap_or_not_shuffle" version = "0.2.0" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ "eth2_hashing", "ethereum-types", @@ -6902,7 +6892,7 @@ dependencies = [ [[package]] name = "test_random_derive" version = "0.2.0" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ "quote", "syn 1.0.109", @@ -7393,7 +7383,7 @@ dependencies = [ [[package]] name = "tree_hash" version = "0.4.1" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ "eth2_hashing", "ethereum-types", @@ -7403,7 +7393,7 @@ dependencies = [ [[package]] name = "tree_hash_derive" version = "0.4.0" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ "darling", "quote", @@ -7480,8 +7470,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "types" version = "0.2.1" -source = "git+https://github.com/synapseweb3/lighthouse?rev=307ade9#307ade97f19792c6ee6b93fdfaa392c3d38ea110" +source = "git+https://github.com/synapseweb3/lighthouse?rev=2c246d6#2c246d68011f14a9ee959b8d75b1dcb5d30b2993" dependencies = [ + "arbitrary", "bls", "cached_tree_hash", "compare_fields", @@ -7536,6 +7527,7 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" dependencies = [ + "arbitrary", "byteorder", "crunchy", "hex", diff --git a/Cargo.toml b/Cargo.toml index 2830a9b58..8647277ea 100644 --- 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 index 13753a5a3..ac3d19b86 100644 --- 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 index 630aefe5a..5a9663572 100644 --- 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 index a8fc494b4..d67f65277 100644 --- 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 index 0c7f7a905..e39a1b131 100644 --- 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"}