karak_docker_added

Author: Rachit2323

deploy.status

@@ -0,0 +1 @@
+success

karak_offchain/aggregator/Dockerfile

@@ -1,38 +1,56 @@
 FROM rust:1.83-slim AS builder
 
+# Set working directory in container
 WORKDIR /app
 
-COPY . .
+# Copy workspace files
+COPY karak_offchain/Cargo.toml karak_offchain/Cargo.lock ./
 
-WORKDIR /app/aggregator
+# Modify workspace members to only include aggregator
+RUN sed -i 's/members = \["aggregator", "operator"\]/members = ["aggregator"]/' Cargo.toml
 
-# Install necessary dependencies in a single step
+# Copy aggregator package
+COPY karak_offchain/aggregator/Cargo.toml ./aggregator/
+COPY karak_offchain/aggregator/src ./aggregator/src
+
+# Copy ABI files
+COPY karak_offchain/abi/ ./abi/
+
+# Copy contracts
+COPY onchain/contracts/ ./onchain/contracts/
+
+# Install system dependencies
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
         pkg-config \
         libssl-dev \
         ca-certificates \
-        openssl \
-        libterm-readline-perl-perl && \
+        openssl && \
     rm -rf /var/lib/apt/lists/*
 
-RUN cargo build --release --bin square-number-dss-aggregator
+# Build only the aggregator
+RUN cargo build --release --package square-number-dss-aggregator
 
 # ---- Runtime stage ----
 FROM debian:bookworm-slim
 
 WORKDIR /app
 
-# Set environment to avoid interactive prompts
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Install necessary runtime dependencies
+# Install runtime dependencies
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends curl ca-certificates && \
+    apt-get install -y --no-install-recommends \
+        libssl3 \
+        ca-certificates && \
     rm -rf /var/lib/apt/lists/*
 
-COPY --from=builder /app/target/release/square-number-dss-aggregator /app/square-number-dss-aggregator
-COPY --from=builder /app/onchain /app/onchain
+# Copy built binary
+COPY --from=builder \
+    /app/target/release/square-number-dss-aggregator \
+    /app/
 
+# Copy contract artifacts
+COPY --from=builder \
+    /app/onchain/contracts \
+    /app/onchain/contracts
 
-ENTRYPOINT ["/app/square-number-dss-aggregator"]
+ENTRYPOINT ["/app/square-number-dss-aggregator"]

karak_offchain/aggregator/src/contract.rs

@@ -17,21 +17,22 @@ use crate::TaskError;
 sol!(
     #[sol(rpc)]
     SquareNumberDSS,
-    "../abi/SquareNumberDSS.json",
+    "/app/abi/SquareNumberDSS.json",
 );
 
-
 sol!(
     #[sol(rpc)]
     TxnVerifier,
-    "../abi/TxnVerifier.json",
+    "/app/abi/TxnVerifier.json",
 );
 
+
+
 sol!(
     #[sol(rpc)]
     #[allow(clippy::too_many_arguments)]
     VaultAbi,
-    "../abi/Vault.json",
+    "/app/abi/Vault.json",
 );
 
 type RecommendedProvider = FillProvider<

karak_offchain/docker-compose.yaml

@@ -3,20 +3,21 @@ services:
         image: ghcr.io/foundry-rs/foundry:nightly
         platform: linux/amd64
         ports:
-            - "8545:8545"
+            - "8546:8545"
         volumes:
-            - ./:/dss
+            - ../:/dss
         environment:
             - ANVIL_IP_ADDR=0.0.0.0
-        working_dir: /dss/contracts
+        working_dir: /dss/onchain/contracts
         command: anvil --no-cors
 
     contract-builder:
         image: node:22.5-slim
+        user: "node"
         platform: linux/amd64
         volumes:
-            - ./:/dss
-        working_dir: /dss/contracts
+            - ../:/dss
+        working_dir: /dss/onchain/contracts
         depends_on:
             - anvil
         entrypoint:
@@ -29,10 +30,11 @@ services:
 
     contract-deployer:
         image: ghcr.io/foundry-rs/foundry:nightly
+        user: "root" 
         platform: linux/amd64
         volumes:
-            - ./:/dss
-        working_dir: /dss/contracts
+            - ../:/dss
+        working_dir: /dss/onchain/contracts
         depends_on:
             - anvil
         entrypoint:
@@ -50,11 +52,12 @@ services:
     aggregator:
         image: square-number-dss-aggregator
         build:
-            context: .
-            dockerfile: aggregator/Dockerfile
+            # Change context to parent directory which contains the workspace root
+            context: ..
+            dockerfile: karak_offchain/aggregator/Dockerfile
         platform: linux/amd64
         volumes:
-            - ./:/dss
+            - ../:/dss
         ports:
             - "3000:3000"
         healthcheck:
@@ -72,7 +75,7 @@ services:
             - COMMON_RATE_LIMIT_WINDOW_MS=1000
             - COMMON_RATE_LIMIT_MAX_REQUESTS=10000
             - PRIVATE_KEY=0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d
-            - BLOCK_NUMBER_STORE=/dss/contracts/block-number-store.json
+            - BLOCK_NUMBER_STORE=/dss/onchain/contracts/block-number-store.json
             - RUST_LOG=info
             - SQUARE_NUMBER_DSS_ADDRESS=0x9A9f2CCfdE556A7E9Ff0848998Aa4a0CFD8863AE
             - TXN_VERIFIER_ADDRESS=0x3Aa5ebB10DC797CAC828524e59A333d0A371443c
@@ -83,9 +86,12 @@ services:
     operator-1:
         image: square-number-dss-operator
         build:
-            context: .
-            dockerfile: operator/Dockerfile
+            # Change context to parent directory which contains the workspace root
+            context: ..
+            dockerfile: karak_offchain/operator/Dockerfile
         platform: linux/amd64
+        volumes:
+            - ../:/dss
         ports:
             - "8080:8080"
         environment:
@@ -111,9 +117,12 @@ services:
     operator-2:
         image: square-number-dss-operator
         build:
-            context: .
-            dockerfile: operator/Dockerfile
+            # Change context to parent directory which contains the workspace root
+            context: ..
+            dockerfile: karak_offchain/operator/Dockerfile
         platform: linux/amd64
+        volumes:
+            - ../:/dss
         ports:
             - "8081:8081"
         environment:
@@ -134,4 +143,4 @@ services:
             - RUST_BACKTRACE=full
         depends_on:
             aggregator:
-                condition: service_healthy
+                condition: service_healthy

karak_offchain/operator/Dockerfile

@@ -1,36 +1,52 @@
 FROM rust:1.83-slim AS builder
 
+# Set working directory in container
 WORKDIR /app
 
-COPY . .
+# Copy workspace root files
+COPY karak_offchain/Cargo.toml karak_offchain/Cargo.lock ./
 
-WORKDIR /app/operator
+# Modify workspace members to only include operator
+RUN sed -i 's/members = \["aggregator", "operator"\]/members = ["operator"]/' Cargo.toml
 
-# Install necessary dependencies in a single step
+# Copy operator package
+COPY karak_offchain/operator/Cargo.toml ./operator/
+COPY karak_offchain/operator/src ./operator/src
+
+# Copy ABI files
+COPY karak_offchain/abi/ ./abi/
+
+# Copy contracts
+COPY onchain/contracts/ ./onchain/contracts/
+
+# Install system dependencies
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
         pkg-config \
         libssl-dev \
         ca-certificates \
-        openssl \
-        libterm-readline-perl-perl && \
+        openssl && \
     rm -rf /var/lib/apt/lists/*
 
-RUN cargo build --release --bin square-number-dss-operator
+# Build only the operator
+RUN cargo build --release --package square-number-dss-operator
 
 # ---- Runtime stage ----
 FROM debian:bookworm-slim
 
 WORKDIR /app
 
-# Set environment to avoid interactive prompts
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Install necessary runtime dependencies
+# Install runtime dependencies
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends libssl3 ca-certificates && \
+    apt-get install -y --no-install-recommends \
+        libssl3 \
+        ca-certificates && \
     rm -rf /var/lib/apt/lists/*
 
-COPY --from=builder /app/target/release/square-number-dss-operator /app/square-number-dss-operator
+# Copy built binary
+COPY --from=builder /app/target/release/square-number-dss-operator /app/
+
+# Copy contract artifacts
+COPY --from=builder /app/onchain/contracts /app/onchain/contracts
 
-ENTRYPOINT ["/app/square-number-dss-operator"]
+ENTRYPOINT ["/app/square-number-dss-operator"]

karak_offchain/operator/src/contract.rs

@@ -3,12 +3,12 @@ use alloy::sol;
 sol!(
     #[sol(rpc)]
     SquareNumberDSS,
-    "../abi/SquareNumberDSS.json",
+    "/app/abi/SquareNumberDSS.json",
 );
 
 sol!(
     #[sol(rpc)]
     TxnVerifier,
-    "../abi/TxnVerifier.json",
+    "/app/abi/TxnVerifier.json",
 );
 

onchain/contracts/.github/workflows/test.yml

@@ -0,0 +1,34 @@
+name: test
+
+on: workflow_dispatch
+
+env:
+  FOUNDRY_PROFILE: ci
+
+jobs:
+  check:
+    strategy:
+      fail-fast: true
+
+    name: Foundry project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      - name: Run Forge build
+        run: |
+          forge --version
+          forge build --sizes
+        id: build
+
+      - name: Run Forge tests
+        run: |
+          forge test -vvv
+        id: test

onchain/contracts/.gitignore

@@ -0,0 +1,14 @@
+# Compiler files
+cache/
+out/
+
+# Ignores development broadcast logs
+!/broadcast
+/broadcast/*/31337/
+/broadcast/**/dry-run/
+
+# Docs
+docs/
+
+# Dotenv file
+.env

onchain/contracts/README.md

@@ -0,0 +1 @@
+# DSS Contract

onchain/contracts/block-number-store.json

@@ -0,0 +1,3 @@
+{
+  "block_number": 0
+}