feat(all): dynamic state sync

core/blockchain_reader.go

@@ -247,6 +247,20 @@ func (bc *BlockChain) HasBlockAndState(hash common.Hash, number uint64) bool {
 	return bc.HasState(block.Root())
 }
 
+// ContractCodeWithPrefix retrieves a blob of data associated with a contract
+// hash either from ephemeral in-memory cache, or from persistent storage.
+//
+// If the code doesn't exist in the in-memory cache, check the storage with
+// new code scheme.
+func (bc *BlockChain) ContractCodeWithPrefix(hash common.Hash) ([]byte, error) {
+	type codeReader interface {
+		ContractCodeWithPrefix(address common.Address, codeHash common.Hash) ([]byte, error)
+	}
+	// TODO(rjl493456442) The associated account address is also required
+	// in Verkle scheme. Fix it once snap-sync is supported for Verkle.
+	return bc.stateCache.(codeReader).ContractCodeWithPrefix(common.Address{}, hash)
+}
+
 // State returns a new mutable state based on the current HEAD block.
 func (bc *BlockChain) State() (*state.StateDB, error) {
 	return bc.StateAt(bc.CurrentBlock().Root)

core/state/snapshot/conversion.go

@@ -372,15 +372,16 @@
 }
 
 func stackTrieGenerate(db ethdb.KeyValueWriter, scheme string, owner common.Hash, in chan trieKV, out chan common.Hash) {
-	options := trie.NewStackTrieOptions()
+	var onTrieNode trie.OnTrieNode
 	if db != nil {
-		options = options.WithWriter(func(path []byte, hash common.Hash, blob []byte) {
+		onTrieNode = func(path []byte, hash common.Hash, blob []byte) {
 			rawdb.WriteTrieNode(db, owner, path, hash, blob, scheme)
-		})
+		}
 	}
-	t := trie.NewStackTrie(options)
+	t := trie.NewStackTrie(onTrieNode)
+
 	for leaf := range in {
 		t.Update(leaf.key[:], leaf.value)
 	}
-	out <- t.Commit()
+	out <- t.Hash()
 }

core/state/snapshot/generate_test.go

@@ -90,7 +90,7 @@ func testGeneration(t *testing.T, scheme string) {
 	case <-time.After(250 * time.Millisecond):
 		t.Errorf("Snapshot generation failed")
 	}
-	checkSnapRoot(t, snap, root)
+	checkSnapRoot(t, snap, root, scheme)
 
 	// Signal abortion to the generator and wait for it to tear down
 	stop := make(chan struct{})
@@ -131,24 +131,24 @@ func testGenerateExistentState(t *testing.T, scheme string) {
 	case <-time.After(250 * time.Millisecond):
 		t.Errorf("Snapshot generation failed")
 	}
-	checkSnapRoot(t, snap, root)
+	checkSnapRoot(t, snap, root, scheme)
 
 	// Signal abortion to the generator and wait for it to tear down
 	stop := make(chan struct{})
 	snap.genAbort <- stop
 	<-stop
 }
 
