Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix ut #49

Merged
merged 154 commits into from
Dec 15, 2023
Merged
Changes from 1 commit
Commits
Show all changes
154 commits
Select commit Hold shift + click to select a range
2ef0c25
fix null effective_percentage
ToniRamirezM Jun 30, 2023
7980151
fix forkID calculation
ToniRamirezM Jun 30, 2023
224a11e
fix script
ToniRamirezM Jun 30, 2023
13bcd29
generate json-schema + docs for node config file and network_custom
joanestebanr Jul 4, 2023
41c63ab
fix unittest
joanestebanr Jul 5, 2023
5a85d85
Hotfixv0.1.4 to v0.2.0 (#2255)
ARR552 Jul 5, 2023
d055c40
Effective GasPrice refactor+fixes (#2247)
agnusmor Jul 5, 2023
76dc7d5
Fix/#2257 effective gas price receipt (#2258)
ARR552 Jul 5, 2023
87200f1
bugfix: fixing l2blocks timestamp for the fist batch (#2260)
ARR552 Jul 5, 2023
9f39433
add more comments, and removed fields PrivateKeyPath and PrivateKeyPa…
joanestebanr Jul 6, 2023
b21258d
add info to git action
joanestebanr Jul 6, 2023
7197f4e
add info to git action
joanestebanr Jul 6, 2023
7e3d34d
fix github action
joanestebanr Jul 6, 2023
8566eed
Merge remote-tracking branch 'origin/develop' into feature/#2200-add-…
joanestebanr Jul 7, 2023
b6e034f
updated comments
joanestebanr Jul 7, 2023
71541ee
updated comments
joanestebanr Jul 7, 2023
623089a
Fix/#2263 gas used (#2264)
ARR552 Jul 10, 2023
9d03f8b
Fix pending tx when duplicate nonce (#2270)
agnusmor Jul 10, 2023
40b084b
Only return a tx from the pool if tx is in pending status (#2273)
ARR552 Jul 10, 2023
17a95f5
Merge pull request #2252 from 0xPolygonHermez/feature/#2200-add-docum…
joanestebanr Jul 11, 2023
867aaaf
fix documentation with config file
joanestebanr Jul 11, 2023
198243a
improve: adding check to skip appending effectivePercentage if curren…
Psykepro Jul 11, 2023
c00e4fa
Merge pull request #2275 from 0xPolygonHermez/improve/add-check-for-f…
Psykepro Jul 11, 2023
861dbba
Fiex effectiveGasprice unsigned txs with forkId lower than 5 (#2278)
ARR552 Jul 11, 2023
e7e9f5b
feat: adding functionality to stop sequencer on specific batch num fr…
Psykepro Jul 12, 2023
caa9a3a
Merge pull request #2282 from 0xPolygonHermez/feature/stop-sequencer-…
Psykepro Jul 13, 2023
a4d0b88
patch: adding print for X-Real-IP in JSON-RPC
Psykepro Jul 14, 2023
32bf764
Fix checkIfSynced (#2289)
ARR552 Jul 14, 2023
b5d5145
[Rehashing] Check logs order and fix blockhash and blockNumber in the…
ARR552 Jul 14, 2023
2b1ea5f
Merge pull request #2286 from 0xPolygonHermez/patch/add-print-for-X-R…
Psykepro Jul 14, 2023
e314df2
flushID synchronizer (#2287)
ARR552 Jul 14, 2023
c9b4057
executor error refactor (#2299)
ToniRamirezM Jul 19, 2023
80c471d
handle invalid rlp ROM error (#2297)
ToniRamirezM Jul 19, 2023
13cafe2
add maxL2GasPrice (#2294)
ToniRamirezM Jul 19, 2023
c761cea
Error refactor (#2302)
ToniRamirezM Jul 19, 2023
9b409e4
Fix replaced tx as failed when duplicated nonce (#2308)
agnusmor Jul 20, 2023
31eb8a4
log reprocess need (#2309)
ToniRamirezM Jul 20, 2023
978e77b
Feature/2300 synchronizer detect if executor restart (#2306)
joanestebanr Jul 21, 2023
a814dc0
Update prover images (#2311)
ToniRamirezM Jul 21, 2023
c66222f
add doc, and fix dockers to be able to use snap/restore feature (#2315)
joanestebanr Jul 21, 2023
2da46fd
Update docker-compose.yml
ToniRamirezM Jul 21, 2023
6fd4c75
Update docker-compose.yml
ToniRamirezM Jul 21, 2023
44356c8
do not add tx to the pool in case err != nil
ToniRamirezM Jul 26, 2023
822858c
do not add tx into the pool if a fatal error in the executor happens …
ToniRamirezM Jul 26, 2023
7d10f46
fix dbMultiWriteSinglePosition config value
tclemos Jul 27, 2023
6a6fc6f
workarround for the error error closing batch
joanestebanr Jul 28, 2023
d6aa5e0
workarround for the error error closing batch
joanestebanr Jul 28, 2023
203751a
workarround for the error error closing batch
joanestebanr Jul 28, 2023
d0e95a8
workaround for the error of closing batch, another case
joanestebanr Jul 28, 2023
38a97f0
`Worker`'s `AddTxTracker` Bug Fix (#2343)
Psykepro Jul 31, 2023
80c8f20
rename config files (#2349)
ToniRamirezM Aug 1, 2023
1389c6b
fix closing batch + logs (#2348)
ARR552 Aug 1, 2023
c99bc9f
Update README.md
ToniRamirezM Aug 1, 2023
7036565
Update release.yml
ToniRamirezM Aug 1, 2023
4806b58
bugfix: fixing place where we need to increment the wg per address fo…
Psykepro Aug 2, 2023
dce5cd0
Merge pull request #2356 from 0xPolygonHermez/bufix/worker-addrqueue-…
Psykepro Aug 2, 2023
2298c8f
Store batchL2Data when the batch is opened (#2358)
ARR552 Aug 3, 2023
24cbf1a
add GasPriceMarginFactor and MaxGasPrice to eth-tx-manager (#2360)
tclemos Aug 3, 2023
9c32934
bugfix: attaching missing TxTracker.From to pending txs to store for …
Psykepro Aug 3, 2023
de6206f
Update README.md
ToniRamirezM Aug 3, 2023
8ec1474
improve: adding logs (#2373)
Psykepro Aug 4, 2023
e15805d
bugfix: fixing finalizer's handling. (#2375)
Psykepro Aug 4, 2023
ca3cc9d
Update README.md
ToniRamirezM Aug 4, 2023
81a6bf6
change hashdb go package
ToniRamirezM Aug 3, 2023
901466f
new hashdb interface
ToniRamirezM Aug 3, 2023
8275016
aggregator pb refactor
ToniRamirezM Aug 3, 2023
9a5b26e
new prover image
ToniRamirezM Aug 3, 2023
6dffbfb
change prover config
ToniRamirezM Aug 3, 2023
4dcd6b0
update prover image
ToniRamirezM Aug 3, 2023
c53d87a
update to latest proto and prover image
ToniRamirezM Aug 5, 2023
8d4ba17
Refactor nonce calculation for addQueue (#2382)
ToniRamirezM Aug 7, 2023
23f4290
fix script
ToniRamirezM Aug 7, 2023
c05398c
check to avoid data inconsistencies (#2387)
ARR552 Aug 8, 2023
8848855
Refactor: avoid delete addrQueue if it has pending txs to store (#2391)
agnusmor Aug 9, 2023
5784aea
Sort txs in worker by gasPrice (remove efficiency sort) (#2392)
agnusmor Aug 9, 2023
072be43
use useMainExecGenerated (#2393)
ToniRamirezM Aug 9, 2023
b4e9dfb
Fix store forced batch tx (#2394)
agnusmor Aug 9, 2023
f041a1b
l2coinbase (#2400)
ARR552 Aug 11, 2023
994cb2c
Check flushID != 0 (#2406)
ARR552 Aug 14, 2023
f494784
Show tx.GasPrice in the worker logs (instead of tx.Cost) (#2416)
agnusmor Aug 17, 2023
caf26bd
Check flushID != 0 in Sequencer (#2415)
agnusmor Aug 17, 2023
5040346
update config params for Prover v2.1.0 (#2418)
agnusmor Aug 17, 2023
59eaa75
cherry-pick #2385 and #2396 from develop into v0.2.6 (#2412)
tclemos Aug 17, 2023
c95cce4
new block endpoints and improvements to batch endpoint (#2411)
tclemos Aug 17, 2023
3b98022
Add forced batches tx to addrQueue (#2398)
ToniRamirezM Aug 18, 2023
4e31815
bugifx: adding missing tx.BreakEvenGasPrice nil check
Psykepro Aug 23, 2023
9d9801f
Merge pull request #2452 from 0xPolygonHermez/bugfix/effectiveGasPric…
Psykepro Aug 23, 2023
667d846
Sync halt (#2428)
ARR552 Aug 23, 2023
c1dd19c
cherry-pick #2245 and #2424 from develop into v0.2.6 (#2447)
tclemos Aug 23, 2023
2983243
New executor errors refactor (#2438)
ToniRamirezM Aug 23, 2023
da77be4
Reprocess full batch in parallel (sanity check) (#2425)
agnusmor Aug 23, 2023
9537f04
Speed up deleting batches from stateDB creating an index for state.re…
ToniRamirezM Aug 24, 2023
eb11e0f
Feature/#2429 fork id improvement (#2450)
ARR552 Aug 24, 2023
f1440a3
fix check storedFlushID (#2458)
ToniRamirezM Aug 24, 2023
5bdc061
remove stored flush id 0 (#2459)
ToniRamirezM Aug 24, 2023
f16d9ae
Feature/#2403 snap (#2404)
ARR552 Aug 28, 2023
307e83e
bugfix: removing measuring of metrics from async batch reprocessing f…
Psykepro Aug 28, 2023
4257f3f
update prover images (#2473)
ToniRamirezM Aug 28, 2023
375bffa
Update production-setup.md
agnusmor Aug 28, 2023
32ce2e9
init
zjg555543 Sep 12, 2023
145ff5d
update
zjg555543 Sep 13, 2023
e9ab3d2
update
zjg555543 Sep 13, 2023
8cc879f
update
zjg555543 Sep 13, 2023
8a44abf
update
zjg555543 Sep 13, 2023
121d0c7
update
zjg555543 Sep 13, 2023
2c7466e
Merge pull request #9 from okx/zjg/fork5-dac
KamiD Oct 12, 2023
6fff3f4
Add logs for sequencer (#14)
giskook Oct 12, 2023
401e252
support innertx (#16)
giskook Oct 12, 2023
49481a5
add switch for pending transaction filter (#18)
lyh169 Oct 12, 2023
a444b66
suport free gas to claim asset (#22)
chengzhinei Oct 12, 2023
c9c53c6
add gp adjust (#17)
lyh169 Oct 12, 2023
216c926
rebranding (#23)
zjg555543 Oct 13, 2023
d16d4a4
rename to xgon (#24)
zjg555543 Oct 16, 2023
892686e
validium/rollup switch (#26)
zjg555543 Oct 23, 2023
4d65247
support nacos (#27)
giskook Oct 23, 2023
6991c3b
sync fix ws debug (#28)
lyh169 Oct 27, 2023
c05ac23
fix ut and e2e test (#29)
zjg555543 Nov 1, 2023
6de0441
Support websocket to register nacos (#33)
giskook Nov 6, 2023
2bafd67
support flatCallTracer and result limit for trace transaction (#40)
ylsGit Nov 14, 2023
ba6ae61
rebranding to X1 (#36)
zjg555543 Nov 14, 2023
9e945f8
fix make deploy-sc error (#38)
zjg555543 Nov 14, 2023
6b55630
add gas price dynamic adjust in follower mode (#34)
lyh169 Dec 4, 2023
6603ea7
Merge branch 'release/v0.1.1' into scf-v041-pr
scf0220 Dec 13, 2023
f8fdd58
first commit
scf0220 Dec 13, 2023
acfc066
Update db.go
scf0220 Dec 13, 2023
79b32a4
Update datacommittee_test.go
scf0220 Dec 13, 2023
d9b74e5
format
scf0220 Dec 13, 2023
0cc9117
fmt
scf0220 Dec 13, 2023
659cf7d
goimport
Dec 13, 2023
d60777c
1
scf0220 Dec 13, 2023
b6d1239
1
scf0220 Dec 13, 2023
5d37cf4
fix
scf0220 Dec 13, 2023
34f2096
Update start.go
scf0220 Dec 13, 2023
8b9f1b7
1
scf0220 Dec 13, 2023
4eb20c5
a
Dec 13, 2023
16311d4
1
scf0220 Dec 13, 2023
adecaa7
Merge branch 'scf-v041-pr-fix-test' of https://github.com/okx/x1-node…
scf0220 Dec 13, 2023
dd71a1b
a
Dec 13, 2023
863c463
Update Makefile
scf0220 Dec 13, 2023
ea649ea
fix test
scf0220 Dec 13, 2023
389070c
Update setup.go
scf0220 Dec 13, 2023
69a484f
a
Dec 14, 2023
3583f66
update makefile
zjg555543 Dec 14, 2023
5e4306c
update makefile
zjg555543 Dec 14, 2023
5f2a7b0
fix ut
zjg555543 Dec 14, 2023
6b71012
update
zjg555543 Dec 14, 2023
1e8ee00
update
zjg555543 Dec 14, 2023
8ca5c23
update
zjg555543 Dec 14, 2023
05f9da5
disabel
zjg555543 Dec 14, 2023
ac87a06
udpate
zjg555543 Dec 14, 2023
afcdff4
update
zjg555543 Dec 14, 2023
d43951e
update
zjg555543 Dec 14, 2023
520d32c
fix e2e
zjg555543 Dec 14, 2023
e8d726d
update permissionless-node
zjg555543 Dec 14, 2023
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
Prev Previous commit
Next Next commit
1
scf0220 committed Dec 13, 2023

Partially verified

This commit is signed with the committer’s verified signature.
gsmet’s contribution has been verified via GPG key.
We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
commit 16311d46ec0460d3957b648b9d93ca59ab6712d7
10 changes: 4 additions & 6 deletions synchronizer/synchronizer.go
Original file line number Diff line number Diff line change
@@ -5,13 +5,7 @@ import (
"context"
"errors"
"fmt"
"math"
"math/big"
"strings"
"time"

"github.com/0xPolygon/cdk-data-availability/client"

"github.com/0xPolygonHermez/zkevm-node/etherman"
"github.com/0xPolygonHermez/zkevm-node/event"
"github.com/0xPolygonHermez/zkevm-node/hex"
@@ -24,6 +18,10 @@ import (
"github.com/ethereum/go-ethereum/common"
ethTypes "github.com/ethereum/go-ethereum/core/types"
"github.com/jackc/pgx/v4"
"math"
"math/big"
"strings"
"time"
)

const (
10 changes: 4 additions & 6 deletions synchronizer/synchronizer_test.go
Original file line number Diff line number Diff line change
@@ -2,12 +2,6 @@ package synchronizer

import (
context "context"
"math/big"
"testing"
"time"

"github.com/ethereum/go-ethereum/crypto"

cfgTypes "github.com/0xPolygonHermez/zkevm-node/config/types"
"github.com/0xPolygonHermez/zkevm-node/etherman"
"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/polygonzkevm"
@@ -17,10 +11,14 @@ import (
"github.com/0xPolygonHermez/zkevm-node/state/runtime/executor"
"github.com/ethereum/go-ethereum/common"
ethTypes "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/jackc/pgx/v4"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"math/big"
"testing"
"time"
)

const (