DApp: create & view invoices

.github/frontend-ci.yml

@@ -0,0 +1,59 @@
+name: "DAPP-CI"
+
+on:
+  pull_request:
+    branches:
+      - "main"
+      - "develop"
+    paths:
+      - "mist-invoice-dapp/**"
+  push:
+    branches:
+      - "main"
+      - "develop"
+      - "dapp/**"
+    paths:
+      - "mist-invoice-dapp/**"
+
+jobs:
+  ci:
+    runs-on: "ubuntu-latest"
+    env:
+      GITHUB_STEP_SUMMARY: ${{ github.workspace }}/.github/step-summary.md
+      WORKING_DIR: ${{ github.workspace }}/mist-invoice-dapp
+    steps:
+      - name: "Check out the repo"
+        uses: "actions/checkout@v3"
+
+      - name: "Install Node.js"
+        uses: "actions/setup-node@v3"
+        with:
+          node-version: "18"
+
+      # - name: "Copy config"
+      #   run: |
+      #     mv ./evm/.env.github ./evm/.env
+      #     echo "::debug::$(less .env)"
+      #     working-directory: ${{ env.WORKING_DIR }}
+
+      - name: "Install the dependencies"
+        run: "npm ci"
+        working-directory: ${{ env.WORKING_DIR }}
+
+      - name: "Lint the code"
+        run: "npm run lint"
+        working-directory: ${{ env.WORKING_DIR }}
+
+      - name: "Add lint summary"
+        run: |
+          echo "## Lint results" >> $GITHUB_STEP_SUMMARY
+          echo "✅ Passed" >> $GITHUB_STEP_SUMMARY
+
+      - name: "Test the code and generate the coverage report"
+        run: "npm test -- --coverage --watchAll=false"
+        working-directory: ${{ env.WORKING_DIR }}
+
+      - name: "Add test summary"
+        run: |
+          echo "## Test results" >> $GITHUB_STEP_SUMMARY
+          echo "✅ Passed" >> $GITHUB_STEP_SUMMARY

.gitignore

@@ -0,0 +1,11 @@
+cache
+coverage
+node_modules
+out
+
+mist-invoice-contracts/src/types
+
+.DS_Store
+.yarn
+.env
+.env.local

.prettierrc.js

@@ -0,0 +1,6 @@
+module.exports = {
+  semi: true,
+  trailingComma: "none",
+  singleQuote: false,
+  printWidth: 80
+};

.vscode/settings.json

@@ -0,0 +1,36 @@
+{
+  // eslint extension options
+  "eslint.enable": true,
+  "editor.codeActionsOnSave": [],
+  // prettier extension setting
+  "editor.formatOnSave": true,
+  "[javascript]": {
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": true,
+        "source.organizeImports": true,
+    },
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[javascriptreact]": {
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": true,
+        "source.organizeImports": true
+    },
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescript]": {
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": true,
+        "source.organizeImports": true
+    },
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescriptreact]": {
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": true,
+        "source.organizeImports": true
+    },
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "prettier.configPath": ".prettierrc.js"
+}

README.md

@@ -1,2 +1,3 @@
 # mist-invoice
+
 A privacy layer on top of smart invoice.

mist-invoice-contracts/.env.example

@@ -1,2 +1,14 @@
 PUBLIC_KEY=
-PRIVATE_KEY=
+PRIVATE_KEY=
+
+SEPOLIA_MIST_POOL=
+SEPOLIA_SMART_INVOICE_FACTORY=
+
+LINEA_GOERLI_MIST_POOL=
+LINEA_GOERLI_SMART_INVOICE_FACTORY=
+
+# linea or sepolia
+NETWORK=
+
+# UPDATE THIS WITH THE LOCAL DEPLOYMENT
+MIST_INVOICE_ESCROW_WRAPPER=

mist-invoice-contracts/.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

mist-invoice-contracts/package.json

