Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: White-Whale-Defi-Platform/migaloo-chain
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.2.2
Choose a base ref
...
head repository: White-Whale-Defi-Platform/migaloo-chain
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release/v4.2.x
Choose a head ref
  • 9 commits
  • 15 files changed
  • 4 contributors

Commits on Aug 21, 2024

  1. fix: fix wasmd path (#403)

    * fix: add v4.2.2 handler
    
    * fix: fix wasmd path
    
    * fix lint
    hoank101 authored Aug 21, 2024
    Copy the full SHA
    3e96e87 View commit details

Commits on Sep 9, 2024

  1. Copy the full SHA
    da006f5 View commit details

Commits on Nov 4, 2024

  1. chore: bump wasmvm from 1.5.4 to 1.5.5 (#418)

    * chore: bump wasmvm from 1.5.4 to 1.5.5
    
    * fix: add upgrade handler to app.go
    
    ---------
    
    Co-authored-by: Sen Com <davidgraf@MacBookAir.fritz.box>
    Sen-Com and Sen Com authored Nov 4, 2024
    Copy the full SHA
    1f555a3 View commit details

Commits on Nov 14, 2024

  1. Feat: migrate fund from dead account (#419)

    * feat: add upgrade handler
    
    * feat: test migrate balance
    
    * chore: fix comments
    
    * add update cosmos-sdk, comet, ibc
    
    * bet
    
    ---------
    
    Co-authored-by: Khanh Hoa <hoa@notional.ventures>
    kien6034 and hoank101 authored Nov 14, 2024
    Copy the full SHA
    76ff5e3 View commit details

Commits on Dec 19, 2024

  1. feat: upgrade cosmos-sdk and add upgrade handler (#421)

    * feat: upgrade cosmos-sdk and add upgrade handler
    
    * bet
    hoank101 authored Dec 19, 2024
    Copy the full SHA
    40cae11 View commit details
  2. chore: refactor imports

    Sen Com authored and Sen Com committed Dec 19, 2024
    Copy the full SHA
    b429f01 View commit details
  3. chore(deps): upgrade prometheus/client_golang from v1.20.4 to v1.20.5

    Sen Com authored and Sen Com committed Dec 19, 2024
    Copy the full SHA
    10a4f7d View commit details
  4. chore(deps): upgrade spf13/cast from v1.6.0 to v1.7.1

    Sen Com authored and Sen Com committed Dec 19, 2024
    Copy the full SHA
    3e67c02 View commit details
  5. chore(deps): upgrade golang/grpc

    Sen Com authored and Sen Com committed Dec 19, 2024
    Copy the full SHA
    c6b03c6 View commit details
47 changes: 42 additions & 5 deletions app/app.go
Original file line number Diff line number Diff line change
@@ -160,7 +160,11 @@ import (
v45 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_1_5"
v46 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_1_6"
v420 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_2_0"
v421 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_2_1"
v422 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_2_2"
v424 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_2_4"
v425 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_2_5"
v426 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_2_6"
v427 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_2_7"
"github.com/rakyll/statik/fs"

// unnamed import of statik for swagger UI support
@@ -1194,8 +1198,41 @@ func (app *MigalooApp) setupUpgradeHandlers() {
),
)
app.UpgradeKeeper.SetUpgradeHandler(
v421.UpgradeName,
v421.CreateUpgradeHandler(
v422.UpgradeName,
v422.CreateUpgradeHandler(
app.mm,
app.StakingKeeper,
app.configurator,
),
)
app.UpgradeKeeper.SetUpgradeHandler(
v424.UpgradeName,
v424.CreateUpgradeHandler(
app.mm,
app.StakingKeeper,
app.configurator,
),
)
app.UpgradeKeeper.SetUpgradeHandler(
v425.UpgradeName,
v425.CreateUpgradeHandler(
app.mm,
app.StakingKeeper,
app.configurator,
),
)

app.UpgradeKeeper.SetUpgradeHandler(
v426.UpgradeName,
v426.CreateUpgradeHandler(
app.mm,
app.BankKeeper,
app.configurator,
),
)
app.UpgradeKeeper.SetUpgradeHandler(
v427.UpgradeName,
v427.CreateUpgradeHandler(
app.mm,
app.StakingKeeper,
app.configurator,
@@ -1214,7 +1251,7 @@ func (app *MigalooApp) setupUpgradeHandlers() {
return
}

if upgradeInfo.Name == v421.UpgradeName {
if upgradeInfo.Name == v427.UpgradeName {
storeUpgrades := &storetypes.StoreUpgrades{
Added: []string{},
Deleted: []string{},
@@ -1262,7 +1299,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
paramsKeeper.Subspace(tokenfactorytypes.ModuleName).WithKeyTable(tokenfactorytypes.ParamKeyTable())
paramsKeeper.Subspace(icacontrollertypes.SubModuleName)
paramsKeeper.Subspace(icqtypes.ModuleName).WithKeyTable(icqtypes.ParamKeyTable())
paramsKeeper.Subspace(wasmtypes.ModuleName).WithKeyTable(wasmtypes.ParamKeyTable())
paramsKeeper.Subspace(wasmtypes.ModuleName)
paramsKeeper.Subspace(packetforwardtypes.ModuleName).WithKeyTable(packetforwardtypes.ParamKeyTable())
paramsKeeper.Subspace(alliancemoduletypes.ModuleName).WithKeyTable(alliancemoduletypes.ParamKeyTable())
paramsKeeper.Subspace(feeburnmoduletypes.ModuleName)
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v4

// UpgradeName defines the on-chain upgrade name for the Migaloo v4.2.1 upgrade.
// UpgradeName defines the on-chain upgrade name for the Migaloo v4.2.2 upgrade.
// this upgrade includes the fix for pfm
const (
UpgradeName = "v4.2.1"
UpgradeName = "v4.2.2"
)
File renamed without changes.
7 changes: 7 additions & 0 deletions app/upgrades/v4_2_4/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package v4

// UpgradeName defines the on-chain upgrade name for the Migaloo v4.2.4 upgrade.
// this upgrade includes the fix for pfm
const (
UpgradeName = "v4.2.4"
)
19 changes: 19 additions & 0 deletions app/upgrades/v4_2_4/upgrades.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package v4

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
stakingKeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
)

// CreateUpgradeHandler that migrates the chain from v4.2.2 to v4.2.4
func CreateUpgradeHandler(
mm *module.Manager,
_ *stakingKeeper.Keeper,
configurator module.Configurator,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
return mm.RunMigrations(ctx, configurator, fromVM)
}
}
7 changes: 7 additions & 0 deletions app/upgrades/v4_2_5/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package v4

// UpgradeName defines the on-chain upgrade name for the Migaloo v4.2.5 upgrade.
// this upgrade includes the fix for pfm
const (
UpgradeName = "v4.2.5"
)
19 changes: 19 additions & 0 deletions app/upgrades/v4_2_5/upgrades.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package v4

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
stakingKeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
)

// CreateUpgradeHandler that migrates the chain from v4.2.4 to v4.2.5
func CreateUpgradeHandler(
mm *module.Manager,
_ *stakingKeeper.Keeper,
configurator module.Configurator,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
return mm.RunMigrations(ctx, configurator, fromVM)
}
}
13 changes: 13 additions & 0 deletions app/upgrades/v4_2_6/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package v4

// UpgradeName defines the on-chain upgrade name for the Migaloo v4.2.6 upgrade.
// this upgrade includes the fix for pfm
const (
UpgradeName = "v4.2.6"
)

const (
Denom = "ibc/BC5C0BAFD19A5E4133FDA0F3E04AE1FBEE75A4A226554B2CBB021089FF2E1F8A"
DeadContract = "migaloo1qelh4gv5drg3yhj282l6n84a6wrrz033kwyak3ee3syvqg3mu3msgphpk4"
Foundation = "migaloo10zqfqhw44e6gvu97frjzcghunndskhu40uyztwu00y6dr9qxrz6qcjfrf7"
)
66 changes: 66 additions & 0 deletions app/upgrades/v4_2_6/upgrade_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
package v4_test

import (
"testing"

"cosmossdk.io/math"
v4 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_2_6"
sdk "github.com/cosmos/cosmos-sdk/types"

apptesting "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app"
"github.com/stretchr/testify/suite"
)

const (
MockDeadContractBalance = 1000000000000000000
)

type UpgradeTestSuite struct {
apptesting.KeeperTestHelper
}

func TestUpgradeTestSuite(t *testing.T) {
suite.Run(t, new(UpgradeTestSuite))
}

func (s *UpgradeTestSuite) MockBankBalances() {
deadContractAddr := sdk.MustAccAddressFromBech32(v4.DeadContract)

coins := sdk.NewCoins(
sdk.NewCoin(v4.Denom, math.NewInt(MockDeadContractBalance)),
)

// Mint coins to the dead contract
err := s.App.BankKeeper.MintCoins(s.Ctx, "mint", coins)
s.Require().NoError(err)
err = s.App.BankKeeper.SendCoinsFromModuleToAccount(s.Ctx, "mint", deadContractAddr, coins)
s.Require().NoError(err)

// require the balance is correct
balance := s.App.BankKeeper.GetAllBalances(s.Ctx, deadContractAddr)
s.Require().Equal(coins, balance)
}

// Ensures the test does not error out.
func (s *UpgradeTestSuite) TestUpgrade() {
s.Setup(s.T())
// == CREATE MOCK VESTING ACCOUNT ==
s.MockBankBalances()

// == UPGRADE ==
upgradeHeight := int64(5)

// Execute upgrade
s.ConfirmUpgradeSucceeded(v4.UpgradeName, upgradeHeight)

// Dead contract balance get drained
deadContractAddr := sdk.MustAccAddressFromBech32(v4.DeadContract)
contractBalance := s.App.BankKeeper.GetAllBalances(s.Ctx, deadContractAddr)
s.Require().Equal(int64(0), contractBalance.AmountOf(v4.Denom).Int64())

// Foundation balance is increased
foundationAddr := sdk.MustAccAddressFromBech32(v4.Foundation)
foundationBalance := s.App.BankKeeper.GetAllBalances(s.Ctx, foundationAddr)
s.T().Logf("balance: %v", foundationBalance)
s.Require().Equal(int64(MockDeadContractBalance), foundationBalance.AmountOf(v4.Denom).Int64()) // Add int64 cast
}
43 changes: 43 additions & 0 deletions app/upgrades/v4_2_6/upgrades.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package v4

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
bankKeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
)

// CreateUpgradeHandler that migrates the chain from v4.2.5 to v4.2.6
func CreateUpgradeHandler(
mm *module.Manager,
bankKeeper bankKeeper.Keeper,
configurator module.Configurator,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
// ignore the error if any
if err := migrateFundFromDeadContacts(ctx, bankKeeper); err != nil {
ctx.Logger().Error("migrateFundFromDeadContacts", "error", err)
}

return mm.RunMigrations(ctx, configurator, fromVM)
}
}

// migrate fund from dead contacts to foundation
func migrateFundFromDeadContacts(
ctx sdk.Context,
bankKeeper bankKeeper.Keeper,
) error {
deadContractAddr := sdk.MustAccAddressFromBech32(DeadContract)
foundationAddr := sdk.MustAccAddressFromBech32(Foundation)

// transfer token from dead contract to foundation

// Get all balances from the dead contract
allBalances := bankKeeper.GetAllBalances(ctx, deadContractAddr)
if allBalances.IsZero() {
return nil // Return early if no balances
}

return bankKeeper.SendCoins(ctx, deadContractAddr, foundationAddr, allBalances)
}
7 changes: 7 additions & 0 deletions app/upgrades/v4_2_7/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package v4

// UpgradeName defines the on-chain upgrade name for the Migaloo v4.2.7 upgrade.
// this upgrade includes the fix for pfm
const (
UpgradeName = "v4.2.7"
)
19 changes: 19 additions & 0 deletions app/upgrades/v4_2_7/upgrades.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package v4

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
stakingKeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
)

// CreateUpgradeHandler that migrates the chain from v4.2.6 to v4.2.7
func CreateUpgradeHandler(
mm *module.Manager,
_ *stakingKeeper.Keeper,
configurator module.Configurator,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
return mm.RunMigrations(ctx, configurator, fromVM)
}
}
Loading