Fix pulsar upgrade

scrtlabs · May 1, 2023 · 4f3327b · 4f3327b
1 parent 807e008
commit 4f3327b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/app/upgrades/v1.9/upgrade.go b/app/upgrades/v1.9/upgrade.go
@@ -11,14 +11,15 @@ import (
 	"github.com/scrtlabs/SecretNetwork/app/upgrades"
 	ibcswitchtypes "github.com/scrtlabs/SecretNetwork/x/emergencybutton/types"
 	ibcpacketforwardtypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types"
+	icacontrollertypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller/types"
 )
 
 const upgradeName = "v1.9"
 
 var Upgrade = upgrades.Upgrade{
 	UpgradeName:          upgradeName,
 	CreateUpgradeHandler: createUpgradeHandler,
-	StoreUpgrades: store.StoreUpgrades{Added: []string{ibcpacketforwardtypes.StoreKey, ibcfeetypes.ModuleName, ibcswitchtypes.ModuleName},
+	StoreUpgrades: store.StoreUpgrades{Added: []string{icacontrollertypes.StoreKey, ibcpacketforwardtypes.StoreKey, ibcfeetypes.ModuleName, ibcswitchtypes.ModuleName},
 		Deleted: []string{"icamsgauth"}},
 }
 

diff --git a/docs/node_init.sh b/docs/node_init.sh
@@ -57,7 +57,7 @@ echo "SEED: $SEED"
 
 SGX_MODE=SW secretd q register secret-network-params
 
-SGX_MODE=SW secretd configure-secret node-master-cert.der "$SEED"
+SGX_MODE=SW secretd configure-secret node-master-key.txt "$SEED"
 
 cp /tmp/.secretd/config/genesis.json /root/.secretd/config/genesis.json
 

diff --git a/docs/test-v1.9-upgrade-handler-testnet.md b/docs/test-v1.9-upgrade-handler-testnet.md
@@ -138,21 +138,21 @@ Wait until you see `ERR CONSENSUS FAILURE!!! err="UPGRADE \"v1.9\" NEEDED at hei
 Copy binaries from v1.9 chain to v1.7 chain.
 
 ```bash
-FEATURES="verify-validator-whitelist,light-client-validation,random" SGX_MODE=SW make build-linux
+FEATURES="light-client-validation,random" SGX_MODE=SW make build-linux
 
 # Copy binaries from host to current v1.7 chain
 
 docker exec bootstrap bash -c 'rm -rf /tmp/upgrade-bin && mkdir -p /tmp/upgrade-bin'
 docker exec node bash -c 'rm -rf /tmp/upgrade-bin && mkdir -p /tmp/upgrade-bin'
 
-docker cp secretd                                                  bootstrap:/tmp/upgrade-bin
-docker cp go-cosmwasm/librust_cosmwasm_enclave.signed.so           bootstrap:/tmp/upgrade-bin
-docker cp go-cosmwasm/api/libgo_cosmwasm.so                        bootstrap:/tmp/upgrade-bin
-docker cp secretd                                                  node:/tmp/upgrade-bin
-docker cp go-cosmwasm/librust_cosmwasm_enclave.signed.so           node:/tmp/upgrade-bin
-docker cp go-cosmwasm/api/libgo_cosmwasm.so                        node:/tmp/upgrade-bin
-docker cp docs/librandom_api.so                                    node:/usr/lib
-docker cp docs/tendermint_enclave.signed.so                        node:/usr/lib
+docker cp test/secretd                                                  bootstrap:/tmp/upgrade-bin
+docker cp test/librust_cosmwasm_enclave.signed.so           bootstrap:/tmp/upgrade-bin
+docker cp test/libgo_cosmwasm.so                        bootstrap:/tmp/upgrade-bin
+docker cp test/secretd                                                  node:/tmp/upgrade-bin
+docker cp test/librust_cosmwasm_enclave.signed.so           node:/tmp/upgrade-bin
+docker cp test/libgo_cosmwasm.so                        node:/tmp/upgrade-bin
+docker cp test/librandom_api.so                                    node:/usr/lib
+docker cp test/tendermint_enclave.signed.so                        node:/usr/lib
 
 docker exec node bash -c 'pkill -9 secretd'
 

diff --git a/x/registration/internal/types/types.go b/x/registration/internal/types/types.go
@@ -13,7 +13,7 @@ const (
 	MasterNodeKeyId            = "NodeExchMasterKey"
 	MasterIoKeyId              = "IoExchMasterKey"
 	SecretNodeSeedLegacyConfig = "seed.json"
-	SecretNodeSeedNewConfig    = "new_seed.json"
+	SecretNodeSeedNewConfig    = "seed.json"
 	SecretNodeCfgFolder        = ".node"
 )