sushi 4.0.0 → 4.0.2

package/dist/_cjs/pool/trident-stable/zod.js

@@ -1,7 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tridentStablePoolSchema = void 0;
-const z = require("zod");
+const z = __importStar(require("zod"));
 const index_js_1 = require("../../currency/index.js");
 const index_js_2 = require("../../dex/index.js");
 exports.tridentStablePoolSchema = z.object({

package/dist/_cjs/pool/trident-stable/zod.js.map

@@ -1 +1 @@
-{"version":3,"file":"zod.js","sourceRoot":"","sources":["../../../../src/pool/trident-stable/zod.ts"],"names":[],"mappings":";;;AAAA,yBAAwB;AACxB,sDAAsD;AACtD,iDAAwC;AAE3B,QAAA,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9C,QAAQ,EAAE,uBAAY;IACtB,QAAQ,EAAE,uBAAY;IACtB,GAAG,EAAE,CAAC,CAAC,UAAU,CAAC,cAAG,CAAC;IACtB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;KACpB,CAAC;IACF,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;KACpB,CAAC;CACH,CAAC,CAAA"}
+{"version":3,"file":"zod.js","sourceRoot":"","sources":["../../../../src/pool/trident-stable/zod.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AACxB,sDAAsD;AACtD,iDAAwC;AAE3B,QAAA,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9C,QAAQ,EAAE,uBAAY;IACtB,QAAQ,EAAE,uBAAY;IACtB,GAAG,EAAE,CAAC,CAAC,UAAU,CAAC,cAAG,CAAC;IACtB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;KACpB,CAAC;IACF,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;KACpB,CAAC;CACH,CAAC,CAAA"}

package/dist/_cjs/sort/sortedInsert.js

@@ -1,7 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sortedInsert = sortedInsert;
-const tiny_invariant_1 = require("tiny-invariant");
+const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
 function sortedInsert(items, add, maxSize, comparator) {
     (0, tiny_invariant_1.default)(maxSize > 0, 'MAX_SIZE_ZERO');
     (0, tiny_invariant_1.default)(items.length <= maxSize, 'ITEMS_SIZE');

package/dist/_cjs/sort/sortedInsert.js.map

@@ -1 +1 @@
-{"version":3,"file":"sortedInsert.js","sourceRoot":"","sources":["../../../src/sort/sortedInsert.ts"],"names":[],"mappings":";;AAIA,oCAmCC;AAvCD,mDAAsC;AAItC,SAAgB,YAAY,CAC1B,KAAU,EACV,GAAM,EACN,OAAe,EACf,UAAkC;IAElC,IAAA,wBAAS,EAAC,OAAO,GAAG,CAAC,EAAE,eAAe,CAAC,CAAA;IAEvC,IAAA,wBAAS,EAAC,KAAK,CAAC,MAAM,IAAI,OAAO,EAAE,YAAY,CAAC,CAAA;IAGhD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACf,OAAO,IAAI,CAAA;IACb,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,KAAK,OAAO,CAAA;QAEvC,IAAI,MAAM,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACjE,OAAO,GAAG,CAAA;QACZ,CAAC;QAED,IAAI,EAAE,GAAG,CAAC,CAAA;QACV,IAAI,EAAE,GAAG,KAAK,CAAC,MAAM,CAAA;QAErB,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC;YACf,MAAM,GAAG,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAA;YAC3B,IAAI,UAAU,CAAC,KAAK,CAAC,GAAG,CAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1C,EAAE,GAAG,GAAG,GAAG,CAAC,CAAA;YACd,CAAC;iBAAM,CAAC;gBACN,EAAE,GAAG,GAAG,CAAA;YACV,CAAC;QACH,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAA;QACxB,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAG,CAAC,CAAC,CAAC,IAAI,CAAA;IACrC,CAAC;AACH,CAAC"}
+{"version":3,"file":"sortedInsert.js","sourceRoot":"","sources":["../../../src/sort/sortedInsert.ts"],"names":[],"mappings":";;;;;AAIA,oCAmCC;AAvCD,oEAAsC;AAItC,SAAgB,YAAY,CAC1B,KAAU,EACV,GAAM,EACN,OAAe,EACf,UAAkC;IAElC,IAAA,wBAAS,EAAC,OAAO,GAAG,CAAC,EAAE,eAAe,CAAC,CAAA;IAEvC,IAAA,wBAAS,EAAC,KAAK,CAAC,MAAM,IAAI,OAAO,EAAE,YAAY,CAAC,CAAA;IAGhD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACf,OAAO,IAAI,CAAA;IACb,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,KAAK,OAAO,CAAA;QAEvC,IAAI,MAAM,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACjE,OAAO,GAAG,CAAA;QACZ,CAAC;QAED,IAAI,EAAE,GAAG,CAAC,CAAA;QACV,IAAI,EAAE,GAAG,KAAK,CAAC,MAAM,CAAA;QAErB,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC;YACf,MAAM,GAAG,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAA;YAC3B,IAAI,UAAU,CAAC,KAAK,CAAC,GAAG,CAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1C,EAAE,GAAG,GAAG,GAAG,CAAC,CAAA;YACd,CAAC;iBAAM,CAAC;gBACN,EAAE,GAAG,GAAG,CAAA;YACV,CAAC;QACH,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAA;QACxB,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAG,CAAC,CAAC,CAAC,IAAI,CAAA;IACrC,CAAC;AACH,CAAC"}

package/dist/_esm/pool/sushiswap-v3/utils/computePoolAddress.js

@@ -2,9 +2,6 @@ import { encodeAbiParameters, keccak256, parseAbiParameters } from 'viem/utils';
 import { getCreate2Address } from '../../../address/getCreate2Address.js';
 import { SUSHISWAP_V3_INIT_CODE_HASH, SushiSwapV3FeeAmount, } from '../../../config/index.js';
 import { Token } from '../../../currency/index.js';
-function hasTokenInstances(params) {
-    return params.tokenA instanceof Token && params.tokenB instanceof Token;
-}
 /**
  * Computes a pool address
  * @param factoryAddress The Uniswap V3 factory address
@@ -15,35 +12,35 @@ function hasTokenInstances(params) {
  * @returns The pool address
  */
 export function computeSushiSwapV3PoolAddress(params) {
-    if (hasTokenInstances(params)) {
-        const { factoryAddress, tokenA, tokenB, fee, initCodeHashManualOverride } = params;
-        const [token0, token1] = tokenA.sortsBefore(tokenB)
-            ? [tokenA, tokenB]
-            : [tokenB, tokenA]; // does safety checks
+    if (typeof params.tokenA === 'string' && typeof params.tokenB === 'string') {
+        // FIXME: We shouldn't even allow sending strings into here
+        const { factoryAddress, tokenA, tokenB, fee, initCodeHashManualOverride, chainId, } = params;
         return getCreate2Address({
             from: factoryAddress,
             salt: keccak256(encodeAbiParameters(parseAbiParameters('address, address, uint24'), [
-                token0.address,
-                token1.address,
+                tokenA,
+                tokenB,
                 fee,
             ])),
             bytecodeHash: initCodeHashManualOverride ??
-                SUSHISWAP_V3_INIT_CODE_HASH[token0.chainId],
-            chainId: token0.chainId,
+                SUSHISWAP_V3_INIT_CODE_HASH[chainId],
+            chainId,
         });
     }
-    // FIXME: We shouldn't even allow sending strings into here
-    const { factoryAddress, tokenA, tokenB, fee, initCodeHashManualOverride, chainId, } = params;
+    const { factoryAddress, tokenA, tokenB, fee, initCodeHashManualOverride } = params;
+    const [token0, token1] = tokenA.sortsBefore(tokenB)
+        ? [tokenA, tokenB]
+        : [tokenB, tokenA]; // does safety checks
     return getCreate2Address({
         from: factoryAddress,
         salt: keccak256(encodeAbiParameters(parseAbiParameters('address, address, uint24'), [
-            tokenA,
-            tokenB,
+            token0.address,
+            token1.address,
             fee,
         ])),
         bytecodeHash: initCodeHashManualOverride ??
-            SUSHISWAP_V3_INIT_CODE_HASH[chainId],
-        chainId,
+            SUSHISWAP_V3_INIT_CODE_HASH[token0.chainId],
+        chainId: token0.chainId,
     });
 }
 //# sourceMappingURL=computePoolAddress.js.map

package/dist/_esm/pool/sushiswap-v3/utils/computePoolAddress.js.map

@@ -1 +1 @@
-{"version":3,"file":"computePoolAddress.js","sourceRoot":"","sources":["../../../../../src/pool/sushiswap-v3/utils/computePoolAddress.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAA;AAEzE,OAAO,EACL,2BAA2B,EAE3B,oBAAoB,GACrB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAkBlD,SAAS,iBAAiB,CACxB,MAA2C;IAK3C,OAAO,MAAM,CAAC,MAAM,YAAY,KAAK,IAAI,MAAM,CAAC,MAAM,YAAY,KAAK,CAAA;AACzE,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,6BAA6B,CAC3C,MAA2C;IAE3C,IAAI,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9B,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,0BAA0B,EAAE,GACvE,MAAM,CAAA;QACR,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC;YACjD,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC;YAClB,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA,CAAC,qBAAqB;QAE1C,OAAO,iBAAiB,CAAC;YACvB,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,SAAS,CACb,mBAAmB,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,EAAE;gBAClE,MAAM,CAAC,OAAO;gBACd,MAAM,CAAC,OAAO;gBACd,GAAG;aACJ,CAAC,CACH;YACD,YAAY,EACV,0BAA0B;gBAC1B,2BAA2B,CAAC,MAAM,CAAC,OAA6B,CAAC;YACnE,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC,CAAA;IACJ,CAAC;IAED,2DAA2D;IAC3D,MAAM,EACJ,cAAc,EACd,MAAM,EACN,MAAM,EACN,GAAG,EACH,0BAA0B,EAC1B,OAAO,GACR,GAAG,MAAM,CAAA;IAEV,OAAO,iBAAiB,CAAC;QACvB,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,SAAS,CACb,mBAAmB,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,EAAE;YAClE,MAAM;YACN,MAAM;YACN,GAAG;SACJ,CAAC,CACH;QACD,YAAY,EACV,0BAA0B;YAC1B,2BAA2B,CAAC,OAA6B,CAAC;QAC5D,OAAO;KACR,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"computePoolAddress.js","sourceRoot":"","sources":["../../../../../src/pool/sushiswap-v3/utils/computePoolAddress.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAA;AAEzE,OAAO,EACL,2BAA2B,EAE3B,oBAAoB,GACrB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAkBlD;;;;;;;;GAQG;AACH,MAAM,UAAU,6BAA6B,CAC3C,MAA2C;IAE3C,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC3E,2DAA2D;QAC3D,MAAM,EACJ,cAAc,EACd,MAAM,EACN,MAAM,EACN,GAAG,EACH,0BAA0B,EAC1B,OAAO,GACR,GAAG,MAAM,CAAA;QAEV,OAAO,iBAAiB,CAAC;YACvB,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,SAAS,CACb,mBAAmB,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,EAAE;gBAClE,MAAM;gBACN,MAAM;gBACN,GAAG;aACJ,CAAC,CACH;YACD,YAAY,EACV,0BAA0B;gBAC1B,2BAA2B,CAAC,OAA6B,CAAC;YAC5D,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,0BAA0B,EAAE,GACvE,MAAM,CAAA;IACR,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC;QACjD,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC;QAClB,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA,CAAC,qBAAqB;IAE1C,OAAO,iBAAiB,CAAC;QACvB,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,SAAS,CACb,mBAAmB,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,EAAE;YAClE,MAAM,CAAC,OAAO;YACd,MAAM,CAAC,OAAO;YACd,GAAG;SACJ,CAAC,CACH;QACD,YAAY,EACV,0BAA0B;YAC1B,2BAA2B,CAAC,MAAM,CAAC,OAA6B,CAAC;QACnE,OAAO,EAAE,MAAM,CAAC,OAAO;KACxB,CAAC,CAAA;AACJ,CAAC"}

package/dist/_types/pool/sushiswap-v3/utils/computePoolAddress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computePoolAddress.d.ts","sourceRoot":"","sources":["../../../../../src/pool/sushiswap-v3/utils/computePoolAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAGnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAGL,oBAAoB,EACrB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAElD,KAAK,mCAAmC,GAAG;IACzC,cAAc,EAAE,OAAO,CAAA;IACvB,GAAG,EAAE,oBAAoB,CAAA;IACzB,0BAA0B,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CACjD,GAAG,CACA;IACE,MAAM,EAAE,KAAK,CAAA;IACb,MAAM,EAAE,KAAK,CAAA;CACd,GACD;IACE,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;CACjB,CACJ,CAAA;AAWD;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,mCAAmC,GAC1C,OAAO,CAgDT"}
+{"version":3,"file":"computePoolAddress.d.ts","sourceRoot":"","sources":["../../../../../src/pool/sushiswap-v3/utils/computePoolAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAGnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAGL,oBAAoB,EACrB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAElD,KAAK,mCAAmC,GAAG;IACzC,cAAc,EAAE,OAAO,CAAA;IACvB,GAAG,EAAE,oBAAoB,CAAA;IACzB,0BAA0B,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CACjD,GAAG,CACA;IACE,MAAM,EAAE,KAAK,CAAA;IACb,MAAM,EAAE,KAAK,CAAA;CACd,GACD;IACE,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;CACjB,CACJ,CAAA;AAED;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,mCAAmC,GAC1C,OAAO,CAgDT"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sushi",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Sushi",
   "keywords": [
     "sushi"
@@ -248,7 +248,7 @@
   },
   "scripts": {
     "build": "pnpm build:cjs && pnpm build:esm && pnpm build:types",
-    "build:cjs": "tsc --project ./tsconfig.build.json --module commonjs --outDir ./dist/_cjs --removeComments --verbatimModuleSyntax false && printf '{\"type\":\"commonjs\"}' > ./dist/_cjs/package.json",
+    "build:cjs": "tsc --project ./tsconfig.build.json --module commonjs --outDir ./dist/_cjs --removeComments --verbatimModuleSyntax false --esModuleInterop true && printf '{\"type\":\"commonjs\"}' > ./dist/_cjs/package.json",
     "build:esm": "tsc --project ./tsconfig.build.json --module es2020 --outDir ./dist/_esm && printf '{\"type\": \"module\",\"sideEffects\": \"true\"}' > ./dist/_esm/package.json",
     "build:types": "tsc --project ./tsconfig.build.json --module esnext --declarationDir ./dist/_types --emitDeclarationOnly --declaration --declarationMap",
     "check": "tsc --pretty --noEmit",