-func checkSnapRoot(t *testing.T, snap *diskLayer, trieRoot common.Hash) {
+func checkSnapRoot(t *testing.T, snap *diskLayer, trieRoot common.Hash, scheme string) {
 	t.Helper()
 	accIt := snap.AccountIterator(common.Hash{})
 	defer accIt.Release()
-	snapRoot, err := generateTrieRoot(nil, "", accIt, common.Hash{}, stackTrieGenerate,
+	snapRoot, err := generateTrieRoot(nil, scheme, accIt, common.Hash{}, stackTrieGenerate,
 		func(db ethdb.KeyValueWriter, accountHash, codeHash common.Hash, stat *generateStats) (common.Hash, error) {
 			storageIt, _ := snap.StorageIterator(accountHash, common.Hash{})
 			defer storageIt.Release()
 
-			hash, err := generateTrieRoot(nil, "", storageIt, accountHash, stackTrieGenerate, nil, stat, false)
+			hash, err := generateTrieRoot(nil, scheme, storageIt, accountHash, stackTrieGenerate, nil, stat, false)
 			if err != nil {
 				return common.Hash{}, err
 			}
@@ -347,7 +347,7 @@ func testGenerateExistentStateWithWrongStorage(t *testing.T, scheme string) {
 	case <-time.After(250 * time.Millisecond):
 		t.Errorf("Snapshot generation failed")
 	}
-	checkSnapRoot(t, snap, root)
+	checkSnapRoot(t, snap, root, scheme)
 	// Signal abortion to the generator and wait for it to tear down
 	stop := make(chan struct{})
 	snap.genAbort <- stop
@@ -409,7 +409,7 @@ func testGenerateExistentStateWithWrongAccounts(t *testing.T, scheme string) {
 	case <-time.After(250 * time.Millisecond):
 		t.Errorf("Snapshot generation failed")
 	}
-	checkSnapRoot(t, snap, root)
+	checkSnapRoot(t, snap, root, scheme)
 
 	// Signal abortion to the generator and wait for it to tear down
 	stop := make(chan struct{})
@@ -600,7 +600,7 @@ func testGenerateWithExtraAccounts(t *testing.T, scheme string) {
 	case <-time.After(250 * time.Millisecond):
 		t.Errorf("Snapshot generation failed")
 	}
-	checkSnapRoot(t, snap, root)
+	checkSnapRoot(t, snap, root, scheme)
 
 	// Signal abortion to the generator and wait for it to tear down
 	stop := make(chan struct{})
@@ -662,7 +662,7 @@ func testGenerateWithManyExtraAccounts(t *testing.T, scheme string) {
 	case <-time.After(5 * time.Second):
 		t.Errorf("Snapshot generation failed")
 	}
-	checkSnapRoot(t, snap, root)
+	checkSnapRoot(t, snap, root, scheme)
 	// Signal abortion to the generator and wait for it to tear down
 	stop := make(chan struct{})
 	snap.genAbort <- stop
@@ -710,7 +710,7 @@ func testGenerateWithExtraBeforeAndAfter(t *testing.T, scheme string) {
 	case <-time.After(250 * time.Millisecond):
 		t.Errorf("Snapshot generation failed")
 	}
-	checkSnapRoot(t, snap, root)
+	checkSnapRoot(t, snap, root, scheme)
 	// Signal abortion to the generator and wait for it to tear down
 	stop := make(chan struct{})
 	snap.genAbort <- stop
@@ -749,7 +749,7 @@ func testGenerateWithMalformedSnapdata(t *testing.T, scheme string) {
 	case <-time.After(250 * time.Millisecond):
 		t.Errorf("Snapshot generation failed")
 	}
-	checkSnapRoot(t, snap, root)
+	checkSnapRoot(t, snap, root, scheme)
 	// Signal abortion to the generator and wait for it to tear down
 	stop := make(chan struct{})
 	snap.genAbort <- stop
@@ -784,7 +784,7 @@ func testGenerateFromEmptySnap(t *testing.T, scheme string) {
 	case <-time.After(1 * time.Second):
 		t.Errorf("Snapshot generation failed")
 	}
-	checkSnapRoot(t, snap, root)
+	checkSnapRoot(t, snap, root, scheme)
 	// Signal abortion to the generator and wait for it to tear down
 	stop := make(chan struct{})
 	snap.genAbort <- stop
@@ -834,7 +834,7 @@ func testGenerateWithIncompleteStorage(t *testing.T, scheme string) {
 	case <-time.After(250 * time.Millisecond):
 		t.Errorf("Snapshot generation failed")
 	}
-	checkSnapRoot(t, snap, root)
+	checkSnapRoot(t, snap, root, scheme)
 	// Signal abortion to the generator and wait for it to tear down
 	stop := make(chan struct{})
 	snap.genAbort <- stop
@@ -929,7 +929,7 @@ func testGenerateCompleteSnapshotWithDanglingStorage(t *testing.T, scheme string
 	case <-time.After(3 * time.Second):
 		t.Errorf("Snapshot generation failed")
 	}
-	checkSnapRoot(t, snap, root)
+	checkSnapRoot(t, snap, root, scheme)
 
 	// Signal abortion to the generator and wait for it to tear down
 	stop := make(chan struct{})
@@ -966,7 +966,7 @@ func testGenerateBrokenSnapshotWithDanglingStorage(t *testing.T, scheme string)
 	case <-time.After(3 * time.Second):
 		t.Errorf("Snapshot generation failed")
 	}
-	checkSnapRoot(t, snap, root)
+	checkSnapRoot(t, snap, root, scheme)
 
 	// Signal abortion to the generator and wait for it to tear down
 	stop := make(chan struct{})

eth/protocols/snap/discovery.go

@@ -0,0 +1,32 @@
+// Copyright 2020 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+package snap
+
+import (
+	"github.com/ava-labs/libevm/rlp"
+)
+
+// enrEntry is the ENR entry which advertises `snap` protocol on the discovery.
+type enrEntry struct {
+	// Ignore additional fields (for forward compatibility).
+	Rest []rlp.RawValue `rlp:"tail"`
+}
+
+// ENRKey implements enr.Entry.
+func (e enrEntry) ENRKey() string {
+	return "snap"
+}