@fairblock/stabletrust 1.0.15 → 1.0.17

package/README.md

@@ -38,12 +38,12 @@ The following contract addresses are available for confidential transfers on tes
 
 | Network(Testnet) | Chain ID | Contract Address                             |
 | :--------------- | :------- | :------------------------------------------- |
-| Stable           | 2201     | `0xb0b461aFA69b715d842c7fAb602f50D4cef83fe5` |
-| Arc              | 1244     | `0xEa837218c7Ccd9eA1BCfB640e5c6aFE59952b4FA` |
-| Base             | 84532    | `0x1a06530765e942a1D26B74d9558e9a1EdA615867` |
-| Ethereum         | 11155111 | `0xABEa3399873b80f528Ee76286087b45ed38Fbf97` |
-| Arbitrum         | 421614   | `0x2131De660C6be8b535E6f17E171bFf7143E9E9F4` |
-| Tempo            | 42431    | `0xF3525FF8F592883f8fA2d89EfBe85637955Df487` |
+| Stable           | 2201     | `0xB96aa42b246a956B170fE426A72fB610E4976f9E` |
+| Arc              | 1244     | `0xb20aB54e1c6AE55B0DD11FEB7FFf3fF1E9631f19` |
+| Base             | 84532    | `0x962a8A7CD28BfFBb17C4F6Ec388782cca3ffd618` |
+| Ethereum         | 11155111 | `0x2E48F3D9b8F4aCA9E6AF0630eaB2ceB7A3f5eEd1` |
+| Arbitrum         | 421614   | `0x14Afd604971bee5b5fac52df2d56CaE421519Cc5` |
+| Tempo            | 42431    | `0x08B6563C95dfe3a4F5533CAA6F7D55a74FCb4F6c` |
 
 ## Usage
 

package/examples/complete-flow.js

@@ -11,9 +11,6 @@ dotenv.config();
  * https://docs.fairblock.network/docs/confidential_transfers/technical_overview
  */
 
-// Optional override for custom confidential contract deployments.
-const CONTRACT_ADDRESS =
-  process.env.CONTRACT_ADDRESS || "0xb0b461aFA69b715d842c7fAb602f50D4cef83fe5";
 // Standard ERC20 token contract. Any ERC20 on this chain ID can be used.
 const TOKEN_ADDRESS =
   process.env.TOKEN_ADDRESS || "0x78Cf24370174180738C5B8E352B6D14c83a6c9A9";
