@coti-io/coti-wallet-plugin 0.2.6 → 0.2.8

package/dist/index.js

@@ -64,8 +64,8 @@ var init_coti = __esm({
       unlockStrategy: "snap",
       portalStrategy: "coti-bridge",
       addresses: {
-        PrivateCoti: "0x6cE8907414986E73De9e7D28d62Ea2080F8E88E1",
-        PrivacyBridgeCotiNative: "0x96117882328407B13A5f378de25764C4eD8477eA",
+        PrivateCoti: "0xF3FC0A3285a6C297682390b1Db76c3AF130FEb93",
+        PrivacyBridgeCotiNative: "0xabB1FC50ebD491c74CE7dfE3bD350bce10f89F2E",
         CotiPriceConsumer: "0xD5EeD24e909AdE249b688671e32dcc013B236B74",
         WETH: "0x8bca4e6bbE402DB4aD189A316137aD08206154FB",
         WBTC: "0x5dBDb2E5D51c3FFab5D6B862Caa11FCe1D83F492",
@@ -75,19 +75,19 @@ var init_coti = __esm({
         gCOTI: "0x878a42D3cB737DEC9E6c7e7774d973F46fd8ed4C",
         NIGHT: "0x918084eee42832f08b868Ea64Bba2d41A5F360c6",
         PrivacyBridgeNight: "0x025b0E54ae5fac3BF3ca6eDe7bd62fa684c25D29",
-        "p.WETH": "0xF009BADb181d471995a1CFF406C3Db7B180F64eA",
-        "p.WBTC": "0xB50F1680a4C69145ABc09A2A71c8D5b8051578cF",
-        "p.USDT": "0xcEF137E96eDF68EE99D4CdEa7085f154d74895cD",
-        "p.USDC_E": "0x37f78dcCd15876F74391EF1F01b76557D9FF1dea",
-        "p.WADA": "0x1245f50a3E9129A219b4bf66D10fEaEA47467B69",
-        "p.gCOTI": "0x1503b02a4Aa27812306c65116FD23b733603F142",
+        "p.WETH": "0x272968B0fC2710AF20e04d1dDc9a49E2FE5a9caa",
+        "p.WBTC": "0xB48119847B7469cbD4a192391287b9c20e6F361F",
+        "p.USDT": "0x288b5c8d3419EFD1c9971d0716bb89fAEBC04aBE",
+        "p.USDC_E": "0xB4d9f6B49Da5637a713cee8Dd6540f311334Fdea",
+        "p.WADA": "0x091Df52B5a7d5EE97132D07Ffd16A21d0eda95b8",
+        "p.gCOTI": "0xB71370A6f2Fa9c2184d0a632b6AaBDA034c4B3db",
         "p.NIGHT": "0xfb3A2F7ca2416e7BE312feA60a647f880B840957",
-        PrivacyBridgeWETH: "0x6f1628D7F1D5d5aDF39b924a28acb10B5C9df283",
-        PrivacyBridgeWBTC: "0x9EBEbC8F5Cff021459a56A681719dF1C0A7435cc",
-        PrivacyBridgeUSDT: "0x549634daBE8237EBda7473d7aA2bB17459826781",
-        PrivacyBridgeUSDCe: "0xaa63D41890D576F93d79272988e212d8B46CdD26",
-        PrivacyBridgeWADA: "0x4AFe67D4aD7AF0a70ACe6f79FbfAB66C72211c9F",
-        PrivacyBridgegCOTI: "0xDB54B4B1B8F9614567bd673A17a5cD31A3DD6033"
+        PrivacyBridgeWETH: "0xF2928e7D17ae11Cea8Ad32340e34F665f618fb92",
+        PrivacyBridgeWBTC: "0x8508e8cbDf24084Ab2D1F8b9e5BbF674742b95aC",
+        PrivacyBridgeUSDT: "0x90f6576Fb941a152427c4423034e869D88C9faA5",
+        PrivacyBridgeUSDCe: "0x8102139805fbFE96c8cBC09be3ae61B5983bCf48",
+        PrivacyBridgeWADA: "0x31A7dDA15c6eb9D88934F91d4F43C2F7bb32c767",
+        PrivacyBridgegCOTI: "0xcfd4C96dD6ff0EDc9Cd0849de2EF45542A71421f"
       },
       tokens: cotiTokenConfigs([COTI_TESTNET_CHAIN_ID, COTI_MAINNET_CHAIN_ID]),
       walletNetwork: {
@@ -5513,6 +5513,7 @@ var import_ethers22 = require("ethers");
 init_config();
 init_executePodPortalTransaction();
 init_chains();
+init_coti();
 init_logger();
 init_rpcProvider();
 init_encryptValue256();
@@ -6126,6 +6127,30 @@ var onboardUser = async () => {
 };
 
 // src/hooks/privacyBridge/usePrivacyBridgeAllowance.ts
+var PRIVATE_ALLOWANCE_ABI = [
+  "function allowance(address owner, address spender) view returns (tuple(tuple(uint256 ciphertextHigh, uint256 ciphertextLow) ciphertext, tuple(uint256 ciphertextHigh, uint256 ciphertextLow) ownerCiphertext, tuple(uint256 ciphertextHigh, uint256 ciphertextLow) spenderCiphertext))"
+];
+var PRIVATE_ALLOWANCE_MUTATION_ABI = [
+  "function approve(address spender, tuple(tuple(uint256 ciphertextHigh, uint256 ciphertextLow) ciphertext, bytes signature) value) returns (bool)",
+  "function increaseAllowance(address spender, tuple(tuple(uint256 ciphertextHigh, uint256 ciphertextLow) ciphertext, bytes signature) addedValue) returns (bool)",
+  "function decreaseAllowance(address spender, tuple(tuple(uint256 ciphertextHigh, uint256 ciphertextLow) ciphertext, bytes signature) subtractedValue) returns (bool)"
+];
+var isCotiBridgeChain = (chainId) => chainId === COTI_TESTNET_CHAIN_ID || chainId === COTI_MAINNET_CHAIN_ID;
+function extractOwnerCiphertextFromAllowance(raw) {
+  if (raw == null || typeof raw !== "object") return null;
+  const row = raw;
+  const ownerCt = row.ownerCiphertext ?? row[1];
+  if (ownerCt == null || typeof ownerCt !== "object") return null;
+  const limbs = ownerCt;
+  const high = limbs.ciphertextHigh ?? limbs[0];
+  const low = limbs.ciphertextLow ?? limbs[1];
+  if (high === void 0 || low === void 0) return null;
+  try {
+    return { ciphertextHigh: BigInt(high), ciphertextLow: BigInt(low) };
+  } catch {
+    return null;
+  }
+}
 var usePrivacyBridgeAllowance = ({
   isConnected,
   walletAddress,
@@ -6281,23 +6306,21 @@ var usePrivacyBridgeAllowance = ({
         );
         if (privTokCfg) privateDecimals = privTokCfg.decimals;
         try {
-          const tokenContract = new import_ethers22.ethers.Contract(privateTokenAddress, [
-            "function allowance(address owner, address spender) view returns (tuple(tuple(uint256 ciphertextHigh, uint256 ciphertextLow) ciphertext, tuple(uint256 ciphertextHigh, uint256 ciphertextLow) ownerCiphertext, tuple(uint256 ciphertextHigh, uint256 ciphertextLow) spenderCiphertext))"
-          ], provider);
-          const currentAllowance2 = await tokenContract.allowance(walletAddress, bridgeAddress);
-          if (currentAllowance2.ownerCiphertext.ciphertextHigh === 0n && currentAllowance2.ownerCiphertext.ciphertextLow === 0n) {
+          const tokenContract = new import_ethers22.ethers.Contract(privateTokenAddress, PRIVATE_ALLOWANCE_ABI, provider);
+          const rawAllowance = await tokenContract.allowance(walletAddress, bridgeAddress);
+          const ownerCt = extractOwnerCiphertextFromAllowance(rawAllowance);
+          if (!ownerCt || ownerCt.ciphertextHigh === 0n && ownerCt.ciphertextLow === 0n) {
             setAllowance("0");
             return;
           }
           if (hasSnap || sessionAesKey) {
             try {
-              const ciphertext = {
-                ciphertextHigh: currentAllowance2.ownerCiphertext.ciphertextHigh,
-                ciphertextLow: currentAllowance2.ownerCiphertext.ciphertextLow
-              };
-              const decryptedVal = sessionAesKey ? decryptCtUint256(ciphertext, sessionAesKey, { decimals: privateDecimals }) : await decryptCtUint256ViaSnap(ciphertext, currentChainId, walletAddress);
+              const decryptedVal = sessionAesKey ? decryptCtUint256(ownerCt, sessionAesKey, { decimals: privateDecimals }) : await decryptCtUint256ViaSnap(ownerCt, currentChainId, walletAddress);
               if (decryptedVal === null) {
-                setAllowance("0");
+                logger.warn(
+                  "Could not decrypt private allowance value; treating as unlimited for UI"
+                );
+                setAllowance(import_ethers22.ethers.formatUnits(import_ethers22.ethers.MaxUint256, privateDecimals));
               } else {
                 setAllowance(import_ethers22.ethers.formatUnits(decryptedVal, privateDecimals));
               }
@@ -6456,33 +6479,79 @@ var usePrivacyBridgeAllowance = ({
           message: `Please approve the bridge to access your Private ${token.symbol} tokens.`
         });
         const amountToApprove2 = amount ? import_ethers22.ethers.parseUnits(amount, privateDecimals) : import_ethers22.ethers.MaxUint256;
-        const approveSig = import_ethers22.ethers.id("approve(address,((uint256,uint256),bytes))").slice(0, 10);
+        let method = "approve";
+        let encryptAmount = amountToApprove2;
+        const readPrivateAllowanceWei = async () => {
+          const allowanceReader = new import_ethers22.ethers.Contract(
+            privateTokenAddress,
+            PRIVATE_ALLOWANCE_ABI,
+            provider
+          );
+          const raw = await allowanceReader.allowance(walletAddress, bridgeAddress);
+          const ownerCt = extractOwnerCiphertextFromAllowance(raw);
+          if (!ownerCt) {
+            return null;
+          }
+          if (ownerCt.ciphertextHigh === 0n && ownerCt.ciphertextLow === 0n) {
+            return 0n;
+          }
+          if (!sessionAesKey && !hasSnap) {
+            throw new Error("Private approval requires unlock/onboarding first.");
+          }
+          const decrypted = sessionAesKey ? decryptCtUint256(ownerCt, sessionAesKey, { decimals: privateDecimals }) : await decryptCtUint256ViaSnap(ownerCt, currentChainId, walletAddress);
+          return decrypted;
+        };
+        if (isCotiBridgeChain(currentChainId)) {
+          const currentAllowanceWei = await readPrivateAllowanceWei();
+          if (currentAllowanceWei === null) {
+            throw new Error(
+              "Could not read current private allowance. Please try again."
+            );
+          }
+          if (currentAllowanceWei === 0n) {
+            method = "approve";
+            encryptAmount = amountToApprove2;
+          } else if (amountToApprove2 > currentAllowanceWei) {
+            method = "increaseAllowance";
+            encryptAmount = amountToApprove2 - currentAllowanceWei;
+          } else if (amountToApprove2 < currentAllowanceWei) {
+            method = "decreaseAllowance";
+            encryptAmount = currentAllowanceWei - amountToApprove2;
+          } else {
+            logger.log("\u{1F510} [Approve] Allowance already matches requested amount; skipping tx");
+            setIsApproving(false);
+            setToastState((prev) => ({ ...prev, visible: false }));
+            await checkAllowance();
+            return;
+          }
+        }
+        const methodSig = import_ethers22.ethers.id(
+          `${method}(address,((uint256,uint256),bytes))`
+        ).slice(0, 10);
         const itValue = sessionAesKey ? await encryptValue256(
-          amountToApprove2,
+          encryptAmount,
           sessionAesKey,
           privateTokenAddress,
-          approveSig,
+          methodSig,
           walletAddress,
           signer
         ) : hasSnap ? await buildItUint256ViaSnap({
-          value: amountToApprove2,
+          value: encryptAmount,
           tokenAddress: privateTokenAddress,
-          functionSelector: approveSig,
+          functionSelector: methodSig,
           chainId: currentChainId,
           accountAddress: walletAddress
         }) : null;
         if (!itValue) {
           throw new Error("Private approval requires unlock/onboarding first.");
         }
-        logger.log("\u{1F510} [Approve] Encrypted approval payload ready, encoding calldata...");
-        const approveInterface = new import_ethers22.ethers.Interface([
-          "function approve(address spender, tuple(tuple(uint256 ciphertextHigh, uint256 ciphertextLow) ciphertext, bytes signature) value) returns (bool)"
-        ]);
-        const calldata = approveInterface.encodeFunctionData("approve", [
+        logger.log("\u{1F510} [Approve] Encrypted approval payload ready", { method });
+        const approveInterface = new import_ethers22.ethers.Interface(PRIVATE_ALLOWANCE_MUTATION_ABI);
+        const calldata = approveInterface.encodeFunctionData(method, [
           bridgeAddress,
           [[itValue.ciphertext.ciphertextHigh, itValue.ciphertext.ciphertextLow], itValue.signature]
         ]);
-        logger.log("\u{1F510} [Approve] Sending approve tx (wallet confirmation expected)...");
+        logger.log("\u{1F510} [Approve] Sending approve tx (wallet confirmation expected)...", { method });
         const rawTxHash = await injectedProvider.request({
           method: "eth_sendTransaction",
           params: [{
@@ -6494,9 +6563,37 @@ var usePrivacyBridgeAllowance = ({
           }]
         });
         logger.log("\u{1F510} [Approve] Tx submitted, waiting for confirmation", { txHash: shortHash(rawTxHash) });
-        await waitForTransactionResilient(currentChainId, rawTxHash, {
+        const receipt2 = await waitForTransactionResilient(currentChainId, rawTxHash, {
           primary: provider
         });
+        if (!receipt2 || receipt2.status !== 1) {
+          const failed = new Error("Approval transaction failed");
+          failed.txHash = typeof rawTxHash === "string" ? rawTxHash : receipt2?.hash;
+          throw failed;
+        }
+        if (isCotiBridgeChain(currentChainId)) {
+          try {
+            const verified = await readPrivateAllowanceWei();
+            if (verified !== null && verified < amountToApprove2) {
+              throw new Error(
+                "Approval completed but allowance is still insufficient. Please try again."
+              );
+            }
+            if (verified === null) {
+              logger.warn(
+                "\u{1F510} [Approve] Post-tx allowance decrypt unavailable; trusting successful receipt"
+              );
+            }
+          } catch (verifyErr) {
+            if (verifyErr instanceof Error && verifyErr.message.includes("still insufficient")) {
+              throw verifyErr;
+            }
+            logger.warn(
+              "\u{1F510} [Approve] Post-tx allowance verification skipped",
+              verifyErr
+            );
+          }
+        }
         logger.log("\u{1F510} [Approve] Tx confirmed, refreshing allowance...");
         setIsApproving(false);
         setToastState((prev) => ({ ...prev, visible: false }));
@@ -6513,9 +6610,14 @@ var usePrivacyBridgeAllowance = ({
         title: "Approving...",
         message: "Waiting for allowance confirmation..."
       });
-      await waitForTransactionResilient(currentChainId, tx.hash, {
+      const receipt = await waitForTransactionResilient(currentChainId, tx.hash, {
         primary: provider
       });
+      if (!receipt || receipt.status !== 1) {
+        const failed = new Error("Approval transaction failed");
+        failed.txHash = tx.hash || receipt?.hash;
+        throw failed;
+      }
       await checkAllowance();
       setIsApproving(false);
       setToastState((prev) => ({ ...prev, visible: false }));