Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,9 +14,9 @@ import ( | |
| "time" | ||
| "unicode" | ||
|
|
||
| "github.com/0xPolygon/agglayer/client" | ||
| agglayerTypes "github.com/0xPolygon/agglayer/rpc/types" | ||
|
Check failure on line 18 in aggregator/aggregator.go
|
||
| "github.com/0xPolygon/agglayer/tx" | ||
|
Check failure on line 19 in aggregator/aggregator.go
|
||
| "github.com/0xPolygonHermez/zkevm-node/aggregator/metrics" | ||
| "github.com/0xPolygonHermez/zkevm-node/aggregator/prover" | ||
| "github.com/0xPolygonHermez/zkevm-node/config/types" | ||
|
|
@@ -71,7 +71,7 @@ type Aggregator struct { | |
| exit context.CancelFunc | ||
|
|
||
| sequencerPrivateKey *ecdsa.PrivateKey | ||
| agglayerClient client.ClientInterface | ||
| } | ||
|
|
||
| // New creates a new aggregator. | ||
|
|
@@ -80,7 +80,7 @@ func New( | |
| stateInterface stateInterface, | ||
| ethTxManager ethTxManager, | ||
| etherman etherman, | ||
| agglayerClient client.ClientInterface, | ||
| sequencerPrivateKey *ecdsa.PrivateKey, | ||
| ) (Aggregator, error) { | ||
| var profitabilityChecker aggregatorTxProfitabilityChecker | ||
|
|
@@ -91,7 +91,7 @@ func New( | |
| profitabilityChecker = NewTxProfitabilityCheckerAcceptAll(stateInterface, cfg.IntervalAfterWhichBatchConsolidateAnyway.Duration) | ||
| } | ||
|
|
||
| if cfg.SettlementBackend == agglayer { | ||
| if sequencerPrivateKey == nil { | ||
| return Aggregator{}, fmt.Errorf("the private key of the sequencer needs to be provided") | ||
| } | ||
|
|
@@ -120,7 +120,7 @@ func New( | |
| TimeCleanupLockedProofs: cfg.CleanupLockedProofsInterval, | ||
|
|
||
| finalProof: make(chan finalProofMsg), | ||
| agglayerClient: agglayerClient, | ||
| sequencerPrivateKey: sequencerPrivateKey, | ||
| } | ||
|
|
||
|
|
@@ -302,8 +302,8 @@ func (a *Aggregator) sendFinalProof() { | |
| if success := a.settleProofToL1(ctx, proof, inputs); !success { | ||
| continue | ||
| } | ||
| case agglayer: | ||
| if success := a.settleProofToagglayer(ctx, proof, inputs); !success { | ||
| continue | ||
| } | ||
| default: | ||
|
|
@@ -1144,47 +1144,47 @@ func (a *Aggregator) settleProofToL1(ctx context.Context, proof *state.Proof, in | |
| return true | ||
| } | ||
|
|
||
| func (a *Aggregator) settleProofToagglayer(ctx context.Context, proof *state.Proof, inputs ethmanTypes.FinalProofInputs) (success bool) { | ||
| l1Contract := a.Ethman.GetL1ContractAddress() | ||
| proofStrNo0x := strings.TrimPrefix(inputs.FinalProof.Proof, "0x") | ||
| proofBytes := common.Hex2Bytes(proofStrNo0x) | ||
| tx := tx.Tx{ | ||
| L1Contract: l1Contract, | ||
| LastVerifiedBatch: agglayerTypes.ArgUint64(proof.BatchNumber - 1), | ||
| NewVerifiedBatch: agglayerTypes.ArgUint64(proof.BatchNumberFinal), | ||
| ZKP: tx.ZKP{ | ||
| NewStateRoot: common.BytesToHash(inputs.NewStateRoot), | ||
| NewLocalExitRoot: common.BytesToHash(inputs.NewLocalExitRoot), | ||
| Proof: agglayerTypes.ArgBytes(proofBytes), | ||
| }, | ||
| } | ||
| signedTx, err := tx.Sign(a.sequencerPrivateKey) | ||
| if err != nil { | ||
| log.Errorf("failed to sign tx: %v", err) | ||
| a.handleFailureToSendToagglayer(ctx, proof) | ||
| return false | ||
| } | ||
| log.Debug("final proof signedTx: ", signedTx.Tx.ZKP.Proof.Hex()) | ||
| txHash, err := a.agglayerClient.SendTx(*signedTx) | ||
| if err != nil { | ||
| log.Errorf("failed to send tx to the interop: %v", err) | ||
| a.handleFailureToSendToagglayer(ctx, proof) | ||
| return false | ||
| } | ||
| log.Infof("tx %s sent to agglayer, waiting to be mined", txHash.Hex()) | ||
| log.Debugf("Timeout set to %f seconds", a.cfg.agglayerTxTimeout.Duration.Seconds()) | ||
| waitCtx, cancelFunc := context.WithDeadline(ctx, time.Now().Add(a.cfg.agglayerTxTimeout.Duration)) | ||
| defer cancelFunc() | ||
| if err := a.agglayerClient.WaitTxToBeMined(txHash, waitCtx); err != nil { | ||
| log.Errorf("interop didn't mine the tx: %v", err) | ||
| a.handleFailureToSendToagglayer(ctx, proof) | ||
| return false | ||
| } | ||
| // TODO: wait for synchronizer to catch up | ||
| return true | ||
| } | ||
|
|
||
| func (a *Aggregator) handleFailureToSendToagglayer(ctx context.Context, proof *state.Proof) { | ||
| log := log.WithFields("proofId", proof.ProofID, "batches", fmt.Sprintf("%d-%d", proof.BatchNumber, proof.BatchNumberFinal)) | ||
| proof.GeneratingSince = nil | ||
| err := a.State.UpdateGeneratedProof(ctx, proof, nil) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ import ( | |
| "runtime" | ||
| "time" | ||
|
|
||
| agglayerClient "github.com/0xPolygon/agglayer/client" | ||
|
Check failure on line 16 in cmd/run.go
|
||
| dataCommitteeClient "github.com/0xPolygon/cdk-data-availability/client" | ||
| datastreamerlog "github.com/0xPolygonHermez/zkevm-data-streamer/log" | ||
| "github.com/0xPolygonHermez/zkevm-node" | ||
|
|
@@ -432,11 +432,11 @@ func createSequenceSender(cfg config.Config, pool *pool.Pool, etmStorage *ethtxm | |
| } | ||
|
|
||
| func runAggregator(ctx context.Context, c aggregator.Config, etherman *etherman.Client, ethTxManager *ethtxmanager.Client, st *state.State) { | ||
| var beethCli *agglayerClient.Client | ||
| var sequencerPrivateKey *ecdsa.PrivateKey | ||
| if c.SettlementBackend == aggregator.agglayer { | ||
| var err error | ||
| beethCli = agglayerClient.New(c.agglayerURL) | ||
| _, sequencerPrivateKey, err = etherman.LoadAuthFromKeyStore( | ||
| c.SequencerPrivateKey.Path, c.SequencerPrivateKey.Password, | ||
| ) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.