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 upstream ci builder #64

Merged
merged 154 commits into from
Oct 6, 2023
Merged

Conversation

jyellick
Copy link

@jyellick jyellick commented Oct 5, 2023

This brings in the upstream code through the merge of the latest ci-builder changes.

The merge is being split into multiple pieces, because first we must get the repo into a state where it's ready for the new CI builder (the previous PR #63), then to a state where we can release the new CI builder (this PR), and finally back up to date utilizing the new CI builder (the next PR).

Rather than trying to cherry-pick out only the CI-builder changes, this PR brings us up to a point in Optimism's history by merging all previous commits as well.

Ignoring the markdown, go, png, go.mod/go.sum changes, this PR includes:

$ git diff --name-only HEAD^|grep -ve '\.\(md\|go\|png\|mod\|sum\)$'
.circleci/config.yml
.gitmodules
.semgrepignore
Makefile
indexer/Dockerfile
indexer/api-ts/generated.ts
indexer/api-ts/indexer.cjs
indexer/api-ts/indexer.cjs.map
indexer/api-ts/indexer.js
indexer/api-ts/indexer.js.map
indexer/api-ts/indexer.spec.ts
indexer/api-ts/indexer.ts
indexer/api-ts/package.json
indexer/api-ts/tsconfig.json
op-bindings/artifacts.json
op-bootnode/Makefile
ops-bedrock/Dockerfile.l1
ops/check-changed/main.py
ops/docker/ci-builder/Dockerfile
package.json
packages/common-ts/package.json
packages/contracts-bedrock/.gas-snapshot
packages/contracts-bedrock/deploy-config/internal-devnet.json
packages/contracts-bedrock/deployments/internal-devnet/ProtocolVersions.json
packages/contracts-bedrock/deployments/internal-devnet/ProtocolVersionsProxy.json
packages/contracts-bedrock/foundry.toml
packages/contracts-bedrock/lib/safe-contracts
packages/contracts-bedrock/scripts/Deploy.s.sol
packages/contracts-bedrock/semver-lock.json
packages/contracts-bedrock/src/L1/DelayedVetoable.sol
packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol
packages/contracts-bedrock/src/dispute/lib/LibHashing.sol
packages/contracts-bedrock/src/libraries/DisputeErrors.sol
packages/contracts-bedrock/test/DelayedVetoable.t.sol
packages/contracts-bedrock/test/FaultDisputeGame.t.sol
packages/core-utils/src/external/geth/geth-types.ts
packages/core-utils/src/external/geth/index.ts
packages/core-utils/src/external/index.ts
pnpm-lock.yaml
pnpm-workspace.yaml
ufm-test-services/docker-compose.yml
ufm-test-services/grafana/dashboards/metamask.json
ufm-test-services/grafana/provisioning/dashboards/all.yml
ufm-test-services/grafana/provisioning/datasources/datasources.yml
ufm-test-services/metamask/package.json
ufm-test-services/metamask/pnpm-lock.yaml
ufm-test-services/metamask/tests/metamask.spec.ts
ufm-test-services/metamask/tests/prometheusUtils.ts
ufm-test-services/prometheus.yml

Note especially the contract changes in your review. These changes look benign to me, related only to the dispute games, but as usual, I am not a solidity expert so please scrutinize anyway.

dependabot bot and others added 30 commits September 14, 2023 17:38
Bumps [eslint-plugin-unicorn](https://github.com/sindresorhus/eslint-plugin-unicorn) from 42.0.0 to 48.0.1.
- [Release notes](https://github.com/sindresorhus/eslint-plugin-unicorn/releases)
- [Commits](sindresorhus/eslint-plugin-unicorn@v42.0.0...v48.0.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-unicorn
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.5.0 to 20.6.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Fixes a bug where the host incorrectly informs the client that a
custom chain config is in use. The client then attempts to read the
chain config pre-image data. However, this pre-image data will not be
available in on-chain contexts.
…sm#7283)

Bumps ethereum/client-go from v1.13.0 to v1.13.1.

---
updated-dependencies:
- dependency-name: ethereum/client-go
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…4-fix_indexer_Fix_uri_util

fix(indexer): Fix uri util
…ndabot/npm_and_yarn/types/node-20.6.1

build(deps-dev): bump @types/node from 20.5.0 to 20.6.1
OptimismBot and others added 24 commits September 21, 2023 00:20
…4-chore_indexer_remove_indexer_all_command

chore(indexer): remove indexer all command
…ndabot/npm_and_yarn/types/node-20.6.3

build(deps-dev): bump @types/node from 20.5.0 to 20.6.3
Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 0.34.1 to 0.34.4.
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Commits](https://github.com/vitest-dev/vitest/commits/v0.34.4/packages/vitest)

---
updated-dependencies:
- dependency-name: vitest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [glob](https://github.com/isaacs/node-glob) from 10.3.3 to 10.3.5.
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md)
- [Commits](isaacs/node-glob@v10.3.3...v10.3.5)

---
updated-dependencies:
- dependency-name: glob
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
…ndabot/npm_and_yarn/vitest-0.34.4

build(deps-dev): bump vitest from 0.34.1 to 0.34.4
…ndabot/npm_and_yarn/glob-10.3.5

build(deps-dev): bump glob from 10.3.3 to 10.3.5
…oy-devnet-protocol-versions

contracts-bedrock: internal devnet ProtocolVersions deployment
…ndabot/npm_and_yarn/envalid-8.0.0

build(deps): bump envalid from 7.3.1 to 8.0.0
…te-libp2p

go: update libp2p to fix Go 1.21 build
Updates to the following commit: ethereum-optimism/superchain-registry@413695c
This contains the changes required for the safe bundler tooling.
These geth types are legacy code and not being updated along
with the definitions of the geth types. They were used in
old regenesis events. They are not used elsewhere in the monorepo,
keeping them around only adds tech debt.
…/superchain-registry

deps: update superchain registry in go.mod
…/delete-dead-geth-types

core-utils: delete unmaintained geth types
@jyellick jyellick merged commit 21251fd into develop Oct 6, 2023
@jyellick jyellick deleted the jyellick/merge-upstream-ci-builder branch November 6, 2023 14:39
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.