From 4f3327b00d6e1a4e68b3591cb9adaf6d7d310f39 Mon Sep 17 00:00:00 2001 From: Lior Bondarevski Date: Mon, 1 May 2023 18:01:53 +0300 Subject: [PATCH] Fix pulsar upgrade --- app/upgrades/v1.9/upgrade.go | 3 ++- docs/node_init.sh | 2 +- docs/test-v1.9-upgrade-handler-testnet.md | 18 +++++++++--------- x/registration/internal/types/types.go | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/upgrades/v1.9/upgrade.go b/app/upgrades/v1.9/upgrade.go index da4075649..27ef2d59d 100644 --- a/app/upgrades/v1.9/upgrade.go +++ b/app/upgrades/v1.9/upgrade.go @@ -11,6 +11,7 @@ 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" @@ -18,7 +19,7 @@ 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 index 3f4d73cda..082039bc3 100644 --- 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 index 0e152d019..04e5a63ca 100644 --- 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 index e5ce60110..3d126e617 100644 --- 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" )