@opensea/seaport-js 4.0.2 → 4.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/utils/approval.js +2 -2
- package/lib/utils/approval.js.map +1 -1
- package/lib/utils/balanceAndApprovalCheck.js +1 -1
- package/lib/utils/balanceAndApprovalCheck.js.map +1 -1
- package/lib/utils/eip712/bulk-orders.js +4 -5
- package/lib/utils/eip712/bulk-orders.js.map +1 -1
- package/lib/utils/eip712/utils.d.ts +0 -1
- package/lib/utils/fulfill.js +10 -10
- package/lib/utils/fulfill.js.map +1 -1
- package/lib/utils/item.d.ts +2 -1
- package/lib/utils/order.d.ts +2 -1
- package/lib/utils/order.js +17 -4
- package/lib/utils/order.js.map +1 -1
- package/lib/utils/usecase.d.ts +1 -1
- package/package.json +3 -3
- package/src/utils/balanceAndApprovalCheck.ts +1 -1
- package/src/utils/fulfill.ts +14 -10
- package/src/utils/order.ts +22 -2
package/lib/utils/approval.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.approvedItemAmount = void 0;
|
|
4
|
+
exports.getApprovalActions = getApprovalActions;
|
|
4
5
|
const constants_1 = require("../constants");
|
|
5
6
|
const typechain_types_1 = require("../typechain-types");
|
|
6
7
|
const item_1 = require("./item");
|
|
@@ -64,5 +65,4 @@ function getApprovalActions(insufficientApprovals, exactApproval, signer) {
|
|
|
64
65
|
}
|
|
65
66
|
});
|
|
66
67
|
}
|
|
67
|
-
exports.getApprovalActions = getApprovalActions;
|
|
68
68
|
//# sourceMappingURL=approval.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approval.js","sourceRoot":"","sources":["../../src/utils/approval.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"approval.js","sourceRoot":"","sources":["../../src/utils/approval.ts"],"names":[],"mappings":";;;AAkCA,gDA6DC;AA9FD,4CAAiD;AACjD,wDAA6E;AAG7E,iCAAqD;AACrD,uCAAkD;AAE3C,MAAM,kBAAkB,GAAG,KAAK,EACrC,KAAa,EACb,IAAU,EACV,QAAgB,EAChB,QAAyB,EACzB,EAAE;IACF,IAAI,IAAA,mBAAY,EAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAA,oBAAa,EAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAChE,uFAAuF;QACvF,MAAM,QAAQ,GAAG,qCAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAEnE,MAAM,gBAAgB,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC1E,2DAA2D;QAC3D,OAAO,gBAAgB,CAAC,CAAC,CAAC,mBAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IACzC,CAAC;SAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,oBAAQ,CAAC,KAAK,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,oCAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAElE,OAAO,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAED,qDAAqD;IACrD,OAAO,mBAAO,CAAC;AACjB,CAAC,CAAC;AArBW,QAAA,kBAAkB,sBAqB7B;AAEF;;GAEG;AACH,SAAgB,kBAAkB,CAChC,qBAA4C,EAC5C,aAAsB,EACtB,MAAc;IAEd,OAAO,qBAAqB;SACzB,MAAM,CACL,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAClB,KAAK,KAAK,qBAAqB,CAAC,MAAM,GAAG,CAAC;QAC1C,qBAAqB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK,CAC5D;SACA,GAAG,CACF,CAAC,EACC,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,oBAAoB,EACpB,sBAAsB,GACvB,EAAE,EAAE;QACH,MAAM,SAAS,GAAG,IAAA,oBAAa,EAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,IAAA,mBAAY,EAAC,QAAQ,CAAC,IAAI,SAAS,EAAE,CAAC;YACxC,wFAAwF;YACxF,MAAM,QAAQ,GAAG,qCAAmB,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC5D,MAAM,kBAAkB,GACtB,aAAa,IAAI,CAAC,SAAS;gBACzB,CAAC,CAAC,IAAA,+BAAqB,EAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE;oBACjD,QAAQ;oBACR,oBAAoB;iBACrB,CAAC;gBACJ,CAAC,CAAC,IAAA,+BAAqB,EAAC,MAAM,EAAE,QAAQ,EAAE,mBAAmB,EAAE;oBAC3D,QAAQ;oBACR,IAAI;iBACL,CAAC,CAAC;YAET,OAAO;gBACL,IAAI,EAAE,UAAU;gBAChB,KAAK;gBACL,oBAAoB;gBACpB,QAAQ;gBACR,QAAQ;gBACR,kBAAkB;aACnB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,oCAAkB,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAE3D,OAAO;gBACL,IAAI,EAAE,UAAU;gBAChB,KAAK;gBACL,oBAAoB;gBACpB,QAAQ;gBACR,kBAAkB,EAAE,IAAA,+BAAqB,EACvC,MAAM,EACN,QAAQ,EACR,SAAS,EACT,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,mBAAO,CAAC,CAC7D;gBACD,QAAQ;aACT,CAAC;QACJ,CAAC;IACH,CAAC,CACF,CAAC;AACN,CAAC"}
|
|
@@ -11,7 +11,7 @@ const findBalanceAndApproval = (balancesAndApprovals, token, identifierOrCriteri
|
|
|
11
11
|
checkedIdentifierOrCriteria.toLowerCase() ===
|
|
12
12
|
identifierOrCriteria.toLowerCase());
|
|
13
13
|
if (!balanceAndApproval) {
|
|
14
|
-
throw new Error(
|
|
14
|
+
throw new Error(`Checking for balance and approvals for token ${token} id ${identifierOrCriteria} failed`);
|
|
15
15
|
}
|
|
16
16
|
return balanceAndApproval;
|
|
17
17
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"balanceAndApprovalCheck.js","sourceRoot":"","sources":["../../src/utils/balanceAndApprovalCheck.ts"],"names":[],"mappings":";;;AACA,4CAAiD;AAEjD,yCAAgD;AAChD,uCAAsC;AACtC,yCAAkD;AAClD,iCAMgB;AA2BhB,MAAM,sBAAsB,GAAG,CAC7B,oBAA0C,EAC1C,KAAa,EACb,oBAA4B,EAC5B,EAAE;IACF,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,IAAI,CAClD,CAAC,EACC,KAAK,EAAE,YAAY,EACnB,oBAAoB,EAAE,2BAA2B,GAClD,EAAE,EAAE,CACH,KAAK,CAAC,WAAW,EAAE,KAAK,YAAY,CAAC,WAAW,EAAE;QAClD,2BAA2B,CAAC,WAAW,EAAE;YACvC,oBAAoB,CAAC,WAAW,EAAE,CACvC,CAAC;IAEF,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CACb,
|
|
1
|
+
{"version":3,"file":"balanceAndApprovalCheck.js","sourceRoot":"","sources":["../../src/utils/balanceAndApprovalCheck.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getBulkOrderTreeHeight = getBulkOrderTreeHeight;
|
|
4
|
+
exports.getBulkOrderTree = getBulkOrderTree;
|
|
5
|
+
exports.getBulkOrderTypeHash = getBulkOrderTypeHash;
|
|
6
|
+
exports.getBulkOrderTypeHashes = getBulkOrderTypeHashes;
|
|
4
7
|
const ethers_1 = require("ethers");
|
|
5
8
|
const Eip712MerkleTree_1 = require("./Eip712MerkleTree");
|
|
6
9
|
const defaults_1 = require("./defaults");
|
|
@@ -16,7 +19,6 @@ function getBulkOrderTypes(height) {
|
|
|
16
19
|
function getBulkOrderTreeHeight(length) {
|
|
17
20
|
return Math.max(Math.ceil(Math.log2(length)), 1);
|
|
18
21
|
}
|
|
19
|
-
exports.getBulkOrderTreeHeight = getBulkOrderTreeHeight;
|
|
20
22
|
function getBulkOrderTree(orderComponents, startIndex = 0, height = getBulkOrderTreeHeight(orderComponents.length + startIndex)) {
|
|
21
23
|
const types = getBulkOrderTypes(height);
|
|
22
24
|
const defaultNode = defaults_1.DefaultGetter.from(types, "OrderComponents");
|
|
@@ -30,14 +32,12 @@ function getBulkOrderTree(orderComponents, startIndex = 0, height = getBulkOrder
|
|
|
30
32
|
const tree = new Eip712MerkleTree_1.Eip712MerkleTree(types, "BulkOrder", "OrderComponents", elements, height);
|
|
31
33
|
return tree;
|
|
32
34
|
}
|
|
33
|
-
exports.getBulkOrderTree = getBulkOrderTree;
|
|
34
35
|
function getBulkOrderTypeHash(height) {
|
|
35
36
|
const types = getBulkOrderTypes(height);
|
|
36
37
|
const encoder = ethers_1.TypedDataEncoder.from(types);
|
|
37
38
|
const typeString = (0, ethers_1.toUtf8Bytes)(encoder.types.BulkOrder[0].type);
|
|
38
39
|
return (0, ethers_1.keccak256)(typeString);
|
|
39
40
|
}
|
|
40
|
-
exports.getBulkOrderTypeHash = getBulkOrderTypeHash;
|
|
41
41
|
function getBulkOrderTypeHashes(maxHeight) {
|
|
42
42
|
const typeHashes = [];
|
|
43
43
|
for (let i = 0; i < maxHeight; i++) {
|
|
@@ -45,5 +45,4 @@ function getBulkOrderTypeHashes(maxHeight) {
|
|
|
45
45
|
}
|
|
46
46
|
return typeHashes;
|
|
47
47
|
}
|
|
48
|
-
exports.getBulkOrderTypeHashes = getBulkOrderTypeHashes;
|
|
49
48
|
//# sourceMappingURL=bulk-orders.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bulk-orders.js","sourceRoot":"","sources":["../../../src/utils/eip712/bulk-orders.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bulk-orders.js","sourceRoot":"","sources":["../../../src/utils/eip712/bulk-orders.ts"],"names":[],"mappings":";;AAmBA,wDAEC;AAED,4CAuBC;AAED,oDAKC;AAED,wDAMC;AA7DD,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;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;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;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"}
|
package/lib/utils/fulfill.js
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.scaleOrderStatusToMaxUnits = exports.getAdvancedOrderNumeratorDenominator = exports.
|
|
3
|
+
exports.scaleOrderStatusToMaxUnits = exports.getAdvancedOrderNumeratorDenominator = exports.shouldUseBasicFulfill = void 0;
|
|
4
|
+
exports.fulfillBasicOrder = fulfillBasicOrder;
|
|
5
|
+
exports.fulfillStandardOrder = fulfillStandardOrder;
|
|
6
|
+
exports.validateAndSanitizeFromOrderStatus = validateAndSanitizeFromOrderStatus;
|
|
7
|
+
exports.fulfillAvailableOrders = fulfillAvailableOrders;
|
|
8
|
+
exports.generateFulfillOrdersFulfillments = generateFulfillOrdersFulfillments;
|
|
4
9
|
const ethers_1 = require("ethers");
|
|
5
10
|
const constants_1 = require("../constants");
|
|
6
11
|
const approval_1 = require("./approval");
|
|
@@ -167,7 +172,6 @@ function fulfillBasicOrder({ order, seaportContract, offererBalancesAndApprovals
|
|
|
167
172
|
executeAllActions: () => (0, usecase_1.executeAllActions)(actions),
|
|
168
173
|
};
|
|
169
174
|
}
|
|
170
|
-
exports.fulfillBasicOrder = fulfillBasicOrder;
|
|
171
175
|
function fulfillStandardOrder({ order, unitsToFill = 0, totalSize, totalFilled, offerCriteria, considerationCriteria, tips = [], extraData, seaportContract, offererBalancesAndApprovals, fulfillerBalancesAndApprovals, offererOperator, fulfillerOperator, timeBasedItemParams, conduitKey, recipientAddress, signer, domain, overrides, }, exactApproval) {
|
|
172
176
|
// If we are supplying units to fill, we adjust the order by the minimum of the amount to fill and
|
|
173
177
|
// the remaining order left to be fulfilled
|
|
@@ -183,7 +187,7 @@ function fulfillStandardOrder({ order, unitsToFill = 0, totalSize, totalFilled,
|
|
|
183
187
|
});
|
|
184
188
|
let adjustedTips = [];
|
|
185
189
|
if (tips.length > 0) {
|
|
186
|
-
adjustedTips = (0, order_1.
|
|
190
|
+
adjustedTips = (0, order_1.mapTipAmountsFromUnitsToFill)(tips, unitsToFill, totalSize);
|
|
187
191
|
}
|
|
188
192
|
const { parameters: { offer, consideration }, } = orderWithAdjustedFills;
|
|
189
193
|
const considerationIncludingTips = [...consideration, ...adjustedTips];
|
|
@@ -255,7 +259,6 @@ function fulfillStandardOrder({ order, unitsToFill = 0, totalSize, totalFilled,
|
|
|
255
259
|
executeAllActions: () => (0, usecase_1.executeAllActions)(actions),
|
|
256
260
|
};
|
|
257
261
|
}
|
|
258
|
-
exports.fulfillStandardOrder = fulfillStandardOrder;
|
|
259
262
|
function validateAndSanitizeFromOrderStatus(order, orderStatus) {
|
|
260
263
|
const { isValidated, isCancelled, totalFilled, totalSize } = orderStatus;
|
|
261
264
|
if (totalSize > 0n && totalFilled / totalSize === 1n) {
|
|
@@ -270,7 +273,6 @@ function validateAndSanitizeFromOrderStatus(order, orderStatus) {
|
|
|
270
273
|
}
|
|
271
274
|
return order;
|
|
272
275
|
}
|
|
273
|
-
exports.validateAndSanitizeFromOrderStatus = validateAndSanitizeFromOrderStatus;
|
|
274
276
|
function fulfillAvailableOrders({ ordersMetadata, seaportContract, fulfillerBalancesAndApprovals, fulfillerOperator, currentBlockTimestamp, ascendingAmountTimestampBuffer, conduitKey, signer, recipientAddress, exactApproval, domain, }) {
|
|
275
277
|
const sanitizedOrdersMetadata = ordersMetadata.map((orderMetadata) => ({
|
|
276
278
|
...orderMetadata,
|
|
@@ -280,9 +282,9 @@ function fulfillAvailableOrders({ ordersMetadata, seaportContract, fulfillerBala
|
|
|
280
282
|
if (!orderMetadata.tips || !orderMetadata.tips.length) {
|
|
281
283
|
return [];
|
|
282
284
|
}
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
285
|
+
return orderMetadata.unitsToFill
|
|
286
|
+
? (0, order_1.mapTipAmountsFromUnitsToFill)(orderMetadata.tips, orderMetadata.unitsToFill, orderMetadata.orderStatus.totalSize)
|
|
287
|
+
: (0, order_1.mapTipAmountsFromFilledStatus)(orderMetadata.tips, orderMetadata.orderStatus.totalFilled, orderMetadata.orderStatus.totalSize);
|
|
286
288
|
};
|
|
287
289
|
const ordersMetadataWithAdjustedFills = sanitizedOrdersMetadata.map((orderMetadata) => ({
|
|
288
290
|
...orderMetadata,
|
|
@@ -401,7 +403,6 @@ function fulfillAvailableOrders({ ordersMetadata, seaportContract, fulfillerBala
|
|
|
401
403
|
executeAllActions: () => (0, usecase_1.executeAllActions)(actions),
|
|
402
404
|
};
|
|
403
405
|
}
|
|
404
|
-
exports.fulfillAvailableOrders = fulfillAvailableOrders;
|
|
405
406
|
function generateFulfillOrdersFulfillments(ordersMetadata) {
|
|
406
407
|
const hashAggregateKey = ({ sourceOrDestination, operator = "", token, identifier, }) => `${sourceOrDestination}-${operator}-${token}-${identifier}`;
|
|
407
408
|
const offerAggregatedFulfillments = {};
|
|
@@ -443,7 +444,6 @@ function generateFulfillOrdersFulfillments(ordersMetadata) {
|
|
|
443
444
|
considerationFulfillments: Object.values(considerationAggregatedFulfillments),
|
|
444
445
|
};
|
|
445
446
|
}
|
|
446
|
-
exports.generateFulfillOrdersFulfillments = generateFulfillOrdersFulfillments;
|
|
447
447
|
const getAdvancedOrderNumeratorDenominator = (order, unitsToFill) => {
|
|
448
448
|
// Used for advanced order cases
|
|
449
449
|
const maxUnits = (0, item_1.getMaximumSizeForOrder)(order);
|
package/lib/utils/fulfill.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fulfill.js","sourceRoot":"","sources":["../../src/utils/fulfill.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"fulfill.js","sourceRoot":"","sources":["../../src/utils/fulfill.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/item.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { ItemType } from "../constants";
|
|
1
2
|
import type { InputCriteria, Item, Order, OrderParameters } from "../types";
|
|
2
3
|
export declare const isCurrencyItem: ({ itemType }: Item) => boolean;
|
|
3
4
|
export declare const isNativeCurrencyItem: ({ itemType }: Item) => boolean;
|
|
4
|
-
export declare const isErc20Item: (itemType: Item["itemType"]) =>
|
|
5
|
+
export declare const isErc20Item: (itemType: Item["itemType"]) => itemType is ItemType.ERC20;
|
|
5
6
|
export declare const isErc721Item: (itemType: Item["itemType"]) => boolean;
|
|
6
7
|
export declare const isErc1155Item: (itemType: Item["itemType"]) => boolean;
|
|
7
8
|
export declare const isCriteriaItem: (itemType: Item["itemType"]) => boolean;
|
package/lib/utils/order.d.ts
CHANGED
|
@@ -32,6 +32,7 @@ export declare const mapOrderAmountsFromUnitsToFill: (order: Order, { unitsToFil
|
|
|
32
32
|
unitsToFill: BigNumberish;
|
|
33
33
|
totalSize: bigint;
|
|
34
34
|
}) => Order;
|
|
35
|
-
export declare function
|
|
35
|
+
export declare function mapTipAmountsFromUnitsToFill(tips: ConsiderationItem[], unitsToFill: BigNumberish, totalSize: bigint): ConsiderationItem[];
|
|
36
|
+
export declare function mapTipAmountsFromFilledStatus(tips: ConsiderationItem[], totalFilled: bigint, totalSize: bigint): ConsiderationItem[];
|
|
36
37
|
export declare const generateRandomSalt: (domain?: string) => string;
|
|
37
38
|
export declare const shouldUseMatchForFulfill: () => boolean;
|
package/lib/utils/order.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.shouldUseMatchForFulfill = exports.generateRandomSalt = exports.
|
|
3
|
+
exports.shouldUseMatchForFulfill = exports.generateRandomSalt = exports.mapOrderAmountsFromUnitsToFill = exports.mapOrderAmountsFromFilledStatus = exports.totalItemsAmount = exports.areAllCurrenciesSame = exports.mapInputItemToOfferItem = exports.deductFees = exports.feeToConsiderationItem = void 0;
|
|
4
|
+
exports.mapTipAmountsFromUnitsToFill = mapTipAmountsFromUnitsToFill;
|
|
5
|
+
exports.mapTipAmountsFromFilledStatus = mapTipAmountsFromFilledStatus;
|
|
4
6
|
const ethers_1 = require("ethers");
|
|
5
7
|
const constants_1 = require("../constants");
|
|
6
8
|
const item_1 = require("./item");
|
|
@@ -120,7 +122,7 @@ const mapOrderAmountsFromFilledStatus = (order, { totalFilled, totalSize }) => {
|
|
|
120
122
|
return order;
|
|
121
123
|
}
|
|
122
124
|
// i.e if totalFilled is 3 and totalSize is 4, there are 1 / 4 order amounts left to fill.
|
|
123
|
-
const basisPoints = totalSize -
|
|
125
|
+
const basisPoints = ((totalSize - totalFilled) * constants_1.ONE_HUNDRED_PERCENT_BP) / totalSize;
|
|
124
126
|
return {
|
|
125
127
|
parameters: {
|
|
126
128
|
...order.parameters,
|
|
@@ -173,7 +175,7 @@ const mapOrderAmountsFromUnitsToFill = (order, { unitsToFill, totalSize }) => {
|
|
|
173
175
|
};
|
|
174
176
|
};
|
|
175
177
|
exports.mapOrderAmountsFromUnitsToFill = mapOrderAmountsFromUnitsToFill;
|
|
176
|
-
function
|
|
178
|
+
function mapTipAmountsFromUnitsToFill(tips, unitsToFill, totalSize) {
|
|
177
179
|
const unitsToFillBn = BigInt(unitsToFill);
|
|
178
180
|
if (unitsToFillBn <= 0n) {
|
|
179
181
|
throw new Error("Units to fill must be greater than 0");
|
|
@@ -184,7 +186,18 @@ function adjustTipsForPartialFills(tips, unitsToFill, totalSize) {
|
|
|
184
186
|
endAmount: multiplyDivision(tip.endAmount, unitsToFillBn, totalSize).toString(),
|
|
185
187
|
}));
|
|
186
188
|
}
|
|
187
|
-
|
|
189
|
+
function mapTipAmountsFromFilledStatus(tips, totalFilled, totalSize) {
|
|
190
|
+
if (totalFilled === 0n || totalSize === 0n) {
|
|
191
|
+
return tips;
|
|
192
|
+
}
|
|
193
|
+
// i.e if totalFilled is 3 and totalSize is 4, there are 1 / 4 order amounts left to fill.
|
|
194
|
+
const basisPoints = ((totalSize - totalFilled) * constants_1.ONE_HUNDRED_PERCENT_BP) / totalSize;
|
|
195
|
+
return tips.map((tip) => ({
|
|
196
|
+
...tip,
|
|
197
|
+
startAmount: multiplyBasisPoints(tip.startAmount, basisPoints).toString(),
|
|
198
|
+
endAmount: multiplyBasisPoints(tip.endAmount, basisPoints).toString(),
|
|
199
|
+
}));
|
|
200
|
+
}
|
|
188
201
|
const generateRandomSalt = (domain) => {
|
|
189
202
|
if (domain) {
|
|
190
203
|
return (0, ethers_1.toBeHex)((0, ethers_1.concat)([
|
package/lib/utils/order.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order.js","sourceRoot":"","sources":["../../src/utils/order.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"order.js","sourceRoot":"","sources":["../../src/utils/order.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/usecase.d.ts
CHANGED
|
@@ -9,5 +9,5 @@ export type TransactionMethods<T = unknown> = {
|
|
|
9
9
|
estimateGas: (overrides?: Overrides) => Promise<bigint>;
|
|
10
10
|
transact: (overrides?: Overrides) => Promise<TransactionResponse>;
|
|
11
11
|
};
|
|
12
|
-
export declare const getTransactionMethods: <T extends BaseContract, U extends keyof T>(signer: Signer | Promise<Signer>, contract: T, method: U, args: T[U] extends TypedContractMethod<infer Args
|
|
12
|
+
export declare const getTransactionMethods: <T extends BaseContract, U extends keyof T>(signer: Signer | Promise<Signer>, contract: T, method: U, args: T[U] extends TypedContractMethod<infer Args, any, any> ? Args | [...Args, Overrides | undefined] : never, domain?: string) => TransactionMethods<ContractMethodReturnType<T, U>>;
|
|
13
13
|
export declare const getTagFromDomain: (domain: string) => string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensea/seaport-js",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.4",
|
|
4
4
|
"description": "[Seaport](https://github.com/ProjectOpenSea/seaport) is a new marketplace protocol for safely and efficiently buying and selling NFTs. This is a TypeScript library intended to make interfacing with the contract reasonable and easy.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "OpenSea Developers",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"types": "lib/index.d.ts",
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"ethers": "^6.9.0",
|
|
37
|
-
"merkletreejs": "^0.
|
|
37
|
+
"merkletreejs": "^0.4.0"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"@nomicfoundation/hardhat-toolbox": "^5.0.0",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"@types/sinon": "^17.0.2",
|
|
49
49
|
"@typescript-eslint/eslint-plugin": "^7.0.0",
|
|
50
50
|
"@typescript-eslint/parser": "^7.0.0",
|
|
51
|
-
"c8": "^
|
|
51
|
+
"c8": "^10.0.0",
|
|
52
52
|
"chai": "^4.3.7",
|
|
53
53
|
"chai-as-promised": "^7.1.1",
|
|
54
54
|
"concurrently": "^8.0.1",
|
|
@@ -54,7 +54,7 @@ const findBalanceAndApproval = (
|
|
|
54
54
|
|
|
55
55
|
if (!balanceAndApproval) {
|
|
56
56
|
throw new Error(
|
|
57
|
-
|
|
57
|
+
`Checking for balance and approvals for token ${token} id ${identifierOrCriteria} failed`,
|
|
58
58
|
);
|
|
59
59
|
}
|
|
60
60
|
|
package/src/utils/fulfill.ts
CHANGED
|
@@ -45,7 +45,8 @@ import {
|
|
|
45
45
|
areAllCurrenciesSame,
|
|
46
46
|
mapOrderAmountsFromFilledStatus,
|
|
47
47
|
mapOrderAmountsFromUnitsToFill,
|
|
48
|
-
|
|
48
|
+
mapTipAmountsFromFilledStatus,
|
|
49
|
+
mapTipAmountsFromUnitsToFill,
|
|
49
50
|
totalItemsAmount,
|
|
50
51
|
} from "./order";
|
|
51
52
|
import {
|
|
@@ -382,7 +383,7 @@ export function fulfillStandardOrder(
|
|
|
382
383
|
let adjustedTips: ConsiderationItem[] = [];
|
|
383
384
|
|
|
384
385
|
if (tips.length > 0) {
|
|
385
|
-
adjustedTips =
|
|
386
|
+
adjustedTips = mapTipAmountsFromUnitsToFill(tips, unitsToFill, totalSize);
|
|
386
387
|
}
|
|
387
388
|
|
|
388
389
|
const {
|
|
@@ -589,14 +590,17 @@ export function fulfillAvailableOrders({
|
|
|
589
590
|
return [];
|
|
590
591
|
}
|
|
591
592
|
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
593
|
+
return orderMetadata.unitsToFill
|
|
594
|
+
? mapTipAmountsFromUnitsToFill(
|
|
595
|
+
orderMetadata.tips,
|
|
596
|
+
orderMetadata.unitsToFill,
|
|
597
|
+
orderMetadata.orderStatus.totalSize,
|
|
598
|
+
)
|
|
599
|
+
: mapTipAmountsFromFilledStatus(
|
|
600
|
+
orderMetadata.tips,
|
|
601
|
+
orderMetadata.orderStatus.totalFilled,
|
|
602
|
+
orderMetadata.orderStatus.totalSize,
|
|
603
|
+
);
|
|
600
604
|
};
|
|
601
605
|
|
|
602
606
|
const ordersMetadataWithAdjustedFills = sanitizedOrdersMetadata.map(
|
package/src/utils/order.ts
CHANGED
|
@@ -185,7 +185,7 @@ export const mapOrderAmountsFromFilledStatus = (
|
|
|
185
185
|
|
|
186
186
|
// i.e if totalFilled is 3 and totalSize is 4, there are 1 / 4 order amounts left to fill.
|
|
187
187
|
const basisPoints =
|
|
188
|
-
totalSize -
|
|
188
|
+
((totalSize - totalFilled) * ONE_HUNDRED_PERCENT_BP) / totalSize;
|
|
189
189
|
|
|
190
190
|
return {
|
|
191
191
|
parameters: {
|
|
@@ -273,7 +273,7 @@ export const mapOrderAmountsFromUnitsToFill = (
|
|
|
273
273
|
};
|
|
274
274
|
};
|
|
275
275
|
|
|
276
|
-
export function
|
|
276
|
+
export function mapTipAmountsFromUnitsToFill(
|
|
277
277
|
tips: ConsiderationItem[],
|
|
278
278
|
unitsToFill: BigNumberish,
|
|
279
279
|
totalSize: bigint,
|
|
@@ -299,6 +299,26 @@ export function adjustTipsForPartialFills(
|
|
|
299
299
|
}));
|
|
300
300
|
}
|
|
301
301
|
|
|
302
|
+
export function mapTipAmountsFromFilledStatus(
|
|
303
|
+
tips: ConsiderationItem[],
|
|
304
|
+
totalFilled: bigint,
|
|
305
|
+
totalSize: bigint,
|
|
306
|
+
): ConsiderationItem[] {
|
|
307
|
+
if (totalFilled === 0n || totalSize === 0n) {
|
|
308
|
+
return tips;
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
// i.e if totalFilled is 3 and totalSize is 4, there are 1 / 4 order amounts left to fill.
|
|
312
|
+
const basisPoints =
|
|
313
|
+
((totalSize - totalFilled) * ONE_HUNDRED_PERCENT_BP) / totalSize;
|
|
314
|
+
|
|
315
|
+
return tips.map((tip) => ({
|
|
316
|
+
...tip,
|
|
317
|
+
startAmount: multiplyBasisPoints(tip.startAmount, basisPoints).toString(),
|
|
318
|
+
endAmount: multiplyBasisPoints(tip.endAmount, basisPoints).toString(),
|
|
319
|
+
}));
|
|
320
|
+
}
|
|
321
|
+
|
|
302
322
|
export const generateRandomSalt = (domain?: string) => {
|
|
303
323
|
if (domain) {
|
|
304
324
|
return toBeHex(
|