From 4ca16dccad5f2e94d01868e5d3a9daa090beb7b4 Mon Sep 17 00:00:00 2001
From: kwiss <mr.dumont.christophe@gmail.com>
Date: Sun, 7 Jan 2024 16:23:34 +0100
Subject: [PATCH] fix: add missing envs

---
 .github/workflows/solis-deploy.yml       |  4 +++-
 Dockerfile                               |  8 ++++----
 aws/cdk-solis-ecs/lib/cdk-solis-stack.ts | 17 +++++++++--------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/solis-deploy.yml b/.github/workflows/solis-deploy.yml
index e8ab7d947..8ebf07830 100644
--- a/.github/workflows/solis-deploy.yml
+++ b/.github/workflows/solis-deploy.yml
@@ -25,7 +25,9 @@ jobs:
         with:
           scarb-version: 2.3.1
       - name: Build contracts
-        run: cd contracts && scarb build -w
+        run: |
+          cd contracts
+          scarb build -workspace
 
   deploy-solis:
     name: Deploy Solis latest
diff --git a/Dockerfile b/Dockerfile
index a155800b1..97199e2bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 FROM rust:latest
 
 # Set the default values for your environment variables
-ENV RPC_URL_GOERLI=""
-ENV MESSAGING_ADDRESS_GOERLI=""
-ENV SENDER_ADDRESS=""
-ENV PRIVATE_KEY=""
+ENV STARKNET_NODE_URL=""
+ENV STARKNET_APPCHAIN_MESSAGING_ADDRESS=""
+ENV STARKNET_SOLIS_ACCOUNT_ADDRESS=""
+ENV STARKNET_SOLIS_ACCOUNT_PRIVATE_KEY=""
 
 WORKDIR /app
 
diff --git a/aws/cdk-solis-ecs/lib/cdk-solis-stack.ts b/aws/cdk-solis-ecs/lib/cdk-solis-stack.ts
index ee889a555..533828502 100644
--- a/aws/cdk-solis-ecs/lib/cdk-solis-stack.ts
+++ b/aws/cdk-solis-ecs/lib/cdk-solis-stack.ts
@@ -53,15 +53,16 @@ export class CdkSolisStack extends cdk.Stack {
         "solis-latest"
       ),
       environment: {
-        RPC_URL: process.env.RPC_URL || "default_rpc_url", // Fallback to a default if not set
+        RPC_URL: process.env.STARKNET_NODE_URL || "default_rpc_url", // Fallback to a default if not set
         CONTRACT_ADDRESS:
-          process.env.CONTRACT_ADDRESS || "default_contract_address",
-        SENDER_ADDRESS: process.env.SENDER_ADDRESS || "default_sender_address",
-        PRIVATE_KEY: process.env.PRIVATE_KEY || "default_private_key",
-        EXECUTOR_ADDRESS:
-          process.env.EXECUTOR_ADDRESS || "default_executor_address",
-        ORDERBOOK_ADDRESS:
-          process.env.ORDERBOOK_ADDRESS || "default_orderbook_address"
+          process.env.STARKNET_APPCHAIN_MESSAGING_ADDRESS ||
+          "default_contract_address",
+        SENDER_ADDRESS:
+          process.env.STARKNET_SOLIS_ACCOUNT_ADDRESS ||
+          "default_sender_address",
+        PRIVATE_KEY:
+          process.env.STARKNET_SOLIS_ACCOUNT_PRIVATE_KEY ||
+          "default_private_key"
       },
       memoryLimitMiB: 512,
       logging