Merge upstream 20231030 #76

jyellick · 2023-10-30T17:49:39Z

$  git diff --name-only HEAD^|grep -ve '\.\(md\|go\|png\|mod\|sum\)$'
.circleci/config.yml
.github/CODEOWNERS
.gitmodules
.nvmrc
Makefile
bedrock-devnet/devnet/__init__.py
codecov.yml
docker-bake.hcl
indexer/migrations/20230523_create_schema.sql
op-batcher/Dockerfile
op-chain-ops/genesis/testdata/test-deploy-config-full.json
op-challenger/Dockerfile
op-heartbeat/Dockerfile
op-node/Dockerfile
op-program/Dockerfile
op-proposer/Dockerfile
op-service/rethdb-reader/.gitignore
op-service/rethdb-reader/Cargo.lock
op-service/rethdb-reader/Cargo.toml
op-service/rethdb-reader/headgen.sh
op-service/rethdb-reader/src/lib.rs
op-service/rethdb-reader/src/receipts.rs
op-service/sources/testdata/data/blocks/post-shanghai-bad-receipts_data.json
op-service/sources/testdata/data/blocks/post-shanghai-bad-receipts_metadata.json
op-service/sources/testdata/data/blocks/post-shanghai-bad-transactions_data.json
op-service/sources/testdata/data/blocks/post-shanghai-bad-transactions_metadata.json
op-service/sources/testdata/data/blocks/post-shanghai-bad-withdrawals_data.json
op-service/sources/testdata/data/blocks/post-shanghai-bad-withdrawals_metadata.json
op-service/sources/testdata/data/blocks/post-shanghai-success_data.json
op-service/sources/testdata/data/blocks/post-shanghai-success_metadata.json
op-service/sources/testdata/data/blocks/pre-shanghai-bad-receipts_data.json
op-service/sources/testdata/data/blocks/pre-shanghai-bad-receipts_metadata.json
op-service/sources/testdata/data/blocks/pre-shanghai-bad-transactions_data.json
op-service/sources/testdata/data/blocks/pre-shanghai-bad-transactions_metadata.json
op-service/sources/testdata/data/blocks/pre-shanghai-success_data.json
op-service/sources/testdata/data/blocks/pre-shanghai-success_metadata.json
op-service/sources/testdata/data/headers/post-shanghai-bad-receipts_data.json
op-service/sources/testdata/data/headers/post-shanghai-bad-receipts_metadata.json
op-service/sources/testdata/data/headers/post-shanghai-bad-transactions_data.json
op-service/sources/testdata/data/headers/post-shanghai-bad-transactions_metadata.json
op-service/sources/testdata/data/headers/post-shanghai-bad-withdrawals_data.json
op-service/sources/testdata/data/headers/post-shanghai-bad-withdrawals_metadata.json
op-service/sources/testdata/data/headers/post-shanghai-success_data.json
op-service/sources/testdata/data/headers/post-shanghai-success_metadata.json
op-service/sources/testdata/data/headers/pre-shanghai-bad-receipts_data.json
op-service/sources/testdata/data/headers/pre-shanghai-bad-receipts_metadata.json
op-service/sources/testdata/data/headers/pre-shanghai-bad-transactions_data.json
op-service/sources/testdata/data/headers/pre-shanghai-bad-transactions_metadata.json
op-service/sources/testdata/data/headers/pre-shanghai-success_data.json
op-service/sources/testdata/data/headers/pre-shanghai-success_metadata.json
op-service/sources/testdata/gen.sh
op-wheel/Dockerfile
ops-bedrock/docker-compose.yml
ops/docker/Dockerfile.packages
ops/docker/ci-builder/Dockerfile
ops/scripts/ci-match-values-between-files.sh
ops/tag-service/tag-service.py
package.json
packages/chain-mon/package.json
packages/common-ts/package.json
packages/common-ts/src/base-service/base-service-v2.ts
packages/contracts-bedrock/.gas-snapshot
packages/contracts-bedrock/.gitignore
packages/contracts-bedrock/deploy-config/devnetL1-template.json
packages/contracts-bedrock/deploy-config/getting-started.json
packages/contracts-bedrock/deploy-config/goerli.json
packages/contracts-bedrock/deploy-config/hardhat.json
packages/contracts-bedrock/package.json
packages/contracts-bedrock/scripts/Deploy.s.sol
packages/contracts-bedrock/scripts/outputs/DeleteOutput.s.sol
packages/contracts-bedrock/scripts/upgrades/EASUpgrade.s.sol
packages/contracts-bedrock/semver-lock.json
packages/contracts-bedrock/src/Safe/LivenessGuard.sol
packages/contracts-bedrock/src/Safe/LivenessModule.sol
packages/contracts-bedrock/src/Safe/SafeSigners.sol
packages/contracts-bedrock/test/AddressAliasHelper.t.sol
packages/contracts-bedrock/test/AdminFaucetAuthModule.t.sol
packages/contracts-bedrock/test/AssetReceiver.t.sol
packages/contracts-bedrock/test/AttestationStation.t.sol
packages/contracts-bedrock/test/BenchmarkTest.t.sol
packages/contracts-bedrock/test/Bytes.t.sol
packages/contracts-bedrock/test/CheckBalanceHigh.t.sol
packages/contracts-bedrock/test/CheckBalanceLow.t.sol
packages/contracts-bedrock/test/CheckGelatoLow.t.sol
packages/contracts-bedrock/test/CheckTrue.t.sol
packages/contracts-bedrock/test/Clones.t.sol
packages/contracts-bedrock/test/CommonTest.t.sol
packages/contracts-bedrock/test/CrossDomainMessenger.t.sol
packages/contracts-bedrock/test/CrossDomainOwnable.t.sol
packages/contracts-bedrock/test/CrossDomainOwnable2.t.sol
packages/contracts-bedrock/test/CrossDomainOwnable3.t.sol
packages/contracts-bedrock/test/DelayedVetoable.t.sol
packages/contracts-bedrock/test/DeployerWhitelist.t.sol
packages/contracts-bedrock/test/DisputeGameFactory.t.sol
packages/contracts-bedrock/test/Drippie.t.sol
packages/contracts-bedrock/test/Encoding.t.sol
packages/contracts-bedrock/test/Faucet.t.sol
packages/contracts-bedrock/test/FaultDisputeGame.t.sol
packages/contracts-bedrock/test/FeeVault.t.sol
packages/contracts-bedrock/test/GasPriceOracle.t.sol
packages/contracts-bedrock/test/GovernanceToken.t.sol
packages/contracts-bedrock/test/Hashing.t.sol
packages/contracts-bedrock/test/Helpers.sol
packages/contracts-bedrock/test/L1Block.t.sol
packages/contracts-bedrock/test/L1BlockNumber.t.sol
packages/contracts-bedrock/test/L1CrossDomainMessenger.t.sol
packages/contracts-bedrock/test/L1ERC721Bridge.t.sol
packages/contracts-bedrock/test/L1StandardBridge.t.sol
packages/contracts-bedrock/test/L2CrossDomainMessenger.t.sol
packages/contracts-bedrock/test/L2ERC721Bridge.t.sol
packages/contracts-bedrock/test/L2OutputOracle.t.sol
packages/contracts-bedrock/test/L2StandardBridge.t.sol
packages/contracts-bedrock/test/L2ToL1MessagePasser.t.sol
packages/contracts-bedrock/test/LegacyERC20ETH.t.sol
packages/contracts-bedrock/test/LegacyMessagePasser.t.sol
packages/contracts-bedrock/test/LibClock.t.sol
packages/contracts-bedrock/test/LibPosition.t.sol
packages/contracts-bedrock/test/LivenessGuard.t.sol
packages/contracts-bedrock/test/LivenessModule.t.sol
packages/contracts-bedrock/test/MerkleTrie.t.sol
packages/contracts-bedrock/test/MintManager.t.sol
packages/contracts-bedrock/test/OptimismMintableERC20.t.sol
packages/contracts-bedrock/test/OptimismMintableERC20Factory.t.sol
packages/contracts-bedrock/test/OptimismMintableERC721.t.sol
packages/contracts-bedrock/test/OptimismMintableERC721Factory.t.sol
packages/contracts-bedrock/test/OptimismPortal.t.sol
packages/contracts-bedrock/test/Optimist.t.sol
packages/contracts-bedrock/test/OptimistAllowlist.t.sol
packages/contracts-bedrock/test/OptimistInviter.t.sol
packages/contracts-bedrock/test/ProtocolVersions.t.sol
packages/contracts-bedrock/test/Proxy.t.sol
packages/contracts-bedrock/test/ProxyAdmin.t.sol
packages/contracts-bedrock/test/RLP.t.sol
packages/contracts-bedrock/test/RLPReader.t.sol
packages/contracts-bedrock/test/RLPWriter.t.sol
packages/contracts-bedrock/test/ResolvedDelegateProxy.t.sol
packages/contracts-bedrock/test/ResourceMetering.t.sol
packages/contracts-bedrock/test/SafeCall.t.sol
packages/contracts-bedrock/test/SafeSigners.t.sol
packages/contracts-bedrock/test/Semver.t.sol
packages/contracts-bedrock/test/SequencerFeeVault.t.sol
packages/contracts-bedrock/test/StandardBridge.t.sol
packages/contracts-bedrock/test/SystemConfig.t.sol
packages/contracts-bedrock/test/Transactor.t.sol
packages/contracts-bedrock/test/TransferOnion.t.sol
packages/contracts-bedrock/test/invariants/AddressAliasHelper.t.sol
packages/contracts-bedrock/test/invariants/Burn.Eth.t.sol
packages/contracts-bedrock/test/invariants/Burn.Gas.t.sol
packages/contracts-bedrock/test/invariants/CrossDomainMessenger.t.sol
packages/contracts-bedrock/test/invariants/Encoding.t.sol
packages/contracts-bedrock/test/invariants/Hashing.t.sol
packages/contracts-bedrock/test/invariants/L2OutputOracle.t.sol
packages/contracts-bedrock/test/invariants/OptimismPortal.t.sol
packages/contracts-bedrock/test/invariants/ResourceMetering.t.sol
packages/contracts-bedrock/test/invariants/SafeCall.t.sol
packages/contracts-bedrock/test/invariants/SystemConfig.t.sol
packages/contracts-bedrock/test/safe-tools/CompatibilityFallbackHandler_1_3_0.sol
packages/contracts-bedrock/test/safe-tools/SafeTestTools.sol
packages/contracts-ts/package.json
packages/core-utils/package.json
packages/fee-estimation/package.json
packages/sdk/hardhat.config.ts
packages/sdk/package.json
packages/sdk/tasks/deposit-erc20.ts
packages/sdk/tasks/deposit-eth.ts
packages/web3js-plugin/package.json
pnpm-lock.yaml
proxyd/Dockerfile.ignore

