Merge upstream plus fixes 20230825 #30

jyellick · 2023-08-25T04:10:22Z

This is another large merge commit, complete with lots of conflict resolution.

The goal had been to merge upstream weekly, and, you'll actually find roughly weekly merge commits in this PR.

Unfortunately, test failures, and then other priorities failed to turn these initial merges into PRs.

This PR turns almost everything green, with the exception of some of the boba-bindings and boba-chain-ops. This may need to be addressed before merging, but I wanted to get this out there so that others could look at it and see the problems I'm describing.

It may be worth merging as is and cleaning up. Or, we may want to address some of these problems.

use env("DATABASE_URL")

…thereum-optimism#6918)

…by/ctb/game-type-parity feat(ctb): Preserve prod game type space

…tream-20230818

…-range

…apture-return-data op-e2e: Capture return value when tracing failed tx

…fy/unreachable simplify: remove unreachable code

…tream-20230821

…ndabot/go_modules/gorm.io/gorm-1.25.4 build(deps): bump gorm.io/gorm from 1.25.3 to 1.25.4

…the_docker-compose_file

…7-feat_indexer_Run_the_migrations_in_the_docker-compose_file feat(indexer): Run the migrations in the docker-compose file

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.28.0 to 2.28.1. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](import-js/eslint-plugin-import@v2.28.0...v2.28.1) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [husky](https://github.com/typicode/husky) from 6.0.0 to 8.0.3. - [Release notes](https://github.com/typicode/husky/releases) - [Commits](typicode/husky@v6.0.0...v8.0.3) --- updated-dependencies: - dependency-name: husky dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [web3-eth](https://github.com/ChainSafe/web3.js) from 4.0.3 to 4.1.1. - [Release notes](https://github.com/ChainSafe/web3.js/releases) - [Changelog](https://github.com/web3/web3.js/blob/4.x/CHANGELOG.md) - [Commits](web3/web3.js@v4.0.3...v4.1.1) --- updated-dependencies: - dependency-name: web3-eth dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [viem](https://github.com/wagmi-dev/viem) from 1.3.1 to 1.6.4. - [Release notes](https://github.com/wagmi-dev/viem/releases) - [Changelog](https://github.com/wagmi-dev/viem/blob/main/CHANGELOG.md) - [Commits](https://github.com/wagmi-dev/viem/compare/[email protected]@1.6.4) --- updated-dependencies: - dependency-name: viem dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

…reum-optimism#6921) Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.27.4 to 1.27.10. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.27.4...v1.27.10) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

* Start adding documentation. * Update README.md --------- Co-authored-by: Matthew Slipper <[email protected]>

…lock-sleep op-service: Add clock.SleepCtx method

…ck-range proxyd: add support for limiting max block range

Bumps [github.com/google/uuid](https://github.com/google/uuid) from 1.3.0 to 1.3.1. - [Release notes](https://github.com/google/uuid/releases) - [Changelog](https://github.com/google/uuid/blob/master/CHANGELOG.md) - [Commits](google/uuid@v1.3.0...v1.3.1) --- updated-dependencies: - dependency-name: github.com/google/uuid dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

This merge exercise has broken a number of the tests. But, because the merge effect keeps snowballing, trying to simply get this in and running and will unskip the failures as they are resolved.

…usptream-plus-fixes-20230821

…hallenger-parallel op-challenger: Play games in parallel

…tream-plus-fixes-20230821

Fix boba components

boyuan-chen · 2023-08-25T20:22:04Z

@jyellick make devnet-up doesn't work on my end.

mmontour1306 · 2023-08-25T20:33:22Z

I get an error on "make devnet-up":
"failed to write to "/home/enya/v3-boba/optimism/packages/contracts-bedrock/deployments/devnetL1/.chainId": No such file or directory (os error 2)"

Creating the directory manually before running the command allows it to proceed.

mmontour1306 · 2023-08-25T20:43:42Z

Also, "packages/contracts-bedrock/deploy-config/devnetL1.json" is checked into git but it's modified by running the devnet-up script (setting a new l1GenesisBlockTimestamp). Maybe we can have a read-only template checked into source control, and a .gitignore rule for the auto-generated version?

mmontour1306

I made a couple of small comments above, but overall if you are happy with it then I would say to merge it and clean up any remaining issues later.

jyellick · 2023-08-28T13:12:28Z

Merging as there seems to be a consensus to do so.

@boyuan-chen How does make devnet-up fail on your end? This works fine on my system. I did find that I needed to do a: make nuke, then make, then make devnet-up in some cases.

@mmontour1306 I too have noticed the devnetL1 json file getting a new timestamp, this may be simply an upstream quirk, but I'll investigate.

Will Cory and others added 30 commits August 21, 2023 08:23

fix(indexer): Run docker-compose for indexer correctly

d9b943a

fix(indexer): Fix api docker-compose config

7380b85

fix(indexer): Update prisma schema to latest

cda3e08

use env("DATABASE_URL")

chore: Remove gateway ui

5a2950d

op-challenger: Use game specific data dir for cannon trace provider (e…

d2b14ac

…thereum-optimism#6918)

Merge branch 'develop' into aj/capture-return-data

c13a4f8

Merge pull request ethereum-optimism#6909 from ethereum-optimism/clab…

bcfbee5

…by/ctb/game-type-parity feat(ctb): Preserve prod game type space

Merge branch 'develop' into aj/capture-return-data

5502ea9

Merge remote-tracking branch 'origin/develop' into jyellick/merge-ups…

825958c

…tream-20230818

proxyd: add support for limiting max block range

0378f71

Merge remote-tracking branch 'upstream/develop' into proxyd-max-block…

96c4f91

…-range

Merge pull request ethereum-optimism#6919 from ethereum-optimism/aj/c…

e0edd60

…apture-return-data op-e2e: Capture return value when tracing failed tx

Merge branch 'develop' into simplify/unreachable

9d70cfe

Merge pull request ethereum-optimism#6925 from bryanchriswhite/simpli…

e9bb919

…fy/unreachable simplify: remove unreachable code

Merge branch 'develop' into dependabot/go_modules/gorm.io/gorm-1.25.4

9eac826

Merge remote-tracking branch 'origin/develop' into jyellick/merge-ups…

eadbb0b

…tream-20230821

Merge pull request ethereum-optimism#6922 from ethereum-optimism/depe…

4570f8c

…ndabot/go_modules/gorm.io/gorm-1.25.4 build(deps): bump gorm.io/gorm from 1.25.3 to 1.25.4

Merge branch 'develop' into 08-17-feat_indexer_Run_the_migrations_in_…

200a255

…the_docker-compose_file

Merge pull request ethereum-optimism#6858 from ethereum-optimism/08-1…

b1b8b5f

…7-feat_indexer_Run_the_migrations_in_the_docker-compose_file feat(indexer): Run the migrations in the docker-compose file

feat(docs): Setup Documentation (ethereum-optimism#6907)

30ec2d8

* Start adding documentation. * Update README.md --------- Co-authored-by: Matthew Slipper <[email protected]>

Merge branch 'develop' into aj/clock-sleep

3927b1d

Merge pull request ethereum-optimism#6916 from ethereum-optimism/aj/c…

41bcf7b

…lock-sleep op-service: Add clock.SleepCtx method

Merge branch 'develop' into proxyd-max-block-range

c30d58c

Merge pull request ethereum-optimism#6686 from mdehoog/proxyd-max-blo…

25a054f

…ck-range proxyd: add support for limiting max block range

jyellick force-pushed the jyellick/merge-usptream-plus-fixes-20230821 branch from 49de5f5 to 59e92ed Compare August 25, 2023 04:19

jyellick added 2 commits August 25, 2023 00:21

Re-enable erigon in CI, skip failing tests

3bf43c1

This merge exercise has broken a number of the tests. But, because the merge effect keeps snowballing, trying to simply get this in and running and will unskip the failures as they are resolved.

Merge remote-tracking branch 'boba/boba-develop' into jyellick/merge-…

fc57aa8

…usptream-plus-fixes-20230821

jyellick force-pushed the jyellick/merge-usptream-plus-fixes-20230821 branch from 59e92ed to fc57aa8 Compare August 25, 2023 04:23

ajsutton and others added 4 commits August 25, 2023 14:31

op-challenger: Play games in parallel

5857f61

op-challenger: Fix test

55ea76d

Merge branch 'develop' into aj/challenger-parallel

e30fd4e

Merge pull request ethereum-optimism#7017 from ethereum-optimism/aj/c…

9656269

…hallenger-parallel op-challenger: Play games in parallel

jyellick force-pushed the jyellick/merge-usptream-plus-fixes-20230821 branch from 1addb8f to 3330a30 Compare August 25, 2023 14:26

jyellick added 2 commits August 25, 2023 10:58

Merge remote-tracking branch 'origin/develop' into jyellick/merge-usp…

2a87604

…tream-plus-fixes-20230821

Add test skips for go-e2e to CI

21889ca

jyellick force-pushed the jyellick/merge-usptream-plus-fixes-20230821 branch from 3330a30 to 21889ca Compare August 25, 2023 14:58

jyellick changed the title ~~Merge upstream plus fixes 20230821~~ Merge upstream plus fixes 20230825 Aug 25, 2023

boyuan-chen and others added 6 commits August 25, 2023 11:24

Fix deployment

3725c8e

Add MetaData type

9d860d9

Update CI/CD

a1f6e55

Remove boba container

f3e4c64

Update bytecode

2b6675c

Merge pull request #31 from bobanetwork/fix-boba-op

cc1ea91

Fix boba components

boyuan-chen requested review from boyuan-chen and mmontour1306 August 25, 2023 20:13

mmontour1306 approved these changes Aug 25, 2023

View reviewed changes

boyuan-chen approved these changes Aug 25, 2023

View reviewed changes

InoMurko approved these changes Aug 26, 2023

View reviewed changes

jyellick merged commit 4f2f886 into boba-develop Aug 28, 2023

jyellick deleted the jyellick/merge-usptream-plus-fixes-20230821 branch September 1, 2023 13:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge upstream plus fixes 20230825 #30

Merge upstream plus fixes 20230825 #30

jyellick commented Aug 25, 2023

boyuan-chen commented Aug 25, 2023

mmontour1306 commented Aug 25, 2023

mmontour1306 commented Aug 25, 2023

mmontour1306 left a comment

jyellick commented Aug 28, 2023

Merge upstream plus fixes 20230825 #30

Merge upstream plus fixes 20230825 #30

Conversation

jyellick commented Aug 25, 2023

boyuan-chen commented Aug 25, 2023

mmontour1306 commented Aug 25, 2023

mmontour1306 commented Aug 25, 2023

mmontour1306 left a comment

Choose a reason for hiding this comment

jyellick commented Aug 28, 2023