@usdctofiat/offramp 1.1.2 → 1.1.4

package/README.md

@@ -131,4 +131,4 @@ Every deposit is automatically delegated to the Delegate vault for oracle-based
 
 [usdctofiat.xyz](https://usdctofiat.xyz) · [delegate.usdctofiat.xyz](https://delegate.usdctofiat.xyz) · [peerlytics.xyz](https://peerlytics.xyz) · [orderbook.peerlytics.xyz](https://orderbook.peerlytics.xyz)
 
-[Examples & agent skills](https://github.com/ADWilkinson/usdctofiat-peerlytics-starters) · [@usdctofiat](https://x.com/usdctofiat) · [@davyjones0x](https://x.com/davyjones0x)
+[Examples & agent skills](https://github.com/ADWilkinson/usdctofiat-peerlytics-starters) · [@usdctofiat](https://x.com/usdctofiat) · [@andrewwilkinson](https://x.com/andrewwilkinson)

package/dist/{chunk-2XJXFOPJ.js → chunk-OJY6DE3I.js}

@@ -1,12 +1,3 @@
-// src/platforms.ts
-import {
-  currencyInfo,
-  getCurrencyInfoFromHash,
-  getPaymentMethodsCatalog,
-  resolvePaymentMethodHash
-} from "@zkp2p/sdk";
-import { z } from "zod";
-
 // src/config.ts
 import { getContracts, getGatingServiceAddress } from "@zkp2p/sdk";
 var BASE_CHAIN_ID = 8453;
@@ -33,6 +24,13 @@ var INDEXER_MAX_DELAY_MS = 1e4;
 var PAYEE_REGISTRATION_TIMEOUT_MS = 8e3;
 
 // src/platforms.ts
+import {
+  currencyInfo,
+  getCurrencyInfoFromHash,
+  getPaymentMethodsCatalog,
+  resolvePaymentMethodHash
+} from "@zkp2p/sdk";
+import { z } from "zod";
 var PAYMENT_CATALOG = getPaymentMethodsCatalog(BASE_CHAIN_ID, RUNTIME_ENV);
 var ZELLE_HASH_LOOKUP_NAMES = ["zelle", "zelle-bofa", "zelle-chase", "zelle-citi"];
 var FALLBACK_CURRENCIES = {
@@ -344,7 +342,8 @@ function isUserCancellation(error) {
 }
 
 // src/otc.ts
-import { isAddress, zeroAddress } from "viem";
+import { createPublicClient, http, isAddress, zeroAddress } from "viem";
+import { base } from "viem/chains";
 
 // ../../node_modules/@zkp2p/contracts-v2/abis/base/WhitelistPreIntentHook.json
 var WhitelistPreIntentHook_default = [
@@ -626,14 +625,21 @@ var WhitelistPreIntentHook_default = [
             type: "uint256"
           },
           {
-            internalType: "address",
-            name: "referrer",
-            type: "address"
-          },
-          {
-            internalType: "uint256",
-            name: "referrerFee",
-            type: "uint256"
+            components: [
+              {
+                internalType: "address",
+                name: "recipient",
+                type: "address"
+              },
+              {
+                internalType: "uint256",
+                name: "fee",
+                type: "uint256"
+              }
+            ],
+            internalType: "struct IReferralFee.ReferralFee[]",
+            name: "referralFees",
+            type: "tuple[]"
           },
           {
             internalType: "bytes",
@@ -682,20 +688,123 @@ var WhitelistPreIntentHook_default = [
   }
 ];
 
-// src/deposit.ts
-import { createPublicClient, decodeEventLog, formatUnits as formatUnits2, http, parseUnits } from "viem";
-import { base } from "viem/chains";
-import {
-  OfframpClient,
-  getSpreadOracleConfig,
-  mapConversionRatesToOnchainMinRate
-} from "@zkp2p/sdk";
+// src/sdk-client.ts
+import { OfframpClient } from "@zkp2p/sdk";
+function createSdkClient(walletClient) {
+  return new OfframpClient({
+    walletClient,
+    chainId: BASE_CHAIN_ID,
+    runtimeEnv: RUNTIME_ENV,
+    rpcUrl: BASE_RPC_URL,
+    baseApiUrl: API_BASE_URL
+  });
+}
+
+// src/otc.ts
+var WHITELIST_HOOK_ADDRESS = "0xda023Ea0d789A41BcF5866F7B6BBd2CaDF9b79B8";
+var OTC_BASE_URL = "https://usdctofiat.xyz";
+async function enableOtc(walletClient, depositId, takerAddress, escrowAddress) {
+  if (!isAddress(takerAddress)) {
+    throw new OfframpError("Invalid taker address", "VALIDATION");
+  }
+  const escrow = escrowAddress || ESCROW_ADDRESS;
+  const taker = takerAddress;
+  const depositIdBig = BigInt(depositId);
+  const client = createSdkClient(walletClient);
+  const txOverrides = { referrer: [REFERRER] };
+  try {
+    const currentHook = await client.getDepositWhitelistHook(depositIdBig, {
+      escrowAddress: escrow
+    });
+    if (currentHook !== zeroAddress) {
+      const isAlready = await readIsWhitelisted(escrow, depositIdBig, taker);
+      if (isAlready) {
+        return {
+          depositId,
+          takerAddress: taker,
+          otcLink: getOtcLink(depositId, escrow)
+        };
+      }
+    }
+    await writeContract(walletClient, "addToWhitelist", [escrow, depositIdBig, [taker]]);
+    if (currentHook === zeroAddress) {
+      await client.setDepositWhitelistHook({
+        depositId: depositIdBig,
+        whitelistHook: WHITELIST_HOOK_ADDRESS,
+        escrowAddress: escrow,
+        txOverrides
+      });
+    }
+    return {
+      depositId,
+      takerAddress: taker,
+      otcLink: getOtcLink(depositId, escrow)
+    };
+  } catch (err) {
+    if (err instanceof OfframpError) throw err;
+    if (isUserCancellation(err)) {
+      throw new OfframpError("User cancelled", "USER_CANCELLED", void 0, err, { depositId });
+    }
+    const detail = err instanceof Error ? err.message : String(err);
+    throw new OfframpError(`Failed to enable OTC: ${detail}`, "DEPOSIT_FAILED", void 0, err, {
+      depositId
+    });
+  }
+}
+async function disableOtc(walletClient, depositId, escrowAddress) {
+  const escrow = escrowAddress || ESCROW_ADDRESS;
+  const client = createSdkClient(walletClient);
+  const txOverrides = { referrer: [REFERRER] };
+  try {
+    await client.setDepositWhitelistHook({
+      depositId: BigInt(depositId),
+      whitelistHook: zeroAddress,
+      escrowAddress: escrow,
+      txOverrides
+    });
+  } catch (err) {
+    if (isUserCancellation(err)) {
+      throw new OfframpError("User cancelled", "USER_CANCELLED", void 0, err, { depositId });
+    }
+    const detail = err instanceof Error ? err.message : String(err);
+    throw new OfframpError(`Failed to disable OTC: ${detail}`, "DEPOSIT_FAILED", void 0, err, {
+      depositId
+    });
+  }
+}
+function getOtcLink(depositId, escrowAddress) {
+  const escrow = escrowAddress || ESCROW_ADDRESS;
+  return `${OTC_BASE_URL}/deposit/${escrow}/${depositId}`;
+}
+async function writeContract(walletClient, functionName, args) {
+  const wc = walletClient;
+  if (typeof wc.writeContract !== "function") {
+    throw new OfframpError("Wallet client does not support writeContract", "VALIDATION");
+  }
+  await wc.writeContract({
+    address: WHITELIST_HOOK_ADDRESS,
+    abi: WhitelistPreIntentHook_default,
+    functionName,
+    args
+  });
+}
+async function readIsWhitelisted(escrow, depositId, taker) {
+  const publicClient = createPublicClient({ chain: base, transport: http(BASE_RPC_URL) });
+  return publicClient.readContract({
+    address: WHITELIST_HOOK_ADDRESS,
+    abi: WhitelistPreIntentHook_default,
+    functionName: "isWhitelisted",
+    args: [escrow, depositId, taker]
+  });
+}
 
 // src/queries.ts
-import { formatUnits } from "viem";
+import { concatHex, createPublicClient as createPublicClient2, encodeFunctionData, formatUnits, http as http2 } from "viem";
+import { base as base2 } from "viem/chains";
 import {
   classifyDelegationState,
   defaultIndexerEndpoint,
+  getAttributionDataSuffix,
   getCurrencyInfoFromHash as getCurrencyInfoFromHash2,
   IndexerClient,
   IndexerDepositService
@@ -772,6 +881,18 @@ function extractTxHash(result) {
     return result.transactionHash;
   throw new Error("Unexpected transaction result format");
 }
+var ESCROW_V2_ABI = [
+  {
+    name: "clearRateManager",
+    type: "function",
+    stateMutability: "nonpayable",
+    inputs: [{ name: "depositId", type: "uint256" }],
+    outputs: []
+  }
+];
+function appendReferrerAttribution(calldata) {
+  return concatHex([calldata, getAttributionDataSuffix([REFERRER])]);
+}
 async function deposits(walletAddress) {
   const service = getIndexerService();
   const raw = await service.fetchDepositsWithRelations(
@@ -794,8 +915,65 @@ async function close(walletClient, depositId, escrowAddress) {
   });
   return extractTxHash(result);
 }
+async function delegate(walletClient, depositId, escrowAddress) {
+  const client = createSdkClient(walletClient);
+  const result = await client.setRateManager({
+    depositId: BigInt(depositId),
+    rateManagerAddress: RATE_MANAGER_REGISTRY_ADDRESS,
+    rateManagerId: DELEGATE_RATE_MANAGER_ID,
+    escrowAddress: escrowAddress || ESCROW_ADDRESS,
+    txOverrides: { referrer: [REFERRER] }
+  });
+  return extractTxHash(result);
+}
+async function undelegate(walletClient, depositId, escrowAddress) {
+  const account = walletClient.account;
+  if (!account) {
+    throw new Error("Wallet client has no account. Connect a wallet first.");
+  }
+  const data = appendReferrerAttribution(
+    encodeFunctionData({
+      abi: ESCROW_V2_ABI,
+      functionName: "clearRateManager",
+      args: [BigInt(depositId)]
+    })
+  );
+  const hash = await walletClient.sendTransaction({
+    account,
+    chain: base2,
+    data,
+    to: escrowAddress || ESCROW_ADDRESS
+  });
+  const publicClient = createPublicClient2({
+    chain: base2,
+    transport: http2(BASE_RPC_URL)
+  });
+  try {
+    const receipt = await publicClient.waitForTransactionReceipt({
+      hash,
+      confirmations: 1,
+      timeout: 12e4,
+      pollingInterval: 4e3
+    });
+    if (receipt.status !== "success") {
+      throw new Error("Undelegation transaction failed");
+    }
+  } catch (err) {
+    const isTimeout = err instanceof Error && err.message.toLowerCase().includes("timed out");
+    if (!isTimeout) {
+      throw err;
+    }
+  }
+  return hash;
+}
 
 // src/deposit.ts
+import { createPublicClient as createPublicClient3, decodeEventLog, formatUnits as formatUnits2, http as http3, parseUnits } from "viem";
+import { base as base3 } from "viem/chains";
+import {
+  getSpreadOracleConfig,
+  mapConversionRatesToOnchainMinRate
+} from "@zkp2p/sdk";
 function usdcToUnits(amount) {
   return parseUnits(amount, 6);
 }
@@ -890,15 +1068,6 @@ function extractTxHash2(result) {
     return result.transactionHash;
   throw new Error("Unexpected transaction result format");
 }
-function createSdkClient(walletClient) {
-  return new OfframpClient({
-    walletClient,
-    chainId: BASE_CHAIN_ID,
-    runtimeEnv: RUNTIME_ENV,
-    rpcUrl: BASE_RPC_URL,
-    baseApiUrl: API_BASE_URL
-  });
-}
 async function findUndelegatedDeposit(walletAddress) {
   try {
     const service = getIndexerService();
@@ -907,6 +1076,7 @@ async function findUndelegatedDeposit(walletAddress) {
       { limit: 50 }
     );
     const escrowLower = ESCROW_ADDRESS.toLowerCase();
+    const delegateIdLower = DELEGATE_RATE_MANAGER_ID.toLowerCase();
     const undelegated = (raw || []).filter((d) => {
       if (d.status === "CLOSED") return false;
       if (d.escrowAddress.toLowerCase() !== escrowLower) return false;
@@ -918,7 +1088,7 @@ async function findUndelegatedDeposit(walletAddress) {
         }
       })();
       if (remaining === 0n) return false;
-      return d.rateManagerId !== DELEGATE_RATE_MANAGER_ID;
+      return (d.rateManagerId ?? "").toLowerCase() !== delegateIdLower;
     });
     undelegated.sort((a, b) => Number(BigInt(b.depositId) - BigInt(a.depositId)));
     return undelegated[0] ?? null;
@@ -983,7 +1153,7 @@ async function offramp(walletClient, params, onProgress) {
   const minUnits = usdcToUnits(String(MIN_ORDER_USDC));
   const maxUnits = usdcToUnits(String(Math.min(amt, 2500)));
   try {
-    const publicClient = createPublicClient({ chain: base, transport: http(BASE_RPC_URL) });
+    const publicClient = createPublicClient3({ chain: base3, transport: http3(BASE_RPC_URL) });
     const balance = await publicClient.readContract({
       address: USDC_ADDRESS,
       abi: [
@@ -1048,8 +1218,8 @@ async function offramp(walletClient, params, onProgress) {
       retainOnEmpty: false,
       intentAmountRange: { min: minUnits, max: maxUnits },
       processorNames: [platformId],
-      depositData: [buildDepositData(platformId, normalizedIdentifier)],
       conversionRates,
+      payeeDetailsHashes: [hashedOnchainId],
       paymentMethodsOverride: [methodHash],
       paymentMethodDataOverride: [
         {
@@ -1172,122 +1342,17 @@ async function offramp(walletClient, params, onProgress) {
   return { depositId, txHash: hash, resumed: false, otcLink };
 }
 
-// src/otc.ts
-var WHITELIST_HOOK_ADDRESS = "0xda023Ea0d789A41BcF5866F7B6BBd2CaDF9b79B8";
-var OTC_BASE_URL = "https://usdctofiat.xyz";
-async function enableOtc(walletClient, depositId, takerAddress, escrowAddress) {
-  if (!isAddress(takerAddress)) {
-    throw new OfframpError("Invalid taker address", "VALIDATION");
-  }
-  const escrow = escrowAddress || ESCROW_ADDRESS;
-  const taker = takerAddress;
-  const depositIdBig = BigInt(depositId);
-  const client = createSdkClient(walletClient);
-  const txOverrides = { referrer: [REFERRER] };
-  try {
-    const currentHook = await client.getDepositWhitelistHook(depositIdBig, {
-      escrowAddress: escrow
-    });
-    if (currentHook !== zeroAddress) {
-      const isAlready = await readIsWhitelisted(
-        walletClient,
-        escrow,
-        depositIdBig,
-        taker
-      );
-      if (isAlready) {
-        return {
-          depositId,
-          takerAddress: taker,
-          otcLink: getOtcLink2(depositId, escrow)
-        };
-      }
-    }
-    await writeContract(walletClient, "addToWhitelist", [escrow, depositIdBig, [taker]]);
-    if (currentHook === zeroAddress) {
-      await client.setDepositWhitelistHook({
-        depositId: depositIdBig,
-        whitelistHook: WHITELIST_HOOK_ADDRESS,
-        escrowAddress: escrow,
-        txOverrides
-      });
-    }
-    return {
-      depositId,
-      takerAddress: taker,
-      otcLink: getOtcLink2(depositId, escrow)
-    };
-  } catch (err) {
-    if (err instanceof OfframpError) throw err;
-    if (isUserCancellation(err)) {
-      throw new OfframpError("User cancelled", "USER_CANCELLED", void 0, err, { depositId });
-    }
-    const detail = err instanceof Error ? err.message : String(err);
-    throw new OfframpError(`Failed to enable OTC: ${detail}`, "DEPOSIT_FAILED", void 0, err, {
-      depositId
-    });
-  }
-}
-async function disableOtc(walletClient, depositId, escrowAddress) {
-  const escrow = escrowAddress || ESCROW_ADDRESS;
-  const client = createSdkClient(walletClient);
-  const txOverrides = { referrer: [REFERRER] };
-  try {
-    await client.setDepositWhitelistHook({
-      depositId: BigInt(depositId),
-      whitelistHook: zeroAddress,
-      escrowAddress: escrow,
-      txOverrides
-    });
-  } catch (err) {
-    if (isUserCancellation(err)) {
-      throw new OfframpError("User cancelled", "USER_CANCELLED", void 0, err, { depositId });
-    }
-    const detail = err instanceof Error ? err.message : String(err);
-    throw new OfframpError(`Failed to disable OTC: ${detail}`, "DEPOSIT_FAILED", void 0, err, {
-      depositId
-    });
-  }
-}
-function getOtcLink2(depositId, escrowAddress) {
-  const escrow = escrowAddress || ESCROW_ADDRESS;
-  return `${OTC_BASE_URL}/deposit/${escrow}/${depositId}`;
-}
-async function writeContract(walletClient, functionName, args) {
-  const wc = walletClient;
-  if (typeof wc.writeContract !== "function") {
-    throw new OfframpError("Wallet client does not support writeContract", "VALIDATION");
-  }
-  await wc.writeContract({
-    address: WHITELIST_HOOK_ADDRESS,
-    abi: WhitelistPreIntentHook_default,
-    functionName,
-    args
-  });
-}
-async function readIsWhitelisted(walletClient, escrow, depositId, taker) {
-  const { createPublicClient: createPublicClient2, http: http2 } = await import("viem");
-  const { base: base2 } = await import("viem/chains");
-  const publicClient = createPublicClient2({
-    chain: base2,
-    transport: http2("https://mainnet.base.org")
-  });
-  return publicClient.readContract({
-    address: WHITELIST_HOOK_ADDRESS,
-    abi: WhitelistPreIntentHook_default,
-    functionName: "isWhitelisted",
-    args: [escrow, depositId, taker]
-  });
-}
-
 export {
+  ESCROW_ADDRESS,
   PLATFORMS,
   OfframpError,
   enableOtc,
   disableOtc,
-  getOtcLink2 as getOtcLink,
+  getOtcLink,
   deposits,
   close,
+  delegate,
+  undelegate,
   offramp
 };
-//# sourceMappingURL=chunk-2XJXFOPJ.js.map
+//# sourceMappingURL=chunk-OJY6DE3I.js.map