@opensea/seaport-js 2.0.8 → 3.0.1

package/lib/utils/approval.js.map

@@ -1 +1 @@
-{"version":3,"file":"approval.js","sourceRoot":"","sources":["../../src/utils/approval.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"approval.js","sourceRoot":"","sources":["../../src/utils/approval.ts"],"names":[],"mappings":"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"}

package/lib/utils/balance.d.ts

@@ -1,4 +1,3 @@
-import { providers as multicallProviders } from "@0xsequence/multicall";
-import { BigNumber } from "ethers";
+import { ethers } from "ethers";
 import type { InputCriteria, Item } from "../types";
-export declare const balanceOf: (owner: string, item: Item, multicallProvider: multicallProviders.MulticallProvider, criteria?: InputCriteria) => Promise<BigNumber>;
+export declare const balanceOf: (owner: string, item: Item, provider: ethers.Provider, criteria?: InputCriteria) => Promise<bigint>;

package/lib/utils/balance.js

@@ -1,54 +1,42 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.balanceOf = void 0;
-const ethers_1 = require("ethers");
-const ERC1155_1 = require("../abi/ERC1155");
-const ERC20_1 = require("../abi/ERC20");
-const ERC721_1 = require("../abi/ERC721");
 const constants_1 = require("../constants");
+const typechain_types_1 = require("../typechain-types");
 const item_1 = require("./item");
-const balanceOf = (owner, item, multicallProvider, criteria) => __awaiter(void 0, void 0, void 0, function* () {
+const balanceOf = async (owner, item, provider, criteria) => {
     if ((0, item_1.isErc721Item)(item.itemType)) {
-        const contract = new ethers_1.Contract(item.token, ERC721_1.ERC721ABI, multicallProvider);
+        const contract = typechain_types_1.TestERC721__factory.connect(item.token, provider);
         if (item.itemType === constants_1.ItemType.ERC721_WITH_CRITERIA) {
             return criteria
                 ? contract
                     .ownerOf(criteria.identifier)
-                    .then((ownerOf) => ethers_1.BigNumber.from(Number(ownerOf.toLowerCase() === owner.toLowerCase())))
+                    .then((ownerOf) => BigInt(ownerOf.toLowerCase() === owner.toLowerCase()))
                 : contract.balanceOf(owner);
         }
         return contract
             .ownerOf(item.identifierOrCriteria)
-            .then((ownerOf) => ethers_1.BigNumber.from(Number(ownerOf.toLowerCase() === owner.toLowerCase())));
+            .then((ownerOf) => BigInt(ownerOf.toLowerCase() === owner.toLowerCase()));
     }
     else if ((0, item_1.isErc1155Item)(item.itemType)) {
-        const contract = new ethers_1.Contract(item.token, ERC1155_1.ERC1155ABI, multicallProvider);
+        const contract = typechain_types_1.TestERC1155__factory.connect(item.token, provider);
         if (item.itemType === constants_1.ItemType.ERC1155_WITH_CRITERIA) {
             if (!criteria) {
                 // We don't have a good way to determine the balance of an erc1155 criteria item unless explicit
                 // identifiers are provided, so just assume the offerer has sufficient balance
-                const startAmount = ethers_1.BigNumber.from(item.startAmount);
-                const endAmount = ethers_1.BigNumber.from(item.endAmount);
-                return startAmount.gt(endAmount) ? startAmount : endAmount;
+                const startAmount = BigInt(item.startAmount);
+                const endAmount = BigInt(item.endAmount);
+                return startAmount > endAmount ? startAmount : endAmount;
             }
             return contract.balanceOf(owner, criteria.identifier);
         }
         return contract.balanceOf(owner, item.identifierOrCriteria);
     }
     if ((0, item_1.isErc20Item)(item.itemType)) {
-        const contract = new ethers_1.Contract(item.token, ERC20_1.ERC20ABI, multicallProvider);
+        const contract = typechain_types_1.TestERC20__factory.connect(item.token, provider);
         return contract.balanceOf(owner);
     }
-    return multicallProvider.getBalance(owner);
-});
+    return provider.getBalance(owner);
+};
 exports.balanceOf = balanceOf;
 //# sourceMappingURL=balance.js.map

package/lib/utils/balance.js.map

@@ -1 +1 @@
-{"version":3,"file":"balance.js","sourceRoot":"","sources":["../../src/utils/balance.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mCAA6C;AAC7C,4CAA4C;AAC5C,wCAAwC;AACxC,0CAA0C;AAC1C,4CAAwC;AAGxC,iCAAkE;AAE3D,MAAM,SAAS,GAAG,CACvB,KAAa,EACb,IAAU,EACV,iBAAuD,EACvD,QAAwB,EACJ,EAAE;IACtB,IAAI,IAAA,mBAAY,EAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QAC/B,MAAM,QAAQ,GAAG,IAAI,iBAAQ,CAC3B,IAAI,CAAC,KAAK,EACV,kBAAS,EACT,iBAAiB,CACJ,CAAC;QAEhB,IAAI,IAAI,CAAC,QAAQ,KAAK,oBAAQ,CAAC,oBAAoB,EAAE;YACnD,OAAO,QAAQ;gBACb,CAAC,CAAC,QAAQ;qBACL,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;qBAC5B,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAChB,kBAAS,CAAC,IAAI,CACZ,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,WAAW,EAAE,CAAC,CACtD,CACF;gBACL,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SAC/B;QAED,OAAO,QAAQ;aACZ,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC;aAClC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAChB,kBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CACtE,CAAC;KACL;SAAM,IAAI,IAAA,oBAAa,EAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QACvC,MAAM,QAAQ,GAAG,IAAI,iBAAQ,CAC3B,IAAI,CAAC,KAAK,EACV,oBAAU,EACV,iBAAiB,CACH,CAAC;QAEjB,IAAI,IAAI,CAAC,QAAQ,KAAK,oBAAQ,CAAC,qBAAqB,EAAE;YACpD,IAAI,CAAC,QAAQ,EAAE;gBACb,gGAAgG;gBAChG,8EAA8E;gBAC9E,MAAM,WAAW,GAAG,kBAAS,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACrD,MAAM,SAAS,GAAG,kBAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAEjD,OAAO,WAAW,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;aAC5D;YACD,OAAO,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;SACvD;QAED,OAAO,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;KAC7D;IAED,IAAI,IAAA,kBAAW,EAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QAC9B,MAAM,QAAQ,GAAG,IAAI,iBAAQ,CAC3B,IAAI,CAAC,KAAK,EACV,gBAAQ,EACR,iBAAiB,CACL,CAAC;QACf,OAAO,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;KAClC;IAED,OAAO,iBAAiB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AAC7C,CAAC,CAAA,CAAC;AA9DW,QAAA,SAAS,aA8DpB"}
+{"version":3,"file":"balance.js","sourceRoot":"","sources":["../../src/utils/balance.ts"],"names":[],"mappings":";;;AACA,4CAAwC;AACxC,wDAI4B;AAE5B,iCAAkE;AAE3D,MAAM,SAAS,GAAG,KAAK,EAC5B,KAAa,EACb,IAAU,EACV,QAAyB,EACzB,QAAwB,EACP,EAAE;IACnB,IAAI,IAAA,mBAAY,EAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,qCAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAEnE,IAAI,IAAI,CAAC,QAAQ,KAAK,oBAAQ,CAAC,oBAAoB,EAAE,CAAC;YACpD,OAAO,QAAQ;gBACb,CAAC,CAAC,QAAQ;qBACL,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;qBAC5B,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAChB,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,WAAW,EAAE,CAAC,CACtD;gBACL,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QAED,OAAO,QAAQ;aACZ,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC;aAClC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC;SAAM,IAAI,IAAA,oBAAa,EAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,sCAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAEpE,IAAI,IAAI,CAAC,QAAQ,KAAK,oBAAQ,CAAC,qBAAqB,EAAE,CAAC;YACrD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,gGAAgG;gBAChG,8EAA8E;gBAC9E,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAEzC,OAAO,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YAC3D,CAAC;YACD,OAAO,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;QACxD,CAAC;QAED,OAAO,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,IAAA,kBAAW,EAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,oCAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAClE,OAAO,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AACpC,CAAC,CAAC;AA9CW,QAAA,SAAS,aA8CpB"}

package/lib/utils/balanceAndApprovalCheck.d.ts

@@ -1,36 +1,35 @@
-import { providers as multicallProviders } from "@0xsequence/multicall";
-import { BigNumber } from "ethers";
+import { ethers } from "ethers";
 import { ItemType } from "../constants";
 import type { InputCriteria, Item, OrderParameters } from "../types";
 import { getSummedTokenAndIdentifierAmounts, TimeBasedItemParams } from "./item";
 export type BalancesAndApprovals = {
     token: string;
     identifierOrCriteria: string;
-    balance: BigNumber;
-    approvedAmount: BigNumber;
+    balance: bigint;
+    approvedAmount: bigint;
     itemType: ItemType;
 }[];
 export type InsufficientBalances = {
     token: string;
     identifierOrCriteria: string;
-    requiredAmount: BigNumber;
-    amountHave: BigNumber;
+    requiredAmount: bigint;
+    amountHave: bigint;
     itemType: ItemType;
 }[];
 export type InsufficientApprovals = {
     token: string;
     identifierOrCriteria: string;
-    approvedAmount: BigNumber;
-    requiredApprovedAmount: BigNumber;
+    approvedAmount: bigint;
+    requiredApprovedAmount: bigint;
     operator: string;
     itemType: ItemType;
 }[];
-export declare const getBalancesAndApprovals: ({ owner, items, criterias, operator, multicallProvider, }: {
+export declare const getBalancesAndApprovals: ({ owner, items, criterias, operator, provider, }: {
     owner: string;
     items: Item[];
     criterias: InputCriteria[];
     operator: string;
-    multicallProvider: multicallProviders.MulticallProvider;
+    provider: ethers.Provider;
 }) => Promise<BalancesAndApprovals>;
 export declare const getInsufficientBalanceAndApprovalAmounts: ({ balancesAndApprovals, tokenAndIdentifierAmounts, operator, }: {
     balancesAndApprovals: BalancesAndApprovals;

package/lib/utils/balanceAndApprovalCheck.js

@@ -1,16 +1,6 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateStandardFulfillBalancesAndApprovals = exports.validateBasicFulfillBalancesAndApprovals = exports.validateOfferBalancesAndApprovals = exports.getInsufficientBalanceAndApprovalAmounts = exports.getBalancesAndApprovals = void 0;
-const ethers_1 = require("ethers");
 const constants_1 = require("../constants");
 const approval_1 = require("./approval");
 const balance_1 = require("./balance");
@@ -25,37 +15,36 @@ const findBalanceAndApproval = (balancesAndApprovals, token, identifierOrCriteri
     }
     return balanceAndApproval;
 };
-const getBalancesAndApprovals = ({ owner, items, criterias, operator, multicallProvider, }) => __awaiter(void 0, void 0, void 0, function* () {
+const getBalancesAndApprovals = async ({ owner, items, criterias, operator, provider, }) => {
     const itemToCriteria = (0, criteria_1.getItemToCriteriaMap)(items, criterias);
-    return Promise.all(items.map((item) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
-        let approvedAmountPromise = Promise.resolve(ethers_1.BigNumber.from(0));
+    return Promise.all(items.map(async (item) => {
+        let approvedAmount = 0n;
         if ((0, item_1.isErc721Item)(item.itemType) || (0, item_1.isErc1155Item)(item.itemType)) {
-            approvedAmountPromise = (0, approval_1.approvedItemAmount)(owner, item, operator, multicallProvider);
+            approvedAmount = await (0, approval_1.approvedItemAmount)(owner, item, operator, provider);
         }
         else if ((0, item_1.isErc20Item)(item.itemType)) {
-            approvedAmountPromise = (0, approval_1.approvedItemAmount)(owner, item, operator, multicallProvider);
+            approvedAmount = await (0, approval_1.approvedItemAmount)(owner, item, operator, provider);
         }
-        // If native token, we don't need to check for approvals
         else {
-            approvedAmountPromise = Promise.resolve(constants_1.MAX_INT);
+            // If native token, we don't need to check for approvals
+            approvedAmount = constants_1.MAX_INT;
         }
         return {
             token: item.token,
-            identifierOrCriteria: (_b = (_a = itemToCriteria.get(item)) === null || _a === void 0 ? void 0 : _a.identifier) !== null && _b !== void 0 ? _b : item.identifierOrCriteria,
-            balance: yield (0, balance_1.balanceOf)(owner, item, multicallProvider, itemToCriteria.get(item)),
-            approvedAmount: yield approvedAmountPromise,
+            identifierOrCriteria: itemToCriteria.get(item)?.identifier ?? item.identifierOrCriteria,
+            balance: await (0, balance_1.balanceOf)(owner, item, provider, itemToCriteria.get(item)),
+            approvedAmount,
             itemType: item.itemType,
         };
-    })));
-});
+    }));
+};
 exports.getBalancesAndApprovals = getBalancesAndApprovals;
 const getInsufficientBalanceAndApprovalAmounts = ({ balancesAndApprovals, tokenAndIdentifierAmounts, operator, }) => {
     const tokenAndIdentifierAndAmountNeeded = [
         ...Object.entries(tokenAndIdentifierAmounts).map(([token, identifierToAmount]) => Object.entries(identifierToAmount).map(([identifierOrCriteria, amountNeeded]) => [token, identifierOrCriteria, amountNeeded])),
     ].flat();
     const filterBalancesOrApprovals = (filterKey) => tokenAndIdentifierAndAmountNeeded
-        .filter(([token, identifierOrCriteria, amountNeeded]) => findBalanceAndApproval(balancesAndApprovals, token, identifierOrCriteria)[filterKey].lt(amountNeeded))
+        .filter(([token, identifierOrCriteria, amountNeeded]) => findBalanceAndApproval(balancesAndApprovals, token, identifierOrCriteria)[filterKey] < amountNeeded)
         .map(([token, identifierOrCriteria, amount]) => {
         const balanceAndApproval = findBalanceAndApproval(balancesAndApprovals, token, identifierOrCriteria);
         return {
@@ -98,7 +87,8 @@ const validateOfferBalancesAndApprovals = ({ offer, criterias, balancesAndApprov
             items: offer,
             criterias,
             timeBasedItemParams: timeBasedItemParams
-                ? Object.assign(Object.assign({}, timeBasedItemParams), { isConsiderationItem: false }) : undefined,
+                ? { ...timeBasedItemParams, isConsiderationItem: false }
+                : undefined,
         }),
         operator,
     });
@@ -144,7 +134,10 @@ const validateBasicFulfillBalancesAndApprovals = ({ offer, consideration, offere
         tokenAndIdentifierAmounts: (0, item_1.getSummedTokenAndIdentifierAmounts)({
             items: considerationWithoutOfferItemType,
             criterias: [],
-            timeBasedItemParams: Object.assign(Object.assign({}, timeBasedItemParams), { isConsiderationItem: true }),
+            timeBasedItemParams: {
+                ...timeBasedItemParams,
+                isConsiderationItem: true,
+            },
         }),
         operator: fulfillerOperator,
     });
@@ -190,7 +183,10 @@ const validateStandardFulfillBalancesAndApprovals = ({ offer, consideration, off
         tokenAndIdentifierAmounts: (0, item_1.getSummedTokenAndIdentifierAmounts)({
             items: consideration,
             criterias: considerationCriteria,
-            timeBasedItemParams: Object.assign(Object.assign({}, timeBasedItemParams), { isConsiderationItem: true }),
+            timeBasedItemParams: {
+                ...timeBasedItemParams,
+                isConsiderationItem: true,
+            },
         }),
         operator: fulfillerOperator,
     });
@@ -204,16 +200,17 @@ const addToExistingBalances = ({ items, criterias, timeBasedItemParams, balances
     const summedItemAmounts = (0, item_1.getSummedTokenAndIdentifierAmounts)({
         items,
         criterias,
-        timeBasedItemParams: Object.assign(Object.assign({}, timeBasedItemParams), { isConsiderationItem: false }),
+        timeBasedItemParams: { ...timeBasedItemParams, isConsiderationItem: false },
     });
     // Deep clone existing balances
-    const balancesAndApprovalsAfterReceivingItems = balancesAndApprovals.map((item) => (Object.assign({}, item)));
-    // Add each summed item amount to the existing balances as we may want tocheck balances after receiving all items
+    const balancesAndApprovalsAfterReceivingItems = balancesAndApprovals.map((item) => ({ ...item }));
+    // Add each summed item amount to the existing balances as we may want to check balances after receiving all items
     Object.entries(summedItemAmounts).forEach(([token, identifierOrCriteriaToAmount]) => Object.entries(identifierOrCriteriaToAmount).forEach(([identifierOrCriteria, amount]) => {
         const balanceAndApproval = findBalanceAndApproval(balancesAndApprovalsAfterReceivingItems, token, identifierOrCriteria);
         const balanceAndApprovalIndex = balancesAndApprovalsAfterReceivingItems.indexOf(balanceAndApproval);
         balancesAndApprovalsAfterReceivingItems[balanceAndApprovalIndex].balance =
-            balancesAndApprovalsAfterReceivingItems[balanceAndApprovalIndex].balance.add(amount);
+            balancesAndApprovalsAfterReceivingItems[balanceAndApprovalIndex]
+                .balance + amount;
     }));
     return balancesAndApprovalsAfterReceivingItems;
 };

package/lib/utils/balanceAndApprovalCheck.js.map

@@ -1 +1 @@
-{"version":3,"file":"balanceAndApprovalCheck.js","sourceRoot":"","sources":["../../src/utils/balanceAndApprovalCheck.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"balanceAndApprovalCheck.js","sourceRoot":"","sources":["../../src/utils/balanceAndApprovalCheck.ts"],"names":[],"mappings":"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"}

package/lib/utils/criteria.js.map

@@ -1 +1 @@
-{"version":3,"file":"criteria.js","sourceRoot":"","sources":["../../src/utils/criteria.ts"],"names":[],"mappings":";;;AAAA,4CAAoC;AAEpC,iCAAwC;AAEjC,MAAM,yBAAyB,GAAG,CAAC,EACxC,MAAM,EACN,cAAc,GAAG,CAAC,EAAE,CAAC,EACrB,sBAAsB,GAAG,CAAC,EAAE,CAAC,GAK9B,EAAE,EAAE;IACH,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CAC9D,KAAK,CAAC,UAAU,CAAC,KAAK;SACnB,GAAG,CACF,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACd,CAAC;QACC,UAAU;QACV,IAAI;QACJ,KAAK;QACL,IAAI,EAAE,gBAAI,CAAC,KAAK;KACjB,CAAU,CACd;SACA,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAA,qBAAc,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CACvD,CAAC;IAEF,MAAM,0BAA0B,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CACtE,KAAK,CAAC,UAAU,CAAC,aAAa;SAC3B,GAAG,CACF,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACd,CAAC;QACC,UAAU;QACV,IAAI;QACJ,KAAK;QACL,IAAI,EAAE,gBAAI,CAAC,aAAa;KACzB,CAAU,CACd;SACA,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAA,qBAAc,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CACvD,CAAC;IAEF,MAAM,0BAA0B,GAAG,CACjC,aAEqC,EACrC,SAA4B,EAC5B,EAAE,CACF,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;QACtD,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,IAAI,GAAG,CAAC;QACpD,MAAM,aAAa,GAAkB,SAAS,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC;QAClE,OAAO;YACL,UAAU;YACV,KAAK;YACL,IAAI;YACJ,UAAU,EAAE,aAAa,CAAC,UAAU;YACpC,aAAa,EAAE,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK;SAC7D,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,iBAAiB,GAAG;QACxB,GAAG,0BAA0B,CAAC,kBAAkB,EAAE,cAAc,CAAC;QACjE,GAAG,0BAA0B,CAC3B,0BAA0B,EAC1B,sBAAsB,CACvB;KACF,CAAC;IAEF,OAAO,iBAAiB,CAAC;AAC3B,CAAC,CAAC;AAhEW,QAAA,yBAAyB,6BAgEpC;AAEK,MAAM,oBAAoB,GAAG,CAClC,KAAa,EACb,SAA0B,EAC1B,EAAE;IACF,MAAM,aAAa,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;IAErC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QAChC,IAAI,IAAA,qBAAc,EAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,KAAK,EAAmB,CAAC,CAAC;SACvD;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,IAAI,GAAG,EAAuB,CAAC,CAAC;AACrC,CAAC,CAAC;AAZW,QAAA,oBAAoB,wBAY/B"}
+{"version":3,"file":"criteria.js","sourceRoot":"","sources":["../../src/utils/criteria.ts"],"names":[],"mappings":";;;AAAA,4CAAoC;AAEpC,iCAAwC;AAEjC,MAAM,yBAAyB,GAAG,CAAC,EACxC,MAAM,EACN,cAAc,GAAG,CAAC,EAAE,CAAC,EACrB,sBAAsB,GAAG,CAAC,EAAE,CAAC,GAK9B,EAAE,EAAE;IACH,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CAC9D,KAAK,CAAC,UAAU,CAAC,KAAK;SACnB,GAAG,CACF,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACd,CAAC;QACC,UAAU;QACV,IAAI;QACJ,KAAK;QACL,IAAI,EAAE,gBAAI,CAAC,KAAK;KACjB,CAAU,CACd;SACA,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAA,qBAAc,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CACvD,CAAC;IAEF,MAAM,0BAA0B,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CACtE,KAAK,CAAC,UAAU,CAAC,aAAa;SAC3B,GAAG,CACF,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACd,CAAC;QACC,UAAU;QACV,IAAI;QACJ,KAAK;QACL,IAAI,EAAE,gBAAI,CAAC,aAAa;KACzB,CAAU,CACd;SACA,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAA,qBAAc,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CACvD,CAAC;IAEF,MAAM,0BAA0B,GAAG,CACjC,aAEqC,EACrC,SAA4B,EAC5B,EAAE,CACF,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;QACtD,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,IAAI,GAAG,CAAC;QACpD,MAAM,aAAa,GAAkB,SAAS,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC;QAClE,OAAO;YACL,UAAU;YACV,KAAK;YACL,IAAI;YACJ,UAAU,EAAE,aAAa,CAAC,UAAU;YACpC,aAAa,EAAE,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK;SAC7D,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,iBAAiB,GAAG;QACxB,GAAG,0BAA0B,CAAC,kBAAkB,EAAE,cAAc,CAAC;QACjE,GAAG,0BAA0B,CAC3B,0BAA0B,EAC1B,sBAAsB,CACvB;KACF,CAAC;IAEF,OAAO,iBAAiB,CAAC;AAC3B,CAAC,CAAC;AAhEW,QAAA,yBAAyB,6BAgEpC;AAEK,MAAM,oBAAoB,GAAG,CAClC,KAAa,EACb,SAA0B,EAC1B,EAAE;IACF,MAAM,aAAa,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;IAErC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QAChC,IAAI,IAAA,qBAAc,EAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,KAAK,EAAmB,CAAC,CAAC;QACxD,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,IAAI,GAAG,EAAuB,CAAC,CAAC;AACrC,CAAC,CAAC;AAZW,QAAA,oBAAoB,wBAY/B"}

package/lib/utils/eip712/Eip712MerkleTree.d.ts

@@ -1,4 +1,4 @@
-import { _TypedDataEncoder as TypedDataEncoder } from "@ethersproject/hash";
+import { TypedDataEncoder } from "ethers";
 import { MerkleTree } from "merkletreejs";
 import type { EIP712TypeDefinitions } from "./defaults";
 type BulkOrderElements<T> = [T, T] | [BulkOrderElements<T>, BulkOrderElements<T>];

package/lib/utils/eip712/Eip712MerkleTree.js

@@ -1,22 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Eip712MerkleTree = void 0;
-const hash_1 = require("@ethersproject/hash");
-const utils_1 = require("ethers/lib/utils");
+const ethers_1 = require("ethers");
 const merkletreejs_1 = require("merkletreejs");
 const defaults_1 = require("./defaults");
-const utils_2 = require("./utils");
-const getTree = (leaves, defaultLeafHash) => new merkletreejs_1.MerkleTree(leaves.map(utils_2.hexToBuffer), utils_2.bufferKeccak, {
+const utils_1 = require("./utils");
+const getTree = (leaves, defaultLeafHash) => new merkletreejs_1.MerkleTree(leaves.map(utils_1.hexToBuffer), utils_1.bufferKeccak, {
     complete: true,
     sort: false,
     hashLeaves: false,
-    fillDefaultHash: (0, utils_2.hexToBuffer)(defaultLeafHash),
+    fillDefaultHash: (0, utils_1.hexToBuffer)(defaultLeafHash),
 });
 const encodeProof = (key, proof, signature = `0x${"ff".repeat(64)}`) => {
-    return (0, utils_1.hexConcat)([
+    return (0, ethers_1.concat)([
         signature,
         `0x${key.toString(16).padStart(6, "0")}`,
-        utils_1.defaultAbiCoder.encode([`uint256[${proof.length}]`], [proof]),
+        ethers_1.AbiCoder.defaultAbiCoder().encode([`uint256[${proof.length}]`], [proof]),
     ]);
 };
 class Eip712MerkleTree {
@@ -26,12 +25,12 @@ class Eip712MerkleTree {
     /** Returns the array of elements in the tree, padded to the complete size with empty items. */
     getCompleteElements() {
         const elements = this.elements;
-        return (0, utils_2.fillArray)([...elements], this.completedSize, this.defaultNode);
+        return (0, utils_1.fillArray)([...elements], this.completedSize, this.defaultNode);
     }
     /** Returns the array of leaf nodes in the tree, padded to the complete size with default hashes. */
     getCompleteLeaves() {
         const leaves = this.elements.map(this.leafHasher);
-        return (0, utils_2.fillArray)([...leaves], this.completedSize, this.defaultLeaf);
+        return (0, utils_1.fillArray)([...leaves], this.completedSize, this.defaultLeaf);
     }
     get root() {
         return this.tree.getHexRoot();
@@ -50,7 +49,7 @@ class Eip712MerkleTree {
     getDataToSign() {
         let layer = this.getCompleteElements();
         while (layer.length > 2) {
-            layer = (0, utils_2.chunk)(layer, 2);
+            layer = (0, utils_1.chunk)(layer, 2);
         }
         return layer;
     }
@@ -61,10 +60,10 @@ class Eip712MerkleTree {
         const structHash = this.encoder.hashStruct("BulkOrder", {
             tree: this.getDataToSign(),
         });
-        const leaves = this.getCompleteLeaves().map(utils_2.hexToBuffer);
-        const rootHash = (0, utils_2.bufferToHex)((0, utils_2.getRoot)(leaves, false));
-        const typeHash = (0, utils_1.keccak256)((0, utils_1.toUtf8Bytes)(this.encoder._types.BulkOrder));
-        const bulkOrderHash = (0, utils_1.keccak256)((0, utils_1.hexConcat)([typeHash, rootHash]));
+        const leaves = this.getCompleteLeaves().map(utils_1.hexToBuffer);
+        const rootHash = (0, utils_1.bufferToHex)((0, utils_1.getRoot)(leaves, false));
+        const typeHash = (0, ethers_1.keccak256)((0, ethers_1.toUtf8Bytes)(this.encoder.types.BulkOrder[0].type));
+        const bulkOrderHash = (0, ethers_1.keccak256)((0, ethers_1.concat)([typeHash, rootHash]));
         if (bulkOrderHash !== structHash) {
             throw new Error("expected derived bulk order hash to match");
         }
@@ -76,7 +75,7 @@ class Eip712MerkleTree {
         this.leafType = leafType;
         this.elements = elements;
         this.depth = depth;
-        const encoder = hash_1._TypedDataEncoder.from(types);
+        const encoder = ethers_1.TypedDataEncoder.from(types);
         this.encoder = encoder;
         this.leafHasher = (leaf) => encoder.hashStruct(leafType, leaf);
         this.defaultNode = defaults_1.DefaultGetter.from(types, leafType);

package/lib/utils/eip712/Eip712MerkleTree.js.map

@@ -1 +1 @@
-{"version":3,"file":"Eip712MerkleTree.js","sourceRoot":"","sources":["../../../src/utils/eip712/Eip712MerkleTree.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Eip712MerkleTree.js","sourceRoot":"","sources":["../../../src/utils/eip712/Eip712MerkleTree.ts"],"names":[],"mappings":"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"}

package/lib/utils/eip712/bulk-orders.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBulkOrderTypeHashes = exports.getBulkOrderTypeHash = exports.getBulkOrderTree = exports.getBulkOrderTreeHeight = void 0;
-const utils_1 = require("ethers/lib/utils");
+const ethers_1 = require("ethers");
 const Eip712MerkleTree_1 = require("./Eip712MerkleTree");
 const defaults_1 = require("./defaults");
-const utils_2 = require("./utils");
+const utils_1 = require("./utils");
 const constants_1 = require("../../constants");
 function getBulkOrderTypes(height) {
-    const types = Object.assign({}, constants_1.EIP_712_BULK_ORDER_TYPE);
+    const types = { ...constants_1.EIP_712_BULK_ORDER_TYPE };
     types.BulkOrder = [
         { name: "tree", type: `OrderComponents${`[2]`.repeat(height)}` },
     ];
@@ -23,7 +23,7 @@ function getBulkOrderTree(orderComponents, startIndex = 0, height = getBulkOrder
     let elements = [...orderComponents];
     if (startIndex > 0) {
         elements = [
-            ...(0, utils_2.fillArray)([], startIndex, defaultNode),
+            ...(0, utils_1.fillArray)([], startIndex, defaultNode),
             ...orderComponents,
         ];
     }
@@ -33,9 +33,9 @@ function getBulkOrderTree(orderComponents, startIndex = 0, height = getBulkOrder
 exports.getBulkOrderTree = getBulkOrderTree;
 function getBulkOrderTypeHash(height) {
     const types = getBulkOrderTypes(height);
-    const encoder = utils_1._TypedDataEncoder.from(types);
-    const typeString = (0, utils_1.toUtf8Bytes)(encoder._types.BulkOrder);
-    return (0, utils_1.keccak256)(typeString);
+    const encoder = ethers_1.TypedDataEncoder.from(types);
+    const typeString = (0, ethers_1.toUtf8Bytes)(encoder.types.BulkOrder[0].type);
+    return (0, ethers_1.keccak256)(typeString);
 }
 exports.getBulkOrderTypeHash = getBulkOrderTypeHash;
 function getBulkOrderTypeHashes(maxHeight) {

package/lib/utils/eip712/bulk-orders.js.map

@@ -1 +1 @@
-{"version":3,"file":"bulk-orders.js","sourceRoot":"","sources":["../../../src/utils/eip712/bulk-orders.ts"],"names":[],"mappings":";;;AAAA,4CAA6E;AAE7E,yDAAsD;AACtD,yCAA2C;AAC3C,mCAAoC;AAKpC,+CAA0D;AAE1D,SAAS,iBAAiB,CAAC,MAAc;IACvC,MAAM,KAAK,qBAAQ,mCAAuB,CAAE,CAAC;IAC7C,KAAK,CAAC,SAAS,GAAG;QAChB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE;KACjE,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,sBAAsB,CAAC,MAAc;IACnD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACnD,CAAC;AAFD,wDAEC;AAED,SAAgB,gBAAgB,CAC9B,eAAkC,EAClC,UAAU,GAAG,CAAC,EACd,MAAM,GAAG,sBAAsB,CAAC,eAAe,CAAC,MAAM,GAAG,UAAU,CAAC;IAEpE,MAAM,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,wBAAa,CAAC,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;IACjE,IAAI,QAAQ,GAAG,CAAC,GAAG,eAAe,CAAC,CAAC;IAEpC,IAAI,UAAU,GAAG,CAAC,EAAE;QAClB,QAAQ,GAAG;YACT,GAAG,IAAA,iBAAS,EAAC,EAAuB,EAAE,UAAU,EAAE,WAAW,CAAC;YAC9D,GAAG,eAAe;SACnB,CAAC;KACH;IACD,MAAM,IAAI,GAAG,IAAI,mCAAgB,CAC/B,KAAK,EACL,WAAW,EACX,iBAAiB,EACjB,QAAQ,EACR,MAAM,CACP,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAvBD,4CAuBC;AAED,SAAgB,oBAAoB,CAAC,MAAc;IACjD,MAAM,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,yBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACzD,OAAO,IAAA,iBAAS,EAAC,UAAU,CAAC,CAAC;AAC/B,CAAC;AALD,oDAKC;AAED,SAAgB,sBAAsB,CAAC,SAAiB;IACtD,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;QAClC,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAC9C;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAND,wDAMC"}
+{"version":3,"file":"bulk-orders.js","sourceRoot":"","sources":["../../../src/utils/eip712/bulk-orders.ts"],"names":[],"mappings":";;;AAAA,mCAAkE;AAElE,yDAAsD;AACtD,yCAA2C;AAC3C,mCAAoC;AAKpC,+CAA0D;AAE1D,SAAS,iBAAiB,CAAC,MAAc;IACvC,MAAM,KAAK,GAAG,EAAE,GAAG,mCAAuB,EAAE,CAAC;IAC7C,KAAK,CAAC,SAAS,GAAG;QAChB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE;KACjE,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,sBAAsB,CAAC,MAAc;IACnD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACnD,CAAC;AAFD,wDAEC;AAED,SAAgB,gBAAgB,CAC9B,eAAkC,EAClC,UAAU,GAAG,CAAC,EACd,MAAM,GAAG,sBAAsB,CAAC,eAAe,CAAC,MAAM,GAAG,UAAU,CAAC;IAEpE,MAAM,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,wBAAa,CAAC,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;IACjE,IAAI,QAAQ,GAAG,CAAC,GAAG,eAAe,CAAC,CAAC;IAEpC,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;QACnB,QAAQ,GAAG;YACT,GAAG,IAAA,iBAAS,EAAC,EAAuB,EAAE,UAAU,EAAE,WAAW,CAAC;YAC9D,GAAG,eAAe;SACnB,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,mCAAgB,CAC/B,KAAK,EACL,WAAW,EACX,iBAAiB,EACjB,QAAQ,EACR,MAAM,CACP,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAvBD,4CAuBC;AAED,SAAgB,oBAAoB,CAAC,MAAc;IACjD,MAAM,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,yBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,UAAU,GAAG,IAAA,oBAAW,EAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAChE,OAAO,IAAA,kBAAS,EAAC,UAAU,CAAC,CAAC;AAC/B,CAAC;AALD,oDAKC;AAED,SAAgB,sBAAsB,CAAC,SAAiB;IACtD,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;QACnC,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAND,wDAMC"}

package/lib/utils/eip712/defaults.d.ts

@@ -1,4 +1,4 @@
-import type { TypedDataField } from "@ethersproject/abstract-signer";
+import { TypedDataField } from "ethers";
 export type EIP712TypeDefinitions = Record<string, TypedDataField[]>;
 type DefaultMap<T extends EIP712TypeDefinitions> = {
     [K in keyof T]: any;

package/lib/utils/eip712/defaults.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultGetter = void 0;
-const logger_1 = require("@ethersproject/logger");
-const utils_1 = require("ethers/lib/utils");
-const logger = new logger_1.Logger("defaults");
+const ethers_1 = require("ethers");
 const baseDefaults = {
     integer: 0,
-    address: (0, utils_1.hexZeroPad)("0x", 20),
+    address: ethers_1.ethers.zeroPadValue("0x", 20),
     bool: false,
     bytes: "0x",
     string: "",
@@ -16,18 +14,16 @@ const isNullish = (value) => {
         return false;
     return (value !== undefined &&
         value !== null &&
-        ((["string", "number"].includes(typeof value) &&
-            BigInt(value) === BigInt(0)) ||
+        ((["string", "number"].includes(typeof value) && BigInt(value) === 0n) ||
             (Array.isArray(value) && value.every(isNullish)) ||
             (typeof value === "object" && Object.values(value).every(isNullish)) ||
             (typeof value === "boolean" && value === false)));
 };
 function getDefaultForBaseType(type) {
-    var _a;
     // bytesXX
-    const [, width] = (_a = type.match(/^bytes(\d+)$/)) !== null && _a !== void 0 ? _a : [];
+    const [, width] = type.match(/^bytes(\d+)$/) ?? [];
     if (width)
-        return (0, utils_1.hexZeroPad)("0x", parseInt(width));
+        return (0, ethers_1.zeroPadValue)("0x", parseInt(width));
     if (type.match(/^(u?)int(\d*)$/))
         type = "integer";
     return baseDefaults[type];
@@ -40,7 +36,7 @@ class DefaultGetter {
             const defaultValue = this.getDefaultValue(name);
             this.defaultValues[name] = defaultValue;
             if (!isNullish(defaultValue)) {
-                logger.throwError(`Got non-empty value for type ${name} in default generator: ${defaultValue}`);
+                throw new Error(`Got non-empty value for type ${name} in default generator: ${defaultValue}`);
             }
         }
     }
@@ -72,9 +68,12 @@ class DefaultGetter {
         // Struct
         const fields = this.types[type];
         if (fields) {
-            return fields.reduce((obj, { name, type }) => (Object.assign(Object.assign({}, obj), { [name]: this.getDefaultValue(type) })), {});
+            return fields.reduce((obj, { name, type }) => ({
+                ...obj,
+                [name]: this.getDefaultValue(type),
+            }), {});
         }
-        return logger.throwArgumentError(`unknown type: ${type}`, "type", type);
+        throw new Error(`unknown type: ${type}`);
     }
 }
 exports.DefaultGetter = DefaultGetter;

package/lib/utils/eip712/defaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../src/utils/eip712/defaults.ts"],"names":[],"mappings":";;;AAAA,kDAA+C;AAC/C,4CAA8C;AAI9C,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,UAAU,CAAC,CAAC;AAEtC,MAAM,YAAY,GAAwB;IACxC,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,IAAA,kBAAU,EAAC,IAAI,EAAE,EAAE,CAAC;IAC7B,IAAI,EAAE,KAAK;IACX,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,EAAE;CACX,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,KAAU,EAAW,EAAE;IACxC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAEtC,OAAO,CACL,KAAK,KAAK,SAAS;QACnB,KAAK,KAAK,IAAI;QACd,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,KAAK,CAAC;YAC3C,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC;YAC5B,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAChD,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACpE,CAAC,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,KAAK,CAAC,CAAC,CACnD,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,qBAAqB,CAAC,IAAY;;IACzC,UAAU;IACV,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,mCAAI,EAAE,CAAC;IACnD,IAAI,KAAK;QAAE,OAAO,IAAA,kBAAU,EAAC,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpD,IAAI,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC;QAAE,IAAI,GAAG,SAAS,CAAC;IAEnD,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAQD,MAAa,aAAa;IAGxB,YAAsB,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;QAFlC,kBAAa,GAAsB,EAAuB,CAAC;QAGzD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAChD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC;YACxC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;gBAC5B,MAAM,CAAC,UAAU,CACf,gCAAgC,IAAI,0BAA0B,YAAY,EAAE,CAC7E,CAAC;aACH;SACF;IACH,CAAC;IAYD,MAAM,CAAC,IAAI,CACT,KAAY,EACZ,IAAkB;QAElB,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,IAAI;YAAE,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;QACrC,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,yCAAyC;IAEzC,eAAe,CAAC,IAAY;QAC1B,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC9D,2CAA2C;QAC3C,MAAM,KAAK,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QAEtC,QAAQ;QACR,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAClD,IAAI,KAAK,EAAE;YACT,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACzB,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,IAAI,MAAM,GAAG,CAAC,EAAE;gBACd,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;gBAChD,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACtC;YACD,OAAO,EAAE,CAAC;SACX;QAED,SAAS;QACT,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,MAAM,EAAE;YACV,OAAO,MAAM,CAAC,MAAM,CAClB,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,iCACpB,GAAG,KACN,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAClC,EACF,EAAE,CACH,CAAC;SACH;QAED,OAAO,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC;CACF;AAnED,sCAmEC"}
+{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../src/utils/eip712/defaults.ts"],"names":[],"mappings":"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"}

package/lib/utils/eip712/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNextLayer = exports.getRoot = exports.fillArray = exports.hashConcat = exports.bufferKeccak = exports.hexToBuffer = exports.bufferToHex = exports.chunk = exports.makeArray = void 0;
-const utils_1 = require("ethers/lib/utils");
+const ethers_1 = require("ethers");
 const makeArray = (len, getValue) => Array(len)
     .fill(0)
     .map((_, i) => getValue(i));
@@ -10,13 +10,13 @@ const chunk = (array, size) => {
     return (0, exports.makeArray)(Math.ceil(array.length / size), (i) => array.slice(i * size, (i + 1) * size));
 };
 exports.chunk = chunk;
-const bufferToHex = (buf) => (0, utils_1.hexlify)(buf);
+const bufferToHex = (buf) => (0, ethers_1.toBeHex)(buf.toString("hex"));
 exports.bufferToHex = bufferToHex;
 const hexToBuffer = (value) => Buffer.from(value.slice(2), "hex");
 exports.hexToBuffer = hexToBuffer;
-const bufferKeccak = (value) => (0, exports.hexToBuffer)((0, utils_1.keccak256)(value));
+const bufferKeccak = (value) => (0, exports.hexToBuffer)((0, ethers_1.keccak256)(value));
 exports.bufferKeccak = bufferKeccak;
-const hashConcat = (arr) => (0, exports.bufferKeccak)((0, utils_1.hexConcat)(arr));
+const hashConcat = (arr) => (0, exports.bufferKeccak)((0, ethers_1.concat)(arr));
 exports.hashConcat = hashConcat;
 const fillArray = (arr, length, value) => {
     if (length > arr.length)

package/lib/utils/eip712/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/eip712/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/eip712/utils.ts"],"names":[],"mappings":"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"}