Fix docker compose

the-candy-shop · Jul 26, 2023 · 7b3825e · 7b3825e
1 parent d4b4cd4
commit 7b3825e
Show file tree

Hide file tree

Showing 19 changed files with 4,318 additions and 1,975 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,46 +1,116 @@
 services:
-  ethereum-devnet:
+  ethereum:
     platform: linux/x86_64
     image: ghcr.io/foundry-rs/foundry
     entrypoint: anvil
     healthcheck:
-      test: ["CMD", "nc", "-z", "localhost", "8545"]
+      test: cast chain-id
       interval: 5s
     ports:
       - '8545:8545'
     environment:
       ANVIL_IP_ADDR: "0.0.0.0"
+    networks:
+      - ethereum
 
   ethereum-deployer:
-    depends_on:
-      ethereum-devnet:
-        condition: service_healthy
-    platform: linux/x86_64
     image: ghcr.io/foundry-rs/foundry
+    platform: linux/x86_64
     entrypoint: forge
+    depends_on:
+      ethereum:
+        condition: service_healthy
     environment:
       PRIVATE_KEY: "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
       ETHERSCAN_API_KEY: "foobar"
     volumes:
-      - ./:/app/starksheet/
+      - ./packages/starksheet-solidity:/app/starksheet/packages/starksheet-solidity
     working_dir: /app/starksheet/packages/starksheet-solidity
     command:
       - "script"
       - "script/Evmsheet.s.sol"
       - "--broadcast"
-      - "-vvvv"
       - "--rpc-url"
-      - "http://ethereum-devnet:8545"
+      - "http://ethereum:8545"
+    networks:
+      - ethereum
 
   ethereum-webapp:
+    build: ./packages/starksheet-webapp
     depends_on:
       ethereum-deployer:
         condition: service_completed_successfully
-    build:
-      context: ./packages/starksheet-webapp
+    working_dir: /app/starksheet/packages/starksheet-webapp
     volumes:
-      - ./:/app/starksheet/
+      - ./packages/starksheet-solidity:/app/starksheet/packages/starksheet-solidity
     environment:
       - REACT_APP_NETWORK=anvil
+      - REACT_APP_RPC_URL=http://0.0.0.0:8545
+      - PORT=3000
     ports:
       - '3000:3000'
+    networks:
+      - ethereum
+
+  starknet:
+    image: ghcr.io/dojoengine/dojo:v0.1.0
+    command:
+      - "katana"
+      - "--allow-zero-max-fee"
+      - "--validate-max-steps"
+      - "16777216"
+      - "--invoke-max-steps"
+      - "16777216"
+      - "--gas-price"
+      - "0"
+    healthcheck:
+      # This is a hack to just wait 1s
+      test: echo "ok"
+      interval: 1s
+    ports:
+      - '5050:5050'
+    networks:
+      - starknet
+
+  starknet-deployer:
+    build: ./packages/starksheet-cairo
+    depends_on:
+      starknet:
+        condition: service_healthy
+    environment:
+      ACCOUNT_ADDRESS: "0x03ee9e18edc71a6df30ac3aca2e0b02a198fbce19b7480a63a0d71cbd76652e0"
+      PRIVATE_KEY: "0x0300001800000000300000180000000000030000000000003006001800006600"
+      RPC_URL: http://starknet:5050
+      CHECK_INTERVAL: "0.1"
+      MAX_WAIT: "1"
+    volumes:
+      - starknet-deployments:/app/starksheet/packages/starksheet-cairo/deployments
+      - starknet-build:/app/starksheet/packages/starksheet-cairo/build
+    networks:
+      - starknet
+
+  starknet-webapp:
+    build: ./packages/starksheet-webapp
+    depends_on:
+      starknet-deployer:
+        condition: service_completed_successfully
+    working_dir: /app/starksheet/packages/starksheet-webapp
+    volumes:
+      - starknet-deployments:/app/starksheet/packages/starksheet-cairo/deployments/katana
+      - starknet-build:/app/starksheet/packages/starksheet-cairo/build
+    environment:
+      - REACT_APP_NETWORK=katana
+      - REACT_APP_RPC_URL=http://0.0.0.0:5050
+      - PORT=3001
+    ports:
+      - '3001:3001'
+    networks:
+      - starknet
+
+volumes:
+  starknet-deployments:
+  starknet-build:
+
+networks:
+  starknet:
+  ethereum:
diff --git a/packages/starksheet-cairo/utils/constants.py b/packages/starksheet-cairo/utils/constants.py
@@ -90,8 +90,8 @@
         "rpc_url": os.getenv("RPC_URL"),
         "explorer_url": "",
         "devnet": False,
-        "check_interval": 6,
-        "max_wait": 30,
+        "check_interval": float(os.getenv("CHECK_INTERVAL", 6)),
+        "max_wait": float(os.getenv("MAX_WAIT", 30)),
     }
 
 prefix = NETWORK["name"].upper().replace("-", "_")

diff --git a/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-1690360749.json b/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-1690360749.json
diff --git a/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-1690361479.json b/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-1690361479.json
diff --git a/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-1690361643.json b/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-1690361643.json
diff --git a/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-1690363242.json b/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-1690363242.json
diff --git a/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-1690364258.json b/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-1690364258.json
diff --git a/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-1690374058.json b/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-1690374058.json
diff --git a/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-1690374106.json b/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-1690374106.json
diff --git a/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-latest.json b/packages/starksheet-solidity/broadcast/Evmsheet.s.sol/31337/run-latest.json
diff --git a/packages/starksheet-solidity/out/BasicCellRenderer.sol/BasicCellRenderer.json b/packages/starksheet-solidity/out/BasicCellRenderer.sol/BasicCellRenderer.json
diff --git a/packages/starksheet-solidity/out/Bytes.sol/Bytes.json b/packages/starksheet-solidity/out/Bytes.sol/Bytes.json
diff --git a/packages/starksheet-solidity/out/Evmsheet.sol/Evmsheet.json b/packages/starksheet-solidity/out/Evmsheet.sol/Evmsheet.json
diff --git a/packages/starksheet-solidity/out/Math.sol/Math.json b/packages/starksheet-solidity/out/Math.sol/Math.json
diff --git a/packages/starksheet-solidity/out/MultiSendCallOnly.sol/MultiSendCallOnly.json b/packages/starksheet-solidity/out/MultiSendCallOnly.sol/MultiSendCallOnly.json
diff --git a/packages/starksheet-solidity/out/Sheet.sol/Sheet.json b/packages/starksheet-solidity/out/Sheet.sol/Sheet.json
diff --git a/packages/starksheet-webapp/Dockerfile b/packages/starksheet-webapp/Dockerfile
@@ -2,9 +2,7 @@ FROM node:16
 
 WORKDIR /app/starksheet/packages/starksheet-webapp
 
-COPY package*.json ./
-RUN npm install
-
 COPY . .
+RUN npm install
 
 CMD ["npm", "start", "--omit=dev"]