@zkp2p/contracts-v2 0.0.2 → 0.0.4

package/_esm/utils/protocolUtils.js

@@ -55,3 +55,8 @@ export const calculateIntentHash = (
 
   return ethers.utils.hexZeroPad(BigNumber.from(intermediateHash).mod(CIRCOM_FIELD).toHexString(), 32);
 };
+
+
+export const calculatePaymentMethodHash = (paymentMethod: string): string => {
+  return ethers.utils.keccak256(ethers.utils.toUtf8Bytes(paymentMethod));
+}

package/_types/abis/baseStaging.d.ts

@@ -0,0 +1,11 @@
+// Auto-generated TypeScript definitions for baseStaging ABIs
+export declare const Escrow: any;
+export declare const EscrowRegistry: any;
+export declare const NullifierRegistry: any;
+export declare const Orchestrator: any;
+export declare const PaymentVerifierRegistry: any;
+export declare const PostIntentHookRegistry: any;
+export declare const ProtocolViewer: any;
+export declare const RelayerRegistry: any;
+export declare const SimpleAttestationVerifier: any;
+export declare const UnifiedPaymentVerifier: any;

package/abis/baseSepolia/Escrow.json

@@ -463,7 +463,7 @@
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "conversionRate",
+        "name": "minConversionRate",
         "type": "uint256"
       }
     ],
@@ -559,6 +559,12 @@
         "internalType": "uint256",
         "name": "amount",
         "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "netAdditionalAmount",
+        "type": "uint256"
       }
     ],
     "name": "DepositFundsAdded",
@@ -703,6 +709,12 @@
         "name": "amount",
         "type": "uint256"
       },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "netDepositAmount",
+        "type": "uint256"
+      },
       {
         "components": [
           {

package/abis/baseSepolia/SimpleAttestationVerifier.json

@@ -5,11 +5,6 @@
         "internalType": "address",
         "name": "_witness",
         "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_zktlsAttestor",
-        "type": "address"
       }
     ],
     "stateMutability": "nonpayable",
@@ -34,19 +29,6 @@
     "name": "OwnershipTransferred",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "required",
-        "type": "bool"
-      }
-    ],
-    "name": "RequireZktlsValidationUpdated",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
@@ -66,25 +48,6 @@
     "name": "WitnessUpdated",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "oldAttestor",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "newAttestor",
-        "type": "address"
-      }
-    ],
-    "name": "ZktlsAttestorUpdated",
-    "type": "event"
-  },
   {
     "inputs": [],
     "name": "MIN_WITNESS_SIGNATURES",
@@ -131,19 +94,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_newAttestor",
-        "type": "address"
-      }
-    ],
-    "name": "setZktlsAttestor",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -171,7 +121,7 @@
       },
       {
         "internalType": "bytes",
-        "name": "_data",
+        "name": "",
         "type": "bytes"
       }
     ],
@@ -198,18 +148,5 @@
     ],
     "stateMutability": "view",
     "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "zktlsAttestor",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
   }
 ]

package/abis/baseSepolia/UnifiedPaymentVerifier.json

@@ -2,8 +2,8 @@
   {
     "inputs": [
       {
-        "internalType": "address",
-        "name": "_escrow",
+        "internalType": "contract IOrchestrator",
+        "name": "_orchestrator",
         "type": "address"
       },
       {
@@ -66,12 +66,6 @@
         "internalType": "bytes32",
         "name": "paymentMethod",
         "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "timestampBuffer",
-        "type": "uint256"
       }
     ],
     "name": "PaymentMethodAdded",
@@ -96,61 +90,47 @@
       {
         "indexed": true,
         "internalType": "bytes32",
-        "name": "paymentMethod",
+        "name": "intentHash",
         "type": "bytes32"
       },
       {
         "indexed": true,
         "internalType": "bytes32",
-        "name": "providerHash",
-        "type": "bytes32"
-      }
-    ],
-    "name": "ProviderHashAdded",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "bytes32",
-        "name": "paymentMethod",
+        "name": "method",
         "type": "bytes32"
       },
       {
         "indexed": true,
         "internalType": "bytes32",
-        "name": "providerHash",
-        "type": "bytes32"
-      }
-    ],
-    "name": "ProviderHashRemoved",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "bytes32",
-        "name": "paymentMethod",
+        "name": "currency",
         "type": "bytes32"
       },
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "oldBuffer",
+        "name": "amount",
         "type": "uint256"
       },
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "newBuffer",
+        "name": "timestamp",
         "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "bytes32",
