Iquidus dev/ecip 1099

.travis.yml

@@ -8,22 +8,22 @@ jobs:
   - stage: lint
     os: linux
     dist: xenial
-    go: 1.14.x
+    go: 1.15.x
     env:
       - lint
     git:
       submodules: false
     script:
       - make lint
 
-  # Run chipprgeth -specific tests, proving regression-safety and config interoperability.
-  #- stage: test
-  #  name: "Go1.14.x: make test-chipprgeth"
-  #  os: linux
-  #  dist: xenial
-  #  go: 1.14.x
-  #  script:
-  #  - make test-chipprgeth
+  # Run core-geth -specific tests, proving regression-safety and config interoperability.
+  - stage: build
+    name: "Go1.15.x: make test-chipprgeth"
+    os: linux
+    dist: xenial
+    go: 1.15.x
+    script:
+    - make test-chipprgeth
 
   # Run build and tests against latest-1 Go version.
   #- stage: test
@@ -37,26 +37,39 @@ jobs:
   #    - make all
   #    - travis_wait 60 make test
 
-  # Run build and tests on ARM64 on Pull Requests.
-  #- stage: test
-  #  name: "ARM64/Go1.14.x: make test"
-  #  if: type = pull_request
-  #  os: linux
-  #  arch: arm64
-  #  dist: xenial
-  #  go: 1.14.x
-  #  env:
-  #    - GO111MODULE=on
-  #  script:
-  #    - make all
-  #    - travis_wait 60 make test
-#
-  # Run build with environment-aware possible artifact deployment.
-  - stage: deploy
-    name: "Go1.14.x: make all && deploy"
+    # Run build and tests against latest-1 Go version.
+  - stage: build
+    name: "Go1.14.x: make test"
     os: linux
     dist: xenial
     go: 1.14.x
+    env:
+      - GO111MODULE=on
+    script:
+      - make all
+      - travis_wait 60 make test
+
+  # Run build and tests on ARM64 on Pull Requests.
+  - stage: build
+    name: "ARM64/Go1.15.x: make test"
+    if: type = pull_request
+    os: linux
+    arch: arm64
+    dist: xenial
+    go: 1.15.x
+    env:
+      - GO111MODULE=on
+    script:
+      - make all
+      - travis_wait 60 make test
+
+  # Run build and tests with environment-aware possible artifact deployment.
+  - stage: build
+    if: type = push
+    name: "Go1.15.x: make test && deploy"
+    os: linux
+    dist: xenial
+    go: 1.15.x
     script:
     - make all
     before_deploy:
@@ -75,12 +88,13 @@ jobs:
       tag_name: "$TRAVIS_TAG"
 
   # Run build on ARM5 with environment-aware possible artifact deployment.
-  - stage: deploy
-    name: "ARM5/Go1.14.x: go run build/ci.go install && deploy"
+  - stage: build
+    if: type = push
+    name: "ARM5/Go1.15.x: go run build/ci.go install && deploy"
     os: linux
     dist: xenial
     sudo: required
-    go: 1.14.x
+    go: 1.15.x
     env:
       - ARMv5
     git:
@@ -110,10 +124,11 @@ jobs:
       tag_name: "$TRAVIS_TAG"
 
   #Run build on OSX with environment-aware possible artifact deployment.
-  - stage: deploy
-    name: "OSX/Go1.14.x: make all && deploy"
+  - stage: build
+    if: type = push
+    name: "OSX/Go1.15.x: make all && deploy"
     os: osx
-    go: 1.14.x
+    go: 1.15.x
     script:
     - echo "Increase the maximum number of open file descriptors on macOS"
     - NOFILE=20480

Dockerfile

@@ -1,5 +1,5 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.14-alpine as builder
+FROM golang:1.15-alpine as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 

Dockerfile.alltools

@@ -1,5 +1,5 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.14-alpine as builder
+FROM golang:1.15-alpine as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 

accounts/abi/bind/backends/simulated.go

