Skip to content

Commit

Permalink
revert change version
Browse files Browse the repository at this point in the history
  • Loading branch information
tungleanh0902 committed Mar 18, 2024
1 parent 91d9bf5 commit 951fa1b
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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{}
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package v6_4_8
package v6_4_7

import (
store "github.com/cosmos/cosmos-sdk/store/types"
Expand All @@ -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{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package v6_4_8
package v6_4_7

import (
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package v6_4_8_test
package v6_4_7_test

import (
"encoding/json"
Expand All @@ -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"
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions scripts/test-upgrade-cosmos-chains.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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 "#########################################################"
Expand Down
6 changes: 3 additions & 3 deletions scripts/test-upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 951fa1b

Please sign in to comment.