@xchainjs/xchain-aggregator 2.3.2 → 2.3.3

package/lib/index.esm.js

@@ -1,5 +1,5 @@
 import { Network } from '@xchainjs/xchain-client';
-import { CachedValue, isSynthAsset, isTradeAsset, CryptoAmount, baseAmount, isSecuredAsset, assetToString, eqAsset, assetFromStringEx, assetFromString, isTokenAsset } from '@xchainjs/xchain-util';
+import { CachedValue, isSynthAsset, isTradeAsset, CryptoAmount, baseAmount, isSecuredAsset, assetToString, eqAsset, assetFromStringEx, isTokenAsset, assetFromString } from '@xchainjs/xchain-util';
 import { SwapSDK } from '@chainflip/sdk/swap';
 import { assetUSDC, ThorchainCache, Thornode, ThorchainQuery } from '@xchainjs/xchain-thorchain-query';
 import { AssetCacao, MAYAChain } from '@xchainjs/xchain-mayachain';
@@ -40,7 +40,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-const SupportedProtocols = ['Thorchain', 'Mayachain', 'Chainflip'];
+const SupportedProtocols = ['Thorchain', 'Mayachain', 'Chainflip', 'OneClick'];
 const DEFAULT_CONFIG = {
     protocols: SupportedProtocols,
     network: Network.Mainnet,
@@ -571,16 +571,16 @@ const G = getGlobal();
 const FormDataCtor = typeof G.FormData !== 'undefined' ? G.FormData : undefined;
 
 const isFormData = (thing) => {
-  let kind;
-  return thing && (
-    (FormDataCtor && thing instanceof FormDataCtor) || (
-      isFunction$1(thing.append) && (
-        (kind = kindOf(thing)) === 'formdata' ||
-        // detect form-data instance
-        (kind === 'object' && isFunction$1(thing.toString) && thing.toString() === '[object FormData]')
-      )
-    )
-  );
+  if (!thing) return false;
+  if (FormDataCtor && thing instanceof FormDataCtor) return true;
+  // Reject plain objects inheriting directly from Object.prototype so prototype-pollution gadgets can't spoof FormData (GHSA-6chq-wfr3-2hj9).
+  const proto = getPrototypeOf(thing);
+  if (!proto || proto === Object.prototype) return false;
+  if (!isFunction$1(thing.append)) return false;
+  const kind = kindOf(thing);
+  return kind === 'formdata' ||
+    // detect form-data instance
+    (kind === 'object' && isFunction$1(thing.toString) && thing.toString() === '[object FormData]');
 };
 
 /**
@@ -1247,40 +1247,40 @@ let AxiosError$1 = class AxiosError extends Error {
     return axiosError;
   }
 
-    /**
-     * Create an Error with the specified message, config, error code, request and response.
-     *
-     * @param {string} message The error message.
-     * @param {string} [code] The error code (for example, 'ECONNABORTED').
-     * @param {Object} [config] The config.
-     * @param {Object} [request] The request.
-     * @param {Object} [response] The response.
-     *
-     * @returns {Error} The created error.
-     */
-    constructor(message, code, config, request, response) {
-      super(message);
-      
-      // Make message enumerable to maintain backward compatibility
-      // The native Error constructor sets message as non-enumerable,
-      // but axios < v1.13.3 had it as enumerable
-      Object.defineProperty(this, 'message', {
-          value: message,
-          enumerable: true,
-          writable: true,
-          configurable: true
-      });
-      
-      this.name = 'AxiosError';
-      this.isAxiosError = true;
-      code && (this.code = code);
-      config && (this.config = config);
-      request && (this.request = request);
-      if (response) {
-          this.response = response;
-          this.status = response.status;
-      }
+  /**
+   * Create an Error with the specified message, config, error code, request and response.
+   *
+   * @param {string} message The error message.
+   * @param {string} [code] The error code (for example, 'ECONNABORTED').
+   * @param {Object} [config] The config.
+   * @param {Object} [request] The request.
+   * @param {Object} [response] The response.
+   *
+   * @returns {Error} The created error.
+   */
+  constructor(message, code, config, request, response) {
+    super(message);
+
+    // Make message enumerable to maintain backward compatibility
+    // The native Error constructor sets message as non-enumerable,
+    // but axios < v1.13.3 had it as enumerable
+    Object.defineProperty(this, 'message', {
+      value: message,
+      enumerable: true,
+      writable: true,
+      configurable: true,
+    });
+
+    this.name = 'AxiosError';
+    this.isAxiosError = true;
+    code && (this.code = code);
+    config && (this.config = config);
+    request && (this.request = request);
+    if (response) {
+      this.response = response;
+      this.status = response.status;
     }
+  }
 
   toJSON() {
     return {
@@ -1316,6 +1316,7 @@ AxiosError$1.ERR_BAD_REQUEST = 'ERR_BAD_REQUEST';
 AxiosError$1.ERR_CANCELED = 'ERR_CANCELED';
 AxiosError$1.ERR_NOT_SUPPORT = 'ERR_NOT_SUPPORT';
 AxiosError$1.ERR_INVALID_URL = 'ERR_INVALID_URL';
+AxiosError$1.ERR_FORM_DATA_DEPTH_EXCEEDED = 'ERR_FORM_DATA_DEPTH_EXCEEDED';
 
 // eslint-disable-next-line strict
 var httpAdapter = null;
@@ -1430,6 +1431,7 @@ function toFormData$1(obj, formData, options) {
   const dots = options.dots;
   const indexes = options.indexes;
   const _Blob = options.Blob || (typeof Blob !== 'undefined' && Blob);
+  const maxDepth = options.maxDepth === undefined ? 100 : options.maxDepth;
   const useBlob = _Blob && utils$1.isSpecCompliantForm(formData);
 
   if (!utils$1.isFunction(visitor)) {
@@ -1522,9 +1524,16 @@ function toFormData$1(obj, formData, options) {
     isVisitable,
   });
 
-  function build(value, path) {
+  function build(value, path, depth = 0) {
     if (utils$1.isUndefined(value)) return;
 
+    if (depth > maxDepth) {
+      throw new AxiosError$1(
+        'Object is too deeply nested (' + depth + ' levels). Max depth: ' + maxDepth,
+        AxiosError$1.ERR_FORM_DATA_DEPTH_EXCEEDED
+      );
+    }
+
     if (stack.indexOf(value) !== -1) {
       throw Error('Circular reference detected in ' + path.join('.'));
     }
@@ -1537,7 +1546,7 @@ function toFormData$1(obj, formData, options) {
         visitor.call(formData, el, utils$1.isString(key) ? key.trim() : key, path, exposedHelpers);
 
       if (result === true) {
-        build(el, path ? path.concat(key) : [key]);
+        build(el, path ? path.concat(key) : [key], depth + 1);
       }
     });
 
@@ -1569,9 +1578,8 @@ function encode$1(str) {
     ')': '%29',
     '~': '%7E',
     '%20': '+',
-    '%00': '\x00',
   };
-  return encodeURIComponent(str).replace(/[!'()~]|%20|%00/g, function replacer(match) {
+  return encodeURIComponent(str).replace(/[!'()~]|%20/g, function replacer(match) {
     return charMap[match];
   });
 }
@@ -1891,7 +1899,9 @@ function formDataToJSON(formData) {
 
     if (isLast) {
       if (utils$1.hasOwnProp(target, name)) {
-        target[name] = [target[name], value];
+        target[name] = utils$1.isArray(target[name])
+          ? target[name].concat(value)
+          : [target[name], value];
       } else {
         target[name] = value;
       }
@@ -1925,6 +1935,8 @@ function formDataToJSON(formData) {
   return null;
 }
 
+const own = (obj, key) => (obj != null && utils$1.hasOwnProp(obj, key) ? obj[key] : undefined);
+
 /**
  * It takes a string, tries to parse it, and if it fails, it returns the stringified version
  * of the input
@@ -1992,20 +2004,22 @@ const defaults = {
       let isFileList;
 
       if (isObjectPayload) {
+        const formSerializer = own(this, 'formSerializer');
         if (contentType.indexOf('application/x-www-form-urlencoded') > -1) {
-          return toURLEncodedForm(data, this.formSerializer).toString();
+          return toURLEncodedForm(data, formSerializer).toString();
         }
 
         if (
           (isFileList = utils$1.isFileList(data)) ||
           contentType.indexOf('multipart/form-data') > -1
         ) {
-          const _FormData = this.env && this.env.FormData;
+          const env = own(this, 'env');
+          const _FormData = env && env.FormData;
 
           return toFormData$1(
             isFileList ? { 'files[]': data } : data,
             _FormData && new _FormData(),
-            this.formSerializer
+            formSerializer
           );
         }
       }
@@ -2021,9 +2035,10 @@ const defaults = {
 
   transformResponse: [
     function transformResponse(data) {
-      const transitional = this.transitional || defaults.transitional;
+      const transitional = own(this, 'transitional') || defaults.transitional;
       const forcedJSONParsing = transitional && transitional.forcedJSONParsing;
-      const JSONRequested = this.responseType === 'json';
+      const responseType = own(this, 'responseType');
+      const JSONRequested = responseType === 'json';
 
       if (utils$1.isResponse(data) || utils$1.isReadableStream(data)) {
         return data;
@@ -2032,17 +2047,17 @@ const defaults = {
       if (
         data &&
         utils$1.isString(data) &&
-        ((forcedJSONParsing && !this.responseType) || JSONRequested)
+        ((forcedJSONParsing && !responseType) || JSONRequested)
       ) {
         const silentJSONParsing = transitional && transitional.silentJSONParsing;
         const strictJSONParsing = !silentJSONParsing && JSONRequested;
 
         try {
-          return JSON.parse(data, this.parseReviver);
+          return JSON.parse(data, own(this, 'parseReviver'));
         } catch (e) {
           if (strictJSONParsing) {
             if (e.name === 'SyntaxError') {
-              throw AxiosError$1.from(e, AxiosError$1.ERR_BAD_RESPONSE, this, null, this.response);
+              throw AxiosError$1.from(e, AxiosError$1.ERR_BAD_RESPONSE, this, null, own(this, 'response'));
             }
             throw e;
           }
@@ -2154,41 +2169,41 @@ var parseHeaders = (rawHeaders) => {
 
 const $internals = Symbol('internals');
 
-const isValidHeaderValue = (value) => !/[\r\n]/.test(value);
-
-function assertValidHeaderValue(value, header) {
-  if (value === false || value == null) {
-    return;
-  }
+const INVALID_HEADER_VALUE_CHARS_RE = /[^\x09\x20-\x7E\x80-\xFF]/g;
 
-  if (utils$1.isArray(value)) {
-    value.forEach((v) => assertValidHeaderValue(v, header));
-    return;
-  }
+function trimSPorHTAB(str) {
+  let start = 0;
+  let end = str.length;
 
-  if (!isValidHeaderValue(String(value))) {
-    throw new Error(`Invalid character in header content ["${header}"]`);
-  }
-}
+  while (start < end) {
+    const code = str.charCodeAt(start);
 
-function normalizeHeader(header) {
-  return header && String(header).trim().toLowerCase();
-}
+    if (code !== 0x09 && code !== 0x20) {
+      break;
+    }
 
-function stripTrailingCRLF(str) {
-  let end = str.length;
+    start += 1;
+  }
 
-  while (end > 0) {
-    const charCode = str.charCodeAt(end - 1);
+  while (end > start) {
+    const code = str.charCodeAt(end - 1);
 
-    if (charCode !== 10 && charCode !== 13) {
+    if (code !== 0x09 && code !== 0x20) {
       break;
     }
 
     end -= 1;
   }
 
-  return end === str.length ? str : str.slice(0, end);
+  return start === 0 && end === str.length ? str : str.slice(start, end);
+}
+
+function normalizeHeader(header) {
+  return header && String(header).trim().toLowerCase();
+}
+
+function sanitizeHeaderValue(str) {
+  return trimSPorHTAB(str.replace(INVALID_HEADER_VALUE_CHARS_RE, ''));
 }
 
 function normalizeValue(value) {
@@ -2196,7 +2211,7 @@ function normalizeValue(value) {
     return value;
   }
 
-  return utils$1.isArray(value) ? value.map(normalizeValue) : stripTrailingCRLF(String(value));
+  return utils$1.isArray(value) ? value.map(normalizeValue) : sanitizeHeaderValue(String(value));
 }
 
 function parseTokens(str) {
@@ -2278,7 +2293,6 @@ let AxiosHeaders$1 = class AxiosHeaders {
         _rewrite === true ||
         (_rewrite === undefined && self[key] !== false)
       ) {
-        assertValidHeaderValue(_value, _header);
         self[key || _header] = normalizeValue(_value);
       }
     }
@@ -2701,13 +2715,13 @@ const progressEventReducer = (listener, isDownloadStream, freq = 3) => {
   const _speedometer = speedometer(50, 250);
 
   return throttle((e) => {
-    const loaded = e.loaded;
+    const rawLoaded = e.loaded;
     const total = e.lengthComputable ? e.total : undefined;
-    const progressBytes = loaded - bytesNotified;
+    const loaded = total != null ? Math.min(rawLoaded, total) : rawLoaded;
+    const progressBytes = Math.max(0, loaded - bytesNotified);
     const rate = _speedometer(progressBytes);
-    const inRange = loaded <= total;
 
-    bytesNotified = loaded;
+    bytesNotified = Math.max(bytesNotified, loaded);
 
     const data = {
       loaded,
@@ -2715,7 +2729,7 @@ const progressEventReducer = (listener, isDownloadStream, freq = 3) => {
       progress: total ? loaded / total : undefined,
       bytes: progressBytes,
       rate: rate ? rate : undefined,
-      estimated: rate && total && inRange ? (total - loaded) / rate : undefined,
+      estimated: rate && total ? (total - loaded) / rate : undefined,
       event: e,
       lengthComputable: total != null,
       [isDownloadStream ? 'download' : 'upload']: true,
@@ -2849,7 +2863,7 @@ function combineURLs(baseURL, relativeURL) {
  */
 function buildFullPath(baseURL, requestedURL, allowAbsoluteUrls) {
   let isRelativeUrl = !isAbsoluteURL(requestedURL);
-  if (baseURL && (isRelativeUrl || allowAbsoluteUrls == false)) {
+  if (baseURL && (isRelativeUrl || allowAbsoluteUrls === false)) {
     return combineURLs(baseURL, requestedURL);
   }
   return requestedURL;
@@ -2869,7 +2883,18 @@ const headersToObject = (thing) => (thing instanceof AxiosHeaders$1 ? { ...thing
 function mergeConfig$1(config1, config2) {
   // eslint-disable-next-line no-param-reassign
   config2 = config2 || {};
-  const config = {};
+
+  // Use a null-prototype object so that downstream reads such as `config.auth`
+  // or `config.baseURL` cannot inherit polluted values from Object.prototype
+  // (see GHSA-q8qp-cvcw-x6jj). `hasOwnProperty` is restored as a non-enumerable
+  // own slot to preserve ergonomics for user code that relies on it.
+  const config = Object.create(null);
+  Object.defineProperty(config, 'hasOwnProperty', {
+    value: Object.prototype.hasOwnProperty,
+    enumerable: false,
+    writable: true,
+    configurable: true,
+  });
 
   function getMergedValue(target, source, prop, caseless) {
     if (utils$1.isPlainObject(target) && utils$1.isPlainObject(source)) {
@@ -2908,9 +2933,9 @@ function mergeConfig$1(config1, config2) {
 
   // eslint-disable-next-line consistent-return
   function mergeDirectKeys(a, b, prop) {
-    if (prop in config2) {
+    if (utils$1.hasOwnProp(config2, prop)) {
       return getMergedValue(a, b);
-    } else if (prop in config1) {
+    } else if (utils$1.hasOwnProp(config1, prop)) {
       return getMergedValue(undefined, a);
     }
   }
@@ -2942,6 +2967,7 @@ function mergeConfig$1(config1, config2) {
     httpsAgent: defaultToConfig2,
     cancelToken: defaultToConfig2,
     socketPath: defaultToConfig2,
+    allowedSocketPaths: defaultToConfig2,
     responseEncoding: defaultToConfig2,
     validateStatus: mergeDirectKeys,
     headers: (a, b, prop) =>
@@ -2951,7 +2977,9 @@ function mergeConfig$1(config1, config2) {
   utils$1.forEach(Object.keys({ ...config1, ...config2 }), function computeConfigValue(prop) {
     if (prop === '__proto__' || prop === 'constructor' || prop === 'prototype') return;
     const merge = utils$1.hasOwnProp(mergeMap, prop) ? mergeMap[prop] : mergeDeepProperties;
-    const configValue = merge(config1[prop], config2[prop], prop);
+    const a = utils$1.hasOwnProp(config1, prop) ? config1[prop] : undefined;
+    const b = utils$1.hasOwnProp(config2, prop) ? config2[prop] : undefined;
+    const configValue = merge(a, b, prop);
     (utils$1.isUndefined(configValue) && merge !== mergeDirectKeys) || (config[prop] = configValue);
   });
 
@@ -2961,12 +2989,24 @@ function mergeConfig$1(config1, config2) {
 var resolveConfig = (config) => {
   const newConfig = mergeConfig$1({}, config);
 
-  let { data, withXSRFToken, xsrfHeaderName, xsrfCookieName, headers, auth } = newConfig;
+  // Read only own properties to prevent prototype pollution gadgets
+  // (e.g. Object.prototype.baseURL = 'https://evil.com'). See GHSA-q8qp-cvcw-x6jj.
+  const own = (key) => (utils$1.hasOwnProp(newConfig, key) ? newConfig[key] : undefined);
+
+  const data = own('data');
+  let withXSRFToken = own('withXSRFToken');
+  const xsrfHeaderName = own('xsrfHeaderName');
+  const xsrfCookieName = own('xsrfCookieName');
+  let headers = own('headers');
+  const auth = own('auth');
+  const baseURL = own('baseURL');
+  const allowAbsoluteUrls = own('allowAbsoluteUrls');
+  const url = own('url');
 
   newConfig.headers = headers = AxiosHeaders$1.from(headers);
 
   newConfig.url = buildURL(
-    buildFullPath(newConfig.baseURL, newConfig.url, newConfig.allowAbsoluteUrls),
+    buildFullPath(baseURL, url, allowAbsoluteUrls),
     config.params,
     config.paramsSerializer
   );
@@ -3005,10 +3045,18 @@ var resolveConfig = (config) => {
   // Specifically not if we're in a web worker, or react-native.
 
   if (platform.hasStandardBrowserEnv) {
-    withXSRFToken && utils$1.isFunction(withXSRFToken) && (withXSRFToken = withXSRFToken(newConfig));
+    if (utils$1.isFunction(withXSRFToken)) {
+      withXSRFToken = withXSRFToken(newConfig);
+    }
+
+    // Strict boolean check — prevents proto-pollution gadgets (e.g. Object.prototype.withXSRFToken = 1)
+    // and misconfigurations (e.g. "false") from short-circuiting the same-origin check and leaking
+    // the XSRF token cross-origin. See GHSA-xx6v-rp6x-q39c.
+    const shouldSendXSRF =
+      withXSRFToken === true ||
+      (withXSRFToken == null && isURLSameOrigin(newConfig.url));
 
-    if (withXSRFToken || (withXSRFToken !== false && isURLSameOrigin(newConfig.url))) {
-      // Add xsrf header
+    if (shouldSendXSRF) {
       const xsrfValue = xsrfHeaderName && xsrfCookieName && cookies.read(xsrfCookieName);
 
       if (xsrfValue) {
@@ -3427,18 +3475,20 @@ const factory = (env) => {
     test(() => {
       let duplexAccessed = false;
 
-      const body = new ReadableStream$1();
-
-      const hasContentType = new Request(platform.origin, {
-        body,
+      const request = new Request(platform.origin, {
+        body: new ReadableStream$1(),
         method: 'POST',
         get duplex() {
           duplexAccessed = true;
           return 'half';
         },
-      }).headers.has('Content-Type');
+      });
+
+      const hasContentType = request.headers.has('Content-Type');
 
-      body.cancel();
+      if (request.body != null) {
+        request.body.cancel();
+      }
 
       return duplexAccessed && !hasContentType;
     });
@@ -3582,6 +3632,19 @@ const factory = (env) => {
       // see https://github.com/cloudflare/workerd/issues/902
       const isCredentialsSupported = isRequestSupported && 'credentials' in Request.prototype;
 
+      // If data is FormData and Content-Type is multipart/form-data without boundary,
+      // delete it so fetch can set it correctly with the boundary
+      if (utils$1.isFormData(data)) {
+        const contentType = headers.getContentType();
+        if (
+          contentType &&
+          /^multipart\/form-data/i.test(contentType) &&
+          !/boundary=/i.test(contentType)
+        ) {
+          headers.delete('content-type');
+        }
+      }
+
       const resolvedOptions = {
         ...fetchOptions,
         signal: composedSignal,
@@ -3890,7 +3953,7 @@ function dispatchRequest(config) {
   );
 }
 
-const VERSION$1 = "1.15.0";
+const VERSION$1 = "1.15.2";
 
 const validators$1 = {};
 
@@ -3975,7 +4038,9 @@ function assertOptions(options, schema, allowUnknown) {
   let i = keys.length;
   while (i-- > 0) {
     const opt = keys[i];
-    const validator = schema[opt];
+    // Use hasOwnProperty so a polluted Object.prototype.<opt> cannot supply
+    // a non-function validator and cause a TypeError. See GHSA-q8qp-cvcw-x6jj.
+    const validator = Object.prototype.hasOwnProperty.call(schema, opt) ? schema[opt] : undefined;
     if (validator) {
       const value = options[opt];
       const result = value === undefined || validator(value, opt, options);
@@ -7678,10 +7743,255 @@ class MayachainProtocol {
     }
 }
 
+const BASE_URL = 'https://1click.chaindefuser.com';
+class OneClickApi {
+    constructor(apiKey) {
+        this.headers = { 'Content-Type': 'application/json' };
+        if (apiKey) {
+            this.headers['Authorization'] = `Bearer ${apiKey}`;
+        }
+    }
+    getTokens() {
+        return __awaiter$4(this, void 0, void 0, function* () {
+            const resp = yield fetch(`${BASE_URL}/v0/tokens`, { headers: this.headers });
+            if (!resp.ok)
+                throw new Error(`1Click getTokens failed: ${resp.status}`);
+            return resp.json();
+        });
+    }
+    getQuote(params) {
+        return __awaiter$4(this, void 0, void 0, function* () {
+            const resp = yield fetch(`${BASE_URL}/v0/quote`, {
+                method: 'POST',
+                headers: this.headers,
+                body: JSON.stringify(params),
+            });
+            if (!resp.ok)
+                throw new Error(`1Click getQuote failed: ${resp.status}`);
+            return resp.json();
+        });
+    }
+    submitDeposit(txHash, depositAddress) {
+        return __awaiter$4(this, void 0, void 0, function* () {
+            yield fetch(`${BASE_URL}/v0/deposit/submit`, {
+                method: 'POST',
+                headers: this.headers,
+                body: JSON.stringify({ txHash, depositAddress }),
+            }).catch(() => {
+                // Fire-and-forget
+            });
+        });
+    }
+}
+
+const X_TO_ONECLICK = {
+    BTC: 'btc',
+    ETH: 'eth',
+    ARB: 'arb',
+    AVAX: 'avax',
+    BSC: 'bsc',
+    SOL: 'sol',
+    DOGE: 'doge',
+    DASH: 'dash',
+    LTC: 'ltc',
+    BCH: 'bch',
+    XRP: 'xrp',
+    ADA: 'cardano',
+    SUI: 'sui',
+};
+const ONECLICK_TO_X = Object.fromEntries(Object.entries(X_TO_ONECLICK).map(([k, v]) => [v, k]));
+const xChainToOneClickBlockchain = (chain) => {
+    var _a;
+    return (_a = X_TO_ONECLICK[chain]) !== null && _a !== void 0 ? _a : null;
+};
+const oneClickBlockchainToXChain = (blockchain) => {
+    var _a;
+    return (_a = ONECLICK_TO_X[blockchain]) !== null && _a !== void 0 ? _a : null;
+};
+const findOneClickToken = (asset, tokens) => {
+    if (isSynthAsset(asset) || isTradeAsset(asset) || isSecuredAsset(asset))
+        return undefined;
+    const blockchain = xChainToOneClickBlockchain(asset.chain);
+    if (!blockchain)
+        return undefined;
+    return tokens.find((token) => {
+        if (token.blockchain !== blockchain)
+            return false;
+        if (isTokenAsset(asset)) {
+            // Match by contract address (case-insensitive)
+            const assetContract = asset.symbol.includes('-') ? asset.symbol.split('-')[1] : undefined;
+            return assetContract && token.contractAddress
+                ? token.contractAddress.toLowerCase() === assetContract.toLowerCase()
+                : false;
+        }
+        // Native asset: match by symbol, ensure no contract address on token
+        return token.symbol.toUpperCase() === asset.symbol.toUpperCase() && !token.contractAddress;
+    });
+};
+
+class OneClickProtocol {
+    constructor(configuration) {
+        this.name = 'OneClick';
+        this.api = new OneClickApi(configuration === null || configuration === void 0 ? void 0 : configuration.oneClickApiKey);
+        this.wallet = configuration === null || configuration === void 0 ? void 0 : configuration.wallet;
+        this.affiliateAddress = configuration === null || configuration === void 0 ? void 0 : configuration.affiliateAddress;
+        this.affiliateBps = configuration === null || configuration === void 0 ? void 0 : configuration.affiliateBps;
+        this.tokensCache = new CachedValue(() => this.api.getTokens(), 24 * 60 * 60 * 1000);
+    }
+    approveRouterToSpend(_params) {
+        return __awaiter$4(this, void 0, void 0, function* () {
+            throw new Error('Not implemented');
+        });
+    }
+    shouldBeApproved(_params) {
+        return __awaiter$4(this, void 0, void 0, function* () {
+            return false;
+        });
+    }
+    isAssetSupported(asset) {
+        return __awaiter$4(this, void 0, void 0, function* () {
+            if (isSynthAsset(asset) || isTradeAsset(asset) || isSecuredAsset(asset))
+                return false;
+            const tokens = yield this.tokensCache.getValue();
+            return findOneClickToken(asset, tokens) !== undefined;
+        });
+    }
+    getSupportedChains() {
+        return __awaiter$4(this, void 0, void 0, function* () {
+            const tokens = yield this.tokensCache.getValue();
+            const chains = new Set();
+            for (const token of tokens) {
+                const chain = oneClickBlockchainToXChain(token.blockchain);
+                if (chain)
+                    chains.add(chain);
+            }
+            return Array.from(chains);
+        });
+    }
+    estimateSwap(params) {
+        return __awaiter$4(this, void 0, void 0, function* () {
+            var _a, _b, _c;
+            const tokens = yield this.tokensCache.getValue();
+            const srcToken = findOneClickToken(params.fromAsset, tokens);
+            const destToken = findOneClickToken(params.destinationAsset, tokens);
+            if (!srcToken || !destToken) {
+                return this.errorQuote(params, srcToken ? 'Destination asset not supported' : 'Source asset not supported');
+            }
+            try {
+                const isDry = !(params.fromAddress && params.destinationAddress);
+                const deadline = new Date(Date.now() + 10 * 60 * 1000).toISOString();
+                const appFees = this.affiliateAddress && this.affiliateBps
+                    ? [{ recipient: this.affiliateAddress, fee: this.affiliateBps }]
+                    : undefined;
+                const resp = yield this.api.getQuote({
+                    dry: isDry,
+                    swapType: 'EXACT_INPUT',
+                    depositType: 'ORIGIN_CHAIN',
+                    recipientType: 'DESTINATION_CHAIN',
+                    refundType: 'ORIGIN_CHAIN',
+                    originAsset: srcToken.assetId,
+                    destinationAsset: destToken.assetId,
+                    amount: params.amount.baseAmount.amount().toString(),
+                    refundTo: params.fromAddress || '',
+                    recipient: params.destinationAddress || '',
+                    slippageTolerance: (_a = params.toleranceBps) !== null && _a !== void 0 ? _a : 100,
+                    deadline,
+                    appFees,
+                });
+                if (resp.error || resp.message) {
+                    return this.errorQuote(params, resp.error || resp.message || 'Unknown error');
+                }
+                const quote = resp.quote;
+                const toAddress = (_b = quote.depositAddress) !== null && _b !== void 0 ? _b : '';
+                return {
+                    protocol: this.name,
+                    toAddress,
+                    memo: '',
+                    expectedAmount: new CryptoAmount(baseAmount(quote.amountOut, destToken.decimals), params.destinationAsset),
+                    dustThreshold: new CryptoAmount(baseAmount(0), params.fromAsset),
+                    totalSwapSeconds: (_c = quote.timeEstimate) !== null && _c !== void 0 ? _c : 0,
+                    maxStreamingQuantity: undefined,
+                    canSwap: toAddress !== '',
+                    warning: '',
+                    errors: [],
+                    slipBasisPoints: 0,
+                    fees: {
+                        asset: params.fromAsset,
+                        affiliateFee: new CryptoAmount(baseAmount(0), params.fromAsset),
+                        outboundFee: new CryptoAmount(baseAmount(0), params.destinationAsset),
+                    },
+                };
+            }
+            catch (e) {
+                return this.errorQuote(params, e instanceof Error ? e.message : 'Unknown error');
+            }
+        });
+    }
+    doSwap(params) {
+        return __awaiter$4(this, void 0, void 0, function* () {
+            const quoteSwap = yield this.estimateSwap(params);
+            if (!quoteSwap.canSwap) {
+                throw new Error(`Can not make swap. ${quoteSwap.errors.join('\n')}`);
+            }
+            if (!this.wallet)
+                throw new Error('Wallet not configured. Can not do swap');
+            const hash = yield this.wallet.transfer({
+                recipient: quoteSwap.toAddress,
+                amount: params.amount.baseAmount,
+                asset: params.fromAsset,
+                memo: quoteSwap.memo,
+            });
+            // Funds are already on the wire. Awaiting submitDeposit lets callers distinguish
+            // "deposit registered, swap will settle" from "registration silently failed, swap will
+            // never settle" — surface the failure with the broadcast hash so it can be retried.
+            try {
+                yield this.api.submitDeposit(hash, quoteSwap.toAddress);
+            }
+            catch (e) {
+                throw new Error(`1Click deposit tx ${hash} was broadcast, but submitDeposit failed: ${e instanceof Error ? e.message : 'unknown error'}`);
+            }
+            // Explorer URL is best-effort; the hash is what callers actually need for tracking.
+            let url = '';
+            try {
+                url = yield this.wallet.getExplorerTxUrl(params.fromAsset.chain, hash);
+            }
+            catch (_a) {
+                // swallow: explorer URL lookup must not reject a successful swap
+            }
+            return { hash, url };
+        });
+    }
+    getSwapHistory(_params) {
+        return __awaiter$4(this, void 0, void 0, function* () {
+            return { count: 0, swaps: [] };
+        });
+    }
+    errorQuote(params, error) {
+        return {
+            protocol: this.name,
+            toAddress: '',
+            memo: '',
+            expectedAmount: new CryptoAmount(baseAmount(0), params.destinationAsset),
+            dustThreshold: new CryptoAmount(baseAmount(0), params.fromAsset),
+            totalSwapSeconds: 0,
+            maxStreamingQuantity: undefined,
+            canSwap: false,
+            warning: '',
+            errors: [error],
+            slipBasisPoints: 0,
+            fees: {
+                asset: params.fromAsset,
+                affiliateFee: new CryptoAmount(baseAmount(0), params.fromAsset),
+                outboundFee: new CryptoAmount(baseAmount(0), params.destinationAsset),
+            },
+        };
+    }
+}
+
 /**
  * The base URL for the Midgard API endpoint.
  */
-const MIDGARD_API_URL = 'https://gateway.liquify.com/chain/thorchain_midgard/';
+const MIDGARD_API_URL = 'https://midgard.thorchain.network/';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -10510,7 +10820,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 const defaultMidgardConfig = {
     mainnet: {
         apiRetries: 3,
-        midgardBaseUrls: ['https://gateway.liquify.com/chain/thorchain_midgard'],
+        midgardBaseUrls: ['https://midgard.thorchain.network', 'https://gateway.liquify.com/chain/thorchain_midgard'],
     },
     stagenet: {
         apiRetries: 3,
@@ -11063,6 +11373,7 @@ const getProtocolConfig = (name, configuration) => {
         network: configuration.network,
         affiliateBrokers: configuration.affiliateBrokers,
         brokerUrl: configuration.brokerUrl,
+        oneClickApiKey: configuration.oneClickApiKey,
     };
 };
 class ProtocolFactory {
@@ -11075,6 +11386,8 @@ class ProtocolFactory {
                 return new MayachainProtocol(protocolConfig);
             case 'Chainflip':
                 return new ChainflipProtocol(protocolConfig);
+            case 'OneClick':
+                return new OneClickProtocol(protocolConfig);
         }
     }
 }