From a69c0a1d0133119298ff092b366cae99df26c6dc Mon Sep 17 00:00:00 2001 From: ido Date: Sat, 19 Oct 2024 22:15:04 +0300 Subject: [PATCH 1/4] 1.81-bookworm --- ci/release/hermes.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/hermes.Dockerfile b/ci/release/hermes.Dockerfile index fdec4ac082..77b78f605f 100644 --- a/ci/release/hermes.Dockerfile +++ b/ci/release/hermes.Dockerfile @@ -3,7 +3,7 @@ # Usage: (from the root of the working copy) # $ docker build . -t informalsystems/hermes -f ci/release/hermes.Dockerfile -FROM rust:1-buster AS build-env +FROM rust:1.81-bookworm AS build-env ARG TAG From 4491f3b431e989690e09f87cfe2f9d697613fb6e Mon Sep 17 00:00:00 2001 From: Josh Bowen Date: Sat, 19 Oct 2024 13:49:45 -0600 Subject: [PATCH 2/4] copy paste cosmos integration test config for astria --- .../src/bin/test_setup_with_binary_channel.rs | 9 ++++++++- .../bin/test_setup_with_fee_enabled_binary_channel.rs | 8 +++++++- .../src/bin/test_setup_with_ternary_channel.rs | 8 +++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/tools/integration-test/src/bin/test_setup_with_binary_channel.rs b/tools/integration-test/src/bin/test_setup_with_binary_channel.rs index 44d6cb40e4..4d8630f27f 100644 --- a/tools/integration-test/src/bin/test_setup_with_binary_channel.rs +++ b/tools/integration-test/src/bin/test_setup_with_binary_channel.rs @@ -28,6 +28,7 @@ use ibc_relayer::config::ChainConfig; use ibc_relayer::keyring::Store; use ibc_test_framework::prelude::*; +use prost::bytes::buf::Chain; use std::env; use std::path::PathBuf; @@ -48,7 +49,13 @@ impl TestOverrides for Test { // keys are stored to ~/.hermes/keys so that we can use them // with external relayer commands. chain_config.key_store_type = Store::Test; - } + }, + ChainConfig::Astria(chain_config) => { + // Modify the key store type to `Store::Test` so that the wallet + // keys are stored to ~/.hermes/keys so that we can use them + // with external relayer commands. + chain_config.key_store_type = Store::Test; + }, } } } diff --git a/tools/integration-test/src/bin/test_setup_with_fee_enabled_binary_channel.rs b/tools/integration-test/src/bin/test_setup_with_fee_enabled_binary_channel.rs index ac938158d2..a84494af4e 100644 --- a/tools/integration-test/src/bin/test_setup_with_fee_enabled_binary_channel.rs +++ b/tools/integration-test/src/bin/test_setup_with_fee_enabled_binary_channel.rs @@ -49,7 +49,13 @@ impl TestOverrides for Test { // keys are stored to ~/.hermes/keys so that we can use them // with external relayer commands. chain_config.key_store_type = Store::Test; - } + }, + ChainConfig::Astria(chain_config) => { + // Modify the key store type to `Store::Test` so that the wallet + // keys are stored to ~/.hermes/keys so that we can use them + // with external relayer commands. + chain_config.key_store_type = Store::Test; + }, } } } diff --git a/tools/integration-test/src/bin/test_setup_with_ternary_channel.rs b/tools/integration-test/src/bin/test_setup_with_ternary_channel.rs index 1cfcd0f921..e1550a3c0d 100644 --- a/tools/integration-test/src/bin/test_setup_with_ternary_channel.rs +++ b/tools/integration-test/src/bin/test_setup_with_ternary_channel.rs @@ -48,7 +48,13 @@ impl TestOverrides for Test { // keys are stored to ~/.hermes/keys so that we can use them // with external relayer commands. chain_config.key_store_type = Store::Test; - } + }, + ChainConfig::Astria(chain_config) => { + // Modify the key store type to `Store::Test` so that the wallet + // keys are stored to ~/.hermes/keys so that we can use them + // with external relayer commands. + chain_config.key_store_type = Store::Test; + }, } } } From 2ee59eb0d2a5c4955dd0c13d8ea200ac7fb90253 Mon Sep 17 00:00:00 2001 From: Josh Bowen Date: Sat, 19 Oct 2024 14:08:37 -0600 Subject: [PATCH 3/4] naive update to astria v1.0.0-rc.1 --- crates/relayer/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml index 0ac6285ac8..804ec71d06 100644 --- a/crates/relayer/Cargo.toml +++ b/crates/relayer/Cargo.toml @@ -19,8 +19,8 @@ all-features = true default = ["flex-error/std", "flex-error/eyre_tracer"] [dependencies] -astria-core = { git = "https://github.com/astriaorg/astria", rev = "070cfee5b87c82819f87dc62a48870c5c22bc108" } -astria-sequencer-client = { git = "https://github.com/astriaorg/astria", rev = "070cfee5b87c82819f87dc62a48870c5c22bc108", features = [ "http" ] } +astria-core = { git = "https://github.com/astriaorg/astria", tag = "sequencer-v1.0.0-rc.1" } +astria-sequencer-client = { git = "https://github.com/astriaorg/astria", tag = "sequencer-v1.0.0-rc.1", features = [ "http" ] } ed25519-consensus = "2.1.0" ibc-types = "0.14" jmt = "0.10" From ddce5a51456577b2acbd027a9fd5ada76aa6fade Mon Sep 17 00:00:00 2001 From: Josh Bowen Date: Sat, 19 Oct 2024 20:20:43 -0600 Subject: [PATCH 4/4] use noot modified astria deps --- crates/relayer/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml index 804ec71d06..0ac6285ac8 100644 --- a/crates/relayer/Cargo.toml +++ b/crates/relayer/Cargo.toml @@ -19,8 +19,8 @@ all-features = true default = ["flex-error/std", "flex-error/eyre_tracer"] [dependencies] -astria-core = { git = "https://github.com/astriaorg/astria", tag = "sequencer-v1.0.0-rc.1" } -astria-sequencer-client = { git = "https://github.com/astriaorg/astria", tag = "sequencer-v1.0.0-rc.1", features = [ "http" ] } +astria-core = { git = "https://github.com/astriaorg/astria", rev = "070cfee5b87c82819f87dc62a48870c5c22bc108" } +astria-sequencer-client = { git = "https://github.com/astriaorg/astria", rev = "070cfee5b87c82819f87dc62a48870c5c22bc108", features = [ "http" ] } ed25519-consensus = "2.1.0" ibc-types = "0.14" jmt = "0.10"