@1inch/fusion-sdk 2.2.4-rc.2 → 2.2.5-rc.0
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/dist/cjs/amount-calculator/amount-calculator.js +23 -4
- package/dist/cjs/amount-calculator/amount-calculator.js.map +1 -1
- package/dist/cjs/api/quoter/quote/quote.js +4 -1
- package/dist/cjs/api/quoter/quote/quote.js.map +1 -1
- package/dist/cjs/api/quoter/types.js.map +1 -1
- package/dist/cjs/constants.js +0 -2
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/fusion-order/constants.js +1 -3
- package/dist/cjs/fusion-order/constants.js.map +1 -1
- package/dist/cjs/fusion-order/fusion-extension.js +8 -3
- package/dist/cjs/fusion-order/fusion-extension.js.map +1 -1
- package/dist/cjs/fusion-order/fusion-order.js +10 -5
- package/dist/cjs/fusion-order/fusion-order.js.map +1 -1
- package/dist/cjs/fusion-order/index.js +1 -0
- package/dist/cjs/fusion-order/index.js.map +1 -1
- package/dist/cjs/fusion-order/surplus-params.js +22 -0
- package/dist/cjs/fusion-order/surplus-params.js.map +1 -0
- package/dist/cjs/fusion-order/whitelist/index.js +0 -1
- package/dist/cjs/fusion-order/whitelist/index.js.map +1 -1
- package/dist/cjs/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/esm/amount-calculator/amount-calculator.js +23 -4
- package/dist/esm/amount-calculator/amount-calculator.js.map +1 -1
- package/dist/esm/api/quoter/quote/quote.js +5 -2
- package/dist/esm/api/quoter/quote/quote.js.map +1 -1
- package/dist/esm/api/quoter/types.js.map +1 -1
- package/dist/esm/constants.js +0 -2
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/fusion-order/constants.js +1 -3
- package/dist/esm/fusion-order/constants.js.map +1 -1
- package/dist/esm/fusion-order/fusion-extension.js +8 -3
- package/dist/esm/fusion-order/fusion-extension.js.map +1 -1
- package/dist/esm/fusion-order/fusion-order.js +10 -5
- package/dist/esm/fusion-order/fusion-order.js.map +1 -1
- package/dist/esm/fusion-order/index.js +1 -0
- package/dist/esm/fusion-order/index.js.map +1 -1
- package/dist/esm/fusion-order/surplus-params.js +17 -0
- package/dist/esm/fusion-order/surplus-params.js.map +1 -0
- package/dist/esm/fusion-order/whitelist/index.js +0 -1
- package/dist/esm/fusion-order/whitelist/index.js.map +1 -1
- package/dist/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/dist/types/src/amount-calculator/amount-calculator.d.ts +6 -3
- package/dist/types/src/api/quoter/quote/quote.d.ts +2 -0
- package/dist/types/src/api/quoter/types.d.ts +2 -0
- package/dist/types/src/constants.d.ts +1 -3
- package/dist/types/src/fusion-order/constants.d.ts +0 -2
- package/dist/types/src/fusion-order/fusion-extension.d.ts +3 -1
- package/dist/types/src/fusion-order/fusion-order.d.ts +4 -1
- package/dist/types/src/fusion-order/index.d.ts +1 -0
- package/dist/types/src/fusion-order/surplus-params.d.ts +9 -0
- package/dist/types/src/fusion-order/whitelist/index.d.ts +0 -1
- package/dist/types/tsconfig.types.tsbuildinfo +1 -1
- package/package.json +16 -16
|
@@ -4,15 +4,17 @@ exports.AmountCalculator = void 0;
|
|
|
4
4
|
const limit_order_sdk_1 = require("@1inch/limit-order-sdk");
|
|
5
5
|
const fee_taker_1 = require("@1inch/limit-order-sdk/extensions/fee-taker");
|
|
6
6
|
const auction_calculator_1 = require("./auction-calculator");
|
|
7
|
+
const fusion_order_1 = require("../fusion-order");
|
|
7
8
|
class AmountCalculator {
|
|
8
|
-
constructor(auctionCalculator, feeCalculator) {
|
|
9
|
+
constructor(auctionCalculator, feeCalculator, surplus = fusion_order_1.SurplusParams.NO_FEE) {
|
|
9
10
|
this.auctionCalculator = auctionCalculator;
|
|
10
11
|
this.feeCalculator = feeCalculator;
|
|
12
|
+
this.surplus = surplus;
|
|
11
13
|
}
|
|
12
14
|
static fromExtension(ext) {
|
|
13
15
|
return new AmountCalculator(auction_calculator_1.AuctionCalculator.fromAuctionData(ext.auctionDetails), ext.extra?.fees
|
|
14
16
|
? new limit_order_sdk_1.FeeTakerExt.FeeCalculator(ext.extra?.fees, ext.whitelist)
|
|
15
|
-
: undefined);
|
|
17
|
+
: undefined, ext.surplus);
|
|
16
18
|
}
|
|
17
19
|
static calcAuctionTakingAmount(baseTakingAmount, rate, fee = limit_order_sdk_1.Bps.ZERO) {
|
|
18
20
|
const withoutFee = auction_calculator_1.AuctionCalculator.calcAuctionTakingAmount(baseTakingAmount, rate);
|
|
@@ -41,9 +43,16 @@ class AmountCalculator {
|
|
|
41
43
|
return (this.getIntegratorFee(taker, takingAmount, time, blockBaseFee) +
|
|
42
44
|
this.getProtocolFee(taker, takingAmount, time, blockBaseFee));
|
|
43
45
|
}
|
|
44
|
-
|
|
46
|
+
getUserTakingAmount(taker, makingAmount, takingAmount, orderMakingAmount, time, blockBaseFee = 0n) {
|
|
45
47
|
const whole = this.getRequiredTakingAmount(taker, takingAmount, time, blockBaseFee);
|
|
46
|
-
|
|
48
|
+
const preSurplus = whole - this.getTotalFee(taker, takingAmount, time, blockBaseFee);
|
|
49
|
+
const surplusFee = this._getSurplusFee(preSurplus, makingAmount, orderMakingAmount);
|
|
50
|
+
return preSurplus - surplusFee;
|
|
51
|
+
}
|
|
52
|
+
getSurplusFee(taker, makingAmount, takingAmount, orderMakingAmount, time, blockBaseFee = 0n) {
|
|
53
|
+
const whole = this.getRequiredTakingAmount(taker, takingAmount, time, blockBaseFee);
|
|
54
|
+
const preSurplus = whole - this.getTotalFee(taker, takingAmount, time, blockBaseFee);
|
|
55
|
+
return this._getSurplusFee(preSurplus, makingAmount, orderMakingAmount);
|
|
47
56
|
}
|
|
48
57
|
getResolverFee(taker, takingAmount, time, blockBaseFee = 0n) {
|
|
49
58
|
return (this.feeCalculator?.getResolverFee(taker, this.getAuctionBumpedAmount(takingAmount, time, blockBaseFee)) ?? 0n);
|
|
@@ -57,6 +66,16 @@ class AmountCalculator {
|
|
|
57
66
|
getProtocolFee(taker, takingAmount, time, blockBaseFee = 0n) {
|
|
58
67
|
return (this.feeCalculator?.getProtocolFee(taker, this.getAuctionBumpedAmount(takingAmount, time, blockBaseFee)) ?? 0n);
|
|
59
68
|
}
|
|
69
|
+
_getSurplusFee(userTakingAmount, makingAmount, orderMakingAmount) {
|
|
70
|
+
const estimatedTakingAmount = (0, limit_order_sdk_1.mulDiv)(this.surplus.estimatedTakerAmount, makingAmount, orderMakingAmount);
|
|
71
|
+
if (userTakingAmount > estimatedTakingAmount) {
|
|
72
|
+
const surplusFee = ((userTakingAmount - estimatedTakingAmount) *
|
|
73
|
+
BigInt(this.surplus.protocolFee.toPercent())) /
|
|
74
|
+
100n;
|
|
75
|
+
return surplusFee;
|
|
76
|
+
}
|
|
77
|
+
return 0n;
|
|
78
|
+
}
|
|
60
79
|
getAuctionBumpedAmount(takingAmount, time, blockBaseFee = 0n) {
|
|
61
80
|
const rateBump = this.auctionCalculator.calcRateBump(time, blockBaseFee);
|
|
62
81
|
return auction_calculator_1.AuctionCalculator.calcAuctionTakingAmount(takingAmount, rateBump);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amount-calculator.js","sourceRoot":"","sources":["../../../src/amount-calculator/amount-calculator.ts"],"names":[],"mappings":";;;AAAA,4DAM+B;AAC/B,2EAA+E;AAC/E,6DAAsD;
|
|
1
|
+
{"version":3,"file":"amount-calculator.js","sourceRoot":"","sources":["../../../src/amount-calculator/amount-calculator.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ class Quote {
|
|
|
22
22
|
: undefined
|
|
23
23
|
};
|
|
24
24
|
this.toTokenAmount = response.toTokenAmount;
|
|
25
|
+
this.marketReturn = BigInt(response.marketAmount);
|
|
25
26
|
this.prices = response.prices;
|
|
26
27
|
this.volume = response.volume;
|
|
27
28
|
this.quoteId = response.quoteId;
|
|
@@ -34,6 +35,7 @@ class Quote {
|
|
|
34
35
|
whitelistDiscountPercent: limit_order_sdk_1.Bps.fromPercent(response.fee.whitelistDiscountPercent),
|
|
35
36
|
bps: new limit_order_sdk_1.Bps(BigInt(response.fee.bps))
|
|
36
37
|
};
|
|
38
|
+
this.surplusFee = response.surplusFee;
|
|
37
39
|
}
|
|
38
40
|
createFusionOrder(paramsData) {
|
|
39
41
|
const params = order_params_1.FusionOrderParams.new({
|
|
@@ -64,7 +66,8 @@ class Quote {
|
|
|
64
66
|
receiver: params.receiver
|
|
65
67
|
}, {
|
|
66
68
|
auction: auctionDetails,
|
|
67
|
-
whitelist: this.getWhitelist(auctionDetails.startTime, preset.exclusiveResolver)
|
|
69
|
+
whitelist: this.getWhitelist(auctionDetails.startTime, preset.exclusiveResolver),
|
|
70
|
+
surplus: new fusion_order_1.SurplusParams(this.marketReturn, limit_order_sdk_1.Bps.fromPercent(this.surplusFee || 0))
|
|
68
71
|
}, {
|
|
69
72
|
nonce,
|
|
70
73
|
unwrapWETH: this.params.toTokenAddress.isNative(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":";;;AAAA,4DAA+D;AAC/D,kDAA6C;AAC7C,2EAIoD;AACpD,iDAAgD;AAMhD,oCAAyD;AACzD,sCAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/api/quoter/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/api/quoter/types.ts"],"names":[],"mappings":";;;AAqFA,IAAY,UAKX;AALD,WAAY,UAAU;IAClB,2BAAa,CAAA;IACb,+BAAiB,CAAA;IACjB,2BAAa,CAAA;IACb,+BAAiB,CAAA;AACrB,CAAC,EALW,UAAU,0BAAV,UAAU,QAKrB"}
|
package/dist/cjs/constants.js
CHANGED
|
@@ -15,8 +15,6 @@ var NetworkEnum;
|
|
|
15
15
|
NetworkEnum[NetworkEnum["GNOSIS"] = 100] = "GNOSIS";
|
|
16
16
|
NetworkEnum[NetworkEnum["COINBASE"] = 8453] = "COINBASE";
|
|
17
17
|
NetworkEnum[NetworkEnum["LINEA"] = 59144] = "LINEA";
|
|
18
|
-
NetworkEnum[NetworkEnum["SONIC"] = 146] = "SONIC";
|
|
19
|
-
NetworkEnum[NetworkEnum["UNICHAIN"] = 130] = "UNICHAIN";
|
|
20
18
|
})(NetworkEnum || (exports.NetworkEnum = NetworkEnum = {}));
|
|
21
19
|
exports.ONE_INCH_LIMIT_ORDER_V4 = '0x111111125421ca6dc452d289314280a0f8842a65';
|
|
22
20
|
exports.UINT_160_MAX = (1n << 160n) - 1n;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,EAAE,GAAG,IAAI,CAAA;AAEtB,IAAY,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,EAAE,GAAG,IAAI,CAAA;AAEtB,IAAY,WAYX;AAZD,WAAY,WAAW;IACnB,qDAAY,CAAA;IACZ,qDAAa,CAAA;IACb,mDAAY,CAAA;IACZ,oDAAY,CAAA;IACZ,yDAAgB,CAAA;IAChB,2DAAiB,CAAA;IACjB,sDAAa,CAAA;IACb,mDAAY,CAAA;IACZ,mDAAY,CAAA;IACZ,wDAAe,CAAA;IACf,mDAAa,CAAA;AACjB,CAAC,EAZW,WAAW,2BAAX,WAAW,QAYtB;AAEY,QAAA,uBAAuB,GAChC,4CAA4C,CAAA;AAEnC,QAAA,YAAY,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA;AAChC,QAAA,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC9B,QAAA,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC9B,QAAA,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC9B,QAAA,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC9B,QAAA,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC9B,QAAA,YAAY,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA"}
|
|
@@ -14,8 +14,6 @@ exports.CHAIN_TO_WRAPPER = {
|
|
|
14
14
|
[constants_1.NetworkEnum.OPTIMISM]: new limit_order_sdk_1.Address('0x4200000000000000000000000000000000000006'),
|
|
15
15
|
[constants_1.NetworkEnum.FANTOM]: new limit_order_sdk_1.Address('0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83'),
|
|
16
16
|
[constants_1.NetworkEnum.ZKSYNC]: new limit_order_sdk_1.Address('0x5aea5775959fbc2557cc8789bc1bf90a239d9a91'),
|
|
17
|
-
[constants_1.NetworkEnum.LINEA]: new limit_order_sdk_1.Address('0xe5d7c2a44ffddf6b295a15c148167daaaf5cf34f')
|
|
18
|
-
[constants_1.NetworkEnum.UNICHAIN]: new limit_order_sdk_1.Address('0x4200000000000000000000000000000000000006'),
|
|
19
|
-
[constants_1.NetworkEnum.SONIC]: new limit_order_sdk_1.Address('0x039e2fb66102314ce7b64ce5ce3e5183bc94ad38')
|
|
17
|
+
[constants_1.NetworkEnum.LINEA]: new limit_order_sdk_1.Address('0xe5d7c2a44ffddf6b295a15c148167daaaf5cf34f')
|
|
20
18
|
};
|
|
21
19
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/fusion-order/constants.ts"],"names":[],"mappings":";;;AAAA,4DAA8C;AAC9C,4CAAwC;AAE3B,QAAA,gBAAgB,GAAG;IAC5B,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,OAAO,CAAC,EAAE,IAAI,yBAAO,CAC9B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,OAAO,CAAC,EAAE,IAAI,yBAAO,CAC9B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,SAAS,CAAC,EAAE,IAAI,yBAAO,CAChC,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,MAAM,CAAC,EAAE,IAAI,yBAAO,CAC7B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,MAAM,CAAC,EAAE,IAAI,yBAAO,CAC7B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,MAAM,CAAC,EAAE,IAAI,yBAAO,CAC7B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,KAAK,CAAC,EAAE,IAAI,yBAAO,CAC5B,4CAA4C,CAC/C;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/fusion-order/constants.ts"],"names":[],"mappings":";;;AAAA,4DAA8C;AAC9C,4CAAwC;AAE3B,QAAA,gBAAgB,GAAG;IAC5B,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,OAAO,CAAC,EAAE,IAAI,yBAAO,CAC9B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,OAAO,CAAC,EAAE,IAAI,yBAAO,CAC9B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,SAAS,CAAC,EAAE,IAAI,yBAAO,CAChC,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,MAAM,CAAC,EAAE,IAAI,yBAAO,CAC7B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,MAAM,CAAC,EAAE,IAAI,yBAAO,CAC7B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,MAAM,CAAC,EAAE,IAAI,yBAAO,CAC7B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,KAAK,CAAC,EAAE,IAAI,yBAAO,CAC5B,4CAA4C,CAC/C;CACJ,CAAA"}
|
|
@@ -7,12 +7,14 @@ const byte_utils_1 = require("@1inch/byte-utils");
|
|
|
7
7
|
const assert_1 = tslib_1.__importDefault(require("assert"));
|
|
8
8
|
const auction_details_1 = require("./auction-details");
|
|
9
9
|
const whitelist_1 = require("./whitelist/whitelist");
|
|
10
|
+
const surplus_params_1 = require("./surplus-params");
|
|
10
11
|
const utils_1 = require("../utils");
|
|
11
12
|
class FusionExtension {
|
|
12
|
-
constructor(address, auctionDetails, whitelist, extra) {
|
|
13
|
+
constructor(address, auctionDetails, whitelist, surplus, extra) {
|
|
13
14
|
this.address = address;
|
|
14
15
|
this.auctionDetails = auctionDetails;
|
|
15
16
|
this.whitelist = whitelist;
|
|
17
|
+
this.surplus = surplus;
|
|
16
18
|
this.extra = extra;
|
|
17
19
|
}
|
|
18
20
|
static decode(bytes) {
|
|
@@ -34,6 +36,7 @@ class FusionExtension {
|
|
|
34
36
|
: undefined;
|
|
35
37
|
const interactionData = parseAmountData(interactionBytes);
|
|
36
38
|
const whitelist = whitelist_1.Whitelist.decodeFrom(interactionBytes);
|
|
39
|
+
const surplusParams = surplus_params_1.SurplusParams.decodeFrom(interactionBytes);
|
|
37
40
|
const amountBytes = byte_utils_1.BytesIter.HexString(extension.makingAmountData);
|
|
38
41
|
amountBytes.nextUint160();
|
|
39
42
|
const auctionDetails = auction_details_1.AuctionDetails.decodeFrom(amountBytes);
|
|
@@ -57,7 +60,7 @@ class FusionExtension {
|
|
|
57
60
|
(0, assert_1.default)(whitelist.whitelist.every(({ addressHalf }, i) => whitelistAddressesFromAmount[i] === addressHalf), 'whitelist addresses must be same in interaction data and in amount data');
|
|
58
61
|
const hasFees = !integratorFeeRecipient.isZero() || !protocolFeeRecipient.isZero();
|
|
59
62
|
if (!hasFees) {
|
|
60
|
-
return new FusionExtension(settlementContract, auctionDetails, whitelist, {
|
|
63
|
+
return new FusionExtension(settlementContract, auctionDetails, whitelist, surplusParams, {
|
|
61
64
|
makerPermit,
|
|
62
65
|
customReceiver,
|
|
63
66
|
fees: undefined
|
|
@@ -68,7 +71,7 @@ class FusionExtension {
|
|
|
68
71
|
: new limit_order_sdk_1.FeeTakerExt.ResolverFee(protocolFeeRecipient, interactionData.fees.resolverFee, interactionData.fees.whitelistDiscount), interactionData.fees.integratorFee.isZero()
|
|
69
72
|
? limit_order_sdk_1.FeeTakerExt.IntegratorFee.ZERO
|
|
70
73
|
: new limit_order_sdk_1.FeeTakerExt.IntegratorFee(integratorFeeRecipient, protocolFeeRecipient, interactionData.fees.integratorFee, interactionData.fees.integratorShare));
|
|
71
|
-
return new FusionExtension(settlementContract, auctionDetails, whitelist, {
|
|
74
|
+
return new FusionExtension(settlementContract, auctionDetails, whitelist, surplusParams, {
|
|
72
75
|
makerPermit,
|
|
73
76
|
fees,
|
|
74
77
|
customReceiver
|
|
@@ -98,6 +101,8 @@ class FusionExtension {
|
|
|
98
101
|
builder.addAddress(customReceiver.toString());
|
|
99
102
|
}
|
|
100
103
|
builder.addBytes(this.buildAmountGetterData(false));
|
|
104
|
+
builder.addUint256(this.surplus.estimatedTakerAmount);
|
|
105
|
+
builder.addUint8(BigInt(this.surplus.protocolFee.toPercent()));
|
|
101
106
|
return builder.asHex();
|
|
102
107
|
}
|
|
103
108
|
buildAmountGetterData(forAmountGetters) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fusion-extension.js","sourceRoot":"","sources":["../../../src/fusion-order/fusion-extension.ts"],"names":[],"mappings":";;;;AAAA,4DAS+B;AAC/B,kDAA6D;AAE7D,4DAA2B;AAC3B,uDAAgD;AAChD,qDAA+C;AAC/C,oCAA8B;AAE9B,MAAa,eAAe;IAOxB,YACoB,OAAgB,EAChB,cAA8B,EAC9B,SAAoB,EACpB,KAIf;
|
|
1
|
+
{"version":3,"file":"fusion-extension.js","sourceRoot":"","sources":["../../../src/fusion-order/fusion-extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,13 +6,14 @@ const limit_order_sdk_1 = require("@1inch/limit-order-sdk");
|
|
|
6
6
|
const assert_1 = tslib_1.__importDefault(require("assert"));
|
|
7
7
|
const fusion_extension_1 = require("./fusion-extension");
|
|
8
8
|
const source_track_1 = require("./source-track");
|
|
9
|
+
const surplus_params_1 = require("./surplus-params");
|
|
9
10
|
const auction_calculator_1 = require("../amount-calculator/auction-calculator");
|
|
10
11
|
const constants_1 = require("../constants");
|
|
11
12
|
const amounts_1 = require("../utils/amounts");
|
|
12
13
|
const time_1 = require("../utils/time");
|
|
13
14
|
const amount_calculator_1 = require("../amount-calculator/amount-calculator");
|
|
14
15
|
class FusionOrder {
|
|
15
|
-
constructor(settlementExtensionContract, orderInfo, auctionDetails, whitelist, extra = FusionOrder.defaultExtra, extension = new fusion_extension_1.FusionExtension(settlementExtensionContract, auctionDetails, whitelist, {
|
|
16
|
+
constructor(settlementExtensionContract, orderInfo, auctionDetails, whitelist, surplusParams = surplus_params_1.SurplusParams.NO_FEE, extra = FusionOrder.defaultExtra, extension = new fusion_extension_1.FusionExtension(settlementExtensionContract, auctionDetails, whitelist, surplusParams, {
|
|
16
17
|
makerPermit: extra.permit
|
|
17
18
|
? new limit_order_sdk_1.Interaction(orderInfo.makerAsset, extra.permit)
|
|
18
19
|
: undefined,
|
|
@@ -117,7 +118,7 @@ class FusionOrder {
|
|
|
117
118
|
return this.inner.salt;
|
|
118
119
|
}
|
|
119
120
|
static new(settlementExtension, orderInfo, details, extra) {
|
|
120
|
-
return new FusionOrder(settlementExtension, orderInfo, details.auction, details.whitelist, extra);
|
|
121
|
+
return new FusionOrder(settlementExtension, orderInfo, details.auction, details.whitelist, details.surplus, extra);
|
|
121
122
|
}
|
|
122
123
|
static fromDataAndExtension(order, extension) {
|
|
123
124
|
const settlementContract = limit_order_sdk_1.Address.fromFirstBytes(extension.makingAmountData);
|
|
@@ -126,7 +127,7 @@ class FusionOrder {
|
|
|
126
127
|
const makerTraits = new limit_order_sdk_1.MakerTraits(BigInt(order.makerTraits));
|
|
127
128
|
(0, assert_1.default)(!makerTraits.isPrivate(), 'fusion order can not be private');
|
|
128
129
|
(0, assert_1.default)(makerTraits.hasPostInteraction(), 'post-interaction must be enabled');
|
|
129
|
-
const { auctionDetails, whitelist, extra } = fusion_extension_1.FusionExtension.fromExtension(extension);
|
|
130
|
+
const { auctionDetails, whitelist, extra, surplus } = fusion_extension_1.FusionExtension.fromExtension(extension);
|
|
130
131
|
const deadline = makerTraits.expiration();
|
|
131
132
|
const orderExpirationDelay = deadline === null
|
|
132
133
|
? undefined
|
|
@@ -139,7 +140,7 @@ class FusionOrder {
|
|
|
139
140
|
takerAsset: new limit_order_sdk_1.Address(order.takerAsset),
|
|
140
141
|
makingAmount: BigInt(order.makingAmount),
|
|
141
142
|
takingAmount: BigInt(order.takingAmount)
|
|
142
|
-
}, auctionDetails, whitelist, {
|
|
143
|
+
}, auctionDetails, whitelist, surplus, {
|
|
143
144
|
allowMultipleFills: makerTraits.isMultipleFillsAllowed(),
|
|
144
145
|
allowPartialFills: makerTraits.isPartialFillAllowed(),
|
|
145
146
|
enablePermit2: makerTraits.isPermit2(),
|
|
@@ -170,7 +171,11 @@ class FusionOrder {
|
|
|
170
171
|
}
|
|
171
172
|
getUserReceiveAmount(taker, makingAmount, time, blockBaseFee = 0n) {
|
|
172
173
|
const takingAmount = (0, amounts_1.calcTakingAmount)(makingAmount, this.makingAmount, this.takingAmount);
|
|
173
|
-
return this.getAmountCalculator().
|
|
174
|
+
return this.getAmountCalculator().getUserTakingAmount(taker, makingAmount, takingAmount, this.makingAmount, time, blockBaseFee);
|
|
175
|
+
}
|
|
176
|
+
getSurplusFee(taker, makingAmount, time, blockBaseFee = 0n) {
|
|
177
|
+
const takingAmount = (0, amounts_1.calcTakingAmount)(makingAmount, this.makingAmount, this.takingAmount);
|
|
178
|
+
return this.getAmountCalculator().getSurplusFee(taker, makingAmount, takingAmount, this.makingAmount, time, blockBaseFee);
|
|
174
179
|
}
|
|
175
180
|
getResolverFee(taker, time, blockBaseFee = 0n, makingAmount = this.makingAmount) {
|
|
176
181
|
const takingAmount = (0, amounts_1.calcTakingAmount)(makingAmount, this.makingAmount, this.takingAmount);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fusion-order.js","sourceRoot":"","sources":["../../../src/fusion-order/fusion-order.ts"],"names":[],"mappings":";;;;AAAA,4DAS+B;AAE/B,4DAA2B;AAC3B,yDAAkD;AAGlD,iDAA8C;AAE9C,gFAAyE;AACzE,4CAA+B;AAC/B,8CAAiD;AACjD,wCAAiC;AACjC,8EAAuE;AAEvE,MAAa,WAAW;IAapB,YAKoB,2BAAoC,EACpD,SAAwB,EACxB,cAA8B,EAC9B,SAAoB,EACpB,QA2BI,WAAW,CAAC,YAAY,EAC5B,SAAS,GAAG,IAAI,kCAAe,CAC3B,2BAA2B,EAC3B,cAAc,EACd,SAAS,EACT;QACI,WAAW,EAAE,KAAK,CAAC,MAAM;YACrB,CAAC,CAAC,IAAI,6BAAW,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC;YACrD,CAAC,CAAC,SAAS;QACf,cAAc,EAAE,SAAS,CAAC,QAAQ;QAClC,IAAI,EAAE,KAAK,EAAE,IAAI;KACpB,CACJ;
|
|
1
|
+
{"version":3,"file":"fusion-order.js","sourceRoot":"","sources":["../../../src/fusion-order/fusion-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,4 +10,5 @@ var constants_1 = require("./constants");
|
|
|
10
10
|
Object.defineProperty(exports, "CHAIN_TO_WRAPPER", { enumerable: true, get: function () { return constants_1.CHAIN_TO_WRAPPER; } });
|
|
11
11
|
var limit_order_sdk_1 = require("@1inch/limit-order-sdk");
|
|
12
12
|
Object.defineProperty(exports, "FeeTakerExt", { enumerable: true, get: function () { return limit_order_sdk_1.FeeTakerExt; } });
|
|
13
|
+
tslib_1.__exportStar(require("./surplus-params"), exports);
|
|
13
14
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/fusion-order/index.ts"],"names":[],"mappings":";;;;AAAA,yDAA8B;AAC9B,4DAAiC;AACjC,sDAA2B;AAC3B,6DAAkC;AAClC,yCAA4C;AAApC,6GAAA,gBAAgB,OAAA;AACxB,0DAAkD;AAA1C,8GAAA,WAAW,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/fusion-order/index.ts"],"names":[],"mappings":";;;;AAAA,yDAA8B;AAC9B,4DAAiC;AACjC,sDAA2B;AAC3B,6DAAkC;AAClC,yCAA4C;AAApC,6GAAA,gBAAgB,OAAA;AACxB,0DAAkD;AAA1C,8GAAA,WAAW,OAAA;AACnB,2DAAgC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SurplusParams = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const byte_utils_1 = require("@1inch/byte-utils");
|
|
6
|
+
const limit_order_sdk_1 = require("@1inch/limit-order-sdk");
|
|
7
|
+
const assert_1 = tslib_1.__importDefault(require("assert"));
|
|
8
|
+
class SurplusParams {
|
|
9
|
+
constructor(estimatedTakerAmount, protocolFee) {
|
|
10
|
+
this.estimatedTakerAmount = estimatedTakerAmount;
|
|
11
|
+
this.protocolFee = protocolFee;
|
|
12
|
+
(0, assert_1.default)(protocolFee.value % 100n == 0n, 'only integer percent supported for protocolFee');
|
|
13
|
+
}
|
|
14
|
+
static decodeFrom(bytes) {
|
|
15
|
+
const amount = BigInt(bytes.nextUint256());
|
|
16
|
+
const protocolFee = new limit_order_sdk_1.Bps(BigInt(bytes.nextUint8()) * 100n);
|
|
17
|
+
return new SurplusParams(amount, protocolFee);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
exports.SurplusParams = SurplusParams;
|
|
21
|
+
SurplusParams.NO_FEE = new SurplusParams(byte_utils_1.UINT_256_MAX, limit_order_sdk_1.Bps.ZERO);
|
|
22
|
+
//# sourceMappingURL=surplus-params.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"surplus-params.js","sourceRoot":"","sources":["../../../src/fusion-order/surplus-params.ts"],"names":[],"mappings":";;;;AAAA,kDAAyD;AACzD,4DAA0C;AAC1C,4DAA2B;AAE3B,MAAa,aAAa;IAGtB,YACoB,oBAA4B,EAC5B,WAAgB;QADhB,yBAAoB,GAApB,oBAAoB,CAAQ;QAC5B,gBAAW,GAAX,WAAW,CAAK;QAEhC,IAAA,gBAAM,EACF,WAAW,CAAC,KAAK,GAAG,IAAI,IAAI,EAAE,EAC9B,gDAAgD,CACnD,CAAA;IACL,CAAC;IAQD,MAAM,CAAC,UAAU,CACb,KAAmB;QAEnB,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;QAC1C,MAAM,WAAW,GAAG,IAAI,qBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,GAAG,IAAI,CAAC,CAAA;QAE7D,OAAO,IAAI,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;IACjD,CAAC;;AA1BL,sCA2BC;AA1BU,oBAAM,GAAG,IAAI,aAAa,CAAC,yBAAY,EAAE,qBAAG,CAAC,IAAI,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/fusion-order/whitelist/index.ts"],"names":[],"mappings":";;;AAAA,sDAA2B
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/fusion-order/whitelist/index.ts"],"names":[],"mappings":";;;AAAA,sDAA2B"}
|