Update optimism L1 contracts deployment script
This commit is contained in:
		
							parent
							
								
									558eb81a7e
								
							
						
					
					
						commit
						16a290c050
					
				| @ -26,6 +26,8 @@ services: | ||||
|     # Waits for L1 endpoint to be up before running the contract deploy script | ||||
|     command: | | ||||
|       "./wait-for-it.sh -h ${CERC_L1_HOST:-$${DEFAULT_CERC_L1_HOST}} -p ${CERC_L1_PORT:-$${DEFAULT_CERC_L1_PORT}} -s -t 60 -- ./deploy-contracts.sh" | ||||
|     extra_hosts: | ||||
|       - "host.docker.internal:host-gateway" | ||||
| 
 | ||||
|   # Initializes and runs the L2 execution client  (outputs to volume l2_geth_data) | ||||
|   op-geth: | ||||
|  | ||||
| @ -123,26 +123,33 @@ echo "Writing deployment config." | ||||
| deploy_config_file="deploy-config/$DEPLOYMENT_CONTEXT.json" | ||||
| cp deploy-config/getting-started.json $deploy_config_file | ||||
| 
 | ||||
| # Replace chain id in the copied config | ||||
| sed -i "s/\"l1ChainID\": .*/\"l1ChainID\": $DEPLOYMENT_CONTEXT,/g" $deploy_config_file | ||||
| # Update generated config | ||||
| #   1. Update L1 chain id | ||||
| #   2. Add missing faultGameWithdrawalDelay field | ||||
| #   (see issue: https://github.com/ethereum-optimism/optimism/issues/9773#issuecomment-2080224969) | ||||
| echo "$(jq ". += {"l1ChainID": $DEPLOYMENT_CONTEXT, "faultGameWithdrawalDelay": 604800}" $deploy_config_file)" > $deploy_config_file | ||||
| 
 | ||||
| mkdir -p deployments/$DEPLOYMENT_CONTEXT | ||||
| 
 | ||||
| # Deployment requires the create2 deterministic proxy contract be published on L1 at address 0x4e59b44847b379578588920ca78fbf26c0b4956c | ||||
| # See: https://github.com/Arachnid/deterministic-deployment-proxy | ||||
| echo "Deploying create2 proxy contract..." | ||||
| echo "Funding deployment signer address" | ||||
| deployment_signer="0x3fab184622dc19b6109349b94811493bf2a45362" | ||||
| cast send --from $ADMIN --rpc-url $CERC_L1_RPC --value 0.5ether $deployment_signer --private-key $ADMIN_KEY | ||||
| echo "Deploying contract..." | ||||
| raw_bytes="0xf8a58085174876e800830186a08080b853604580600e600039806000f350fe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf31ba02222222222222222222222222222222222222222222222222222222222222222a02222222222222222222222222222222222222222222222222222222222222222" | ||||
| 
 | ||||
| cast publish --rpc-url $CERC_L1_RPC $raw_bytes | ||||
| create2CodeSize=$(cast codesize 0x4e59b44847b379578588920cA78FbF26c0B4956C --rpc-url $CERC_L1_RPC) | ||||
| if [ "$create2CodeSize" -eq 0 ]; then | ||||
|   echo "Deploying create2 proxy contract..." | ||||
| 
 | ||||
|   echo "Funding deployment signer address" | ||||
|   deployment_signer="0x3fab184622dc19b6109349b94811493bf2a45362" | ||||
|   cast send --from $ADMIN --rpc-url $CERC_L1_RPC --value 0.5ether $deployment_signer --private-key $ADMIN_KEY | ||||
| 
 | ||||
|   raw_bytes="0xf8a58085174876e800830186a08080b853604580600e600039806000f350fe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf31ba02222222222222222222222222222222222222222222222222222222222222222a02222222222222222222222222222222222222222222222222222222222222222" | ||||
|   cast publish --rpc-url $CERC_L1_RPC $raw_bytes | ||||
| fi | ||||
| 
 | ||||
| # Create the L2 deployment | ||||
| # Writes out artifact to /app/packages/contracts-bedrock/deployments/$DEPLOYMENT_CONTEXT/.deploy | ||||
| echo "Deploying L1 Optimism contracts..." | ||||
| forge script scripts/Deploy.s.sol:Deploy --private-key $ADMIN_KEY --broadcast --rpc-url $CERC_L1_RPC | ||||
| forge script scripts/Deploy.s.sol:Deploy --sig 'sync()' --private-key $ADMIN_KEY --broadcast --rpc-url $CERC_L1_RPC | ||||
| 
 | ||||
| echo "*************************************" | ||||
| echo "Done deploying contracts." | ||||
|  | ||||
| @ -15,12 +15,12 @@ rollup_outfile="/l2-config/rollup.json" | ||||
| 
 | ||||
