Modularize out to shell src

ethereum-optimism · Apr 18, 2024 · e3368a3 · e3368a3
1 parent a1a6e30
commit e3368a3
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 29 deletions.
diff --git a/Makefile b/Makefile
@@ -88,35 +88,8 @@ devnet-allocs-monorepo:
 	make -C $(MONOREPO_ROOT) devnet-allocs
 .PHONY: devnet-allocs-monorepo
 
-devnet-allocs: devnet-allocs-monorepo
-	cp -r $(MONOREPO_ROOT)/.devnet .devnet
-	mkdir -p packages/contracts-bedrock
-	cp -r $(MONOREPO_ROOT)/packages/contracts-bedrock/deploy-config packages/contracts-bedrock
-	mkdir -p packages/contracts-bedrock/deployments/devnetL1
-	cp -r $(MONOREPO_ROOT)/packages/contracts-bedrock/deployments/devnetL1 packages/contracts-bedrock/deployments
-	# Patch L1 Allocs
-	jq .accounts .devnet/allocs-l1.json > /tmp/allocs-l1-patched.json
-	# Generate L1 Allocs including asterisc
-	# copy everything locally due to foundry permission issues
-	cp ./rvgo/bin/prestate-proof.json ./rvsol/prestate-proof.json
-	cp -r packages/contracts-bedrock/deployments/devnetL1 ./rvsol/devnetL1
-	cp packages/contracts-bedrock/deploy-config/devnetL1.json ./rvsol/devnetL1.json
-	cp /tmp/allocs-l1-patched.json ./rvsol/allocs-l1-patched.json
-	cd ./rvsol && ASTERISC_PRESTATE=./prestate-proof.json \
-	TARGET_L2_DEPLOYMENT_FILE=./devnetL1/.deploy \
-	TARGET_L2_DEPLOY_CONFIG=./devnetL1.json \
-	TARGET_L1_ALLOC=./allocs-l1-patched.json \
-	DEPLOYMENT_OUTFILE=./deployments/devnetL1/.deploy \
-	STATE_DUMP_PATH=./allocs-l1-asterisc.json \
-	./scripts/create_poststate_after_deployment.sh
-	# Create address.json
-	jq -s '.[0] * .[1]' ./rvsol/devnetL1/.deploy ./rvsol/deployments/devnetL1/.deploy | tee .devnet/addresses.json
-	# Patch L1 Allocs: we need json as the form {"accounts": ... } for op-e2e
-	jq '{accounts: .}' ./rvsol/allocs-l1-asterisc.json > .devnet/allocs-l1.json
-	# Patch .deploy
-	cp .devnet/addresses.json packages/contracts-bedrock/deployments/devnetL1/.deploy
-	# Remove tmps
-	cd rvsol && rm -rf prestate-proof.json devnetL1 devnetL1.json allocs-l1-patched.json deployments ./allocs-l1-asterisc.json 
+devnet-allocs: devnet-allocs-monorepo prestate
+	./rvsol/scripts/devnet_allocs.sh
 .PHONY: devnet-allocs
 
 devnet-clean:

diff --git a/rvsol/scripts/devnet_allocs.sh b/rvsol/scripts/devnet_allocs.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+MONOREPO_ROOT=./rvsol/lib/optimism
+
+cp -r ${MONOREPO_ROOT}/.devnet .devnet
+mkdir -p packages/contracts-bedrock
+cp -r ${MONOREPO_ROOT}/packages/contracts-bedrock/deploy-config packages/contracts-bedrock
+mkdir -p packages/contracts-bedrock/deployments/devnetL1
+cp -r ${MONOREPO_ROOT}/packages/contracts-bedrock/deployments/devnetL1 packages/contracts-bedrock/deployments
+# Patch L1 Allocs
+jq .accounts .devnet/allocs-l1.json > /tmp/allocs-l1-patched.json
+# Generate L1 Allocs including asterisc
+# copy everything locally due to foundry permission issues
+cp ./rvgo/bin/prestate-proof.json ./rvsol/prestate-proof.json
+cp -r packages/contracts-bedrock/deployments/devnetL1 ./rvsol/devnetL1
+cp packages/contracts-bedrock/deploy-config/devnetL1.json ./rvsol/devnetL1.json
+cp /tmp/allocs-l1-patched.json ./rvsol/allocs-l1-patched.json
+cd ./rvsol && ASTERISC_PRESTATE=./prestate-proof.json \
+TARGET_L2_DEPLOYMENT_FILE=./devnetL1/.deploy \
+TARGET_L2_DEPLOY_CONFIG=./devnetL1.json \
+TARGET_L1_ALLOC=./allocs-l1-patched.json \
+DEPLOYMENT_OUTFILE=./deployments/devnetL1/.deploy \
+STATE_DUMP_PATH=./allocs-l1-asterisc.json \
+./scripts/create_poststate_after_deployment.sh
+cd ..
+# Create address.json
+jq -s '.[0] * .[1]' ./rvsol/devnetL1/.deploy ./rvsol/deployments/devnetL1/.deploy | tee .devnet/addresses.json
+# Patch L1 Allocs: we need json as the form {"accounts": ... } for op-e2e
+jq '{accounts: .}' ./rvsol/allocs-l1-asterisc.json > .devnet/allocs-l1.json
+# Patch .deploy
+cp .devnet/addresses.json packages/contracts-bedrock/deployments/devnetL1/.deploy
+# Remove tmps
+cd rvsol && rm -rf prestate-proof.json devnetL1 devnetL1.json allocs-l1-patched.json deployments ./allocs-l1-asterisc.json