@1inch/fusion-sdk 2.3.1 → 2.3.2
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/api/quoter/quote/quote.js +7 -6
- package/dist/cjs/api/quoter/quote/quote.js.map +1 -1
- package/dist/cjs/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/esm/api/quoter/quote/quote.js +7 -6
- package/dist/esm/api/quoter/quote/quote.js.map +1 -1
- package/dist/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/dist/types/tsconfig.types.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -74,7 +74,7 @@ export class Quote {
|
|
|
74
74
|
orderExpirationDelay: paramsData?.orderExpirationDelay,
|
|
75
75
|
source: this.params.source,
|
|
76
76
|
enablePermit2: params.isPermit2,
|
|
77
|
-
fees: buildFees(this.resolverFeePreset, this.params.integratorFee)
|
|
77
|
+
fees: buildFees(this.resolverFeePreset, this.params.integratorFee, this.surplusFee)
|
|
78
78
|
});
|
|
79
79
|
}
|
|
80
80
|
getPreset(type = PresetEnum.fast) {
|
|
@@ -96,14 +96,15 @@ export class Quote {
|
|
|
96
96
|
})));
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
|
-
function buildFees(resolverFeePreset, integratorFee) {
|
|
99
|
+
function buildFees(resolverFeePreset, integratorFee, surplusFee) {
|
|
100
|
+
const protocolReceiver = resolverFeePreset.receiver;
|
|
100
101
|
const hasIntegratorFee = integratorFee && !integratorFee.value.isZero();
|
|
101
|
-
|
|
102
|
+
const hasProtocolFee = !resolverFeePreset.bps.isZero() || (surplusFee || 0) > 0;
|
|
103
|
+
if (!hasProtocolFee && !hasIntegratorFee) {
|
|
102
104
|
return undefined;
|
|
103
105
|
}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
? new IntegratorFee(integratorFee.receiver, resolverFeePreset.receiver, integratorFee.value, integratorFee.share)
|
|
106
|
+
return new Fees(new ResolverFee(protocolReceiver, resolverFeePreset.bps, resolverFeePreset.whitelistDiscountPercent), integratorFee
|
|
107
|
+
? new IntegratorFee(integratorFee.receiver, protocolReceiver, integratorFee.value, integratorFee.share)
|
|
107
108
|
: IntegratorFee.ZERO);
|
|
108
109
|
}
|
|
109
110
|
//# sourceMappingURL=quote.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":"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"}
|