From e77cc13f70a75236c8d7cfe4390a254947d6dcbf Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Sun, 31 Jul 2022 19:19:33 -0600
Subject: [PATCH 1/2] ci: Tag cloudbuild images with the commit SHA

---
 cloudbuild.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index be9d56fc39ab..cb8e46c104e3 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -2,6 +2,7 @@ steps:
   - name: 'gcr.io/kaniko-project/executor:latest'
     args:
       - --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/op-node:$_TAG
+      - --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/op-proposer:$COMMIT_SHA
       - --dockerfile=op-node/Dockerfile
       - --cache=true
       - --cache-ttl=48h
@@ -9,6 +10,7 @@ steps:
   - name: 'gcr.io/kaniko-project/executor:latest'
     args:
       - --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/op-batcher:$_TAG
+      - --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/op-proposer:$COMMIT_SHA
       - --dockerfile=./op-batcher/Dockerfile
       - --cache=true
       - --cache-ttl=48h
@@ -16,6 +18,7 @@ steps:
   - name: 'gcr.io/kaniko-project/executor:latest'
     args:
       - --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/op-proposer:$_TAG
+      - --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/op-proposer:$COMMIT_SHA
       - --dockerfile=./op-proposer/Dockerfile
       - --cache=true
       - --cache-ttl=48h
@@ -23,6 +26,7 @@ steps:
   - name: 'gcr.io/kaniko-project/executor:latest'
     args:
       - --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/deployer-bedrock:$_TAG
+      - --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/deployer-bedrock:$COMMIT_SHA
       - --dockerfile=./ops/docker/Dockerfile.packages
       - --target=deployer-bedrock
       - --cache=true

From 7aca4c500bf0521ebbb959c455dbeb108153bd76 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Sun, 31 Jul 2022 21:50:29 -0600
Subject: [PATCH 2/2] contracts-bedrock: Fix provider usage in L2OutputOracle
 deployment script

`getDefaultProvider()` returns a fallback mainnet provider, which doesn't work.

Builds on #3147.
---
 packages/contracts-bedrock/deploy/000-L2OutputOracle.deploy.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/contracts-bedrock/deploy/000-L2OutputOracle.deploy.ts b/packages/contracts-bedrock/deploy/000-L2OutputOracle.deploy.ts
index c7602623ebc9..776212ad3528 100644
--- a/packages/contracts-bedrock/deploy/000-L2OutputOracle.deploy.ts
+++ b/packages/contracts-bedrock/deploy/000-L2OutputOracle.deploy.ts
@@ -10,7 +10,7 @@ const deployFn: DeployFunction = async (hre) => {
   const { deployer } = await hre.getNamedAccounts()
   const { deployConfig } = hre
 
-  const l1 = hre.ethers.getDefaultProvider()
+  const l1 = hre.ethers.provider
   const l1StartingBlock = await l1.getBlock(deployConfig.l1StartingBlockTag)
   if (l1StartingBlock === null) {
     throw new Error(`Cannot fetch block tag ${deployConfig.l1StartingBlockTag}`)