@@ -1,19 +1,25 @@
 {
   "license": "UNLICENSED",
   "scripts": {
+    "build": "forge build & yarn typechain",
     "lint": "yarn lint:sol && yarn prettier:check",
     "lint:sol": "forge fmt --check && yarn solhint \"{script,src,test}/**/*.sol\"",
     "prettier:check": "yarn prettier --check \"**/*.{json,md,svg,yml}\"",
     "test": "forge t -vvv --ffi --fork-url http://localhost:8545",
-    "fork": "anvil --fork-url https://rpc.goerli.linea.build  --block-base-fee-per-gas 30000000000 --chain-id 31137",
-    "deploy-local": "forge script script/deployMistInvoiceEscrowWrapper.s.sol --fork-url http://localhost:8545 --broadcast --ffi",
-    "create-invoice": "forge script script/createMistInvoice.s.sol --fork-url http://localhost:8545 --broadcast --ffi"
+    "fork-linea": "anvil --fork-url https://rpc.goerli.linea.build  --block-base-fee-per-gas 30000000000 --chain-id 31137",
+    "fork-sepolia": "anvil --fork-url https://gateway.tenderly.co/public/sepolia  --block-base-fee-per-gas 30000000000 --chain-id 31137",
+    "deploy-local-wrapper": "forge script script/deployMistInvoiceEscrowWrapper.s.sol --fork-url http://localhost:8545 --broadcast --ffi --legacy",
+    "create-local-linea": "forge script script/createMistInvoice.s.sol --fork-url http://localhost:8545 --broadcast --ffi --legacy",
+    "create-local-sepolia": "forge script script/createMistInvoice.s.sol --fork-url http://localhost:8545 --broadcast --ffi",
+    "typechain": "typechain --target=ethers-v6 --out-dir=src/types \"out/**/*.json\""
   },
   "devDependencies": {
+    "@typechain/ethers-v6": "^0.4.3",
     "prettier": "^3.0.0",
-    "solhint": "^3.4.1"
+    "solhint": "^3.4.1",
+    "typechain": "^8.3.1",
+    "typescript": "^5.1.6"
   },
   "name": "mist-invoice",
   "description": "A privacy layer on top of smart invoice."
 }
-

mist-invoice-contracts/script/createMistInvoice.s.sol

