Skip to content

Commit 3d5c930

Browse files
authored
Merge pull request #37 from rabbitprincess/feature/v1.11.0
Feature/v1.11.0
2 parents 0412c56 + ec13511 commit 3d5c930

5 files changed

Lines changed: 26 additions & 29 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ buildx-init:
2525
buildx-run:
2626
docker buildx build \
2727
--platform linux/amd64,linux/arm64 \
28-
-t dreamcacao/builderism_run:1.10.0 \
28+
-t dreamcacao/builderism_run:1.11.0 \
2929
-t dreamcacao/builderism_run:latest \
3030
--push ./run
3131

run/Dockerfile

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,23 @@ FROM golang:1.23 AS op
22

33
WORKDIR /app
44

5+
ENV CGO_ENABLED=0
56
ENV OP_REPO=https://github.com/ethereum-optimism/optimism.git
6-
ENV OP_VERSION=${OP_VERSION:-v1.10.0}
7+
ENV OP_VERSION=${OP_VERSION:-v1.11.0}
78

8-
RUN git clone $OP_REPO --depth 1 --branch op-node/$OP_VERSION --single-branch . && \
9-
git switch -c branch-$OP_VERSION && \
10-
make -C op-node VERSION=$OP_VERSION op-node && \
11-
make -C op-batcher VERSION=$OP_VERSION op-batcher && \
12-
make -C op-proposer VERSION=$OP_VERSION op-proposer
9+
RUN git clone $OP_REPO --depth 1 --branch op-node/$OP_VERSION --single-branch ./optimism && \
10+
cd optimism && git switch -c branch-$OP_VERSION && \
11+
git submodule sync --recursive && git submodule update --init --recursive && \
12+
go build -o /app/op-node ./op-node/cmd/main.go && \
13+
go build -o /app/op-batcher ./op-batcher/cmd/main.go && \
14+
go build -o /app/op-proposer ./op-proposer/cmd/main.go
1315

14-
FROM golang:1.22 AS geth
16+
FROM golang:1.23 AS geth
1517

1618
WORKDIR /app
1719

1820
ENV GETH_REPO=https://github.com/ethereum-optimism/op-geth.git
19-
ENV GETH_VERSION=${GETH_VERSION:-v1.101411.2}
21+
ENV GETH_VERSION=${GETH_VERSION:-v1.101500.0}
2022

2123
RUN git clone $GETH_REPO --depth 1 --branch $GETH_VERSION --single-branch . && \
2224
git switch -c branch-$GETH_VERSION && \
@@ -33,7 +35,7 @@ RUN apt-get update && \
3335
apt-get install -y sudo jq curl wget lz4 && \
3436
rm -rf /var/lib/apt/lists
3537

36-
COPY --from=op /app/op-node/bin/op-node ./
37-
COPY --from=op /app/op-batcher/bin/op-batcher ./
38-
COPY --from=op /app/op-proposer/bin/op-proposer ./
38+
COPY --from=op /app/op-node ./
39+
COPY --from=op /app/op-batcher ./
40+
COPY --from=op /app/op-proposer ./
3941
COPY --from=geth /app/build/bin/geth ./

run/docker-compose.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ services:
22
init:
33
build:
44
context: .
5-
image: dreamcacao/builderism_run:latest
6-
pull_policy: always
5+
image: dreamcacao/builderism_run:1.11.0
76
command: [ "bash", "/script/init-entrypoint.sh" ]
87
volumes:
98
- ${GETH_DATA_DIR}:/data
@@ -14,8 +13,7 @@ services:
1413
- ../common.env
1514
- ../envs/${CHAIN_ENV_FILE}
1615
geth:
17-
image: dreamcacao/builderism_run:latest
18-
pull_policy: always
16+
image: dreamcacao/builderism_run:1.11.0
1917
depends_on:
2018
init:
2119
condition: service_completed_successfully
@@ -39,8 +37,7 @@ services:
3937
max-size: "500m"
4038
max-file: "7"
4139
node:
42-
image: dreamcacao/builderism_run:latest
43-
pull_policy: always
40+
image: dreamcacao/builderism_run:1.11.0
4441
depends_on:
4542
- geth
4643
command: [ "bash", "/script/op-node-entrypoint.sh" ]
@@ -63,8 +60,7 @@ services:
6360
max-size: "500m"
6461
max-file: "7"
6562
batcher:
66-
image: dreamcacao/builderism_run:latest
67-
pull_policy: always
63+
image: dreamcacao/builderism_run:1.11.0
6864
depends_on:
6965
- node
7066
command: [ "bash", "/script/op-batcher-entrypoint.sh" ]
@@ -82,8 +78,7 @@ services:
8278
max-size: "500m"
8379
max-file: "7"
8480
proposer:
85-
image: dreamcacao/builderism_run:latest
86-
pull_policy: always
81+
image: dreamcacao/builderism_run:1.11.0
8782
depends_on:
8883
- batcher
8984
command: [ "bash", "/script/op-proposer-entrypoint.sh" ]

run/geth-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ exec /app/geth \
3131
--ws.addr=0.0.0.0 \
3232
--ws.port=8546 \
3333
--ws.origins="*" \
34-
--ws.api=debug,eth,txpool,net,engine \
34+
--ws.api=web3,debug,eth,txpool,net,engine \
3535
--authrpc.vhosts="*" \
3636
--authrpc.addr=0.0.0.0 \
3737
--authrpc.port=8551 \

run/snapshot/snapshots.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"10": [
33
"https://snapshots.publicnode.com/optimism-geth-base-0-123025549.tar.lz4",
4-
"https://snapshots.publicnode.com/optimism-geth-part-123025550-127037167.tar.lz4"
4+
"https://snapshots.publicnode.com/optimism-geth-part-123025550-131918765.tar.lz4"
55
],
66
"11155420": [
77
"https://snapshots.publicnode.com/optimism-sepolia-geth-base-0-14573701.tar.lz4",
8-
"https://snapshots.publicnode.com/optimism-sepolia-geth-part-14573702-18926737.tar.lz4"
8+
"https://snapshots.publicnode.com/optimism-sepolia-geth-part-14573702-23851533.tar.lz4"
99
],
1010
"8453": [
11-
"https://snapshots.publicnode.com/base-geth-base-0-11019956.tar.lz4",
12-
"https://snapshots.publicnode.com/base-geth-part-11019957-21465281.tar.lz4"
11+
"https://snapshots.publicnode.com/base-geth-base-0-26112439.tar.lz4",
12+
"https://snapshots.publicnode.com/base-geth-part-26112440-26346882.tar.lz4"
1313
],
1414
"84532": [
15-
"https://snapshots.publicnode.com/base-sepolia-geth-base-0-12900080.tar.lz4",
16-
"https://snapshots.publicnode.com/base-sepolia-geth-part-12900081-16960513.tar.lz4"
15+
"https://snapshots.publicnode.com/base-sepolia-geth-base-0-21553672.tar.lz4",
16+
"https://snapshots.publicnode.com/base-sepolia-geth-part-21553673-21842110.tar.lz4"
1717
]
1818
}

0 commit comments

Comments
 (0)