fix forced batch query #1630
Merged
fix forced batch query #1630
Conversation
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
ToniRamirezM
added a commit
that referenced
this pull request
Feb 15, 2023
* WIP * wip: adding some implementation of the finalizer, defining needed interfaces by the finalizer from the dbmanager, and implementing the remaining resourses Sub. Signed-off-by: Nikolay Nedkov <[email protected]> * wip:2 Signed-off-by: Nikolay Nedkov <[email protected]> * fix: fixing comment Signed-off-by: Nikolay Nedkov <[email protected]> * wip: #4 Signed-off-by: Nikolay Nedkov <[email protected]> * fix: fixing bootstrap method in sequencer Signed-off-by: Nikolay Nedkov <[email protected]> * fix: fixing log in finalizer.reopenBatch Signed-off-by: Nikolay Nedkov <[email protected]> * DBManager WIP (#1512) * WIP * WIP * WIP * wip: adding implementation for .isCurrBatchAboveLimitWindow', and doing small refactor. Signed-off-by: Nikolay Nedkov <[email protected]> * fix: fixing handling of deadlines and events Signed-off-by: Nikolay Nedkov <[email protected]> * WIP: fixing logic. Signed-off-by: Nikolay Nedkov <[email protected]> * WIP: fixing logic. Signed-off-by: Nikolay Nedkov <[email protected]> * Synchronizer stores the accumulated input hash (#1535) * Initial worker implementation (still WIP) * merge Signed-off-by: Nikolay Nedkov <[email protected]> * Wip: merge Signed-off-by: Nikolay Nedkov <[email protected]> * merge Signed-off-by: Nikolay Nedkov <[email protected]> * Feature/dbmanager (#1524) * wip: adding implementation for .isCurrBatchAboveLimitWindow', and doing small refactor. Signed-off-by: Nikolay Nedkov <[email protected]> * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * ForceBatch unit test * SequenceForceBatch unit test * Fix forcedBatch check * linter * Fix reset forcedBatch * batch and forcedbatch table modified * fix * WIP * Finish dbmanager * Branches Integration Signed-off-by: Nikolay Nedkov <[email protected]> Co-authored-by: Nikolay Nedkov <[email protected]> Co-authored-by: Alonso <[email protected]> * implement last methods (#1542) * added getLastStateRoot (#1543) * fix,tests: fixing some methods and adding unit tests. Signed-off-by: Nikolay Nedkov <[email protected]> * Closing Signals Manager first implementation (#1550) * Closing Signals Manager first implementation * Closing Signals Manager first implementation * Closing Signals Manager first implementation * refactor * Added worker unit testing. Missing TODOs implementation done * Cahnge getLastGer implementation (#1556) * wip fixes Signed-off-by: Nikolay Nedkov <[email protected]> * wip fixes Signed-off-by: Nikolay Nedkov <[email protected]> * wip fixes Signed-off-by: Nikolay Nedkov <[email protected]> * fixed addrqueue.addTx returning wrong (newReadyTx, prevReadyTx) when the added tx was a notReadyTxs * Fix encoding bug in AddForcedBatch (#1544) The forced_batch table expects the raw_txs_data column to be a string (specifically a hex encoding of the raw transaction bytes). The corresponding GetForcedBatch function uses hex.DecodeString to turn the value of this column back into raw bytes. However, AddForcedBatch is missing a hex.EncodeToString, so it is actually interpreting the raw transaction bytes as an ASCII representation of a hex-encoded string. * Feature/executor error (#1566) * Handle executor and rom erros from executor * convert touched addresses * add debug logs * add debug logs * store request in case of executor error * store request in case of executor error * minor fixes * WIP * convert readwriteaddresses to map * add test * add method to mark wip txs as pending Co-authored-by: ToniRamirezM <[email protected]> * fix: wip fix of prepareProcessRequestFromState to fetch txs when reprocess is done. Signed-off-by: Nikolay Nedkov <[email protected]> * test (#1569) * fix: fixing benchmark test and several bugs. Signed-off-by: Nikolay Nedkov <[email protected]> * Fix linter and tests (#1576) * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * fix linter * remove testMain (#1585) * Fix errors found while running bridge/GER tests * update mock files * Add forced batch closing signal unit test (#1593) * add forced batch closing signal unit test * add forced batch closing signal unit test * add forced batch closing signal unit test * add forced batch closing signal unit test * test: adding sequencer benchmark test with ERC20 transfers. Signed-off-by: Nikolay Nedkov <[email protected]> * adding erc-20 benchmark test, adding metrics for wokerker processing time and fixing unit tests of finalizer Signed-off-by: Nikolay Nedkov <[email protected]> * adding missing mutex lock in woker.MoveTxToNotReady Signed-off-by: Nikolay Nedkov <[email protected]> * fix: fixing benchmark result print messages. Signed-off-by: Nikolay Nedkov <[email protected]> * [New Sequencer] Merge develop into new sequencer branch (#1602) * Backport v0.0.1-RC4 & RC5 to develop (#1483) * update poe sc to security mechanisms version (#1467) * update poe sc to security mechanisms version * updated names, fix tests and remove ger timestamp and other fixes * fix rlp tool * fix linter * new genesis + fix * new smc * Update executor errors * Update executor errors * Update executor errors * Update executor errors * new l2 contract names * sequencewr unit test commented * fix test Co-authored-by: Alonso <[email protected]> Co-authored-by: ToniRamirezM <[email protected]> * Fix/1472 verify batches timeout (#1473) Closes #1472 ### What does this PR do? During testing we faced an issue of two consecutive verified batches on L1 without respecting the time spacing. The problem was that we were relying on the timer to check if we can start generating a new final proof. That timer is only reset after the final proof is sent to L1. This means that there's a time window between the generation of a final proof and its verification in which a new proof eligible to be final can be generated and immediately trigger another final proof generation. The fix introduced here is to have a `verifyingProof` flag that gets checked when the final proof generation process begins and released only when the verification phase ends (or in case of errors). Co-authored-by: Thiago Coimbra Lemos <[email protected]> Co-authored-by: Alonso <[email protected]> Co-authored-by: ToniRamirezM <[email protected]> * fix unpack the revert reason (#1475) Co-authored-by: tclemos <[email protected]> * fix: update the genesis file (#1489) * update the genesis * revert bytecode * upgrade git hub actions to the latest versions (#1471) * build(deps): bump github.com/go-git/go-billy/v5 from 5.3.1 to 5.4.0 (#1492) Bumps [github.com/go-git/go-billy/v5](https://github.com/go-git/go-billy) from 5.3.1 to 5.4.0. - [Release notes](https://github.com/go-git/go-billy/releases) - [Commits](go-git/go-billy@v5.3.1...v5.4.0) --- updated-dependencies: - dependency-name: github.com/go-git/go-billy/v5 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fatals changed to return error (#1494) * fatals changed to return error * comments * [Aggregator] Add metrics package and ConnectedProvers metric (#1502) * feat: add metrics pkg and connected provers metric This commit adds the `metrics` subpackage in the `aggregator` package. It also adds the connected provers gauge metric to keep track of the number of currently connected provers. Signed-off-by: Paolo Grisoli <[email protected]> * chore: expose aggregator metrics port This commit exposes the aggregator metrics port in `test/docker-compose.yml`. Signed-off-by: Paolo Grisoli <[email protected]> * feat: add WorkingProvers gauge metric (#1504) Closes #1503 ### What does this PR do? This PR adds the `aggregator_current_working_provers` gauge metric to keep track of the number of Provers that are busy generating a proof at any point in time. * build(deps): bump google.golang.org/grpc from 1.51.0 to 1.52.0 (#1525) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.51.0 to 1.52.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.51.0...v1.52.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump github.com/gorilla/websocket from 1.4.2 to 1.5.0 (#1510) Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.4.2 to 1.5.0. - [Release notes](https://github.com/gorilla/websocket/releases) - [Commits](gorilla/websocket@v1.4.2...v1.5.0) --- updated-dependencies: - dependency-name: github.com/gorilla/websocket dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump github.com/prometheus/common from 0.37.0 to 0.39.0 (#1511) Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.37.0 to 0.39.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](prometheus/common@v0.37.0...v0.39.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Feature/#1506 forced batch (#1523) * ForceBatch unit test * SequenceForceBatch unit test * Fix forcedBatch check * linter * Fix reset forcedBatch * batch and forcedbatch table modified * fix * Handle and log ROM OOC errors in executor (#1528) * Handle and log ROM OOC errors in executor * Fix IP * linter * improve test * solve conflicts * Feature/#1515 migration (#1531) * rpc and broadcast without migrations * mock * linter * fix unit test * migration flag for synchronizer and checkMigrations * run/stop aggregator command * discard invalid txs in the pool when checking for an underpriced tx (#1563) * allow array config params to be set via env vars (#1553) * new eth tx manager (#1484) * Fix: typos (#1567) * Fix: typo Fix: typo * Fix: typo Fix: typo * Fix: typo Fix: typo * Fix: typo Fix: typo * Fix: typo Fix: typo * Fix: typo Fix: typo * Fix: typo Fix: typo * Merge release/v0.0.1 into develop (#1561) Merge release/v0.0.1 changes into develop. The original release/v0.0.1 branch has been left intact to be able to perform hotfixes in case. * build(deps): bump github.com/spf13/viper from 1.14.0 to 1.15.0 (#1568) Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.14.0 to 1.15.0. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](spf13/viper@v1.14.0...v1.15.0) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump github.com/urfave/cli/v2 from 2.23.7 to 2.24.1 (#1573) Bumps [github.com/urfave/cli/v2](https://github.com/urfave/cli) from 2.23.7 to 2.24.1. - [Release notes](https://github.com/urfave/cli/releases) - [Changelog](https://github.com/urfave/cli/blob/main/docs/CHANGELOG.md) - [Commits](urfave/cli@v2.23.7...v2.24.1) --- updated-dependencies: - dependency-name: github.com/urfave/cli/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Gas limit 150K + tests (#1551) * Gas limit 150K + tests * FreeClaimGasLimit as a config param * linter * fix config test * Gas limit 150K + tests (#1551) * Gas limit 150K + tests * FreeClaimGasLimit as a config param * linter * fix config test * Db flag to identify trusted verified batches (#1575) * Db flag to identify trusted verified batches * log * Feature/#1549 genesis txs (#1574) * genesis txs * linter * command removed * fixes * Feature/#1486 l2gasprice (#1548) * gasPricer as a component with the follower follower sets the l2gasprice depending on the l1 gas price * make command * Unit test + mocks * linter * fix * suggestions * suggestions * log message * suggesto to suggester + fix merge * file name fixed * jRPC - Batch methods and custom endpoint docs (#1554) * build(deps): bump google.golang.org/grpc from 1.52.0 to 1.52.3 (#1588) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.52.0 to 1.52.3. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.52.0...v1.52.3) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * New smc version (#1581) * New smc version * linter * fix * linter * genesis + network update * l2 claim gas limit * new aggregator wallet * config * add support to pre-EIP155 txs (#1582) * add support to pre-EIP155 txs * =) * naming things * add pre-EIP-155 tx e2e test * fix merge with develop * add check for the vitualized batch when testing pre-EIP155 tx * remove dependency of iden3 package from jrpc (#1596) * Merge * Feature/#1577 force (#1599) * forcedBatch Script * Sequence forcedBatch * linter * linter * linter * migrations * config * state.exit_root * state.exit_root * state.exit_root * state.exit_root * state.exit_root * state.exit_root * merge state migrations * merge state migrations * remerge with develop * Comment TestPreEIP155Tx * remove not used test --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Paolo Grisoli <[email protected]> Co-authored-by: Paolo Grisoli <[email protected]> Co-authored-by: Thiago Coimbra Lemos <[email protected]> Co-authored-by: Alonso <[email protected]> Co-authored-by: cool-developer <[email protected]> Co-authored-by: tclemos <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alonso Rodriguez <[email protected]> Co-authored-by: omahs <[email protected]> * adding missing mutex lock in woker.MoveTxToNotReady Signed-off-by: Nikolay Nedkov <[email protected]> * fix: fixing benchmark result print messages. Signed-off-by: Nikolay Nedkov <[email protected]> * adding missing part for processing forced batches, new http port exposing profiling endpoints when enabled, fixing lastGER hash used on opening new batch, and adding context to 'finalizer.processTransation' logs. * fixing lint error Signed-off-by: Nikolay Nedkov <[email protected]> * adding missing port exposing for profilintin test/docker-compose.yml Signed-off-by: Nikolay Nedkov <[email protected]> * adding prints for fetching methods in benchmark/.../metrics.go Signed-off-by: Nikolay Nedkov <[email protected]> * Fix closing signals (#1623) * adding wip fixes and the closing signal emit from the sequencesender (#1625) Signed-off-by: Nikolay Nedkov <[email protected]> * fix forced batch query (#1630) * L1Timeout (#1635) * L1Timeout * L1Timeout * L1Timeout * fix config files * wip * fix config files * fix config files * fix test * fix test * wip: fixing forced batches. Signed-off-by: Nikolay Nedkov <[email protected]> * decode txs * wip Signed-off-by: Nikolay Nedkov <[email protected]> * wip #2 Signed-off-by: Nikolay Nedkov <[email protected]> * wip #3 Signed-off-by: Nikolay Nedkov <[email protected]> * wip fixes and improvements Signed-off-by: Nikolay Nedkov <[email protected]> * wip making print of reprocess state root difference to not be Fatal. Signed-off-by: Nikolay Nedkov <[email protected]> * wip: removing redundant fatal in reprocessBatch and fixing unit tests. Signed-off-by: Nikolay Nedkov <[email protected]> * wip: removing redundant fatal Signed-off-by: Nikolay Nedkov <[email protected]> * wip: fixing to update StateRoot when passing no txs for processing to close empty batch. Signed-off-by: Nikolay Nedkov <[email protected]> * wip fixes Signed-off-by: Nikolay Nedkov <[email protected]> * wip updating config files. Signed-off-by: Nikolay Nedkov <[email protected]> * changing when checking nextSendingToL1Deadline if there are no txs in the batch not to close the batch but to update the deadline Signed-off-by: Nikolay Nedkov <[email protected]> * removing debug prints Signed-off-by: Nikolay Nedkov <[email protected]> * wip Signed-off-by: Nikolay Nedkov <[email protected]> * update executor image to e7ac5c4 * smc update * GetForks + test * integrate getForks * l1 network docker image * linter * Fee recipient * genesis * linter * fix unit test * coinbase * claim signature * smc update l2coinbase * remove genesis txs * genesis * genesis docker + new addresses and names * addresses * genesis fix * fix script * fix GenBlockNum * fix docker-compose * fix prover config * update makefile * fix config toml files * fix db schema * timestamp * fix state tests * minor fixes * fix migrations test * update prover * prover image * prover image * fix makefile * fix fork_id in ProcessBatch * fix fork_id in ProcessBatch * update prover image * update test * update test * do not update MT in reprocess * change config * update MT in reprocess * fix RlpFieldsToLegacyTx * fix RlpFieldsToLegacyTx * fix RlpFieldsToLegacyTx * change config * change config * increase test timeout * increase test timeout * wip fixes Signed-off-by: Nikolay Nedkov <[email protected]> * check fix Signed-off-by: Nikolay Nedkov <[email protected]> * fixing 'debug.node.config.toml' Signed-off-by: Nikolay Nedkov <[email protected]> * removing unused config props for sequencer Signed-off-by: Nikolay Nedkov <[email protected]> --------- Signed-off-by: Nikolay Nedkov <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Paolo Grisoli <[email protected]> Co-authored-by: Nikolay Nedkov <[email protected]> Co-authored-by: Alonso Rodriguez <[email protected]> Co-authored-by: agnusmor <[email protected]> Co-authored-by: agnusmor <[email protected]> Co-authored-by: Alonso <[email protected]> Co-authored-by: Jeb Bearer <[email protected]> Co-authored-by: Paolo Grisoli <[email protected]> Co-authored-by: Thiago Coimbra Lemos <[email protected]> Co-authored-by: cool-developer <[email protected]> Co-authored-by: tclemos <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: omahs <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
fixes forced batch query
Reviewers
Main reviewers: