@sodax/sdk 2.0.0-rc.10 → 2.0.0-rc.12

package/dist/index.cjs

@@ -3052,9 +3052,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: ""
     },
@@ -3896,6 +3896,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 +4016,7 @@ function isValidWalletProviderForChainKey(chainKey, walletProvider) {
 }
 
 // ../types/dist/index.js
-var CONFIG_VERSION = 208;
+var CONFIG_VERSION = 210;
 function isEvmSpokeChainConfig(value) {
   return typeof value === "object" && value !== null && value.chain.type === "EVM" && value.chain.key !== HUB_CHAIN_KEY;
 }
@@ -4440,7 +4443,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 +4462,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 +13303,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 +13351,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 +13364,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 +14522,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 +14538,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 +14578,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 +14670,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 +14697,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 +14721,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 +14745,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 +14787,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 +14841,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 +14870,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 +14889,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 +15001,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 +15025,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 +15109,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 +15121,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 +15196,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 +15211,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 +15230,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 +15238,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 +15288,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 +15324,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 +15343,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 +15356,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 +17602,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 +20999,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 +21027,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 +21293,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 +21343,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 +21417,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 +21449,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.
@@ -22512,13 +22702,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;
@@ -22629,7 +22819,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 +22847,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 +22896,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;
     }
   }
@@ -22940,7 +23130,12 @@ var SolanaSpokeService = class _SolanaSpokeService {
         }
       ]).instruction();
     } else {
-      const signerTokenAccount = await _SolanaSpokeService.getAssociatedTokenAddress(token.toBase58(), walletAddress);
+      const tokenProgramId = await _SolanaSpokeService.getMintTokenProgramId(this.connection, token);
+      const signerTokenAccount = await _SolanaSpokeService.getAssociatedTokenAddress(
+        token.toBase58(),
+        walletAddress,
+        tokenProgramId
+      );
       depositInstruction = await assetManagerProgram.methods.transfer(amountBN, Buffer.from(recipient.slice(2), "hex"), Buffer.from(data.slice(2), "hex")).accountsStrict({
         signer: walletPublicKey,
         systemProgram: web3_js.SystemProgram.programId,
@@ -22951,7 +23146,7 @@ var SolanaSpokeService = class _SolanaSpokeService {
         authority: AssetManagerPDA.authority(assetManagerProgram.programId).pda,
         mint: token,
         connection: connectionProgram.programId,
-        tokenProgram: splToken.TOKEN_PROGRAM_ID
+        tokenProgram: tokenProgramId
       }).remainingAccounts([
         {
           pubkey: ConnectionConfigPDA.config(connectionProgram.programId).pda,
@@ -23090,8 +23285,22 @@ var SolanaSpokeService = class _SolanaSpokeService {
   static async getTokenAccountBalance(connection, publicKey) {
     return await connection.getTokenAccountBalance(new web3_js.PublicKey(publicKey));
   }
-  static async getAssociatedTokenAddress(mint, walletAddress) {
-    return (await splToken.getAssociatedTokenAddress(new web3_js.PublicKey(mint), new web3_js.PublicKey(walletAddress), true)).toBase58();
+  /**
+   * Resolves the token program that owns a mint (legacy SPL Token vs Token-2022). Falls back to
+   * the legacy SPL Token program when the mint account can't be read.
+   */
+  static async getMintTokenProgramId(connection, mint) {
+    const mintAccountInfo = await connection.getAccountInfo(mint);
+    return mintAccountInfo?.owner.equals(splToken.TOKEN_2022_PROGRAM_ID) ? splToken.TOKEN_2022_PROGRAM_ID : splToken.TOKEN_PROGRAM_ID;
+  }
+  static async getAssociatedTokenAddress(mint, walletAddress, tokenProgramId = splToken.TOKEN_PROGRAM_ID) {
+    const ata = await splToken.getAssociatedTokenAddress(
+      new web3_js.PublicKey(mint),
+      new web3_js.PublicKey(walletAddress),
+      true,
+      tokenProgramId
+    );
+    return ata.toBase58();
   }
   static buildTransactionInstruction(rawInstructions) {
     return rawInstructions.map(
@@ -23546,7 +23755,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(", ")}`);
       }
     }
@@ -23719,7 +23928,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(", ")}`)
@@ -23826,17 +24035,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 };
     }
   }
@@ -23921,7 +24130,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(", ")}`)
@@ -23998,7 +24207,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(", ")}`)
@@ -24107,7 +24316,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(", ")}`)
@@ -24186,10 +24395,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 };
@@ -24276,7 +24485,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}`) };
         }
       }
