Skip to content

Commit 495b0bb

Browse files
Copybara Botactions-user
authored andcommitted
Project import generated by Copybara.
GitOrigin-RevId: f7d7c8b7212cb30fb543784d0f00127b4e370571
1 parent bf27238 commit 495b0bb

17 files changed

Lines changed: 134 additions & 130 deletions

File tree

.github/workflows/test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ jobs:
238238
- name: Run Clippy
239239
run: |
240240
cargo hack clippy \
241+
--locked \
241242
--workspace --all-targets \
242243
--feature-powerset \
243244
--exclude-features bb_rs,bb_utxo

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,4 @@ temp_fixtures
2929
# Claude Code completion markers
3030
.done
3131

32-
# Symlink to GENERATED_AI_GUIDANCE.md (canonical file)
33-
CLAUDE.md
32+
PLAN.md

Cargo.lock

Lines changed: 10 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,13 +271,13 @@ once_cell = "1.19.0"
271271
parking_lot = "0.12.1"
272272
phonenumber = "0.3"
273273
pretty-hex = "0.3.0"
274-
proptest = "1.6.0"
274+
proptest = "1.11.0"
275275
proc-macro2 = "1.0"
276276
quote = "1.0"
277277
quickcheck = "1.0.3"
278278
rand = "0.8.5"
279279
rand_chacha = "0.3.1"
280-
rand_xorshift = "0.3"
280+
rand_xorshift = "0.4"
281281
reqwest = { version = "0.12", features = ["json", "multipart"] }
282282
rlp = "0.6.1"
283283
rocksdb = "0.21"

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ cargo hakari manage-deps --yes
363363
```
364364

365365
The `Rust / Hakari Check` GitHub workflow enforces that the crate stays synchronized; if it fails, re-run the commands above and commit the resulting changes.
366+
The main `Test` workflow also verifies `Cargo.lock` during its clippy run by adding `--locked` to `cargo hack clippy`; if that check reports that the lockfile needs updates, regenerate and commit `Cargo.lock` before retrying CI.
366367

367368
## Contributing
368369

app/packages/payy/scripts/export-ts-types.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,15 @@ echo "📋 Checking generated types ..."
1515

1616
# Type-check only the generated TypeScript types using the custom tsconfig
1717
cd "${workspace_root}/app/packages/payy"
18+
19+
# Keep this aligned with the app TypeScript toolchain (see app/yarn.lock).
20+
TS_RS_TS_VERSION="5.9.3"
21+
echo "Using TypeScript ${TS_RS_TS_VERSION} for generated-bindings type checking."
22+
1823
# Note: this expects at least one top-level `src/ts-rs-bindings/*.ts` file.
1924
# If we adopt namespaced exports via `#[ts(export_to = ".../")]`, revisit this
2025
# check and `src/ts-rs-bindings/tsconfig.tsrs.json` include patterns.
21-
if ls src/ts-rs-bindings/*.ts && npx tsc --project src/ts-rs-bindings/tsconfig.tsrs.json; then
26+
if ls src/ts-rs-bindings/*.ts && npx --yes --package typescript@${TS_RS_TS_VERSION} tsc --project src/ts-rs-bindings/tsconfig.tsrs.json; then
2227
echo "✅ TypeScript type check passed for generated bindings."
2328
else
2429
echo "❌ TypeScript type check failed for generated bindings!"

docker/Dockerfile.aggregator

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Build aggregator CLI binary
2+
ARG DEBIAN_TESTING_SNAPSHOT=20260404T140000Z
3+
24
FROM rust:1-bookworm AS workspace
35

46
ARG SCCACHE_GCS_BUCKET
@@ -75,6 +77,8 @@ RUN mkdir -p /build/bin && \
7577
# Runtime image with barretenberg CLI installed
7678
FROM debian:bookworm-slim as runtime
7779

80+
ARG DEBIAN_TESTING_SNAPSHOT
81+
7882
ENV ROOT_DIR /polybase
7983
WORKDIR $ROOT_DIR
8084

@@ -93,12 +97,13 @@ RUN wget https://storage.googleapis.com/payy-public-fixtures/bb/v3.0.0-manual.20
9397
mv bb /usr/local/bin/bb && \
9498
rm barretenberg.tar.gz
9599

96-
# Fetch modern libc/libstdc++ plus jq which bb expects
97-
RUN echo 'deb http://deb.debian.org/debian testing main' \
98-
> /etc/apt/sources.list.d/testing.list && \
99-
echo 'APT::Default-Release "stable";' \
100-
> /etc/apt/apt.conf.d/99defaultrelease && \
101-
apt-get update && \
100+
# Freeze Debian testing to a known-good snapshot so upstream testing changes
101+
# do not break image builds.
102+
RUN echo "deb [check-valid-until=no] https://snapshot.debian.org/archive/debian/${DEBIAN_TESTING_SNAPSHOT} testing main" \
103+
> /etc/apt/sources.list.d/testing.list && \
104+
echo 'APT::Default-Release "stable";' \
105+
> /etc/apt/apt.conf.d/99defaultrelease && \
106+
apt-get update && \
102107
DEBIAN_FRONTEND=noninteractive \
103108
apt-get install -y -t testing libc6 libstdc++6 jq
104109

docker/Dockerfile.barretenberg-api-server

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Build binary
2+
ARG DEBIAN_TESTING_SNAPSHOT=20260404T140000Z
3+
24
FROM rust:1-bookworm AS workspace
35

46
ARG SCCACHE_GCS_BUCKET
@@ -37,6 +39,8 @@ WORKDIR /build
3739

3840
FROM workspace AS tester
3941

42+
ARG DEBIAN_TESTING_SNAPSHOT
43+
4044
SHELL ["/bin/bash", "--login", "-c"]
4145

4246
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
@@ -53,15 +57,14 @@ RUN wget https://storage.googleapis.com/payy-public-fixtures/bb/v3.0.0-manual.20
5357
mv bb /usr/local/bin/bb && \
5458
rm barretenberg.tar.gz
5559

56-
# bb requires a recent glibcxx version
57-
# Enable backports and pull libstdc++ 13.x (exports GLIBCXX_3.4.31)
58-
# also installs jq, some bb commands require jq
59-
RUN echo 'deb http://deb.debian.org/debian testing main' \
60-
> /etc/apt/sources.list.d/testing.list && \
61-
echo 'APT::Default-Release "stable";' \
62-
> /etc/apt/apt.conf.d/99defaultrelease && \
63-
apt-get update && \
64-
# pull only the two runtime libs from testing
60+
# bb requires a recent glibcxx version.
61+
# Freeze Debian testing to a known-good snapshot so upstream testing changes
62+
# do not break image builds.
63+
RUN echo "deb [check-valid-until=no] https://snapshot.debian.org/archive/debian/${DEBIAN_TESTING_SNAPSHOT} testing main" \
64+
> /etc/apt/sources.list.d/testing.list && \
65+
echo 'APT::Default-Release "stable";' \
66+
> /etc/apt/apt.conf.d/99defaultrelease && \
67+
apt-get update && \
6568
DEBIAN_FRONTEND=noninteractive \
6669
apt-get install -y -t testing libc6 libstdc++6 jq
6770

@@ -140,6 +143,8 @@ RUN cp /build/target/$([ "$RELEASE" = "1" ] && echo "release" || echo "debug")/b
140143
# Runtime stage dedicated to barretenberg-api-server
141144
FROM debian:bookworm-slim as runtime
142145

146+
ARG DEBIAN_TESTING_SNAPSHOT
147+
143148
ENV ROOT_DIR /polybase
144149
WORKDIR $ROOT_DIR
145150

@@ -158,14 +163,12 @@ RUN wget https://storage.googleapis.com/payy-public-fixtures/bb/v3.0.0-manual.20
158163
mv bb /usr/local/bin/bb && \
159164
rm barretenberg.tar.gz
160165

161-
# Enable backports and pull libstdc++ 13.x (exports GLIBCXX_3.4.31)
162-
# also installs jq, some bb commands require jq
163-
RUN echo 'deb http://deb.debian.org/debian testing main' \
164-
> /etc/apt/sources.list.d/testing.list && \
165-
echo 'APT::Default-Release "stable";' \
166-
> /etc/apt/apt.conf.d/99defaultrelease && \
167-
apt-get update && \
168-
# pull only the two runtime libs from testing
166+
# Freeze Debian testing to the same snapshot used in the tester stage.
167+
RUN echo "deb [check-valid-until=no] https://snapshot.debian.org/archive/debian/${DEBIAN_TESTING_SNAPSHOT} testing main" \
168+
> /etc/apt/sources.list.d/testing.list && \
169+
echo 'APT::Default-Release "stable";' \
170+
> /etc/apt/apt.conf.d/99defaultrelease && \
171+
apt-get update && \
169172
DEBIAN_FRONTEND=noninteractive \
170173
apt-get install -y -t testing libc6 libstdc++6 jq
171174

docker/Dockerfile.guild

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
ARG DEBIAN_TESTING_SNAPSHOT=20260404T140000Z
2+
13
FROM rust:1-bookworm AS builder
24
ARG RUST_GIT_FETCH_CLI
35
ARG SCCACHE_GCS_BUCKET
@@ -55,6 +57,8 @@ RUN if [ -f /gcs_key.json ]; then \
5557

5658
FROM debian:bookworm-slim
5759

60+
ARG DEBIAN_TESTING_SNAPSHOT
61+
5862
#Add custom user
5963
RUN adduser --disabled-password --gecos "" --uid 1001 polybase
6064

@@ -67,14 +71,13 @@ RUN wget https://storage.googleapis.com/payy-public-fixtures/bb/v3.0.0-manual.20
6771
mv bb /usr/local/bin/bb && \
6872
rm barretenberg.tar.gz
6973

70-
# Enable backports and pull libstdc++ 13.x (exports GLIBCXX_3.4.31)
71-
# also installs jq, some bb commands require jq
72-
RUN echo 'deb http://deb.debian.org/debian testing main' \
73-
> /etc/apt/sources.list.d/testing.list && \
74-
echo 'APT::Default-Release "stable";' \
75-
> /etc/apt/apt.conf.d/99defaultrelease && \
76-
apt-get update && \
77-
# pull only the two runtime libs from testing
74+
# Freeze Debian testing to a known-good snapshot so upstream testing changes
75+
# do not break image builds.
76+
RUN echo "deb [check-valid-until=no] https://snapshot.debian.org/archive/debian/${DEBIAN_TESTING_SNAPSHOT} testing main" \
77+
> /etc/apt/sources.list.d/testing.list && \
78+
echo 'APT::Default-Release "stable";' \
79+
> /etc/apt/apt.conf.d/99defaultrelease && \
80+
apt-get update && \
7881
DEBIAN_FRONTEND=noninteractive \
7982
apt-get install -y -t testing libc6 libstdc++6 jq
8083

docker/Dockerfile.merge-cli

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
ARG DEBIAN_TESTING_SNAPSHOT=20260404T140000Z
2+
13
FROM rust:1-bookworm AS builder
24
ARG RUST_GIT_FETCH_CLI
35
ARG SCCACHE_GCS_BUCKET
@@ -50,6 +52,8 @@ RUN if [ -f /gcs_key.json ]; then \
5052

5153
FROM debian:bookworm-slim
5254

55+
ARG DEBIAN_TESTING_SNAPSHOT
56+
5357
RUN apt-get update && apt-get install -y openssl ca-certificates libpq-dev postgresql wget tar curl
5458

5559
# Download and install barretenberg
@@ -59,14 +63,13 @@ RUN wget https://storage.googleapis.com/payy-public-fixtures/bb/v3.0.0-manual.20
5963
mv bb /usr/local/bin/bb && \
6064
rm barretenberg.tar.gz
6165

62-
# Enable backports and pull libstdc++ 13.x (exports GLIBCXX_3.4.31)
63-
# also installs jq, some bb commands require jq
64-
RUN echo 'deb http://deb.debian.org/debian testing main' \
65-
> /etc/apt/sources.list.d/testing.list && \
66-
echo 'APT::Default-Release "stable";' \
67-
> /etc/apt/apt.conf.d/99defaultrelease && \
68-
apt-get update && \
69-
# pull only the two runtime libs from testing
66+
# Freeze Debian testing to a known-good snapshot so upstream testing changes
67+
# do not break image builds.
68+
RUN echo "deb [check-valid-until=no] https://snapshot.debian.org/archive/debian/${DEBIAN_TESTING_SNAPSHOT} testing main" \
69+
> /etc/apt/sources.list.d/testing.list && \
70+
echo 'APT::Default-Release "stable";' \
71+
> /etc/apt/apt.conf.d/99defaultrelease && \
72+
apt-get update && \
7073
DEBIAN_FRONTEND=noninteractive \
7174
apt-get install -y -t testing libc6 libstdc++6 jq
7275

@@ -87,4 +90,4 @@ ENV NODE_URL=http://localhost:8091/v0
8790
ENV BURN_EVM_ADDR=0x9A4ebe49A963D3BC5f16639A0ABFF093CA0b040D
8891
ENV BATCH=10
8992

90-
CMD merge-cli merge-ramps --batch ${BATCH} --burn-evm-address ${BURN_EVM_ADDR}
93+
CMD ["sh", "-c", "exec merge-cli merge-ramps --batch ${BATCH} --burn-evm-address ${BURN_EVM_ADDR}"]

0 commit comments

Comments
 (0)