@1inch/fusion-sdk 2.4.3 → 2.4.4

package/dist/cjs/amount-calculator/amount-calculator.js

@@ -221,7 +221,7 @@ function _define_property(obj, key, value) {
      * @param makingAmount making amount to be filled
      * @param orderMakingAmount full order making amount
      */ function _getSurplusFee(userTakingAmount, makingAmount, orderMakingAmount) {
-                var estimatedTakingAmount = (0, _limitordersdk.mulDiv)(this.surplus.estimatedTakerAmount, makingAmount, orderMakingAmount);
+                var estimatedTakingAmount = (0, _limitordersdk.mulDiv)(this.surplus.estimatedTakerAmount, makingAmount, orderMakingAmount, _limitordersdk.Rounding.Ceil);
                 if (userTakingAmount > estimatedTakingAmount) {
                     var surplusFee = (userTakingAmount - estimatedTakingAmount) * BigInt(this.surplus.protocolFee.toPercent()) / 100n;
                     return surplusFee;

package/dist/cjs/amount-calculator/amount-calculator.spec.js

@@ -62,5 +62,47 @@ describe('AmountCalculator', function() {
         expect(userAmount).toBeGreaterThan(userAmountWithChargedSurplus);
         expect(userAmount - userAmountWithChargedSurplus).toEqual(surplus / 2n);
     });
-}) // fee is 50%
-;
+    // fee is 50%
+    it('should apply surplus with correct rounding', function() {
+        var startTime = 1764548287n;
+        var execTime = startTime;
+        var auction = new _index.AuctionCalculator(startTime, 600n, 179149n, [
+            {
+                coefficient: 157277,
+                delay: 84
+            },
+            {
+                coefficient: 141862,
+                delay: 84
+            },
+            {
+                coefficient: 129415,
+                delay: 84
+            },
+            {
+                coefficient: 116876,
+                delay: 84
+            },
+            {
+                coefficient: 24,
+                delay: 264
+            }
+        ], {
+            gasBumpEstimate: 24n,
+            gasPriceEstimate: 221n
+        });
+        var taker = _limitordersdk.Address.fromBigInt(1n);
+        var feeCalculator = new _limitordersdk.FeeTakerExt.FeeCalculator(_index2.Fees.integratorFee(new _index2.IntegratorFee(new _limitordersdk.Address('0x0000000000000000000000000000000000000000'), new _limitordersdk.Address('0x0000000000000000000000000000000000000000'), new _limitordersdk.Bps(0n), new _limitordersdk.Bps(0n))), _index1.Whitelist.new(1764548263n, [
+            {
+                address: taker,
+                allowFrom: 0n
+            }
+        ]));
+        var makingAmountOrder = 1369521200000n;
+        var calculator = new _amountcalculator.AmountCalculator(auction, feeCalculator, new _index1.SurplusParams(107289453867377650931124n, _limitordersdk.Bps.fromPercent(90)));
+        var userAmount1 = calculator.getSurplusFee(taker, 982226837n, 76145644627284979970n, makingAmountOrder, execTime, 216836903n);
+        expect(userAmount1).toBe(505013885259508359n);
+        var userAmount2 = calculator.getSurplusFee(taker, 136853897316n, 10609390660421433527440n, makingAmountOrder, execTime + 4n, 242000680n);
+        expect(userAmount2).toBe(69365890784904718356n);
+    });
+});

package/dist/esm/amount-calculator/amount-calculator.js

@@ -30,7 +30,7 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
-import { Bps, mulDiv, Rounding, FeeTakerExt } from '@1inch/limit-order-sdk';
+import { Bps, FeeTakerExt, mulDiv, Rounding } from '@1inch/limit-order-sdk';
 import { AuctionCalculator } from './auction-calculator/index.js';
 import { SurplusParams } from '../fusion-order/index.js';
 import { Fees } from '../fusion-order/fees/index.js';
@@ -211,7 +211,7 @@ import { Fees } from '../fusion-order/fees/index.js';
      * @param makingAmount making amount to be filled
      * @param orderMakingAmount full order making amount
      */ function _getSurplusFee(userTakingAmount, makingAmount, orderMakingAmount) {
-                var estimatedTakingAmount = mulDiv(this.surplus.estimatedTakerAmount, makingAmount, orderMakingAmount);
+                var estimatedTakingAmount = mulDiv(this.surplus.estimatedTakerAmount, makingAmount, orderMakingAmount, Rounding.Ceil);
                 if (userTakingAmount > estimatedTakingAmount) {
                     var surplusFee = (userTakingAmount - estimatedTakingAmount) * BigInt(this.surplus.protocolFee.toPercent()) / 100n;
                     return surplusFee;

package/dist/esm/amount-calculator/amount-calculator.spec.js

@@ -58,5 +58,47 @@ describe('AmountCalculator', function() {
         expect(userAmount).toBeGreaterThan(userAmountWithChargedSurplus);
         expect(userAmount - userAmountWithChargedSurplus).toEqual(surplus / 2n);
     });
-}) // fee is 50%
-;
+    // fee is 50%
+    it('should apply surplus with correct rounding', function() {
+        var startTime = 1764548287n;
+        var execTime = startTime;
+        var auction = new AuctionCalculator(startTime, 600n, 179149n, [
+            {
+                coefficient: 157277,
+                delay: 84
+            },
+            {
+                coefficient: 141862,
+                delay: 84
+            },
+            {
+                coefficient: 129415,
+                delay: 84
+            },
+            {
+                coefficient: 116876,
+                delay: 84
+            },
+            {
+                coefficient: 24,
+                delay: 264
+            }
+        ], {
+            gasBumpEstimate: 24n,
+            gasPriceEstimate: 221n
+        });
+        var taker = Address.fromBigInt(1n);
+        var feeCalculator = new FeeTakerExt.FeeCalculator(Fees.integratorFee(new IntegratorFee(new Address('0x0000000000000000000000000000000000000000'), new Address('0x0000000000000000000000000000000000000000'), new Bps(0n), new Bps(0n))), Whitelist.new(1764548263n, [
+            {
+                address: taker,
+                allowFrom: 0n
+            }
+        ]));
+        var makingAmountOrder = 1369521200000n;
+        var calculator = new AmountCalculator(auction, feeCalculator, new SurplusParams(107289453867377650931124n, Bps.fromPercent(90)));
+        var userAmount1 = calculator.getSurplusFee(taker, 982226837n, 76145644627284979970n, makingAmountOrder, execTime, 216836903n);
+        expect(userAmount1).toBe(505013885259508359n);
+        var userAmount2 = calculator.getSurplusFee(taker, 136853897316n, 10609390660421433527440n, makingAmountOrder, execTime + 4n, 242000680n);
+        expect(userAmount2).toBe(69365890784904718356n);
+    });
+});

package/dist/esm/package.json

@@ -1 +1 @@
-{"name":"@1inch/fusion-sdk","version":"2.4.3","type":"module"}
+{"name":"@1inch/fusion-sdk","version":"2.4.4","type":"module"}