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>
89 lines
2.7 KiB
Go
89 lines
2.7 KiB
Go
package codec
|
|
|
|
import (
|
|
"github.com/cosmos/cosmos-sdk/codec"
|
|
codecstd "github.com/cosmos/cosmos-sdk/codec/std"
|
|
"github.com/cosmos/cosmos-sdk/crypto/keyring"
|
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
|
"github.com/cosmos/cosmos-sdk/types/module"
|
|
"github.com/cosmos/cosmos-sdk/x/auth"
|
|
authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
|
|
"github.com/cosmos/cosmos-sdk/x/auth/vesting"
|
|
|
|
emintcrypto "github.com/cosmos/ethermint/crypto"
|
|
eminttypes "github.com/cosmos/ethermint/types"
|
|
)
|
|
|
|
var (
|
|
_ auth.Codec = (*Codec)(nil)
|
|
)
|
|
|
|
// Codec is a wrapper of the SDK standard Codec. It extends the Account interface
|
|
// by adding the EthAccount type for ethereum accounts.
|
|
type Codec struct {
|
|
*codecstd.Codec
|
|
}
|
|
|
|
func NewAppCodec(amino *codec.Codec) *Codec {
|
|
return &Codec{codecstd.NewAppCodec(amino)}
|
|
}
|
|
|
|
// MarshalAccount marshals an Account interface. If the given type implements
|
|
// the Marshaler interface, it is treated as a Proto-defined message and
|
|
// serialized that way. Otherwise, it falls back on the internal Amino codec.
|
|
func (c *Codec) MarshalAccount(accI authexported.Account) ([]byte, error) {
|
|
acc := &Account{}
|
|
if err := acc.SetAccount(accI); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return c.Marshaler.MarshalBinaryBare(acc)
|
|
}
|
|
|
|
// UnmarshalAccount returns an Account interface from raw encoded account bytes
|
|
// of a Proto-based Account type. An error is returned upon decoding failure.
|
|
func (c *Codec) UnmarshalAccount(bz []byte) (authexported.Account, error) {
|
|
acc := &Account{}
|
|
if err := c.Marshaler.UnmarshalBinaryBare(bz, acc); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return acc.GetAccount(), nil
|
|
}
|
|
|
|
// MarshalAccountJSON JSON encodes an account object implementing the Account
|
|
// interface.
|
|
func (c *Codec) MarshalAccountJSON(acc authexported.Account) ([]byte, error) {
|
|
return c.Marshaler.MarshalJSON(acc)
|
|
}
|
|
|
|
// UnmarshalAccountJSON returns an Account from JSON encoded bytes.
|
|
func (c *Codec) UnmarshalAccountJSON(bz []byte) (authexported.Account, error) {
|
|
acc := &Account{}
|
|
if err := c.Marshaler.UnmarshalJSON(bz, acc); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return acc.GetAccount(), nil
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// MakeCodec registers the necessary types and interfaces for an sdk.App. This
|
|
// codec is provided to all the modules the application depends on.
|
|
//
|
|
// NOTE: This codec will be deprecated in favor of AppCodec once all modules are
|
|
// migrated.
|
|
func MakeCodec(bm module.BasicManager) *codec.Codec {
|
|
cdc := codec.New()
|
|
|
|
bm.RegisterCodec(cdc)
|
|
vesting.RegisterCodec(cdc)
|
|
sdk.RegisterCodec(cdc)
|
|
emintcrypto.RegisterCodec(cdc)
|
|
codec.RegisterCrypto(cdc)
|
|
eminttypes.RegisterCodec(cdc)
|
|
keyring.RegisterCodec(cdc) // temporary. Used to register keyring.Info
|
|
|
|
return cdc
|
|
}
|