refactor: update denom

notional-labs · Apr 18, 2024 · 2950b9b · 2950b9b
1 parent 28623d9
commit 2950b9b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 21 deletions.
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -330,17 +330,6 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
 		authorityAddress,
 	)
 
-	appKeepers.RouterKeeper = routerkeeper.NewKeeper(
-		appCodec,
-		appKeepers.keys[routertypes.StoreKey],
-		appKeepers.TransferKeeper.Keeper,
-		appKeepers.IBCKeeper.ChannelKeeper,
-		&appKeepers.DistrKeeper,
-		appKeepers.BankKeeper,
-		&appKeepers.TransferMiddlewareKeeper,
-		govModAddress,
-	)
-
 	appKeepers.RouterKeeper = routerkeeper.NewKeeper(
 		appCodec,
 		appKeepers.keys[routertypes.StoreKey],

diff --git a/app/upgrades/v7_0_1/upgrade.go b/app/upgrades/v7_0_1/upgrade.go
@@ -42,7 +42,8 @@ func CreateUpgradeHandler(
 			"d2e8126bc2226fb57e4fa8462da2a3441c3bead05c1161e848c944f99d9119ab",
 			"ee97c9bd49a83282c2be1cd8cef0f2f55feb6d2d4c63ec3d27d69c252bd78531",
 			"ef52ef690dc5ec88fd4dd78dc8fd7582904492284b0c290a12ef343d8a541056",
-			"fccfde77e9318b1316e545a34414b5fc3e6cf82a5fe432815b956153c2e655bc"}
+			"fccfde77e9318b1316e545a34414b5fc3e6cf82a5fe432815b956153c2e655bc",
+		}
 		listCheckSum := [][]byte{}
 		for _, code := range listCode {
 			checksumStr, err := hex.DecodeString(code)

diff --git a/go.mod b/go.mod
@@ -365,12 +365,9 @@ replace (
 	github.com/CosmWasm/wasmvm => github.com/CosmWasm/wasmvm v1.5.2
 
 	github.com/cometbft/cometbft => github.com/notional-labs/cometbft v0.38.6-fixed-len-vote-time-tag
-
-	github.com/cosmos/cosmos-sdk => github.com/notional-labs/cosmos-sdk v0.50.5-patch-validators-trim-tag
 	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.2-rc2
-	// github.com/cosmos/ibc-go/modules/light-clients/08-wasm => /Users/hoank/resource/notional/ibc-go/modules/light-clients/08-wasm
 	// 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
@@ -826,8 +826,6 @@ github.com/cosmos/gogoproto v1.4.12 h1:vB6Lbe/rtnYGjQuFxkPiPYiCybqFT8QvLipDZP8Jp
 github.com/cosmos/gogoproto v1.4.12/go.mod h1:LnZob1bXRdUoqMMtwYlcR3wjiElmlC+FkjaZRv1/eLY=
 github.com/cosmos/iavl v1.1.1 h1:64nTi8s3gEoGqhA8TyAWFWfz7/pg0anKzHNSc1ETc7Q=
 github.com/cosmos/iavl v1.1.1/go.mod h1:jLeUvm6bGT1YutCaL2fIar/8vGUE8cPZvh/gXEWDaDM=
-github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.2 h1:dyLNlDElY6+5zW/BT/dO/3Ad9FpQblfh+9dQpYQodbA=
-github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.2/go.mod h1:82hPO/tRawbuFad2gPwChvpZ0JEIoNi91LwVneAYCeM=
 github.com/cosmos/ibc-apps/modules/async-icq/v8 v8.0.0 h1:nKP2+Rzlz2iyvTosY5mvP+aEBPe06oaDl3G7xLGBpNI=
 github.com/cosmos/ibc-apps/modules/async-icq/v8 v8.0.0/go.mod h1:D3Q380FpWRFtmUQWLosPxachi6w24Og2t5u/Tww5wtY=
 github.com/cosmos/ibc-go/modules/capability v1.0.0 h1:r/l++byFtn7jHYa09zlAdSeevo8ci1mVZNO9+V0xsLE=
@@ -1403,6 +1401,8 @@ github.com/notional-labs/cometbft v0.38.6-fixed-len-vote-time-tag h1:emP5WMt3WNi
 github.com/notional-labs/cometbft v0.38.6-fixed-len-vote-time-tag/go.mod h1:8rSPxzUJYquCN8uuBgbUHOMg2KAwvr7CyUw+6ukO4nw=
 github.com/notional-labs/cosmos-sdk v0.50.5-patch-validators-trim-tag h1:lnMn2O2zjUvLbWJuKY3yXtrkVzCXQ7r1/oS/tgCsyjU=
 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.2-rc2 h1:MyYzyL8jIIiWKaEtPsTnfF+6NDOomFvFYUzVxLcn/Gg=
+github.com/notional-labs/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.2-rc2/go.mod h1:caFEYyFRCMVQdN9UsCC17apFxd/LSntCxEFpWIaDmr4=
 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/scripts/tweak-test-upgrade.sh b/scripts/tweak-test-upgrade.sh
@@ -7,7 +7,7 @@ OLD_VERSION=kien-v6.5.0-tweak
 UPGRADE_WAIT=${UPGRADE_WAIT:-20}
 HOME=mytestnet
 ROOT=$(pwd)
-DENOM=upica
+DENOM=ppica
 CHAIN_ID=localpica
 SOFTWARE_UPGRADE_NAME="v7_0_1"
 ADDITIONAL_PRE_SCRIPTS="./scripts/upgrade/v6_to_7/pre_08_wasm.sh"
@@ -138,12 +138,13 @@ run_upgrade () {
         if [ $BLOCK_HEIGHT = "$UPGRADE_HEIGHT" ]; then
             # assuming running only 1 centaurid
             echo "BLOCK HEIGHT = $UPGRADE_HEIGHT REACHED, KILLING OLD ONE"
+            sleep 3
             pkill centaurid
             break
         else
             ./_build/old/centaurid q gov proposal 1 --output=json | jq ".status"
             echo "BLOCK_HEIGHT = $BLOCK_HEIGHT"
-            sleep 1 
+            sleep 3
         fi
     done
 }

diff --git a/scripts/upgrade/v6_to_7/pre_08_wasm.sh b/scripts/upgrade/v6_to_7/pre_08_wasm.sh
@@ -11,8 +11,8 @@ command -v jq > /dev/null 2>&1 || { echo >&2 "jq not installed. More info: https
 
 
 stat $(pwd)/contracts/ics10_grandpa_cw.wasm
-./_build/old/centaurid tx 08-wasm push-wasm $(pwd)/contracts/ics10_grandpa_cw.wasm --from=mykey --gas 10002152622 --fees 10020166upica --keyring-backend test --chain-id=localpica -y  --home $HOME_DIR
+./_build/old/centaurid tx 08-wasm push-wasm $(pwd)/contracts/ics10_grandpa_cw.wasm --from=mykey --gas 10002152622 --fees 10020166ppica --keyring-backend test --chain-id=localpica -y  --home $HOME_DIR
 
-sleep 3
+sleep 5
 
 ./_build/old/centaurid query 08-wasm all-wasm-code --home $HOME_DIR