Merge branch 'develop2' into hoa/add-test

ComposableFi · May 29, 2024 · c23aa1a · c23aa1a
2 parents 59559a8 + 0a1fc64
commit c23aa1a
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 78 deletions.
diff --git a/Makefile b/Makefile
@@ -236,7 +236,10 @@ pica-upgrade:
 
 relayer-test-cleanup:
 	@echo "Cleaning up"
-	./scripts/relayer_hyperspace/cleanup.sh
+	@rm -rf mytestnet > /dev/null 2>&1
+	@killall parachain-node > /dev/null 2>&1
+	@killall polkadot > /dev/null 2>&1
+	@./scripts/relayer_hyperspace/cleanup.sh
 ###############################################################################
 ###                        Integration Tests                                ###
 ###############################################################################

diff --git a/go.mod b/go.mod
@@ -359,9 +359,9 @@ replace (
 	github.com/cosmos/cosmos-sdk => github.com/notional-labs/cosmos-sdk v0.50.5-patch-validators-trim-tag
 
 	github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 => github.com/notional-labs/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.0-20240508031447-347412725653
-	github.com/cosmos/ibc-go/modules/light-clients/08-wasm => github.com/notional-labs/ibc-go/modules/light-clients/08-wasm v0.0.0-20240522081622-85c49c80dc29
+	github.com/cosmos/ibc-go/modules/light-clients/08-wasm => github.com/notional-labs/ibc-go/modules/light-clients/08-wasm v0.0.0-20240528171744-4baae4266be1
 	//github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 => github.com/notional-labs/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.0-20240504082418-e4d8c9cb7044
-	github.com/cosmos/ibc-go/v8 => github.com/notional-labs/ibc-go/v8 v8.0.0-alpha.1.0.20240515181700-c058e14324e8
+	github.com/cosmos/ibc-go/v8 => github.com/notional-labs/ibc-go/v8 v8.0.0-alpha.1.0.20240528170913-e5e7d5434f75
 
 	// use cosmos-compatible protobufs
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

diff --git a/go.sum b/go.sum
@@ -1385,10 +1385,10 @@ github.com/notional-labs/cosmos-sdk v0.50.5-patch-validators-trim-tag h1:lnMn2O2
 github.com/notional-labs/cosmos-sdk v0.50.5-patch-validators-trim-tag/go.mod h1:oV/k6GJgXV9QPoM2fsYDPPsyPBgQbdotv532O6Mz1OQ=
 github.com/notional-labs/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.0-20240508031447-347412725653 h1:P7Chh5O10Jtv+vvfaVpG72fv5LKVWQLEtCKQrMtbBdw=
 github.com/notional-labs/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.0-20240508031447-347412725653/go.mod h1:NS+Ooc0vOyr1mAgAbt/HS8Dpes2dV7/YgOc+WxD63O4=
-github.com/notional-labs/ibc-go/modules/light-clients/08-wasm v0.0.0-20240522081622-85c49c80dc29 h1:h+EVIIwTI9iBtUhgBay5dJs+bUCnTHDOaXT0uujm6Zs=
-github.com/notional-labs/ibc-go/modules/light-clients/08-wasm v0.0.0-20240522081622-85c49c80dc29/go.mod h1:u2FXNcSxzzn5IwjWBA51HKMwiYMRK6/G35VmSJULhP0=
-github.com/notional-labs/ibc-go/v8 v8.0.0-alpha.1.0.20240515181700-c058e14324e8 h1:RkivXDi3NoRZEjdbO0ueSykCnb7FPaBR0F8sWn5DlFM=
-github.com/notional-labs/ibc-go/v8 v8.0.0-alpha.1.0.20240515181700-c058e14324e8/go.mod h1:x024D7fnWnTL6wNeoHbe0+JSjDaoQ3CNvJY8o9F4imE=
+github.com/notional-labs/ibc-go/modules/light-clients/08-wasm v0.0.0-20240528171744-4baae4266be1 h1:QIyze/ch1sy7SNtEH0szWzH7aLAeB+XADl9eniLYQlc=
+github.com/notional-labs/ibc-go/modules/light-clients/08-wasm v0.0.0-20240528171744-4baae4266be1/go.mod h1:u2FXNcSxzzn5IwjWBA51HKMwiYMRK6/G35VmSJULhP0=
+github.com/notional-labs/ibc-go/v8 v8.0.0-alpha.1.0.20240528170913-e5e7d5434f75 h1:0o7I3+n65GCz1P1mDfSPqHE9iVJeQi8fyiQ086Kd6YI=
+github.com/notional-labs/ibc-go/v8 v8.0.0-alpha.1.0.20240528170913-e5e7d5434f75/go.mod h1:x024D7fnWnTL6wNeoHbe0+JSjDaoQ3CNvJY8o9F4imE=
 github.com/nunnatsa/ginkgolinter v0.9.0 h1:Sm0zX5QfjJzkeCjEp+t6d3Ha0jwvoDjleP9XCsrEzOA=
 github.com/nunnatsa/ginkgolinter v0.9.0/go.mod h1:FHaMLURXP7qImeH6bvxWJUpyH+2tuqe5j4rW1gxJRmI=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=

diff --git a/kien-note.md b/kien-note.md
diff --git a/scripts/50/migrate-wasm-code.sh b/scripts/50/migrate-wasm-code.sh
@@ -4,7 +4,7 @@ DENOM="ppica"
 HOME_DIR="mytestnet"
 CHAINID="centauri-dev"
 BINARY=_build/new/picad
-WASM_CONTRACT_PATH="$PWD/bin/ics10_grandpa_cw.wasm"
+WASM_CONTRACT_PATH="composable-ibc/target/wasm32-unknown-unknown/release/ics10_grandpa_cw.wasm"
 
 WASM_CLIENT_ID="08-wasm-0"
 HEX_CHECKSUM=$(sha256sum "$WASM_CONTRACT_PATH" | awk '{ print $1 }')

diff --git a/scripts/50/store-wasm-code.sh b/scripts/50/store-wasm-code.sh
@@ -4,11 +4,17 @@ DENOM="ppica"
 HOME_DIR="mytestnet"
 CHAINID="centauri-dev"
 BINARY=picad
-WASM_CONTRACT_PATH="$PWD/bin/ics10_grandpa_cw.wasm"
+WASM_CONTRACT_PATH="composable-ibc/target/wasm32-unknown-unknown/release/ics10_grandpa_cw.wasm"
+
+HEX_CHECKSUM=$(sha256sum "$WASM_CONTRACT_PATH" | awk '{ print $1 }')
+echo "Hex checksum is: $HEX_CHECKSUM"
+
 
 # Wait for chain to start 
 echo "Waiting for chain to start..."
+sleep 10
 
+exit 0
 picad keys show mykey --keyring-backend test --home mytestnet
 
 $BINARY tx ibc-wasm store-code $WASM_CONTRACT_PATH --from mykey --keyring-backend test --chain-id $CHAINID --home $HOME_DIR --gas 20002152622 --fees 20020166${DENOM}  -y

diff --git a/scripts/relayer_hyperspace/config-chain-a.toml b/scripts/relayer_hyperspace/config-chain-a.toml
@@ -8,6 +8,6 @@ connection_id = "connection-0"
 commitment_prefix = "0x6962632f"
 private_key = "//Alice"
 ss58_version = 49
-channel_whitelist = [["channel-0", "transfer"], ["channel-0", "transfer"], ["channel-0", "transfer"]]
+channel_whitelist = [["channel-0", "transfer"], ["channel-0", "transfer"], ["channel-0", "transfer"], ["channel-0", "transfer"]]
 finality_protocol = "Grandpa"
 key_type = "sr25519"
diff --git a/scripts/relayer_hyperspace/config-chain-b.toml b/scripts/relayer_hyperspace/config-chain-b.toml
@@ -4,16 +4,16 @@ rpc_url = "http://127.0.0.1:26657/"
 grpc_url = "http://127.0.0.1:9090/"
 websocket_url = "ws://127.0.0.1:26657/websocket"
 chain_id = "centauri-dev"
-client_id = "07-tendermint-0"
+client_id = "07-tendermint-1"
 connection_id = "connection-0"
 account_prefix = "pica"
 fee_denom = "ppica"
 fee_amount = "9223372036854776"
 gas_limit = 9223372036854775806
 store_prefix = "ibc"
 max_tx_size = 20000000
-wasm_code_id = "9d5056f2b551213094a03b788db80274445175bae78c8fede38bf25a2ddc84bc"
-channel_whitelist = [["channel-0", "transfer"], ["channel-0", "transfer"], ["channel-0", "transfer"]]
+wasm_checksum = "2499377e7b99e1b621f980ffc2f6a9322742717c7ede1bf7c97235440450fffe"
+channel_whitelist = [["channel-0", "transfer"], ["channel-0", "transfer"], ["channel-0", "transfer"], ["channel-0", "transfer"]]
 mnemonic = "decorate bright ozone fork gallery riot bus exhaust worth way bone indoor calm squirrel merry zero scheme cotton until shop any excess stage laundry"
 skip_optional_client_updates = false
 max_packets_to_process = 50

diff --git a/scripts/relayer_hyperspace/create-channel.sh b/scripts/relayer_hyperspace/create-channel.sh
@@ -1,2 +1,2 @@
 
-RUST_LOG=hyperspace_cosmos=trace,hyperspace=trace,info /home/kien6034/notional/composable-ibc/target/release/hyperspace create-channel --config-a scripts/relayer_hyperspace/config-chain-a.toml --config-b scripts/relayer_hyperspace/config-chain-b.toml --config-core scripts/relayer_hyperspace/config-core.toml --delay-period 10 --port-id transfer --version ics20-1 --order unordered
+RUST_LOG=hyperspace_cosmos=trace,hyperspace=trace,info composable-ibc/target/release/hyperspace create-channel --config-a scripts/relayer_hyperspace/config-chain-a.toml --config-b scripts/relayer_hyperspace/config-chain-b.toml --config-core scripts/relayer_hyperspace/config-core.toml --delay-period 10 --port-id transfer --version ics20-1 --order unordered
diff --git a/scripts/relayer_hyperspace/create-clients.sh b/scripts/relayer_hyperspace/create-clients.sh
@@ -1,2 +1,2 @@
 
-RUST_LOG=hyperspace_cosmos=trace,hyperspace=trace,info /home/kien6034/notional/composable-ibc/target/release/hyperspace create-clients --config-a scripts/relayer_hyperspace/config-chain-a.toml --config-b scripts/relayer_hyperspace/config-chain-b.toml --config-core scripts/relayer_hyperspace/config-core.toml --delay-period 10
+RUST_LOG=hyperspace_cosmos=trace,hyperspace=trace,info  composable-ibc/target/release/hyperspace create-clients --config-a scripts/relayer_hyperspace/config-chain-a.toml --config-b scripts/relayer_hyperspace/config-chain-b.toml --config-core scripts/relayer_hyperspace/config-core.toml --delay-period 10
diff --git a/scripts/relayer_hyperspace/create-connections.sh b/scripts/relayer_hyperspace/create-connections.sh
@@ -1 +1 @@
-RUST_LOG=hyperspace_cosmos=trace,hyperspace=trace,info /home/kien6034/notional/composable-ibc/target/release/hyperspace create-connection --config-a scripts/relayer_hyperspace/config-chain-a.toml --config-b scripts/relayer_hyperspace/config-chain-b.toml --config-core scripts/relayer_hyperspace/config-core.toml --delay-period 10
+RUST_LOG=hyperspace_cosmos=trace,hyperspace=trace,info composable-ibc/target/release/hyperspace create-connection --config-a scripts/relayer_hyperspace/config-chain-a.toml --config-b scripts/relayer_hyperspace/config-chain-b.toml --config-core scripts/relayer_hyperspace/config-core.toml --delay-period 10
diff --git a/scripts/relayer_hyperspace/start-relay.sh b/scripts/relayer_hyperspace/start-relay.sh
@@ -1,2 +1,2 @@
 
-RUST_LOG=hyperspace_cosmos=trace,hyperspace=trace,info /home/kien6034/notional/composable-ibc/target/release/hyperspace relay --config-a scripts/relayer_hyperspace/config-chain-a.toml --config-b scripts/relayer_hyperspace/config-chain-b.toml --config-core scripts/relayer_hyperspace/config-core.toml --delay-period 10
+RUST_LOG=hyperspace_cosmos=trace,hyperspace=trace,info composable-ibc/target/release/hyperspace relay --config-a scripts/relayer_hyperspace/config-chain-a.toml --config-b scripts/relayer_hyperspace/config-chain-b.toml --config-core scripts/relayer_hyperspace/config-core.toml --delay-period 10
diff --git a/scripts/relayer_hyperspace/v47/create-clients.sh b/scripts/relayer_hyperspace/v47/create-clients.sh
@@ -1,2 +1,2 @@
 
-RUST_LOG=hyperspace_cosmos=trace,hyperspace=trace,info /home/kien6034/notional/composable-ibc-old/bin/hyperspace create-clients --config-a scripts/relayer_hyperspace/config-chain-a.toml --config-b scripts/relayer_hyperspace/config-chain-b.toml --config-core scripts/relayer_hyperspace/config-core.toml --delay-period 10
+RUST_LOG=hyperspace_cosmos=trace,hyperspace=trace,info composable-ibc/target/release/hyperspace create-clients --config-a scripts/relayer_hyperspace/config-chain-a.toml --config-b scripts/relayer_hyperspace/config-chain-b.toml --config-core scripts/relayer_hyperspace/config-core.toml --delay-period 10
diff --git a/scripts/relayer_hyperspace/v47/create-connection.sh b/scripts/relayer_hyperspace/v47/create-connection.sh
@@ -1,2 +1,2 @@
 
-RUST_LOG=hyperspace_cosmos=trace,hyperspace=trace,info /home/kien6034/notional/composable-ibc-old/bin/hyperspace create-connection --config-a scripts/relayer_hyperspace/config-chain-a.toml --config-b scripts/relayer_hyperspace/config-chain-b.toml --config-core scripts/relayer_hyperspace/config-core.toml --delay-period 10
+RUST_LOG=hyperspace_cosmos=trace,hyperspace=trace,info composable-ibc/bin/hyperspace create-connection --config-a scripts/relayer_hyperspace/config-chain-a.toml --config-b scripts/relayer_hyperspace/config-chain-b.toml --config-core scripts/relayer_hyperspace/config-core.toml --delay-period 10
diff --git a/scripts/upgrade/setup-polkadot-node.sh b/scripts/upgrade/setup-polkadot-node.sh
@@ -1,3 +1,3 @@
 export PARA_HOST=127.0.0.1
-cd /home/kien6034/notional/composable-ibc-old/scripts/zombienet 
+cd /home/kien6034/notional/composable-ibc/scripts/zombienet 
 process-compose up -f process-compose.yml & sleep 100
diff --git a/test b/test