4d609b2a22
* evm: move Keeper and Querier to /keeper package * keeper: update keeper_test.go * fix format * evm: use aliased types * bump SDK version to v0.38.1 * app: updates from new version * errors: switch sdk.Error -> error * errors: switch sdk.Error -> error. Continuation * more fixes * update app/ * update keys and client pkgs * build * fix tests * lint * minor changes * changelog * address @austinbell comments * Fix keyring usage in rpc API and CLI * fix keyring * break line * Misc cleanup (#188) * evm: move Begin and EndBlock to abci.go * evm: use expected keeper interfaces * app: use EthermintApp for integration and unit test setup * evm: remove count type; update codec * go mod verify * evm: rename msgs for consistency * evm: events * minor cleanup * lint * ante: update tests * changelog * nolint * evm: update statedb to create ethermint Account instead of BaseAccount * fix importer test * address @austinabell comments * update README * changelog * evm: update codec * fix event sender * store logs in keeper after transition (#210) * add some comments * begin log handler test * update TransitionCSDB to return ReturnData * use rlp for result data encode/decode * update tests * implement SetBlockLogs * implement GetBlockLogs * test log set/get * update keeper get/set logs to use hash as key * fix test * move logsKey to csdb * attempt to fix test * attempt to fix test * attempt to fix test * lint * lint * lint * save logs after handling msg * update k.Logs * cleanup * remove unused * fix issues * comment out handler test * address comments * lint * fix handler test * address comments * use amino * lint * address comments * merge * fix encoding bug * minor fix * rpc: error handling * rpc: simulate only returns gasConsumed * rpc: error ineffassign * go: bump version to 1.14 and SDK version to latest master * rpc: fix simulation return value * breaking changes from SDK * sdk: breaking changes; build * tests: fixes * minor fix * proto: ethermint types attempt * proto: define EthAccount proto type and extend sdk std.Codec * evm: fix panic on handler test * evm: minor state object changes * cleanup * tests: update test-importer * fix pubkey registration * lint * cleanup * more test checks for importer * minor change * codec fixes * rm init func * fix importer test build * fix marshaling for TxDecoder * use amino codec for evm * fix marshaling for SimulationResponse * use jsonpb for unmarshaling * fix method handler crashed * return err on VerifySig * switch stateObject balance to sdk.Int * fixes to codec and encoding * cleanup * set tmhash -> ethhash in state transition * add tmhash->ethereumhash to csdb.GetLogs * attempt to fix tests * update GetLogs to switch with Has * ante panic * diff changes * update SetLogs * evm/cli: use ethermint codec * use LengthPrefixed for encoding * add check for nil *big.Int * add balance to UpdateAccounts * fix previous balance * fix balance bug * prevent panic on make test-import Co-authored-by: austinabell <austinabell8@gmail.com> Co-authored-by: noot <36753753+noot@users.noreply.github.com> Co-authored-by: noot <elizabethjbinks@gmail.com>
196 lines
5.6 KiB
Go
196 lines
5.6 KiB
Go
package keeper
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
|
|
"github.com/cosmos/cosmos-sdk/codec"
|
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
|
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
|
|
"github.com/cosmos/ethermint/utils"
|
|
"github.com/cosmos/ethermint/version"
|
|
"github.com/cosmos/ethermint/x/evm/types"
|
|
ethcmn "github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
|
abci "github.com/tendermint/tendermint/abci/types"
|
|
)
|
|
|
|
// NewQuerier is the module level router for state queries
|
|
func NewQuerier(keeper Keeper) sdk.Querier {
|
|
return func(ctx sdk.Context, path []string, req abci.RequestQuery) ([]byte, error) {
|
|
switch path[0] {
|
|
case types.QueryProtocolVersion:
|
|
return queryProtocolVersion(keeper)
|
|
case types.QueryBalance:
|
|
return queryBalance(ctx, path, keeper)
|
|
case types.QueryBlockNumber:
|
|
return queryBlockNumber(ctx, keeper)
|
|
case types.QueryStorage:
|
|
return queryStorage(ctx, path, keeper)
|
|
case types.QueryCode:
|
|
return queryCode(ctx, path, keeper)
|
|
case types.QueryNonce:
|
|
return queryNonce(ctx, path, keeper)
|
|
case types.QueryHashToHeight:
|
|
return queryHashToHeight(ctx, path, keeper)
|
|
case types.QueryTxLogs:
|
|
return queryTxLogs(ctx, path, keeper)
|
|
case types.QueryLogsBloom:
|
|
return queryBlockLogsBloom(ctx, path, keeper)
|
|
case types.QueryLogs:
|
|
return queryLogs(ctx, keeper)
|
|
case types.QueryAccount:
|
|
return queryAccount(ctx, path, keeper)
|
|
default:
|
|
return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "unknown query endpoint")
|
|
}
|
|
}
|
|
}
|
|
|
|
func queryProtocolVersion(keeper Keeper) ([]byte, error) {
|
|
vers := version.ProtocolVersion
|
|
|
|
bz, err := codec.MarshalJSONIndent(keeper.cdc, hexutil.Uint(vers))
|
|
if err != nil {
|
|
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
|
|
}
|
|
|
|
return bz, nil
|
|
}
|
|
|
|
func queryBalance(ctx sdk.Context, path []string, keeper Keeper) ([]byte, error) {
|
|
addr := ethcmn.HexToAddress(path[1])
|
|
balance := keeper.GetBalance(ctx, addr)
|
|
|
|
res := types.QueryResBalance{Balance: utils.MarshalBigInt(balance)}
|
|
bz, err := codec.MarshalJSONIndent(keeper.cdc, res)
|
|
if err != nil {
|
|
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
|
|
}
|
|
|
|
return bz, nil
|
|
}
|
|
|
|
func queryBlockNumber(ctx sdk.Context, keeper Keeper) ([]byte, error) {
|
|
num := ctx.BlockHeight()
|
|
bnRes := types.QueryResBlockNumber{Number: num}
|
|
bz, err := codec.MarshalJSONIndent(keeper.cdc, bnRes)
|
|
if err != nil {
|
|
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
|
|
}
|
|
|
|
return bz, nil
|
|
}
|
|
|
|
func queryStorage(ctx sdk.Context, path []string, keeper Keeper) ([]byte, error) {
|
|
addr := ethcmn.HexToAddress(path[1])
|
|
key := ethcmn.HexToHash(path[2])
|
|
val := keeper.GetState(ctx, addr, key)
|
|
res := types.QueryResStorage{Value: val.Bytes()}
|
|
bz, err := codec.MarshalJSONIndent(keeper.cdc, res)
|
|
if err != nil {
|
|
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
|
|
}
|
|
return bz, nil
|
|
}
|
|
|
|
func queryCode(ctx sdk.Context, path []string, keeper Keeper) ([]byte, error) {
|
|
addr := ethcmn.HexToAddress(path[1])
|
|
code := keeper.GetCode(ctx, addr)
|
|
res := types.QueryResCode{Code: code}
|
|
bz, err := codec.MarshalJSONIndent(keeper.cdc, res)
|
|
if err != nil {
|
|
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
|
|
}
|
|
|
|
return bz, nil
|
|
}
|
|
|
|
func queryNonce(ctx sdk.Context, path []string, keeper Keeper) ([]byte, error) {
|
|
addr := ethcmn.HexToAddress(path[1])
|
|
nonce := keeper.GetNonce(ctx, addr)
|
|
nRes := types.QueryResNonce{Nonce: nonce}
|
|
bz, err := codec.MarshalJSONIndent(keeper.cdc, nRes)
|
|
if err != nil {
|
|
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
|
|
}
|
|
|
|
return bz, nil
|
|
}
|
|
|
|
func queryHashToHeight(ctx sdk.Context, path []string, keeper Keeper) ([]byte, error) {
|
|
blockHash := ethcmn.FromHex(path[1])
|
|
blockNumber := keeper.GetBlockHashMapping(ctx, blockHash)
|
|
|
|
res := types.QueryResBlockNumber{Number: blockNumber}
|
|
bz, err := codec.MarshalJSONIndent(keeper.cdc, res)
|
|
if err != nil {
|
|
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
|
|
}
|
|
|
|
return bz, nil
|
|
}
|
|
|
|
func queryBlockLogsBloom(ctx sdk.Context, path []string, keeper Keeper) ([]byte, error) {
|
|
num, err := strconv.ParseInt(path[1], 10, 64)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not unmarshal block number: %w", err)
|
|
}
|
|
|
|
bloom, err := keeper.GetBlockBloomMapping(ctx, num)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to get block bloom mapping: %w", err)
|
|
}
|
|
|
|
res := types.QueryBloomFilter{Bloom: bloom}
|
|
bz, err := codec.MarshalJSONIndent(keeper.cdc, res)
|
|
if err != nil {
|
|
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
|
|
}
|
|
|
|
return bz, nil
|
|
}
|
|
|
|
func queryTxLogs(ctx sdk.Context, path []string, keeper Keeper) ([]byte, error) {
|
|
txHash := ethcmn.HexToHash(path[1])
|
|
logs, err := keeper.GetLogs(ctx, txHash)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
res := types.QueryETHLogs{Logs: logs}
|
|
bz, err := codec.MarshalJSONIndent(keeper.cdc, res)
|
|
if err != nil {
|
|
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
|
|
}
|
|
|
|
return bz, nil
|
|
}
|
|
|
|
func queryLogs(ctx sdk.Context, keeper Keeper) ([]byte, error) {
|
|
logs := keeper.AllLogs(ctx)
|
|
|
|
res := types.QueryETHLogs{Logs: logs}
|
|
bz, err := codec.MarshalJSONIndent(keeper.cdc, res)
|
|
if err != nil {
|
|
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
|
|
}
|
|
return bz, nil
|
|
}
|
|
|
|
func queryAccount(ctx sdk.Context, path []string, keeper Keeper) ([]byte, error) {
|
|
addr := ethcmn.HexToAddress(path[1])
|
|
so := keeper.GetOrNewStateObject(ctx, addr)
|
|
|
|
res := types.QueryResAccount{
|
|
Balance: utils.MarshalBigInt(so.Balance()),
|
|
CodeHash: so.CodeHash(),
|
|
Nonce: so.Nonce(),
|
|
}
|
|
bz, err := codec.MarshalJSONIndent(keeper.cdc, res)
|
|
if err != nil {
|
|
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
|
|
}
|
|
return bz, nil
|
|
}
|