Merge pull request #2681 from ethereum-optimism/fix/bedrock-itests-build

fix: bedrock itests

Makefile

 COMPOSEFLAGS=-d
 ITESTS_L2_HOST=http://localhost:9545
 
-build: build-go contracts integration-tests
+build: build-go build-ts
 .PHONY: build
 
 build-go: submodules op-node op-proposer op-batcher
 .PHONY: build-go
 
-build-ts: submodules contracts integration-tests
+build-ts: submodules
+	yarn build
 .PHONY: build-ts
 
 submodules:
@@ -42,14 +43,6 @@ mod-tidy:
 	cd ./op-e2e && go mod tidy && cd ..
 .PHONY: mod-tidy
 
-contracts:
-	cd ./contracts-bedrock && yarn install && yarn build
-.PHONY: contracts
-
-integration-tests:
-	cd ./packages/integration-tests-bedrock && yarn install && yarn build:contracts
-.PHONY: integration-tests
-
 clean:
 	rm -rf ./bin
 .PHONY: clean
@@ -63,7 +56,7 @@ devnet-down:
 .PHONY: devnet-down
 
 devnet-clean:
-	rm -rf ./contracts-bedrock/deployments/devnetL1
+	rm -rf ./packages/contracts-bedrock/deployments/devnetL1
 	rm -rf ./.devnet
 	cd ./ops-bedrock && docker-compose down
 	docker volume rm ops-bedrock_l1_data
@@ -76,12 +69,12 @@ test-unit:
 	make -C ./op-proposer test
 	make -C ./op-batcher test
 	make -C ./op-e2e test
-	cd ./contracts-bedrock && yarn test
+	yarn test
 .PHONY: test-unit
 
 test-integration:
 	bash ./ops-bedrock/test-integration.sh \
-		./contracts-bedrock/deployments/devnetL1
+		./packages/contracts-bedrock/deployments/devnetL1
 .PHONY: test-integration
 
 devnet-genesis:

packages/integration-tests-bedrock/.gitignore

 artifacts
 cache
+forge-artifacts

packages/integration-tests-bedrock/foundry.toml

+[default]
+src = 'contracts'
+out = 'forge-artifacts'
+optimizer = true
+optimizer_runs = 999999
+
+extra_output = ['devdoc', 'userdoc', 'metadata', 'storageLayout']
+bytecode_hash = "none"

packages/integration-tests-bedrock/package.json

@@ -2,16 +2,16 @@
   "private": true,
   "name": "@eth-optimism/integration-tests-bedrock",
   "version": "0.5.10",
-  "description": "[Optimism] Integration tests",
+  "description": "[Optimism] Bedrock Integration tests",
   "scripts": {
     "lint": "yarn lint:fix && yarn lint:check",
     "lint:fix": "yarn lint:check --fix",
     "lint:check": "eslint . --max-warnings=0",
-    "build:contracts": "forge build --root . -c contracts -o artifacts",
+    "build:contracts": "forge build",
     "test": "echo 'no unit tests'",
     "test:actor": "IS_LIVE_NETWORK=true ts-node actor-tests/lib/runner.ts",
     "test:integration:live": "NO_NETWORK=true IS_LIVE_NETWORK=true hardhat --network optimism test",
-    "clean": "rimraf cache artifacts"
+    "clean": "rimraf cache artifacts foundry-artifacts"
   },
   "keywords": [
     "optimism",
@@ -19,7 +19,7 @@
     "integration",
     "tests"
   ],
-  "homepage": "https://github.com/ethereum-optimism/optimism/tree/develop/packages/integration-tests#readme",
+  "homepage": "https://github.com/ethereum-optimism/optimism/tree/develop/packages/integration-tests-bedrock#readme",
   "license": "MIT",
   "author": "Optimism PBC",
   "repository": {

packages/integration-tests-bedrock/test/deposit.spec.ts

@@ -5,8 +5,8 @@ import { awaitCondition } from '@eth-optimism/core-utils'
 /* Imports: Internal */
 import { defaultTransactionFactory } from './shared/utils'
 import env from './shared/env'
-import counterArtifact from '../artifacts/Counter.sol/Counter.json'
-import multiDepositorArtifact from '../artifacts/MultiDepositor.sol/MultiDepositor.json'
+import counterArtifact from '../forge-artifacts/Counter.sol/Counter.json'
+import multiDepositorArtifact from '../forge-artifacts/MultiDepositor.sol/MultiDepositor.json'
 
 describe('Deposits', () => {
   let portal: Contract