x402z-shared 0.0.4 → 0.0.6

package/dist/web.mjs

@@ -4,12 +4,11 @@ import {
   confidentialTokenAbi,
   createNonce,
   hashEncryptedAmountInput,
-  normalizeAmount,
-  setObserver
-} from "./chunk-LTE4V3LT.mjs";
+  normalizeAmount
+} from "./chunk-7OLOM2AQ.mjs";
 
 // src/relayer-web.ts
-import { createInstance, initSDK, SepoliaConfig } from "@zama-fhe/relayer-sdk/bundle";
+import { createInstance, initSDK, SepoliaConfig } from "@zama-fhe/relayer-sdk/web";
 import { getAddress, toHex } from "viem";
 async function createRelayerInstance(config) {
   const instance = await createInstance(config);
@@ -63,82 +62,29 @@ async function publicDecrypt(relayer, handles) {
   };
 }
 
-// src/balance-web.ts
-import { createPublicClient, getAddress as getAddress2, http, isAddress, isAddressEqual } from "viem";
-var ZERO_HANDLE = "0x" + "00".repeat(32);
-async function viewConfidentialBalance(options) {
-  if (!isAddress(options.tokenAddress)) {
-    throw new Error(`Invalid token address: ${options.tokenAddress}`);
-  }
-  const account = options.account ?? options.signer?.address;
-  if (!account || !isAddress(account)) {
-    throw new Error(`Invalid account address: ${account ?? "undefined"}`);
-  }
-  const publicClient = createPublicClient({ transport: http(options.rpcUrl) });
-  const confidentialBalanceAbi = [
-    {
-      inputs: [{ internalType: "address", name: "account", type: "address" }],
-      name: "confidentialBalanceOf",
-      outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
-      stateMutability: "view",
-      type: "function"
-    }
-  ];
-  const handle = await publicClient.readContract({
-    address: options.tokenAddress,
-    abi: confidentialBalanceAbi,
-    functionName: "confidentialBalanceOf",
-    args: [account]
-  });
-  const shouldDecrypt = options.decrypt ?? true;
-  if (!shouldDecrypt) {
-    return { handle };
-  }
-  if (!options.signer) {
-    throw new Error("Missing signer for decryption");
-  }
-  const signerAddress = getAddress2(options.signer.address);
-  if (!isAddressEqual(signerAddress, getAddress2(account))) {
-    const observer = await publicClient.readContract({
-      address: options.tokenAddress,
-      abi: confidentialTokenAbi,
-      functionName: "observer",
-      args: [account]
-    });
-    if (!observer || !isAddressEqual(observer, signerAddress)) {
-      throw new Error(confidentialErrorCodes.observerNotAuthorized);
-    }
-  }
-  if (handle === ZERO_HANDLE) {
-    return { handle, balance: 0n };
-  }
-  const balance = await userDecryptEuint64(options.relayer, handle, options.tokenAddress, options.signer);
-  return { handle, balance };
-}
-
 // src/transfer-web.ts
