feat: implement and integrate counter-based CCC (#982)

Co-authored-by: colin <[email protected]> Co-authored-by: Zhang Zhuo <[email protected]> Co-authored-by: Xi Lin <[email protected]>
scroll-tech · Sep 4, 2024 · e9259b7 · e9259b7
1 parent 2865e13
commit e9259b7
Show file tree

Hide file tree

Showing 19 changed files with 1,645 additions and 417 deletions.
diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go
@@ -821,6 +821,7 @@ func (m callMsg) Value() *big.Int              { return m.CallMsg.Value }
 func (m callMsg) Data() []byte                 { return m.CallMsg.Data }
 func (m callMsg) AccessList() types.AccessList { return m.CallMsg.AccessList }
 func (m callMsg) IsL1MessageTx() bool          { return false }
+func (m callMsg) TxSize() common.StorageSize   { return 0 }
 
 // filterBackend implements filters.Backend to support filtering for logs without
 // taking bloom-bits acceleration structures into account.

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -1551,6 +1551,11 @@ func setMiner(ctx *cli.Context, cfg *miner.Config) {
 	if ctx.GlobalIsSet(LegacyMinerGasTargetFlag.Name) {
 		log.Warn("The generic --miner.gastarget flag is deprecated and will be removed in the future!")
 	}
+
+	cfg.CCCMaxWorkers = runtime.GOMAXPROCS(0)
+	if ctx.GlobalIsSet(CircuitCapacityCheckWorkersFlag.Name) {
+		cfg.CCCMaxWorkers = int(ctx.GlobalUint(CircuitCapacityCheckWorkersFlag.Name))
+	}
 }
 
 func setWhitelist(ctx *cli.Context, cfg *ethconfig.Config) {

diff --git a/core/evm.go b/core/evm.go
@@ -70,9 +70,11 @@ func NewEVMBlockContext(header *types.Header, chain ChainContext, chainConfig *p
 // NewEVMTxContext creates a new transaction context for a single transaction.
 func NewEVMTxContext(msg Message) vm.TxContext {
 	return vm.TxContext{
-		Origin:   msg.From(),
-		To:       msg.To(),
-		GasPrice: new(big.Int).Set(msg.GasPrice()),
+		Origin:        msg.From(),
+		To:            msg.To(),
+		GasPrice:      new(big.Int).Set(msg.GasPrice()),
+		IsL1MessageTx: msg.IsL1MessageTx(),
+		TxSize:        msg.TxSize(),
 	}
 }
 

diff --git a/core/rawdb/accessors_row_consumption.go b/core/rawdb/accessors_row_consumption.go
@@ -49,3 +49,8 @@ func ReadBlockRowConsumptionRLP(db ethdb.Reader, l2BlockHash common.Hash) rlp.Ra
 	}
 	return data
 }
+
+// DeleteBlockRowConsumption deletes a RowConsumption of the block from the database
+func DeleteBlockRowConsumption(db ethdb.KeyValueWriter, l2BlockHash common.Hash) error {
+	return db.Delete(rowConsumptionKey(l2BlockHash))
+}
diff --git a/core/state_processor.go b/core/state_processor.go
@@ -17,6 +17,7 @@
 package core
 
 import (
+	"errors"
 	"fmt"
 	"math/big"
 	"time"
@@ -132,6 +133,11 @@ func applyTransaction(msg types.Message, config *params.ChainConfig, bc ChainCon
 	// Apply the transaction to the current state (included in the env).
 	applyMessageStartTime := time.Now()
 	result, err := ApplyMessage(evm, msg, gp, l1DataFee)
+	if evm.Config.Debug {
+		if erroringTracer, ok := evm.Config.Tracer.(interface{ Error() error }); ok {
+			err = errors.Join(err, erroringTracer.Error())
+		}
+	}
 	applyMessageTimer.Update(time.Since(applyMessageStartTime))
 	if err != nil {
 		return nil, err

diff --git a/core/state_transition.go b/core/state_transition.go
@@ -90,6 +90,7 @@ type Message interface {
 	Data() []byte
 	AccessList() types.AccessList
 	IsL1MessageTx() bool
+	TxSize() common.StorageSize
 }
 
 // ExecutionResult includes all output after executing given evm

diff --git a/core/types/transaction.go b/core/types/transaction.go
@@ -752,6 +752,7 @@ type Message struct {
 	accessList    AccessList
 	isFake        bool
 	isL1MessageTx bool
+	txSize        common.StorageSize
 }
 
 func NewMessage(from common.Address, to *common.Address, nonce uint64, amount *big.Int, gasLimit uint64, gasPrice, gasFeeCap, gasTipCap *big.Int, data []byte, accessList AccessList, isFake bool) Message {
@@ -785,6 +786,7 @@ func (tx *Transaction) AsMessage(s Signer, baseFee *big.Int) (Message, error) {
 		accessList:    tx.AccessList(),
 		isFake:        false,
 		isL1MessageTx: tx.IsL1MessageTx(),
+		txSize:        tx.Size(),
 	}
 	// If baseFee provided, set gasPrice to effectiveGasPrice.
 	if baseFee != nil {
@@ -795,18 +797,19 @@ func (tx *Transaction) AsMessage(s Signer, baseFee *big.Int) (Message, error) {
 	return msg, err
 }
 
-func (m Message) From() common.Address   { return m.from }
-func (m Message) To() *common.Address    { return m.to }
-func (m Message) GasPrice() *big.Int     { return m.gasPrice }
-func (m Message) GasFeeCap() *big.Int    { return m.gasFeeCap }
-func (m Message) GasTipCap() *big.Int    { return m.gasTipCap }
-func (m Message) Value() *big.Int        { return m.amount }
-func (m Message) Gas() uint64            { return m.gasLimit }
-func (m Message) Nonce() uint64          { return m.nonce }
-func (m Message) Data() []byte           { return m.data }
-func (m Message) AccessList() AccessList { return m.accessList }
-func (m Message) IsFake() bool           { return m.isFake }
-func (m Message) IsL1MessageTx() bool    { return m.isL1MessageTx }
+func (m Message) From() common.Address       { return m.from }
+func (m Message) To() *common.Address        { return m.to }
+func (m Message) GasPrice() *big.Int         { return m.gasPrice }
+func (m Message) GasFeeCap() *big.Int        { return m.gasFeeCap }
+func (m Message) GasTipCap() *big.Int        { return m.gasTipCap }
+func (m Message) Value() *big.Int            { return m.amount }
+func (m Message) Gas() uint64                { return m.gasLimit }
+func (m Message) Nonce() uint64              { return m.nonce }
+func (m Message) Data() []byte               { return m.data }
+func (m Message) AccessList() AccessList     { return m.accessList }
+func (m Message) IsFake() bool               { return m.isFake }
+func (m Message) IsL1MessageTx() bool        { return m.isL1MessageTx }
+func (m Message) TxSize() common.StorageSize { return m.txSize }
 
 // copyAddressPtr copies an address.
 func copyAddressPtr(a *common.Address) *common.Address {

diff --git a/core/vm/evm.go b/core/vm/evm.go
@@ -87,9 +87,11 @@ type BlockContext struct {
 // All fields can change between transactions.
 type TxContext struct {
 	// Message information
-	Origin   common.Address  // Provides information for ORIGIN
-	To       *common.Address // Provides information for trace
-	GasPrice *big.Int        // Provides information for GASPRICE
+	Origin        common.Address     // Provides information for ORIGIN
+	To            *common.Address    // Provides information for trace
+	IsL1MessageTx bool               // Provides information for trace
+	TxSize        common.StorageSize // Provides information for trace
+	GasPrice      *big.Int           // Provides information for GASPRICE
 }
 
 // EVM is the Ethereum Virtual Machine base object and provides

diff --git a/eth/backend.go b/eth/backend.go
@@ -200,7 +200,7 @@ func New(stack *node.Node, config *ethconfig.Config, l1Client sync_service.EthCl
 		return nil, err
 	}
 	if config.CheckCircuitCapacity {
-		eth.asyncChecker = ccc.NewAsyncChecker(eth.blockchain, config.CCCMaxWorkers, true)
+		eth.asyncChecker = ccc.NewAsyncChecker(eth.blockchain, config.CCCMaxWorkers, false)
 		eth.asyncChecker.WithOnFailingBlock(func(b *types.Block, err error) {
 			log.Warn("block failed CCC check, it will be reorged by the sequencer", "hash", b.Hash(), "err", err)
 		})

diff --git a/miner/miner.go b/miner/miner.go
@@ -59,6 +59,7 @@ type Config struct {
 
 	StoreSkippedTxTraces bool // Whether store the wrapped traces when storing a skipped tx
 	MaxAccountsNum       int  // Maximum number of accounts that miner will fetch the pending transactions of when building a new block
+	CCCMaxWorkers        int  // Maximum number of workers to use for async CCC tasks
 }
 
 // Miner creates blocks and searches for proof-of-work values.

diff --git a/miner/miner_test.go b/miner/miner_test.go
@@ -251,6 +251,7 @@ func createMiner(t *testing.T) (*Miner, *event.TypeMux) {
 	config := Config{
 		Etherbase:      common.HexToAddress("123456789"),
 		MaxAccountsNum: math.MaxInt,
+		CCCMaxWorkers:  2,
 	}
 	// Create chainConfig
 	memdb := memorydb.New()