feat: Wormchain v0.47

wormchain/TODO.md

@@ -0,0 +1,4 @@
+# TODO
+- Create Crisis Store in Upgrade: https://github.com/cosmos/cosmos-sdk/blob/release/v0.47.x/UPGRADING.md#xcrisis
+- Upgrade Handler for Consesus Params Keeper & Create New Store: https://github.com/cosmos/cosmos-sdk/blob/release/v0.47.x/UPGRADING.md#xconsensus
+- Make Protobuff Changes / Replacements: https://github.com/cosmos/cosmos-sdk/blob/release/v0.47.x/UPGRADING.md#protobuf

wormchain/app/apptesting/mock_key.go

@@ -1,9 +1,9 @@
 package apptesting
 
 import (
- "github.com/tendermint/tendermint/crypto"
- tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
- tmtypes "github.com/tendermint/tendermint/types"
+ "github.com/cometbft/cometbft/crypto"
+ tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+ tmtypes "github.com/cometbft/cometbft/types"
 
  cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
  "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"

wormchain/app/apptesting/test_helpers.go

@@ -6,6 +6,13 @@ import (
  "time"
 
  "github.com/CosmWasm/wasmd/x/wasm/keeper"
+ dbm "github.com/cometbft/cometbft-db"
+ abci "github.com/cometbft/cometbft/abci/types"
+ "github.com/cometbft/cometbft/crypto"
+ "github.com/cometbft/cometbft/crypto/ed25519"
+ "github.com/cometbft/cometbft/libs/log"
+ tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+ tmtypes "github.com/cometbft/cometbft/types"
  codectypes "github.com/cosmos/cosmos-sdk/codec/types"
  cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
  "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
@@ -14,14 +21,6 @@ import (
  banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
  stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
  "github.com/stretchr/testify/require"
- "github.com/tendermint/spm/cosmoscmd"
- abci "github.com/tendermint/tendermint/abci/types"
- "github.com/tendermint/tendermint/crypto"
- "github.com/tendermint/tendermint/crypto/ed25519"
- "github.com/tendermint/tendermint/libs/log"
- tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
- tmtypes "github.com/tendermint/tendermint/types"
- dbm "github.com/tendermint/tm-db"
  "github.com/wormhole-foundation/wormchain/app"
  appparams "github.com/wormhole-foundation/wormchain/app/params"
 )
@@ -41,8 +40,8 @@ func (ao EmptyBaseAppOptions) Get(_ string) interface{} {
 
 // DefaultConsensusParams defines the default Tendermint consensus params used
 // in wormApp testing.
-var DefaultConsensusParams = &abci.ConsensusParams{
- Block: &abci.BlockParams{
+var DefaultConsensusParams = &tmproto.ConsensusParams{
+ Block: &tmproto.BlockParams{
  MaxBytes: 200000,
  MaxGas: 2000000,
  },
@@ -121,7 +120,7 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs
 
 func setup(withGenesis bool, invCheckPeriod uint) (*app.App, app.GenesisState) {
  db := dbm.NewMemDB()
- encoding := cosmoscmd.MakeEncodingConfig(app.ModuleBasics)
+ encoding := app.MakeEncodingConfig()
  wormApp := app.New(
  log.NewNopLogger(),
  db,
@@ -134,10 +133,10 @@ func setup(withGenesis bool, invCheckPeriod uint) (*app.App, app.GenesisState) {
  EmptyBaseAppOptions{},
  )
  if withGenesis {
- return wormApp.(*app.App), app.NewDefaultGenesisState(encoding.Marshaler)
+ return wormApp, app.NewDefaultGenesisState(encoding.Marshaler)
  }
 
- return wormApp.(*app.App), app.GenesisState{}
+ return wormApp, app.GenesisState{}
 }
 
 func genesisStateWithValSet(t *testing.T,
@@ -184,6 +183,7 @@ func genesisStateWithValSet(t *testing.T,
  defaultStParams.MaxEntries,
  defaultStParams.HistoricalEntries,
  appparams.BondDenom,
+ defaultStParams.MinCommissionRate,
  )
 
  // set validators and delegations
@@ -213,6 +213,7 @@ func genesisStateWithValSet(t *testing.T,
  balances,
  totalSupply,
  []banktypes.Metadata{},
+ []banktypes.SendEnabled{}, // TODO: JOEL - MAY NEED TO ADD A DENOM TO THE SEND ENABLED
  )
 
  genesisState[banktypes.ModuleName] = app.AppCodec().MustMarshalJSON(bankGenesis)

wormchain/app/apptesting/test_suite.go

@@ -6,27 +6,27 @@ import (
  "testing"
  "time"
 
+ dbm "github.com/cometbft/cometbft-db"
+ abci "github.com/cometbft/cometbft/abci/types"
+ "github.com/cometbft/cometbft/crypto/ed25519"
+ "github.com/cometbft/cometbft/libs/log"
+ tmtypes "github.com/cometbft/cometbft/proto/tendermint/types"
  "github.com/cosmos/cosmos-sdk/baseapp"
  "github.com/cosmos/cosmos-sdk/client"
  cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
  "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
- "github.com/cosmos/cosmos-sdk/simapp"
  "github.com/cosmos/cosmos-sdk/store/rootmulti"
  sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/cosmos/cosmos-sdk/types/tx/signing"
  authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
  "github.com/cosmos/cosmos-sdk/x/authz"
+ testutil "github.com/cosmos/cosmos-sdk/x/bank/testutil"
  distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
  slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
- "github.com/cosmos/cosmos-sdk/x/staking"
+ stakinghelper "github.com/cosmos/cosmos-sdk/x/staking/testutil"
  stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
  "github.com/stretchr/testify/require"
  "github.com/stretchr/testify/suite"
- abci "github.com/tendermint/tendermint/abci/types"
- "github.com/tendermint/tendermint/crypto/ed25519"
- "github.com/tendermint/tendermint/libs/log"
- tmtypes "github.com/tendermint/tendermint/proto/tendermint/types"
- dbm "github.com/tendermint/tm-db"
 
  authzcodec "github.com/wormhole-foundation/wormchain/x/tokenfactory/types/authzcodec"
 
@@ -41,6 +41,8 @@ type KeeperTestHelper struct {
  Ctx sdk.Context
  QueryHelper *baseapp.QueryServiceTestHelper
  TestAccs []sdk.AccAddress
+
+ StakingHelper *stakinghelper.Helper
 }
 
 var (
@@ -57,6 +59,9 @@ func (s *KeeperTestHelper) Setup() {
  Ctx: s.Ctx,
  }
  s.TestAccs = CreateRandomAccounts(3)
+
+ s.StakingHelper = stakinghelper.NewHelper(s.Suite.T(), s.Ctx, s.App.StakingKeeper)
+ // TODO: JOEL - MAY NEED TO ADD THE DENOM?
 }
 
 func (s *KeeperTestHelper) SetupTestForInitGenesis() {
@@ -93,13 +98,13 @@ func (s *KeeperTestHelper) Commit() {
 
 // FundAcc funds target address with specified amount.
 func (s *KeeperTestHelper) FundAcc(acc sdk.AccAddress, amounts sdk.Coins) {
- err := simapp.FundAccount(s.App.BankKeeper, s.Ctx, acc, amounts)
+ err := testutil.FundAccount(s.App.BankKeeper, s.Ctx, acc, amounts)
  s.Require().NoError(err)
 }
 
 // FundModuleAcc funds target modules with specified amount.
 func (s *KeeperTestHelper) FundModuleAcc(moduleName string, amounts sdk.Coins) {
- err := simapp.FundModuleAccount(s.App.BankKeeper, s.Ctx, moduleName, amounts)
+ err := testutil.FundModuleAccount(s.App.BankKeeper, s.Ctx, moduleName, amounts)
  s.Require().NoError(err)
 }
 
@@ -117,12 +122,8 @@ func (s *KeeperTestHelper) SetupValidator(bondStatus stakingtypes.BondStatus) sd
 
  s.FundAcc(sdk.AccAddress(valAddr), selfBond)
 
- stakingHandler := staking.NewHandler(s.App.StakingKeeper)
- stakingCoin := sdk.NewCoin(sdk.DefaultBondDenom, selfBond[0].Amount)
- ZeroCommission := stakingtypes.NewCommissionRates(sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec())
- msg, err := stakingtypes.NewMsgCreateValidator(valAddr, valPub, stakingCoin, stakingtypes.Description{}, ZeroCommission, sdk.OneInt())
- s.Require().NoError(err)
- res, err := stakingHandler(s.Ctx, msg)
+ msg := s.StakingHelper.CreateValidatorMsg(valAddr, valPub, selfBond[0].Amount)
+ res, err := s.StakingHelper.CreateValidatorWithMsg(s.Ctx, msg)
  s.Require().NoError(err)
  s.Require().NotNil(res)
 
@@ -182,7 +183,8 @@ func (s *KeeperTestHelper) BeginNewBlockWithProposer(proposer sdk.ValAddress) {
  header := tmtypes.Header{Height: s.Ctx.BlockHeight() + 1, Time: newBlockTime}
  newCtx := s.Ctx.WithBlockTime(newBlockTime).WithBlockHeight(s.Ctx.BlockHeight() + 1)
  s.Ctx = newCtx
- lastCommitInfo := abci.LastCommitInfo{
+
+ lastCommitInfo := abci.CommitInfo{
  Votes: []abci.VoteInfo{{
  Validator: abci.Validator{Address: valAddr, Power: 1000},
  SignedLastBlock: true,
@@ -207,7 +209,7 @@ func (s *KeeperTestHelper) AllocateRewardsToValidator(valAddr sdk.ValAddress, re
 
  // allocate reward tokens to distribution module
  coins := sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, rewardAmt)}
- err := simapp.FundModuleAccount(s.App.BankKeeper, s.Ctx, distrtypes.ModuleName, coins)
+ err := testutil.FundModuleAccount(s.App.BankKeeper, s.Ctx, distrtypes.ModuleName, coins)
  s.Require().NoError(err)
 
  // allocate rewards to validator
@@ -263,7 +265,7 @@ func TestMessageAuthzSerialization(t *testing.T, msg sdk.Msg) {
 
  // Authz: Grant Msg
  typeURL := sdk.MsgTypeURL(msg)
- grant, err := authz.NewGrant(authz.NewGenericAuthorization(typeURL), someDate.Add(time.Hour))
+ grant, err := authz.NewGrant(someDate.Add(time.Hour), authz.NewGenericAuthorization(typeURL), nil)
  require.NoError(t, err)
 
  msgGrant := authz.MsgGrant{Granter: mockGranter, Grantee: mockGrantee, Grant: grant}

wormchain/app/encoding.go

@@ -0,0 +1,17 @@
+package app
+
+import (
+ "github.com/cosmos/cosmos-sdk/std"
+
+ "github.com/wormhole-foundation/wormchain/app/params"
+)
+
+// MakeEncodingConfig creates an EncodingConfig for testing
+func MakeEncodingConfig() params.EncodingConfig {
+ encodingConfig := params.MakeEncodingConfig()
+ std.RegisterLegacyAminoCodec(encodingConfig.Amino)
+ std.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+ ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
+ ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+ return encodingConfig
+}

wormchain/app/export.go

@@ -4,7 +4,7 @@ import (
  "encoding/json"
  "log"
 
- tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+ tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 
  servertypes "github.com/cosmos/cosmos-sdk/server/types"
  sdk "github.com/cosmos/cosmos-sdk/types"
@@ -15,10 +15,7 @@ import (
 
 // ExportAppStateAndValidators exports the state of the application for a genesis
 // file.
-func (app *App) ExportAppStateAndValidators(
- forZeroHeight bool, jailAllowedAddrs []string,
-) (servertypes.ExportedApp, error) {
-
+func (app *App) ExportAppStateAndValidators(forZeroHeight bool, jailAllowedAddrs []string, modulesToExport []string) (servertypes.ExportedApp, error) {
  // as if they could withdraw from the start of the next block
  ctx := app.NewContext(true, tmproto.Header{Height: app.LastBlockHeight()})
 
@@ -30,22 +27,19 @@ func (app *App) ExportAppStateAndValidators(
  app.prepForZeroHeightGenesis(ctx, jailAllowedAddrs)
  }
 
- genState := app.mm.ExportGenesis(ctx, app.appCodec)
+ genState := app.mm.ExportGenesisForModules(ctx, app.appCodec, modulesToExport)
  appState, err := json.MarshalIndent(genState, "", " ")
  if err != nil {
  return servertypes.ExportedApp{}, err
  }
 
  validators, err := staking.WriteValidators(ctx, app.StakingKeeper)
- if err != nil {
- return servertypes.ExportedApp{}, err
- }
  return servertypes.ExportedApp{
  AppState: appState,
  Validators: validators,
  Height: height,
  ConsensusParams: app.BaseApp.GetConsensusParams(ctx),
- }, nil
+ }, err
 }
 
 // prepare for fresh start at zero height

wormchain/app/openapiconsole/console.go

@@ -0,0 +1,27 @@
+package openapiconsole
+
+import (
+ "embed"
+ "html/template"
+ "net/http"
+)
+
+// index.tpl is the template file for the OpenAPI console
+//
+//go:embed index.tpl
+var index embed.FS
+
+// Handler returns an http handler that servers OpenAPI console for an OpenAPI spec at specURL.
+func Handler(title, specURL string) http.HandlerFunc {
+ t, _ := template.ParseFS(index, "index.tpl")
+
+ return func(w http.ResponseWriter, _ *http.Request) {
+ t.Execute(w, struct { //nolint:errcheck
+ Title string
+ URL string
+ }{
+ title,
+ specURL,
+ })
+ }
+}

wormchain/app/openapiconsole/index.tpl

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <meta charset="utf-8" />
+ <title>{{ .Title }}</title>
+ <link rel="stylesheet" type="text/css" href="//unpkg.com/swagger-ui-dist@3.40.0/swagger-ui.css" />
+ <link rel="icon" type="image/png" href="//unpkg.com/swagger-ui-dist@3.40.0/favicon-16x16.png" />
+ </head>
+ <body>
+ <div id="swagger-ui"></div>
+
+ <script src="//unpkg.com/swagger-ui-dist@3.40.0/swagger-ui-bundle.js"></script>
+ <script>
+ // init Swagger for faucet's openapi.yml.
+ window.onload = function() {
+ window.ui = SwaggerUIBundle({
+ url: {{ .URL }},
+ dom_id: "#swagger-ui",
+ deepLinking: true,
+ layout: "BaseLayout",
+ });
+ }
+ </script>
+ </body>
+</html>

wormchain/app/params/encoding.go

@@ -0,0 +1,32 @@
+package params
+
+import (
+ "github.com/cosmos/cosmos-sdk/client"
+ "github.com/cosmos/cosmos-sdk/codec"
+ "github.com/cosmos/cosmos-sdk/codec/types"
+ "github.com/cosmos/cosmos-sdk/x/auth/tx"
+)
+
+// EncodingConfig specifies the concrete encoding types to use for a given app.
+// This is provided for compatibility between protobuf and amino implementations.
+type EncodingConfig struct {
+ InterfaceRegistry types.InterfaceRegistry
+ Marshaler codec.Codec
+ TxConfig client.TxConfig
+ Amino *codec.LegacyAmino
+}
+
+// makeEncodingConfig creates an EncodingConfig for an amino based test configuration.
+func MakeEncodingConfig() EncodingConfig {
+ amino := codec.NewLegacyAmino()
+ interfaceRegistry := types.NewInterfaceRegistry()
+ marshaler := codec.NewProtoCodec(interfaceRegistry)
+ txCfg := tx.NewTxConfig(marshaler, tx.DefaultSignModes)
+
+ return EncodingConfig{
+ InterfaceRegistry: interfaceRegistry,
+ Marshaler: marshaler,
+ TxConfig: txCfg,
+ Amino: amino,
+ }
+}

wormchain/app/v2_23_0_upgrade.go

@@ -6,7 +6,7 @@ import (
  "github.com/cosmos/cosmos-sdk/types/module"
  upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
- packetforwardtypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types"
+ packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
  ibccomposabilitytypes "github.com/wormhole-foundation/wormchain/x/ibc-composability-mw/types"
  ibchookstypes "github.com/wormhole-foundation/wormchain/x/ibc-hooks/types"
  tokenfactorytypes "github.com/wormhole-foundation/wormchain/x/tokenfactory/types"