@enkryptcom/swap 0.0.4 → 0.0.5

package/dist/index.cjs

@@ -1924,7 +1924,8 @@ var Changelly = /*#__PURE__*/ function(ProviderClass) {
                                     if (!supportedChangellyNames.has(cur.blockchain)) {
                                         return;
                                     }
-                                    if (cur.enabledFrom && cur.fixRateEnabled && cur.token && changellyToNetwork[cur.blockchain] === _this.network) {
+                                    if (cur.enabledFrom && (cur.fixRateEnabled || cur.protocol === "RBTC") && // Allow RBTC as native currency for gas fees and swaps
+                                    cur.token && changellyToNetwork[cur.blockchain] === _this.network) {
                                         _this.fromTokens[cur.token.address] = cur.token;
                                     }
                                     if (cur.enabledTo && cur.fixRateEnabled && cur.token) {

package/dist/index.js

@@ -1824,7 +1824,8 @@ var Changelly = /*#__PURE__*/ function(ProviderClass) {
                                     if (!supportedChangellyNames.has(cur.blockchain)) {
                                         return;
                                     }
-                                    if (cur.enabledFrom && cur.fixRateEnabled && cur.token && changellyToNetwork[cur.blockchain] === _this.network) {
+                                    if (cur.enabledFrom && (cur.fixRateEnabled || cur.protocol === "RBTC") && // Allow RBTC as native currency for gas fees and swaps
+                                    cur.token && changellyToNetwork[cur.blockchain] === _this.network) {
                                         _this.fromTokens[cur.token.address] = cur.token;
                                     }
                                     if (cur.enabledTo && cur.fixRateEnabled && cur.token) {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@enkryptcom/swap",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Swap library for enkrypt",
   "type": "module",
-  "main": "src/index.ts",
-  "module": "src/index.ts",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
   "publishConfig": {
     "main": "dist/index.cjs",
     "module": "dist/index.js",
@@ -22,8 +22,8 @@
     "node": ">=14.15.0"
   },
   "dependencies": {
-    "@enkryptcom/types": "workspace:^",
-    "@enkryptcom/utils": "workspace:^",
+    "@enkryptcom/types": "^0.0.6",
+    "@enkryptcom/utils": "^0.0.6",
     "@solana/spl-token": "^0.4.13",
     "@solana/web3.js": "^1.98.2",
     "bignumber.js": "^9.3.0",
@@ -31,7 +31,7 @@
     "isomorphic-ws": "^5.0.0",
     "json-rpc-2.0": "^1.7.0",
     "lodash": "^4.17.21",
-    "rango-sdk-basic": "^0.1.67",
+    "rango-sdk-basic": "^0.1.69",
     "reconnecting-websocket": "^4.4.0",
     "uuid": "^11.1.0",
     "web3-eth": "^1.10.4",
@@ -40,9 +40,9 @@
   },
   "devDependencies": {
     "@types/node": "^22.15.24",
-    "@typescript-eslint/eslint-plugin": "^8.33.0",
-    "@typescript-eslint/parser": "^8.33.0",
-    "eslint": "^9.27.0",
+    "@typescript-eslint/eslint-plugin": "^8.34.1",
+    "@typescript-eslint/parser": "^8.34.1",
+    "eslint": "^9.29.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^10.1.5",
     "eslint-import-resolver-alias": "^1.1.2",
@@ -53,8 +53,8 @@
     "tsconfig-paths": "^4.2.0",
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
-    "typescript-eslint": "8.33.0",
-    "vitest": "^3.1.4"
+    "typescript-eslint": "8.34.1",
+    "vitest": "^3.2.3"
   },
   "repository": {
     "type": "git",
@@ -62,5 +62,6 @@
   },
   "keywords": [],
   "author": "kvhnuke",
-  "license": "MIT"
-}
+  "license": "MIT",
+  "types": "dist/index.d.ts"
+}

package/src/index.ts

@@ -1,270 +0,0 @@
-import { merge } from "lodash";
-import EventEmitter from "eventemitter3";
-import type Web3Eth from "web3-eth";
-import type { Connection as Web3Solana } from "@solana/web3.js";
-import { TOKEN_LISTS, TOP_TOKEN_INFO_LIST } from "./configs";
-import OneInch from "./providers/oneInch";
-import Paraswap from "./providers/paraswap";
-import Changelly from "./providers/changelly";
-import ZeroX from "./providers/zerox";
-import Rango from "./providers/rango";
-import NetworkDetails, {
-  isSupportedNetwork,
-  getSupportedNetworks,
-  getNetworkInfoByName,
-} from "./common/supportedNetworks";
-import type {
-  APIType,
-  EvmOptions,
-  FromTokenType,
-  getQuoteOptions,
-  NetworkInfo,
-  ProviderFromTokenResponse,
-  ProviderQuoteResponse,
-  ProviderSwapResponse,
-  ProviderToTokenResponse,
-  SwapOptions,
-  SwapQuote,
-  TokenType,
-  TokenTypeTo,
-  TopTokenInfo,
-  ToTokenType,
-  GenericTransaction,
-  SolanaTransaction,
-  EVMTransaction,
-  StatusOptionsResponse,
-  StatusOptions,
-  ProviderClass,
-} from "./types";
-import {
-  SupportedNetworkName,
-  Events,
-  WalletIdentifier,
-  NetworkType,
-  TransactionType,
-  TransactionStatus,
-} from "./types";
-import { sortByRank, sortNativeToFront } from "./utils/common";
-import SwapToken from "./swapToken";
-import { Jupiter } from "./providers/jupiter";
-
-class Swap extends EventEmitter {
-  network: SupportedNetworkName;
-
-  evmOptions: EvmOptions;
-
-  private api: APIType;
-
-  initPromise: Promise<void>;
-
-  private providers: ProviderClass[];
-
-  private tokenList: FromTokenType;
-
-  private topTokenInfo: TopTokenInfo;
-
-  private fromTokens: FromTokenType;
-
-  private toTokens: ToTokenType;
-
-  private walletId: WalletIdentifier;
-
-  constructor(options: SwapOptions) {
-    super();
-    this.network = options.network;
-    this.evmOptions = options.evmOptions
-      ? options.evmOptions
-      : { infiniteApproval: true };
-    this.api = options.api;
-    this.walletId = options.walletIdentifier;
-    this.topTokenInfo = {
-      contractsToId: {},
-      topTokens: {},
-      trendingTokens: {},
-    };
-    this.tokenList = {
-      all: [],
-      top: [],
-      trending: [],
-    };
-    this.toTokens = {
-      all: {},
-      top: {},
-      trending: {},
-    };
-    this.fromTokens = {
-      all: [],
-      top: [],
-      trending: [],
-    };
-    this.initPromise = this.init();
-  }
-
-  private async init() {
-    if (TOKEN_LISTS[this.network]) {
-      this.tokenList = await fetch(TOKEN_LISTS[this.network]).then((res) =>
-        res.json(),
-      );
-    }
-
-    this.topTokenInfo = await fetch(TOP_TOKEN_INFO_LIST).then((res) =>
-      res.json(),
-    );
-
-    // TODO: use network type instead?
-    switch (this.network) {
-      case SupportedNetworkName.Solana:
-        // Solana
-        this.providers = [
-          new Jupiter(this.api as Web3Solana, this.network),
-          new Rango(this.api as Web3Solana, this.network),
-          new Changelly(this.api, this.network),
-        ];
-        break;
-      default:
-        // EVM
-        this.providers = [
-          new OneInch(this.api as Web3Eth, this.network),
-          new Paraswap(this.api as Web3Eth, this.network),
-          new Changelly(this.api, this.network),
-          new ZeroX(this.api as Web3Eth, this.network),
-          new Rango(this.api as Web3Eth, this.network),
-        ];
-        break;
-    }
-
-    await Promise.all(
-      this.providers.map((Provider) => Provider.init(this.tokenList.all)),
-    );
-    const allFromTokens: ProviderFromTokenResponse = {};
-    [...this.providers].reverse().forEach((p) => {
-      Object.assign(allFromTokens, p.getFromTokens());
-    });
-    this.fromTokens = {
-      all: Object.values(allFromTokens).sort(sortNativeToFront),
-      top: this.tokenList.top.filter((topt) => !!allFromTokens[topt.address]),
-      trending: this.tokenList.trending.filter(
-        (trendt) => !!allFromTokens[trendt.address],
-      ),
-    };
-    const native = this.fromTokens.all.shift();
-    this.fromTokens.all.sort(sortByRank);
-    if (native) this.fromTokens.all.unshift(native);
-    const allToTokens: ProviderToTokenResponse = {};
-    [...this.providers].reverse().forEach((p) => {
-      merge(allToTokens, p.getToTokens());
-    });
-    Object.keys(allToTokens).forEach((nName) => {
-      const values = Object.values(allToTokens[nName]);
-      values.sort(sortNativeToFront);
-      const nativeTo = values.shift();
-      values.sort(sortByRank);
-      if (nativeTo) values.unshift(nativeTo);
-      values.forEach((val: TokenTypeTo) => {
-        if (val.cgId && this.topTokenInfo.topTokens[val.cgId]) {
-          if (!this.toTokens.top[nName]) this.toTokens.top[nName] = [];
-          this.toTokens.top[nName].push({
-            ...val,
-            rank: this.topTokenInfo.topTokens[val.cgId].rank,
-          });
-        }
-        if (val.cgId && this.topTokenInfo.trendingTokens[val.cgId]) {
-          if (!this.toTokens.trending[nName])
-            this.toTokens.trending[nName] = [];
-          this.toTokens.trending[nName].push({
-            ...val,
-            rank: this.topTokenInfo.trendingTokens[val.cgId],
-          });
-        }
-      });
-      if (this.toTokens.top[nName]) this.toTokens.top[nName].sort(sortByRank);
-      if (this.toTokens.trending[nName])
-        this.toTokens.trending[nName].sort(sortByRank);
-      this.toTokens.all[nName] = values;
-    });
-  }
-
-  getFromTokens() {
-    return this.fromTokens;
-  }
-
-  getToTokens() {
-    return this.toTokens;
-  }
-
-  /**
-   * Request a quote from each provider
-   *
-   * Only providers that support the network will respond
-   */
-  async getQuotes(
-    options: getQuoteOptions,
-    context?: { signal?: AbortSignal },
-  ): Promise<ProviderQuoteResponse[]> {
-    const response = await Promise.all(
-      this.providers.map((provider) =>
-        provider
-          .getQuote(
-            options,
-            {
-              infiniteApproval: this.evmOptions.infiniteApproval,
-              walletIdentifier: this.walletId,
-            },
-            context,
-          )
-          .then((res) => {
-            if (!res) return res;
-            this.emit(Events.QuoteUpdate, res.toTokenAmount);
-            return res;
-          }),
-      ),
-    );
-    // Sort by the dest token amount i.e. best offer first
-    return response
-      .filter((res) => res !== null)
-      .sort((a, b) => (b.toTokenAmount.gt(a.toTokenAmount) ? 1 : -1));
-  }
-
-  getSwap(
-    quote: SwapQuote,
-    context?: { signal?: AbortSignal },
-  ): Promise<ProviderSwapResponse | null> {
-    const provider = this.providers.find((p) => p.name === quote.provider);
-    return provider.getSwap(quote, context);
-  }
-
-  getStatus(options: StatusOptionsResponse): Promise<TransactionStatus | null> {
-    const provider = this.providers.find((p) => p.name === options.provider);
-    return provider.getStatus(options.options);
-  }
-
-  static networkNameToInfo(networkName: SupportedNetworkName): NetworkInfo {
-    return NetworkDetails[networkName];
-  }
-}
-
-export {
-  SwapToken,
-  isSupportedNetwork,
-  getSupportedNetworks,
-  TokenType,
-  TokenTypeTo,
-  WalletIdentifier,
-  SupportedNetworkName,
-  getNetworkInfoByName,
-  sortByRank,
-  sortNativeToFront,
-  NetworkInfo,
-  ProviderQuoteResponse,
-  ProviderSwapResponse,
-  NetworkType,
-  GenericTransaction,
-  SolanaTransaction,
-  EVMTransaction,
-  TransactionType,
-  TransactionStatus,
-  StatusOptionsResponse,
-  StatusOptions,
-};
-
-export default Swap;