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

develop -> main #430

Merged
merged 94 commits into from
May 26, 2023
Merged

develop -> main #430

merged 94 commits into from
May 26, 2023

Conversation

ARR552
Copy link
Contributor

@ARR552 ARR552 commented May 26, 2023

What does this PR do?

Merge develop into main

Reviewers

cool-develope and others added 30 commits January 19, 2023 05:42
* wip

* config scirpt

* add ga

* improve mt db operations

* lint fixing

* refactor the mt

* dbTx from synchronizer

* reflect suggestions
* separate bridge service interface from ctrl

* wip

* fix test

* comments

* small fix
* new smc without genesis

* fix node conf

* genesis + network update

* fix config

* fix accounts

* fix node version

* linter
* update the sibling

* small updates

* more comments

* remove unnecessary comments
* indexes + migration test utils

* uncomment migration helper

* add migration tests

* sepcify schema

---------

Co-authored-by: Cool Developer <[email protected]>
Co-authored-by: cool-developer <[email protected]>
* new smc

* update docker images

* linter

* fix e2e

* fix genesis + prover conf

* new genesis and addresses

* genesis fix

* fix node GenBlockNum

* fix proxy event executor

* node version

* mtHeight as constant
Add a cache to the bridge service to reduce read accesses in getProof
* support new smc and node fflonk

* etherman test

* node config

* addresses + node v0.0.3-RC4

* new config values

* revert time increase

---------

Co-authored-by: Cool Developer <[email protected]>
* Feature/smc fork (#304)

* new smc

* update docker images

* linter

* fix e2e

* fix genesis + prover conf

* new genesis and addresses

* genesis fix

* fix node GenBlockNum

* fix proxy event executor

* node version

* mtHeight as constant

* fix forced batches check (#314)

* fix forced batches check

* fix test

* release workflow (#305)

* Feature/fflonk smc (#316)

* support new smc and node fflonk

* etherman test

* go 1.18

* fix node config

* addresses + node v0.0.3-RC4

* new config values

* increase timeouts

* revert time increase

---------

Co-authored-by: Cool Developer <[email protected]>

---------

Co-authored-by: Cool Developer <[email protected]>
…320)

Bumps [github.com/grpc-ecosystem/grpc-gateway/v2](https://github.com/grpc-ecosystem/grpc-gateway) from 2.14.0 to 2.15.1.
- [Release notes](https://github.com/grpc-ecosystem/grpc-gateway/releases)
- [Changelog](https://github.com/grpc-ecosystem/grpc-gateway/blob/main/.goreleaser.yml)
- [Commits](grpc-ecosystem/grpc-gateway@v2.14.0...v2.15.1)

---
updated-dependencies:
- dependency-name: github.com/grpc-ecosystem/grpc-gateway/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Fix synchronization when bridge is ahead of the trusted state due to a forkID
acroca and others added 22 commits May 18, 2023 10:44
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.2 to 1.8.3.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.8.2...v1.8.3)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
…velop/github.com/stretchr/testify-1.8.3

Bump github.com/stretchr/testify from 1.8.2 to 1.8.3
Co-authored-by: Alonso Rodriguez <[email protected]>
Copied versioning system from zkevm-node
…etwork-id

Use the network ID when updating L2 deposits
* fix ignore deposit if fails during gasestimation

* log

* suggestion
@ARR552 ARR552 requested review from acroca and ToniRamirezM May 26, 2023 08:23
@cla-bot cla-bot bot added the cla-signed label May 26, 2023
@ARR552 ARR552 changed the title Fix/main develop -> main May 26, 2023
@ARR552 ARR552 merged commit 74b2905 into main May 26, 2023
@ARR552 ARR552 deleted the fix/main branch May 26, 2023 08:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants