@1inch/fusion-sdk 0.1.6 → 0.1.8
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/api/quoter/quote/quote.js +1 -1
- package/api/quoter/quote/quote.js.map +1 -1
- package/constants.d.ts +2 -1
- package/constants.js +7 -3
- package/constants.js.map +1 -1
- package/fusion-order/fusion-order.d.ts +2 -2
- package/fusion-order/fusion-order.js +2 -1
- package/fusion-order/fusion-order.js.map +1 -1
- package/fusion-order/fusion-order.spec.js +4 -2
- package/fusion-order/fusion-order.spec.js.map +1 -1
- package/limit-order/types.d.ts +4 -0
- package/package.json +1 -1
|
@@ -63,7 +63,7 @@ class Quote {
|
|
|
63
63
|
takingAmount: preset.auctionEndAmount,
|
|
64
64
|
maker: this.params.walletAddress,
|
|
65
65
|
receiver: takerAssetReceiver,
|
|
66
|
-
|
|
66
|
+
network: this.network
|
|
67
67
|
}, salt, suffix, {
|
|
68
68
|
postInteraction: this.buildUnwrapPostInteractionIfNeeded(params.receiver),
|
|
69
69
|
// todo: change hardcoded extended deadline
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":"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"}
|
package/constants.d.ts
CHANGED
|
@@ -9,7 +9,8 @@ export declare enum NetworkEnum {
|
|
|
9
9
|
ARBITRUM = 42161,
|
|
10
10
|
AVALANCHE = 43114,
|
|
11
11
|
OPTIMISM = 10,
|
|
12
|
-
FANTOM = 250
|
|
12
|
+
FANTOM = 250,
|
|
13
|
+
GNOSIS = 100
|
|
13
14
|
}
|
|
14
15
|
export declare const WRAPPER_ADDRESS_MAP: Record<NetworkEnum, string>;
|
|
15
16
|
export declare const UNWRAPPER_CONTRACT_ADDRESS_MAP: Record<NetworkEnum, string>;
|
package/constants.js
CHANGED
|
@@ -14,6 +14,7 @@ var NetworkEnum;
|
|
|
14
14
|
NetworkEnum[NetworkEnum["AVALANCHE"] = 43114] = "AVALANCHE";
|
|
15
15
|
NetworkEnum[NetworkEnum["OPTIMISM"] = 10] = "OPTIMISM";
|
|
16
16
|
NetworkEnum[NetworkEnum["FANTOM"] = 250] = "FANTOM";
|
|
17
|
+
NetworkEnum[NetworkEnum["GNOSIS"] = 100] = "GNOSIS";
|
|
17
18
|
})(NetworkEnum = exports.NetworkEnum || (exports.NetworkEnum = {}));
|
|
18
19
|
exports.WRAPPER_ADDRESS_MAP = {
|
|
19
20
|
[NetworkEnum.ETHEREUM]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
|
|
@@ -22,7 +23,8 @@ exports.WRAPPER_ADDRESS_MAP = {
|
|
|
22
23
|
[NetworkEnum.ARBITRUM]: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
|
|
23
24
|
[NetworkEnum.AVALANCHE]: '0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7',
|
|
24
25
|
[NetworkEnum.OPTIMISM]: '0x4200000000000000000000000000000000000006',
|
|
25
|
-
[NetworkEnum.FANTOM]: '0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83'
|
|
26
|
+
[NetworkEnum.FANTOM]: '0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83',
|
|
27
|
+
[NetworkEnum.GNOSIS]: '0xe91d153e0b41518a2ce8dd3d7944fa863463a97d'
|
|
26
28
|
};
|
|
27
29
|
exports.UNWRAPPER_CONTRACT_ADDRESS_MAP = {
|
|
28
30
|
[NetworkEnum.ETHEREUM]: '0x08b067ad41e45babe5bbb52fc2fe7f692f628b06',
|
|
@@ -31,7 +33,8 @@ exports.UNWRAPPER_CONTRACT_ADDRESS_MAP = {
|
|
|
31
33
|
[NetworkEnum.ARBITRUM]: '0x3e57c682c72f3bd255ebf439b74c784bc82029ee',
|
|
32
34
|
[NetworkEnum.AVALANCHE]: '0x5d0ec1f843c1233d304b96dbde0cab9ec04d71ef',
|
|
33
35
|
[NetworkEnum.OPTIMISM]: '0xb33839e05ce9fc53236ae325324a27612f4d110d',
|
|
34
|
-
[NetworkEnum.FANTOM]: '0x94bc2a1c732bcad7343b25af48385fe76e08734f'
|
|
36
|
+
[NetworkEnum.FANTOM]: '0x94bc2a1c732bcad7343b25af48385fe76e08734f',
|
|
37
|
+
[NetworkEnum.GNOSIS]: '0xd41b24bba51fac0e4827b6f94c0d6ddeb183cd64'
|
|
35
38
|
};
|
|
36
39
|
exports.SETTLEMENT_CONTRACT_ADDRESS_MAP = {
|
|
37
40
|
[NetworkEnum.ETHEREUM]: '0xa88800cd213da5ae406ce248380802bd53b47647',
|
|
@@ -40,7 +43,8 @@ exports.SETTLEMENT_CONTRACT_ADDRESS_MAP = {
|
|
|
40
43
|
[NetworkEnum.ARBITRUM]: '0x4bc3e539aaa5b18a82f6cd88dc9ab0e113c63377',
|
|
41
44
|
[NetworkEnum.AVALANCHE]: '0x7731f8df999a9441ae10519617c24568dc82f697',
|
|
42
45
|
[NetworkEnum.OPTIMISM]: '0xd89adc20c400b6c45086a7f6ab2dca19745b89c2',
|
|
43
|
-
[NetworkEnum.FANTOM]: '0xa218543cc21ee9388fa1e509f950fd127ca82155'
|
|
46
|
+
[NetworkEnum.FANTOM]: '0xa218543cc21ee9388fa1e509f950fd127ca82155',
|
|
47
|
+
[NetworkEnum.GNOSIS]: '0xcbdb7490968d4dbf183c60fc899c2e9fbd445308'
|
|
44
48
|
};
|
|
45
49
|
exports.ONE_INCH_ROUTER_V5 = '0x1111111254eeb25477b68fb85ed929f73a960582';
|
|
46
50
|
//# sourceMappingURL=constants.js.map
|
package/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,4CAA4C,CAAA;AAC9D,QAAA,YAAY,GAAG,4CAA4C,CAAA;AAC3D,QAAA,WAAW,GAAG,GAAG,CAAA;AACjB,QAAA,EAAE,GAAG,IAAI,CAAA;AAEtB,IAAY,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,4CAA4C,CAAA;AAC9D,QAAA,YAAY,GAAG,4CAA4C,CAAA;AAC3D,QAAA,WAAW,GAAG,GAAG,CAAA;AACjB,QAAA,EAAE,GAAG,IAAI,CAAA;AAEtB,IAAY,WASX;AATD,WAAY,WAAW;IACnB,qDAAY,CAAA;IACZ,qDAAa,CAAA;IACb,oDAAY,CAAA;IACZ,yDAAgB,CAAA;IAChB,2DAAiB,CAAA;IACjB,sDAAa,CAAA;IACb,mDAAY,CAAA;IACZ,mDAAY,CAAA;AAChB,CAAC,EATW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAStB;AAEY,QAAA,mBAAmB,GAAgC;IAC5D,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,4CAA4C;IACnE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,4CAA4C;IACnE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,4CAA4C;IACrE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,4CAA4C;IAClE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,4CAA4C;CACrE,CAAA;AAEY,QAAA,8BAA8B,GAAgC;IACvE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,4CAA4C;IACnE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,4CAA4C;IACnE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,4CAA4C;IACrE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,4CAA4C;IAClE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,4CAA4C;CACrE,CAAA;AAEY,QAAA,+BAA+B,GAAgC;IACxE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,4CAA4C;IACnE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,4CAA4C;IACnE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,4CAA4C;IACrE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,4CAA4C;IAClE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,4CAA4C;CACrE,CAAA;AAEY,QAAA,kBAAkB,GAAG,4CAA4C,CAAA"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { AuctionSalt } from '../auction-salt';
|
|
2
2
|
import { AuctionSuffix } from '../auction-suffix';
|
|
3
|
-
import { LimitOrder, InteractionsData, LimitOrderV3Struct,
|
|
3
|
+
import { LimitOrder, InteractionsData, LimitOrderV3Struct, OrderInfoDataFusion } from '../limit-order';
|
|
4
4
|
export declare class FusionOrder extends LimitOrder {
|
|
5
5
|
private readonly auction;
|
|
6
6
|
private readonly auctionSuffix;
|
|
7
|
-
constructor(orderInfo:
|
|
7
|
+
constructor(orderInfo: OrderInfoDataFusion, auction: AuctionSalt, auctionSuffix: AuctionSuffix, interactions?: InteractionsData);
|
|
8
8
|
build(): LimitOrderV3Struct;
|
|
9
9
|
}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FusionOrder = void 0;
|
|
4
|
+
const constants_1 = require("../constants");
|
|
4
5
|
const limit_order_1 = require("../limit-order");
|
|
5
6
|
class FusionOrder extends limit_order_1.LimitOrder {
|
|
6
7
|
constructor(orderInfo, auction, auctionSuffix, interactions) {
|
|
7
|
-
super(orderInfo, interactions);
|
|
8
|
+
super(Object.assign(Object.assign({}, orderInfo), { allowedSender: constants_1.SETTLEMENT_CONTRACT_ADDRESS_MAP[orderInfo.network] }), interactions);
|
|
8
9
|
this.auction = auction;
|
|
9
10
|
this.auctionSuffix = auctionSuffix;
|
|
10
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fusion-order.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"fusion-order.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.ts"],"names":[],"mappings":";;;AAAA,4CAA4D;AAG5D,gDAKuB;AAEvB,MAAa,WAAY,SAAQ,wBAAU;IACvC,YACI,SAA8B,EACb,OAAoB,EACpB,aAA4B,EAC7C,YAA+B;QAE/B,KAAK,iCAEM,SAAS,KACZ,aAAa,EACT,2CAA+B,CAAC,SAAS,CAAC,OAAO,CAAC,KAE1D,YAAY,CACf,CAAA;QAXgB,YAAO,GAAP,OAAO,CAAa;QACpB,kBAAa,GAAb,aAAa,CAAe;IAWjD,CAAC;IAED,KAAK;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;QAChC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAA;QAE3B,uCACO,KAAK,KACR,YAAY,EAAE,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,IAChE;IACL,CAAC;CACJ;AA1BD,kCA0BC"}
|
|
@@ -5,6 +5,7 @@ const fusion_order_1 = require("./fusion-order");
|
|
|
5
5
|
const auction_salt_1 = require("../auction-salt");
|
|
6
6
|
const auction_suffix_1 = require("../auction-suffix");
|
|
7
7
|
const crypto_1 = tslib_1.__importDefault(require("crypto"));
|
|
8
|
+
const constants_1 = require("../constants");
|
|
8
9
|
describe('Fusion Order', () => {
|
|
9
10
|
jest.spyOn(crypto_1.default.webcrypto, 'getRandomValues').mockImplementation(() => new Int8Array([9, 10, 10, 10, 10]));
|
|
10
11
|
it('should create fusion order', () => {
|
|
@@ -33,10 +34,11 @@ describe('Fusion Order', () => {
|
|
|
33
34
|
takerAsset: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
|
|
34
35
|
makingAmount: '1000000000000000000',
|
|
35
36
|
takingAmount: '1420000000',
|
|
36
|
-
maker: '0x00000000219ab540356cbb839cbe05303d7705fa'
|
|
37
|
+
maker: '0x00000000219ab540356cbb839cbe05303d7705fa',
|
|
38
|
+
network: constants_1.NetworkEnum.ETHEREUM
|
|
37
39
|
}, salt, suffix);
|
|
38
40
|
expect(order.build()).toStrictEqual({
|
|
39
|
-
allowedSender:
|
|
41
|
+
allowedSender: constants_1.SETTLEMENT_CONTRACT_ADDRESS_MAP[constants_1.NetworkEnum.ETHEREUM],
|
|
40
42
|
interactions: '0x000c004e200000000000000000219ab540356cbb839cbe05303d7705faf486570009',
|
|
41
43
|
maker: '0x00000000219ab540356cbb839cbe05303d7705fa',
|
|
42
44
|
makerAsset: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fusion-order.spec.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.spec.ts"],"names":[],"mappings":";;;AAAA,iDAA0C;AAC1C,kDAA2C;AAC3C,sDAA+C;AAC/C,4DAA2B;
|
|
1
|
+
{"version":3,"file":"fusion-order.spec.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.spec.ts"],"names":[],"mappings":";;;AAAA,iDAA0C;AAC1C,kDAA2C;AAC3C,sDAA+C;AAC/C,4DAA2B;AAC3B,4CAAyE;AAEzE,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC1B,IAAI,CAAC,KAAK,CAAC,gBAAM,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC,kBAAkB,CAC9D,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAC3C,CAAA;IAED,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAClC,MAAM,IAAI,GAAG,IAAI,0BAAW,CAAC;YACzB,QAAQ,EAAE,GAAG;YACb,gBAAgB,EAAE,UAAU;YAC5B,eAAe,EAAE,KAAK;YACtB,OAAO,EAAE,GAAG;SACf,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,8BAAa,CAAC;YAC7B,MAAM,EAAE;gBACJ;oBACI,WAAW,EAAE,KAAK;oBAClB,KAAK,EAAE,EAAE;iBACZ;aACJ;YACD,SAAS,EAAE;gBACP;oBACI,OAAO,EAAE,4CAA4C;oBACrD,SAAS,EAAE,CAAC;iBACf;aACJ;SACJ,CAAC,CAAA;QAEF,MAAM,KAAK,GAAG,IAAI,0BAAW,CACzB;YACI,UAAU,EAAE,4CAA4C;YACxD,UAAU,EAAE,4CAA4C;YACxD,YAAY,EAAE,qBAAqB;YACnC,YAAY,EAAE,YAAY;YAC1B,KAAK,EAAE,4CAA4C;YACnD,OAAO,EAAE,uBAAW,CAAC,QAAQ;SAChC,EACD,IAAI,EACJ,MAAM,CACT,CAAA;QAED,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,aAAa,CAAC;YAChC,aAAa,EACT,2CAA+B,CAAC,uBAAW,CAAC,QAAQ,CAAC;YACzD,YAAY,EACR,wEAAwE;YAC5E,KAAK,EAAE,4CAA4C;YACnD,UAAU,EAAE,4CAA4C;YACxD,YAAY,EAAE,qBAAqB;YACnC,OAAO,EAAE,GAAG;YACZ,QAAQ,EAAE,4CAA4C;YACtD,IAAI,EAAE,+EAA+E;YACrF,UAAU,EAAE,4CAA4C;YACxD,YAAY,EAAE,YAAY;SAC7B,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
|
package/limit-order/types.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { NetworkEnum } from '../constants';
|
|
1
2
|
export declare type OrderInfoData = {
|
|
2
3
|
makerAsset: string;
|
|
3
4
|
takerAsset: string;
|
|
@@ -8,6 +9,9 @@ export declare type OrderInfoData = {
|
|
|
8
9
|
allowedSender?: string;
|
|
9
10
|
receiver?: string;
|
|
10
11
|
};
|
|
12
|
+
export declare type OrderInfoDataFusion = Exclude<OrderInfoData, 'allowedSender'> & {
|
|
13
|
+
network: NetworkEnum;
|
|
14
|
+
};
|
|
11
15
|
export declare type InteractionsData = {
|
|
12
16
|
makerAssetData?: string;
|
|
13
17
|
takerAssetData?: string;
|