Merge pull request #19 from windingtree/feat/node-contract

Smart contract interaction

Author: kostysh

.env.example

@@ -1,2 +1,4 @@
+# LOCAL_NODE=true
 EXAMPLE_ENTITY_SIGNER_MNEMONIC=
+# EXAMPLE_ENTITY_SIGNER_PK=
 EXAMPLE_ENTITY_ID=

examples/client/src/App.tsx

@@ -1,6 +1,7 @@
 import { useState, useEffect, useRef } from 'react';
+import { hardhat, polygonZkEvmTestnet } from 'viem/chains';
 import { Client, ClientOptions, createClient, storage } from '../../../src/index.js'; // @windingtree/sdk
-import { RequestQuery, OfferOptions, chainConfig, serverAddress } from '../../shared/index.js';
+import { RequestQuery, OfferOptions, contractsConfig, serverAddress } from '../../shared/index.js';
 import { OfferData } from '../../../src/shared/types.js';
 import { useWallet } from './providers/WalletProvider/WalletProviderContext.js';
 import { AccountWidget } from './providers/WalletProvider/AccountWidget.js';
@@ -11,6 +12,9 @@ import { MakeDeal } from './components/MakeDeal.js';
 import { Offers } from './components/Offers.js';
 import { Deals, DealsRegistryRecord } from './components/Deals.js';
 
+/** Target chain config */
+const chain = import.meta.env.LOCAL_NODE === 'true' ? hardhat : polygonZkEvmTestnet;
+
 /** Default request expiration time */
 const defaultExpire = '30s';
 
