Merge main feat ibcv10

CHANGELOG.md

@@ -22,6 +22,7 @@
 - Refactored evmos/os into cosmos/evm
 - Renamed x/evm to x/vm
 - Renamed protobuf files from evmos to cosmos org
+- [\#83](https://github.com/cosmos/evm/pull/83) Remove base fee v1 from x/feemarket
 
 ### API-Breaking
 

Makefile

@@ -15,7 +15,7 @@ export GO111MODULE = on
 # Default target executed when no arguments are given to make.
 default_target: all
 
-.PHONY: build, default_target
+.PHONY: build default_target
 
 ###############################################################################
 ###                          evmd Build & Install                           ###
@@ -55,6 +55,10 @@ endif
 ldflags += $(LDFLAGS)
 ldflags := $(strip $(ldflags))
 
+ifeq (staticlink,$(findstring staticlink,$(COSMOS_BUILD_OPTIONS)))
+  ldflags += -linkmode external -extldflags '-static'
+endif
+
 BUILD_FLAGS := -tags "$(build_tags)" -ldflags '$(ldflags)'
 # check for nostrip option
 ifeq (,$(findstring nostrip,$(COSMOS_BUILD_OPTIONS)))
@@ -284,4 +288,4 @@ contracts-compile:
 # Add a new solidity contract to be compiled
 contracts-add:
 	@echo "Adding a new smart contract to be compiled..."
-	@python3 ./scripts/compile_smart_contracts/compile_smart_contracts.py --add $(CONTRACT)
+	@python3 ./scripts/compile_smart_contracts/compile_smart_contracts.py --add $(CONTRACT)

README.md

@@ -7,6 +7,8 @@ alt="Cosmos EVM - A plug-and-play solution that adds EVM compatibility and custo
 v1 release, targeting late Q2. Some breaking changes might occur. While the Cosmos EVM is currently being used in
 production on various chains without fault, Interchain Labs will only mark this repository as stable after the audit is completed.
 
+**Visit the official documentation for Cosmos EVM**: [evm.cosmos.network](https://evm.cosmos.network/)
+
 ## What is Cosmos EVM?
 
 Cosmos EVM is a plug-and-play solution that adds EVM compatibility

ante/interfaces/evm.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/vm"
 
 	feemarkettypes "github.com/cosmos/evm/x/feemarket/types"
-	"github.com/cosmos/evm/x/vm/core/vm"
 	"github.com/cosmos/evm/x/vm/statedb"
 	evmtypes "github.com/cosmos/evm/x/vm/types"
 

evmd/README.md

@@ -18,7 +18,7 @@ By default, this chain has the following configuration:
 | Chain ID            | `cosmos_262144-1`      |
 | Custom Opcodes      | -                      |
 | Default Token Pairs | 1 for the native token |
-| Denomination        | `utest`                |
+| Denomination        | `atest`                |
 | EVM permissioning   | permissionless         |
 | Enabled Precompiles | all                    |
 

evmd/activators.go

@@ -1,16 +1,15 @@
 package evmd
 
 import (
+	"github.com/ethereum/go-ethereum/core/vm"
+
 	"github.com/cosmos/evm/evmd/eips"
-	"github.com/cosmos/evm/x/vm/core/vm"
 )
 
 // cosmosEVMActivators defines a map of opcode modifiers associated
 // with a key defining the corresponding EIP.
-//
-//nolint:unused
-var cosmosEVMActivators = map[string]func(*vm.JumpTable){
-	"evmos_0": eips.Enable0000,
-	"evmos_1": eips.Enable0001,
-	"evmos_2": eips.Enable0002,
+var cosmosEVMActivators = map[int]func(*vm.JumpTable){
+	0o000: eips.Enable0000,
+	0o001: eips.Enable0001,
+	0o002: eips.Enable0002,
 }

evmd/app.go

@@ -8,11 +8,12 @@ import (
 	"os"
 	"sort"
 
+	corevm "github.com/ethereum/go-ethereum/core/vm"
 	"github.com/spf13/cast"
 
 	// Force-load the tracer engines to trigger registration due to Go-Ethereum v1.10.15 changes
-	_ "github.com/cosmos/evm/x/vm/core/tracers/js"
-	_ "github.com/cosmos/evm/x/vm/core/tracers/native"
+	_ "github.com/ethereum/go-ethereum/eth/tracers/js"
+	_ "github.com/ethereum/go-ethereum/eth/tracers/native"
 
 	abci "github.com/cometbft/cometbft/abci/types"
 
@@ -36,7 +37,6 @@ import (
 	transferkeeper "github.com/cosmos/evm/x/ibc/transfer/keeper"
 	transferv2 "github.com/cosmos/evm/x/ibc/transfer/v2"
 	"github.com/cosmos/evm/x/vm"
-	corevm "github.com/cosmos/evm/x/vm/core/vm"
 	evmkeeper "github.com/cosmos/evm/x/vm/keeper"
 	evmtypes "github.com/cosmos/evm/x/vm/types"
 	"github.com/cosmos/gogoproto/proto"

evmd/config.go

@@ -37,7 +37,7 @@ var ChainsCoinInfo = map[string]evmtypes.EvmCoinInfo{
 		Decimals:     evmtypes.EighteenDecimals,
 	},
 	CosmosChainID: {
-		Denom:        "utest",
+		Denom:        "atest",
 		DisplayDenom: "test",
 		Decimals:     evmtypes.EighteenDecimals,
 	},
@@ -69,6 +69,7 @@ func EvmAppOptions(chainID string) error {
 	ethCfg := evmtypes.DefaultChainConfig(chainID)
 
 	err = evmtypes.NewEVMConfigurator().
+		WithExtendedEips(cosmosEVMActivators).
 		WithChainConfig(ethCfg).
 		// NOTE: we're using the 18 decimals default for the example chain
 		WithEVMCoinInfo(baseDenom, uint8(coinInfo.Decimals)).