@1inch/fusion-sdk 2.3.4 → 2.3.6-rc.0

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

@@ -1,83 +1,183 @@
+function _class_call_check(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
+}
+function _defineProperties(target, props) {
+    for(var i = 0; i < props.length; i++){
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+    }
+}
+function _create_class(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
+}
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
 import { mulDiv, Rounding } from '@1inch/limit-order-sdk';
-export class AuctionCalculator {
-    constructor(startTime, duration, initialRateBump, points, gasCost = {
-        gasBumpEstimate: 0n,
-        gasPriceEstimate: 0n
-    }) {
+export var AuctionCalculator = /*#__PURE__*/ function() {
+    "use strict";
+    function AuctionCalculator(// 1000 means 1 Gwei
+    startTime, duration, initialRateBump, points) {
+        var gasCost = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : {
+            gasBumpEstimate: 0n,
+            gasPriceEstimate: 0n
+        };
+        _class_call_check(this, AuctionCalculator);
+        _define_property(this, "startTime", void 0);
+        _define_property(this, "duration", void 0);
+        _define_property(this, "initialRateBump", void 0);
+        _define_property(this, "points", void 0);
+        _define_property(this, "gasCost", void 0);
         this.startTime = startTime;
         this.duration = duration;
         this.initialRateBump = initialRateBump;
         this.points = points;
         this.gasCost = gasCost;
     }
-    get finishTime() {
-        return this.startTime + this.duration;
-    }
-    static fromAuctionData(details) {
-        return new AuctionCalculator(details.startTime, details.duration, details.initialRateBump, details.points, details.gasCost);
-    }
-    static calcInitialRateBump(startAmount, endAmount) {
-        const bump = (AuctionCalculator.RATE_BUMP_DENOMINATOR * startAmount) /
-            endAmount -
-            AuctionCalculator.RATE_BUMP_DENOMINATOR;
-        return Number(bump);
-    }
-    static calcAuctionTakingAmount(takingAmount, rate) {
-        return mulDiv(takingAmount, BigInt(rate) + AuctionCalculator.RATE_BUMP_DENOMINATOR, AuctionCalculator.RATE_BUMP_DENOMINATOR, Rounding.Ceil);
-    }
-    static calcAuctionMakingAmount(makingAmount, rate) {
-        return mulDiv(makingAmount, AuctionCalculator.RATE_BUMP_DENOMINATOR, BigInt(rate) + AuctionCalculator.RATE_BUMP_DENOMINATOR);
-    }
-    static baseFeeToGasPriceEstimate(baseFee) {
-        return baseFee / AuctionCalculator.GAS_PRICE_BASE;
-    }
-    static calcGasBumpEstimate(endTakingAmount, gasCostInToToken) {
-        return ((gasCostInToToken * AuctionCalculator.RATE_BUMP_DENOMINATOR) /
-            endTakingAmount);
-    }
-    calcAuctionTakingAmount(takingAmount, rate) {
-        return AuctionCalculator.calcAuctionTakingAmount(takingAmount, rate);
-    }
-    calcRateBump(time, blockBaseFee = 0n) {
-        const gasBump = this.getGasPriceBump(blockBaseFee);
-        const auctionBump = this.getAuctionBump(time);
-        const final = auctionBump > gasBump ? auctionBump - gasBump : 0n;
-        return Number(final);
-    }
-    getGasPriceBump(blockBaseFee) {
-        if (this.gasCost.gasBumpEstimate === 0n ||
-            this.gasCost.gasPriceEstimate === 0n ||
-            blockBaseFee === 0n) {
-            return 0n;
-        }
-        return ((this.gasCost.gasBumpEstimate * blockBaseFee) /
-            this.gasCost.gasPriceEstimate /
-            AuctionCalculator.GAS_PRICE_BASE);
-    }
-    getAuctionBump(blockTime) {
-        const auctionFinishTime = this.finishTime;
-        if (blockTime <= this.startTime) {
-            return this.initialRateBump;
-        }
-        else if (blockTime >= auctionFinishTime) {
-            return 0n;
+    _create_class(AuctionCalculator, [
+        {
+            key: "finishTime",
+            get: function get() {
+                return this.startTime + this.duration;
+            }
+        },
+        {
+            key: "calcAuctionTakingAmount",
+            value: function calcAuctionTakingAmount(takingAmount, rate) {
+                return AuctionCalculator.calcAuctionTakingAmount(takingAmount, rate);
+            }
+        },
+        {
+            key: "calcRateBump",
+            value: /**
+     * @see https://github.com/1inch/limit-order-settlement/blob/273defdf7b0f1867299dcbc306f32f035579310f/contracts/extensions/BaseExtension.sol#L121
+     * @param time auction timestamp in seconds
+     * @param blockBaseFee blockBaseFee in Wei, if passed, then rate will be calculated as if order executed in block with `blockBaseFee`
+     */ function calcRateBump(time) {
+                var blockBaseFee = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0n;
+                var gasBump = this.getGasPriceBump(blockBaseFee);
+                var auctionBump = this.getAuctionBump(time);
+                var final = auctionBump > gasBump ? auctionBump - gasBump : 0n;
+                return Number(final);
+            }
+        },
+        {
+            key: "getGasPriceBump",
+            value: function getGasPriceBump(blockBaseFee) {
+                if (this.gasCost.gasBumpEstimate === 0n || this.gasCost.gasPriceEstimate === 0n || blockBaseFee === 0n) {
+                    return 0n;
+                }
+                return this.gasCost.gasBumpEstimate * blockBaseFee / this.gasCost.gasPriceEstimate / AuctionCalculator.GAS_PRICE_BASE;
+            }
+        },
+        {
+            key: "getAuctionBump",
+            value: function getAuctionBump(blockTime) {
+                var auctionFinishTime = this.finishTime;
+                if (blockTime <= this.startTime) {
+                    return this.initialRateBump;
+                } else if (blockTime >= auctionFinishTime) {
+                    return 0n;
+                }
+                var currentPointTime = this.startTime;
+                var currentRateBump = this.initialRateBump;
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                try {
+                    for(var _iterator = this.points[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var _step_value = _step.value, nextRateBump = _step_value.coefficient, delay = _step_value.delay;
+                        var nextPointTime = BigInt(delay) + currentPointTime;
+                        if (blockTime <= nextPointTime) {
+                            return ((blockTime - currentPointTime) * BigInt(nextRateBump) + (nextPointTime - blockTime) * currentRateBump) / (nextPointTime - currentPointTime);
+                        }
+                        currentPointTime = nextPointTime;
+                        currentRateBump = BigInt(nextRateBump);
+                    }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
+                    }
+                }
+                return (auctionFinishTime - blockTime) * currentRateBump / (auctionFinishTime - currentPointTime);
+            }
         }
-        let currentPointTime = this.startTime;
-        let currentRateBump = this.initialRateBump;
-        for (const { coefficient: nextRateBump, delay } of this.points) {
-            const nextPointTime = BigInt(delay) + currentPointTime;
-            if (blockTime <= nextPointTime) {
-                return (((blockTime - currentPointTime) * BigInt(nextRateBump) +
-                    (nextPointTime - blockTime) * currentRateBump) /
-                    (nextPointTime - currentPointTime));
+    ], [
+        {
+            key: "fromAuctionData",
+            value: function fromAuctionData(details) {
+                return new AuctionCalculator(details.startTime, details.duration, details.initialRateBump, details.points, details.gasCost);
+            }
+        },
+        {
+            key: "calcInitialRateBump",
+            value: function calcInitialRateBump(startAmount, endAmount) {
+                var bump = AuctionCalculator.RATE_BUMP_DENOMINATOR * startAmount / endAmount - AuctionCalculator.RATE_BUMP_DENOMINATOR;
+                return Number(bump);
+            }
+        },
+        {
+            key: "calcAuctionTakingAmount",
+            value: /**
+     * @see https://github.com/1inch/limit-order-settlement/blob/82f0a25c969170f710825ce6aa6920062adbde88/contracts/SimpleSettlement.sol#L54
+     */ function calcAuctionTakingAmount(takingAmount, rate) {
+                return mulDiv(takingAmount, BigInt(rate) + AuctionCalculator.RATE_BUMP_DENOMINATOR, AuctionCalculator.RATE_BUMP_DENOMINATOR, Rounding.Ceil);
+            }
+        },
+        {
+            key: "calcAuctionMakingAmount",
+            value: /**
+     * @see https://github.com/1inch/limit-order-settlement/blob/82f0a25c969170f710825ce6aa6920062adbde88/contracts/SimpleSettlement.sol#L34
+     */ function calcAuctionMakingAmount(makingAmount, rate) {
+                return mulDiv(makingAmount, AuctionCalculator.RATE_BUMP_DENOMINATOR, BigInt(rate) + AuctionCalculator.RATE_BUMP_DENOMINATOR);
+            }
+        },
+        {
+            key: "baseFeeToGasPriceEstimate",
+            value: /**
+     * Encode estimation `baseFee` as `gasPriceEstimate` for `AuctionGasCostInfo`
+     */ function baseFeeToGasPriceEstimate(baseFee) {
+                return baseFee / AuctionCalculator.GAS_PRICE_BASE;
+            }
+        },
+        {
+            key: "calcGasBumpEstimate",
+            value: /**
+     * Calculates `gasBumpEstimate` for `AuctionGasCostInfo`
+     *
+     * @param endTakingAmount min return in destToken
+     * @param gasCostInToToken gas cost in destToken
+     */ function calcGasBumpEstimate(endTakingAmount, gasCostInToToken) {
+                return gasCostInToToken * AuctionCalculator.RATE_BUMP_DENOMINATOR / endTakingAmount;
             }
-            currentPointTime = nextPointTime;
-            currentRateBump = BigInt(nextRateBump);
         }
-        return (((auctionFinishTime - blockTime) * currentRateBump) /
-            (auctionFinishTime - currentPointTime));
-    }
-}
-AuctionCalculator.RATE_BUMP_DENOMINATOR = 10000000n;
-AuctionCalculator.GAS_PRICE_BASE = 1000000n;
-//# sourceMappingURL=auction-calculator.js.map
+    ]);
+    return AuctionCalculator;
+}();
+_define_property(AuctionCalculator, "RATE_BUMP_DENOMINATOR", 10000000n);
+// 100%
+_define_property(AuctionCalculator, "GAS_PRICE_BASE", 1000000n);

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

@@ -0,0 +1,53 @@
+import { parseEther, parseUnits } from 'ethers';
+import { AuctionCalculator } from './auction-calculator.js';
+import { AuctionDetails } from '../../fusion-order/index.js';
+describe('Auction Calculator', function() {
+    it('should be created successfully from suffix and salt', function() {
+        var auctionStartTime = 1708448252n;
+        var auctionDetails = new AuctionDetails({
+            startTime: auctionStartTime,
+            initialRateBump: 50000,
+            duration: 120n,
+            points: []
+        });
+        var calculator = AuctionCalculator.fromAuctionData(auctionDetails);
+        var rate = calculator.calcRateBump(auctionStartTime + 60n);
+        var auctionTakingAmount = calculator.calcAuctionTakingAmount(1420000000n, rate);
+        expect(rate).toBe(25000);
+        expect(auctionTakingAmount).toBe(1423550000n);
+    });
+    // 1423550000 from rate
+    describe('Gas bump', function() {
+        var now = BigInt(Math.floor(Date.now() / 1000));
+        var duration = 1800n;
+        // 30m
+        var takingAmount = parseEther('1');
+        var calculator = new AuctionCalculator(now - 60n, duration, 1000000n, [
+            {
+                delay: 60,
+                coefficient: 500000
+            }
+        ], {
+            gasBumpEstimate: 10000n,
+            // 0.1% of taking amount
+            gasPriceEstimate: 1000n
+        });
+        // 1gwei
+        it('0 gwei = no gas fee', function() {
+            var bump = calculator.calcRateBump(now);
+            expect(calculator.calcAuctionTakingAmount(takingAmount, bump)).toBe(parseEther('1.05'));
+        });
+        it('0.1 gwei = 0.01% gas fee', function() {
+            var bump = calculator.calcRateBump(now, parseUnits('1', 8));
+            expect(calculator.calcAuctionTakingAmount(takingAmount, bump)).toBe(parseEther('1.0499'));
+        });
+        it('15 gwei = 1.5% gas fee', function() {
+            var bump = calculator.calcRateBump(now, parseUnits('15', 9));
+            expect(calculator.calcAuctionTakingAmount(takingAmount, bump)).toBe(parseEther('1.035'));
+        });
+        it('100 gwei = 10% gas fee, should be capped with takingAmount', function() {
+            var bump = calculator.calcRateBump(now, parseUnits('100', 9));
+            expect(calculator.calcAuctionTakingAmount(takingAmount, bump)).toBe(parseEther('1'));
+        });
+    });
+});

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

@@ -1,2 +1 @@
-export * from './auction-calculator';
-//# sourceMappingURL=index.js.map
+export * from './auction-calculator.js';

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

@@ -1,4 +1,4 @@
-export * from './auction-calculator';
-export { AmountCalculator } from './amount-calculator';
-export { FeeCalculator } from '@1inch/limit-order-sdk/extensions/fee-taker';
-//# sourceMappingURL=index.js.map
+import { FeeTakerExt } from '@1inch/limit-order-sdk';
+export * from './auction-calculator/index.js';
+export { AmountCalculator } from './amount-calculator.js';
+export var FeeCalculator = FeeTakerExt.FeeCalculator;

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

@@ -1,55 +1,120 @@
-import { QuoterApi } from './quoter';
-import { RelayerApi } from './relayer';
-import { ActiveOrdersRequest, OrdersApi } from './orders';
-import { OrdersVersion } from './ordersVersion';
-import { AxiosProviderConnector } from '../connector';
-export class FusionApi {
-    constructor(config) {
+function _class_call_check(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
+}
+function _defineProperties(target, props) {
+    for(var i = 0; i < props.length; i++){
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+    }
+}
+function _create_class(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
+}
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+import { QuoterApi } from './quoter/index.js';
+import { RelayerApi } from './relayer/index.js';
+import { ActiveOrdersRequest, OrdersApi } from './orders/index.js';
+import { OrdersVersion } from './ordersVersion.js';
+import { AxiosProviderConnector } from '../connector/index.js';
+export var FusionApi = /*#__PURE__*/ function() {
+    "use strict";
+    function FusionApi(config) {
+        _class_call_check(this, FusionApi);
+        _define_property(this, "quoterApi", void 0);
+        _define_property(this, "relayerApi", void 0);
+        _define_property(this, "ordersApi", void 0);
         this.quoterApi = QuoterApi.new({
-            url: `${config.url}/quoter`,
+            url: "".concat(config.url, "/quoter"),
             network: config.network,
             authKey: config.authKey
         }, config.httpProvider);
         this.relayerApi = RelayerApi.new({
-            url: `${config.url}/relayer`,
+            url: "".concat(config.url, "/relayer"),
             network: config.network,
             authKey: config.authKey
         }, config.httpProvider);
         this.ordersApi = OrdersApi.new({
-            url: `${config.url}/orders`,
+            url: "".concat(config.url, "/orders"),
             network: config.network,
             authKey: config.authKey
         }, config.httpProvider);
     }
-    static new(config) {
-        return new FusionApi({
-            network: config.network,
-            url: config.url,
-            authKey: config.authKey,
-            httpProvider: config.httpProvider ||
-                new AxiosProviderConnector(config.authKey)
-        });
-    }
-    getQuote(params) {
-        return this.quoterApi.getQuote(params);
-    }
-    getQuoteWithCustomPreset(params, body) {
-        return this.quoterApi.getQuoteWithCustomPreset(params, body);
-    }
-    getActiveOrders(params = ActiveOrdersRequest.new(), ordersVersion = OrdersVersion._2_1) {
-        return this.ordersApi.getActiveOrders(params, ordersVersion);
-    }
-    getOrderStatus(params) {
-        return this.ordersApi.getOrderStatus(params);
-    }
-    getOrdersByMaker(params, ordersVersion = OrdersVersion._2_1) {
-        return this.ordersApi.getOrdersByMaker(params, ordersVersion);
-    }
-    submitOrder(params) {
-        return this.relayerApi.submit(params);
-    }
-    submitOrderBatch(params) {
-        return this.relayerApi.submitBatch(params);
-    }
-}
-//# sourceMappingURL=fusion-api.js.map
+    _create_class(FusionApi, [
+        {
+            key: "getQuote",
+            value: function getQuote(params) {
+                return this.quoterApi.getQuote(params);
+            }
+        },
+        {
+            key: "getQuoteWithCustomPreset",
+            value: function getQuoteWithCustomPreset(params, body) {
+                return this.quoterApi.getQuoteWithCustomPreset(params, body);
+            }
+        },
+        {
+            key: "getActiveOrders",
+            value: function getActiveOrders() {
+                var params = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : ActiveOrdersRequest.new(), ordersVersion = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : OrdersVersion._2_1;
+                return this.ordersApi.getActiveOrders(params, ordersVersion);
+            }
+        },
+        {
+            key: "getOrderStatus",
+            value: function getOrderStatus(params) {
+                return this.ordersApi.getOrderStatus(params);
+            }
+        },
+        {
+            key: "getOrdersByMaker",
+            value: function getOrdersByMaker(params) {
+                var ordersVersion = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : OrdersVersion._2_1;
+                return this.ordersApi.getOrdersByMaker(params, ordersVersion);
+            }
+        },
+        {
+            key: "submitOrder",
+            value: function submitOrder(params) {
+                return this.relayerApi.submit(params);
+            }
+        },
+        {
+            key: "submitOrderBatch",
+            value: function submitOrderBatch(params) {
+                return this.relayerApi.submitBatch(params);
+            }
+        }
+    ], [
+        {
+            key: "new",
+            value: function _new(config) {
+                return new FusionApi({
+                    network: config.network,
+                    url: config.url,
+                    authKey: config.authKey,
+                    httpProvider: config.httpProvider || new AxiosProviderConnector(config.authKey)
+                });
+            }
+        }
+    ]);
+    return FusionApi;
+}();

package/dist/esm/api/index.js

@@ -1,9 +1,8 @@
-export * from './params';
-export * from './quoter/index';
-export * from './relayer/index';
-export * from './orders/index';
-export * from './fusion-api';
-export * from './pagination';
-export * from './types';
-export * from './ordersVersion';
-//# sourceMappingURL=index.js.map
+export * from './params.js';
+export * from './quoter/index.js';
+export * from './relayer/index.js';
+export * from './orders/index.js';
+export * from './fusion-api.js';
+export * from './pagination.js';
+export * from './types.js';
+export * from './ordersVersion.js';

package/dist/esm/api/orders/index.js

@@ -1,4 +1,3 @@
-export * from './orders.api';
-export * from './orders.request';
-export * from './types';
-//# sourceMappingURL=index.js.map
+export * from './orders.api.js';
+export * from './orders.request.js';
+export * from './types.js';