Merge branch 'master' into trie-prefetcher-alt2

Darioush Jalali · web-flow · commit 0b5bed8215e0 · 2024-12-16T10:08:54.000-08:00
Signed-off-by: Darioush Jalali &lt;darioush.jalali@avalabs.org&gt;
diff --git a/README.md b/README.md
@@ -30,7 +30,8 @@ The Subnet EVM runs in a separate process from the main AvalancheGo process and
 [v0.6.9] AvalancheGo@v1.11.11-v1.11.12 (Protocol Version: 37)
 [v0.6.10] AvalancheGo@v1.11.11-v1.11.12 (Protocol Version: 37)
 [v0.6.11] AvalancheGo@v1.11.11-v1.11.12 (Protocol Version: 37)
-[v0.6.12] AvalancheGo@v1.11.13/v1.12.0-fuji (Protocol Version: 38)
+[v0.6.12] AvalancheGo@v1.11.13/v1.12.0 (Protocol Version: 38)
+[v0.7.0] AvalancheGo@v1.12.0 (Protocol Version: 38)
 ```
 
 ## API
diff --git a/RELEASES.md b/RELEASES.md
@@ -4,6 +4,7 @@
 
 * Refactored trie_prefetcher.go to be structurally similar to upstream.
 
+
 ## [v0.6.11](https://github.com/ava-labs/subnet-evm/releases/tag/v0.6.11)
 
 This release focuses on Standalone DB and database configs.
diff --git a/compatibility.json b/compatibility.json
@@ -1,5 +1,6 @@
 {
   "rpcChainVMProtocolVersion": {
+    "v0.7.0": 38,
     "v0.6.12": 38,
     "v0.6.11": 37,
     "v0.6.10": 37,
diff --git a/consensus/dummy/README.md b/consensus/dummy/README.md
@@ -18,7 +18,7 @@ The dynamic fee algorithm aims to adjust the base fee to handle network congesti
 
 - EIP-1559 is intended for Ethereum where a block is produced roughly every 10s
 - The dynamic fee algorithm needs to handle the case that the network quiesces and there are no blocks for a long period of time
-- Since Subnet-EVM produces blocks at a different cadence, it adapts EIP-1559 to sum the amount of gas consumed within a 10 second interval instead of using only the amount of gas consumed in the parent block
+- Since Subnet-EVM produces blocks at a different cadence, it adapts EIP-1559 to sum the amount of gas consumed within a 10-second interval instead of using only the amount of gas consumed in the parent block
 
 ## Consensus Engine Callbacks
 
diff --git a/eth/tracers/js/tracer_test.go b/eth/tracers/js/tracer_test.go
@@ -206,7 +206,7 @@ func TestHaltBetweenSteps(t *testing.T) {
 	}
 }
 
-// testNoStepExec tests a regular value transfer (no exec), and accessing the statedb
+// TestNoStepExec tests a regular value transfer (no exec), and accessing the statedb
 // in 'result'
 func TestNoStepExec(t *testing.T) {
 	execTracer := func(code string) []byte {
diff --git a/eth/tracers/logger/access_list_tracer.go b/eth/tracers/logger/access_list_tracer.go
@@ -87,7 +87,7 @@ func (al accessList) equal(other accessList) bool {
 	return true
 }
 
-// accesslist converts the accesslist to a types.AccessList.
+// accessList converts the accesslist to a types.AccessList.
 func (al accessList) accessList() types.AccessList {
 	acl := make(types.AccessList, 0, len(al))
 	for addr, slots := range al {
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.22.8
 require (
 	github.com/VictoriaMetrics/fastcache v1.12.1
 	github.com/antithesishq/antithesis-sdk-go v0.3.8
-	github.com/ava-labs/avalanchego v1.12.0
+	github.com/ava-labs/avalanchego v1.12.0-config-pebble-sync
 	github.com/cespare/cp v0.1.0
 	github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233
 	github.com/davecgh/go-spew v1.1.1
diff --git a/go.sum b/go.sum
@@ -60,8 +60,8 @@ github.com/antithesishq/antithesis-sdk-go v0.3.8/go.mod h1:IUpT2DPAKh6i/YhSbt6Gl
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/ava-labs/avalanchego v1.12.0 h1:NBx0vSOY1dCT0PeJzojIhNhx0NMQNem4GgTEN+v8Sx4=
-github.com/ava-labs/avalanchego v1.12.0/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0=
+github.com/ava-labs/avalanchego v1.12.0-config-pebble-sync h1:HvtadR1VLxsOe7Y2PSnNmLUXPvp1RnTgeWtk5cOuGYA=
+github.com/ava-labs/avalanchego v1.12.0-config-pebble-sync/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0=
 github.com/ava-labs/coreth v0.13.9-rc.1 h1:qIICpC/OZGYUP37QnLgIqqwGmxnLwLpZaUlqJNI85vU=
 github.com/ava-labs/coreth v0.13.9-rc.1/go.mod h1:7aMsRIo/3GBE44qWZMjnfqdqfcfZ5yShTTm2LObLaYo=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
diff --git a/internal/ethapi/transaction_args.go b/internal/ethapi/transaction_args.go
@@ -277,7 +277,7 @@ func (args *TransactionArgs) setCancunFeeDefaults(ctx context.Context, head *typ
 	return nil
 }
 
-// setSubnetEVMFeeDefaults fills in reasonable default fee values for unspecified fields.
+// setSubnetEVMFeeDefault fills in reasonable default fee values for unspecified fields.
 func (args *TransactionArgs) setSubnetEVMFeeDefault(ctx context.Context, head *types.Header, b feeBackend) error {
 	// Set maxPriorityFeePerGas if it is missing.
 	if args.MaxPriorityFeePerGas == nil {
diff --git a/plugin/evm/block.go b/plugin/evm/block.go
@@ -55,7 +55,7 @@ func (b *Block) Accept(context.Context) error {
 
 	// Although returning an error from Accept is considered fatal, it is good
 	// practice to cleanup the batch we were modifying in the case of an error.
-	defer vm.db.Abort()
+	defer vm.versiondb.Abort()
 
 	log.Debug(fmt.Sprintf("Accepting block %s (%s) at height %d", b.ID().Hex(), b.ID(), b.Height()))
 
@@ -74,7 +74,7 @@ func (b *Block) Accept(context.Context) error {
 		return fmt.Errorf("failed to put %s as the last accepted block: %w", b.ID(), err)
 	}
 
-	return b.vm.db.Commit()
+	return b.vm.versiondb.Commit()
 }
 
 // handlePrecompileAccept calls Accept on any logs generated with an active precompile address that implements
diff --git a/plugin/evm/database/database.go b/plugin/evm/database/database.go
@@ -4,6 +4,7 @@
 package database
 
 import (
+	"encoding/json"
 	"fmt"
 	"path/filepath"
 
@@ -16,6 +17,7 @@ import (
 	"github.com/ava-labs/avalanchego/database/versiondb"
 	avalanchenode "github.com/ava-labs/avalanchego/node"
 	"github.com/ava-labs/avalanchego/utils/logging"
+	"github.com/prometheus/client_golang/prometheus"
 )
 
 const (
@@ -44,7 +46,7 @@ func NewStandaloneDatabase(dbConfig avalanchenode.DatabaseConfig, gatherer metri
 		db = memdb.New()
 	case pebbledb.Name:
 		dbPath := filepath.Join(dbConfig.Path, pebbledb.Name)
-		db, err = pebbledb.New(dbPath, dbConfig.Config, logger, dbRegisterer)
+		db, err = NewPebbleDB(dbPath, dbConfig.Config, logger, dbRegisterer)
 		if err != nil {
 			return nil, fmt.Errorf("couldn't create %s at %s: %w", pebbledb.Name, dbPath, err)
 		}
@@ -77,3 +79,20 @@ func NewStandaloneDatabase(dbConfig avalanchenode.DatabaseConfig, gatherer metri
 
 	return db, nil
 }
+
+func NewPebbleDB(file string, configBytes []byte, log logging.Logger, dbRegisterer prometheus.Registerer) (database.Database, error) {
+	cfg := pebbledb.DefaultConfig
+	// Use no sync for pebble db
+	cfg.Sync = false
+	if len(configBytes) > 0 {
+		if err := json.Unmarshal(configBytes, &cfg); err != nil {
+			return nil, err
+		}
+	}
+	// Marshal the config back to bytes to ensure that new defaults are applied
+	newCfgBytes, err := json.Marshal(cfg)
+	if err != nil {
+		return nil, err
+	}
+	return pebbledb.New(file, newCfgBytes, log, dbRegisterer)
+}
diff --git a/plugin/evm/syncervm_test.go b/plugin/evm/syncervm_test.go
@@ -431,7 +431,7 @@ func testSyncerVM(t *testing.T, vmSetup *syncVMSetup, test syncTest) {
 	if test.expectedErr != nil {
 		require.ErrorIs(err, test.expectedErr)
 		// Note we re-open the database here to avoid a closed error when the test is for a shutdown VM.
-		chaindb := database.WrapDatabase(prefixdb.NewNested(ethDBPrefix, syncerVM.db))
+		chaindb := database.WrapDatabase(prefixdb.NewNested(ethDBPrefix, syncerVM.versiondb))
 		assertSyncPerformedHeights(t, chaindb, map[uint64]struct{}{})
 		return
 	}
diff --git a/plugin/evm/version.go b/plugin/evm/version.go
@@ -11,7 +11,7 @@ var (
 	// GitCommit is set by the build script
 	GitCommit string
 	// Version is the version of Subnet EVM
-	Version string = "v0.6.12"
+	Version string = "v0.7.0"
 )
 
 func init() {
diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go
@@ -195,15 +195,20 @@ type VM struct {
 	blockChain *core.BlockChain
 	miner      *miner.Miner
 
-	// [db] is the VM's current database managed by ChainState
-	db *versiondb.Database
+	// [versiondb] is the VM's current versioned database
+	versiondb *versiondb.Database
+
+	// [db] is the VM's current database
+	db database.Database
 
 	// metadataDB is used to store one off keys.
 	metadataDB database.Database
 
 	// [chaindb] is the database supplied to the Ethereum backend
 	chaindb ethdb.Database
 
+	usingStandaloneDB bool
+
 	// [acceptedBlockDB] is the database to store the last accepted
 	// block.
 	acceptedBlockDB database.Database
@@ -630,7 +635,7 @@ func (vm *VM) initializeStateSyncClient(lastAcceptedHeight uint64) error {
 		chaindb:              vm.chaindb,
 		metadataDB:           vm.metadataDB,
 		acceptedBlockDB:      vm.acceptedBlockDB,
-		db:                   vm.db,
+		db:                   vm.versiondb,
 		toEngine:             vm.toEngine,
 	})
 
@@ -880,6 +885,13 @@ func (vm *VM) Shutdown(context.Context) error {
 	}
 	vm.eth.Stop()
 	log.Info("Ethereum backend stop completed")
+	if vm.usingStandaloneDB {
+		if err := vm.db.Close(); err != nil {
+			log.Error("failed to close database: %w", err)
+		} else {
+			log.Info("Database closed")
+		}
+	}
 	vm.shutdownWg.Wait()
 	log.Info("Subnet-EVM Shutdown completed")
 	return nil
diff --git a/plugin/evm/vm_database.go b/plugin/evm/vm_database.go
@@ -46,14 +46,16 @@ func (vm *VM) initializeDBs(avaDB avalanchedatabase.Database) error {
 			if err != nil {
 				return err
 			}
+			vm.usingStandaloneDB = true
 		}
 	}
 	// Use NewNested rather than New so that the structure of the database
 	// remains the same regardless of the provided baseDB type.
 	vm.chaindb = rawdb.NewDatabase(database.WrapDatabase(prefixdb.NewNested(ethDBPrefix, db)))
-	vm.db = versiondb.New(db)
-	vm.acceptedBlockDB = prefixdb.New(acceptedPrefix, vm.db)
-	vm.metadataDB = prefixdb.New(metadataPrefix, vm.db)
+	vm.versiondb = versiondb.New(db)
+	vm.acceptedBlockDB = prefixdb.New(acceptedPrefix, vm.versiondb)
+	vm.metadataDB = prefixdb.New(metadataPrefix, vm.versiondb)
+	vm.db = db
 	// Note warpDB and validatorsDB are not part of versiondb because it is not necessary
 	// that they are committed to the database atomically with
 	// the last accepted block.
diff --git a/precompile/contracts/warp/README.md b/precompile/contracts/warp/README.md
@@ -57,7 +57,7 @@ To use this function, the transaction must include the signed Avalanche Warp Mes
 This leads to the following advantages:
 
 1. The EVM execution does not need to verify the Warp Message at runtime (no signature verification or external calls to the P-Chain)
-2. The EVM can deterministically re-execute and re-verify blocks assuming the predicate was verified by the network (eg., in bootstrapping)
+2. The EVM can deterministically re-execute and re-verify blocks assuming the predicate was verified by the network (e.g., in bootstrapping)
 
 This pre-verification is performed using the ProposerVM Block header during [block verification](../../../plugin/evm/block.go#L220) and [block building](../../../miner/worker.go#L200).
 
diff --git a/rpc/handler.go b/rpc/handler.go
@@ -479,7 +479,7 @@ func (h *handler) startCallProc(fn func(*callProc)) {
 	}
 }
 
-// handleResponse processes method call responses.
+// handleResponses processes method call responses.
 func (h *handler) handleResponses(batch []*jsonrpcMessage, handleCall func(*jsonrpcMessage)) {
 	var resolvedops []*requestOp
 	handleResp := func(msg *jsonrpcMessage) {
diff --git a/scripts/versions.sh b/scripts/versions.sh
@@ -4,5 +4,5 @@
 # shellcheck disable=SC2034
 
 # Don't export them as they're used in the context of other calls
-AVALANCHE_VERSION=${AVALANCHE_VERSION:-'v1.12.0'}
+AVALANCHE_VERSION=${AVALANCHE_VERSION:-'v1.12.0-config-pebble-sync'}
 GINKGO_VERSION=${GINKGO_VERSION:-'v2.2.0'}

-Original file line number
+Diff line change
 [v0.6.9] [email protected] (Protocol Version: 37)
 [v0.6.10] [email protected] (Protocol Version: 37)
 [v0.6.11] [email protected] (Protocol Version: 37)
 -[v0.6.12] [email protected]/v1.12.0-fuji (Protocol Version: 38)
 +[v0.6.12] [email protected]/v1.12.0 (Protocol Version: 38)
 +[v0.7.0] [email protected] (Protocol Version: 38)
 ```
 ## API
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"rpcChainVMProtocolVersion": {`
	`3`	`+ "v0.7.0": 38,`
`3`	`4`	`"v0.6.12": 38,`
`4`	`5`	`"v0.6.11": 37,`
`5`	`6`	`"v0.6.10": 37,`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ func TestHaltBetweenSteps(t *testing.T) {`
`206`	`206`	`}`
`207`	`207`	`}`
`208`	`208`
`209`		`-// testNoStepExec tests a regular value transfer (no exec), and accessing the statedb`
	`209`	`+// TestNoStepExec tests a regular value transfer (no exec), and accessing the statedb`
`210`	`210`	`// in 'result'`
`211`	`211`	`func TestNoStepExec(t *testing.T) {`
`212`	`212`	`execTracer := func(code string) []byte {`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func (al accessList) equal(other accessList) bool {`
`87`	`87`	`return true`
`88`	`88`	`}`
`89`	`89`
`90`		`-// accesslist converts the accesslist to a types.AccessList.`
	`90`	`+// accessList converts the accesslist to a types.AccessList.`
`91`	`91`	`func (al accessList) accessList() types.AccessList {`
`92`	`92`	`acl := make(types.AccessList, 0, len(al))`
`93`	`93`	`for addr, slots := range al {`
Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ func (args TransactionArgs) setCancunFeeDefaults(ctx context.Context, head typ`
`277`	`277`	`return nil`
`278`	`278`	`}`
`279`	`279`
`280`		`-// setSubnetEVMFeeDefaults fills in reasonable default fee values for unspecified fields.`
	`280`	`+// setSubnetEVMFeeDefault fills in reasonable default fee values for unspecified fields.`
`281`	`281`	`func (args TransactionArgs) setSubnetEVMFeeDefault(ctx context.Context, head types.Header, b feeBackend) error {`
`282`	`282`	`// Set maxPriorityFeePerGas if it is missing.`
`283`	`283`	`if args.MaxPriorityFeePerGas == nil {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func (b *Block) Accept(context.Context) error {`
`55`	`55`
`56`	`56`	`// Although returning an error from Accept is considered fatal, it is good`
`57`	`57`	`// practice to cleanup the batch we were modifying in the case of an error.`
`58`		`- defer vm.db.Abort()`
	`58`	`+ defer vm.versiondb.Abort()`
`59`	`59`
`60`	`60`	`log.Debug(fmt.Sprintf("Accepting block %s (%s) at height %d", b.ID().Hex(), b.ID(), b.Height()))`
`61`	`61`
`@@ -74,7 +74,7 @@ func (b *Block) Accept(context.Context) error {`
`74`	`74`	`return fmt.Errorf("failed to put %s as the last accepted block: %w", b.ID(), err)`
`75`	`75`	`}`
`76`	`76`
`77`		`- return b.vm.db.Commit()`
	`77`	`+ return b.vm.versiondb.Commit()`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`// handlePrecompileAccept calls Accept on any logs generated with an active precompile address that implements`