Merge pull request #29 from rabbitprincess/feature/v1.9.2

Feature/v1.9.2

Author: gosunuts

Makefile

@@ -22,14 +22,14 @@ buildx: buildx-init buildx-run buildx-bridge
 buildx-init:
 	docker buildx build \
 	--platform linux/amd64,linux/arm64 \
-	-t dreamcacao/builderism_init:1.9.1 \
+	-t dreamcacao/builderism_init:1.9.2 \
 	-t dreamcacao/builderism_init:latest \
 	--push ./init
 
 buildx-run:
 	docker buildx build \
 	--platform linux/amd64,linux/arm64 \
-	-t dreamcacao/builderism_run:1.9.1 \
+	-t dreamcacao/builderism_run:1.9.2 \
 	-t dreamcacao/builderism_run:latest \
 	--push ./run
 

README.md

@@ -32,10 +32,6 @@ It support 4 steps to operate OP Stack node
 - Most of time is spent on contract deployment.
 - If you see `[all process is done! check config files.]` message, init process is successfully done.
 
-**Q. Init failed with message 'Please try to change your RPC url to an archive node if the issue persists.'**
-- It seems to be problem of foundry.
-- you can use other rpc provider like `infura`, `quicknode` instead of `publicNode`.
-
 **Q. I want to change configuration not in ENV files.**
 - you can modify all `entrypoint` as needed.
 - all script is mounted in docker volume, so there is no need to rebuild docker images.

envs/base-sepolia.env

@@ -20,5 +20,5 @@ L2_BRIDGE_URL="http://host.docker.internal:3000/"
 
 RUN_MODE="replica"
 L2_SUPERCHAIN_NETWORK="base-sepolia"
-OP_EXECUTION_SEQUENCER_HTTP="=https://sepolia-sequencer.base.org"
+OP_EXECUTION_SEQUENCER_HTTP="https://sepolia-sequencer.base.org"
 OP_NODE_P2P_BOOTNODES="enr:-J64QBwRIWAco7lv6jImSOjPU_W266lHXzpAS5YOh7WmgTyBZkgLgOwo_mxKJq3wz2XRbsoBItbv1dCyjIoNq67mFguGAYrTxM42gmlkgnY0gmlwhBLSsHKHb3BzdGFja4S0lAUAiXNlY3AyNTZrMaEDmoWSi8hcsRpQf2eJsNUx-sqv6fH4btmo2HsAzZFAKnKDdGNwgiQGg3VkcIIkBg,enr:-J64QFa3qMsONLGphfjEkeYyF6Jkil_jCuJmm7_a42ckZeUQGLVzrzstZNb1dgBp1GGx9bzImq5VxJLP-BaptZThGiWGAYrTytOvgmlkgnY0gmlwhGsV-zeHb3BzdGFja4S0lAUAiXNlY3AyNTZrMaEDahfSECTIS_cXyZ8IyNf4leANlZnrsMEWTkEYxf4GMCmDdGNwgiQGg3VkcIIkBg"

envs/custom-holesky.env

@@ -19,6 +19,7 @@ ALT_DA_SERVER=
 ##################################################
 #            init node configuration             #
 ##################################################
+L1_RPC_URL_DEPLOY="https://holesky.drpc.org"
 PRIORITY_GAS_PRICE=1
 GOVERNANCE_TOKEN_SYMBOL=
 

envs/custom-mainnet.env

@@ -19,6 +19,7 @@ ALT_DA_SERVER=
 ##################################################
 #            init node configuration             #
 ##################################################
+L1_RPC_URL_DEPLOY="https://eth.drpc.org"
 PRIORITY_GAS_PRICE=1
 GOVERNANCE_TOKEN_SYMBOL=
 

envs/custom-sepolia.env

@@ -19,6 +19,7 @@ ALT_DA_SERVER=
 ##################################################
 #            init node configuration             #
 ##################################################
+L1_RPC_URL_DEPLOY="https://sepolia.drpc.org"
 PRIORITY_GAS_PRICE=10000
 GOVERNANCE_TOKEN_SYMBOL=
 

init/1_init_environment.sh

@@ -19,6 +19,11 @@ export DEPLOYMENT_CONTEXT=$L2_CHAIN_ID
 export FAUCET_ADDRESS=${FAUCET_ADDRESS:-""}
 export FAUCET_PRIVATE_KEY=${FAUCET_PRIVATE_KEY:-""}
 
+# overwrite l1 rpc address only for deploy
+if [ ! -z "${L1_RPC_URL_DEPLOY:-}" ]; then
+	export L1_RPC_URL=$L1_RPC_URL_DEPLOY
+fi
+
 # set priority gas price
 if [ -z "${PRIORITY_GAS_PRICE:-}" ]; then
 	export PRIORITY_GAS_PRICE=10000

init/4_deploy_contract.sh

@@ -11,7 +11,7 @@ forge script scripts/deploy/Deploy.s.sol:Deploy \
   --rpc-url $L1_RPC_URL \
   --priority-gas-price $PRIORITY_GAS_PRICE
 
-echo "[deploy contract done!]"
+echo "[deploy contract done, start to deploy L2Genesis]"
 
 CONTRACT_ADDRESSES_PATH="./deployments/$L1_CHAIN_ID-deploy.json" \
 DEPLOY_CONFIG_PATH="./deployments/$DEPLOYMENT_CONTEXT/.deploy" \

init/Dockerfile

@@ -22,7 +22,7 @@ ENV PATH="~/.foundry/bin:${PATH}"
 
 # clone optimism repository
 ENV OP_REPO=https://github.com/ethereum-optimism/optimism.git
-ENV OP_VERSION=${OP_VERSION:-v1.9.1}
+ENV OP_VERSION=${OP_VERSION:-v1.9.2}
 RUN mkdir -p ~/optimism && cd ~/optimism && \
     git clone $OP_REPO --depth 1 --branch $OP_VERSION --single-branch . && \
     git switch -c $OP_VERSION && \
@@ -33,8 +33,8 @@ RUN mkdir -p ~/optimism && cd ~/optimism && \
 COPY *.sh /script/
 RUN chmod +x /script/*.sh
 
-ENTRYPOINT ["/bin/bash", "-c", "\
-    chmod +x /script/*.sh && \
+ENTRYPOINT ["/bin/bash", "-c", \
+    "chmod +x /script/*.sh && \
     source /script/1_init_environment.sh && \
     /script/2_faucet.sh && \
     /script/3_generate_config.sh && \

run/Dockerfile

@@ -1,17 +1,17 @@
-FROM golang:1.22 as op
+FROM golang:1.22 AS op
 
 WORKDIR /app
 
 ENV OP_REPO=https://github.com/ethereum-optimism/optimism.git
-ENV OP_VERSION=${OP_VERSION:-v1.9.1}
+ENV OP_VERSION=${OP_VERSION:-v1.9.2}
 
 RUN git clone $OP_REPO --depth 1 --branch op-node/$OP_VERSION --single-branch . && \
     git switch -c branch-$OP_VERSION && \
     make -C op-node VERSION=$OP_VERSION op-node && \
     make -C op-batcher VERSION=$OP_VERSION op-batcher && \
     make -C op-proposer VERSION=$OP_VERSION op-proposer
 
-FROM golang:1.22 as geth
+FROM golang:1.22 AS geth
 
 WORKDIR /app