diff --git a/app/ethermint.go b/app/ethermint.go index 726e22f7..2b82850e 100644 --- a/app/ethermint.go +++ b/app/ethermint.go @@ -14,7 +14,6 @@ import ( "github.com/pkg/errors" "github.com/cosmos/ethermint/handlers" - "github.com/cosmos/ethermint/state" "github.com/cosmos/ethermint/types" ethcmn "github.com/ethereum/go-ethereum/common" @@ -37,7 +36,6 @@ type ( *bam.BaseApp codec *wire.Codec - ethDB *state.Database accountKey *sdk.KVStoreKey storageKey *sdk.KVStoreKey @@ -84,30 +82,10 @@ func NewEthermintApp(logger tmlog.Logger, db dbm.DB, sdkAddr ethcmn.Address) *Et tParamsKey: types.StoreKeyTransParams, } - // create Ethereum state database - ethDB, err := state.NewDatabase(cms, db, state.DefaultStoreCacheSize) - if err != nil { - tmcmn.Exit(err.Error()) - } - - app.ethDB = ethDB - // set application keepers and mappers app.accountMapper = auth.NewAccountMapper(codec, app.accountKey, auth.ProtoBaseAccount) - app.coinKeeper = bank.NewKeeper(app.accountMapper) app.paramsKeeper = params.NewKeeper(app.codec, app.paramsKey) app.feeCollKeeper = auth.NewFeeCollectionKeeper(app.codec, app.feeCollKey) - app.stakeKeeper = stake.NewKeeper( - app.codec, app.stakeKey, app.coinKeeper, app.RegisterCodespace(stake.DefaultCodespace), - ) - app.govKeeper = gov.NewKeeper( - app.codec, app.govKey, app.paramsKeeper.Setter(), app.coinKeeper, - app.stakeKeeper, app.RegisterCodespace(gov.DefaultCodespace), - ) - app.slashingKeeper = slashing.NewKeeper( - app.codec, app.slashingKey, app.stakeKeeper, - app.paramsKeeper.Getter(), app.RegisterCodespace(slashing.DefaultCodespace), - ) // register message handlers app.Router(). @@ -140,25 +118,13 @@ func NewEthermintApp(logger tmlog.Logger, db dbm.DB, sdkAddr ethcmn.Address) *Et // BeginBlocker signals the beginning of a block. It performs application // updates on the start of every block. func (app *EthermintApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock { - tags := slashing.BeginBlocker(ctx, req, app.slashingKeeper) - - return abci.ResponseBeginBlock{ - Tags: tags.ToKVPairs(), - } + return abci.ResponseBeginBlock{} } // EndBlocker signals the end of a block. It performs application updates on // the end of every block. func (app *EthermintApp) EndBlocker(ctx sdk.Context, _ abci.RequestEndBlock) abci.ResponseEndBlock { - tags := gov.EndBlocker(ctx, app.govKeeper) - validatorUpdates := stake.EndBlocker(ctx, app.stakeKeeper) - - app.slashingKeeper.AddValidators(ctx, validatorUpdates) - - return abci.ResponseEndBlock{ - ValidatorUpdates: validatorUpdates, - Tags: tags, - } + return abci.ResponseEndBlock{} } // initChainer initializes the application blockchain with validators and other @@ -172,25 +138,9 @@ func (app *EthermintApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) panic(errors.Wrap(err, "failed to parse application genesis state")) } - // load the genesis accounts - for _, genAcc := range genesisState.Accounts { - acc := genAcc.ToAccount() - acc.AccountNumber = app.accountMapper.GetNextAccountNumber(ctx) - app.accountMapper.SetAccount(ctx, acc) - } + // TODO: load the genesis accounts - // load the genesis stake information - validators, err := stake.InitGenesis(ctx, app.stakeKeeper, genesisState.StakeData) - if err != nil { - panic(errors.Wrap(err, "failed to initialize genesis validators")) - } - - slashing.InitGenesis(ctx, app.slashingKeeper, genesisState.StakeData) - gov.InitGenesis(ctx, app.govKeeper, genesisState.GovData) - - return abci.ResponseInitChain{ - Validators: validators, - } + return abci.ResponseInitChain{} } // CreateCodec creates a new amino wire codec and registers all the necessary @@ -200,9 +150,6 @@ func CreateCodec() *wire.Codec { types.RegisterWire(codec) auth.RegisterWire(codec) - gov.RegisterWire(codec) - slashing.RegisterWire(codec) - stake.RegisterWire(codec) wire.RegisterCrypto(codec) return codec