@owney/sdk 0.7.22-beta.4 → 0.7.22-beta.6

package/dist/{chunk-T5YJVIQG.js → chunk-CWGCQLB2.js}

@@ -251,8 +251,20 @@ async function depositSponsored(input) {
   }
   return { txHash, vault };
 }
+var PROCEEDS_POLL_ATTEMPTS = 6;
+var PROCEEDS_POLL_INTERVAL_MS = 1500;
+var defaultSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+async function awaitProceeds(chain, smartAccount, sleep) {
+  for (let attempt = 0; attempt < PROCEEDS_POLL_ATTEMPTS; attempt += 1) {
+    const balance = await chain.usdcBalanceOf(smartAccount);
+    if (balance > 0n) return balance;
+    if (attempt < PROCEEDS_POLL_ATTEMPTS - 1) await sleep(PROCEEDS_POLL_INTERVAL_MS);
+  }
+  return 0n;
+}
 async function withdrawSponsored(input) {
   const { api, chain, wallet, amount } = input;
+  const sleep = input.sleep ?? defaultSleep;
   const registered = await api.getVault(wallet.smartAccountAddress);
   if (!registered.userVaultAddress) {
     throw new Error("SurfLiquid has no vault registered for this wallet");
@@ -272,7 +284,7 @@ async function withdrawSponsored(input) {
     return { txHash: sweepHash, amount: stranded.toString() };
   }
   try {
-    const proceeds = await chain.usdcBalanceOf(wallet.smartAccountAddress);
+    const proceeds = await awaitProceeds(chain, wallet.smartAccountAddress, sleep);
     if (proceeds === 0n) return { txHash: withdrawHash, amount: "0" };
     const sweepHash = await wallet.sendCalls(
       buildSweepCalls({ owner: wallet.ownerAddress, amount: proceeds })

package/dist/index.cjs

@@ -501,7 +501,7 @@ function createSurfBroker(options) {
     )
   };
 }
-var SURF_SESSION_HEADER, SURF_BROKER_TIMEOUT_MS, VAULT_MEMO_TTL_MS, AGENT_ID, DISCOVERY_WALLET, SurfSessionExpiredError, asRecord, unavailable;
+var SURF_SESSION_HEADER, SURF_BROKER_TIMEOUT_MS, VAULT_MEMO_TTL_MS, AGENT_ID, DISCOVERY_WALLET, SurfSessionExpiredError, asRecord, unavailable, emptyVaultInfo;
 var init_surfliquid_broker = __esm({
   "src/agents/surfliquid/surfliquid.broker.ts"() {
     "use strict";
@@ -520,6 +520,7 @@ var init_surfliquid_broker = __esm({
     };
     asRecord = (value) => value && typeof value === "object" ? value : {};
     unavailable = (message, details) => new OwneyError("SURF_UNAVAILABLE", message, details, AGENT_ID);
+    emptyVaultInfo = () => normalizeVault(void 0);
   }
 });
 
@@ -562,8 +563,18 @@ function mapMessage(message) {
   }
   return [base4];
 }
+function dedupeMessages(messages) {
+  const seen = /* @__PURE__ */ new Set();
+  return messages.filter((message) => {
+    if (!message.txHash) return true;
+    const key2 = `${message.transactionType}:${message.txHash}`;
+    if (seen.has(key2)) return false;
+    seen.add(key2);
+    return true;
+  });
+}
 function mapHistory(result, _chainId) {
-  const data = result.messages.flatMap(mapMessage);
+  const data = dedupeMessages(result.messages).flatMap(mapMessage);
   const hasMore = result.page < result.pages;
   return {
     data,
@@ -873,8 +884,17 @@ async function depositSponsored(input) {
   }
   return { txHash, vault };
 }
+async function awaitProceeds(chain, smartAccount, sleep) {
+  for (let attempt = 0; attempt < PROCEEDS_POLL_ATTEMPTS; attempt += 1) {
+    const balance = await chain.usdcBalanceOf(smartAccount);
+    if (balance > 0n) return balance;
+    if (attempt < PROCEEDS_POLL_ATTEMPTS - 1) await sleep(PROCEEDS_POLL_INTERVAL_MS);
+  }
+  return 0n;
+}
 async function withdrawSponsored(input) {
   const { api, chain, wallet, amount } = input;
+  const sleep = input.sleep ?? defaultSleep;
   const registered = await api.getVault(wallet.smartAccountAddress);
   if (!registered.userVaultAddress) {
     throw new Error("SurfLiquid has no vault registered for this wallet");
@@ -894,7 +914,7 @@ async function withdrawSponsored(input) {
     return { txHash: sweepHash, amount: stranded.toString() };
   }
   try {
-    const proceeds = await chain.usdcBalanceOf(wallet.smartAccountAddress);
+    const proceeds = await awaitProceeds(chain, wallet.smartAccountAddress, sleep);
     if (proceeds === 0n) return { txHash: withdrawHash, amount: "0" };
     const sweepHash = await wallet.sendCalls(
       buildSweepCalls({ owner: wallet.ownerAddress, amount: proceeds })
@@ -906,7 +926,7 @@ async function withdrawSponsored(input) {
     );
   }
 }
-var import_viem8, SubmittedError, VaultNotSponsorableError;
+var import_viem8, SubmittedError, VaultNotSponsorableError, PROCEEDS_POLL_ATTEMPTS, PROCEEDS_POLL_INTERVAL_MS, defaultSleep;
 var init_surfliquid_sponsorship = __esm({
   "src/agents/surfliquid/surfliquid.sponsorship.ts"() {
     "use strict";
@@ -928,6 +948,9 @@ var init_surfliquid_sponsorship = __esm({
         this.name = "VaultNotSponsorableError";
       }
     };
+    PROCEEDS_POLL_ATTEMPTS = 6;
+    PROCEEDS_POLL_INTERVAL_MS = 1500;
+    defaultSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
   }
 });
 
@@ -1114,19 +1137,10 @@ async function createSponsoredWallet(input) {
       message: typedData.message
     }),
     // The smart account signs (ERC-1271), not the EOA: SurfLiquid's SIWE session must
-    // be the vault owner, which is the smart account. Safe wraps this as a SafeMessage
-    // EIP-712 signature the deployed account verifies via isValidSignature.
+    // be the vault owner, which is the smart account. While the account is still
+    // counterfactual, Safe/permissionless wraps this as an EIP-6492 signature SurfLiquid
+    // accepts; the first deposit's userOp deploys the account via its initCode.
     signMessage: (message) => account.signMessage({ message }),
-    // Deploy-on-connect: the account is counterfactual until its first userOp, but SIWE
-    // (isValidSignature) needs on-chain code. A no-op self-call carries the factory
-    // initCode and deploys it. Idempotency is the caller's (it checks isDeployed first).
-    deployAccount: async () => {
-      const userOpHash = await smartAccountClient.sendUserOperation({
-        calls: [{ to: account.address, value: 0n, data: "0x" }]
-      });
-      const receipt = await smartAccountClient.waitForUserOperationReceipt({ hash: userOpHash });
-      return receipt.receipt.transactionHash;
-    },
     sendCalls: async (calls) => {
       const userOpHash = await smartAccountClient.sendUserOperation({
         calls: calls.map((c) => ({ to: c.to, data: c.data, value: 0n }))
@@ -1245,10 +1259,6 @@ var init_surfliquid_agent = __esm({
           this.smartAccountAddress = smartAccountAddress;
           const broker = this.brokerFor(smartAccountAddress);
           if (!shouldForce && broker.hasSession()) return broker;
-          const { createSponsoredChain: createSponsoredChain2 } = await Promise.resolve().then(() => (init_surfliquid_smart_account(), surfliquid_smart_account_exports));
-          if (!await createSponsoredChain2(this.config.rpcUrl).isDeployed(smartAccountAddress)) {
-            await wallet.deployAccount();
-          }
           const message = await broker.nonce();
           const signature = await wallet.signMessage(message);
           await broker.login(message, signature);
@@ -1296,9 +1306,21 @@ var init_surfliquid_agent = __esm({
         this.brokerWallet = null;
         this.smartAccountAddress = null;
       }
+      // One signature on connect: SIWE the counterfactual smart account (EIP-6492). The
+      // account isn't deployed and no funds move — the first deposit's userOp deploys it.
       async activateAgent(state, _chainId) {
         await this.connect(state);
       }
+      /** A counterfactual account owns no vault and can't be a SIWE signer yet — reads answer empty. */
+      async isSmartAccountDeployed(state) {
+        if (this.broker?.hasSession()) return true;
+        const wallet = await this.sponsoredWallet(state);
+        this.smartAccountAddress = wallet.smartAccountAddress;
+        const { createSponsoredChain: createSponsoredChain2 } = await Promise.resolve().then(() => (init_surfliquid_smart_account(), surfliquid_smart_account_exports));
+        return createSponsoredChain2(this.config.rpcUrl).isDeployed(
+          wallet.smartAccountAddress
+        );
+      }
       // --- IAgent: funds (gasless only) ---
       async deposit(state, _chainId, amount, _asset, _depositCallback) {
         const broker = await this.connect(state);
@@ -1355,6 +1377,7 @@ var init_surfliquid_agent = __esm({
       }
       // --- IAgent: portfolio reads ---
       async vault(state) {
+        if (!await this.isSmartAccountDeployed(state)) return emptyVaultInfo();
         const broker = await this.connect(state);
         return this.withSession(state, () => broker.getVault(this.surfWallet(state)));
       }
@@ -1372,6 +1395,7 @@ var init_surfliquid_agent = __esm({
         return mapAccountApy(await this.vault(state), days);
       }
       async getHistory(state, chainId, options) {
+        if (!await this.isSmartAccountDeployed(state)) return { data: [], hasMore: false };
         const broker = await this.connect(state);
         const page = options?.cursor ? Number(options.cursor) : 1;
         const limit = options?.limit ?? HISTORY_DEFAULT_LIMIT;

package/dist/index.js

@@ -3036,7 +3036,7 @@ var OwneySDK = class {
     }
     if (agentId === "surfliquid") {
       if (!key2) return null;
-      const { SurfLiquidAgent } = await import("./surfliquid.agent-ZTIK54MW.js");
+      const { SurfLiquidAgent } = await import("./surfliquid.agent-2XTX6I4E.js");
       return new SurfLiquidAgent({
         apiKey: this.apiKey,
         routingApiBaseUrl: this.routingApiBaseUrl

package/dist/{surfliquid.agent-ZTIK54MW.js → surfliquid.agent-2XTX6I4E.js}

@@ -13,7 +13,7 @@ import {
   readStuckBalance,
   sweepStuckBalance,
   withdrawSponsored
-} from "./chunk-T5YJVIQG.js";
+} from "./chunk-CWGCQLB2.js";
 import "./chunk-AURO3C3R.js";
 
 // src/agents/surfliquid/surfliquid.session-store.ts
@@ -96,6 +96,7 @@ function parseJson(text) {
     return void 0;
   }
 }
+var emptyVaultInfo = () => normalizeVault(void 0);
 function normalizeVault(json) {
   const root = asRecord(json);
   const data = asRecord(root.data);
@@ -301,8 +302,18 @@ function mapMessage(message) {
   }
   return [base];
 }
+function dedupeMessages(messages) {
+  const seen = /* @__PURE__ */ new Set();
+  return messages.filter((message) => {
+    if (!message.txHash) return true;
+    const key = `${message.transactionType}:${message.txHash}`;
+    if (seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  });
+}
 function mapHistory(result, _chainId) {
-  const data = result.messages.flatMap(mapMessage);
+  const data = dedupeMessages(result.messages).flatMap(mapMessage);
   const hasMore = result.page < result.pages;
   return {
     data,
@@ -532,10 +543,6 @@ var SurfLiquidAgent = class {
       this.smartAccountAddress = smartAccountAddress;
       const broker = this.brokerFor(smartAccountAddress);
       if (!shouldForce && broker.hasSession()) return broker;
-      const { createSponsoredChain } = await import("./surfliquid.smart-account-YV3PLZ72.js");
-      if (!await createSponsoredChain(this.config.rpcUrl).isDeployed(smartAccountAddress)) {
-        await wallet.deployAccount();
-      }
       const message = await broker.nonce();
       const signature = await wallet.signMessage(message);
       await broker.login(message, signature);
@@ -567,7 +574,7 @@ var SurfLiquidAgent = class {
     }
   }
   async sponsoredWallet(state) {
-    const { createSponsoredWallet } = await import("./surfliquid.smart-account-YV3PLZ72.js");
+    const { createSponsoredWallet } = await import("./surfliquid.smart-account-JHW6VYLJ.js");
     return createSponsoredWallet({
       provider: state.provider,
       ownerAddress: state.walletAddress,
@@ -583,14 +590,26 @@ var SurfLiquidAgent = class {
     this.brokerWallet = null;
     this.smartAccountAddress = null;
   }
+  // One signature on connect: SIWE the counterfactual smart account (EIP-6492). The
+  // account isn't deployed and no funds move — the first deposit's userOp deploys it.
   async activateAgent(state, _chainId) {
     await this.connect(state);
   }
+  /** A counterfactual account owns no vault and can't be a SIWE signer yet — reads answer empty. */
+  async isSmartAccountDeployed(state) {
+    if (this.broker?.hasSession()) return true;
+    const wallet = await this.sponsoredWallet(state);
+    this.smartAccountAddress = wallet.smartAccountAddress;
+    const { createSponsoredChain } = await import("./surfliquid.smart-account-JHW6VYLJ.js");
+    return createSponsoredChain(this.config.rpcUrl).isDeployed(
+      wallet.smartAccountAddress
+    );
+  }
   // --- IAgent: funds (gasless only) ---
   async deposit(state, _chainId, amount, _asset, _depositCallback) {
     const broker = await this.connect(state);
     const wallet = await this.sponsoredWallet(state);
-    const { createSponsoredChain } = await import("./surfliquid.smart-account-YV3PLZ72.js");
+    const { createSponsoredChain } = await import("./surfliquid.smart-account-JHW6VYLJ.js");
     try {
       const { txHash, vault } = await this.withSession(
         state,
@@ -605,7 +624,7 @@ var SurfLiquidAgent = class {
   async withdraw(state, _chainId, _token, amount) {
     const broker = await this.connect(state);
     const wallet = await this.sponsoredWallet(state);
-    const { createSponsoredChain } = await import("./surfliquid.smart-account-YV3PLZ72.js");
+    const { createSponsoredChain } = await import("./surfliquid.smart-account-JHW6VYLJ.js");
     try {
       const result = await this.withSession(
         state,
@@ -625,14 +644,14 @@ var SurfLiquidAgent = class {
   /** Funds a prior withdrawal's sweep left in the smart account (never reached the EOA). No session needed — pure read. */
   async getStuckBalance(state) {
     const wallet = await this.sponsoredWallet(state);
-    const { createSponsoredChain } = await import("./surfliquid.smart-account-YV3PLZ72.js");
+    const { createSponsoredChain } = await import("./surfliquid.smart-account-JHW6VYLJ.js");
     const amount = await readStuckBalance({ chain: createSponsoredChain(this.config.rpcUrl), wallet });
     return { amount: amount.toString(), smartAccountAddress: wallet.smartAccountAddress };
   }
   /** Sweep the stranded balance to the owner's EOA — one sponsored userOp, one signature. */
   async recoverStuckBalance(state) {
     const wallet = await this.sponsoredWallet(state);
-    const { createSponsoredChain } = await import("./surfliquid.smart-account-YV3PLZ72.js");
+    const { createSponsoredChain } = await import("./surfliquid.smart-account-JHW6VYLJ.js");
     try {
       const { txHash, amount } = await sweepStuckBalance({ chain: createSponsoredChain(this.config.rpcUrl), wallet });
       return { txHash, type: "full", amount: amount.toString() };
@@ -642,6 +661,7 @@ var SurfLiquidAgent = class {
   }
   // --- IAgent: portfolio reads ---
   async vault(state) {
+    if (!await this.isSmartAccountDeployed(state)) return emptyVaultInfo();
     const broker = await this.connect(state);
     return this.withSession(state, () => broker.getVault(this.surfWallet(state)));
   }
@@ -659,6 +679,7 @@ var SurfLiquidAgent = class {
     return mapAccountApy(await this.vault(state), days);
   }
   async getHistory(state, chainId, options) {
+    if (!await this.isSmartAccountDeployed(state)) return { data: [], hasMore: false };
     const broker = await this.connect(state);
     const page = options?.cursor ? Number(options.cursor) : 1;
     const limit = options?.limit ?? HISTORY_DEFAULT_LIMIT;

package/dist/{surfliquid.smart-account-YV3PLZ72.js → surfliquid.smart-account-JHW6VYLJ.js}

@@ -6,7 +6,7 @@ import {
   SURFLIQUID_VAULT_ABI,
   SubmittedError,
   USDC_ABI
-} from "./chunk-T5YJVIQG.js";
+} from "./chunk-CWGCQLB2.js";
 import {
   readTokenMeta
 } from "./chunk-AURO3C3R.js";
@@ -114,19 +114,10 @@ async function createSponsoredWallet(input) {
       message: typedData.message
     }),
     // The smart account signs (ERC-1271), not the EOA: SurfLiquid's SIWE session must
-    // be the vault owner, which is the smart account. Safe wraps this as a SafeMessage
-    // EIP-712 signature the deployed account verifies via isValidSignature.
+    // be the vault owner, which is the smart account. While the account is still
+    // counterfactual, Safe/permissionless wraps this as an EIP-6492 signature SurfLiquid
+    // accepts; the first deposit's userOp deploys the account via its initCode.
     signMessage: (message) => account.signMessage({ message }),
-    // Deploy-on-connect: the account is counterfactual until its first userOp, but SIWE
-    // (isValidSignature) needs on-chain code. A no-op self-call carries the factory
-    // initCode and deploys it. Idempotency is the caller's (it checks isDeployed first).
-    deployAccount: async () => {
-      const userOpHash = await smartAccountClient.sendUserOperation({
-        calls: [{ to: account.address, value: 0n, data: "0x" }]
-      });
-      const receipt = await smartAccountClient.waitForUserOperationReceipt({ hash: userOpHash });
-      return receipt.receipt.transactionHash;
-    },
     sendCalls: async (calls) => {
       const userOpHash = await smartAccountClient.sendUserOperation({
         calls: calls.map((c) => ({ to: c.to, data: c.data, value: 0n }))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owney/sdk",
-  "version": "0.7.22-beta.4",
+  "version": "0.7.22-beta.6",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",