@1inch/fusion-sdk 1.0.1-rc.42 → 1.0.1-rc.44
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/dist/api/orders/order-api.spec.js +225 -139
- package/dist/api/orders/order-api.spec.js.map +1 -1
- package/dist/api/orders/types.d.ts +6 -0
- package/dist/auction-calculator/auction-calculator.d.ts +5 -1
- package/dist/auction-calculator/auction-calculator.js +23 -20
- package/dist/auction-calculator/auction-calculator.js.map +1 -1
- package/dist/auction-calculator/index.d.ts +0 -1
- package/dist/auction-calculator/index.js +0 -1
- package/dist/auction-calculator/index.js.map +1 -1
- package/dist/fusion-order/auction-details/auction-details.spec.js +3 -3
- package/dist/fusion-order/auction-details/auction-details.spec.js.map +1 -1
- package/dist/fusion-order/fusion-order.spec.js +15 -0
- package/dist/fusion-order/fusion-order.spec.js.map +1 -1
- package/dist/fusion-order/index.d.ts +1 -0
- package/dist/fusion-order/index.js +1 -0
- package/dist/fusion-order/index.js.map +1 -1
- package/dist/fusion-order/source-track.js +13 -0
- package/dist/fusion-order/source-track.js.map +1 -1
- package/dist/sdk/sdk.js +4 -4
- package/dist/sdk/sdk.js.map +1 -1
- package/dist/sdk/types.d.ts +2 -0
- package/dist/ws-api/types.d.ts +1 -0
- package/dist/ws-api/ws.spec.js +105 -98
- package/dist/ws-api/ws.spec.js.map +1 -1
- package/package.json +1 -1
- package/dist/auction-calculator/calc.d.ts +0 -9
- package/dist/auction-calculator/calc.js +0 -22
- package/dist/auction-calculator/calc.js.map +0 -1
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AuctionCalculator = void 0;
|
|
4
|
-
const calc_1 = require("./calc");
|
|
5
4
|
const constants_1 = require("./constants");
|
|
6
5
|
const sdk_1 = require("../sdk");
|
|
7
6
|
class AuctionCalculator {
|
|
@@ -16,6 +15,9 @@ class AuctionCalculator {
|
|
|
16
15
|
this.takerFeeRatio = takerFeeRatio;
|
|
17
16
|
this.gasCost = gasCost;
|
|
18
17
|
}
|
|
18
|
+
get finishTime() {
|
|
19
|
+
return this.startTime + this.duration;
|
|
20
|
+
}
|
|
19
21
|
static fromAuctionData(data, details) {
|
|
20
22
|
return new AuctionCalculator(details.startTime, details.duration, details.initialRateBump, details.points, data.integratorFee?.ratio || 0n, details.gasCost);
|
|
21
23
|
}
|
|
@@ -25,7 +27,10 @@ class AuctionCalculator {
|
|
|
25
27
|
return Number(bump);
|
|
26
28
|
}
|
|
27
29
|
/**
|
|
28
|
-
*
|
|
30
|
+
* Important!: method implementation is different from contract implementation
|
|
31
|
+
* Because of that, sdk amount can be less than contract amount by 1 wad
|
|
32
|
+
*
|
|
33
|
+
* @see https://github.com/1inch/limit-order-settlement/blob/2eef6f86bf0142024f9a8bf054a0256b41d8362a/contracts/extensions/BaseExtension.sol#L66
|
|
29
34
|
*/
|
|
30
35
|
static calcAuctionTakingAmount(takingAmount, rate, takerFeeRatio) {
|
|
31
36
|
const auctionTakingAmount = (BigInt(takingAmount) * (BigInt(rate) + constants_1.RATE_BUMP_DENOMINATOR)) /
|
|
@@ -74,30 +79,28 @@ class AuctionCalculator {
|
|
|
74
79
|
this.gasCost.gasPriceEstimate /
|
|
75
80
|
AuctionCalculator.GAS_PRICE_BASE);
|
|
76
81
|
}
|
|
77
|
-
getAuctionBump(
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
const startBump = BigInt(this.initialRateBump);
|
|
81
|
-
const currentTime = BigInt(time);
|
|
82
|
-
if (currentTime <= cumulativeTime) {
|
|
82
|
+
getAuctionBump(blockTime) {
|
|
83
|
+
const auctionFinishTime = this.finishTime;
|
|
84
|
+
if (blockTime <= this.startTime) {
|
|
83
85
|
return this.initialRateBump;
|
|
84
86
|
}
|
|
85
|
-
else if (
|
|
87
|
+
else if (blockTime >= auctionFinishTime) {
|
|
86
88
|
return 0n;
|
|
87
89
|
}
|
|
88
|
-
let
|
|
89
|
-
let
|
|
90
|
-
for (
|
|
91
|
-
const
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
90
|
+
let currentPointTime = this.startTime;
|
|
91
|
+
let currentRateBump = this.initialRateBump;
|
|
92
|
+
for (const { coefficient: nextRateBump, delay } of this.points) {
|
|
93
|
+
const nextPointTime = BigInt(delay) + currentPointTime;
|
|
94
|
+
if (blockTime <= nextPointTime) {
|
|
95
|
+
return (((blockTime - currentPointTime) * BigInt(nextRateBump) +
|
|
96
|
+
(nextPointTime - blockTime) * currentRateBump) /
|
|
97
|
+
(nextPointTime - currentPointTime));
|
|
96
98
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
+
currentPointTime = nextPointTime;
|
|
100
|
+
currentRateBump = BigInt(nextRateBump);
|
|
99
101
|
}
|
|
100
|
-
return (
|
|
102
|
+
return (((auctionFinishTime - blockTime) * currentRateBump) /
|
|
103
|
+
(auctionFinishTime - currentPointTime));
|
|
101
104
|
}
|
|
102
105
|
}
|
|
103
106
|
exports.AuctionCalculator = AuctionCalculator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auction-calculator.js","sourceRoot":"","sources":["../../src/auction-calculator/auction-calculator.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"auction-calculator.js","sourceRoot":"","sources":["../../src/auction-calculator/auction-calculator.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./auction-calculator"), exports);
|
|
18
|
-
__exportStar(require("./calc"), exports);
|
|
19
18
|
__exportStar(require("./constants"), exports);
|
|
20
19
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auction-calculator/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auction-calculator/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAoC;AACpC,8CAA2B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auction-details.spec.js","sourceRoot":"","sources":["../../../src/fusion-order/auction-details/auction-details.spec.ts"],"names":[],"mappings":";;AAAA,uDAAgD;AAEhD,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACpC,MAAM,OAAO,GAAG,IAAI,gCAAc,CAAC;YAC/B,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,WAAW;YACtB,eAAe,EAAE,KAAK;YACtB,MAAM,EAAE;gBACJ;oBACI,KAAK,EAAE,EAAE;oBACT,WAAW,EAAE,KAAK;iBACrB;
|
|
1
|
+
{"version":3,"file":"auction-details.spec.js","sourceRoot":"","sources":["../../../src/fusion-order/auction-details/auction-details.spec.ts"],"names":[],"mappings":";;AAAA,uDAAgD;AAEhD,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACpC,MAAM,OAAO,GAAG,IAAI,gCAAc,CAAC;YAC/B,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,WAAW;YACtB,eAAe,EAAE,KAAK;YACtB,MAAM,EAAE;gBACJ;oBACI,KAAK,EAAE,EAAE;oBACT,WAAW,EAAE,KAAK;iBACrB;gBACD;oBACI,KAAK,EAAE,EAAE;oBACT,WAAW,EAAE,IAAI;iBACpB;aACJ;SACJ,CAAC,CAAA;QAEF,MAAM,CAAC,gCAAc,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;IAC1E,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
|
|
@@ -142,5 +142,20 @@ describe('Fusion Order', () => {
|
|
|
142
142
|
expect(order.calcTakingAmount(order.makingAmount, now)).toEqual(2n * order.takingAmount // because init rate bump is 100%
|
|
143
143
|
);
|
|
144
144
|
});
|
|
145
|
+
it('Should calculate taking amount 2', () => {
|
|
146
|
+
const order = fusion_order_1.FusionOrder.fromDataAndExtension({
|
|
147
|
+
salt: '9445680526437905167361671445680544159946878658630243245775199089669376863246',
|
|
148
|
+
maker: '0x6edc317f3208b10c46f4ff97faa04dd632487408',
|
|
149
|
+
receiver: '0x0000000000000000000000000000000000000000',
|
|
150
|
+
makerAsset: '0x6b175474e89094c44da98b954eedeac495271d0f',
|
|
151
|
+
takerAsset: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
|
|
152
|
+
makerTraits: '62419173104490761595518734106245825327156011637372339461913926769802108469248',
|
|
153
|
+
makingAmount: '100000000000000000000',
|
|
154
|
+
takingAmount: '29266814473325164'
|
|
155
|
+
}, limit_order_sdk_1.Extension.decode('0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662f5c9b0002580d653601a4b500180bc0800048fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662f5c9b0002580d653601a4b500180bc0800048fb2809a5314473e1165f6b58018e20ed8f07b840662f5c83b09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'));
|
|
156
|
+
const now = 1714380275n;
|
|
157
|
+
const baseFee = 10844562822n;
|
|
158
|
+
expect(order.calcTakingAmount(order.makingAmount, now, baseFee)).toEqual(30411732255521644n);
|
|
159
|
+
});
|
|
145
160
|
});
|
|
146
161
|
//# sourceMappingURL=fusion-order.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fusion-order.spec.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.spec.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"fusion-order.spec.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,4 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
__exportStar(require("./fusion-order"), exports);
|
|
18
18
|
__exportStar(require("./auction-details"), exports);
|
|
19
19
|
__exportStar(require("./settlement-post-interaction-data"), exports);
|
|
20
|
+
__exportStar(require("./fusion-extension"), exports);
|
|
20
21
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/fusion-order/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA8B;AAC9B,oDAAiC;AACjC,qEAAkD"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/fusion-order/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA8B;AAC9B,oDAAiC;AACjC,qEAAkD;AAClD,qDAAkC"}
|
|
@@ -4,8 +4,21 @@ exports.injectTrackCode = void 0;
|
|
|
4
4
|
const byte_utils_1 = require("@1inch/byte-utils");
|
|
5
5
|
const ethers_1 = require("ethers");
|
|
6
6
|
const utils_1 = require("../utils");
|
|
7
|
+
const validations_1 = require("../validations");
|
|
7
8
|
const TRACK_CODE_MASK = new byte_utils_1.BitMask(224n, 256n);
|
|
8
9
|
function getTrackCodeForSource(source) {
|
|
10
|
+
if (!(0, validations_1.isHexString)(source)) {
|
|
11
|
+
return createId(source);
|
|
12
|
+
}
|
|
13
|
+
if (source.length === 10) {
|
|
14
|
+
return BigInt(source);
|
|
15
|
+
}
|
|
16
|
+
if (source.length === 66) {
|
|
17
|
+
return BigInt(source.substring(0, 10));
|
|
18
|
+
}
|
|
19
|
+
return createId(source);
|
|
20
|
+
}
|
|
21
|
+
function createId(source) {
|
|
9
22
|
return BigInt((0, utils_1.add0x)((0, ethers_1.id)(source).slice(0, 10)));
|
|
10
23
|
}
|
|
11
24
|
function injectTrackCode(salt, source) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source-track.js","sourceRoot":"","sources":["../../src/fusion-order/source-track.ts"],"names":[],"mappings":";;;AAAA,kDAA6C;AAC7C,mCAAyB;AACzB,oCAA8B;
|
|
1
|
+
{"version":3,"file":"source-track.js","sourceRoot":"","sources":["../../src/fusion-order/source-track.ts"],"names":[],"mappings":";;;AAAA,kDAA6C;AAC7C,mCAAyB;AACzB,oCAA8B;AAC9B,gDAA0C;AAE1C,MAAM,eAAe,GAAG,IAAI,oBAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;AAE/C,SAAS,qBAAqB,CAAC,MAAc;IACzC,IAAI,CAAC,IAAA,yBAAW,EAAC,MAAM,CAAC,EAAE;QACtB,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAA;KAC1B;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,EAAE;QACtB,OAAO,MAAM,CAAC,MAAM,CAAC,CAAA;KACxB;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,EAAE;QACtB,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;KACzC;IAED,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAA;AAC3B,CAAC;AAED,SAAS,QAAQ,CAAC,MAAc;IAC5B,OAAO,MAAM,CAAC,IAAA,aAAK,EAAC,IAAA,WAAE,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;AACjD,CAAC;AAED,SAAgB,eAAe,CAAC,IAAY,EAAE,MAAe;IACzD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAEzD,OAAO,IAAI,eAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,KAAK,CAAA;AAC7D,CAAC;AAJD,0CAIC"}
|
package/dist/sdk/sdk.js
CHANGED
|
@@ -32,9 +32,9 @@ class FusionSDK {
|
|
|
32
32
|
fromTokenAddress: params.fromTokenAddress,
|
|
33
33
|
toTokenAddress: params.toTokenAddress,
|
|
34
34
|
amount: params.amount,
|
|
35
|
-
walletAddress: limit_order_sdk_1.Address.ZERO_ADDRESS.toString(),
|
|
35
|
+
walletAddress: params.walletAddress || limit_order_sdk_1.Address.ZERO_ADDRESS.toString(),
|
|
36
36
|
permit: params.permit,
|
|
37
|
-
enableEstimate:
|
|
37
|
+
enableEstimate: !!params.enableEstimate,
|
|
38
38
|
fee: params?.takingFeeBps,
|
|
39
39
|
source: params.source,
|
|
40
40
|
isPermit2: params.isPermit2
|
|
@@ -46,9 +46,9 @@ class FusionSDK {
|
|
|
46
46
|
fromTokenAddress: params.fromTokenAddress,
|
|
47
47
|
toTokenAddress: params.toTokenAddress,
|
|
48
48
|
amount: params.amount,
|
|
49
|
-
walletAddress: limit_order_sdk_1.Address.ZERO_ADDRESS.toString(),
|
|
49
|
+
walletAddress: params.walletAddress || limit_order_sdk_1.Address.ZERO_ADDRESS.toString(),
|
|
50
50
|
permit: params.permit,
|
|
51
|
-
enableEstimate:
|
|
51
|
+
enableEstimate: !!params.enableEstimate,
|
|
52
52
|
fee: params?.takingFeeBps,
|
|
53
53
|
source: params.source,
|
|
54
54
|
isPermit2: params.isPermit2
|
package/dist/sdk/sdk.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../src/sdk/sdk.ts"],"names":[],"mappings":";;;AAAA,4DAA2D;AAS3D,yCAA4C;AAC5C,gCAMe;AACf,0CASsB;AAGtB,MAAa,SAAS;IAGlB,YAA6B,MAA6B;QAA7B,WAAM,GAAN,MAAM,CAAuB;QACtD,IAAI,CAAC,GAAG,GAAG,eAAS,CAAC,GAAG,CAAC;YACrB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,OAAO,EAAE,MAAM,CAAC,OAAO;SAC1B,CAAC,CAAA;IACN,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,EAClB,IAAI,EACJ,KAAK,KACsB,EAAE;QAC7B,MAAM,OAAO,GAAG,4BAAmB,CAAC,GAAG,CAAC,EAAC,IAAI,EAAE,KAAK,EAAC,CAAC,CAAA;QAEtD,OAAO,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,SAAiB;QAClC,MAAM,OAAO,GAAG,2BAAkB,CAAC,GAAG,CAAC,EAAC,SAAS,EAAC,CAAC,CAAA;QAEnD,OAAO,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,EACnB,KAAK,EACL,IAAI,EACJ,OAAO,EACW;QAClB,MAAM,OAAO,GAAG,6BAAoB,CAAC,GAAG,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAC,CAAC,CAAA;QAEhE,OAAO,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAC7C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAmB;QAC9B,MAAM,OAAO,GAAG,mBAAa,CAAC,GAAG,CAAC;YAC9B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,aAAa,
|
|
1
|
+
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../src/sdk/sdk.ts"],"names":[],"mappings":"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"}
|
package/dist/sdk/types.d.ts
CHANGED
package/dist/ws-api/types.d.ts
CHANGED
|
@@ -17,6 +17,7 @@ export type OrderCreatedEvent = Event<'order_created', {
|
|
|
17
17
|
auctionStartDate: string;
|
|
18
18
|
auctionEndDate: string;
|
|
19
19
|
remainingMakerAmount: string;
|
|
20
|
+
extension: string;
|
|
20
21
|
}>;
|
|
21
22
|
export type OrderBalanceOrAllowanceChangeEvent = Event<'order_balance_or_allowance_change', {
|
|
22
23
|
orderHash: string;
|
package/dist/ws-api/ws.spec.js
CHANGED
|
@@ -314,23 +314,24 @@ describe(__filename, () => {
|
|
|
314
314
|
const message1 = {
|
|
315
315
|
event: 'order_created',
|
|
316
316
|
result: {
|
|
317
|
-
quoteId: '
|
|
318
|
-
orderHash: '
|
|
317
|
+
quoteId: 'b77da8b7-a4bb-4563-b917-03522aa609e3',
|
|
318
|
+
orderHash: '0xb9522c23c8667c5e76bf0b855ffabbaebca282f8e396d788c2df75e91a0391d2-5705f2156ef5b2db36c160b36f31ce4',
|
|
319
319
|
order: {
|
|
320
|
-
salt: '
|
|
321
|
-
maker: '
|
|
320
|
+
salt: '9445680545936410419330284706951757224702878670220689583677680607556412140293',
|
|
321
|
+
maker: '0x6edc317f3208b10c46f4ff97faa04dd632487408',
|
|
322
322
|
receiver: '0x0000000000000000000000000000000000000000',
|
|
323
|
-
makerAsset: '
|
|
324
|
-
takerAsset: '
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
323
|
+
makerAsset: '0x6b175474e89094c44da98b954eedeac495271d0f',
|
|
324
|
+
takerAsset: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
|
|
325
|
+
makerTraits: '62419173104490761595518734106557662061518414611782227068396304425790442831872',
|
|
326
|
+
makingAmount: '30000000000000000000',
|
|
327
|
+
takingAmount: '7516665910385115'
|
|
328
328
|
},
|
|
329
|
-
signature: '
|
|
330
|
-
deadline: '
|
|
331
|
-
auctionStartDate: '
|
|
332
|
-
auctionEndDate: '
|
|
333
|
-
remainingMakerAmount: '
|
|
329
|
+
signature: '0xb51731d6e62754ae75d11d13983c19b25fcc1a43fc327710a26ae291fde3d33f52dee7a4c0154256f6bb272260170128242034a89f44e7e887d1bb54a746a5941b',
|
|
330
|
+
deadline: '2024-04-29T15:27:39.000Z',
|
|
331
|
+
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
332
|
+
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
333
|
+
remainingMakerAmount: '30000000000000000000',
|
|
334
|
+
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
334
335
|
}
|
|
335
336
|
};
|
|
336
337
|
const message2 = {
|
|
@@ -363,23 +364,24 @@ describe(__filename, () => {
|
|
|
363
364
|
const message1 = {
|
|
364
365
|
event: 'order_created',
|
|
365
366
|
result: {
|
|
366
|
-
quoteId: '
|
|
367
|
-
orderHash: '
|
|
367
|
+
quoteId: 'b77da8b7-a4bb-4563-b917-03522aa609e3',
|
|
368
|
+
orderHash: '0xb9522c23c8667c5e76bf0b855ffabbaebca282f8e396d788c2df75e91a0391d2-5705f2156ef5b2db36c160b36f31ce4',
|
|
368
369
|
order: {
|
|
369
|
-
salt: '
|
|
370
|
-
maker: '
|
|
370
|
+
salt: '9445680545936410419330284706951757224702878670220689583677680607556412140293',
|
|
371
|
+
maker: '0x6edc317f3208b10c46f4ff97faa04dd632487408',
|
|
371
372
|
receiver: '0x0000000000000000000000000000000000000000',
|
|
372
|
-
makerAsset: '
|
|
373
|
-
takerAsset: '
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
373
|
+
makerAsset: '0x6b175474e89094c44da98b954eedeac495271d0f',
|
|
374
|
+
takerAsset: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
|
|
375
|
+
makerTraits: '62419173104490761595518734106557662061518414611782227068396304425790442831872',
|
|
376
|
+
makingAmount: '30000000000000000000',
|
|
377
|
+
takingAmount: '7516665910385115'
|
|
377
378
|
},
|
|
378
|
-
signature: '
|
|
379
|
-
deadline: '
|
|
380
|
-
auctionStartDate: '
|
|
381
|
-
auctionEndDate: '
|
|
382
|
-
remainingMakerAmount: '
|
|
379
|
+
signature: '0xb51731d6e62754ae75d11d13983c19b25fcc1a43fc327710a26ae291fde3d33f52dee7a4c0154256f6bb272260170128242034a89f44e7e887d1bb54a746a5941b',
|
|
380
|
+
deadline: '2024-04-29T15:27:39.000Z',
|
|
381
|
+
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
382
|
+
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
383
|
+
remainingMakerAmount: '30000000000000000000',
|
|
384
|
+
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
383
385
|
}
|
|
384
386
|
};
|
|
385
387
|
const message2 = {
|
|
@@ -413,23 +415,24 @@ describe(__filename, () => {
|
|
|
413
415
|
const message1 = {
|
|
414
416
|
event: 'order_created',
|
|
415
417
|
result: {
|
|
416
|
-
quoteId: '
|
|
417
|
-
orderHash: '
|
|
418
|
+
quoteId: 'b77da8b7-a4bb-4563-b917-03522aa609e3',
|
|
419
|
+
orderHash: '0xb9522c23c8667c5e76bf0b855ffabbaebca282f8e396d788c2df75e91a0391d2-5705f2156ef5b2db36c160b36f31ce4',
|
|
418
420
|
order: {
|
|
419
|
-
salt: '
|
|
420
|
-
maker: '
|
|
421
|
+
salt: '9445680545936410419330284706951757224702878670220689583677680607556412140293',
|
|
422
|
+
maker: '0x6edc317f3208b10c46f4ff97faa04dd632487408',
|
|
421
423
|
receiver: '0x0000000000000000000000000000000000000000',
|
|
422
|
-
makerAsset: '
|
|
423
|
-
takerAsset: '
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
424
|
+
makerAsset: '0x6b175474e89094c44da98b954eedeac495271d0f',
|
|
425
|
+
takerAsset: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
|
|
426
|
+
makerTraits: '62419173104490761595518734106557662061518414611782227068396304425790442831872',
|
|
427
|
+
makingAmount: '30000000000000000000',
|
|
428
|
+
takingAmount: '7516665910385115'
|
|
427
429
|
},
|
|
428
|
-
signature: '
|
|
429
|
-
deadline: '
|
|
430
|
-
auctionStartDate: '
|
|
431
|
-
auctionEndDate: '
|
|
432
|
-
remainingMakerAmount: '
|
|
430
|
+
signature: '0xb51731d6e62754ae75d11d13983c19b25fcc1a43fc327710a26ae291fde3d33f52dee7a4c0154256f6bb272260170128242034a89f44e7e887d1bb54a746a5941b',
|
|
431
|
+
deadline: '2024-04-29T15:27:39.000Z',
|
|
432
|
+
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
433
|
+
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
434
|
+
remainingMakerAmount: '30000000000000000000',
|
|
435
|
+
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
433
436
|
}
|
|
434
437
|
};
|
|
435
438
|
const message2 = {
|
|
@@ -463,23 +466,24 @@ describe(__filename, () => {
|
|
|
463
466
|
const message1 = {
|
|
464
467
|
event: 'order_created',
|
|
465
468
|
result: {
|
|
466
|
-
quoteId: '
|
|
467
|
-
orderHash: '
|
|
469
|
+
quoteId: 'b77da8b7-a4bb-4563-b917-03522aa609e3',
|
|
470
|
+
orderHash: '0xb9522c23c8667c5e76bf0b855ffabbaebca282f8e396d788c2df75e91a0391d2-5705f2156ef5b2db36c160b36f31ce4',
|
|
468
471
|
order: {
|
|
469
|
-
salt: '
|
|
470
|
-
maker: '
|
|
472
|
+
salt: '9445680545936410419330284706951757224702878670220689583677680607556412140293',
|
|
473
|
+
maker: '0x6edc317f3208b10c46f4ff97faa04dd632487408',
|
|
471
474
|
receiver: '0x0000000000000000000000000000000000000000',
|
|
472
|
-
makerAsset: '
|
|
473
|
-
takerAsset: '
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
475
|
+
makerAsset: '0x6b175474e89094c44da98b954eedeac495271d0f',
|
|
476
|
+
takerAsset: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
|
|
477
|
+
makerTraits: '62419173104490761595518734106557662061518414611782227068396304425790442831872',
|
|
478
|
+
makingAmount: '30000000000000000000',
|
|
479
|
+
takingAmount: '7516665910385115'
|
|
477
480
|
},
|
|
478
|
-
signature: '
|
|
479
|
-
deadline: '
|
|
480
|
-
auctionStartDate: '
|
|
481
|
-
auctionEndDate: '
|
|
482
|
-
remainingMakerAmount: '
|
|
481
|
+
signature: '0xb51731d6e62754ae75d11d13983c19b25fcc1a43fc327710a26ae291fde3d33f52dee7a4c0154256f6bb272260170128242034a89f44e7e887d1bb54a746a5941b',
|
|
482
|
+
deadline: '2024-04-29T15:27:39.000Z',
|
|
483
|
+
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
484
|
+
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
485
|
+
remainingMakerAmount: '30000000000000000000',
|
|
486
|
+
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
483
487
|
}
|
|
484
488
|
};
|
|
485
489
|
const message2 = {
|
|
@@ -516,23 +520,24 @@ describe(__filename, () => {
|
|
|
516
520
|
const message1 = {
|
|
517
521
|
event: 'order_created',
|
|
518
522
|
result: {
|
|
519
|
-
quoteId: '
|
|
520
|
-
orderHash: '
|
|
523
|
+
quoteId: 'b77da8b7-a4bb-4563-b917-03522aa609e3',
|
|
524
|
+
orderHash: '0xb9522c23c8667c5e76bf0b855ffabbaebca282f8e396d788c2df75e91a0391d2-5705f2156ef5b2db36c160b36f31ce4',
|
|
521
525
|
order: {
|
|
522
|
-
salt: '
|
|
523
|
-
maker: '
|
|
526
|
+
salt: '9445680545936410419330284706951757224702878670220689583677680607556412140293',
|
|
527
|
+
maker: '0x6edc317f3208b10c46f4ff97faa04dd632487408',
|
|
524
528
|
receiver: '0x0000000000000000000000000000000000000000',
|
|
525
|
-
makerAsset: '
|
|
526
|
-
takerAsset: '
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
529
|
+
makerAsset: '0x6b175474e89094c44da98b954eedeac495271d0f',
|
|
530
|
+
takerAsset: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
|
|
531
|
+
makerTraits: '62419173104490761595518734106557662061518414611782227068396304425790442831872',
|
|
532
|
+
makingAmount: '30000000000000000000',
|
|
533
|
+
takingAmount: '7516665910385115'
|
|
530
534
|
},
|
|
531
|
-
signature: '
|
|
532
|
-
deadline: '
|
|
533
|
-
auctionStartDate: '
|
|
534
|
-
auctionEndDate: '
|
|
535
|
-
remainingMakerAmount: '
|
|
535
|
+
signature: '0xb51731d6e62754ae75d11d13983c19b25fcc1a43fc327710a26ae291fde3d33f52dee7a4c0154256f6bb272260170128242034a89f44e7e887d1bb54a746a5941b',
|
|
536
|
+
deadline: '2024-04-29T15:27:39.000Z',
|
|
537
|
+
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
538
|
+
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
539
|
+
remainingMakerAmount: '30000000000000000000',
|
|
540
|
+
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
536
541
|
}
|
|
537
542
|
};
|
|
538
543
|
const message2 = {
|
|
@@ -566,23 +571,24 @@ describe(__filename, () => {
|
|
|
566
571
|
const message1 = {
|
|
567
572
|
event: 'order_created',
|
|
568
573
|
result: {
|
|
569
|
-
quoteId: '
|
|
570
|
-
orderHash: '
|
|
574
|
+
quoteId: 'b77da8b7-a4bb-4563-b917-03522aa609e3',
|
|
575
|
+
orderHash: '0xb9522c23c8667c5e76bf0b855ffabbaebca282f8e396d788c2df75e91a0391d2-5705f2156ef5b2db36c160b36f31ce4',
|
|
571
576
|
order: {
|
|
572
|
-
salt: '
|
|
573
|
-
maker: '
|
|
577
|
+
salt: '9445680545936410419330284706951757224702878670220689583677680607556412140293',
|
|
578
|
+
maker: '0x6edc317f3208b10c46f4ff97faa04dd632487408',
|
|
574
579
|
receiver: '0x0000000000000000000000000000000000000000',
|
|
575
|
-
makerAsset: '
|
|
576
|
-
takerAsset: '
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
+
makerAsset: '0x6b175474e89094c44da98b954eedeac495271d0f',
|
|
581
|
+
takerAsset: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
|
|
582
|
+
makerTraits: '62419173104490761595518734106557662061518414611782227068396304425790442831872',
|
|
583
|
+
makingAmount: '30000000000000000000',
|
|
584
|
+
takingAmount: '7516665910385115'
|
|
580
585
|
},
|
|
581
|
-
signature: '
|
|
582
|
-
deadline: '
|
|
583
|
-
auctionStartDate: '
|
|
584
|
-
auctionEndDate: '
|
|
585
|
-
remainingMakerAmount: '
|
|
586
|
+
signature: '0xb51731d6e62754ae75d11d13983c19b25fcc1a43fc327710a26ae291fde3d33f52dee7a4c0154256f6bb272260170128242034a89f44e7e887d1bb54a746a5941b',
|
|
587
|
+
deadline: '2024-04-29T15:27:39.000Z',
|
|
588
|
+
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
589
|
+
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
590
|
+
remainingMakerAmount: '30000000000000000000',
|
|
591
|
+
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
586
592
|
}
|
|
587
593
|
};
|
|
588
594
|
const message2 = {
|
|
@@ -617,23 +623,24 @@ describe(__filename, () => {
|
|
|
617
623
|
const message1 = {
|
|
618
624
|
event: 'order_created',
|
|
619
625
|
result: {
|
|
620
|
-
quoteId: '
|
|
621
|
-
orderHash: '
|
|
626
|
+
quoteId: 'b77da8b7-a4bb-4563-b917-03522aa609e3',
|
|
627
|
+
orderHash: '0xb9522c23c8667c5e76bf0b855ffabbaebca282f8e396d788c2df75e91a0391d2-5705f2156ef5b2db36c160b36f31ce4',
|
|
622
628
|
order: {
|
|
623
|
-
salt: '
|
|
624
|
-
maker: '
|
|
629
|
+
salt: '9445680545936410419330284706951757224702878670220689583677680607556412140293',
|
|
630
|
+
maker: '0x6edc317f3208b10c46f4ff97faa04dd632487408',
|
|
625
631
|
receiver: '0x0000000000000000000000000000000000000000',
|
|
626
|
-
makerAsset: '
|
|
627
|
-
takerAsset: '
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
632
|
+
makerAsset: '0x6b175474e89094c44da98b954eedeac495271d0f',
|
|
633
|
+
takerAsset: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
|
|
634
|
+
makerTraits: '62419173104490761595518734106557662061518414611782227068396304425790442831872',
|
|
635
|
+
makingAmount: '30000000000000000000',
|
|
636
|
+
takingAmount: '7516665910385115'
|
|
631
637
|
},
|
|
632
|
-
signature: '
|
|
633
|
-
deadline: '
|
|
634
|
-
auctionStartDate: '
|
|
635
|
-
auctionEndDate: '
|
|
636
|
-
remainingMakerAmount: '
|
|
638
|
+
signature: '0xb51731d6e62754ae75d11d13983c19b25fcc1a43fc327710a26ae291fde3d33f52dee7a4c0154256f6bb272260170128242034a89f44e7e887d1bb54a746a5941b',
|
|
639
|
+
deadline: '2024-04-29T15:27:39.000Z',
|
|
640
|
+
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
641
|
+
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
642
|
+
remainingMakerAmount: '30000000000000000000',
|
|
643
|
+
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
637
644
|
}
|
|
638
645
|
};
|
|
639
646
|
const message2 = {
|