fix: internal failure: Cancun is active but ExcessBlobGas is nil

ourzora · Mar 13, 2024 · 0183d0b · 0183d0b
1 parent ef51847
commit 0183d0b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/turbo/jsonrpc/eth_callMany.go b/turbo/jsonrpc/eth_callMany.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
-	"github.com/ledgerwatch/erigon-lib/common/hexutil"
 	"math/big"
 	"time"
 
+	"github.com/ledgerwatch/erigon-lib/common/hexutil"
+
 	"github.com/holiman/uint256"
 	"github.com/ledgerwatch/erigon-lib/common"
 	"github.com/ledgerwatch/log/v3"
@@ -160,15 +161,16 @@ func (api *APIImpl) CallMany(ctx context.Context, bundles []Bundle, simulateCont
 	}
 
 	blockCtx = evmtypes.BlockContext{
-		CanTransfer: core.CanTransfer,
-		Transfer:    core.Transfer,
-		GetHash:     getHash,
-		Coinbase:    parent.Coinbase,
-		BlockNumber: parent.Number.Uint64(),
-		Time:        parent.Time,
-		Difficulty:  new(big.Int).Set(parent.Difficulty),
-		GasLimit:    parent.GasLimit,
-		BaseFee:     &baseFee,
+		CanTransfer:   core.CanTransfer,
+		Transfer:      core.Transfer,
+		GetHash:       getHash,
+		Coinbase:      parent.Coinbase,
+		BlockNumber:   parent.Number.Uint64(),
+		Time:          parent.Time,
+		Difficulty:    new(big.Int).Set(parent.Difficulty),
+		GasLimit:      parent.GasLimit,
+		BaseFee:       &baseFee,
+		ExcessBlobGas: parent.ExcessBlobGas,
 	}
 
 	// Get a new instance of the EVM

diff --git a/turbo/jsonrpc/tracing.go b/turbo/jsonrpc/tracing.go
@@ -482,15 +482,16 @@ func (api *PrivateDebugAPIImpl) TraceCallMany(ctx context.Context, bundles []Bun
 	}
 
 	blockCtx = evmtypes.BlockContext{
-		CanTransfer: core.CanTransfer,
-		Transfer:    core.Transfer,
-		GetHash:     getHash,
-		Coinbase:    parent.Coinbase,
-		BlockNumber: parent.Number.Uint64(),
-		Time:        parent.Time,
-		Difficulty:  new(big.Int).Set(parent.Difficulty),
-		GasLimit:    parent.GasLimit,
-		BaseFee:     &baseFee,
+		CanTransfer:   core.CanTransfer,
+		Transfer:      core.Transfer,
+		GetHash:       getHash,
+		Coinbase:      parent.Coinbase,
+		BlockNumber:   parent.Number.Uint64(),
+		Time:          parent.Time,
+		Difficulty:    new(big.Int).Set(parent.Difficulty),
+		GasLimit:      parent.GasLimit,
+		BaseFee:       &baseFee,
+		ExcessBlobGas: parent.ExcessBlobGas,
 	}
 
 	// Get a new instance of the EVM