| # Generate L2 genesis (if not already done) | ||||
| if [ ! -f "$genesis_outfile" ] || [ ! -f "$rollup_outfile" ]; then | ||||
| 	op-node genesis l2 \ | ||||
| 		--deploy-config $deploy_config_file \ | ||||
| 		--deployment-dir $deployment_dir \ | ||||
| 		--outfile.l2 $genesis_outfile \ | ||||
| 		--outfile.rollup $rollup_outfile \ | ||||
| 		--l1-rpc $CERC_L1_RPC | ||||
|   op-node genesis l2 \ | ||||
|     --deploy-config $deploy_config_file \ | ||||
|     --deployment-dir $deployment_dir \ | ||||
|     --outfile.l2 $genesis_outfile \ | ||||
|     --outfile.rollup $rollup_outfile \ | ||||
|     --l1-rpc $CERC_L1_RPC | ||||
| fi | ||||
| 
 | ||||
| # Start op-node | ||||
| @ -30,16 +30,16 @@ L2_AUTH="http://op-geth:8551" | ||||
| RPC_KIND=any # this can optionally be set to a preset for common node providers like Infura, Alchemy, etc. | ||||
| 
 | ||||
| op-node \ | ||||
| 	--l2=$L2_AUTH \ | ||||
| 	--l2.jwt-secret=$jwt_file \ | ||||
| 	--sequencer.enabled \ | ||||
| 	--sequencer.l1-confs=5 \ | ||||
| 	--verifier.l1-confs=4 \ | ||||
| 	--rollup.config=$rollup_outfile \ | ||||
| 	--rpc.addr=0.0.0.0 \ | ||||
| 	--rpc.port=8547 \ | ||||
| 	--p2p.disable \ | ||||
| 	--rpc.enable-admin \ | ||||
| 	--p2p.sequencer.key="${SEQ_KEY#0x}" \ | ||||
| 	--l1=$CERC_L1_RPC \ | ||||
| 	--l1.rpckind=$RPC_KIND | ||||
|   --l2=$L2_AUTH \ | ||||
|   --l2.jwt-secret=$jwt_file \ | ||||
|   --sequencer.enabled \ | ||||
|   --sequencer.l1-confs=5 \ | ||||
|   --verifier.l1-confs=4 \ | ||||
|   --rollup.config=$rollup_outfile \ | ||||
|   --rpc.addr=0.0.0.0 \ | ||||
|   --rpc.port=8547 \ | ||||
|   --p2p.disable \ | ||||
|   --rpc.enable-admin \ | ||||
|   --p2p.sequencer.key="${SEQ_KEY#0x}" \ | ||||
|   --l1=$CERC_L1_RPC \ | ||||
|   --l1.rpckind=$RPC_KIND | ||||
|  | ||||
							
								
								
									
										182
									
								
								config/network/wait-for-it.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										182
									
								
								config/network/wait-for-it.sh
									
									
									
									
									
										Executable file
									
								
							| @ -0,0 +1,182 @@ | ||||
| #!/usr/bin/env bash | ||||
| # Use this script to test if a given TCP host/port are available | ||||
| 
 | ||||
| WAITFORIT_cmdname=${0##*/} | ||||
| 
 | ||||
| echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi } | ||||
| 
 | ||||
| usage() | ||||
| { | ||||
|     cat << USAGE >&2 | ||||
| Usage: | ||||
|     $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args] | ||||
|     -h HOST | --host=HOST       Host or IP under test | ||||
|     -p PORT | --port=PORT       TCP port under test | ||||
|                                 Alternatively, you specify the host and port as host:port | ||||
|     -s | --strict               Only execute subcommand if the test succeeds | ||||
|     -q | --quiet                Don't output any status messages | ||||
|     -t TIMEOUT | --timeout=TIMEOUT | ||||
|                                 Timeout in seconds, zero for no timeout | ||||
|     -- COMMAND ARGS             Execute command with args after the test finishes | ||||
| USAGE | ||||
|     exit 1 | ||||
| } | ||||
| 
 | ||||