…ndabot/npm_and_yarn/hardhat-2.18.3 build(deps-dev): bump hardhat from 2.18.2 to 2.18.3

Set a pseudorandom `block.number` when fuzzing the `OptimismPortal` deposit transaction codepath. This is a small fix required for the migration to using the deploy script to set up the unit tests. This prevents underflows with computing the `_prevBlockNum` and also adds additional converage since previously the block number was not being set dynamically. Breaking this out into its own smaller PR so that the deploy script migration can be smaller.

…ndabot/npm_and_yarn/nx-17.0.2 build(deps-dev): bump nx from 17.0.1 to 17.0.2

…pe/op-service-http-latency-metric feat(op-service): new http latency metric

…et-ci-speed devnet: devnet-test and CI improvements

…ndabot/npm_and_yarn/viem-1.17.1 build(deps): bump viem from 1.16.6 to 1.17.1

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.8.8 to 20.8.9. - [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-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Some tests are failing because the challenger can't generate the cannon trace before the timeout. Better to have long timeouts than flaky tests.

…ncrease-cannon-timeoutes op-e2e: Increase timeouts for cannon

Avoids leaving a background function running that could trigger logging.

…portal-fuzz-bn contracts-bedrock: pseudorandom blocknumber in portal fuzz test

Migrate to the modern import style in the tests where the path relative from the project root is used. This makes the code much more portable and easier to modify without the dot dot syntax. There should be very little old relative style imports left in the codebase if any. There are no functional changes with this commit.

This code is no longer used so we should delete it to reduce compile times slightly. It is a library for computing contract addresses, taken from the solmate issues. It may be in modern versions of solmate if we ever end up needing it again.

All upgraes in the future will go through the `superchain-ops` repo. Delete this script to reduce compile time of the contracts. All new chains will have EAS in their genesis. Chains that do not have EAS already should use the `superchain-ops` repo to create a deploy script.

We have migrated to using `superchain-ops` for any sort of safe interactions. This code will likely need to be ported over to the `superchain-ops` repo in the future. It is not necessary for now, so delete it.

This mirrors a change to the L2 block builder to wait for the tx pool to have a processable transaction. The txpool does promotion async so a simple check leads to race conditions. Fixes intermittency in TestFinalizeWhileSyncing

…onitor-unsubscribe op-challenger: Unsubscribe from l1 heads on shutdown

This does several things to enable Canyon 1. Update to op-geth which has all canyon changes enabled in it 2. Thread the new 1559 config change through the devnet config 3. Fix some EIP-1559 calculations where were use CalcBaseFee 4. Add the PostCanyonDenominator in several deploy configs

…1-miner-wait op-e2e: Add waiter to ActL1IncludeTx

Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.28.1 to 1.29.0. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.28.1...v1.29.0) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [gorm.io/driver/postgres](https://github.com/go-gorm/postgres) from 1.5.3 to 1.5.4. - [Commits](go-gorm/postgres@v1.5.3...v1.5.4) --- updated-dependencies: - dependency-name: gorm.io/driver/postgres dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: Adrian Sutton <[email protected]>

…i-check

…ar/client-pod-issue-131/initializer-ci-check Issue 131: Verify Initializer Values in Contract & Genesis Match

…ci-builder-go-version-envvar ci-builder: go version env var

…-batch-derivation Span batch derivation [by Test In Prod, rebased on develop, see ethereum-optimism#7289]

The other 2 compiler versions are included in `ci-builder` so we should also include `0.8.19`. This will save us from needing to download the compiler in CI many times. The following lines are logged in CI: ``` 3[2K[⠆]3[2Ktalling solc version 0.8.19[⠰]3[2Ktalling solc version 0.8.19[⠔] Installing solc version 0.8.19 3[2K[⠒]3[2Kcessfully installed solc 0.8.19[⠑] Successfully installed solc 0.8.19 ``` These lines are not logged for the other 2 solc versions that are included in `ci-builder` because they are already downloaded.

…-batch-batcher op-batcher: Span Batch Submission

…uilder/include-solc-19 ci-builder: include solc 0.8.19

codecov-commenter · 2023-10-30T19:28:11Z

We're currently processing your upload. This comment will be updated when the results are available.

…tream-20231030

Disable build-info in hardhat plug

…-optimism#12321) * feat: add superchain erc20 bridge (#61) * feat: add superchain erc20 bridge * fix: interfaces and versions * refactor: optimism superchain erc20 redesign (#62) * refactor: use oz upgradeable erc20 as dependency * chore: update interfaces * fix: tests based on changes * refactor: remove op as dependency * feat: add check for supererc20 bridge on modifier * chore: update tests and interfaces * chore: update stack vars name on test * chore: remove empty gitmodules file * chore: update superchain weth errors * test: add superchain erc20 bridge tests (#65) * test: add superchain erc20 bridge tests * test: add optimism superchain erc20 beacon tests * test: remove unnecessary test * test: tests fixes * test: tests fixes * chore: update missing bridge on natspec (#69) * chore: update missing bridge on natspec * fix: natspecs --------- Co-authored-by: agusduha <[email protected]> * fix: remove superchain erc20 base (#70) * refactor: update isuperchainweth (#71) --------- Co-authored-by: agusduha <[email protected]> * feat: rename mint/burn and add SuperchainERC20 (#74) * refactor: rename mint and burn functions on superchain erc20 * chore: rename optimism superchain erc20 to superchain erc20 * feat: create optimism superchain erc20 contract * chore: update natspec and errors * fix: superchain erc20 tests * refactor: make superchain erc20 abstract * refactor: move storage and erc20 metadata functions to implementation * chore: update interfaces * chore: update superchain erc20 events * fix: tests * fix: natspecs * fix: add semmver lock and snapshots * fix: remove unused imports * fix: natspecs --------- Co-authored-by: 0xDiscotech <[email protected]> * fix: refactor zero check (#76) * fix: pre pr * fix: semver natspec check failure (#79) * fix: semver natspec check failure * fix: ignore mock contracts in semver natspec script * fix: error message * feat: add crosschain erc20 interface (#80) * feat: add crosschain erc20 interface * fix: refactor interfaces * fix: superchain bridge natspec (#83) * fix: superchain weth natspec (#84) Co-authored-by: 0xng <[email protected]> Co-authored-by: 0xParticle <[email protected]> Co-authored-by: gotzenx <[email protected]> * fix: stop inheriting superchain interfaces (#85) * fix: stop inheriting superchain interfaces * fix: move events and erros into the implementation * fix: make superchainERC20 inherits from crosschainERC20 * fix: superchain bridge rename (#86) * fix: fee vault compiler error (#87) * fix: remove unused imports * fix: refactor common errors (#90) * fix: refactor common errors * fix: remove unused version * fix: reuse unauthorized error (#92) * fix: superchain erc20 factory conflicts * fix: rename crosschain functions (#94) --------- Co-authored-by: Disco <[email protected]> Co-authored-by: 0xng <[email protected]> Co-authored-by: 0xParticle <[email protected]> Co-authored-by: gotzenx <[email protected]>

) * feat: add superchain erc20 bridge (#61) * feat: add superchain erc20 bridge * fix: interfaces and versions * refactor: optimism superchain erc20 redesign (#62) * refactor: use oz upgradeable erc20 as dependency * chore: update interfaces * fix: tests based on changes * refactor: remove op as dependency * feat: add check for supererc20 bridge on modifier * chore: update tests and interfaces * chore: update stack vars name on test * chore: remove empty gitmodules file * chore: update superchain weth errors * test: add superchain erc20 bridge tests (#65) * test: add superchain erc20 bridge tests * test: add optimism superchain erc20 beacon tests * test: remove unnecessary test * test: tests fixes * test: tests fixes * chore: update missing bridge on natspec (#69) * chore: update missing bridge on natspec * fix: natspecs --------- Co-authored-by: agusduha <[email protected]> * fix: remove superchain erc20 base (#70) * refactor: update isuperchainweth (#71) --------- Co-authored-by: agusduha <[email protected]> * feat: rename mint/burn and add SuperchainERC20 (#74) * refactor: rename mint and burn functions on superchain erc20 * chore: rename optimism superchain erc20 to superchain erc20 * feat: create optimism superchain erc20 contract * chore: update natspec and errors * fix: superchain erc20 tests * refactor: make superchain erc20 abstract * refactor: move storage and erc20 metadata functions to implementation * chore: update interfaces * chore: update superchain erc20 events * fix: tests * fix: natspecs * fix: add semmver lock and snapshots * fix: remove unused imports * fix: natspecs --------- Co-authored-by: 0xDiscotech <[email protected]> * fix: refactor zero check (#76) * fix: pre pr * fix: semver natspec check failure (#79) * fix: semver natspec check failure * fix: ignore mock contracts in semver natspec script * fix: error message * feat: add crosschain erc20 interface (#80) * feat: add crosschain erc20 interface * fix: refactor interfaces * fix: superchain bridge natspec (#83) * fix: superchain weth natspec (#84) Co-authored-by: 0xng <[email protected]> Co-authored-by: 0xParticle <[email protected]> Co-authored-by: gotzenx <[email protected]> * fix: stop inheriting superchain interfaces (#85) * fix: stop inheriting superchain interfaces * fix: move events and erros into the implementation * fix: make superchainERC20 inherits from crosschainERC20 * fix: superchain bridge rename (#86) * fix: fee vault compiler error (#87) * fix: remove unused imports * fix: refactor common errors (#90) * fix: refactor common errors * fix: remove unused version * feat: add cross domain context function * fix: reuse unauthorized error (#92) * fix: superchain erc20 factory conflicts * fix: rename crosschain functions (#94) * chore: run pre-pr * chore: run pre-pr * fix: mocked calls on tests * feat: add cross domain message context function (#98) ---- Co-Authored-by: AgusDuha <[email protected]> --------- Co-authored-by: AgusDuha <[email protected]> Co-authored-by: agusduha <[email protected]> Co-authored-by: 0xng <[email protected]> Co-authored-by: 0xParticle <[email protected]> Co-authored-by: gotzenx <[email protected]>

* feat: SuperchainWETH redesign (#101) * feat: add superchain erc20 bridge (#61) * feat: add superchain erc20 bridge * fix: interfaces and versions * refactor: optimism superchain erc20 redesign (#62) * refactor: use oz upgradeable erc20 as dependency * chore: update interfaces * fix: tests based on changes * refactor: remove op as dependency * feat: add check for supererc20 bridge on modifier * chore: update tests and interfaces * chore: update stack vars name on test * chore: remove empty gitmodules file * chore: update superchain weth errors * test: add superchain erc20 bridge tests (#65) * test: add superchain erc20 bridge tests * test: add optimism superchain erc20 beacon tests * test: remove unnecessary test * test: tests fixes * test: tests fixes * chore: update missing bridge on natspec (#69) * chore: update missing bridge on natspec * fix: natspecs --------- Co-authored-by: agusduha <[email protected]> * fix: remove superchain erc20 base (#70) * refactor: update isuperchainweth (#71) --------- Co-authored-by: agusduha <[email protected]> * feat: rename mint/burn and add SuperchainERC20 (#74) * refactor: rename mint and burn functions on superchain erc20 * chore: rename optimism superchain erc20 to superchain erc20 * feat: create optimism superchain erc20 contract * chore: update natspec and errors * fix: superchain erc20 tests * refactor: make superchain erc20 abstract * refactor: move storage and erc20 metadata functions to implementation * chore: update interfaces * chore: update superchain erc20 events * fix: tests * fix: natspecs * fix: add semmver lock and snapshots * fix: remove unused imports * fix: natspecs --------- Co-authored-by: 0xDiscotech <[email protected]> * fix: refactor zero check (#76) * fix: pre pr * fix: semver natspec check failure (#79) * fix: semver natspec check failure * fix: ignore mock contracts in semver natspec script * fix: error message * feat: add crosschain erc20 interface (#80) * feat: add crosschain erc20 interface * fix: refactor interfaces * fix: superchain bridge natspec (#83) * fix: superchain weth natspec (#84) Co-authored-by: 0xng <[email protected]> Co-authored-by: 0xParticle <[email protected]> Co-authored-by: gotzenx <[email protected]> * fix: stop inheriting superchain interfaces (#85) * fix: stop inheriting superchain interfaces * fix: move events and erros into the implementation * fix: make superchainERC20 inherits from crosschainERC20 * fix: superchain bridge rename (#86) * fix: fee vault compiler error (#87) * fix: remove unused imports * fix: refactor common errors (#90) * fix: refactor common errors * fix: remove unused version * fix: reuse unauthorized error (#92) * fix: superchain erc20 factory conflicts * fix: rename crosschain functions (#94) * feat: superweth redesign * fix: pr fixes * fix: fixes post merge --------- Co-authored-by: Disco <[email protected]> Co-authored-by: 0xng <[email protected]> Co-authored-by: 0xParticle <[email protected]> Co-authored-by: gotzenx <[email protected]> * fix: SuperchainWETH redesign fixes (#110) * fix: superchainWETH redesign fixes * fix: withdraw arg * fix: fix revert in SuperchainWETH tests (#112) --------- Co-authored-by: AgusDuha <[email protected]> Co-authored-by: Disco <[email protected]> Co-authored-by: 0xng <[email protected]> Co-authored-by: 0xParticle <[email protected]> Co-authored-by: agusduha <[email protected]>

…rc20 implementation (ethereum-optimism#12476) * feat: add superchain erc20 bridge (#61) * feat: add superchain erc20 bridge * fix: interfaces and versions * refactor: optimism superchain erc20 redesign (#62) * refactor: use oz upgradeable erc20 as dependency * chore: update interfaces * fix: tests based on changes * refactor: remove op as dependency * feat: add check for supererc20 bridge on modifier * chore: update tests and interfaces * chore: update stack vars name on test * chore: remove empty gitmodules file * chore: update superchain weth errors * test: add superchain erc20 bridge tests (#65) * test: add superchain erc20 bridge tests * test: add optimism superchain erc20 beacon tests * test: remove unnecessary test * test: tests fixes * test: tests fixes * chore: update missing bridge on natspec (#69) * chore: update missing bridge on natspec * fix: natspecs --------- Co-authored-by: agusduha <[email protected]> * fix: remove superchain erc20 base (#70) * refactor: update isuperchainweth (#71) --------- Co-authored-by: agusduha <[email protected]> * feat: rename mint/burn and add SuperchainERC20 (#74) * refactor: rename mint and burn functions on superchain erc20 * chore: rename optimism superchain erc20 to superchain erc20 * feat: create optimism superchain erc20 contract * chore: update natspec and errors * fix: superchain erc20 tests * refactor: make superchain erc20 abstract * refactor: move storage and erc20 metadata functions to implementation * chore: update interfaces * chore: update superchain erc20 events * fix: tests * fix: natspecs * fix: add semmver lock and snapshots * fix: remove unused imports * fix: natspecs --------- Co-authored-by: 0xDiscotech <[email protected]> * fix: refactor zero check (#76) * fix: pre pr * chore: add new solady version and import it for erc20 * fix: undo forge std changes * chore: re run pre pr script * fix: semver natspec check failure (#79) * fix: semver natspec check failure * fix: ignore mock contracts in semver natspec script * fix: error message * feat: add crosschain erc20 interface (#80) * feat: add crosschain erc20 interface * fix: refactor interfaces * fix: superchain bridge natspec (#83) * fix: superchain weth natspec (#84) Co-authored-by: 0xng <[email protected]> Co-authored-by: 0xParticle <[email protected]> Co-authored-by: gotzenx <[email protected]> * fix: stop inheriting superchain interfaces (#85) * fix: stop inheriting superchain interfaces * fix: move events and erros into the implementation * fix: make superchainERC20 inherits from crosschainERC20 * fix: superchain bridge rename (#86) * fix: fee vault compiler error (#87) * fix: remove unused imports * chore: run pre-pr and update vendor interface * fix: refactor common errors (#90) * fix: refactor common errors * fix: remove unused version * feat: add permit2 on optimism superchain erc20 * chore: run pre-pr script * fix: reuse unauthorized error (#92) * fix: superchain erc20 factory conflicts * fix: rename crosschain functions (#94) * chore: run pre-pr * chore: run pre-pr * chore: run pre-pr * feat: add new tests on optimism superchain erc20 * fix: vars and params naming on newly added tests * fix: var name * feat: support permit2 on optimism superchain erc20 and upgrade solady's erc20 implementation (#97) --- Co-Authored-by: AgusDuha <[email protected]> * chore: use ierc20 alias for ierc20 solady interface (#108) --------- Co-authored-by: AgusDuha <[email protected]> Co-authored-by: agusduha <[email protected]> Co-authored-by: 0xng <[email protected]> Co-authored-by: 0xParticle <[email protected]> Co-authored-by: gotzenx <[email protected]>

felipe-op and others added 30 commits October 25, 2023 15:27

feat(op-service): new latency metric

4f78aa4

semgrep

3dff59f

add linear to todo

9789fa6

also to other todo

412ac55

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

c44d455

…ndabot/npm_and_yarn/hardhat-2.18.3 build(deps-dev): bump hardhat from 2.18.2 to 2.18.3

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

48a01da

…ndabot/npm_and_yarn/nx-17.0.2 build(deps-dev): bump nx from 17.0.1 to 17.0.2

Merge pull request ethereum-optimism#7852 from ethereum-optimism/feli…

e9ced79

…pe/op-service-http-latency-metric feat(op-service): new http latency metric

Merge pull request ethereum-optimism#7788 from ethereum-optimism/devn…

64a28a8

…et-ci-speed devnet: devnet-test and CI improvements

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

5032ad2

…ndabot/npm_and_yarn/viem-1.17.1 build(deps): bump viem from 1.16.6 to 1.17.1

op-e2e: Increase timeouts for cannon

c58bf1c

Some tests are failing because the challenger can't generate the cannon trace before the timeout. Better to have long timeouts than flaky tests.

Merge pull request ethereum-optimism#7857 from ethereum-optimism/aj/i…

f0d2d32

…ncrease-cannon-timeoutes op-e2e: Increase timeouts for cannon

op-challenger: Unsubscribe from l1 heads on shutdown

20fa6c5

Avoids leaving a background function running that could trigger logging.

Merge pull request ethereum-optimism#7842 from ethereum-optimism/ctb/…

2372c98

…portal-fuzz-bn contracts-bedrock: pseudorandom blocknumber in portal fuzz test

contracts-bedrock: delete dead rlp code

0ec7e15

This code is no longer used so we should delete it to reduce compile times slightly. It is a library for computing contract addresses, taken from the solmate issues. It may be in modern versions of solmate if we ever end up needing it again.

fix: string encode error TS2345

3d61fe8

op-bindings: regenerate

08c3a50

contracts-bedrock: delete dead delete output code

798f054

We have migrated to using `superchain-ops` for any sort of safe interactions. This code will likely need to be ported over to the `superchain-ops` repo in the future. It is not necessary for now, so delete it.

op-bindings: regenerate

bd23c0a

op-e2e: Add waiter to ActL1IncludeTx

329bec4

This mirrors a change to the L2 block builder to wait for the tx pool to have a processable transaction. The txpool does promotion async so a simple check leads to race conditions. Fixes intermittency in TestFinalizeWhileSyncing

Merge pull request ethereum-optimism#7859 from ethereum-optimism/aj/m…

c46093b

…onitor-unsubscribe op-challenger: Unsubscribe from l1 heads on shutdown

Merge pull request ethereum-optimism#7866 from ethereum-optimism/aj/l…

b4201bd

…1-miner-wait op-e2e: Add waiter to ActL1IncludeTx

ops: handle warm-up output case during docker publish correctly

9c0960c

Update packages/contracts-bedrock/deploy-config/devnetL1-template.json

0fc2b1d

Co-authored-by: Adrian Sutton <[email protected]>

mslipper and others added 9 commits October 30, 2023 00:19

Merge branch 'develop' into tushar/client-pod-issue-131/initializer-c…

72ac254

…i-check

Merge pull request ethereum-optimism#7874 from ethereum-optimism/tush…

06e048c

…ar/client-pod-issue-131/initializer-ci-check Issue 131: Verify Initializer Values in Contract & Genesis Match

Merge pull request ethereum-optimism#7888 from ethereum-optimism/fix/…

9599375

…ci-builder-go-version-envvar ci-builder: go version env var

Merge pull request ethereum-optimism#7621 from ethereum-optimism/span…

4bc28da

…-batch-derivation Span batch derivation [by Test In Prod, rebased on develop, see ethereum-optimism#7289]

derive: remove outdated channel-out TODOs

381bbb8

op-batcher: remove outdated comment

ea8ffec

Merge pull request ethereum-optimism#7290 from testinprod-io/tip/span…

515de0e

…-batch-batcher op-batcher: Span Batch Submission

Merge pull request ethereum-optimism#7925 from ethereum-optimism/ci-b…

4606212

…uilder/include-solc-19 ci-builder: include solc 0.8.19

jyellick force-pushed the jyellick/merge-upstream-20231030 branch 3 times, most recently from 587605b to 9dda4a6 Compare October 30, 2023 19:16

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

913e5c1

…tream-20231030

jyellick force-pushed the jyellick/merge-upstream-20231030 branch from 9dda4a6 to 913e5c1 Compare October 30, 2023 19:48

boyuan-chen and others added 3 commits October 31, 2023 10:12

Disable build-info in plug

46f9c8c

Merge pull request #79 from bobanetwork/disable-build-info

1d1fb24

Disable build-info in hardhat plug

Merge branch 'develop' into jyellick/merge-upstream-20231030

19bb4d1

jyellick marked this pull request as ready for review November 2, 2023 14:52

jyellick requested review from InoMurko, boyuan-chen and mmontour1306 November 2, 2023 14:52

InoMurko approved these changes Nov 2, 2023

View reviewed changes

boyuan-chen approved these changes Nov 2, 2023

View reviewed changes

jyellick merged commit a8aea0c into develop Nov 2, 2023

jyellick deleted the jyellick/merge-upstream-20231030 branch November 3, 2023 20:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge upstream 20231030 #76

Merge upstream 20231030 #76

jyellick commented Oct 30, 2023

codecov-commenter commented Oct 30, 2023 •

edited

Loading

Merge upstream 20231030 #76

Merge upstream 20231030 #76

Conversation

jyellick commented Oct 30, 2023

codecov-commenter commented Oct 30, 2023 • edited Loading

codecov-commenter commented Oct 30, 2023 •

edited

Loading