From 7d4b3ef51e4767f4b496b4567a4e471b4205cc31 Mon Sep 17 00:00:00 2001 From: Aleksandr Bezobchuk Date: Fri, 24 Aug 2018 08:37:18 -0700 Subject: [PATCH] Update ethermint app to no longer use SDK address --- app/ethermint.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/ethermint.go b/app/ethermint.go index 575452eb..e98536f8 100644 --- a/app/ethermint.go +++ b/app/ethermint.go @@ -9,7 +9,6 @@ import ( "github.com/cosmos/ethermint/handlers" "github.com/cosmos/ethermint/types" - ethcmn "github.com/ethereum/go-ethereum/common" ethparams "github.com/ethereum/go-ethereum/params" tmcmn "github.com/tendermint/tendermint/libs/common" @@ -43,20 +42,17 @@ type ( // NewEthermintApp returns a reference to a new initialized Ethermint // application. -func NewEthermintApp( - logger tmlog.Logger, db dbm.DB, ethChainCfg *ethparams.ChainConfig, - sdkAddr ethcmn.Address, opts ...Options, +func NewEthermintApp(logger tmlog.Logger, db dbm.DB, ethChainCfg *ethparams.ChainConfig, opts ...Options, ) *EthermintApp { codec := CreateCodec() app := &EthermintApp{ - BaseApp: bam.NewBaseApp(appName, codec, logger, db), + BaseApp: bam.NewBaseApp(appName, logger, db, types.TxDecoder(codec)), codec: codec, accountKey: sdk.NewKVStoreKey("accounts"), } app.accountMapper = auth.NewAccountMapper(codec, app.accountKey, auth.ProtoBaseAccount) - app.SetTxDecoder(types.TxDecoder(codec, sdkAddr)) app.SetAnteHandler(handlers.AnteHandler(app.accountMapper)) app.MountStoresIAVL(app.accountKey)