@@ -42,11 +39,7 @@ async function trackPerformance(actionName, action) {
 async function main() {
   console.log("=== Starting Confidential Flow Performance Test ===\n");
 
-  const client = new ConfidentialTransferClient(
-    RPC_URL,
-    CONTRACT_ADDRESS,
-    Number(CHAIN_ID),
-  );
+  const client = new ConfidentialTransferClient(RPC_URL, Number(CHAIN_ID));
 
   const provider = new ethers.JsonRpcProvider(RPC_URL);
   const sender = new ethers.Wallet(process.env.SENDER_PRIVATE_KEY, provider);
@@ -170,9 +163,9 @@ async function main() {
   );
 
   // 3. WITHDRAW PHASE
-  const withdrawAmount = ethers.parseUnits("0.05", tokenDecimals);
+  const withdrawAmount = ethers.parseUnits("0.025", tokenDecimals);
   console.log(
-    "Withdrawing 0.05 tokens from confidential contract to recipient's public balance...",
+    "Withdrawing 0.025 tokens from confidential contract to recipient's public balance...",
   );
   let recipientConfidentialBalanceBeforeWithdraw =
     await client.getConfidentialBalance(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fairblock/stabletrust",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "SDK for confidential transfers using homomorphic encryption and zero-knowledge proofs",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/client.js

@@ -778,18 +778,28 @@ export class ConfidentialTransferClient {
       }
 
       const address = await wallet.getAddress();
-      await this._applyPendingIfNeeded(
-        wallet,
-        derivedKeys.privateKey,
-        tokenAddress,
-        "withdraw",
-      );
-
-      const balanceSummary = await this.getConfidentialBalance(
+      // Fetch balance first — only apply pending if available is insufficient
+      let balanceSummary = await this.getConfidentialBalance(
         address,
         derivedKeys.privateKey,
         tokenAddress,
       );
+
+      if (balanceSummary.available.amount < BigInt(amount)) {
+        await this._applyPendingIfNeeded(
+          wallet,
+          derivedKeys.privateKey,
+          tokenAddress,
+          "withdraw",
+        );
+        // Re-fetch after applying pending
+        balanceSummary = await this.getConfidentialBalance(
+          address,
+          derivedKeys.privateKey,
+          tokenAddress,
+        );
+      }
+
       const currentBalanceCiphertext = balanceSummary.available.ciphertext;
       const currentBalance = balanceSummary.available.amount;
 

package/src/constants.js

@@ -25,12 +25,12 @@ export const TEMPO_FEE_TOKEN_ADDRESS =
   "0x20c0000000000000000000000000000000000000";
 
 export const STABLETRUST_CONTRACTS_BY_CHAIN_ID = Object.freeze({
-  2201: "0xb0b461aFA69b715d842c7fAb602f50D4cef83fe5", //Stable
-  1244: "0xEa837218c7Ccd9eA1BCfB640e5c6aFE59952b4FA", //Arc
-  84532: "0x1a06530765e942a1D26B74d9558e9a1EdA615867", //Base
-  11155111: "0xABEa3399873b80f528Ee76286087b45ed38Fbf97", //Ethereum
-  421614: "0x2131De660C6be8b535E6f17E171bFf7143E9E9F4", //Arbitrum
-  42431: "0xF3525FF8F592883f8fA2d89EfBe85637955Df487", //Tempo
+  2201: "0xB96aa42b246a956B170fE426A72fB610E4976f9E", //Stable
+  1244: "0xb20aB54e1c6AE55B0DD11FEB7FFf3fF1E9631f19", //Arc
+  84532: "0x962a8A7CD28BfFBb17C4F6Ec388782cca3ffd618", //Base
+  11155111: "0x2E48F3D9b8F4aCA9E6AF0630eaB2ceB7A3f5eEd1", //Ethereum
+  421614: "0x14Afd604971bee5b5fac52df2d56CaE421519Cc5", //Arbitrum
+  42431: "0x08B6563C95dfe3a4F5533CAA6F7D55a74FCb4F6c", //Tempo
 });
 
 export function getStableTrustContractAddress(chainId) {

package/src/crypto.js

@@ -11,7 +11,7 @@ import { ethers } from "ethers";
  */
 export async function deriveKeys(wallet, config, generateKeypair) {
   const domain = {
-    name: "Fairblock",
+    name: "ConfidentialTokens",
     version: "1",
     chainId: config.chainId,
     verifyingContract: config.contractAddress,
@@ -26,15 +26,15 @@ export async function deriveKeys(wallet, config, generateKeypair) {
   };
 
   const contextHash = ethers.keccak256(
-    ethers.solidityPacked(
+    ethers.AbiCoder.defaultAbiCoder().encode(
       ["uint256", "address", "address", "string"],
       [config.chainId, config.contractAddress, ethers.ZeroAddress, "main"],
     ),
   );
-
+  const userAddress = wallet.address.toLowerCase();
   const message = {
     purpose: "homomorphic-key-derive-v1",
-    user: wallet.address,
+    user: userAddress,
     context: contextHash,
   };
 
@@ -42,7 +42,7 @@ export async function deriveKeys(wallet, config, generateKeypair) {
   const domainContext = JSON.stringify({
     chainId: config.chainId.toString(),
     verifyingContract: config.contractAddress,
-    user: wallet.address,
+    user: userAddress,
     purpose: "homomorphic-key-derive-v1",
     version: "1",
   });