x402z-shared 0.0.2 → 0.0.3

package/dist/web.js

@@ -21,6 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var web_exports = {};
 __export(web_exports, {
   SepoliaConfig: () => import_bundle.SepoliaConfig,
+  confidentialErrorCodes: () => confidentialErrorCodes,
   confidentialPaymentTypes: () => confidentialPaymentTypes,
   confidentialTokenAbi: () => confidentialTokenAbi,
   createEncryptedAmountInput: () => createEncryptedAmountInput,
@@ -30,6 +31,8 @@ __export(web_exports, {
   initSDK: () => import_bundle.initSDK,
   normalizeAmount: () => normalizeAmount,
   publicDecrypt: () => publicDecrypt,
+  setObserver: () => setObserver,
+  setObserverWeb: () => setObserverWeb,
   userDecryptEuint64: () => userDecryptEuint64,
   viewConfidentialBalance: () => viewConfidentialBalance,
   viewConfidentialTransferAmounts: () => viewConfidentialTransferAmounts
@@ -86,6 +89,23 @@ var confidentialTokenAbi = [
     outputs: [{ internalType: "bool", name: "", type: "bool" }],
     stateMutability: "view",
     type: "function"
+  },
+  {
+    inputs: [{ internalType: "address", name: "account", type: "address" }],
+    name: "observer",
+    outputs: [{ internalType: "address", name: "", type: "address" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "address", name: "account", type: "address" },
+      { internalType: "address", name: "newObserver", type: "address" }
+    ],
+    name: "setObserver",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
   }
 ];
 
@@ -102,6 +122,9 @@ var confidentialPaymentTypes = {
     { name: "encryptedAmountHash", type: "bytes32" }
   ]
 };
+var confidentialErrorCodes = {
+  observerNotAuthorized: "observer_not_authorized"
+};
 
 // src/utils.ts
 var import_viem = require("viem");
@@ -134,7 +157,11 @@ function normalizeAmount(amount) {
 var import_bundle = require("@zama-fhe/relayer-sdk/bundle");
 var import_viem2 = require("viem");
 async function createRelayerInstance(config) {
-  return (0, import_bundle.createInstance)(config);
+  const instance = await (0, import_bundle.createInstance)(config);
+  if (typeof config.network === "string") {
+    instance.network = config.network;
+  }
+  return instance;
 }
 async function createEncryptedAmountInput(relayer, contractAddress, senderAddress, amount) {
   const normalizedContract = (0, import_viem2.getAddress)(contractAddress);
@@ -215,6 +242,18 @@ async function viewConfidentialBalance(options) {
   if (!options.signer) {
     throw new Error("Missing signer for decryption");
   }
+  const signerAddress = (0, import_viem3.getAddress)(options.signer.address);
+  if (!(0, import_viem3.isAddressEqual)(signerAddress, (0, import_viem3.getAddress)(account))) {
+    const observer = await publicClient.readContract({
+      address: options.tokenAddress,
+      abi: confidentialTokenAbi,
+      functionName: "observer",
+      args: [account]
+    });
+    if (!observer || !(0, import_viem3.isAddressEqual)(observer, signerAddress)) {
+      throw new Error(confidentialErrorCodes.observerNotAuthorized);
+    }
+  }
   if (handle === ZERO_HANDLE) {
     return { handle, balance: 0n };
   }
@@ -275,8 +314,27 @@ async function viewConfidentialTransferAmounts(options) {
           throw new Error("Missing signer for decryption");
         }
         const signerAddress = (0, import_viem4.getAddress)(options.signer.address);
-        if (signerAddress !== (0, import_viem4.getAddress)(entry.holder) && signerAddress !== (0, import_viem4.getAddress)(entry.payee)) {
-          throw new Error("Signer must be the holder or payee to decrypt transfer amount");
+        const holderAddress = (0, import_viem4.getAddress)(entry.holder);
+        const payeeAddress = (0, import_viem4.getAddress)(entry.payee);
+        if (!(0, import_viem4.isAddressEqual)(signerAddress, holderAddress) && !(0, import_viem4.isAddressEqual)(signerAddress, payeeAddress)) {
+          const [holderObserver, payeeObserver] = await Promise.all([
+            publicClient.readContract({
+              address: tokenAddress,
+              abi: confidentialTokenAbi,
+              functionName: "observer",
+              args: [holderAddress]
+            }),
+            publicClient.readContract({
+              address: tokenAddress,
+              abi: confidentialTokenAbi,
+              functionName: "observer",
+              args: [payeeAddress]
+            })
+          ]);
+          const allowed = holderObserver && (0, import_viem4.isAddressEqual)(holderObserver, signerAddress) || payeeObserver && (0, import_viem4.isAddressEqual)(payeeObserver, signerAddress);
+          if (!allowed) {
+            throw new Error(confidentialErrorCodes.observerNotAuthorized);
+          }
         }
         entry.amount = await userDecryptEuint64(
           options.relayer,
@@ -294,9 +352,65 @@ async function viewConfidentialTransferAmounts(options) {
   }
   return transfers;
 }
+
+// src/observer.ts
+var import_viem5 = require("viem");
+async function setObserver(options) {
+  if (!(0, import_viem5.isAddress)(options.tokenAddress)) {
+    throw new Error(`Invalid token address: ${options.tokenAddress}`);
+  }
+  if (!(0, import_viem5.isAddress)(options.account)) {
+    throw new Error(`Invalid account address: ${options.account}`);
+  }
+  if (!(0, import_viem5.isAddress)(options.observer)) {
+    throw new Error(`Invalid observer address: ${options.observer}`);
+  }
+  const tokenAddress = (0, import_viem5.getAddress)(options.tokenAddress);
+  const account = (0, import_viem5.getAddress)(options.account);
+  const observer = (0, import_viem5.getAddress)(options.observer);
+  const publicClient = (0, import_viem5.createPublicClient)({ transport: (0, import_viem5.http)(options.rpcUrl) });
+  const existing = await publicClient.readContract({
+    address: tokenAddress,
+    abi: confidentialTokenAbi,
+    functionName: "observer",
+    args: [account]
+  });
+  if (existing && (0, import_viem5.isAddress)(existing) && (0, import_viem5.getAddress)(existing) === observer) {
+    return "0x" + "00".repeat(32);
+  }
+  return options.signer.writeContract({
+    address: tokenAddress,
+    abi: confidentialTokenAbi,
+    functionName: "setObserver",
+    args: [account, observer]
+  });
+}
+
+// src/observer-web.ts
+var import_viem6 = require("viem");
+async function setObserverWeb(options) {
+  if (!(0, import_viem6.isAddress)(options.tokenAddress)) {
+    throw new Error(`Invalid token address: ${options.tokenAddress}`);
+  }
+  if (!(0, import_viem6.isAddress)(options.account)) {
+    throw new Error(`Invalid account address: ${options.account}`);
+  }
+  if (!(0, import_viem6.isAddress)(options.observer)) {
+    throw new Error(`Invalid observer address: ${options.observer}`);
+  }
+  return options.walletClient.writeContract({
+    address: (0, import_viem6.getAddress)(options.tokenAddress),
+    abi: confidentialTokenAbi,
+    functionName: "setObserver",
+    args: [(0, import_viem6.getAddress)(options.account), (0, import_viem6.getAddress)(options.observer)],
+    chain: options.walletClient.chain ?? null,
+    account: options.signer ?? options.walletClient.account ?? null
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SepoliaConfig,
+  confidentialErrorCodes,
   confidentialPaymentTypes,
   confidentialTokenAbi,
   createEncryptedAmountInput,
@@ -306,6 +420,8 @@ async function viewConfidentialTransferAmounts(options) {
   initSDK,
   normalizeAmount,
   publicDecrypt,
+  setObserver,
+  setObserverWeb,
   userDecryptEuint64,
   viewConfidentialBalance,
   viewConfidentialTransferAmounts

package/dist/web.mjs

@@ -1,16 +1,22 @@
 import {
+  confidentialErrorCodes,
   confidentialPaymentTypes,
   confidentialTokenAbi,
   createNonce,
   hashEncryptedAmountInput,
-  normalizeAmount
-} from "./chunk-V7Z3OAXS.mjs";
+  normalizeAmount,
+  setObserver
+} from "./chunk-LTE4V3LT.mjs";
 
 // src/relayer-web.ts
 import { createInstance, initSDK, SepoliaConfig } from "@zama-fhe/relayer-sdk/bundle";
 import { getAddress, toHex } from "viem";
 async function createRelayerInstance(config) {
-  return createInstance(config);
+  const instance = await createInstance(config);
+  if (typeof config.network === "string") {
+    instance.network = config.network;
+  }
+  return instance;
 }
 async function createEncryptedAmountInput(relayer, contractAddress, senderAddress, amount) {
   const normalizedContract = getAddress(contractAddress);
@@ -58,7 +64,7 @@ async function publicDecrypt(relayer, handles) {
 }
 
 // src/balance-web.ts
-import { createPublicClient, http, isAddress } from "viem";
+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)) {
@@ -91,6 +97,18 @@ async function viewConfidentialBalance(options) {
   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 };
   }
@@ -99,7 +117,7 @@ async function viewConfidentialBalance(options) {
 }
 
 // src/transfer-web.ts
-import { createPublicClient as createPublicClient2, decodeEventLog, getAddress as getAddress2, http as http2, isAddress as isAddress2, isHex } from "viem";
+import { createPublicClient as createPublicClient2, decodeEventLog, getAddress as getAddress3, http as http2, isAddress as isAddress2, isHex, isAddressEqual as isAddressEqual2 } from "viem";
 async function viewConfidentialTransferAmounts(options) {
   if (!isAddress2(options.tokenAddress)) {
     throw new Error(`Invalid token address: ${options.tokenAddress}`);
@@ -117,10 +135,10 @@ async function viewConfidentialTransferAmounts(options) {
   const receipt = await publicClient.getTransactionReceipt({
     hash: options.txHash
   });
-  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 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 transfers = [];
   for (const log of logs) {
     try {
@@ -132,8 +150,8 @@ async function viewConfidentialTransferAmounts(options) {
       });
       const args = decoded.args;
       const entry = {
-        holder: getAddress2(args.holder),
-        payee: getAddress2(args.payee),
+        holder: getAddress3(args.holder),
+        payee: getAddress3(args.payee),
         maxClearAmount: BigInt(args.maxClearAmount),
         resourceHash: args.resourceHash,
         nonce: args.nonce,
@@ -150,9 +168,28 @@ async function viewConfidentialTransferAmounts(options) {
         if (!options.signer) {
           throw new Error("Missing signer for decryption");
         }
-        const signerAddress = getAddress2(options.signer.address);
-        if (signerAddress !== getAddress2(entry.holder) && signerAddress !== getAddress2(entry.payee)) {
-          throw new Error("Signer must be the holder or payee to decrypt transfer amount");
+        const signerAddress = getAddress3(options.signer.address);
+        const holderAddress = getAddress3(entry.holder);
+        const payeeAddress = getAddress3(entry.payee);
+        if (!isAddressEqual2(signerAddress, holderAddress) && !isAddressEqual2(signerAddress, payeeAddress)) {
+          const [holderObserver, payeeObserver] = await Promise.all([
+            publicClient.readContract({
+              address: tokenAddress,
+              abi: confidentialTokenAbi,
+              functionName: "observer",
+              args: [holderAddress]
+            }),
+            publicClient.readContract({
+              address: tokenAddress,
+              abi: confidentialTokenAbi,
+              functionName: "observer",
+              args: [payeeAddress]
+            })
+          ]);
+          const allowed = holderObserver && isAddressEqual2(holderObserver, signerAddress) || payeeObserver && isAddressEqual2(payeeObserver, signerAddress);
+          if (!allowed) {
+            throw new Error(confidentialErrorCodes.observerNotAuthorized);
+          }
         }
         entry.amount = await userDecryptEuint64(
           options.relayer,
@@ -170,8 +207,31 @@ async function viewConfidentialTransferAmounts(options) {
   }
   return transfers;
 }
+
+// src/observer-web.ts
+import { getAddress as getAddress4, isAddress as isAddress3 } from "viem";
+async function setObserverWeb(options) {
+  if (!isAddress3(options.tokenAddress)) {
+    throw new Error(`Invalid token address: ${options.tokenAddress}`);
+  }
+  if (!isAddress3(options.account)) {
+    throw new Error(`Invalid account address: ${options.account}`);
+  }
+  if (!isAddress3(options.observer)) {
+    throw new Error(`Invalid observer address: ${options.observer}`);
+  }
+  return options.walletClient.writeContract({
+    address: getAddress4(options.tokenAddress),
+    abi: confidentialTokenAbi,
+    functionName: "setObserver",
+    args: [getAddress4(options.account), getAddress4(options.observer)],
+    chain: options.walletClient.chain ?? null,
+    account: options.signer ?? options.walletClient.account ?? null
+  });
+}
 export {
   SepoliaConfig,
+  confidentialErrorCodes,
   confidentialPaymentTypes,
   confidentialTokenAbi,
   createEncryptedAmountInput,
@@ -181,6 +241,8 @@ export {
   initSDK,
   normalizeAmount,
   publicDecrypt,
+  setObserver,
+  setObserverWeb,
   userDecryptEuint64,
   viewConfidentialBalance,
   viewConfidentialTransferAmounts

package/package.json

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