@pancakeswap/swap-sdk-core 1.5.1 → 1.6.0

package/dist/index.d.ts

@@ -356,8 +356,11 @@ declare function getTokenComparator(balances: {
     [tokenAddress: string]: CurrencyAmount<Token> | undefined;
 }): (tokenA: Token, tokenB: Token) => number;
 declare function sortCurrencies<T extends Currency>(currencies: T[]): T[];
+declare function sortUnifiedCurrencies<T extends UnifiedCurrency>(currencies: T[]): T[];
 declare const isCurrencySorted: (currencyA: Currency, currencyB: Currency) => boolean;
+declare const isUnifiedCurrencySorted: (currencyA: UnifiedCurrency, currencyB: UnifiedCurrency) => boolean;
 declare function getCurrencyAddress(currency: Currency): `0x${string}`;
+declare function getUnifiedCurrencyAddress(currency: UnifiedCurrency): string;
 declare function getMatchedCurrency(currency: Currency, list: Currency[], matchWrappedCurrency?: boolean): Currency | undefined;
 
-export { BaseCurrency, BigintIsh, Currency, CurrencyAmount, FIVE, Fraction, InsufficientInputAmountError, InsufficientReservesError, MINIMUM_LIQUIDITY, MaxUint256, NativeCurrency, ONE, Percent, Price, Rounding, SPLNativeCurrency, SPLToken, SerializedSPLToken, SerializedToken, TEN, THREE, TWO, Token, TradeType, UnifiedCurrency, UnifiedCurrencyAmount, UnifiedNativeCurrency, UnifiedToken, VMType, VM_TYPE_MAXIMA, ZERO, ZERO_ADDRESS, _100, _10000, _9975, computePriceImpact, getCurrencyAddress, getMatchedCurrency, getTokenComparator, isCurrencySorted, sortCurrencies, sortedInsert, sqrt, validateVMTypeInstance };
+export { BaseCurrency, BigintIsh, Currency, CurrencyAmount, FIVE, Fraction, InsufficientInputAmountError, InsufficientReservesError, MINIMUM_LIQUIDITY, MaxUint256, NativeCurrency, ONE, Percent, Price, Rounding, SPLNativeCurrency, SPLToken, SerializedSPLToken, SerializedToken, TEN, THREE, TWO, Token, TradeType, UnifiedCurrency, UnifiedCurrencyAmount, UnifiedNativeCurrency, UnifiedToken, VMType, VM_TYPE_MAXIMA, ZERO, ZERO_ADDRESS, _100, _10000, _9975, computePriceImpact, getCurrencyAddress, getMatchedCurrency, getTokenComparator, getUnifiedCurrencyAddress, isCurrencySorted, isUnifiedCurrencySorted, sortCurrencies, sortUnifiedCurrencies, sortedInsert, sqrt, validateVMTypeInstance };

package/dist/index.js

@@ -4,6 +4,8 @@ var invariant8 = require('tiny-invariant');
 var _Decimal = require('decimal.js-light');
 var _Big = require('big.js');
 var toFormat = require('toformat');
