@defisaver/automation-sdk 3.3.17 → 3.3.18-spark-eoa-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/cjs/constants/index.js +170 -0
- package/cjs/index.d.ts +2 -2
- package/cjs/index.js +5 -2
- package/cjs/services/ethereumService.test.js +4 -7
- package/cjs/services/strategiesService.js +195 -15
- package/cjs/services/strategySubService.d.ts +22 -17
- package/cjs/services/strategySubService.js +92 -28
- package/cjs/services/strategySubService.test.js +297 -40
- package/cjs/services/subDataService.d.ts +108 -20
- package/cjs/services/subDataService.js +97 -79
- package/cjs/services/subDataService.test.js +479 -174
- package/cjs/types/enums.d.ts +44 -6
- package/cjs/types/enums.js +38 -0
- package/esm/constants/index.js +170 -0
- package/esm/index.d.ts +2 -2
- package/esm/index.js +5 -2
- package/esm/services/ethereumService.test.js +4 -7
- package/esm/services/strategiesService.js +195 -15
- package/esm/services/strategySubService.d.ts +22 -17
- package/esm/services/strategySubService.js +91 -27
- package/esm/services/strategySubService.test.js +298 -38
- package/esm/services/subDataService.d.ts +108 -20
- package/esm/services/subDataService.js +95 -77
- package/esm/services/subDataService.test.js +480 -172
- package/esm/types/enums.d.ts +44 -6
- package/esm/types/enums.js +38 -0
- package/package.json +1 -1
- package/src/constants/index.ts +172 -1
- package/src/index.ts +22 -6
- package/src/services/ethereumService.test.ts +5 -8
- package/src/services/strategiesService.ts +262 -16
- package/src/services/strategySubService.test.ts +384 -46
- package/src/services/strategySubService.ts +251 -40
- package/src/services/subDataService.test.ts +639 -231
- package/src/services/subDataService.ts +149 -106
- package/src/services/utils.test.ts +1 -1
- package/src/services/utils.ts +3 -1
- package/src/types/enums.ts +38 -2
|
@@ -6,7 +6,7 @@ import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisave
|
|
|
6
6
|
import { otherAddresses } from '@defisaver/sdk';
|
|
7
7
|
|
|
8
8
|
import type { SubData, EthereumAddress } from '../types';
|
|
9
|
-
import type { CloseStrategyType
|
|
9
|
+
import type { CloseStrategyType } from '../types/enums';
|
|
10
10
|
import {
|
|
11
11
|
ChainId, CollActionType, DebtActionType, RatioState,
|
|
12
12
|
} from '../types/enums';
|
|
@@ -24,22 +24,6 @@ import { compareAddresses, ratioPercentageToWei, weiToRatioPercentage } from './
|
|
|
24
24
|
|_______/ |_______|| _| | _| `._____||_______| \______/__/ \__\ |__| |_______||_______/
|
|
25
25
|
*/
|
|
26
26
|
export const morphoAaveV2LeverageManagementSubData = {
|
|
27
|
-
encode(
|
|
28
|
-
triggerRepayRatio: number,
|
|
29
|
-
triggerBoostRatio: number,
|
|
30
|
-
targetBoostRatio: number,
|
|
31
|
-
targetRepayRatio: number,
|
|
32
|
-
boostEnabled: boolean,
|
|
33
|
-
): SubData {
|
|
34
|
-
return [
|
|
35
|
-
ratioPercentageToWei(triggerRepayRatio),
|
|
36
|
-
ratioPercentageToWei(triggerBoostRatio),
|
|
37
|
-
ratioPercentageToWei(targetBoostRatio),
|
|
38
|
-
ratioPercentageToWei(targetRepayRatio),
|
|
39
|
-
// @ts-ignore
|
|
40
|
-
boostEnabled,
|
|
41
|
-
];
|
|
42
|
-
},
|
|
43
27
|
decode(subData: SubData): { targetRatio: number } {
|
|
44
28
|
const ratioWei = AbiCoder.decodeParameter('uint128', subData[1]) as any as string;
|
|
45
29
|
const targetRatio = weiToRatioPercentage(ratioWei);
|
|
@@ -48,10 +32,6 @@ export const morphoAaveV2LeverageManagementSubData = {
|
|
|
48
32
|
},
|
|
49
33
|
};
|
|
50
34
|
export const cBondsRebondSubData = {
|
|
51
|
-
encode(bondId: number | string): SubData {
|
|
52
|
-
const bondIdEncoded = AbiCoder.encodeParameter('uint256', bondId);
|
|
53
|
-
return [bondIdEncoded];
|
|
54
|
-
},
|
|
55
35
|
decode(subData: SubData): { bondId: string } {
|
|
56
36
|
const bondId = AbiCoder.decodeParameter('uint256', subData[1])!.toString();
|
|
57
37
|
return { bondId };
|
|
@@ -156,7 +136,7 @@ export const makerCloseSubData = {
|
|
|
156
136
|
};
|
|
157
137
|
},
|
|
158
138
|
};
|
|
159
|
-
export const
|
|
139
|
+
export const legacyMakerLeverageManagementSubData = {
|
|
160
140
|
decode: (subData:SubData) => {
|
|
161
141
|
const vaultId = +AbiCoder.decodeParameter('uint256', subData[0])!.toString();
|
|
162
142
|
const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
|
|
@@ -164,7 +144,8 @@ export const makerLeverageManagementSubData = {
|
|
|
164
144
|
return { vaultId, targetRatio };
|
|
165
145
|
},
|
|
166
146
|
};
|
|
167
|
-
|
|
147
|
+
|
|
148
|
+
export const makerLeverageManagementSubData = {
|
|
168
149
|
encode(
|
|
169
150
|
vaultId: number,
|
|
170
151
|
targetRatio: number,
|
|
@@ -184,6 +165,9 @@ export const makerLeverageManagementWithoutSubProxy = {
|
|
|
184
165
|
},
|
|
185
166
|
};
|
|
186
167
|
|
|
168
|
+
export const makerLiquidationProtectionSubData = makerLeverageManagementSubData;
|
|
169
|
+
|
|
170
|
+
|
|
187
171
|
/**
|
|
188
172
|
__ __ ______ __ __ __ .___________.____ ____ ____ ____ __
|
|
189
173
|
| | | | / __ \ | | | | | | | |\ \ / / \ \ / / /_ |
|
|
@@ -200,14 +184,14 @@ export const liquityRepayFromSavingsSubData = {
|
|
|
200
184
|
return { targetRatio };
|
|
201
185
|
},
|
|
202
186
|
};
|
|
203
|
-
export const
|
|
187
|
+
export const legacyLiquityLeverageManagementSubData = {
|
|
204
188
|
decode: (subData:SubData) => {
|
|
205
189
|
const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
|
|
206
190
|
const targetRatio = weiToRatioPercentage(weiRatio);
|
|
207
191
|
return { targetRatio };
|
|
208
192
|
},
|
|
209
193
|
};
|
|
210
|
-
export const
|
|
194
|
+
export const liquityLeverageManagementSubData = {
|
|
211
195
|
encode(
|
|
212
196
|
targetRatio: number,
|
|
213
197
|
ratioState: RatioState,
|
|
@@ -510,23 +494,7 @@ export const liquityV2PaybackSubData = {
|
|
|
510
494
|
/ _____ \ / _____ \ \ / | |____ \ / / /_
|
|
511
495
|
/__/ \__\ /__/ \__\ \__/ |_______| \__/ |____|
|
|
512
496
|
*/
|
|
513
|
-
export const
|
|
514
|
-
encode(
|
|
515
|
-
triggerRepayRatio: number,
|
|
516
|
-
triggerBoostRatio: number,
|
|
517
|
-
targetBoostRatio: number,
|
|
518
|
-
targetRepayRatio: number,
|
|
519
|
-
boostEnabled: boolean,
|
|
520
|
-
): SubData {
|
|
521
|
-
return [
|
|
522
|
-
new Dec(triggerRepayRatio).mul(1e16).toString(),
|
|
523
|
-
new Dec(triggerBoostRatio).mul(1e16).toString(),
|
|
524
|
-
new Dec(targetBoostRatio).mul(1e16).toString(),
|
|
525
|
-
new Dec(targetRepayRatio).mul(1e16).toString(),
|
|
526
|
-
// @ts-ignore // TODO
|
|
527
|
-
boostEnabled,
|
|
528
|
-
];
|
|
529
|
-
},
|
|
497
|
+
export const legacyAaveV2LeverageManagementSubData = {
|
|
530
498
|
decode(subData: SubData): { targetRatio: number } {
|
|
531
499
|
const ratioWei = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
|
|
532
500
|
const targetRatio = weiToRatioPercentage(ratioWei);
|
|
@@ -534,7 +502,7 @@ export const aaveV2LeverageManagementSubData = {
|
|
|
534
502
|
return { targetRatio };
|
|
535
503
|
},
|
|
536
504
|
};
|
|
537
|
-
export const
|
|
505
|
+
export const aaveV2LeverageManagementSubData = {
|
|
538
506
|
encode(
|
|
539
507
|
market: EthereumAddress,
|
|
540
508
|
targetRatio: number,
|
|
@@ -570,7 +538,7 @@ export const aaveV2LeverageManagementSubDataWithoutSubProxy = {
|
|
|
570
538
|
/ _____ \ / _____ \ \ / | |____ \ / ___) |
|
|
571
539
|
/__/ \__\ /__/ \__\ \__/ |_______| \__/ |____/
|
|
572
540
|
*/
|
|
573
|
-
export const
|
|
541
|
+
export const legacyAaveV3LeverageManagementSubData = {
|
|
574
542
|
decode(subData: SubData): { targetRatio: number } {
|
|
575
543
|
const ratioWei = AbiCoder.decodeParameter('uint256', subData[0]) as any as string;
|
|
576
544
|
const targetRatio = weiToRatioPercentage(ratioWei);
|
|
@@ -578,7 +546,8 @@ export const aaveV3LeverageManagementSubData = {
|
|
|
578
546
|
return { targetRatio };
|
|
579
547
|
},
|
|
580
548
|
};
|
|
581
|
-
|
|
549
|
+
|
|
550
|
+
export const aaveV3LeverageManagementSubData = {
|
|
582
551
|
encode(
|
|
583
552
|
targetRatio: number,
|
|
584
553
|
ratioState: RatioState,
|
|
@@ -605,6 +574,9 @@ export const aaveV3LeverageManagementSubDataWithoutSubProxy = {
|
|
|
605
574
|
return { targetRatio, ratioState };
|
|
606
575
|
},
|
|
607
576
|
};
|
|
577
|
+
|
|
578
|
+
export const aaveV3LiquidationProtectionSubData = aaveV3LeverageManagementSubData;
|
|
579
|
+
|
|
608
580
|
export const aaveV3LeverageManagementOnPriceGeneric = {
|
|
609
581
|
encode(
|
|
610
582
|
collAsset: EthereumAddress,
|
|
@@ -851,6 +823,7 @@ export const aaveV3LeverageManagementOnPriceSubData = {
|
|
|
851
823
|
/ _____ \ / _____ \ \ / | |____ \ / | |
|
|
852
824
|
/__/ \__\ /__/ \__\ \__/ |_______| \__/ |_|
|
|
853
825
|
*/
|
|
826
|
+
|
|
854
827
|
export const aaveV4LeverageManagementSubData = {
|
|
855
828
|
encode: (
|
|
856
829
|
spoke: EthereumAddress,
|
|
@@ -882,6 +855,9 @@ export const aaveV4LeverageManagementSubData = {
|
|
|
882
855
|
};
|
|
883
856
|
},
|
|
884
857
|
};
|
|
858
|
+
|
|
859
|
+
export const aaveV4LiquidationProtectionSubData = aaveV4LeverageManagementSubData;
|
|
860
|
+
|
|
885
861
|
export const aaveV4LeverageManagementOnPriceSubData = {
|
|
886
862
|
encode: (
|
|
887
863
|
spoke: EthereumAddress,
|
|
@@ -1024,23 +1000,7 @@ export const aaveV4CollateralSwitchSubData = {
|
|
|
1024
1000
|
| `----.| `--' | | | | | | | \ / / /_
|
|
1025
1001
|
\______| \______/ |__| |__| | _| \__/ |____|
|
|
1026
1002
|
*/
|
|
1027
|
-
export const
|
|
1028
|
-
encode(
|
|
1029
|
-
triggerRepayRatio: number,
|
|
1030
|
-
triggerBoostRatio: number,
|
|
1031
|
-
targetBoostRatio: number,
|
|
1032
|
-
targetRepayRatio: number,
|
|
1033
|
-
boostEnabled: boolean,
|
|
1034
|
-
): SubData {
|
|
1035
|
-
return [
|
|
1036
|
-
new Dec(triggerRepayRatio).mul(1e16).toString(),
|
|
1037
|
-
new Dec(triggerBoostRatio).mul(1e16).toString(),
|
|
1038
|
-
new Dec(targetBoostRatio).mul(1e16).toString(),
|
|
1039
|
-
new Dec(targetRepayRatio).mul(1e16).toString(),
|
|
1040
|
-
// @ts-ignore // TODO
|
|
1041
|
-
boostEnabled,
|
|
1042
|
-
];
|
|
1043
|
-
},
|
|
1003
|
+
export const legacyCompoundV2LeverageManagementSubData = {
|
|
1044
1004
|
decode(subData: SubData): { targetRatio: number } {
|
|
1045
1005
|
const weiRatio = AbiCoder.decodeParameter('uint256', subData[0]) as any as string;
|
|
1046
1006
|
const targetRatio = weiToRatioPercentage(weiRatio);
|
|
@@ -1048,7 +1008,7 @@ export const compoundV2LeverageManagementSubData = {
|
|
|
1048
1008
|
return { targetRatio };
|
|
1049
1009
|
},
|
|
1050
1010
|
};
|
|
1051
|
-
export const
|
|
1011
|
+
export const compoundV2LeverageManagementSubData = {
|
|
1052
1012
|
encode(
|
|
1053
1013
|
targetRatio: number,
|
|
1054
1014
|
ratioState: RatioState,
|
|
@@ -1081,36 +1041,8 @@ export const compoundV2LeverageManagementSubDataWithoutSubProxy = {
|
|
|
1081
1041
|
| `----.| `--' | | | | | | | \ / ___) |
|
|
1082
1042
|
\______| \______/ |__| |__| | _| \__/ |____/
|
|
1083
1043
|
*/
|
|
1084
|
-
export const compoundV3LeverageManagementSubData = {
|
|
1085
|
-
encode(
|
|
1086
|
-
market: EthereumAddress,
|
|
1087
|
-
baseToken: EthereumAddress,
|
|
1088
|
-
triggerRepayRatio: number,
|
|
1089
|
-
triggerBoostRatio: number,
|
|
1090
|
-
targetBoostRatio: number,
|
|
1091
|
-
targetRepayRatio: number,
|
|
1092
|
-
boostEnabled: boolean,
|
|
1093
|
-
isEOA: boolean,
|
|
1094
|
-
): SubData {
|
|
1095
|
-
return [
|
|
1096
|
-
market,
|
|
1097
|
-
baseToken,
|
|
1098
|
-
new Dec(triggerRepayRatio).mul(1e16).toString(),
|
|
1099
|
-
new Dec(triggerBoostRatio).mul(1e16).toString(),
|
|
1100
|
-
new Dec(targetBoostRatio).mul(1e16).toString(),
|
|
1101
|
-
new Dec(targetRepayRatio).mul(1e16).toString(),
|
|
1102
|
-
// @ts-ignore // TODO
|
|
1103
|
-
boostEnabled, isEOA,
|
|
1104
|
-
];
|
|
1105
|
-
},
|
|
1106
|
-
decode(subData: SubData): { targetRatio: number } {
|
|
1107
|
-
const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]) as any as string;
|
|
1108
|
-
const targetRatio = weiToRatioPercentage(weiRatio);
|
|
1109
1044
|
|
|
1110
|
-
|
|
1111
|
-
},
|
|
1112
|
-
};
|
|
1113
|
-
export const compoundV3LeverageManagementSubDataWithoutSubProxy = {
|
|
1045
|
+
export const compoundV3LeverageManagementSubData = {
|
|
1114
1046
|
encode(
|
|
1115
1047
|
market: EthereumAddress,
|
|
1116
1048
|
baseToken: EthereumAddress,
|
|
@@ -1134,6 +1066,9 @@ export const compoundV3LeverageManagementSubDataWithoutSubProxy = {
|
|
|
1134
1066
|
};
|
|
1135
1067
|
},
|
|
1136
1068
|
};
|
|
1069
|
+
|
|
1070
|
+
export const compoundV3LiquidationProtectionSubData = compoundV3LeverageManagementSubData;
|
|
1071
|
+
|
|
1137
1072
|
export const compoundV3LeverageManagementOnPriceSubData = {
|
|
1138
1073
|
encode(
|
|
1139
1074
|
market: EthereumAddress,
|
|
@@ -1251,17 +1186,7 @@ export const exchangeDcaSubData = {
|
|
|
1251
1186
|
};
|
|
1252
1187
|
},
|
|
1253
1188
|
};
|
|
1254
|
-
export const
|
|
1255
|
-
encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: OrderType) : SubData {
|
|
1256
|
-
return [
|
|
1257
|
-
fromToken,
|
|
1258
|
-
toToken,
|
|
1259
|
-
amount,
|
|
1260
|
-
targetPrice,
|
|
1261
|
-
new Dec(goodUntil).toString(),
|
|
1262
|
-
new Dec(orderType).toString(),
|
|
1263
|
-
];
|
|
1264
|
-
},
|
|
1189
|
+
export const legacyExchangeLimitOrderSubData = {
|
|
1265
1190
|
decode: (subData: SubData, chainId: ChainId) => {
|
|
1266
1191
|
const fromToken = AbiCoder.decodeParameter('address', subData[0])!.toString();
|
|
1267
1192
|
const toToken = AbiCoder.decodeParameter('address', subData[1])!.toString();
|
|
@@ -1269,7 +1194,7 @@ export const exchangeLimitOrderSubData = {
|
|
|
1269
1194
|
return { fromToken, toToken, amount };
|
|
1270
1195
|
},
|
|
1271
1196
|
};
|
|
1272
|
-
export const
|
|
1197
|
+
export const exchangeLimitOrderSubData = {
|
|
1273
1198
|
encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string): SubData {
|
|
1274
1199
|
return [
|
|
1275
1200
|
AbiCoder.encodeParameter('address', fromToken),
|
|
@@ -1293,7 +1218,7 @@ export const exchangeLimitOrderSubDataWithoutSubProxy = {
|
|
|
1293
1218
|
.----) | | | / _____ \ | |\ \----.| . \
|
|
1294
1219
|
|_______/ | _| /__/ \__\ | _| `._____||__|\__\
|
|
1295
1220
|
*/
|
|
1296
|
-
export const
|
|
1221
|
+
export const legacySparkLeverageManagementSubData = {
|
|
1297
1222
|
decode(subData: SubData): { targetRatio: number } {
|
|
1298
1223
|
const ratioWei = AbiCoder.decodeParameter('uint256', subData[0]) as any as string;
|
|
1299
1224
|
const targetRatio = weiToRatioPercentage(ratioWei);
|
|
@@ -1301,7 +1226,8 @@ export const sparkLeverageManagementSubData = {
|
|
|
1301
1226
|
return { targetRatio };
|
|
1302
1227
|
},
|
|
1303
1228
|
};
|
|
1304
|
-
|
|
1229
|
+
|
|
1230
|
+
export const sparkLeverageManagementSubData = {
|
|
1305
1231
|
encode(
|
|
1306
1232
|
targetRatio: number,
|
|
1307
1233
|
ratioState: RatioState,
|
|
@@ -1320,6 +1246,31 @@ export const sparkLeverageManagementSubDataWithoutSubProxy = {
|
|
|
1320
1246
|
return { targetRatio, ratioState };
|
|
1321
1247
|
},
|
|
1322
1248
|
};
|
|
1249
|
+
|
|
1250
|
+
export const sparkLiquidationProtectionSubData = sparkLeverageManagementSubData;
|
|
1251
|
+
|
|
1252
|
+
export const sparkGenericLeverageManagementSubData = {
|
|
1253
|
+
encode(
|
|
1254
|
+
targetRatio: number,
|
|
1255
|
+
ratioState: RatioState,
|
|
1256
|
+
market: EthereumAddress,
|
|
1257
|
+
user: EthereumAddress,
|
|
1258
|
+
): SubData {
|
|
1259
|
+
const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
|
|
1260
|
+
const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
|
|
1261
|
+
const encodedMarket = AbiCoder.encodeParameter('address', market);
|
|
1262
|
+
const encodedUser = AbiCoder.encodeParameter('address', user);
|
|
1263
|
+
return [encodedTargetRatio, encodedRatioState, encodedMarket, encodedUser];
|
|
1264
|
+
},
|
|
1265
|
+
decode(subData: SubData): { targetRatio: number, ratioState: RatioState } {
|
|
1266
|
+
const targetRatio = weiToRatioPercentage(String(AbiCoder.decodeParameter('uint256', subData[0])));
|
|
1267
|
+
const ratioState = Number(AbiCoder.decodeParameter('uint8', subData[1])) as RatioState;
|
|
1268
|
+
return { targetRatio, ratioState };
|
|
1269
|
+
},
|
|
1270
|
+
};
|
|
1271
|
+
|
|
1272
|
+
export const sparkGenericLiquidationProtectionSubData = sparkGenericLeverageManagementSubData;
|
|
1273
|
+
|
|
1323
1274
|
export const sparkCloseGenericSubData = {
|
|
1324
1275
|
encode(
|
|
1325
1276
|
collAsset: EthereumAddress,
|
|
@@ -1409,6 +1360,41 @@ export const sparkLeverageManagementOnPriceSubData = {
|
|
|
1409
1360
|
};
|
|
1410
1361
|
},
|
|
1411
1362
|
};
|
|
1363
|
+
export const sparkLeverageManagementOnPriceGenericSubData = {
|
|
1364
|
+
encode(
|
|
1365
|
+
collAsset: EthereumAddress,
|
|
1366
|
+
collAssetId: number,
|
|
1367
|
+
debtAsset: EthereumAddress,
|
|
1368
|
+
debtAssetId: number,
|
|
1369
|
+
marketAddr: EthereumAddress,
|
|
1370
|
+
targetRatio: number,
|
|
1371
|
+
user: EthereumAddress,
|
|
1372
|
+
): SubData {
|
|
1373
|
+
const encodedColl = AbiCoder.encodeParameter('address', collAsset);
|
|
1374
|
+
const encodedCollId = AbiCoder.encodeParameter('uint16', collAssetId);
|
|
1375
|
+
const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
|
|
1376
|
+
const encodedDebtId = AbiCoder.encodeParameter('uint16', debtAssetId);
|
|
1377
|
+
const encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
|
|
1378
|
+
const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
|
|
1379
|
+
const encodedUser = AbiCoder.encodeParameter('address', user);
|
|
1380
|
+
return [
|
|
1381
|
+
encodedColl, encodedCollId, encodedDebt, encodedDebtId,
|
|
1382
|
+
encodedMarket, encodedTargetRatio, encodedUser,
|
|
1383
|
+
];
|
|
1384
|
+
},
|
|
1385
|
+
decode(subData: SubData) {
|
|
1386
|
+
const collAsset = AbiCoder.decodeParameter('address', subData[0]) as any as EthereumAddress;
|
|
1387
|
+
const collAssetId = Number(AbiCoder.decodeParameter('uint16', subData[1]));
|
|
1388
|
+
const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as any as EthereumAddress;
|
|
1389
|
+
const debtAssetId = Number(AbiCoder.decodeParameter('uint16', subData[3]));
|
|
1390
|
+
const marketAddr = AbiCoder.decodeParameter('address', subData[4]) as any as EthereumAddress;
|
|
1391
|
+
const targetRatio = weiToRatioPercentage(String(AbiCoder.decodeParameter('uint256', subData[5])));
|
|
1392
|
+
const user = AbiCoder.decodeParameter('address', subData[6]) as any as EthereumAddress;
|
|
1393
|
+
return {
|
|
1394
|
+
collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user,
|
|
1395
|
+
};
|
|
1396
|
+
},
|
|
1397
|
+
};
|
|
1412
1398
|
export const sparkCollateralSwitchSubData = {
|
|
1413
1399
|
encode(
|
|
1414
1400
|
fromAsset: EthereumAddress,
|
|
@@ -1458,6 +1444,57 @@ export const sparkCollateralSwitchSubData = {
|
|
|
1458
1444
|
},
|
|
1459
1445
|
};
|
|
1460
1446
|
|
|
1447
|
+
export const sparkGenericFLCollateralSwitchSubData = {
|
|
1448
|
+
encode(
|
|
1449
|
+
fromAsset: EthereumAddress,
|
|
1450
|
+
fromAssetId: number,
|
|
1451
|
+
toAsset: EthereumAddress,
|
|
1452
|
+
toAssetId: number,
|
|
1453
|
+
marketAddr: EthereumAddress,
|
|
1454
|
+
amountToSwitch: string,
|
|
1455
|
+
user: EthereumAddress,
|
|
1456
|
+
): SubData {
|
|
1457
|
+
const encodedFromAsset = AbiCoder.encodeParameter('address', fromAsset);
|
|
1458
|
+
const encodedFromAssetId = AbiCoder.encodeParameter('uint16', fromAssetId);
|
|
1459
|
+
const encodedToAsset = AbiCoder.encodeParameter('address', toAsset);
|
|
1460
|
+
const encodedToAssetId = AbiCoder.encodeParameter('uint16', toAssetId);
|
|
1461
|
+
const encodedMarketAddr = AbiCoder.encodeParameter('address', marketAddr);
|
|
1462
|
+
const encodedAmountToSwitch = AbiCoder.encodeParameter('uint256', amountToSwitch);
|
|
1463
|
+
const encodedUser = AbiCoder.encodeParameter('address', user);
|
|
1464
|
+
|
|
1465
|
+
return [
|
|
1466
|
+
encodedFromAsset,
|
|
1467
|
+
encodedFromAssetId,
|
|
1468
|
+
encodedToAsset,
|
|
1469
|
+
encodedToAssetId,
|
|
1470
|
+
encodedMarketAddr,
|
|
1471
|
+
encodedAmountToSwitch,
|
|
1472
|
+
encodedUser,
|
|
1473
|
+
];
|
|
1474
|
+
},
|
|
1475
|
+
decode(subData: SubData): {
|
|
1476
|
+
fromAsset: EthereumAddress,
|
|
1477
|
+
fromAssetId: number,
|
|
1478
|
+
toAsset: EthereumAddress,
|
|
1479
|
+
toAssetId: number,
|
|
1480
|
+
marketAddr: EthereumAddress,
|
|
1481
|
+
amountToSwitch: string,
|
|
1482
|
+
user: EthereumAddress,
|
|
1483
|
+
} {
|
|
1484
|
+
const fromAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
|
|
1485
|
+
const fromAssetId = Number(AbiCoder.decodeParameter('uint16', subData[1]));
|
|
1486
|
+
const toAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
|
|
1487
|
+
const toAssetId = Number(AbiCoder.decodeParameter('uint16', subData[3]));
|
|
1488
|
+
const marketAddr = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
|
|
1489
|
+
const amountToSwitch = AbiCoder.decodeParameter('uint256', subData[5]) as unknown as string;
|
|
1490
|
+
const user = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
|
|
1491
|
+
|
|
1492
|
+
return {
|
|
1493
|
+
fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user,
|
|
1494
|
+
};
|
|
1495
|
+
},
|
|
1496
|
+
};
|
|
1497
|
+
|
|
1461
1498
|
|
|
1462
1499
|
/**
|
|
1463
1500
|
______ .______ ____ ____ __ __ _______. _______
|
|
@@ -1534,6 +1571,7 @@ export const crvUSDPaybackSubData = {
|
|
|
1534
1571
|
| | | | | `--' | | |\ \----.| | | | | | | `--' |
|
|
1535
1572
|
|__| |__| \______/ | _| `._____|| _| |__| |__| \______/
|
|
1536
1573
|
*/
|
|
1574
|
+
|
|
1537
1575
|
export const morphoBlueLeverageManagementSubData = {
|
|
1538
1576
|
encode: (
|
|
1539
1577
|
loanToken: EthereumAddress,
|
|
@@ -1578,6 +1616,9 @@ export const morphoBlueLeverageManagementSubData = {
|
|
|
1578
1616
|
};
|
|
1579
1617
|
},
|
|
1580
1618
|
};
|
|
1619
|
+
|
|
1620
|
+
export const morphoBlueLiquidationProtectionSubData = morphoBlueLeverageManagementSubData;
|
|
1621
|
+
|
|
1581
1622
|
export const morphoBlueLeverageManagementOnPriceSubData = {
|
|
1582
1623
|
encode(
|
|
1583
1624
|
loanToken: EthereumAddress,
|
|
@@ -1708,3 +1749,5 @@ export const fluidLeverageManagementSubData = {
|
|
|
1708
1749
|
};
|
|
1709
1750
|
},
|
|
1710
1751
|
};
|
|
1752
|
+
|
|
1753
|
+
export const fluidLiquidationProtectionSubData = fluidLeverageManagementSubData;
|
|
@@ -2,7 +2,7 @@ import { expect } from 'chai';
|
|
|
2
2
|
import { getAssetInfo } from '@defisaver/tokens';
|
|
3
3
|
|
|
4
4
|
import type { EthereumAddress } from '../types';
|
|
5
|
-
import { ChainId, ProtocolIdentifiers, RatioState } from '../types/enums';
|
|
5
|
+
import { Bundles, ChainId, ProtocolIdentifiers, RatioState } from '../types/enums';
|
|
6
6
|
|
|
7
7
|
import '../configuration';
|
|
8
8
|
import {
|
package/src/services/utils.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
|
|
|
5
5
|
|
|
6
6
|
import type { EthereumAddress } from '../types';
|
|
7
7
|
import {
|
|
8
|
+
Bundles,
|
|
8
9
|
ChainId, CloseStrategyType, CloseToAssetType, RatioState,
|
|
9
10
|
} from '../types/enums';
|
|
10
11
|
|
|
@@ -171,4 +172,5 @@ export function getStopLossAndTakeProfitTypeByCloseStrategyType(
|
|
|
171
172
|
default:
|
|
172
173
|
throw new Error('CloseStrategyType not supported');
|
|
173
174
|
}
|
|
174
|
-
}
|
|
175
|
+
}
|
|
176
|
+
|
package/src/types/enums.ts
CHANGED
|
@@ -101,6 +101,7 @@ export namespace Strategies {
|
|
|
101
101
|
AAVE_V4_COLLATERAL_SWITCH = 154,
|
|
102
102
|
AAVE_V4_COLLATERAL_SWITCH_EOA = 155,
|
|
103
103
|
SPARK_COLLATERAL_SWITCH = 156,
|
|
104
|
+
SPARK_GENERIC_FL_COLLATERAL_SWITCH = 167,
|
|
104
105
|
}
|
|
105
106
|
|
|
106
107
|
export enum OptimismIds {
|
|
@@ -153,6 +154,8 @@ export namespace Strategies {
|
|
|
153
154
|
EoaRepayOnPrice = 'eoa-repay-on-price',
|
|
154
155
|
CollateralSwitch = 'collateral-switch',
|
|
155
156
|
EoaCollateralSwitch = 'eoa-collateral-switch',
|
|
157
|
+
LiquidationProtection = 'liquidation-protection',
|
|
158
|
+
EoaLiquidationProtection = 'liquidation-protection-eoa',
|
|
156
159
|
}
|
|
157
160
|
export enum IdOverrides {
|
|
158
161
|
TakeProfit = 'take-profit',
|
|
@@ -164,6 +167,8 @@ export namespace Strategies {
|
|
|
164
167
|
EoaLeverageManagement = 'leverage-management-eoa',
|
|
165
168
|
LeverageManagementOnPrice = 'leverage-management-on-price',
|
|
166
169
|
EoaLeverageManagementOnPrice = 'leverage-management-on-price-eoa',
|
|
170
|
+
LiquidationProtection = 'liquidation-protection',
|
|
171
|
+
EoaLiquidationProtection = 'liquidation-protection-eoa',
|
|
167
172
|
}
|
|
168
173
|
}
|
|
169
174
|
|
|
@@ -240,10 +245,27 @@ export namespace Bundles {
|
|
|
240
245
|
AAVE_V4_EOA_REPAY_ON_PRICE = 68,
|
|
241
246
|
AAVE_V4_EOA_BOOST_ON_PRICE = 69,
|
|
242
247
|
AAVE_V4_EOA_CLOSE = 70,
|
|
248
|
+
AAVE_V3_SW_LIQUIDATION_PROTECTION = 71,
|
|
249
|
+
SPARK_SW_LIQUIDATION_PROTECTION = 72,
|
|
250
|
+
MAKER_SW_LIQUIDATION_PROTECTION = 75,
|
|
251
|
+
FLUID_T1_SW_LIQUIDATION_PROTECTION = 76,
|
|
252
|
+
AAVE_V4_SW_LIQUIDATION_PROTECTION = 77,
|
|
253
|
+
MORPHO_BLUE_SW_LIQUIDATION_PROTECTION = 78,
|
|
254
|
+
AAVE_V3_EOA_LIQUIDATION_PROTECTION = 79,
|
|
255
|
+
AAVE_V4_EOA_LIQUIDATION_PROTECTION = 80,
|
|
256
|
+
MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 81,
|
|
257
|
+
COMP_V3_SW_LIQUIDATION_PROTECTION = 82,
|
|
258
|
+
COMP_V3_EOA_LIQUIDATION_PROTECTION = 83,
|
|
243
259
|
MORPHO_BLUE_REPAY_ON_PRICE = 84,
|
|
244
260
|
MORPHO_BLUE_EOA_BOOST_ON_PRICE = 85,
|
|
245
261
|
MORPHO_BLUE_EOA_REPAY_ON_PRICE = 86,
|
|
246
262
|
MORPHO_BLUE_EOA_CLOSE = 87,
|
|
263
|
+
SPARK_EOA_REPAY = 88,
|
|
264
|
+
SPARK_EOA_BOOST = 89,
|
|
265
|
+
SPARK_EOA_REPAY_ON_PRICE = 90,
|
|
266
|
+
SPARK_EOA_BOOST_ON_PRICE = 91,
|
|
267
|
+
SPARK_EOA_CLOSE = 92,
|
|
268
|
+
SPARK_EOA_LIQUIDATION_PROTECTION = 93,
|
|
247
269
|
}
|
|
248
270
|
|
|
249
271
|
export enum OptimismIds {
|
|
@@ -258,6 +280,8 @@ export namespace Bundles {
|
|
|
258
280
|
AAVE_V3_EOA_REPAY_ON_PRICE = 8,
|
|
259
281
|
AAVE_V3_EOA_BOOST_ON_PRICE = 9,
|
|
260
282
|
AAVE_V3_EOA_CLOSE = 10,
|
|
283
|
+
AAVE_V3_SW_LIQUIDATION_PROTECTION = 11,
|
|
284
|
+
AAVE_V3_EOA_LIQUIDATION_PROTECTION = 12,
|
|
261
285
|
}
|
|
262
286
|
|
|
263
287
|
export enum BaseIds {
|
|
@@ -288,12 +312,19 @@ export namespace Bundles {
|
|
|
288
312
|
AAVE_V3_EOA_BOOST_ON_PRICE = 26,
|
|
289
313
|
AAVE_V3_EOA_CLOSE = 27,
|
|
290
314
|
MORPHO_BLUE_CLOSE = 28,
|
|
315
|
+
AAVE_V3_SW_LIQUIDATION_PROTECTION = 29,
|
|
316
|
+
FLUID_T1_SW_LIQUIDATION_PROTECTION = 30,
|
|
317
|
+
COMP_V3_SW_LIQUIDATION_PROTECTION = 32,
|
|
318
|
+
COMP_V3_EOA_LIQUIDATION_PROTECTION = 33,
|
|
319
|
+
AAVE_V3_EOA_LIQUIDATION_PROTECTION = 34,
|
|
320
|
+
MORPHO_BLUE_SW_LIQUIDATION_PROTECTION = 35,
|
|
291
321
|
MORPHO_BLUE_REPAY_ON_PRICE = 36,
|
|
292
322
|
MORPHO_BLUE_EOA_REPAY = 37,
|
|
293
323
|
MORPHO_BLUE_EOA_BOOST = 38,
|
|
294
324
|
MORPHO_BLUE_EOA_BOOST_ON_PRICE = 39,
|
|
295
325
|
MORPHO_BLUE_EOA_REPAY_ON_PRICE = 40,
|
|
296
326
|
MORPHO_BLUE_EOA_CLOSE = 41,
|
|
327
|
+
MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 42,
|
|
297
328
|
}
|
|
298
329
|
|
|
299
330
|
export enum ArbitrumIds {
|
|
@@ -326,11 +357,16 @@ export namespace Bundles {
|
|
|
326
357
|
MORPHO_BLUE_EOA_REPAY = 26,
|
|
327
358
|
MORPHO_BLUE_EOA_BOOST = 27,
|
|
328
359
|
MORPHO_BLUE_CLOSE = 28,
|
|
360
|
+
AAVE_V3_SW_LIQUIDATION_PROTECTION = 29,
|
|
361
|
+
FLUID_T1_SW_LIQUIDATION_PROTECTION = 30,
|
|
362
|
+
MORPHO_BLUE_SW_LIQUIDATION_PROTECTION = 31,
|
|
363
|
+
COMP_V3_SW_LIQUIDATION_PROTECTION = 32,
|
|
364
|
+
COMP_V3_EOA_LIQUIDATION_PROTECTION = 33,
|
|
365
|
+
AAVE_V3_EOA_LIQUIDATION_PROTECTION = 34,
|
|
366
|
+
MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 35,
|
|
329
367
|
MORPHO_BLUE_REPAY_ON_PRICE = 36,
|
|
330
368
|
MORPHO_BLUE_EOA_BOOST_ON_PRICE = 37,
|
|
331
369
|
MORPHO_BLUE_EOA_REPAY_ON_PRICE = 38,
|
|
332
370
|
MORPHO_BLUE_EOA_CLOSE = 39,
|
|
333
371
|
}
|
|
334
372
|
}
|
|
335
|
-
|
|
336
|
-
|