@owney/sdk 0.8.0-beta.0 → 0.8.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.cjs CHANGED
@@ -211,7 +211,7 @@ var P_SUPPORTED_CHAINS = {
211
211
  chainIds: [8453, 42161, 1],
212
212
  chains: ["BASE", "ARBITRUM", "ETHEREUM"]
213
213
  };
214
- var SUPPORTED_TOKENS = ["USDC", "WETH", "EURC", "USDT"];
214
+ var SUPPORTED_TOKENS = ["USDC", "WETH", "EURC", "USDT", "WBTC"];
215
215
  var SUPPORTED_CHAIN_IDS = P_SUPPORTED_CHAINS.chainIds;
216
216
  var SUPPORTED_CHAINS = P_SUPPORTED_CHAINS.chains;
217
217
  var SupportedAssets = [
@@ -268,6 +268,18 @@ var SupportedAssets = [
268
268
  symbol: "USDT",
269
269
  chainId: 1,
270
270
  decimals: 6
271
+ },
272
+ {
273
+ address: `0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599`,
274
+ symbol: "WBTC",
275
+ chainId: 1,
276
+ decimals: 8
277
+ },
278
+ {
279
+ address: `0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f`,
280
+ symbol: "WBTC",
281
+ chainId: 42161,
282
+ decimals: 8
271
283
  }
272
284
  ];
273
285
  function tokenAddress(symbol, chainId) {
@@ -1237,6 +1249,7 @@ var CHAINLINK_ETH_USD_FEED = {
1237
1249
  1: "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419"
1238
1250
  };
1239
1251
  var CHAINLINK_EUR_USD_FEED = "0xb49f677943BC038e9857d61E7d053CaA2C1734C1";
1252
+ var CHAINLINK_BTC_USD_FEED = "0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c";
1240
1253
  var CHAINLINK_ABI = (0, import_viem.parseAbi)([
1241
1254
  "function latestRoundData() view returns (uint80, int256, uint256, uint256, uint80)"
1242
1255
  ]);
@@ -1268,7 +1281,10 @@ var ZyfaiAgent = class _ZyfaiAgent {
1268
1281
  chain: "ARBITRUM",
1269
1282
  assets: [
1270
1283
  { symbol: "USDC", minDepositAmount: "1500000" },
1271
- { symbol: "WETH", minDepositAmount: "500000000000000" }
1284
+ { symbol: "WETH", minDepositAmount: "500000000000000" },
1285
+ // ROUT-780: 0.0002 WBTC (8 decimals), about $13 at $65k BTC, to clear
1286
+ // Zyfai's $10 Arbitrum MIN_PORTFOLIO_USD.
1287
+ { symbol: "WBTC", minDepositAmount: "20000" }
1272
1288
  ]
1273
1289
  },
1274
1290
  {
@@ -1286,7 +1302,10 @@ var ZyfaiAgent = class _ZyfaiAgent {
1286
1302
  // MIN_PORTFOLIO_BALANCE says 10,000 here, but that is only enforced by
1287
1303
  // its sendDeposit, which we don't use. Confirm with Zyfai before release.
1288
1304
  { symbol: "EURC", minDepositAmount: "100000000" },
1289
- { symbol: "USDT", minDepositAmount: "100000000" }
1305
+ { symbol: "USDT", minDepositAmount: "100000000" },
1306
+ // ROUT-780: Zyfai's MIN_PORTFOLIO_USD[1].WBTC is $10,000, enforced only
1307
+ // by its sendDeposit (unused here), as with EURC. Confirm before release.
1308
+ { symbol: "WBTC", minDepositAmount: "20000" }
1290
1309
  ]
1291
1310
  }
1292
1311
  ];
