From 0e685dcd0378f7e342f87f17af586de44e4d4c28 Mon Sep 17 00:00:00 2001 From: spypsy Date: Wed, 5 Apr 2023 12:40:26 +0000 Subject: [PATCH 1/4] remove manual cp from Dockerfiles --- yarn-project/barretenberg.js/package.json | 5 +++-- yarn-project/circuits.js/Dockerfile | 9 +++------ yarn-project/merkle-tree/Dockerfile | 1 - yarn-project/sequencer-client/Dockerfile | 10 +++------- yarn-project/world-state/Dockerfile | 7 ++----- 5 files changed, 11 insertions(+), 21 deletions(-) diff --git a/yarn-project/barretenberg.js/package.json b/yarn-project/barretenberg.js/package.json index 4ff0559dc626..bf4c8eb7acb0 100644 --- a/yarn-project/barretenberg.js/package.json +++ b/yarn-project/barretenberg.js/package.json @@ -13,8 +13,9 @@ "tsconfig": "./tsconfig.dest.json" }, "scripts": { - "build": "tsc -b tsconfig.dest.json && cp ./src/wasm/barretenberg.wasm ./dest/wasm", + "build": "tsc -b tsconfig.dest.json && yarn build:link", "build:dev": "tsc -b tsconfig.dest.json --watch", + "build:link": "ln -nf src/wasm/barretenberg.wasm dest/wasm/barretenberg.wasm", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "prettier --check ./src && eslint --max-warnings 0 ./src", "formatting:fix": "prettier -w ./src", @@ -56,4 +57,4 @@ "ts-node": "^10.9.1", "typescript": "^4.9.5" } -} +} \ No newline at end of file diff --git a/yarn-project/circuits.js/Dockerfile b/yarn-project/circuits.js/Dockerfile index bd539cb3073b..91ac21829c88 100644 --- a/yarn-project/circuits.js/Dockerfile +++ b/yarn-project/circuits.js/Dockerfile @@ -7,17 +7,14 @@ COPY . . WORKDIR /usr/src/yarn-project/circuits.js RUN yarn build && yarn formatting -# (3) copy bb.js wasm binaries -RUN cp /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/yarn-project/circuits.js/dest/wasm/aztec3-circuits.wasm - -# (3.5) test +# (2.5) test RUN yarn test -# (4) Prune dev dependencies. See comment in base image. +# (3) Prune dev dependencies. See comment in base image. RUN yarn cache clean RUN yarn workspaces focus --production > /dev/null -# (5) set up entry point +# (4) set up entry point FROM node:18-alpine COPY --from=builder /usr/src/yarn-project /usr/src/yarn-project WORKDIR /usr/src/yarn-project/circuits.js diff --git a/yarn-project/merkle-tree/Dockerfile b/yarn-project/merkle-tree/Dockerfile index 30cf2f54f1bb..c1790d5937ed 100644 --- a/yarn-project/merkle-tree/Dockerfile +++ b/yarn-project/merkle-tree/Dockerfile @@ -8,7 +8,6 @@ WORKDIR /usr/src/yarn-project/foundation RUN yarn build WORKDIR /usr/src/yarn-project/barretenberg.js RUN yarn build -RUN cp /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm dest/wasm/barretenberg.wasm WORKDIR /usr/src/yarn-project/merkle-tree RUN yarn build && yarn formatting && yarn test diff --git a/yarn-project/sequencer-client/Dockerfile b/yarn-project/sequencer-client/Dockerfile index 08097d37b3b2..2282a040a0f4 100644 --- a/yarn-project/sequencer-client/Dockerfile +++ b/yarn-project/sequencer-client/Dockerfile @@ -7,18 +7,14 @@ COPY . . WORKDIR /usr/src/yarn-project/sequencer-client RUN yarn build && yarn formatting -# (3) copy bb.js wasm binaries -RUN cp /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/yarn-project/circuits.js/dest/wasm/aztec3-circuits.wasm -RUN cp /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/yarn-project/barretenberg.js/dest/wasm/barretenberg.wasm - -# (3.5) test +# (2.5) test RUN yarn test -# (4) Prune dev dependencies. See comment in base image. +# (3) Prune dev dependencies. See comment in base image. RUN yarn cache clean RUN yarn workspaces focus --production > /dev/null -# (5) set up entry point +# (4) set up entry point FROM node:18-alpine COPY --from=builder /usr/src/yarn-project /usr/src/yarn-project WORKDIR /usr/src/yarn-project/sequencer-client diff --git a/yarn-project/world-state/Dockerfile b/yarn-project/world-state/Dockerfile index 43fc2ef568a6..58e77925952d 100644 --- a/yarn-project/world-state/Dockerfile +++ b/yarn-project/world-state/Dockerfile @@ -18,14 +18,11 @@ RUN yarn build && yarn formatting # (3.5) test RUN yarn test -# (4) copy bb.js wasm binaries -RUN cp /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/yarn-project/barretenberg.js/dest/wasm/barretenberg.wasm - -# (5) Prune dev dependencies. See comment in base image. +# (4) Prune dev dependencies. See comment in base image. RUN yarn cache clean RUN yarn workspaces focus --production > /dev/null -# (6) set up entry point +# (5) set up entry point FROM node:18-alpine COPY --from=builder /usr/src/yarn-project/world-state /usr/src/yarn-project/world-state WORKDIR /usr/src/yarn-project/world-state From 44e463ac8e837f7a852b742c285f9d35b072023a Mon Sep 17 00:00:00 2001 From: spypsy Date: Wed, 5 Apr 2023 13:24:25 +0000 Subject: [PATCH 2/4] COPY circuits.js in sequencer-client --- yarn-project/sequencer-client/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yarn-project/sequencer-client/Dockerfile b/yarn-project/sequencer-client/Dockerfile index 2282a040a0f4..55bfc0638be8 100644 --- a/yarn-project/sequencer-client/Dockerfile +++ b/yarn-project/sequencer-client/Dockerfile @@ -1,7 +1,10 @@ FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder # (1) project -COPY . . +COPY sequencer-client sequencer-client + +# (2) dependencies +COPY circuits.js circuits.js # (2) build WORKDIR /usr/src/yarn-project/sequencer-client From 337ec2f016a7d8e88d0112024be9fb240dfe14ea Mon Sep 17 00:00:00 2001 From: spypsy Date: Wed, 5 Apr 2023 13:38:10 +0000 Subject: [PATCH 3/4] add all deps --- yarn-project/sequencer-client/Dockerfile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/yarn-project/sequencer-client/Dockerfile b/yarn-project/sequencer-client/Dockerfile index 55bfc0638be8..58dd6079e4dc 100644 --- a/yarn-project/sequencer-client/Dockerfile +++ b/yarn-project/sequencer-client/Dockerfile @@ -5,19 +5,27 @@ COPY sequencer-client sequencer-client # (2) dependencies COPY circuits.js circuits.js +COPY ethereum.js ethereum.js +COPY foundation foundation +COPY l1-contracts l1-contracts +COPY l2-block l2-block +COPY merkle-tree merkle-tree +COPY p2p p2p +COPY tx tx +COPY world-state world-state -# (2) build +# (3) build WORKDIR /usr/src/yarn-project/sequencer-client RUN yarn build && yarn formatting -# (2.5) test +# (3.5) test RUN yarn test -# (3) Prune dev dependencies. See comment in base image. +# (4) Prune dev dependencies. See comment in base image. RUN yarn cache clean RUN yarn workspaces focus --production > /dev/null -# (4) set up entry point +# (5) set up entry point FROM node:18-alpine COPY --from=builder /usr/src/yarn-project /usr/src/yarn-project WORKDIR /usr/src/yarn-project/sequencer-client From d27f7b52279fe9e21328536b82d619cf9fb696bb Mon Sep 17 00:00:00 2001 From: spypsy Date: Wed, 5 Apr 2023 13:41:06 +0000 Subject: [PATCH 4/4] add bb.js --- yarn-project/sequencer-client/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/yarn-project/sequencer-client/Dockerfile b/yarn-project/sequencer-client/Dockerfile index 58dd6079e4dc..634dbb206448 100644 --- a/yarn-project/sequencer-client/Dockerfile +++ b/yarn-project/sequencer-client/Dockerfile @@ -5,6 +5,7 @@ COPY sequencer-client sequencer-client # (2) dependencies COPY circuits.js circuits.js +COPY barretenberg.js barretenberg.js COPY ethereum.js ethereum.js COPY foundation foundation COPY l1-contracts l1-contracts