test: Add Shanghai tests by ethereum/execution-spec-tests

.gitignore

@@ -25,6 +25,7 @@ vendor
 
 # used by the Makefile
 /build/_workspace/
+/build/cache/
 /build/bin/
 /klay*.zip
 
@@ -55,3 +56,5 @@ tests/testdata
 
 # generated files but not want to include
 contracts/cypress/credit.go
+
+tests/spec-tests/

Makefile

@@ -28,10 +28,12 @@ abigen:
 	@echo "Run \"$(BIN)/abigen\" to launch abigen."
 
 test:
-	$(GORUN) build/ci.go test
+	$(GORUN) build/ci.go test -skip ^TestExecutionSpecState$$
+	$(GORUN) build/ci.go test -run ^TestExecutionSpecState$$
 
 test-seq:
-	$(GORUN) build/ci.go test -p 1
+	$(GORUN) build/ci.go test -p 1 -skip ^TestExecutionSpecState$$
+	$(GORUN) build/ci.go test -p 1 -run ^TestExecutionSpecState$$
 
 test-datasync:
 	$(GORUN) build/ci.go test -p 1 ./datasync/...
@@ -43,7 +45,8 @@ test-node:
 	$(GORUN) build/ci.go test -p 1 ./node/...
 
 test-tests:
-	$(GORUN) build/ci.go test -p 1 ./tests/...
+	$(GORUN) build/ci.go test -p 1 -skip ^TestExecutionSpecState$$ ./tests/...
+	$(GORUN) build/ci.go test -p 1 -run ^TestExecutionSpecState$$ ./tests/...
 
 test-others:
 	$(GORUN) build/ci.go test -p 1 -exclude datasync,networks,node,tests

blockchain/state/statedb.go

@@ -805,6 +805,21 @@ func (s *StateDB) CreateSmartContractAccountWithKey(addr common.Address, humanRe
 	}
 }
 
