imp(all): Add EVM, ERC-20, feemarket and precompiles from Evmos

CHANGELOG.md

@@ -8,6 +8,7 @@ This changelog was created using the `clu` binary
 
 ### Improvements
 
+- (all) [#37](https://github.com/evmos/os/pull/37) Add EVM, feemarket and precompiles from evmOS.
 - (all) [#30](https://github.com/evmos/os/pull/30) Add example chain implementation and ante handlers.
 - (ci) [#35](https://github.com/evmos/os/pull/35) Disable dependabot temporarily.
 - (contracts) [#24](https://github.com/evmos/os/pull/24) Add contracts directory and compilation script.

ante/cosmos/setup_test.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/evmos/evmos/v19/x/evm/statedb"
 	evmtypes "github.com/evmos/evmos/v19/x/evm/types"
-	feemarkettypes "github.com/evmos/evmos/v19/x/feemarket/types"
 	"github.com/evmos/os/ante"
 	evmante "github.com/evmos/os/ante/evm"
 	"github.com/evmos/os/crypto/ethsecp256k1"
@@ -33,6 +32,7 @@ import (
 	chaintestutil "github.com/evmos/os/example_chain/testutil"
 	"github.com/evmos/os/testutil"
 	"github.com/evmos/os/types"
+	feemarkettypes "github.com/evmos/os/x/feemarket/types"
 )
 
 type AnteTestSuite struct {

ante/evm/setup_test.go

@@ -17,13 +17,13 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/ethereum/go-ethereum/core/types"
 	evmtypes "github.com/evmos/evmos/v19/x/evm/types"
-	feemarkettypes "github.com/evmos/evmos/v19/x/feemarket/types"
 	evmosante "github.com/evmos/os/ante"
 	"github.com/evmos/os/encoding"
 	"github.com/evmos/os/ethereum/eip712"
 	app "github.com/evmos/os/example_chain"
 	chainante "github.com/evmos/os/example_chain/ante"
 	"github.com/evmos/os/testutil"
+	feemarkettypes "github.com/evmos/os/x/feemarket/types"
 )
 
 type AnteTestSuite struct {

ante/interfaces/evm.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/evmos/evmos/v19/x/evm/statedb"
 	evmtypes "github.com/evmos/evmos/v19/x/evm/types"
-	feemarkettypes "github.com/evmos/evmos/v19/x/feemarket/types"
+	feemarkettypes "github.com/evmos/os/x/feemarket/types"
 )
 
 // EVMKeeper exposes the required EVM keeper interface required for ante handlers

example_chain/app.go

@@ -97,9 +97,6 @@
 	"github.com/evmos/evmos/v19/x/evm/core/vm"
 	evmkeeper "github.com/evmos/evmos/v19/x/evm/keeper"
 	evmtypes "github.com/evmos/evmos/v19/x/evm/types"
-	"github.com/evmos/evmos/v19/x/feemarket"
-	feemarketkeeper "github.com/evmos/evmos/v19/x/feemarket/keeper"
-	feemarkettypes "github.com/evmos/evmos/v19/x/feemarket/types"
 	evmosante "github.com/evmos/os/ante"
 	evmosevmante "github.com/evmos/os/ante/evm"
 	evmosencoding "github.com/evmos/os/encoding"
@@ -108,6 +105,9 @@
 	srvflags "github.com/evmos/os/server/flags"
 	evmostypes "github.com/evmos/os/types"
 	evmosutils "github.com/evmos/os/utils"
+	"github.com/evmos/os/x/feemarket"
+	feemarketkeeper "github.com/evmos/os/x/feemarket/keeper"
+	feemarkettypes "github.com/evmos/os/x/feemarket/types"
 	"github.com/spf13/cast"
 )
 
@@ -428,7 +428,7 @@
 	app.EVMKeeper = evmkeeper.NewKeeper(
 		appCodec, keys[evmtypes.StoreKey], tkeys[evmtypes.TransientKey],
 		authtypes.NewModuleAddress(govtypes.ModuleName),
 		app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.FeeMarketKeeper,
 		&app.Erc20Keeper,
 		tracer, app.GetSubspace(evmtypes.ModuleName),
 	)

example_chain/testutil/contract.go

@@ -19,9 +19,9 @@ import (
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 
-	evm "github.com/evmos/evmos/v19/x/evm/types"
-	app "github.com/evmos/os/example_chain"
+	example_app "github.com/evmos/os/example_chain"
 	"github.com/evmos/os/testutil/tx"
+	evm "github.com/evmos/os/x/evm/types"
 )
 
 // ContractArgs are the params used for calling a smart contract.
@@ -42,7 +42,7 @@ type ContractCallArgs struct {
 	Contract ContractArgs
 	// Nonce is the nonce to use for the transaction.
 	Nonce *big.Int
-	// Amount is the aevmos amount to send in the transaction.
+	// Amount is the amount of the native denomination to send in the transaction.
 	Amount *big.Int
 	// GasLimit to use for the transaction
 	GasLimit uint64
@@ -54,7 +54,7 @@ type ContractCallArgs struct {
 // compiled contract data and constructor arguments
 func DeployContract(
 	ctx sdk.Context,
-	app *app.ExampleChain,
+	app *example_app.ExampleChain,
 	priv cryptotypes.PrivKey,
 	queryClientEvm evm.QueryClient,
 	contract evm.CompiledContract,
@@ -102,14 +102,14 @@ func DeployContract(
 // with the provided factoryAddress
 func DeployContractWithFactory(
 	ctx sdk.Context,
-	evmosApp *app.ExampleChain,
+	exampleApp *example_app.ExampleChain,
 	priv cryptotypes.PrivKey,
 	factoryAddress common.Address,
 ) (common.Address, abci.ResponseDeliverTx, error) {
-	chainID := evmosApp.EVMKeeper.ChainID()
+	chainID := exampleApp.EVMKeeper.ChainID()
 	from := common.BytesToAddress(priv.PubKey().Address().Bytes())
-	factoryNonce := evmosApp.EVMKeeper.GetNonce(ctx, factoryAddress)
-	nonce := evmosApp.EVMKeeper.GetNonce(ctx, from)
+	factoryNonce := exampleApp.EVMKeeper.GetNonce(ctx, factoryAddress)
+	nonce := exampleApp.EVMKeeper.GetNonce(ctx, from)
 
 	msgEthereumTx := evm.NewTx(&evm.EvmTxArgs{
 		ChainID:  chainID,
@@ -120,12 +120,12 @@ func DeployContractWithFactory(
 	})
 	msgEthereumTx.From = from.String()
 
-	res, err := DeliverEthTx(evmosApp, priv, msgEthereumTx)
+	res, err := DeliverEthTx(exampleApp, priv, msgEthereumTx)
 	if err != nil {
 		return common.Address{}, abci.ResponseDeliverTx{}, err
 	}
 
-	if _, err := CheckEthTxResponse(res, evmosApp.AppCodec()); err != nil {
+	if _, err := CheckEthTxResponse(res, exampleApp.AppCodec()); err != nil {
 		return common.Address{}, abci.ResponseDeliverTx{}, err
 	}
 

example_chain/testutil/fund.go

@@ -22,7 +22,9 @@ func FundAccount(ctx sdk.Context, bankKeeper bankkeeper.Keeper, addr sdk.AccAddr
 }
 
 // FundAccountWithBaseDenom is a utility function that uses the FundAccount function
-// to fund an account with the default Evmos denomination.
+// to fund an account with the default denomination.
+//
+// TODO: as per Freddy these methods should be replaced with a bank transfer from a main account, not by minting in the process
 func FundAccountWithBaseDenom(ctx sdk.Context, bankKeeper bankkeeper.Keeper, addr sdk.AccAddress, amount int64) error {
 	coins := sdk.NewCoins(
 		sdk.NewCoin(testutil.ExampleAttoDenom, math.NewInt(amount)),

ibc/errors.go

@@ -0,0 +1,11 @@
+// Copyright Tharsis Labs Ltd.(Evmos)
+// SPDX-License-Identifier:ENCL-1.0(https://github.com/evmos/evmos/blob/main/LICENSE)
+package ibc
+
+import "errors"
+
+var (
+	ErrNoIBCVoucherDenom  = errors.New("denom is not an IBC voucher")
+	ErrDenomTraceNotFound = errors.New("denom trace not found")
+	ErrInvalidBaseDenom   = errors.New("invalid base denomination")
+)

ibc/module.go

@@ -0,0 +1,129 @@
+// Copyright Tharsis Labs Ltd.(Evmos)
+// SPDX-License-Identifier:ENCL-1.0(https://github.com/evmos/evmos/blob/main/LICENSE)
+
+package ibc
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
+	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+	porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
+	"github.com/cosmos/ibc-go/v7/modules/core/exported"
+)
+
+var _ porttypes.IBCModule = &Module{}
+
+// Module a concrete type for a module boilerplate.
+type Module struct {
+	app porttypes.IBCModule
+}
+
+// NewModule creates a new IBC Module boilerplate given the underlying IBC app
+func NewModule(app porttypes.IBCModule) *Module {
+	return &Module{
+		app: app,
+	}
+}
+
+// OnChanOpenInit implements the Module interface
+// It calls the underlying app's OnChanOpenInit callback.
+func (im Module) OnChanOpenInit(
+	ctx sdk.Context,
+	order channeltypes.Order,
+	connectionHops []string,
+	portID string,
+	channelID string,
+	chanCap *capabilitytypes.Capability,
+	counterparty channeltypes.Counterparty,
+	version string,
+) (string, error) {
+	return im.app.OnChanOpenInit(ctx, order, connectionHops, portID, channelID, chanCap, counterparty, version)
+}
+
+// OnChanOpenTry implements the Module interface.
+// It calls the underlying app's OnChanOpenTry callback.
+func (im Module) OnChanOpenTry(
+	ctx sdk.Context,
+	order channeltypes.Order,
+	connectionHops []string,
+	portID,
+	channelID string,
+	chanCap *capabilitytypes.Capability,
+	counterparty channeltypes.Counterparty,
+	counterpartyVersion string,
+) (version string, err error) {
+	return im.app.OnChanOpenTry(ctx, order, connectionHops, portID, channelID, chanCap, counterparty, counterpartyVersion)
+}
+
+// OnChanOpenAck implements the Module interface.
+// It calls the underlying app's OnChanOpenAck callback.
+func (im Module) OnChanOpenAck(
+	ctx sdk.Context,
+	portID,
+	channelID,
+	counterpartyChannelID,
+	counterpartyVersion string,
+) error {
+	return im.app.OnChanOpenAck(ctx, portID, channelID, counterpartyChannelID, counterpartyVersion)
+}
+
+// OnChanOpenConfirm implements the Module interface.
+// It calls the underlying app's OnChanOpenConfirm callback.
+func (im Module) OnChanOpenConfirm(
+	ctx sdk.Context,
+	portID,
+	channelID string,
+) error {
+	return im.app.OnChanOpenConfirm(ctx, portID, channelID)
+}
+
+// OnChanCloseInit implements the Module interface
+// It calls the underlying app's OnChanCloseInit callback.
+func (im Module) OnChanCloseInit(
+	ctx sdk.Context,
+	portID,
+	channelID string,
+) error {
+	return im.app.OnChanCloseInit(ctx, portID, channelID)
+}
+
+// OnChanCloseConfirm implements the Module interface.
+// It calls the underlying app's OnChanCloseConfirm callback.
+func (im Module) OnChanCloseConfirm(
+	ctx sdk.Context,
+	portID,
+	channelID string,
+) error {
+	return im.app.OnChanCloseConfirm(ctx, portID, channelID)
+}
+
+// OnRecvPacket implements the Module interface.
+// It calls the underlying app's OnRecvPacket callback.
+func (im Module) OnRecvPacket(
+	ctx sdk.Context,
+	packet channeltypes.Packet,
+	relayer sdk.AccAddress,
+) exported.Acknowledgement {
+	return im.app.OnRecvPacket(ctx, packet, relayer)
+}
+
+// OnAcknowledgementPacket implements the Module interface.
+// It calls the underlying app's OnAcknowledgementPacket callback.
+func (im Module) OnAcknowledgementPacket(
+	ctx sdk.Context,
+	packet channeltypes.Packet,
+	acknowledgement []byte,
+	relayer sdk.AccAddress,
+) error {
+	return im.app.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer)
+}
+
+// OnTimeoutPacket implements the Module interface.
+// It calls the underlying app's OnTimeoutPacket callback.
+func (im Module) OnTimeoutPacket(
+	ctx sdk.Context,
+	packet channeltypes.Packet,
+	relayer sdk.AccAddress,
+) error {
+	return im.app.OnTimeoutPacket(ctx, packet, relayer)
+}