@@ -38,7 +42,8 @@ export const App = () => {
         setError(undefined);
 
         const options: ClientOptions = {
-          chain: chainConfig,
+          chain,
+          contracts: contractsConfig,
           serverAddress,
           storageInitializer: storage.localStorage.createInitializer({
             session: false, // session or local storage

examples/client/src/components/Deals.tsx

@@ -1,6 +1,6 @@
 import { useState, useCallback, useEffect } from 'react';
 import { DateTime } from 'luxon';
-import { Address } from 'viem';
+import { Address, Hash } from 'viem';
 import { Client, DealRecord, DealStatus } from '../../../../src/index.js'; // @windingtree/sdk
 import { RequestQuery, OfferOptions } from '../../../shared/index.js';
 import { centerEllipsis, formatBalance, parseWalletError } from '../utils.js';
@@ -57,7 +57,7 @@ export const TransferForm = ({ deal, client, onClose }: TransferFormProps) => {
         throw new Error('Ethereum client not ready');
       }
 
-      await client.deals.transfer(deal.offer.payload.id, to as Address, walletClient, setTx);
+      await client.deals.transfer(deal.offer, to as Address, walletClient, setTx);
       setLoading(false);
       setSuccess(true);
     } catch (err) {
@@ -145,7 +145,7 @@ export const Cancel = ({ deal, client, onClose }: CancelProps) => {
         throw new Error('Ethereum client not ready');
       }
 
-      await client.deals.cancel(deal.offer.payload.id, walletClient, setTx);
+      await client.deals.cancel(deal.offer, walletClient, setTx);
       setLoading(false);
       setSuccess(true);
     } catch (err) {

examples/client/src/components/MakeDeal.tsx

@@ -16,7 +16,7 @@ interface MakeDealProps {
  * Making of deal form
  */
 export const MakeDeal = ({ offer, client }: MakeDealProps) => {
-  const { account, publicClient, walletClient } = useWallet();
+  const { account, walletClient } = useWallet();
   const [tx, setTx] = useState<string | undefined>();
   const [error, setError] = useState<string | undefined>();
   const [loading, setLoading] = useState<boolean>(false);
@@ -40,7 +40,7 @@ export const MakeDeal = ({ offer, client }: MakeDealProps) => {
           throw new Error('Client not ready');
         }
 
-        if (!publicClient || !walletClient) {
+        if (!walletClient) {
           throw new Error('Ethereum client not ready');
         }
 
@@ -57,7 +57,7 @@ export const MakeDeal = ({ offer, client }: MakeDealProps) => {
         setLoading(false);
       }
     },
-    [client, offer, publicClient, walletClient],
+    [client, offer, walletClient],
   );
 
   if (!offer || !client) {

examples/node/index.ts

@@ -1,17 +1,19 @@
 import 'dotenv/config';
 import { EventHandler } from '@libp2p/interfaces/events';
 import { DateTime } from 'luxon';
-import { Hash, Hex } from 'viem';
+import { Hash, Hex, zeroAddress } from 'viem';
+import { hardhat, polygonZkEvmTestnet } from 'viem/chains';
 import { randomSalt } from '@windingtree/contracts';
 import {
   RequestQuery,
   OfferOptions,
-  chainConfig,
+  contractsConfig,
   stableCoins,
   serverAddress,
 } from '../shared/index.js';
 import { createNode, Node, NodeOptions, Queue, createJobHandler } from '../../src/index.js';
 import { OfferData } from '../../src/shared/types.js';
+import { DealStatus } from '../../src/shared/contracts.js';
 import { noncePeriod } from '../../src/constants.js';
 import { memoryStorage } from '../../src/storage/index.js';
 import { nowSec, parseSeconds } from '../../src/utils/time.js';
@@ -20,6 +22,11 @@ import { createLogger } from '../../src/utils/logger.js';
 
 const logger = createLogger('NodeMain');
 
+/**
+ * Chain config
+ */
+const chain = process.env.LOCAL_NODE === 'true' ? hardhat : polygonZkEvmTestnet;
+
 /**
  * The supplier signer credentials
  */
@@ -52,21 +59,35 @@ process.once('unhandledRejection', (error) => {
  */
 interface DealHandlerOptions {
   node: Node<RequestQuery, OfferOptions>;
+  [key: string]: unknown;
 }
 
 /**
  * This handler looking up for a deal
  */
 const dealHandler = createJobHandler<OfferData<RequestQuery, OfferOptions>, DealHandlerOptions>(
-  // eslint-disable-next-line @typescript-eslint/require-await, @typescript-eslint/no-unused-vars
-  async ({ name, id, data: offer }, options) => {
+  async ({ name, id, data: offer }, { node }) => {
     logger.trace(`Job "${name}" #${id} Checking for a deal. Offer #${offer.id}`);
-    // const { node } = options;
 
-    // Makes request to the smart contract, checks for a deal
-    // If the deal is found - check for double booking in the availability system
-    // If double booking detected - rejects (and refunds) the deal
-    // If not detected - claims the deal
+    if (node) {
+      // Check for a deal
+      const [, , , buyer, , , status] = await node.deals.get(offer);
+
+      // Deal must be exists and not cancelled
+      if (buyer !== zeroAddress && status === DealStatus.Created) {
+        // check for double booking in the availability system
+        // If double booking detected - rejects (and refunds) the deal
+
+        // If not detected - claims the deal
+        await node.deals.claim(offer, undefined, (txHash: string, txSubj?: string) => {
+          logger.trace(`Offer #${offer.payload.id} ${txSubj ?? 'claim'} tx hash: ${txHash}`);
+        });
+
+        return true; // Returning true means that the job must be stopped
+      }
+    }
+
+    return; // Job continuing
   },
 );
 
@@ -154,7 +175,8 @@ const main = async (): Promise<void> => {
 
   const options: NodeOptions = {
     topics: ['hello'],
-    chain: chainConfig,
+    chain,
+    contracts: contractsConfig,
     serverAddress,
     noncePeriod: Number(parseSeconds(noncePeriod)),
     supplierId,

examples/shared/index.ts

@@ -1,6 +1,5 @@
 import { Address } from 'viem';
-import { GenericQuery, GenericOfferOptions } from '../../src/shared/types.js';
-import { ProtocolChain } from '../../src/utils/contracts.js';
+import { GenericQuery, GenericOfferOptions, Contracts } from '../../src/shared/types.js';
 
 export interface RequestQuery extends GenericQuery {
   greeting: string;
@@ -21,58 +20,50 @@ export interface LocalEnv {
 const env =
   typeof window === 'undefined' ? process.env : (import.meta as unknown as { env: LocalEnv }).env;
 
-export const chainConfig: ProtocolChain =
+export const contractsConfig: Contracts =
   env.LOCAL_NODE === 'hardhat' || env.VITE_LOCAL_NODE === 'hardhat'
     ? {
-        chainId: 31337, // Local Hardhat node
-        chainName: 'hardhat',
-        contracts: {
-          config: {
-            name: 'Config',
-            version: '1',
-            address: '0x3Aa5ebB10DC797CAC828524e59A333d0A371443c',
-          },
-          entities: {
-            name: 'EntitiesRegistry',
-            version: '1',
-            address: '0x59b670e9fA9D0A427751Af201D676719a970857b',
-          },
-          market: {
-            name: 'Market',
-            version: '1',
-            address: '0x09635F643e140090A9A8Dcd712eD6285858ceBef',
-          },
-          token: {
-            name: 'LifToken',
-            version: '1',
-            address: '0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1',
-          },
+        config: {
+          name: 'Config',
+          version: '1',
+          address: '0x3Aa5ebB10DC797CAC828524e59A333d0A371443c',
+        },
+        entities: {
+          name: 'EntitiesRegistry',
+          version: '1',
+          address: '0x59b670e9fA9D0A427751Af201D676719a970857b',
+        },
+        market: {
+          name: 'Market',
+          version: '1',
+          address: '0x09635F643e140090A9A8Dcd712eD6285858ceBef',
+        },
+        token: {
+          name: 'LifToken',
+          version: '1',
+          address: '0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1',
         },
       }
     : {
-        chainId: 1442,
-        chainName: 'zkSyncTestnet',
-        contracts: {
-          config: {
-            name: 'Config',
-            version: '1',
-            address: '0x098b1d12cAfE7315C77b6d308A62ce02806260Ee',
-          },
-          entities: {
-            name: 'EntitiesRegistry',
-            version: '1',
-            address: '0x4bB51528C83844b509E1152EEb05260eE1bf60e6',
-          },
-          market: {
-            name: 'Market',
-            version: '1',
-            address: '0xDd5B6ffB3585E109ECddec5293e31cdc1e9DeD57',
-          },
-          token: {
-            name: 'LifToken',
-            version: '1',
-            address: '0x4d60F4483BaA654CdAF1c5734D9E6B16735efCF8',
-          },
+        config: {
+          name: 'Config',
+          version: '1',
+          address: '0x098b1d12cAfE7315C77b6d308A62ce02806260Ee',
+        },
+        entities: {
+          name: 'EntitiesRegistry',
+          version: '1',
+          address: '0x4bB51528C83844b509E1152EEb05260eE1bf60e6',
+        },
+        market: {
+          name: 'Market',
+          version: '1',
+          address: '0xDd5B6ffB3585E109ECddec5293e31cdc1e9DeD57',
+        },
+        token: {
+          name: 'LifToken',
+          version: '1',
+          address: '0x4d60F4483BaA654CdAF1c5734D9E6B16735efCF8',
         },
       };
 

package.json

@@ -75,27 +75,27 @@
     "@types/node": "^18.15.11",
     "@types/mocha": "^10.0.1",
     "@types/chai": "^4.3.5",
-    "@types/debug": "^4.1.7",
+    "@types/debug": "^4.1.8",
     "@types/chai-as-promised": "^7.1.5",
     "@types/luxon": "^3.3.0",
     "mocha": "^10.2.0",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4",
+    "typescript": "^5.1.3",
     "semantic-release": "^21.0.2",
     "semantic-release-cli": "^5.4.4",
     "@semantic-release/changelog": "^6.0.3",
-    "eslint": "^8.40.0",
-    "@typescript-eslint/eslint-plugin": "^5.59.5",
-    "@typescript-eslint/parser": "^5.59.5",
+    "eslint": "^8.41.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.8",
+    "@typescript-eslint/parser": "^5.59.8",
     "prettier": "^2.8.8",
     "husky": "^8.0.3",
     "git-cz": "^4.9.0",
-    "@commitlint/config-conventional": "^17.6.3",
-    "@commitlint/cli": "^17.6.3",
+    "@commitlint/config-conventional": "^17.6.5",
+    "@commitlint/cli": "^17.6.5",
     "lint-staged": "^13.2.2",
-    "c8": "^7.13.0",
+    "c8": "^7.14.0",
     "typedoc": "^0.24.7",
     "dotenv": "^16.0.3"
   },
@@ -106,7 +106,7 @@
     "@libp2p/mplex": "^7.1.3",
     "@libp2p/websockets": "^5.0.8",
     "ethers": "^6.4.0",
-    "viem": "^0.3.41",
+    "viem": "^0.3.49",
     "luxon": "^3.3.0",
     "h3-js": "^4.1.0",
     "debug": "^4.3.4",