sushi 6.0.16 → 6.0.18

package/_cjs/evm/currency/currency.js

@@ -1,11 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializedEvmCurrencySchema = void 0;
+exports.getEvmCurrencyAddress = getEvmCurrencyAddress;
 const zod_1 = require("zod");
+const simple_constants_js_1 = require("../config/simple-constants.js");
 const native_js_1 = require("./native.js");
 const token_js_1 = require("./token.js");
 exports.serializedEvmCurrencySchema = zod_1.z.discriminatedUnion('type', [
     token_js_1.serializedEvmTokenSchema,
     native_js_1.serializedEvmNativeSchema,
 ]);
+function getEvmCurrencyAddress(currency) {
+    return currency.type === 'native' ? simple_constants_js_1.nativeAddress : currency.address;
+}
 //# sourceMappingURL=currency.js.map

package/_cjs/evm/currency/currency.js.map

@@ -1 +1 @@
-{"version":3,"file":"currency.js","sourceRoot":"","sources":["../../../evm/currency/currency.ts"],"names":[],"mappings":";;;AAAA,6BAAuB;AAEvB,2CAAuE;AACvE,yCAAoE;AAMvD,QAAA,2BAA2B,GAAG,OAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;IACtE,mCAAwB;IACxB,qCAAyB;CAC1B,CAAC,CAAA"}
+{"version":3,"file":"currency.js","sourceRoot":"","sources":["../../../evm/currency/currency.ts"],"names":[],"mappings":";;;AAqBA,sDAEC;AAvBD,6BAAuB;AAEvB,uEAA6D;AAC7D,2CAAuE;AACvE,yCAAoE;AAMvD,QAAA,2BAA2B,GAAG,OAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;IACtE,mCAAwB;IACxB,qCAAyB;CAC1B,CAAC,CAAA;AAQF,SAAgB,qBAAqB,CAAC,QAAqB;IACzD,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,mCAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAA;AACtE,CAAC"}

package/_cjs/generic/utils/id.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getChainIdAddressFromId = getChainIdAddressFromId;
 exports.getIdFromChainIdAddress = getIdFromChainIdAddress;
