From e95670faea50b5469bc753503d23a324870051c0 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 24 Feb 2024 23:20:26 +0200 Subject: [PATCH 1/3] modify upgrade due to Khanh, Vuong, and Long having backed out of their stated agreement twice. --- app/upgrades/v4_1_1/constants.go | 4 +- app/upgrades/v4_1_1/mainnet_account.go | 48 -------- app/upgrades/v4_1_1/upgrades.go | 155 +------------------------ app/upgrades/v4_1_1/upgrades_test.go | 102 ---------------- 4 files changed, 4 insertions(+), 305 deletions(-) delete mode 100644 app/upgrades/v4_1_1/mainnet_account.go delete mode 100644 app/upgrades/v4_1_1/upgrades_test.go diff --git a/app/upgrades/v4_1_1/constants.go b/app/upgrades/v4_1_1/constants.go index b3b72b4a..3a1e7a2b 100644 --- a/app/upgrades/v4_1_1/constants.go +++ b/app/upgrades/v4_1_1/constants.go @@ -3,7 +3,5 @@ package v4 // UpgradeName defines the on-chain upgrade name for the Migaloo v4.1.0 upgrade. // this upgrade includes the fix for pfm const ( - UpgradeName = "v4.1.1" - NotionalMultisigVestingAccount = "migaloo1alga5e8vr6ccr9yrg0kgxevpt5xgmgrvqgujs6" - NewNotionalMultisigAccount = "migaloo1tx6f2hetpd9uhveja26kr074496hzk2zzqhsh0" + UpgradeName = "v4.1.1" ) diff --git a/app/upgrades/v4_1_1/mainnet_account.go b/app/upgrades/v4_1_1/mainnet_account.go deleted file mode 100644 index ea258d76..00000000 --- a/app/upgrades/v4_1_1/mainnet_account.go +++ /dev/null @@ -1,48 +0,0 @@ -package v4 - -import ( - "encoding/json" - - authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" - bankKeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - - "cosmossdk.io/math" - - sdk "github.com/cosmos/cosmos-sdk/types" - vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - banktestutil "github.com/cosmos/cosmos-sdk/x/bank/testutil" -) - -const ( - TestDenom = "test" - TestAmount = 1000000 -) - -func CreateMainnetVestingAccount(ctx sdk.Context, - bankKeeper bankKeeper.Keeper, - accountKeeper authkeeper.AccountKeeper, -) (vestingtypes.ContinuousVestingAccount, math.Int) { - str := `{"@type":"/cosmos.vesting.v1beta1.ContinuousVestingAccount","base_vesting_account":{"base_account":{"address":"migaloo1alga5e8vr6ccr9yrg0kgxevpt5xgmgrvqgujs6","pub_key":{"@type":"/cosmos.crypto.multisig.LegacyAminoPubKey","threshold":4,"public_keys":[{"@type":"/cosmos.crypto.secp256k1.PubKey","key":"AlnzK22KrkylnvTCvZZc8eZnydtQuzCWLjJJSMFUvVHf"},{"@type":"/cosmos.crypto.secp256k1.PubKey","key":"Aiw2Ftg+fnoHDU7M3b0VMRsI0qurXlerW0ahtfzSDZA4"},{"@type":"/cosmos.crypto.secp256k1.PubKey","key":"AvEHv+MVYRVau8FbBcJyG0ql85Tbbn7yhSA0VGmAY4ku"},{"@type":"/cosmos.crypto.secp256k1.PubKey","key":"Az5VHWqi3zMJu1rLGcu2EgNXLLN+al4Dy/lj6UZTzTCl"},{"@type":"/cosmos.crypto.secp256k1.PubKey","key":"Ai4GlSH3uG+joMnAFbQC3jQeHl9FPvVTlRmwIFt7d7TI"},{"@type":"/cosmos.crypto.secp256k1.PubKey","key":"A2kAzH2bZr530jmFq/bRFrT2q8SRqdnfIebba+YIBqI1"}]},"account_number":46,"sequence":27},"original_vesting":[{"denom":"uwhale","amount":"22165200000000"}],"delegated_free":[{"denom":"uwhale","amount":"443382497453"}],"delegated_vesting":[{"denom":"uwhale","amount":"22129422502547"}],"end_time":1770994800},"start_time":1676300400}` - - var acc vestingtypes.ContinuousVestingAccount - if err := json.Unmarshal([]byte(str), &acc); err != nil { - panic(err) - } - - vesting := GetVestingCoin(ctx, &acc) - - err := banktestutil.FundAccount(bankKeeper, ctx, acc.BaseAccount.GetAddress(), - acc.GetOriginalVesting()) - if err != nil { - panic(err) - } - - err = banktestutil.FundAccount(bankKeeper, ctx, acc.BaseAccount.GetAddress(), - sdk.NewCoins(sdk.NewCoin(TestDenom, sdk.NewInt(TestAmount)))) - if err != nil { - panic(err) - } - - accountKeeper.SetAccount(ctx, &acc) - return acc, vesting -} diff --git a/app/upgrades/v4_1_1/upgrades.go b/app/upgrades/v4_1_1/upgrades.go index 195c3f0b..cb50c5d0 100644 --- a/app/upgrades/v4_1_1/upgrades.go +++ b/app/upgrades/v4_1_1/upgrades.go @@ -1,12 +1,6 @@ package v4 import ( - "fmt" - "time" - - vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - - "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" @@ -24,7 +18,7 @@ import ( ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ) -// CreateUpgradeHandler small security fix, can be a no-op, running mm.RunMigarions just to be sure +// CreateUpgradeHandler that migrates the chain from v3.0.2 to v4.1.1 func CreateUpgradeHandler( mm *module.Manager, configurator module.Configurator, @@ -33,8 +27,8 @@ func CreateUpgradeHandler( consensusParamsKeeper consensuskeeper.Keeper, icacontrollerKeeper icacontrollerkeeper.Keeper, accountKeeper authkeeper.AccountKeeper, - stakingKeeper stakingKeeper.Keeper, - bankKeeper bankKeeper.Keeper, + _ stakingKeeper.Keeper, + _ bankKeeper.Keeper, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { // READ: https://github.com/cosmos/cosmos-sdk/blob/v0.47.4/UPGRADING.md#xconsensus @@ -56,149 +50,6 @@ func CreateUpgradeHandler( moduleAcc.Permissions = []string{authtypes.Burner} accountKeeper.SetModuleAccount(ctx, moduleAcc) - migrateMultisigVesting(ctx, stakingKeeper, bankKeeper, accountKeeper) return mm.RunMigrations(ctx, configurator, fromVM) } } - -// migrateMultisigVesting moves the unvested from the ContinuousVestingAccount -> the new ContinuousVestingAccount -// - Retrieves the old multisig vesting account -// - Instantly finish all redelegations, then unbond all tokens. -// - Transfer unvested token to the new multisign ContinuousVestingAccount -func migrateMultisigVesting(ctx sdk.Context, - stakingKeeper stakingKeeper.Keeper, - bankKeeper bankKeeper.Keeper, - accountKeeper authkeeper.AccountKeeper, -) { - currentAddr := sdk.MustAccAddressFromBech32(NotionalMultisigVestingAccount) - newAddr := sdk.MustAccAddressFromBech32(NewNotionalMultisigAccount) - - currentAcc := accountKeeper.GetAccount(ctx, currentAddr) - - currentVestingAcc, ok := currentAcc.(*vestingtypes.ContinuousVestingAccount) - if !ok { - // skip if account invalid - fmt.Printf("err currentAcc.(*vestingtypes.ContinuousVestingAccount): %+v\n", currentAcc) - return - } - // process migrate - processMigrateMultisig(ctx, stakingKeeper, bankKeeper, accountKeeper, currentAddr, newAddr, currentVestingAcc) -} - -func processMigrateMultisig(ctx sdk.Context, stakingKeeper stakingKeeper.Keeper, - bankKeeper bankKeeper.Keeper, - accountKeeper authkeeper.AccountKeeper, - currentAddr, newAddr sdk.AccAddress, - oldAcc *vestingtypes.ContinuousVestingAccount, -) { - redelegated, err := completeAllRedelegations(ctx, ctx.BlockTime(), stakingKeeper, currentAddr) - if err != nil { - panic(err) - } - - unbonded, err := unbondAllAndFinish(ctx, ctx.BlockTime(), stakingKeeper, currentAddr) - if err != nil { - panic(err) - } - - fmt.Printf("currentAddr Instant Redelegations: %s\n", redelegated) - fmt.Printf("currentAddr Instant Unbonding: %s\n", unbonded) - - // get vesting balance - vestingCoin := oldAcc.GetVestingCoins(ctx.BlockTime()) - fmt.Printf("Total vesting balance %v\n", vestingCoin) - if vestingCoin.Empty() { - panic(err) - } - - // setup NewContinuousVestingAccount - newAccount := authtypes.NewBaseAccountWithAddress(newAddr) - newVestingAcc := vestingtypes.NewContinuousVestingAccount(newAccount, vestingCoin, - ctx.BlockTime().Unix(), oldAcc.EndTime) - accountKeeper.SetAccount(ctx, newVestingAcc) - - // end current ContinuousVestingAccount - oldAcc.OriginalVesting = oldAcc.OriginalVesting.Sub(vestingCoin[0]) - oldAcc.DelegatedFree = sdk.NewCoins() - oldAcc.DelegatedVesting = sdk.NewCoins() - oldAcc.EndTime = ctx.BlockTime().Unix() - accountKeeper.SetAccount(ctx, oldAcc) - - // move vesting coin to new ContinuousVestingAccount - err = bankKeeper.SendCoins(ctx, currentAddr, newAddr, vestingCoin) - if err != nil { - panic(err) - } -} - -func GetVestingCoin(ctx sdk.Context, acc *vestingtypes.ContinuousVestingAccount) (unvested math.Int) { - vestingCoin := acc.GetVestingCoins(ctx.BlockTime()) - return vestingCoin[0].Amount -} - -func completeAllRedelegations(ctx sdk.Context, now time.Time, - stakingKeeper stakingKeeper.Keeper, - accAddr sdk.AccAddress, -) (math.Int, error) { - redelegatedAmt := math.ZeroInt() - - for _, activeRedelegation := range stakingKeeper.GetRedelegations(ctx, accAddr, 65535) { - redelegationSrc, _ := sdk.ValAddressFromBech32(activeRedelegation.ValidatorSrcAddress) - redelegationDst, _ := sdk.ValAddressFromBech32(activeRedelegation.ValidatorDstAddress) - - // set all entry completionTime to now so we can complete re-delegation - for i := range activeRedelegation.Entries { - activeRedelegation.Entries[i].CompletionTime = now - redelegatedAmt = redelegatedAmt.Add(math.Int(activeRedelegation.Entries[i].SharesDst)) - } - - stakingKeeper.SetRedelegation(ctx, activeRedelegation) - _, err := stakingKeeper.CompleteRedelegation(ctx, accAddr, redelegationSrc, redelegationDst) - if err != nil { - return redelegatedAmt, err - } - } - - return redelegatedAmt, nil -} - -func unbondAllAndFinish(ctx sdk.Context, now time.Time, - stakingKeeper stakingKeeper.Keeper, - accAddr sdk.AccAddress, -) (math.Int, error) { - unbondedAmt := math.ZeroInt() - - // Unbond all delegations from the account - for _, delegation := range stakingKeeper.GetAllDelegatorDelegations(ctx, accAddr) { - validatorValAddr := delegation.GetValidatorAddr() - _, found := stakingKeeper.GetValidator(ctx, validatorValAddr) - if !found { - continue - } - - _, err := stakingKeeper.Undelegate(ctx, accAddr, validatorValAddr, delegation.GetShares()) - if err != nil { - return math.ZeroInt(), err - } - } - - // Take all unbonding and complete them. - for _, unbondingDelegation := range stakingKeeper.GetAllUnbondingDelegations(ctx, accAddr) { - validatorStringAddr := unbondingDelegation.ValidatorAddress - validatorValAddr, _ := sdk.ValAddressFromBech32(validatorStringAddr) - - // Complete unbonding delegation - for i := range unbondingDelegation.Entries { - unbondingDelegation.Entries[i].CompletionTime = now - unbondedAmt = unbondedAmt.Add(unbondingDelegation.Entries[i].Balance) - } - - stakingKeeper.SetUnbondingDelegation(ctx, unbondingDelegation) - _, err := stakingKeeper.CompleteUnbonding(ctx, accAddr, validatorValAddr) - if err != nil { - return math.ZeroInt(), err - } - } - - return unbondedAmt, nil -} diff --git a/app/upgrades/v4_1_1/upgrades_test.go b/app/upgrades/v4_1_1/upgrades_test.go deleted file mode 100644 index 5179a324..00000000 --- a/app/upgrades/v4_1_1/upgrades_test.go +++ /dev/null @@ -1,102 +0,0 @@ -package v4_test - -import ( - "fmt" - "testing" - - "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/params" - v4 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_1_1" - sdk "github.com/cosmos/cosmos-sdk/types" - vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - - apptesting "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app" - "github.com/stretchr/testify/suite" -) - -type UpgradeTestSuite struct { - apptesting.KeeperTestHelper -} - -func TestUpgradeTestSuite(t *testing.T) { - suite.Run(t, new(UpgradeTestSuite)) -} - -// Ensures the test does not error out. -func (s *UpgradeTestSuite) TestUpgrade() { - s.Setup(s.T()) - // == CREATE MOCK VESTING ACCOUNT == - cVesting, unvested := v4.CreateMainnetVestingAccount(s.Ctx, s.App.BankKeeper, s.App.AccountKeeper) - vestingAddr := cVesting.GetAddress() - fmt.Printf("VestingAddr unvested: %+v\n", unvested) - - accVestingBalance := s.App.BankKeeper.GetAllBalances(s.Ctx, vestingAddr) - fmt.Printf("Acc vesting bal: %s\n", accVestingBalance) - // create many validators to confirm the unbonding code works - newVal1 := s.SetupValidator(stakingtypes.Bonded) - newVal2 := s.SetupValidator(stakingtypes.Bonded) - newVal3 := s.SetupValidator(stakingtypes.Bonded) - - // Delegate tokens of the vesting multisig account - s.StakingHelper.Delegate(vestingAddr, newVal1, sdk.NewInt(300)) - s.StakingHelper.Delegate(vestingAddr, newVal2, sdk.NewInt(300)) - s.StakingHelper.Delegate(vestingAddr, newVal3, sdk.NewInt(300)) - - // Undelegate part of the tokens from val2 (test instant unbonding on undelegation started before upgrade) - s.StakingHelper.Undelegate(vestingAddr, newVal3, sdk.NewInt(10), true) - - // Redelegate part of the tokens from val2 -> val3 (test instant unbonding on redelegations started before upgrade) - _, err := s.App.StakingKeeper.BeginRedelegation(s.Ctx, vestingAddr, newVal2, newVal3, sdk.NewDec(1)) - s.Require().NoError(err) - - // Confirm delegated to 3 validators - s.Require().Equal(3, len(s.App.StakingKeeper.GetAllDelegatorDelegations(s.Ctx, vestingAddr))) - - // == UPGRADE == - upgradeHeight := int64(5) - s.ConfirmUpgradeSucceeded(v4.UpgradeName, upgradeHeight) - - // == VERIFICATION FEEBURN == - feeBurnParam := s.App.FeeBurnKeeper.GetParams(s.Ctx) - s.Require().Equal("0", feeBurnParam.GetTxFeeBurnPercent()) - - // VERIFY MULTISIGN MIGRATION - accAfter := s.App.AccountKeeper.GetAccount(s.Ctx, vestingAddr) - accAfterVestingAccount, ok := accAfter.(*vestingtypes.ContinuousVestingAccount) - s.Require().True(ok) - - newNotionalAcc := s.App.AccountKeeper.GetAccount(s.Ctx, sdk.MustAccAddressFromBech32(v4.NewNotionalMultisigAccount)) - newNotionalAccVesting, ok := newNotionalAcc.(*vestingtypes.ContinuousVestingAccount) - s.Require().True(ok) - - s.Require().Equal(2, len(s.App.BankKeeper.GetAllBalances(s.Ctx, vestingAddr))) - // only move uwhale token - s.Require().Equal(1, len(s.App.BankKeeper.GetAllBalances(s.Ctx, sdk.MustAccAddressFromBech32(v4.NewNotionalMultisigAccount)))) - s.Require().Equal(0, len(s.App.StakingKeeper.GetAllDelegatorDelegations(s.Ctx, vestingAddr))) - s.Require().Equal(0, len(s.App.StakingKeeper.GetRedelegations(s.Ctx, vestingAddr, 65535))) - - vestingBalance := cVesting.GetVestingCoins(s.Ctx.BlockTime()) - - // check old multisign address balance - expectedBalance := accVestingBalance.AmountOf(params.BaseDenom).Sub(vestingBalance.AmountOf(params.BaseDenom)) - oldMultisigBalance := s.App.BankKeeper.GetAllBalances(s.Ctx, sdk.MustAccAddressFromBech32(v4.NotionalMultisigVestingAccount)) - fmt.Printf("Old multisign address Upgrade Balance: %s, expectedBalance %s\n", oldMultisigBalance, expectedBalance) - // check base account balance - s.Require().True(oldMultisigBalance.AmountOf(params.BaseDenom).Equal(expectedBalance)) - s.Require().True(oldMultisigBalance.AmountOf(v4.TestDenom).Equal(sdk.NewInt(v4.TestAmount))) - // check vesting info - s.Require().True(accAfterVestingAccount.OriginalVesting.AmountOf(params.BaseDenom).Equal(expectedBalance)) - s.Require().True(accAfterVestingAccount.DelegatedVesting.Empty()) - s.Require().True(accAfterVestingAccount.DelegatedFree.Empty()) - - // check new multisign address balance - fmt.Printf("New multisign Upgrade Balance: %s, vestingBalance %s\n", newNotionalAccVesting.GetOriginalVesting(), vestingBalance) - // check vesting info - s.Require().True(vestingBalance.AmountOf(params.BaseDenom).Equal(newNotionalAccVesting.GetOriginalVesting().AmountOf(params.BaseDenom))) - s.Require().True(newNotionalAccVesting.DelegatedVesting.Empty()) - s.Require().True(newNotionalAccVesting.DelegatedFree.Empty()) - - // check base account balance - newMultisigBalance := s.App.BankKeeper.GetAllBalances(s.Ctx, sdk.MustAccAddressFromBech32(v4.NewNotionalMultisigAccount)) - s.Require().True(newMultisigBalance.AmountOf(params.BaseDenom).Equal(vestingBalance.AmountOf(params.BaseDenom))) -} From 76cfa4d5924d9cb1dffe30a432156dfdd174d45b Mon Sep 17 00:00:00 2001 From: Khanh Hoa Date: Mon, 26 Feb 2024 09:42:12 +0700 Subject: [PATCH 2/3] refactor: change UpgradeName --- app/app.go | 4 +--- app/upgrades/{v4_1_1 => v4_1_2}/constants.go | 4 ++-- app/upgrades/{v4_1_1 => v4_1_2}/upgrades.go | 6 +----- scripts/upgrade_test.sh | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) rename app/upgrades/{v4_1_1 => v4_1_2}/constants.go (75%) rename app/upgrades/{v4_1_1 => v4_1_2}/upgrades.go (93%) diff --git a/app/app.go b/app/app.go index f9db889a..3d84b2bb 100644 --- a/app/app.go +++ b/app/app.go @@ -157,7 +157,7 @@ import ( "github.com/rakyll/statik/fs" v3_0_2 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v3_0_2" - v4 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_1_1" + v4 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_1_2" // unnamed import of statik for swagger UI support _ "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/client/docs/statik" @@ -1149,8 +1149,6 @@ func (app *MigalooApp) setupUpgradeHandlers() { app.ConsensusParamsKeeper, app.ICAControllerKeeper, app.AccountKeeper, - *app.StakingKeeper, - app.BankKeeper, ), ) diff --git a/app/upgrades/v4_1_1/constants.go b/app/upgrades/v4_1_2/constants.go similarity index 75% rename from app/upgrades/v4_1_1/constants.go rename to app/upgrades/v4_1_2/constants.go index 3a1e7a2b..36db1968 100644 --- a/app/upgrades/v4_1_1/constants.go +++ b/app/upgrades/v4_1_2/constants.go @@ -1,7 +1,7 @@ package v4 -// UpgradeName defines the on-chain upgrade name for the Migaloo v4.1.0 upgrade. +// UpgradeName defines the on-chain upgrade name for the Migaloo v4.1.2 upgrade. // this upgrade includes the fix for pfm const ( - UpgradeName = "v4.1.1" + UpgradeName = "v4.1.2" ) diff --git a/app/upgrades/v4_1_1/upgrades.go b/app/upgrades/v4_1_2/upgrades.go similarity index 93% rename from app/upgrades/v4_1_1/upgrades.go rename to app/upgrades/v4_1_2/upgrades.go index cb50c5d0..7d857d92 100644 --- a/app/upgrades/v4_1_1/upgrades.go +++ b/app/upgrades/v4_1_2/upgrades.go @@ -6,11 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - bankKeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - stakingKeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" icacontrollerkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper" icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" @@ -18,7 +16,7 @@ import ( ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ) -// CreateUpgradeHandler that migrates the chain from v3.0.2 to v4.1.1 +// CreateUpgradeHandler that migrates the chain from v3.0.2 to v4.1.2 func CreateUpgradeHandler( mm *module.Manager, configurator module.Configurator, @@ -27,8 +25,6 @@ func CreateUpgradeHandler( consensusParamsKeeper consensuskeeper.Keeper, icacontrollerKeeper icacontrollerkeeper.Keeper, accountKeeper authkeeper.AccountKeeper, - _ stakingKeeper.Keeper, - _ bankKeeper.Keeper, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { // READ: https://github.com/cosmos/cosmos-sdk/blob/v0.47.4/UPGRADING.md#xconsensus diff --git a/scripts/upgrade_test.sh b/scripts/upgrade_test.sh index 366e941d..b0e23747 100755 --- a/scripts/upgrade_test.sh +++ b/scripts/upgrade_test.sh @@ -9,7 +9,7 @@ HOME=mytestnet ROOT=$(pwd) DENOM=uwhale CHAIN_ID=localmigaloo -SOFTWARE_UPGRADE_NAME="v4.1.1" +SOFTWARE_UPGRADE_NAME="v4.1.2" ADDITIONAL_PRE_SCRIPTS=${ADDITIONAL_PRE_SCRIPTS:-""} ADDITIONAL_AFTER_SCRIPTS=${ADDITIONAL_AFTER_SCRIPTS:-""} From 5160998fabb5b9a6e1cc73d308c3462155f128b8 Mon Sep 17 00:00:00 2001 From: Khanh Hoa Date: Mon, 26 Feb 2024 10:25:08 +0700 Subject: [PATCH 3/3] deps: bump cosmos-sdk --- go.mod | 12 ++++++------ go.sum | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 29bba324..5c2a108b 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,8 @@ require ( github.com/CosmWasm/wasmd v0.45.0 github.com/cometbft/cometbft v0.37.4 github.com/cometbft/cometbft-db v0.8.0 - github.com/cosmos/cosmos-proto v1.0.0-beta.3 - github.com/cosmos/cosmos-sdk v0.47.7 + github.com/cosmos/cosmos-proto v1.0.0-beta.4 + github.com/cosmos/cosmos-sdk v0.47.9 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20230906222317-d88d4028e5c9 github.com/cosmos/ibc-go/v7 v7.3.0 @@ -30,7 +30,7 @@ require ( ) require ( - cosmossdk.io/log v1.3.0 // indirect + cosmossdk.io/log v1.3.1 // indirect github.com/cockroachdb/errors v1.10.0 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect github.com/cockroachdb/redact v1.1.5 // indirect @@ -43,7 +43,7 @@ require ( github.com/linxGnu/grocksdb v1.7.16 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect - github.com/rs/zerolog v1.31.0 // indirect + github.com/rs/zerolog v1.32.0 // indirect golang.org/x/sync v0.4.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect @@ -99,7 +99,7 @@ require ( github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect github.com/docker/distribution v2.8.2+incompatible // indirect github.com/dustin/go-humanize v1.0.1 // indirect - github.com/dvsekhvalnov/jose2go v1.5.0 // indirect + github.com/dvsekhvalnov/jose2go v1.6.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-kit/kit v0.12.0 // indirect @@ -192,7 +192,7 @@ require ( gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect nhooyr.io/websocket v1.8.6 // indirect - pgregory.net/rapid v0.5.5 // indirect + pgregory.net/rapid v1.1.0 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/go.sum b/go.sum index bf24cf7b..c15255ea 100644 --- a/go.sum +++ b/go.sum @@ -195,8 +195,8 @@ cosmossdk.io/depinject v1.0.0-alpha.4 h1:PLNp8ZYAMPTUKyG9IK2hsbciDWqna2z1Wsl98ok cosmossdk.io/depinject v1.0.0-alpha.4/go.mod h1:HeDk7IkR5ckZ3lMGs/o91AVUc7E596vMaOmslGFM3yU= cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= -cosmossdk.io/log v1.3.0 h1:L0Z0XstClo2kOU4h3V1iDoE5Ji64sg5HLOogzGg67Oo= -cosmossdk.io/log v1.3.0/go.mod h1:HIDyvWLqZe2ovlWabsDN4aPMpY/nUEquAhgfTf2ZzB8= +cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI= +cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM= cosmossdk.io/math v1.2.0 h1:8gudhTkkD3NxOP2YyyJIYYmt6dQ55ZfJkDOaxXpy7Ig= cosmossdk.io/math v1.2.0/go.mod h1:l2Gnda87F0su8a/7FEKJfFdJrM0JZRXQaohlgJeyQh0= cosmossdk.io/simapp v0.0.0-20230602123434-616841b9704d h1:G24nV8KQ5tcSLJEYPUEpKxuX4usvpQg5r7LhCLYPs1o= @@ -340,10 +340,10 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= -github.com/cosmos/cosmos-proto v1.0.0-beta.3 h1:VitvZ1lPORTVxkmF2fAp3IiA61xVwArQYKXTdEcpW6o= -github.com/cosmos/cosmos-proto v1.0.0-beta.3/go.mod h1:t8IASdLaAq+bbHbjq4p960BvcTqtwuAxid3b/2rOD6I= -github.com/cosmos/cosmos-sdk v0.47.7 h1:yoyWF/x2dvKysgB8PVnSc83JIhbx3l11ZSf+bgBBfHQ= -github.com/cosmos/cosmos-sdk v0.47.7/go.mod h1:hljXsedSCJYge78hyaMYy+yzDQVGZtKAZBjZn5QMddk= +github.com/cosmos/cosmos-proto v1.0.0-beta.4 h1:aEL7tU/rLOmxZQ9z4i7mzxcLbSCY48OdY7lIWTLG7oU= +github.com/cosmos/cosmos-proto v1.0.0-beta.4/go.mod h1:oeB+FyVzG3XrQJbJng0EnV8Vljfk9XvTIpGILNU/9Co= +github.com/cosmos/cosmos-sdk v0.47.9 h1:D51VLkF59D53PMLsbNtp6JyWR+6MbetFyomrH88+y08= +github.com/cosmos/cosmos-sdk v0.47.9/go.mod h1:cmAawe8FV/52oPKbgeHLt4UpNkrNu8R5KD+kw0kxJFc= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= @@ -404,8 +404,8 @@ github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:Htrtb github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= -github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= +github.com/dvsekhvalnov/jose2go v1.6.0 h1:Y9gnSnP4qEI0+/uQkHvFXeD2PLPJeXEL+ySMEA2EjTY= +github.com/dvsekhvalnov/jose2go v1.6.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= @@ -918,8 +918,8 @@ github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= -github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= +github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -1704,8 +1704,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= -pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= -pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= +pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw= +pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=