Skip to content
This repository has been archived by the owner on Feb 17, 2025. It is now read-only.

Cherry-pick #3642: Fix use l2coinbase configured in sequencesender.L2Coinbase parameter #3694

Closed
wants to merge 2 commits into from
Closed

Cherry-pick #3642: Fix use l2coinbase configured in sequencesender.L2Coinbase parameter #3694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3739d7e
fix use l2coinbase configured in sequencesender.L2Coinbase parameter
agnusmor May 22, 2024
a122c5b
Merge branch 'develop' into develop-cherry-pick-3642
agnusmor Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"github.com/0xPolygonHermez/zkevm-node/metrics"
"github.com/0xPolygonHermez/zkevm-node/pool"
"github.com/0xPolygonHermez/zkevm-node/pool/pgpoolstorage"
"github.com/0xPolygonHermez/zkevm-node/sequencer"

Check failure on line 33 in cmd/run.go

View workflow job for this annotation

GitHub Actions / lint 

could not import github.com/0xPolygonHermez/zkevm-node/sequencer (-: # github.com/0xPolygonHermez/zkevm-node/sequencer
"github.com/0xPolygonHermez/zkevm-node/sequencesender"
"github.com/0xPolygonHermez/zkevm-node/state"
"github.com/0xPolygonHermez/zkevm-node/state/pgstatestorage"
Expand Down Expand Up @@ -416,6 +416,8 @@
}

