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

Commit 0cbb920

Browse files
ToniRamirezMjoanestebanrARR552tclemosagnusmor
authored
Merge Release/v0.2.2 into develop (#2353)
* fix null effective_percentage * fix forkID calculation * fix script * generate json-schema + docs for node config file and network_custom * fix unittest * Hotfixv0.1.4 to v0.2.0 (#2255) * Hotfix v0.1.4 to main (#2250) * fix concurrent web socket writes * fix eth_syncing * fix custom trace internal tx call error handling and update prover * add test to custom tracer depth issue; fix internal call error and gas used * fix custom tracer for internal tx with error and no more steps after it * remove debug code * Make max grpc message size configurable (#2179) * make max grpc message size configurable * fix state tests * fix tests * fix tests * get SequencerNodeURI from SC if empty and not IsTrustedSequencer * Optimize trace (#2183) * optimize trace * fix memory reading * update docker image * update prover image * fix converter * fix memory * fix step memory * fix structlogs * fix structlogs * fix structlogs * fix structlogs * fix structlogs * fix structlogs * fix structlogs * fix structlogs * update prover image * fix struclogs * fix memory size * fix memory size * fix memory size * refactor memory resize * refactor memory resize * move log for the best fitting tx (#2192) * fix load zkCounters from pool * remove unnecessary log.info * add custom tracer support to CREATES opcode without depth increase (#2213) * logs * fix getting stateroot from previous batch (GetWIPBatch) * logs * Fix GetWipBatch when previous last batch is a forced batch * fix forcedBatch trusted state * Revert "fix getting stateroot from previous batch (GetWIPBatch)" This reverts commit 860f0e7. * force GHA * add pool limits (#2189) * Hotfix/batch l2 data (#2223) * Fix BatchL2Data * Force GHA * remove failed txs from the pool limit check (#2233) * debug trace by batch number via external rpc requests (#2235) * fix trace batch remote requests in parallel limitation (#2244) * Added RPC.TraceBatchUseHTTPS config parameter * fix executor version --------- Co-authored-by: tclemos <thiago@polygon.technology> Co-authored-by: tclemos <thiago@iden3.com> Co-authored-by: Toni Ramírez <58293609+ToniRamirezM@users.noreply.github.com> Co-authored-by: agnusmor <agnusmor@gmail.com> Co-authored-by: agnusmor <100322135+agnusmor@users.noreply.github.com> Co-authored-by: Thiago Coimbra Lemos <tclemos@users.noreply.github.com> * fix test * fix test --------- Co-authored-by: tclemos <thiago@polygon.technology> Co-authored-by: tclemos <thiago@iden3.com> Co-authored-by: Toni Ramírez <58293609+ToniRamirezM@users.noreply.github.com> Co-authored-by: agnusmor <agnusmor@gmail.com> Co-authored-by: agnusmor <100322135+agnusmor@users.noreply.github.com> Co-authored-by: Thiago Coimbra Lemos <tclemos@users.noreply.github.com> * Effective GasPrice refactor+fixes (#2247) * effective GasPrice refactor * bugs fixes and finalizer tests fixes * fix typo * fix calculate effective gasprice percentage * fix test gas price * Fix/#2257 effective gas price receipt (#2258) * effective gas price returned by the rpc in the receipt * linter * bugfix: fixing l2blocks timestamp for the fist batch (#2260) * bugfix: fixing l2blocks timestamp for the fist batch Signed-off-by: Nikolay Nedkov <nikolai_nedkov@yahoo.com> * fix finalizer unit test --------- Signed-off-by: Nikolay Nedkov <nikolai_nedkov@yahoo.com> * add more comments, and removed fields PrivateKeyPath and PrivateKeyPassword from etherman.Config that are not in use * add info to git action * add info to git action * fix github action * updated comments * updated comments * Fix/#2263 gas used (#2264) * fix fea2scalar and gas used * suggestion * fix fea2scalar * suggestion * Fix pending tx when duplicate nonce (#2270) * fix pending tx when duplicate nonce * set pool.transaction.failed_reason to NULL when updating an existing tx * add more log details when adding tx to AddrQueue * fix query to add tx to the pool. Fix lint errors * change failed_reason for tx discarded due duplicate nonce * Only return a tx from the pool if tx is in pending status (#2273) * Return a tx from the pool only if it is * fix TestGetTransactionByHash --------- Co-authored-by: agnusmor <agnusmor@gmail.com> * fix documentation with config file * improve: adding check to skip appending effectivePercentage if current forkId is under 5. Signed-off-by: Nikolay Nedkov <nikolai_nedkov@yahoo.com> * Fiex effectiveGasprice unsigned txs with forkId lower than 5 (#2278) * feat: adding functionality to stop sequencer on specific batch num from config param. Signed-off-by: Nikolay Nedkov <nikolai_nedkov@yahoo.com> * patch: adding print for X-Real-IP in JSON-RPC Signed-off-by: Nikolay Nedkov <nikolai_nedkov@yahoo.com> * Fix checkIfSynced (#2289) * [Rehashing] Check logs order and fix blockhash and blockNumber in the log conversion (#2280) * fix and check order * linter * flushID synchronizer (#2287) * FlushID in synchronizer * linter * fix logs * commnets * executor error refactor (#2299) * handle invalid rlp ROM error (#2297) * add maxL2GasPrice (#2294) * add maxL2GasPrice * fix * fix * add test * document parameter * update description * Error refactor (#2302) * error refactor * refactor * Fix replaced tx as failed when duplicated nonce (#2308) * Fix UpdateTxStatus for replacedTx * Fix adding tx with same nonce on AddrQueue * log reprocess need (#2309) * log reprocess need * Update finalizer.go * Feature/2300 synchronizer detect if executor restart (#2306) * detect if executor restarts and stop synchonizer * Update prover images (#2311) * update prover image * update prover images * change executor param * Update testnet.prover.config.json * Update test.permissionless.prover.config.json * Update test.prover.config.json * Update public.prover.config.json * prover params * prover params * prover params * update prover images * add doc, and fix dockers to be able to use snap/restore feature (#2315) * add doc, and fix dockers to be able to use snap/restore feature * add doc for snap/restore feature --------- Co-authored-by: Toni Ramírez <toni@polygon.technology> * Update docker-compose.yml * Update docker-compose.yml * do not add tx to the pool in case err != nil * do not add tx into the pool if a fatal error in the executor happens during pre execution * fix dbMultiWriteSinglePosition config value * workarround for the error error closing batch * workarround for the error error closing batch * workarround for the error error closing batch * workaround for the error of closing batch, another case * `Worker`'s `AddTxTracker` Bug Fix (#2343) * bugfix: Resolve Function Bug in Worker Module Signed-off-by: Nikolay Nedkov <nikolai_nedkov@yahoo.com> * improve: improving the wait for pending txs to be for only the txs for the current address. Signed-off-by: Nikolay Nedkov <nikolai_nedkov@yahoo.com> --------- Signed-off-by: Nikolay Nedkov <nikolai_nedkov@yahoo.com> * rename config files (#2349) * fix closing batch + logs (#2348) * fix closing batch + logs * fix * log description * typo errors * fix error: failed to store transactions for batch due to duplicate key * test * typo * Update README.md * Update release.yml * fix conflict --------- Signed-off-by: Nikolay Nedkov <nikolai_nedkov@yahoo.com> Co-authored-by: joanestebanr <zodiac.ng@gmail.com> Co-authored-by: Alonso Rodriguez <ARR552@users.noreply.github.com> Co-authored-by: tclemos <thiago@polygon.technology> Co-authored-by: tclemos <thiago@iden3.com> Co-authored-by: agnusmor <agnusmor@gmail.com> Co-authored-by: agnusmor <100322135+agnusmor@users.noreply.github.com> Co-authored-by: Thiago Coimbra Lemos <tclemos@users.noreply.github.com> Co-authored-by: joanestebanr <129153821+joanestebanr@users.noreply.github.com> Co-authored-by: Nikolay Nedkov <nikolai_nedkov@yahoo.com>
1 parent 01d8bbe commit 0cbb920

25 files changed

Lines changed: 252 additions & 111 deletions

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ jobs:
4646
sed -i -e "s/image: zkevm-node/image: hermeznetwork\/zkevm-node:$GIT_TAG_NAME/g" testnet/docker-compose.yml
4747
zip -r testnet.zip testnet
4848
# MAINNET
49-
mkdir -p mainnet/config/environments/testnet
49+
mkdir -p mainnet/config/environments/mainnet
5050
mkdir -p mainnet/db/scripts
51-
cp config/environments/mainnet/* mainnet/config/environments/testnet
51+
cp config/environments/mainnet/* mainnet/config/environments/mainnet
5252
cp docker-compose.yml mainnet
5353
cp db/scripts/init_prover_db.sql mainnet/db/scripts
54-
mv mainnet/config/environments/testnet/example.env mainnet
54+
mv mainnet/config/environments/mainnet/example.env mainnet
5555
sed -i -e "s/image: zkevm-node/image: hermeznetwork\/zkevm-node:$GIT_TAG_NAME/g" mainnet/docker-compose.yml
5656
zip -r mainnet.zip mainnet
5757
@@ -61,4 +61,4 @@ jobs:
6161
files: 'testnet.zip;mainnet.zip'
6262
repo-token: ${{ secrets.TOKEN_RELEASE }}
6363
release-tag: ${{ steps.tagName.outputs.tag }}
64-
64+

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN cd /src && make build
1414
# CONTAINER FOR RUNNING BINARY
1515
FROM alpine:3.18.0
1616
COPY --from=build /src/dist/zkevm-node /app/zkevm-node
17-
COPY --from=build /src/config/environments/testnet/testnet.node.config.toml /app/example.config.toml
17+
COPY --from=build /src/config/environments/testnet/node.config.toml /app/example.config.toml
1818
RUN apk update && apk add postgresql15-client
1919
EXPOSE 8123
2020
CMD ["/bin/sh", "-c", "/app/zkevm-node run"]

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,6 @@ It's recommended to use `make` for building, and testing the code, ... Run `make
115115

116116
## Contribute
117117

118-
Before opening a pull request, please read this [guide](CONTRIBUTING.md)
118+
Before opening a pull request, please read this [guide](CONTRIBUTING.md).
119119

120120

‎config/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ Config represents the configuration of the entire Hermez Node
6161
The file is [TOML format]
6262
You could find some examples:
6363
- `config/environments/local/local.node.config.toml`: running a permisionless node
64-
- `config/environments/mainnet/public.node.config.toml`
65-
- `config/environments/public/public.node.config.toml`
64+
- `config/environments/mainnet/node.config.toml`
65+
- `config/environments/public/node.config.toml`
6666
- `test/config/test.node.config.toml`: configuration for a trusted node used in CI
6767
6868
[TOML format]: https://en.wikipedia.org/wiki/TOML

config/environments/mainnet/public.node.config.toml renamed to config/environments/mainnet/node.config.toml

File renamed without changes.

config/environments/mainnet/public.prover.config.json renamed to config/environments/mainnet/prover.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,5 +112,5 @@
112112
"maxHashDBThreads": 8,
113113
"ECRecoverPrecalc": true,
114114
"ECRecoverPrecalcNThreads": 16,
115-
"dbMultiWriteSinglePosition": true
115+
"dbMultiWriteSinglePosition": false
116116
}

config/environments/testnet/testnet.node.config.toml renamed to config/environments/testnet/node.config.toml

File renamed without changes.

config/environments/testnet/testnet.prover.config.json renamed to config/environments/testnet/prover.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,5 +112,5 @@
112112
"maxHashDBThreads": 8,
113113
"ECRecoverPrecalc": true,
114114
"ECRecoverPrecalcNThreads": 16,
115-
"dbMultiWriteSinglePosition": true
115+
"dbMultiWriteSinglePosition": false
116116
}

‎config/gen_json_schema_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ The file is [TOML format](https://en.wikipedia.org/wiki/TOML#)
2525
2626
You could find some examples:
2727
- `config/environments/local/local.node.config.toml`: running a permisionless node
28-
- `config/environments/mainnet/public.node.config.toml`
29-
- `config/environments/public/public.node.config.toml`
28+
- `config/environments/mainnet/node.config.toml`
29+
- `config/environments/public/node.config.toml`
3030
- `test/config/test.node.config.toml`: configuration for a trusted node used in CI
3131
*/
3232
type MyTestConfig struct {

‎docker-compose.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ services:
2626
environment:
2727
- ZKEVM_NODE_ETHERMAN_URL=${ZKEVM_NODE_ETHERMAN_URL}
2828
volumes:
29-
- ${ZKEVM_ADVANCED_CONFIG_DIR:-./config/environments/testnet}/testnet.node.config.toml:/app/config.toml
29+
- ${ZKEVM_ADVANCED_CONFIG_DIR:-./config/environments/testnet}/node.config.toml:/app/config.toml
3030
command:
3131
- "/bin/sh"
3232
- "-c"
@@ -50,7 +50,7 @@ services:
5050
environment:
5151
- ZKEVM_NODE_ETHERMAN_URL=${ZKEVM_NODE_ETHERMAN_URL}
5252
volumes:
53-
- ${ZKEVM_ADVANCED_CONFIG_DIR:-./config/environments/testnet}/testnet.node.config.toml:/app/config.toml
53+
- ${ZKEVM_ADVANCED_CONFIG_DIR:-./config/environments/testnet}/node.config.toml:/app/config.toml
5454
command:
5555
- "/bin/sh"
5656
- "-c"
@@ -115,6 +115,6 @@ services:
115115
- 50061:50061 # MT
116116
- 50071:50071 # Executor
117117
volumes:
118-
- ${ZKEVM_ADVANCED_CONFIG_DIR:-./config/environments/testnet}/testnet.prover.config.json:/usr/src/app/config.json
118+
- ${ZKEVM_ADVANCED_CONFIG_DIR:-./config/environments/testnet}/prover.config.json:/usr/src/app/config.json
119119
command: >
120120
zkProver -c /usr/src/app/config.json

0 commit comments

Comments
 (0)