Merge branch 'main' into eip4844

Author: davidtaikocha

cmd/flags/proposer.go

@@ -126,6 +126,10 @@ var (
 		Name:     "blobAllowed",
 		Usage:    "Send blob tx when propose block",
 		Value:    false,
+	L1BlockBuilderTip = &cli.Uint64Flag{
+		Name:     "l1BlockBuilderTip",
+		Usage:    "Amount you wish to tip the L1 block builder",
+		Value:    0,
 		Category: proposerCategory,
 	}
 )
@@ -154,4 +158,5 @@ var ProposerFlags = MergeFlags(CommonFlags, []cli.Flag{
 	ProposeBlockIncludeParentMetaHash,
 	ProposerAssignmentHookAddress,
 	BlobAllowed,
+	L1BlockBuilderTip,
 })

driver/chain_syncer/calldata/syncer_test.go

@@ -68,6 +68,7 @@ func (s *CalldataSyncerTestSuite) SetupTest() {
 		SgxAndPseZkevmTierFee:      common.Big256,
 		MaxTierFeePriceBumps:       3,
 		TierFeePriceBump:           common.Big2,
+		L1BlockBuilderTip:          common.Big0,
 	}))
 
 	s.p = prop

driver/chain_syncer/chain_syncer_test.go

@@ -70,6 +70,7 @@ func (s *ChainSyncerTestSuite) SetupTest() {
 		MaxTierFeePriceBumps:       3,
 		TierFeePriceBump:           common.Big2,
 		ExtraData:                  "test",
+		L1BlockBuilderTip:          common.Big0,
 	}))
 
 	s.p = prop

driver/driver_test.go

@@ -75,6 +75,7 @@ func (s *DriverTestSuite) SetupTest() {
 		SgxAndPseZkevmTierFee:      common.Big256,
 		MaxTierFeePriceBumps:       3,
 		TierFeePriceBump:           common.Big2,
+		L1BlockBuilderTip:          common.Big0,
 	}))
 	s.p = p
 }

proposer/config.go

@@ -40,6 +40,7 @@ type Config struct {
 	MaxTierFeePriceBumps                uint64
 	IncludeParentMetaHash               bool
 	BlobAllowed                         bool
+	L1BlockBuilderTip                   *big.Int
 }
 
 // NewConfigFromCliContext initializes a Config instance from
@@ -128,5 +129,6 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) {
 		MaxTierFeePriceBumps:                c.Uint64(flags.MaxTierFeePriceBumps.Name),
 		IncludeParentMetaHash:               c.Bool(flags.ProposeBlockIncludeParentMetaHash.Name),
 		BlobAllowed:                         c.Bool(flags.BlobAllowed.Name),
+		L1BlockBuilderTip:                   new(big.Int).SetUint64(c.Uint64(flags.L1BlockBuilderTip.Name)),
 	}, nil
 }

proposer/proposer.go

@@ -463,7 +463,7 @@ func (p *Proposer) sendProposeBlockTx(
 	// TODO: flag for additional hook addresses and data.
 	hookInputData, err := encoding.EncodeAssignmentHookInput(&encoding.AssignmentHookInput{
 		Assignment: assignment,
-		Tip:        common.Big0, // TODO: flag for tip
+		Tip:        p.L1BlockBuilderTip,
 	})
 	if err != nil {
 		return nil, err

proposer/proposer_test.go

@@ -58,6 +58,7 @@ func (s *ProposerTestSuite) SetupTest() {
 		MaxTierFeePriceBumps:                3,
 		ExtraData:                           "test",
 		BlobAllowed:                         true,
+		L1BlockBuilderTip:                   common.Big0,
 	}))
 
 	s.p = p

prover/proof_submitter/proof_submitter_test.go

@@ -110,6 +110,7 @@ func (s *ProofSubmitterTestSuite) SetupTest() {
 		SgxAndPseZkevmTierFee:      common.Big256,
 		MaxTierFeePriceBumps:       3,
 		TierFeePriceBump:           common.Big2,
+		L1BlockBuilderTip:          common.Big0,
 	}))
 
 	s.proposer = prop

prover/prover_test.go

@@ -92,6 +92,7 @@ func (s *ProverTestSuite) SetupTest() {
 		SgxAndPseZkevmTierFee:      common.Big256,
 		MaxTierFeePriceBumps:       3,
 		TierFeePriceBump:           common.Big2,
+		L1BlockBuilderTip:          common.Big0,
 	}))
 
 	s.proposer = prop