+var web3_js = require('@solana/web3.js');
+var BN = require('bn.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -11,6 +13,7 @@ var invariant8__default = /*#__PURE__*/_interopDefault(invariant8);
 var _Decimal__default = /*#__PURE__*/_interopDefault(_Decimal);
 var _Big__default = /*#__PURE__*/_interopDefault(_Big);
 var toFormat__default = /*#__PURE__*/_interopDefault(toFormat);
+var BN__default = /*#__PURE__*/_interopDefault(BN);
 
 // src/constants.ts
 var TradeType = /* @__PURE__ */ ((TradeType2) => {
@@ -520,9 +523,8 @@ var SPLToken = class extends BaseCurrency {
     return this.chainId === other.chainId && this.address === other.address;
   }
   sortsBefore(other) {
-    invariant8__default.default(this.chainId === other.chainId, "CHAIN_IDS");
-    invariant8__default.default(this.programId !== other.programId, "ADDRESSES");
-    return this.programId.toLowerCase() < other.programId.toLowerCase();
+    invariant8__default.default(this.chainId === other.chainId, "CHAIN_IDS_MUST_MATCH");
+    return new BN__default.default(new web3_js.PublicKey(this.address).toBuffer()).lt(new BN__default.default(new web3_js.PublicKey(other.address).toBuffer()));
   }
   /* For compatibility */
   get wrapped() {
@@ -646,16 +648,46 @@ function sortCurrencies(currencies) {
     return a.sortsBefore(b) ? -1 : 1;
   });
 }
+function sortUnifiedCurrencies(currencies) {
+  return currencies.sort((a, b) => {
+    if (a instanceof SPLToken && a.chainId === b.chainId) {
+      return a.sortsBefore(b.wrapped) ? -1 : 1;
+    }
+    if (b instanceof SPLToken && a.chainId === b.chainId) {
+      return b.sortsBefore(a.wrapped) ? 1 : -1;
+    }
+    if (a.isNative) {
+      return -1;
+    }
+    if (b.isNative) {
+      return 1;
+    }
+    if (a instanceof Token && b instanceof Token) {
+      return a.sortsBefore(b) ? -1 : 1;
+    }
+    return 0;
+  });
+}
 var isCurrencySorted = (currencyA, currencyB) => {
   const [currency0] = sortCurrencies([currencyA, currencyB]);
   return currency0 === currencyA;
 };
+var isUnifiedCurrencySorted = (currencyA, currencyB) => {
+  const [currency0] = sortUnifiedCurrencies([currencyA, currencyB]);
+  return currency0 === currencyA;
+};
 function getCurrencyAddress(currency) {
   if (currency.isNative) {
     return ZERO_ADDRESS;
   }
   return currency.address;
 }
+function getUnifiedCurrencyAddress(currency) {
+  if (currency.isNative) {
+    return currency instanceof SPLNativeCurrency ? currency.address : ZERO_ADDRESS;
+  }
+  return currency.address;
+}
 function getMatchedCurrency(currency, list, matchWrappedCurrency = true) {
   const c = matchWrappedCurrency ? currency.wrapped : currency;
   for (const current of list) {
@@ -699,8 +731,11 @@ exports.computePriceImpact = computePriceImpact;
 exports.getCurrencyAddress = getCurrencyAddress;
 exports.getMatchedCurrency = getMatchedCurrency;
 exports.getTokenComparator = getTokenComparator;
+exports.getUnifiedCurrencyAddress = getUnifiedCurrencyAddress;
 exports.isCurrencySorted = isCurrencySorted;
+exports.isUnifiedCurrencySorted = isUnifiedCurrencySorted;
 exports.sortCurrencies = sortCurrencies;
+exports.sortUnifiedCurrencies = sortUnifiedCurrencies;
 exports.sortedInsert = sortedInsert;
 exports.sqrt = sqrt;
 exports.validateVMTypeInstance = validateVMTypeInstance;

package/dist/index.mjs

@@ -2,6 +2,8 @@ import invariant8 from 'tiny-invariant';
 import _Decimal from 'decimal.js-light';
 import _Big from 'big.js';
 import toFormat from 'toformat';
+import { PublicKey } from '@solana/web3.js';
+import BN from 'bn.js';
 
 // src/constants.ts
 var TradeType = /* @__PURE__ */ ((TradeType2) => {
@@ -511,9 +513,8 @@ var SPLToken = class extends BaseCurrency {
     return this.chainId === other.chainId && this.address === other.address;
   }
   sortsBefore(other) {
-    invariant8(this.chainId === other.chainId, "CHAIN_IDS");
-    invariant8(this.programId !== other.programId, "ADDRESSES");
-    return this.programId.toLowerCase() < other.programId.toLowerCase();
+    invariant8(this.chainId === other.chainId, "CHAIN_IDS_MUST_MATCH");
+    return new BN(new PublicKey(this.address).toBuffer()).lt(new BN(new PublicKey(other.address).toBuffer()));
   }
   /* For compatibility */
   get wrapped() {
@@ -637,16 +638,46 @@ function sortCurrencies(currencies) {
     return a.sortsBefore(b) ? -1 : 1;
   });
 }
+function sortUnifiedCurrencies(currencies) {
+  return currencies.sort((a, b) => {
+    if (a instanceof SPLToken && a.chainId === b.chainId) {
+      return a.sortsBefore(b.wrapped) ? -1 : 1;
+    }
+    if (b instanceof SPLToken && a.chainId === b.chainId) {
+      return b.sortsBefore(a.wrapped) ? 1 : -1;
+    }
+    if (a.isNative) {
+      return -1;
+    }
+    if (b.isNative) {
+      return 1;
+    }
+    if (a instanceof Token && b instanceof Token) {
+      return a.sortsBefore(b) ? -1 : 1;
+    }
+    return 0;
+  });
+}
 var isCurrencySorted = (currencyA, currencyB) => {
   const [currency0] = sortCurrencies([currencyA, currencyB]);
   return currency0 === currencyA;
 };
+var isUnifiedCurrencySorted = (currencyA, currencyB) => {
+  const [currency0] = sortUnifiedCurrencies([currencyA, currencyB]);
+  return currency0 === currencyA;
+};
 function getCurrencyAddress(currency) {
   if (currency.isNative) {
     return ZERO_ADDRESS;
   }
   return currency.address;
 }
+function getUnifiedCurrencyAddress(currency) {
+  if (currency.isNative) {
+    return currency instanceof SPLNativeCurrency ? currency.address : ZERO_ADDRESS;
+  }
+  return currency.address;
+}
 function getMatchedCurrency(currency, list, matchWrappedCurrency = true) {
   const c = matchWrappedCurrency ? currency.wrapped : currency;
   for (const current of list) {
@@ -658,4 +689,4 @@ function getMatchedCurrency(currency, list, matchWrappedCurrency = true) {
   return void 0;
 }
 
-export { BaseCurrency, CurrencyAmount, FIVE, Fraction, InsufficientInputAmountError, InsufficientReservesError, MINIMUM_LIQUIDITY, MaxUint256, NativeCurrency, ONE, Percent, Price, Rounding, SPLNativeCurrency, SPLToken, TEN, THREE, TWO, Token, TradeType, UnifiedCurrencyAmount, VMType, VM_TYPE_MAXIMA, ZERO, ZERO_ADDRESS, _100, _10000, _9975, computePriceImpact, getCurrencyAddress, getMatchedCurrency, getTokenComparator, isCurrencySorted, sortCurrencies, sortedInsert, sqrt, validateVMTypeInstance };
+export { BaseCurrency, CurrencyAmount, FIVE, Fraction, InsufficientInputAmountError, InsufficientReservesError, MINIMUM_LIQUIDITY, MaxUint256, NativeCurrency, ONE, Percent, Price, Rounding, SPLNativeCurrency, SPLToken, TEN, THREE, TWO, Token, TradeType, UnifiedCurrencyAmount, VMType, VM_TYPE_MAXIMA, ZERO, ZERO_ADDRESS, _100, _10000, _9975, computePriceImpact, getCurrencyAddress, getMatchedCurrency, getTokenComparator, getUnifiedCurrencyAddress, isCurrencySorted, isUnifiedCurrencySorted, sortCurrencies, sortUnifiedCurrencies, sortedInsert, sqrt, validateVMTypeInstance };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pancakeswap/swap-sdk-core",
   "license": "MIT",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "🛠 An SDK for building applications on top of Pancakeswap.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -26,7 +26,9 @@
     "pancakeswap"
   ],
   "dependencies": {
+    "@solana/web3.js": "1.98.4",
     "big.js": "^5.2.2",
+    "bn.js": "5.2.1",
     "decimal.js-light": "^2.5.0",
     "tiny-invariant": "^1.3.0",
     "tiny-warning": "^1.0.3",
@@ -35,6 +37,7 @@
   "peerDependencies": {},
   "devDependencies": {
     "@types/big.js": "^4.0.5",
+    "@types/bn.js": "5.2.0",
     "tsup": "^6.7.0"
   },
   "engines": {