Feat/evmc6

.github/workflows/evmc.yml

@@ -0,0 +1,38 @@
+name: EVMC
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+
+  build:
+    name: EWASM State Tests
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v2
+        with:
+          go-version: ^1.13
+        id: go
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Get dependencies
+        run: |
+          go get -v -t -d ./...
+          git submodule update --init --recursive
+          go get golang.org/x/mobile/cmd/gomobile
+          gomobile init
+
+      - name: Build
+        run: |
+          make all
+
+      - name: Test EVMC
+        run: |
+          make test-evmc

.golangci.yml

@@ -9,6 +9,7 @@ run:
   skip-files:
     - core/genesis_alloc.go
     - params/alloc.go
+    - evmc/*
 
 linters:
   disable-all: true

.travis.yml

@@ -4,7 +4,7 @@ sudo: false
 jobs:
   include:
 
-  # Only test code linters on latest version of Go
+  # Run linter check. Only test code linters on latest version of Go.
   - stage: lint
     os: linux
     dist: xenial
@@ -14,28 +14,32 @@ jobs:
     git:
       submodules: false
     script:
-      - go run build/ci.go lint
+      - make lint
 
+  # Run core-geth -specific tests, proving regression-safety and config interoperability.
   - stage: build
+    name: "Go1.14.x: make test-coregeth"
     os: linux
     dist: xenial
     go: 1.14.x
-    env:
-      - COREGETH
     script:
     - make test-coregeth
 
+  # Run build and tests against latest-1 Go version.
   - stage: build
+    name: "Go1.13.x: make test"
     os: linux
     dist: xenial
     go: 1.13.x
     env:
       - GO111MODULE=on
     script:
-      - go run build/ci.go install
-      - travis_wait 60 go run build/ci.go test
+      - make all
+      - travis_wait 60 make test
 
+  # Run build and tests on ARM64 on Pull Requests.
   - stage: build
+    name: "ARM64/Go1.14.x: make test"
     if: type = pull_request
     os: linux
     arch: arm64
@@ -44,16 +48,18 @@ jobs:
     env:
       - GO111MODULE=on
     script:
-      - go run build/ci.go install
-      - travis_wait 60 go run build/ci.go test
+      - make all
+      - travis_wait 60 make test
 
+  # Run build and tests with environment-aware possible artifact deployment.
   - stage: build
+    name: "Go1.14.x: make test && deploy"
     os: linux
     dist: xenial
     go: 1.14.x
     script:
-    - go run build/ci.go install
-    - travis_wait 60 go run build/ci.go test
+    - make all
+    - travis_wait 60 make test
     before_deploy:
     - sh build/deploy.sh
     deploy:
@@ -69,7 +75,9 @@ jobs:
       skip_cleanup: true
       tag_name: "$TRAVIS_TAG"
 
+  # Run build on ARM5 with environment-aware possible artifact deployment.
   - stage: build
+    name: "ARM5/Go1.14.x: go run build/ci.go install && deploy"
     os: linux
     dist: xenial
     sudo: required
@@ -102,7 +110,9 @@ jobs:
       skip_cleanup: true
       tag_name: "$TRAVIS_TAG"
 
+  #Run build on OSX with environment-aware possible artifact deployment.
   - stage: build
+    name: "OSX/Go1.14.x: make all && deploy"
     os: osx
     go: 1.14.x
     script:
@@ -115,7 +125,7 @@ jobs:
     - ulimit -S -n $NOFILE
     - ulimit -n
     - unset -f cd
-    - go run build/ci.go install
+    - make all
     before_deploy:
     - sh build/deploy.sh
     deploy:

Makefile

@@ -2,7 +2,9 @@
 # with Go source code. If you know what GOPATH is then you probably
 # don't need to bother with make.
 
-.PHONY: geth android ios geth-cross evm all test clean
+.PHONY: all test clean
+.PHONY: evmc
+.PHONY: geth android ios geth-cross
 .PHONY: geth-linux geth-linux-386 geth-linux-amd64 geth-linux-mips64 geth-linux-mips64le
 .PHONY: geth-linux-arm geth-linux-arm-5 geth-linux-arm-6 geth-linux-arm-7 geth-linux-arm64
 .PHONY: geth-darwin geth-darwin-386 geth-darwin-amd64
@@ -11,6 +13,7 @@
 GOBIN = ./build/bin
 GO ?= latest
 GORUN = env GO111MODULE=on go run
+ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 
 geth:
 	$(GORUN) build/ci.go install ./cmd/geth
@@ -42,6 +45,27 @@ test-coregeth: \
  test-coregeth-chainspecs \
  test-coregeth-consensus ## Runs all tests specific to core-geth.
 
+evmc/bindings/go/evmc/example_vm.so:
+	./build/evmc-example_vm.so.sh
+
+hera:
+	./build/hera.sh
+
+ssvm:
+	./build/ssvm.sh
+
+evmone:
+	./build/evmone.sh
+
+test-evmc: evmc/bindings/go/evmc/example_vm.so hera ssvm evmone
+	go test -count 1 ./evmc/...
+	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
+
+clean-evmc:
+	rm -rf evmc/bindings/go/evmc/example_vm.so ./build/_workspace/hera ./build/_workspace/SSVM ./build/_workspace/evmone
+
 test-coregeth-features: test-coregeth-features-parity test-coregeth-features-coregeth test-coregeth-features-multigethv0 ## Runs tests specific to multi-geth using Fork/Feature configs.
 
 test-coregeth-consensus: test-coregeth-features-clique-consensus
@@ -89,7 +113,7 @@ tests-generate-difficulty: ## Generate difficulty tests.
 lint: ## Run linters.
 	$(GORUN) build/ci.go lint
 
-clean:
+clean: clean-evmc
 	env GO111MODULE=on go clean -cache
 	rm -fr build/_workspace/pkg/ $(GOBIN)/*
 

README.md

@@ -139,7 +139,7 @@ $ sudo apt-get install -y build-essential
 
 #### Source
 
-Once the dependencies are installed, it's time to clone and build the source:
+Once the dependencies have been installed, it's time to clone and build the source:
 
 ```shell
 $ git clone https://github.com/etclabscore/core-geth.git

appveyor.yml

@@ -26,6 +26,10 @@ install:
 
 build_script:
   - ps: $env:VERSION = "$(git describe --always)"
+  - copy /Y evmc\include\evmc\evmc.h evmc\bindings\go\evmc\evmc.h
+  - copy /Y evmc\include\evmc\helpers.h evmc\bindings\go\evmc\helpers.h
+  - copy /Y evmc\include\evmc\loader.h evmc\bindings\go\evmc\loader.h
+  - copy /Y evmc\lib\loader\loader.c evmc\bindings\go\evmc\loader.c
   - go run build\ci.go install
   - 7z a core-geth-win64-%VERSION%.zip .\build\bin\geth.exe
   - ps: Get-FileHash core-geth-win64-$env:VERSION.zip -Algorithm SHA256

build/evmc-example_vm.so.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Travis errors when trying to use the "normal" 'go generate' way of making this file.
+# I don't know why.
+
+set -x
+
+if [ "$CI" = "true" ] && [ "$TRAVIS" = "true" ]; then
+	echo "In Travis CI. Building SO with an adhoc Makefile."
+	# Use a temporary adhoc Makefile located in a child-dir of the evmc submodule to build the required example_vm.so file.
+	# Once finished, remove the adhoc Makefile.
+	# The important part of this command (vs. the 'go generate' command)
+	# is the -fPIC flags.
+	> ./evmc/bindings/go/evmc/Makefile \
+	echo -e 'example_vm.so:\n\tgcc -fPIC -shared ../../../examples/example_vm/example_vm.c -I../../../include -o example_vm.so'
+	make -C ./evmc/bindings/go/evmc/ example_vm.so
+	rm -f ./evmc/bindings/go/evmc/Makefile
+else
+    go generate ./evmc/bindings/go/evmc/
+fi

build/evmone.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+mkdir -p build/_workspace/evmone/build/tools/ssvm-evmc/
+wget -O build/_workspace/evmone/evmone-0.2.0-linux-x86_64.tar.gz https://github.com/ethereum/evmone/releases/download/v0.2.0/evmone-0.2.0-linux-x86_64.tar.gz
+tar xzvf build/_workspace/evmone/evmone-0.2.0-linux-x86_64.tar.gz -C build/_workspace/evmone/

build/hera.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -e
+
+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.2.5 # Last EVMCv6-compatible tag (v0.3.0 bumps to v7).
+    git submodule update --init
+    mkdir -p build
+    cd build
+    cmake -DBUILD_SHARED_LIBS=ON ..
+    cmake --build .
+    echo "Built library at: $(pwd)/src/libhera.so"
+}
+main

build/ssvm.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+set -e
+
+mkdir -p build/_workspace/SSVM/build/tools/ssvm-evmc/
+wget -O build/_workspace/SSVM/build/tools/ssvm-evmc/libssvmEVMC.so https://github.com/second-state/SSVM/releases/download/0.5.0/libssvmEVMC-linux-x86_64.so
+
+# The follow are steps that might be used to build the SSVM SO from source.
+# This library is only used for testing.
+# Previous versions of this source worked by this pattern, but
+# fail for me with 0.5.0.
+# So I opted to use the above download pattern, which is simpler.
+#main() {
+#    mkdir -p build/_workspace
+#    [ ! -d build/_workspace/SSVM ] && git clone https://github.com/second-state/SSVM build/_workspace/SSVM || echo "SSVM exists."
+#    cd build/_workspace/SSVM
+#    git fetch --tags
+#    # git checkout 0.5.0
+#    git checkout 0.6.1
+#    mkdir -p build
+#    cd build
+#    cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON ..
+#    make
+#    echo "Built library at: $(pwd)/tools/ssvm-evmc/libssvmEVMC.so"
+#}
+#main

cmd/evm/runner.go

@@ -217,6 +217,10 @@ func runCmd(ctx *cli.Context) error {
 		},
 	}
 
+	if runtimeConfig.EVMConfig.EVMInterpreter != "" {
+		vm.InitEVMCEVM(runtimeConfig.EVMConfig.EVMInterpreter)
+	}
+
 	if cpuProfilePath := ctx.GlobalString(CPUProfileFlag.Name); cpuProfilePath != "" {
 		f, err := os.Create(cpuProfilePath)
 		if err != nil {

cmd/evm/staterunner.go

@@ -36,6 +36,12 @@ var stateTestCommand = cli.Command{
 	Name:      "statetest",
 	Usage:     "executes the given state tests",
 	ArgsUsage: "<file>",
+	Flags:     []cli.Flag{stateTestEVMCEWASMFlag},
+}
+
+var stateTestEVMCEWASMFlag = cli.StringFlag{
+	Name:  "evmc.ewasm",
+	Usage: "EVMC EWASM configuration",
 }
 
 // StatetestResult contains the execution status after running a state test, any
@@ -57,6 +63,11 @@ func stateTestCmd(ctx *cli.Context) error {
 	glogger.Verbosity(log.Lvl(ctx.GlobalInt(VerbosityFlag.Name)))
 	log.Root().SetHandler(glogger)
 
+	if s := ctx.String(stateTestEVMCEWASMFlag.Name); s != "" {
+		log.Info("Running tests with %s=%s", "evmc.ewasm", s)
+		vm.InitEVMCEwasm(s)
+	}
+
 	// Configure the EVM logger
 	config := &vm.LogConfig{
 		DisableMemory: ctx.GlobalBool(DisableMemoryFlag.Name),
@@ -88,12 +99,13 @@ func stateTestCmd(ctx *cli.Context) error {
 	}
 	// Iterate over all the tests, run them and aggregate the results
 	cfg := vm.Config{
-		Tracer: tracer,
-		Debug:  ctx.GlobalBool(DebugFlag.Name) || ctx.GlobalBool(MachineFlag.Name),
+		Tracer:           tracer,
+		Debug:            ctx.GlobalBool(DebugFlag.Name) || ctx.GlobalBool(MachineFlag.Name),
+		EWASMInterpreter: ctx.String(stateTestEVMCEWASMFlag.Name),
 	}
 	results := make([]StatetestResult, 0, len(tests))
 	for key, test := range tests {
-		for _, st := range test.Subtests() {
+		for _, st := range test.Subtests(nil) {
 			// Run the test and aggregate the result
 			result := &StatetestResult{Name: key, Fork: st.Fork, Pass: true}
 			_, state, err := test.Run(st, cfg, false)

cmd/utils/flags.go

@@ -1647,10 +1647,12 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
 
 	if ctx.GlobalIsSet(EWASMInterpreterFlag.Name) {
 		cfg.EWASMInterpreter = ctx.GlobalString(EWASMInterpreterFlag.Name)
+		vm.InitEVMCEwasm(cfg.EWASMInterpreter)
 	}
 
 	if ctx.GlobalIsSet(EVMInterpreterFlag.Name) {
 		cfg.EVMInterpreter = ctx.GlobalString(EVMInterpreterFlag.Name)
+		vm.InitEVMCEVM(cfg.EVMInterpreter)
 	}
 	if ctx.GlobalIsSet(RPCGlobalGasCap.Name) {
 		cfg.RPCGasCap = ctx.GlobalUint64(RPCGlobalGasCap.Name)