From f8d02584342d950a6fa0cf19e6cb33ddf9a3ce1c Mon Sep 17 00:00:00 2001 From: tom Date: Thu, 9 Feb 2023 11:00:14 -0300 Subject: [PATCH 1/4] chore(imp) refactor to use BaseDenom --- app/ante/cosmos/min_price_test.go | 4 +- app/ante/cosmos/utils_test.go | 6 +- app/ante/utils_test.go | 4 +- app/app_test.go | 3 +- app/test_helpers.go | 9 +- go.mod | 2 +- indexer/kv_indexer_test.go | 3 +- rpc/backend/backend_suite_test.go | 3 +- testutil/integration.go | 4 +- x/claims/genesis_test.go | 8 +- .../keeper/ibc_callbacks_ibc_suite_test.go | 4 +- x/claims/keeper/integration_test.go | 119 +++++++++--------- x/claims/migrations/v3/types/params.go | 3 +- x/claims/types/params.go | 5 +- .../keeper/ibc_callbacks_integration_test.go | 19 +-- x/erc20/keeper/ibc_callbacks_test.go | 11 +- x/erc20/keeper/integration_test.go | 7 +- x/evm/types/params.go | 8 +- x/ibc/transfer/keeper/keeper_test.go | 5 +- x/recovery/keeper/keeper_test.go | 3 +- x/revenue/keeper/integration_test.go | 3 +- x/revenue/keeper/keeper_test.go | 4 +- x/vesting/keeper/integration_test.go | 8 +- 23 files changed, 127 insertions(+), 118 deletions(-) diff --git a/app/ante/cosmos/min_price_test.go b/app/ante/cosmos/min_price_test.go index 420cda9de0..7f3437fdb5 100644 --- a/app/ante/cosmos/min_price_test.go +++ b/app/ante/cosmos/min_price_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" cosmosante "github.com/evmos/evmos/v11/app/ante/cosmos" - evmtypes "github.com/evmos/evmos/v11/x/evm/types" + "github.com/evmos/evmos/v11/utils" ) var execTypes = []struct { @@ -18,7 +18,7 @@ var execTypes = []struct { } func (suite *AnteTestSuite) TestMinGasPriceDecorator() { - denom := evmtypes.DefaultEVMDenom + denom := utils.BaseDenom testMsg := banktypes.MsgSend{ FromAddress: "evmos1x8fhpj9nmhqk8z9kpgjt95ck2xwyue0ptzkucp", ToAddress: "evmos1dx67l23hz9l0k9hcher8xz04uj7wf3yu26l2yn", diff --git a/app/ante/cosmos/utils_test.go b/app/ante/cosmos/utils_test.go index 5f64da66a7..5b0551bea3 100644 --- a/app/ante/cosmos/utils_test.go +++ b/app/ante/cosmos/utils_test.go @@ -10,16 +10,18 @@ import ( "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/evmos/evmos/v11/ethereum/eip712" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + "github.com/evmos/evmos/v11/app" ante "github.com/evmos/evmos/v11/app/ante" "github.com/evmos/evmos/v11/encoding" + "github.com/evmos/evmos/v11/ethereum/eip712" + "github.com/evmos/evmos/v11/utils" "github.com/evmos/evmos/v11/x/evm/statedb" evmtypes "github.com/evmos/evmos/v11/x/evm/types" feemarkettypes "github.com/evmos/evmos/v11/x/feemarket/types" @@ -79,7 +81,7 @@ func (suite *AnteTestSuite) SetupTest() { }) suite.ctx = suite.app.BaseApp.NewContext(checkTx, tmproto.Header{Height: 2, ChainID: "evmos_9000-1", Time: time.Now().UTC()}) - suite.ctx = suite.ctx.WithMinGasPrices(sdk.NewDecCoins(sdk.NewDecCoin(evmtypes.DefaultEVMDenom, sdk.OneInt()))) + suite.ctx = suite.ctx.WithMinGasPrices(sdk.NewDecCoins(sdk.NewDecCoin(utils.BaseDenom, sdk.OneInt()))) suite.ctx = suite.ctx.WithBlockGasMeter(sdk.NewGasMeter(1000000000000000000)) suite.app.EvmKeeper.WithChainID(suite.ctx) diff --git a/app/ante/utils_test.go b/app/ante/utils_test.go index 6f25afe5b2..c0a965bb04 100644 --- a/app/ante/utils_test.go +++ b/app/ante/utils_test.go @@ -18,7 +18,7 @@ import ( "github.com/evmos/evmos/v11/app" "github.com/evmos/evmos/v11/crypto/ethsecp256k1" "github.com/evmos/evmos/v11/encoding" - claimstypes "github.com/evmos/evmos/v11/x/claims/types" + "github.com/evmos/evmos/v11/utils" evmtypes "github.com/evmos/evmos/v11/x/evm/types" feemarkettypes "github.com/evmos/evmos/v11/x/feemarket/types" abci "github.com/tendermint/tendermint/abci/types" @@ -72,7 +72,7 @@ func (suite *AnteTestSuite) SetupTest() { LastResultsHash: tmhash.Sum([]byte("last_result")), }) - suite.denom = claimstypes.DefaultClaimsDenom + suite.denom = utils.BaseDenom evmParams := suite.app.EvmKeeper.GetParams(suite.ctx) evmParams.EvmDenom = suite.denom _ = suite.app.EvmKeeper.SetParams(suite.ctx, evmParams) diff --git a/app/app_test.go b/app/app_test.go index 20a5d1ee96..a16c6deb31 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -21,7 +21,6 @@ import ( "github.com/evmos/evmos/v11/encoding" "github.com/evmos/evmos/v11/utils" - claimstypes "github.com/evmos/evmos/v11/x/claims/types" ) func TestEvmosExport(t *testing.T) { @@ -39,7 +38,7 @@ func TestEvmosExport(t *testing.T) { acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), 0, 0) balance := banktypes.Balance{ Address: acc.GetAddress().String(), - Coins: sdk.NewCoins(sdk.NewCoin(claimstypes.DefaultParams().ClaimsDenom, sdk.NewInt(100000000000000))), + Coins: sdk.NewCoins(sdk.NewCoin(utils.BaseDenom, sdk.NewInt(100000000000000))), } db := dbm.NewMemDB() diff --git a/app/test_helpers.go b/app/test_helpers.go index e1db194634..e64d3ca8f7 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -36,7 +36,6 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - claimstypes "github.com/evmos/evmos/v11/x/claims/types" "github.com/evmos/evmos/v11/encoding" feemarkettypes "github.com/evmos/evmos/v11/x/feemarket/types" @@ -97,7 +96,7 @@ func Setup( acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), 0, 0) balance := banktypes.Balance{ Address: acc.GetAddress().String(), - Coins: sdk.NewCoins(sdk.NewCoin(claimstypes.DefaultParams().ClaimsDenom, sdk.NewInt(100000000000000))), + Coins: sdk.NewCoins(sdk.NewCoin(utils.BaseDenom, sdk.NewInt(100000000000000))), } db := dbm.NewMemDB() @@ -171,7 +170,7 @@ func GenesisStateWithValSet(app *Evmos, genesisState simapp.GenesisState, } // set validators and delegations stakingparams := stakingtypes.DefaultParams() - stakingparams.BondDenom = claimstypes.DefaultGenesis().Params.GetClaimsDenom() + stakingparams.BondDenom = utils.BaseDenom stakingGenesis := stakingtypes.NewGenesisState(stakingparams, validators, delegations) genesisState[stakingtypes.ModuleName] = app.AppCodec().MustMarshalJSON(stakingGenesis) @@ -183,13 +182,13 @@ func GenesisStateWithValSet(app *Evmos, genesisState simapp.GenesisState, for range delegations { // add delegated tokens to total supply - totalSupply = totalSupply.Add(sdk.NewCoin(claimstypes.DefaultParams().ClaimsDenom, bondAmt)) + totalSupply = totalSupply.Add(sdk.NewCoin(utils.BaseDenom, bondAmt)) } // add bonded amount to bonded pool module account balances = append(balances, banktypes.Balance{ Address: authtypes.NewModuleAddress(stakingtypes.BondedPoolName).String(), - Coins: sdk.Coins{sdk.NewCoin(claimstypes.DefaultParams().ClaimsDenom, bondAmt)}, + Coins: sdk.Coins{sdk.NewCoin(utils.BaseDenom, bondAmt)}, }) // update total supply diff --git a/go.mod b/go.mod index d0a75563a5..0009dc4b62 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/btcsuite/btcd v0.22.2 github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce github.com/cosmos/cosmos-proto v1.0.0-beta.1 - github.com/cosmos/cosmos-sdk v0.46.8 + github.com/cosmos/cosmos-sdk v0.46.9 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogoproto v1.4.4 github.com/cosmos/ibc-go/v6 v6.1.0 diff --git a/indexer/kv_indexer_test.go b/indexer/kv_indexer_test.go index 393e78e027..ffb1b5588c 100644 --- a/indexer/kv_indexer_test.go +++ b/indexer/kv_indexer_test.go @@ -13,6 +13,7 @@ import ( evmenc "github.com/evmos/evmos/v11/encoding" "github.com/evmos/evmos/v11/indexer" "github.com/evmos/evmos/v11/tests" + "github.com/evmos/evmos/v11/utils" "github.com/evmos/evmos/v11/x/evm/types" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" @@ -40,7 +41,7 @@ func TestKVIndexer(t *testing.T) { clientCtx := client.Context{}.WithTxConfig(encodingConfig.TxConfig).WithCodec(encodingConfig.Codec) // build cosmos-sdk wrapper tx - tmTx, err := tx.BuildTx(clientCtx.TxConfig.NewTxBuilder(), types.DefaultEVMDenom) + tmTx, err := tx.BuildTx(clientCtx.TxConfig.NewTxBuilder(), utils.BaseDenom) require.NoError(t, err) txBz, err := clientCtx.TxConfig.TxEncoder()(tmTx) require.NoError(t, err) diff --git a/rpc/backend/backend_suite_test.go b/rpc/backend/backend_suite_test.go index ef7acecfca..1b4ed8815a 100644 --- a/rpc/backend/backend_suite_test.go +++ b/rpc/backend/backend_suite_test.go @@ -25,6 +25,7 @@ import ( "github.com/evmos/evmos/v11/rpc/backend/mocks" rpctypes "github.com/evmos/evmos/v11/rpc/types" "github.com/evmos/evmos/v11/tests" + "github.com/evmos/evmos/v11/utils" evmtypes "github.com/evmos/evmos/v11/x/evm/types" ) @@ -184,7 +185,7 @@ func (suite *BackendTestSuite) signAndEncodeEthTx(msgEthereumTx *evmtypes.MsgEth err := msgEthereumTx.Sign(ethSigner, signer) suite.Require().NoError(err) - tx, err := msgEthereumTx.BuildTx(suite.backend.clientCtx.TxConfig.NewTxBuilder(), evmtypes.DefaultEVMDenom) + tx, err := msgEthereumTx.BuildTx(suite.backend.clientCtx.TxConfig.NewTxBuilder(), utils.BaseDenom) suite.Require().NoError(err) txEncoder := suite.backend.clientCtx.TxConfig.TxEncoder() diff --git a/testutil/integration.go b/testutil/integration.go index b1b381d1eb..552fe11522 100644 --- a/testutil/integration.go +++ b/testutil/integration.go @@ -31,6 +31,7 @@ import ( "github.com/evmos/evmos/v11/crypto/ethsecp256k1" "github.com/evmos/evmos/v11/encoding" + "github.com/evmos/evmos/v11/utils" "github.com/evmos/evmos/v11/app" ) @@ -108,13 +109,12 @@ func DeliverTx( ) (abci.ResponseDeliverTx, error) { encodingConfig := encoding.MakeConfig(app.ModuleBasics) accountAddress := sdk.AccAddress(priv.PubKey().Address().Bytes()) - denom := appEvmos.ClaimsKeeper.GetParams(ctx).ClaimsDenom txBuilder := encodingConfig.TxConfig.NewTxBuilder() txBuilder.SetGasLimit(100_000_000) amt, _ := sdk.NewIntFromString("1000000000000000000000") - txBuilder.SetFeeAmount(sdk.Coins{{Denom: denom, Amount: amt}}) + txBuilder.SetFeeAmount(sdk.Coins{{Denom: utils.BaseDenom, Amount: amt}}) if err := txBuilder.SetMsgs(msgs...); err != nil { return abci.ResponseDeliverTx{}, err } diff --git a/x/claims/genesis_test.go b/x/claims/genesis_test.go index e2dbdb9372..796f99f284 100644 --- a/x/claims/genesis_test.go +++ b/x/claims/genesis_test.go @@ -12,13 +12,13 @@ import ( tmversion "github.com/tendermint/tendermint/proto/tendermint/version" "github.com/tendermint/tendermint/version" - "github.com/evmos/evmos/v11/tests" - feemarkettypes "github.com/evmos/evmos/v11/x/feemarket/types" - "github.com/evmos/evmos/v11/app" + "github.com/evmos/evmos/v11/tests" "github.com/evmos/evmos/v11/testutil" + "github.com/evmos/evmos/v11/utils" "github.com/evmos/evmos/v11/x/claims" "github.com/evmos/evmos/v11/x/claims/types" + feemarkettypes "github.com/evmos/evmos/v11/x/feemarket/types" ) type GenesisTestSuite struct { @@ -66,7 +66,7 @@ func (suite *GenesisTestSuite) SetupTest() { suite.Require().NoError(err) stakingParams := suite.app.StakingKeeper.GetParams(suite.ctx) - stakingParams.BondDenom = params.GetClaimsDenom() + stakingParams.BondDenom = utils.BaseDenom suite.app.StakingKeeper.SetParams(suite.ctx, stakingParams) suite.genesis = *types.DefaultGenesis() diff --git a/x/claims/keeper/ibc_callbacks_ibc_suite_test.go b/x/claims/keeper/ibc_callbacks_ibc_suite_test.go index 8602f878f2..21a5265342 100644 --- a/x/claims/keeper/ibc_callbacks_ibc_suite_test.go +++ b/x/claims/keeper/ibc_callbacks_ibc_suite_test.go @@ -50,7 +50,7 @@ func (suite *IBCTestingSuite) SetupTest() { // Mint coins to pay tx fees amt, ok := sdk.NewIntFromString("1000000000000000000000") suite.Require().True(ok) - coinEvmos := sdk.NewCoin(types.DefaultClaimsDenom, amt) + coinEvmos := sdk.NewCoin(utils.BaseDenom, amt) coins := sdk.NewCoins(coinEvmos) err := evmosChainA.BankKeeper.MintCoins(suite.chainA.GetContext(), inflationtypes.ModuleName, coins) @@ -64,7 +64,7 @@ func (suite *IBCTestingSuite) SetupTest() { suite.Require().NoError(err) evmParams := evmosChainA.EvmKeeper.GetParams(suite.chainA.GetContext()) - evmParams.EvmDenom = types.DefaultClaimsDenom + evmParams.EvmDenom = utils.BaseDenom err = evmosChainA.EvmKeeper.SetParams(suite.chainA.GetContext(), evmParams) suite.Require().NoError(err) err = evmosChainB.EvmKeeper.SetParams(suite.chainB.GetContext(), evmParams) diff --git a/x/claims/keeper/integration_test.go b/x/claims/keeper/integration_test.go index 7ca66e91b2..2132e5435d 100644 --- a/x/claims/keeper/integration_test.go +++ b/x/claims/keeper/integration_test.go @@ -9,6 +9,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" + ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" . "github.com/onsi/ginkgo/v2" @@ -22,7 +23,8 @@ import ( distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - ethtypes "github.com/ethereum/go-ethereum/core/types" + abci "github.com/tendermint/tendermint/abci/types" + "github.com/evmos/evmos/v11/app" "github.com/evmos/evmos/v11/contracts" "github.com/evmos/evmos/v11/crypto/ethsecp256k1" @@ -30,40 +32,39 @@ import ( "github.com/evmos/evmos/v11/server/config" "github.com/evmos/evmos/v11/tests" "github.com/evmos/evmos/v11/testutil" + "github.com/evmos/evmos/v11/utils" "github.com/evmos/evmos/v11/x/claims/types" evm "github.com/evmos/evmos/v11/x/evm/types" incentivestypes "github.com/evmos/evmos/v11/x/incentives/types" inflationtypes "github.com/evmos/evmos/v11/x/inflation/types" - abci "github.com/tendermint/tendermint/abci/types" ) -var defaultTxFee = sdk.NewCoin(evm.DefaultEVMDenom, sdk.NewInt(1_000_000_000_000_000)) // 0.001 EVMOS +var defaultTxFee = sdk.NewCoin(utils.BaseDenom, sdk.NewInt(1_000_000_000_000_000)) // 0.001 EVMOS var _ = Describe("Claiming", Ordered, func() { claimsAddr := s.app.AccountKeeper.GetModuleAddress(types.ModuleName) distrAddr := s.app.AccountKeeper.GetModuleAddress(distrtypes.ModuleName) stakeDenom := stakingtypes.DefaultParams().BondDenom - claimsDenom := types.DefaultClaimsDenom accountCount := 4 actionValue := sdk.NewInt(int64(math.Pow10(5) * 10)) claimValue := actionValue.MulRaw(4) - totalClaimsAmount := sdk.NewCoin(claimsDenom, claimValue.MulRaw(int64(accountCount))) + totalClaimsAmount := sdk.NewCoin(utils.BaseDenom, claimValue.MulRaw(int64(accountCount))) // account initial balances initClaimsAmount := sdk.NewInt(types.GenesisDust) - initEvmAmount := sdk.NewInt(int64(math.Pow10(18) * 2)) + initBalanceAmount := sdk.NewInt(int64(math.Pow10(18) * 2)) initStakeAmount := sdk.NewInt(int64(math.Pow10(10) * 2)) - delegateAmount := sdk.NewCoin(claimsDenom, sdk.NewInt(1)) + delegateAmount := sdk.NewCoin(utils.BaseDenom, sdk.NewInt(1)) initBalance := sdk.NewCoins( - sdk.NewCoin(claimsDenom, initClaimsAmount.Add(initEvmAmount)), // claimsDenom == evmDenom + sdk.NewCoin(utils.BaseDenom, initClaimsAmount.Add(initBalanceAmount)), // claimsDenom == evmDenom ) // account for creating the governance proposals initClaimsAmount0 := sdk.NewInt(int64(math.Pow10(18) * 2)) initBalance0 := sdk.NewCoins( sdk.NewCoin(stakeDenom, initStakeAmount), - sdk.NewCoin(evm.DefaultEVMDenom, initEvmAmount.Add(initClaimsAmount0)), // claimsDenom == evmDenom + sdk.NewCoin(utils.BaseDenom, initBalanceAmount.Add(initClaimsAmount0)), // claimsDenom == evmDenom ) var ( @@ -113,19 +114,19 @@ var _ = Describe("Claiming", Ordered, func() { s.app.AccountKeeper.SetAccount(s.ctx, acc) claimsRecords = append(claimsRecords, claimsRecord) - balance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) // claimsDenom == evmDenom == 'aevmos' - Expect(balance.Amount).To(Equal(initClaimsAmount.Add(initEvmAmount))) + balance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) // claimsDenom == evmDenom == 'aevmos' + Expect(balance.Amount).To(Equal(initClaimsAmount.Add(initBalanceAmount))) } // Keep track of the fees paid fees = make([]sdk.Coin, len(privs)) // ensure community pool doesn't have the fund - poolBalance := s.app.BankKeeper.GetBalance(s.ctx, distrAddr, claimsDenom) + poolBalance := s.app.BankKeeper.GetBalance(s.ctx, distrAddr, utils.BaseDenom) Expect(poolBalance.IsZero()).To(BeTrue()) // ensure module account has the escrow fund - balanceClaims := s.app.BankKeeper.GetBalance(s.ctx, claimsAddr, claimsDenom) + balanceClaims := s.app.BankKeeper.GetBalance(s.ctx, claimsAddr, utils.BaseDenom) Expect(balanceClaims).To(Equal(totalClaimsAmount)) s.Commit() @@ -140,47 +141,47 @@ var _ = Describe("Claiming", Ordered, func() { BeforeAll(func() { // Community pool will have balance after several blocks because it // receives inflation and fees rewards - initialPoolBalance = s.app.BankKeeper.GetBalance(s.ctx, distrAddr, claimsDenom) - actionV = sdk.NewCoin(claimsDenom, actionValue) + initialPoolBalance = s.app.BankKeeper.GetBalance(s.ctx, distrAddr, utils.BaseDenom) + actionV = sdk.NewCoin(utils.BaseDenom, actionValue) }) It("can claim ActionDelegate", func() { addr := getAddr(privs[0]) - prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) delegate(privs[0], delegateAmount) - balance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + balance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) Expect(balance).To(Equal(prebalance.Add(actionV).Sub(delegateAmount).Sub(defaultTxFee))) - Expect(balance.Amount).To(Equal(initClaimsAmount.Add(initEvmAmount).Add(actionV.Amount).Sub(delegateAmount.Amount).Sub(defaultTxFee.Amount))) + Expect(balance.Amount).To(Equal(initClaimsAmount.Add(initBalanceAmount).Add(actionV.Amount).Sub(delegateAmount.Amount).Sub(defaultTxFee.Amount))) fees[0] = defaultTxFee }) It("can claim ActionEVM", func() { addr := getAddr(privs[0]) - prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) fee := getEthTxFee() sendEthToSelf(privs[0]) - balance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + balance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) Expect(balance).To(Equal(prebalance.Add(actionV).Sub(fee))) fees[0] = fees[0].Add(fee) }) It("can claim ActionVote", func() { addr := getAddr(privs[1]) - prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) vote(privs[1], proposalID) - balance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + balance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) Expect(balance).To(Equal(prebalance.Add(actionV).Sub(defaultTxFee))) fees[1] = defaultTxFee }) It("did not clawback to the community pool", func() { // ensure community pool doesn't have the fund - poolBalance := s.app.BankKeeper.GetBalance(s.ctx, distrAddr, claimsDenom) + poolBalance := s.app.BankKeeper.GetBalance(s.ctx, distrAddr, utils.BaseDenom) Expect((poolBalance.Sub(initialPoolBalance)).IsZero()).To(BeTrue()) // ensure module account has the escrow fund minus what was claimed - balanceClaims := s.app.BankKeeper.GetBalance(s.ctx, claimsAddr, claimsDenom) - totalClaimed = sdk.NewCoin(claimsDenom, actionV.Amount.MulRaw(3)) + balanceClaims := s.app.BankKeeper.GetBalance(s.ctx, claimsAddr, utils.BaseDenom) + totalClaimed = sdk.NewCoin(utils.BaseDenom, actionV.Amount.MulRaw(3)) Expect(balanceClaims).To(Equal(totalClaimsAmount.Sub(totalClaimed))) }) }) @@ -191,8 +192,8 @@ var _ = Describe("Claiming", Ordered, func() { var initialPoolBalance sdk.Coin BeforeAll(func() { - actionV = sdk.NewCoin(claimsDenom, actionValue.QuoRaw(3)) - unclaimedV = sdk.NewCoin(claimsDenom, actionValue.Sub(actionV.Amount)) + actionV = sdk.NewCoin(utils.BaseDenom, actionValue.QuoRaw(3)) + unclaimedV = sdk.NewCoin(utils.BaseDenom, actionValue.Sub(actionV.Amount)) duration := params.DecayStartTime().Sub(s.ctx.BlockHeader().Time) // TODO fix - every call to CommitAfter with t != 0 increases the community pool balance // by 565068499471900803082192aevmos. This happens when the BaseApp.NewContext() func is called @@ -207,24 +208,24 @@ var _ = Describe("Claiming", Ordered, func() { // Community pool will have balance after several blocks because it // receives inflation and fees rewards - initialPoolBalance = s.app.BankKeeper.GetBalance(s.ctx, distrAddr, claimsDenom) + initialPoolBalance = s.app.BankKeeper.GetBalance(s.ctx, distrAddr, utils.BaseDenom) }) It("can claim ActionDelegate", func() { addr := getAddr(privs[1]) - prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) delegate(privs[1], delegateAmount) - balance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + balance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) Expect(balance).To(Equal(prebalance.Add(actionV).Sub(delegateAmount).Sub(defaultTxFee))) fees[1] = fees[1].Add(defaultTxFee) }) It("can claim ActionEVM", func() { addr := getAddr(privs[1]) - prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) fee := getEthTxFee() sendEthToSelf(privs[1]) - balance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + balance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) Expect(balance).To(Equal(prebalance.Add(actionV).Sub(fee))) fees[1] = fees[1].Add(fee) fee = getEthTxFee() @@ -234,51 +235,51 @@ var _ = Describe("Claiming", Ordered, func() { It("can claim ActionVote", func() { addr := getAddr(privs[0]) - prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) vote(privs[0], proposalID) - balance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + balance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) Expect(balance).To(Equal(prebalance.Add(actionV).Sub(defaultTxFee))) fees[0] = fees[0].Add(defaultTxFee) }) It("cannot claim ActionDelegate a second time", func() { addr := getAddr(privs[1]) - prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) delegate(privs[1], delegateAmount) - balance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + balance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) Expect(balance).To(Equal(prebalance.Sub(delegateAmount).Sub(defaultTxFee))) fees[1] = fees[1].Add(defaultTxFee) }) It("cannot claim ActionEVM a second time", func() { addr := getAddr(privs[1]) - prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) fee := getEthTxFee() sendEthToSelf(privs[1]) - balance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + balance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) Expect(balance).To(Equal(prebalance.Sub(fee))) fees[1] = fees[1].Add(fee) }) It("cannot claim ActionVote a second time", func() { addr := getAddr(privs[0]) - prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) vote(privs[0], proposalID) - balance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + balance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) Expect(balance).To(Equal(prebalance.Sub(defaultTxFee))) fees[0] = fees[0].Add(defaultTxFee) }) It("did not clawback to the community pool", func() { - remainderUnclaimed = sdk.NewCoin(claimsDenom, unclaimedV.Amount.MulRaw(4)) - totalClaimed = totalClaimed.Add(sdk.NewCoin(claimsDenom, actionV.Amount.MulRaw(4))) + remainderUnclaimed = sdk.NewCoin(utils.BaseDenom, unclaimedV.Amount.MulRaw(4)) + totalClaimed = totalClaimed.Add(sdk.NewCoin(utils.BaseDenom, actionV.Amount.MulRaw(4))) // ensure community pool doesn't have the fund - poolBalance := s.app.BankKeeper.GetBalance(s.ctx, distrAddr, claimsDenom) + poolBalance := s.app.BankKeeper.GetBalance(s.ctx, distrAddr, utils.BaseDenom) Expect(poolBalance.Sub(initialPoolBalance)).To(Equal(remainderUnclaimed)) // ensure module account has the escrow fund minus what was claimed - balanceClaims := s.app.BankKeeper.GetBalance(s.ctx, claimsAddr, claimsDenom) + balanceClaims := s.app.BankKeeper.GetBalance(s.ctx, claimsAddr, utils.BaseDenom) Expect(balanceClaims).To(Equal(totalClaimsAmount.Sub(totalClaimed).Sub(remainderUnclaimed))) }) }) @@ -290,46 +291,46 @@ var _ = Describe("Claiming", Ordered, func() { // ensure module account has the unclaimed amount before airdrop ends moduleBalances := s.app.ClaimsKeeper.GetModuleAccountBalances(s.ctx) - Expect(moduleBalances.AmountOf(claimsDenom)).To(Equal(totalClaimsAmount.Sub(totalClaimed).Sub(remainderUnclaimed).Amount)) + Expect(moduleBalances.AmountOf(utils.BaseDenom)).To(Equal(totalClaimsAmount.Sub(totalClaimed).Sub(remainderUnclaimed).Amount)) s.Commit() }) It("cannot claim additional actions", func() { addr := getAddr(privs[2]) - prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + prebalance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) delegate(privs[2], delegateAmount) - balance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + balance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) Expect(balance).To(Equal(prebalance.Sub(delegateAmount).Sub(defaultTxFee))) fees[2] = fees[2].Add(defaultTxFee) }) It("cannot clawback already claimed actions", func() { addr := getAddr(privs[0]) - finalBalance := s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + finalBalance := s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) claimed := actionValue.MulRaw(2).Add(actionValue.QuoRaw(3)) - Expect(finalBalance.Amount).To(Equal(initClaimsAmount.Add(initEvmAmount).Add(claimed).Sub(delegateAmount.Amount).Sub(fees[0].Amount))) + Expect(finalBalance.Amount).To(Equal(initClaimsAmount.Add(initBalanceAmount).Add(claimed).Sub(delegateAmount.Amount).Sub(fees[0].Amount))) addr = getAddr(privs[1]) - finalBalance = s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + finalBalance = s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) claimed = actionValue.MulRaw(2).QuoRaw(3).Add(actionValue) - Expect(finalBalance.Amount).To(Equal(initClaimsAmount.Add(initEvmAmount).Add(claimed).Sub(delegateAmount.Amount.MulRaw(2)).Sub(fees[1].Amount))) + Expect(finalBalance.Amount).To(Equal(initClaimsAmount.Add(initBalanceAmount).Add(claimed).Sub(delegateAmount.Amount.MulRaw(2)).Sub(fees[1].Amount))) addr = getAddr(privs[2]) - finalBalance = s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) + finalBalance = s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) claimed = actionValue.QuoRaw(3) - Expect(finalBalance.Amount).To(Equal(initClaimsAmount.Add(initEvmAmount).Add(claimed).Sub(delegateAmount.Amount).Sub(fees[2].Amount))) + Expect(finalBalance.Amount).To(Equal(initClaimsAmount.Add(initBalanceAmount).Add(claimed).Sub(delegateAmount.Amount).Sub(fees[2].Amount))) // no-op, should have same balance as initial balance addr = getAddr(privs[3]) - finalBalance = s.app.BankKeeper.GetBalance(s.ctx, addr, claimsDenom) - Expect(finalBalance.Amount).To(Equal(initClaimsAmount.Add(initEvmAmount))) + finalBalance = s.app.BankKeeper.GetBalance(s.ctx, addr, utils.BaseDenom) + Expect(finalBalance.Amount).To(Equal(initClaimsAmount.Add(initBalanceAmount))) }) It("can clawback unclaimed", func() { // ensure module account is empty moduleBalance := s.app.ClaimsKeeper.GetModuleAccountBalances(s.ctx) - Expect(moduleBalance.AmountOf(claimsDenom).IsZero()).To(BeTrue()) + Expect(moduleBalance.AmountOf(utils.BaseDenom).IsZero()).To(BeTrue()) }) }) }) @@ -356,7 +357,7 @@ func govProposal(priv *ethsecp256k1.PrivKey) uint64 { "test", "description", contractAddress.String(), - sdk.DecCoins{sdk.NewDecCoinFromDec(evm.DefaultEVMDenom, sdk.NewDecWithPrec(5, 2))}, + sdk.DecCoins{sdk.NewDecCoinFromDec(utils.BaseDenom, sdk.NewDecWithPrec(5, 2))}, 1000, ) @@ -435,7 +436,7 @@ func performEthTx(priv *ethsecp256k1.PrivKey, msgEthereumTx *evm.MsgEthereumTx) // Assemble transaction from fields encodingConfig := encoding.MakeConfig(app.ModuleBasics) txBuilder := encodingConfig.TxConfig.NewTxBuilder() - tx, err := msgEthereumTx.BuildTx(txBuilder, evm.DefaultEVMDenom) + tx, err := msgEthereumTx.BuildTx(txBuilder, utils.BaseDenom) s.Require().NoError(err) // Encode transaction by default Tx encoder and broadcasted over the network @@ -511,5 +512,5 @@ func getEthTxFee() sdk.Coin { baseFee := s.app.FeeMarketKeeper.GetBaseFee(s.ctx) baseFee.Mul(baseFee, big.NewInt(100000)) feeAmt := baseFee.Quo(baseFee, big.NewInt(2)) - return sdk.NewCoin(evm.DefaultEVMDenom, sdkmath.NewIntFromBigInt(feeAmt)) + return sdk.NewCoin(utils.BaseDenom, sdkmath.NewIntFromBigInt(feeAmt)) } diff --git a/x/claims/migrations/v3/types/params.go b/x/claims/migrations/v3/types/params.go index 445c77f985..5ec7738dc7 100644 --- a/x/claims/migrations/v3/types/params.go +++ b/x/claims/migrations/v3/types/params.go @@ -20,6 +20,7 @@ import ( "fmt" "time" + "github.com/evmos/evmos/v11/utils" "github.com/evmos/evmos/v11/x/claims/types" errorsmod "cosmossdk.io/errors" @@ -34,7 +35,7 @@ var _ types.LegacyParams = &V3Params{} var ( // DefaultClaimsDenom is aevmos - DefaultClaimsDenom = "aevmos" + DefaultClaimsDenom = utils.BaseDenom // DefaultDurationUntilDecay is 1 month = 30.4375 days DefaultDurationUntilDecay = 2629800 * time.Second // DefaultDurationOfDecay is 2 months diff --git a/x/claims/types/params.go b/x/claims/types/params.go index 27359fcb93..59d3c56c68 100644 --- a/x/claims/types/params.go +++ b/x/claims/types/params.go @@ -17,18 +17,19 @@ package types import ( - fmt "fmt" + "fmt" "time" errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" host "github.com/cosmos/ibc-go/v6/modules/core/24-host" + "github.com/evmos/evmos/v11/utils" ) var ( // DefaultClaimsDenom is aevmos - DefaultClaimsDenom = "aevmos" + DefaultClaimsDenom = utils.BaseDenom // DefaultDurationUntilDecay is 1 month = 30.4375 days DefaultDurationUntilDecay = 2629800 * time.Second // DefaultDurationOfDecay is 2 months diff --git a/x/erc20/keeper/ibc_callbacks_integration_test.go b/x/erc20/keeper/ibc_callbacks_integration_test.go index 1cbb428440..a5267c338d 100644 --- a/x/erc20/keeper/ibc_callbacks_integration_test.go +++ b/x/erc20/keeper/ibc_callbacks_integration_test.go @@ -17,6 +17,7 @@ import ( ibctesting "github.com/evmos/evmos/v11/ibc/testing" "github.com/evmos/evmos/v11/testutil" teststypes "github.com/evmos/evmos/v11/types/tests" + "github.com/evmos/evmos/v11/utils" claimstypes "github.com/evmos/evmos/v11/x/claims/types" "github.com/evmos/evmos/v11/x/erc20/types" . "github.com/onsi/ginkgo/v2" @@ -49,14 +50,14 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { evmosMeta := banktypes.Metadata{ Description: "Base Denom for Evmos Chain", - Base: claimstypes.DefaultClaimsDenom, + Base: utils.BaseDenom, DenomUnits: []*banktypes.DenomUnit{ { Denom: teststypes.AevmosDenomtrace.BaseDenom, Exponent: 0, }, }, - Name: claimstypes.DefaultClaimsDenom, + Name: utils.BaseDenom, Symbol: erc20Symbol, Display: teststypes.AevmosDenomtrace.BaseDenom, } @@ -153,12 +154,12 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { pair, err := s.app.Erc20Keeper.RegisterCoin(s.EvmosChain.GetContext(), evmosMeta) s.Require().NoError(err) - aevmosInitialBalance := s.app.BankKeeper.GetBalance(s.EvmosChain.GetContext(), receiverAcc, claimstypes.DefaultClaimsDenom) + aevmosInitialBalance := s.app.BankKeeper.GetBalance(s.EvmosChain.GetContext(), receiverAcc, utils.BaseDenom) // 1. Send aevmos from Evmos to Osmosis - s.SendAndReceiveMessage(s.pathOsmosisEvmos, s.EvmosChain, claimstypes.DefaultClaimsDenom, amount, receiver, sender, 1, "") + s.SendAndReceiveMessage(s.pathOsmosisEvmos, s.EvmosChain, utils.BaseDenom, amount, receiver, sender, 1, "") - aevmosAfterBalance := s.app.BankKeeper.GetBalance(s.EvmosChain.GetContext(), receiverAcc, claimstypes.DefaultClaimsDenom) + aevmosAfterBalance := s.app.BankKeeper.GetBalance(s.EvmosChain.GetContext(), receiverAcc, utils.BaseDenom) s.Require().Equal(aevmosInitialBalance.Amount.Sub(math.NewInt(amount)).Sub(sendAndReceiveMsgFee), aevmosAfterBalance.Amount) // check ibc aevmos coins balance on Osmosis @@ -174,7 +175,7 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { s.Require().Equal(int64(0), aevmosIBCSenderFinalBalance.Amount.Int64()) // check aevmos balance after transfer - should be equal to initial balance - aevmosFinalBalance := s.app.BankKeeper.GetBalance(s.EvmosChain.GetContext(), receiverAcc, claimstypes.DefaultClaimsDenom) + aevmosFinalBalance := s.app.BankKeeper.GetBalance(s.EvmosChain.GetContext(), receiverAcc, utils.BaseDenom) totalFees := sendBackCoinsFee.Add(sendAndReceiveMsgFee) s.Require().Equal(aevmosInitialBalance.Amount.Sub(totalFees), aevmosFinalBalance.Amount) @@ -293,11 +294,11 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { }) // escrow coins in module - coins := sdk.NewCoins(sdk.NewCoin(claimstypes.DefaultClaimsDenom, claimableAmount)) + coins := sdk.NewCoins(sdk.NewCoin(utils.BaseDenom, claimableAmount)) err := testutil.FundModuleAccount(s.EvmosChain.GetContext(), s.app.BankKeeper, claimstypes.ModuleName, coins) s.Require().NoError(err) - receiverInitialAevmosBalance := s.app.BankKeeper.GetBalance(s.EvmosChain.GetContext(), receiverAcc, claimstypes.DefaultClaimsDenom) + receiverInitialAevmosBalance := s.app.BankKeeper.GetBalance(s.EvmosChain.GetContext(), receiverAcc, utils.BaseDenom) uosmoInitialBalance := s.IBCOsmosisChain.GetSimApp().BankKeeper.GetBalance(s.IBCOsmosisChain.GetContext(), senderAcc, "uosmo") @@ -321,7 +322,7 @@ var _ = Describe("Convert receiving IBC to Erc20", Ordered, func() { s.Require().Equal(uosmoInitialBalance.Amount.Int64()-amount, uosmoFinalBalance.Amount.Int64()) // validate that Receiver address on Evmos got the claims tokens - receiverFinalAevmosBalance := s.app.BankKeeper.GetBalance(s.EvmosChain.GetContext(), receiverAcc, claimstypes.DefaultClaimsDenom) + receiverFinalAevmosBalance := s.app.BankKeeper.GetBalance(s.EvmosChain.GetContext(), receiverAcc, utils.BaseDenom) s.Require().Equal(receiverInitialAevmosBalance.Amount.Add(claimableAmount).Sub(sendBackCoinsFee), receiverFinalAevmosBalance.Amount) }) diff --git a/x/erc20/keeper/ibc_callbacks_test.go b/x/erc20/keeper/ibc_callbacks_test.go index c662000008..d96802b5a3 100644 --- a/x/erc20/keeper/ibc_callbacks_test.go +++ b/x/erc20/keeper/ibc_callbacks_test.go @@ -5,6 +5,7 @@ import ( "fmt" "math/big" + "github.com/evmos/evmos/v11/utils" "github.com/evmos/evmos/v11/x/erc20/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" @@ -59,7 +60,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { registeredDenom := cosmosTokenBase coins := sdk.NewCoins( - sdk.NewCoin(claimstypes.DefaultClaimsDenom, sdk.NewInt(1000)), + sdk.NewCoin(utils.BaseDenom, sdk.NewInt(1000)), sdk.NewCoin(registeredDenom, sdk.NewInt(1000)), // some ERC20 token sdk.NewCoin(ibcBase, sdk.NewInt(1000)), // some IBC coin with a registered token pair ) @@ -210,7 +211,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { receiver: ethsecpAddr, expErc20s: big.NewInt(0), expCoins: sdk.NewCoins( - sdk.NewCoin(claimstypes.DefaultClaimsDenom, sdk.NewInt(1000)), + sdk.NewCoin(utils.BaseDenom, sdk.NewInt(1000)), sdk.NewCoin(registeredDenom, sdk.NewInt(0)), sdk.NewCoin(ibcBase, sdk.NewInt(1000)), ), @@ -261,7 +262,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { checkBalances: true, expErc20s: big.NewInt(1000), expCoins: sdk.NewCoins( - sdk.NewCoin(claimstypes.DefaultClaimsDenom, sdk.NewInt(1000)), + sdk.NewCoin(utils.BaseDenom, sdk.NewInt(1000)), sdk.NewCoin(registeredDenom, sdk.NewInt(0)), sdk.NewCoin(ibcBase, sdk.NewInt(1000)), ), @@ -282,7 +283,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { expErc20s: big.NewInt(1000), checkBalances: true, expCoins: sdk.NewCoins( - sdk.NewCoin(claimstypes.DefaultClaimsDenom, sdk.NewInt(1000)), + sdk.NewCoin(utils.BaseDenom, sdk.NewInt(1000)), sdk.NewCoin(registeredDenom, sdk.NewInt(0)), sdk.NewCoin(ibcBase, sdk.NewInt(1000)), ), @@ -308,7 +309,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { expErc20s: big.NewInt(1000), expCoins: sdk.NewCoins( sdk.NewCoin(ibcBase, sdk.NewInt(1000)), - sdk.NewCoin(claimstypes.DefaultClaimsDenom, sdk.NewInt(1000)), + sdk.NewCoin(utils.BaseDenom, sdk.NewInt(1000)), sdk.NewCoin(registeredDenom, sdk.NewInt(0)), ), }, diff --git a/x/erc20/keeper/integration_test.go b/x/erc20/keeper/integration_test.go index 5755c8d21d..07a0af9718 100644 --- a/x/erc20/keeper/integration_test.go +++ b/x/erc20/keeper/integration_test.go @@ -16,6 +16,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/evmos/evmos/v11/crypto/ethsecp256k1" + "github.com/evmos/evmos/v11/utils" "github.com/evmos/evmos/v11/app" "github.com/evmos/evmos/v11/testutil" @@ -247,8 +248,7 @@ var _ = Describe("ERC20:", Ordered, func() { pair = s.setupRegisterCoin(metadataCoin) coin = sdk.NewCoin(pair.Denom, amt) - denom := s.app.ClaimsKeeper.GetParams(s.ctx).ClaimsDenom - err := testutil.FundAccount(s.ctx, s.app.BankKeeper, accAddr, sdk.NewCoins(sdk.NewCoin(denom, fundsAmt))) + err := testutil.FundAccount(s.ctx, s.app.BankKeeper, accAddr, sdk.NewCoins(sdk.NewCoin(utils.BaseDenom, fundsAmt))) s.Require().NoError(err) err = testutil.FundAccount(s.ctx, s.app.BankKeeper, accAddr, sdk.NewCoins(coin)) s.Require().NoError(err) @@ -306,8 +306,7 @@ var _ = Describe("ERC20:", Ordered, func() { *pair, _ = s.app.Erc20Keeper.GetTokenPair(s.ctx, id) coin = sdk.NewCoin(pair.Denom, amt) - denom := s.app.ClaimsKeeper.GetParams(s.ctx).ClaimsDenom - err := testutil.FundAccount(s.ctx, s.app.BankKeeper, accAddr, sdk.NewCoins(sdk.NewCoin(denom, fundsAmt))) + err := testutil.FundAccount(s.ctx, s.app.BankKeeper, accAddr, sdk.NewCoins(sdk.NewCoin(utils.BaseDenom, fundsAmt))) s.Require().NoError(err) _ = s.MintERC20Token(contract, s.address, addr, big.NewInt(amt.Int64())) diff --git a/x/evm/types/params.go b/x/evm/types/params.go index 541dff08df..4319fcf06b 100644 --- a/x/evm/types/params.go +++ b/x/evm/types/params.go @@ -19,15 +19,17 @@ import ( "fmt" "math/big" + "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/params" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/ethereum/go-ethereum/core/vm" + + "github.com/evmos/evmos/v11/utils" ) var ( - // DefaultEVMDenom defines the default EVM denomination on Ethermint - DefaultEVMDenom = "aevmos" + // DefaultEVMDenom defines the default EVM denomination on Evmos + DefaultEVMDenom = utils.BaseDenom // DefaultAllowUnprotectedTxs rejects all unprotected txs (i.e false) DefaultAllowUnprotectedTxs = false // DefaultEnableCreate enables contract creation (i.e true) diff --git a/x/ibc/transfer/keeper/keeper_test.go b/x/ibc/transfer/keeper/keeper_test.go index e5178d8883..8c3b9f0a01 100644 --- a/x/ibc/transfer/keeper/keeper_test.go +++ b/x/ibc/transfer/keeper/keeper_test.go @@ -32,13 +32,13 @@ import ( "github.com/evmos/evmos/v11/crypto/ethsecp256k1" "github.com/evmos/evmos/v11/server/config" "github.com/evmos/evmos/v11/tests" + "github.com/evmos/evmos/v11/utils" "github.com/evmos/evmos/v11/x/evm/statedb" evm "github.com/evmos/evmos/v11/x/evm/types" feemarkettypes "github.com/evmos/evmos/v11/x/feemarket/types" "github.com/evmos/evmos/v11/app" "github.com/evmos/evmos/v11/contracts" - claimstypes "github.com/evmos/evmos/v11/x/claims/types" "github.com/evmos/evmos/v11/x/erc20/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" @@ -130,9 +130,8 @@ func (suite *KeeperTestSuite) DoSetupTest(t require.TestingT) { suite.queryClientEvm = evm.NewQueryClient(queryHelperEvm) // bond denom - params := claimstypes.DefaultParams() stakingParams := suite.app.StakingKeeper.GetParams(suite.ctx) - stakingParams.BondDenom = params.GetClaimsDenom() + stakingParams.BondDenom = utils.BaseDenom suite.app.StakingKeeper.SetParams(suite.ctx, stakingParams) // Set Validator diff --git a/x/recovery/keeper/keeper_test.go b/x/recovery/keeper/keeper_test.go index 6622376229..9f6d25a9d3 100644 --- a/x/recovery/keeper/keeper_test.go +++ b/x/recovery/keeper/keeper_test.go @@ -12,6 +12,7 @@ import ( "github.com/tendermint/tendermint/version" "github.com/evmos/evmos/v11/tests" + "github.com/evmos/evmos/v11/utils" feemarkettypes "github.com/evmos/evmos/v11/x/feemarket/types" "github.com/cosmos/cosmos-sdk/baseapp" @@ -77,7 +78,7 @@ func (suite *KeeperTestSuite) SetupTest() { suite.Require().NoError(err) stakingParams := suite.app.StakingKeeper.GetParams(suite.ctx) - stakingParams.BondDenom = claimsParams.GetClaimsDenom() + stakingParams.BondDenom = utils.BaseDenom suite.app.StakingKeeper.SetParams(suite.ctx, stakingParams) } diff --git a/x/revenue/keeper/integration_test.go b/x/revenue/keeper/integration_test.go index 1098133ca7..91ea12ca83 100644 --- a/x/revenue/keeper/integration_test.go +++ b/x/revenue/keeper/integration_test.go @@ -21,6 +21,7 @@ import ( "github.com/evmos/evmos/v11/encoding" "github.com/evmos/evmos/v11/tests" "github.com/evmos/evmos/v11/testutil" + "github.com/evmos/evmos/v11/utils" evmtypes "github.com/evmos/evmos/v11/x/evm/types" "github.com/evmos/evmos/v11/x/revenue/types" @@ -918,7 +919,7 @@ func deliverEthTx(priv *ethsecp256k1.PrivKey, msgEthereumTx *evmtypes.MsgEthereu func prepareCosmosTx(priv *ethsecp256k1.PrivKey, gasPrice *sdkmath.Int, msgs ...sdk.Msg) []byte { encodingConfig := encoding.MakeConfig(app.ModuleBasics) accountAddress := sdk.AccAddress(priv.PubKey().Address().Bytes()) - denom := s.app.ClaimsKeeper.GetParams(s.ctx).ClaimsDenom + denom := utils.BaseDenom txBuilder := encodingConfig.TxConfig.NewTxBuilder() diff --git a/x/revenue/keeper/keeper_test.go b/x/revenue/keeper/keeper_test.go index 4bb56af4af..68ef37bc1a 100644 --- a/x/revenue/keeper/keeper_test.go +++ b/x/revenue/keeper/keeper_test.go @@ -10,6 +10,7 @@ import ( "github.com/evmos/evmos/v11/crypto/ethsecp256k1" "github.com/evmos/evmos/v11/tests" + "github.com/evmos/evmos/v11/utils" feemarkettypes "github.com/evmos/evmos/v11/x/feemarket/types" "github.com/cosmos/cosmos-sdk/baseapp" @@ -19,7 +20,6 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/evmos/evmos/v11/app" - claimstypes "github.com/evmos/evmos/v11/x/claims/types" evm "github.com/evmos/evmos/v11/x/evm/types" "github.com/evmos/evmos/v11/x/revenue/types" "github.com/stretchr/testify/require" @@ -77,7 +77,7 @@ func (suite *KeeperTestSuite) SetupApp() { suite.address = common.BytesToAddress(priv.PubKey().Address().Bytes()) suite.signer = tests.NewSigner(priv) - suite.denom = claimstypes.DefaultClaimsDenom + suite.denom = utils.BaseDenom // consensus key privCons, err := ethsecp256k1.GenerateKey() diff --git a/x/vesting/keeper/integration_test.go b/x/vesting/keeper/integration_test.go index 603698924b..260b3a48f3 100644 --- a/x/vesting/keeper/integration_test.go +++ b/x/vesting/keeper/integration_test.go @@ -13,6 +13,7 @@ import ( "github.com/evmos/evmos/v11/encoding" "github.com/evmos/evmos/v11/tests" "github.com/evmos/evmos/v11/testutil" + "github.com/evmos/evmos/v11/utils" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" @@ -21,7 +22,6 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - claimstypes "github.com/evmos/evmos/v11/x/claims/types" evmtypes "github.com/evmos/evmos/v11/x/evm/types" "github.com/evmos/evmos/v11/x/vesting/types" @@ -38,7 +38,7 @@ import ( // 23/02 Lock ends var _ = Describe("Clawback Vesting Accounts", Ordered, func() { // Monthly vesting period - stakeDenom := claimstypes.DefaultParams().ClaimsDenom + stakeDenom := utils.BaseDenom amt := sdk.NewInt(1) vestingLength := int64(60 * 60 * 24 * 30) // in seconds vestingAmt := sdk.NewCoins(sdk.NewCoin(stakeDenom, amt)) @@ -218,7 +218,7 @@ var _ = Describe("Clawback Vesting Accounts", Ordered, func() { // 23/02 Lock ends var _ = Describe("Clawback Vesting Accounts - claw back tokens", Ordered, func() { // Monthly vesting period - stakeDenom := claimstypes.DefaultParams().ClaimsDenom + stakeDenom := utils.BaseDenom amt := sdk.NewInt(1) vestingLength := int64(60 * 60 * 24 * 30) // in seconds vestingAmt := sdk.NewCoins(sdk.NewCoin(stakeDenom, amt)) @@ -527,7 +527,7 @@ func delegate(clawbackAccount *types.ClawbackVestingAccount, amount int64) error // val, err := sdk.ValAddressFromBech32("evmosvaloper1z3t55m0l9h0eupuz3dp5t5cypyv674jjn4d6nn") s.Require().NoError(err) - delegateMsg := stakingtypes.NewMsgDelegate(addr, val, sdk.NewCoin(claimstypes.DefaultParams().ClaimsDenom, sdk.NewInt(amount))) + delegateMsg := stakingtypes.NewMsgDelegate(addr, val, sdk.NewCoin(utils.BaseDenom, sdk.NewInt(amount))) err = txBuilder.SetMsgs(delegateMsg) s.Require().NoError(err) tx := txBuilder.GetTx() From 33ec5d736c9a0a5fe7cf1ab243b66d4602e99d49 Mon Sep 17 00:00:00 2001 From: tom Date: Thu, 9 Feb 2023 11:02:49 -0300 Subject: [PATCH 2/4] rollback go.mod changes --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 0009dc4b62..d0a75563a5 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/btcsuite/btcd v0.22.2 github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce github.com/cosmos/cosmos-proto v1.0.0-beta.1 - github.com/cosmos/cosmos-sdk v0.46.9 + github.com/cosmos/cosmos-sdk v0.46.8 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogoproto v1.4.4 github.com/cosmos/ibc-go/v6 v6.1.0 From 904e71e6b10e290fbf82f411e0f94982ed35758b Mon Sep 17 00:00:00 2001 From: tom Date: Thu, 9 Feb 2023 11:06:04 -0300 Subject: [PATCH 3/4] remove TODO comment on test --- x/claims/keeper/integration_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/x/claims/keeper/integration_test.go b/x/claims/keeper/integration_test.go index 2132e5435d..388ecce88e 100644 --- a/x/claims/keeper/integration_test.go +++ b/x/claims/keeper/integration_test.go @@ -195,8 +195,7 @@ var _ = Describe("Claiming", Ordered, func() { actionV = sdk.NewCoin(utils.BaseDenom, actionValue.QuoRaw(3)) unclaimedV = sdk.NewCoin(utils.BaseDenom, actionValue.Sub(actionV.Amount)) duration := params.DecayStartTime().Sub(s.ctx.BlockHeader().Time) - // TODO fix - every call to CommitAfter with t != 0 increases the community pool balance - // by 565068499471900803082192aevmos. This happens when the BaseApp.NewContext() func is called + s.CommitAfter(duration) duration = params.GetDurationOfDecay() * 2 / 3 From d3c1887e380557358176f2a98eb7c732b12b38f3 Mon Sep 17 00:00:00 2001 From: tom Date: Thu, 9 Feb 2023 11:11:20 -0300 Subject: [PATCH 4/4] add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d52d6c6f83..31c3d23974 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,6 +59,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ - (docs) [#1361](https://github.com/evmos/evmos/pull/1361) Update `vesting` module docs with new behavior for `ClawbackVestingAccounts` - (evm) [#1349](https://github.com/evmos/evmos/pull/1349) Restrict the Evmos codebase from working with chain IDs other than `9000` and `9001` - (test) [#1352](https://github.com/evmos/evmos/pull/1352) Deprecate usage of `aphoton` as denomination on tests +- (test) [#1369](https://github.com/evmos/evmos/pull/1369) Refactor code to use `BaseDenom` for simplification ## [v11.0.1] - 2023-02-04