Merge branch 'develop' into action-l2-sequencer

.changeset/chilly-cups-agree.md

+---
+'@eth-optimism/sdk': patch
+---
+
+Adds contract addresses for the Bedrock Alpha testnet

.changeset/slow-stingrays-rescue.md → .changeset/serious-pianos-complain.md

@@ -2,4 +2,4 @@
 '@eth-optimism/ci-builder': patch
 ---
 
-Install slither from a specific commit hash
+Pin slither version to 0.9.0

.circleci/config.yml

@@ -145,7 +145,7 @@ jobs:
           working_directory: packages/contracts-bedrock
       - run:
           name: upload coverage
-          command: codecov --verbose --clean --flag contracts-bedrock-forge
+          command: codecov --verbose --clean --flag contracts-bedrock-tests
           environment:
             FOUNDRY_PROFILE: ci
       - run:
@@ -190,6 +190,9 @@ jobs:
         description: Regex matching dependent packages
         type: string
         default: this-package-does-not-exist
+      coverage_flag:
+        description: Coverage flag name
+        type: string
     docker:
       - image: ethereumoptimism/ci-builder:latest
     resource_class: large
@@ -214,9 +217,7 @@ jobs:
           working_directory: packages/<<parameters.package_name>>
       - run:
           name: Upload coverage
-          command: |
-            echo <<parameters.package_name>> # TEMP for debugging
-            codecov --verbose --clean --flag <<parameters.package_name>>
+          command: codecov --verbose --clean --flag <<parameters.coverage_flag>>
 
   bedrock-go-tests:
     docker:
@@ -637,17 +638,20 @@ workflows:
       - yarn-monorepo
       - js-lint-test:
           name: common-ts-tests
+          coverage_flag: common-ts-tests
           package_name: common-ts
           requires:
             - yarn-monorepo
       - js-lint-test:
           name: contracts-tests
+          coverage_flag: contracts-tests
           package_name: contracts
           dependencies: hardhat-deploy-config
           requires:
             - yarn-monorepo
       - js-lint-test:
           name: core-utils-tests
+          coverage_flag: core-utils-tests
           package_name: core-utils
           requires:
             - yarn-monorepo
@@ -659,54 +663,63 @@ workflows:
             - yarn-monorepo
       - js-lint-test:
           name: actor-tests-tests
+          coverage_flag: actor-tests-tests
           package_name: actor-tests
           dependencies: "(core-utils|sdk)"
           requires:
             - yarn-monorepo
       - js-lint-test:
           name: contracts-governance-tests
+          coverage_flag: contracts-governance-tests
           package_name: contracts-governance
           dependencies: "(core-utils|sdk)"
           requires:
             - yarn-monorepo
       - js-lint-test:
           name: contracts-periphery-tests
+          coverage_flag: contracts-periphery-tests
           package_name: contracts-periphery
           dependencies: "(contracts|contracts-bedrock|core-utils|hardhat-deploy-config)"
           requires:
             - yarn-monorepo
       - js-lint-test:
           name: dtl-tests
+          coverage_flag: dtl-tests
           package_name: data-transport-layer
           dependencies: "(common-ts|contracts|core-utils)"
           requires:
             - yarn-monorepo
       - js-lint-test:
           name: drippie-mon-tests
+          coverage_flag: drippie-mon-tests
           package_name: drippie-mon
           dependencies: "(common-ts|contracts-periphery|core-utils|sdk)"
           requires:
             - yarn-monorepo
       - js-lint-test:
           name: fault-detector-tests
+          coverage_flag: fault-detector-tests
           package_name: fault-detector
           dependencies: "(common-ts|contracts|core-utils|sdk)"
           requires:
             - yarn-monorepo
       - js-lint-test:
           name: message-relayer-tests
+          coverage_flag: message-relayer-tests
           package_name: message-relayer
           dependencies: "(common-ts|core-utils|sdk)"
           requires:
             - yarn-monorepo
       - js-lint-test:
           name: replica-healthcheck-tests
+          coverage_flag: replica-healthcheck-tests
           package_name: replica-healthcheck
           dependencies: "(common-ts|core-utils)"
           requires:
             - yarn-monorepo
       - js-lint-test:
           name: sdk-tests
+          coverage_flag: sdk-tests
           package_name: sdk
           dependencies: "(contracts|core-utils)"
           requires:

indexer/Makefile

@@ -7,6 +7,10 @@ LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
 LDFLAGSSTRING +=-X main.GitVersion=$(GITVERSION)
 LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
 
