diff --git a/deploy-scripts/.env.example b/deploy-scripts/.env.example index d77eab2..4d5fb51 100644 --- a/deploy-scripts/.env.example +++ b/deploy-scripts/.env.example @@ -9,4 +9,6 @@ BATCHER_PUBLIC_ADDRESS= BATCHER_PRIVATE_KEY= PROPOSER_PUBLIC_ADDRESS= PROPOSER_PRIVATE_KEY= -RPC_KIND= \ No newline at end of file +RPC_KIND= +MONOREPO_VER= +OP_GETH_VER= diff --git a/deploy-scripts/opstack.sh b/deploy-scripts/opstack.sh index 95fc43a..099c2e0 100755 --- a/deploy-scripts/opstack.sh +++ b/deploy-scripts/opstack.sh @@ -102,6 +102,8 @@ check_parameter "BATCHER_PRIVATE_KEY" "$BATCHER_PUBLIC_ADDRESS" check_parameter "PROPOSER_PUBLIC_ADDRESS" "$PROPOSER_PUBLIC_ADDRESS" check_parameter "PROPOSER_PRIVATE_KEY" "$PROPOSER_PRIVATE_KEY" check_parameter "RPC_KIND" "$RPC_KIND" +check_parameter "MONOREPO_VER" "$MONOREPO_VER" +check_parameter "OP_GETH_VER" "$OP_GETH_VER" echo "Cloning Optimism repository" # Clone and install Optimism @@ -114,6 +116,7 @@ else git clone --recurse-submodules https://github.com/ethereum-optimism/optimism.git fi cd optimism +git checkout $MONOREPO_VER # Disable immediate exit on error set +e @@ -140,6 +143,7 @@ else git clone https://github.com/ethereum-optimism/op-geth.git fi cd op-geth +git checkout $OP_GETH_VER make geth # Set ETH_RPC_URL environment variable diff --git a/deploy-scripts/setup.sh b/deploy-scripts/setup.sh index 4cdea9e..b9285a8 100755 --- a/deploy-scripts/setup.sh +++ b/deploy-scripts/setup.sh @@ -36,6 +36,8 @@ check_parameter "BATCHER_PRIVATE_KEY" "$BATCHER_PUBLIC_ADDRESS" check_parameter "PROPOSER_PUBLIC_ADDRESS" "$PROPOSER_PUBLIC_ADDRESS" check_parameter "PROPOSER_PRIVATE_KEY" "$PROPOSER_PRIVATE_KEY" check_parameter "RPC_KIND" "$RPC_KIND" +check_parameter "MONOREPO_VER" "$MONOREPO_VER" +check_parameter "OP_GETH_VER" "$OP_GETH_VER" echo "Cloning Optimism repository" # Clone and install Optimism @@ -48,6 +50,7 @@ else git clone --recurse-submodules https://github.com/ethereum-optimism/optimism.git fi cd optimism +git checkout $MONOREPO_VER # Disable immediate exit on error set +e @@ -74,6 +77,7 @@ else git clone https://github.com/ethereum-optimism/op-geth.git fi cd op-geth +git checkout $OP_GETH_VER make geth # Set ETH_RPC_URL environment variable