Merge branch 'develop' into ci/check-op-node

.changeset/curly-spies-switch.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Fix build for smaller package

.changeset/slimy-spoons-repair.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+bedrock-goerli-96f44f79 deployment

.changeset/wet-doors-collect.md

+---
+'@eth-optimism/integration-tests': patch
+---
+
+Modularize the itests away from depending on api of messenger

.changeset/wet-suns-develop.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Fix typechain exports

Makefile

@@ -93,3 +93,7 @@ semgrep:
 	$(eval DEV_REF := $(shell git rev-parse develop))
 	SEMGREP_REPO_NAME=ethereum-optimism/optimism semgrep ci --baseline-commit=$(DEV_REF)
 .PHONY: semgrep
+
+clean-node-modules:
+	rm -rf node_modules
+	rm -rf packages/**/node_modules

integration-tests/test/queue-ingestion.spec.ts

@@ -2,6 +2,7 @@
 import { providers } from 'ethers'
 import { applyL1ToL2Alias } from '@eth-optimism/core-utils'
 import { asL2Provider } from '@eth-optimism/sdk'
+import { getContractInterface } from '@eth-optimism/contracts'
 
 /* Imports: External */
 import { expect } from './shared/setup'
@@ -47,11 +48,9 @@ describe('Queue Ingestion', () => {
         receipt.remoteTx.hash
       )) as any
 
-      const params =
-        env.messenger.contracts.l2.L2CrossDomainMessenger.interface.decodeFunctionData(
-          'relayMessage',
-          l2Tx.data
-        )
+      const params = getContractInterface(
+        'L2CrossDomainMessenger'
+      ).decodeFunctionData('relayMessage', l2Tx.data)
 
       expect(params._sender.toLowerCase()).to.equal(
         env.l1Wallet.address.toLowerCase()

packages/contracts-bedrock/deploy-config/goerli.ts

 import { ethers } from 'ethers'
 
-const sequencerAddress = '0x0631f9bccb86548dc4a574c730a46d6ca283a338'
-const startingTimestamp = 1656654016
+const sequencerAddress = '0x6c23a0dcdfc44b7a57bed148de598895e398d984'
+const startingTimestamp = 1658777882
 
 const config = {
   submissionInterval: 6,
@@ -41,12 +41,12 @@ const config = {
   sequencerWindowSize: 120,
   channelTimeout: 120,
 
-  proxyAdmin: '0x05e22b779967b86fb9572e8292090be2d5c1cab7',
-  optimismBaseFeeRecipient: '0xec4f588262821a7c1f722e5bc40dc5332335c47f',
-  optimismL1FeeRecipient: '0x8fd8d6b9e556cf4791ff9c99a56420ac2fdd2b59',
-  optimismL2FeeRecipient: '0x7890eee9efd42496c63f3ec71bf61bf96af088d0',
-  outputOracleOwner: '0x0f01ce071078396040a4a0de613aa024aba2d18f',
-  batchSenderAddress: '0x32b317fc8d35e015cd9942bc9c7cecaf7f651838',
+  proxyAdmin: '0xe584e1b833ca80020130b1b69f84f90479076168',
+  optimismBaseFeeRecipient: '0xf116a24056b647e3211d095c667e951536cdebaa',
+  optimismL1FeeRecipient: '0xc731837b696ca3d9720d23336925368ceaa58f83',
+  optimismL2FeeRecipient: '0x26862c200bd48c19f39d9e1cd88a3b439611d911',
+  outputOracleOwner: '0x6925b8704ff96dee942623d6fb5e946ef5884b63',
+  batchSenderAddress: '0xa11d2b908470e17923fff184d48269bebbd9b2a5',
 }
 
 export default config

packages/contracts-bedrock/package.json

@@ -8,19 +8,20 @@
   "files": [
     "dist/**/*.js",
     "dist/**/*.d.ts",
-    "dist/types/*.ts",
+    "dist/types/**/*.ts",
     "artifacts/contracts/**/*.json",
     "deployments/**/*.json",
     "contracts/**/*.sol"
   ],
   "scripts": {
     "build:forge": "forge build",
+    "build:differential": "tsc scripts/differential-testing.ts --outDir dist --moduleResolution node",
     "prebuild": "yarn ts-node scripts/verifyFoundryInstall.ts",
     "build": "hardhat compile && yarn autogen:artifacts && yarn build:ts && yarn typechain",
     "build:ts": "tsc -p tsconfig.json",
     "autogen:artifacts": "ts-node scripts/generate-artifacts.ts",
     "deploy": "hardhat deploy",
-    "test": "yarn build:ts && forge test",
+    "test": "yarn build:differential && forge test",
     "gas-snapshot": "forge snapshot",
     "storage-snapshot": "./scripts/storage-snapshot.sh",
     "slither": "./scripts/slither.sh",
@@ -36,14 +37,10 @@
   },
   "dependencies": {
     "@eth-optimism/core-utils": "^0.9.2",
-    "@ethereumjs/trie": "^5.0.0-beta.1",
-    "@ethereumjs/util": "^8.0.0-beta.1",
     "@openzeppelin/contracts": "4.6.0",
     "@openzeppelin/contracts-upgradeable": "4.7.1",
     "@rari-capital/solmate": "https://github.com/rari-capital/solmate.git#8f9b23f8838670afda0fd8983f2c41e8037ae6bc",
-    "bip39": "^3.0.4",
     "ds-test": "https://github.com/dapphub/ds-test.git#9310e879db8ba3ea6d5c6489a579118fd264a3f5",
-    "ethereumjs-wallet": "^1.0.2",
     "ethers": "^5.6.8",
     "excessively-safe-call": "https://github.com/nomad-xyz/ExcessivelySafeCall.git#4fcdfd3593d21381f696c790fa6180b8ef559c1e",
     "forge-std": "https://github.com/foundry-rs/forge-std.git#f18682b2874fc57d7c80a511fed0b35ec4201ffa",
@@ -51,6 +48,9 @@
   },
   "devDependencies": {
     "@eth-optimism/hardhat-deploy-config": "^0.2.1",
+    "@ethereumjs/trie": "^5.0.0-beta.1",
+    "@ethereumjs/util": "^8.0.0-beta.1",
+    "ethereumjs-wallet": "^1.0.2",
     "@defi-wonderland/smock": "^2.0.2",
     "@foundry-rs/hardhat-forge": "^0.1.16",
     "@nomiclabs/hardhat-ethers": "^2.0.0",
@@ -58,6 +58,7 @@
     "@typechain/ethers-v5": "^10.1.0",
     "@typescript-eslint/eslint-plugin": "^5.26.0",
     "@typescript-eslint/parser": "^4.29.1",
+    "bip39": "^3.0.4",
     "chai": "^4.2.0",
     "command-exists": "1.2.9",
     "dotenv": "^16.0.0",

packages/contracts-bedrock/tsconfig.json

 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "rootDir": ".",
+    "rootDir": "./src",
     "outDir": "./dist"
   },
-  "exclude": ["hardhat.config.ts", "deploy", "tasks", "test"],
-  "include": ["src/**/*", "scripts/**/*"]
+  "include": [
+    "src/**/*"
+  ]
 }