From 6acc22ab9987ca4d2d70ade589e23ae468b04a70 Mon Sep 17 00:00:00 2001 From: RogerLamTd Date: Tue, 30 Jan 2024 16:32:34 -0800 Subject: [PATCH 1/3] add flag for adding tip to assignmenthook --- cmd/flags/proposer.go | 7 +++++++ proposer/config.go | 7 +++++++ proposer/proposer.go | 2 +- proposer/proposer_test.go | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/cmd/flags/proposer.go b/cmd/flags/proposer.go index d6e75f66e..63cd09524 100644 --- a/cmd/flags/proposer.go +++ b/cmd/flags/proposer.go @@ -122,6 +122,12 @@ var ( Value: false, Category: proposerCategory, } + L1BlockBuilderTip = &cli.Uint64Flag{ + Name: "l1BlockBuilderTip", + Usage: "Amount you wish to tip the L1 block builder", + Value: 0, + Category: proposerCategory, + } ) // ProposerFlags All proposer flags. @@ -147,4 +153,5 @@ var ProposerFlags = MergeFlags(CommonFlags, []cli.Flag{ MaxTierFeePriceBumps, ProposeBlockIncludeParentMetaHash, ProposerAssignmentHookAddress, + L1BlockBuilderTip, }) diff --git a/proposer/config.go b/proposer/config.go index 4a6834c26..f5a1eb6cc 100644 --- a/proposer/config.go +++ b/proposer/config.go @@ -39,6 +39,7 @@ type Config struct { TierFeePriceBump *big.Int MaxTierFeePriceBumps uint64 IncludeParentMetaHash bool + L1BlockBuilderTip *big.Int } // NewConfigFromCliContext initializes a Config instance from @@ -87,6 +88,11 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) { proposeBlockTxGasTipCap = new(big.Int).SetUint64(c.Uint64(flags.ProposeBlockTxGasTipCap.Name)) } + // var l1BlockBuilderTip *big.Int + // if c.IsSet(flags.L1BlockBuilderTip.Name) { + // l1BlockBuilderTip = new(big.Int).SetUint64(c.Uint64(flags.L1BlockBuilderTip.Name)) + // } + var proverEndpoints []*url.URL for _, e := range strings.Split(c.String(flags.ProverEndpoints.Name), ",") { endpoint, err := url.Parse(e) @@ -126,5 +132,6 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) { TierFeePriceBump: new(big.Int).SetUint64(c.Uint64(flags.TierFeePriceBump.Name)), MaxTierFeePriceBumps: c.Uint64(flags.MaxTierFeePriceBumps.Name), IncludeParentMetaHash: c.Bool(flags.ProposeBlockIncludeParentMetaHash.Name), + L1BlockBuilderTip: new(big.Int).SetUint64(c.Uint64(flags.L1BlockBuilderTip.Name)), }, nil } diff --git a/proposer/proposer.go b/proposer/proposer.go index 6255a9edb..702e62cf6 100644 --- a/proposer/proposer.go +++ b/proposer/proposer.go @@ -360,7 +360,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 diff --git a/proposer/proposer_test.go b/proposer/proposer_test.go index 2bbf8af9e..b810e3861 100644 --- a/proposer/proposer_test.go +++ b/proposer/proposer_test.go @@ -57,6 +57,7 @@ func (s *ProposerTestSuite) SetupTest() { TierFeePriceBump: common.Big2, MaxTierFeePriceBumps: 3, ExtraData: "test", + L1BlockBuilderTip: common.Big0, })) s.p = p From a746891e327ea110dcf770813e9e372f7f4ef4b0 Mon Sep 17 00:00:00 2001 From: RogerLamTd Date: Wed, 31 Jan 2024 11:54:07 -0800 Subject: [PATCH 2/3] fix tests --- driver/chain_syncer/calldata/syncer_test.go | 1 + driver/chain_syncer/chain_syncer_test.go | 1 + driver/driver_test.go | 1 + prover/proof_submitter/proof_submitter_test.go | 1 + prover/prover_test.go | 1 + 5 files changed, 5 insertions(+) diff --git a/driver/chain_syncer/calldata/syncer_test.go b/driver/chain_syncer/calldata/syncer_test.go index 941537b47..0073e7dd2 100644 --- a/driver/chain_syncer/calldata/syncer_test.go +++ b/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 diff --git a/driver/chain_syncer/chain_syncer_test.go b/driver/chain_syncer/chain_syncer_test.go index 196803813..55e261b22 100644 --- a/driver/chain_syncer/chain_syncer_test.go +++ b/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 diff --git a/driver/driver_test.go b/driver/driver_test.go index ae63953ef..8c5362049 100644 --- a/driver/driver_test.go +++ b/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 } diff --git a/prover/proof_submitter/proof_submitter_test.go b/prover/proof_submitter/proof_submitter_test.go index e33807be0..30885fb6c 100644 --- a/prover/proof_submitter/proof_submitter_test.go +++ b/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 diff --git a/prover/prover_test.go b/prover/prover_test.go index ea0abae50..823693a2a 100644 --- a/prover/prover_test.go +++ b/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 From c8e242417c9c98d11485d508056b08a7442b500e Mon Sep 17 00:00:00 2001 From: Roger <50648015+RogerLamTd@users.noreply.github.com> Date: Wed, 31 Jan 2024 23:52:34 -0800 Subject: [PATCH 3/3] Update proposer/config.go --- proposer/config.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/proposer/config.go b/proposer/config.go index f5a1eb6cc..4010f1552 100644 --- a/proposer/config.go +++ b/proposer/config.go @@ -88,11 +88,6 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) { proposeBlockTxGasTipCap = new(big.Int).SetUint64(c.Uint64(flags.ProposeBlockTxGasTipCap.Name)) } - // var l1BlockBuilderTip *big.Int - // if c.IsSet(flags.L1BlockBuilderTip.Name) { - // l1BlockBuilderTip = new(big.Int).SetUint64(c.Uint64(flags.L1BlockBuilderTip.Name)) - // } - var proverEndpoints []*url.URL for _, e := range strings.Split(c.String(flags.ProverEndpoints.Name), ",") { endpoint, err := url.Parse(e)