Update go relayer & integration test timing (#668)

.gitmodules

@@ -3,7 +3,7 @@
 	path = deps/hermes
 	url = https://github.com/informalsystems/ibc-rs.git
 [submodule "deps/relayer"]
-	# Commit: 2d9fe1acf9081ec7bdcefd8c212a21d28febaba7
+	# Commit: v2.3.0-rc3
 	path = deps/relayer
 	url = https://github.com/cosmos/relayer.git
 [submodule "deps/gaia"]

dockernet/README.md

@@ -57,9 +57,6 @@ while getopts sgojhir{n} flag; do
 {CHAIN}_DENOM="{min_denom}"
 ST{CHAIN}_DENOM="st{min_denom}"
 
-# if the network uses a new coin type, add it to the top and reference it below
-# most chains will use either the cosmos coin type (118) or eth coin type (60)
-
 # add in the new chain's config section
 {CHAIN}_CHAIN_ID={NEW-HOST-ZONE}
 {CHAIN}_NODE_PREFIX={new-host-zone}
@@ -69,7 +66,6 @@ ST{CHAIN}_DENOM="st{min_denom}"
 {CHAIN}_ADDRESS_PREFIX=stars
 {CHAIN}_REV_ACCT={n}rev1
 {CHAIN}_DENOM=${CHAIN}_DENOM
-{CHAIN}_COIN_TYPE=${TYPE}_COIN_TYPE
 {CHAIN}_RPC_PORT={the one included in the docker-compose above}
 {CHAIN}_MAIN_CMD="${CHAIN}_CMD --home $DOCKERNET_HOME/state/${${CHAIN}_NODE_PREFIX}1"
 {CHAIN}_RECEIVER_ADDRESS={any random address on the chain}
@@ -96,7 +92,7 @@ ${CHAIN_ID}_ADDRESS() {
 
 ```
 * Add the IBC denom's for the host zone across each channel to `dockernet/config.sh` (e.g. `IBC_{HOST}_CHANNEL_{N}_DENOM)`). You can generate the variables by uncommenting `x/stakeibc/keeper/get_denom_traces_test.go`, specifying the ChainID and denom, and running `make test-unit`. Add the output to `dockernet/config.sh`. Note: You have to run the test using the "run test" button in VSCode, or pass in the `-v` flag and run the tests using `go test -mod=readonly ./x/stakeibc/...`, for the output to show up.
-* Add a section to the `dockernet/config/relayer_config.yaml`
+* Add a section to the `dockernet/config/relayer_config.yaml`. Most chains will use either the cosmos coin type (118) or eth coin type (60). If a new coin type is used, add it to the top of `config.sh` for future reference.
 ```
 chains:
   ...

dockernet/config.sh

@@ -158,7 +158,6 @@ GAIA_REV_ACCT=grev1
 GAIA_ADDRESS_PREFIX=cosmos
 GAIA_DENOM=$ATOM_DENOM
 GAIA_RPC_PORT=26557
-GAIA_COIN_TYPE=$COSMOS_COIN_TYPE
 GAIA_MAIN_CMD="$GAIA_BINARY --home $DOCKERNET_HOME/state/${GAIA_NODE_PREFIX}1"
 GAIA_RECEIVER_ADDRESS='cosmos1g6qdx6kdhpf000afvvpte7hp0vnpzapuyxp8uf'
 
@@ -172,7 +171,6 @@ JUNO_REV_ACCT=jrev1
 JUNO_ADDRESS_PREFIX=juno
 JUNO_DENOM=$JUNO_DENOM
 JUNO_RPC_PORT=26457
-JUNO_COIN_TYPE=$COSMOS_COIN_TYPE
 JUNO_MAIN_CMD="$JUNO_BINARY --home $DOCKERNET_HOME/state/${JUNO_NODE_PREFIX}1"
 JUNO_RECEIVER_ADDRESS='juno1sy0q0jpaw4t3hnf6k5wdd4384g0syzlp7rrtsg'
 
@@ -186,7 +184,6 @@ OSMO_REV_ACCT=orev1
 OSMO_ADDRESS_PREFIX=osmo
 OSMO_DENOM=$OSMO_DENOM
 OSMO_RPC_PORT=26357
-OSMO_COIN_TYPE=$COSMOS_COIN_TYPE
 OSMO_MAIN_CMD="$OSMO_BINARY --home $DOCKERNET_HOME/state/${OSMO_NODE_PREFIX}1"
 OSMO_RECEIVER_ADDRESS='osmo1w6wdc2684g9h3xl8nhgwr282tcxx4kl06n4sjl'
 
@@ -200,7 +197,6 @@ STARS_REV_ACCT=sgrev1
 STARS_ADDRESS_PREFIX=stars
 STARS_DENOM=$STARS_DENOM
 STARS_RPC_PORT=26257
-STARS_COIN_TYPE=$COSMOS_COIN_TYPE
 STARS_MAIN_CMD="$STARS_BINARY --home $DOCKERNET_HOME/state/${STARS_NODE_PREFIX}1"
 STARS_RECEIVER_ADDRESS='stars15dywcmy6gzsc8wfefkrx0c9czlwvwrjenqthyq'
 
@@ -213,7 +209,6 @@ HOST_VAL_PREFIX=hval
 HOST_ADDRESS_PREFIX=stride
 HOST_REV_ACCT=hrev1
 HOST_DENOM=$WALK_DENOM
-HOST_COIN_TYPE=$COSMOS_COIN_TYPE
 HOST_RPC_PORT=26157
 HOST_MAIN_CMD="$HOST_BINARY --home $DOCKERNET_HOME/state/${HOST_NODE_PREFIX}1"
 HOST_RECEIVER_ADDRESS='stride1trm75t8g83f26u4y8jfds7pms9l587a7q227k9'

dockernet/config/relayer_config.yaml

@@ -14,6 +14,7 @@ chains:
       keyring-backend: test
       gas-adjustment: 1.2
       gas-prices: 0.01ustrd
+      coin-type: 118
       debug: false
       timeout: 20s
       output-format: json
@@ -28,6 +29,7 @@ chains:
       keyring-backend: test
       gas-adjustment: 1.2
       gas-prices: 0.01uatom
+      coin-type: 118
       debug: false
       timeout: 20s
       output-format: json
@@ -42,6 +44,7 @@ chains:
       keyring-backend: test
       gas-adjustment: 1.2
       gas-prices: 0.01ujuno
+      coin-type: 118
       debug: false
       timeout: 20s
       output-format: json
@@ -56,6 +59,7 @@ chains:
       keyring-backend: test
       gas-adjustment: 1.2
       gas-prices: 0.01uosmo
+      coin-type: 118
       debug: false
       timeout: 20s
       output-format: json
@@ -70,6 +74,7 @@ chains:
       keyring-backend: test
       gas-adjustment: 1.2
       gas-prices: 0.01ustars
+      coin-type: 118
       debug: false
       timeout: 20s
       output-format: json
@@ -84,6 +89,7 @@ chains:
       keyring-backend: test
       gas-adjustment: 1.2
       gas-prices: 0.01uwalk
+      coin-type: 118
       debug: false
       timeout: 20s
       output-format: json
@@ -98,6 +104,7 @@ chains:
   #     keyring-backend: test
   #     gas-adjustment: 1.2
   #     gas-prices: 0.01{minimal_denom}
+  #     coin-type: {coin-type}
   #     debug: false
   #     timeout: 20s
   #     output-format: json

dockernet/dockerfiles/Dockerfile.relayer

@@ -3,7 +3,7 @@ FROM golang:1.19-alpine3.15 AS builder
 
 WORKDIR /src/
 
-ENV COMMIT_HASH=2d9fe1acf9081ec7bdcefd8c212a21d28febaba7
+ENV COMMIT_HASH=v2.3.0-rc3
 
 RUN apk add --update git make gcc linux-headers libc-dev eudev-dev 
 RUN git clone https://github.com/cosmos/relayer.git \

dockernet/src/start_relayers.sh

@@ -10,7 +10,6 @@ for chain in ${HOST_CHAINS[@]}; do
     chain_name=$(printf "$chain" | awk '{ print tolower($0) }')
     account_name=$(GET_VAR_VALUE RELAYER_${chain}_ACCT)
     mnemonic=$(GET_VAR_VALUE     RELAYER_${chain}_MNEMONIC)
-    coin_type=$(GET_VAR_VALUE    ${chain}_COIN_TYPE)
 
     relayer_logs=${LOGS}/relayer-${chain_name}.log
     relayer_config=$STATE/relayer-${chain_name}/config
@@ -21,7 +20,7 @@ for chain in ${HOST_CHAINS[@]}; do
 
     printf "STRIDE <> $chain - Adding relayer keys..."
     $relayer_exec rly keys restore stride $RELAYER_STRIDE_ACCT "$mnemonic" >> $relayer_logs 2>&1
-    $relayer_exec rly keys restore $chain_name $account_name "$mnemonic" --coin-type $coin_type >> $relayer_logs 2>&1
+    $relayer_exec rly keys restore $chain_name $account_name "$mnemonic" >> $relayer_logs 2>&1
     echo "Done restoring relayer keys"
 
     printf "STRIDE <> $chain - Creating client, connection, and transfer channel..." | tee -a $relayer_logs

dockernet/tests/integration_tests.bats

@@ -136,8 +136,8 @@ setup_file() {
   # liquid stake
   $STRIDE_MAIN_CMD tx stakeibc liquid-stake $STAKE_AMOUNT $HOST_DENOM --from $STRIDE_VAL -y 
 
-  # sleep two block for the tx to settle on stride
-  WAIT_FOR_BLOCK $STRIDE_LOGS 2
+  # wait for the stTokens to get minted 
+  WAIT_FOR_BALANCE_CHANGE STRIDE $(STRIDE_ADDRESS) st$HOST_DENOM 
 
   # make sure IBC_DENOM went down
   token_balance_end=$($STRIDE_MAIN_CMD q bank balances $(STRIDE_ADDRESS) --denom $HOST_IBC_DENOM | GETBAL)