@sodax/sdk 2.0.0-rc.11 → 2.0.0-rc.13

package/dist/index.cjs

@@ -197,7 +197,8 @@ var SODAX_FEATURES = [
   "migration",
   "dex",
   "partner",
-  "recovery"
+  "recovery",
+  "leverageYield"
 ];
 
 // src/shared/utils/tiny-invariant.ts
@@ -559,6 +560,27 @@ var SodaTokens = {
     vault: "0x243b0c26c8b38793908d7C64e8510f21B19B4613"
   }
 };
+var LsodaSymbols = ["lsodaWEETH", "lsodaWSTETH"];
+var LsodaTokens = {
+  lsodaWEETH: {
+    symbol: "lsodaWEETH",
+    name: "Leveraged Soda weETH",
+    decimals: 18,
+    address: "0xD09de2f5070699A909c0FD32fb5A909d3886701D",
+    chainKey: ChainKeys.SONIC_MAINNET,
+    hubAsset: "0xD09de2f5070699A909c0FD32fb5A909d3886701D",
+    vault: "0xD09de2f5070699A909c0FD32fb5A909d3886701D"
+  },
+  lsodaWSTETH: {
+    symbol: "lsodaWSTETH",
+    name: "Leveraged Soda wstETH",
+    decimals: 18,
+    address: "0x136E5D1CEC5db1829E24941Eddd9C8640E02Ce7a",
+    chainKey: ChainKeys.SONIC_MAINNET,
+    hubAsset: "0x136E5D1CEC5db1829E24941Eddd9C8640E02Ce7a",
+    vault: "0x136E5D1CEC5db1829E24941Eddd9C8640E02Ce7a"
+  }
+};
 var sonicSupportedTokens = {
   S: {
     symbol: "S",
@@ -623,7 +645,8 @@ var sonicSupportedTokens = {
     hubAsset: "0x7c7d53EEcda37a87ce0D5bf8E0b24512A48dC963",
     vault: SodaTokens.sodaSODA.address
   },
-  ...SodaTokens
+  ...SodaTokens,
+  ...LsodaTokens
 };
 var redbellySupportedTokens = {
   RBNT: {
@@ -3052,9 +3075,9 @@ var spokeChainConfig = {
     supportedTokens: bitcoinSupportedTokens,
     radfi: {
       walletMode: "TRADING",
-      apiUrl: "https://api.radfi.co/api",
+      apiUrl: "https://api.bound.exchange/api",
       apiKey: "",
-      umsUrl: "https://ums.radfi.co/api",
+      umsUrl: "https://api.ums.bound.exchange/api",
       accessToken: "",
       refreshToken: ""
     },
@@ -3624,7 +3647,8 @@ var swapSupportedTokens = {
     spokeChainConfig[ChainKeys.SONIC_MAINNET].supportedTokens.USDT,
     spokeChainConfig[ChainKeys.SONIC_MAINNET].supportedTokens.wS,
     spokeChainConfig[ChainKeys.SONIC_MAINNET].supportedTokens.SODA,
-    ...Object.values(SodaTokens)
+    ...Object.values(SodaTokens),
+    ...Object.values(LsodaTokens)
   ],
   [ChainKeys.AVALANCHE_MAINNET]: [
     spokeChainConfig[ChainKeys.AVALANCHE_MAINNET].supportedTokens.AVAX,
@@ -3864,6 +3888,41 @@ var swapsConfig = {
 var getSupportedSolverTokens = (chainId) => swapSupportedTokens[chainId];
 var isSwapSupportedToken = (chainId, token) => swapSupportedTokens[chainId].some((t) => t.address.toLowerCase() === token.toLowerCase());
 
+// ../types/dist/leverageYield/leverageYield.js
+var leverageYieldVaults = [
+  {
+    name: LsodaTokens.lsodaWEETH.symbol,
+    vault: LsodaTokens.lsodaWEETH.vault,
+    asset: SodaTokens.sodaWEETH.address,
+    // sodaWEETH on Sonic
+    borrowToken: SodaTokens.sodaETH.address,
+    // sodaETH on Sonic
+    lsdSource: {
+      // DefiLlama pool for EtherFi's weETH on Ethereum (project: 'ether.fi-stake').
+      poolId: "46bd2bdf-6d92-4066-b482-e885ee172264",
+      fallbackAprPct: 3,
+      label: "EtherFi (weETH)"
+    }
+  },
+  {
+    name: LsodaTokens.lsodaWSTETH.symbol,
+    vault: LsodaTokens.lsodaWSTETH.vault,
+    asset: SodaTokens.sodaWSTETH.address,
+    // sodaWSTETH on Sonic
+    borrowToken: SodaTokens.sodaETH.address,
+    // sodaETH on Sonic
+    lsdSource: {
+      // DefiLlama pool for Lido's stETH on Ethereum (wstETH inherits this rate via redeem).
+      poolId: "747c1d2a-c668-4682-b9f9-296708a3dd90",
+      fallbackAprPct: 2.4,
+      label: "Lido (stETH)"
+    }
+  }
+];
+var leverageYieldConfig = {
+  vaults: leverageYieldVaults
+};
+
 // ../types/dist/sodax-config/sodax-config.js
 var bridgeConfig = {
   partnerFee: void 0
@@ -3875,6 +3934,7 @@ var sodaxConfig = {
   moneyMarket: moneyMarketConfig,
   bridge: bridgeConfig,
   dex: dexConfig,
+  leverageYield: leverageYieldConfig,
   hub: hubConfig,
   api: apiConfig,
   solver: solverConfig,
@@ -3896,6 +3956,9 @@ function detectBitcoinAddressType(address) {
     return "P2PKH";
   throw new Error(`Unknown Bitcoin address type: ${address}`);
 }
+function usesBip322MessageSigning(addressType) {
+  return addressType === "P2WPKH" || addressType === "P2TR";
+}
 var BTC_WALLET_ADDRESS_TYPES = ["taproot", "segwit"];
 var BTC_ADDRESS_TYPES = ["P2PKH", "P2SH", "P2WPKH", "P2TR"];
 
@@ -4013,7 +4076,7 @@ function isValidWalletProviderForChainKey(chainKey, walletProvider) {
 }
 
 // ../types/dist/index.js
-var CONFIG_VERSION = 209;
+var CONFIG_VERSION = 211;
 function isEvmSpokeChainConfig(value) {
   return typeof value === "object" && value !== null && value.chain.type === "EVM" && value.chain.key !== HUB_CHAIN_KEY;
 }
@@ -4440,7 +4503,7 @@ async function waitUntilIntentExecuted(payload) {
 }
 async function relayTxAndWaitPacket(params) {
   try {
-    const { srcTxHash, data, chainKey, relayerApiEndpoint, timeout = DEFAULT_RELAY_TX_TIMEOUT } = params;
+    const { srcTxHash, data, chainKey, relayerApiEndpoint, timeout = DEFAULT_RELAY_TX_TIMEOUT, pollTxHash } = params;
     const intentRelayChainId = getIntentRelayChainId(chainKey).toString();
     const isSplitTxChain = isSolanaChainKeyType(chainKey) || isBitcoinChainKeyType(chainKey);
     invariant(!isSplitTxChain || data !== void 0, "Data is required for Solana and Bitcoin chain keys");
@@ -4459,7 +4522,9 @@ async function relayTxAndWaitPacket(params) {
     if (!submitResult.ok) return submitResult;
     return await waitUntilIntentExecuted({
       intentRelayChainId,
-      srcTxHash,
+      // The relay may track the packet under a different id than the submit tx_hash (Bitcoin
+      // on-demand: submit "withdraw", poll the derived `od:<hash>`). Defaults to the submit id.
+      srcTxHash: pollTxHash ?? srcTxHash,
       timeout,
       apiUrl: relayerApiEndpoint
     });
@@ -13298,11 +13363,43 @@ function mergeSodaxConfig(base2, override) {
   return merged;
 }
 
+// src/shared/logger.ts
+var consoleLogger = {
+  debug: (message, data) => data ? console.debug(message, data) : console.debug(message),
+  info: (message, data) => data ? console.info(message, data) : console.info(message),
+  warn: (message, data) => data ? console.warn(message, data) : console.warn(message),
+  error: (message, error, data) => {
+    if (error !== void 0 && data !== void 0) console.error(message, error, data);
+    else if (error !== void 0) console.error(message, error);
+    else console.error(message);
+  }
+};
+var silentLogger = {
+  debug: () => {
+  },
+  info: () => {
+  },
+  warn: () => {
+  },
+  error: () => {
+  }
+};
+function resolveLogger(option) {
+  if (option === void 0 || option === "console") return consoleLogger;
+  if (option === "silent") return silentLogger;
+  return option;
+}
+
 // src/shared/config/ConfigService.ts
 var ConfigService = class {
   sodax;
   api;
   userConfig;
+  /**
+   * SDK log sink. Resolved once at construction and kept independent of {@link sodax} so that
+   * {@link initialize}'s dynamic-config swap never clobbers it. Read by services via `config.logger`.
+   */
+  logger;
   initialized = false;
   // data structures for quick lookup
   supportedHubAssetsSet;
@@ -13314,10 +13411,11 @@ var ConfigService = class {
   stakedATokenAddressesSet;
   chainToSupportedTokenAddressMap;
   hubAssetToXTokenMap;
-  constructor({ api, config, userConfig }) {
+  constructor({ api, config, userConfig, logger }) {
     this.api = api;
     this.sodax = config;
     this.userConfig = userConfig;
+    this.logger = logger ?? resolveLogger(void 0);
     this.loadSodaxConfigDataStructures(config);
   }
   async initialize() {
@@ -13326,7 +13424,7 @@ var ConfigService = class {
       if (!result.ok) return result;
       const response = result.value;
       if (!response.version || response.version < CONFIG_VERSION) {
-        console.warn(
+        this.logger.warn(
           `Dynamic config version is less than the current version, resorting to the default one. Current version: ${CONFIG_VERSION}, response version: ${response.version}`
         );
       } else {
@@ -14484,7 +14582,7 @@ var RadfiProvider = class {
     }
   }
   /**
-   * Authenticate with Radfi: BIP322-sign a login message, then call the Radfi API.
+   * Authenticate with Bound Exchange: BIP322-sign a login message, then call the Bound Exchange API.
    * Returns accessToken, refreshToken, and tradingAddress.
    */
   async authenticateWithWallet(walletProvider, cachedPublicKey) {
@@ -14500,15 +14598,14 @@ var RadfiProvider = class {
       throw new Error("Failed to retrieve public key from wallet. Please unlock your wallet and try again.");
     }
     const message = `${Date.now()}`;
-    const addressType = detectBitcoinAddressType(address);
-    const signature = addressType === "P2WPKH" || addressType === "P2TR" ? await walletProvider.signBip322Message(message) : await walletProvider.signEcdsaMessage(message);
+    const signature = usesBip322MessageSigning(detectBitcoinAddressType(address)) ? await walletProvider.signBip322Message(message) : await walletProvider.signEcdsaMessage(message);
     const result = await this.authenticate({ message, signature, address, publicKey });
     this.setRadfiAccessToken(result.accessToken, result.refreshToken);
     return { ...result, publicKey };
   }
   /**
-   * Ensure a valid Radfi access token is set on this provider.
-   * If a token exists, validates it via the Radfi API.
+   * Ensure a valid Bound Exchange access token is set on this provider.
+   * If a token exists, validates it via the Bound Exchange API.
    * If invalid, tries refreshing with the refresh token first.
    * If refresh also fails, falls back to full re-authentication (BIP322 sign).
    */
@@ -14541,7 +14638,7 @@ var RadfiProvider = class {
     });
     if (!res.ok) {
       const err = await res.json();
-      throw new RadfiApiError(res.status, err, "Radfi authentication failed");
+      throw new RadfiApiError(res.status, err, "Bound Exchange authentication failed");
     }
     return res.json().then((r) => ({
       accessToken: r.data?.accessToken ?? "",
@@ -14633,12 +14730,20 @@ var RadfiProvider = class {
         }
       })
     });
-    if (!res.ok) {
-      const err = await res.json();
-      throw new RadfiApiError(res.status, err, "Radfi transaction request failed");
+    const body = await res.json();
+    if (!res.ok || !body?.data) {
+      throw new RadfiApiError(res.status, body, "Bound Exchange transaction request failed");
     }
-    return res.json().then((r) => r.data);
+    return body.data;
   }
+  /**
+   * Co-sign and broadcast a `sodax-withdraw` deposit via the Bound Exchange API.
+   *
+   * `relayData` ({ address, payload }) is the same `RelayExtraData` the SDK returns from
+   * `createIntent()` / money-market supply etc. It is optional and non-breaking: when supplied,
+   * the Bound Exchange backend persists it so it can auto-resubmit the intent relay if the relay
+   * gets stuck (otherwise a stuck relay eventually refunds instead of completing the swap).
+   */
   async requestRadfiSignature(params, accessToken) {
     const res = await this.request("/sodax/transaction/sign", {
       method: "POST",
@@ -14652,7 +14757,7 @@ var RadfiProvider = class {
     });
     if (!res.ok) {
       const err = await res.json();
-      throw new RadfiApiError(res.status, err, "Radfi signature request failed");
+      throw new RadfiApiError(res.status, err, "Bound Exchange signature request failed");
     }
     return res.json().then((r) => r.data.txId);
   }
@@ -14676,7 +14781,7 @@ var RadfiProvider = class {
     return res.json();
   }
   /**
-   * Build a renew-utxo transaction via the Radfi API.
+   * Build a renew-utxo transaction via the Bound Exchange API.
    * Returns a PSBT that needs to be signed by the user.
    */
   async buildRenewUtxoTransaction(params, accessToken) {
@@ -14700,8 +14805,8 @@ var RadfiProvider = class {
     return res.json().then((r) => r.data);
   }
   /**
-   * Sign and broadcast a renew-utxo transaction via the Radfi API.
-   * The user signs the PSBT first, then Radfi co-signs and broadcasts.
+   * Sign and broadcast a renew-utxo transaction via the Bound Exchange API.
+   * The user signs the PSBT first, then Bound Exchange co-signs and broadcasts.
    */
   async signAndBroadcastRenewUtxo(params, accessToken) {
     const res = await this.request("/transactions/sign", {
@@ -14742,7 +14847,7 @@ var RadfiProvider = class {
     return res.json().then((r) => r.data);
   }
   /**
-   * Sign and broadcast a withdraw transaction via Radfi.
+   * Sign and broadcast a withdraw transaction via Bound Exchange.
    */
   async signAndBroadcastWithdraw(params, accessToken) {
     const res = await this.request("/transactions/sign", {
@@ -14796,7 +14901,20 @@ var RadfiProvider = class {
 };
 
 // src/shared/entities/btc/btc-utils.ts
-function estimateBitcoinTxSize(inputCount, outputCount, addressType) {
+var BITCOIN_FEE_SAFETY_VBYTES = 20;
+function calcOpReturnOutputVbytes(payloadByteLength) {
+  let scriptSize;
+  if (payloadByteLength <= 75) {
+    scriptSize = 3 + payloadByteLength;
+  } else if (payloadByteLength <= 255) {
+    scriptSize = 4 + payloadByteLength;
+  } else {
+    scriptSize = 5 + payloadByteLength;
+  }
+  const scriptLenVarint = scriptSize <= 252 ? 1 : 3;
+  return 8 + scriptLenVarint + scriptSize;
+}
+function estimateBitcoinTxSize(inputCount, outputCount, addressType, opReturnOutputVbytes = 44) {
   let inputWeight;
   switch (addressType) {
     case "P2PKH":
@@ -14812,7 +14930,9 @@ function estimateBitcoinTxSize(inputCount, outputCount, addressType) {
       inputWeight = 68;
       break;
   }
-  return Math.ceil(10.5 + 44 + inputCount * inputWeight + outputCount * 31);
+  return Math.ceil(
+    10.5 + opReturnOutputVbytes + BITCOIN_FEE_SAFETY_VBYTES + inputCount * inputWeight + outputCount * 31
+  );
 }
 function encodeBtcPayloadToBytes(payload) {
   return JSON.stringify({
@@ -14829,6 +14949,10 @@ function normalizePsbtToBase64(signedPsbt) {
   const isHex = /^[0-9a-fA-F]+$/.test(signedPsbt);
   return isHex ? Buffer.from(signedPsbt, "hex").toString("base64") : signedPsbt;
 }
+function normalizeSignatureToBase64(signature) {
+  const isHex = /^[0-9a-fA-F]+$/.test(signature);
+  return isHex ? Buffer.from(signature, "hex").toString("base64") : signature;
+}
 
 // src/shared/services/spoke/BitcoinSpokeService.ts
 bitcoinjsLib.initEccLib(ecc__namespace);
@@ -14937,7 +15061,7 @@ var BitcoinSpokeService = class {
     return BigInt(totalBalance);
   }
   /**
-   * Fund the Radfi trading wallet by sending BTC from the user's personal wallet
+   * Fund the Bound Exchange trading wallet by sending BTC from the user's personal wallet
    *
    * @param {bigint} amount - Amount in satoshis to send
    * @param {BitcoinSpokeProvider} spokeProvider - The Bitcoin spoke provider (must have signing capability)
@@ -14961,10 +15085,28 @@ var BitcoinSpokeService = class {
   async sendMessage(params) {
     return await this.encodeWithdrawalData(params);
   }
+  /**
+   * Build the relay submit/poll identity for an on-demand action (borrow/withdraw).
+   *
+   * Bitcoin borrow/withdraw are on-demand: there is no broadcast transaction — the spoke result is
+   * the signed payload JSON produced by {@link encodeWithdrawalData}/{@link sendMessage}. The relay
+   * accepts the submit under the literal `withdraw` tx_hash with the signed payload (as a JSON object)
+   * in `data`, then tracks the resulting packet under a derived id: `od:` + keccak256 of the ASCII
+   * `payload_hex` string (hash the hex characters, not the decoded bytes). Polling must use that
+   * derived id (`pollTxHash`), not `withdraw`.
+   *
+   * @param tx - The JSON-stringified signed payload returned by `sendMessage` / `encodeWithdrawalData`.
+   */
+  getOnDemandRelayIdentity(tx) {
+    const data = JSON.parse(tx);
+    const payloadHex = data.payload_hex.startsWith("0x") ? data.payload_hex.slice(2) : data.payload_hex;
+    const pollTxHash = `od:${viem.keccak256(viem.stringToBytes(payloadHex)).slice(2)}`;
+    return { srcTxHash: "withdraw", data, pollTxHash };
+  }
   /**
    * Build a priority Bitcoin transaction with proper fee calculation
    */
-  async buildBitcoinTransaction(utxos, outputs, changeAddress, chainId, walletProvider, feeRate) {
+  async buildBitcoinTransaction(utxos, outputs, changeAddress, chainId, walletProvider, feeRate, opReturnOutputVbytes) {
     const psbt = new bitcoinjsLib.Psbt({ network: this.getBtcNetwork(chainId) });
     const effectiveFeeRate = feeRate ?? await this.getFeeRateEstimate();
     const walletAddress = await walletProvider.getWalletAddress();
@@ -15027,7 +15169,7 @@ var BitcoinSpokeService = class {
         });
       }
       inputSum += utxo.value;
-      const estimatedSize = estimateBitcoinTxSize(psbt.inputCount, outputs.length, addressType);
+      const estimatedSize = estimateBitcoinTxSize(psbt.inputCount, outputs.length, addressType, opReturnOutputVbytes);
       const estimatedFee = Math.ceil(effectiveFeeRate * estimatedSize);
       if (inputSum >= outputSum + estimatedFee + DUST_THRESHOLD) {
         break;
@@ -15039,8 +15181,13 @@ var BitcoinSpokeService = class {
         value: output.value
       });
     }
-    const sizeWithChange = estimateBitcoinTxSize(psbt.inputCount, outputs.length + 1, addressType);
-    const sizeWithoutChange = estimateBitcoinTxSize(psbt.inputCount, outputs.length, addressType);
+    const sizeWithChange = estimateBitcoinTxSize(
+      psbt.inputCount,
+      outputs.length + 1,
+      addressType,
+      opReturnOutputVbytes
+    );
+    const sizeWithoutChange = estimateBitcoinTxSize(psbt.inputCount, outputs.length, addressType, opReturnOutputVbytes);
     const feeWithChange = Math.ceil(effectiveFeeRate * sizeWithChange);
     const feeWithoutChange = Math.ceil(effectiveFeeRate * sizeWithoutChange);
     let change = inputSum - outputSum - feeWithChange;
@@ -15109,7 +15256,12 @@ var BitcoinSpokeService = class {
         return await this.radfi.requestRadfiSignature(
           {
             userAddress: from,
-            signedBase64Tx
+            signedBase64Tx,
+            // Forward the relay identity ({ hub wallet address, full payload }) so the Bound Exchange
+            // backend can auto-resubmit the intent relay if it gets stuck. `to` is the hub wallet
+            // (relayData.address) and `data` is the full payload (relayData.payload) — the same pair
+            // feature services return as `relayData` from createIntent()/supply().
+            relayData: { address: params.to, payload: data }
           },
           accessToken
         );
@@ -15119,7 +15271,11 @@ var BitcoinSpokeService = class {
           "Raw mode is not supported for normal Bitcoin deposits. Use TRADING wallet mode for raw transactions."
         );
       }
-      const utxos = await this.fetchUTXOs(from);
+      const [allUtxos, mempoolSpent] = await Promise.all([
+        this.fetchUTXOs(from),
+        this.fetchMempoolSpentOutpoints(from)
+      ]);
+      const utxos = allUtxos.filter((u) => !mempoolSpent.has(`${u.txid}:${u.vout}`));
       if (!utxos?.length) {
         throw new Error("No UTXOs available for deposit");
       }
@@ -15134,7 +15290,7 @@ var BitcoinSpokeService = class {
       );
       return await this.signAndBroadcastTransaction(depositPsbt, params.walletProvider);
     } catch (error) {
-      console.error("Error during deposit:", error);
+      this.config.logger.error("Error during deposit", error);
       throw error;
     }
   }
@@ -15142,22 +15298,37 @@ var BitcoinSpokeService = class {
    * Build deposit PSBT with embedded cross-chain data
    */
   async buildDepositPsbt(walletAddress, walletProvider, srcChainKey, token, amount, data, utxos) {
-    const assetManagerAddress = this.config.getChainConfig(srcChainKey).addresses.assetManager;
-    if (token.toLocaleLowerCase() === "btc") {
+    const chainConfig = this.config.getChainConfig(srcChainKey);
+    const assetManagerAddress = chainConfig.addresses.assetManager;
+    const normalizedToken = token.toLocaleLowerCase();
+    const nativeBtcTokens = new Set(
+      ["btc", chainConfig.nativeToken, chainConfig.supportedTokens.BTC?.address].filter((value) => !!value).map((value) => value.toLocaleLowerCase())
+    );
+    const isNativeBtc = nativeBtcTokens.has(normalizedToken);
+    if (isNativeBtc) {
+      const OP_RETURN = bitcoinjsLib.opcodes.OP_RETURN;
+      const OP_12 = bitcoinjsLib.opcodes.OP_12;
+      if (OP_RETURN === void 0 || OP_12 === void 0) {
+        throw new Error("bitcoinjs-lib opcodes OP_RETURN or OP_12 are undefined");
+      }
+      const OP_RADFI_SODAX_DATA = 49;
+      const payload = Buffer.concat([Buffer.from([OP_RADFI_SODAX_DATA]), Buffer.from(data.slice(2), "hex")]);
+      const opReturnOutputVbytes = calcOpReturnOutputVbytes(payload.length);
       const outputs = [
         {
           address: assetManagerAddress,
           value: Number(amount)
         }
       ];
-      const psbt = await this.buildBitcoinTransaction(utxos, outputs, walletAddress, srcChainKey, walletProvider);
-      const OP_RADFI_SODAX_DATA = 49;
-      const payload = Buffer.concat([Buffer.from([OP_RADFI_SODAX_DATA]), Buffer.from(data.slice(2), "hex")]);
-      const OP_RETURN = bitcoinjsLib.opcodes.OP_RETURN;
-      const OP_12 = bitcoinjsLib.opcodes.OP_12;
-      if (OP_RETURN === void 0 || OP_12 === void 0) {
-        throw new Error("bitcoinjs-lib opcodes OP_RETURN or OP_12 are undefined");
-      }
+      const psbt = await this.buildBitcoinTransaction(
+        utxos,
+        outputs,
+        walletAddress,
+        srcChainKey,
+        walletProvider,
+        void 0,
+        opReturnOutputVbytes
+      );
       const compiledScript = bitcoinjsLib.script.compile([OP_RETURN, OP_12, payload]);
       psbt.addOutput({
         script: compiledScript,
@@ -15177,6 +15348,27 @@ var BitcoinSpokeService = class {
     }
     return await response.json();
   }
+  /**
+   * Returns the set of "txid:vout" outpoints currently being spent by
+   * unconfirmed transactions in the mempool for the given address.
+   * Used to prevent double-spend when building a new PSBT.
+   */
+  async fetchMempoolSpentOutpoints(address) {
+    try {
+      const response = await fetch(`${this.rpcUrl}/address/${address}/txs/mempool`);
+      if (!response.ok) return /* @__PURE__ */ new Set();
+      const mempoolTxs = await response.json();
+      const spent = /* @__PURE__ */ new Set();
+      for (const tx of mempoolTxs) {
+        for (const input of tx.vin) {
+          spent.add(`${input.txid}:${input.vout}`);
+        }
+      }
+      return spent;
+    } catch {
+      return /* @__PURE__ */ new Set();
+    }
+  }
   /**
    * Fetch raw transaction hex
    */
@@ -15192,7 +15384,7 @@ var BitcoinSpokeService = class {
     let srcAddress = from;
     const addressType = detectBitcoinAddressType(from);
     if (walletMode === "TRADING") {
-      srcAddress = await this.radfi.getTradingWallet(srcAddress).then((res) => res.tradingAddress).catch(() => srcAddress);
+      srcAddress = (await this.radfi.getTradingWallet(srcAddress)).tradingAddress;
     }
     const payload = {
       src_address: srcAddress,
@@ -15211,8 +15403,12 @@ var BitcoinSpokeService = class {
     if (params.raw === true) {
       return JSON.stringify(onDemandWithdraw);
     }
-    const signature = await params.walletProvider.signEcdsaMessage(orderedPayload);
-    onDemandWithdraw.signature = signature;
+    if (!params.walletProvider.getPublicKey) {
+      throw new Error("Wallet provider does not support getPublicKey");
+    }
+    const rawSignature = usesBip322MessageSigning(addressType) ? await params.walletProvider.signBip322Message(orderedPayload) : await params.walletProvider.signEcdsaMessage(orderedPayload);
+    onDemandWithdraw.signature = normalizeSignatureToBase64(rawSignature);
+    onDemandWithdraw.public_key = await params.walletProvider.getPublicKey();
     return JSON.stringify(onDemandWithdraw);
   }
   /**
@@ -15220,8 +15416,14 @@ var BitcoinSpokeService = class {
    */
   async signAndBroadcastTransaction(psbt, walletProvider) {
     const psbtBase64 = typeof psbt === "string" ? psbt : psbt.toBase64();
-    const signedPsbtHex = await walletProvider.signTransaction(psbtBase64);
-    const txHash = await this.broadcastTransaction(signedPsbtHex);
+    const signedRaw = await walletProvider.signTransaction(psbtBase64, false);
+    const signedPsbt = bitcoinjsLib.Psbt.fromBase64(normalizePsbtToBase64(signedRaw));
+    try {
+      signedPsbt.finalizeAllInputs();
+    } catch {
+    }
+    const txHex = signedPsbt.extractTransaction().toHex();
+    const txHash = await this.broadcastTransaction(txHex);
     return txHash;
   }
   /**
@@ -17460,7 +17662,7 @@ function base64Decode(str) {
 }
 var encoder = new TextEncoder();
 var decoder = new TextDecoder();
-function stringToBytes(str) {
+function stringToBytes2(str) {
   return encoder.encode(str);
 }
 function bytesToString(bytes) {
@@ -20857,7 +21059,7 @@ var JsonRpcProvider = class {
     };
   }
   async viewContractState({ contractId, prefix: prefix2, blockQuery = { finality: DEFAULT_FINALITY } }) {
-    const prefixBase64 = base64Encode(stringToBytes(prefix2 || ""));
+    const prefixBase64 = base64Encode(stringToBytes2(prefix2 || ""));
     let reference;
     if ("blockId" in blockQuery) {
       reference = { block_id: blockQuery.blockId };
@@ -20885,7 +21087,7 @@ var JsonRpcProvider = class {
     }
   }
   async callFunctionRaw({ contractId, method, args, blockQuery = { finality: DEFAULT_FINALITY } }) {
-    const argsBytes = args instanceof Uint8Array ? args : stringToBytes(JSON.stringify(args));
+    const argsBytes = args instanceof Uint8Array ? args : stringToBytes2(JSON.stringify(args));
     const argsBase64 = base64Encode(argsBytes);
     if ("blockId" in blockQuery) {
       return this.query({
@@ -21151,6 +21353,7 @@ var JsonRpcProvider = class {
 
 // src/shared/services/spoke/NearSpokeService.ts
 var NEAR_DEFAULT_GAS = BigInt("300000000000000");
+var NEAR_STORAGE_DEPOSIT = BigInt("1250000000000000000000");
 var NearSpokeService = class {
   config;
   rpcProvider;
@@ -21200,7 +21403,7 @@ var NearSpokeService = class {
       token: Array.from(Buffer.from(fillData.token, "utf-8"))
     };
   }
-  async fillIntent(fromInfo, fillData, deposit = BigInt("0"), gas = BigInt("300000000000000")) {
+  async fillIntent(fromInfo, fillData, deposit = BigInt("1"), gas = BigInt("300000000000000")) {
     const intentFiller = this.config.getChainConfig(fromInfo.srcChainKey).addresses.intentFiller;
     if (isNativeToken(fromInfo.srcChainKey, fillData.token)) {
       deposit = BigInt(fillData.amount);
@@ -21274,7 +21477,8 @@ var NearSpokeService = class {
               data: inputParams.data
             })
           },
-          deposit: BigInt("0"),
+          // NEP-141 requires exactly 1 yoctoNEAR attached to ft_transfer_call.
+          deposit: BigInt("1"),
           gas: NEAR_DEFAULT_GAS
         }
       };
@@ -21305,6 +21509,52 @@ var NearSpokeService = class {
     }
     return BigInt(bal);
   }
+  /**
+   * Whether `accountId` is storage-registered on a NEP-141 `token` contract. NEP-141 requires an
+   * account to pay a one-time storage bond before it can receive (hold a balance of) the token, so
+   * this gates any leg that delivers a token to a user on NEAR (swap output on NEAR, bridge into
+   * NEAR, money-market borrow/withdraw to NEAR).
+   *
+   * Native NEAR is not a NEP-141 token and has no storage registration, so this returns `true` for
+   * the native token. The view goes through {@link queryContract}, i.e. the configurable RPC from
+   * chain config — a custom `rpcUrl` passed to the SDK is honoured.
+   */
+  async isStorageRegistered(token, accountId) {
+    if (isNativeToken(ChainKeys.NEAR_MAINNET, token)) {
+      return true;
+    }
+    const balance = await this.queryContract(token, "storage_balance_of", { account_id: accountId });
+    return balance != null;
+  }
+  /**
+   * Build (and, unless `raw`, submit) a NEP-141 `storage_deposit` registration for `accountId` on
+   * the `token` contract. Call this when {@link isStorageRegistered} is `false` before a token is
+   * delivered to the account on NEAR.
+   *
+   * Native NEAR has no storage registration — passing the native token throws.
+   *
+   * @param params.deposit Storage bond to attach; defaults to {@link NEAR_STORAGE_DEPOSIT}
+   *   (0.00125 NEAR). Override per token if its `storage_balance_bounds.min` differs.
+   */
+  async registerStorage(params) {
+    if (isNativeToken(ChainKeys.NEAR_MAINNET, params.token)) {
+      throw new Error("[NearSpokeService.registerStorage] Native NEAR has no NEP-141 storage registration.");
+    }
+    const tx = {
+      signerId: params.accountId,
+      params: {
+        contractId: params.token,
+        method: "storage_deposit",
+        args: { account_id: params.accountId, registration_only: true },
+        deposit: params.deposit ?? NEAR_STORAGE_DEPOSIT,
+        gas: NEAR_DEFAULT_GAS
+      }
+    };
+    if (params.raw === true) {
+      return tx;
+    }
+    return params.walletProvider.signAndSubmitTxn(tx);
+  }
   /**
    * Sends a message to the hub chain.
    * @param {SendMessageParams} params - Includes dstChainKey, the chain key of the hub chain.
@@ -22105,17 +22355,11 @@ var SuiSpokeService = class {
       ]
     });
     if (params.raw === true) {
-      tx.setSender(from);
-      const transactionRaw = await tx.build({
-        client: this.publicClient,
-        onlyTransactionKind: true
-      });
-      const transactionRawBase64String = Buffer.from(transactionRaw).toString("base64");
       return {
         from,
         to: `${assetManager.packageId}::${assetManager.moduleId}::transfer`,
         value: amount,
-        data: transactionRawBase64String
+        data: tx.serialize()
       };
     }
     return params.walletProvider.signAndExecuteTxn(tx);
@@ -22135,17 +22379,11 @@ var SuiSpokeService = class {
       ]
     });
     if (params.raw === true) {
-      txb.setSender(from);
-      const transactionRaw = await txb.build({
-        client: this.publicClient,
-        onlyTransactionKind: true
-      });
-      const transactionRawBase64String = Buffer.from(transactionRaw).toString("base64");
       return {
         from,
         to: `${connection.packageId}::${connection.moduleId}::send_message_ua`,
         value: 0n,
-        data: transactionRawBase64String
+        data: txb.serialize()
       };
     }
     return params.walletProvider.signAndExecuteTxn(txb);
@@ -22156,7 +22394,7 @@ var SuiSpokeService = class {
    * @returns {Promise<bigint>} The estimated computation cost.
    */
   async estimateGas({ tx }) {
-    const txb = transactions.Transaction.fromKind(tx.data);
+    const txb = transactions.Transaction.from(tx.data);
     const result = await this.publicClient.devInspectTransactionBlock({
       sender: tx.from,
       transactionBlock: txb
@@ -22387,6 +22625,7 @@ var CustomStellarAccount = class {
   decrementSequenceNumber() {
     if (this.sequenceNumber > this.startingSequenceNumber) {
       this.sequenceNumber--;
+      return;
     }
     throw new Error(
       `Sequence number cannot be decremented below the starting sequence number: ${this.startingSequenceNumber}`
@@ -22493,7 +22732,7 @@ var StellarSpokeService = class {
       );
       const assembledPriorityTx = stellarSdk.rpc.assembleTransaction(rawPriorityTx, simulation).build();
       if (params.raw) {
-        const transactionXdr = rawPriorityTx.toXDR();
+        const transactionXdr = assembledPriorityTx.toXDR();
         return {
           from,
           to: this.config.getChainConfig(srcChainKey).addresses.assetManager,
@@ -22512,13 +22751,13 @@ var StellarSpokeService = class {
       );
       return `${hash}`;
     } catch (error) {
-      console.error("Error during sendMessage:", error);
+      this.config.logger.error("Error during sendMessage", error);
       throw error;
     }
   }
   handleSendTransactionError(response) {
     if (response.status === "ERROR") {
-      console.error(JSON.stringify(response, null, 2));
+      this.config.logger.error(JSON.stringify(response, null, 2));
       throw new Error(JSON.stringify(response, null, 2));
     }
     return response;
@@ -22610,7 +22849,7 @@ var StellarSpokeService = class {
       );
       const assembledPriorityTx = stellarSdk.rpc.assembleTransaction(rawPriorityTx, simulation).build();
       if (params.raw) {
-        const transactionXdr = rawPriorityTx.toXDR();
+        const transactionXdr = assembledPriorityTx.toXDR();
         return {
           from,
           to: this.config.getChainConfig(srcChainKey).addresses.assetManager,
@@ -22629,7 +22868,7 @@ var StellarSpokeService = class {
       );
       return `${hash}`;
     } catch (error) {
-      console.error("Error during deposit:", error);
+      this.config.logger.error("Error during deposit", error);
       throw error;
     }
   }
@@ -22657,7 +22896,7 @@ var StellarSpokeService = class {
       (balance2) => "limit" in balance2 && "balance" in balance2 && "asset_code" in balance2 && trustlineConfig.assetCode.toLowerCase() === balance2.asset_code?.toLowerCase() && "asset_issuer" in balance2 && trustlineConfig.assetIssuer.toLowerCase() === balance2.asset_issuer?.toLowerCase()
     );
     if (!tokenBalance) {
-      console.error(`No token balances found for token: ${token}`);
+      this.config.logger.error(`No token balances found for token: ${token}`);
       return false;
     }
     const limit = parseToStroops(tokenBalance.limit);
@@ -22706,7 +22945,7 @@ var StellarSpokeService = class {
       const hash = await this.signAndSendTransaction(walletProvider, transaction);
       return `${hash}`;
     } catch (error) {
-      console.error("Error during requestTrustline:", error);
+      this.config.logger.error("Error during requestTrustline", error);
       throw error;
     }
   }
@@ -23565,7 +23804,7 @@ var SpokeService = class _SpokeService {
       }
       default: {
         const exhaustiveCheck = chainType;
-        console.log(exhaustiveCheck);
+        this.config.logger.debug("Unhandled exhaustive case", { value: exhaustiveCheck });
         throw new Error(`[getSpokeService] Invalid chain type. Valid chain types: ${ChainTypeArr.join(", ")}`);
       }
     }
@@ -23738,7 +23977,7 @@ var SpokeService = class _SpokeService {
         }
         default: {
           const exhaustiveCheck = chainType;
-          console.log(exhaustiveCheck);
+          this.config.logger.debug("Unhandled exhaustive case", { value: exhaustiveCheck });
           return {
             ok: false,
             error: new Error(`[estimateGas] Invalid chain type. Valid chain types: ${ChainTypeArr.join(", ")}`)
@@ -23845,17 +24084,17 @@ var SpokeService = class _SpokeService {
           args: [params.srcChainId, params.srcAddress, params.payload]
         })
       });
-      console.warn("simulateRecvMessage did not revert as expected", { result });
+      this.config.logger.warn("simulateRecvMessage did not revert as expected", { result });
       return {
         ok: false,
         error: new Error('Function should have reverted with "Simulation completed"')
       };
     } catch (error) {
       if (error instanceof Error && error.message?.includes("Simulation completed")) {
-        console.warn("simulateRecvMessage completed successfully with expected revert");
+        this.config.logger.warn("simulateRecvMessage completed successfully with expected revert");
         return { ok: true, value: true };
       }
-      console.error("simulateRecvMessage failed with unexpected error:", error);
+      this.config.logger.error("simulateRecvMessage failed with unexpected error", error);
       return { ok: false, error };
     }
   }
@@ -23940,7 +24179,7 @@ var SpokeService = class _SpokeService {
         }
         default: {
           const exhaustiveCheck = chainType;
-          console.log(exhaustiveCheck);
+          this.config.logger.debug("Unhandled exhaustive case", { value: exhaustiveCheck });
           return {
             ok: false,
             error: new Error(`[deposit] Invalid chain type. Valid chain types: ${ChainTypeArr.join(", ")}`)
@@ -24017,7 +24256,7 @@ var SpokeService = class _SpokeService {
         }
         default: {
           const exhaustiveCheck = chainType;
-          console.log(exhaustiveCheck);
+          this.config.logger.debug("Unhandled exhaustive case", { value: exhaustiveCheck });
           return {
             ok: false,
             error: new Error(`[getDeposit] Invalid chain type. Valid chain types: ${ChainTypeArr.join(", ")}`)
@@ -24126,7 +24365,7 @@ var SpokeService = class _SpokeService {
         }
         default: {
           const exhaustiveCheck = chainType;
-          console.log(exhaustiveCheck);
+          this.config.logger.debug("Unhandled exhaustive case", { value: exhaustiveCheck });
           return {
             ok: false,
             error: new Error(`[sendMessage] Invalid chain type. Valid chain types: ${ChainTypeArr.join(", ")}`)
@@ -24205,10 +24444,10 @@ var SpokeService = class _SpokeService {
       if (isSolanaChainKeyType(chainKey)) {
         const result = await this.solana.waitForTransactionReceipt({ txHash, chainKey });
         if (!result.ok || result.value.status !== "success") {
-          console.warn(
+          this.config.logger.warn(
             `Solana verifyTxHash failed: ${!result.ok ? result.error : "error" in result.value ? result.value.error : "unknown"}`
           );
-          console.warn("Returning true to assume transaction exists on chain in future ");
+          this.config.logger.warn("Returning true to assume transaction exists on chain in future ");
           return { ok: true, value: true };
         }
         return { ok: true, value: true };
@@ -24295,7 +24534,7 @@ var SpokeService = class _SpokeService {
         }
         default: {
           const exhaustiveCheck = chainType;
-          console.log(exhaustiveCheck);
+          this.config.logger.debug("Unhandled exhaustive case", { value: exhaustiveCheck });
           return { ok: false, error: new Error(`waitForTransactionReceipt not supported for ${params.chainKey}`) };
         }
       }
@@ -25346,6 +25585,7 @@ var EvmHubProvider = class {
 };
 
 // src/swap/SolverApiService.ts
+var bigintReplacer = (_key, value) => typeof value === "bigint" ? value.toString() : value;
 var SolverApiService = class {
   constructor() {
   }
@@ -25414,13 +25654,16 @@ var SolverApiService = class {
         }
       };
     } catch (e) {
-      console.error(`[SolverApiService.getQuote] failed. Details: ${JSON.stringify(e)}`);
+      configService.logger.error(
+        "[SolverApiService.getQuote] failed",
+        e instanceof Error ? e : new Error(JSON.stringify(e, bigintReplacer))
+      );
       return {
         ok: false,
         error: {
           detail: {
             code: exports.SolverIntentErrorCode.UNKNOWN,
-            message: e ? JSON.stringify(e) : "Unknown error"
+            message: e ? JSON.stringify(e, bigintReplacer) : "Unknown error"
           }
         }
       };
@@ -25437,7 +25680,7 @@ var SolverApiService = class {
    * @param config - Solver endpoint configuration.
    * @returns A `Result` containing `{ answer: 'OK', intent_hash: Hex }` on success.
    */
-  static async postExecution(request, config) {
+  static async postExecution(request, config, logger = silentLogger) {
     try {
       const response = await retry(
         () => fetch(`${config.solverApiEndpoint}/execute`, {
@@ -25459,13 +25702,16 @@ var SolverApiService = class {
         value: await response.json()
       };
     } catch (e) {
-      console.error(`[SolverApiService.postExecution] failed. Details: ${JSON.stringify(e)}`);
+      logger.error(
+        "[SolverApiService.postExecution] failed",
+        e instanceof Error ? e : new Error(JSON.stringify(e, bigintReplacer))
+      );
       return {
         ok: false,
         error: {
           detail: {
             code: exports.SolverIntentErrorCode.UNKNOWN,
-            message: e ? JSON.stringify(e) : "Unknown error"
+            message: e ? JSON.stringify(e, bigintReplacer) : "Unknown error"
           }
         }
       };
@@ -25480,7 +25726,7 @@ var SolverApiService = class {
    *   `fill_tx_hash` is set only when `status === SolverIntentStatusCode.SOLVED (3)`.
    * @throws Invariant error if `intent_tx_hash` is empty (thrown before the async request).
    */
-  static async getStatus(request, config) {
+  static async getStatus(request, config, logger = silentLogger) {
     invariant(request.intent_tx_hash.length > 0, "Empty intent_tx_hash");
     try {
       const response = await fetch(`${config.solverApiEndpoint}/status`, {
@@ -25501,13 +25747,16 @@ var SolverApiService = class {
         value: await response.json()
       };
     } catch (e) {
-      console.error(`[SolverApiService.getStatus] failed. Details: ${JSON.stringify(e)}`);
+      logger.error(
+        "[SolverApiService.getStatus] failed",
+        e instanceof Error ? e : new Error(JSON.stringify(e, bigintReplacer))
+      );
       return {
         ok: false,
         error: {
           detail: {
             code: exports.SolverIntentErrorCode.UNKNOWN,
-            message: e ? JSON.stringify(e) : "Unknown error"
+            message: e ? JSON.stringify(e, bigintReplacer) : "Unknown error"
           }
         }
       };
@@ -25627,7 +25876,7 @@ var SwapService = class {
    *   `fill_tx_hash` is populated only when `status === SolverIntentStatusCode.SOLVED (3)`.
    */
   async getStatus(request) {
-    return SolverApiService.getStatus(request, this.solver);
+    return SolverApiService.getStatus(request, this.solver, this.config.logger);
   }
   /**
    * Notifies the solver API that an intent has been registered on the hub chain, triggering
@@ -25650,7 +25899,7 @@ var SwapService = class {
    */
   async postExecution(request) {
     try {
-      const result = await SolverApiService.postExecution(request, this.solver);
+      const result = await SolverApiService.postExecution(request, this.solver, this.config.logger);
       if (result.ok) return result;
       const detail = result.error?.detail ?? {
         code: -999,
@@ -25923,7 +26172,7 @@ var SwapService = class {
    * - `raw: false` — broadcasts the transaction; `walletProvider` is required and must match `K`.
    *
    * Validates tokens and chain keys against the active `ConfigService` before constructing the
-   * intent. Bitcoin source chains require an additional RadFi access token step.
+   * intent. Bitcoin source chains require an additional Bound Exchange access token step.
    *
    * @param _params - Intent parameters, source chain key, wallet provider (when `raw: false`),
    *   and optional `skipSimulation` flag.
@@ -28404,11 +28653,13 @@ var MigrationService = class {
 
 // src/backendApi/BackendApiService.ts
 var BackendApiService = class {
-  constructor(config) {
+  constructor(config, logger = consoleLogger) {
     this.config = config;
     this.headers = { ...config.headers };
+    this.logger = logger;
   }
   headers;
+  logger;
   /**
    * Execute a single HTTP request and return the parsed JSON body.
    *
@@ -28447,10 +28698,10 @@ var BackendApiService = class {
         if (error.name === "AbortError") {
           throw new Error("REQUEST_TIMEOUT", { cause: new Error(`Request timeout after ${timeout}ms`) });
         }
-        console.error("[BackendApiService] Request error:", error.message);
+        this.logger.error("[BackendApiService] Request error", error);
         throw error;
       }
-      console.error("[BackendApiService] Unknown error:", error);
+      this.logger.error("[BackendApiService] Unknown error", error);
       throw new Error("UNKNOWN_REQUEST_ERROR", { cause: error });
     }
   }
@@ -29120,7 +29371,7 @@ var BridgeService = class {
    * transaction simulation or batching). When `raw` is `false`, signs and submits the deposit
    * transaction via the provided wallet provider.
    *
-   * Bitcoin is only supported with `raw: false` because it requires the RadFi trading wallet
+   * Bitcoin is only supported with `raw: false` because it requires the Bound Exchange trading wallet
    * derivation flow.
    *
    * @param _params - Bridge parameters including source/destination chain keys, token addresses,
@@ -29153,9 +29404,12 @@ var BridgeService = class {
           { ...baseCtx, field: "walletProvider" }
         );
         walletAddress = await this.spoke.bitcoin.getEffectiveWalletAddress(personalAddress);
-        await this.spoke.bitcoin.radfi.ensureRadfiAccessToken(_params.walletProvider);
+        if (this.spoke.bitcoin.walletMode === "TRADING") {
+          await this.spoke.bitcoin.radfi.ensureRadfiAccessToken(_params.walletProvider);
+        }
       }
-      const hubWallet = await this.hubProvider.getUserHubWalletAddress(params.srcAddress, params.srcChainKey);
+      const hubWallet = await this.hubProvider.getUserHubWalletAddress(walletAddress, params.srcChainKey);
+      const effectiveSkipSimulation = skipSimulation || isBitcoinChainKeyType(params.srcChainKey) && this.spoke.bitcoin.walletMode === "USER";
       const data = this.buildBridgeData(params, srcToken, dstToken, this.config.bridge.partnerFee);
       const coreParams = {
         srcChainKey: params.srcChainKey,
@@ -29164,7 +29418,7 @@ var BridgeService = class {
         token: params.srcToken,
         amount: params.amount,
         data,
-        skipSimulation
+        skipSimulation: effectiveSkipSimulation
       };
       const txResult = await this.spoke.deposit(
         _params.raw ? {
@@ -29177,7 +29431,7 @@ var BridgeService = class {
         }
       );
       if (!txResult.ok) {
-        console.error(txResult.error);
+        this.config.logger.error("createBridgeIntent failed", txResult.error);
         if (isBridgeCreateIntentError(txResult.error)) return { ok: false, error: txResult.error };
         return {
           ok: false,
@@ -29192,7 +29446,7 @@ var BridgeService = class {
         }
       };
     } catch (error) {
-      console.error(error);
+      this.config.logger.error("createBridgeIntent failed", error);
       if (isBridgeCreateIntentError(error)) return { ok: false, error };
       return {
         ok: false,
@@ -29362,7 +29616,7 @@ var BridgeService = class {
         value: availableDepositNormalised.isLessThan(assetManagerBalanceNormalised) ? { amount: availableDeposit, decimals: fromTokenInfo.decimals, type: "DEPOSIT_LIMIT" } : { amount: assetManagerBalance, decimals: toTokenInfo.decimals, type: "WITHDRAWAL_LIMIT" }
       };
     } catch (error) {
-      console.error(error);
+      this.config.logger.error("getBridgeableAmount failed", error);
       if (isBridgeLookupError(error)) return { ok: false, error };
       return {
         ok: false,
@@ -29409,7 +29663,7 @@ var BridgeService = class {
       });
       return srcToken.vault.toLowerCase() === dstToken.vault.toLowerCase();
     } catch (error) {
-      console.error(error);
+      this.config.logger.error("isBridgeable check failed", error);
       return false;
     }
   }
@@ -31799,7 +32053,7 @@ var ClService = class _ClService {
       };
       const txResult = await this.spoke.sendMessage(sendMessageParams);
       if (!txResult.ok) {
-        console.error("executeSupplyLiquidity error:", txResult.error);
+        this.config.logger.error("executeSupplyLiquidity error", txResult.error);
         return {
           ok: false,
           error: txResult.error
@@ -31813,7 +32067,7 @@ var ClService = class _ClService {
         }
       };
     } catch (error) {
-      console.error("executeSupplyLiquidity error:", error);
+      this.config.logger.error("executeSupplyLiquidity error", error);
       return {
         ok: false,
         error
@@ -32086,7 +32340,7 @@ var ClService = class _ClService {
       }
       return { ok: true, value: { srcChainTxHash: txResult.value.tx, dstChainTxHash: hubTxHash } };
     } catch (error) {
-      console.error("supplyLiquidity error:", error);
+      this.config.logger.error("supplyLiquidity error", error);
       return {
         ok: false,
         error
@@ -32230,7 +32484,7 @@ var ClService = class _ClService {
         }
       };
     } catch (error) {
-      console.error("getPoolRewardConfig error:", error);
+      this.config.logger.error("getPoolRewardConfig error", error);
       return {
         ok: false,
         error: lookupFailed("dex", "getPoolRewardConfig", error)
@@ -32291,7 +32545,7 @@ var ClService = class _ClService {
       };
       const txResult = await this.spoke.sendMessage(sendMessageParams);
       if (!txResult.ok) {
-        console.error("executeClaimRewards error:", txResult.error);
+        this.config.logger.error("executeClaimRewards error", txResult.error);
         return {
           ok: false,
           error: txResult.error
@@ -32305,7 +32559,7 @@ var ClService = class _ClService {
         }
       };
     } catch (error) {
-      console.error("executeClaimRewards error:", error);
+      this.config.logger.error("executeClaimRewards error", error);
       return {
         ok: false,
         error
@@ -32347,7 +32601,7 @@ var ClService = class _ClService {
       }
       return { ok: true, value: { srcChainTxHash: txResult.value.tx, dstChainTxHash: hubTxHash } };
     } catch (error) {
-      console.error("claimRewards error:", error);
+      this.config.logger.error("claimRewards error", error);
       return {
         ok: false,
         error
@@ -32395,7 +32649,7 @@ var ClService = class _ClService {
         address: tokenAddress
       };
     } catch (error) {
-      console.error(`Failed to fetch token info for ${tokenAddress}:`, error);
+      this.config.logger.error(`Failed to fetch token info for ${tokenAddress}`, error);
       return {
         symbol: "UNKNOWN",
         name: "Unknown Token",
@@ -32420,12 +32674,12 @@ var ClService = class _ClService {
       const oneShare = BigInt(10 ** 18);
       const result = await Erc4626Service.convertToAssets(statATokenAddress, oneShare, this.hubProvider.publicClient);
       if (!result.ok) {
-        console.error("[getStatATokenConversionRate] Failed to get conversion rate:", result.error);
+        this.config.logger.error("[getStatATokenConversionRate] Failed to get conversion rate", result.error);
         return oneShare;
       }
       return result.value;
     } catch (error) {
-      console.error("[getStatATokenConversionRate] Error:", error);
+      this.config.logger.error("[getStatATokenConversionRate] Error", error);
       return BigInt(10 ** 18);
     }
   }
@@ -32462,7 +32716,7 @@ var ClService = class _ClService {
         underlyingToken
       };
     } catch (error) {
-      console.error(`[getTokenEnrichmentData] Failed to enrich token ${token.address}:`, error);
+      this.config.logger.error(`[getTokenEnrichmentData] Failed to enrich token ${token.address}`, error);
       return {
         token,
         isStatAToken: true
@@ -32532,7 +32786,7 @@ var ClService = class _ClService {
             rewardConfig = rewardConfigResult.value;
           }
         } catch (error) {
-          console.warn("Failed to fetch reward config for pool:", error);
+          this.config.logger.warn("Failed to fetch reward config for pool", { error });
         }
       }
       return {
@@ -32568,7 +32822,7 @@ var ClService = class _ClService {
         }
       };
     } catch (error) {
-      console.error("Failed to fetch pool data:", error);
+      this.config.logger.error("Failed to fetch pool data", error);
       return {
         ok: false,
         error: lookupFailed("dex", "getPoolData", error)
@@ -35352,14 +35606,25 @@ var MoneyMarketService = class _MoneyMarketService {
       );
       const dstChainKey = params.dstChainKey ?? srcChainKey;
       const dstAddress = params.dstAddress ?? params.srcAddress;
-      const [fromHubWallet, toHubWallet] = await Promise.all([
-        this.hubProvider.getUserHubWalletAddress(params.srcAddress, srcChainKey),
-        this.hubProvider.getUserHubWalletAddress(dstAddress, dstChainKey)
-      ]);
+      const isBitcoinSrc = isBitcoinChainKeyType(srcChainKey);
+      if (isBitcoinSrc && !_params.raw) {
+        mmInvariant(
+          walletProvider !== void 0 && isBitcoinWalletProviderType(walletProvider),
+          `Invalid wallet provider for chain key: ${srcChainKey}. Expected bitcoin wallet provider.`,
+          { ...baseCtx, field: "walletProvider" }
+        );
+        await this.spoke.bitcoin.radfi.ensureRadfiAccessToken(walletProvider);
+      }
+      const srcEffectiveAddress = isBitcoinSrc ? await this.spoke.bitcoin.getEffectiveWalletAddress(params.srcAddress) : params.srcAddress;
+      const fromHubWallet = await this.hubProvider.getUserHubWalletAddress(srcEffectiveAddress, srcChainKey);
+      const toHubWallet = dstChainKey === srcChainKey && dstAddress === params.srcAddress ? fromHubWallet : await this.hubProvider.getUserHubWalletAddress(
+        isBitcoinChainKeyType(dstChainKey) ? await this.spoke.bitcoin.getEffectiveWalletAddress(dstAddress) : dstAddress,
+        dstChainKey
+      );
       const data = this.buildSupplyData(srcChainKey, params.token, params.amount, toHubWallet);
       const coreParams = {
         srcChainKey,
-        srcAddress: params.srcAddress,
+        srcAddress: srcEffectiveAddress,
         to: fromHubWallet,
         token: params.token,
         amount: params.amount,
@@ -35399,6 +35664,17 @@ var MoneyMarketService = class _MoneyMarketService {
     }
   }
   // ==== borrow ==========================================================================
+  /**
+   * Build the relay submit/poll identity for a money-market borrow/withdraw.
+   *
+   * Bitcoin borrow/withdraw are on-demand: the spoke result is a signed payload JSON that the relay
+   * submits under the literal "withdraw" tx_hash and tracks under a derived `od:<hash>` poll id
+   * (see {@link BitcoinSpokeService.getOnDemandRelayIdentity}). Every other chain relays and polls by
+   * its real spoke tx hash, so `pollTxHash` is undefined and `srcChainTxHash` stays the spoke tx.
+   */
+  buildRelayIdentity(srcChainKey, tx, relayData) {
+    return isBitcoinChainKeyType(srcChainKey) ? this.spoke.bitcoin.getOnDemandRelayIdentity(tx) : { srcTxHash: tx, data: relayData, pollTxHash: void 0 };
+  }
   /**
    * Borrow tokens from the money market lending pool and wait for the cross-chain relay to
    * deliver the funds to the destination address.
@@ -35434,9 +35710,9 @@ var MoneyMarketService = class _MoneyMarketService {
           value: { srcChainTxHash: txResult.value.tx, dstChainTxHash: txResult.value.tx }
         };
       }
+      const relayIdentity = this.buildRelayIdentity(srcChainKey, txResult.value.tx, txResult.value.relayData);
       const packet = await relayTxAndWaitPacket({
-        srcTxHash: txResult.value.tx,
-        data: txResult.value.relayData,
+        ...relayIdentity,
         chainKey: srcChainKey,
         relayerApiEndpoint: this.relayerApiEndpoint,
         timeout
@@ -35451,7 +35727,13 @@ var MoneyMarketService = class _MoneyMarketService {
             dstChainKey: baseCtx.dstChainKey
           })
         };
-      return { ok: true, value: { srcChainTxHash: txResult.value.tx, dstChainTxHash: packet.value.dst_tx_hash } };
+      return {
+        ok: true,
+        value: {
+          srcChainTxHash: relayIdentity.pollTxHash ?? txResult.value.tx,
+          dstChainTxHash: packet.value.dst_tx_hash
+        }
+      };
     } catch (error) {
       if (isMoneyMarketOrchestrationError(error)) return { ok: false, error };
       return {
@@ -35493,7 +35775,8 @@ var MoneyMarketService = class _MoneyMarketService {
         field: "token"
       });
       const encodedDstAddress = encodeAddress(dstChainKey, dstAddress);
-      const fromHubWallet = await this.hubProvider.getUserHubWalletAddress(params.srcAddress, srcChainKey);
+      const srcEffectiveAddress = isBitcoinChainKeyType(srcChainKey) ? await this.spoke.bitcoin.getEffectiveWalletAddress(params.srcAddress) : params.srcAddress;
+      const fromHubWallet = await this.hubProvider.getUserHubWalletAddress(srcEffectiveAddress, srcChainKey);
       const payload = this.buildBorrowData(
         fromHubWallet,
         encodedDstAddress,
@@ -35572,144 +35855,151 @@ var MoneyMarketService = class _MoneyMarketService {
       }
       const needsRelay = srcChainKey !== hubChainId || params.dstChainKey != null && params.dstAddress != null && params.dstChainKey !== hubChainId && params.dstAddress !== walletRouter;
       if (!needsRelay) {
-        return {
-          ok: true,
-          value: { srcChainTxHash: txResult.value.tx, dstChainTxHash: txResult.value.tx }
-        };
-      }
-      const packet = await relayTxAndWaitPacket({
-        srcTxHash: txResult.value.tx,
-        data: txResult.value.relayData,
-        chainKey: srcChainKey,
-        relayerApiEndpoint: this.relayerApiEndpoint,
-        timeout
-      });
-      if (!packet.ok)
-        return {
-          ok: false,
-          error: mapRelayFailure(packet.error, {
-            feature: "moneyMarket",
-            action: baseCtx.action,
-            srcChainKey: baseCtx.srcChainKey,
-            dstChainKey: baseCtx.dstChainKey
-          })
-        };
-      return { ok: true, value: { srcChainTxHash: txResult.value.tx, dstChainTxHash: packet.value.dst_tx_hash } };
-    } catch (error) {
-      if (isMoneyMarketOrchestrationError(error)) return { ok: false, error };
-      return {
-        ok: false,
-        error: executionFailed("moneyMarket", error, { ...baseCtx, phase: "intentCreation" })
-      };
-    }
-  }
-  /**
-   * Build and optionally broadcast the spoke-side withdraw message without waiting for the
-   * cross-chain relay to deliver funds.
-   *
-   * Use this when you need manual relay control or want to sign and broadcast the transaction
-   * yourself. Pass `{ raw: true }` to receive unsigned calldata instead of executing.
-   *
-   * @param _params - Withdraw action params plus `raw` flag and optional `skipSimulation`.
-   * @returns The spoke transaction result (hash or raw calldata) plus `relayData` required to
-   *   trigger the hub-side withdrawal via {@link relayTxAndWaitPacket}.
-   */
-  async createWithdrawIntent(_params) {
-    const { params, walletProvider } = _params;
-    const srcChainKey = params.srcChainKey;
-    const skipSimulation = _params.skipSimulation ?? false;
-    const baseCtx = { srcChainKey, dstChainKey: params.dstChainKey, action: "withdraw" };
-    try {
-      mmInvariant(params.action === "withdraw", "Invalid action", { ...baseCtx, field: "action" });
-      mmInvariant(params.token.length > 0, "Token is required", { ...baseCtx, field: "token" });
-      mmInvariant(params.amount > 0n, "Amount must be greater than 0", { ...baseCtx, field: "amount" });
-      mmInvariant(
-        isUndefinedOrValidWalletProviderForChainKey(srcChainKey, walletProvider),
-        `Invalid wallet provider for chain key: ${srcChainKey}, walletProvider.chainType: ${walletProvider?.chainType}`,
-        { ...baseCtx, field: "walletProvider" }
-      );
-      const dstChainKey = params.dstChainKey ?? srcChainKey;
-      const dstAddress = params.dstAddress ?? params.srcAddress;
-      mmInvariant(
-        this.config.isMoneyMarketSupportedToken(dstChainKey, params.token),
-        `Unsupported spoke chain (${dstChainKey}) token: ${params.token}`,
-        { ...baseCtx, field: "token" }
-      );
-      const encodedDstAddress = encodeAddress(dstChainKey, dstAddress);
-      const fromHubWallet = await this.hubProvider.getUserHubWalletAddress(params.srcAddress, srcChainKey);
-      const payload = this.buildWithdrawData(
-        fromHubWallet,
-        encodedDstAddress,
-        params.token,
-        params.amount,
-        dstChainKey
-      );
-      const coreParams = {
-        srcChainKey,
-        srcAddress: params.srcAddress,
-        dstChainKey: HUB_CHAIN_KEY,
-        dstAddress: fromHubWallet,
-        payload,
-        skipSimulation
-      };
-      const sendMessageParams = _params.raw ? {
-        ...coreParams,
-        raw: true
-      } : {
-        ...coreParams,
-        raw: false,
-        walletProvider: _params.walletProvider
-      };
-      const txResult = await this.spoke.sendMessage(sendMessageParams);
-      if (!txResult.ok) {
-        if (isMoneyMarketCreateIntentError(txResult.error)) return { ok: false, error: txResult.error };
-        return {
-          ok: false,
-          error: intentCreationFailed("moneyMarket", txResult.error, baseCtx)
-        };
-      }
-      return {
-        ok: true,
-        value: {
-          tx: txResult.value,
-          relayData: { address: fromHubWallet, payload }
-        }
-      };
-    } catch (error) {
-      if (isMoneyMarketCreateIntentError(error)) return { ok: false, error };
-      return {
-        ok: false,
-        error: intentCreationFailed("moneyMarket", error, baseCtx)
-      };
-    }
-  }
-  // ==== repay ===========================================================================
-  /**
-   * Repay a borrowed position in the money market lending pool and wait for the cross-chain
-   * relay to settle on the hub.
-   *
-   * Hub-chain callers skip the relay step. The repayment is credited to `dstAddress` on
-   * `dstChainKey` (defaulting to the source address and chain when omitted).
-   *
-   * @param _params - Repay action params: `srcChainKey`, `srcAddress`, `token`, `amount`,
-   *   `walletProvider`, and optional `dstChainKey`/`dstAddress`.
-   * @returns A pair of transaction hashes — `srcChainTxHash` (spoke) and `dstChainTxHash` (hub).
-   */
-  async repay(_params) {
-    const { params, timeout = DEFAULT_RELAY_TX_TIMEOUT } = _params;
-    const srcChainKey = params.srcChainKey;
-    const baseCtx = { srcChainKey, dstChainKey: params.dstChainKey, action: "repay" };
-    try {
-      const txResult = await this.createRepayIntent(_params);
-      if (!txResult.ok) return { ok: false, error: txResult.error };
-      const verify = await this.spoke.verifyTxHash({ txHash: txResult.value.tx, chainKey: srcChainKey });
-      if (!verify.ok) {
-        return {
-          ok: false,
-          error: verifyFailed("moneyMarket", verify.error, baseCtx)
-        };
-      }
-      if (isHubChainKeyType(srcChainKey)) {
+        return {
+          ok: true,
+          value: { srcChainTxHash: txResult.value.tx, dstChainTxHash: txResult.value.tx }
+        };
+      }
+      const relayIdentity = this.buildRelayIdentity(srcChainKey, txResult.value.tx, txResult.value.relayData);
+      const packet = await relayTxAndWaitPacket({
+        ...relayIdentity,
+        chainKey: srcChainKey,
+        relayerApiEndpoint: this.relayerApiEndpoint,
+        timeout
+      });
+      if (!packet.ok)
+        return {
+          ok: false,
+          error: mapRelayFailure(packet.error, {
+            feature: "moneyMarket",
+            action: baseCtx.action,
+            srcChainKey: baseCtx.srcChainKey,
+            dstChainKey: baseCtx.dstChainKey
+          })
+        };
+      return {
+        ok: true,
+        value: {
+          srcChainTxHash: relayIdentity.pollTxHash ?? txResult.value.tx,
+          dstChainTxHash: packet.value.dst_tx_hash
+        }
+      };
+    } catch (error) {
+      if (isMoneyMarketOrchestrationError(error)) return { ok: false, error };
+      return {
+        ok: false,
+        error: executionFailed("moneyMarket", error, { ...baseCtx, phase: "intentCreation" })
+      };
+    }
+  }
+  /**
+   * Build and optionally broadcast the spoke-side withdraw message without waiting for the
+   * cross-chain relay to deliver funds.
+   *
+   * Use this when you need manual relay control or want to sign and broadcast the transaction
+   * yourself. Pass `{ raw: true }` to receive unsigned calldata instead of executing.
+   *
+   * @param _params - Withdraw action params plus `raw` flag and optional `skipSimulation`.
+   * @returns The spoke transaction result (hash or raw calldata) plus `relayData` required to
+   *   trigger the hub-side withdrawal via {@link relayTxAndWaitPacket}.
+   */
+  async createWithdrawIntent(_params) {
+    const { params, walletProvider } = _params;
+    const srcChainKey = params.srcChainKey;
+    const skipSimulation = _params.skipSimulation ?? false;
+    const baseCtx = { srcChainKey, dstChainKey: params.dstChainKey, action: "withdraw" };
+    try {
+      mmInvariant(params.action === "withdraw", "Invalid action", { ...baseCtx, field: "action" });
+      mmInvariant(params.token.length > 0, "Token is required", { ...baseCtx, field: "token" });
+      mmInvariant(params.amount > 0n, "Amount must be greater than 0", { ...baseCtx, field: "amount" });
+      mmInvariant(
+        isUndefinedOrValidWalletProviderForChainKey(srcChainKey, walletProvider),
+        `Invalid wallet provider for chain key: ${srcChainKey}, walletProvider.chainType: ${walletProvider?.chainType}`,
+        { ...baseCtx, field: "walletProvider" }
+      );
+      const dstChainKey = params.dstChainKey ?? srcChainKey;
+      const dstAddress = params.dstAddress ?? params.srcAddress;
+      mmInvariant(
+        this.config.isMoneyMarketSupportedToken(dstChainKey, params.token),
+        `Unsupported spoke chain (${dstChainKey}) token: ${params.token}`,
+        { ...baseCtx, field: "token" }
+      );
+      const encodedDstAddress = encodeAddress(dstChainKey, dstAddress);
+      const srcEffectiveAddress = isBitcoinChainKeyType(srcChainKey) ? await this.spoke.bitcoin.getEffectiveWalletAddress(params.srcAddress) : params.srcAddress;
+      const fromHubWallet = await this.hubProvider.getUserHubWalletAddress(srcEffectiveAddress, srcChainKey);
+      const payload = this.buildWithdrawData(
+        fromHubWallet,
+        encodedDstAddress,
+        params.token,
+        params.amount,
+        dstChainKey
+      );
+      const coreParams = {
+        srcChainKey,
+        srcAddress: params.srcAddress,
+        dstChainKey: HUB_CHAIN_KEY,
+        dstAddress: fromHubWallet,
+        payload,
+        skipSimulation
+      };
+      const sendMessageParams = _params.raw ? {
+        ...coreParams,
+        raw: true
+      } : {
+        ...coreParams,
+        raw: false,
+        walletProvider: _params.walletProvider
+      };
+      const txResult = await this.spoke.sendMessage(sendMessageParams);
+      if (!txResult.ok) {
+        if (isMoneyMarketCreateIntentError(txResult.error)) return { ok: false, error: txResult.error };
+        return {
+          ok: false,
+          error: intentCreationFailed("moneyMarket", txResult.error, baseCtx)
+        };
+      }
+      return {
+        ok: true,
+        value: {
+          tx: txResult.value,
+          relayData: { address: fromHubWallet, payload }
+        }
+      };
+    } catch (error) {
+      if (isMoneyMarketCreateIntentError(error)) return { ok: false, error };
+      return {
+        ok: false,
+        error: intentCreationFailed("moneyMarket", error, baseCtx)
+      };
+    }
+  }
+  // ==== repay ===========================================================================
+  /**
+   * Repay a borrowed position in the money market lending pool and wait for the cross-chain
+   * relay to settle on the hub.
+   *
+   * Hub-chain callers skip the relay step. The repayment is credited to `dstAddress` on
+   * `dstChainKey` (defaulting to the source address and chain when omitted).
+   *
+   * @param _params - Repay action params: `srcChainKey`, `srcAddress`, `token`, `amount`,
+   *   `walletProvider`, and optional `dstChainKey`/`dstAddress`.
+   * @returns A pair of transaction hashes — `srcChainTxHash` (spoke) and `dstChainTxHash` (hub).
+   */
+  async repay(_params) {
+    const { params, timeout = DEFAULT_RELAY_TX_TIMEOUT } = _params;
+    const srcChainKey = params.srcChainKey;
+    const baseCtx = { srcChainKey, dstChainKey: params.dstChainKey, action: "repay" };
+    try {
+      const txResult = await this.createRepayIntent(_params);
+      if (!txResult.ok) return { ok: false, error: txResult.error };
+      const verify = await this.spoke.verifyTxHash({ txHash: txResult.value.tx, chainKey: srcChainKey });
+      if (!verify.ok) {
+        return {
+          ok: false,
+          error: verifyFailed("moneyMarket", verify.error, baseCtx)
+        };
+      }
+      if (isHubChainKeyType(srcChainKey)) {
         return {
           ok: true,
           value: { srcChainTxHash: txResult.value.tx, dstChainTxHash: txResult.value.tx }
@@ -35773,14 +36063,25 @@ var MoneyMarketService = class _MoneyMarketService {
       );
       const dstChainKey = params.dstChainKey ?? srcChainKey;
       const dstAddress = params.dstAddress ?? params.srcAddress;
-      const [fromHubWallet, toHubWallet] = await Promise.all([
-        this.hubProvider.getUserHubWalletAddress(params.srcAddress, srcChainKey),
-        this.hubProvider.getUserHubWalletAddress(dstAddress, dstChainKey)
-      ]);
+      const isBitcoinSrc = isBitcoinChainKeyType(srcChainKey);
+      if (isBitcoinSrc && !_params.raw) {
+        mmInvariant(
+          walletProvider !== void 0 && isBitcoinWalletProviderType(walletProvider),
+          `Invalid wallet provider for chain key: ${srcChainKey}. Expected bitcoin wallet provider.`,
+          { ...baseCtx, field: "walletProvider" }
+        );
+        await this.spoke.bitcoin.radfi.ensureRadfiAccessToken(walletProvider);
+      }
+      const srcEffectiveAddress = isBitcoinSrc ? await this.spoke.bitcoin.getEffectiveWalletAddress(params.srcAddress) : params.srcAddress;
+      const fromHubWallet = await this.hubProvider.getUserHubWalletAddress(srcEffectiveAddress, srcChainKey);
+      const toHubWallet = dstChainKey === srcChainKey && dstAddress === params.srcAddress ? fromHubWallet : await this.hubProvider.getUserHubWalletAddress(
+        isBitcoinChainKeyType(dstChainKey) ? await this.spoke.bitcoin.getEffectiveWalletAddress(dstAddress) : dstAddress,
+        dstChainKey
+      );
       const data = this.buildRepayData(srcChainKey, params.token, params.amount, toHubWallet);
       const coreParams = {
         srcChainKey,
-        srcAddress: params.srcAddress,
+        srcAddress: srcEffectiveAddress,
         to: fromHubWallet,
         token: params.token,
         amount: params.amount,
@@ -36341,9 +36642,9 @@ var PartnerFeeClaimService = class {
         if (typeof balanceResult === "bigint") {
           balance = balanceResult;
         } else {
-          console.warn(
-            `[PartnerFeeClaimService] Unexpected balance result format for ${entry.hubAsset.symbol} (${entry.assetAddress}):`,
-            balanceResult
+          this.config.logger.warn(
+            `[PartnerFeeClaimService] Unexpected balance result format for ${entry.hubAsset.symbol} (${entry.assetAddress})`,
+            { balanceResult }
           );
           balance = 0n;
         }
@@ -36679,7 +36980,8 @@ var PartnerFeeClaimService = class {
       }
       const solverExecutionResponse = await SolverApiService.postExecution(
         { intent_tx_hash: intentTxHash },
-        this.config.solver
+        this.config.solver,
+        this.config.logger
       );
       if (!solverExecutionResponse.ok) {
         return solverExecutionResponse;
@@ -36760,7 +37062,12 @@ var RecoveryService = class {
         srcChainKey: chainKey,
         field: "chainKey"
       });
-      const entries = Object.values(chainConfig.supportedTokens).filter((token) => viem.isAddress(token.hubAsset));
+      const leverageVaultAddresses = new Set(
+        this.config.sodaxConfig.leverageYield.vaults.map((vault) => vault.vault.toLowerCase())
+      );
+      const entries = Object.values(chainConfig.supportedTokens).filter(
+        (token) => viem.isAddress(token.hubAsset) && !leverageVaultAddresses.has(token.hubAsset.toLowerCase())
+      );
       if (entries.length === 0) {
         return { ok: true, value: [] };
       }
@@ -36862,6 +37169,871 @@ var RecoveryService = class {
   }
 };
 
+// src/leverageYield/errors.ts
+var leverageYieldInvariant = createInvariant("leverageYield");
+var LEVERAGE_YIELD_CODES = /* @__PURE__ */ new Set([
+  "VALIDATION_FAILED",
+  "INTENT_CREATION_FAILED",
+  "APPROVE_FAILED",
+  "ALLOWANCE_CHECK_FAILED",
+  "LOOKUP_FAILED",
+  "TX_VERIFICATION_FAILED",
+  "TX_SUBMIT_FAILED",
+  "RELAY_TIMEOUT",
+  "RELAY_FAILED",
+  "EXECUTION_FAILED",
+  "EXTERNAL_API_ERROR",
+  "UNKNOWN"
+]);
+var LEVERAGE_YIELD_POST_EXECUTION_CODES = /* @__PURE__ */ new Set([
+  "EXECUTION_FAILED",
+  "EXTERNAL_API_ERROR",
+  "UNKNOWN"
+]);
+var LEVERAGE_YIELD_SWAP_CODES = /* @__PURE__ */ new Set([
+  "VALIDATION_FAILED",
+  "INTENT_CREATION_FAILED",
+  "TX_VERIFICATION_FAILED",
+  "TX_SUBMIT_FAILED",
+  "RELAY_TIMEOUT",
+  "RELAY_FAILED",
+  "EXECUTION_FAILED",
+  "EXTERNAL_API_ERROR",
+  "UNKNOWN"
+]);
+var isLeverageYieldCreateIntentError = isCodeMember(CREATE_INTENT_CODES);
+var isLeverageYieldApproveError = isCodeMember(APPROVE_CODES);
+var isLeverageYieldAllowanceCheckError = isCodeMember(ALLOWANCE_CHECK_CODES);
+var isLeverageYieldLookupError = isCodeMember(LOOKUP_CODES);
+var isLeverageYieldPostExecutionError = isCodeMember(
+  LEVERAGE_YIELD_POST_EXECUTION_CODES
+);
+var isLeverageYieldSwapError = isCodeMember(LEVERAGE_YIELD_SWAP_CODES);
+var isLeverageYieldError = isCodeMember(LEVERAGE_YIELD_CODES);
+
+// src/leverageYield/LeverageYieldService.ts
+var leverageYieldVaultAbi = viem.parseAbi([
+  "function asset() view returns (address)",
+  "function getPositionDetails() view returns (uint256 collateral, uint256 debt, uint256 ltv, uint256 healthFactor, uint256 idleAsset)",
+  // Used by getApr() — read-only metadata that doesn't change per pass.
+  "function pool() view returns (address)",
+  "function borrowToken() view returns (address)",
+  "function targetLTV() view returns (uint256)"
+]);
+var INTENT_DEADLINE_BUFFER_SECONDS = 5 * 60;
+var ANY_SOLVER_ADDRESS = "0x0000000000000000000000000000000000000000";
+var MAX_WITHDRAW_DUST_BUFFER = 1000n;
+function pctToRay(aprPct) {
+  return BigInt(Math.round(aprPct * 1e9)) * 10n ** 16n;
+}
+var DEFILLAMA_FETCH_TIMEOUT_MS = 1e4;
+var DEFILLAMA_FETCH_MAX_ATTEMPTS = 2;
+async function fetchWithTimeout(url, timeoutMs) {
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    return await fetch(url, { signal: controller.signal });
+  } finally {
+    clearTimeout(timeoutId);
+  }
+}
+async function fetchDefillamaApr(poolId) {
+  return retry(async () => {
+    const response = await fetchWithTimeout(`https://yields.llama.fi/chart/${poolId}`, DEFILLAMA_FETCH_TIMEOUT_MS);
+    if (!response.ok) throw new Error(`DefiLlama APR fetch failed: HTTP ${response.status}`);
+    const json = await response.json();
+    const series = json?.data;
+    if (!Array.isArray(series) || series.length === 0) {
+      throw new Error("DefiLlama APR response: empty time series");
+    }
+    const latest = series[series.length - 1]?.apy;
+    if (typeof latest !== "number") throw new Error("DefiLlama APR: latest entry missing numeric apy");
+    return latest;
+  }, DEFILLAMA_FETCH_MAX_ATTEMPTS);
+}
+var LeverageYieldService = class {
+  hubProvider;
+  config;
+  spoke;
+  constructor({ hubProvider, config, spoke }) {
+    this.hubProvider = hubProvider;
+    this.config = config;
+    this.spoke = spoke;
+  }
+  // ─── Registry ──────────────────────────────────────────────────────────
+  /** Returns the static registry of known leverage-yield vaults. */
+  listVaults() {
+    return this.config.sodaxConfig.leverageYield.vaults;
+  }
+  /** Looks up a vault by its `name` field. Returns `undefined` when not registered. */
+  getVault(name) {
+    return this.listVaults().find((v) => v.name === name);
+  }
+  /**
+   * Looks up a registered vault by its on-chain proxy address (case-insensitive).
+   * Returns `undefined` when the address isn't in the registry.
+   */
+  getVaultByAddress(address) {
+    const normalized = address.toLowerCase();
+    return this.listVaults().find((v) => v.vault.toLowerCase() === normalized);
+  }
+  /**
+   * Resolves the intent `deadline`: returns the caller-supplied value verbatim, otherwise
+   * derives a default from the hub-chain (Sonic) block timestamp plus
+   * {@link INTENT_DEADLINE_BUFFER_SECONDS}. The deadline is enforced on-chain against the hub
+   * block time, so the default is anchored to that block — never the client clock, which can
+   * drift and produce an already-expired or over-extended deadline.
+   *
+   * Returns a {@link Result}: a `getBlock` RPC outage is a read failure, surfaced as
+   * `LOOKUP_FAILED` (`method: 'resolveDeadline'`) rather than masquerading as an intent-build
+   * failure. The `deposit` / `withdraw` callers forward it verbatim.
+   */
+  async resolveDeadline(deadline, srcChainKey) {
+    if (deadline !== void 0) return { ok: true, value: deadline };
+    try {
+      const block = await this.hubProvider.publicClient.getBlock({
+        includeTransactions: false,
+        blockTag: "latest"
+      });
+      return { ok: true, value: block.timestamp + BigInt(INTENT_DEADLINE_BUFFER_SECONDS) };
+    } catch (error) {
+      return { ok: false, error: lookupFailed("leverageYield", "resolveDeadline", error, { srcChainKey }) };
+    }
+  }
+  /**
+   * Builds the {@link LeverageYieldSwapPayload} for a leverage-yield deposit (any token → lsoda*).
+   * The lsoda* output is delivered to the user's hub wallet on Sonic so a later
+   * {@link LeverageYieldService.withdraw} can swap it back. Spread the result into
+   * {@link LeverageYieldService.vaultSwap}: `vaultSwap({ ...payload, walletProvider })`.
+   * An optional `partnerFee` is forwarded on the payload as the per-intent fee override.
+   *
+   * For `minOutputAmount`, quote via `sodax.swaps.getQuote` with the vault address as the
+   * destination token (`token_dst`) — vault shares are solver-tradeable, so the generic swap
+   * quote applies; then subtract your slippage tolerance.
+   */
+  async deposit(params) {
+    const baseCtx = { srcChainKey: params.srcChainKey, action: "deposit" };
+    try {
+      leverageYieldInvariant(params.inputAmount > 0n, "inputAmount must be greater than 0", {
+        ...baseCtx,
+        field: "inputAmount"
+      });
+      leverageYieldInvariant(params.vault.length > 0, "Vault address is required", { ...baseCtx, field: "vault" });
+      leverageYieldInvariant(params.inputToken.length > 0, "inputToken is required", {
+        ...baseCtx,
+        field: "inputToken"
+      });
+      const hubWallet = await this.hubProvider.getUserHubWalletAddress(params.srcAddress, params.srcChainKey);
+      const deadlineResult = await this.resolveDeadline(params.deadline, params.srcChainKey);
+      if (!deadlineResult.ok) return deadlineResult;
+      const deadline = deadlineResult.value;
+      return {
+        ok: true,
+        value: {
+          params: {
+            inputToken: params.inputToken,
+            outputToken: params.vault,
+            inputAmount: params.inputAmount,
+            minOutputAmount: params.minOutputAmount,
+            deadline,
+            allowPartialFill: false,
+            srcChainKey: params.srcChainKey,
+            dstChainKey: this.hubProvider.chainConfig.chain.key,
+            srcAddress: params.srcAddress,
+            dstAddress: hubWallet,
+            solver: params.solver ?? ANY_SOLVER_ADDRESS,
+            data: "0x"
+          },
+          // Per-intent fee override — only included when the caller supplies one, so the
+          // payload stays free of undefined-valued keys.
+          ...params.partnerFee !== void 0 && { partnerFee: params.partnerFee }
+        }
+      };
+    } catch (error) {
+      if (isLeverageYieldCreateIntentError(error)) return { ok: false, error };
+      return { ok: false, error: intentCreationFailed("leverageYield", error, baseCtx) };
+    }
+  }
+  /**
+   * Builds the {@link LeverageYieldSwapPayload} for a leverage-yield withdraw (lsoda* → any
+   * token). The payload carries `hubWalletSwap: true` — {@link LeverageYieldService.vaultSwap}
+   * then spends the lsoda* held in the user's hub wallet by authorising it via a
+   * `Connection.sendMessage` the user signs on `srcChainKey`. Wrapped in a {@link Result} for
+   * a call shape uniform with {@link LeverageYieldService.deposit}; async because the default
+   * `deadline` is read from the hub block timestamp.
+   *
+   * For `minOutputAmount`, quote via `sodax.swaps.getQuote` with the vault address as the
+   * source token (`token_src`) — vault shares are solver-tradeable, so the generic swap quote
+   * applies; then subtract your slippage tolerance.
+   */
+  async withdraw(params) {
+    const baseCtx = { srcChainKey: params.srcChainKey, action: "withdraw" };
+    try {
+      leverageYieldInvariant(params.inputAmount > 0n, "inputAmount must be greater than 0", {
+        ...baseCtx,
+        field: "inputAmount"
+      });
+      leverageYieldInvariant(params.vault.length > 0, "Vault address is required", { ...baseCtx, field: "vault" });
+      leverageYieldInvariant(params.outputToken.length > 0, "outputToken is required", {
+        ...baseCtx,
+        field: "outputToken"
+      });
+      const deadlineResult = await this.resolveDeadline(params.deadline, params.srcChainKey);
+      if (!deadlineResult.ok) return deadlineResult;
+      const deadline = deadlineResult.value;
+      return {
+        ok: true,
+        value: {
+          params: {
+            inputToken: params.vault,
+            outputToken: params.outputToken,
+            inputAmount: params.inputAmount,
+            minOutputAmount: params.minOutputAmount,
+            deadline,
+            allowPartialFill: false,
+            srcChainKey: params.srcChainKey,
+            dstChainKey: params.dstChainKey,
+            srcAddress: params.srcAddress,
+            dstAddress: params.recipient ?? params.srcAddress,
+            solver: params.solver ?? ANY_SOLVER_ADDRESS,
+            data: "0x"
+          },
+          hubWalletSwap: true
+        }
+      };
+    } catch (error) {
+      if (isLeverageYieldCreateIntentError(error)) return { ok: false, error };
+      return { ok: false, error: intentCreationFailed("leverageYield", error, baseCtx) };
+    }
+  }
+  /**
+   * Creates a vault swap intent on the user's source spoke chain without submitting it to
+   * the solver. Leverage-yield copy of the swap domain's `createIntent`, specialised for
+   * vault flows — duplicated deliberately so the vault-specific execution modifiers
+   * (`hubWalletSwap`, per-intent `partnerFee`) stay off the generic swap surface.
+   *
+   * Use {@link LeverageYieldService.vaultSwap} for the full end-to-end flow
+   * (create → relay → notify solver); use this directly when you need the raw transaction
+   * or drive the relay yourself (e.g. the backend submit-tx path). To complete a manual flow,
+   * relay the returned `relayData` (the shared `relayTxAndWaitPacket` helper) and then call
+   * {@link LeverageYieldService.notifySolver} with the hub-side intent tx hash.
+   *
+   * @param _params - Intent parameters, source chain key, wallet provider (when `raw: false`),
+   *   and optional `skipSimulation` / `hubWalletSwap` / `partnerFee`.
+   * @returns A `Result<CreateVaultIntentResult<K, Raw>, LeverageYieldCreateIntentError>`.
+   *   On success contains:
+   *   - `tx` — chain-specific tx hash (executed) or raw tx data (raw mode).
+   *   - `intent` — the fully constructed `Intent` object augmented with `feeAmount`.
+   *   - `relayData` — `{ address, payload }` needed to submit the intent to the relayer.
+   *
+   *   On failure `result.error` is a SodaxError with `VALIDATION_FAILED` (invariant
+   *   precondition), `INTENT_CREATION_FAILED` (spoke-side creation/deposit failed) or
+   *   `UNKNOWN` (defensive fallback).
+   */
+  async createVaultIntent(_params) {
+    const { params, skipSimulation, hubWalletSwap, partnerFee = this.config.swaps.partnerFee } = _params;
+    const baseCtx = { srcChainKey: params.srcChainKey, dstChainKey: params.dstChainKey };
+    try {
+      leverageYieldInvariant(
+        isUndefinedOrValidWalletProviderForChainKey(params.srcChainKey, _params.walletProvider),
+        `Invalid wallet provider for chain key: ${params.srcChainKey}`,
+        baseCtx
+      );
+      const hubChainKey = this.hubProvider.chainConfig.chain.key;
+      const inputTokenChainKey = hubWalletSwap ? hubChainKey : params.srcChainKey;
+      leverageYieldInvariant(
+        this.config.isValidOriginalAssetAddress(inputTokenChainKey, params.inputToken),
+        `Unsupported spoke chain token (srcChainKey: ${inputTokenChainKey}, inputToken: ${params.inputToken})`,
+        { ...baseCtx, field: "inputToken" }
+      );
+      leverageYieldInvariant(
+        this.config.isValidOriginalAssetAddress(params.dstChainKey, params.outputToken),
+        `Unsupported spoke chain token (params.dstChain: ${params.dstChainKey}, params.outputToken: ${params.outputToken})`,
+        { ...baseCtx, field: "outputToken" }
+      );
+      leverageYieldInvariant(
+        this.config.isValidSpokeChainKey(params.srcChainKey),
+        `Invalid spoke chain (srcChainKey): ${params.srcChainKey}`,
+        { ...baseCtx, field: "srcChainKey" }
+      );
+      leverageYieldInvariant(
+        this.config.isValidSpokeChainKey(params.dstChainKey),
+        `Invalid spoke chain (params.dstChain): ${params.dstChainKey}`,
+        { ...baseCtx, field: "dstChainKey" }
+      );
+      if (isBitcoinChainKey(params.dstChainKey) && params.outputToken === "BTC") {
+        leverageYieldInvariant(
+          params.minOutputAmount >= 546n,
+          `Invalid minOutputAmount (params.minOutputAmount): ${params.minOutputAmount}`,
+          { ...baseCtx, field: "minOutputAmount" }
+        );
+      }
+      const personalAddress = params.srcAddress;
+      let walletAddress = personalAddress;
+      if (isBitcoinChainKeyType(params.srcChainKey) && _params.raw === false) {
+        leverageYieldInvariant(
+          isBitcoinWalletProviderType(_params.walletProvider),
+          `Invalid wallet provider for chain key: ${params.srcChainKey}`,
+          baseCtx
+        );
+        walletAddress = await this.spoke.bitcoin.getEffectiveWalletAddress(personalAddress);
+        await this.spoke.bitcoin.radfi.ensureRadfiAccessToken(_params.walletProvider);
+      }
+      const creatorHubWalletAddress = await this.hubProvider.getUserHubWalletAddress(walletAddress, params.srcChainKey);
+      if (hubWalletSwap) {
+        const [data2, intent2, feeAmount2] = EvmSolverService.constructCreateIntentData(
+          { ...params, srcChainKey: hubChainKey, srcAddress: creatorHubWalletAddress },
+          creatorHubWalletAddress,
+          this.config,
+          partnerFee
+        );
+        const coreSendMessageParams = {
+          srcChainKey: params.srcChainKey,
+          // Personal address — NOT the resolved trading `walletAddress`. SpokeService.sendMessage
+          // re-resolves the effective (Bitcoin trading) address itself; passing the already-resolved
+          // trading address here would double-resolve it (getTradingWallet(tradingAddress) →
+          // "Trading wallet not found"). The trading address is used only for the hub-wallet
+          // derivation above (creatorHubWalletAddress). Mirrors MoneyMarketService borrow/withdraw.
+          srcAddress: personalAddress,
+          dstChainKey: hubChainKey,
+          dstAddress: creatorHubWalletAddress,
+          payload: data2,
+          skipSimulation
+        };
+        const txResult2 = await this.spoke.sendMessage(
+          _params.raw ? { ...coreSendMessageParams, raw: true } : {
+            ...coreSendMessageParams,
+            raw: false,
+            walletProvider: _params.walletProvider
+          }
+        );
+        if (!txResult2.ok) {
+          if (isLeverageYieldCreateIntentError(txResult2.error)) {
+            return { ok: false, error: txResult2.error };
+          }
+          return { ok: false, error: intentCreationFailed("leverageYield", txResult2.error, baseCtx) };
+        }
+        return {
+          ok: true,
+          value: {
+            tx: txResult2.value,
+            intent: { ...intent2, feeAmount: feeAmount2 },
+            relayData: { address: creatorHubWalletAddress, payload: data2 }
+          }
+        };
+      }
+      if (isHubChainKeyType(params.srcChainKey) && isSonicChainKeyType(params.srcChainKey)) {
+        const coreSonicParams = {
+          createIntentParams: params,
+          creatorHubWalletAddress,
+          solverConfig: this.config.solver,
+          fee: partnerFee,
+          hubProvider: this.hubProvider
+        };
+        const [txResult2, intent2, feeAmount2, data2] = await SonicSpokeService.createSwapIntent(
+          _params.raw ? { ...coreSonicParams, raw: true } : {
+            ...coreSonicParams,
+            raw: false,
+            walletProvider: _params.walletProvider
+          }
+        );
+        return {
+          ok: true,
+          value: {
+            tx: txResult2,
+            intent: { ...intent2, feeAmount: feeAmount2 },
+            relayData: { address: intent2.creator, payload: data2 }
+          }
+        };
+      }
+      const [data, intent, feeAmount] = EvmSolverService.constructCreateIntentData(
+        {
+          ...params,
+          srcAddress: walletAddress
+        },
+        creatorHubWalletAddress,
+        this.config,
+        partnerFee
+      );
+      const coreDepositParams = {
+        srcChainKey: params.srcChainKey,
+        srcAddress: walletAddress,
+        to: creatorHubWalletAddress,
+        token: params.inputToken,
+        amount: params.inputAmount,
+        data,
+        skipSimulation
+      };
+      const txResult = await this.spoke.deposit(
+        _params.raw ? {
+          ...coreDepositParams,
+          raw: true
+        } : {
+          ...coreDepositParams,
+          raw: false,
+          walletProvider: _params.walletProvider
+        }
+      );
+      if (!txResult.ok) {
+        if (isLeverageYieldCreateIntentError(txResult.error)) {
+          return { ok: false, error: txResult.error };
+        }
+        return {
+          ok: false,
+          error: intentCreationFailed("leverageYield", txResult.error, baseCtx)
+        };
+      }
+      return {
+        ok: true,
+        value: {
+          tx: txResult.value,
+          intent: { ...intent, feeAmount },
+          relayData: { address: intent.creator, payload: data }
+        }
+      };
+    } catch (error) {
+      if (isLeverageYieldCreateIntentError(error)) return { ok: false, error };
+      return {
+        ok: false,
+        error: intentCreationFailed("leverageYield", error, baseCtx)
+      };
+    }
+  }
+  /**
+   * Executes a full end-to-end leverage-yield vault swap (deposit or withdraw).
+   * Leverage-yield copy of the swap domain's `swap()` orchestrator:
+   * 1. Calls {@link LeverageYieldService.createVaultIntent} to submit the intent
+   *    transaction on the source spoke chain.
+   * 2. Verifies the spoke transaction landed on-chain.
+   * 3. For non-hub source chains: submits the spoke tx to the relayer and waits for the
+   *    relay packet to land on the hub (Sonic). Skipped when `srcChainKey` is the hub.
+   * 4. Notifies the solver, triggering it to fill the intent.
+   *
+   * Spread a {@link LeverageYieldSwapPayload} from `deposit` / `withdraw` into this method
+   * alongside the wallet provider: `vaultSwap({ ...payload, walletProvider })`.
+   *
+   * @returns A `Result<VaultSwapResponse, LeverageYieldSwapError>`. On success:
+   *   - `solverExecutionResponse` — solver acknowledgement (`{ answer: 'OK', intent_hash }`).
+   *   - `intent` — the on-chain intent object that was created.
+   *   - `intentDeliveryInfo` — source/destination chain keys, tx hashes, and user addresses.
+   *
+   *   On failure `result.error` carries one of the create-intent codes plus
+   *   `TX_VERIFICATION_FAILED`, `TX_SUBMIT_FAILED`, `RELAY_TIMEOUT`, `RELAY_FAILED`,
+   *   `EXECUTION_FAILED`, `EXTERNAL_API_ERROR` or `UNKNOWN`.
+   */
+  async vaultSwap(_params) {
+    const { params } = _params;
+    const srcChainKey = params.srcChainKey;
+    const baseCtx = { srcChainKey, dstChainKey: params.dstChainKey, action: "vaultSwap" };
+    try {
+      const timeout = _params.timeout;
+      const createIntentResult = await this.createVaultIntent(_params);
+      if (!createIntentResult.ok) {
+        return { ok: false, error: createIntentResult.error };
+      }
+      const { tx: spokeTxHash, intent, relayData } = createIntentResult.value;
+      const verifyTxHashResult = await this.spoke.verifyTxHash({
+        txHash: spokeTxHash,
+        chainKey: srcChainKey
+      });
+      if (!verifyTxHashResult.ok) {
+        return {
+          ok: false,
+          error: verifyFailed("leverageYield", verifyTxHashResult.error, baseCtx)
+        };
+      }
+      let dstIntentTxHash;
+      if (isHubChainKeyType(srcChainKey)) {
+        dstIntentTxHash = spokeTxHash;
+      } else {
+        const packet = await relayTxAndWaitPacket({
+          srcTxHash: spokeTxHash,
+          data: relayData,
+          chainKey: srcChainKey,
+          relayerApiEndpoint: this.config.relay.relayerApiEndpoint,
+          timeout
+        });
+        if (!packet.ok) {
+          return {
+            ok: false,
+            error: mapRelayFailure(packet.error, { feature: "leverageYield", ...baseCtx })
+          };
+        }
+        dstIntentTxHash = packet.value.dst_tx_hash;
+      }
+      const postExecResult = await this.notifySolver({
+        intent_tx_hash: dstIntentTxHash
+      });
+      if (!postExecResult.ok) {
+        return { ok: false, error: postExecResult.error };
+      }
+      return {
+        ok: true,
+        value: {
+          solverExecutionResponse: postExecResult.value,
+          intent,
+          intentDeliveryInfo: {
+            srcChainKey,
+            srcTxHash: spokeTxHash,
+            srcAddress: params.srcAddress,
+            dstChainKey: params.dstChainKey,
+            dstTxHash: dstIntentTxHash,
+            dstAddress: params.dstAddress
+          }
+        }
+      };
+    } catch (error) {
+      if (isLeverageYieldSwapError(error)) return { ok: false, error };
+      return {
+        ok: false,
+        error: unknownFailed("leverageYield", error, baseCtx)
+      };
+    }
+  }
+  /**
+   * Notifies the solver that the vault intent landed on the hub, triggering it to fill.
+   * Leverage-yield copy of the swap domain's `postExecution` — emits only
+   * `EXECUTION_FAILED` / `EXTERNAL_API_ERROR` / `UNKNOWN` (relay/verify codes appear only
+   * on {@link LeverageYieldService.vaultSwap}, which owns the verify + relay steps).
+   *
+   * Called automatically by {@link LeverageYieldService.vaultSwap} after the relay packet
+   * lands on the hub. Public so callers who created the intent via
+   * {@link LeverageYieldService.createVaultIntent} and relayed it themselves can finish the
+   * flow manually.
+   *
+   * @param request - `{ intent_tx_hash }` — the hub-chain (Sonic) tx hash where the intent
+   *   was registered (the relay packet's `dst_tx_hash`, or the spoke tx hash for hub-sourced
+   *   intents).
+   */
+  async notifySolver(request) {
+    try {
+      const result = await SolverApiService.postExecution(request, this.config.solver, this.config.logger);
+      if (result.ok) return result;
+      const detail = result.error?.detail ?? {
+        code: -999,
+        // SolverIntentErrorCode.UNKNOWN
+        message: "Solver returned malformed error response"
+      };
+      return {
+        ok: false,
+        error: new SodaxError("EXTERNAL_API_ERROR", detail.message, {
+          feature: "leverageYield",
+          context: {
+            phase: "postExecution",
+            api: "solver",
+            solverCode: detail.code,
+            solverDetail: detail
+          }
+        })
+      };
+    } catch (error) {
+      if (isLeverageYieldPostExecutionError(error)) return { ok: false, error };
+      return { ok: false, error: executionFailed("leverageYield", error, { phase: "postExecution" }) };
+    }
+  }
+  /**
+   * Approves the vault's underlying asset to the leverage vault on Sonic. For callers
+   * interacting with the vault directly on the hub — the swap-style {@link
+   * LeverageYieldService.deposit} flow handles its own approvals.
+   */
+  async approve(params) {
+    const baseCtx = { action: "approve" };
+    try {
+      leverageYieldInvariant(params.amount > 0n, "Amount must be greater than 0", { ...baseCtx, field: "amount" });
+      leverageYieldInvariant(params.vault.length > 0, "Vault address is required", { ...baseCtx, field: "vault" });
+      const assetResult = await this.getAsset(params.vault);
+      if (!assetResult.ok) {
+        return { ok: false, error: approveFailed("leverageYield", assetResult.error, baseCtx) };
+      }
+      const from = await params.walletProvider.getWalletAddress();
+      const baseApprove = {
+        token: assetResult.value,
+        amount: params.amount,
+        from,
+        spender: params.vault
+      };
+      if (params.raw) {
+        const tx2 = await Erc20Service.approve({ ...baseApprove, raw: true });
+        return { ok: true, value: tx2 };
+      }
+      const tx = await Erc20Service.approve({
+        ...baseApprove,
+        raw: false,
+        walletProvider: params.walletProvider
+      });
+      return { ok: true, value: tx };
+    } catch (error) {
+      if (isLeverageYieldApproveError(error)) return { ok: false, error };
+      return { ok: false, error: approveFailed("leverageYield", error, baseCtx) };
+    }
+  }
+  /**
+   * Reads on-chain allowance of the vault's underlying asset for `owner → vault`. Returns
+   * `true` when the allowance covers `amount`. Use before a direct
+   * {@link LeverageYieldService.deposit}.
+   */
+  async isAllowanceValid(params) {
+    const baseCtx = { action: "allowanceCheck" };
+    try {
+      leverageYieldInvariant(params.amount > 0n, "Amount must be greater than 0", { ...baseCtx, field: "amount" });
+      const assetResult = await this.getAsset(params.vault);
+      if (!assetResult.ok) {
+        return { ok: false, error: allowanceCheckFailed("leverageYield", assetResult.error, baseCtx) };
+      }
+      const allowance = await this.hubProvider.publicClient.readContract({
+        address: assetResult.value,
+        abi: viem.erc20Abi,
+        functionName: "allowance",
+        args: [params.owner, params.vault]
+      });
+      return { ok: true, value: allowance >= params.amount };
+    } catch (error) {
+      if (isLeverageYieldAllowanceCheckError(error)) return { ok: false, error };
+      return { ok: false, error: allowanceCheckFailed("leverageYield", error, baseCtx) };
+    }
+  }
+  // ─── Reads ──────────────────────────────────────────────────────────────
+  /** ERC-4626 `asset()` of the vault — the sodaWEETH-style underlying. */
+  async getAsset(vault) {
+    try {
+      const value = await this.hubProvider.publicClient.readContract({
+        address: vault,
+        abi: leverageYieldVaultAbi,
+        functionName: "asset"
+      });
+      return { ok: true, value };
+    } catch (error) {
+      if (isLeverageYieldLookupError(error)) return { ok: false, error };
+      return { ok: false, error: lookupFailed("leverageYield", "getAsset", error) };
+    }
+  }
+  /** Reads the vault's leveraged position snapshot via the non-standard `getPositionDetails`. */
+  async getPosition(vault) {
+    try {
+      const [collateral, debt, ltv, healthFactor, idleAsset] = await this.hubProvider.publicClient.readContract({
+        address: vault,
+        abi: leverageYieldVaultAbi,
+        functionName: "getPositionDetails"
+      });
+      return { ok: true, value: { collateral, debt, ltv, healthFactor, idleAsset } };
+    } catch (error) {
+      if (isLeverageYieldLookupError(error)) return { ok: false, error };
+      return { ok: false, error: lookupFailed("leverageYield", "getPosition", error) };
+    }
+  }
+  /**
+   * Computes the steady-state APR of a leverage-yield vault from the AAVE supply/borrow
+   * rates of its asset and borrowToken, scaled by the vault's target leverage. Matches the
+   * convention used by leveraged-LSD vaults (Origami, Gearbox, etc.) — assumes constant
+   * LTV at `targetLTV` and constant AAVE rates.
+   *
+   * Returns raw fields in RAY (1e27, AAVE's native rate scale) plus the leverage multiplier
+   * in WAD (1e18). See {@link LeverageYieldApr} for the formula and caveats.
+   */
+  async getApr(vault) {
+    try {
+      const [pool, asset, borrowToken, targetLtvBps] = await Promise.all([
+        this.hubProvider.publicClient.readContract({
+          address: vault,
+          abi: leverageYieldVaultAbi,
+          functionName: "pool"
+        }),
+        this.hubProvider.publicClient.readContract({
+          address: vault,
+          abi: leverageYieldVaultAbi,
+          functionName: "asset"
+        }),
+        this.hubProvider.publicClient.readContract({
+          address: vault,
+          abi: leverageYieldVaultAbi,
+          functionName: "borrowToken"
+        }),
+        this.hubProvider.publicClient.readContract({
+          address: vault,
+          abi: leverageYieldVaultAbi,
+          functionName: "targetLTV"
+        })
+      ]);
+      const [assetReserve, borrowReserve] = await Promise.all([
+        this.hubProvider.publicClient.readContract({
+          address: pool,
+          abi: poolAbi,
+          functionName: "getReserveData",
+          args: [asset]
+        }),
+        this.hubProvider.publicClient.readContract({
+          address: pool,
+          abi: poolAbi,
+          functionName: "getReserveData",
+          args: [borrowToken]
+        })
+      ]);
+      const supplyAprRay = assetReserve.currentLiquidityRate;
+      const borrowAprRay = borrowReserve.currentVariableBorrowRate;
+      const BPS = 10000n;
+      const WAD2 = 1000000000000000000n;
+      leverageYieldInvariant(targetLtvBps < BPS, `targetLTV (${targetLtvBps}) must be < 100% (10_000 bps)`, {
+        method: "getApr",
+        field: "targetLtvBps"
+      });
+      const leverageMultiplierWad = targetLtvBps * WAD2 / (BPS - targetLtvBps);
+      const spreadRay = supplyAprRay - borrowAprRay;
+      const netAprRay = supplyAprRay + spreadRay * leverageMultiplierWad / WAD2;
+      return {
+        ok: true,
+        value: { supplyAprRay, borrowAprRay, targetLtvBps, leverageMultiplierWad, netAprRay }
+      };
+    } catch (error) {
+      if (isLeverageYieldLookupError(error)) return { ok: false, error };
+      return { ok: false, error: lookupFailed("leverageYield", "getApr", error) };
+    }
+  }
+  /**
+   * Off-chain LSD staking-APR for the vault's underlying asset. Looks the vault up in the
+   * registry, hits DefiLlama's per-pool chart endpoint for the configured `poolId`, and on
+   * any fetch failure returns the registry's hardcoded `fallbackAprPct` with `stale: true`.
+   *
+   * Always resolves to `{ ok: true, ... }` for a known vault — the fallback path replaces
+   * the error, since a missing LSD APR shouldn't break the parent call. Returns
+   * `{ aprRay: 0n, stale: true, label: 'no LSD source' }` for vaults without an
+   * `lsdSource` configured (non-LSD strategies); callers can treat that as "skip LSD".
+   */
+  async getLsdApr(vault) {
+    try {
+      const cfg = this.getVaultByAddress(vault);
+      const source = cfg?.lsdSource;
+      if (!source) {
+        return { ok: true, value: { aprRay: 0n, label: "no LSD source", stale: true } };
+      }
+      try {
+        const aprPct = await fetchDefillamaApr(source.poolId);
+        return { ok: true, value: { aprRay: pctToRay(aprPct), label: source.label, stale: false } };
+      } catch (fetchError) {
+        this.config.logger.warn("[leverageYield] DefiLlama APR fetch failed; using fallbackAprPct", {
+          vault,
+          poolId: source.poolId,
+          fallbackAprPct: source.fallbackAprPct,
+          error: fetchError instanceof Error ? fetchError.message : String(fetchError)
+        });
+        return {
+          ok: true,
+          value: { aprRay: pctToRay(source.fallbackAprPct), label: `${source.label} (fallback)`, stale: true }
+        };
+      }
+    } catch (error) {
+      if (isLeverageYieldLookupError(error)) return { ok: false, error };
+      return { ok: false, error: lookupFailed("leverageYield", "getLsdApr", error) };
+    }
+  }
+  /**
+   * Combined view of {@link getApr} + {@link getLsdApr}: re-applies the vault's leverage
+   * formula with the LSD's native staking yield folded into the supply side, exposing the
+   * **effective** net APR that LSD-backed strategies actually earn. The AAVE-only
+   * `netAprRay` is preserved on the return value for callers who want to display both.
+   *
+   *   effectiveSupply = supplyAprRay + lsdApr.aprRay
+   *   effectiveNet    = effectiveSupply + leverage × (effectiveSupply − borrowAprRay)
+   *
+   * Fetches AAVE rates and the LSD APR in parallel for one round-trip's worth of latency.
+   */
+  async getEffectiveApr(vault) {
+    try {
+      const [aprResult, lsdResult] = await Promise.all([this.getApr(vault), this.getLsdApr(vault)]);
+      if (!aprResult.ok) return aprResult;
+      if (!lsdResult.ok) return lsdResult;
+      const apr = aprResult.value;
+      const lsd = lsdResult.value;
+      const effectiveSupplyAprRay = apr.supplyAprRay + lsd.aprRay;
+      const spreadRay = effectiveSupplyAprRay - apr.borrowAprRay;
+      const WAD2 = 1000000000000000000n;
+      const effectiveNetAprRay = effectiveSupplyAprRay + spreadRay * apr.leverageMultiplierWad / WAD2;
+      return {
+        ok: true,
+        value: { ...apr, lsdApr: lsd, effectiveSupplyAprRay, effectiveNetAprRay }
+      };
+    } catch (error) {
+      if (isLeverageYieldLookupError(error)) return { ok: false, error };
+      return { ok: false, error: lookupFailed("leverageYield", "getEffectiveApr", error) };
+    }
+  }
+  /** Synchronously withdrawable assets for `owner` (clamped against leverage HF floor). */
+  async getMaxWithdraw(vault, owner) {
+    const inner = await Erc4626Service.getMaxWithdraw(vault, owner, this.hubProvider.publicClient);
+    if (!inner.ok) return { ok: false, error: lookupFailed("leverageYield", "getMaxWithdraw", inner.error) };
+    return { ok: true, value: inner.value };
+  }
+  /** Total underlying assets currently held by the vault (vault-asset units, 18 decimals) — TVL. */
+  async getTotalAssets(vault) {
+    const inner = await Erc4626Service.getTotalAssets(vault, this.hubProvider.publicClient);
+    if (!inner.ok) return { ok: false, error: lookupFailed("leverageYield", "getTotalAssets", inner.error) };
+    return { ok: true, value: inner.value };
+  }
+  /** Shares minted for a given asset deposit. */
+  async previewDeposit(vault, assets) {
+    const inner = await Erc4626Service.previewDeposit(vault, assets, this.hubProvider.publicClient);
+    if (!inner.ok) return { ok: false, error: lookupFailed("leverageYield", "previewDeposit", inner.error) };
+    return { ok: true, value: inner.value };
+  }
+  /** Shares burned for a given asset withdrawal. */
+  async previewWithdraw(vault, assets) {
+    const inner = await Erc4626Service.previewWithdraw(vault, assets, this.hubProvider.publicClient);
+    if (!inner.ok) return { ok: false, error: lookupFailed("leverageYield", "previewWithdraw", inner.error) };
+    return { ok: true, value: inner.value };
+  }
+  /** Assets received for a given share redemption. */
+  async previewRedeem(vault, shares) {
+    const inner = await Erc4626Service.previewRedeem(vault, shares, this.hubProvider.publicClient);
+    if (!inner.ok) return { ok: false, error: lookupFailed("leverageYield", "previewRedeem", inner.error) };
+    return { ok: true, value: inner.value };
+  }
+  /** Vault shares held by `owner`. */
+  async getShareBalance(vault, owner) {
+    try {
+      const value = await this.hubProvider.publicClient.readContract({
+        address: vault,
+        abi: viem.erc20Abi,
+        functionName: "balanceOf",
+        args: [owner]
+      });
+      return { ok: true, value };
+    } catch (error) {
+      if (isLeverageYieldLookupError(error)) return { ok: false, error };
+      return { ok: false, error: lookupFailed("leverageYield", "getShareBalance", error) };
+    }
+  }
+  /**
+   * Convenience: resolves the user's hub wallet from `(srcChainKey, srcAddress)` and
+   * returns its on-chain `maxWithdraw`, less {@link MAX_WITHDRAW_DUST_BUFFER}. The trim
+   * keeps the value safe for an asset-denominated ERC-4626 `withdraw` — the raw
+   * `maxWithdraw` can trip the round-up that asks for one more share than the user holds.
+   */
+  async getMaxWithdrawForUser(vault, srcChainKey, srcAddress) {
+    try {
+      const hubWallet = await this.hubProvider.getUserHubWalletAddress(srcAddress, srcChainKey);
+      const maxWithdrawResult = await this.getMaxWithdraw(vault, hubWallet);
+      if (!maxWithdrawResult.ok) return maxWithdrawResult;
+      const buffered = maxWithdrawResult.value > MAX_WITHDRAW_DUST_BUFFER ? maxWithdrawResult.value - MAX_WITHDRAW_DUST_BUFFER : 0n;
+      return { ok: true, value: buffered };
+    } catch (error) {
+      if (isLeverageYieldLookupError(error)) return { ok: false, error };
+      return { ok: false, error: lookupFailed("leverageYield", "getMaxWithdrawForUser", error, { srcChainKey }) };
+    }
+  }
+  /**
+   * Convenience: resolves the user's hub wallet from `(srcChainKey, srcAddress)` and
+   * returns its on-chain share balance.
+   */
+  async getShareBalanceForUser(vault, srcChainKey, srcAddress) {
+    try {
+      const hubWallet = await this.hubProvider.getUserHubWalletAddress(srcAddress, srcChainKey);
+      return await this.getShareBalance(vault, hubWallet);
+    } catch (error) {
+      if (isLeverageYieldLookupError(error)) return { ok: false, error };
+      return { ok: false, error: lookupFailed("leverageYield", "getShareBalanceForUser", error, { srcChainKey }) };
+    }
+  }
+};
+
 // src/shared/entities/Sodax.ts
 var Sodax = class {
   instanceConfig;
@@ -36883,6 +38055,8 @@ var Sodax = class {
   // Recovery service for withdrawing stuck hub-wallet assets back to a spoke chain
   dex;
   // Dex service enabling DEX operations
+  leverageYield;
+  // Leverage-yield service: cross-chain deposits / withdrawals into ERC-4626 leverage vaults on Sonic
   config;
   // Config service enabling configuration data fetching from the backend API or fallbacking to default values
   hubProvider;
@@ -36890,9 +38064,10 @@ var Sodax = class {
   spoke;
   // spoke service enabling spoke chain operations
   constructor(config) {
+    const logger = resolveLogger(config?.logger);
     this.instanceConfig = config ? mergeSodaxConfig(sodaxConfig, config) : sodaxConfig;
-    this.backendApi = new BackendApiService(this.instanceConfig.api);
-    this.config = new ConfigService({ api: this.backendApi, config: this.instanceConfig, userConfig: config });
+    this.backendApi = new BackendApiService(this.instanceConfig.api, logger);
+    this.config = new ConfigService({ api: this.backendApi, config: this.instanceConfig, userConfig: config, logger });
     this.hubProvider = new EvmHubProvider({ config: this.config });
     this.spoke = new SpokeService({ config: this.config, hubProvider: this.hubProvider });
     this.swaps = new SwapService({
@@ -36927,6 +38102,11 @@ var Sodax = class {
       config: this.config,
       spoke: this.spoke
     });
+    this.leverageYield = new LeverageYieldService({
+      hubProvider: this.hubProvider,
+      config: this.config,
+      spoke: this.spoke
+    });
   }
   /**
    * Initializes the Sodax instance with dynamic configuration.
@@ -37035,8 +38215,11 @@ exports.IntentsAbi = IntentsAbi;
 exports.LOOKUP_CODES = LOOKUP_CODES;
 exports.LTV_PRECISION = LTV_PRECISION;
 exports.LendingPoolService = LendingPoolService;
+exports.LeverageYieldService = LeverageYieldService;
 exports.LockupMultiplier = LockupMultiplier;
 exports.LockupPeriod = LockupPeriod;
+exports.LsodaSymbols = LsodaSymbols;
+exports.LsodaTokens = LsodaTokens;
 exports.MAX_UINT256 = MAX_UINT256;
 exports.MigrationService = MigrationService;
 exports.MintPositionEventAbi = MintPositionEventAbi;
@@ -37045,6 +38228,7 @@ exports.MoneyMarketService = MoneyMarketService;
 exports.NEAR_CHAIN_KEYS = NEAR_CHAIN_KEYS;
 exports.NEAR_CHAIN_KEYS_SET = NEAR_CHAIN_KEYS_SET;
 exports.NEAR_DEFAULT_GAS = NEAR_DEFAULT_GAS;
+exports.NEAR_STORAGE_DEPOSIT = NEAR_STORAGE_DEPOSIT;
 exports.NearSpokeService = NearSpokeService;
 exports.PartnerFeeClaimService = PartnerFeeClaimService;
 exports.PartnerService = PartnerService;
@@ -37108,6 +38292,7 @@ exports.bnUSDLegacyTokens = bnUSDLegacyTokens;
 exports.bridgeConfig = bridgeConfig;
 exports.bridgeInvariant = bridgeInvariant;
 exports.bscSupportedTokens = bscSupportedTokens;
+exports.calcOpReturnOutputVbytes = calcOpReturnOutputVbytes;
 exports.calculateAllReserveIncentives = calculateAllReserveIncentives;
 exports.calculateAllUserIncentives = calculateAllUserIncentives;
 exports.calculateAvailableBorrowsMarketReferenceCurrency = calculateAvailableBorrowsMarketReferenceCurrency;
@@ -37126,6 +38311,7 @@ exports.clRouterAbi = clRouterAbi;
 exports.clTickLensAbi = clTickLensAbi;
 exports.concentratedLiquidityConfig = concentratedLiquidityConfig;
 exports.connectionAbi = connectionAbi;
+exports.consoleLogger = consoleLogger;
 exports.convertTransactionInstructionToRaw = convertTransactionInstructionToRaw;
 exports.createInvariant = createInvariant;
 exports.deepMerge = deepMerge;
@@ -37218,6 +38404,13 @@ exports.isInjectiveChainKeyType = isInjectiveChainKeyType;
 exports.isJsonRpcPayloadResponse = isJsonRpcPayloadResponse;
 exports.isLegacybnUSDChainId = isLegacybnUSDChainId;
 exports.isLegacybnUSDToken = isLegacybnUSDToken;
+exports.isLeverageYieldAllowanceCheckError = isLeverageYieldAllowanceCheckError;
+exports.isLeverageYieldApproveError = isLeverageYieldApproveError;
+exports.isLeverageYieldCreateIntentError = isLeverageYieldCreateIntentError;
+exports.isLeverageYieldError = isLeverageYieldError;
+exports.isLeverageYieldLookupError = isLeverageYieldLookupError;
+exports.isLeverageYieldPostExecutionError = isLeverageYieldPostExecutionError;
+exports.isLeverageYieldSwapError = isLeverageYieldSwapError;
 exports.isMigrateOrchestrationError = isMigrateOrchestrationError;
 exports.isMigrationAllowanceCheckError = isMigrationAllowanceCheckError;
 exports.isMigrationApproveError = isMigrationApproveError;
@@ -37284,6 +38477,9 @@ exports.isUndefinedOrValidWalletProviderForChainKey = isUndefinedOrValidWalletPr
 exports.isUnifiedBnUSDMigrateParams = isUnifiedBnUSDMigrateParams;
 exports.isValidWalletProviderForChainKey = isValidWalletProviderForChainKey;
 exports.kaiaSupportedTokens = kaiaSupportedTokens;
+exports.leverageYieldConfig = leverageYieldConfig;
+exports.leverageYieldInvariant = leverageYieldInvariant;
+exports.leverageYieldVaults = leverageYieldVaults;
 exports.lightlinkSupportedTokens = lightlinkSupportedTokens;
 exports.lookupFailed = lookupFailed;
 exports.mapRelayFailure = mapRelayFailure;
@@ -37302,6 +38498,7 @@ exports.newbnUSDSpokeChainIds = newbnUSDSpokeChainIds;
 exports.normalize = normalize;
 exports.normalizeBN = normalizeBN;
 exports.normalizePsbtToBase64 = normalizePsbtToBase64;
+exports.normalizeSignatureToBase64 = normalizeSignatureToBase64;
 exports.normalizedToUsd = normalizedToUsd;
 exports.optimismSupportedTokens = optimismSupportedTokens;
 exports.pancakeSwapInfinityDefaultHookAbi = pancakeSwapInfinityDefaultHookAbi;
@@ -37326,9 +38523,11 @@ exports.relayTxAndWaitPacket = relayTxAndWaitPacket;
 exports.requestAddress = requestAddress;
 exports.requestJsonRpc = requestJsonRpc;
 exports.requestSigning = requestSigning;
+exports.resolveLogger = resolveLogger;
 exports.retry = retry;
 exports.reverseEncodeAddress = reverseEncodeAddress;
 exports.serializeAddressData = serializeAddressData;
+exports.silentLogger = silentLogger;
 exports.sleep = sleep;
 exports.sodaxConfig = sodaxConfig;
 exports.sodaxInvariant = sodaxInvariant;
@@ -37356,6 +38555,7 @@ exports.swapsConfig = swapsConfig;
 exports.uiPoolDataAbi = uiPoolDataAbi;
 exports.universalRouterAbi = universalRouterAbi;
 exports.unknownFailed = unknownFailed;
+exports.usesBip322MessageSigning = usesBip322MessageSigning;
 exports.valueToBigNumber = valueToBigNumber;
 exports.valueToZDBigNumber = valueToZDBigNumber;
 exports.variableDebtTokenAbi = variableDebtTokenAbi;