@defisaver/sdk 1.3.30 → 1.3.31-midnight-dev
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/esm/src/actions/checkers/SparkRatioCheckAction.d.ts +4 -2
- package/esm/src/actions/checkers/SparkRatioCheckAction.js +6 -2
- package/esm/src/actions/checkers/SparkTargetRatioCheck.d.ts +2 -1
- package/esm/src/actions/checkers/SparkTargetRatioCheck.js +4 -2
- package/esm/src/addresses.d.ts +16 -16
- package/esm/src/addresses.js +6 -0
- package/esm/src/index.d.ts +64 -64
- package/package.json +1 -1
- package/src/actions/checkers/SparkRatioCheckAction.ts +18 -4
- package/src/actions/checkers/SparkTargetRatioCheck.ts +14 -3
- package/src/addresses.ts +7 -0
- package/umd/index.js +17 -5
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Action } from '../../Action';
|
|
2
|
-
import { uint8, uint256 } from '../../types';
|
|
2
|
+
import { uint8, uint256, EthAddress } from '../../types';
|
|
3
3
|
/**
|
|
4
4
|
* SparkRatioCheckAction - Checks spark ratio for users proxy position and reverts if faulty
|
|
5
5
|
*
|
|
@@ -9,6 +9,8 @@ export declare class SparkRatioCheckAction extends Action {
|
|
|
9
9
|
/**
|
|
10
10
|
* @param ratioState If it should lower/higher
|
|
11
11
|
* @param targetRatio The ratio user want to be at
|
|
12
|
+
* @param market Address provider for specific market. This param was added later
|
|
13
|
+
* @param user Address of the user (EOA/SW). This param was added later
|
|
12
14
|
*/
|
|
13
|
-
constructor(ratioState: uint8, targetRatio: uint256);
|
|
15
|
+
constructor(ratioState: uint8, targetRatio: uint256, market?: EthAddress, user?: EthAddress);
|
|
14
16
|
}
|
|
@@ -9,12 +9,16 @@ export class SparkRatioCheckAction extends Action {
|
|
|
9
9
|
/**
|
|
10
10
|
* @param ratioState If it should lower/higher
|
|
11
11
|
* @param targetRatio The ratio user want to be at
|
|
12
|
+
* @param market Address provider for specific market. This param was added later
|
|
13
|
+
* @param user Address of the user (EOA/SW). This param was added later
|
|
12
14
|
*/
|
|
13
|
-
constructor(ratioState, targetRatio) {
|
|
14
|
-
super('SparkRatioCheck', getAddr('Empty'), ['uint8', 'uint256'], [ratioState, targetRatio]);
|
|
15
|
+
constructor(ratioState, targetRatio, market = getAddr('Empty'), user = getAddr('Empty')) {
|
|
16
|
+
super('SparkRatioCheck', getAddr('Empty'), ['uint8', 'uint256', 'address', 'address'], [ratioState, targetRatio, market, user]);
|
|
15
17
|
this.mappableArgs = [
|
|
16
18
|
this.args[0],
|
|
17
19
|
this.args[1],
|
|
20
|
+
this.args[2],
|
|
21
|
+
this.args[3],
|
|
18
22
|
];
|
|
19
23
|
}
|
|
20
24
|
}
|
|
@@ -9,6 +9,7 @@ export declare class SparkTargetRatioCheck extends Action {
|
|
|
9
9
|
/**
|
|
10
10
|
* @param targetRatio The ratio user want to be at
|
|
11
11
|
* @param market Address of the market
|
|
12
|
+
* @param user Address of the user (EOA/SW). This param was added later
|
|
12
13
|
*/
|
|
13
|
-
constructor(targetRatio: uint256, market: EthAddress);
|
|
14
|
+
constructor(targetRatio: uint256, market: EthAddress, user?: EthAddress);
|
|
14
15
|
}
|
|
@@ -9,12 +9,14 @@ export class SparkTargetRatioCheck extends Action {
|
|
|
9
9
|
/**
|
|
10
10
|
* @param targetRatio The ratio user want to be at
|
|
11
11
|
* @param market Address of the market
|
|
12
|
+
* @param user Address of the user (EOA/SW). This param was added later
|
|
12
13
|
*/
|
|
13
|
-
constructor(targetRatio, market) {
|
|
14
|
-
super('SparkTargetRatioCheck', getAddr('Empty'), ['uint256', 'address'], [targetRatio, market]);
|
|
14
|
+
constructor(targetRatio, market, user = getAddr('Empty')) {
|
|
15
|
+
super('SparkTargetRatioCheck', getAddr('Empty'), ['uint256', 'address', 'address'], [targetRatio, market, user]);
|
|
15
16
|
this.mappableArgs = [
|
|
16
17
|
this.args[0],
|
|
17
18
|
this.args[1],
|
|
19
|
+
this.args[2],
|
|
18
20
|
];
|
|
19
21
|
}
|
|
20
22
|
}
|
package/esm/src/addresses.d.ts
CHANGED
|
@@ -290,16 +290,16 @@ export declare const actionAddresses: {
|
|
|
290
290
|
AaveV4DelegateWithdrawWithSig: string;
|
|
291
291
|
AaveV4DelegateBorrowWithSig: string;
|
|
292
292
|
AaveV4DelegateSetUsingAsCollateralWithSig: string;
|
|
293
|
+
MidnightPaybackDirect: string;
|
|
294
|
+
MidnightBorrowFromOrders: string;
|
|
295
|
+
MidnightPaybackFromOrders: string;
|
|
296
|
+
MidnightSupplyCollateral: string;
|
|
297
|
+
MidnightWithdrawCollateral: string;
|
|
298
|
+
MidnightView: string;
|
|
293
299
|
AaveV3RatioTrigger?: undefined;
|
|
294
300
|
GasFeeTakerL2?: undefined;
|
|
295
301
|
AaveV3RatioCheck?: undefined;
|
|
296
302
|
MorphoBlueView?: undefined;
|
|
297
|
-
MidnightPaybackDirect?: undefined;
|
|
298
|
-
MidnightBorrowFromOrders?: undefined;
|
|
299
|
-
MidnightPaybackFromOrders?: undefined;
|
|
300
|
-
MidnightSupplyCollateral?: undefined;
|
|
301
|
-
MidnightWithdrawCollateral?: undefined;
|
|
302
|
-
MidnightView?: undefined;
|
|
303
303
|
} | {
|
|
304
304
|
DFSSell: string;
|
|
305
305
|
DFSSellNoFee: string;
|
|
@@ -593,13 +593,13 @@ export declare const actionAddresses: {
|
|
|
593
593
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
594
594
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
595
595
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
596
|
-
MorphoBlueView?: undefined;
|
|
597
596
|
MidnightPaybackDirect?: undefined;
|
|
598
597
|
MidnightBorrowFromOrders?: undefined;
|
|
599
598
|
MidnightPaybackFromOrders?: undefined;
|
|
600
599
|
MidnightSupplyCollateral?: undefined;
|
|
601
600
|
MidnightWithdrawCollateral?: undefined;
|
|
602
601
|
MidnightView?: undefined;
|
|
602
|
+
MorphoBlueView?: undefined;
|
|
603
603
|
} | {
|
|
604
604
|
DFSSell: string;
|
|
605
605
|
DFSSellNoFee: string;
|
|
@@ -893,13 +893,13 @@ export declare const actionAddresses: {
|
|
|
893
893
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
894
894
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
895
895
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
896
|
-
AaveV3RatioTrigger?: undefined;
|
|
897
896
|
MidnightPaybackDirect?: undefined;
|
|
898
897
|
MidnightBorrowFromOrders?: undefined;
|
|
899
898
|
MidnightPaybackFromOrders?: undefined;
|
|
900
899
|
MidnightSupplyCollateral?: undefined;
|
|
901
900
|
MidnightWithdrawCollateral?: undefined;
|
|
902
901
|
MidnightView?: undefined;
|
|
902
|
+
AaveV3RatioTrigger?: undefined;
|
|
903
903
|
} | {
|
|
904
904
|
DFSSell: string;
|
|
905
905
|
DFSSellNoFee: string;
|
|
@@ -1490,16 +1490,16 @@ export declare const actionAddresses: {
|
|
|
1490
1490
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
1491
1491
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
1492
1492
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
1493
|
-
AaveV3RatioTrigger?: undefined;
|
|
1494
|
-
GasFeeTakerL2?: undefined;
|
|
1495
|
-
AaveV3RatioCheck?: undefined;
|
|
1496
|
-
MorphoBlueView?: undefined;
|
|
1497
1493
|
MidnightPaybackDirect?: undefined;
|
|
1498
1494
|
MidnightBorrowFromOrders?: undefined;
|
|
1499
1495
|
MidnightPaybackFromOrders?: undefined;
|
|
1500
1496
|
MidnightSupplyCollateral?: undefined;
|
|
1501
1497
|
MidnightWithdrawCollateral?: undefined;
|
|
1502
1498
|
MidnightView?: undefined;
|
|
1499
|
+
AaveV3RatioTrigger?: undefined;
|
|
1500
|
+
GasFeeTakerL2?: undefined;
|
|
1501
|
+
AaveV3RatioCheck?: undefined;
|
|
1502
|
+
MorphoBlueView?: undefined;
|
|
1503
1503
|
} | {
|
|
1504
1504
|
DFSSell: string;
|
|
1505
1505
|
DFSSellNoFee: string;
|
|
@@ -1790,16 +1790,16 @@ export declare const actionAddresses: {
|
|
|
1790
1790
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
1791
1791
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
1792
1792
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
1793
|
-
AaveV3RatioTrigger?: undefined;
|
|
1794
|
-
GasFeeTakerL2?: undefined;
|
|
1795
|
-
AaveV3RatioCheck?: undefined;
|
|
1796
|
-
MorphoBlueView?: undefined;
|
|
1797
1793
|
MidnightPaybackDirect?: undefined;
|
|
1798
1794
|
MidnightBorrowFromOrders?: undefined;
|
|
1799
1795
|
MidnightPaybackFromOrders?: undefined;
|
|
1800
1796
|
MidnightSupplyCollateral?: undefined;
|
|
1801
1797
|
MidnightWithdrawCollateral?: undefined;
|
|
1802
1798
|
MidnightView?: undefined;
|
|
1799
|
+
AaveV3RatioTrigger?: undefined;
|
|
1800
|
+
GasFeeTakerL2?: undefined;
|
|
1801
|
+
AaveV3RatioCheck?: undefined;
|
|
1802
|
+
MorphoBlueView?: undefined;
|
|
1803
1803
|
};
|
|
1804
1804
|
};
|
|
1805
1805
|
export declare const otherAddresses: {
|
package/esm/src/addresses.js
CHANGED
|
@@ -332,6 +332,12 @@ export const actionAddresses = {
|
|
|
332
332
|
AaveV4DelegateWithdrawWithSig: '0x81864dBd69c46B19463eC7BEC6cE0B271126531a',
|
|
333
333
|
AaveV4DelegateBorrowWithSig: '0x9D68b41BB9f9e9Ac1E1ee49d3566CAd4624886BA',
|
|
334
334
|
AaveV4DelegateSetUsingAsCollateralWithSig: '0xF3D7C7e8F5154c669EAA0dE996cdE0575D7d3A00',
|
|
335
|
+
MidnightPaybackDirect: '0x2911FFF5C567Ac71d653AAf5919410A3e078D186',
|
|
336
|
+
MidnightBorrowFromOrders: '0xB37fB30b93e1D5b0E870312997426c4a04Cff8Ce',
|
|
337
|
+
MidnightPaybackFromOrders: '0x55cd72fB914A60587a88962Efa680117aE900729',
|
|
338
|
+
MidnightSupplyCollateral: '0x32e25a420cF132832173AFfF7e74a7A0F9EC7430',
|
|
339
|
+
MidnightWithdrawCollateral: '0x4791Ffa530757AC56Cab7857291557ad3ef8b370',
|
|
340
|
+
MidnightView: '0xB64FBf011343961D9AC4A04b714414E35ebE6BE0',
|
|
335
341
|
},
|
|
336
342
|
[NETWORKS.optimism.chainId]: {
|
|
337
343
|
DFSSell: '0x9f234af5c10c136863a20865ba00b26951ab8269',
|
package/esm/src/index.d.ts
CHANGED
|
@@ -301,16 +301,16 @@ declare const actionAddressesAllChains: {
|
|
|
301
301
|
AaveV4DelegateWithdrawWithSig: string;
|
|
302
302
|
AaveV4DelegateBorrowWithSig: string;
|
|
303
303
|
AaveV4DelegateSetUsingAsCollateralWithSig: string;
|
|
304
|
+
MidnightPaybackDirect: string;
|
|
305
|
+
MidnightBorrowFromOrders: string;
|
|
306
|
+
MidnightPaybackFromOrders: string;
|
|
307
|
+
MidnightSupplyCollateral: string;
|
|
308
|
+
MidnightWithdrawCollateral: string;
|
|
309
|
+
MidnightView: string;
|
|
304
310
|
AaveV3RatioTrigger?: undefined;
|
|
305
311
|
GasFeeTakerL2?: undefined;
|
|
306
312
|
AaveV3RatioCheck?: undefined;
|
|
307
313
|
MorphoBlueView?: undefined;
|
|
308
|
-
MidnightPaybackDirect?: undefined;
|
|
309
|
-
MidnightBorrowFromOrders?: undefined;
|
|
310
|
-
MidnightPaybackFromOrders?: undefined;
|
|
311
|
-
MidnightSupplyCollateral?: undefined;
|
|
312
|
-
MidnightWithdrawCollateral?: undefined;
|
|
313
|
-
MidnightView?: undefined;
|
|
314
314
|
} | {
|
|
315
315
|
DFSSell: string;
|
|
316
316
|
DFSSellNoFee: string;
|
|
@@ -604,13 +604,13 @@ declare const actionAddressesAllChains: {
|
|
|
604
604
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
605
605
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
606
606
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
607
|
-
MorphoBlueView?: undefined;
|
|
608
607
|
MidnightPaybackDirect?: undefined;
|
|
609
608
|
MidnightBorrowFromOrders?: undefined;
|
|
610
609
|
MidnightPaybackFromOrders?: undefined;
|
|
611
610
|
MidnightSupplyCollateral?: undefined;
|
|
612
611
|
MidnightWithdrawCollateral?: undefined;
|
|
613
612
|
MidnightView?: undefined;
|
|
613
|
+
MorphoBlueView?: undefined;
|
|
614
614
|
} | {
|
|
615
615
|
DFSSell: string;
|
|
616
616
|
DFSSellNoFee: string;
|
|
@@ -904,13 +904,13 @@ declare const actionAddressesAllChains: {
|
|
|
904
904
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
905
905
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
906
906
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
907
|
-
AaveV3RatioTrigger?: undefined;
|
|
908
907
|
MidnightPaybackDirect?: undefined;
|
|
909
908
|
MidnightBorrowFromOrders?: undefined;
|
|
910
909
|
MidnightPaybackFromOrders?: undefined;
|
|
911
910
|
MidnightSupplyCollateral?: undefined;
|
|
912
911
|
MidnightWithdrawCollateral?: undefined;
|
|
913
912
|
MidnightView?: undefined;
|
|
913
|
+
AaveV3RatioTrigger?: undefined;
|
|
914
914
|
} | {
|
|
915
915
|
DFSSell: string;
|
|
916
916
|
DFSSellNoFee: string;
|
|
@@ -1501,16 +1501,16 @@ declare const actionAddressesAllChains: {
|
|
|
1501
1501
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
1502
1502
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
1503
1503
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
1504
|
-
AaveV3RatioTrigger?: undefined;
|
|
1505
|
-
GasFeeTakerL2?: undefined;
|
|
1506
|
-
AaveV3RatioCheck?: undefined;
|
|
1507
|
-
MorphoBlueView?: undefined;
|
|
1508
1504
|
MidnightPaybackDirect?: undefined;
|
|
1509
1505
|
MidnightBorrowFromOrders?: undefined;
|
|
1510
1506
|
MidnightPaybackFromOrders?: undefined;
|
|
1511
1507
|
MidnightSupplyCollateral?: undefined;
|
|
1512
1508
|
MidnightWithdrawCollateral?: undefined;
|
|
1513
1509
|
MidnightView?: undefined;
|
|
1510
|
+
AaveV3RatioTrigger?: undefined;
|
|
1511
|
+
GasFeeTakerL2?: undefined;
|
|
1512
|
+
AaveV3RatioCheck?: undefined;
|
|
1513
|
+
MorphoBlueView?: undefined;
|
|
1514
1514
|
} | {
|
|
1515
1515
|
DFSSell: string;
|
|
1516
1516
|
DFSSellNoFee: string;
|
|
@@ -1801,16 +1801,16 @@ declare const actionAddressesAllChains: {
|
|
|
1801
1801
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
1802
1802
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
1803
1803
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
1804
|
-
AaveV3RatioTrigger?: undefined;
|
|
1805
|
-
GasFeeTakerL2?: undefined;
|
|
1806
|
-
AaveV3RatioCheck?: undefined;
|
|
1807
|
-
MorphoBlueView?: undefined;
|
|
1808
1804
|
MidnightPaybackDirect?: undefined;
|
|
1809
1805
|
MidnightBorrowFromOrders?: undefined;
|
|
1810
1806
|
MidnightPaybackFromOrders?: undefined;
|
|
1811
1807
|
MidnightSupplyCollateral?: undefined;
|
|
1812
1808
|
MidnightWithdrawCollateral?: undefined;
|
|
1813
1809
|
MidnightView?: undefined;
|
|
1810
|
+
AaveV3RatioTrigger?: undefined;
|
|
1811
|
+
GasFeeTakerL2?: undefined;
|
|
1812
|
+
AaveV3RatioCheck?: undefined;
|
|
1813
|
+
MorphoBlueView?: undefined;
|
|
1814
1814
|
};
|
|
1815
1815
|
};
|
|
1816
1816
|
declare const actionAddresses: (chainId?: null) => {
|
|
@@ -2103,16 +2103,16 @@ declare const actionAddresses: (chainId?: null) => {
|
|
|
2103
2103
|
AaveV4DelegateWithdrawWithSig: string;
|
|
2104
2104
|
AaveV4DelegateBorrowWithSig: string;
|
|
2105
2105
|
AaveV4DelegateSetUsingAsCollateralWithSig: string;
|
|
2106
|
+
MidnightPaybackDirect: string;
|
|
2107
|
+
MidnightBorrowFromOrders: string;
|
|
2108
|
+
MidnightPaybackFromOrders: string;
|
|
2109
|
+
MidnightSupplyCollateral: string;
|
|
2110
|
+
MidnightWithdrawCollateral: string;
|
|
2111
|
+
MidnightView: string;
|
|
2106
2112
|
AaveV3RatioTrigger?: undefined;
|
|
2107
2113
|
GasFeeTakerL2?: undefined;
|
|
2108
2114
|
AaveV3RatioCheck?: undefined;
|
|
2109
2115
|
MorphoBlueView?: undefined;
|
|
2110
|
-
MidnightPaybackDirect?: undefined;
|
|
2111
|
-
MidnightBorrowFromOrders?: undefined;
|
|
2112
|
-
MidnightPaybackFromOrders?: undefined;
|
|
2113
|
-
MidnightSupplyCollateral?: undefined;
|
|
2114
|
-
MidnightWithdrawCollateral?: undefined;
|
|
2115
|
-
MidnightView?: undefined;
|
|
2116
2116
|
} | {
|
|
2117
2117
|
DFSSell: string;
|
|
2118
2118
|
DFSSellNoFee: string;
|
|
@@ -2406,13 +2406,13 @@ declare const actionAddresses: (chainId?: null) => {
|
|
|
2406
2406
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
2407
2407
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
2408
2408
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
2409
|
-
MorphoBlueView?: undefined;
|
|
2410
2409
|
MidnightPaybackDirect?: undefined;
|
|
2411
2410
|
MidnightBorrowFromOrders?: undefined;
|
|
2412
2411
|
MidnightPaybackFromOrders?: undefined;
|
|
2413
2412
|
MidnightSupplyCollateral?: undefined;
|
|
2414
2413
|
MidnightWithdrawCollateral?: undefined;
|
|
2415
2414
|
MidnightView?: undefined;
|
|
2415
|
+
MorphoBlueView?: undefined;
|
|
2416
2416
|
} | {
|
|
2417
2417
|
DFSSell: string;
|
|
2418
2418
|
DFSSellNoFee: string;
|
|
@@ -2706,13 +2706,13 @@ declare const actionAddresses: (chainId?: null) => {
|
|
|
2706
2706
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
2707
2707
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
2708
2708
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
2709
|
-
AaveV3RatioTrigger?: undefined;
|
|
2710
2709
|
MidnightPaybackDirect?: undefined;
|
|
2711
2710
|
MidnightBorrowFromOrders?: undefined;
|
|
2712
2711
|
MidnightPaybackFromOrders?: undefined;
|
|
2713
2712
|
MidnightSupplyCollateral?: undefined;
|
|
2714
2713
|
MidnightWithdrawCollateral?: undefined;
|
|
2715
2714
|
MidnightView?: undefined;
|
|
2715
|
+
AaveV3RatioTrigger?: undefined;
|
|
2716
2716
|
} | {
|
|
2717
2717
|
DFSSell: string;
|
|
2718
2718
|
DFSSellNoFee: string;
|
|
@@ -3303,16 +3303,16 @@ declare const actionAddresses: (chainId?: null) => {
|
|
|
3303
3303
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
3304
3304
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
3305
3305
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
3306
|
-
AaveV3RatioTrigger?: undefined;
|
|
3307
|
-
GasFeeTakerL2?: undefined;
|
|
3308
|
-
AaveV3RatioCheck?: undefined;
|
|
3309
|
-
MorphoBlueView?: undefined;
|
|
3310
3306
|
MidnightPaybackDirect?: undefined;
|
|
3311
3307
|
MidnightBorrowFromOrders?: undefined;
|
|
3312
3308
|
MidnightPaybackFromOrders?: undefined;
|
|
3313
3309
|
MidnightSupplyCollateral?: undefined;
|
|
3314
3310
|
MidnightWithdrawCollateral?: undefined;
|
|
3315
3311
|
MidnightView?: undefined;
|
|
3312
|
+
AaveV3RatioTrigger?: undefined;
|
|
3313
|
+
GasFeeTakerL2?: undefined;
|
|
3314
|
+
AaveV3RatioCheck?: undefined;
|
|
3315
|
+
MorphoBlueView?: undefined;
|
|
3316
3316
|
} | {
|
|
3317
3317
|
DFSSell: string;
|
|
3318
3318
|
DFSSellNoFee: string;
|
|
@@ -3603,16 +3603,16 @@ declare const actionAddresses: (chainId?: null) => {
|
|
|
3603
3603
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
3604
3604
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
3605
3605
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
3606
|
-
AaveV3RatioTrigger?: undefined;
|
|
3607
|
-
GasFeeTakerL2?: undefined;
|
|
3608
|
-
AaveV3RatioCheck?: undefined;
|
|
3609
|
-
MorphoBlueView?: undefined;
|
|
3610
3606
|
MidnightPaybackDirect?: undefined;
|
|
3611
3607
|
MidnightBorrowFromOrders?: undefined;
|
|
3612
3608
|
MidnightPaybackFromOrders?: undefined;
|
|
3613
3609
|
MidnightSupplyCollateral?: undefined;
|
|
3614
3610
|
MidnightWithdrawCollateral?: undefined;
|
|
3615
3611
|
MidnightView?: undefined;
|
|
3612
|
+
AaveV3RatioTrigger?: undefined;
|
|
3613
|
+
GasFeeTakerL2?: undefined;
|
|
3614
|
+
AaveV3RatioCheck?: undefined;
|
|
3615
|
+
MorphoBlueView?: undefined;
|
|
3616
3616
|
};
|
|
3617
3617
|
declare const otherAddressesAllChains: {
|
|
3618
3618
|
[x: number]: {
|
|
@@ -4142,16 +4142,16 @@ declare const _default: {
|
|
|
4142
4142
|
AaveV4DelegateWithdrawWithSig: string;
|
|
4143
4143
|
AaveV4DelegateBorrowWithSig: string;
|
|
4144
4144
|
AaveV4DelegateSetUsingAsCollateralWithSig: string;
|
|
4145
|
+
MidnightPaybackDirect: string;
|
|
4146
|
+
MidnightBorrowFromOrders: string;
|
|
4147
|
+
MidnightPaybackFromOrders: string;
|
|
4148
|
+
MidnightSupplyCollateral: string;
|
|
4149
|
+
MidnightWithdrawCollateral: string;
|
|
4150
|
+
MidnightView: string;
|
|
4145
4151
|
AaveV3RatioTrigger?: undefined;
|
|
4146
4152
|
GasFeeTakerL2?: undefined;
|
|
4147
4153
|
AaveV3RatioCheck?: undefined;
|
|
4148
4154
|
MorphoBlueView?: undefined;
|
|
4149
|
-
MidnightPaybackDirect?: undefined;
|
|
4150
|
-
MidnightBorrowFromOrders?: undefined;
|
|
4151
|
-
MidnightPaybackFromOrders?: undefined;
|
|
4152
|
-
MidnightSupplyCollateral?: undefined;
|
|
4153
|
-
MidnightWithdrawCollateral?: undefined;
|
|
4154
|
-
MidnightView?: undefined;
|
|
4155
4155
|
} | {
|
|
4156
4156
|
DFSSell: string;
|
|
4157
4157
|
DFSSellNoFee: string;
|
|
@@ -4445,13 +4445,13 @@ declare const _default: {
|
|
|
4445
4445
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
4446
4446
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
4447
4447
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
4448
|
-
MorphoBlueView?: undefined;
|
|
4449
4448
|
MidnightPaybackDirect?: undefined;
|
|
4450
4449
|
MidnightBorrowFromOrders?: undefined;
|
|
4451
4450
|
MidnightPaybackFromOrders?: undefined;
|
|
4452
4451
|
MidnightSupplyCollateral?: undefined;
|
|
4453
4452
|
MidnightWithdrawCollateral?: undefined;
|
|
4454
4453
|
MidnightView?: undefined;
|
|
4454
|
+
MorphoBlueView?: undefined;
|
|
4455
4455
|
} | {
|
|
4456
4456
|
DFSSell: string;
|
|
4457
4457
|
DFSSellNoFee: string;
|
|
@@ -4745,13 +4745,13 @@ declare const _default: {
|
|
|
4745
4745
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
4746
4746
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
4747
4747
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
4748
|
-
AaveV3RatioTrigger?: undefined;
|
|
4749
4748
|
MidnightPaybackDirect?: undefined;
|
|
4750
4749
|
MidnightBorrowFromOrders?: undefined;
|
|
4751
4750
|
MidnightPaybackFromOrders?: undefined;
|
|
4752
4751
|
MidnightSupplyCollateral?: undefined;
|
|
4753
4752
|
MidnightWithdrawCollateral?: undefined;
|
|
4754
4753
|
MidnightView?: undefined;
|
|
4754
|
+
AaveV3RatioTrigger?: undefined;
|
|
4755
4755
|
} | {
|
|
4756
4756
|
DFSSell: string;
|
|
4757
4757
|
DFSSellNoFee: string;
|
|
@@ -5342,16 +5342,16 @@ declare const _default: {
|
|
|
5342
5342
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
5343
5343
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
5344
5344
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
5345
|
-
AaveV3RatioTrigger?: undefined;
|
|
5346
|
-
GasFeeTakerL2?: undefined;
|
|
5347
|
-
AaveV3RatioCheck?: undefined;
|
|
5348
|
-
MorphoBlueView?: undefined;
|
|
5349
5345
|
MidnightPaybackDirect?: undefined;
|
|
5350
5346
|
MidnightBorrowFromOrders?: undefined;
|
|
5351
5347
|
MidnightPaybackFromOrders?: undefined;
|
|
5352
5348
|
MidnightSupplyCollateral?: undefined;
|
|
5353
5349
|
MidnightWithdrawCollateral?: undefined;
|
|
5354
5350
|
MidnightView?: undefined;
|
|
5351
|
+
AaveV3RatioTrigger?: undefined;
|
|
5352
|
+
GasFeeTakerL2?: undefined;
|
|
5353
|
+
AaveV3RatioCheck?: undefined;
|
|
5354
|
+
MorphoBlueView?: undefined;
|
|
5355
5355
|
} | {
|
|
5356
5356
|
DFSSell: string;
|
|
5357
5357
|
DFSSellNoFee: string;
|
|
@@ -5642,16 +5642,16 @@ declare const _default: {
|
|
|
5642
5642
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
5643
5643
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
5644
5644
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
5645
|
-
AaveV3RatioTrigger?: undefined;
|
|
5646
|
-
GasFeeTakerL2?: undefined;
|
|
5647
|
-
AaveV3RatioCheck?: undefined;
|
|
5648
|
-
MorphoBlueView?: undefined;
|
|
5649
5645
|
MidnightPaybackDirect?: undefined;
|
|
5650
5646
|
MidnightBorrowFromOrders?: undefined;
|
|
5651
5647
|
MidnightPaybackFromOrders?: undefined;
|
|
5652
5648
|
MidnightSupplyCollateral?: undefined;
|
|
5653
5649
|
MidnightWithdrawCollateral?: undefined;
|
|
5654
5650
|
MidnightView?: undefined;
|
|
5651
|
+
AaveV3RatioTrigger?: undefined;
|
|
5652
|
+
GasFeeTakerL2?: undefined;
|
|
5653
|
+
AaveV3RatioCheck?: undefined;
|
|
5654
|
+
MorphoBlueView?: undefined;
|
|
5655
5655
|
};
|
|
5656
5656
|
actionAddressesAllChains: {
|
|
5657
5657
|
[x: number]: {
|
|
@@ -5944,16 +5944,16 @@ declare const _default: {
|
|
|
5944
5944
|
AaveV4DelegateWithdrawWithSig: string;
|
|
5945
5945
|
AaveV4DelegateBorrowWithSig: string;
|
|
5946
5946
|
AaveV4DelegateSetUsingAsCollateralWithSig: string;
|
|
5947
|
+
MidnightPaybackDirect: string;
|
|
5948
|
+
MidnightBorrowFromOrders: string;
|
|
5949
|
+
MidnightPaybackFromOrders: string;
|
|
5950
|
+
MidnightSupplyCollateral: string;
|
|
5951
|
+
MidnightWithdrawCollateral: string;
|
|
5952
|
+
MidnightView: string;
|
|
5947
5953
|
AaveV3RatioTrigger?: undefined;
|
|
5948
5954
|
GasFeeTakerL2?: undefined;
|
|
5949
5955
|
AaveV3RatioCheck?: undefined;
|
|
5950
5956
|
MorphoBlueView?: undefined;
|
|
5951
|
-
MidnightPaybackDirect?: undefined;
|
|
5952
|
-
MidnightBorrowFromOrders?: undefined;
|
|
5953
|
-
MidnightPaybackFromOrders?: undefined;
|
|
5954
|
-
MidnightSupplyCollateral?: undefined;
|
|
5955
|
-
MidnightWithdrawCollateral?: undefined;
|
|
5956
|
-
MidnightView?: undefined;
|
|
5957
5957
|
} | {
|
|
5958
5958
|
DFSSell: string;
|
|
5959
5959
|
DFSSellNoFee: string;
|
|
@@ -6247,13 +6247,13 @@ declare const _default: {
|
|
|
6247
6247
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
6248
6248
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
6249
6249
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
6250
|
-
MorphoBlueView?: undefined;
|
|
6251
6250
|
MidnightPaybackDirect?: undefined;
|
|
6252
6251
|
MidnightBorrowFromOrders?: undefined;
|
|
6253
6252
|
MidnightPaybackFromOrders?: undefined;
|
|
6254
6253
|
MidnightSupplyCollateral?: undefined;
|
|
6255
6254
|
MidnightWithdrawCollateral?: undefined;
|
|
6256
6255
|
MidnightView?: undefined;
|
|
6256
|
+
MorphoBlueView?: undefined;
|
|
6257
6257
|
} | {
|
|
6258
6258
|
DFSSell: string;
|
|
6259
6259
|
DFSSellNoFee: string;
|
|
@@ -6547,13 +6547,13 @@ declare const _default: {
|
|
|
6547
6547
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
6548
6548
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
6549
6549
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
6550
|
-
AaveV3RatioTrigger?: undefined;
|
|
6551
6550
|
MidnightPaybackDirect?: undefined;
|
|
6552
6551
|
MidnightBorrowFromOrders?: undefined;
|
|
6553
6552
|
MidnightPaybackFromOrders?: undefined;
|
|
6554
6553
|
MidnightSupplyCollateral?: undefined;
|
|
6555
6554
|
MidnightWithdrawCollateral?: undefined;
|
|
6556
6555
|
MidnightView?: undefined;
|
|
6556
|
+
AaveV3RatioTrigger?: undefined;
|
|
6557
6557
|
} | {
|
|
6558
6558
|
DFSSell: string;
|
|
6559
6559
|
DFSSellNoFee: string;
|
|
@@ -7144,16 +7144,16 @@ declare const _default: {
|
|
|
7144
7144
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
7145
7145
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
7146
7146
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
7147
|
-
AaveV3RatioTrigger?: undefined;
|
|
7148
|
-
GasFeeTakerL2?: undefined;
|
|
7149
|
-
AaveV3RatioCheck?: undefined;
|
|
7150
|
-
MorphoBlueView?: undefined;
|
|
7151
7147
|
MidnightPaybackDirect?: undefined;
|
|
7152
7148
|
MidnightBorrowFromOrders?: undefined;
|
|
7153
7149
|
MidnightPaybackFromOrders?: undefined;
|
|
7154
7150
|
MidnightSupplyCollateral?: undefined;
|
|
7155
7151
|
MidnightWithdrawCollateral?: undefined;
|
|
7156
7152
|
MidnightView?: undefined;
|
|
7153
|
+
AaveV3RatioTrigger?: undefined;
|
|
7154
|
+
GasFeeTakerL2?: undefined;
|
|
7155
|
+
AaveV3RatioCheck?: undefined;
|
|
7156
|
+
MorphoBlueView?: undefined;
|
|
7157
7157
|
} | {
|
|
7158
7158
|
DFSSell: string;
|
|
7159
7159
|
DFSSellNoFee: string;
|
|
@@ -7444,16 +7444,16 @@ declare const _default: {
|
|
|
7444
7444
|
AaveV4DelegateWithdrawWithSig?: undefined;
|
|
7445
7445
|
AaveV4DelegateBorrowWithSig?: undefined;
|
|
7446
7446
|
AaveV4DelegateSetUsingAsCollateralWithSig?: undefined;
|
|
7447
|
-
AaveV3RatioTrigger?: undefined;
|
|
7448
|
-
GasFeeTakerL2?: undefined;
|
|
7449
|
-
AaveV3RatioCheck?: undefined;
|
|
7450
|
-
MorphoBlueView?: undefined;
|
|
7451
7447
|
MidnightPaybackDirect?: undefined;
|
|
7452
7448
|
MidnightBorrowFromOrders?: undefined;
|
|
7453
7449
|
MidnightPaybackFromOrders?: undefined;
|
|
7454
7450
|
MidnightSupplyCollateral?: undefined;
|
|
7455
7451
|
MidnightWithdrawCollateral?: undefined;
|
|
7456
7452
|
MidnightView?: undefined;
|
|
7453
|
+
AaveV3RatioTrigger?: undefined;
|
|
7454
|
+
GasFeeTakerL2?: undefined;
|
|
7455
|
+
AaveV3RatioCheck?: undefined;
|
|
7456
|
+
MorphoBlueView?: undefined;
|
|
7457
7457
|
};
|
|
7458
7458
|
};
|
|
7459
7459
|
otherAddresses: (chainId?: null) => {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Action } from '../../Action';
|
|
2
2
|
import { getAddr } from '../../addresses';
|
|
3
|
-
import { uint8, uint256 } from '../../types';
|
|
3
|
+
import { uint8, uint256, EthAddress } from '../../types';
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
6
|
* SparkRatioCheckAction - Checks spark ratio for users proxy position and reverts if faulty
|
|
@@ -11,13 +11,27 @@ export class SparkRatioCheckAction extends Action {
|
|
|
11
11
|
/**
|
|
12
12
|
* @param ratioState If it should lower/higher
|
|
13
13
|
* @param targetRatio The ratio user want to be at
|
|
14
|
+
* @param market Address provider for specific market. This param was added later
|
|
15
|
+
* @param user Address of the user (EOA/SW). This param was added later
|
|
14
16
|
*/
|
|
15
|
-
constructor(
|
|
16
|
-
|
|
17
|
+
constructor(
|
|
18
|
+
ratioState: uint8,
|
|
19
|
+
targetRatio: uint256,
|
|
20
|
+
market: EthAddress = getAddr('Empty'),
|
|
21
|
+
user: EthAddress = getAddr('Empty'),
|
|
22
|
+
) {
|
|
23
|
+
super(
|
|
24
|
+
'SparkRatioCheck',
|
|
25
|
+
getAddr('Empty'),
|
|
26
|
+
['uint8', 'uint256', 'address', 'address'],
|
|
27
|
+
[ratioState, targetRatio, market, user],
|
|
28
|
+
);
|
|
17
29
|
|
|
18
30
|
this.mappableArgs = [
|
|
19
31
|
this.args[0],
|
|
20
32
|
this.args[1],
|
|
33
|
+
this.args[2],
|
|
34
|
+
this.args[3],
|
|
21
35
|
];
|
|
22
36
|
}
|
|
23
|
-
}
|
|
37
|
+
}
|
|
@@ -11,13 +11,24 @@ export class SparkTargetRatioCheck extends Action {
|
|
|
11
11
|
/**
|
|
12
12
|
* @param targetRatio The ratio user want to be at
|
|
13
13
|
* @param market Address of the market
|
|
14
|
+
* @param user Address of the user (EOA/SW). This param was added later
|
|
14
15
|
*/
|
|
15
|
-
constructor(
|
|
16
|
-
|
|
16
|
+
constructor(
|
|
17
|
+
targetRatio: uint256,
|
|
18
|
+
market: EthAddress,
|
|
19
|
+
user: EthAddress = getAddr('Empty'),
|
|
20
|
+
) {
|
|
21
|
+
super(
|
|
22
|
+
'SparkTargetRatioCheck',
|
|
23
|
+
getAddr('Empty'),
|
|
24
|
+
['uint256', 'address', 'address'],
|
|
25
|
+
[targetRatio, market, user],
|
|
26
|
+
);
|
|
17
27
|
|
|
18
28
|
this.mappableArgs = [
|
|
19
29
|
this.args[0],
|
|
20
30
|
this.args[1],
|
|
31
|
+
this.args[2],
|
|
21
32
|
];
|
|
22
33
|
}
|
|
23
|
-
}
|
|
34
|
+
}
|
package/src/addresses.ts
CHANGED
|
@@ -404,6 +404,13 @@ export const actionAddresses = {
|
|
|
404
404
|
AaveV4DelegateWithdrawWithSig: '0x81864dBd69c46B19463eC7BEC6cE0B271126531a',
|
|
405
405
|
AaveV4DelegateBorrowWithSig: '0x9D68b41BB9f9e9Ac1E1ee49d3566CAd4624886BA',
|
|
406
406
|
AaveV4DelegateSetUsingAsCollateralWithSig: '0xF3D7C7e8F5154c669EAA0dE996cdE0575D7d3A00',
|
|
407
|
+
|
|
408
|
+
MidnightPaybackDirect: '0x2911FFF5C567Ac71d653AAf5919410A3e078D186',
|
|
409
|
+
MidnightBorrowFromOrders: '0xB37fB30b93e1D5b0E870312997426c4a04Cff8Ce',
|
|
410
|
+
MidnightPaybackFromOrders: '0x55cd72fB914A60587a88962Efa680117aE900729',
|
|
411
|
+
MidnightSupplyCollateral: '0x32e25a420cF132832173AFfF7e74a7A0F9EC7430',
|
|
412
|
+
MidnightWithdrawCollateral: '0x4791Ffa530757AC56Cab7857291557ad3ef8b370',
|
|
413
|
+
MidnightView: '0xB64FBf011343961D9AC4A04b714414E35ebE6BE0',
|
|
407
414
|
},
|
|
408
415
|
[NETWORKS.optimism.chainId]: {
|
|
409
416
|
DFSSell: '0x9f234af5c10c136863a20865ba00b26951ab8269',
|
package/umd/index.js
CHANGED
|
@@ -1659,7 +1659,13 @@ var actionAddresses = {
|
|
|
1659
1659
|
AaveV4SetUserManagersWithSig: '0x70CB26167153298aF397dF58200799A24B060b0d',
|
|
1660
1660
|
AaveV4DelegateWithdrawWithSig: '0x81864dBd69c46B19463eC7BEC6cE0B271126531a',
|
|
1661
1661
|
AaveV4DelegateBorrowWithSig: '0x9D68b41BB9f9e9Ac1E1ee49d3566CAd4624886BA',
|
|
1662
|
-
AaveV4DelegateSetUsingAsCollateralWithSig: '0xF3D7C7e8F5154c669EAA0dE996cdE0575D7d3A00'
|
|
1662
|
+
AaveV4DelegateSetUsingAsCollateralWithSig: '0xF3D7C7e8F5154c669EAA0dE996cdE0575D7d3A00',
|
|
1663
|
+
MidnightPaybackDirect: '0x2911FFF5C567Ac71d653AAf5919410A3e078D186',
|
|
1664
|
+
MidnightBorrowFromOrders: '0xB37fB30b93e1D5b0E870312997426c4a04Cff8Ce',
|
|
1665
|
+
MidnightPaybackFromOrders: '0x55cd72fB914A60587a88962Efa680117aE900729',
|
|
1666
|
+
MidnightSupplyCollateral: '0x32e25a420cF132832173AFfF7e74a7A0F9EC7430',
|
|
1667
|
+
MidnightWithdrawCollateral: '0x4791Ffa530757AC56Cab7857291557ad3ef8b370',
|
|
1668
|
+
MidnightView: '0xB64FBf011343961D9AC4A04b714414E35ebE6BE0'
|
|
1663
1669
|
},
|
|
1664
1670
|
[_config__WEBPACK_IMPORTED_MODULE_0__.NETWORKS.optimism.chainId]: {
|
|
1665
1671
|
DFSSell: '0x9f234af5c10c136863a20865ba00b26951ab8269',
|
|
@@ -7455,10 +7461,14 @@ class SparkRatioCheckAction extends _Action__WEBPACK_IMPORTED_MODULE_0__.Action
|
|
|
7455
7461
|
/**
|
|
7456
7462
|
* @param ratioState If it should lower/higher
|
|
7457
7463
|
* @param targetRatio The ratio user want to be at
|
|
7464
|
+
* @param market Address provider for specific market. This param was added later
|
|
7465
|
+
* @param user Address of the user (EOA/SW). This param was added later
|
|
7458
7466
|
*/
|
|
7459
7467
|
constructor(ratioState, targetRatio) {
|
|
7460
|
-
|
|
7461
|
-
|
|
7468
|
+
var market = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : (0,_addresses__WEBPACK_IMPORTED_MODULE_1__.getAddr)('Empty');
|
|
7469
|
+
var user = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : (0,_addresses__WEBPACK_IMPORTED_MODULE_1__.getAddr)('Empty');
|
|
7470
|
+
super('SparkRatioCheck', (0,_addresses__WEBPACK_IMPORTED_MODULE_1__.getAddr)('Empty'), ['uint8', 'uint256', 'address', 'address'], [ratioState, targetRatio, market, user]);
|
|
7471
|
+
this.mappableArgs = [this.args[0], this.args[1], this.args[2], this.args[3]];
|
|
7462
7472
|
}
|
|
7463
7473
|
}
|
|
7464
7474
|
|
|
@@ -7755,10 +7765,12 @@ class SparkTargetRatioCheck extends _Action__WEBPACK_IMPORTED_MODULE_0__.Action
|
|
|
7755
7765
|
/**
|
|
7756
7766
|
* @param targetRatio The ratio user want to be at
|
|
7757
7767
|
* @param market Address of the market
|
|
7768
|
+
* @param user Address of the user (EOA/SW). This param was added later
|
|
7758
7769
|
*/
|
|
7759
7770
|
constructor(targetRatio, market) {
|
|
7760
|
-
|
|
7761
|
-
|
|
7771
|
+
var user = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : (0,_addresses__WEBPACK_IMPORTED_MODULE_1__.getAddr)('Empty');
|
|
7772
|
+
super('SparkTargetRatioCheck', (0,_addresses__WEBPACK_IMPORTED_MODULE_1__.getAddr)('Empty'), ['uint256', 'address', 'address'], [targetRatio, market, user]);
|
|
7773
|
+
this.mappableArgs = [this.args[0], this.args[1], this.args[2]];
|
|
7762
7774
|
}
|
|
7763
7775
|
}
|
|
7764
7776
|
|