aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authoraaronbuchwald <[email protected]>2020-12-17 17:13:04 -0500
committerGitHub <[email protected]>2020-12-17 17:13:04 -0500
commit374b401198759f23bac435a78c5b1fa2c516aad9 (patch)
treef3d33fa99fc7d46dd2836bef500d8a1cf445e094 /core
parentc765f9b5b38d3e4b5f4261d3c4ab776dd9c3c97a (diff)
parent72f10d245f5514de4f586ca97784d599d00cc8f3 (diff)
Merge pull request #72 from ava-labs/devHEADv0.3.17master
Dev
Diffstat (limited to 'core')
-rw-r--r--core/state/statedb.go1
-rw-r--r--core/types/block.go2
-rw-r--r--core/vm/instructions.go1
3 files changed, 2 insertions, 2 deletions
diff --git a/core/state/statedb.go b/core/state/statedb.go
index c4d926d..f75428b 100644
--- a/core/state/statedb.go
+++ b/core/state/statedb.go
@@ -43,7 +43,6 @@ type revision struct {
var (
// emptyRoot is the known root hash of an empty trie.
emptyRoot = common.HexToHash("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
- zeroRoot = common.HexToHash("0000000000000000000000000000000000000000000000000000000000000000")
)
type proofList [][]byte
diff --git a/core/types/block.go b/core/types/block.go
index 8e23488..b293ae7 100644
--- a/core/types/block.go
+++ b/core/types/block.go
@@ -86,7 +86,7 @@ type Header struct {
Extra []byte `json:"extraData" gencodec:"required"`
MixDigest common.Hash `json:"mixHash"`
Nonce BlockNonce `json:"nonce"`
- ExtDataHash common.Hash `json:"extDataHash" gencodec:"required"`
+ ExtDataHash common.Hash `json:"extDataHash" gencodec:"required"`
}
// field type overrides for gencodec
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
index e1eb25e..3e1da26 100644
--- a/core/vm/instructions.go
+++ b/core/vm/instructions.go
@@ -18,6 +18,7 @@ package vm
import (
"errors"
+
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/params"
"github.com/ethereum/go-ethereum/common"