feat(beacon): introduce soft blocks (ethereum#342)

* feat(beacon): introduce soft blocks * feat: update api.go * chore(ci): update CI * feat: update L1Origin * feat: update `verifyHeader` * test: update tests * feat: update consensus * feat: update consensus * feat: update genesis * feat: remove timestamp check in prepareWork * feat: merge changes in ethereum#281 * Update eth/catalyst/api.go Co-authored-by: maskpp <[email protected]> * Update internal/ethapi/taiko_preconf.go Co-authored-by: maskpp <[email protected]> * fix consensus test * revert commit f1df58 * fix consensus test (ethereum#349) * Update eth/catalyst/api.go Co-authored-by: maskpp <[email protected]> * feat: add back timestamp check in worker * add genesis * temp fix for old l1origin * nil value * feat: rename to `L1OriginLegacy` * feat: change `common.Big0` as the default value for legacy l1Origin, to make `IsSoftblock` return `false` * feat(beacon): change the reorg log level (ethereum#350) * use debug log level to avoid logging too many logs when frequently soft block reorg. * use debug log level to avoid logging too many logs when frequently soft block reorg. * feat: check --taiko flag --------- Co-authored-by: David <[email protected]> * add rlp optional flag (ethereum#353) * fix lint * fix test case * feat(l1Origin): remove the reverted l1Origins (ethereum#355) * remove the reverted l1Origins * feat: add more comments --------- Co-authored-by: David <[email protected]> * only forward txs * chore: update ci --------- Co-authored-by: maskpp <[email protected]> Co-authored-by: Jeffery Walsh <[email protected]>
jsvisa · Jan 7, 2025 · a2cbf90 · a2cbf90
1 parent 5ef7421
commit a2cbf90
Show file tree

Hide file tree

Showing 26 changed files with 562 additions and 79 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -2,7 +2,7 @@ name: "Push multi-arch docker image to GAR"
 
 on:
   push:
-    branches: [ taiko ]
+    branches: [taiko]
     tags:
       - "v*"
 
@@ -19,9 +19,9 @@ jobs:
             platform: linux/amd64
           - runner: arc-runner-set-arm64
             platform: linux/arm64
-    
+
     runs-on: ${{ matrix.runner }}
-    
+
     steps:
       - name: Prepare Environment
         run: |
@@ -80,7 +80,7 @@ jobs:
         with:
           context: .
           cache-from: type=gha
-          cache-to: type=gha,mode=max          
+          cache-to: type=gha,mode=max
           platforms: ${{ matrix.platform }}
           push: true
           tags: ${{ env.REGISTRY_IMAGE }}

diff --git a/cmd/geth/config.go b/cmd/geth/config.go
@@ -192,6 +192,11 @@ func makeFullNode(ctx *cli.Context) *node.Node {
 		cfg.Eth.OverrideVerkle = &v
 	}
 
+	// CHANGE(taiko): set preconfirmation forwarding URL.
+	if ctx.IsSet(utils.PreconfirmationForwardingURLFlag.Name) {
+		cfg.Eth.PreconfirmationForwardingURL = ctx.String(utils.PreconfirmationForwardingURLFlag.Name)
+	}
+
 	backend, eth := utils.RegisterEthService(stack, &cfg.Eth)
 
 	// CHANGE(TAIKO): register Taiko RPC APIs.

diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -261,7 +261,7 @@ func init() {
 		metricsFlags,
 	)
 	// CHANGE(taiko): append Taiko flags into the original GETH flags
-	app.Flags = append(app.Flags, &utils.TaikoFlag)
+	app.Flags = append(app.Flags, utils.TaikoFlag, utils.PreconfirmationForwardingURLFlag)
 
 	flags.AutoEnvVars(app.Flags, "GETH")
 

diff --git a/cmd/utils/taiko_flags.go b/cmd/utils/taiko_flags.go
@@ -5,16 +5,23 @@ import (
 
 	"github.com/ethereum/go-ethereum/eth"
 	"github.com/ethereum/go-ethereum/eth/ethconfig"
+	"github.com/ethereum/go-ethereum/internal/flags"
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/urfave/cli/v2"
 )
 
 var (
-	TaikoFlag = cli.BoolFlag{
-		Name:  "taiko",
-		Usage: "Taiko network",
+	TaikoFlag = &cli.BoolFlag{
+		Name:     "taiko",
+		Usage:    "Taiko network",
+		Category: flags.TaikoCategory,
+	}
+	PreconfirmationForwardingURLFlag = &cli.StringFlag{
+		Name:     "taiko.preconfirmationForwardingUrl",
+		Usage:    "URL to forward RPC requests before confirmation",
+		Category: flags.TaikoCategory,
 	}
 )
 

diff --git a/consensus/taiko/consensus.go b/consensus/taiko/consensus.go
@@ -10,10 +10,12 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/consensus"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/tracing"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rpc"
@@ -40,12 +42,13 @@ var (
 // Taiko is a consensus engine used by L2 rollup.
 type Taiko struct {
 	chainConfig    *params.ChainConfig
+	chainDB        ethdb.Database
 	taikoL2Address common.Address
 }
 
 var _ = new(Taiko)
 
-func New(chainConfig *params.ChainConfig) *Taiko {
+func New(chainConfig *params.ChainConfig, chainDB ethdb.Database) *Taiko {
 	taikoL2AddressPrefix := strings.TrimPrefix(chainConfig.ChainID.String(), "0")
 
 	return &Taiko{
@@ -56,6 +59,7 @@ func New(chainConfig *params.ChainConfig) *Taiko {
 				strings.Repeat("0", common.AddressLength*2-len(taikoL2AddressPrefix)-len(TaikoL2AddressSuffix)) +
 				TaikoL2AddressSuffix,
 		),
+		chainDB: chainDB,
 	}
 }
 
@@ -82,7 +86,7 @@ func (t *Taiko) VerifyHeader(chain consensus.ChainHeaderReader, header *types.He
 		return consensus.ErrUnknownAncestor
 	}
 	// Sanity checks passed, do a proper verification
-	return t.verifyHeader(chain, header, parent, time.Now().Unix())
+	return t.verifyHeader(header, parent, time.Now().Unix())
 }
 
 // VerifyHeaders is similar to VerifyHeader, but verifies a batch of headers
@@ -109,7 +113,7 @@ func (t *Taiko) VerifyHeaders(chain consensus.ChainHeaderReader, headers []*type
 			if parent == nil {
 				err = consensus.ErrUnknownAncestor
 			} else {
-				err = t.verifyHeader(chain, header, parent, unixNow)
+				err = t.verifyHeader(header, parent, unixNow)
 			}
 			select {
 			case <-abort:
@@ -121,11 +125,7 @@ func (t *Taiko) VerifyHeaders(chain consensus.ChainHeaderReader, headers []*type
 	return abort, results
 }
 
-func (t *Taiko) verifyHeader(chain consensus.ChainHeaderReader, header, parent *types.Header, unixNow int64) error {
-	if header.Time > uint64(unixNow) {
-		return consensus.ErrFutureBlock
-	}
-
+func (t *Taiko) verifyHeader(header, parent *types.Header, unixNow int64) error {
 	// Ensure that the header's extra-data section is of a reasonable size (<= 32 bytes)
 	if uint64(len(header.Extra)) > params.MaximumExtraDataSize {
 		return fmt.Errorf("extra-data too long: %d > %d", len(header.Extra), params.MaximumExtraDataSize)
@@ -171,6 +171,16 @@ func (t *Taiko) verifyHeader(chain consensus.ChainHeaderReader, header, parent *
 		return ErrEmptyWithdrawalsHash
 	}
 
+	l1Origin, err := rawdb.ReadL1Origin(t.chainDB, header.Number)
+	if err != nil {
+		return err
+	}
+
+	// If the current block is not a soft block, then check the timestamp.
+	if l1Origin != nil && !l1Origin.IsSoftBlock() && header.Time > uint64(unixNow) {
+		return consensus.ErrFutureBlock
+	}
+
 	return nil
 }
 

diff --git a/consensus/taiko/consensus_test.go b/consensus/taiko/consensus_test.go
@@ -39,7 +39,7 @@ func init() {
 	config.ArrowGlacierBlock = nil
 	config.Ethash = nil
 	config.Taiko = true
-	testEngine = taiko.New(config)
+	testEngine = taiko.New(config, rawdb.NewMemoryDatabase())
 
 	taikoL2AddressPrefix := strings.TrimPrefix(config.ChainID.String(), "0")
 
@@ -93,70 +93,73 @@ func init() {
 	}
 }
 
-func newTestBackend(t *testing.T) (*eth.Ethereum, []*types.Block) {
-	// Generate test chain.
-	blocks := generateTestChain()
+func generateTestChain(t *testing.T) ([]*types.Block, *eth.Ethereum) {
+	generate := func(i int, g *core.BlockGen) {
+		g.OffsetTime(5)
+
+		g.SetExtra([]byte("test_taiko"))
+		g.SetDifficulty(common.Big0)
+
+		for i, tx := range txs {
+			if i == 0 {
+				if err := tx.MarkAsAnchor(); err != nil {
+					panic(err)
+				}
+			}
+			g.AddTx(tx)
+		}
+	}
 
 	// Create node
-	n, err := node.New(&node.Config{})
+	n, err := node.New(&node.Config{
+		DataDir: t.TempDir(),
+	})
 	if err != nil {
 		t.Fatalf("can't create new node: %v", err)
 	}
 
 	// Create Ethereum Service
-	config := &ethconfig.Config{
+	ethService, err := eth.New(n, &ethconfig.Config{
 		Genesis: genesis,
-	}
-
-	ethservice, err := eth.New(n, config)
+	})
 	if err != nil {
 		t.Fatalf("can't create new ethereum service: %v", err)
 	}
 
+	db := ethService.ChainDb()
+
+	gblock := genesis.MustCommit(db, triedb.NewDatabase(db, triedb.HashDefaults))
+	blocks, _ := core.GenerateChain(genesis.Config, gblock, testEngine, db, 1, generate)
+	blocks = append([]*types.Block{gblock}, blocks...)
+
+	// Insert L1Origins.
+	for _, block := range blocks {
+		rawdb.WriteL1Origin(db, block.Number(), &rawdb.L1Origin{
+			BlockID:       block.Number(),
+			L1BlockHeight: block.Number(),
+			L1BlockHash:   block.Hash(),
+		})
+	}
+
 	// Import the test chain.
 	if err := n.Start(); err != nil {
 		t.Fatalf("can't start test node: %v", err)
 	}
 
-	if _, err := ethservice.BlockChain().InsertChain(blocks[1:]); err != nil {
+	if _, err := ethService.BlockChain().InsertChain(blocks[1:]); err != nil {
 		t.Fatalf("can't import test blocks: %v", err)
 	}
 
-	if _, ok := ethservice.Engine().(*taiko.Taiko); !ok {
+	if _, ok := ethService.Engine().(*taiko.Taiko); !ok {
 		t.Fatalf("not use taiko engine")
 	}
 
-	return ethservice, blocks
-}
-
-func generateTestChain() []*types.Block {
-	db := rawdb.NewMemoryDatabase()
-	generate := func(i int, g *core.BlockGen) {
-		g.OffsetTime(5)
-
-		g.SetExtra([]byte("test_taiko"))
-		g.SetDifficulty(common.Big0)
-
-		for i, tx := range txs {
-			if i == 0 {
-				if err := tx.MarkAsAnchor(); err != nil {
-					panic(err)
-				}
-			}
-			g.AddTx(tx)
-		}
-	}
-
-	gblock := genesis.MustCommit(db, triedb.NewDatabase(db, triedb.HashDefaults))
-
-	blocks, _ := core.GenerateChain(genesis.Config, gblock, testEngine, db, 1, generate)
-
-	blocks = append([]*types.Block{gblock}, blocks...)
-	return blocks
+	return blocks, ethService
 }
 
 func TestVerifyHeader(t *testing.T) {
-	ethService, blocks := newTestBackend(t)
+	// Generate test chain.
+	blocks, ethService := generateTestChain(t)
 
 	for _, b := range blocks {
 		err := testEngine.VerifyHeader(ethService.BlockChain(), b.Header())

diff --git a/core/blockchain.go b/core/blockchain.go
@@ -2269,7 +2269,12 @@ func (bc *BlockChain) reorg(oldHead *types.Header, newHead *types.Block) error {
 	} else {
 		// len(newChain) == 0 && len(oldChain) > 0
 		// rewind the canonical chain to a lower point.
-		log.Error("Impossible reorg, please file an issue", "oldnum", oldBlock.Number(), "oldhash", oldBlock.Hash(), "oldblocks", len(oldChain), "newnum", newBlock.Number(), "newhash", newBlock.Hash(), "newblocks", len(newChain))
+		// CHANGE(taiko): use debug log level to avoid logging too many logs when frequently soft block rollback.
+		if bc.chainConfig.Taiko {
+			log.Debug("Impossible reorg, please file an issue", "oldnum", oldBlock.Number(), "oldhash", oldBlock.Hash(), "oldblocks", len(oldChain), "newnum", newBlock.Number(), "newhash", newBlock.Hash(), "newblocks", len(newChain))
+		} else {
+			log.Error("Impossible reorg, please file an issue", "oldnum", oldBlock.Number(), "oldhash", oldBlock.Hash(), "oldblocks", len(oldChain), "newnum", newBlock.Number(), "newhash", newBlock.Hash(), "newblocks", len(newChain))
+		}
 	}
 	// Acquire the tx-lookup lock before mutation. This step is essential
 	// as the txlookups should be changed atomically, and all subsequent

diff --git a/core/rawdb/gen_taiko_l1_origin.go b/core/rawdb/gen_taiko_l1_origin.go