Merge pull request #33 from rabbitprincess/feature/v1.9.3

Feature/v1.9.3

Author: gosunuts

Makefile

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

README.md

@@ -76,7 +76,6 @@ It support 4 steps to operate OP Stack node
 
 ### run node
 - `RUN_MODE`: Run mode ( sequencer or replica ) (default `sequencer`)
-- `DATA_AVAILABILITY_TYPE`: Data availability type (default `blobs`)
 - `MAX_CHANNEL_DURATION`: Batch time submitted to the L1 (default `1500`)
 - `SEQUENCER_HTTP`: Sequencer endpoint
 - `P2P_BOOTNODES`: Bootnode enr address

envs/custom-holesky.env

@@ -21,7 +21,7 @@ ALT_DA_SERVER=
 ##################################################
 #            init node configuration             #
 ##################################################
-L1_RPC_URL_DEPLOY="https://holesky.drpc.org"
+L1_RPC_URL_DEPLOY="https://eth-holesky.public.blastapi.io/"
 PRIORITY_GAS_PRICE=1
 GOVERNANCE_TOKEN_SYMBOL=
 
@@ -48,9 +48,7 @@ SEQUENCER_PRIVATE_KEY=
 RUN_MODE="sequencer" # run mode, sequencer or replica
 
 # Sequencer Configuration
-# docs.optimism.io/builders/chain-operators/configuration/batcher#data-availability-type
-OP_BATCHER_DATA_AVAILABILITY_TYPE="blobs"
-# docs.optimism.io/builders/chain-operators/management/configuration#op-batcher-configuration
+# docs.optimism.io/builders/chain-operators/configuration/batcher#recommendations
 OP_BATCHER_MAX_CHANNEL_DURATION=1500
 
 # Replica Configuration

envs/custom-mainnet.env

@@ -21,7 +21,7 @@ ALT_DA_SERVER=
 ##################################################
 #            init node configuration             #
 ##################################################
-L1_RPC_URL_DEPLOY="https://eth.drpc.org"
+L1_RPC_URL_DEPLOY="https://eth-mainnet.public.blastapi.io/"
 PRIORITY_GAS_PRICE=1
 GOVERNANCE_TOKEN_SYMBOL=
 
@@ -48,9 +48,7 @@ SEQUENCER_PRIVATE_KEY=
 RUN_MODE="sequencer" # run mode, sequencer or replica
 
 # Sequencer Configuration
-# docs.optimism.io/builders/chain-operators/configuration/batcher#data-availability-type
-OP_BATCHER_DATA_AVAILABILITY_TYPE="blobs"
-# docs.optimism.io/builders/chain-operators/management/configuration#op-batcher-configuration
+# docs.optimism.io/builders/chain-operators/configuration/batcher#recommendations
 OP_BATCHER_MAX_CHANNEL_DURATION=1500
 
 # Replica Configuration

envs/custom-sepolia.env

@@ -21,7 +21,7 @@ ALT_DA_SERVER=
 ##################################################
 #            init node configuration             #
 ##################################################
-L1_RPC_URL_DEPLOY="https://sepolia.drpc.org"
+L1_RPC_URL_DEPLOY="https://eth-sepolia.public.blastapi.io/"
 PRIORITY_GAS_PRICE=10000
 GOVERNANCE_TOKEN_SYMBOL=
 
@@ -48,9 +48,7 @@ SEQUENCER_PRIVATE_KEY=
 RUN_MODE="sequencer" # run mode, sequencer or replica
 
 # Sequencer Configuration
-# docs.optimism.io/builders/chain-operators/configuration/batcher#data-availability-type
-OP_BATCHER_DATA_AVAILABILITY_TYPE="blobs" 
-# docs.optimism.io/builders/chain-operators/management/configuration#op-batcher-configuration
+# docs.optimism.io/builders/chain-operators/configuration/batcher#recommendations
 OP_BATCHER_MAX_CHANNEL_DURATION=1500
 
 # Replica Configuration

init/Dockerfile

@@ -7,7 +7,7 @@ RUN apt-get -y update && apt-get install -y sudo jq wget curl gnupg git make bc
     sudo rm -rf /var/lib/apt/lists
 
 # install go
-RUN curl -sL https://golang.org/dl/go1.22.5.linux-amd64.tar.gz | tar -C /usr/local -xzf -
+RUN curl -sL https://golang.org/dl/go1.23.2.linux-amd64.tar.gz | tar -C /usr/local -xzf -
 ENV PATH="$PATH:/usr/local/go/bin"
 
 # install nodejs and pnpm
@@ -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.2}
+ENV OP_VERSION=${OP_VERSION:-v1.9.1}
 RUN mkdir -p ~/optimism && cd ~/optimism && \
     git clone $OP_REPO --depth 1 --branch $OP_VERSION --single-branch . && \
     git switch -c $OP_VERSION && \

init/docker-compose.yml

@@ -2,7 +2,7 @@ services:
   node_init:
     build:
       context: .
-    image: dreamcacao/builderism_init:latest
+    image: dreamcacao/builderism_init:1.9.1
     pull_policy: always
     volumes:
       - ${CONFIG_DIR}:/config

run/Dockerfile

@@ -1,9 +1,9 @@
-FROM golang:1.22 AS op
+FROM golang:1.23 AS op
 
 WORKDIR /app
 
 ENV OP_REPO=https://github.com/ethereum-optimism/optimism.git
-ENV OP_VERSION=${OP_VERSION:-v1.9.2}
+ENV OP_VERSION=${OP_VERSION:-v1.9.3}
 
 RUN git clone $OP_REPO --depth 1 --branch op-node/$OP_VERSION --single-branch . && \
     git switch -c branch-$OP_VERSION && \

run/op-batcher-entrypoint.sh

@@ -4,7 +4,6 @@ set -eu
 RUN_MODE=${RUN_MODE:-"replica"}
 OP_BATCHER_L1_ETH_RPC=${L1_RPC_URL}
 OP_BATCHER_MAX_CHANNEL_DURATION=${OP_BATCHER_MAX_CHANNEL_DURATION:-0}
-OP_BATCHER_DATA_AVAILABILITY_TYPE=${OP_BATCHER_DATA_AVAILABILITY_TYPE:-"blobs"}
 
 if [ "$RUN_MODE" != "sequencer" ]; then
   echo "batcher only running in sequencer mode, exiting..."
@@ -13,7 +12,6 @@ fi
 
 ADDITIONAL_ARGS=""
 if [ ! -z "${ALT_DA_SERVER:-}" ]; then
-  OP_BATCHER_DATA_AVAILABILITY_TYPE="calldata"
   ADDITIONAL_ARGS="$ADDITIONAL_ARGS \
     --altda.da-server=$ALT_DA_SERVER \
     --altda.enabled"
@@ -33,7 +31,7 @@ exec /app/op-batcher \
   --rpc.addr=0.0.0.0 \
   --rpc.port=8548 \
   --rpc.enable-admin \
-  --data-availability-type=${OP_BATCHER_DATA_AVAILABILITY_TYPE} \
+  --data-availability-type=auto \
   --wait-node-sync=true \
   --max-channel-duration=${OP_BATCHER_MAX_CHANNEL_DURATION} \
   --private-key=${OP_BATCHER_PRIVATE_KEY} \