context-markets 0.5.1 → 0.6.0

package/dist/index.cjs

@@ -168,6 +168,13 @@ var ERC20_ABI = [
       { name: "spender", type: "address" }
     ],
     outputs: [{ name: "", type: "uint256" }]
+  },
+  {
+    name: "balanceOf",
+    type: "function",
+    stateMutability: "view",
+    inputs: [{ name: "account", type: "address" }],
+    outputs: [{ name: "", type: "uint256" }]
   }
 ];
 var HOLDINGS_ABI = [
@@ -1015,11 +1022,12 @@ var PortfolioModule = class {
 // src/modules/account.ts
 var import_viem2 = require("viem");
 var AccountModule = class {
-  constructor(http2, walletClient, account, chainConfig, rpcUrl) {
+  constructor(http2, walletClient, account, chainConfig, chain, rpcUrl) {
     this.http = http2;
     this.walletClient = walletClient;
     this.account = account;
     this.chainConfig = chainConfig;
+    this.chain = chain;
     this.publicClient = (0, import_viem2.createPublicClient)({
       chain: chainConfig.viemChain,
       transport: (0, import_viem2.http)(rpcUrl)
@@ -1053,8 +1061,14 @@ var AccountModule = class {
   async status() {
     const addr = this.address;
     const { settlement, holdings, usdc } = this.chainConfig;
-    const [ethBalance, usdcAllowance, isOperatorApproved] = await Promise.all([
+    const [ethBalance, usdcBalance, usdcAllowance, isOperatorApproved] = await Promise.all([
       this.publicClient.getBalance({ address: addr }),
+      this.publicClient.readContract({
+        address: usdc,
+        abi: ERC20_ABI,
+        functionName: "balanceOf",
+        args: [addr]
+      }),
       this.publicClient.readContract({
         address: usdc,
         abi: ERC20_ABI,
@@ -1068,51 +1082,92 @@ var AccountModule = class {
         args: [addr, settlement]
       })
     ]);
+    const needsUsdcApproval = usdcAllowance === 0n;
+    const needsOperatorApproval = !isOperatorApproved;
     return {
       address: addr,
       ethBalance,
+      usdcBalance,
       usdcAllowance,
       isOperatorApproved,
-      needsApprovals: usdcAllowance === 0n || !isOperatorApproved,
-      needsGaslessSetup: !isOperatorApproved
+      needsUsdcApproval,
+      needsOperatorApproval,
+      isReady: !needsUsdcApproval && !needsOperatorApproval
     };
   }
-  async setup() {
+  // ─── Granular Approval Methods ───
+  async approveUsdc() {
     const wallet = this.requireWallet();
     const account = this.requireAccount();
-    const { viemChain, settlement, holdings, usdc } = this.chainConfig;
-    const walletStatus = await this.status();
-    let usdcApprovalTx = null;
-    let operatorApprovalTx = null;
-    if (walletStatus.usdcAllowance === 0n) {
-      usdcApprovalTx = await wallet.writeContract({
-        account,
-        chain: viemChain,
-        address: usdc,
-        abi: ERC20_ABI,
-        functionName: "approve",
-        args: [holdings, import_viem2.maxUint256]
-      });
-    }
-    if (!walletStatus.isOperatorApproved) {
-      operatorApprovalTx = await wallet.writeContract({
-        account,
-        chain: viemChain,
-        address: holdings,
-        abi: HOLDINGS_ABI,
-        functionName: "setOperator",
-        args: [settlement, true]
-      });
-    }
-    return { usdcApprovalTx, operatorApprovalTx };
+    const { viemChain, holdings, usdc } = this.chainConfig;
+    const status = await this.status();
+    if (!status.needsUsdcApproval) return null;
+    const hash = await wallet.writeContract({
+      account,
+      chain: viemChain,
+      address: usdc,
+      abi: ERC20_ABI,
+      functionName: "approve",
+      args: [holdings, import_viem2.maxUint256]
+    });
+    await this.publicClient.waitForTransactionReceipt({ hash });
+    return hash;
   }
-  async mintTestUsdc(amount = 1e3) {
-    return this.http.post(ENDPOINTS.balance.mintTestUsdc, {
-      address: this.address,
-      amount: amount.toString()
+  async approveOperator() {
+    const wallet = this.requireWallet();
+    const account = this.requireAccount();
+    const { viemChain, settlement, holdings } = this.chainConfig;
+    const status = await this.status();
+    if (!status.needsOperatorApproval) return null;
+    const hash = await wallet.writeContract({
+      account,
+      chain: viemChain,
+      address: holdings,
+      abi: HOLDINGS_ABI,
+      functionName: "setOperator",
+      args: [settlement, true]
     });
+    await this.publicClient.waitForTransactionReceipt({ hash });
+    return hash;
+  }
+  // ─── Chain-Aware Dispatchers ───
+  async setup() {
+    if (this.chain === "testnet") {
+      const result = await this.gaslessSetup();
+      return {
+        usdcApproval: { needed: false, txHash: null },
+        operatorApproval: { needed: true, txHash: result.txHash }
+      };
+    }
+    return this.onchainSetup();
   }
   async deposit(amount) {
+    if (this.chain === "testnet") {
+      const result = await this.gaslessDeposit(amount);
+      return {
+        txHash: result.txHash,
+        amount: result.amount,
+        gasless: true
+      };
+    }
+    const amountRaw = (0, import_viem2.parseUnits)(amount.toString(), 6);
+    const hash = await this.onchainDeposit(amount);
+    return { txHash: hash, amount: amountRaw.toString(), gasless: false };
+  }
+  // ─── On-Chain Methods ───
+  async onchainSetup() {
+    const status = await this.status();
+    const usdcTx = status.needsUsdcApproval ? await this.approveUsdcUnchecked() : null;
+    const operatorTx = status.needsOperatorApproval ? await this.approveOperatorUnchecked() : null;
+    return {
+      usdcApproval: { needed: status.needsUsdcApproval, txHash: usdcTx },
+      operatorApproval: {
+        needed: status.needsOperatorApproval,
+        txHash: operatorTx
+      }
+    };
+  }
+  async onchainDeposit(amount) {
     const wallet = this.requireWallet();
     const account = this.requireAccount();
     const { viemChain, holdings, usdc } = this.chainConfig;
@@ -1144,6 +1199,12 @@ var AccountModule = class {
     await this.publicClient.waitForTransactionReceipt({ hash });
     return hash;
   }
+  async mintTestUsdc(amount = 1e3) {
+    return this.http.post(ENDPOINTS.balance.mintTestUsdc, {
+      address: this.address,
+      amount: amount.toString()
+    });
+  }
   async mintCompleteSets(marketId, amount) {
     const wallet = this.requireWallet();
     const account = this.requireAccount();
@@ -1252,6 +1313,37 @@ var AccountModule = class {
       req
     );
   }
+  // ─── Private helpers (skip status check, used by onchainSetup) ───
+  async approveUsdcUnchecked() {
+    const wallet = this.requireWallet();
+    const account = this.requireAccount();
+    const { viemChain, holdings, usdc } = this.chainConfig;
+    const hash = await wallet.writeContract({
+      account,
+      chain: viemChain,
+      address: usdc,
+      abi: ERC20_ABI,
+      functionName: "approve",
+      args: [holdings, import_viem2.maxUint256]
+    });
+    await this.publicClient.waitForTransactionReceipt({ hash });
+    return hash;
+  }
+  async approveOperatorUnchecked() {
+    const wallet = this.requireWallet();
+    const account = this.requireAccount();
+    const { viemChain, settlement, holdings } = this.chainConfig;
+    const hash = await wallet.writeContract({
+      account,
+      chain: viemChain,
+      address: holdings,
+      abi: HOLDINGS_ABI,
+      functionName: "setOperator",
+      args: [settlement, true]
+    });
+    await this.publicClient.waitForTransactionReceipt({ hash });
+    return hash;
+  }
 };
 
 // src/client.ts
@@ -1263,11 +1355,14 @@ var ContextClient = class {
   account;
   /** The resolved chain configuration. */
   chainConfig;
+  /** Which chain this client is connected to. */
+  chain;
   /** The trader's on-chain address, or null if no signer was provided. */
   address;
   constructor(options = {}) {
     const chainConfig = resolveChainConfig(options.chain);
     this.chainConfig = chainConfig;
+    this.chain = options.chain ?? "mainnet";
     const http2 = createHttpClient({
       apiKey: options.apiKey,
       baseUrl: options.baseUrl ?? chainConfig.apiBase
@@ -1288,7 +1383,7 @@ var ContextClient = class {
     this.questions = new Questions(http2);
     this.orders = new Orders(http2, builder, address);
     this.portfolio = new PortfolioModule(http2, address);
-    this.account = new AccountModule(http2, walletClient, account, chainConfig, options.rpcUrl);
+    this.account = new AccountModule(http2, walletClient, account, chainConfig, this.chain, options.rpcUrl);
   }
 };
 // Annotate the CommonJS export names for ESM import in node: