@dcentralab/d402-client 0.3.3 → 0.3.5

package/dist/index.mjs

@@ -302,7 +302,6 @@ async function signD402Payment(params) {
     requestPath,
     d402Version = 1
   } = params;
-  const consumerWallet = iatpWalletAddress || operatorAccount.address;
   let finalRequestPath = requestPath || paymentRequirement.resource || "/mcp";
   if (!finalRequestPath || finalRequestPath.trim() === "") {
     finalRequestPath = "/mcp";
@@ -319,10 +318,10 @@ async function signD402Payment(params) {
     name: walletName,
     version: walletVersion,
     chainId,
-    verifyingContract: consumerWallet
+    verifyingContract: iatpWalletAddress
   };
   const message = {
-    wallet: consumerWallet,
+    wallet: iatpWalletAddress,
     provider: paymentRequirement.payTo,
     token: paymentRequirement.asset,
     amount: BigInt(paymentRequirement.maxAmountRequired),
@@ -347,7 +346,7 @@ async function signD402Payment(params) {
     payload: {
       signature,
       authorization: {
-        from: consumerWallet,
+        from: iatpWalletAddress,
         to: paymentRequirement.payTo,
         value: paymentRequirement.maxAmountRequired,
         validAfter,
@@ -5107,13 +5106,13 @@ async function createIATPWallet(params) {
 }
 async function getAvailableBalance(params) {
   const { publicClient, walletAddress, tokenAddress, network = "sepolia" } = params;
-  const walletConfig = getContractConfig("IATPWallet" /* IATP_WALLET */, network);
-  if (!walletConfig) {
-    throw new Error(`IATPWallet contract not found for network: ${network}`);
+  const walletAbi = getContractAbi("IATPWallet" /* IATP_WALLET */, network);
+  if (!walletAbi) {
+    throw new Error(`IATPWallet ABI not found for network: ${network}`);
   }
   const balance = await publicClient.readContract({
     address: walletAddress,
-    abi: walletConfig.abi,
+    abi: walletAbi,
     functionName: "getAvailableBalance",
     args: [tokenAddress]
   });
@@ -5143,37 +5142,41 @@ async function getWalletsByOwner(params) {
 // src/wallet/withdrawals.ts
 async function getWithdrawalRequest(params) {
   const { publicClient, walletAddress, tokenAddress, network = "sepolia" } = params;
-  const walletConfig = getContractConfig("IATPWallet" /* IATP_WALLET */, network);
-  if (!walletConfig) {
-    throw new Error(`IATPWallet contract not found for network: ${network}`);
+  const walletAbi = getContractAbi("IATPWallet" /* IATP_WALLET */, network);
+  if (!walletAbi) {
+    throw new Error(`IATPWallet ABI not found for network: ${network}`);
   }
   const result = await publicClient.readContract({
     address: walletAddress,
-    abi: walletConfig.abi,
+    abi: walletAbi,
     functionName: "getWithdrawalRequest",
     args: [tokenAddress]
   });
-  if (result[0] === 0n) {
+  const [request, unlockTime] = result;
+  if (request.amount === 0n) {
     return null;
   }
-  return result;
+  return {
+    request,
+    unlockTime
+  };
 }
 async function requestWithdrawal(params) {
   const { walletClient, publicClient, walletAddress, tokenAddress, amount, account, network = "sepolia" } = params;
-  const walletConfig = getContractConfig("IATPWallet" /* IATP_WALLET */, network);
-  if (!walletConfig) {
-    throw new Error(`IATPWallet contract not found for network: ${network}`);
+  const walletAbi = getContractAbi("IATPWallet" /* IATP_WALLET */, network);
+  if (!walletAbi) {
+    throw new Error(`IATPWallet ABI not found for network: ${network}`);
   }
   await publicClient.simulateContract({
     account,
     address: walletAddress,
-    abi: walletConfig.abi,
+    abi: walletAbi,
     functionName: "requestWithdrawal",
     args: [tokenAddress, amount]
   });
   const estimatedGas = await publicClient.estimateContractGas({
     address: walletAddress,
-    abi: walletConfig.abi,
+    abi: walletAbi,
     functionName: "requestWithdrawal",
     args: [tokenAddress, amount],
     account
@@ -5181,7 +5184,7 @@ async function requestWithdrawal(params) {
   const gasLimit = estimatedGas + estimatedGas / 5n;
   const hash = await walletClient.writeContract({
     address: walletAddress,
-    abi: walletConfig.abi,
+    abi: walletAbi,
     functionName: "requestWithdrawal",
     args: [tokenAddress, amount],
     account,
@@ -5192,20 +5195,20 @@ async function requestWithdrawal(params) {
 }
 async function executeWithdrawal(params) {
   const { walletClient, publicClient, walletAddress, tokenAddress, account, network = "sepolia" } = params;
-  const walletConfig = getContractConfig("IATPWallet" /* IATP_WALLET */, network);
-  if (!walletConfig) {
-    throw new Error(`IATPWallet contract not found for network: ${network}`);
+  const walletAbi = getContractAbi("IATPWallet" /* IATP_WALLET */, network);
+  if (!walletAbi) {
+    throw new Error(`IATPWallet ABI not found for network: ${network}`);
   }
   await publicClient.simulateContract({
     account,
     address: walletAddress,
-    abi: walletConfig.abi,
+    abi: walletAbi,
     functionName: "executeWithdrawal",
     args: [tokenAddress]
   });
   const estimatedGas = await publicClient.estimateContractGas({
     address: walletAddress,
-    abi: walletConfig.abi,
+    abi: walletAbi,
     functionName: "executeWithdrawal",
     args: [tokenAddress],
     account
@@ -5213,7 +5216,7 @@ async function executeWithdrawal(params) {
   const gasLimit = estimatedGas + estimatedGas / 5n;
   const hash = await walletClient.writeContract({
     address: walletAddress,
-    abi: walletConfig.abi,
+    abi: walletAbi,
     functionName: "executeWithdrawal",
     args: [tokenAddress],
     account,
@@ -5306,7 +5309,7 @@ var D402Client = class {
    * 
    * @param publicClient - Viem PublicClient
    * @param tokenAddress - Token contract address
-   * @returns Withdrawal request: [amount, unlockTimestamp] or null if no request exists
+   * @returns Withdrawal request details (request + unlockTime) or null if no request exists
    */
   async getWithdrawalRequest(publicClient, tokenAddress) {
     return getWithdrawalRequest({
@@ -5384,7 +5387,15 @@ var D402Client = class {
     const { parseAllPaymentRequirements: parseAllPaymentRequirements2 } = await Promise.resolve().then(() => (init_parser(), parser_exports));
     const { signD402Payment: signD402Payment2 } = await Promise.resolve().then(() => (init_signer(), signer_exports));
     const { encodePayment: encodePayment2 } = await Promise.resolve().then(() => (init_encoder(), encoder_exports));
-    let response = await fetch(url, init);
+    const enhancedInit = {
+      ...init,
+      headers: {
+        ...init?.headers,
+        // Preserve existing Accept header or set default for MCP compatibility
+        "Accept": init?.headers?.["Accept"] || "application/json, text/event-stream"
+      }
+    };
+    let response = await fetch(url, enhancedInit);
     if (response.status !== 402) {
       return response;
     }
@@ -5398,9 +5409,9 @@ var D402Client = class {
       });
       const paymentHeader = encodePayment2(signedPayment);
       response = await fetch(url, {
-        ...init,
+        ...enhancedInit,
         headers: {
-          ...init?.headers,
+          ...enhancedInit.headers,
           "X-Payment": paymentHeader,
           "Access-Control-Expose-Headers": "X-Payment-Response"
         }