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

Merge dev into upstream v0.2.1 #8

Merged
merged 13 commits into from
Nov 14, 2024
Merged

Merge dev into upstream v0.2.1 #8

merged 13 commits into from
Nov 14, 2024

Conversation

Vui-Chee
Copy link

@Vui-Chee Vui-Chee commented Nov 13, 2024

This PR prepares this repo as a dependency for the new CDK. It combines custodial assets logic with v0.2.1 updates in the upstream https://github.com/0xPolygon/zkevm-ethtx-manager/tree/v0.2.1. Once merged, a new tag v0.2.1 will be assigned and referenced from the new CDK repo.

For context, xlayer-node use to contain ethtxmanager code, however, the powers that be decided to split ethtxmanager code into a separate repo as a dependency, which invariably led to this PR.

In an effort to make future updates as seamless as possible, most of the new changes are preserved and custom changes are pushed to separate new files.

Change list

  1. change import paths "github.com/0xPolygonHermez/zkevm-ethtx-manager" => "github.com/0xPolygon/zkevm-ethtx-manager"
  2. export custom constructor (with from address) for ethtxmanager in separate file xlayer_ethtxmanager.go
  3. type monitoredTx => zkmanTypes.MonitoredTx (types file is moved)
  4. copied hex.go under hex folder (these file is extracted from CDK repo)
  5. add GetZkEVMAddressAndL1ChainID() method to EthermanInterface
  6. regenerated mocks for interface (GetZkEVMAddressAndL1ChainID)

arnaubennassar and others added 10 commits July 16, 2024 12:50
…s-estimation

option to avoid gas estimationi
* add linters

* fix: lint fix

* fix: lint make file

* feat: sonar

* fix: remove unused files

* try to include coverage

* fix: change sonar cloud project key

* small fix

* fix: comments

---------

Co-authored-by: Rachit Sonthalia <[email protected]>
* ensure tx order

* fix: linter
* Serial nonce update (0xPolygon#74)

* feat: prepare txns before routines

* fix: remove forcedNonce feature

* feat: uts

* fix: lint

* lint fix

---------

Co-authored-by: Goran Rojovic <[email protected]>
Co-authored-by: Goran Rojovic <[email protected]>
* feat: initial scaffolding

* feat: insert implementation

* feat: change column types based on the SQL lite supported types

* feat: changed schema, first version of CRUD operations implementation

* refactor: extract common parts to helper functions

* chore: add comments

* fix: linter config warning

* refactor: simplify in-memory storage and fix deadlocks in case of errors

* feat: instantiate either in memory or sql storage

* chore: add comment

* test: fully covered memstorage feat minor renames

* feat: add github.com/mattn/go-sqlite3 as direct dependency

* fix: adapt the DB schema, fix issues and add unit tests for sql storage

* feat: increase coverage

* test: add some more unit tests

* fix: group variables

* refactor: rename PersistenceFilename config parameter

* fix: rename helper function (address comment part 1)

* feat: introduce meddler

* chore: remove useless comments

* fix: revert update logic to manually constructing SQL and address comments from @joanestebanr (part 1)

* fix: change some columns types (address comment from @joanestebanr 2nd part)

* fix: use meddler to construct on fly update statement, address comments from @joanestebanr (part 3)

* feat: remove in memory storage, change block_number to BIGINT (address @joanestebanr part 4)

* fix: remove redundant code

* feat: simplify building of UPDATE clause

* rebase fix

* refactor: build base select and base delete statement dynamically (address comment from @arnaubennassar)

* test: concurrent write to the database unit test

---------

Co-authored-by: Goran Rojovic <[email protected]>
@Vui-Chee Vui-Chee changed the base branch from upstream/v0.2.1 to dev November 13, 2024 08:01
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added by v0.2.1 0xPolygon/zkevm-ethtx-manager.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added by v0.2.1 0xPolygon/zkevm-ethtx-manager.

Copy link
Author

@Vui-Chee Vui-Chee Nov 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to types/interfaces.go folder in v0.2.1 0xPolygon/zkevm-ethtx-manager.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed in v0.2.1 0xPolygon/zkevm-ethtx-manager.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to types/interfaces.go folder in v0.2.1 0xPolygon/zkevm-ethtx-manager.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to types/interfaces.go folder in v0.2.1 0xPolygon/zkevm-ethtx-manager.

# This is the 1st commit message:

Merge `dev` into upstream v0.2.1

# This is the commit message #2:

Fix lint errs

# This is the commit message #3:

Comment interface method
author Vui-Chee <[email protected]> 1731548943 +0800
committer Vui-Chee <[email protected]> 1731548943 +0800

parent 1b8de9d
author Vui-Chee <[email protected]> 1731476344 +0800
committer Vui-Chee <[email protected]> 1731548582 +0800

Merge `dev` into upstream v0.2.1

Fix lint errs

Comment interface method

Fix configure (#3)

* fix configure

* keep the same with genesis

Silence sonar cloud

go mod tidy

Add back hex ut to keep consistent with `dev`
@Vui-Chee Vui-Chee force-pushed the vui-chee/base-dev-v0.2.1 branch from ea372f0 to 700f184 Compare November 14, 2024 01:52
* dev:
  update (#4)
  Fix configure (#3)
  add custodialaset feature (#1)
@zjg555543 zjg555543 marked this pull request as ready for review November 14, 2024 06:19
@KamiD KamiD merged commit 4891711 into dev Nov 14, 2024
3 checks passed
@Vui-Chee Vui-Chee deleted the vui-chee/base-dev-v0.2.1 branch November 14, 2024 06:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants