update

.gitignore

@@ -49,3 +49,4 @@ crytic-export
 bin
 data
 .node
+deployer

deploy.sh

@@ -4,16 +4,23 @@ configdir=$(pwd)/deployer
 
 deploymentdir=$rootdir/packages/contracts-bedrock/deployments
 
-cp $configdir/config.json $deploymentdir/
 
 source $rootdir/.envrc
 
-cd packages/contracts-bedrock && \
+cd $rootdir/packages/contracts-bedrock && ./scripts/getting-started/config.sh
+
+echo "configure finished"
+
+cd $rootdir/packages/contracts-bedrock && \
 DEPLOYMENT_OUTFILE=$deploymentdir/artifact.json \
 DEPLOY_CONFIG_PATH=$deploymentdir/config.json  \
   forge script scripts/deploy/Deploy.s.sol:Deploy \
+    --non-interactive \
     --broadcast --private-key $PRIVATE_KEY \
     --rpc-url $L1_RPC_URL
 
+echo "contract deploy finished"
+
+cp $deploymentdir/config.json $configdir/
 cp $deploymentdir/artifact.json $configdir/
 cd $rootdir

generate.sh

 #!/bin/bash
-./bin/op-node genesis l2 --deploy-config ./deployer/config.json  --l1-deployments ./deployer/artifact.json  --l2-allocs ./deployer/alloc.json  --outfile.l2 ./deployer/genesis.json --outfile.rollup ./deployer/rollup.json --l1-rpc=http://18.168.16.120:18888
+source .envrc
+./bin/op-node genesis l2 --deploy-config ./deployer/config.json  --l1-deployments ./deployer/artifact.json  --l2-allocs ./deployer/alloc.json  --outfile.l2 ./deployer/genesis.json --outfile.rollup ./deployer/rollup.json --l1-rpc=$L1_RPC_URL
 

op-proposer/flags/flags.go

@@ -49,6 +49,7 @@ var (
 		Name:    "allow-non-finalized",
 		Usage:   "Allow the proposer to submit proposals for L2 blocks derived from non-finalized L1 blocks.",
 		EnvVars: prefixEnvVars("ALLOW_NON_FINALIZED"),
+		Value:   true,
 	}
 	DisputeGameFactoryAddressFlag = &cli.StringFlag{
 		Name:    "game-factory-address",

packages/contracts-bedrock/scripts/getting-started/config.sh

@@ -159,4 +159,4 @@ cat << EOL >> tmp_config.json
 EOL
 
 # Write the final config file
-mv tmp_config.json "$CONTRACTS_BASE/deploy-config/getting-started.json"
+mv tmp_config.json "$CONTRACTS_BASE/deployments/config.json"