@defisaver/positions-sdk 0.0.62 → 0.0.63-dev1
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/config/contracts.d.ts +20 -189
- package/cjs/config/contracts.js +15 -25
- package/cjs/llamaLend/index.js +30 -30
- package/cjs/markets/compound/index.js +3 -2
- package/cjs/markets/compound/marketsAssets.d.ts +2 -1
- package/cjs/markets/compound/marketsAssets.js +3 -2
- package/cjs/markets/llamaLend/contractAddresses.d.ts +9 -0
- package/cjs/markets/llamaLend/contractAddresses.js +88 -0
- package/cjs/markets/llamaLend/index.d.ts +12 -10
- package/cjs/markets/llamaLend/index.js +41 -57
- package/cjs/types/contracts/generated/{LlamaLendCRVCrvUSDController.d.ts → LlamaLendControllerAbi.d.ts} +3 -3
- package/cjs/types/contracts/generated/LlamaLendView.d.ts +5 -0
- package/cjs/types/contracts/generated/index.d.ts +1 -4
- package/cjs/types/llamaLend.d.ts +35 -9
- package/cjs/types/llamaLend.js +26 -8
- package/esm/config/contracts.d.ts +20 -189
- package/esm/config/contracts.js +15 -25
- package/esm/llamaLend/index.js +33 -33
- package/esm/markets/compound/index.js +3 -2
- package/esm/markets/compound/marketsAssets.d.ts +2 -1
- package/esm/markets/compound/marketsAssets.js +2 -1
- package/esm/markets/llamaLend/contractAddresses.d.ts +9 -0
- package/esm/markets/llamaLend/contractAddresses.js +84 -0
- package/esm/markets/llamaLend/index.d.ts +12 -10
- package/esm/markets/llamaLend/index.js +31 -55
- package/esm/types/contracts/generated/{LlamaLendCrvUSDCRVController.d.ts → LlamaLendControllerAbi.d.ts} +3 -3
- package/esm/types/contracts/generated/LlamaLendView.d.ts +5 -0
- package/esm/types/contracts/generated/index.d.ts +1 -4
- package/esm/types/llamaLend.d.ts +35 -9
- package/esm/types/llamaLend.js +25 -7
- package/package.json +2 -2
- package/src/config/contracts.js +15 -25
- package/src/contracts.ts +2 -1
- package/src/llamaLend/index.ts +21 -29
- package/src/markets/compound/index.ts +4 -3
- package/src/markets/compound/marketsAssets.ts +2 -1
- package/src/markets/llamaLend/contractAddresses.ts +95 -0
- package/src/markets/llamaLend/index.ts +123 -38
- package/src/types/common.ts +1 -1
- package/src/types/contracts/generated/{LlamaLendCRVCrvUSDController.ts → LlamaLendControllerAbi.ts} +3 -3
- package/src/types/contracts/generated/LlamaLendView.ts +9 -0
- package/src/types/contracts/generated/index.ts +1 -4
- package/src/types/llamaLend.ts +34 -10
- package/yarn-error.log +64 -0
- package/cjs/types/contracts/generated/LlamaLendCrvUSDCRVController.d.ts +0 -209
- package/cjs/types/contracts/generated/LlamaLendCrvUSDCRVController.js +0 -5
- package/cjs/types/contracts/generated/LlamaLendTBTCCrvUSDController.d.ts +0 -209
- package/cjs/types/contracts/generated/LlamaLendTBTCCrvUSDController.js +0 -5
- package/cjs/types/contracts/generated/LlamaLendWstETHCrvUSDController.d.ts +0 -209
- package/cjs/types/contracts/generated/LlamaLendWstETHCrvUSDController.js +0 -5
- package/esm/types/contracts/generated/LlamaLendCRVCrvUSDController.d.ts +0 -209
- package/esm/types/contracts/generated/LlamaLendCrvUSDCRVController.js +0 -4
- package/esm/types/contracts/generated/LlamaLendTBTCCrvUSDController.d.ts +0 -209
- package/esm/types/contracts/generated/LlamaLendTBTCCrvUSDController.js +0 -4
- package/esm/types/contracts/generated/LlamaLendWstETHCrvUSDController.d.ts +0 -209
- package/esm/types/contracts/generated/LlamaLendWstETHCrvUSDController.js +0 -4
- package/src/types/contracts/generated/LlamaLendCrvUSDCRVController.ts +0 -416
- package/src/types/contracts/generated/LlamaLendTBTCCrvUSDController.ts +0 -416
- package/src/types/contracts/generated/LlamaLendWstETHCrvUSDController.ts +0 -416
- /package/cjs/types/contracts/generated/{LlamaLendCRVCrvUSDController.js → LlamaLendControllerAbi.js} +0 -0
- /package/esm/types/contracts/generated/{LlamaLendCRVCrvUSDController.js → LlamaLendControllerAbi.js} +0 -0
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
import {
|
|
2
|
+
LlamaLendVersions, LlamaLendVersionsType, LLVersionsArb, LLVersionsEth,
|
|
3
|
+
} from '../../types';
|
|
4
|
+
import { NetworkNumber } from '../../types/common';
|
|
5
|
+
|
|
6
|
+
type LLAddresses = {
|
|
7
|
+
controllerAddress: string,
|
|
8
|
+
vaultAddress: string
|
|
9
|
+
controllerId: number,
|
|
10
|
+
};
|
|
11
|
+
|
|
12
|
+
const ethAddresses: Record<LLVersionsEth, LLAddresses> = {
|
|
13
|
+
[LlamaLendVersions.LLWstethCrvusd]: {
|
|
14
|
+
controllerId: 0,
|
|
15
|
+
controllerAddress: '0x1E0165DbD2019441aB7927C018701f3138114D71',
|
|
16
|
+
vaultAddress: '0x8cf1DE26729cfB7137AF1A6B2a665e099EC319b5',
|
|
17
|
+
},
|
|
18
|
+
[LlamaLendVersions.LLSusdeCrvusd]: {
|
|
19
|
+
controllerId: 7,
|
|
20
|
+
controllerAddress: '0x98fc283d6636f6dcff5a817a00ac69a3add96907',
|
|
21
|
+
vaultAddress: '0x52096539ed1391CB50C6b9e4Fd18aFd2438ED23b',
|
|
22
|
+
},
|
|
23
|
+
[LlamaLendVersions.LLCrvCrvusd]: {
|
|
24
|
+
controllerId: 3,
|
|
25
|
+
controllerAddress: '0xEdA215b7666936DEd834f76f3fBC6F323295110A',
|
|
26
|
+
vaultAddress: '0xCeA18a8752bb7e7817F9AE7565328FE415C0f2cA',
|
|
27
|
+
},
|
|
28
|
+
[LlamaLendVersions.LLCrvusdCrv]: {
|
|
29
|
+
controllerId: 4,
|
|
30
|
+
controllerAddress: '0xC510d73Ad34BeDECa8978B6914461aA7b50CF3Fc',
|
|
31
|
+
vaultAddress: '0x4D2f44B0369f3C20c3d670D2C26b048985598450',
|
|
32
|
+
},
|
|
33
|
+
[LlamaLendVersions.LLTbtcCrvusd]: {
|
|
34
|
+
controllerId: 2,
|
|
35
|
+
controllerAddress: '0x413FD2511BAD510947a91f5c6c79EBD8138C29Fc',
|
|
36
|
+
vaultAddress: '0xb2b23C87a4B6d1b03Ba603F7C3EB9A81fDC0AAC9',
|
|
37
|
+
},
|
|
38
|
+
[LlamaLendVersions.LLCrvusdTbtc]: {
|
|
39
|
+
controllerId: 6,
|
|
40
|
+
controllerAddress: '0xe438658874b0acf4d81c24172e137f0ee00621b8',
|
|
41
|
+
vaultAddress: '0x99Cff9Dc26A44dc2496B4448ebE415b5E894bd30',
|
|
42
|
+
},
|
|
43
|
+
[LlamaLendVersions.LLWethCrvusd]: {
|
|
44
|
+
controllerId: 1,
|
|
45
|
+
controllerAddress: '0xaade9230aa9161880e13a38c83400d3d1995267b',
|
|
46
|
+
vaultAddress: '0x5AE28c9197a4a6570216fC7e53E7e0221D7A0FEF',
|
|
47
|
+
},
|
|
48
|
+
[LlamaLendVersions.LLCrvusdWeth]: {
|
|
49
|
+
controllerId: 5,
|
|
50
|
+
controllerAddress: '0xa5d9137d2a1ee912469d911a8e74b6c77503bac8',
|
|
51
|
+
vaultAddress: '0x46196C004de85c7a75C8b1bB9d54Afb0f8654A45',
|
|
52
|
+
},
|
|
53
|
+
};
|
|
54
|
+
|
|
55
|
+
const arbAddresses: Record<LLVersionsArb, LLAddresses> = {
|
|
56
|
+
[LlamaLendVersions.LLArbCrvusd]: {
|
|
57
|
+
controllerId: 5,
|
|
58
|
+
controllerAddress: '0x76709bc0da299ab0234eec51385e900922ae98f5',
|
|
59
|
+
vaultAddress: '0x65592b1F12c07D434e95c7BF87F4f2f464e950e4',
|
|
60
|
+
},
|
|
61
|
+
[LlamaLendVersions.LLFxnCrvusd]: {
|
|
62
|
+
controllerId: 7,
|
|
63
|
+
controllerAddress: '0x7adcc491f0b7f9bc12837b8f5edf0e580d176f1f',
|
|
64
|
+
vaultAddress: '0xebA51f6472F4cE1C47668c2474ab8f84B32E1ae7',
|
|
65
|
+
},
|
|
66
|
+
[LlamaLendVersions.LLWbtcCrvusd]: {
|
|
67
|
+
controllerId: 1,
|
|
68
|
+
controllerAddress: '0x013be86e1cdb0f384daf24bd974fe75edffe6b68',
|
|
69
|
+
vaultAddress: '0x60D38b12d22BF423F28082bf396ff8F28cC506B1',
|
|
70
|
+
},
|
|
71
|
+
[LlamaLendVersions.LLCrvCrvusd]: {
|
|
72
|
+
controllerId: 4,
|
|
73
|
+
controllerAddress: '0x88f88e937db48bbfe8e3091718576430704e47ab',
|
|
74
|
+
vaultAddress: '0xeEaF2ccB73A01deb38Eca2947d963D64CfDe6A32',
|
|
75
|
+
},
|
|
76
|
+
[LlamaLendVersions.LLWethCrvusd]: {
|
|
77
|
+
controllerId: 0,
|
|
78
|
+
controllerAddress: '0xb5b6f0e69c283aa32425fa18220e64283b51f0a4',
|
|
79
|
+
vaultAddress: '0x49014A8eB1585cBee6A7a9A50C3b81017BF6Cc4d',
|
|
80
|
+
},
|
|
81
|
+
};
|
|
82
|
+
|
|
83
|
+
export const getLLamaLendAddresses = (networkId: NetworkNumber, version: LlamaLendVersionsType) => {
|
|
84
|
+
let addresses: LLAddresses | undefined;
|
|
85
|
+
if (networkId === NetworkNumber.Eth) {
|
|
86
|
+
addresses = ethAddresses[version as any as LLVersionsEth];
|
|
87
|
+
} else if (networkId === NetworkNumber.Arb) {
|
|
88
|
+
addresses = arbAddresses[version as any as LLVersionsArb];
|
|
89
|
+
} else {
|
|
90
|
+
throw new Error(`Invalid LlamaLend network ${networkId} for version ${version}`);
|
|
91
|
+
}
|
|
92
|
+
return addresses;
|
|
93
|
+
};
|
|
94
|
+
|
|
95
|
+
|
|
@@ -1,65 +1,150 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { LlamaLendMarketData, LlamaLendVersions } from '../../types';
|
|
1
|
+
import { LlamaLendMarketData, LlamaLendVersions, LlamaLendVersionsType } from '../../types';
|
|
3
2
|
import { NetworkNumber } from '../../types/common';
|
|
3
|
+
import { getLLamaLendAddresses } from './contractAddresses';
|
|
4
4
|
|
|
5
5
|
export const LLAMALEND_WSTETH_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
|
|
6
|
-
chainIds: [
|
|
6
|
+
chainIds: [NetworkNumber.Eth],
|
|
7
7
|
label: 'LlamaLend - wstETH/crvUSD',
|
|
8
8
|
shortLabel: 'wstETH/crvUSD',
|
|
9
|
-
value: LlamaLendVersions.
|
|
9
|
+
value: LlamaLendVersions.LLWstethCrvusd,
|
|
10
10
|
collAsset: 'wstETH',
|
|
11
11
|
baseAsset: 'crvUSD',
|
|
12
|
-
controllerAddress: getConfigContractAddress('LlamaLendWstETHCrvUSDController', networkId),
|
|
13
|
-
vaultAddress: '0x8cf1DE26729cfB7137AF1A6B2a665e099EC319b5',
|
|
14
12
|
url: 'wstethcrvusd',
|
|
13
|
+
...getLLamaLendAddresses(networkId, LlamaLendVersions.LLWstethCrvusd),
|
|
15
14
|
});
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
15
|
+
|
|
16
|
+
export const LLAMALEND_SUSDE_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
|
|
17
|
+
chainIds: [NetworkNumber.Eth],
|
|
18
|
+
label: 'LlamaLend - sUSDe/crvUSD',
|
|
19
|
+
shortLabel: 'sUSDe/crvUSD',
|
|
20
|
+
value: LlamaLendVersions.LLSusdeCrvusd,
|
|
21
|
+
collAsset: 'sUSDe',
|
|
22
|
+
baseAsset: 'crvUSD',
|
|
23
|
+
url: 'susdecrvusd',
|
|
24
|
+
...getLLamaLendAddresses(networkId, LlamaLendVersions.LLSusdeCrvusd),
|
|
26
25
|
});
|
|
26
|
+
|
|
27
27
|
export const LLAMALEND_CRV_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
|
|
28
|
-
chainIds: [
|
|
28
|
+
chainIds: [NetworkNumber.Eth, NetworkNumber.Arb],
|
|
29
29
|
label: 'LlamaLend - CRV/crvUSD',
|
|
30
30
|
shortLabel: 'CRV/crvUSD',
|
|
31
|
-
value: LlamaLendVersions.
|
|
31
|
+
value: LlamaLendVersions.LLCrvCrvusd,
|
|
32
32
|
collAsset: 'CRV',
|
|
33
33
|
baseAsset: 'crvUSD',
|
|
34
|
-
controllerAddress: getConfigContractAddress('LlamaLendCRVCrvUSDController', networkId),
|
|
35
|
-
vaultAddress: '0xCeA18a8752bb7e7817F9AE7565328FE415C0f2cA',
|
|
36
34
|
url: 'crvcrvusd',
|
|
35
|
+
...getLLamaLendAddresses(networkId, LlamaLendVersions.LLCrvCrvusd),
|
|
37
36
|
});
|
|
38
37
|
|
|
38
|
+
export const LLAMALEND_CRVUSD_CRV_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
|
|
39
|
+
chainIds: [NetworkNumber.Eth],
|
|
40
|
+
label: 'LlamaLend - crvUSD/CRV',
|
|
41
|
+
shortLabel: 'crvUSD/CRV',
|
|
42
|
+
value: LlamaLendVersions.LLCrvusdCrv,
|
|
43
|
+
collAsset: 'crvUSD',
|
|
44
|
+
baseAsset: 'CRV',
|
|
45
|
+
url: 'crvusdcrv',
|
|
46
|
+
...getLLamaLendAddresses(networkId, LlamaLendVersions.LLCrvusdCrv),
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
|
|
39
50
|
export const LLAMALEND_TBTC_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
|
|
40
|
-
chainIds: [
|
|
41
|
-
label: 'LlamaLend -
|
|
42
|
-
shortLabel: '
|
|
43
|
-
value: LlamaLendVersions.
|
|
51
|
+
chainIds: [NetworkNumber.Eth],
|
|
52
|
+
label: 'LlamaLend - tBTC/crvUSD',
|
|
53
|
+
shortLabel: 'tBTC/crvUSD',
|
|
54
|
+
value: LlamaLendVersions.LLTbtcCrvusd,
|
|
44
55
|
collAsset: 'tBTC',
|
|
45
56
|
baseAsset: 'crvUSD',
|
|
46
|
-
controllerAddress: getConfigContractAddress('LlamaLendTBTCCrvUSDController', networkId),
|
|
47
|
-
vaultAddress: '0xb2b23C87a4B6d1b03Ba603F7C3EB9A81fDC0AAC9',
|
|
48
57
|
url: 'tbtccrvusd',
|
|
58
|
+
...getLLamaLendAddresses(networkId, LlamaLendVersions.LLTbtcCrvusd),
|
|
59
|
+
});
|
|
60
|
+
|
|
61
|
+
export const LLAMALEND_CRVUSD_TBTC_MARKET = (networkId:NetworkNumber): LlamaLendMarketData => ({
|
|
62
|
+
chainIds: [NetworkNumber.Eth],
|
|
63
|
+
label: 'LlamaLend - crvUSD/tBTC',
|
|
64
|
+
shortLabel: 'crvUSD/tBTC',
|
|
65
|
+
value: LlamaLendVersions.LLCrvusdTbtc,
|
|
66
|
+
collAsset: 'crvUSD',
|
|
67
|
+
baseAsset: 'tBTC',
|
|
68
|
+
url: 'crvusdtbtc',
|
|
69
|
+
...getLLamaLendAddresses(networkId, LlamaLendVersions.LLCrvusdTbtc),
|
|
70
|
+
});
|
|
71
|
+
|
|
72
|
+
export const LLAMALEND_WETH_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
|
|
73
|
+
chainIds: [NetworkNumber.Eth, NetworkNumber.Arb],
|
|
74
|
+
label: 'LlamaLend - ETH/crvUSD',
|
|
75
|
+
shortLabel: 'ETH/crvUSD',
|
|
76
|
+
value: LlamaLendVersions.LLWethCrvusd,
|
|
77
|
+
collAsset: 'ETH',
|
|
78
|
+
baseAsset: 'crvUSD',
|
|
79
|
+
url: 'wethcrvusd',
|
|
80
|
+
...getLLamaLendAddresses(networkId, LlamaLendVersions.LLWethCrvusd),
|
|
49
81
|
});
|
|
50
82
|
|
|
51
|
-
export const
|
|
52
|
-
[
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
83
|
+
export const LLAMALEND_CRVUSD_WETH_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
|
|
84
|
+
chainIds: [NetworkNumber.Eth],
|
|
85
|
+
label: 'LlamaLend - crvUSD/ETH',
|
|
86
|
+
shortLabel: 'crvUSD/ETH',
|
|
87
|
+
value: LlamaLendVersions.LLCrvusdWeth,
|
|
88
|
+
collAsset: 'crvUSD',
|
|
89
|
+
baseAsset: 'ETH',
|
|
90
|
+
url: 'crvusdweth',
|
|
91
|
+
...getLLamaLendAddresses(networkId, LlamaLendVersions.LLCrvusdWeth),
|
|
92
|
+
});
|
|
93
|
+
|
|
94
|
+
export const LLAMALEND_ARB_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
|
|
95
|
+
chainIds: [NetworkNumber.Arb],
|
|
96
|
+
label: 'LlamaLend - ARB/crvUSD',
|
|
97
|
+
shortLabel: 'ARB/crvUSD',
|
|
98
|
+
value: LlamaLendVersions.LLArbCrvusd,
|
|
99
|
+
collAsset: 'ARB',
|
|
100
|
+
baseAsset: 'crvUSD',
|
|
101
|
+
url: 'arbcrvusd',
|
|
102
|
+
...getLLamaLendAddresses(networkId, LlamaLendVersions.LLArbCrvusd),
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
export const LLAMALEND_FXN_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
|
|
106
|
+
chainIds: [NetworkNumber.Arb],
|
|
107
|
+
label: 'LlamaLend - FXN/crvUSD',
|
|
108
|
+
shortLabel: 'FXN/crvUSD',
|
|
109
|
+
value: LlamaLendVersions.LLFxnCrvusd,
|
|
110
|
+
collAsset: 'FXN',
|
|
111
|
+
baseAsset: 'crvUSD',
|
|
112
|
+
url: 'fxncrvusd',
|
|
113
|
+
...getLLamaLendAddresses(networkId, LlamaLendVersions.LLFxnCrvusd),
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
export const LLAMALEND_WBTC_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
|
|
117
|
+
chainIds: [NetworkNumber.Arb],
|
|
118
|
+
label: 'LlamaLend - WBTC/crvUSD',
|
|
119
|
+
shortLabel: 'WBTC/crvUSD',
|
|
120
|
+
value: LlamaLendVersions.LLWbtcCrvusd,
|
|
121
|
+
collAsset: 'WBTC',
|
|
122
|
+
baseAsset: 'crvUSD',
|
|
123
|
+
url: 'wbtcusd',
|
|
124
|
+
...getLLamaLendAddresses(networkId, LlamaLendVersions.LLWbtcCrvusd),
|
|
125
|
+
});
|
|
126
|
+
|
|
127
|
+
export const LlamaLendMarkets = (networkId: NetworkNumber):Record<LlamaLendVersionsType, LlamaLendMarketData> => ({
|
|
128
|
+
[LlamaLendVersions.LLWstethCrvusd]: LLAMALEND_WSTETH_CRVUSD_MARKET(networkId),
|
|
129
|
+
[LlamaLendVersions.LLCrvusdCrv]: LLAMALEND_CRVUSD_CRV_MARKET(networkId),
|
|
130
|
+
[LlamaLendVersions.LLCrvCrvusd]: LLAMALEND_CRV_CRVUSD_MARKET(networkId),
|
|
131
|
+
[LlamaLendVersions.LLTbtcCrvusd]: LLAMALEND_TBTC_CRVUSD_MARKET(networkId),
|
|
132
|
+
[LlamaLendVersions.LLCrvusdTbtc]: LLAMALEND_CRVUSD_TBTC_MARKET(networkId),
|
|
133
|
+
[LlamaLendVersions.LLWethCrvusd]: LLAMALEND_WETH_CRVUSD_MARKET(networkId),
|
|
134
|
+
[LlamaLendVersions.LLCrvusdWeth]: LLAMALEND_CRVUSD_WETH_MARKET(networkId),
|
|
135
|
+
[LlamaLendVersions.LLArbCrvusd]: LLAMALEND_ARB_CRVUSD_MARKET(networkId),
|
|
136
|
+
[LlamaLendVersions.LLFxnCrvusd]: LLAMALEND_FXN_CRVUSD_MARKET(networkId),
|
|
137
|
+
[LlamaLendVersions.LLWbtcCrvusd]: LLAMALEND_WBTC_CRVUSD_MARKET(networkId),
|
|
138
|
+
[LlamaLendVersions.LLSusdeCrvusd]: LLAMALEND_SUSDE_CRVUSD_MARKET(networkId),
|
|
56
139
|
}) as const;
|
|
57
140
|
|
|
58
141
|
|
|
59
|
-
export const
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
142
|
+
export const getLlamaLendMarketData = (market: LlamaLendVersionsType, network: NetworkNumber = 1) => LlamaLendMarkets(network)[market];
|
|
143
|
+
|
|
144
|
+
|
|
145
|
+
export const getLlamaLendMarketFromControllerAddress = (controllerAddress: string, network: NetworkNumber) => {
|
|
146
|
+
const markets = LlamaLendMarkets(network);
|
|
147
|
+
const market = Object.values(markets).find((market) => market.controllerAddress === controllerAddress);
|
|
148
|
+
if (!market) throw new Error('Market not found');
|
|
149
|
+
return market;
|
|
150
|
+
};
|
package/src/types/common.ts
CHANGED
package/src/types/contracts/generated/{LlamaLendCRVCrvUSDController.ts → LlamaLendControllerAbi.ts}
RENAMED
|
@@ -86,13 +86,13 @@ export type CollectFees = ContractEventLog<{
|
|
|
86
86
|
1: string;
|
|
87
87
|
}>;
|
|
88
88
|
|
|
89
|
-
export interface
|
|
89
|
+
export interface LlamaLendControllerAbi extends BaseContract {
|
|
90
90
|
constructor(
|
|
91
91
|
jsonInterface: any[],
|
|
92
92
|
address?: string,
|
|
93
93
|
options?: ContractOptions
|
|
94
|
-
):
|
|
95
|
-
clone():
|
|
94
|
+
): LlamaLendControllerAbi;
|
|
95
|
+
clone(): LlamaLendControllerAbi;
|
|
96
96
|
methods: {
|
|
97
97
|
factory(): NonPayableTransactionObject<string>;
|
|
98
98
|
|
|
@@ -97,6 +97,7 @@ export declare namespace LlamaLendView {
|
|
|
97
97
|
number | string | BN,
|
|
98
98
|
number | string | BN,
|
|
99
99
|
number | string | BN,
|
|
100
|
+
number | string | BN,
|
|
100
101
|
number | string | BN
|
|
101
102
|
]
|
|
102
103
|
| {
|
|
@@ -119,6 +120,7 @@ export declare namespace LlamaLendView {
|
|
|
119
120
|
lendApr: number | string | BN;
|
|
120
121
|
debtTokenTotalSupply: number | string | BN;
|
|
121
122
|
debtTokenLeftToBorrow: number | string | BN;
|
|
123
|
+
loanDiscount: number | string | BN;
|
|
122
124
|
};
|
|
123
125
|
|
|
124
126
|
export type GlobalDataStructOutputArray = [
|
|
@@ -140,6 +142,7 @@ export declare namespace LlamaLendView {
|
|
|
140
142
|
string,
|
|
141
143
|
string,
|
|
142
144
|
string,
|
|
145
|
+
string,
|
|
143
146
|
string
|
|
144
147
|
];
|
|
145
148
|
export type GlobalDataStructOutputStruct = {
|
|
@@ -162,6 +165,7 @@ export declare namespace LlamaLendView {
|
|
|
162
165
|
lendApr: string;
|
|
163
166
|
debtTokenTotalSupply: string;
|
|
164
167
|
debtTokenLeftToBorrow: string;
|
|
168
|
+
loanDiscount: string;
|
|
165
169
|
};
|
|
166
170
|
export type GlobalDataStructOutput = GlobalDataStructOutputArray &
|
|
167
171
|
GlobalDataStructOutputStruct;
|
|
@@ -307,6 +311,11 @@ export interface LlamaLendView extends BaseContract {
|
|
|
307
311
|
numBands: number | string | BN
|
|
308
312
|
): NonPayableTransactionObject<string>;
|
|
309
313
|
|
|
314
|
+
isControllerValid(
|
|
315
|
+
_controllerAddr: string,
|
|
316
|
+
_controllerId: number | string | BN
|
|
317
|
+
): NonPayableTransactionObject<boolean>;
|
|
318
|
+
|
|
310
319
|
maxBorrow(
|
|
311
320
|
market: string,
|
|
312
321
|
collateral: number | string | BN,
|
|
@@ -32,11 +32,8 @@ export type { LendingPoolAddressesProvider } from "./LendingPoolAddressesProvide
|
|
|
32
32
|
export type { Lido } from "./Lido";
|
|
33
33
|
export type { LiquityActivePool } from "./LiquityActivePool";
|
|
34
34
|
export type { LiquityView } from "./LiquityView";
|
|
35
|
-
export type {
|
|
36
|
-
export type { LlamaLendCrvUSDCRVController } from "./LlamaLendCrvUSDCRVController";
|
|
37
|
-
export type { LlamaLendTBTCCrvUSDController } from "./LlamaLendTBTCCrvUSDController";
|
|
35
|
+
export type { LlamaLendControllerAbi } from "./LlamaLendControllerAbi";
|
|
38
36
|
export type { LlamaLendView } from "./LlamaLendView";
|
|
39
|
-
export type { LlamaLendWstETHCrvUSDController } from "./LlamaLendWstETHCrvUSDController";
|
|
40
37
|
export type { McdDog } from "./McdDog";
|
|
41
38
|
export type { McdJug } from "./McdJug";
|
|
42
39
|
export type { McdSpotter } from "./McdSpotter";
|
package/src/types/llamaLend.ts
CHANGED
|
@@ -1,14 +1,37 @@
|
|
|
1
|
-
import { AssetDataBase } from '@defisaver/tokens';
|
|
2
1
|
import { EthAddress, NetworkNumber } from './common';
|
|
3
2
|
import { BandData, UserBandData } from './curveUsd';
|
|
4
3
|
|
|
5
|
-
export enum
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
4
|
+
export enum LLVersionsEth {
|
|
5
|
+
//long only
|
|
6
|
+
LLWstethCrvusd = 'llamaLendwstETHcrvUSD',
|
|
7
|
+
LLSusdeCrvusd = 'llamaLendsUSDecrvUSD',
|
|
8
|
+
// long and short crv
|
|
9
|
+
LLCrvCrvusd = 'llamaLendCRVcrvUSD',
|
|
10
|
+
LLCrvusdCrv = 'llamaLendcrvUSDCRV',
|
|
11
|
+
// long and short tbtc
|
|
12
|
+
LLTbtcCrvusd = 'llamaLendTBTCcrvUSD',
|
|
13
|
+
LLCrvusdTbtc = 'llamaLendcrvUSDTBTC',
|
|
14
|
+
// long and short weth
|
|
15
|
+
LLWethCrvusd = 'llamaLendWETHcrvUSD',
|
|
16
|
+
LLCrvusdWeth = 'llamaLendcrvUSDWETH',
|
|
10
17
|
}
|
|
11
18
|
|
|
19
|
+
export enum LLVersionsArb {
|
|
20
|
+
//long only
|
|
21
|
+
LLArbCrvusd = 'llamaLendArbcrvUSD',
|
|
22
|
+
LLFxnCrvusd = 'llamaLendFXNcrvUSD',
|
|
23
|
+
LLWbtcCrvusd = 'llamaLendWBTCcrvUSD',
|
|
24
|
+
LLCrvCrvusd = 'llamaLendCRVcrvUSD',
|
|
25
|
+
LLWethCrvusd = 'llamaLendWETHcrvUSD',
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export const LlamaLendVersions = {
|
|
29
|
+
...LLVersionsEth,
|
|
30
|
+
...LLVersionsArb
|
|
31
|
+
} as const;
|
|
32
|
+
|
|
33
|
+
export type LlamaLendVersionsType = typeof LlamaLendVersions[keyof typeof LlamaLendVersions];
|
|
34
|
+
|
|
12
35
|
export enum LlamaLendStatus {
|
|
13
36
|
Nonexistant = 'Nonexistant',
|
|
14
37
|
Safe = 'Safe',
|
|
@@ -21,7 +44,7 @@ export interface LlamaLendMarketData {
|
|
|
21
44
|
chainIds: NetworkNumber[],
|
|
22
45
|
label: string,
|
|
23
46
|
shortLabel: string,
|
|
24
|
-
value:
|
|
47
|
+
value: LlamaLendVersionsType,
|
|
25
48
|
collAsset: string,
|
|
26
49
|
baseAsset: string,
|
|
27
50
|
controllerAddress: string,
|
|
@@ -44,10 +67,12 @@ export interface LlamaLendAssetData {
|
|
|
44
67
|
export type LlamaLendAssetsData = { [key: string]: LlamaLendAssetData };
|
|
45
68
|
|
|
46
69
|
export interface LlamaLendGlobalMarketData {
|
|
47
|
-
|
|
48
|
-
|
|
70
|
+
A:string,
|
|
71
|
+
loanDiscount: string,
|
|
49
72
|
activeBand: string,
|
|
50
73
|
totalDebt: string,
|
|
74
|
+
totalDebtSupplied:string,
|
|
75
|
+
utilization:string,
|
|
51
76
|
ammPrice: string,
|
|
52
77
|
basePrice: string,
|
|
53
78
|
oraclePrice: string,
|
|
@@ -57,7 +82,6 @@ export interface LlamaLendGlobalMarketData {
|
|
|
57
82
|
ammRate: string,
|
|
58
83
|
minBand: string,
|
|
59
84
|
maxBand: string,
|
|
60
|
-
debtCeiling: string,
|
|
61
85
|
borrowRate: string,
|
|
62
86
|
lendRate: string,
|
|
63
87
|
futureBorrowRate: string,
|
package/yarn-error.log
ADDED
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
Arguments:
|
|
2
|
+
/Users/stefan/.nvm/versions/node/v14.19.0/bin/node /usr/local/Cellar/yarn/1.22.19/libexec/bin/yarn.js
|
|
3
|
+
|
|
4
|
+
PATH:
|
|
5
|
+
/Users/stefan/.nvm/versions/node/v14.19.0/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Applications/VMware Fusion.app/Contents/Public:/usr/local/go/bin:/Users/stefan/WebstormProjects/defisaver-positions-sdk/node_modules/.bin:/usr/local/go
|
|
6
|
+
|
|
7
|
+
Yarn version:
|
|
8
|
+
1.22.19
|
|
9
|
+
|
|
10
|
+
Node version:
|
|
11
|
+
14.19.0
|
|
12
|
+
|
|
13
|
+
Platform:
|
|
14
|
+
darwin x64
|
|
15
|
+
|
|
16
|
+
Trace:
|
|
17
|
+
Error: incorrect data check
|
|
18
|
+
at Zlib.zlibOnError [as onerror] (zlib.js:187:17)
|
|
19
|
+
|
|
20
|
+
npm manifest:
|
|
21
|
+
{
|
|
22
|
+
"name": "defisaver-positions-sdk",
|
|
23
|
+
"version": "0.0.1",
|
|
24
|
+
"description": "",
|
|
25
|
+
"main": "./cjs/index.js",
|
|
26
|
+
"module": "./esm/src/index.js",
|
|
27
|
+
"types": "./esm/src/index.d.ts",
|
|
28
|
+
"scripts": {
|
|
29
|
+
"build:esm": "rm -rf esm && tsc -p tsconfig.json",
|
|
30
|
+
"build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
|
|
31
|
+
"build": "npm run build:cjs && npm run build:esm",
|
|
32
|
+
"dev": "tsc -p tsconfig.cjs.json --watch",
|
|
33
|
+
"lint": "eslint src/ --fix",
|
|
34
|
+
"generate-contracts": "node scripts/generateContracts.js",
|
|
35
|
+
"test": "mocha tests/*",
|
|
36
|
+
"build-test": "npm run build && mocha tests/*"
|
|
37
|
+
},
|
|
38
|
+
"keywords": [],
|
|
39
|
+
"author": "",
|
|
40
|
+
"license": "ISC",
|
|
41
|
+
"dependencies": {
|
|
42
|
+
"@defisaver/tokens": "^1.4.56",
|
|
43
|
+
"decimal.js": "^10.4.3"
|
|
44
|
+
},
|
|
45
|
+
"devDependencies": {
|
|
46
|
+
"@defisaver/eslint-config": "^1.0.1",
|
|
47
|
+
"chai": "^4.3.8",
|
|
48
|
+
"dotenv": "^16.3.1",
|
|
49
|
+
"eslint": "^8.49.0",
|
|
50
|
+
"mocha": "^10.2.0",
|
|
51
|
+
"typechain": "^8.3.1",
|
|
52
|
+
"typechain-target-web3-v1-3mihai3": "^6.0.2",
|
|
53
|
+
"typescript": "^5.2.2"
|
|
54
|
+
},
|
|
55
|
+
"peerDependencies": {
|
|
56
|
+
"web3": "^1.10.2"
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
yarn manifest:
|
|
61
|
+
No manifest
|
|
62
|
+
|
|
63
|
+
Lockfile:
|
|
64
|
+
No lockfile
|