Skip to content

Commit

Permalink
deps: use squashed forks versions
Browse files Browse the repository at this point in the history
  • Loading branch information
duvbell committed May 28, 2024
1 parent cfe736d commit 07a8c6b
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 11 deletions.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,9 @@ pica-upgrade:

relayer-test-cleanup:
@echo "Cleaning up"
./scripts/relayer_hyperspace/cleanup.sh
@killall parachain-node > /dev/null 2>&1
@killall polkadot > /dev/null 2>&1
@./scripts/relayer_hyperspace/cleanup.sh
###############################################################################
### Integration Tests ###
###############################################################################
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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-20240527144037-12578bfe6a1d
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.20240527145057-e2e260de0aaf
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
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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-20240527144037-12578bfe6a1d h1:hW2Lk4glakqZBUAE090SCaPUd90U8Fx0JU8cU14n0yg=
github.com/notional-labs/ibc-go/modules/light-clients/08-wasm v0.0.0-20240527144037-12578bfe6a1d/go.mod h1:u2FXNcSxzzn5IwjWBA51HKMwiYMRK6/G35VmSJULhP0=
github.com/notional-labs/ibc-go/v8 v8.0.0-alpha.1.0.20240527145057-e2e260de0aaf h1:uGHaV0yd0vDm/XnW2vhD814Pf+xjQ1AU5pWz96Kyctk=
github.com/notional-labs/ibc-go/v8 v8.0.0-alpha.1.0.20240527145057-e2e260de0aaf/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=
Expand Down
3 changes: 2 additions & 1 deletion scripts/50/store-wasm-code.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ DENOM="ppica"
HOME_DIR="mytestnet"
CHAINID="centauri-dev"
BINARY=picad
WASM_CONTRACT_PATH="$PWD/bin/ics10_grandpa_cw.wasm"
WASM_CONTRACT_PATH="/home/kien6034/notional/composable-ibc/target/wasm32-unknown-unknown/release/ics10_grandpa_cw.wasm"

# Wait for chain to start
echo "Waiting for chain to start..."
sleep 10

picad keys show mykey --keyring-backend test --home mytestnet

Expand Down
2 changes: 1 addition & 1 deletion scripts/relayer_hyperspace/config-chain-b.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fee_amount = "9223372036854776"
gas_limit = 9223372036854775806
store_prefix = "ibc"
max_tx_size = 20000000
wasm_code_id = "9d5056f2b551213094a03b788db80274445175bae78c8fede38bf25a2ddc84bc"
wasm_checksum = "e2597825980ba38dd6263fcdd15503f0832067570d341de819fbc9f77f390d5a"
channel_whitelist = [["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
Expand Down
2 changes: 1 addition & 1 deletion scripts/relayer_hyperspace/create-clients.sh
Original file line number Diff line number Diff line change
@@ -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 /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
2 changes: 1 addition & 1 deletion scripts/upgrade/setup-polkadot-node.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 07a8c6b

Please sign in to comment.