From 951fa1b2d14056e6fdae8a1d43b16dd1466affc5 Mon Sep 17 00:00:00 2001 From: tungle Date: Mon, 18 Mar 2024 18:26:49 +0700 Subject: [PATCH] revert change version --- app/app.go | 4 ++-- app/upgrades/{v6_4_8 => v6_4_7}/constants.go | 4 ++-- app/upgrades/{v6_4_8 => v6_4_7}/upgrade.go | 2 +- app/upgrades/{v6_4_8 => v6_4_7}/upgrades_test.go | 6 +++--- scripts/test-upgrade-cosmos-chains.sh | 10 +++++----- scripts/test-upgrade.sh | 6 +++--- .../{v_6_4_8 => v_6_4_7}/post-script-ibc-transfer.sh | 0 scripts/upgrade/{v_6_4_8 => v_6_4_7}/post-script.sh | 0 .../{v_6_4_8 => v_6_4_7}/pre-script-ibc-transfer.sh | 0 scripts/upgrade/{v_6_4_8 => v_6_4_7}/pre-script.sh | 0 10 files changed, 16 insertions(+), 16 deletions(-) rename app/upgrades/{v6_4_8 => v6_4_7}/constants.go (91%) rename app/upgrades/{v6_4_8 => v6_4_7}/upgrade.go (97%) rename app/upgrades/{v6_4_8 => v6_4_7}/upgrades_test.go (99%) rename scripts/upgrade/{v_6_4_8 => v_6_4_7}/post-script-ibc-transfer.sh (100%) rename scripts/upgrade/{v_6_4_8 => v_6_4_7}/post-script.sh (100%) rename scripts/upgrade/{v_6_4_8 => v_6_4_7}/pre-script-ibc-transfer.sh (100%) rename scripts/upgrade/{v_6_4_8 => v_6_4_7}/pre-script.sh (100%) diff --git a/app/app.go b/app/app.go index fbf96e3ef..a59d241ea 100644 --- a/app/app.go +++ b/app/app.go @@ -36,7 +36,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/bank" "github.com/notional-labs/composable/v6/app/keepers" - "github.com/notional-labs/composable/v6/app/upgrades/v6_4_8" + "github.com/notional-labs/composable/v6/app/upgrades/v6_4_7" // bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" @@ -147,7 +147,7 @@ var ( // https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34 EnableSpecificProposals = "" - Upgrades = []upgrades.Upgrade{v6_4_8.Upgrade} + Upgrades = []upgrades.Upgrade{v6_4_7.Upgrade} Forks = []upgrades.Fork{} ) diff --git a/app/upgrades/v6_4_8/constants.go b/app/upgrades/v6_4_7/constants.go similarity index 91% rename from app/upgrades/v6_4_8/constants.go rename to app/upgrades/v6_4_7/constants.go index 1f9e52267..e6bdd1fcd 100644 --- a/app/upgrades/v6_4_8/constants.go +++ b/app/upgrades/v6_4_7/constants.go @@ -1,4 +1,4 @@ -package v6_4_8 +package v6_4_7 import ( store "github.com/cosmos/cosmos-sdk/store/types" @@ -8,7 +8,7 @@ import ( const ( // UpgradeName defines the on-chain upgrade name for the composable upgrade. - UpgradeName = "v6_4_8" + UpgradeName = "v6_4_7" ) var Upgrade = upgrades.Upgrade{ diff --git a/app/upgrades/v6_4_8/upgrade.go b/app/upgrades/v6_4_7/upgrade.go similarity index 97% rename from app/upgrades/v6_4_8/upgrade.go rename to app/upgrades/v6_4_7/upgrade.go index aa4bc1756..682c58a62 100644 --- a/app/upgrades/v6_4_8/upgrade.go +++ b/app/upgrades/v6_4_7/upgrade.go @@ -1,4 +1,4 @@ -package v6_4_8 +package v6_4_7 import ( sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/app/upgrades/v6_4_8/upgrades_test.go b/app/upgrades/v6_4_7/upgrades_test.go similarity index 99% rename from app/upgrades/v6_4_8/upgrades_test.go rename to app/upgrades/v6_4_7/upgrades_test.go index 399b1547d..f87ee94d5 100644 --- a/app/upgrades/v6_4_8/upgrades_test.go +++ b/app/upgrades/v6_4_7/upgrades_test.go @@ -1,4 +1,4 @@ -package v6_4_8_test +package v6_4_7_test import ( "encoding/json" @@ -17,7 +17,7 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" apptesting "github.com/notional-labs/composable/v6/app" - "github.com/notional-labs/composable/v6/app/upgrades/v6_4_8" + "github.com/notional-labs/composable/v6/app/upgrades/v6_4_7" "github.com/notional-labs/composable/v6/bech32-migration/utils" "github.com/stretchr/testify/suite" alliancetypes "github.com/terra-money/alliance/x/alliance/types" @@ -60,7 +60,7 @@ func (s *UpgradeTestSuite) TestForMigratingNewPrefix() { /* == UPGRADE == */ upgradeHeight := int64(5) - s.ConfirmUpgradeSucceeded(v6_4_8.UpgradeName, upgradeHeight) + s.ConfirmUpgradeSucceeded(v6_4_7.UpgradeName, upgradeHeight) /* == CHECK AFTER UPGRADE == */ checkUpgradeGovModule(s, acc1, proposal) diff --git a/scripts/test-upgrade-cosmos-chains.sh b/scripts/test-upgrade-cosmos-chains.sh index 6268fc345..a7b7f5db7 100755 --- a/scripts/test-upgrade-cosmos-chains.sh +++ b/scripts/test-upgrade-cosmos-chains.sh @@ -9,9 +9,9 @@ HOME=mytestnet ROOT=$(pwd) DENOM=stake CHAIN_ID1=test-1 -SOFTWARE_UPGRADE_NAME="v6_4_8" -ADDITIONAL_PRE_SCRIPTS="./scripts/upgrade/v_6_4_8/pre-script-ibc-transfer.sh" -ADDITIONAL_AFTER_SCRIPTS="./scripts/upgrade/v_6_4_8/post-script-ibc-transfer.sh" +SOFTWARE_UPGRADE_NAME="v6_4_6" +ADDITIONAL_PRE_SCRIPTS="./scripts/upgrade/v_6_4_7/pre-script-ibc-transfer.sh" +ADDITIONAL_AFTER_SCRIPTS="./scripts/upgrade/v_6_4_7/post-script-ibc-transfer.sh" SETUP_RELAYER_SCRIPTS="./scripts/relayer/relayer-init.sh" CHAIN_DIR=$(pwd)/data @@ -61,7 +61,7 @@ source $SETUP_RELAYER_SCRIPTS # Transfer from chain 1 to chain 2 and return balance of sender on chain 1 echo "executing additional pre scripts from $ADDITIONAL_PRE_SCRIPTS" -bash ./scripts/upgrade/v_6_4_8/pre-script-ibc-transfer.sh +bash ./scripts/upgrade/v_6_4_7/pre-script-ibc-transfer.sh run_fork () { echo "forking" @@ -148,7 +148,7 @@ CONTINUE="true" bash scripts/two-testnodes.sh _build/new/picad sleep 5 echo "executing additional post scripts from $ADDITIONAL_AFTER_SCRIPTS" -bash ./scripts/upgrade/v_6_4_8/post-script-ibc-transfer.sh +bash ./scripts/upgrade/v_6_4_7/post-script-ibc-transfer.sh echo "" echo "#########################################################" diff --git a/scripts/test-upgrade.sh b/scripts/test-upgrade.sh index 99c11fcfc..e584f8a25 100755 --- a/scripts/test-upgrade.sh +++ b/scripts/test-upgrade.sh @@ -9,9 +9,9 @@ HOME=mytestnet ROOT=$(pwd) DENOM=upica CHAIN_ID=localpica -SOFTWARE_UPGRADE_NAME="v6_4_8" -ADDITIONAL_PRE_SCRIPTS="./scripts/upgrade/v_6_4_8/pre-script.sh" -ADDITIONAL_AFTER_SCRIPTS="./scripts/upgrade/v_6_4_8/post-script.sh" +SOFTWARE_UPGRADE_NAME="v6_4_7" +ADDITIONAL_PRE_SCRIPTS="./scripts/upgrade/v_6_4_7/pre-script.sh" +ADDITIONAL_AFTER_SCRIPTS="./scripts/upgrade/v_6_4_7/post-script.sh" SLEEP_TIME=1 diff --git a/scripts/upgrade/v_6_4_8/post-script-ibc-transfer.sh b/scripts/upgrade/v_6_4_7/post-script-ibc-transfer.sh similarity index 100% rename from scripts/upgrade/v_6_4_8/post-script-ibc-transfer.sh rename to scripts/upgrade/v_6_4_7/post-script-ibc-transfer.sh diff --git a/scripts/upgrade/v_6_4_8/post-script.sh b/scripts/upgrade/v_6_4_7/post-script.sh similarity index 100% rename from scripts/upgrade/v_6_4_8/post-script.sh rename to scripts/upgrade/v_6_4_7/post-script.sh diff --git a/scripts/upgrade/v_6_4_8/pre-script-ibc-transfer.sh b/scripts/upgrade/v_6_4_7/pre-script-ibc-transfer.sh similarity index 100% rename from scripts/upgrade/v_6_4_8/pre-script-ibc-transfer.sh rename to scripts/upgrade/v_6_4_7/pre-script-ibc-transfer.sh diff --git a/scripts/upgrade/v_6_4_8/pre-script.sh b/scripts/upgrade/v_6_4_7/pre-script.sh similarity index 100% rename from scripts/upgrade/v_6_4_8/pre-script.sh rename to scripts/upgrade/v_6_4_7/pre-script.sh