From 0e7984ada0b6b8b1c29e260661f0d21324076810 Mon Sep 17 00:00:00 2001 From: _dssei_ Date: Tue, 3 Dec 2024 14:35:38 -0800 Subject: [PATCH] remove token factory config --- app/app.go | 6 ---- app/test_helpers.go | 4 --- x/tokenfactory/keeper/config.go | 29 ------------------ x/tokenfactory/keeper/createdenom.go | 2 +- x/tokenfactory/keeper/createdenom_test.go | 37 ++++++++++------------- x/tokenfactory/keeper/keeper.go | 7 ++--- x/tokenfactory/keeper/migrations_test.go | 4 +-- 7 files changed, 21 insertions(+), 68 deletions(-) delete mode 100644 x/tokenfactory/keeper/config.go diff --git a/app/app.go b/app/app.go index b81f37b549..2c0f204c32 100644 --- a/app/app.go +++ b/app/app.go @@ -534,11 +534,6 @@ func New( ).SetHooks(epochmoduletypes.NewMultiEpochHooks( app.MintKeeper.Hooks())) - tokenFactoryConfig, err := tokenfactorykeeper.ReadConfig(appOpts) - if err != nil { - panic(fmt.Sprintf("error reading token factory config due to %s", err)) - } - app.TokenFactoryKeeper = tokenfactorykeeper.NewKeeper( appCodec, app.keys[tokenfactorytypes.StoreKey], @@ -546,7 +541,6 @@ func New( app.AccountKeeper, app.BankKeeper.(bankkeeper.BaseKeeper).WithMintCoinsRestriction(tokenfactorytypes.NewTokenFactoryDenomMintCoinsRestriction()), app.DistrKeeper, - tokenFactoryConfig, ) // The last arguments can contain custom message handlers, and custom query handlers, diff --git a/app/test_helpers.go b/app/test_helpers.go index 5e36a976a5..16c1c80c1f 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -15,7 +15,6 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" "github.com/cosmos/cosmos-sdk/x/staking/teststaking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - tokenfactorykeeper "github.com/sei-protocol/sei-chain/x/tokenfactory/keeper" "github.com/stretchr/testify/suite" abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/config" @@ -56,9 +55,6 @@ func (t TestAppOpts) Get(s string) interface{} { if s == FlagSCEnable { return t.useSc } - if s == tokenfactorykeeper.FlagDenomAllowListMaxSize { - return 3 - } return nil } diff --git a/x/tokenfactory/keeper/config.go b/x/tokenfactory/keeper/config.go deleted file mode 100644 index 4fa177429c..0000000000 --- a/x/tokenfactory/keeper/config.go +++ /dev/null @@ -1,29 +0,0 @@ -package keeper - -import ( - servertypes "github.com/cosmos/cosmos-sdk/server/types" - "github.com/spf13/cast" -) - -type Config struct { - DenomAllowListMaxSize int `mapstructure:"denom_allow_list_max_size"` -} - -var DefaultConfig = Config{ - DenomAllowListMaxSize: 2000, -} - -const ( - FlagDenomAllowListMaxSize = "tokenfactory.denom_allow_list_max_size" -) - -func ReadConfig(opts servertypes.AppOptions) (Config, error) { - cfg := DefaultConfig // copy - var err error - if v := opts.Get(FlagDenomAllowListMaxSize); v != nil { - if cfg.DenomAllowListMaxSize, err = cast.ToIntE(v); err != nil { - return cfg, err - } - } - return cfg, nil -} diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go index cdc3549815..b9d2ec43c1 100644 --- a/x/tokenfactory/keeper/createdenom.go +++ b/x/tokenfactory/keeper/createdenom.go @@ -92,7 +92,7 @@ func (k Keeper) validateAllowListSize(allowList *banktypes.AllowList) error { return types.ErrAllowListUndefined } - if len(allowList.Addresses) > k.config.DenomAllowListMaxSize { + if len(allowList.Addresses) > DenomAllowListMaxSize { return types.ErrAllowListTooLarge } return nil diff --git a/x/tokenfactory/keeper/createdenom_test.go b/x/tokenfactory/keeper/createdenom_test.go index e24cb54315..4b3394f89c 100644 --- a/x/tokenfactory/keeper/createdenom_test.go +++ b/x/tokenfactory/keeper/createdenom_test.go @@ -51,6 +51,10 @@ func (suite *KeeperTestSuite) TestMsgCreateDenom() { } func (suite *KeeperTestSuite) TestCreateDenom() { + largeAllowList := make([]string, 2001) + for i := 0; i < 2001; i++ { + largeAllowList[i] = suite.TestAccs[i%len(suite.TestAccs)].String() + } for _, tc := range []struct { desc string setup func() @@ -99,16 +103,10 @@ func (suite *KeeperTestSuite) TestCreateDenom() { valid: false, }, { - desc: "list is too large", - subdenom: "test", - allowList: &banktypes.AllowList{ - Addresses: []string{ - suite.TestAccs[0].String(), - suite.TestAccs[1].String(), - suite.TestAccs[2].String(), - suite.TestAccs[2].String()}, - }, - valid: false, + desc: "list is too large", + subdenom: "test", + allowList: &banktypes.AllowList{Addresses: largeAllowList}, + valid: false, }, } { suite.Run(fmt.Sprintf("Case %s", tc.desc), func() { @@ -158,6 +156,10 @@ func (suite *KeeperTestSuite) TestCreateDenom() { } func (suite *KeeperTestSuite) TestUpdateDenom() { + largeAllowList := make([]string, 2001) + for i := 0; i < 2001; i++ { + largeAllowList[i] = suite.TestAccs[0].String() + } for _, tc := range []struct { desc string setup func() @@ -222,17 +224,10 @@ func (suite *KeeperTestSuite) TestUpdateDenom() { types.NewMsgCreateDenom(suite.TestAccs[0].String(), "TLRG")) suite.Require().NoError(err) }, - denom: fmt.Sprintf("factory/%s/TLRG", suite.TestAccs[0].String()), - allowList: &banktypes.AllowList{ - Addresses: []string{ - suite.TestAccs[0].String(), - suite.TestAccs[1].String(), - suite.TestAccs[2].String(), - suite.TestAccs[2].String(), - }, - }, - valid: false, - errMsg: "allowlist too large", + denom: fmt.Sprintf("factory/%s/TLRG", suite.TestAccs[0].String()), + allowList: &banktypes.AllowList{Addresses: largeAllowList}, + valid: false, + errMsg: "allowlist too large", }, { desc: "denom having invalid characters", diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index ed4ecc02ad..223e069e4c 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -15,6 +15,8 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) +const DenomAllowListMaxSize = 2000 + type ( Keeper struct { storeKey sdk.StoreKey @@ -24,8 +26,6 @@ type ( accountKeeper types.AccountKeeper bankKeeper types.BankKeeper distrKeeper types.DistrKeeper - - config Config } ) @@ -37,7 +37,6 @@ func NewKeeper( accountKeeper types.AccountKeeper, bankKeeper types.BankKeeper, distrKeeper types.DistrKeeper, - config Config, ) Keeper { if !paramSpace.HasKeyTable() { paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable()) @@ -50,8 +49,6 @@ func NewKeeper( accountKeeper: accountKeeper, bankKeeper: bankKeeper, distrKeeper: distrKeeper, - - config: config, } } diff --git a/x/tokenfactory/keeper/migrations_test.go b/x/tokenfactory/keeper/migrations_test.go index e0db6d88b0..71a84e87cc 100644 --- a/x/tokenfactory/keeper/migrations_test.go +++ b/x/tokenfactory/keeper/migrations_test.go @@ -59,7 +59,7 @@ func TestMigrate2to3(t *testing.T) { store.Set(oldCreatorSpecificPrefix, []byte("garbage value whitelist creator")) require.True(t, store.Has(oldCreateDenomFeeWhitelistPrefix)) require.True(t, store.Has(oldCreatorSpecificPrefix)) - newKeeper := NewKeeper(cdc, storeKey, paramsSubspace, nil, bankkeeper.NewBaseKeeper(cdc, bankstorekey, nil, paramsSubspace, nil), nil, Config{DenomAllowListMaxSize: 100}) + newKeeper := NewKeeper(cdc, storeKey, paramsSubspace, nil, bankkeeper.NewBaseKeeper(cdc, bankstorekey, nil, paramsSubspace, nil), nil) m := NewMigrator(newKeeper) err := m.Migrate2to3(ctx) require.Nil(t, err) @@ -80,7 +80,7 @@ func TestMigrate2to3(t *testing.T) { func TestMigrate3To4(t *testing.T) { // Test migration with all metadata denom metadata := banktypes.Metadata{Description: sdk.DefaultBondDenom, Base: sdk.DefaultBondDenom, Display: sdk.DefaultBondDenom, Name: sdk.DefaultBondDenom, Symbol: sdk.DefaultBondDenom} - keeper := NewKeeper(nil, nil, typesparams.Subspace{}, nil, nil, nil, Config{DenomAllowListMaxSize: 100}) + keeper := NewKeeper(nil, nil, typesparams.Subspace{}, nil, nil, nil) m := NewMigrator(keeper) m.SetMetadata(&metadata) require.Equal(t, sdk.DefaultBondDenom, metadata.Display)