+# Note: Requires legacy contracts to be built before
+# running and binding-related Make targets.
+SCC_ABI_ARTIFACT = ../packages/contracts/artifacts/contracts/L1/rollup/StateCommitmentChain.sol/StateCommitmentChain.json
+
 indexer:
 	env GO111MODULE=on go build -v $(LDFLAGS) ./cmd/indexer
 
@@ -19,8 +23,28 @@ test:
 lint:
 	golangci-lint run ./...
 
+bindings: bindings-scc
+
+bindings-scc:
+	$(eval temp := $(shell mktemp))
+
+	cat $(SCC_ABI_ARTIFACT) \
+		| jq -r .bytecode > $(temp)
+
+	cat $(SCC_ABI_ARTIFACT) \
+		| jq .abi \
+		| abigen --pkg scc \
+		--abi - \
+		--out bindings/scc/statecommitmentchain.go \
+		--type StateCommitmentChain \
+		--bin $(temp)
+
+	rm $(temp)
+
 .PHONY: \
 	indexer \
+	bindings \
+	bindings-scc \
 	clean \
 	test \
 	lint

ops/docker/ci-builder/Dockerfile

@@ -48,19 +48,12 @@ RUN apt-get update && \
   apt-get install -y nodejs && \
   npm i -g yarn && \
   npm i -g depcheck && \
+  pip install slither-analyzer==0.9.0 && \
   go install gotest.tools/gotestsum@latest && \
   curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.48.0 && \
   curl -fLSs https://raw.githubusercontent.com/CircleCI-Public/circleci-cli/master/install.sh | bash && \
   chmod +x /usr/local/bin/check-changed
 
-# Install a specific version of slither. The current release does not work with our
-# forge test contracts.
-WORKDIR /opt
-RUN git clone https://github.com/crytic/slither && \
-    cd slither && \
-    git checkout 90d13cd3883404a86ef4b3dd6af4d5c234e69a54 && \
-    python3 setup.py install
-
 RUN echo "downloading solidity compilers" && \
   curl -o solc-linux-amd64-v0.5.17+commit.d19bba13 -sL https://binaries.soliditylang.org/linux-amd64/solc-linux-amd64-v0.5.17+commit.d19bba13 && \
   curl -o solc-linux-amd64-v0.8.9+commit.e5eed63a -sL https://binaries.soliditylang.org/linux-amd64/solc-linux-amd64-v0.8.9+commit.e5eed63a  && \

packages/sdk/src/interfaces/types.ts

@@ -30,6 +30,7 @@ export enum L2ChainID {
   OPTIMISM_HARDHAT_LOCAL = 31337,
   OPTIMISM_HARDHAT_DEVNET = 17,
   OPTIMISM_BEDROCK_LOCAL_DEVNET = 901,
+  OPTIMISM_BEDROCK_ALPHA_TESTNET = 28528,
 }
 
 /**

packages/sdk/src/utils/chain-constants.ts

@@ -23,6 +23,7 @@ export const DEPOSIT_CONFIRMATION_BLOCKS: {
   [L2ChainID.OPTIMISM_HARDHAT_LOCAL]: 2 as const,
   [L2ChainID.OPTIMISM_HARDHAT_DEVNET]: 2 as const,
   [L2ChainID.OPTIMISM_BEDROCK_LOCAL_DEVNET]: 2 as const,
+  [L2ChainID.OPTIMISM_BEDROCK_ALPHA_TESTNET]: 12 as const,
 }
 
 export const CHAIN_BLOCK_TIMES: {
@@ -146,6 +147,22 @@ export const CONTRACT_ADDRESSES: {
     },
     l2: DEFAULT_L2_CONTRACT_ADDRESSES,
   },
+  [L2ChainID.OPTIMISM_BEDROCK_ALPHA_TESTNET]: {
+    l1: {
+      AddressManager: '0xb4e08DcE1F323608229265c9d4125E22a4B9dbAF' as const,
+      L1CrossDomainMessenger:
+        '0x838a6DC4E37CA45D4Ef05bb776bf05eEf50798De' as const,
+      L1StandardBridge: '0xFf94B6C486350aD92561Ba09bad3a59df764Da92' as const,
+      StateCommitmentChain:
+        '0x0000000000000000000000000000000000000000' as const,
+      CanonicalTransactionChain:
+        '0x0000000000000000000000000000000000000000' as const,
+      BondManager: '0x0000000000000000000000000000000000000000' as const,
+      OptimismPortal: '0xA581Ca3353DB73115C4625FFC7aDF5dB379434A8' as const,
+      L2OutputOracle: '0x3A234299a14De50027eA65dCdf1c0DaC729e04A6' as const,
+    },
+    l2: DEFAULT_L2_CONTRACT_ADDRESSES,
+  },
 }
 
 /**