From 18eb15acdda2079246d290ed8ceb23f6d9ab1a72 Mon Sep 17 00:00:00 2001 From: Enderson Maia Date: Tue, 3 Dec 2024 11:07:39 -0300 Subject: [PATCH 1/4] feat(sdk): add cartesi-rollups-graphql binary --- .changeset/long-stingrays-work.md | 5 +++++ packages/sdk/Dockerfile | 11 +++++++++++ packages/sdk/docker-bake.hcl | 1 + 3 files changed, 17 insertions(+) create mode 100644 .changeset/long-stingrays-work.md diff --git a/.changeset/long-stingrays-work.md b/.changeset/long-stingrays-work.md new file mode 100644 index 00000000..d61a21a6 --- /dev/null +++ b/.changeset/long-stingrays-work.md @@ -0,0 +1,5 @@ +--- +"@cartesi/sdk": major +--- + +add cartesi-rollups-graphql binary diff --git a/packages/sdk/Dockerfile b/packages/sdk/Dockerfile index 7bc3b4dd..589dea32 100644 --- a/packages/sdk/Dockerfile +++ b/packages/sdk/Dockerfile @@ -8,6 +8,7 @@ ARG CRANE_VERSION ARG NODEJS_VERSION ARG SU_EXEC_VERSION ARG ANVIL_VERSION +ARG CARTESI_ROLLUPS_GRAPHQL_VERSION ################################################################################ # base image @@ -71,6 +72,15 @@ FROM node:${NODEJS_VERSION}-bookworm AS devnet ARG DEVNET_VERSION RUN npm install -g @cartesi/devnet@${DEVNET_VERSION} +################################################################################ +# cartesi-rollups-graphql installer +FROM base AS graphql +ARG CARTESI_ROLLUPS_GRAPHQL_VERSION +ARG TARGETOS +ARG TARGETARCH +RUN curl -fsSL https://github.com/Calindra/cartesi-rollups-graphql/releases/download/v${CARTESI_ROLLUPS_GRAPHQL_VERSION}/cartesi-rollups-graphql-v${CARTESI_ROLLUPS_GRAPHQL_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz \ + | tar -xzf - -C /usr/local/bin + ################################################################################ # sdk final image FROM base @@ -143,6 +153,7 @@ COPY --from=su-exec /usr/local/src/su-exec /usr/local/bin/ COPY --from=crane /usr/local/bin/crane /usr/local/bin/ COPY --from=devnet /usr/local/lib/node_modules/@cartesi/devnet/export/abi/localhost.json /usr/share/cartesi/ COPY --from=devnet /usr/local/lib/node_modules/@cartesi/devnet/build/anvil_state.json /usr/share/cartesi/ +COPY --from=graphql /usr/local/bin/cartesi-rollups-graphql /usr/local/bin/ RUN mkdir -p /tmp/.cartesi && chmod 1777 /tmp/.cartesi # Install cartesi-machine emulator diff --git a/packages/sdk/docker-bake.hcl b/packages/sdk/docker-bake.hcl index 89f5ffcd..fecccc69 100644 --- a/packages/sdk/docker-bake.hcl +++ b/packages/sdk/docker-bake.hcl @@ -16,5 +16,6 @@ target "default" { NODEJS_VERSION = "18.19.0" SU_EXEC_VERSION = "0.2" ANVIL_VERSION = "2044faec64f99a21f0e5f0094458a973612d0712" + CARTESI_ROLLUPS_GRAPHQL_VERSION = "2.1.1" } } From 4a5a21842f63a0c5bfc817db48a24cfcde302f01 Mon Sep 17 00:00:00 2001 From: Danilo Tuler Date: Wed, 8 Jan 2025 11:08:20 -0500 Subject: [PATCH 2/4] fixup! feat(sdk): add cartesi-rollups-graphql binary --- packages/sdk/Dockerfile | 4 ++-- packages/sdk/docker-bake.hcl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sdk/Dockerfile b/packages/sdk/Dockerfile index 589dea32..7eafd416 100644 --- a/packages/sdk/Dockerfile +++ b/packages/sdk/Dockerfile @@ -78,7 +78,7 @@ FROM base AS graphql ARG CARTESI_ROLLUPS_GRAPHQL_VERSION ARG TARGETOS ARG TARGETARCH -RUN curl -fsSL https://github.com/Calindra/cartesi-rollups-graphql/releases/download/v${CARTESI_ROLLUPS_GRAPHQL_VERSION}/cartesi-rollups-graphql-v${CARTESI_ROLLUPS_GRAPHQL_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz \ +RUN curl -fsSL https://github.com/cartesi/rollups-graphql/releases/download/v${CARTESI_ROLLUPS_GRAPHQL_VERSION}/rollups-graphql-v${CARTESI_ROLLUPS_GRAPHQL_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz \ | tar -xzf - -C /usr/local/bin ################################################################################ @@ -153,7 +153,7 @@ COPY --from=su-exec /usr/local/src/su-exec /usr/local/bin/ COPY --from=crane /usr/local/bin/crane /usr/local/bin/ COPY --from=devnet /usr/local/lib/node_modules/@cartesi/devnet/export/abi/localhost.json /usr/share/cartesi/ COPY --from=devnet /usr/local/lib/node_modules/@cartesi/devnet/build/anvil_state.json /usr/share/cartesi/ -COPY --from=graphql /usr/local/bin/cartesi-rollups-graphql /usr/local/bin/ +COPY --from=graphql /usr/local/bin/rollups-graphql /usr/local/bin/cartesi-rollups-graphql RUN mkdir -p /tmp/.cartesi && chmod 1777 /tmp/.cartesi # Install cartesi-machine emulator diff --git a/packages/sdk/docker-bake.hcl b/packages/sdk/docker-bake.hcl index fecccc69..c73b04bc 100644 --- a/packages/sdk/docker-bake.hcl +++ b/packages/sdk/docker-bake.hcl @@ -16,6 +16,6 @@ target "default" { NODEJS_VERSION = "18.19.0" SU_EXEC_VERSION = "0.2" ANVIL_VERSION = "2044faec64f99a21f0e5f0094458a973612d0712" - CARTESI_ROLLUPS_GRAPHQL_VERSION = "2.1.1" + CARTESI_ROLLUPS_GRAPHQL_VERSION = "2.2.2" } } From 16b6bf3dfbd557843270a7cbcb8ca7ce5963c97d Mon Sep 17 00:00:00 2001 From: Enderson Maia Date: Wed, 22 Jan 2025 15:40:50 -0300 Subject: [PATCH 3/4] fixup! feat(sdk): add cartesi-rollups-graphql binary --- packages/sdk/Dockerfile | 4 ++-- packages/sdk/docker-bake.hcl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sdk/Dockerfile b/packages/sdk/Dockerfile index 7eafd416..b9cad9d3 100644 --- a/packages/sdk/Dockerfile +++ b/packages/sdk/Dockerfile @@ -78,7 +78,7 @@ FROM base AS graphql ARG CARTESI_ROLLUPS_GRAPHQL_VERSION ARG TARGETOS ARG TARGETARCH -RUN curl -fsSL https://github.com/cartesi/rollups-graphql/releases/download/v${CARTESI_ROLLUPS_GRAPHQL_VERSION}/rollups-graphql-v${CARTESI_ROLLUPS_GRAPHQL_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz \ +RUN curl -fsSL https://github.com/cartesi/rollups-graphql/releases/download/v${CARTESI_ROLLUPS_GRAPHQL_VERSION}/cartesi-rollups-graphql-v${CARTESI_ROLLUPS_GRAPHQL_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz \ | tar -xzf - -C /usr/local/bin ################################################################################ @@ -153,7 +153,7 @@ COPY --from=su-exec /usr/local/src/su-exec /usr/local/bin/ COPY --from=crane /usr/local/bin/crane /usr/local/bin/ COPY --from=devnet /usr/local/lib/node_modules/@cartesi/devnet/export/abi/localhost.json /usr/share/cartesi/ COPY --from=devnet /usr/local/lib/node_modules/@cartesi/devnet/build/anvil_state.json /usr/share/cartesi/ -COPY --from=graphql /usr/local/bin/rollups-graphql /usr/local/bin/cartesi-rollups-graphql +COPY --from=graphql /usr/local/bin/cartesi-rollups-graphql /usr/local/bin/cartesi-rollups-graphql RUN mkdir -p /tmp/.cartesi && chmod 1777 /tmp/.cartesi # Install cartesi-machine emulator diff --git a/packages/sdk/docker-bake.hcl b/packages/sdk/docker-bake.hcl index c73b04bc..8d4b86b9 100644 --- a/packages/sdk/docker-bake.hcl +++ b/packages/sdk/docker-bake.hcl @@ -16,6 +16,6 @@ target "default" { NODEJS_VERSION = "18.19.0" SU_EXEC_VERSION = "0.2" ANVIL_VERSION = "2044faec64f99a21f0e5f0094458a973612d0712" - CARTESI_ROLLUPS_GRAPHQL_VERSION = "2.2.2" + CARTESI_ROLLUPS_GRAPHQL_VERSION = "2.3.4" } } From 7cfe54ebc364af04677fc8d3d90616213c8af47e Mon Sep 17 00:00:00 2001 From: Enderson Maia Date: Wed, 22 Jan 2025 16:23:24 -0300 Subject: [PATCH 4/4] Update packages/sdk/Dockerfile Co-authored-by: Danilo Tuler --- packages/sdk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sdk/Dockerfile b/packages/sdk/Dockerfile index b9cad9d3..ab2b7eb0 100644 --- a/packages/sdk/Dockerfile +++ b/packages/sdk/Dockerfile @@ -153,7 +153,7 @@ COPY --from=su-exec /usr/local/src/su-exec /usr/local/bin/ COPY --from=crane /usr/local/bin/crane /usr/local/bin/ COPY --from=devnet /usr/local/lib/node_modules/@cartesi/devnet/export/abi/localhost.json /usr/share/cartesi/ COPY --from=devnet /usr/local/lib/node_modules/@cartesi/devnet/build/anvil_state.json /usr/share/cartesi/ -COPY --from=graphql /usr/local/bin/cartesi-rollups-graphql /usr/local/bin/cartesi-rollups-graphql +COPY --from=graphql /usr/local/bin/cartesi-rollups-graphql /usr/local/bin/ RUN mkdir -p /tmp/.cartesi && chmod 1777 /tmp/.cartesi # Install cartesi-machine emulator