@@ -1309,6 +1328,7 @@ var ZyfaiAgent = class _ZyfaiAgent {
1309
1328
  withdrawAmountCache = /* @__PURE__ */ new Map();
1310
1329
  ethUsd = null;
1311
1330
  eurUsd = null;
1331
+ btcUsd = null;
1312
1332
  earningsReads = /* @__PURE__ */ new Map();
1313
1333
  earningsRefreshes = /* @__PURE__ */ new Map();
1314
1334
  earningsSnapshot = null;
@@ -2377,15 +2397,17 @@ var ZyfaiAgent = class _ZyfaiAgent {
2377
2397
  }
2378
2398
  async getAccountApy(state, chainId, days, tokenSymbol, scopeChainId) {
2379
2399
  const { smartWallet, chainId: validChainId } = await this.resolveSmartWallet(state, chainId);
2380
- const [raw, ethUsd, eurUsd] = await Promise.all([
2400
+ const [raw, ethUsd, eurUsd, btcUsd] = await Promise.all([
2381
2401
  this.sdk.getDailyApyHistory(smartWallet, days),
2382
2402
  tokenSymbol ? void 0 : this.readEthUsd(validChainId),
2383
- tokenSymbol ? void 0 : this.readEurUsd()
2403
+ tokenSymbol ? void 0 : this.readEurUsd(),
2404
+ tokenSymbol ? void 0 : this.readBtcUsd()
2384
2405
  ]);
2385
2406
  const scope = scopeChainId === null ? void 0 : scopeChainId ?? chainId;
2386
2407
  const usdPrices = {
2387
2408
  ...ethUsd ? { WETH: ethUsd, ETH: ethUsd } : {},
2388
- ...eurUsd ? { EURC: eurUsd } : {}
2409
+ ...eurUsd ? { EURC: eurUsd } : {},
2410
+ ...btcUsd ? { WBTC: btcUsd } : {}
2389
2411
  };
2390
2412
  return mapApyHistory(
2391
2413
  raw,
@@ -2411,6 +2433,10 @@ var ZyfaiAgent = class _ZyfaiAgent {
2411
2433
  readEurUsd() {
2412
2434
  return this.readChainlinkUsd(1, CHAINLINK_EUR_USD_FEED, "eurUsd");
2413
2435
  }
2436
+ /** Today's BTC/USD from Chainlink on Ethereum, for pricing WBTC (ROUT-780). */
2437
+ readBtcUsd() {
2438
+ return this.readChainlinkUsd(1, CHAINLINK_BTC_USD_FEED, "btcUsd");
2439
+ }
2414
2440
  async readChainlinkUsd(chainId, feed, cache) {
2415
2441
  const cached = this[cache];
2416
2442
  if (cached && Date.now() - cached.at < ETH_USD_TTL_MS) {
@@ -2429,7 +2455,7 @@ var ZyfaiAgent = class _ZyfaiAgent {
2429
2455
  } catch (err) {
2430
2456
  debugLog(
2431
2457
  "zyfai:apy",
2432
- `${cache === "ethUsd" ? "ETH/USD" : "EUR/USD"} read failed; token-amount weighting`,
2458
+ `${{ ethUsd: "ETH/USD", eurUsd: "EUR/USD", btcUsd: "BTC/USD" }[cache]} read failed; token-amount weighting`,
2433
2459
  { err }
2434
2460
  );
2435
2461
  return void 0;
@@ -2462,6 +2488,8 @@ var ZyfaiAgent = class _ZyfaiAgent {
2462
2488
  return "eth";
2463
2489
  case "EURC":
2464
2490
  return "eurc";
2491
+ case "WBTC":
2492
+ return "wbtc";
2465
2493
  // Zyfai has no "usdt" history filter, so USDT is filtered client-side.
2466
2494
  default:
2467
2495
  return void 0;
@@ -4051,6 +4079,66 @@ async function runFusion(deps, options, walletAddress) {
4051
4079
  return { orderHash: built.orderHash };
4052
4080
  }
4053
4081
 
4082
+ // src/lib/swap/swap.approve.ts
4083
+ var APPROVE_WATCH_INTERVAL_MS = 4e3;
4084
+ var APPROVE_PROMPT_TIMEOUT_MS = 5 * 60 * 1e3;
4085
+ async function approveWatched(deps, options) {
4086
+ const { amount, symbol, chainId } = options;
4087
+ const landed = (allowance) => amount === 0n ? allowance === 0n : allowance >= amount;
4088
+ const sleep2 = deps.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
4089
+ return new Promise((resolve, reject) => {
4090
+ let done = false;
4091
+ const finish = (settle) => {
4092
+ if (done) return;
4093
+ done = true;
4094
+ clearTimeout(timer);
4095
+ settle();
4096
+ };
4097
+ const timer = setTimeout(
4098
+ () => finish(
4099
+ () => reject(
4100
+ new OwneyError(
4101
+ "SWAP_WALLET_PROMPT_TIMEOUT",
4102
+ // Hedged: a wallet that never answered may still have sent it.
4103
+ `Your wallet didn't answer the request to approve your ${symbol}. Check your wallet before trying again.`,
4104
+ {
4105
+ chainId,
4106
+ prompt: "approve",
4107
+ timeoutMs: APPROVE_PROMPT_TIMEOUT_MS
4108
+ }
4109
+ )
4110
+ )
4111
+ ),
4112
+ APPROVE_PROMPT_TIMEOUT_MS
4113
+ );
4114
+ deps.send().then(async (hash) => {
4115
+ clearTimeout(timer);
4116
+ await deps.waitForReceipt(hash);
4117
+ return hash;
4118
+ }).then(
4119
+ (hash) => finish(() => resolve(hash)),
4120
+ (error) => finish(() => reject(error))
4121
+ );
4122
+ void (async () => {
4123
+ while (!done) {
4124
+ await sleep2(APPROVE_WATCH_INTERVAL_MS);
4125
+ if (done) return;
4126
+ try {
4127
+ if (landed(await deps.readAllowance())) {
4128
+ debugLog(
4129
+ "owney-sdk",
4130
+ "approve: landed on chain before the wallet answered"
4131
+ );
4132
+ finish(() => resolve(void 0));
4133
+ return;
4134
+ }
4135
+ } catch {
4136
+ }
4137
+ }
4138
+ })();
4139
+ });
4140
+ }
4141
+
4054
4142
  // src/lib/swap/swap.permit.ts
4055
4143
  var import_viem5 = require("viem");
4056
4144
  var PERMIT_ABI = (0, import_viem5.parseAbi)([
@@ -5123,7 +5211,7 @@ function sponsoredTokenMap(asset) {
5123
5211
  })
5124
5212
  );
5125
5213
  }
5126
- var PERMIT2_ASSETS = /* @__PURE__ */ new Set(["WETH", "USDT"]);
5214
+ var PERMIT2_ASSETS = /* @__PURE__ */ new Set(["WETH", "USDT", "WBTC"]);
5127
5215
  function isPermit2Asset(asset) {
5128
5216
  return PERMIT2_ASSETS.has(asset);
5129
5217
  }
@@ -6204,29 +6292,45 @@ var OwneySDK = class {
6204
6292
  functionName: "allowance",
6205
6293
  args: [state.walletAddress, spender]
6206
6294
  }),
6207
- approve: async (spender, amount) => {
6208
- const hash = await wallet.writeContract({
6209
- address: quote.src.address,
6210
- abi: ERC20_ALLOWANCE_ABI,
6211
- functionName: "approve",
6212
- args: [spender, amount],
6213
- account: state.walletAddress,
6214
- chain: srcChain
6215
- });
6216
- const receipt = await srcPublic.waitForTransactionReceipt({
6217
- hash,
6218
- confirmations: 1,
6219
- timeout: receiptTimeoutMs(quote.src.chainId)
6220
- });
6221
- if (receipt.status !== "success") {
6222
- throw new OwneyError(
6223
- "SWAP_REQUEST_FAILED",
6224
- `Approval transaction reverted (tx ${hash})`,
6225
- { hash }
6226
- );
6295
+ // Watched on chain as well as through the wallet: Trust's extension can
6296
+ // land the approval and never return its hash (ROUT-759).
6297
+ approve: (spender, amount) => approveWatched(
6298
+ {
6299
+ send: () => wallet.writeContract({
6300
+ address: quote.src.address,
6301
+ abi: ERC20_ALLOWANCE_ABI,
6302
+ functionName: "approve",
6303
+ args: [spender, amount],
6304
+ account: state.walletAddress,
6305
+ chain: srcChain
6306
+ }),
6307
+ waitForReceipt: async (hash) => {
6308
+ const receipt = await srcPublic.waitForTransactionReceipt({
6309
+ hash,
6310
+ confirmations: 1,
6311
+ timeout: receiptTimeoutMs(quote.src.chainId)
6312
+ });
6313
+ if (receipt.status !== "success") {
6314
+ throw new OwneyError(
6315
+ "SWAP_REQUEST_FAILED",
6316
+ `Approval transaction reverted (tx ${hash})`,
6317
+ { hash }
6318
+ );
6319
+ }
6320
+ },
6321
+ readAllowance: () => srcPublic.readContract({
6322
+ address: quote.src.address,
6323
+ abi: ERC20_ALLOWANCE_ABI,
6324
+ functionName: "allowance",
6325
+ args: [state.walletAddress, spender]
6326
+ })
6327
+ },
6328
+ {
6329
+ amount,
6330
+ symbol: quote.src.symbol,
6331
+ chainId: quote.src.chainId
6227
6332
  }
6228
- return hash;
6229
- },
6333
+ ),
6230
6334
  ensureChain: (chainId) => this.ensureSwapChain(chainId),
6231
6335
  /**
6232
6336
  * Sign the approval instead of paying for it. Null means the token
package/dist/index.d.cts CHANGED
@@ -302,7 +302,7 @@ interface ConnectionState {
302
302
  walletAddress: `0x${string}`;
303
303
  chainId: number | null;
304
304
  }
305
- declare const SUPPORTED_TOKENS: readonly ["USDC", "WETH", "EURC", "USDT"];
305
+ declare const SUPPORTED_TOKENS: readonly ["USDC", "WETH", "EURC", "USDT", "WBTC"];
306
306
  declare const SUPPORTED_CHAIN_IDS: readonly [8453, 42161, 1];
307
307
  declare const SUPPORTED_CHAINS: readonly ["BASE", "ARBITRUM", "ETHEREUM"];
308
308
  type OwneySupportedChainId = (typeof SUPPORTED_CHAIN_IDS)[number];
@@ -1912,7 +1912,7 @@ declare class OwneySDK {
1912
1912
  * approves from zero in a single transaction.
1913
1913
  * @returns the approval transaction hash.
1914
1914
  */
1915
- approvePermit2(asset?: "WETH" | "USDT"): Promise<`0x${string}`>;
1915
+ approvePermit2(asset?: "WETH" | "USDT" | "WBTC"): Promise<`0x${string}`>;
1916
1916
  /**
1917
1917
  * Get the agent's average APY performance over a time period. Does not require a wallet connection.
1918
1918
  * @param options - Contains agentId (optional) and days ("7D", "14D", or "30D")
package/dist/index.d.ts CHANGED
@@ -302,7 +302,7 @@ interface ConnectionState {
302
302
  walletAddress: `0x${string}`;
303
303
  chainId: number | null;
304
304
  }
305
- declare const SUPPORTED_TOKENS: readonly ["USDC", "WETH", "EURC", "USDT"];
305
+ declare const SUPPORTED_TOKENS: readonly ["USDC", "WETH", "EURC", "USDT", "WBTC"];
306
306
  declare const SUPPORTED_CHAIN_IDS: readonly [8453, 42161, 1];
307
307
  declare const SUPPORTED_CHAINS: readonly ["BASE", "ARBITRUM", "ETHEREUM"];
308
308
  type OwneySupportedChainId = (typeof SUPPORTED_CHAIN_IDS)[number];
@@ -1912,7 +1912,7 @@ declare class OwneySDK {
1912
1912
  * approves from zero in a single transaction.
1913
1913
  * @returns the approval transaction hash.
1914
1914
  */
1915
- approvePermit2(asset?: "WETH" | "USDT"): Promise<`0x${string}`>;
1915
+ approvePermit2(asset?: "WETH" | "USDT" | "WBTC"): Promise<`0x${string}`>;
1916
1916
  /**
1917
1917
  * Get the agent's average APY performance over a time period. Does not require a wallet connection.
1918
1918
  * @param options - Contains agentId (optional) and days ("7D", "14D", or "30D")
package/dist/index.js CHANGED
@@ -170,7 +170,7 @@ var P_SUPPORTED_CHAINS = {
170
170
  chainIds: [8453, 42161, 1],
171
171
  chains: ["BASE", "ARBITRUM", "ETHEREUM"]
172
172
  };
173
- var SUPPORTED_TOKENS = ["USDC", "WETH", "EURC", "USDT"];
173
+ var SUPPORTED_TOKENS = ["USDC", "WETH", "EURC", "USDT", "WBTC"];
174
174
  var SUPPORTED_CHAIN_IDS = P_SUPPORTED_CHAINS.chainIds;
175
175
  var SUPPORTED_CHAINS = P_SUPPORTED_CHAINS.chains;
176
176
  var SupportedAssets = [
@@ -227,6 +227,18 @@ var SupportedAssets = [
227
227
  symbol: "USDT",
228
228
  chainId: 1,
229
229
  decimals: 6
230
+ },
231
+ {
232
+ address: `0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599`,
233
+ symbol: "WBTC",
234
+ chainId: 1,
235
+ decimals: 8
236
+ },
237
+ {
238
+ address: `0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f`,
239
+ symbol: "WBTC",
240
+ chainId: 42161,
241
+ decimals: 8
230
242
  }
231
243
  ];
232
244
  function tokenAddress(symbol, chainId) {
@@ -1196,6 +1208,7 @@ var CHAINLINK_ETH_USD_FEED = {
1196
1208
  1: "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419"
1197
1209
  };
1198
1210
  var CHAINLINK_EUR_USD_FEED = "0xb49f677943BC038e9857d61E7d053CaA2C1734C1";
1211
+ var CHAINLINK_BTC_USD_FEED = "0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c";
1199
1212
  var CHAINLINK_ABI = parseAbi([
1200
1213
  "function latestRoundData() view returns (uint80, int256, uint256, uint256, uint80)"
1201
1214
  ]);
@@ -1227,7 +1240,10 @@ var ZyfaiAgent = class _ZyfaiAgent {
1227
1240
  chain: "ARBITRUM",
1228
1241
  assets: [
1229
1242
  { symbol: "USDC", minDepositAmount: "1500000" },
1230
- { symbol: "WETH", minDepositAmount: "500000000000000" }
1243
+ { symbol: "WETH", minDepositAmount: "500000000000000" },
1244
+ // ROUT-780: 0.0002 WBTC (8 decimals), about $13 at $65k BTC, to clear
1245
+ // Zyfai's $10 Arbitrum MIN_PORTFOLIO_USD.
1246
+ { symbol: "WBTC", minDepositAmount: "20000" }
1231
1247
  ]
1232
1248
  },
1233
1249
  {
@@ -1245,7 +1261,10 @@ var ZyfaiAgent = class _ZyfaiAgent {
1245
1261
  // MIN_PORTFOLIO_BALANCE says 10,000 here, but that is only enforced by
1246
1262
  // its sendDeposit, which we don't use. Confirm with Zyfai before release.
1247
1263
  { symbol: "EURC", minDepositAmount: "100000000" },
1248
- { symbol: "USDT", minDepositAmount: "100000000" }
1264
+ { symbol: "USDT", minDepositAmount: "100000000" },
1265
+ // ROUT-780: Zyfai's MIN_PORTFOLIO_USD[1].WBTC is $10,000, enforced only
1266
+ // by its sendDeposit (unused here), as with EURC. Confirm before release.
1267
+ { symbol: "WBTC", minDepositAmount: "20000" }
1249
1268
  ]
1250
1269
  }
1251
1270
  ];
@@ -1268,6 +1287,7 @@ var ZyfaiAgent = class _ZyfaiAgent {
1268
1287
  withdrawAmountCache = /* @__PURE__ */ new Map();
1269
1288
  ethUsd = null;
1270
1289
  eurUsd = null;
1290
+ btcUsd = null;
1271
1291
  earningsReads = /* @__PURE__ */ new Map();
1272
1292
  earningsRefreshes = /* @__PURE__ */ new Map();
1273
1293
  earningsSnapshot = null;
@@ -2336,15 +2356,17 @@ var ZyfaiAgent = class _ZyfaiAgent {
2336
2356
  }
2337
2357
  async getAccountApy(state, chainId, days, tokenSymbol, scopeChainId) {
2338
2358
  const { smartWallet, chainId: validChainId } = await this.resolveSmartWallet(state, chainId);
2339
- const [raw, ethUsd, eurUsd] = await Promise.all([
2359
+ const [raw, ethUsd, eurUsd, btcUsd] = await Promise.all([
2340
2360
  this.sdk.getDailyApyHistory(smartWallet, days),
2341
2361
  tokenSymbol ? void 0 : this.readEthUsd(validChainId),
2342
- tokenSymbol ? void 0 : this.readEurUsd()
2362
+ tokenSymbol ? void 0 : this.readEurUsd(),
2363
+ tokenSymbol ? void 0 : this.readBtcUsd()
2343
2364
  ]);
2344
2365
  const scope = scopeChainId === null ? void 0 : scopeChainId ?? chainId;
2345
2366
  const usdPrices = {
2346
2367
  ...ethUsd ? { WETH: ethUsd, ETH: ethUsd } : {},
2347
- ...eurUsd ? { EURC: eurUsd } : {}
2368
+ ...eurUsd ? { EURC: eurUsd } : {},
2369
+ ...btcUsd ? { WBTC: btcUsd } : {}
2348
2370
  };
2349
2371
  return mapApyHistory(
2350
2372
  raw,
@@ -2370,6 +2392,10 @@ var ZyfaiAgent = class _ZyfaiAgent {
2370
2392
  readEurUsd() {
2371
2393
  return this.readChainlinkUsd(1, CHAINLINK_EUR_USD_FEED, "eurUsd");
2372
2394
  }
2395
+ /** Today's BTC/USD from Chainlink on Ethereum, for pricing WBTC (ROUT-780). */
2396
+ readBtcUsd() {
2397
+ return this.readChainlinkUsd(1, CHAINLINK_BTC_USD_FEED, "btcUsd");
2398
+ }
2373
2399
  async readChainlinkUsd(chainId, feed, cache) {
2374
2400
  const cached = this[cache];
2375
2401
  if (cached && Date.now() - cached.at < ETH_USD_TTL_MS) {
@@ -2388,7 +2414,7 @@ var ZyfaiAgent = class _ZyfaiAgent {
2388
2414
  } catch (err) {
2389
2415
  debugLog(
2390
2416
  "zyfai:apy",
2391
- `${cache === "ethUsd" ? "ETH/USD" : "EUR/USD"} read failed; token-amount weighting`,
2417
+ `${{ ethUsd: "ETH/USD", eurUsd: "EUR/USD", btcUsd: "BTC/USD" }[cache]} read failed; token-amount weighting`,
2392
2418
  { err }
2393
2419
  );
2394
2420
  return void 0;
@@ -2421,6 +2447,8 @@ var ZyfaiAgent = class _ZyfaiAgent {
2421
2447
  return "eth";
2422
2448
  case "EURC":
2423
2449
  return "eurc";
2450
+ case "WBTC":
2451
+ return "wbtc";
2424
2452
  // Zyfai has no "usdt" history filter, so USDT is filtered client-side.
2425
2453
  default:
2426
2454
  return void 0;
@@ -4020,6 +4048,66 @@ async function runFusion(deps, options, walletAddress) {
4020
4048
  return { orderHash: built.orderHash };
4021
4049
  }
4022
4050
 
4051
+ // src/lib/swap/swap.approve.ts
4052
+ var APPROVE_WATCH_INTERVAL_MS = 4e3;
4053
+ var APPROVE_PROMPT_TIMEOUT_MS = 5 * 60 * 1e3;
4054
+ async function approveWatched(deps, options) {
4055
+ const { amount, symbol, chainId } = options;
4056
+ const landed = (allowance) => amount === 0n ? allowance === 0n : allowance >= amount;
4057
+ const sleep2 = deps.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
4058
+ return new Promise((resolve, reject) => {
4059
+ let done = false;
4060
+ const finish = (settle) => {
4061
+ if (done) return;
4062
+ done = true;
4063
+ clearTimeout(timer);
4064
+ settle();
4065
+ };
4066
+ const timer = setTimeout(
4067
+ () => finish(
4068
+ () => reject(
4069
+ new OwneyError(
4070
+ "SWAP_WALLET_PROMPT_TIMEOUT",
4071
+ // Hedged: a wallet that never answered may still have sent it.
4072
+ `Your wallet didn't answer the request to approve your ${symbol}. Check your wallet before trying again.`,
4073
+ {
4074
+ chainId,
4075
+ prompt: "approve",
4076
+ timeoutMs: APPROVE_PROMPT_TIMEOUT_MS
4077
+ }
4078
+ )
4079
+ )
4080
+ ),
4081
+ APPROVE_PROMPT_TIMEOUT_MS
4082
+ );
4083
+ deps.send().then(async (hash) => {
4084
+ clearTimeout(timer);
4085
+ await deps.waitForReceipt(hash);
4086
+ return hash;
4087
+ }).then(
4088
+ (hash) => finish(() => resolve(hash)),
4089
+ (error) => finish(() => reject(error))
4090
+ );
4091
+ void (async () => {
4092
+ while (!done) {
4093
+ await sleep2(APPROVE_WATCH_INTERVAL_MS);
4094
+ if (done) return;
4095
+ try {
4096
+ if (landed(await deps.readAllowance())) {
4097
+ debugLog(
4098
+ "owney-sdk",
4099
+ "approve: landed on chain before the wallet answered"
4100
+ );
4101
+ finish(() => resolve(void 0));
4102
+ return;
4103
+ }
4104
+ } catch {
4105
+ }
4106
+ }
4107
+ })();
4108
+ });
4109
+ }
4110
+
4023
4111
  // src/lib/swap/swap.permit.ts
4024
4112
  import {
4025
4113
  domainSeparator,
@@ -5103,7 +5191,7 @@ function sponsoredTokenMap(asset) {
5103
5191
  })
5104
5192
  );
5105
5193
  }
5106
- var PERMIT2_ASSETS = /* @__PURE__ */ new Set(["WETH", "USDT"]);
5194
+ var PERMIT2_ASSETS = /* @__PURE__ */ new Set(["WETH", "USDT", "WBTC"]);
5107
5195
  function isPermit2Asset(asset) {
5108
5196
  return PERMIT2_ASSETS.has(asset);
5109
5197
  }
@@ -6184,29 +6272,45 @@ var OwneySDK = class {
6184
6272
  functionName: "allowance",
6185
6273
  args: [state.walletAddress, spender]
6186
6274
  }),
6187
- approve: async (spender, amount) => {
6188
- const hash = await wallet.writeContract({
6189
- address: quote.src.address,
6190
- abi: ERC20_ALLOWANCE_ABI,
6191
- functionName: "approve",
6192
- args: [spender, amount],
6193
- account: state.walletAddress,
6194
- chain: srcChain
6195
- });
6196
- const receipt = await srcPublic.waitForTransactionReceipt({
6197
- hash,
6198
- confirmations: 1,
6199
- timeout: receiptTimeoutMs(quote.src.chainId)
6200
- });
6201
- if (receipt.status !== "success") {
6202
- throw new OwneyError(
6203
- "SWAP_REQUEST_FAILED",
6204
- `Approval transaction reverted (tx ${hash})`,
6205
- { hash }
6206
- );
6275
+ // Watched on chain as well as through the wallet: Trust's extension can
6276
+ // land the approval and never return its hash (ROUT-759).
6277
+ approve: (spender, amount) => approveWatched(
6278
+ {
6279
+ send: () => wallet.writeContract({
6280
+ address: quote.src.address,
6281
+ abi: ERC20_ALLOWANCE_ABI,
6282
+ functionName: "approve",
6283
+ args: [spender, amount],
6284
+ account: state.walletAddress,
6285
+ chain: srcChain
6286
+ }),
6287
+ waitForReceipt: async (hash) => {
6288
+ const receipt = await srcPublic.waitForTransactionReceipt({
6289
+ hash,
6290
+ confirmations: 1,
6291
+ timeout: receiptTimeoutMs(quote.src.chainId)
6292
+ });
6293
+ if (receipt.status !== "success") {
6294
+ throw new OwneyError(
6295
+ "SWAP_REQUEST_FAILED",
6296
+ `Approval transaction reverted (tx ${hash})`,
6297
+ { hash }
6298
+ );
6299
+ }
6300
+ },
6301
+ readAllowance: () => srcPublic.readContract({
6302
+ address: quote.src.address,
6303
+ abi: ERC20_ALLOWANCE_ABI,
6304
+ functionName: "allowance",
6305
+ args: [state.walletAddress, spender]
6306
+ })
6307
+ },
6308
+ {
6309
+ amount,
6310
+ symbol: quote.src.symbol,
6311
+ chainId: quote.src.chainId
6207
6312
  }
6208
- return hash;
6209
- },
6313
+ ),
6210
6314
  ensureChain: (chainId) => this.ensureSwapChain(chainId),
6211
6315
  /**
6212
6316
  * Sign the approval instead of paying for it. Null means the token
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@owney/sdk",
3
- "version": "0.8.0-beta.0",
3
+ "version": "0.8.0-beta.2",
4
4
  "type": "module",
5
5
  "main": "dist/index.cjs",
6
6
  "module": "dist/index.js",
@@ -23,7 +23,7 @@
23
23
  "test:watch": "vitest"
24
24
  },
25
25
  "dependencies": {
26
- "@zyfai/sdk": "0.11.2",
26
+ "@zyfai/sdk": "1.3.0",
27
27
  "siwe": "^3.0.0",
28
28
  "viem": "^2.48.1"
29
29
  },