Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
kkast committed Apr 10, 2024
1 parent ecf3f7a commit a806d66
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 2 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_5_2"
"github.com/notional-labs/composable/v6/app/upgrades/v6_5_3"

// 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_5_2.Upgrade}
Upgrades = []upgrades.Upgrade{v6_5_3.Upgrade}
Forks = []upgrades.Fork{}
)

Expand Down
20 changes: 20 additions & 0 deletions app/upgrades/v6_5_3/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package v6_5_3

import (
store "github.com/cosmos/cosmos-sdk/store/types"
"github.com/notional-labs/composable/v6/app/upgrades"
)

const (
// UpgradeName defines the on-chain upgrade name for the composable upgrade.
UpgradeName = "v6_5_3"
)

var Upgrade = upgrades.Upgrade{
UpgradeName: UpgradeName,
CreateUpgradeHandler: CreateUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{
Added: []string{},
Deleted: []string{},
},
}
36 changes: 36 additions & 0 deletions app/upgrades/v6_5_3/upgrade.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package v6_5_3

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/cosmos/cosmos-sdk/x/gov/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/cosmos/cosmos-sdk/codec"
"github.com/notional-labs/composable/v6/app/keepers"

"github.com/notional-labs/composable/v6/app/upgrades"
)

func CreateUpgradeHandler(
mm *module.Manager,
configurator module.Configurator,
_ upgrades.BaseAppParamManager,
_ codec.Codec,
keepers *keepers.AppKeepers,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {

Check failure on line 23 in app/upgrades/v6_5_3/upgrade.go

View workflow job for this annotation

GitHub Actions / lint

File is not `gofumpt`-ed with `-extra` (gofumpt)
BrokenProposals := [3]uint64{2, 6, 11}
// gov module store
store := ctx.KVStore(keepers.GetKVStoreKey()["gov"])

for _, proposalID := range BrokenProposals {
bz := store.Get(types.ProposalKey(proposalID))
if bz != nil {
store.Delete(types.ProposalKey(proposalID))
}
}
return mm.RunMigrations(ctx, configurator, vm)
}
}
1 change: 1 addition & 0 deletions x/mint/keeper/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ func NewKeeper(
bankKeeper: bk,
feeCollectorName: feeCollectorName,
authority: authority,
accountKeeper: ak,
}
}

Expand Down

0 comments on commit a806d66

Please sign in to comment.