From f1f389559695c18cc5b41b444e548f8d948a47de Mon Sep 17 00:00:00 2001 From: elizabeth Date: Thu, 9 May 2024 15:44:55 -0400 Subject: [PATCH 1/3] bump astria and penumbra deps --- Cargo.lock | 46 +++++++++---------- .../applications/ics27_ica/msgs/register.rs | 1 + crates/relayer/Cargo.toml | 8 ++-- crates/relayer/src/chain/astria/endpoint.rs | 22 +++++---- .../relayer/src/keyring/ed25519_key_pair.rs | 2 +- crates/relayer/src/transfer.rs | 14 ++++-- tools/test-framework/Cargo.toml | 2 +- 7 files changed, 52 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 92bd8daea6..b837839b4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -358,7 +358,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "astria-core" version = "0.1.0" -source = "git+https://github.com/astriaorg/astria?rev=21cc874ca499c1f4afa8576f8640a9c8deac7690#21cc874ca499c1f4afa8576f8640a9c8deac7690" +source = "git+https://github.com/astriaorg/astria?rev=53244b59be27f80a1b4062a8e96f452be98977c0#53244b59be27f80a1b4062a8e96f452be98977c0" dependencies = [ "astria-merkle", "base64 0.21.7", @@ -381,7 +381,7 @@ dependencies = [ [[package]] name = "astria-merkle" version = "0.1.0" -source = "git+https://github.com/astriaorg/astria?rev=21cc874ca499c1f4afa8576f8640a9c8deac7690#21cc874ca499c1f4afa8576f8640a9c8deac7690" +source = "git+https://github.com/astriaorg/astria?rev=53244b59be27f80a1b4062a8e96f452be98977c0#53244b59be27f80a1b4062a8e96f452be98977c0" 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=21cc874ca499c1f4afa8576f8640a9c8deac7690#21cc874ca499c1f4afa8576f8640a9c8deac7690" +source = "git+https://github.com/astriaorg/astria?rev=53244b59be27f80a1b4062a8e96f452be98977c0#53244b59be27f80a1b4062a8e96f452be98977c0" dependencies = [ "astria-core", "async-trait", @@ -1356,8 +1356,8 @@ dependencies = [ [[package]] name = "decaf377-fmd" -version = "0.69.1" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.69.1#b3e62ece950a55f25982c962c88dcfec0b603174" +version = "0.71.0" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=8b06546af43bf073fd99f3f9d82b8afb51872489#8b06546af43bf073fd99f3f9d82b8afb51872489" dependencies = [ "ark-ff", "ark-serialize", @@ -1370,8 +1370,8 @@ dependencies = [ [[package]] name = "decaf377-ka" -version = "0.69.1" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.69.1#b3e62ece950a55f25982c962c88dcfec0b603174" +version = "0.71.0" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=8b06546af43bf073fd99f3f9d82b8afb51872489#8b06546af43bf073fd99f3f9d82b8afb51872489" dependencies = [ "ark-ff", "decaf377 0.5.0", @@ -3495,8 +3495,8 @@ checksum = "36bae92c60fa2398ce4678b98b2c4b5a7c61099961ca1fa305aec04a9ad28922" [[package]] name = "penumbra-asset" -version = "0.69.1" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.69.1#b3e62ece950a55f25982c962c88dcfec0b603174" +version = "0.71.0" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=8b06546af43bf073fd99f3f9d82b8afb51872489#8b06546af43bf073fd99f3f9d82b8afb51872489" dependencies = [ "anyhow", "ark-ff", @@ -3533,8 +3533,8 @@ dependencies = [ [[package]] name = "penumbra-ibc" -version = "0.69.1" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.69.1#b3e62ece950a55f25982c962c88dcfec0b603174" +version = "0.71.0" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=8b06546af43bf073fd99f3f9d82b8afb51872489#8b06546af43bf073fd99f3f9d82b8afb51872489" dependencies = [ "anyhow", "ark-ff", @@ -3566,8 +3566,8 @@ dependencies = [ [[package]] name = "penumbra-keys" -version = "0.69.1" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.69.1#b3e62ece950a55f25982c962c88dcfec0b603174" +version = "0.71.0" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=8b06546af43bf073fd99f3f9d82b8afb51872489#8b06546af43bf073fd99f3f9d82b8afb51872489" dependencies = [ "aes", "anyhow", @@ -3610,8 +3610,8 @@ dependencies = [ [[package]] name = "penumbra-num" -version = "0.69.1" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.69.1#b3e62ece950a55f25982c962c88dcfec0b603174" +version = "0.71.0" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=8b06546af43bf073fd99f3f9d82b8afb51872489#8b06546af43bf073fd99f3f9d82b8afb51872489" dependencies = [ "anyhow", "ark-ff", @@ -3646,8 +3646,8 @@ dependencies = [ [[package]] name = "penumbra-proto" -version = "0.69.1" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.69.1#b3e62ece950a55f25982c962c88dcfec0b603174" +version = "0.71.0" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=8b06546af43bf073fd99f3f9d82b8afb51872489#8b06546af43bf073fd99f3f9d82b8afb51872489" dependencies = [ "anyhow", "async-trait", @@ -3673,8 +3673,8 @@ dependencies = [ [[package]] name = "penumbra-sct" -version = "0.69.1" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.69.1#b3e62ece950a55f25982c962c88dcfec0b603174" +version = "0.71.0" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=8b06546af43bf073fd99f3f9d82b8afb51872489#8b06546af43bf073fd99f3f9d82b8afb51872489" dependencies = [ "anyhow", "ark-ff", @@ -3704,8 +3704,8 @@ dependencies = [ [[package]] name = "penumbra-tct" -version = "0.69.1" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.69.1#b3e62ece950a55f25982c962c88dcfec0b603174" +version = "0.71.0" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=8b06546af43bf073fd99f3f9d82b8afb51872489#8b06546af43bf073fd99f3f9d82b8afb51872489" dependencies = [ "ark-ed-on-bls12-377", "ark-ff", @@ -3732,8 +3732,8 @@ dependencies = [ [[package]] name = "penumbra-txhash" -version = "0.69.1" -source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.69.1#b3e62ece950a55f25982c962c88dcfec0b603174" +version = "0.71.0" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=8b06546af43bf073fd99f3f9d82b8afb51872489#8b06546af43bf073fd99f3f9d82b8afb51872489" dependencies = [ "anyhow", "blake2b_simd 1.0.2", diff --git a/crates/relayer-types/src/applications/ics27_ica/msgs/register.rs b/crates/relayer-types/src/applications/ics27_ica/msgs/register.rs index 1301de19cd..af1d7ad2f3 100644 --- a/crates/relayer-types/src/applications/ics27_ica/msgs/register.rs +++ b/crates/relayer-types/src/applications/ics27_ica/msgs/register.rs @@ -66,6 +66,7 @@ impl From for RawMsgRegisterInterchainAccount { owner: value.owner.to_string(), connection_id: value.connection_id.to_string(), version: value.version.to_string(), + ordering, } } } diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml index d361d3c254..74444305b3 100644 --- a/crates/relayer/Cargo.toml +++ b/crates/relayer/Cargo.toml @@ -24,13 +24,13 @@ ibc-proto = { version = "0.41.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 = "21cc874ca499c1f4afa8576f8640a9c8deac7690" } -astria-sequencer-client = { git = "https://github.com/astriaorg/astria", rev = "21cc874ca499c1f4afa8576f8640a9c8deac7690", features = [ "http" ] } +astria-core = { git = "https://github.com/astriaorg/astria", rev = "53244b59be27f80a1b4062a8e96f452be98977c0" } +astria-sequencer-client = { git = "https://github.com/astriaorg/astria", rev = "53244b59be27f80a1b4062a8e96f452be98977c0", features = [ "http" ] } ed25519-consensus = "2.1.0" ibc-types = "0.12.0" jmt = "0.6" -penumbra-ibc = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.69.1", default-features = false } -penumbra-proto = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.69.1" } +penumbra-ibc = { git = "https://github.com/penumbra-zone/penumbra.git", rev = "8b06546af43bf073fd99f3f9d82b8afb51872489", default-features = false } +penumbra-proto = { git = "https://github.com/penumbra-zone/penumbra.git", rev = "8b06546af43bf073fd99f3f9d82b8afb51872489" } pbjson-types = "0.6" subtle-encoding = "0.5" diff --git a/crates/relayer/src/chain/astria/endpoint.rs b/crates/relayer/src/chain/astria/endpoint.rs index 98586f2a73..19187bdd24 100644 --- a/crates/relayer/src/chain/astria/endpoint.rs +++ b/crates/relayer/src/chain/astria/endpoint.rs @@ -231,13 +231,12 @@ impl AstriaEndpoint { async fn broadcast_messages(&mut self, tracked_msgs: TrackedMsgs) -> Result { use astria_core::{ - generated::sequencer::v1::Ics20Withdrawal as RawIcs20Withdrawal, - sequencer::v1::{ - transaction::{ - action::Ics20Withdrawal, - Action, - }, - Address, + generated::protocol::transaction::v1alpha1::Ics20Withdrawal as RawIcs20Withdrawal, + primitive::v1::Address, + protocol::transaction::v1alpha1::{ + action::Ics20Withdrawal, + Action, + TransactionParams, UnsignedTransaction, }, }; @@ -278,7 +277,10 @@ impl AstriaEndpoint { .map_err(|e| Error::other(Box::new(e)))?; let unsigned_tx = UnsignedTransaction { - nonce: nonce.nonce, + params: TransactionParams { + nonce: nonce.nonce, + chain_id: self.config.id().to_string(), + }, actions, }; @@ -586,7 +588,7 @@ impl ChainEndpoint for AstriaEndpoint { _key_name: Option<&str>, denom: Option<&str>, ) -> Result { - use astria_core::sequencer::v1::account::AssetBalance; + use astria_core::protocol::account::v1alpha1::AssetBalance; use astria_sequencer_client::{ Address, SequencerClientExt as _, @@ -599,7 +601,7 @@ impl ChainEndpoint for AstriaEndpoint { .block_on(self.sequencer_client.get_latest_balance(address)) .map_err(|e| Error::other(Box::new(e)))?; - let denom = denom.unwrap_or(astria_core::sequencer::v1::asset::DEFAULT_NATIVE_ASSET_DENOM); + let denom = denom.unwrap_or(astria_core::primitive::v1::asset::DEFAULT_NATIVE_ASSET_DENOM); let balance: Vec = balance .balances diff --git a/crates/relayer/src/keyring/ed25519_key_pair.rs b/crates/relayer/src/keyring/ed25519_key_pair.rs index 6c8ec1a1e3..79171979f9 100644 --- a/crates/relayer/src/keyring/ed25519_key_pair.rs +++ b/crates/relayer/src/keyring/ed25519_key_pair.rs @@ -158,7 +158,7 @@ impl SigningKeyPair for Ed25519KeyPair { bs58::encode(&self.signing_key.verifying_key()).into_string() } Ed25519AddressType::Astria => { - hex::encode(astria_core::sequencer::v1::Address::from_verification_key( + hex::encode(astria_core::primitive::v1::Address::from_verification_key( ed25519_consensus::VerificationKey::try_from( self.signing_key.verifying_key().to_bytes(), ) diff --git a/crates/relayer/src/transfer.rs b/crates/relayer/src/transfer.rs index 4a6be237c7..8ef322e2a1 100644 --- a/crates/relayer/src/transfer.rs +++ b/crates/relayer/src/transfer.rs @@ -195,21 +195,27 @@ fn build_transfer_message_astria( timeout_height: TimeoutHeight, timeout_timestamp: Timestamp, ) -> Any { - use astria_core::sequencer::v1::asset::default_native_asset_id; + use astria_core::{ + generated::protocol::transaction::v1alpha1::{ + IbcHeight, + Ics20Withdrawal, + }, + primitive::v1::asset::default_native_asset_id, + }; let timeout_height = match timeout_height { // TODO: update astria IbcHeight to support optional? - TimeoutHeight::At(height) => astria_core::generated::sequencer::v1::IbcHeight { + TimeoutHeight::At(height) => IbcHeight { revision_number: height.revision_number(), revision_height: height.revision_height(), }, - TimeoutHeight::Never => astria_core::generated::sequencer::v1::IbcHeight { + TimeoutHeight::Never => IbcHeight { revision_number: 0, revision_height: u64::MAX, }, }; - let msg = astria_core::generated::sequencer::v1::Ics20Withdrawal { + let msg = Ics20Withdrawal { source_channel: src_channel_id.to_string(), denom: denom, amount: Some( diff --git a/tools/test-framework/Cargo.toml b/tools/test-framework/Cargo.toml index f4bfc60324..c29cb6aa89 100644 --- a/tools/test-framework/Cargo.toml +++ b/tools/test-framework/Cargo.toml @@ -17,7 +17,7 @@ description = """ ibc-relayer-types = { version = "=0.26.4", path = "../../crates/relayer-types" } ibc-relayer = { version = "=0.26.4", path = "../../crates/relayer" } ibc-relayer-cli = { version = "=1.7.4", path = "../../crates/relayer-cli" } -ibc-proto = { version = "0.40.0", features = ["serde"] } +ibc-proto = { version = "0.41.0", features = ["serde"] } tendermint-rpc = { version = "0.34.0", features = ["http-client", "websocket-client"] } http = "0.2.9" From 71eb7d1a9f877192618370b0d919d09917b661e0 Mon Sep 17 00:00:00 2001 From: elizabeth Date: Thu, 9 May 2024 15:46:43 -0400 Subject: [PATCH 2/3] fix --- crates/relayer-types/src/applications/ics27_ica/msgs/register.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/relayer-types/src/applications/ics27_ica/msgs/register.rs b/crates/relayer-types/src/applications/ics27_ica/msgs/register.rs index af1d7ad2f3..1301de19cd 100644 --- a/crates/relayer-types/src/applications/ics27_ica/msgs/register.rs +++ b/crates/relayer-types/src/applications/ics27_ica/msgs/register.rs @@ -66,7 +66,6 @@ impl From for RawMsgRegisterInterchainAccount { owner: value.owner.to_string(), connection_id: value.connection_id.to_string(), version: value.version.to_string(), - ordering, } } } From 96dff08e5065714589f0a3d02b878cf30e05fde2 Mon Sep 17 00:00:00 2001 From: elizabeth Date: Mon, 20 May 2024 14:34:42 -0400 Subject: [PATCH 3/3] bump astria dep to latest --- Cargo.lock | 8 +++++--- crates/relayer/Cargo.toml | 4 ++-- crates/relayer/src/chain/astria/endpoint.rs | 2 +- crates/relayer/src/transfer.rs | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b837839b4d..5222387ab0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -358,7 +358,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "astria-core" version = "0.1.0" -source = "git+https://github.com/astriaorg/astria?rev=53244b59be27f80a1b4062a8e96f452be98977c0#53244b59be27f80a1b4062a8e96f452be98977c0" +source = "git+https://github.com/astriaorg/astria?rev=8f261a4cadc9631f319b1872c2afdc64812d2ca4#8f261a4cadc9631f319b1872c2afdc64812d2ca4" dependencies = [ "astria-merkle", "base64 0.21.7", @@ -371,17 +371,19 @@ dependencies = [ "penumbra-ibc", "penumbra-proto", "prost 0.12.3", + "rand", "sha2 0.10.8", "tendermint", "tendermint-proto", "thiserror", "tracing", + "zeroize", ] [[package]] name = "astria-merkle" version = "0.1.0" -source = "git+https://github.com/astriaorg/astria?rev=53244b59be27f80a1b4062a8e96f452be98977c0#53244b59be27f80a1b4062a8e96f452be98977c0" +source = "git+https://github.com/astriaorg/astria?rev=8f261a4cadc9631f319b1872c2afdc64812d2ca4#8f261a4cadc9631f319b1872c2afdc64812d2ca4" dependencies = [ "sha2 0.10.8", ] @@ -389,7 +391,7 @@ dependencies = [ [[package]] name = "astria-sequencer-client" version = "0.1.0" -source = "git+https://github.com/astriaorg/astria?rev=53244b59be27f80a1b4062a8e96f452be98977c0#53244b59be27f80a1b4062a8e96f452be98977c0" +source = "git+https://github.com/astriaorg/astria?rev=8f261a4cadc9631f319b1872c2afdc64812d2ca4#8f261a4cadc9631f319b1872c2afdc64812d2ca4" dependencies = [ "astria-core", "async-trait", diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml index 74444305b3..0ad4a9ed9b 100644 --- a/crates/relayer/Cargo.toml +++ b/crates/relayer/Cargo.toml @@ -24,8 +24,8 @@ ibc-proto = { version = "0.41.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 = "53244b59be27f80a1b4062a8e96f452be98977c0" } -astria-sequencer-client = { git = "https://github.com/astriaorg/astria", rev = "53244b59be27f80a1b4062a8e96f452be98977c0", features = [ "http" ] } +astria-core = { git = "https://github.com/astriaorg/astria", rev = "8f261a4cadc9631f319b1872c2afdc64812d2ca4" } +astria-sequencer-client = { git = "https://github.com/astriaorg/astria", rev = "8f261a4cadc9631f319b1872c2afdc64812d2ca4", features = [ "http" ] } ed25519-consensus = "2.1.0" ibc-types = "0.12.0" jmt = "0.6" diff --git a/crates/relayer/src/chain/astria/endpoint.rs b/crates/relayer/src/chain/astria/endpoint.rs index 19187bdd24..6f434bfbcd 100644 --- a/crates/relayer/src/chain/astria/endpoint.rs +++ b/crates/relayer/src/chain/astria/endpoint.rs @@ -267,7 +267,7 @@ impl AstriaEndpoint { actions.push(Action::Ibc(non_raw)); } - let signing_key: ed25519_consensus::SigningKey = + let signing_key: astria_core::crypto::SigningKey = (*self.get_key()?.signing_key().as_bytes()).into(); // TODO cache this let address = Address::from_verification_key(signing_key.verification_key()); let nonce = self diff --git a/crates/relayer/src/transfer.rs b/crates/relayer/src/transfer.rs index 8ef322e2a1..20c0da631e 100644 --- a/crates/relayer/src/transfer.rs +++ b/crates/relayer/src/transfer.rs @@ -228,6 +228,7 @@ fn build_transfer_message_astria( timeout_height: Some(timeout_height), timeout_time: timeout_timestamp.nanoseconds(), fee_asset_id: default_native_asset_id().as_ref().to_vec(), + memo: "".to_string(), }; Any {