@1inch/fusion-sdk 2.4.5-rc.0 → 2.4.6-rc.0

package/dist/cjs/api/quoter/quote/quote.js

@@ -138,7 +138,7 @@ var Quote = /*#__PURE__*/ function() {
                 var details = {
                     auction: auctionDetails,
                     whitelist: this.getWhitelist(auctionDetails.startTime, preset.exclusiveResolver),
-                    surplus: new _index.SurplusParams(this.marketReturn, _limitordersdk.Bps.fromPercent(this.surplusFee || 0))
+                    surplus: this.marketReturn > orderInfo.takingAmount ? new _index.SurplusParams(this.marketReturn, _limitordersdk.Bps.fromPercent(this.surplusFee || 0)) : _index.SurplusParams.NO_FEE
                 };
                 var extra = {
                     nonce: nonce,

package/dist/cjs/fusion-order/fusion-order.js

@@ -143,6 +143,9 @@ var FusionOrder = /*#__PURE__*/ function() {
         if (orderInfo.makerAsset.isNative()) {
             throw new Error('use FusionOrder.fromNative to create order from native asset');
         }
+        if (!surplusParams.isZero()) {
+            (0, _assert.default)(orderInfo.takingAmount <= surplusParams.estimatedTakerAmount, 'order.takingAmount must be less then surplusParams.estimatedTakerAmount');
+        }
         var optimizeReceiverAddress = extra.optimizeReceiverAddress !== undefined ? extra.optimizeReceiverAddress : FusionOrder.defaultExtra.optimizeReceiverAddress;
         this.inner = new _limitordersdk.LimitOrder(_object_spread_props(_object_spread({}, orderInfo), {
             receiver: receiver,

package/dist/cjs/fusion-order/fusion-order.spec.js

@@ -296,6 +296,38 @@ describe('Fusion Order', function() {
         expect(userAmount).toEqual(75000000n);
         expect(surplus).toEqual(25000000n);
     });
+    it('should fail to create fusion order with bad surplus params', function() {
+        var extensionContract = new _limitordersdk.Address('0x8273f37417da37c4a6c3995e82cf442f87a25d9c');
+        expect(function() {
+            return _fusionorder.FusionOrder.new(extensionContract, {
+                makerAsset: new _limitordersdk.Address('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                takerAsset: new _limitordersdk.Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'),
+                makingAmount: 1000000000000000000n,
+                takingAmount: 1420000000n,
+                maker: new _limitordersdk.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                salt: 10n
+            }, {
+                auction: new _index.AuctionDetails({
+                    duration: 180n,
+                    startTime: 1673548149n,
+                    initialRateBump: 50000,
+                    points: [
+                        {
+                            coefficient: 20000,
+                            delay: 12
+                        }
+                    ]
+                }),
+                whitelist: _index1.Whitelist.new(1673548139n, [
+                    {
+                        address: new _limitordersdk.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                        allowFrom: 0n
+                    }
+                ]),
+                surplus: new _surplusparams.SurplusParams(1420000000n - 1n, _limitordersdk.Bps.fromFraction(0.1))
+            });
+        }).toThrow('order.takingAmount must be less then surplusParams.estimatedTakerAmount');
+    });
 });
 describe('FusionOrder Native', function() {
     it('should correct detect that order is from native asset', function() {
@@ -429,7 +461,7 @@ describe('FusionOrder Native', function() {
                     allowFrom: 0n
                 }
             ]),
-            surplus: new _surplusparams.SurplusParams(10n, new _limitordersdk.Bps(10000n))
+            surplus: new _surplusparams.SurplusParams(1420000000n * 2n, new _limitordersdk.Bps(10000n))
         });
         expect(nativeOrder.build().receiver).toEqual(settlementExt.toString());
     });

package/dist/esm/api/quoter/quote/quote.js

@@ -123,7 +123,7 @@ export var Quote = /*#__PURE__*/ function() {
                 var details = {
                     auction: auctionDetails,
                     whitelist: this.getWhitelist(auctionDetails.startTime, preset.exclusiveResolver),
-                    surplus: new SurplusParams(this.marketReturn, Bps.fromPercent(this.surplusFee || 0))
+                    surplus: this.marketReturn > orderInfo.takingAmount ? new SurplusParams(this.marketReturn, Bps.fromPercent(this.surplusFee || 0)) : SurplusParams.NO_FEE
                 };
                 var extra = {
                     nonce: nonce,

package/dist/esm/fusion-order/fusion-order.js

@@ -128,6 +128,9 @@ export var FusionOrder = /*#__PURE__*/ function() {
         if (orderInfo.makerAsset.isNative()) {
             throw new Error('use FusionOrder.fromNative to create order from native asset');
         }
+        if (!surplusParams.isZero()) {
+            assert(orderInfo.takingAmount <= surplusParams.estimatedTakerAmount, 'order.takingAmount must be less then surplusParams.estimatedTakerAmount');
+        }
         var optimizeReceiverAddress = extra.optimizeReceiverAddress !== undefined ? extra.optimizeReceiverAddress : FusionOrder.defaultExtra.optimizeReceiverAddress;
         this.inner = new LimitOrder(_object_spread_props(_object_spread({}, orderInfo), {
             receiver: receiver,

package/dist/esm/fusion-order/fusion-order.spec.js

@@ -292,6 +292,38 @@ describe('Fusion Order', function() {
         expect(userAmount).toEqual(75000000n);
         expect(surplus).toEqual(25000000n);
     });
+    it('should fail to create fusion order with bad surplus params', function() {
+        var extensionContract = new Address('0x8273f37417da37c4a6c3995e82cf442f87a25d9c');
+        expect(function() {
+            return FusionOrder.new(extensionContract, {
+                makerAsset: new Address('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                takerAsset: new Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'),
+                makingAmount: 1000000000000000000n,
+                takingAmount: 1420000000n,
+                maker: new Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                salt: 10n
+            }, {
+                auction: new AuctionDetails({
+                    duration: 180n,
+                    startTime: 1673548149n,
+                    initialRateBump: 50000,
+                    points: [
+                        {
+                            coefficient: 20000,
+                            delay: 12
+                        }
+                    ]
+                }),
+                whitelist: Whitelist.new(1673548139n, [
+                    {
+                        address: new Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                        allowFrom: 0n
+                    }
+                ]),
+                surplus: new SurplusParams(1420000000n - 1n, Bps.fromFraction(0.1))
+            });
+        }).toThrow('order.takingAmount must be less then surplusParams.estimatedTakerAmount');
+    });
 });
 describe('FusionOrder Native', function() {
     it('should correct detect that order is from native asset', function() {
@@ -425,7 +457,7 @@ describe('FusionOrder Native', function() {
                     allowFrom: 0n
                 }
             ]),
-            surplus: new SurplusParams(10n, new Bps(10000n))
+            surplus: new SurplusParams(1420000000n * 2n, new Bps(10000n))
         });
         expect(nativeOrder.build().receiver).toEqual(settlementExt.toString());
     });

package/dist/esm/package.json

@@ -1 +1 @@
-{"name":"@1inch/fusion-sdk","version":"2.4.5-rc.0","type":"module"}
+{"name":"@1inch/fusion-sdk","version":"2.4.6-rc.0","type":"module"}

package/dist/types/src/index.d.ts

@@ -10,4 +10,4 @@ export * from './utils/time.js';
 export * from './validations.js';
 export * from './ws-api/index.js';
 export * from './errors.js';
-export { QuoterRequest, type QuoterResponse, RelayerRequest, QuoterCustomPresetRequest, PresetEnum, Preset, Quote, type OrderStatusResponse, OrderStatus } from './api/index.js';
+export { QuoterRequest, type QuoterResponse, RelayerRequest, QuoterCustomPresetRequest, PresetEnum, Preset, Quote, type OrderStatusResponse, OrderStatus, type IntegratorFeeRequest, type IntegratorFeeResponse } from './api/index.js';