@zkp2p/contracts-v2 0.0.11-rc.1 → 0.0.11

package/abis/base/index.ts

@@ -1,3 +1,4 @@
+export { default as AcrossBridgeHook } from './AcrossBridgeHook.json';
 export { default as Escrow } from './Escrow.json';
 export { default as EscrowRegistry } from './EscrowRegistry.json';
 export { default as NullifierRegistry } from './NullifierRegistry.json';

package/abis/base.cjs

@@ -1,5 +1,6 @@
 // Auto-generated CommonJS wrapper for base ABIs
 module.exports = {
+  AcrossBridgeHook: require('../_cjs/abis/base/AcrossBridgeHook.js'),
   Escrow: require('../_cjs/abis/base/Escrow.js'),
   EscrowRegistry: require('../_cjs/abis/base/EscrowRegistry.js'),
   NullifierRegistry: require('../_cjs/abis/base/NullifierRegistry.js'),

package/abis/base.d.ts

@@ -1,5 +1,6 @@
 // Auto-generated TypeScript definitions for base ABIs
 import type { Abi } from 'abitype';
+export declare const AcrossBridgeHook: Abi;
 export declare const Escrow: Abi;
 export declare const EscrowRegistry: Abi;
 export declare const NullifierRegistry: Abi;

package/abis/base.mjs

@@ -1,4 +1,5 @@
 // Auto-generated ESM wrapper for base ABIs
+export { default as AcrossBridgeHook } from '../_esm/abis/base/AcrossBridgeHook.js';
 export { default as Escrow } from '../_esm/abis/base/Escrow.js';
 export { default as EscrowRegistry } from '../_esm/abis/base/EscrowRegistry.js';
 export { default as NullifierRegistry } from '../_esm/abis/base/NullifierRegistry.js';

package/abis/baseStaging/AcrossBridgeHook.json

@@ -31,17 +31,6 @@
     "name": "InvalidDestinationChainId",
     "type": "error"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "dataLength",
-        "type": "uint256"
-      }
-    ],
-    "name": "InvalidFulfillHookDataLength",
-    "type": "error"
-  },
   {
     "inputs": [
       {
@@ -80,17 +69,6 @@
     "name": "NativeTransferFailed",
     "type": "error"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "orchestrator",
-        "type": "address"
-      }
-    ],
-    "name": "SameOrchestrator",
-    "type": "error"
-  },
   {
     "inputs": [
       {
@@ -199,25 +177,6 @@
     "name": "FallbackTransfer",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "previousOrchestrator",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "newOrchestrator",
-        "type": "address"
-      }
-    ],
-    "name": "OrchestratorUpdated",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
@@ -285,91 +244,89 @@
     "inputs": [
       {
         "components": [
+          {
+            "internalType": "address",
+            "name": "owner",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "to",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "escrow",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "depositId",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "amount",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "timestamp",
+            "type": "uint256"
+          },
+          {
+            "internalType": "bytes32",
+            "name": "paymentMethod",
+            "type": "bytes32"
+          },
+          {
+            "internalType": "bytes32",
+            "name": "fiatCurrency",
+            "type": "bytes32"
+          },
+          {
+            "internalType": "uint256",
+            "name": "conversionRate",
+            "type": "uint256"
+          },
           {
             "internalType": "bytes32",
-            "name": "intentHash",
+            "name": "payeeId",
             "type": "bytes32"
           },
           {
             "internalType": "address",
-            "name": "token",
+            "name": "referrer",
             "type": "address"
           },
           {
             "internalType": "uint256",
-            "name": "executableAmount",
+            "name": "referrerFee",
             "type": "uint256"
           },
           {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "owner",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "to",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "escrow",
-                "type": "address"
-              },
-              {
-                "internalType": "uint256",
-                "name": "depositId",
-                "type": "uint256"
-              },
-              {
-                "internalType": "uint256",
-                "name": "amount",
-                "type": "uint256"
-              },
-              {
-                "internalType": "uint256",
-                "name": "timestamp",
-                "type": "uint256"
-              },
-              {
-                "internalType": "bytes32",
-                "name": "paymentMethod",
-                "type": "bytes32"
-              },
-              {
-                "internalType": "bytes32",
-                "name": "fiatCurrency",
-                "type": "bytes32"
-              },
-              {
-                "internalType": "uint256",
-                "name": "conversionRate",
-                "type": "uint256"
-              },
-              {
-                "internalType": "bytes32",
-                "name": "payeeId",
-                "type": "bytes32"
-              },
-              {
-                "internalType": "bytes",
-                "name": "signalHookData",
-                "type": "bytes"
-              }
-            ],
-            "internalType": "struct IPostIntentHook.HookIntentContext",
-            "name": "intent",
-            "type": "tuple"
+            "internalType": "contract IPostIntentHook",
+            "name": "postIntentHook",
+            "type": "address"
+          },
+          {
+            "internalType": "bytes",
+            "name": "data",
+            "type": "bytes"
           }
         ],
-        "internalType": "struct IPostIntentHook.HookExecutionContext",
-        "name": "_ctx",
+        "internalType": "struct IOrchestrator.Intent",
+        "name": "_intent",
         "type": "tuple"
       },
