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>
97 lines
2.7 KiB
Go
97 lines
2.7 KiB
Go
package types
|
|
|
|
import (
|
|
"encoding/json"
|
|
|
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
|
"github.com/cosmos/cosmos-sdk/x/auth"
|
|
"github.com/cosmos/cosmos-sdk/x/auth/exported"
|
|
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
|
tmamino "github.com/tendermint/tendermint/crypto/encoding/amino"
|
|
"gopkg.in/yaml.v2"
|
|
|
|
ethcmn "github.com/ethereum/go-ethereum/common"
|
|
ethcrypto "github.com/ethereum/go-ethereum/crypto"
|
|
)
|
|
|
|
var _ exported.Account = (*EthAccount)(nil)
|
|
var _ exported.GenesisAccount = (*EthAccount)(nil)
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// Main Ethermint account
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// ProtoAccount defines the prototype function for BaseAccount used for an
|
|
// AccountKeeper.
|
|
func ProtoAccount() exported.Account {
|
|
return &EthAccount{
|
|
BaseAccount: &auth.BaseAccount{},
|
|
CodeHash: ethcrypto.Keccak256(nil),
|
|
}
|
|
}
|
|
|
|
type ethermintAccountPretty struct {
|
|
Address sdk.AccAddress `json:"address" yaml:"address"`
|
|
Coins sdk.Coins `json:"coins" yaml:"coins"`
|
|
PubKey []byte `json:"public_key" yaml:"public_key"`
|
|
AccountNumber uint64 `json:"account_number" yaml:"account_number"`
|
|
Sequence uint64 `json:"sequence" yaml:"sequence"`
|
|
CodeHash string `json:"code_hash" yaml:"code_hash"`
|
|
}
|
|
|
|
// MarshalYAML returns the YAML representation of an account.
|
|
func (acc EthAccount) MarshalYAML() (interface{}, error) {
|
|
alias := ethermintAccountPretty{
|
|
Address: acc.Address,
|
|
PubKey: acc.PubKey,
|
|
AccountNumber: acc.AccountNumber,
|
|
Sequence: acc.Sequence,
|
|
CodeHash: ethcmn.Bytes2Hex(acc.CodeHash),
|
|
}
|
|
|
|
bz, err := yaml.Marshal(alias)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return string(bz), err
|
|
}
|
|
|
|
// MarshalJSON returns the JSON representation of an EthAccount.
|
|
func (acc EthAccount) MarshalJSON() ([]byte, error) {
|
|
alias := ethermintAccountPretty{
|
|
Address: acc.Address,
|
|
PubKey: acc.PubKey,
|
|
AccountNumber: acc.AccountNumber,
|
|
Sequence: acc.Sequence,
|
|
CodeHash: ethcmn.Bytes2Hex(acc.CodeHash),
|
|
}
|
|
|
|
return json.Marshal(alias)
|
|
}
|
|
|
|
// UnmarshalJSON unmarshals raw JSON bytes into an EthAccount.
|
|
func (acc *EthAccount) UnmarshalJSON(bz []byte) error {
|
|
acc.BaseAccount = &authtypes.BaseAccount{}
|
|
var alias ethermintAccountPretty
|
|
if err := json.Unmarshal(bz, &alias); err != nil {
|
|
return err
|
|
}
|
|
|
|
if alias.PubKey != nil {
|
|
pubk, err := tmamino.PubKeyFromBytes(alias.PubKey)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
acc.BaseAccount.PubKey = pubk.Bytes()
|
|
}
|
|
|
|
acc.BaseAccount.Address = alias.Address
|
|
acc.BaseAccount.AccountNumber = alias.AccountNumber
|
|
acc.BaseAccount.Sequence = alias.Sequence
|
|
acc.CodeHash = ethcmn.Hex2Bytes(alias.CodeHash)
|
|
|
|
return nil
|
|
}
|