| wait_for() | ||||
| { | ||||
|     if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then | ||||
|         echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" | ||||
|     else | ||||
|         echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout" | ||||
|     fi | ||||
|     WAITFORIT_start_ts=$(date +%s) | ||||
|     while : | ||||
|     do | ||||
|         if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then | ||||
|             nc -z $WAITFORIT_HOST $WAITFORIT_PORT | ||||
|             WAITFORIT_result=$? | ||||
|         else | ||||
|             (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1 | ||||
|             WAITFORIT_result=$? | ||||
|         fi | ||||
|         if [[ $WAITFORIT_result -eq 0 ]]; then | ||||
|             WAITFORIT_end_ts=$(date +%s) | ||||
|             echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds" | ||||
|             break | ||||
|         fi | ||||
|         sleep 1 | ||||
|     done | ||||
|     return $WAITFORIT_result | ||||
| } | ||||
| 
 | ||||
| wait_for_wrapper() | ||||
| { | ||||
|     # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692 | ||||
|     if [[ $WAITFORIT_QUIET -eq 1 ]]; then | ||||
|         timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & | ||||
|     else | ||||
|         timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & | ||||
|     fi | ||||
|     WAITFORIT_PID=$! | ||||
|     trap "kill -INT -$WAITFORIT_PID" INT | ||||
|     wait $WAITFORIT_PID | ||||
|     WAITFORIT_RESULT=$? | ||||
|     if [[ $WAITFORIT_RESULT -ne 0 ]]; then | ||||
|         echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" | ||||
|     fi | ||||
|     return $WAITFORIT_RESULT | ||||
| } | ||||
| 
 | ||||
| # process arguments | ||||
| while [[ $# -gt 0 ]] | ||||
| do | ||||
|     case "$1" in | ||||
|         *:* ) | ||||
|         WAITFORIT_hostport=(${1//:/ }) | ||||
|         WAITFORIT_HOST=${WAITFORIT_hostport[0]} | ||||
|         WAITFORIT_PORT=${WAITFORIT_hostport[1]} | ||||
|         shift 1 | ||||
|         ;; | ||||
|         --child) | ||||
|         WAITFORIT_CHILD=1 | ||||
|         shift 1 | ||||
|         ;; | ||||
|         -q | --quiet) | ||||
|         WAITFORIT_QUIET=1 | ||||
|         shift 1 | ||||
|         ;; | ||||
|         -s | --strict) | ||||
|         WAITFORIT_STRICT=1 | ||||
|         shift 1 | ||||
|         ;; | ||||
|         -h) | ||||
|         WAITFORIT_HOST="$2" | ||||
|         if [[ $WAITFORIT_HOST == "" ]]; then break; fi | ||||
|         shift 2 | ||||
|         ;; | ||||
|         --host=*) | ||||
|         WAITFORIT_HOST="${1#*=}" | ||||
|         shift 1 | ||||
|         ;; | ||||
|         -p) | ||||
|         WAITFORIT_PORT="$2" | ||||
|         if [[ $WAITFORIT_PORT == "" ]]; then break; fi | ||||
|         shift 2 | ||||
|         ;; | ||||
|         --port=*) | ||||
|         WAITFORIT_PORT="${1#*=}" | ||||
|         shift 1 | ||||
|         ;; | ||||
|         -t) | ||||
|         WAITFORIT_TIMEOUT="$2" | ||||
|         if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi | ||||
|         shift 2 | ||||
|         ;; | ||||
|         --timeout=*) | ||||
|         WAITFORIT_TIMEOUT="${1#*=}" | ||||
|         shift 1 | ||||
|         ;; | ||||
|         --) | ||||
|         shift | ||||
|         WAITFORIT_CLI=("$@") | ||||
|         break | ||||
|         ;; | ||||
|         --help) | ||||
|         usage | ||||
|         ;; | ||||
|         *) | ||||
|         echoerr "Unknown argument: $1" | ||||
|         usage | ||||
|         ;; | ||||
|     esac | ||||
| done | ||||
| 
 | ||||
| if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then | ||||
|     echoerr "Error: you need to provide a host and port to test." | ||||
|     usage | ||||
| fi | ||||
| 
 | ||||
| WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15} | ||||
| WAITFORIT_STRICT=${WAITFORIT_STRICT:-0} | ||||
| WAITFORIT_CHILD=${WAITFORIT_CHILD:-0} | ||||
| WAITFORIT_QUIET=${WAITFORIT_QUIET:-0} | ||||
| 
 | ||||
| # Check to see if timeout is from busybox? | ||||
| WAITFORIT_TIMEOUT_PATH=$(type -p timeout) | ||||
| WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH) | ||||
| 
 | ||||
| WAITFORIT_BUSYTIMEFLAG="" | ||||
| if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then | ||||
|     WAITFORIT_ISBUSY=1 | ||||
|     # Check if busybox timeout uses -t flag | ||||
|     # (recent Alpine versions don't support -t anymore) | ||||
|     if timeout &>/dev/stdout | grep -q -e '-t '; then | ||||
|         WAITFORIT_BUSYTIMEFLAG="-t" | ||||
|     fi | ||||
| else | ||||
|     WAITFORIT_ISBUSY=0 | ||||
| fi | ||||
| 
 | ||||
| if [[ $WAITFORIT_CHILD -gt 0 ]]; then | ||||
|     wait_for | ||||
|     WAITFORIT_RESULT=$? | ||||
|     exit $WAITFORIT_RESULT | ||||
| else | ||||
|     if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then | ||||
|         wait_for_wrapper | ||||
|         WAITFORIT_RESULT=$? | ||||
|     else | ||||
|         wait_for | ||||
|         WAITFORIT_RESULT=$? | ||||
|     fi | ||||
| fi | ||||
| 
 | ||||
| if [[ $WAITFORIT_CLI != "" ]]; then | ||||
|     if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then | ||||
|         echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess" | ||||
|         exit $WAITFORIT_RESULT | ||||
|     fi | ||||
|     exec "${WAITFORIT_CLI[@]}" | ||||
| else | ||||
|     exit $WAITFORIT_RESULT | ||||
| fi | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user