@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.
@@ -77,7 +77,7 @@ class Quote {
77
77
  orderExpirationDelay: paramsData?.orderExpirationDelay,
78
78
  source: this.params.source,
79
79
  enablePermit2: params.isPermit2,
80
- fees: buildFees(this.resolverFeePreset, this.params.integratorFee)
80
+ fees: buildFees(this.resolverFeePreset, this.params.integratorFee, this.surplusFee)
81
81
  });
82
82
  }
83
83
  getPreset(type = types_1.PresetEnum.fast) {
@@ -100,14 +100,15 @@ class Quote {
100
100
  }
101
101
  }
102
102
  exports.Quote = Quote;
103
- function buildFees(resolverFeePreset, integratorFee) {
103
+ function buildFees(resolverFeePreset, integratorFee, surplusFee) {
104
+ const protocolReceiver = resolverFeePreset.receiver;
104
105
  const hasIntegratorFee = integratorFee && !integratorFee.value.isZero();
105
- if (resolverFeePreset.bps.isZero() && !hasIntegratorFee) {
106
+ const hasProtocolFee = !resolverFeePreset.bps.isZero() || (surplusFee || 0) > 0;
107
+ if (!hasProtocolFee && !hasIntegratorFee) {
106
108
  return undefined;
107
109
  }
108
- const hasResolverFee = !resolverFeePreset.bps.isZero();
109
- return new fee_taker_1.Fees(new fee_taker_1.ResolverFee(hasResolverFee ? resolverFeePreset.receiver : limit_order_sdk_1.Address.ZERO_ADDRESS, resolverFeePreset.bps, resolverFeePreset.whitelistDiscountPercent), integratorFee
110
- ? new fee_taker_1.IntegratorFee(integratorFee.receiver, resolverFeePreset.receiver, integratorFee.value, integratorFee.share)
110
+ return new fee_taker_1.Fees(new fee_taker_1.ResolverFee(protocolReceiver, resolverFeePreset.bps, resolverFeePreset.whitelistDiscountPercent), integratorFee
111
+ ? new fee_taker_1.IntegratorFee(integratorFee.receiver, protocolReceiver, integratorFee.value, integratorFee.share)
111
112
  : fee_taker_1.IntegratorFee.ZERO);
112
113
  }
113
114
  //# 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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"}