@1inch/fusion-sdk 2.3.7-rc.0 → 2.3.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/dist/cjs/fusion-order/whitelist/whitelist.js +1 -1
- package/dist/cjs/fusion-order/whitelist/whitelist.spec.js +18 -0
- package/dist/cjs/ws-api/ws.spec.js +7 -0
- package/dist/esm/fusion-order/whitelist/whitelist.js +1 -1
- package/dist/esm/fusion-order/whitelist/whitelist.spec.js +18 -0
- package/dist/esm/package.json +1 -1
- package/dist/esm/ws-api/ws.spec.js +7 -0
- package/dist/types/src/ws-api/types.d.ts +1 -0
- package/dist/types/tsconfig.types.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -140,7 +140,7 @@ var Whitelist = /*#__PURE__*/ function() {
|
|
|
140
140
|
{
|
|
141
141
|
key: "isWhitelisted",
|
|
142
142
|
value: function isWhitelisted(address) {
|
|
143
|
-
var half = address.
|
|
143
|
+
var half = address.toString().slice(-20);
|
|
144
144
|
return this.whitelist.some(function(w) {
|
|
145
145
|
return w.addressHalf === half;
|
|
146
146
|
});
|
|
@@ -65,4 +65,22 @@ describe('Whitelist', function() {
|
|
|
65
65
|
expect(data.canExecuteAt(_limitordersdk.Address.fromBigInt(3n), start + 9n)).toEqual(false);
|
|
66
66
|
expect(data.canExecuteAt(_limitordersdk.Address.fromBigInt(2n), start + 50n)).toEqual(false);
|
|
67
67
|
});
|
|
68
|
+
it('should correctly identify whitelisted addresses with address half reconstruction', function() {
|
|
69
|
+
var start = 1708117482n;
|
|
70
|
+
var testAddress = new _limitordersdk.Address('0x1234567890abcdef1234567890abcdef12345678');
|
|
71
|
+
var whitelist = _whitelist.Whitelist.new(start, [
|
|
72
|
+
{
|
|
73
|
+
address: testAddress,
|
|
74
|
+
allowFrom: start + 10n
|
|
75
|
+
}
|
|
76
|
+
]);
|
|
77
|
+
// Get the address half from the whitelist
|
|
78
|
+
var addressHalf = whitelist.whitelist[0].addressHalf;
|
|
79
|
+
expect(addressHalf).toBe('1234567890abcdef1234567890abcdef12345678'.slice(-20));
|
|
80
|
+
// Create a new address by duplicating the address half (like in the user's scenario)
|
|
81
|
+
var reconstructedAddress = new _limitordersdk.Address(addressHalf + addressHalf);
|
|
82
|
+
expect(whitelist.isWhitelisted(reconstructedAddress)).toBe(true);
|
|
83
|
+
expect(reconstructedAddress.toString().slice(-20)).toBe(addressHalf);
|
|
84
|
+
expect(reconstructedAddress.lastHalf()).toBe('0x' + addressHalf);
|
|
85
|
+
});
|
|
68
86
|
});
|
|
@@ -397,6 +397,7 @@ describe(__filename, function() {
|
|
|
397
397
|
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
398
398
|
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
399
399
|
remainingMakerAmount: '30000000000000000000',
|
|
400
|
+
isMakerContract: false,
|
|
400
401
|
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
401
402
|
}
|
|
402
403
|
};
|
|
@@ -451,6 +452,7 @@ describe(__filename, function() {
|
|
|
451
452
|
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
452
453
|
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
453
454
|
remainingMakerAmount: '30000000000000000000',
|
|
455
|
+
isMakerContract: false,
|
|
454
456
|
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
455
457
|
}
|
|
456
458
|
};
|
|
@@ -509,6 +511,7 @@ describe(__filename, function() {
|
|
|
509
511
|
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
510
512
|
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
511
513
|
remainingMakerAmount: '30000000000000000000',
|
|
514
|
+
isMakerContract: false,
|
|
512
515
|
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
513
516
|
}
|
|
514
517
|
};
|
|
@@ -566,6 +569,7 @@ describe(__filename, function() {
|
|
|
566
569
|
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
567
570
|
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
568
571
|
remainingMakerAmount: '30000000000000000000',
|
|
572
|
+
isMakerContract: false,
|
|
569
573
|
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
570
574
|
}
|
|
571
575
|
};
|
|
@@ -626,6 +630,7 @@ describe(__filename, function() {
|
|
|
626
630
|
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
627
631
|
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
628
632
|
remainingMakerAmount: '30000000000000000000',
|
|
633
|
+
isMakerContract: false,
|
|
629
634
|
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
630
635
|
}
|
|
631
636
|
};
|
|
@@ -683,6 +688,7 @@ describe(__filename, function() {
|
|
|
683
688
|
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
684
689
|
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
685
690
|
remainingMakerAmount: '30000000000000000000',
|
|
691
|
+
isMakerContract: false,
|
|
686
692
|
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
687
693
|
}
|
|
688
694
|
};
|
|
@@ -741,6 +747,7 @@ describe(__filename, function() {
|
|
|
741
747
|
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
742
748
|
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
743
749
|
remainingMakerAmount: '30000000000000000000',
|
|
750
|
+
isMakerContract: false,
|
|
744
751
|
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
745
752
|
}
|
|
746
753
|
};
|
|
@@ -125,7 +125,7 @@ export var Whitelist = /*#__PURE__*/ function() {
|
|
|
125
125
|
{
|
|
126
126
|
key: "isWhitelisted",
|
|
127
127
|
value: function isWhitelisted(address) {
|
|
128
|
-
var half = address.
|
|
128
|
+
var half = address.toString().slice(-20);
|
|
129
129
|
return this.whitelist.some(function(w) {
|
|
130
130
|
return w.addressHalf === half;
|
|
131
131
|
});
|
|
@@ -61,4 +61,22 @@ describe('Whitelist', function() {
|
|
|
61
61
|
expect(data.canExecuteAt(Address.fromBigInt(3n), start + 9n)).toEqual(false);
|
|
62
62
|
expect(data.canExecuteAt(Address.fromBigInt(2n), start + 50n)).toEqual(false);
|
|
63
63
|
});
|
|
64
|
+
it('should correctly identify whitelisted addresses with address half reconstruction', function() {
|
|
65
|
+
var start = 1708117482n;
|
|
66
|
+
var testAddress = new Address('0x1234567890abcdef1234567890abcdef12345678');
|
|
67
|
+
var whitelist = Whitelist.new(start, [
|
|
68
|
+
{
|
|
69
|
+
address: testAddress,
|
|
70
|
+
allowFrom: start + 10n
|
|
71
|
+
}
|
|
72
|
+
]);
|
|
73
|
+
// Get the address half from the whitelist
|
|
74
|
+
var addressHalf = whitelist.whitelist[0].addressHalf;
|
|
75
|
+
expect(addressHalf).toBe('1234567890abcdef1234567890abcdef12345678'.slice(-20));
|
|
76
|
+
// Create a new address by duplicating the address half (like in the user's scenario)
|
|
77
|
+
var reconstructedAddress = new Address(addressHalf + addressHalf);
|
|
78
|
+
expect(whitelist.isWhitelisted(reconstructedAddress)).toBe(true);
|
|
79
|
+
expect(reconstructedAddress.toString().slice(-20)).toBe(addressHalf);
|
|
80
|
+
expect(reconstructedAddress.lastHalf()).toBe('0x' + addressHalf);
|
|
81
|
+
});
|
|
64
82
|
});
|
package/dist/esm/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@1inch/fusion-sdk","version":"2.3.
|
|
1
|
+
{"name":"@1inch/fusion-sdk","version":"2.3.8","type":"module"}
|
|
@@ -393,6 +393,7 @@ describe(__filename, function() {
|
|
|
393
393
|
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
394
394
|
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
395
395
|
remainingMakerAmount: '30000000000000000000',
|
|
396
|
+
isMakerContract: false,
|
|
396
397
|
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
397
398
|
}
|
|
398
399
|
};
|
|
@@ -447,6 +448,7 @@ describe(__filename, function() {
|
|
|
447
448
|
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
448
449
|
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
449
450
|
remainingMakerAmount: '30000000000000000000',
|
|
451
|
+
isMakerContract: false,
|
|
450
452
|
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
451
453
|
}
|
|
452
454
|
};
|
|
@@ -505,6 +507,7 @@ describe(__filename, function() {
|
|
|
505
507
|
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
506
508
|
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
507
509
|
remainingMakerAmount: '30000000000000000000',
|
|
510
|
+
isMakerContract: false,
|
|
508
511
|
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
509
512
|
}
|
|
510
513
|
};
|
|
@@ -562,6 +565,7 @@ describe(__filename, function() {
|
|
|
562
565
|
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
563
566
|
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
564
567
|
remainingMakerAmount: '30000000000000000000',
|
|
568
|
+
isMakerContract: false,
|
|
565
569
|
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
566
570
|
}
|
|
567
571
|
};
|
|
@@ -622,6 +626,7 @@ describe(__filename, function() {
|
|
|
622
626
|
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
623
627
|
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
624
628
|
remainingMakerAmount: '30000000000000000000',
|
|
629
|
+
isMakerContract: false,
|
|
625
630
|
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
626
631
|
}
|
|
627
632
|
};
|
|
@@ -679,6 +684,7 @@ describe(__filename, function() {
|
|
|
679
684
|
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
680
685
|
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
681
686
|
remainingMakerAmount: '30000000000000000000',
|
|
687
|
+
isMakerContract: false,
|
|
682
688
|
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
683
689
|
}
|
|
684
690
|
};
|
|
@@ -737,6 +743,7 @@ describe(__filename, function() {
|
|
|
737
743
|
auctionStartDate: '2024-04-29T15:17:27.000Z',
|
|
738
744
|
auctionEndDate: '2024-04-29T15:27:27.000Z',
|
|
739
745
|
remainingMakerAmount: '30000000000000000000',
|
|
746
|
+
isMakerContract: false,
|
|
740
747
|
extension: '0x000000cb0000005e0000005e0000005e0000005e0000002f0000000000000000fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b84000000000000000662fba0700025829a7fd01ec57001827bba60018fb2809a5314473e1165f6b58018e20ed8f07b840662fb9efb09498030ae3416b66dc00007bf29735c20c566e5a0c0000950fa635aec75b30781a0000d18bd45f0b94f54a968f000076d49414ad2b8371a4220000a59ca88d5813e693528f000038700d5181a674fdb9a2000038'
|
|
741
748
|
}
|
|
742
749
|
};
|
|
@@ -18,6 +18,7 @@ export type OrderCreatedEvent = Event<'order_created', {
|
|
|
18
18
|
auctionEndDate: string;
|
|
19
19
|
remainingMakerAmount: string;
|
|
20
20
|
extension: string;
|
|
21
|
+
isMakerContract: boolean;
|
|
21
22
|
}>;
|
|
22
23
|
export type OrderBalanceOrAllowanceChangeEvent = Event<'order_balance_or_allowance_change', {
|
|
23
24
|
orderHash: string;
|