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.

Sign up for GitHub

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

Jump to bottom

Feature/#3549 reorgs improvement #3553

Merged
merged 19 commits into from
Apr 15, 2024
Merged

Feature/#3549 reorgs improvement #3553

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
127ff48
New reorg function
ARR552 Apr 9, 2024
b9fb7d0
mocks
ARR552 Apr 9, 2024
c4b1aaa
linter
ARR552 Apr 9, 2024
b71bf53
Synchronizer tests
ARR552 Apr 10, 2024
3cdf66d
new elderberry smc docker image
ARR552 Apr 11, 2024
d0cc807
new image
ARR552 Apr 11, 2024
256bfcc
logs
ARR552 Apr 11, 2024
161db71
fix json rpc
ARR552 Apr 12, 2024
7066554
fix
ARR552 Apr 12, 2024
5c40085
Test sync from empty block
ARR552 Apr 12, 2024
e7c11e8
Regular reorg case tested
ARR552 Apr 12, 2024
7b8e289
linter
ARR552 Apr 12, 2024
6253021
remove empty block + fix LatestSyncedBlockEmpty
ARR552 Apr 12, 2024
f66c71a
Improve check reorgs when no block is received during the call
ARR552 Apr 13, 2024
44e5e1a
fix RPC error code for eth_estimateGas and eth_call for reverted tx a…
tclemos Apr 14, 2024
a39d27f
fix test
tclemos Apr 14, 2024
be19b98
Extra unit test
ARR552 Apr 14, 2024
6f65690
fix reorg until genesis
ARR552 Apr 15, 2024
995a635
disable parallel synchronization
ARR552 Apr 15, 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
32 changes: 16 additions & 16 deletions config/environments/local/local.genesis.config.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/running_local.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ To configure your Metamask to use your local environment, follow these steps:
| Address | Description |
|---|---|
| 0x8dAF17A20c9DBA35f005b6324F493785D239719d | Polygon ZKEVM |
| 0x40E0576c0A7dff9dc460B29ba73e79aBf73dD2a9 | Polygon Bridge |
| 0xFe12ABaa190Ef0c8638Ee0ba9F828BF41368Ca0E | Polygon Bridge |
| 0x5FbDB2315678afecb367f032d93F642f64180aa3 | Pol token |
| 0x8A791620dd6260079BF849Dc5567aDC3F2FdC318 | Polygon GlobalExitRootManager |
| 0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e | Polygon RollupManager |
Expand Down
4 changes: 2 additions & 2 deletions etherman/etherman.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ func NewClient(cfg Config, l1Config L1Config) (*Client, error) {
rollupID, err := rollupManager.RollupAddressToID(&bind.CallOpts{Pending: false}, l1Config.ZkEVMAddr)
if err != nil {
log.Debugf("error rollupManager.RollupAddressToID(%s). Error: %w", l1Config.RollupManagerAddr, err)
// TODO return error after the upgrade
return nil, err
}
log.Debug("rollupID: ", rollupID)

Expand Down Expand Up @@ -1512,7 +1512,7 @@ func (etherMan *Client) forceSequencedBatchesEvent(ctx context.Context, vLog typ
if err != nil {
return err
}
// TODO completar los datos de forcedBlockHas, forcedGer y forcedTimestamp
// TODO complete data forcedBlockHash, forcedGer y forcedTimestamp

// Read the tx for this batch.
tx, err := etherMan.EthClient.TransactionInBlock(ctx, vLog.BlockHash, vLog.TxIndex)
Expand Down
2 changes: 0 additions & 2 deletions jsonrpc/endpoints_eth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ func (e *EthEndpoints) Call(arg *types.TxArgs, blockArg *types.BlockNumberOrHash
return e.txMan.NewDbTxScope(e.state, func(ctx context.Context, dbTx pgx.Tx) (interface{}, types.Error) {
if arg == nil {
return RPCErrorResponse(types.InvalidParamsErrorCode, "missing value for required argument 0", nil, false)
} else if blockArg == nil {
return RPCErrorResponse(types.InvalidParamsErrorCode, "missing value for required argument 1", nil, false)
}
block, respErr := e.getBlockByArg(ctx, blockArg, dbTx)
if respErr != nil {
Expand Down
1 change: 1 addition & 0 deletions synchronizer/common/syncinterfaces/etherman.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ type EthermanFullInterface interface {
GetTrustedSequencerURL() (string, error)
VerifyGenBlockNumber(ctx context.Context, genBlockNumber uint64) (bool, error)
GetLatestVerifiedBatchNum() (uint64, error)
GetFinalizedBlockNumber(ctx context.Context) (uint64, error)
}

type EthermanGetLatestBatchNumber interface {
Expand Down
56 changes: 56 additions & 0 deletions synchronizer/common/syncinterfaces/mocks/etherman_full_interface.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

98 changes: 98 additions & 0 deletions synchronizer/common/syncinterfaces/mocks/zkevm_client_ethereum_compatible_l2_block_getter.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading