curvance 2.5.3 → 2.6.0
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/abis/BaseCToken.json +3 -21
- package/dist/abis/BorrowableCToken.json +43 -22
- package/dist/abis/MarketManagerIsolated.json +3 -26
- package/dist/abis/RedstoneCoreAdaptor.json +11 -11
- package/dist/abis/SimplePositionManager.json +0 -5
- package/dist/classes/BorrowableCToken.d.ts +2 -3
- package/dist/classes/BorrowableCToken.d.ts.map +1 -1
- package/dist/classes/BorrowableCToken.js.map +1 -1
- package/dist/classes/CToken.d.ts +12 -5
- package/dist/classes/CToken.d.ts.map +1 -1
- package/dist/classes/CToken.js +72 -13
- package/dist/classes/CToken.js.map +1 -1
- package/dist/classes/ERC20.d.ts +4 -0
- package/dist/classes/ERC20.d.ts.map +1 -1
- package/dist/classes/ERC20.js +3 -0
- package/dist/classes/ERC20.js.map +1 -1
- package/dist/classes/Kuru.d.ts +34 -0
- package/dist/classes/Kuru.d.ts.map +1 -0
- package/dist/classes/Kuru.js +139 -0
- package/dist/classes/Kuru.js.map +1 -0
- package/dist/classes/Market.d.ts +7 -0
- package/dist/classes/Market.d.ts.map +1 -1
- package/dist/classes/Market.js +15 -0
- package/dist/classes/Market.js.map +1 -1
- package/dist/classes/ProtocolReader.d.ts +3 -0
- package/dist/classes/ProtocolReader.d.ts.map +1 -1
- package/dist/classes/ProtocolReader.js.map +1 -1
- package/dist/classes/Zapper.d.ts +2 -0
- package/dist/classes/Zapper.d.ts.map +1 -1
- package/dist/classes/Zapper.js +24 -0
- package/dist/classes/Zapper.js.map +1 -1
- package/dist/helpers.d.ts +2 -0
- package/dist/helpers.d.ts.map +1 -1
- package/dist/helpers.js +2 -1
- package/dist/helpers.js.map +1 -1
- package/dist/setup.d.ts +2 -0
- package/dist/setup.d.ts.map +1 -1
- package/dist/setup.js +5 -0
- package/dist/setup.js.map +1 -1
- package/package.json +1 -1
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"inputs": [],
|
|
74
74
|
"outputs": [
|
|
75
75
|
{
|
|
76
|
-
"name": "",
|
|
76
|
+
"name": "result",
|
|
77
77
|
"type": "address",
|
|
78
78
|
"internalType": "address"
|
|
79
79
|
}
|
|
@@ -426,7 +426,7 @@
|
|
|
426
426
|
"inputs": [],
|
|
427
427
|
"outputs": [
|
|
428
428
|
{
|
|
429
|
-
"name": "",
|
|
429
|
+
"name": "result",
|
|
430
430
|
"type": "bool",
|
|
431
431
|
"internalType": "bool"
|
|
432
432
|
}
|
|
@@ -948,24 +948,6 @@
|
|
|
948
948
|
"outputs": [],
|
|
949
949
|
"stateMutability": "nonpayable"
|
|
950
950
|
},
|
|
951
|
-
{
|
|
952
|
-
"type": "function",
|
|
953
|
-
"name": "rescueToken",
|
|
954
|
-
"inputs": [
|
|
955
|
-
{
|
|
956
|
-
"name": "token",
|
|
957
|
-
"type": "address",
|
|
958
|
-
"internalType": "address"
|
|
959
|
-
},
|
|
960
|
-
{
|
|
961
|
-
"name": "amount",
|
|
962
|
-
"type": "uint256",
|
|
963
|
-
"internalType": "uint256"
|
|
964
|
-
}
|
|
965
|
-
],
|
|
966
|
-
"outputs": [],
|
|
967
|
-
"stateMutability": "nonpayable"
|
|
968
|
-
},
|
|
969
951
|
{
|
|
970
952
|
"type": "function",
|
|
971
953
|
"name": "seize",
|
|
@@ -1045,7 +1027,7 @@
|
|
|
1045
1027
|
"inputs": [],
|
|
1046
1028
|
"outputs": [
|
|
1047
1029
|
{
|
|
1048
|
-
"name": "",
|
|
1030
|
+
"name": "result",
|
|
1049
1031
|
"type": "uint256",
|
|
1050
1032
|
"internalType": "uint256"
|
|
1051
1033
|
}
|
|
@@ -138,7 +138,7 @@
|
|
|
138
138
|
"inputs": [],
|
|
139
139
|
"outputs": [
|
|
140
140
|
{
|
|
141
|
-
"name": "",
|
|
141
|
+
"name": "result",
|
|
142
142
|
"type": "address",
|
|
143
143
|
"internalType": "address"
|
|
144
144
|
}
|
|
@@ -151,7 +151,7 @@
|
|
|
151
151
|
"inputs": [],
|
|
152
152
|
"outputs": [
|
|
153
153
|
{
|
|
154
|
-
"name": "",
|
|
154
|
+
"name": "result",
|
|
155
155
|
"type": "uint256",
|
|
156
156
|
"internalType": "uint256"
|
|
157
157
|
}
|
|
@@ -743,7 +743,7 @@
|
|
|
743
743
|
"inputs": [],
|
|
744
744
|
"outputs": [
|
|
745
745
|
{
|
|
746
|
-
"name": "",
|
|
746
|
+
"name": "result",
|
|
747
747
|
"type": "bool",
|
|
748
748
|
"internalType": "bool"
|
|
749
749
|
}
|
|
@@ -1363,24 +1363,6 @@
|
|
|
1363
1363
|
"outputs": [],
|
|
1364
1364
|
"stateMutability": "nonpayable"
|
|
1365
1365
|
},
|
|
1366
|
-
{
|
|
1367
|
-
"type": "function",
|
|
1368
|
-
"name": "rescueToken",
|
|
1369
|
-
"inputs": [
|
|
1370
|
-
{
|
|
1371
|
-
"name": "token",
|
|
1372
|
-
"type": "address",
|
|
1373
|
-
"internalType": "address"
|
|
1374
|
-
},
|
|
1375
|
-
{
|
|
1376
|
-
"name": "amount",
|
|
1377
|
-
"type": "uint256",
|
|
1378
|
-
"internalType": "uint256"
|
|
1379
|
-
}
|
|
1380
|
-
],
|
|
1381
|
-
"outputs": [],
|
|
1382
|
-
"stateMutability": "nonpayable"
|
|
1383
|
-
},
|
|
1384
1366
|
{
|
|
1385
1367
|
"type": "function",
|
|
1386
1368
|
"name": "seize",
|
|
@@ -1448,6 +1430,26 @@
|
|
|
1448
1430
|
"outputs": [],
|
|
1449
1431
|
"stateMutability": "nonpayable"
|
|
1450
1432
|
},
|
|
1433
|
+
{
|
|
1434
|
+
"type": "function",
|
|
1435
|
+
"name": "skim",
|
|
1436
|
+
"inputs": [],
|
|
1437
|
+
"outputs": [],
|
|
1438
|
+
"stateMutability": "nonpayable"
|
|
1439
|
+
},
|
|
1440
|
+
{
|
|
1441
|
+
"type": "function",
|
|
1442
|
+
"name": "skimAvailable",
|
|
1443
|
+
"inputs": [],
|
|
1444
|
+
"outputs": [
|
|
1445
|
+
{
|
|
1446
|
+
"name": "excess",
|
|
1447
|
+
"type": "uint256",
|
|
1448
|
+
"internalType": "uint256"
|
|
1449
|
+
}
|
|
1450
|
+
],
|
|
1451
|
+
"stateMutability": "view"
|
|
1452
|
+
},
|
|
1451
1453
|
{
|
|
1452
1454
|
"type": "function",
|
|
1453
1455
|
"name": "supportsInterface",
|
|
@@ -1486,7 +1488,7 @@
|
|
|
1486
1488
|
"inputs": [],
|
|
1487
1489
|
"outputs": [
|
|
1488
1490
|
{
|
|
1489
|
-
"name": "",
|
|
1491
|
+
"name": "result",
|
|
1490
1492
|
"type": "uint256",
|
|
1491
1493
|
"internalType": "uint256"
|
|
1492
1494
|
}
|
|
@@ -1886,6 +1888,25 @@
|
|
|
1886
1888
|
],
|
|
1887
1889
|
"anonymous": false
|
|
1888
1890
|
},
|
|
1891
|
+
{
|
|
1892
|
+
"type": "event",
|
|
1893
|
+
"name": "ExcessRecovered",
|
|
1894
|
+
"inputs": [
|
|
1895
|
+
{
|
|
1896
|
+
"name": "assets",
|
|
1897
|
+
"type": "uint256",
|
|
1898
|
+
"indexed": false,
|
|
1899
|
+
"internalType": "uint256"
|
|
1900
|
+
},
|
|
1901
|
+
{
|
|
1902
|
+
"name": "recipient",
|
|
1903
|
+
"type": "address",
|
|
1904
|
+
"indexed": false,
|
|
1905
|
+
"internalType": "address"
|
|
1906
|
+
}
|
|
1907
|
+
],
|
|
1908
|
+
"anonymous": false
|
|
1909
|
+
},
|
|
1889
1910
|
{
|
|
1890
1911
|
"type": "event",
|
|
1891
1912
|
"name": "Flashloan",
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"internalType": "contract ICentralRegistry"
|
|
9
9
|
},
|
|
10
10
|
{
|
|
11
|
-
"name": "
|
|
11
|
+
"name": "minLoanSize",
|
|
12
12
|
"type": "uint256",
|
|
13
13
|
"internalType": "uint256"
|
|
14
14
|
}
|
|
@@ -434,29 +434,6 @@
|
|
|
434
434
|
"outputs": [],
|
|
435
435
|
"stateMutability": "view"
|
|
436
436
|
},
|
|
437
|
-
{
|
|
438
|
-
"type": "function",
|
|
439
|
-
"name": "canRedeem",
|
|
440
|
-
"inputs": [
|
|
441
|
-
{
|
|
442
|
-
"name": "cToken",
|
|
443
|
-
"type": "address",
|
|
444
|
-
"internalType": "address"
|
|
445
|
-
},
|
|
446
|
-
{
|
|
447
|
-
"name": "shares",
|
|
448
|
-
"type": "uint256",
|
|
449
|
-
"internalType": "uint256"
|
|
450
|
-
},
|
|
451
|
-
{
|
|
452
|
-
"name": "account",
|
|
453
|
-
"type": "address",
|
|
454
|
-
"internalType": "address"
|
|
455
|
-
}
|
|
456
|
-
],
|
|
457
|
-
"outputs": [],
|
|
458
|
-
"stateMutability": "nonpayable"
|
|
459
|
-
},
|
|
460
437
|
{
|
|
461
438
|
"type": "function",
|
|
462
439
|
"name": "canRedeemWithCollateralRemoval",
|
|
@@ -494,7 +471,7 @@
|
|
|
494
471
|
],
|
|
495
472
|
"outputs": [
|
|
496
473
|
{
|
|
497
|
-
"name": "",
|
|
474
|
+
"name": "collateralRedeemed",
|
|
498
475
|
"type": "uint256",
|
|
499
476
|
"internalType": "uint256"
|
|
500
477
|
}
|
|
@@ -574,7 +551,7 @@
|
|
|
574
551
|
],
|
|
575
552
|
"outputs": [
|
|
576
553
|
{
|
|
577
|
-
"name": "",
|
|
554
|
+
"name": "collateralRedeemed",
|
|
578
555
|
"type": "uint256",
|
|
579
556
|
"internalType": "uint256"
|
|
580
557
|
}
|
|
@@ -70,12 +70,12 @@
|
|
|
70
70
|
"inputs": [],
|
|
71
71
|
"outputs": [
|
|
72
72
|
{
|
|
73
|
-
"name": "",
|
|
73
|
+
"name": "result",
|
|
74
74
|
"type": "uint256",
|
|
75
75
|
"internalType": "uint256"
|
|
76
76
|
}
|
|
77
77
|
],
|
|
78
|
-
"stateMutability": "
|
|
78
|
+
"stateMutability": "view"
|
|
79
79
|
},
|
|
80
80
|
{
|
|
81
81
|
"type": "function",
|
|
@@ -165,8 +165,8 @@
|
|
|
165
165
|
},
|
|
166
166
|
{
|
|
167
167
|
"name": "heartbeat",
|
|
168
|
-
"type": "
|
|
169
|
-
"internalType": "
|
|
168
|
+
"type": "uint8",
|
|
169
|
+
"internalType": "uint8"
|
|
170
170
|
},
|
|
171
171
|
{
|
|
172
172
|
"name": "redstoneTimestamp",
|
|
@@ -175,8 +175,8 @@
|
|
|
175
175
|
},
|
|
176
176
|
{
|
|
177
177
|
"name": "price",
|
|
178
|
-
"type": "
|
|
179
|
-
"internalType": "
|
|
178
|
+
"type": "uint192",
|
|
179
|
+
"internalType": "uint192"
|
|
180
180
|
},
|
|
181
181
|
{
|
|
182
182
|
"name": "symbolHash",
|
|
@@ -344,7 +344,7 @@
|
|
|
344
344
|
],
|
|
345
345
|
"outputs": [
|
|
346
346
|
{
|
|
347
|
-
"name": "",
|
|
347
|
+
"name": "result",
|
|
348
348
|
"type": "tuple",
|
|
349
349
|
"internalType": "struct IOracleAdaptor.PriceGuard",
|
|
350
350
|
"components": [
|
|
@@ -572,8 +572,8 @@
|
|
|
572
572
|
},
|
|
573
573
|
{
|
|
574
574
|
"name": "heartbeat",
|
|
575
|
-
"type": "
|
|
576
|
-
"internalType": "
|
|
575
|
+
"type": "uint8",
|
|
576
|
+
"internalType": "uint8"
|
|
577
577
|
},
|
|
578
578
|
{
|
|
579
579
|
"name": "redstoneTimestamp",
|
|
@@ -582,8 +582,8 @@
|
|
|
582
582
|
},
|
|
583
583
|
{
|
|
584
584
|
"name": "price",
|
|
585
|
-
"type": "
|
|
586
|
-
"internalType": "
|
|
585
|
+
"type": "uint192",
|
|
586
|
+
"internalType": "uint192"
|
|
587
587
|
},
|
|
588
588
|
{
|
|
589
589
|
"name": "symbolHash",
|
|
@@ -818,11 +818,6 @@
|
|
|
818
818
|
],
|
|
819
819
|
"anonymous": false
|
|
820
820
|
},
|
|
821
|
-
{
|
|
822
|
-
"type": "error",
|
|
823
|
-
"name": "BasePositionManager__ExceedsMaximumBorrowAllowed",
|
|
824
|
-
"inputs": []
|
|
825
|
-
},
|
|
826
821
|
{
|
|
827
822
|
"type": "error",
|
|
828
823
|
"name": "BasePositionManager__InsufficientAssetsForRepayment",
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { Contract, TransactionResponse } from "ethers";
|
|
2
2
|
import { address, curvance_provider, Percentage, TokenInput, USD, USD_WAD } from "../types";
|
|
3
|
-
import { CToken, ICToken } from "./CToken";
|
|
3
|
+
import { CToken, ICToken, ZapperInstructions } from "./CToken";
|
|
4
4
|
import { DynamicMarketToken, StaticMarketToken, UserMarketToken } from "./ProtocolReader";
|
|
5
5
|
import { Market } from "./Market";
|
|
6
6
|
import { ChangeRate } from "../helpers";
|
|
7
7
|
import Decimal from "decimal.js";
|
|
8
|
-
import { ZapperTypes } from "./Zapper";
|
|
9
8
|
export interface IBorrowableCToken extends ICToken {
|
|
10
9
|
borrow(amount: bigint, receiver: address): Promise<TransactionResponse>;
|
|
11
10
|
repay(amount: bigint): Promise<TransactionResponse>;
|
|
@@ -38,7 +37,7 @@ export declare class BorrowableCToken extends CToken {
|
|
|
38
37
|
getSupplyRate(inPercentage: true): Percentage;
|
|
39
38
|
getSupplyRate(inPercentage: false): bigint;
|
|
40
39
|
borrowChange(amount: USD, rateType: ChangeRate): Decimal;
|
|
41
|
-
depositAsCollateral(amount: TokenInput, zap?:
|
|
40
|
+
depositAsCollateral(amount: TokenInput, zap?: ZapperInstructions, receiver?: address | null): Promise<TransactionResponse>;
|
|
42
41
|
postCollateral(amount: TokenInput): Promise<TransactionResponse>;
|
|
43
42
|
hypotheticalBorrowOf(amount: TokenInput): Promise<{
|
|
44
43
|
excess: bigint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BorrowableCToken.d.ts","sourceRoot":"","sources":["../../src/classes/BorrowableCToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAC5F,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"BorrowableCToken.d.ts","sourceRoot":"","sources":["../../src/classes/BorrowableCToken.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BorrowableCToken.js","sourceRoot":"","sources":["../../src/classes/BorrowableCToken.ts"],"names":[],"mappings":";;;;;;AAEA,
|
|
1
|
+
{"version":3,"file":"BorrowableCToken.js","sourceRoot":"","sources":["../../src/classes/BorrowableCToken.ts"],"names":[],"mappings":"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"}
|
package/dist/classes/CToken.d.ts
CHANGED
|
@@ -26,6 +26,11 @@ export interface ZapToken {
|
|
|
26
26
|
interface: NativeToken | ERC20;
|
|
27
27
|
type: ZapperTypes;
|
|
28
28
|
}
|
|
29
|
+
export type ZapperInstructions = 'none' | 'native-vault' | 'vault' | 'native-simple' | {
|
|
30
|
+
type: ZapperTypes;
|
|
31
|
+
slippage: bigint;
|
|
32
|
+
inputToken: address;
|
|
33
|
+
};
|
|
29
34
|
export interface ICToken {
|
|
30
35
|
decimals(): Promise<bigint>;
|
|
31
36
|
isBorrowable(): Promise<boolean>;
|
|
@@ -174,6 +179,8 @@ export declare class CToken extends Calldata<ICToken> {
|
|
|
174
179
|
fetchTotalCollateral(inUSD: false): Promise<bigint>;
|
|
175
180
|
getPositionManager(type: PositionManagerTypes): PositionManager;
|
|
176
181
|
getZapper(type: ZapperTypes): Zapper | null;
|
|
182
|
+
isZapAssetApproved(instructions: ZapperInstructions, amount: bigint): Promise<true>;
|
|
183
|
+
approveZapAsset(instructions: ZapperInstructions, amount: TokenInput | null): Promise<TransactionResponse>;
|
|
177
184
|
isPluginApproved(plugin: ZapperTypes | PositionManagerTypes, type: PluginTypes): Promise<boolean>;
|
|
178
185
|
approvePlugin(plugin: ZapperTypes | PositionManagerTypes, type: PluginTypes): Promise<TransactionResponse>;
|
|
179
186
|
getPluginAddress(plugin: ZapperTypes | PositionManagerTypes, type: PluginTypes): address | null;
|
|
@@ -210,7 +217,7 @@ export declare class CToken extends Calldata<ICToken> {
|
|
|
210
217
|
convertBigInt(amount: bigint, inShares?: boolean, use_exchange_rate?: boolean): Decimal;
|
|
211
218
|
convertTokenInput(amount: TokenInput, inShares?: boolean, use_exchange_rate?: boolean): bigint;
|
|
212
219
|
/** @returns A list of tokens mapped to their respective zap options */
|
|
213
|
-
getDepositTokens(): Promise<ZapToken[]>;
|
|
220
|
+
getDepositTokens(search?: string | null): Promise<ZapToken[]>;
|
|
214
221
|
hypotheticalRedemptionOf(amount: TokenInput): Promise<{
|
|
215
222
|
excess: bigint;
|
|
216
223
|
deficit: bigint;
|
|
@@ -219,7 +226,7 @@ export declare class CToken extends Calldata<ICToken> {
|
|
|
219
226
|
}>;
|
|
220
227
|
leverageUp(borrow: BorrowableCToken, borrowAmount: TokenInput, type: PositionManagerTypes, slippage_?: TokenInput): Promise<TransactionResponse>;
|
|
221
228
|
depositAndLeverage(depositAmount: TokenInput, borrow: BorrowableCToken, borrowAmount: TokenInput, type: PositionManagerTypes, slippage_?: TokenInput): Promise<TransactionResponse>;
|
|
222
|
-
zap(assets: bigint, zap:
|
|
229
|
+
zap(assets: bigint, zap: ZapperInstructions, collateralize: boolean | undefined, default_calldata: bytes): Promise<{
|
|
223
230
|
calldata: `0x${string}`;
|
|
224
231
|
calldata_overrides: {};
|
|
225
232
|
zapper: null;
|
|
@@ -227,9 +234,9 @@ export declare class CToken extends Calldata<ICToken> {
|
|
|
227
234
|
calldata: `0x${string}`;
|
|
228
235
|
calldata_overrides: {};
|
|
229
236
|
zapper: Zapper;
|
|
230
|
-
}
|
|
231
|
-
deposit(amount: TokenInput, zap?:
|
|
232
|
-
depositAsCollateral(amount: Decimal, zap?:
|
|
237
|
+
}>;
|
|
238
|
+
deposit(amount: TokenInput, zap?: ZapperInstructions, receiver?: address | null): Promise<TransactionResponse>;
|
|
239
|
+
depositAsCollateral(amount: Decimal, zap?: ZapperInstructions, receiver?: address | null): Promise<TransactionResponse>;
|
|
233
240
|
redeem(amount: TokenInput): Promise<TransactionResponse>;
|
|
234
241
|
redeemShares(amount: bigint): Promise<TransactionResponse>;
|
|
235
242
|
collateralPosted(account?: address | null): Promise<bigint>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CToken.d.ts","sourceRoot":"","sources":["../../src/classes/CToken.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CToken.d.ts","sourceRoot":"","sources":["../../src/classes/CToken.ts"],"names":[],"mappings":"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"}
|
package/dist/classes/CToken.js
CHANGED
|
@@ -40,6 +40,7 @@ class CToken extends Calldata_1.Calldata {
|
|
|
40
40
|
this.leverageTypes.push('native-vault');
|
|
41
41
|
if (isWrappedNative)
|
|
42
42
|
this.zapTypes.push('native-simple');
|
|
43
|
+
this.zapTypes.push('simple');
|
|
43
44
|
}
|
|
44
45
|
get adapters() { return this.cache.adapters; }
|
|
45
46
|
get borrowPaused() { return this.cache.borrowPaused; }
|
|
@@ -188,7 +189,34 @@ class CToken extends Calldata_1.Calldata {
|
|
|
188
189
|
}
|
|
189
190
|
return new Zapper_1.Zapper(zap_contract, signer, type);
|
|
190
191
|
}
|
|
192
|
+
async isZapAssetApproved(instructions, amount) {
|
|
193
|
+
if (instructions == 'none' || typeof instructions != 'object') {
|
|
194
|
+
return true;
|
|
195
|
+
}
|
|
196
|
+
const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
|
|
197
|
+
const asset = new ERC20_1.ERC20(signer, instructions.inputToken);
|
|
198
|
+
const plugin = this.getPluginAddress(instructions.type, 'zapper');
|
|
199
|
+
const allowance = await asset.allowance(signer.address, plugin);
|
|
200
|
+
const isApproved = allowance >= amount;
|
|
201
|
+
if (!isApproved) {
|
|
202
|
+
const symbol = await asset.fetchSymbol();
|
|
203
|
+
throw new Error(`Plugin needs to be approved for the asset: ${symbol}`);
|
|
204
|
+
}
|
|
205
|
+
return isApproved;
|
|
206
|
+
}
|
|
207
|
+
async approveZapAsset(instructions, amount) {
|
|
208
|
+
if (instructions == 'none' || typeof instructions != 'object') {
|
|
209
|
+
throw new Error("Plugin does not have an associated contract");
|
|
210
|
+
}
|
|
211
|
+
const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
|
|
212
|
+
const asset = new ERC20_1.ERC20(signer, instructions.inputToken);
|
|
213
|
+
const plugin = this.getPluginAddress(instructions.type, 'zapper');
|
|
214
|
+
return asset.approve(plugin, amount);
|
|
215
|
+
}
|
|
191
216
|
async isPluginApproved(plugin, type) {
|
|
217
|
+
if (plugin == 'none') {
|
|
218
|
+
return true;
|
|
219
|
+
}
|
|
192
220
|
const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
|
|
193
221
|
const plugin_address = this.getPluginAddress(plugin, type);
|
|
194
222
|
if (plugin_address == null) {
|
|
@@ -372,7 +400,7 @@ class CToken extends Calldata_1.Calldata {
|
|
|
372
400
|
return use_exchange_rate ? (newAmount * this.exchangeRate) / helpers_1.WAD : newAmount;
|
|
373
401
|
}
|
|
374
402
|
/** @returns A list of tokens mapped to their respective zap options */
|
|
375
|
-
async getDepositTokens() {
|
|
403
|
+
async getDepositTokens(search = null) {
|
|
376
404
|
let tokens = [{
|
|
377
405
|
interface: this.getAsset(true),
|
|
378
406
|
type: 'none'
|
|
@@ -389,8 +417,12 @@ class CToken extends Calldata_1.Calldata {
|
|
|
389
417
|
type: 'native-simple'
|
|
390
418
|
});
|
|
391
419
|
}
|
|
420
|
+
if (this.zapTypes.includes('simple')) {
|
|
421
|
+
const dexAggSearch = await setup_1.chain_config[setup_1.setup_config.chain].dexAgg.getAvailableTokens(this.provider, search);
|
|
422
|
+
tokens = tokens.concat(dexAggSearch);
|
|
423
|
+
}
|
|
392
424
|
// @NOTE: You are probably wondering... why the hell is this an async function,
|
|
393
|
-
// The future plan for other zappers will be to query an API for a token list which will require this to be async
|
|
425
|
+
// The future plan for other zappers will be to query an API for a token list which will require this to be async
|
|
394
426
|
return tokens;
|
|
395
427
|
}
|
|
396
428
|
async hypotheticalRedemptionOf(amount) {
|
|
@@ -428,9 +460,9 @@ class CToken extends Calldata_1.Calldata {
|
|
|
428
460
|
});
|
|
429
461
|
}
|
|
430
462
|
// async leverageDown(
|
|
431
|
-
// borrow: BorrowableCToken,
|
|
432
|
-
// borrowAmount: TokenInput,
|
|
433
|
-
// type: PositionManagerTypes,
|
|
463
|
+
// borrow: BorrowableCToken,
|
|
464
|
+
// borrowAmount: TokenInput,
|
|
465
|
+
// type: PositionManagerTypes,
|
|
434
466
|
// slippage_: TokenInput = Decimal(0.5)
|
|
435
467
|
// ) {
|
|
436
468
|
// const manager = this.getPositionManager(type);
|
|
@@ -465,17 +497,34 @@ class CToken extends Calldata_1.Calldata {
|
|
|
465
497
|
to: manager.address
|
|
466
498
|
});
|
|
467
499
|
}
|
|
468
|
-
zap(assets, zap, collateralize = false, default_calldata) {
|
|
500
|
+
async zap(assets, zap, collateralize = false, default_calldata) {
|
|
469
501
|
let calldata;
|
|
470
502
|
let calldata_overrides = {};
|
|
471
|
-
let
|
|
503
|
+
let slippage = 0n;
|
|
504
|
+
let inputToken = null;
|
|
505
|
+
let type_of_zap;
|
|
506
|
+
if (typeof zap == 'object') {
|
|
507
|
+
slippage = zap.slippage;
|
|
508
|
+
inputToken = zap.inputToken;
|
|
509
|
+
type_of_zap = zap.type;
|
|
510
|
+
}
|
|
511
|
+
else {
|
|
512
|
+
type_of_zap = zap;
|
|
513
|
+
}
|
|
514
|
+
let zapper = this.getZapper(type_of_zap);
|
|
472
515
|
if (zapper == null) {
|
|
473
|
-
if (
|
|
516
|
+
if (type_of_zap != 'none') {
|
|
474
517
|
throw new Error("Zapper type selected but no zapper contract found");
|
|
475
518
|
}
|
|
476
519
|
return { calldata: default_calldata, calldata_overrides, zapper: null };
|
|
477
520
|
}
|
|
478
|
-
switch (
|
|
521
|
+
switch (type_of_zap) {
|
|
522
|
+
case 'simple':
|
|
523
|
+
if (inputToken == null)
|
|
524
|
+
throw new Error("Input token must be provided for simple zap");
|
|
525
|
+
calldata = await zapper.getSimpleZapCalldata(this.address, inputToken, this.asset.address, assets, collateralize, slippage);
|
|
526
|
+
calldata_overrides = { to: zapper.address };
|
|
527
|
+
break;
|
|
479
528
|
case 'native-vault':
|
|
480
529
|
calldata = zapper.getNativeZapCalldata(this, assets, collateralize);
|
|
481
530
|
calldata_overrides = { value: assets, to: zapper.address };
|
|
@@ -494,9 +543,17 @@ class CToken extends Calldata_1.Calldata {
|
|
|
494
543
|
if (receiver == null)
|
|
495
544
|
receiver = signer.address;
|
|
496
545
|
const assets = this.convertTokenInput(amount);
|
|
546
|
+
const zapType = typeof zap == 'object' ? zap.type : zap;
|
|
547
|
+
const isNative = zapType == 'native-simple' || zapType == 'native-vault' || zapType == 'none';
|
|
497
548
|
const default_calldata = this.getCallData("deposit", [assets, receiver]);
|
|
498
|
-
const { calldata, calldata_overrides } = this.zap(assets, zap, false, default_calldata);
|
|
499
|
-
|
|
549
|
+
const { calldata, calldata_overrides } = await this.zap(assets, zap, false, default_calldata);
|
|
550
|
+
if (isNative) {
|
|
551
|
+
await this._checkAssetApproval(this.address, assets);
|
|
552
|
+
}
|
|
553
|
+
else {
|
|
554
|
+
await this.isZapAssetApproved(zap, assets);
|
|
555
|
+
await this._checkZapperApproval(this.getZapper(zapType));
|
|
556
|
+
}
|
|
500
557
|
return this.oracleRoute(calldata, calldata_overrides);
|
|
501
558
|
}
|
|
502
559
|
async depositAsCollateral(amount, zap = 'none', receiver = null) {
|
|
@@ -515,7 +572,7 @@ class CToken extends Calldata_1.Calldata {
|
|
|
515
572
|
}
|
|
516
573
|
}
|
|
517
574
|
const default_calldata = this.getCallData("depositAsCollateral", [assets, receiver]);
|
|
518
|
-
const { calldata, calldata_overrides, zapper } = this.zap(assets, zap, true, default_calldata);
|
|
575
|
+
const { calldata, calldata_overrides, zapper } = await this.zap(assets, zap, true, default_calldata);
|
|
519
576
|
await this._checkDepositApprovals(zapper, assets);
|
|
520
577
|
return this.oracleRoute(calldata, calldata_overrides);
|
|
521
578
|
}
|
|
@@ -597,10 +654,12 @@ class CToken extends Calldata_1.Calldata {
|
|
|
597
654
|
if (!setup_1.setup_config.approval_protection) {
|
|
598
655
|
return;
|
|
599
656
|
}
|
|
600
|
-
const asset = this.getAsset(true);
|
|
657
|
+
const asset = target == this.address ? this.getAsset(true) : new ERC20_1.ERC20(this.provider, target);
|
|
601
658
|
const owner = (0, helpers_1.validateProviderAsSigner)(this.provider).address;
|
|
602
659
|
const allowance = await asset.allowance(owner, target);
|
|
603
660
|
if (allowance < assets) {
|
|
661
|
+
if (target != this.address)
|
|
662
|
+
await asset.fetchSymbol();
|
|
604
663
|
throw new Error(`Please approve the ${asset.symbol} token for ${this.symbol}.`);
|
|
605
664
|
}
|
|
606
665
|
}
|