+const simple_constants_js_1 = require("../../evm/config/simple-constants.js");
 function getChainIdAddressFromId(id) {
     const [chainId, address, ...rest] = id.split(':');
     if (rest.length > 0) {
@@ -12,10 +13,14 @@ function getChainIdAddressFromId(id) {
     }
     return { chainId, address };
 }
-function getIdFromChainIdAddress(chainId, address) {
+function getIdFromChainIdAddress(chainId, address, options = {}) {
     if (!chainId || !address) {
         throw new Error(`Invalid chainId or address: ${chainId}, ${address}. Both must be provided.`);
     }
+    address = address.toLowerCase();
+    if (address === simple_constants_js_1.nativeAddress && options.translateNative) {
+        address = 'NATIVE';
+    }
     return `${chainId}:${address}`;
 }
 //# sourceMappingURL=id.js.map

package/_cjs/generic/utils/id.js.map

@@ -1 +1 @@
-{"version":3,"file":"id.js","sourceRoot":"","sources":["../../../generic/utils/id.ts"],"names":[],"mappings":";;AAGA,0DAwBC;AAED,0DAWC;AArCD,SAAgB,uBAAuB,CAIrC,EAA0B;IAK1B,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAyB,CAAA;IAEzE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CACb,sBAAsB,EAAE,yCAAyC,CAClE,CAAA;IACH,CAAC;IAED,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,sBAAsB,EAAE,yCAAyC,CAClE,CAAA;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA;AAC7B,CAAC;AAED,SAAgB,uBAAuB,CAGrC,OAAiB,EAAE,OAAiB;IACpC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,+BAA+B,OAAO,KAAK,OAAO,0BAA0B,CAC7E,CAAA;IACH,CAAC;IAED,OAAO,GAAG,OAAO,IAAI,OAAO,EAA4B,CAAA;AAC1D,CAAC"}
+{"version":3,"file":"id.js","sourceRoot":"","sources":["../../../generic/utils/id.ts"],"names":[],"mappings":";;AAIA,0DAwBC;AAED,0DAwBC;AAtDD,8EAAoE;AAIpE,SAAgB,uBAAuB,CAIrC,EAA0B;IAK1B,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAyB,CAAA;IAEzE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CACb,sBAAsB,EAAE,yCAAyC,CAClE,CAAA;IACH,CAAC;IAED,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,sBAAsB,EAAE,yCAAyC,CAClE,CAAA;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA;AAC7B,CAAC;AAED,SAAgB,uBAAuB,CAKrC,OAAiB,EACjB,OAAiB,EACjB,UAAkD,EAAE;IAEpD,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,+BAA+B,OAAO,KAAK,OAAO,0BAA0B,CAC7E,CAAA;IACH,CAAC;IAED,OAAO,GAAG,OAAO,CAAC,WAAW,EAAc,CAAA;IAE3C,IAAI,OAAO,KAAK,mCAAa,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;QACzD,OAAO,GAAG,QAAoB,CAAA;IAChC,CAAC;IAED,OAAO,GAAG,OAAO,IAAI,OAAO,EAEF,CAAA;AAC5B,CAAC"}

package/_esm/evm/currency/currency.js

@@ -1,8 +1,16 @@
 import { z } from 'zod';
+import { nativeAddress } from '../config/simple-constants.js';
 import { serializedEvmNativeSchema } from './native.js';
 import { serializedEvmTokenSchema } from './token.js';
 export const serializedEvmCurrencySchema = z.discriminatedUnion('type', [
     serializedEvmTokenSchema,
     serializedEvmNativeSchema,
 ]);
+/**
+ *
+ * @returns The address of the currency. If the currency is native, returns the native address constant.
+ */
+export function getEvmCurrencyAddress(currency) {
+    return currency.type === 'native' ? nativeAddress : currency.address;
+}
 //# sourceMappingURL=currency.js.map

package/_esm/evm/currency/currency.js.map

@@ -1 +1 @@
-{"version":3,"file":"currency.js","sourceRoot":"","sources":["../../../evm/currency/currency.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAkB,yBAAyB,EAAE,MAAM,aAAa,CAAA;AACvE,OAAO,EAAiB,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAMpE,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;IACtE,wBAAwB;IACxB,yBAAyB;CAC1B,CAAC,CAAA"}
+{"version":3,"file":"currency.js","sourceRoot":"","sources":["../../../evm/currency/currency.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAC7D,OAAO,EAAkB,yBAAyB,EAAE,MAAM,aAAa,CAAA;AACvE,OAAO,EAAiB,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAMpE,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;IACtE,wBAAwB;IACxB,yBAAyB;CAC1B,CAAC,CAAA;AAIF;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,QAAqB;IACzD,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAA;AACtE,CAAC"}

package/_esm/generic/utils/id.js

@@ -1,3 +1,4 @@
+import { nativeAddress } from '../../evm/config/simple-constants.js';
 export function getChainIdAddressFromId(id) {
     const [chainId, address, ...rest] = id.split(':');
     if (rest.length > 0) {
@@ -8,10 +9,14 @@ export function getChainIdAddressFromId(id) {
     }
     return { chainId, address };
 }
-export function getIdFromChainIdAddress(chainId, address) {
+export function getIdFromChainIdAddress(chainId, address, options = {}) {
     if (!chainId || !address) {
         throw new Error(`Invalid chainId or address: ${chainId}, ${address}. Both must be provided.`);
     }
+    address = address.toLowerCase();
+    if (address === nativeAddress && options.translateNative) {
+        address = 'NATIVE';
+    }
     return `${chainId}:${address}`;
 }
 //# sourceMappingURL=id.js.map

package/_esm/generic/utils/id.js.map

@@ -1 +1 @@
-{"version":3,"file":"id.js","sourceRoot":"","sources":["../../../generic/utils/id.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,uBAAuB,CAIrC,EAA0B;IAK1B,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAyB,CAAA;IAEzE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CACb,sBAAsB,EAAE,yCAAyC,CAClE,CAAA;IACH,CAAC;IAED,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,sBAAsB,EAAE,yCAAyC,CAClE,CAAA;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA;AAC7B,CAAC;AAED,MAAM,UAAU,uBAAuB,CAGrC,OAAiB,EAAE,OAAiB;IACpC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,+BAA+B,OAAO,KAAK,OAAO,0BAA0B,CAC7E,CAAA;IACH,CAAC;IAED,OAAO,GAAG,OAAO,IAAI,OAAO,EAA4B,CAAA;AAC1D,CAAC"}
+{"version":3,"file":"id.js","sourceRoot":"","sources":["../../../generic/utils/id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAA;AAIpE,MAAM,UAAU,uBAAuB,CAIrC,EAA0B;IAK1B,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAyB,CAAA;IAEzE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CACb,sBAAsB,EAAE,yCAAyC,CAClE,CAAA;IACH,CAAC;IAED,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,sBAAsB,EAAE,yCAAyC,CAClE,CAAA;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA;AAC7B,CAAC;AAED,MAAM,UAAU,uBAAuB,CAKrC,OAAiB,EACjB,OAAiB,EACjB,UAAkD,EAAE;IAEpD,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,+BAA+B,OAAO,KAAK,OAAO,0BAA0B,CAC7E,CAAA;IACH,CAAC;IAED,OAAO,GAAG,OAAO,CAAC,WAAW,EAAc,CAAA;IAE3C,IAAI,OAAO,KAAK,aAAa,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;QACzD,OAAO,GAAG,QAAoB,CAAA;IAChC,CAAC;IAED,OAAO,GAAG,OAAO,IAAI,OAAO,EAEF,CAAA;AAC5B,CAAC"}

package/_types/evm/currency/currency.d.ts

@@ -44,4 +44,9 @@ export declare const serializedEvmCurrencySchema: z.ZodDiscriminatedUnion<"type"
     chainId: number;
 }>]>;
 export type SerializedEvmCurrency = z.infer<typeof serializedEvmCurrencySchema>;
+/**
+ *
+ * @returns The address of the currency. If the currency is native, returns the native address constant.
+ */
+export declare function getEvmCurrencyAddress(currency: EvmCurrency): `0x${string}`;
 //# sourceMappingURL=currency.d.ts.map

package/_types/evm/currency/currency.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"currency.d.ts","sourceRoot":"","sources":["../../../evm/currency/currency.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAA;AAC1E,OAAO,EAAE,KAAK,SAAS,EAA6B,MAAM,aAAa,CAAA;AACvE,OAAO,EAAE,KAAK,QAAQ,EAA4B,MAAM,YAAY,CAAA;AAEpE,MAAM,MAAM,WAAW,CACrB,SAAS,SAAS,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAC1D,QAAQ,CAAC,SAAS,CAAC,GAAG,SAAS,CAAA;AAEnC,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGtC,CAAA;AAEF,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAA"}
+{"version":3,"file":"currency.d.ts","sourceRoot":"","sources":["../../../evm/currency/currency.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAA;AAE1E,OAAO,EAAE,KAAK,SAAS,EAA6B,MAAM,aAAa,CAAA;AACvE,OAAO,EAAE,KAAK,QAAQ,EAA4B,MAAM,YAAY,CAAA;AAEpE,MAAM,MAAM,WAAW,CACrB,SAAS,SAAS,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAC1D,QAAQ,CAAC,SAAS,CAAC,GAAG,SAAS,CAAA;AAEnC,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGtC,CAAA;AAEF,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAA;AAE/E;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,WAAW,iBAE1D"}

package/_types/generic/utils/id.d.ts

@@ -4,5 +4,7 @@ export declare function getChainIdAddressFromId<TChainId extends ChainId, TAddre
     chainId: TChainId;
     address: TAddress;
 };
-export declare function getIdFromChainIdAddress<TChainId extends ChainId, TAddress extends string>(chainId: TChainId, address: TAddress): ID<TChainId, TAddress>;
+export declare function getIdFromChainIdAddress<TChainId extends ChainId, TAddress extends string, TTranslateNative extends boolean = false>(chainId: TChainId, address: TAddress, options?: {
+    translateNative?: TTranslateNative;
+}): TTranslateNative extends true ? ID<TChainId, TAddress | "NATIVE"> : ID<TChainId, TAddress>;
 //# sourceMappingURL=id.d.ts.map

package/_types/generic/utils/id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"id.d.ts","sourceRoot":"","sources":["../../../generic/utils/id.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AAExC,wBAAgB,uBAAuB,CACrC,QAAQ,SAAS,OAAO,EACxB,QAAQ,SAAS,MAAM,EAEvB,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,GACzB;IACD,OAAO,EAAE,QAAQ,CAAA;IACjB,OAAO,EAAE,QAAQ,CAAA;CAClB,CAgBA;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,SAAS,OAAO,EACxB,QAAQ,SAAS,MAAM,EACvB,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAQ9D"}
+{"version":3,"file":"id.d.ts","sourceRoot":"","sources":["../../../generic/utils/id.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AAExC,wBAAgB,uBAAuB,CACrC,QAAQ,SAAS,OAAO,EACxB,QAAQ,SAAS,MAAM,EAEvB,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,GACzB;IACD,OAAO,EAAE,QAAQ,CAAA;IACjB,OAAO,EAAE,QAAQ,CAAA;CAClB,CAgBA;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,SAAS,OAAO,EACxB,QAAQ,SAAS,MAAM,EACvB,gBAAgB,SAAS,OAAO,GAAG,KAAK,EAExC,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,EACjB,OAAO,GAAE;IAAE,eAAe,CAAC,EAAE,gBAAgB,CAAA;CAAO,GAclB,gBAAgB,SAAS,IAAI,GAC3D,EAAE,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,CAAC,GACjC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAC3B"}

package/evm/currency/currency.ts

@@ -1,5 +1,6 @@
 import { z } from 'zod'
 import type { CurrencyMetadata } from '../../generic/currency/currency.js'
+import { nativeAddress } from '../config/simple-constants.js'
 import { type EvmNative, serializedEvmNativeSchema } from './native.js'
 import { type EvmToken, serializedEvmTokenSchema } from './token.js'
 
@@ -13,3 +14,11 @@ export const serializedEvmCurrencySchema = z.discriminatedUnion('type', [
 ])
 
 export type SerializedEvmCurrency = z.infer<typeof serializedEvmCurrencySchema>
+
+/**
+ *
+ * @returns The address of the currency. If the currency is native, returns the native address constant.
+ */
+export function getEvmCurrencyAddress(currency: EvmCurrency) {
+  return currency.type === 'native' ? nativeAddress : currency.address
+}

package/generic/utils/id.ts

@@ -1,3 +1,4 @@
+import { nativeAddress } from '../../evm/config/simple-constants.js'
 import type { ChainId } from '../chain/chains.js'
 import type { ID } from '../types/id.js'
 
@@ -30,12 +31,25 @@ export function getChainIdAddressFromId<
 export function getIdFromChainIdAddress<
   TChainId extends ChainId,
   TAddress extends string,
->(chainId: TChainId, address: TAddress): ID<TChainId, TAddress> {
+  TTranslateNative extends boolean = false,
+>(
+  chainId: TChainId,
+  address: TAddress,
+  options: { translateNative?: TTranslateNative } = {},
+) {
   if (!chainId || !address) {
     throw new Error(
       `Invalid chainId or address: ${chainId}, ${address}. Both must be provided.`,
     )
   }
 
-  return `${chainId}:${address}` as ID<TChainId, TAddress>
+  address = address.toLowerCase() as TAddress
+
+  if (address === nativeAddress && options.translateNative) {
+    address = 'NATIVE' as TAddress
+  }
+
+  return `${chainId}:${address}` as TTranslateNative extends true
+    ? ID<TChainId, TAddress | 'NATIVE'>
+    : ID<TChainId, TAddress>
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sushi",
   "description": "Sushi",
-  "version": "6.0.16",
+  "version": "6.0.18",
   "type": "module",
   "main": "./_cjs/generic/index.js",
   "module": "./_esm/generic/index.js",