diff --git a/app/app.go b/app/app.go index 371d301e..df3d154d 100644 --- a/app/app.go +++ b/app/app.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/notional-labs/composable/v6/app/upgrades/v6_6_0" + "github.com/notional-labs/composable/v6/app/upgrades/v6_6_1" nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node" authante "github.com/cosmos/cosmos-sdk/x/auth/ante" @@ -38,7 +38,6 @@ 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_5_4" // bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" @@ -149,7 +148,7 @@ var ( // https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34 EnableSpecificProposals = "" - Upgrades = []upgrades.Upgrade{v6_5_4.Upgrade, v6_6_0.Upgrade} + Upgrades = []upgrades.Upgrade{v6_6_1.Upgrade} Forks = []upgrades.Fork{} ) diff --git a/app/upgrades/v6_6_0/constants.go b/app/upgrades/v6_6_1/constants.go similarity index 91% rename from app/upgrades/v6_6_0/constants.go rename to app/upgrades/v6_6_1/constants.go index 874a2a41..01219650 100644 --- a/app/upgrades/v6_6_0/constants.go +++ b/app/upgrades/v6_6_1/constants.go @@ -1,4 +1,4 @@ -package v6_6_0 +package v6_6_1 import ( store "github.com/cosmos/cosmos-sdk/store/types" @@ -7,7 +7,7 @@ import ( const ( // UpgradeName defines the on-chain upgrade name for the composable upgrade. - UpgradeName = "v6_6_0" + UpgradeName = "v6_6_1" ) var Upgrade = upgrades.Upgrade{ diff --git a/app/upgrades/v6_6_0/upgrade.go b/app/upgrades/v6_6_1/upgrade.go similarity index 99% rename from app/upgrades/v6_6_0/upgrade.go rename to app/upgrades/v6_6_1/upgrade.go index ac235692..c3019b75 100644 --- a/app/upgrades/v6_6_0/upgrade.go +++ b/app/upgrades/v6_6_1/upgrade.go @@ -1,4 +1,4 @@ -package v6_6_0 +package v6_6_1 import ( "github.com/CosmWasm/wasmd/x/wasm" diff --git a/app/upgrades/v6_6_0/upgrades_test.go b/app/upgrades/v6_6_1/upgrades_test.go similarity index 99% rename from app/upgrades/v6_6_0/upgrades_test.go rename to app/upgrades/v6_6_1/upgrades_test.go index 10e54570..00a24232 100644 --- a/app/upgrades/v6_6_0/upgrades_test.go +++ b/app/upgrades/v6_6_1/upgrades_test.go @@ -1,4 +1,4 @@ -package v6_6_0_test +package v6_6_1_test import ( "encoding/json" @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/notional-labs/composable/v6/app/upgrades/v6_6_0" + "github.com/notional-labs/composable/v6/app/upgrades/v6_6_1" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" @@ -63,7 +63,7 @@ func (s *UpgradeTestSuite) TestForMigratingNewPrefix() { /* == UPGRADE == */ upgradeHeight := int64(5) - s.ConfirmUpgradeSucceeded(v6_6_0.UpgradeName, upgradeHeight) + s.ConfirmUpgradeSucceeded(v6_6_1.UpgradeName, upgradeHeight) /* == CHECK AFTER UPGRADE == */ checkUpgradeGovModule(s, acc1, proposal) diff --git a/scripts/test-upgrade.sh b/scripts/test-upgrade.sh index 826c4fb5..2bbbe23a 100755 --- a/scripts/test-upgrade.sh +++ b/scripts/test-upgrade.sh @@ -9,7 +9,7 @@ HOME=mytestnet ROOT=$(pwd) DENOM=upica CHAIN_ID=localpica -SOFTWARE_UPGRADE_NAME="v6_6_0" +SOFTWARE_UPGRADE_NAME="v6_6_1" ADDITIONAL_PRE_SCRIPTS="./scripts/upgrade/v_6_4_8/pre-script.sh" ADDITIONAL_AFTER_SCRIPTS="./scripts/upgrade/v_6_4_8/post-script.sh" diff --git a/scripts/upgrade/init_deps.sh b/scripts/upgrade/init_deps.sh index 5ed0b2f6..5c26e30f 100755 --- a/scripts/upgrade/init_deps.sh +++ b/scripts/upgrade/init_deps.sh @@ -2,7 +2,7 @@ OLD_VERSION=kien-devnet-651 -SOFTWARE_UPGRADE_NAME="v6_6_0" +SOFTWARE_UPGRADE_NAME="v6_6_1" ROOT=$(pwd) COMPOSABLE_VERSION="branchfortestingpfmfix" diff --git a/scripts/upgrade/upgrade.sh b/scripts/upgrade/upgrade.sh index 166975b1..28771b9b 100755 --- a/scripts/upgrade/upgrade.sh +++ b/scripts/upgrade/upgrade.sh @@ -6,7 +6,7 @@ HOME=mytestnet ROOT=$(pwd) DENOM=ppica CHAIN_ID=centauri-dev -SOFTWARE_UPGRADE_NAME="v6_6_0" +SOFTWARE_UPGRADE_NAME="v6_6_1" ADDITIONAL_PRE_SCRIPTS="./scripts/upgrade/v_6_4_8/pre-script.sh" ADDITIONAL_AFTER_SCRIPTS="./scripts/upgrade/v_6_4_8/post-script.sh" KEY="mykey"