Adds Docker support for easy project setup.

.dockerignore

@@ -0,0 +1,20 @@
+node_modules
+**/node_modules
+npm-debug.log*
+frontend/dist
+frontend/build
+frontend/.env
+frontend/.env.local
+contracts/out
+contracts/cache
+contracts/broadcast
+contracts/.env
+.git
+.gitignore
+.gitmodules
+*.md
+docs/
+.vscode
+.idea
+.DS_Store
+Thumbs.db

.gitmodules

@@ -4,3 +4,7 @@
 [submodule "contracts/lib/chainlink-brownie-contracts"]
 	path = contracts/lib/chainlink-brownie-contracts
 	url = https://github.com/smartcontractkit/chainlink-brownie-contracts
+[submodule "contracts/lib/openzeppelin-contracts"]
+	path = contracts/lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	branch = release-v5.5

contracts/foundry.lock

@@ -1,5 +1,11 @@
 {
   "lib/forge-std": {
     "rev": "3b20d60d14b343ee4f908cb8079495c07f5e8981"
+  },
+  "lib\\openzeppelin-contracts": {
+    "tag": {
+      "name": "v5.5.0",
+      "rev": "fcbae5394ae8ad52d8e580a3477db99814b9d565"
+    }
   }
 }

contracts/foundry.toml

@@ -2,6 +2,7 @@
 src = "src"
 out = "out"
 libs = ["lib"]
-solc_version = '0.8.13'
+solc_version = '0.8.24'
+   remappings = ['@openzeppelin/=lib/openzeppelin-contracts/']
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
 # forge create --rpc-url https://eth-sepolia.g.alchemy.com/v2/nnY0qPUQLYsUvb5BKJM5bh81sI6O0PQG   --private-key fba7342ef6879df2c735644c734ea69c140f423d84eb2d53fbdfd53fd5d7c586  src/Token.sol:MyToken --legacy

contracts/src/Chainvoice.sol

@@ -1,15 +1,14 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.20;
+
+
+import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-interface IERC20 {
-    function transferFrom(address sender, address recipient, uint256 amount) external returns (bool);
-    function balanceOf(address account) external view returns (uint256);
-    function allowance(address owner, address spender) external view returns (uint256);
-}
 
 contract Chainvoice {
-    // ========== Errors ==========
-    // Existing
+    using SafeERC20 for IERC20;
+    // Errors
     error MixedTokenBatch();
     error InvalidBatchSize();
     error AlreadySettled();
@@ -103,16 +102,6 @@ contract Chainvoice {
     // Constants
     uint256 public constant MAX_BATCH = 50;
 
-    // ========== Internal Utils ==========
-    function _isERC20(address token) internal view returns (bool) {
-        if (token == address(0)) return false;
-        if (token.code.length == 0) return false;
-        (bool success, ) = token.staticcall(
-            abi.encodeWithSignature("balanceOf(address)", address(this))
-        );
-        return success;
-    }
-
     // ========== Single-invoice create ==========
     function createInvoice(
         address to,
@@ -258,12 +247,11 @@ contract Chainvoice {
             }
             accumulatedFees += fee;
 
-            bool transferSuccess = IERC20(invoice.tokenAddress).transferFrom(
+            IERC20(invoice.tokenAddress).safeTransferFrom(
                 msg.sender,
                 invoice.from,
                 invoice.amountDue
             );
-            if (!transferSuccess) revert TokenTransferFailed();
         }
 
         emit InvoicePaid(
@@ -331,8 +319,7 @@ contract Chainvoice {
 
             for (uint256 i = 0; i < n; i++) {
                 InvoiceDetails storage inv = invoices[invoiceIds[i]];
-                bool ok = erc20.transferFrom(msg.sender, inv.from, inv.amountDue);
-                if (!ok) revert TokenTransferFailed();
+                erc20.safeTransferFrom(msg.sender, inv.from, inv.amountDue);
                 emit InvoicePaid(inv.id, inv.from, inv.to, inv.amountDue, token);
             }
         }

contracts/test/Chainvoice.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 import {console} from "forge-std/console.sol";

docker-compose.yml

@@ -0,0 +1,32 @@
+version: '3.8'
+
+services:
+  frontend:
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile
+    container_name: chainvoice-frontend
+    ports:
+      - "5173:5173"
+    volumes:
+      - ./frontend:/app
+      - /app/node_modules
+    env_file:
+      - ./frontend/.env
+    restart: unless-stopped
+    networks:
+      - chainvoice-network
+
+  blockchain:
+    image: ghcr.io/foundry-rs/foundry:latest
+    container_name: chainvoice-blockchain
+    command: anvil --host 0.0.0.0 --chain-id 31337 --accounts 10 --balance 10000
+    ports:
+      - "8545:8545"
+    restart: unless-stopped
+    networks:
+      - chainvoice-network
+
+networks:
+  chainvoice-network:
+    driver: bridge

frontend/.dockerignore

@@ -0,0 +1,30 @@
+node_modules
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+dist
+build
+.next
+out
+.env
+.env.local
+.env.*.local
+.git
+.gitignore
+.gitattributes
+.vscode
+.idea
+*.swp
+*.swo
+*~
+.DS_Store
+Thumbs.db
+coverage
+.nyc_output
+*.test.js
+*.spec.js
+README.md
+*.md
+Dockerfile
+docker-compose.yml
+.dockerignore

frontend/Dockerfile

@@ -0,0 +1,13 @@
+FROM node:20-alpine
+
+WORKDIR /app
+
+COPY package.json package-lock.json ./
+
+RUN npm ci --legacy-peer-deps
+
+COPY . .
+
+EXPOSE 5173
+
+CMD ["npm", "run", "dev", "--", "--host", "0.0.0.0"]

frontend/vite.config.js

@@ -11,5 +11,17 @@ export default defineConfig({
       "@": path.resolve(__dirname, "./src"),
     },
   },
+  server: {
+    host: '0.0.0.0',
+    port: 5173,
+    strictPort: true,
+    watch: {
+      usePolling: true,
+    },
+    hmr: {
+      host: 'localhost',
+      port: 5173,
+    },
+  },
 })