@@ -678,14 +678,16 @@ func (b *SimulatedBackend) SubscribeNewHead(ctx context.Context, ch chan<- *type
 }
 
 // AdjustTime adds a time shift to the simulated clock.
+// It can only be called on empty blocks.
 func (b *SimulatedBackend) AdjustTime(adjustment time.Duration) error {
 	b.mu.Lock()
 	defer b.mu.Unlock()
 
+	if len(b.pendingBlock.Transactions()) != 0 {
+		return errors.New("Could not adjust time on non-empty block")
+	}
+
 	blocks, _ := core.GenerateChain(b.config, b.blockchain.CurrentBlock(), ethash.NewFaker(), b.database, 1, func(number int, block *core.BlockGen) {
-		for _, tx := range b.pendingBlock.Transactions() {
-			block.AddTx(tx)
-		}
 		block.OffsetTime(int64(adjustment.Seconds()))
 	})
 	statedb, _ := b.blockchain.State()

accounts/abi/bind/backends/simulated_test.go

@@ -144,8 +144,7 @@ func TestSimulatedBackend_AdjustTime(t *testing.T) {
 	defer sim.Close()
 
 	prevTime := sim.pendingBlock.Time()
-	err := sim.AdjustTime(time.Second)
-	if err != nil {
+	if err := sim.AdjustTime(time.Second); err != nil {
 		t.Error(err)
 	}
 	newTime := sim.pendingBlock.Time()
@@ -155,6 +154,44 @@ func TestSimulatedBackend_AdjustTime(t *testing.T) {
 	}
 }
 
+func TestNewSimulatedBackend_AdjustTimeFail(t *testing.T) {
+	testAddr := crypto.PubkeyToAddress(testKey.PublicKey)
+	sim := simTestBackend(testAddr)
+	// Create tx and send
+	tx := types.NewTransaction(0, testAddr, big.NewInt(1000), vars.TxGas, big.NewInt(1), nil)
+	signedTx, err := types.SignTx(tx, types.HomesteadSigner{}, testKey)
+	if err != nil {
+		t.Errorf("could not sign tx: %v", err)
+	}
+	sim.SendTransaction(context.Background(), signedTx)
+	// AdjustTime should fail on non-empty block
+	if err := sim.AdjustTime(time.Second); err == nil {
+		t.Error("Expected adjust time to error on non-empty block")
+	}
+	sim.Commit()
+
+	prevTime := sim.pendingBlock.Time()
+	if err := sim.AdjustTime(time.Minute); err != nil {
+		t.Error(err)
+	}
+	newTime := sim.pendingBlock.Time()
+	if newTime-prevTime != uint64(time.Minute.Seconds()) {
+		t.Errorf("adjusted time not equal to a minute. prev: %v, new: %v", prevTime, newTime)
+	}
+	// Put a transaction after adjusting time
+	tx2 := types.NewTransaction(1, testAddr, big.NewInt(1000), vars.TxGas, big.NewInt(1), nil)
+	signedTx2, err := types.SignTx(tx2, types.HomesteadSigner{}, testKey)
+	if err != nil {
+		t.Errorf("could not sign tx: %v", err)
+	}
+	sim.SendTransaction(context.Background(), signedTx2)
+	sim.Commit()
+	newTime = sim.pendingBlock.Time()
+	if newTime-prevTime >= uint64(time.Minute.Seconds()) {
+		t.Errorf("time adjusted, but shouldn't be: prev: %v, new: %v", prevTime, newTime)
+	}
+}
+
 func TestSimulatedBackend_BalanceAt(t *testing.T) {
 	testAddr := crypto.PubkeyToAddress(testKey.PublicKey)
 	expectedBal := big.NewInt(10000000000)

appveyor.yml

@@ -19,8 +19,8 @@ environment:
 install:
   - git submodule update --init
   - rmdir C:\go /s /q
-  - appveyor DownloadFile https://dl.google.com/go/go1.14.2.windows-%GETH_ARCH%.zip
-  - 7z x go1.14.2.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
+  - appveyor DownloadFile https://dl.google.com/go/go1.15.windows-%GETH_ARCH%.zip
+  - 7z x go1.15.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
   - go version
   - gcc --version
 

build/checksums.txt

@@ -1,6 +1,6 @@
 # This file contains sha256 checksums of optional build dependencies.
 
-98de84e69726a66da7b4e58eac41b99cbe274d7e8906eeb8a5b7eb0aadee7f7c  go1.14.2.src.tar.gz
+69438f7ed4f532154ffaf878f3dfd83747e7a00b70b3556eddabf7aaee28ac3a  go1.15.src.tar.gz
 
 d998a84eea42f2271aca792a7b027ca5c1edfcba229e8e5a844c9ac3f336df35  golangci-lint-1.27.0-linux-armv7.tar.gz
 bf781f05b0d393b4bf0a327d9e62926949a4f14d7774d950c4e009fc766ed1d4  golangci-lint.exe-1.27.0-windows-amd64.zip

build/ci.go

@@ -149,13 +149,14 @@ var (
 	// Note: zesty is unsupported because it was officially deprecated on Launchpad.
 	// Note: artful is unsupported because it was officially deprecated on Launchpad.
 	// Note: cosmic is unsupported because it was officially deprecated on Launchpad.
+	// Note: disco is unsupported because it was officially deprecated on Launchpad.
 	debDistroGoBoots = map[string]string{
 		"trusty": "golang-1.11",
 		"xenial": "golang-go",
 		"bionic": "golang-go",
-		"disco":  "golang-go",
 		"eoan":   "golang-go",
 		"focal":  "golang-go",
+		"groovy": "golang-go",
 	}
 
 	debGoBootPaths = map[string]string{

cmd/ancient-store-mem/lib/mem.go

@@ -60,15 +60,15 @@ func (f *MemFreezerRemoteServerAPI) Reset() {
 }
 
 func (f *MemFreezerRemoteServerAPI) HasAncient(kind string, number uint64) (bool, error) {
-	fmt.Println("mock server called", "method=HasAncient")
+	// fmt.Println("mock server called", "method=HasAncient")
 	f.mu.Lock()
 	defer f.mu.Unlock()
 	_, ok := f.store[f.storeKey(kind, number)]
 	return ok, nil
 }
 
 func (f *MemFreezerRemoteServerAPI) Ancient(kind string, number uint64) ([]byte, error) {
-	fmt.Println("mock server called", "method=Ancient")
+	// fmt.Println("mock server called", "method=Ancient")
 	f.mu.Lock()
 	defer f.mu.Unlock()
 	v, ok := f.store[f.storeKey(kind, number)]
@@ -79,12 +79,12 @@ func (f *MemFreezerRemoteServerAPI) Ancient(kind string, number uint64) ([]byte,
 }
 
 func (f *MemFreezerRemoteServerAPI) Ancients() (uint64, error) {
-	fmt.Println("mock server called", "method=Ancients")
+	// fmt.Println("mock server called", "method=Ancients")
 	return f.count, nil
 }
 
 func (f *MemFreezerRemoteServerAPI) AncientSize(kind string) (uint64, error) {
-	fmt.Println("mock server called", "method=AncientSize")
+	// fmt.Println("mock server called", "method=AncientSize")
 	sum := uint64(0)
 	for k, v := range f.store {
 		if strings.HasPrefix(k, kind) {
@@ -95,7 +95,7 @@ func (f *MemFreezerRemoteServerAPI) AncientSize(kind string) (uint64, error) {
 }
 
 func (f *MemFreezerRemoteServerAPI) AppendAncient(number uint64, hash, header, body, receipt, td []byte) error {
-	fmt.Println("mock server called", "method=AppendAncient", "number=", number, "header", fmt.Sprintf("%x", header))
+	// fmt.Println("mock server called", "method=AppendAncient", "number=", number, "header", fmt.Sprintf("%x", header))
 	fieldNames := []string{
 		freezerRemoteHashTable,
 		freezerRemoteHeaderTable,
@@ -118,7 +118,7 @@ func (f *MemFreezerRemoteServerAPI) AppendAncient(number uint64, hash, header, b
 }
 
 func (f *MemFreezerRemoteServerAPI) TruncateAncients(n uint64) error {
-	fmt.Println("mock server called", "method=TruncateAncients")
+	// fmt.Println("mock server called", "method=TruncateAncients")
 	f.count = n
 	f.mu.Lock()
 	defer f.mu.Unlock()
@@ -136,11 +136,11 @@ func (f *MemFreezerRemoteServerAPI) TruncateAncients(n uint64) error {
 }
 
 func (f *MemFreezerRemoteServerAPI) Sync() error {
-	fmt.Println("mock server called", "method=Sync")
+	// fmt.Println("mock server called", "method=Sync")
 	return nil
 }
 
 func (f *MemFreezerRemoteServerAPI) Close() error {
-	fmt.Println("mock server called", "method=Close")
+	// fmt.Println("mock server called", "method=Close")
 	return nil
 }

cmd/evm/README.md

@@ -29,6 +29,8 @@ Command line params that has to be supported are
    --trace                            Output full trace logs to files <txhash>.jsonl
    --trace.nomemory                   Disable full memory dump in traces
    --trace.nostack                    Disable stack output in traces
+   --trace.noreturndata               Disable return data output in traces
+   --output.basedir value             Specifies where output files are placed. Will be created if it does not exist. (default: ".")
    --output.alloc alloc               Determines where to put the alloc of the post-state.
                                       `stdout` - into the stdout output
                                       `stderr` - into the stderr output
@@ -232,13 +234,13 @@ Example where blockhashes are provided:
 ./evm t8n --input.alloc=./testdata/3/alloc.json --input.txs=./testdata/3/txs.json --input.env=./testdata/3/env.json --trace
 ```
 ```
-cat trace-0.jsonl | grep BLOCKHASH -C2
+cat trace-0-0x72fadbef39cd251a437eea619cfeda752271a5faaaa2147df012e112159ffb81.jsonl | grep BLOCKHASH -C2
 ```
 ```
-{"pc":0,"op":96,"gas":"0x5f58ef8","gasCost":"0x3","memory":"0x","memSize":0,"stack":[],"returnStack":[],"depth":1,"refund":0,"opName":"PUSH1","error":""}
-{"pc":2,"op":64,"gas":"0x5f58ef5","gasCost":"0x14","memory":"0x","memSize":0,"stack":["0x1"],"returnStack":[],"depth":1,"refund":0,"opName":"BLOCKHASH","error":""}
-{"pc":3,"op":0,"gas":"0x5f58ee1","gasCost":"0x0","memory":"0x","memSize":0,"stack":["0xdac58aa524e50956d0c0bae7f3f8bb9d35381365d07804dd5b48a5a297c06af4"],"returnStack":[],"depth":1,"refund":0,"opName":"STOP","error":""}
-{"output":"","gasUsed":"0x17","time":155861}
+{"pc":0,"op":96,"gas":"0x5f58ef8","gasCost":"0x3","memory":"0x","memSize":0,"stack":[],"returnStack":[],"returnData":null,"depth":1,"refund":0,"opName":"PUSH1","error":""}
+{"pc":2,"op":64,"gas":"0x5f58ef5","gasCost":"0x14","memory":"0x","memSize":0,"stack":["0x1"],"returnStack":[],"returnData":null,"depth":1,"refund":0,"opName":"BLOCKHASH","error":""}
+{"pc":3,"op":0,"gas":"0x5f58ee1","gasCost":"0x0","memory":"0x","memSize":0,"stack":["0xdac58aa524e50956d0c0bae7f3f8bb9d35381365d07804dd5b48a5a297c06af4"],"returnStack":[],"returnData":null,"depth":1,"refund":0,"opName":"STOP","error":""}
+{"output":"","gasUsed":"0x17","time":112885}
 ```
 
 In this example, the caller has not provided the required blockhash:
@@ -254,9 +256,9 @@ Error code: 4
 Another thing that can be done, is to chain invocations:
 ```
 ./evm t8n --input.alloc=./testdata/1/alloc.json --input.txs=./testdata/1/txs.json --input.env=./testdata/1/env.json --output.alloc=stdout | ./evm t8n --input.alloc=stdin --input.env=./testdata/1/env.json --input.txs=./testdata/1/txs.json
-INFO [06-29|11:52:04.934] rejected tx                              index=1 hash="0557ba…18d673" from=0x8A8eAFb1cf62BfBeb1741769DAE1a9dd47996192 error="nonce too low"
-INFO [06-29|11:52:04.936] rejected tx                              index=0 hash="0557ba…18d673" from=0x8A8eAFb1cf62BfBeb1741769DAE1a9dd47996192 error="nonce too low"
-INFO [06-29|11:52:04.936] rejected tx                              index=1 hash="0557ba…18d673" from=0x8A8eAFb1cf62BfBeb1741769DAE1a9dd47996192 error="nonce too low"
+INFO [08-03|15:25:15.168] rejected tx                              index=1 hash="0557ba…18d673" from=0x8A8eAFb1cf62BfBeb1741769DAE1a9dd47996192 error="nonce too low"
+INFO [08-03|15:25:15.169] rejected tx                              index=0 hash="0557ba…18d673" from=0x8A8eAFb1cf62BfBeb1741769DAE1a9dd47996192 error="nonce too low"
+INFO [08-03|15:25:15.169] rejected tx                              index=1 hash="0557ba…18d673" from=0x8A8eAFb1cf62BfBeb1741769DAE1a9dd47996192 error="nonce too low"
 
 ```
 What happened here, is that we first applied two identical transactions, so the second one was rejected. 

cmd/evm/internal/t8ntool/execution.go

@@ -35,6 +35,7 @@ import (
 	"github.com/ethereum/go-ethereum/params/types/ctypes"
 	"github.com/ethereum/go-ethereum/params/types/genesisT"
 	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/ethereum/go-ethereum/trie"
 	"golang.org/x/crypto/sha3"
 )
 
@@ -82,7 +83,7 @@ type stEnvMarshaling struct {
 // Apply applies a set of transactions to a pre-state
 func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig ctypes.ChainConfigurator,
 	txs types.Transactions, miningReward int64,
-	getTracerFn func(txIndex int) (tracer vm.Tracer, err error)) (*state.StateDB, *ExecutionResult, error) {
+	getTracerFn func(txIndex int, txHash common.Hash) (tracer vm.Tracer, err error)) (*state.StateDB, *ExecutionResult, error) {
 
 	// Capture errors for BLOCKHASH operation, if we haven't been supplied the
 	// required blockhashes
@@ -137,7 +138,7 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig ctypes.ChainConfigura
 			rejectedTxs = append(rejectedTxs, i)
 			continue
 		}
-		tracer, err := getTracerFn(txIndex)
+		tracer, err := getTracerFn(txIndex, tx.Hash())
 		if err != nil {
 			return nil, nil, err
 		}
@@ -223,8 +224,8 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig ctypes.ChainConfigura
 	}
 	execRs := &ExecutionResult{
 		StateRoot:   root,
-		TxRoot:      types.DeriveSha(includedTxs),
-		ReceiptRoot: types.DeriveSha(receipts),
+		TxRoot:      types.DeriveSha(includedTxs, new(trie.Trie)),
+		ReceiptRoot: types.DeriveSha(receipts, new(trie.Trie)),
 		Bloom:       types.CreateBloom(receipts),
 		LogsHash:    rlpHash(statedb.Logs()),
 		Receipts:    receipts,

cmd/evm/internal/t8ntool/flags.go

@@ -42,6 +42,11 @@ var (
 		Name:  "trace.noreturndata",
 		Usage: "Disable return data output in traces",
 	}
+	OutputBasedir = cli.StringFlag{
+		Name:  "output.basedir",
+		Usage: "Specifies where output files are placed. Will be created if it does not exist.",
+		Value: "",
+	}
 	OutputAllocFlag = cli.StringFlag{
 		Name: "output.alloc",
 		Usage: "Determines where to put the `alloc` of the post-state.\n" +