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

Merge v1.0.0 into zero #1697

Merged
merged 207 commits into from
Jul 4, 2023
Merged

Merge v1.0.0 into zero #1697

merged 207 commits into from
Jul 4, 2023

Conversation

stana-miric
Copy link
Contributor

Description

This PR merges the v1.0.0 release into zero branch

Changes include

  • Bugfix (non-breaking change that solves an issue)
  • Hotfix (change that solves an urgent issue, and requires immediate attention)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (change that is not backwards-compatible and/or changes current functionality)

Checklist

  • I have assigned this PR to myself
  • I have added at least 1 reviewer
  • I have added the relevant labels
  • I have updated the official documentation
  • I have added sufficient documentation in code

Testing

  • I have tested this code with the official test suite
  • I have tested this code manually

SebastianSupreme and others added 30 commits March 31, 2023 20:58
@SebastianSupreme
Fix minor punctuation mistakes (#1343)
0631dd4
@Nemanja0x
EVM-533 Nightly slack notificatinos (#1341)
880c32f
@ferranbt
Add e2e test for allowlist proxy (#1338)
7911c43
@sergerad @Stefan-Ethernal @goran-ethernal
Add docs/sequences.md with deposit, withdraw, and exit sequences (#1354)
0972756 
* Add docs/sequences.md with deposit, withdraw, and exit sequences

* Add more detail to exit sequence

* Fix StateSyncResult Event typo

Co-authored-by: Stefan Negovanović <93934272+Stefan-Ethernal@users.noreply.github.com>

* Fix arrow typo

Co-authored-by: Stefan Negovanović <93934272+Stefan-Ethernal@users.noreply.github.com>

* Rm imx reference

Co-authored-by: Stefan Negovanović <93934272+Stefan-Ethernal@users.noreply.github.com>

* Rename NativeERC20.sol to ChildERC20.sol

Co-authored-by: Stefan Negovanović <93934272+Stefan-Ethernal@users.noreply.github.com>

* Move sequences.md to docs/bridge

* Rephrase sequence explanation sentences

* Rename Client to User

* Fix deposit sequence and specifer spender in approve()

* Add mapToken() flow

* Add DEPOSIT_SIG flow

Co-authored-by: Goran Rojovic <100121253+goran-ethernal@users.noreply.github.com>

* Rm duplicate rows in deposit

---------

Co-authored-by: Stefan Negovanović <93934272+Stefan-Ethernal@users.noreply.github.com>
Co-authored-by: Goran Rojovic <100121253+goran-ethernal@users.noreply.github.com>
@Stefan-Ethernal
Deploy NFT contracts (#1322)
afee1c6 
* Deploy NFT contracts

* Provide flags for existing tokens on the root chain

* Linters fix
@vcastellm
Transactions allow list (#1349)
b48f781 
* Implement transactions allow list
@Nemanja0x @vcastellm
Evm 505: fuzz tests in nightly build (#1353)
99166f0 
add slack notification for fuzz tests

Co-authored-by: Victor Castell <victor@polygon.technology>
@Stefan-Ethernal
Add receivers to sync state actions (#1358)
0592e11
@goran-ethernal
Use buffered channel (#1361)
eb45dba
@igorcrevar
EVM-584 Panic -> send on closed channel inside syncer (#1364)
3765811
@Stefan-Ethernal @flavor-town
Obsolete block time flag from server command (#1365)
5d4c9d9 
* refactor(server): remove block time configuration from raw config and server params (#1363)

The block time configuration was removed from the raw config and server params. The initBlockTime function was also removed from the server params.

* Resolve block time from consensus engine parameters

* Provide zero value for block time for dummy and dev consensuses

* Move DefaultBlockTime to IBFT E2E tests

* Make sure that block time is not less than 1 second

---------

Co-authored-by: Flavor Town <117117716+flavor-town@users.noreply.github.com>
@Stefan-Ethernal @igorcrevar @Nemanja0x
Deprecate L2 to L1 e2e tests (#1369)
f23eb43 
* Update TestIntegratoin_PerformExit

* deposit + widthdraw signature

* Add minting and approval steps in TestIntegratoin_PerformExit

* Obsolete TestL1StateReceiver SC and L2 to L1 E2E tests which were using it

* some comments added

* lint fix

* deployer address

---------

Co-authored-by: Igor Crevar <crewce@gmail.com>
Co-authored-by: Nemanja0x <nemanja@ethernal.tech>
@Stefan-Ethernal
Shorten execution time of E2E tests (#1360)
f6cc66a 
* Provide epoch size to consensus tests

* Fix failing tests

* Rename tests

* Fix comment

* Rely on epoch sizes in TestE2E_Bridge_ChangeVotingPower

* Move getCheckpointBlockNumber to helpers_test

* Introduce waitForRootchainEpoch helper fn

* Consolidate deposit and withdrawal erc20 with multiple commitments per epoch tests

* Consolidate deposit and withdrawals transactions and multiple commitments into single test

* Minor improvements to documentation

* Rootchain fund command minor change

* Try to stabilize ERC 20 deposit and withdrawal test

* Test hardening cont.

* Consolidate basic consensus and sync tests into the one

* Stop timer and create single ticker instance for recurrent checking
@ferranbt
Add eth_call override (#1337)
36772f4 
* Add eth_call override

* Pass lint

* Apply feedback

---------

Co-authored-by: Victor Castell <victor@victorcastell.com>
@Stefan-Ethernal
Eth_call override unit test lint fix (#1374)
c8236e0
@goran-ethernal
Change folders hierarchy for property tests logs (#1371)
3dbacc7 
* Change folders hierarchy for property tests logs

* Remove unnecessary env variable

* Update yml and Make files

* Comments fix

* Add logging of test parameters

* Comments fix

* Lint fix
@Nemanja0x
SLACK_TEST_WEBHOOK_URL -> SLACK_EDGE_GITHUB_URL (#1380)
c5f83e2
@vcastellm
Move IBFT E2E tests to nighly builds (#1382)
ccbe2b9
@goran-ethernal
Support non-validator nodes in e2e tests (#1378)
de2bd8c 
* Support non-validator nodes in e2e tests

* Comments fix

* Comments fix

* Fix
@goran-ethernal
Remove validator-set-size from cluster script (#1384)
f1f4e8f
@Nemanja0x
"native-token-config" flag added to genesis command (#1376)
eea4fa3 
"native-token-config" flag added to genesis command
Co-authored-by: Stefan Negovanović <stefan@ethernal.tech>
@Stefan-Ethernal
Remove unused Seal field from the extra data (#1379)
dd7ec79 
* Remove unused Seal field from the extra data

* Fix tests

* Update field comments
@vcastellm
Typo in e2e workflow file name (#1387)
ed1ecd7
@Stefan-Ethernal
Provide correct state sync event logs filter in `TestE2E_Bridge_Trans…
a5aea76 
…fers` (#1381)

* Fix TestE2E_Bridge_Transfers

* Extract finalBlockNum variable

* Harden TestPeerConnectionUpdateEventCh

* Inline WriteTx invocation
@goran-ethernal
eth_getBlockByHash and eth_getBlockByNumber JSON RPC endpoints sh…
e37c9da 
…ould omit `Committed` field (#1383)

* Filter extra Committed field in jsonRPC endpoints

* UT

* Fix UTs

* Lint fix

* Comments fix

* Comments fix
@Stefan-Ethernal
Append ExtraVanity to the beginning of the marshaled ExtraData (#…
f0f2716 
…1391)

* Append ExtraVanity to the beginning of the marshaled extra data

* Build unit tests fix

* Fix test

* Fix by not adding ExtraVanity twice
@dependabot
Bump github.com/prometheus/client_golang from 1.13.1 to 1.15.0 (#1395)
f3a8f21 
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.13.1 to 1.15.0.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.13.1...v1.15.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump github.com/hashicorp/go-hclog from 1.3.1 to 1.5.0 (#1393)
b764741 
Bumps [github.com/hashicorp/go-hclog](https://github.com/hashicorp/go-hclog) from 1.3.1 to 1.5.0.
- [Release notes](https://github.com/hashicorp/go-hclog/releases)
- [Commits](hashicorp/go-hclog@v1.3.1...v1.5.0)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/go-hclog
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@goran-ethernal
[EVM-586]: Paralelize fund transactions sending (#1399)
1c7d69f 
* Parallelize execution of fund commands on root

* Use errgroup
@dependabot
Bump gopkg.in/DataDog/dd-trace-go.v1 from 1.43.1 to 1.49.1 (#1398)
852f44d 
Bumps gopkg.in/DataDog/dd-trace-go.v1 from 1.43.1 to 1.49.1.

---
updated-dependencies:
- dependency-name: gopkg.in/DataDog/dd-trace-go.v1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Nemanja0x and others added 23 commits June 22, 2023 12:07
@Nemanja0x
e2e fixed (#1639)
c2d4821
@Stefan-Ethernal
Execute nightlies on demand (#1650)
44c79df
@Nemanja0x
Reference latest ethgo (#1653)
62653a7 
* set latest ethgo
@Stefan-Ethernal
Remove default mock tokens deployment from rootchain deploy command (#…
a152b79 
…1642)

* Remove default mock tokens deployment from rootchain deploy command

* Fix E2E tests

* Remove unused flag names
@igorcrevar
EVM-713 Fork manager params (#1645)
2df1b93
@igorcrevar
go.mod fix (#1658)
90fca14
@Nemanja0x
TestPeerConnectionUpdateEventCh (#1662)
b624822
@Stefan-Ethernal
Ensure that the same child token addresses are calculated on both cha…
8f39a41 
…ins (#1621)

* Provide correct addresses for child token templates to predicates

* Assert that rootTokenToChildToken exists in the provided predicate ABI
@dependabot
Bump google.golang.org/grpc from 1.56.0 to 1.56.1 (#1655)
fd58a19 
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.56.0 to 1.56.1.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.56.0...v1.56.1)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump gopkg.in/DataDog/dd-trace-go.v1 from 1.51.0 to 1.52.0 (#1659)
4a6addb 
Bumps gopkg.in/DataDog/dd-trace-go.v1 from 1.51.0 to 1.52.0.

---
updated-dependencies:
- dependency-name: gopkg.in/DataDog/dd-trace-go.v1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump cloud.google.com/go/secretmanager from 1.11.0 to 1.11.1 (#1643)
b821d0d 
Bumps [cloud.google.com/go/secretmanager](https://github.com/googleapis/google-cloud-go) from 1.11.0 to 1.11.1.
- [Release notes](https://github.com/googleapis/google-cloud-go/releases)
- [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/documentai/CHANGES.md)
- [Commits](googleapis/google-cloud-go@kms/v1.11.0...asset/v1.11.1)

---
updated-dependencies:
- dependency-name: cloud.google.com/go/secretmanager
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@criadoperez
added jq dependency (#1666)
3bb79ee
@Stefan-Ethernal
Print additional fields in the withdraw CLI command (#1663)
807ca08
@stana-miric
Deploy burn contract by default on EIP-1559 enabled (#1648)
6c6e969
@vcastellm
Update README for release (#1644)
ffe6fce
@vcastellm
Apply trace patch for CALL trace issue (#1654)
4813213
@dependabot
Bump google.golang.org/protobuf from 1.30.0 to 1.31.0 (#1665)
4d868a4 
Bumps google.golang.org/protobuf from 1.30.0 to 1.31.0.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump github.com/envoyproxy/protoc-gen-validate from 1.0.1 to 1.0.2 (#…
cbe6b84 
…1670)

Bumps [github.com/envoyproxy/protoc-gen-validate](https://github.com/envoyproxy/protoc-gen-validate) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/envoyproxy/protoc-gen-validate/releases)
- [Changelog](https://github.com/bufbuild/protoc-gen-validate/blob/main/.goreleaser.yaml)
- [Commits](bufbuild/protoc-gen-validate@v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: github.com/envoyproxy/protoc-gen-validate
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jp-imx
Added DEBUG logs to executor in order to track allow and block lists (#…
1ab1a31 
…1664)

* Added DEBUG level log lines when the transaction or deployment allowlists are applied to reject a transaction

* Added blank lines for linting
@Stefan-Ethernal
Fix flaky ERC721 and ERC1155 bridge tests (#1671)
1bfb902
@jelacamarko @Stefan-Ethernal @igorcrevar
Invoke estimate gas limit if gas limit not already provided (#1582)
bb8f77c 
* Invoke estimate gas limit if gas limit not already provided

* Added sender address in txn. Needed for estimateGasLimit

* Fixed failing e2e tests

* Provide fix gas limit for exit transaction (pass child chain mintable e2e test)

* Fix failing E2E tests

* uint64 to big.int change

---------

Co-authored-by: Stefan Negovanović <stefan@ethernal.tech>
Co-authored-by: Igor Crevar <crewce@gmail.com>
@criadoperez
Upgraded script to check both dependencies and display all missing on…
36fa7a6 
…es at the same time (#1667)
@stana-miric
Merge v1.0.0 into feat-zero
9c011da
@stana-miric stana-miric requested a review from a team July 4, 2023 11:50
@stana-miric stana-miric self-assigned this Jul 4, 2023
vcastellm
vcastellm approved these changes Jul 4, 2023
View reviewed changes
Copy link
Contributor

@vcastellm vcastellm left a comment

Choose a reason for hiding this comment

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

LGTM? 😄

@stana-miric stana-miric merged commit 575d1ed into feat-zero Jul 4, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Jul 4, 2023
@vcastellm vcastellm deleted the EVM-727-merge-1-0-into-zero-feat branch August 2, 2023 09:30
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@vcastellm vcastellm vcastellm approved these changes

@rachit77 rachit77 rachit77 approved these changes

Assignees

@stana-miric stana-miric

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.