Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 12 additions & 27 deletions evmd/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"encoding/json"
"errors"
"fmt"
precisebankkeeper "github.com/cosmos/evm/x/precisebank/keeper"
"io"
"os"

Expand Down Expand Up @@ -38,9 +39,6 @@ import (
"github.com/cosmos/evm/x/ibc/transfer"
transferkeeper "github.com/cosmos/evm/x/ibc/transfer/keeper"
transferv2 "github.com/cosmos/evm/x/ibc/transfer/v2"
"github.com/cosmos/evm/x/precisebank"
precisebankkeeper "github.com/cosmos/evm/x/precisebank/keeper"
precisebanktypes "github.com/cosmos/evm/x/precisebank/types"
"github.com/cosmos/evm/x/vm"
evmkeeper "github.com/cosmos/evm/x/vm/keeper"
evmtypes "github.com/cosmos/evm/x/vm/types"
Expand Down Expand Up @@ -184,11 +182,10 @@ type EVMD struct {
CallbackKeeper ibccallbackskeeper.ContractKeeper

// Cosmos EVM keepers
FeeMarketKeeper feemarketkeeper.Keeper
EVMKeeper *evmkeeper.Keeper
Erc20Keeper erc20keeper.Keeper
PreciseBankKeeper precisebankkeeper.Keeper
EVMMempool *evmmempool.ExperimentalEVMMempool
FeeMarketKeeper feemarketkeeper.Keeper
EVMKeeper *evmkeeper.Keeper
Erc20Keeper erc20keeper.Keeper
EVMMempool *evmmempool.ExperimentalEVMMempool

// the module manager
ModuleManager *module.Manager
Expand Down Expand Up @@ -239,7 +236,7 @@ func NewExampleApp(
// ibc keys
ibcexported.StoreKey, ibctransfertypes.StoreKey,
// Cosmos EVM store keys
evmtypes.StoreKey, feemarkettypes.StoreKey, erc20types.StoreKey, precisebanktypes.StoreKey,
evmtypes.StoreKey, feemarkettypes.StoreKey, erc20types.StoreKey,
)
oKeys := storetypes.NewObjectStoreKeys(banktypes.ObjectStoreKey, evmtypes.ObjectKey)

Expand Down Expand Up @@ -431,16 +428,6 @@ func NewExampleApp(
keys[feemarkettypes.StoreKey],
)

// Set up PreciseBank keeper
//
// NOTE: PreciseBank is not needed if SDK use 18 decimals for gas coin. Use BankKeeper instead.
app.PreciseBankKeeper = precisebankkeeper.NewKeeper(
appCodec,
keys[precisebanktypes.StoreKey],
app.BankKeeper,
app.AccountKeeper,
)

// Set up EVM keeper
tracer := cast.ToString(appOpts.Get(srvflags.EVMTracer))

Expand All @@ -450,7 +437,7 @@ func NewExampleApp(
appCodec, keys[evmtypes.StoreKey], oKeys[evmtypes.ObjectKey], nonTransientKeys,
authtypes.NewModuleAddress(govtypes.ModuleName),
app.AccountKeeper,
app.PreciseBankKeeper,
app.BankKeeper,
app.StakingKeeper,
app.FeeMarketKeeper,
&app.ConsensusParamsKeeper,
Expand All @@ -461,7 +448,7 @@ func NewExampleApp(
precompiletypes.DefaultStaticPrecompiles(
*app.StakingKeeper,
app.DistrKeeper,
app.PreciseBankKeeper,
app.BankKeeper,
&app.Erc20Keeper,
&app.TransferKeeper,
app.IBCKeeper.ChannelKeeper,
Expand All @@ -477,7 +464,7 @@ func NewExampleApp(
appCodec,
authtypes.NewModuleAddress(govtypes.ModuleName),
app.AccountKeeper,
app.PreciseBankKeeper,
app.BankKeeper,
app.EVMKeeper,
app.StakingKeeper,
&app.TransferKeeper,
Expand Down Expand Up @@ -578,7 +565,6 @@ func NewExampleApp(
vm.NewAppModule(app.EVMKeeper, app.AccountKeeper, app.BankKeeper, app.AccountKeeper.AddressCodec()),
feemarket.NewAppModule(app.FeeMarketKeeper),
erc20.NewAppModule(app.Erc20Keeper, app.AccountKeeper),
precisebank.NewAppModule(app.PreciseBankKeeper, app.BankKeeper, app.AccountKeeper),
)

// BasicModuleManager defines the module BasicManager which is in charge of setting up basic,
Expand Down Expand Up @@ -626,7 +612,6 @@ func NewExampleApp(
authtypes.ModuleName, banktypes.ModuleName, govtypes.ModuleName, genutiltypes.ModuleName,
authz.ModuleName, feegrant.ModuleName,
consensusparamtypes.ModuleName,
precisebanktypes.ModuleName,
vestingtypes.ModuleName,
)

Expand All @@ -647,7 +632,6 @@ func NewExampleApp(
slashingtypes.ModuleName, minttypes.ModuleName,
genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName,
feegrant.ModuleName, upgradetypes.ModuleName, consensusparamtypes.ModuleName,
precisebanktypes.ModuleName,
vestingtypes.ModuleName,
)

Expand All @@ -667,7 +651,6 @@ func NewExampleApp(
evmtypes.ModuleName,
feemarkettypes.ModuleName,
erc20types.ModuleName,
precisebanktypes.ModuleName,

ibctransfertypes.ModuleName,
genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName,
Expand Down Expand Up @@ -1039,7 +1022,9 @@ func (app *EVMD) GetMintKeeper() mintkeeper.Keeper {
}

func (app *EVMD) GetPreciseBankKeeper() *precisebankkeeper.Keeper {
return &app.PreciseBankKeeper
return nil
// Uncomment if using PreciseBank
//return &app.PreciseBankKeeper
}

func (app *EVMD) GetCallbackKeeper() ibccallbackskeeper.ContractKeeper {
Expand Down
14 changes: 6 additions & 8 deletions evmd/tests/integration/x_precisebank_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,16 @@ package integration

import (
"testing"

"github.com/stretchr/testify/suite"

"github.com/cosmos/evm/tests/integration/x/precisebank"
)

func TestPreciseBankGenesis(t *testing.T) {
s := precisebank.NewGenesisTestSuite(CreateEvmd)
suite.Run(t, s)
// Uncomment these lines if using PreciseBank
//s := precisebank.NewGenesisTestSuite(CreateEvmd)
//suite.Run(t, s)
}

func TestPreciseBankKeeper(t *testing.T) {
s := precisebank.NewKeeperIntegrationTestSuite(CreateEvmd)
suite.Run(t, s)
// Uncomment these lines if using PreciseBank
//s := precisebank.NewKeeperIntegrationTestSuite(CreateEvmd)
//suite.Run(t, s)
}
4 changes: 2 additions & 2 deletions interfaces.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package evm

import (
"encoding/json"

Check failure on line 4 in interfaces.go

View workflow job for this annotation

GitHub Actions / Run golangci-lint

File is not properly formatted (gofumpt)
precisebankkeeper "github.com/cosmos/evm/x/precisebank/keeper"

Check failure on line 5 in interfaces.go

View workflow job for this annotation

GitHub Actions / Run golangci-lint

File is not properly formatted (gci)

erc20keeper "github.com/cosmos/evm/x/erc20/keeper"
feemarketkeeper "github.com/cosmos/evm/x/feemarket/keeper"
"github.com/cosmos/evm/x/ibc/callbacks/keeper"
transferkeeper "github.com/cosmos/evm/x/ibc/transfer/keeper"
precisebankkeeper "github.com/cosmos/evm/x/precisebank/keeper"
evmkeeper "github.com/cosmos/evm/x/vm/keeper"
ibctesting "github.com/cosmos/ibc-go/v10/testing"

Expand Down Expand Up @@ -50,7 +50,6 @@
GetDistrKeeper() distrkeeper.Keeper
GetStakingKeeper() *stakingkeeper.Keeper
GetMintKeeper() mintkeeper.Keeper
GetPreciseBankKeeper() *precisebankkeeper.Keeper
GetFeeGrantKeeper() feegrantkeeper.Keeper
GetConsensusParamsKeeper() consensusparamkeeper.Keeper
GetCallbackKeeper() keeper.ContractKeeper
Expand All @@ -61,4 +60,5 @@
GetAnteHandler() sdk.AnteHandler
MsgServiceRouter() *baseapp.MsgServiceRouter
GetMempool() mempool.ExtMempool
GetPreciseBankKeeper() *precisebankkeeper.Keeper
}
Loading