Merge branch 'master' into sean/channel-upgradability

informalsystems · Aug 8, 2023 · 8aad9da · 8aad9da
2 parents ce6c01f + dfae384
commit 8aad9da
Show file tree

Hide file tree

Showing 19 changed files with 272 additions and 68 deletions.
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -94,7 +94,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: test
@@ -132,7 +132,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: test
@@ -173,7 +173,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: test
@@ -222,7 +222,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: test
@@ -268,7 +268,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: test
@@ -308,7 +308,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: test
@@ -350,7 +350,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: test
@@ -390,7 +390,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: test
@@ -471,7 +471,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: test
@@ -511,7 +511,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: test
@@ -527,6 +527,46 @@ jobs:
             test -p ibc-integration-test --features interchain-security,ica --no-fail-fast -- \
             --nocapture --test-threads=1 interchain_security::
 
+  interchain-security-icq:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        chain:
+          - package: stride-consumer-no-admin
+            command: strided
+            account_prefix: stride
+    steps:
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
+        with:
+          install_url: https://nixos-nix-install-tests.cachix.org/serve/vij683ly7sl95nnhb67bdjjfabclr85m/install
+          install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
+          extra_nix_config: |
+            experimental-features = nix-command flakes
+      - uses: cachix/cachix-action@v12
+        with:
+          name: cosmos
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+      - uses: Swatinem/rust-cache@v2
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: -p ibc-integration-test --features interchain-security --no-fail-fast --no-run
+      - env:
+          RUST_LOG: info
+          RUST_BACKTRACE: 1
+          NO_COLOR_LOG: 1
+          CHAIN_COMMAND_PATHS: gaiad,${{ matrix.chain.command }}
+          ACCOUNT_PREFIXES: cosmos,${{ matrix.chain.account_prefix }}
+        run: |
+          nix shell .#gaia9 .#${{ matrix.chain.package }} -c cargo \
+            test -p ibc-integration-test --features interchain-security,ics31 --no-fail-fast -- \
+            --nocapture --test-threads=1 interchain_security::
+
   model-based-test:
     runs-on: ubuntu-20.04
     timeout-minutes: 60
@@ -549,7 +589,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: test

diff --git a/.github/workflows/misbehaviour.yml b/.github/workflows/misbehaviour.yml
@@ -84,7 +84,7 @@ jobs:
           toolchain: stable
           override: true
       - name: Use Rust cache
-        uses: Swatinem/rust-cache@v1
+        uses: Swatinem/rust-cache@v2
       - name: Build Hermes
         uses: actions-rs/cargo@v1
         with:

diff --git a/.github/workflows/multi-chains.yaml b/.github/workflows/multi-chains.yaml
@@ -96,7 +96,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: test

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -56,7 +56,7 @@ jobs:
           toolchain: stable
           components: clippy
           override: true
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/clippy-check@v1
         with:
           name: clippy-all-features
@@ -72,7 +72,7 @@ jobs:
           toolchain: stable
           components: clippy
           override: true
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/clippy-check@v1
         with:
           name: clippy-no-default-features
@@ -88,7 +88,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: test

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/chain-registry/Cargo.toml b/crates/chain-registry/Cargo.toml
@@ -16,7 +16,7 @@ ibc-proto         = { version = "0.32.0" }
 ibc-relayer-types = { version = "0.25.0", path = "../relayer-types" }
 tendermint-rpc    = { version = "0.32.0", features = ["http-client", "websocket-client"] }
 
-async-trait = "0.1.69"
+async-trait = "0.1.72"
 flex-error  = { version = "0.4.4", default-features = false }
 futures     = { version = "0.3.27", features = ["executor"] }
 http        = "0.2"

diff --git a/crates/relayer-cli/Cargo.toml b/crates/relayer-cli/Cargo.toml
@@ -49,7 +49,7 @@ oneline-eyre             = "0.1"
 regex                    = "1.8.1"
 serde                    = { version = "1.0", features = ["serde_derive"] }
 serde_json               = "1"
-signal-hook              = "0.3.15"
+signal-hook              = "0.3.17"
 subtle-encoding          = "0.5"
 tokio                    = { version = "1.0", features = ["full"] }
 tracing                  = "0.1.36"

diff --git a/crates/relayer-types/Cargo.toml b/crates/relayer-types/Cargo.toml
@@ -40,7 +40,7 @@ derive_more = { version = "0.99.17", default-features = false, features = ["from
 uint = { version = "0.9" }
 itertools = { version = "0.10.3" }
 primitive-types = { version = "0.12.1", default-features = false, features = ["serde_no_std"] }
-dyn-clone = "1.0.8"
+dyn-clone = "1.0.12"
 num-rational = "0.4.1"
 
 [dependencies.tendermint]

diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml
@@ -39,7 +39,7 @@ tonic = { version = "0.9", features = ["tls", "tls-roots"] }
 futures = "0.3.27"
 crossbeam-channel = "0.5.8"
 hex = "0.4"
-bitcoin = { version = "0.30.0", features = ["serde"] }
+bitcoin = { version = "0.30.1", features = ["serde"] }
 tiny-bip39 = "1.0.0"
 hdpath = "0.6.3"
 sha2 = "0.10.6"

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -48,8 +48,9 @@
               evmos
               juno
               stride
-              stride-consumer
               stride-no-admin
+              stride-consumer-no-admin
+              stride-consumer
               migaloo
               neutron
             ;

diff --git a/tools/integration-test/src/tests/interchain_security/ica_transfer.rs b/tools/integration-test/src/tests/interchain_security/ica_transfer.rs
@@ -14,11 +14,13 @@ use ibc_relayer_types::bigint::U256;
 use ibc_relayer_types::signer::Signer;
 use ibc_relayer_types::timestamp::Timestamp;
 use ibc_relayer_types::tx_msg::Msg;
-use ibc_test_framework::chain::config::set_voting_period;
 use ibc_test_framework::chain::ext::ica::register_interchain_account;
 use ibc_test_framework::framework::binary::channel::run_binary_interchain_security_channel_test;
 use ibc_test_framework::prelude::*;
 use ibc_test_framework::relayer::channel::assert_eventually_channel_established;
+use ibc_test_framework::util::interchain_security::{
+    update_genesis_for_consumer_chain, update_relayer_config_for_consumer_chain,
+};
 
 #[test]
 fn test_ics_ica_transfer() -> Result<(), Error> {
@@ -46,14 +48,8 @@ impl TestOverrides for InterchainSecurityIcaTransferTest {
             return Err(Error::generic(eyre!("failed to update genesis file")));
         }
 
-        // Consumer chain doesn't have a gov key.
-        if genesis
-            .get_mut("app_state")
-            .and_then(|app_state| app_state.get("gov"))
-            .is_some()
-        {
-            set_voting_period(genesis, "10s")?;
-        }
+        update_genesis_for_consumer_chain(genesis)?;
+
         Ok(())
     }
 
@@ -64,12 +60,7 @@ impl TestOverrides for InterchainSecurityIcaTransferTest {
     fn modify_relayer_config(&self, config: &mut Config) {
         config.mode.channels.enabled = true;
 
-        for chain_config in config.chains.iter_mut() {
-            if chain_config.id == ChainId::from_string("ibcconsumer") {
-                chain_config.ccv_consumer_chain = true;
-                chain_config.trusting_period = Some(Duration::from_secs(99));
-            }
-        }
+        update_relayer_config_for_consumer_chain(config);
     }
 }