From 442ab67b0c96418110dfc88293685ae2fe3534f3 Mon Sep 17 00:00:00 2001 From: Alexandr Kolesov Date: Tue, 30 Nov 2021 12:14:00 +0300 Subject: [PATCH] Bump versions in ibc-rs test --- tests/ibc-defi/cheqd/cheqd.Dockerfile | 2 +- tests/ibc-defi/cheqd/cheqd_init.sh | 6 +++--- tests/ibc-defi/hermes/config.toml | 22 +++++++++++++++++++--- tests/ibc-defi/hermes/hermes.Dockerfile | 2 +- tests/ibc-defi/ibc-transfer-test.sh | 8 ++++---- tests/ibc-defi/osmosis/osmosis.Dockerfile | 2 +- 6 files changed, 29 insertions(+), 13 deletions(-) diff --git a/tests/ibc-defi/cheqd/cheqd.Dockerfile b/tests/ibc-defi/cheqd/cheqd.Dockerfile index 8622b4619..9e2654545 100644 --- a/tests/ibc-defi/cheqd/cheqd.Dockerfile +++ b/tests/ibc-defi/cheqd/cheqd.Dockerfile @@ -19,7 +19,7 @@ RUN wget -qO- https://github.com/tendermint/starport/releases/download/v0.17.3/s # App WORKDIR /app -RUN git clone --depth 1 --branch v0.2.3 https://github.com/cheqd/cheqd-node +RUN git clone --depth 1 --branch v0.3.1 https://github.com/cheqd/cheqd-node WORKDIR /app/cheqd-node diff --git a/tests/ibc-defi/cheqd/cheqd_init.sh b/tests/ibc-defi/cheqd/cheqd_init.sh index a26a4ed04..b876c461d 100755 --- a/tests/ibc-defi/cheqd/cheqd_init.sh +++ b/tests/ibc-defi/cheqd/cheqd_init.sh @@ -17,7 +17,7 @@ cheqd-noded init node0 --chain-id $CHAIN_ID NODE_0_VAL_PUBKEY=$(cheqd-noded tendermint show-validator) # User -cheqd-noded keys add cheqd-user +cheqd-noded keys add cheqd-user --keyring-backend test # Config sed -i $sed_extension 's|minimum-gas-prices = ""|minimum-gas-prices = "25ncheq"|g' "$HOME/.cheqdnode/config/app.toml" @@ -27,8 +27,8 @@ sed -i $sed_extension 's|laddr = "tcp://127.0.0.1:26657"|laddr = "tcp://0.0.0.0: GENESIS="$HOME/.cheqdnode/config/genesis.json" sed -i $sed_extension 's/"stake"/"ncheq"/' $GENESIS -cheqd-noded add-genesis-account cheqd-user 1000000000000000000ncheq -cheqd-noded gentx cheqd-user 10000000000000000ncheq --chain-id $CHAIN_ID --pubkey "$NODE_0_VAL_PUBKEY" +cheqd-noded add-genesis-account cheqd-user 1000000000000000000ncheq --keyring-backend test +cheqd-noded gentx cheqd-user 10000000000000000ncheq --chain-id $CHAIN_ID --pubkey "$NODE_0_VAL_PUBKEY" --keyring-backend test cheqd-noded collect-gentxs cheqd-noded validate-genesis diff --git a/tests/ibc-defi/hermes/config.toml b/tests/ibc-defi/hermes/config.toml index 22e079433..156e7bc51 100644 --- a/tests/ibc-defi/hermes/config.toml +++ b/tests/ibc-defi/hermes/config.toml @@ -2,10 +2,26 @@ # client_id, connection_id, channel_id and port_id [global] -strategy = 'packets' -filter = false log_level = 'info' -clear_packets_interval = 100 + +[mode] + +[mode.clients] +enabled = true +refresh = true +misbehaviour = true + +[mode.connections] +enabled = false + +[mode.channels] +enabled = false + +[mode.packets] +enabled = true +clear_interval = 100 +clear_on_start = true +filter = false tx_confirmation = true [rest] diff --git a/tests/ibc-defi/hermes/hermes.Dockerfile b/tests/ibc-defi/hermes/hermes.Dockerfile index 19ee4f8c3..b4231d386 100644 --- a/tests/ibc-defi/hermes/hermes.Dockerfile +++ b/tests/ibc-defi/hermes/hermes.Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ WORKDIR /app -RUN git clone --depth 1 --branch v0.7.3 https://github.com/informalsystems/ibc-rs +RUN git clone --depth 1 --branch v0.9.0 https://github.com/informalsystems/ibc-rs WORKDIR /app/ibc-rs diff --git a/tests/ibc-defi/ibc-transfer-test.sh b/tests/ibc-defi/ibc-transfer-test.sh index fdca3cc40..65324ff69 100755 --- a/tests/ibc-defi/ibc-transfer-test.sh +++ b/tests/ibc-defi/ibc-transfer-test.sh @@ -31,12 +31,12 @@ sleep 15 # Wait for chains info "Create relayer user on cheqd" # --- CHEQD_RELAYER_KEY_NAME="cheqd-relayer" -CHEQD_RELAYER_ACCOUNT=$(docker-compose exec cheqd cheqd-noded keys add ${CHEQD_RELAYER_KEY_NAME} --output json) +CHEQD_RELAYER_ACCOUNT=$(docker-compose exec cheqd cheqd-noded keys add ${CHEQD_RELAYER_KEY_NAME} --keyring-backend test --output json) CHEQD_RELAYER_ADDRESS=$(echo ${CHEQD_RELAYER_ACCOUNT} | jq --raw-output '.address') CHEQD_RELAYER_MNEMONIC=$(echo ${CHEQD_RELAYER_ACCOUNT} | jq --raw-output '.mnemonic') info "Send some tokens to it" # --- -RES=$(docker-compose exec cheqd cheqd-noded tx bank send cheqd-user ${CHEQD_RELAYER_ADDRESS} 1000000000000ncheq --gas-prices 25ncheq --chain-id cheqd -y) +RES=$(docker-compose exec cheqd cheqd-noded tx bank send cheqd-user ${CHEQD_RELAYER_ADDRESS} 1000000000000ncheq --gas-prices 25ncheq --chain-id cheqd -y --keyring-backend test) [[ $(echo $RES | jq --raw-output '.code') == 0 ]] && info "tx successfull" || (err "non zero tx return code"; exit 1) @@ -63,7 +63,7 @@ docker-compose exec -d hermes hermes start info "Check balances" # --- -CHEQD_USER_ADDRESS=$(docker-compose exec cheqd cheqd-noded keys show --address cheqd-user | sed 's/\r//g') +CHEQD_USER_ADDRESS=$(docker-compose exec cheqd cheqd-noded keys show --address cheqd-user --keyring-backend test | sed 's/\r//g') OSMOSIS_USER_ADDRESS=$(docker-compose exec osmosis osmosisd keys show --address osmosis-user --keyring-backend test | sed 's/\r//g') CHEQD_BALANCE_1=$(docker-compose exec cheqd cheqd-noded query bank balances $CHEQD_USER_ADDRESS --output json) @@ -72,7 +72,7 @@ docker-compose exec osmosis osmosisd query bank balances $OSMOSIS_USER_ADDRESS info "Forward transfer" # --- PORT="transfer" CHANNEL="channel-0" -docker-compose exec cheqd cheqd-noded tx ibc-transfer transfer $PORT $CHANNEL $OSMOSIS_USER_ADDRESS 10000000000ncheq --from cheqd-user --chain-id cheqd --gas-prices 25ncheq -y +docker-compose exec cheqd cheqd-noded tx ibc-transfer transfer $PORT $CHANNEL $OSMOSIS_USER_ADDRESS 10000000000ncheq --from cheqd-user --chain-id cheqd --gas-prices 25ncheq --keyring-backend test -y sleep 30 # Wait for relayer info "Check balances the second time" # --- diff --git a/tests/ibc-defi/osmosis/osmosis.Dockerfile b/tests/ibc-defi/osmosis/osmosis.Dockerfile index 46068c3d2..28cc4088d 100644 --- a/tests/ibc-defi/osmosis/osmosis.Dockerfile +++ b/tests/ibc-defi/osmosis/osmosis.Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ # App WORKDIR /app -RUN git clone --depth 1 --branch v4.0.0 https://github.com/osmosis-labs/osmosis +RUN git clone --depth 1 --branch v4.2.0 https://github.com/osmosis-labs/osmosis WORKDIR /app/osmosis