@1inch/fusion-sdk 2.4.8-rc.0 → 2.4.8

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

@@ -80,6 +80,7 @@ var Quote = /*#__PURE__*/ function() {
         _define_property(this, "resolverFeePreset", void 0);
         _define_property(this, "surplusFee", void 0);
         _define_property(this, "integratorFeeParams", void 0);
+        _define_property(this, "source", void 0);
         this.params = params;
         this.fromTokenAmount = BigInt(response.fromTokenAmount);
         var _obj;
@@ -102,6 +103,7 @@ var Quote = /*#__PURE__*/ function() {
             bps: new _limitordersdk.Bps(BigInt(response.fee.bps))
         };
         this.surplusFee = response.surplusFee;
+        this.source = response.source;
         this.integratorFeeParams = this.parseIntegratorFee(response);
     }
     _create_class(Quote, [
@@ -147,7 +149,7 @@ var Quote = /*#__PURE__*/ function() {
                     allowPartialFills: allowPartialFills,
                     allowMultipleFills: allowMultipleFills,
                     orderExpirationDelay: paramsData === null || paramsData === void 0 ? void 0 : paramsData.orderExpirationDelay,
-                    source: this.params.source,
+                    source: this.source || this.params.source,
                     enablePermit2: params.isPermit2,
                     fees: buildFees(this.resolverFeePreset, this.integratorFeeParams, this.surplusFee)
                 };

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

@@ -501,6 +501,44 @@ describe('Quoter API', function() {
             }
         });
     }));