+      {
+        "internalType": "uint256",
+        "name": "_amountNetFees",
+        "type": "uint256"
+      },
       {
         "internalType": "bytes",
-        "name": "_fulfillHookData",
+        "name": "_fulfillIntentData",
         "type": "bytes"
       }
     ],
@@ -465,19 +422,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_newOrchestrator",
-        "type": "address"
-      }
-    ],
-    "name": "setOrchestrator",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "spokePool",

package/abis/baseStaging/Orchestrator.json

@@ -21,6 +21,11 @@
         "name": "_paymentVerifierRegistry",
         "type": "address"
       },
+      {
+        "internalType": "address",
+        "name": "_postIntentHookRegistry",
+        "type": "address"
+      },
       {
         "internalType": "address",
         "name": "_relayerRegistry",
@@ -120,11 +125,6 @@
     "name": "CurrencyNotSupported",
     "type": "error"
   },
-  {
-    "inputs": [],
-    "name": "DepositRateManagerControllerNotSet",
-    "type": "error"
-  },
   {
     "inputs": [],
     "name": "EscrowLockFailed",
@@ -184,28 +184,6 @@
     "name": "IntentNotFound",
     "type": "error"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "hook",
-        "type": "address"
-      }
-    ],
-    "name": "InvalidPostIntentHook",
-    "type": "error"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "hook",
-        "type": "address"
-      }
-    ],
-    "name": "InvalidPreIntentHook",
-    "type": "error"
-  },
   {
     "inputs": [],
     "name": "InvalidReferrerFeeConfiguration",
@@ -270,6 +248,17 @@
     "name": "PaymentVerificationFailed",
     "type": "error"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "hook",
+        "type": "address"
+      }
+    ],
+    "name": "PostIntentHookNotWhitelisted",
+    "type": "error"
+  },
   {
     "inputs": [
       {
@@ -334,27 +323,6 @@
     "name": "UnauthorizedCaller",
     "type": "error"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "caller",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "delegate",
-        "type": "address"
-      }
-    ],
-    "name": "UnauthorizedCallerOrDelegate",
-    "type": "error"
-  },
   {
     "inputs": [
       {
@@ -389,81 +357,6 @@
     "name": "AllowMultipleIntentsUpdated",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "escrow",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "depositId",
-        "type": "uint256"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "hook",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "setter",
-        "type": "address"
-      }
-    ],
-    "name": "DepositPreIntentHookSet",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "depositRateManagerController",
-        "type": "address"
-      }
-    ],
-    "name": "DepositRateManagerControllerUpdated",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "escrow",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "depositId",
-        "type": "uint256"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "hook",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "setter",
-        "type": "address"
-      }
-    ],
-    "name": "DepositWhitelistHookSet",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
@@ -508,31 +401,6 @@
     "name": "IntentFulfilled",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "bytes32",
-        "name": "intentHash",
-        "type": "bytes32"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "feeRecipient",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "fee",
-        "type": "uint256"
-      }
-    ],
-    "name": "IntentManagerFeeSnapshotted",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
@@ -671,6 +539,19 @@
     "name": "PaymentVerifierRegistryUpdated",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "postIntentHookRegistry",
+        "type": "address"
+      }
+    ],
+    "name": "PostIntentHookRegistryUpdated",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -762,32 +643,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32[]",
-        "name": "_intentHashes",
-        "type": "bytes32[]"
-      }
-    ],
-    "name": "cleanupOrphanedIntents",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "depositRateManagerController",
-    "outputs": [
-      {
-        "internalType": "contract IDepositRateManagerController",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "escrowRegistry",
@@ -855,54 +710,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_escrow",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_depositId",
-        "type": "uint256"
-      }
-    ],
-    "name": "getDepositPreIntentHook",
-    "outputs": [
-      {
-        "internalType": "contract IPreIntentHook",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_escrow",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_depositId",
-        "type": "uint256"
-      }
-    ],
-    "name": "getDepositWhitelistHook",
-    "outputs": [
-      {
-        "internalType": "contract IPreIntentHook",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -1072,6 +879,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "postIntentHookRegistry",
+    "outputs": [
+      {
+        "internalType": "contract IPostIntentHookRegistry",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "protocolFee",
@@ -1161,57 +981,11 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "_escrow",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_depositId",
-        "type": "uint256"
-      },
-      {
-        "internalType": "contract IPreIntentHook",
-        "name": "_hook",
-        "type": "address"
-      }
-    ],
-    "name": "setDepositPreIntentHook",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_depositRateManagerController",
-        "type": "address"
-      }
-    ],
-    "name": "setDepositRateManagerController",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_escrow",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_depositId",
-        "type": "uint256"
-      },
-      {
-        "internalType": "contract IPreIntentHook",
-        "name": "_hook",
+        "name": "_escrowRegistry",
         "type": "address"
       }
     ],
-    "name": "setDepositWhitelistHook",
+    "name": "setEscrowRegistry",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
@@ -1220,11 +994,11 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "_escrowRegistry",
+        "name": "_postIntentHookRegistry",
         "type": "address"
       }
     ],
-    "name": "setEscrowRegistry",
+    "name": "setPostIntentHookRegistry",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
@@ -1332,11 +1106,6 @@
             "name": "postIntentHook",
             "type": "address"
           },
-          {
-            "internalType": "bytes",
-            "name": "preIntentHookData",
-            "type": "bytes"
-          },
           {
             "internalType": "bytes",
             "name": "data",