Merge branch 'run-mode-struct' into wasm-rebuild-missing-targets

Author: magicxyyz

arbitrum/backend.go

@@ -15,6 +15,7 @@ import (
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/internal/shutdowncheck"
+	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/rpc"
 )
@@ -128,7 +129,16 @@ func (b *Backend) updateFilterMapsHeads() {
 	headEventCh := make(chan core.ChainEvent, 10)
 	blockProcCh := make(chan bool, 10)
 	sub := b.arb.BlockChain().SubscribeChainEvent(headEventCh)
+	if sub == nil {
+		log.Error("arbitrum Backend: failed subscribing to Head Event")
+		return
+	}
 	sub2 := b.arb.BlockChain().SubscribeBlockProcessingEvent(blockProcCh)
+	if sub2 == nil {
+		log.Error("arbitrum Backend: failed subscribing to Block Processing Event")
+		sub.Unsubscribe()
+		return
+	}
 	defer func() {
 		sub.Unsubscribe()
 		sub2.Unsubscribe()

arbitrum/config.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/eth/ethconfig"
 	flag "github.com/spf13/pflag"
 )
@@ -119,4 +120,5 @@ var DefaultConfig = Config{
 		TimeoutQueueBound: 512,
 	},
 	BlockRedirectsList: "default",
+	StateScheme:        rawdb.HashScheme,
 }

consensus/misc/eip4844/eip4844.go

@@ -81,6 +81,10 @@ func CalcExcessBlobGas(config *params.ChainConfig, parent *types.Header, headTim
 
 // CalcBlobFee calculates the blobfee from the header's excess blob gas field.
 func CalcBlobFee(config *params.ChainConfig, header *types.Header) *big.Int {
+	if config.IsArbitrum() {
+		// Arbitrum does not support blob transactions, so we return 0.
+		return big.NewInt(0)
+	}
 	var frac uint64
 	switch config.LatestFork(header.Time, types.DeserializeHeaderExtraInformation(header).ArbOSFormatVersion) {
 	case forks.Osaka:

core/rawdb/accessors_trie.go

@@ -265,10 +265,20 @@ func ReadStateScheme(db ethdb.Database) string {
 	if id := ReadPersistentStateID(vdb); id != 0 {
 		return PathScheme
 	}
+	genesisBlockNumber := uint64(0)
+	block0Hash := ReadCanonicalHash(db, 0)
+	if (block0Hash != common.Hash{}) {
+		chainConfig := ReadChainConfig(db, block0Hash)
+		if chainConfig != nil {
+			if chainConfig.IsArbitrum() {
+				genesisBlockNumber = chainConfig.ArbitrumChainParams.GenesisBlockNum
+			}
+		}
+	}
 	// In a hash-based scheme, the genesis state is consistently stored
 	// on the disk. To assess the scheme of the persistent state, it
 	// suffices to inspect the scheme of the genesis state.
-	header := ReadHeader(db, ReadCanonicalHash(db, 0), 0)
+	header := ReadHeader(db, ReadCanonicalHash(db, genesisBlockNumber), genesisBlockNumber)
 	if header == nil {
 		return "" // empty datadir
 	}