etclabscore · meowsbits · Jan 19, 2023 · Aug 25, 2022 · Aug 25, 2022 · Aug 25, 2022
diff --git a/.github/workflows/evmc.yml b/.github/workflows/evmc.yml
@@ -8,8 +8,8 @@ on:
 
 jobs:
 
-  build-ewasm:
-    name: EWASM State Tests
+  build-evmc:
+    name: EVMC/EVM+EWASM State Tests
     runs-on: ubuntu-latest
     steps:
 
@@ -22,9 +22,31 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
 
+      - name: Install cmake
+        run: |
+          sudo apt-get update -y
+          sudo apt-get upgrade -y
+          sudo apt-get install -y cmake
+          cmake --version
+
+      - name: Install necessary GLIBCXX version
+        run: |
+          strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBCXX
+          sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+          sudo apt-get update -y
+          sudo apt-get install -y gcc-9 g++-9
+          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 90
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 90
+          g++ --version
+          gcc --version     
+          strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBCXX
+
       - name: Get dependencies
         run: |
           go get -v -t -d ./...
+          git config --global --add safe.directory $(pwd)/tests/evm-benchmarks
+          git config --global --add safe.directory $(pwd)/tests/testdata
+          git config --global --add safe.directory $(pwd)/tests/testdata/LegacyTests
           git submodule update --init --recursive
           export GOBIN=${HOME}/go/bin
           mkdir -p "${GOBIN}"

diff --git a/.gitmodules b/.gitmodules
@@ -1,11 +1,11 @@
 [submodule "tests"]
 	path = tests/testdata
-	url = https://github.com/etclabscore/tests
+	url = https://github.com/ethereum/tests
 	shallow = true
 [submodule "evm-benchmarks"]
 	path = tests/evm-benchmarks
 	url = https://github.com/ipsilon/evm-benchmarks
 	shallow = true
 [submodule "tests-etc"]
 	path = tests/testdata-etc
-	url = https://github.com/etclabscore/tests-etc
+	url = https://github.com/etclabscore/tests
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ ios:
 	@echo "Import \"$(GOBIN)/Geth.framework\" to use the library."
 
 test:
-	$(GORUN) build/ci.go test
+	$(GORUN) build/ci.go test -timeout 20m
 
 # DEPRECATED.
 # No attempt will be made after the Istanbul fork to maintain
@@ -48,24 +48,16 @@ test-coregeth: \
 hera:
 	./build/hera.sh
 
-ssvm:
-	./build/ssvm.sh
-
 evmone:
 	./build/evmone.sh
 
-aleth-interpreter:
-	./build/aleth-interpreter.sh
-
 # Test EVMC support against various external interpreters.
-test-evmc: hera ssvm evmone aleth-interpreter
+test-evmc: hera evmone
 	go test -count 1 ./tests -run TestState -evmc.ewasm=$(ROOT_DIR)/build/_workspace/hera/build/src/libhera.so
-	go test -count 1 ./tests -run TestState -evmc.ewasm=$(ROOT_DIR)/build/_workspace/SSVM/build/tools/ssvm-evmc/libssvmEVMC.so
 	go test -count 1 ./tests -run TestState -evmc.evm=$(ROOT_DIR)/build/_workspace/evmone/lib/libevmone.so
-	go test -count 1 ./tests -run TestState -evmc.evm=$(ROOT_DIR)/build/_workspace/aleth/lib/libaleth-interpreter.so
 
 clean-evmc:
-	rm -rf ./build/_workspace/hera ./build/_workspace/SSVM ./build/_workspace/evmone ./build/_workspace/aleth
+	rm -rf ./build/_workspace/hera ./build/_workspace/evmone
 
 test-coregeth-features: \
 	test-coregeth-features-coregeth \