@@ -7,35 +7,97 @@ import "forge-std/console.sol";
 
 contract InvoiceCreationScript is Script {
     struct MistData {
-        bytes merkleRoot;
-        bytes clientRandom;
-        bytes providerRandom;
-        bytes clientKey;
-        bytes providerKey;
+        bytes32 merkleRoot;
+        bytes32 clientRandom;
+        bytes32 providerRandom;
+        bytes32 clientKey;
+        bytes32 providerKey;
+    }
+
+    function getSepoliaDummyData() public view returns (bytes memory) {
+        address _client = 0x1111111111111111111111111111111111111111;
+        uint8 _resolverType = 1; // For simplicity
+        address _resolver = 0x2222222222222222222222222222222222222222;
+        address _token = 0x3333333333333333333333333333333333333333;
+        uint256 _terminationTime = block.timestamp + 30 days;
+        bytes32 _details = keccak256(abi.encodePacked("Details for mist invoice"));
+        address _wrappedNativeToken = 0xb16F35c0Ae2912430DAc15764477E179D9B9EbEa; // WETH on sepolia
+        bool _requireVerification = true;
+
+        address _factory = 0xaE57F3689a23792649c597DD3B652b788f0414E4; //sepolia factory
+
+        return abi.encode(
+            _client,
+            _resolverType,
+            _resolver,
+            _token,
+            _terminationTime,
+            _details,
+            _wrappedNativeToken,
+            _requireVerification,
+            _factory
+        );
+    }
+
+       function getLineaDummyData() public view returns (bytes memory) {
+        address _client = 0x1111111111111111111111111111111111111111;
+        uint8 _resolverType = 1; // For simplicity
+        address _resolver = 0x2222222222222222222222222222222222222222;
+        address _token = 0x3333333333333333333333333333333333333333;
+        uint256 _terminationTime = block.timestamp + 30 days;
+        bytes32 _details = keccak256(abi.encodePacked("Details for mist invoice"));
+        address _wrappedNativeToken = 0x2C1b868d6596a18e32E61B901E4060C872647b6C; // WETH on linea
+        bool _requireVerification = true;
+
+        address _factory = 0xa9c2372FdFA2ef145A0d13784C74DE96f0e3eaff; //linea factory
+
+        return abi.encode(
+            _client,
+            _resolverType,
+            _resolver,
+            _token,
+            _terminationTime,
+            _details,
+            _wrappedNativeToken,
+            _requireVerification,
+            _factory
+        );
     }
 
     function run() external {
         // Read environment variables and select EOA for transaction signing
         uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
         address deployerAddress = vm.envAddress("PUBLIC_KEY");
+        string memory network = vm.envString("NETWORK");
+
+        bytes memory _data;
+
+        if (keccak256(bytes(network)) == keccak256(bytes("sepolia"))) {
+            _data = getSepoliaDummyData();
+        } else if (keccak256(bytes(network)) == keccak256(bytes("linea"))) {
+            _data = getLineaDummyData();
+        } else {
+            revert("Invalid network selection");
+        }
 
         vm.startBroadcast(deployerPrivateKey);
 
-        // THIS IS THE SEPOLIA MIST POOL, NEEDS TO BE UPDATED TO LINEA-GOERLI
-        MistInvoiceEscrowWrapper mistWrapper = MistInvoiceEscrowWrapper(0xda430a73106D31120Ec5128Bb1008bcd00d25A9C);
+        address mistWrapperDeployment = vm.envAddress("MIST_INVOICE_ESCROW_WRAPPER");
+        MistInvoiceEscrowWrapper mistWrapper = MistInvoiceEscrowWrapper(mistWrapperDeployment);
 
         // Dummy data
-        MistData memory _mistData = MistData(
-            bytes("dummyMerkleRoot"),
-            bytes("dummyClientRandom"),
-            bytes("dummyProviderRandom"),
-            bytes("dummyClientKey"),
-            bytes("dummyProviderKey")
-        );
+        MistData memory _mistData = MistData({
+            merkleRoot: keccak256(abi.encodePacked("dummyMerkleRoot")),
+            clientRandom: keccak256(abi.encodePacked("dummyClientRandom")),
+            providerRandom: keccak256(abi.encodePacked("dummyProviderRandom")),
+            clientKey: keccak256(abi.encodePacked("dummyClientKey")),
+            providerKey: keccak256(abi.encodePacked("dummyProviderKey"))
+        });
+
         uint256[] memory _amounts = new uint256[](1);
         _amounts[0] = 1000;
-        bytes memory _data = bytes("dummyData");
-        bytes32 _type = bytes32(0x73706c69742d657363726f770000000000000000000000000000000000000000);
+
+        bytes32 _type = bytes32("escrow");
 
         MistInvoiceEscrowWrapper.MistData memory mistDataForWrapper = MistInvoiceEscrowWrapper.MistData({
             merkleRoot: _mistData.merkleRoot,
@@ -49,7 +111,6 @@ contract InvoiceCreationScript is Script {
 
         console.log("Mist Invoice Address: %s", invoiceAddress);
 
-
         vm.stopBroadcast();
     }
 }

mist-invoice-contracts/script/deployMistInvoiceEscrowWrapper.s.sol

@@ -9,17 +9,26 @@ contract DeployScript is Script {
     function run() external {
         //read env variables and choose EOA for transaction signing
         uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
-        address deployerAddress = vm.envAddress("PUBLIC_KEY");
 
-        vm.startBroadcast(deployerPrivateKey);
-        // THIS IS THE SEPOLIA MIST POOL, NEEDS TO BE UPDATED TO LINEA-GOERLI
-        address MIST_POOL = 0x6bA81b91c72755459CfdF3c5ad25eFe636DCd493;
+        string memory network = vm.envString("NETWORK");
+
+        address MIST_POOL;
+        address SMART_INVOICE_FACTORY;
 
-        // verified
-        address LINEA_GOERLI_SMART_INVOICE_FACTORY = 0xa9c2372FdFA2ef145A0d13784C74DE96f0e3eaff;
+        if (keccak256(bytes(network)) == keccak256(bytes("sepolia"))) {
+            MIST_POOL = vm.envAddress("SEPOLIA_MIST_POOL");
+            SMART_INVOICE_FACTORY = vm.envAddress("SEPOLIA_SMART_INVOICE_FACTORY");
+        } else if (keccak256(bytes(network)) == keccak256(bytes("linea"))) {
+            MIST_POOL = vm.envAddress("LINEA_GOERLI_MIST_POOL");
+            SMART_INVOICE_FACTORY = vm.envAddress("LINEA_GOERLI_SMART_INVOICE_FACTORY");
+        } else {
+            revert("Invalid network selection");
+        }
+
+        vm.startBroadcast(deployerPrivateKey);
 
         // deploy mist invoice escrow
-        MistInvoiceEscrowWrapper mistWrapper = new MistInvoiceEscrowWrapper(LINEA_GOERLI_SMART_INVOICE_FACTORY, MIST_POOL);
+        MistInvoiceEscrowWrapper mistWrapper = new MistInvoiceEscrowWrapper(SMART_INVOICE_FACTORY, MIST_POOL);
 
         console.log("MistInvoiceEscrowWrapper Address: %s", address(mistWrapper));