Skip to content

Commit 3aeb6bd

Browse files
authored
feat: remove proxyd from monorepo, since it has been moved to ethereum-optimism/infra (ethereum-optimism#10831)
1 parent 5cd0214 commit 3aeb6bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+15
-12793
lines changed

Diff for: .circleci/config.yml

+1-20
Original file line numberDiff line numberDiff line change
@@ -1555,10 +1555,6 @@ workflows:
15551555
dependencies: "contracts-bedrock"
15561556
requires:
15571557
- pnpm-monorepo
1558-
- go-lint-test-build:
1559-
name: proxyd-tests
1560-
binary_name: proxyd
1561-
working_directory: proxyd
15621558
- semgrep-scan
15631559
- go-mod-download
15641560
- fuzz-golang:
@@ -1774,7 +1770,7 @@ workflows:
17741770
type: approval
17751771
filters:
17761772
tags:
1777-
only: /^(da-server|proxyd|chain-mon|ci-builder(-rust)?|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)\/v.*/
1773+
only: /^(da-server|chain-mon|ci-builder(-rust)?|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)\/v.*/
17781774
branches:
17791775
ignore: /.*/
17801776
- docker-build:
@@ -1952,21 +1948,6 @@ workflows:
19521948
- oplabs-gcr-release
19531949
requires:
19541950
- hold
1955-
- docker-build:
1956-
name: proxyd-docker-release
1957-
filters:
1958-
tags:
1959-
only: /^proxyd\/v.*/
1960-
branches:
1961-
ignore: /.*/
1962-
docker_name: proxyd
1963-
docker_tags: <<pipeline.git.revision>>
1964-
publish: true
1965-
release: true
1966-
context:
1967-
- oplabs-gcr-release
1968-
requires:
1969-
- hold
19701951
- docker-build:
19711952
name: chain-mon-docker-release
19721953
filters:

Diff for: .github/mergify.yml

-8
Original file line numberDiff line numberDiff line change
@@ -228,14 +228,6 @@ pull_request_rules:
228228
request_reviews:
229229
users:
230230
- roninjin10
231-
- name: Add A-proxyd label
232-
conditions:
233-
- 'files~=^proxyd/'
234-
- '#label<5'
235-
actions:
236-
label:
237-
add:
238-
- A-proxyd
239231
- name: Add M-docs label
240232
conditions:
241233
- 'files~=^(docs|specs)\/'

Diff for: .github/workflows/tag-service.yml

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ on:
3030
- op-dispute-mon
3131
- op-ufm
3232
- da-server
33-
- proxyd
3433
- op-contracts
3534
- op-conductor
3635
prerelease:

Diff for: docker-bake.hcl

-13
Original file line numberDiff line numberDiff line change
@@ -199,19 +199,6 @@ target "cannon" {
199199
tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/cannon:${tag}"]
200200
}
201201

202-
target "proxyd" {
203-
dockerfile = "./proxyd/Dockerfile"
204-
context = "./"
205-
args = {
206-
// proxyd dockerfile has no _ in the args
207-
GITCOMMIT = "${GIT_COMMIT}"
208-
GITDATE = "${GIT_DATE}"
209-
GITVERSION = "${GIT_VERSION}"
210-
}
211-
platforms = split(",", PLATFORMS)
212-
tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/proxyd:${tag}"]
213-
}
214-
215202
target "chain-mon" {
216203
dockerfile = "./ops/docker/Dockerfile.packages"
217204
context = "."

Diff for: ops/docker/op-stack-go/Dockerfile

+11-11
Original file line numberDiff line numberDiff line change
@@ -55,58 +55,58 @@ ARG TARGETOS TARGETARCH
5555
FROM --platform=$BUILDPLATFORM builder as cannon-builder
5656
ARG CANNON_VERSION=v0.0.0
5757
RUN --mount=type=cache,target=/root/.cache/go-build cd cannon && make cannon \
58-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$CANNON_VERSION"
58+
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$CANNON_VERSION"
5959

6060
FROM --platform=$BUILDPLATFORM builder as op-program-builder
6161
ARG OP_PROGRAM_VERSION=v0.0.0
6262
# note: we only build the host, that's all the user needs. No Go MIPS cross-build in docker
6363
RUN --mount=type=cache,target=/root/.cache/go-build cd op-program && make op-program-host \
64-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_PROGRAM_VERSION"
64+
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_PROGRAM_VERSION"
6565

6666
FROM --platform=$BUILDPLATFORM builder as op-heartbeat-builder
6767
ARG OP_HEARTBEAT_VERSION=v0.0.0
6868
RUN --mount=type=cache,target=/root/.cache/go-build cd op-heartbeat && make op-heartbeat \
69-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_HEARTBEAT_VERSION"
69+
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_HEARTBEAT_VERSION"
7070

7171
FROM --platform=$BUILDPLATFORM builder as op-wheel-builder
7272
ARG OP_WHEEL_VERSION=v0.0.0
7373
RUN --mount=type=cache,target=/root/.cache/go-build cd op-wheel && make op-wheel \
74-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_WHEEL_VERSION"
74+
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_WHEEL_VERSION"
7575

7676
FROM --platform=$BUILDPLATFORM builder as op-node-builder
7777
ARG OP_NODE_VERSION=v0.0.0
7878
RUN echo TARGETOS=$TARGETOS TARGETARCH=$TARGETARCH BUILDPLATFORM=$BUILDPLATFORM TARGETPLATFORM=$TARGETPLATFORM OP_NODE_VERSION=$OP_NODE_VERSION
7979
RUN --mount=type=cache,target=/root/.cache/go-build cd op-node && make op-node \
80-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_NODE_VERSION"
80+
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_NODE_VERSION"
8181

8282
FROM --platform=$BUILDPLATFORM builder as op-challenger-builder
8383
ARG OP_CHALLENGER_VERSION=v0.0.0
8484
RUN --mount=type=cache,target=/root/.cache/go-build cd op-challenger && make op-challenger \
85-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_CHALLENGER_VERSION"
85+
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_CHALLENGER_VERSION"
8686

8787
FROM --platform=$BUILDPLATFORM builder as op-dispute-mon-builder
8888
ARG OP_DISPUTE_MON_VERSION=v0.0.0
8989
RUN --mount=type=cache,target=/root/.cache/go-build cd op-dispute-mon && make op-dispute-mon \
90-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_DISPUTE_MON_VERSION"
90+
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_DISPUTE_MON_VERSION"
9191

9292
FROM --platform=$BUILDPLATFORM builder as op-batcher-builder
9393
ARG OP_BATCHER_VERSION=v0.0.0
9494
RUN --mount=type=cache,target=/root/.cache/go-build cd op-batcher && make op-batcher \
95-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_BATCHER_VERSION"
95+
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_BATCHER_VERSION"
9696

9797
FROM --platform=$BUILDPLATFORM builder as op-proposer-builder
9898
ARG OP_PROPOSER_VERSION=v0.0.0
9999
RUN --mount=type=cache,target=/root/.cache/go-build cd op-proposer && make op-proposer \
100-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_PROPOSER_VERSION"
100+
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_PROPOSER_VERSION"
101101

102102
FROM --platform=$BUILDPLATFORM builder as op-conductor-builder
103103
ARG OP_CONDUCTOR_VERSION=v0.0.0
104104
RUN --mount=type=cache,target=/root/.cache/go-build cd op-conductor && make op-conductor \
105-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_CONDUCTOR_VERSION"
105+
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_CONDUCTOR_VERSION"
106106

107107
FROM --platform=$BUILDPLATFORM builder as da-server-builder
108108
RUN --mount=type=cache,target=/root/.cache/go-build cd op-plasma && make da-server \
109-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE
109+
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE
110110

111111
FROM --platform=$TARGETPLATFORM $TARGET_BASE_IMAGE as cannon-target
112112
COPY --from=cannon-builder /app/cannon/bin/cannon /usr/local/bin/

Diff for: ops/scripts/ci-docker-tag-op-stack-release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ DOCKER_REPO=$1
66
GIT_TAG=$2
77
GIT_SHA=$3
88

9-
IMAGE_NAME=$(echo "$GIT_TAG" | grep -Eow '^(ci-builder(-rust)?|chain-mon|proxyd|da-server|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)' || true)
9+
IMAGE_NAME=$(echo "$GIT_TAG" | grep -Eow '^(ci-builder(-rust)?|chain-mon|da-server|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)' || true)
1010
if [ -z "$IMAGE_NAME" ]; then
1111
echo "image name could not be parsed from git tag '$GIT_TAG'"
1212
exit 1

Diff for: ops/tag-service/tag-service.py

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
'op-program': '0.0.0',
1919
'op-dispute-mon': '0.0.0',
2020
'op-proposer': '0.10.14',
21-
'proxyd': '3.16.0',
2221
'op-heartbeat': '0.1.0',
2322
'op-contracts': '1.0.0',
2423
'op-conductor': '0.0.0',

Diff for: ops/tag-service/tag-tool.py

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
'op-dispute-mon',
1313
'op-proposer',
1414
'da-server',
15-
'proxyd',
1615
'op-heartbeat',
1716
'op-contracts',
1817
'test',

Diff for: proxyd/.gitignore

-3
This file was deleted.

0 commit comments

Comments
 (0)