@1inch/fusion-sdk 2.1.11-rc.0 → 2.1.11
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 +4 -0
- package/dist/cjs/amount-calculator/amount-calculator.js.map +1 -1
- package/dist/cjs/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/esm/amount-calculator/amount-calculator.js +5 -1
- package/dist/esm/amount-calculator/amount-calculator.js.map +1 -1
- package/dist/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/dist/types/src/amount-calculator/amount-calculator.d.ts +1 -0
- package/dist/types/tsconfig.types.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Bps, FeeTakerExt } from '@1inch/limit-order-sdk';
|
|
1
|
+
import { Bps, FeeTakerExt, mulDiv, Rounding } from '@1inch/limit-order-sdk';
|
|
2
2
|
import { Fees } from '@1inch/limit-order-sdk/extensions/fee-taker';
|
|
3
3
|
import { AuctionCalculator } from './auction-calculator';
|
|
4
4
|
export class AmountCalculator {
|
|
@@ -19,6 +19,10 @@ export class AmountCalculator {
|
|
|
19
19
|
const numerator = Fees.BASE_1E5 + BigInt(fee.toFraction(Fees.BASE_1E5));
|
|
20
20
|
return (withoutFee * numerator) / Fees.BASE_1E5;
|
|
21
21
|
}
|
|
22
|
+
static extractFeeAmount(requiredTakingAmount, fee) {
|
|
23
|
+
return (requiredTakingAmount -
|
|
24
|
+
mulDiv(requiredTakingAmount, Fees.BASE_1E5, Fees.BASE_1E5 + BigInt(fee.toFraction(Fees.BASE_1E5)), Rounding.Ceil));
|
|
25
|
+
}
|
|
22
26
|
getRequiredTakingAmount(taker, takingAmount, time, blockBaseFee = 0n) {
|
|
23
27
|
const withFee = this.feeCalculator?.getTakingAmount(taker, takingAmount) ??
|
|
24
28
|
takingAmount;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amount-calculator.js","sourceRoot":"","sources":["../../../src/amount-calculator/amount-calculator.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"amount-calculator.js","sourceRoot":"","sources":["../../../src/amount-calculator/amount-calculator.ts"],"names":[],"mappings":"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"}
|