From 4628f2f14e6e7191b4736750171fa11eec0d519c Mon Sep 17 00:00:00 2001
From: ns212 <nikolai@interlay.io>
Date: Fri, 19 Jul 2024 09:38:57 +0000
Subject: [PATCH 1/2] relay-retarget script

---
 sdk/Dockerfile => Dockerfile      | 10 ++++++----
 sdk/src/scripts/relay-retarget.ts | 15 ++++++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)
 rename sdk/Dockerfile => Dockerfile (78%)

diff --git a/sdk/Dockerfile b/Dockerfile
similarity index 78%
rename from sdk/Dockerfile
rename to Dockerfile
index d5e297ef..3013bf9e 100644
--- a/sdk/Dockerfile
+++ b/Dockerfile
@@ -5,9 +5,12 @@ RUN apt-get update \
     && apt-get install --no-install-recommends -y tini curl ca-certificates git \
     && rm -rf /var/lib/apt/lists/*
 
-RUN mkdir -p /home/node/app/node_modules && chown -R node:node /home/node/app
 WORKDIR /home/node/app
-COPY . ./
+COPY ./sdk ./sdk
+COPY --chown=node:node ./script ./sdk/script
+
+WORKDIR /home/node/app/sdk
+
 RUN corepack enable \
     && corepack prepare pnpm@latest-9 --activate \
     && npm ci \
@@ -20,7 +23,6 @@ RUN curl -L https://foundry.paradigm.xyz | bash && \
 
 USER node
 RUN mkdir /home/node/.npm/
-COPY --chown=node:node . .
 
-WORKDIR /home/node/app/dist/
+WORKDIR /home/node/app/sdk/dist/
 ENTRYPOINT [ "tini", "--", "node" ]
diff --git a/sdk/src/scripts/relay-retarget.ts b/sdk/src/scripts/relay-retarget.ts
index e26ac8fc..d91eb992 100644
--- a/sdk/src/scripts/relay-retarget.ts
+++ b/sdk/src/scripts/relay-retarget.ts
@@ -103,13 +103,14 @@ async function main(): Promise<void> {
 
     const retargetHeaders = await getRetargetHeaders(esploraClient, nextRetargetHeight, proofLength);
 
-    let env = [
-        `RELAY_ADDRESS=${relayAddress}`,
-        `RETARGET_HEADERS=${retargetHeaders}`,
-        `PRIVATE_KEY=${privateKey}`,
-    ];
-
-    exec(`${env.join(" ")} forge script ../script/RelayRetarget.s.sol:RelayRetargetScript --rpc-url '${rpcUrl}' --broadcast --priority-gas-price 1`,
+    let env = {
+        'RELAY_ADDRESS': relayAddress,
+        'RETARGET_HEADERS': retargetHeaders,
+        'PRIVATE_KEY': privateKey,
+    };
+
+    exec(`forge script ../script/RelayRetarget.s.sol:RelayRetargetScript --rpc-url '${rpcUrl}' --broadcast --priority-gas-price 1`,
+        { env: { ...process.env, ...env } },
         (err: any, stdout: string, stderr: string) => {
             if (err) {
                 throw new Error(`Failed to run command: ${err}`);

From 740b6e3d01159e13b37458f83a715865a121322a Mon Sep 17 00:00:00 2001
From: ns212 <nikolai@interlay.io>
Date: Sun, 21 Jul 2024 23:56:18 +0000
Subject: [PATCH 2/2] relay-retarget script

---
 Dockerfile | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3013bf9e..d43677d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,24 +5,22 @@ RUN apt-get update \
     && apt-get install --no-install-recommends -y tini curl ca-certificates git \
     && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /home/node/app
-COPY ./sdk ./sdk
-COPY --chown=node:node ./script ./sdk/script
+RUN curl -L https://foundry.paradigm.xyz | bash && \
+    . /root/.bashrc && \
+    /root/.foundry/bin/foundryup && \
+    cp /root/.foundry/bin/* /usr/local/bin/
 
-WORKDIR /home/node/app/sdk
+WORKDIR /home/node/app
+COPY --chown=node:node . .
 
 RUN corepack enable \
     && corepack prepare pnpm@latest-9 --activate \
-    && npm ci \
-    && npm run build
-
-RUN curl -L https://foundry.paradigm.xyz | bash && \
-    . /root/.bashrc && \
-    foundryup && \
-    mv /root/.foundry/bin/* /usr/local/bin
+    && chown -R node:node /home/node/app
 
 USER node
-RUN mkdir /home/node/.npm/
+RUN forge install
+
+WORKDIR /home/node/app/sdk
+RUN npm ci && npm run build
 
-WORKDIR /home/node/app/sdk/dist/
 ENTRYPOINT [ "tini", "--", "node" ]