-import { createPublicClient as createPublicClient2, decodeEventLog, getAddress as getAddress3, http as http2, isAddress as isAddress2, isHex, isAddressEqual as isAddressEqual2 } from "viem";
+import { createPublicClient, decodeEventLog, getAddress as getAddress2, http, isAddress, isHex, isAddressEqual } from "viem";
 async function viewConfidentialTransferAmounts(options) {
-  if (!isAddress2(options.tokenAddress)) {
+  if (!isAddress(options.tokenAddress)) {
     throw new Error(`Invalid token address: ${options.tokenAddress}`);
   }
   if (!isHex(options.txHash, { strict: true })) {
     throw new Error(`Invalid transaction hash: ${options.txHash}`);
   }
-  if (options.from && !isAddress2(options.from)) {
+  if (options.from && !isAddress(options.from)) {
     throw new Error(`Invalid from address: ${options.from}`);
   }
-  if (options.to && !isAddress2(options.to)) {
+  if (options.to && !isAddress(options.to)) {
     throw new Error(`Invalid to address: ${options.to}`);
   }
-  const publicClient = createPublicClient2({ transport: http2(options.rpcUrl) });
+  const publicClient = createPublicClient({ transport: http(options.rpcUrl) });
   const receipt = await publicClient.getTransactionReceipt({
     hash: options.txHash
   });
-  const tokenAddress = getAddress3(options.tokenAddress);
-  const fromFilter = options.from ? getAddress3(options.from) : void 0;
-  const toFilter = options.to ? getAddress3(options.to) : void 0;
-  const logs = receipt.logs.filter((log) => getAddress3(log.address) === tokenAddress);
+  const tokenAddress = getAddress2(options.tokenAddress);
+  const fromFilter = options.from ? getAddress2(options.from) : void 0;
+  const toFilter = options.to ? getAddress2(options.to) : void 0;
+  const logs = receipt.logs.filter((log) => getAddress2(log.address) === tokenAddress);
   const transfers = [];
   for (const log of logs) {
     try {
@@ -150,8 +96,8 @@ async function viewConfidentialTransferAmounts(options) {
       });
       const args = decoded.args;
       const entry = {
-        holder: getAddress3(args.holder),
-        payee: getAddress3(args.payee),
+        holder: getAddress2(args.holder),
+        payee: getAddress2(args.payee),
         maxClearAmount: BigInt(args.maxClearAmount),
         resourceHash: args.resourceHash,
         nonce: args.nonce,
@@ -168,10 +114,10 @@ async function viewConfidentialTransferAmounts(options) {
         if (!options.signer) {
           throw new Error("Missing signer for decryption");
         }
-        const signerAddress = getAddress3(options.signer.address);
-        const holderAddress = getAddress3(entry.holder);
-        const payeeAddress = getAddress3(entry.payee);
-        if (!isAddressEqual2(signerAddress, holderAddress) && !isAddressEqual2(signerAddress, payeeAddress)) {
+        const signerAddress = getAddress2(options.signer.address);
+        const holderAddress = getAddress2(entry.holder);
+        const payeeAddress = getAddress2(entry.payee);
+        if (!isAddressEqual(signerAddress, holderAddress) && !isAddressEqual(signerAddress, payeeAddress)) {
           const [holderObserver, payeeObserver] = await Promise.all([
             publicClient.readContract({
               address: tokenAddress,
@@ -186,7 +132,7 @@ async function viewConfidentialTransferAmounts(options) {
               args: [payeeAddress]
             })
           ]);
-          const allowed = holderObserver && isAddressEqual2(holderObserver, signerAddress) || payeeObserver && isAddressEqual2(payeeObserver, signerAddress);
+          const allowed = holderObserver && isAddressEqual(holderObserver, signerAddress) || payeeObserver && isAddressEqual(payeeObserver, signerAddress);
           if (!allowed) {
             throw new Error(confidentialErrorCodes.observerNotAuthorized);
           }
@@ -208,6 +154,62 @@ async function viewConfidentialTransferAmounts(options) {
   return transfers;
 }
 
+// src/token-web.ts
+import { getAddress as getAddress5, isAddress as isAddress4 } from "viem";
+
+// src/balance-web.ts
+import { createPublicClient as createPublicClient2, getAddress as getAddress3, http as http2, isAddress as isAddress2, isAddressEqual as isAddressEqual2 } from "viem";
+var ZERO_HANDLE = "0x" + "00".repeat(32);
+async function viewConfidentialBalance(options) {
+  if (!isAddress2(options.tokenAddress)) {
+    throw new Error(`Invalid token address: ${options.tokenAddress}`);
+  }
+  const account = options.account ?? options.signer?.address;
+  if (!account || !isAddress2(account)) {
+    throw new Error(`Invalid account address: ${account ?? "undefined"}`);
+  }
+  const publicClient = createPublicClient2({ transport: http2(options.rpcUrl) });
+  const confidentialBalanceAbi = [
+    {
+      inputs: [{ internalType: "address", name: "account", type: "address" }],
+      name: "confidentialBalanceOf",
+      outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
+      stateMutability: "view",
+      type: "function"
+    }
+  ];
+  const handle = await publicClient.readContract({
+    address: options.tokenAddress,
+    abi: confidentialBalanceAbi,
+    functionName: "confidentialBalanceOf",
+    args: [account]
+  });
+  const shouldDecrypt = options.decrypt ?? true;
+  if (!shouldDecrypt) {
+    return { handle };
+  }
+  if (!options.signer) {
+    throw new Error("Missing signer for decryption");
+  }
+  const signerAddress = getAddress3(options.signer.address);
+  if (!isAddressEqual2(signerAddress, getAddress3(account))) {
+    const observer = await publicClient.readContract({
+      address: options.tokenAddress,
+      abi: confidentialTokenAbi,
+      functionName: "observer",
+      args: [account]
+    });
+    if (!observer || !isAddressEqual2(observer, signerAddress)) {
+      throw new Error(confidentialErrorCodes.observerNotAuthorized);
+    }
+  }
+  if (handle === ZERO_HANDLE) {
+    return { handle, balance: 0n };
+  }
+  const balance = await userDecryptEuint64(options.relayer, handle, options.tokenAddress, options.signer);
+  return { handle, balance };
+}
+
 // src/observer-web.ts
 import { getAddress as getAddress4, isAddress as isAddress3 } from "viem";
 async function setObserverWeb(options) {
@@ -229,10 +231,130 @@ async function setObserverWeb(options) {
     account: options.signer ?? options.walletClient.account ?? null
   });
 }
+
+// src/token-web.ts
+function assertAddress(value, label) {
+  if (!isAddress4(value)) {
+    throw new Error(`Invalid ${label}: ${value}`);
+  }
+  return getAddress5(value);
+}
+function resolveSignerAddress(signer, walletClient) {
+  if (signer?.address) {
+    return assertAddress(signer.address, "signer address");
+  }
+  const account = walletClient.account;
+  if (typeof account === "string") {
+    return assertAddress(account, "wallet address");
+  }
+  if (account && typeof account === "object" && "address" in account && account.address) {
+    return assertAddress(account.address, "wallet address");
+  }
+  throw new Error("Missing signer address");
+}
+function resolveWriteAccount(signer, walletClient) {
+  if (signer?.address) {
+    return assertAddress(signer.address, "signer address");
+  }
+  const account = walletClient.account;
+  if (typeof account === "string") {
+    return assertAddress(account, "wallet address");
+  }
+  return account ?? null;
+}
+var ConfidentialTokenWeb = class {
+  constructor(config) {
+    this.rpcUrl = config.rpcUrl;
+    this.tokenAddress = config.tokenAddress;
+    this.relayer = config.relayer;
+    this.walletClient = config.walletClient;
+    this.signer = config.signer;
+  }
+  async balanceOf(account) {
+    const result = await viewConfidentialBalance({
+      rpcUrl: this.rpcUrl,
+      tokenAddress: this.tokenAddress,
+      account,
+      relayer: this.relayer,
+      signer: this.signer,
+      decrypt: true
+    });
+    return result.balance ?? 0n;
+  }
+  async setObserver(account, observer) {
+    return setObserverWeb({
+      tokenAddress: this.tokenAddress,
+      account,
+      observer,
+      signer: this.signer?.address ? assertAddress(this.signer.address, "signer address") : void 0,
+      walletClient: this.walletClient
+    });
+  }
+  async transfer(to, amount) {
+    const tokenAddress = assertAddress(this.tokenAddress, "token address");
+    const toAddress = assertAddress(to, "recipient address");
+    const fromAddress = resolveSignerAddress(this.signer, this.walletClient);
+    if (!Number.isSafeInteger(amount)) {
+      throw new Error("Transfer amount must be a safe integer");
+    }
+    const { handle, inputProof } = await createEncryptedAmountInput(
+      this.relayer,
+      tokenAddress,
+      fromAddress,
+      amount
+    );
+    return this.walletClient.writeContract({
+      address: tokenAddress,
+      abi: confidentialTokenAbi,
+      functionName: "confidentialTransfer",
+      args: [toAddress, handle, inputProof],
+      chain: this.walletClient.chain ?? null,
+      account: resolveWriteAccount(this.signer, this.walletClient)
+    });
+  }
+  async wrap(to, amount) {
+    const tokenAddress = assertAddress(this.tokenAddress, "token address");
+    const toAddress = assertAddress(to, "recipient address");
+    const normalizedAmount = BigInt(normalizeAmount(amount));
+    return this.walletClient.writeContract({
+      address: tokenAddress,
+      abi: confidentialTokenAbi,
+      functionName: "wrap",
+      args: [toAddress, normalizedAmount],
+      chain: this.walletClient.chain ?? null,
+      account: resolveWriteAccount(this.signer, this.walletClient)
+    });
+  }
+  async unwrap(from, to, amount) {
+    const tokenAddress = assertAddress(this.tokenAddress, "token address");
+    const fromAddress = assertAddress(from, "from address");
+    const toAddress = assertAddress(to, "to address");
+    const signerAddress = resolveSignerAddress(this.signer, this.walletClient);
+    if (!Number.isSafeInteger(amount)) {
+      throw new Error("Unwrap amount must be a safe integer");
+    }
+    const { handle, inputProof } = await createEncryptedAmountInput(
+      this.relayer,
+      tokenAddress,
+      signerAddress,
+      amount
+    );
+    return this.walletClient.writeContract({
+      address: tokenAddress,
+      abi: confidentialTokenAbi,
+      functionName: "unwrap",
+      args: [fromAddress, toAddress, handle, inputProof],
+      chain: this.walletClient.chain ?? null,
+      account: resolveWriteAccount(this.signer, this.walletClient)
+    });
+  }
+};
 export {
+  ConfidentialTokenWeb,
   SepoliaConfig,
   confidentialErrorCodes,
   confidentialPaymentTypes,
+  ConfidentialTokenWeb as confidentialToken,
   confidentialTokenAbi,
   createEncryptedAmountInput,
   createNonce,
@@ -241,9 +363,6 @@ export {
   initSDK,
   normalizeAmount,
   publicDecrypt,
-  setObserver,
-  setObserverWeb,
   userDecryptEuint64,
-  viewConfidentialBalance,
   viewConfidentialTransferAmounts
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x402z-shared",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",