+        "name": "paymentId",
+        "type": "bytes32"
+      },
+      {
+        "indexed": false,
+        "internalType": "bytes32",
+        "name": "payeeId",
+        "type": "bytes32"
       }
     ],
-    "name": "TimestampBufferUpdated",
+    "name": "PaymentVerified",
     "type": "event"
   },
   {
@@ -172,16 +152,6 @@
         "internalType": "bytes32",
         "name": "_paymentMethod",
         "type": "bytes32"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_timestampBuffer",
-        "type": "uint256"
-      },
-      {
-        "internalType": "bytes32[]",
-        "name": "_providerHashes",
-        "type": "bytes32[]"
       }
     ],
     "name": "addPaymentMethod",
@@ -189,24 +159,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_paymentMethod",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes32[]",
-        "name": "_providerHashes",
-        "type": "bytes32[]"
-      }
-    ],
-    "name": "addProviderHashes",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "attestationVerifier",
@@ -237,54 +189,11 @@
     "inputs": [
       {
         "internalType": "bytes32",
-        "name": "_paymentMethod",
-        "type": "bytes32"
-      }
-    ],
-    "name": "getProviderHashes",
-    "outputs": [
-      {
-        "internalType": "bytes32[]",
-        "name": "",
-        "type": "bytes32[]"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_paymentMethod",
-        "type": "bytes32"
-      }
-    ],
-    "name": "getTimestampBuffer",
-    "outputs": [
-      {
-        "internalType": "uint256",
         "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_paymentMethod",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_providerHash",
         "type": "bytes32"
       }
     ],
-    "name": "isProviderHash",
+    "name": "isPaymentMethod",
     "outputs": [
       {
         "internalType": "bool",
@@ -313,7 +222,7 @@
     "name": "orchestrator",
     "outputs": [
       {
-        "internalType": "address",
+        "internalType": "contract IOrchestrator",
         "name": "",
         "type": "address"
       }
@@ -366,24 +275,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_paymentMethod",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes32[]",
-        "name": "_providerHashes",
-        "type": "bytes32[]"
-      }
-    ],
-    "name": "removeProviderHashes",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "renounceOwnership",
@@ -404,48 +295,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_paymentMethod",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_newTimestampBuffer",
-        "type": "uint256"
-      }
-    ],
-    "name": "setTimestampBuffer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "name": "store",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "initialized",
-        "type": "bool"
-      },
-      {
-        "internalType": "uint256",
-        "name": "timestampBuffer",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -463,44 +312,14 @@
     "inputs": [
       {
         "components": [
-          {
-            "internalType": "bytes",
-            "name": "paymentProof",
-            "type": "bytes"
-          },
-          {
-            "internalType": "address",
-            "name": "depositToken",
-            "type": "address"
-          },
-          {
-            "internalType": "uint256",
-            "name": "intentAmount",
-            "type": "uint256"
-          },
-          {
-            "internalType": "uint256",
-            "name": "intentTimestamp",
-            "type": "uint256"
-          },
-          {
-            "internalType": "bytes32",
-            "name": "payeeDetails",
-            "type": "bytes32"
-          },
           {
             "internalType": "bytes32",
-            "name": "fiatCurrency",
+            "name": "intentHash",
             "type": "bytes32"
           },
-          {
-            "internalType": "uint256",
-            "name": "conversionRate",
-            "type": "uint256"
-          },
           {
             "internalType": "bytes",
-            "name": "depositData",
+            "name": "paymentProof",
             "type": "bytes"
           },
           {