Merge branch 'develop' into develop

aks3213 · Aug 7, 2023 · 76d40ba · 76d40ba
2 parents 62acf3f + 49fc568
commit 76d40ba
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/app/app.go b/app/app.go
@@ -389,7 +389,7 @@ func New(
 		keys[fungibletypes.MemStoreKey],
 		app.GetSubspace(fungibletypes.ModuleName),
 		app.AccountKeeper,
-		*app.EvmKeeper,
+		app.EvmKeeper,
 		app.BankKeeper,
 		app.ZetaObserverKeeper,
 	)

diff --git a/x/fungible/keeper/keeper.go b/x/fungible/keeper/keeper.go
@@ -3,13 +3,12 @@ package keeper
 import (
 	"fmt"
 
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
-	"github.com/tendermint/tendermint/libs/log"
-
 	"github.com/cosmos/cosmos-sdk/codec"
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
-	evmkeeper "github.com/evmos/ethermint/x/evm/keeper"
+	"github.com/tendermint/tendermint/libs/log"
+
 	"github.com/zeta-chain/zetacore/x/fungible/types"
 )
 
@@ -20,7 +19,7 @@ type (
 		memKey             storetypes.StoreKey
 		paramstore         paramtypes.Subspace
 		authKeeper         types.AccountKeeper
-		evmKeeper          evmkeeper.Keeper
+		evmKeeper          types.EVMKeeper
 		bankKeeper         types.BankKeeper
 		zetaobserverKeeper types.ZetaObserverKeeper
 	}
@@ -32,7 +31,7 @@ func NewKeeper(
 	memKey storetypes.StoreKey,
 	ps paramtypes.Subspace,
 	authKeeper types.AccountKeeper,
-	evmKeeper evmkeeper.Keeper,
+	evmKeeper types.EVMKeeper,
 	bankKeeper types.BankKeeper,
 	zetacobservKeeper types.ZetaObserverKeeper,
 ) *Keeper {
@@ -42,7 +41,6 @@ func NewKeeper(
 	}
 
 	return &Keeper{
-
 		cdc:                cdc,
 		storeKey:           storeKey,
 		memKey:             memKey,

diff --git a/x/fungible/types/expected_keepers.go b/x/fungible/types/expected_keepers.go
@@ -1,17 +1,23 @@
 package types
 
 import (
+	"context"
+	"math/big"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/vm"
+	evmtypes "github.com/evmos/ethermint/x/evm/types"
+
 	"github.com/zeta-chain/zetacore/common"
 	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 )
 
 // AccountKeeper defines the expected account keeper used for simulations (noalias)
 type AccountKeeper interface {
 	GetAccount(ctx sdk.Context, addr sdk.AccAddress) types.AccountI
-	// Methods imported from account should be defined here
 	GetSequence(ctx sdk.Context, addr sdk.AccAddress) (uint64, error)
 	GetModuleAccount(ctx sdk.Context, name string) types.ModuleAccountI
 }
@@ -39,3 +45,19 @@ type ZetaObserverKeeper interface {
 	GetParams(ctx sdk.Context) (params observertypes.Params)
 	GetCoreParamsByChainID(ctx sdk.Context, chainID int64) (params *observertypes.CoreParams, found bool)
 }
+
+type EVMKeeper interface {
+	ChainID() *big.Int
+	GetBlockBloomTransient(ctx sdk.Context) *big.Int
+	GetLogSizeTransient(ctx sdk.Context) uint64
+	WithChainID(ctx sdk.Context)
+	SetBlockBloomTransient(ctx sdk.Context, bloom *big.Int)
+	SetLogSizeTransient(ctx sdk.Context, logSize uint64)
+	EstimateGas(c context.Context, req *evmtypes.EthCallRequest) (*evmtypes.EstimateGasResponse, error)
+	ApplyMessage(
+		ctx sdk.Context,
+		msg core.Message,
+		tracer vm.EVMLogger,
+		commit bool,
+	) (*evmtypes.MsgEthereumTxResponse, error)
+}