diff --git a/Cargo.lock b/Cargo.lock index 6c766b7f7a..8b2210c231 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -358,13 +358,13 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "astria-core" version = "0.1.0" -source = "git+https://github.com/astriaorg/astria?rev=a3e05ebf15f71cb3086244e57d980ec71132e8df#a3e05ebf15f71cb3086244e57d980ec71132e8df" +source = "git+https://github.com/astriaorg/astria?rev=112a66d6f9bb6638cce4935c949834e1d35416bb#112a66d6f9bb6638cce4935c949834e1d35416bb" dependencies = [ "astria-merkle", "bytes", "ed25519-consensus", "hex", - "ibc-types", + "ibc-types 0.12.0", "indexmap 2.1.0", "penumbra-ibc", "penumbra-proto", @@ -381,7 +381,7 @@ dependencies = [ [[package]] name = "astria-merkle" version = "0.1.0" -source = "git+https://github.com/astriaorg/astria?rev=a3e05ebf15f71cb3086244e57d980ec71132e8df#a3e05ebf15f71cb3086244e57d980ec71132e8df" +source = "git+https://github.com/astriaorg/astria?rev=112a66d6f9bb6638cce4935c949834e1d35416bb#112a66d6f9bb6638cce4935c949834e1d35416bb" dependencies = [ "sha2 0.10.8", ] @@ -389,7 +389,7 @@ dependencies = [ [[package]] name = "astria-sequencer-client" version = "0.1.0" -source = "git+https://github.com/astriaorg/astria?rev=a3e05ebf15f71cb3086244e57d980ec71132e8df#a3e05ebf15f71cb3086244e57d980ec71132e8df" +source = "git+https://github.com/astriaorg/astria?rev=112a66d6f9bb6638cce4935c949834e1d35416bb#112a66d6f9bb6638cce4935c949834e1d35416bb" dependencies = [ "astria-core", "async-trait", @@ -1299,8 +1299,8 @@ dependencies = [ [[package]] name = "decaf377-fmd" -version = "0.66.0" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.66.0#29b93231c6dc4a534b7a1177790d3d39d2dfb52c" +version = "0.68.1" +source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.68.1#c462e9a6cc86a37d42a9d75f1ab9ceb0e3789f77" dependencies = [ "ark-ff", "ark-serialize", @@ -1313,8 +1313,8 @@ dependencies = [ [[package]] name = "decaf377-ka" -version = "0.66.0" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.66.0#29b93231c6dc4a534b7a1177790d3d39d2dfb52c" +version = "0.68.1" +source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.68.1#c462e9a6cc86a37d42a9d75f1ab9ceb0e3789f77" dependencies = [ "ark-ff", "decaf377 0.5.0", @@ -1327,9 +1327,9 @@ dependencies = [ [[package]] name = "decaf377-rdsa" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc48f39a9939244f1d1e043b8065330022b8c4337cf359f32231fed8b2165973" +checksum = "2356bb010273c2b6e4e928b2bb442ddaa255ec242c16ff46cf9c3811fefa5ace" dependencies = [ "ark-ff", "ark-serialize", @@ -2116,7 +2116,7 @@ dependencies = [ "flex-error", "futures", "http", - "ibc-proto", + "ibc-proto 0.40.0", "ibc-relayer-types", "itertools 0.10.5", "reqwest", @@ -2165,6 +2165,23 @@ dependencies = [ "tonic", ] +[[package]] +name = "ibc-proto" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4ee32b22d3b06f31529b956f4928e5c9a068d71e46cf6abfa19c31ca550553" +dependencies = [ + "base64 0.21.5", + "bytes", + "flex-error", + "ics23 0.11.0", + "informalsystems-pbjson 0.7.0", + "prost 0.12.3", + "serde", + "subtle-encoding", + "tendermint-proto 0.34.0", +] + [[package]] name = "ibc-relayer" version = "0.26.4" @@ -2194,10 +2211,10 @@ dependencies = [ "http", "humantime", "humantime-serde", - "ibc-proto", + "ibc-proto 0.40.0", "ibc-relayer-types", "ibc-telemetry", - "ibc-types", + "ibc-types 0.11.1", "itertools 0.10.5", "jmt", "moka", @@ -2305,7 +2322,7 @@ dependencies = [ "derive_more", "env_logger", "flex-error", - "ibc-proto", + "ibc-proto 0.40.0", "ics23 0.11.0", "itertools 0.10.5", "num-rational", @@ -2358,7 +2375,7 @@ dependencies = [ "hdpath", "hex", "http", - "ibc-proto", + "ibc-proto 0.40.0", "ibc-relayer", "ibc-relayer-cli", "ibc-relayer-types", @@ -2386,16 +2403,34 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3178d46ae589af5cab981989a8c631a76d12411edc54d23fd35a52e2fffee07f" dependencies = [ - "ibc-types-core-channel", - "ibc-types-core-client", - "ibc-types-core-commitment", - "ibc-types-core-connection", - "ibc-types-domain-type", - "ibc-types-identifier", - "ibc-types-lightclients-tendermint", - "ibc-types-path", - "ibc-types-timestamp", - "ibc-types-transfer", + "ibc-types-core-channel 0.11.1", + "ibc-types-core-client 0.11.1", + "ibc-types-core-commitment 0.11.1", + "ibc-types-core-connection 0.11.1", + "ibc-types-domain-type 0.11.1", + "ibc-types-identifier 0.11.1", + "ibc-types-lightclients-tendermint 0.11.1", + "ibc-types-path 0.11.1", + "ibc-types-timestamp 0.11.1", + "ibc-types-transfer 0.11.1", +] + +[[package]] +name = "ibc-types" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba606d86e2015991f86a129935dbaeacd94beab72fb90a733c1b1ea76be708a2" +dependencies = [ + "ibc-types-core-channel 0.12.0", + "ibc-types-core-client 0.12.0", + "ibc-types-core-commitment 0.12.0", + "ibc-types-core-connection 0.12.0", + "ibc-types-domain-type 0.12.0", + "ibc-types-identifier 0.12.0", + "ibc-types-lightclients-tendermint 0.12.0", + "ibc-types-path 0.12.0", + "ibc-types-timestamp 0.12.0", + "ibc-types-transfer 0.12.0", ] [[package]] @@ -2408,13 +2443,45 @@ dependencies = [ "bytes", "derive_more", "displaydoc", - "ibc-proto", - "ibc-types-core-client", - "ibc-types-core-commitment", - "ibc-types-core-connection", - "ibc-types-domain-type", - "ibc-types-identifier", - "ibc-types-timestamp", + "ibc-proto 0.40.0", + "ibc-types-core-client 0.11.1", + "ibc-types-core-commitment 0.11.1", + "ibc-types-core-connection 0.11.1", + "ibc-types-domain-type 0.11.1", + "ibc-types-identifier 0.11.1", + "ibc-types-timestamp 0.11.1", + "ics23 0.11.0", + "num-traits", + "proc-macro2 0.1.10", + "prost 0.12.3", + "safe-regex", + "serde", + "serde_json", + "sha2 0.10.8", + "subtle-encoding", + "tendermint 0.34.0", + "tendermint-proto 0.34.0", + "time", + "tracing", +] + +[[package]] +name = "ibc-types-core-channel" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86fb64ef52086b727e5ae01da0e773f8ca9172ec1fd9d0aa1a79c0c2c610b17a" +dependencies = [ + "anyhow", + "bytes", + "derive_more", + "displaydoc", + "ibc-proto 0.41.0", + "ibc-types-core-client 0.12.0", + "ibc-types-core-commitment 0.12.0", + "ibc-types-core-connection 0.12.0", + "ibc-types-domain-type 0.12.0", + "ibc-types-identifier 0.12.0", + "ibc-types-timestamp 0.12.0", "ics23 0.11.0", "num-traits", "proc-macro2 0.1.10", @@ -2440,10 +2507,36 @@ dependencies = [ "bytes", "derive_more", "displaydoc", - "ibc-proto", - "ibc-types-domain-type", - "ibc-types-identifier", - "ibc-types-timestamp", + "ibc-proto 0.40.0", + "ibc-types-domain-type 0.11.1", + "ibc-types-identifier 0.11.1", + "ibc-types-timestamp 0.11.1", + "ics23 0.11.0", + "num-traits", + "prost 0.12.3", + "serde", + "serde_json", + "sha2 0.10.8", + "subtle-encoding", + "tendermint 0.34.0", + "tendermint-proto 0.34.0", + "time", +] + +[[package]] +name = "ibc-types-core-client" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4db9d4b136b9e84ccf581fec02bb9ebc4478ac0f145c526760ed4310b98741e7" +dependencies = [ + "anyhow", + "bytes", + "derive_more", + "displaydoc", + "ibc-proto 0.41.0", + "ibc-types-domain-type 0.12.0", + "ibc-types-identifier 0.12.0", + "ibc-types-timestamp 0.12.0", "ics23 0.11.0", "num-traits", "prost 0.12.3", @@ -2469,10 +2562,44 @@ dependencies = [ "dyn-clone", "erased-serde", "hex", - "ibc-proto", - "ibc-types-domain-type", - "ibc-types-identifier", - "ibc-types-timestamp", + "ibc-proto 0.40.0", + "ibc-types-domain-type 0.11.1", + "ibc-types-identifier 0.11.1", + "ibc-types-timestamp 0.11.1", + "ics23 0.11.0", + "num-traits", + "primitive-types", + "prost 0.12.3", + "safe-regex", + "serde", + "serde_json", + "sha2 0.10.8", + "subtle-encoding", + "tendermint 0.34.0", + "tendermint-light-client-verifier", + "tendermint-proto 0.34.0", + "time", + "tracing", + "uint", +] + +[[package]] +name = "ibc-types-core-commitment" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e2c527e14707dd0b2c7e6e2f6f62b0655c83154ae3eb1504e441d9d8f454ac6" +dependencies = [ + "anyhow", + "bytes", + "derive_more", + "displaydoc", + "dyn-clone", + "erased-serde", + "hex", + "ibc-proto 0.41.0", + "ibc-types-domain-type 0.12.0", + "ibc-types-identifier 0.12.0", + "ibc-types-timestamp 0.12.0", "ics23 0.11.0", "num-traits", "primitive-types", @@ -2500,12 +2627,41 @@ dependencies = [ "bytes", "derive_more", "displaydoc", - "ibc-proto", - "ibc-types-core-client", - "ibc-types-core-commitment", - "ibc-types-domain-type", - "ibc-types-identifier", - "ibc-types-timestamp", + "ibc-proto 0.40.0", + "ibc-types-core-client 0.11.1", + "ibc-types-core-commitment 0.11.1", + "ibc-types-domain-type 0.11.1", + "ibc-types-identifier 0.11.1", + "ibc-types-timestamp 0.11.1", + "ics23 0.11.0", + "num-traits", + "prost 0.12.3", + "safe-regex", + "serde", + "serde_json", + "sha2 0.10.8", + "subtle-encoding", + "tendermint 0.34.0", + "tendermint-proto 0.34.0", + "time", +] + +[[package]] +name = "ibc-types-core-connection" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a8a326c00e9ba48059407478c826237fe39cc90dd2b47182484192926904fe7" +dependencies = [ + "anyhow", + "bytes", + "derive_more", + "displaydoc", + "ibc-proto 0.41.0", + "ibc-types-core-client 0.12.0", + "ibc-types-core-commitment 0.12.0", + "ibc-types-domain-type 0.12.0", + "ibc-types-identifier 0.12.0", + "ibc-types-timestamp 0.12.0", "ics23 0.11.0", "num-traits", "prost 0.12.3", @@ -2530,6 +2686,17 @@ dependencies = [ "prost 0.12.3", ] +[[package]] +name = "ibc-types-domain-type" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3abc9619b9dd7201804f45fc7f335dda72d2e4d6f82d96e8fe3abf4585e6101b" +dependencies = [ + "anyhow", + "bytes", + "prost 0.12.3", +] + [[package]] name = "ibc-types-identifier" version = "0.11.1" @@ -2540,6 +2707,16 @@ dependencies = [ "serde", ] +[[package]] +name = "ibc-types-identifier" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "405880cf06fef65f51c5c91b7efbdcbc8d7eba0ac16b43538b36ebd17f21edea" +dependencies = [ + "displaydoc", + "serde", +] + [[package]] name = "ibc-types-lightclients-tendermint" version = "0.11.1" @@ -2552,13 +2729,49 @@ dependencies = [ "displaydoc", "dyn-clone", "erased-serde", - "ibc-proto", - "ibc-types-core-client", - "ibc-types-core-commitment", - "ibc-types-core-connection", - "ibc-types-domain-type", - "ibc-types-identifier", - "ibc-types-timestamp", + "ibc-proto 0.40.0", + "ibc-types-core-client 0.11.1", + "ibc-types-core-commitment 0.11.1", + "ibc-types-core-connection 0.11.1", + "ibc-types-domain-type 0.11.1", + "ibc-types-identifier 0.11.1", + "ibc-types-timestamp 0.11.1", + "ics23 0.11.0", + "num-traits", + "primitive-types", + "prost 0.12.3", + "safe-regex", + "serde", + "serde_json", + "sha2 0.10.8", + "subtle-encoding", + "tendermint 0.34.0", + "tendermint-light-client-verifier", + "tendermint-proto 0.34.0", + "time", + "tracing", + "uint", +] + +[[package]] +name = "ibc-types-lightclients-tendermint" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab22446058bd5afa50d64f8519a9107bbc5101ee65373df896314f52afa0fc6" +dependencies = [ + "anyhow", + "bytes", + "derive_more", + "displaydoc", + "dyn-clone", + "erased-serde", + "ibc-proto 0.41.0", + "ibc-types-core-client 0.12.0", + "ibc-types-core-commitment 0.12.0", + "ibc-types-core-connection 0.12.0", + "ibc-types-domain-type 0.12.0", + "ibc-types-identifier 0.12.0", + "ibc-types-timestamp 0.12.0", "ics23 0.11.0", "num-traits", "primitive-types", @@ -2585,9 +2798,31 @@ dependencies = [ "bytes", "derive_more", "displaydoc", - "ibc-types-core-channel", - "ibc-types-core-client", - "ibc-types-core-connection", + "ibc-types-core-channel 0.11.1", + "ibc-types-core-client 0.11.1", + "ibc-types-core-connection 0.11.1", + "num-traits", + "prost 0.12.3", + "serde", + "serde_json", + "subtle-encoding", + "tendermint 0.34.0", + "tendermint-proto 0.34.0", + "time", +] + +[[package]] +name = "ibc-types-path" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a29e6fd8871fdced76402a3008219abf8773e527a46f120e0d76d6a3bb9706c1" +dependencies = [ + "bytes", + "derive_more", + "displaydoc", + "ibc-types-core-channel 0.12.0", + "ibc-types-core-client 0.12.0", + "ibc-types-core-connection 0.12.0", "num-traits", "prost 0.12.3", "serde", @@ -2616,6 +2851,24 @@ dependencies = [ "time", ] +[[package]] +name = "ibc-types-timestamp" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d2e763838dbef62ca8a1344b4dd5b3919d685b4c61874183724644c912237a" +dependencies = [ + "bytes", + "displaydoc", + "num-traits", + "prost 0.12.3", + "serde", + "serde_json", + "subtle-encoding", + "tendermint 0.34.0", + "tendermint-proto 0.34.0", + "time", +] + [[package]] name = "ibc-types-transfer" version = "0.11.1" @@ -2626,6 +2879,16 @@ dependencies = [ "serde", ] +[[package]] +name = "ibc-types-transfer" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad973ca1fbad8d0d1632ec0a329aecff8731bbb96395b7553d6b9fd749356d34" +dependencies = [ + "displaydoc", + "serde", +] + [[package]] name = "ibig" version = "0.3.6" @@ -3421,8 +3684,8 @@ checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088" [[package]] name = "penumbra-asset" -version = "0.66.0" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.66.0#29b93231c6dc4a534b7a1177790d3d39d2dfb52c" +version = "0.68.1" +source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.68.1#c462e9a6cc86a37d42a9d75f1ab9ceb0e3789f77" dependencies = [ "anyhow", "ark-ff", @@ -3458,8 +3721,8 @@ dependencies = [ [[package]] name = "penumbra-ibc" -version = "0.66.0" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.66.0#29b93231c6dc4a534b7a1177790d3d39d2dfb52c" +version = "0.68.1" +source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.68.1#c462e9a6cc86a37d42a9d75f1ab9ceb0e3789f77" dependencies = [ "anyhow", "ark-ff", @@ -3467,8 +3730,8 @@ dependencies = [ "base64 0.21.5", "blake2b_simd 1.0.2", "hex", - "ibc-proto", - "ibc-types", + "ibc-proto 0.41.0", + "ibc-types 0.12.0", "ics23 0.11.0", "metrics", "num-traits", @@ -3491,8 +3754,8 @@ dependencies = [ [[package]] name = "penumbra-keys" -version = "0.66.0" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.66.0#29b93231c6dc4a534b7a1177790d3d39d2dfb52c" +version = "0.68.1" +source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.68.1#c462e9a6cc86a37d42a9d75f1ab9ceb0e3789f77" dependencies = [ "aes", "anyhow", @@ -3535,8 +3798,8 @@ dependencies = [ [[package]] name = "penumbra-num" -version = "0.66.0" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.66.0#29b93231c6dc4a534b7a1177790d3d39d2dfb52c" +version = "0.68.1" +source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.68.1#c462e9a6cc86a37d42a9d75f1ab9ceb0e3789f77" dependencies = [ "anyhow", "ark-ff", @@ -3571,8 +3834,8 @@ dependencies = [ [[package]] name = "penumbra-proto" -version = "0.66.0" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.66.0#29b93231c6dc4a534b7a1177790d3d39d2dfb52c" +version = "0.68.1" +source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.68.1#c462e9a6cc86a37d42a9d75f1ab9ceb0e3789f77" dependencies = [ "anyhow", "async-trait", @@ -3582,8 +3845,8 @@ dependencies = [ "decaf377-rdsa", "futures", "hex", - "ibc-proto", - "ibc-types", + "ibc-proto 0.41.0", + "ibc-types 0.12.0", "ics23 0.11.0", "pbjson", "pbjson-types", @@ -3598,8 +3861,8 @@ dependencies = [ [[package]] name = "penumbra-sct" -version = "0.66.0" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.66.0#29b93231c6dc4a534b7a1177790d3d39d2dfb52c" +version = "0.68.1" +source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.68.1#c462e9a6cc86a37d42a9d75f1ab9ceb0e3789f77" dependencies = [ "anyhow", "ark-ff", @@ -3629,8 +3892,8 @@ dependencies = [ [[package]] name = "penumbra-tct" -version = "0.66.0" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.66.0#29b93231c6dc4a534b7a1177790d3d39d2dfb52c" +version = "0.68.1" +source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.68.1#c462e9a6cc86a37d42a9d75f1ab9ceb0e3789f77" dependencies = [ "ark-ed-on-bls12-377", "ark-ff", @@ -3657,8 +3920,8 @@ dependencies = [ [[package]] name = "penumbra-txhash" -version = "0.66.0" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.66.0#29b93231c6dc4a534b7a1177790d3d39d2dfb52c" +version = "0.68.1" +source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.68.1#c462e9a6cc86a37d42a9d75f1ab9ceb0e3789f77" dependencies = [ "anyhow", "blake2b_simd 1.0.2", diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml index 0fd40a8831..f594447886 100644 --- a/crates/relayer/Cargo.toml +++ b/crates/relayer/Cargo.toml @@ -24,13 +24,13 @@ ibc-proto = { version = "0.40.0", features = ["serde"] } ibc-telemetry = { version = "0.26.4", path = "../telemetry", optional = true } ibc-relayer-types = { version = "0.26.4", path = "../relayer-types", features = ["mocks"] } -astria-core = { git = "https://github.com/astriaorg/astria", rev = "a3e05ebf15f71cb3086244e57d980ec71132e8df" } -astria-sequencer-client = { git = "https://github.com/astriaorg/astria", rev = "a3e05ebf15f71cb3086244e57d980ec71132e8df", features = [ "http" ] } +astria-core = { git = "https://github.com/astriaorg/astria", rev = "112a66d6f9bb6638cce4935c949834e1d35416bb" } +astria-sequencer-client = { git = "https://github.com/astriaorg/astria", rev = "112a66d6f9bb6638cce4935c949834e1d35416bb", features = [ "http" ] } ed25519-consensus = "2.1.0" ibc-types = "0.11.1" jmt = "0.6" -penumbra-ibc = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.66.0", default-features = false } -penumbra-proto = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.66.0" } +penumbra-ibc = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.68.1", default-features = false } +penumbra-proto = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.68.1" } pbjson-types = "0.6" subtle-encoding = "0.5"