+    describe('source from response', function() {
+        it('should store source from response', function() {
+            var responseWithSource = _object_spread_props(_object_spread({}, ResponseMock), {
+                source: '0xabcdef01'
+            });
+            var quote = new _index.Quote(params, responseWithSource);
+            expect(quote.source).toBe('0xabcdef01');
+        });
+        it('should be undefined when response has no source', function() {
+            var quote = new _index.Quote(params, ResponseMock);
+            expect(quote.source).toBeUndefined();
+        });
+        it('should prefer response source over request source', function() {
+            var paramsWithSource = _quoterrequest.QuoterRequest.new({
+                fromTokenAddress: '0x6b175474e89094c44da98b954eedeac495271d0f',
+                toTokenAddress: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                amount: '1000000000000000000000',
+                walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
+                source: 'user-provided-source'
+            });
+            var responseWithSource = _object_spread_props(_object_spread({}, ResponseMock), {
+                source: '0xabcdef01'
+            });
+            var quote = new _index.Quote(paramsWithSource, responseWithSource);
+            expect(quote.source).toBe('0xabcdef01');
+        });
+        it('should fall back to request source when response source is absent', function() {
+            var paramsWithSource = _quoterrequest.QuoterRequest.new({
+                fromTokenAddress: '0x6b175474e89094c44da98b954eedeac495271d0f',
+                toTokenAddress: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                amount: '1000000000000000000000',
+                walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
+                source: 'user-provided-source'
+            });
+            var quote = new _index.Quote(paramsWithSource, ResponseMock);
+            expect(quote.source).toBeUndefined();
+        });
+    });
     describe('parseIntegratorFee', function() {
         it('should use response receiver when provided', function() {
             var _quote_integratorFeeParams, _quote_integratorFeeParams1, _quote_integratorFeeParams2;

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

@@ -17,6 +17,8 @@ Object.defineProperty(exports, "PresetEnum", {
      * In bps
      */ /**
      * Percentage of the integrator fee that will be shared with the integrator.
+     */ /**
+     * Resolved source tracking code
      */ var PresetEnum = /*#__PURE__*/ function(PresetEnum) {
     PresetEnum["fast"] = "fast";
     PresetEnum["medium"] = "medium";

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

@@ -16,7 +16,6 @@ var _whitelist = require("./whitelist/whitelist.js");
 var _surplusparams = require("./surplus-params.js");
 var _index1 = require("./fees/index.js");
 var _utils = require("../utils.js");
-var _constants = require("../constants.js");
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -232,7 +231,7 @@ var FusionExtension = /*#__PURE__*/ function() {
                 }
                 //endregion Parse amount data
                 var makerPermit = extension.hasMakerPermit ? _limitordersdk.Interaction.decode(extension.makerPermit) : undefined;
-                var preInteraction = extension.preInteraction !== _constants.ZX ? _limitordersdk.Interaction.decode(extension.preInteraction) : undefined;
+                var preInteraction = extension.hasPreInteraction ? _limitordersdk.Interaction.decode(extension.preInteraction) : undefined;
                 (0, _assert.default)(amountData.fees.integratorFee.value === interactionData.fees.integratorFee.value, "invalid extension: integrator fee must be same in interaction data and in amount data");
                 (0, _assert.default)(amountData.fees.resolverFee.value === interactionData.fees.resolverFee.value, "invalid extension: resolver fee must be same in interaction data and in amount data");
                 (0, _assert.default)(amountData.fees.whitelistDiscount.equal(interactionData.fees.whitelistDiscount), "invalid extension: whitelistDiscount must be same in interaction data and in amount data");

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

@@ -65,6 +65,7 @@ export var Quote = /*#__PURE__*/ function() {
         _define_property(this, "resolverFeePreset", void 0);
         _define_property(this, "surplusFee", void 0);
         _define_property(this, "integratorFeeParams", void 0);
+        _define_property(this, "source", void 0);
         this.params = params;
         this.fromTokenAmount = BigInt(response.fromTokenAmount);
         var _obj;
@@ -87,6 +88,7 @@ export var Quote = /*#__PURE__*/ function() {
             bps: new Bps(BigInt(response.fee.bps))
         };
         this.surplusFee = response.surplusFee;
+        this.source = response.source;
         this.integratorFeeParams = this.parseIntegratorFee(response);
     }
     _create_class(Quote, [
@@ -132,7 +134,7 @@ export var Quote = /*#__PURE__*/ function() {
                     allowPartialFills: allowPartialFills,
                     allowMultipleFills: allowMultipleFills,
                     orderExpirationDelay: paramsData === null || paramsData === void 0 ? void 0 : paramsData.orderExpirationDelay,
-                    source: this.params.source,
+                    source: this.source || this.params.source,
                     enablePermit2: params.isPermit2,
                     fees: buildFees(this.resolverFeePreset, this.integratorFeeParams, this.surplusFee)
                 };

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

@@ -497,6 +497,44 @@ describe('Quoter API', function() {
             }
         });
     }));
+    describe('source from response', function() {
+        it('should store source from response', function() {
+            var responseWithSource = _object_spread_props(_object_spread({}, ResponseMock), {
+                source: '0xabcdef01'
+            });
+            var quote = new Quote(params, responseWithSource);
+            expect(quote.source).toBe('0xabcdef01');
+        });
+        it('should be undefined when response has no source', function() {
+            var quote = new Quote(params, ResponseMock);
+            expect(quote.source).toBeUndefined();
+        });
+        it('should prefer response source over request source', function() {
+            var paramsWithSource = QuoterRequest.new({
+                fromTokenAddress: '0x6b175474e89094c44da98b954eedeac495271d0f',
+                toTokenAddress: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                amount: '1000000000000000000000',
+                walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
+                source: 'user-provided-source'
+            });
+            var responseWithSource = _object_spread_props(_object_spread({}, ResponseMock), {
+                source: '0xabcdef01'
+            });
+            var quote = new Quote(paramsWithSource, responseWithSource);
+            expect(quote.source).toBe('0xabcdef01');
+        });
+        it('should fall back to request source when response source is absent', function() {
+            var paramsWithSource = QuoterRequest.new({
+                fromTokenAddress: '0x6b175474e89094c44da98b954eedeac495271d0f',
+                toTokenAddress: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                amount: '1000000000000000000000',
+                walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
+                source: 'user-provided-source'
+            });
+            var quote = new Quote(paramsWithSource, ResponseMock);
+            expect(quote.source).toBeUndefined();
+        });
+    });
     describe('parseIntegratorFee', function() {
         it('should use response receiver when provided', function() {
             var _quote_integratorFeeParams, _quote_integratorFeeParams1, _quote_integratorFeeParams2;

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

@@ -7,6 +7,8 @@
      * In bps
      */ /**
      * Percentage of the integrator fee that will be shared with the integrator.
+     */ /**
+     * Resolved source tracking code
      */ export var PresetEnum = /*#__PURE__*/ function(PresetEnum) {
     PresetEnum["fast"] = "fast";
     PresetEnum["medium"] = "medium";

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

@@ -38,7 +38,6 @@ import { Whitelist } from './whitelist/whitelist.js';
 import { SurplusParams } from './surplus-params.js';
 import { Fees, IntegratorFee, ResolverFee } from './fees/index.js';
 import { add0x } from '../utils.js';
-import { ZX } from '../constants.js';
 export var FusionExtension = /*#__PURE__*/ function() {
     "use strict";
     function FusionExtension(address, auctionDetails, whitelist, surplus, extra) {
@@ -217,7 +216,7 @@ export var FusionExtension = /*#__PURE__*/ function() {
                 }
                 //endregion Parse amount data
                 var makerPermit = extension.hasMakerPermit ? Interaction.decode(extension.makerPermit) : undefined;
-                var preInteraction = extension.preInteraction !== ZX ? Interaction.decode(extension.preInteraction) : undefined;
+                var preInteraction = extension.hasPreInteraction ? Interaction.decode(extension.preInteraction) : undefined;
                 assert(amountData.fees.integratorFee.value === interactionData.fees.integratorFee.value, "invalid extension: integrator fee must be same in interaction data and in amount data");
                 assert(amountData.fees.resolverFee.value === interactionData.fees.resolverFee.value, "invalid extension: resolver fee must be same in interaction data and in amount data");
                 assert(amountData.fees.whitelistDiscount.equal(interactionData.fees.whitelistDiscount), "invalid extension: whitelistDiscount must be same in interaction data and in amount data");

package/dist/esm/package.json

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

package/dist/types/src/api/quoter/quote/quote.d.ts

@@ -26,6 +26,7 @@ export declare class Quote {
     readonly resolverFeePreset: ResolverFeePreset;
     readonly surplusFee?: number;
     readonly integratorFeeParams?: IntegratorFeeResponse;
+    readonly source?: string;
     constructor(params: QuoterRequest, response: QuoterResponse);
     createFusionOrder(paramsData: Omit<FusionOrderParamsData, 'permit' | 'isPermit2'>): FusionOrder;
     getPreset(type?: PresetEnum): Preset;

package/dist/types/src/api/quoter/types.d.ts

@@ -44,6 +44,7 @@ export type QuoterResponse = {
     integratorFee: number;
     integratorFeeReceiver?: string;
     integratorFeeShare: number;
+    source?: string;
 };
 export type QuoterPresets = {
     fast: PresetData;