diff --git a/build/aleth-interpreter.sh b/build/aleth-interpreter.sh
diff --git a/build/ci.go b/build/ci.go
@@ -138,7 +138,7 @@ var (
 		"focal":  "golang-go",   // EOL: 04/2030
 		"impish": "golang-go",   // EOL: 07/2022
 		"jammy":  "golang-go",   // EOL: 04/2032
-		//"kinetic": "golang-go",   //  EOL: 07/2023
+		// "kinetic": "golang-go",   //  EOL: 07/2023
 	}
 
 	debGoBootPaths = map[string]string{
@@ -349,7 +349,7 @@ func doLint(cmdline []string) {
 	}
 
 	linter := downloadLinter(*cachedir)
-	lflags := []string{"run", "--timeout", "3m0s", "--config", ".golangci.yml"}
+	lflags := []string{"run", "--timeout", "5m0s", "--config", ".golangci.yml"}
 	build.MustRunCommand(linter, append(lflags, packages...)...)
 	fmt.Println("You have achieved perfection.")
 }

diff --git a/build/evmone.sh b/build/evmone.sh
@@ -8,6 +8,6 @@ if [[ "$OSTYPE" != "linux"* ]]; then
 fi
 
 mkdir -p build/_workspace/evmone
-[[ -f build/_workspace/evmone/evmone-0.5.0-linux-x86_64.tar.gz ]] && exit 0
-wget -O build/_workspace/evmone/evmone-0.5.0-linux-x86_64.tar.gz https://github.com/ethereum/evmone/releases/download/v0.5.0/evmone-0.5.0-linux-x86_64.tar.gz
-tar xzvf build/_workspace/evmone/evmone-0.5.0-linux-x86_64.tar.gz -C build/_workspace/evmone/
+[[ -f build/_workspace/evmone/evmone-0.9.1-linux-x86_64.tar.gz ]] && exit 0
+wget -O build/_workspace/evmone/evmone-0.9.1-linux-x86_64.tar.gz https://github.com/ethereum/evmone/releases/download/v0.9.1/evmone-0.9.1-linux-x86_64.tar.gz
+tar xzvf build/_workspace/evmone/evmone-0.9.1-linux-x86_64.tar.gz -C build/_workspace/evmone/
diff --git a/build/hera.sh b/build/hera.sh
@@ -16,7 +16,7 @@ main() {
     mkdir -p build/_workspace
     [ ! -d build/_workspace/hera ] && git clone https://github.com/ewasm/hera build/_workspace/hera || echo "Hera exists."
     cd build/_workspace/hera
-    git checkout v0.3.2
+    git checkout v0.6.0
     git submodule update --init
     mkdir -p build
     cd build

diff --git a/build/ssvm.sh b/build/ssvm.sh
diff --git a/cmd/echainspec/util.go b/cmd/echainspec/util.go
@@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"strings"
 
@@ -15,9 +15,9 @@ import (
 
 func readInputData(ctx *cli.Context) ([]byte, error) {
 	if !ctx.GlobalIsSet(fileInFlag.Name) {
-		return ioutil.ReadAll(os.Stdin)
+		return io.ReadAll(os.Stdin)
 	}
-	return ioutil.ReadFile(ctx.GlobalString(fileInFlag.Name))
+	return os.ReadFile(ctx.GlobalString(fileInFlag.Name))
 }
 
 func unmarshalChainSpec(format string, data []byte) (conf ctypes.Configurator, err error) {

diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go
@@ -58,6 +58,7 @@ type ExecutionResult struct {
 	Rejected    []*rejectedTx         `json:"rejected,omitempty"`
 	Difficulty  *math.HexOrDecimal256 `json:"currentDifficulty" gencodec:"required"`
 	GasUsed     math.HexOrDecimal64   `json:"gasUsed"`
+	BaseFee     *math.HexOrDecimal256 `json:"currentBaseFee,omitempty"`
 }
 
 type ommer struct {
@@ -273,6 +274,7 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig ctypes.ChainConfigura
 		Rejected:    rejectedTxs,
 		Difficulty:  (*math.HexOrDecimal256)(vmContext.Difficulty),
 		GasUsed:     (math.HexOrDecimal64)(gasUsed),
+		BaseFee:     (*math.HexOrDecimal256)(vmContext.BaseFee),
 	}
 	return statedb, execRs, nil
 }

diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go
@@ -26,6 +26,7 @@ import (
 	"path"
 	"strings"
 
+	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/state"
@@ -178,9 +179,20 @@ func Transition(ctx *cli.Context) error {
 	prestate.Env = *inputData.Env
 
 	vmConfig := vm.Config{
-		Tracer: tracer,
-		Debug:  (tracer != nil),
+		Tracer:           tracer,
+		Debug:            (tracer != nil),
+		EVMInterpreter:   ctx.String(utils.EVMInterpreterFlag.Name),
+		EWASMInterpreter: ctx.String(utils.EWASMInterpreterFlag.Name),
 	}
+
+	if vmConfig.EVMInterpreter != "" {
+		vm.InitEVMCEVM(vmConfig.EVMInterpreter)
+	}
+
+	if vmConfig.EWASMInterpreter != "" {
+		vm.InitEVMCEwasm(vmConfig.EWASMInterpreter)
+	}
+
 	// Construct the chainconfig
 	var chainConfig ctypes.ChainConfigurator
 	if cConf, extraEips, err := tests.GetChainConfig(ctx.String(ForknameFlag.Name)); err != nil {

diff --git a/cmd/evm/main.go b/cmd/evm/main.go
@@ -23,6 +23,7 @@ import (
 	"os"
 
 	"github.com/ethereum/go-ethereum/cmd/evm/internal/t8ntool"
+	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/internal/flags"
 	"github.com/urfave/cli/v2"
 )
@@ -132,11 +133,6 @@ var (
 		Value: true,
 		Usage: "enable return data output",
 	}
-	EVMInterpreterFlag = &cli.StringFlag{
-		Name:  "vm.evm",
-		Usage: "External EVM configuration (default = built-in interpreter)",
-		Value: "",
-	}
 )
 
 var stateTransitionCommand = &cli.Command{
@@ -162,6 +158,8 @@ var stateTransitionCommand = &cli.Command{
 		t8ntool.ChainIDFlag,
 		t8ntool.RewardFlag,
 		t8ntool.VerbosityFlag,
+		utils.EVMInterpreterFlag,
+		utils.EWASMInterpreterFlag,
 	},
 }
 
@@ -222,7 +220,7 @@ func init() {
 		DisableStackFlag,
 		DisableStorageFlag,
 		DisableReturnDataFlag,
-		EVMInterpreterFlag,
+		utils.EVMInterpreterFlag,
 	}
 	app.Commands = []*cli.Command{
 		compileCommand,

diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go
@@ -217,7 +217,7 @@ func runCmd(ctx *cli.Context) error {
 		EVMConfig: vm.Config{
 			Tracer:         tracer,
 			Debug:          ctx.Bool(DebugFlag.Name) || ctx.Bool(MachineFlag.Name),
-			EVMInterpreter: ctx.String(EVMInterpreterFlag.Name),
+			EVMInterpreter: ctx.String(utils.EVMInterpreterFlag.Name),
 		},
 	}
 

diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/eth/tracers/logger"
@@ -37,8 +38,12 @@ var stateTestCommand = &cli.Command{
 	Name:      "statetest",
 	Usage:     "executes the given state tests",
 	ArgsUsage: "<file>",
-	Flags:     []cli.Flag{stateTestEVMCEWASMFlag, stateTestForkFlag},
-	Category:  flags.DevCategory,
+	Flags: []cli.Flag{
+		stateTestForkFlag,
+		stateTestEVMCEWASMFlag,
+		utils.EVMInterpreterFlag,
+	},
+	Category: flags.DevCategory,
 }
 
 var stateTestEVMCEWASMFlag = &cli.StringFlag{
@@ -113,7 +118,16 @@ func stateTestCmd(ctx *cli.Context) error {
 		Tracer:           tracer,
 		Debug:            ctx.Bool(DebugFlag.Name) || ctx.Bool(MachineFlag.Name),
 		EWASMInterpreter: ctx.String(stateTestEVMCEWASMFlag.Name),
+		EVMInterpreter:   ctx.String(utils.EVMInterpreterFlag.Name),
+	}
+
+	if cfg.EVMInterpreter != "" {
+		vm.InitEVMCEVM(cfg.EVMInterpreter)
 	}
+	if cfg.EWASMInterpreter != "" {
+		vm.InitEVMCEwasm(cfg.EWASMInterpreter)
+	}
+
 	results := make([]StatetestResult, 0, len(tests))
 	for key, test := range tests {
 		for _, st := range test.Subtests(nil) {

diff --git a/cmd/evm/testdata/13/exp2.json b/cmd/evm/testdata/13/exp2.json
@@ -34,6 +34,7 @@
       }
     ],
     "currentDifficulty": "0x20000",
-    "gasUsed": "0x109a0"
+    "gasUsed": "0x109a0",
+    "currentBaseFee": "0x36b"
   }
 }
diff --git a/cmd/evm/testdata/14/exp.json b/cmd/evm/testdata/14/exp.json
@@ -7,6 +7,7 @@
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     "currentDifficulty": "0x2000020000000",
     "receipts": [],
-    "gasUsed": "0x0"
+    "gasUsed": "0x0",
+    "currentBaseFee": "0x500"
   }
 }
diff --git a/cmd/evm/testdata/14/exp2.json b/cmd/evm/testdata/14/exp2.json
@@ -7,6 +7,7 @@
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     "receipts": [],
     "currentDifficulty": "0x1ff8020000000",
-    "gasUsed": "0x0"
+    "gasUsed": "0x0",
+    "currentBaseFee": "0x500"
   }
 }
