Merge branch 'fix/stopping-workers' of https://github.com/beer-1/hermes…

… into fix/stopping-workers
informalsystems · Nov 23, 2023 · 14a80d5 · 14a80d5
2 parents d020489 + c95ff3b
commit 14a80d5
Show file tree

Hide file tree

Showing 48 changed files with 1,567 additions and 397 deletions.
diff --git a/.changelog/unreleased/features/ibc-relayer-cli/3696-new-chain-upgrade-flag.md b/.changelog/unreleased/features/ibc-relayer-cli/3696-new-chain-upgrade-flag.md
@@ -0,0 +1,3 @@
+- Add a `--gov-account` option to `hermes tx upgrade-chain` to specify the
+  authority account used to sign upgrade proposal for chains running IBC-Go v8+.
+  ([\#3696](https://github.com/informalsystems/hermes/issues/3696))
diff --git a/.changelog/unreleased/features/ibc-relayer/3696-new-upgrade-proposal.md b/.changelog/unreleased/features/ibc-relayer/3696-new-upgrade-proposal.md
@@ -0,0 +1,3 @@
+- Use legacy `UpgradeProposal` or newer `MsgIbcSoftwareUpgrade` message when upgrading
+  a chain depending on whether the chain is running IBC-Go v8 or older.
+  ([\#3696](https://github.com/informalsystems/hermes/issues/3696))
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -45,7 +45,10 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: gaia12
+          - package: gaia13
+            command: gaiad
+            account_prefix: cosmos
+          - package: gaia14
             command: gaiad
             account_prefix: cosmos
           - package: ibc-go-v4-simapp
@@ -60,6 +63,9 @@ jobs:
           - package: ibc-go-v7-simapp
             command: simd
             account_prefix: cosmos
+          - package: ibc-go-v8-simapp
+            command: simd
+            account_prefix: cosmos
           - package: wasmd
             command: wasmd
             account_prefix: wasm
@@ -157,6 +163,9 @@ jobs:
           - package: ibc-go-v7-simapp
             command: simd
             account_prefix: cosmos
+          - package: ibc-go-v8-simapp
+            command: simd
+            account_prefix: cosmos
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v22
@@ -206,6 +215,9 @@ jobs:
           - package: ibc-go-v7-simapp
             command: simd
             account_prefix: cosmos
+          - package: ibc-go-v8-simapp
+            command: simd
+            account_prefix: cosmos
           - package: migaloo
             command: migalood
             account_prefix: migaloo
@@ -249,7 +261,10 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: gaia12
+          - package: gaia13
+            command: gaiad
+            account_prefix: cosmos
+          - package: gaia14
             command: gaiad
             account_prefix: cosmos
           - package: juno
@@ -295,7 +310,10 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: .#gaia12 .#stride-no-admin
+          - package: .#gaia13 .#stride-no-admin
+            command: gaiad,strided
+            account_prefix: cosmos,stride
+          - package: .#gaia14 .#stride-no-admin
             command: gaiad,strided
             account_prefix: cosmos,stride
     steps:
@@ -331,6 +349,7 @@ jobs:
           nix shell ${{ matrix.chain.package }} -c \
             cargo nextest run -p ibc-integration-test --no-fail-fast --failure-output final --test-threads=2 \
             --features ics31 ics31::
+
   fee-grant:
     runs-on: ubuntu-20.04
     strategy:
@@ -382,7 +401,10 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: gaia12
+          - package: gaia13
+            command: gaiad
+            account_prefix: cosmos
+          - package: gaia14
             command: gaiad
             account_prefix: cosmos
     steps:
@@ -425,9 +447,12 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: neutron
-            command: neutrond
-            account_prefix: neutron
+          - package: .#gaia13 .#neutron
+            command: gaiad,neutrond
+            account_prefix: cosmos,neutron
+          - package: .#gaia14 .#neutron
+            command: gaiad,neutrond
+            account_prefix: cosmos,neutron
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v22
@@ -455,10 +480,10 @@ jobs:
           RUST_BACKTRACE: 1
           NO_COLOR_LOG: 1
           NEXTEST_RETRIES: 2
-          CHAIN_COMMAND_PATHS: gaiad,${{ matrix.chain.command }}
-          ACCOUNT_PREFIXES: cosmos,${{ matrix.chain.account_prefix }}
+          CHAIN_COMMAND_PATHS: ${{ matrix.chain.command }}
+          ACCOUNT_PREFIXES: ${{ matrix.chain.account_prefix }}
         run: |
-          nix shell .#gaia12 .#${{ matrix.chain.package }} -c \
+          nix shell ${{ matrix.chain.package }} -c \
             cargo nextest run -p ibc-integration-test --no-fail-fast --failure-output final --test-threads=2 \
             --features interchain-security interchain_security::
 
@@ -468,9 +493,12 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: stride-consumer
-            command: strided
-            account_prefix: stride
+          - package: .#gaia13 .#stride-consumer
+            command: gaiad,strided
+            account_prefix: cosmos,stride
+          - package: .#gaia14 .#stride-consumer
+            command: gaiad,strided
+            account_prefix: cosmos,stride
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v22
@@ -498,10 +526,10 @@ jobs:
           RUST_BACKTRACE: 1
           NO_COLOR_LOG: 1
           NEXTEST_RETRIES: 2
-          CHAIN_COMMAND_PATHS: gaiad,${{ matrix.chain.command }}
-          ACCOUNT_PREFIXES: cosmos,${{ matrix.chain.account_prefix }}
+          CHAIN_COMMAND_PATHS: ${{ matrix.chain.command }}
+          ACCOUNT_PREFIXES: ${{ matrix.chain.account_prefix }}
         run: |
-          nix shell .#gaia12 .#${{ matrix.chain.package }} -c \
+          nix shell ${{ matrix.chain.package }} -c \
             cargo nextest run -p ibc-integration-test --no-fail-fast --failure-output final --test-threads=2 \
             --features interchain-security,ica interchain_security::
 
@@ -511,9 +539,12 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: stride-consumer-no-admin
-            command: strided
-            account_prefix: stride
+          - package: .#gaia13 .#stride-consumer-no-admin
+            command: gaiad,strided
+            account_prefix: cosmos,stride
+          - package: .#gaia14 .#stride-consumer-no-admin
+            command: gaiad,strided
+            account_prefix: cosmos,stride
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v22
@@ -540,10 +571,10 @@ jobs:
           RUST_LOG: info
           RUST_BACKTRACE: 1
           NO_COLOR_LOG: 1
-          CHAIN_COMMAND_PATHS: gaiad,${{ matrix.chain.command }}
-          ACCOUNT_PREFIXES: cosmos,${{ matrix.chain.account_prefix }}
+          CHAIN_COMMAND_PATHS: ${{ matrix.chain.command }}
+          ACCOUNT_PREFIXES: ${{ matrix.chain.account_prefix }}
         run: |
-          nix shell .#gaia12 .#${{ matrix.chain.package }} -c \
+          nix shell ${{ matrix.chain.package }} -c \
             cargo nextest run -p ibc-integration-test --no-fail-fast --failure-output final --test-threads=2 \
             --features interchain-security,ics31 interchain_security::
 
@@ -553,10 +584,14 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: celestia
-            command: celestia-appd
-            account_prefix: celestia
-            native_token: utia
+          - package: .#celestia .#gaia13
+            command: celestia-appd,gaiad
+            account_prefix: celestia,cosmos
+            native_token: utia,stake
+          - package: .#celestia .#gaia14
+            command: celestia-appd,gaiad
+            account_prefix: celestia,cosmos
+            native_token: utia,stake
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v22
@@ -584,11 +619,11 @@ jobs:
           RUST_BACKTRACE: 1
           NO_COLOR_LOG: 1
           COMPAT_MODES: 0.34
-          CHAIN_COMMAND_PATHS: ${{ matrix.chain.command }},gaiad
-          ACCOUNT_PREFIXES: ${{ matrix.chain.account_prefix }},cosmos
-          NATIVE_TOKENS: ${{ matrix.chain.native_token }},stake
+          CHAIN_COMMAND_PATHS: ${{ matrix.chain.command }}
+          ACCOUNT_PREFIXES: ${{ matrix.chain.account_prefix }}
+          NATIVE_TOKENS: ${{ matrix.chain.native_token }}
         run: |
-          nix shell .#python .#gaia12 .#${{ matrix.chain.package }} -c \
+          nix shell .#python ${{ matrix.chain.package }} -c \
             cargo nextest run -p ibc-integration-test --no-fail-fast --failure-output final --test-threads=2 \
             --features celestia
 

diff --git a/.github/workflows/misbehaviour.yml b/.github/workflows/misbehaviour.yml
@@ -43,7 +43,7 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: gaia12
+          - package: gaia14
             command: gaiad
             account_prefix: cosmos
     steps:

diff --git a/.github/workflows/multi-chains.yaml b/.github/workflows/multi-chains.yaml
@@ -58,12 +58,18 @@ jobs:
       fail-fast: false
       matrix:
         first-package:
-          - package: gaia12
+          - package: gaia13
+            command: gaiad
+            account_prefix: cosmos
+          - package: gaia14
             command: gaiad
             account_prefix: cosmos
           - package: ibc-go-v7-simapp
             command: simd
             account_prefix: cosmos
+          - package: ibc-go-v8-simapp
+            command: simd
+            account_prefix: cosmos
           - package: wasmd
             command: wasmd
             account_prefix: wasm