@@ -25327,6 +25536,7 @@ var EvmHubProvider = class {
 };
 
 // src/swap/SolverApiService.ts
+var bigintReplacer = (_key, value) => typeof value === "bigint" ? value.toString() : value;
 var SolverApiService = class {
   constructor() {
   }
@@ -25395,13 +25605,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"
           }
         }
       };
@@ -25418,7 +25631,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`, {
@@ -25440,13 +25653,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"
           }
         }
       };
@@ -25461,7 +25677,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`, {
@@ -25482,13 +25698,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"
           }
         }
       };
@@ -25608,7 +25827,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
@@ -25631,7 +25850,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,
@@ -25904,7 +26123,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.
@@ -28385,11 +28604,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.
    *
@@ -28428,10 +28649,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 });
     }
   }
@@ -29101,7 +29322,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,
@@ -29134,9 +29355,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,
@@ -29145,7 +29369,7 @@ var BridgeService = class {
         token: params.srcToken,
         amount: params.amount,
         data,
-        skipSimulation
+        skipSimulation: effectiveSkipSimulation
       };
       const txResult = await this.spoke.deposit(
         _params.raw ? {
@@ -29158,7 +29382,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,
@@ -29173,7 +29397,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,
@@ -29343,7 +29567,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,
@@ -29390,7 +29614,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;
     }
   }
@@ -31780,7 +32004,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
@@ -31794,7 +32018,7 @@ var ClService = class _ClService {
         }
       };
     } catch (error) {
-      console.error("executeSupplyLiquidity error:", error);
+      this.config.logger.error("executeSupplyLiquidity error", error);
       return {
         ok: false,
         error
@@ -32067,7 +32291,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
@@ -32211,7 +32435,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)
@@ -32272,7 +32496,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
@@ -32286,7 +32510,7 @@ var ClService = class _ClService {
         }
       };
     } catch (error) {
-      console.error("executeClaimRewards error:", error);
+      this.config.logger.error("executeClaimRewards error", error);
       return {
         ok: false,
         error
@@ -32328,7 +32552,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
@@ -32376,7 +32600,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",
@@ -32401,12 +32625,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);
     }
   }
@@ -32443,7 +32667,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
@@ -32513,7 +32737,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 {
@@ -32549,7 +32773,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)
@@ -35333,14 +35557,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,
@@ -35380,6 +35615,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.
@@ -35415,9 +35661,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
@@ -35432,7 +35678,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 {
@@ -35474,7 +35726,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,
@@ -35558,9 +35811,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
@@ -35575,7 +35828,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 {
@@ -35617,7 +35876,8 @@ var MoneyMarketService = class _MoneyMarketService {
         { ...baseCtx, 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.buildWithdrawData(
         fromHubWallet,
         encodedDstAddress,
@@ -35754,14 +36014,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,
@@ -36322,9 +36593,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;
         }
@@ -36660,7 +36931,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;
@@ -36871,9 +37143,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({
@@ -37026,6 +37299,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;
@@ -37089,6 +37363,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;
@@ -37107,6 +37382,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;
@@ -37283,6 +37559,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;
@@ -37307,9 +37584,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;
@@ -37337,6 +37616,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;