diff --git a/cmd/evm/testdata/14/exp_berlin.json b/cmd/evm/testdata/14/exp_berlin.json
@@ -7,6 +7,7 @@
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     "receipts": [],
     "currentDifficulty": "0x1ff9000000000",
-    "gasUsed": "0x0"
+    "gasUsed": "0x0",
+    "currentBaseFee": "0x500"
   }
 }
diff --git a/cmd/evm/testdata/19/exp_arrowglacier.json b/cmd/evm/testdata/19/exp_arrowglacier.json
@@ -7,6 +7,7 @@
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     "currentDifficulty": "0x2000000200000",
     "receipts": [],
-    "gasUsed": "0x0"
+    "gasUsed": "0x0",
+    "currentBaseFee": "0x500"
   }
 }
diff --git a/cmd/evm/testdata/19/exp_grayglacier.json b/cmd/evm/testdata/19/exp_grayglacier.json
@@ -7,6 +7,7 @@
       "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
       "receipts": [],
       "currentDifficulty": "0x2000000004000",
-      "gasUsed": "0x0"
+      "gasUsed": "0x0",
+      "currentBaseFee": "0x500"
     }
 }
diff --git a/cmd/evm/testdata/19/exp_london.json b/cmd/evm/testdata/19/exp_london.json
@@ -7,6 +7,7 @@
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     "currentDifficulty": "0x2000080000000",
     "receipts": [],
-    "gasUsed": "0x0"
+    "gasUsed": "0x0",
+    "currentBaseFee": "0x500"
   }
 }
diff --git a/cmd/evm/testdata/24/exp.json b/cmd/evm/testdata/24/exp.json
@@ -48,6 +48,7 @@
       }
     ],
     "currentDifficulty": null,
-    "gasUsed": "0x10306"
+    "gasUsed": "0x10306",
+    "currentBaseFee": "0x500"
   }
 }
diff --git a/cmd/evm/testdata/25/alloc.json b/cmd/evm/testdata/25/alloc.json
@@ -0,0 +1,8 @@
+{
+  "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+    "balance": "0x5ffd4878be161d74",
+    "code": "0x",
+    "nonce": "0xac",
+    "storage": {}
+  }
+}