+// SetLegacyAccountForTest is setting an account as Legacy Account to StateDB.
+// SetLegacyAccountForTest should be used for only tests.
+func (s *StateDB) SetLegacyAccountForTest(addr common.Address, nonce uint64, balance *big.Int, root common.Hash, codeHash []byte) {
+	acc := &account.LegacyAccount{
+		Nonce:    nonce,
+		Balance:  balance,
+		Root:     root,
+		CodeHash: codeHash,
+	}
+	newobj := newObject(s, addr, acc)
+	s.journal.append(createObjectChange{account: &addr})
+	newobj.created = true
+	s.setStateObject(newobj)
+}
+
 func (s *StateDB) ForEachStorage(addr common.Address, cb func(key, value common.Hash) bool) {
 	so := s.getStateObject(addr)
 	if so == nil {

blockchain/vm/eips.go

@@ -378,3 +378,7 @@ func enableCancunComputationCostModification(jt *JumpTable) {
 	jt[LOG3].computationCost = params.Log3ComputationCostCancun
 	jt[LOG4].computationCost = params.Log4ComputationCostCancun
 }
+
+func ChangeGasCostForTest(jt *JumpTable, opCode OpCode, constantGas uint64) {
+	jt[opCode].constantGas = constantGas
+}

build/checksums.txt

@@ -0,0 +1,6 @@
+# This file contains sha256 checksums of optional build dependencies.
+
+# version:spec-tests 2.1.0
+# https://github.com/ethereum/execution-spec-tests/releases
+# https://github.com/ethereum/execution-spec-tests/releases/download/v2.1.0/
+ca89c76851b0900bfcc3cbb9a26cbece1f3d7c64a3bed38723e914713290df6c  fixtures_develop.tar.gz

build/ci.go

@@ -68,6 +68,9 @@ var (
 	// Note: yakkety is unsupported because it was officially deprecated on lanchpad.
 	// Note: zesty is unsupported because it was officially deprecated on lanchpad.
 	debDistros = []string{"trusty", "xenial", "artful", "bionic"}
+
+	// This is where the tests should be unpacked.
+	executionSpecTestsDir = "tests/spec-tests"
 )
 
 var GOBIN, _ = filepath.Abs(filepath.Join("build", "bin"))
@@ -264,10 +267,17 @@ func doTest(cmdline []string) {
 	var (
 		parallel = flag.Int("p", 0, "The number of parallel test executions (default: the number of CPUs available)")
 		excludes = flag.String("exclude", "", "Comma-separated top-level directories to be excluded in test")
+		cachedir = flag.String("cachedir", "./build/cache", "directory for caching downloads")
+		run      = flag.String("run", "", "Tests to run")
+		skip     = flag.String("skip", "", "Tests to skip")
 	)
 	flag.CommandLine.Parse(cmdline)
 	env := build.Env()
 
+	// Get test fixtures.
+	csdb := build.MustLoadChecksums("build/checksums.txt")
+	downloadSpecTestFixtures(csdb, *cachedir)
+
 	packages := []string{"./..."}
 	if len(flag.CommandLine.Args()) > 0 {
 		packages = flag.CommandLine.Args()
@@ -277,6 +287,16 @@ func doTest(cmdline []string) {
 		packages = build.ExcludePackages(packages, strings.Split(*excludes, ","))
 	}
 
+	var runArgs []string
+	if len(*run) > 0 {
+		runArgs = append(runArgs, "-run", *run)
+	}
+
+	var skipArgs []string
+	if len(*skip) > 0 {
+		skipArgs = append(runArgs, "-skip", *skip)
+	}
+
 	// Run analysis tools before the tests.
 	build.MustRun(goTool("vet", packages...))
 
@@ -286,10 +306,31 @@ func doTest(cmdline []string) {
 		gotest.Args = append(gotest.Args, "-p", strconv.Itoa(*parallel))
 	}
 	gotest.Args = append(gotest.Args, "--timeout=30m")
+	gotest.Args = append(gotest.Args, runArgs...)
+	gotest.Args = append(gotest.Args, skipArgs...)
 	gotest.Args = append(gotest.Args, packages...)
 	build.MustRun(gotest)
 }
 
+// downloadSpecTestFixtures downloads and extracts the execution-spec-tests fixtures.
+func downloadSpecTestFixtures(csdb *build.ChecksumDB, cachedir string) string {
+	executionSpecTestsVersion, err := build.Version(csdb, "spec-tests")
+	if err != nil {
+		log.Fatal(err)
+	}
+	ext := ".tar.gz"
+	base := "fixtures_develop" // TODO(MariusVanDerWijden) rename once the version becomes part of the filename
+	url := fmt.Sprintf("https://github.com/ethereum/execution-spec-tests/releases/download/v%s/%s%s", executionSpecTestsVersion, base, ext)
+	archivePath := filepath.Join(cachedir, base+ext)
+	if err := csdb.DownloadFile(url, archivePath); err != nil {
+		log.Fatal(err)
+	}
+	if err := build.ExtractArchive(archivePath, executionSpecTestsDir); err != nil {
+		log.Fatal(err)
+	}
+	return filepath.Join(cachedir, base)
+}
+
 func doCover(cmdline []string) {
 	var (
 		parallel   = flag.Int("p", 0, "The number of parallel coverage test executions (default: the number of CPUs available)")

common/types.go

@@ -353,14 +353,24 @@ func BigToAddress(b *big.Int) Address { return BytesToAddress(b.Bytes()) }
 // If s is larger than len(h), s will be cropped from the left.
 func HexToAddress(s string) Address { return BytesToAddress(FromHex(s)) }
 
+var relaxPrecompileRangeForTest bool
+
 // IsPrecompiledContractAddress returns true if the input address is in the range of precompiled contract addresses.
 func IsPrecompiledContractAddress(addr Address) bool {
+	if relaxPrecompileRangeForTest {
+		return false
+	}
 	if bytes.Compare(addr.Bytes(), lastPrecompiledContractAddressHex) > 0 || addr == (Address{}) {
 		return false
 	}
 	return true
 }
 
+// Only for testing. Make sure to reset (false) after test.
+func RelaxPrecompileRangeForTest(enable bool) {
+	relaxPrecompileRangeForTest = enable
+}
+
 // IsHexAddress verifies whether a string can represent a valid hex-encoded
 // Kaia address or not.
 func IsHexAddress(s string) bool {

tests/init.go

@@ -35,12 +35,30 @@ var Forks = map[string]*params.ChainConfig{
 	"Frontier": {
 		ChainID: big.NewInt(1),
 	},
+	"Homestead": {
+		ChainID: big.NewInt(1),
+	},
 	"Byzantium": {
 		ChainID: big.NewInt(1),
 	},
 	"Constantinople": {
 		ChainID: big.NewInt(1),
 	},
+	"ConstantinopleFix": {
+		ChainID: big.NewInt(1),
+	},
+	"Istanbul": {
+		ChainID: big.NewInt(1),
+	},
+	"Berlin": {
+		ChainID: big.NewInt(1),
+	},
+	"London": {
+		ChainID: big.NewInt(1),
+	},
+	"Merge": {
+		ChainID: big.NewInt(1),
+	},
 	"Shanghai": {
 		ChainID:                  big.NewInt(1),
 		IstanbulCompatibleBlock:  new(big.Int),
@@ -50,17 +68,33 @@ var Forks = map[string]*params.ChainConfig{
 		KoreCompatibleBlock:      new(big.Int),
 		ShanghaiCompatibleBlock:  new(big.Int),
 	},
-	"Prague": {
+	"Cancun": {
 		ChainID:                  big.NewInt(1),
 		IstanbulCompatibleBlock:  new(big.Int),
 		LondonCompatibleBlock:    new(big.Int),
 		EthTxTypeCompatibleBlock: new(big.Int),
 		MagmaCompatibleBlock:     new(big.Int),
 		KoreCompatibleBlock:      new(big.Int),
+		Kip103CompatibleBlock:    new(big.Int),
 		ShanghaiCompatibleBlock:  new(big.Int),
 		CancunCompatibleBlock:    new(big.Int),
+		RandaoCompatibleBlock:    new(big.Int),
 		KaiaCompatibleBlock:      new(big.Int),
+		Kip160CompatibleBlock:    new(big.Int),
+	},
+	"Prague": {
+		ChainID:                  big.NewInt(1),
+		IstanbulCompatibleBlock:  new(big.Int),
+		LondonCompatibleBlock:    new(big.Int),
+		EthTxTypeCompatibleBlock: new(big.Int),
+		MagmaCompatibleBlock:     new(big.Int),
+		KoreCompatibleBlock:      new(big.Int),
+		Kip103CompatibleBlock:    new(big.Int),
+		ShanghaiCompatibleBlock:  new(big.Int),
+		CancunCompatibleBlock:    new(big.Int),
 		RandaoCompatibleBlock:    new(big.Int),
+		KaiaCompatibleBlock:      new(big.Int),
+		Kip160CompatibleBlock:    new(big.Int),
 		PragueCompatibleBlock:    new(big.Int),
 	},
 }

tests/init_test.go

@@ -38,12 +38,13 @@ import (
 )
 
 var (
-	baseDir            = filepath.Join(".", "testdata")
-	blockTestDir       = filepath.Join(baseDir, "BlockchainTests")
-	stateTestDir       = filepath.Join(baseDir, "GeneralStateTests")
-	transactionTestDir = filepath.Join(baseDir, "TransactionTests")
-	vmTestDir          = filepath.Join(baseDir, "VMTests")
-	rlpTestDir         = filepath.Join(baseDir, "RLPTests")
+	baseDir                   = filepath.Join(".", "testdata")
+	blockTestDir              = filepath.Join(baseDir, "BlockchainTests")
+	stateTestDir              = filepath.Join(baseDir, "GeneralStateTests")
+	transactionTestDir        = filepath.Join(baseDir, "TransactionTests")
+	vmTestDir                 = filepath.Join(baseDir, "VMTests")
+	rlpTestDir                = filepath.Join(baseDir, "RLPTests")
+	executionSpecStateTestDir = filepath.Join(".", "spec-tests", "fixtures", "state_tests")
 )
 
 func readJSON(reader io.Reader, value interface{}) error {