func createSequencer(cfg config.Config, pool *pool.Pool, st *state.State, etherman *etherman.Client, eventLog *event.EventLog) *sequencer.Sequencer {
cfg.Sequencer.L2Coinbase = cfg.SequenceSender.L2Coinbase

seq, err := sequencer.New(cfg.Sequencer, cfg.State.Batch, cfg.Pool, pool, st, etherman, eventLog)
if err != nil {
log.Fatal(err)
Expand Down
2 changes: 1 addition & 1 deletion docs/config-file/node-config-doc.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</pre></div> </div><div id=Sequencer_LoadPoolTxsCheckInterval_ex2 class="jumbotron examples"><div class=highlight><pre><span></span><span class=s2>&quot;300ms&quot;</span>
</pre></div> </div> <hr> <div class=breadcrumbs> <!-- None --><!-- None --><a href=#Sequencer.StateConsistencyCheckInterval onclick="anchorLink('Sequencer.StateConsistencyCheckInterval')">Sequencer.StateConsistencyCheckInterval=</a> </div> <span class="badge badge-success default-value">Default: "5s"</span><span class="badge badge-dark value-type">Type: string</span><br> <span class=description><p>StateConsistencyCheckInterval is the time the sequencer waits to check if a state inconsistency has happened</p> </span> <br> <div class="badge badge-secondary">Examples:</div> <br><div id=Sequencer_StateConsistencyCheckInterval_ex1 class="jumbotron examples"><div class=highlight><pre><span></span><span class=s2>&quot;1m&quot;</span>
</pre></div> </div><div id=Sequencer_StateConsistencyCheckInterval_ex2 class="jumbotron examples"><div class=highlight><pre><span></span><span class=s2>&quot;300ms&quot;</span>
</pre></div> </div> <hr> <div class=accordion id=accordionSequencer_Finalizer> <div class=card> <div class=card-header id=headingSequencer_Finalizer> <h2 class=mb-0> <button class="btn btn-link property-name-button" type=button data-toggle=collapse data-target=#Sequencer_Finalizer aria-expanded aria-controls=Sequencer_Finalizer onclick="setAnchor('#Sequencer_Finalizer')"><span class=property-name> <div class=breadcrumbs>[<a href=#Sequencer onclick="anchorLink('Sequencer')">Sequencer</a> . <a href=#Sequencer_Finalizer onclick="anchorLink('Sequencer_Finalizer')">Finalizer</a>] </div></span></button> </h2> Finalizer&#39;s specific config properties </div> <div id=Sequencer_Finalizer class="collapse property-definition-div" aria-labelledby=headingSequencer_Finalizer data-parent=#accordionSequencer_Finalizer> <div class="card-body pl-5"> <div class=breadcrumbs> <!-- None --><!-- None --><!-- None --><a href=#Sequencer.Finalizer.ForcedBatchesTimeout onclick="anchorLink('Sequencer.Finalizer.ForcedBatchesTimeout')">Sequencer.Finalizer.ForcedBatchesTimeout=</a> </div> <span class="badge badge-success default-value">Default: "1m0s"</span><span class="badge badge-dark value-type">Type: string</span><br> <span class=description><p>ForcedBatchesTimeout is the time the finalizer waits after receiving closing signal to process Forced Batches</p> </span> <br> <div class="badge badge-secondary">Examples:</div> <br><div id=Sequencer_Finalizer_ForcedBatchesTimeout_ex1 class="jumbotron examples"><div class=highlight><pre><span></span><span class=s2>&quot;1m&quot;</span>
</pre></div> </div> <hr> <div class=breadcrumbs> <!-- None --><!-- None --><a href=#Sequencer.L2Coinbase onclick="anchorLink('Sequencer.L2Coinbase')">Sequencer.L2Coinbase=</a> </div><span class="badge badge-dark value-type">Type: array of integer</span><br> <span class=description><p>L2Coinbase defines which address is going to receive the fees. It gets the config value from SequenceSender.L2Coinbase</p> </span> <p><span class="badge badge-light restriction min-items-restriction" id=Sequencer_L2Coinbase_minItems>Must contain a minimum of <code>20</code> items</span></p><p><span class="badge badge-light restriction max-items-restriction" id=Sequencer_L2Coinbase_maxItems>Must contain a maximum of <code>20</code> items</span></p><h4>Each item of this array must be:</h4> <div class=card> <div class="card-body items-definition" id=Sequencer_L2Coinbase_items> <div class=breadcrumbs> <!-- None --><!-- None --><!-- None --><a href="#Sequencer.L2Coinbase.L2Coinbase items" onclick="anchorLink('Sequencer.L2Coinbase.L2Coinbase items')">Sequencer.L2Coinbase.L2Coinbase items=</a> </div><span class="badge badge-dark value-type">Type: integer</span><br> </div> </div> <hr> <div class=accordion id=accordionSequencer_Finalizer> <div class=card> <div class=card-header id=headingSequencer_Finalizer> <h2 class=mb-0> <button class="btn btn-link property-name-button" type=button data-toggle=collapse data-target=#Sequencer_Finalizer aria-expanded aria-controls=Sequencer_Finalizer onclick="setAnchor('#Sequencer_Finalizer')"><span class=property-name> <div class=breadcrumbs>[<a href=#Sequencer onclick="anchorLink('Sequencer')">Sequencer</a> . <a href=#Sequencer_Finalizer onclick="anchorLink('Sequencer_Finalizer')">Finalizer</a>] </div></span></button> </h2> Finalizer&#39;s specific config properties </div> <div id=Sequencer_Finalizer class="collapse property-definition-div" aria-labelledby=headingSequencer_Finalizer data-parent=#accordionSequencer_Finalizer> <div class="card-body pl-5"> <div class=breadcrumbs> <!-- None --><!-- None --><!-- None --><a href=#Sequencer.Finalizer.ForcedBatchesTimeout onclick="anchorLink('Sequencer.Finalizer.ForcedBatchesTimeout')">Sequencer.Finalizer.ForcedBatchesTimeout=</a> </div> <span class="badge badge-success default-value">Default: "1m0s"</span><span class="badge badge-dark value-type">Type: string</span><br> <span class=description><p>ForcedBatchesTimeout is the time the finalizer waits after receiving closing signal to process Forced Batches</p> </span> <br> <div class="badge badge-secondary">Examples:</div> <br><div id=Sequencer_Finalizer_ForcedBatchesTimeout_ex1 class="jumbotron examples"><div class=highlight><pre><span></span><span class=s2>&quot;1m&quot;</span>
</pre></div> </div><div id=Sequencer_Finalizer_ForcedBatchesTimeout_ex2 class="jumbotron examples"><div class=highlight><pre><span></span><span class=s2>&quot;300ms&quot;</span>
</pre></div> </div> <hr> <div class=breadcrumbs> <!-- None --><!-- None --><!-- None --><a href=#Sequencer.Finalizer.NewTxsWaitInterval onclick="anchorLink('Sequencer.Finalizer.NewTxsWaitInterval')">Sequencer.Finalizer.NewTxsWaitInterval=</a> </div> <span class="badge badge-success default-value">Default: "100ms"</span><span class="badge badge-dark value-type">Type: string</span><br> <span class=description><p>NewTxsWaitInterval is the time the finalizer sleeps between each iteration, if there are no transactions to be processed</p> </span> <br> <div class="badge badge-secondary">Examples:</div> <br><div id=Sequencer_Finalizer_NewTxsWaitInterval_ex1 class="jumbotron examples"><div class=highlight><pre><span></span><span class=s2>&quot;1m&quot;</span>
</pre></div> </div><div id=Sequencer_Finalizer_NewTxsWaitInterval_ex2 class="jumbotron examples"><div class=highlight><pre><span></span><span class=s2>&quot;300ms&quot;</span>
Expand Down
Loading
Loading