From 96dff08e5065714589f0a3d02b878cf30e05fde2 Mon Sep 17 00:00:00 2001 From: elizabeth Date: Mon, 20 May 2024 14:34:42 -0400 Subject: [PATCH] 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 {