@enzymefinance/testutils 4.0.0-next.0 → 4.0.0-next.5
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/CHANGELOG.md +33 -0
- package/dist/declarations/src/assertions.d.ts +4 -4
- package/dist/declarations/src/deployment.d.ts +181 -82
- package/dist/declarations/src/gasRelayer.d.ts +56 -54
- package/dist/declarations/src/helpers.d.ts +16 -15
- package/dist/declarations/src/index.d.ts +6 -6
- package/dist/declarations/src/scaffolding/assets.d.ts +10 -10
- package/dist/declarations/src/scaffolding/chainlink.d.ts +3 -3
- package/dist/declarations/src/scaffolding/common.d.ts +7 -7
- package/dist/declarations/src/scaffolding/core.d.ts +17 -16
- package/dist/declarations/src/scaffolding/extensions/common.d.ts +11 -11
- package/dist/declarations/src/scaffolding/extensions/external-positions/actions.d.ts +35 -0
- package/dist/declarations/src/scaffolding/extensions/external-positions/compound.d.ts +56 -59
- package/dist/declarations/src/scaffolding/extensions/external-positions/index.d.ts +4 -2
- package/dist/declarations/src/scaffolding/extensions/external-positions/mocks.d.ts +53 -20
- package/dist/declarations/src/scaffolding/extensions/external-positions/uniswap-v3-liquidity.d.ts +99 -0
- package/dist/declarations/src/scaffolding/extensions/fees.d.ts +12 -12
- package/dist/declarations/src/scaffolding/extensions/index.d.ts +5 -5
- package/dist/declarations/src/scaffolding/extensions/integrations/aave.d.ts +20 -19
- package/dist/declarations/src/scaffolding/extensions/integrations/compound.d.ts +28 -28
- package/dist/declarations/src/scaffolding/extensions/integrations/curve.d.ts +272 -271
- package/dist/declarations/src/scaffolding/extensions/integrations/idle.d.ts +28 -28
- package/dist/declarations/src/scaffolding/extensions/integrations/index.d.ts +14 -12
- package/dist/declarations/src/scaffolding/extensions/integrations/mock.d.ts +32 -32
- package/dist/declarations/src/scaffolding/extensions/integrations/paraSwapV4.d.ts +23 -22
- package/dist/declarations/src/scaffolding/extensions/integrations/paraSwapV5.d.ts +23 -0
- package/dist/declarations/src/scaffolding/extensions/integrations/poolTogetherV4.d.ts +29 -0
- package/dist/declarations/src/scaffolding/extensions/integrations/synthetix.d.ts +33 -25
- package/dist/declarations/src/scaffolding/extensions/integrations/trackedAssets.d.ts +15 -15
- package/dist/declarations/src/scaffolding/extensions/integrations/uniswapV2.d.ts +46 -46
- package/dist/declarations/src/scaffolding/extensions/integrations/uniswapV3.d.ts +15 -15
- package/dist/declarations/src/scaffolding/extensions/integrations/yearn.d.ts +22 -22
- package/dist/declarations/src/scaffolding/extensions/integrations/zeroExV2.d.ts +12 -12
- package/dist/declarations/src/scaffolding/extensions/policies.d.ts +17 -17
- package/dist/declarations/src/scaffolding/index.d.ts +8 -8
- package/dist/declarations/src/scaffolding/setup.d.ts +77 -75
- package/dist/declarations/src/scaffolding/shares.d.ts +35 -35
- package/dist/declarations/src/scaffolding/vaultCalls.d.ts +32 -17
- package/dist/declarations/src/whales.d.ts +42 -44
- package/dist/enzymefinance-testutils.browser.cjs.js +1470 -697
- package/dist/enzymefinance-testutils.browser.esm.js +1257 -508
- package/dist/enzymefinance-testutils.cjs.dev.js +1470 -697
- package/dist/enzymefinance-testutils.cjs.prod.js +1470 -697
- package/dist/enzymefinance-testutils.esm.js +1257 -508
- package/package.json +6 -6
- package/src/assertions.ts +5 -2
- package/src/deployment.ts +202 -99
- package/src/gasRelayer.ts +17 -18
- package/src/helpers.ts +6 -4
- package/src/scaffolding/assets.ts +6 -5
- package/src/scaffolding/chainlink.ts +2 -2
- package/src/scaffolding/common.ts +1 -1
- package/src/scaffolding/core.ts +28 -12
- package/src/scaffolding/extensions/common.ts +4 -4
- package/src/scaffolding/extensions/external-positions/actions.ts +103 -0
- package/src/scaffolding/extensions/external-positions/compound.ts +69 -114
- package/src/scaffolding/extensions/external-positions/index.ts +2 -0
- package/src/scaffolding/extensions/external-positions/mocks.ts +132 -10
- package/src/scaffolding/extensions/external-positions/uniswap-v3-liquidity.ts +290 -0
- package/src/scaffolding/extensions/fees.ts +1 -1
- package/src/scaffolding/extensions/integrations/aave.ts +6 -8
- package/src/scaffolding/extensions/integrations/compound.ts +10 -11
- package/src/scaffolding/extensions/integrations/curve.ts +72 -68
- package/src/scaffolding/extensions/integrations/idle.ts +9 -11
- package/src/scaffolding/extensions/integrations/index.ts +2 -0
- package/src/scaffolding/extensions/integrations/mock.ts +11 -13
- package/src/scaffolding/extensions/integrations/paraSwapV4.ts +16 -11
- package/src/scaffolding/extensions/integrations/paraSwapV5.ts +73 -0
- package/src/scaffolding/extensions/integrations/poolTogetherV4.ts +117 -0
- package/src/scaffolding/extensions/integrations/synthetix.ts +45 -12
- package/src/scaffolding/extensions/integrations/trackedAssets.ts +3 -4
- package/src/scaffolding/extensions/integrations/uniswapV2.ts +31 -27
- package/src/scaffolding/extensions/integrations/uniswapV3.ts +9 -10
- package/src/scaffolding/extensions/integrations/yearn.ts +9 -11
- package/src/scaffolding/extensions/integrations/zeroExV2.ts +9 -7
- package/src/scaffolding/extensions/policies.ts +2 -1
- package/src/scaffolding/setup.ts +27 -19
- package/src/scaffolding/shares.ts +5 -4
- package/src/scaffolding/vaultCalls.ts +50 -3
- package/src/whales.ts +26 -17
- package/tsconfig.json +2 -1
|
@@ -0,0 +1,290 @@
|
|
|
1
|
+
import type { AddressLike, Call, Contract } from '@enzymefinance/ethers';
|
|
2
|
+
import { contract, extractEvent, resolveAddress } from '@enzymefinance/ethers';
|
|
3
|
+
import type { SignerWithAddress } from '@enzymefinance/hardhat';
|
|
4
|
+
import type { ComptrollerLib, ExternalPositionManager } from '@enzymefinance/protocol';
|
|
5
|
+
import {
|
|
6
|
+
callOnExternalPositionArgs,
|
|
7
|
+
encodeArgs,
|
|
8
|
+
ExternalPositionManagerActionId,
|
|
9
|
+
ExternalPositionType,
|
|
10
|
+
UniswapV3LiquidityPositionActionId,
|
|
11
|
+
uniswapV3LiquidityPositionAddLiquidityArgs,
|
|
12
|
+
uniswapV3LiquidityPositionCollectArgs,
|
|
13
|
+
uniswapV3LiquidityPositionInitArgs,
|
|
14
|
+
UniswapV3LiquidityPositionLib,
|
|
15
|
+
uniswapV3LiquidityPositionMintArgs,
|
|
16
|
+
uniswapV3LiquidityPositionPurgeArgs,
|
|
17
|
+
uniswapV3LiquidityPositionRemoveLiquidityArgs,
|
|
18
|
+
VaultLib,
|
|
19
|
+
} from '@enzymefinance/protocol';
|
|
20
|
+
import type { BigNumber, BigNumberish } from 'ethers';
|
|
21
|
+
|
|
22
|
+
export enum UniswapV3FeeAmount {
|
|
23
|
+
LOW = 500,
|
|
24
|
+
MEDIUM = 3000,
|
|
25
|
+
HIGH = 10000,
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export const uniswapV3LiquidityPositionGetMinTick = (tickSpacing: number) =>
|
|
29
|
+
Math.ceil(-887272 / tickSpacing) * tickSpacing;
|
|
30
|
+
export const uniswapV3LiquidityPositionGetMaxTick = (tickSpacing: number) =>
|
|
31
|
+
Math.floor(887272 / tickSpacing) * tickSpacing;
|
|
32
|
+
|
|
33
|
+
export interface IUniswapV3NonFungibleTokenManager extends Contract<IUniswapV3NonFungibleTokenManager> {
|
|
34
|
+
positions: Call<
|
|
35
|
+
(tokenId: BigNumberish) => {
|
|
36
|
+
nonce: BigNumber;
|
|
37
|
+
operator: string;
|
|
38
|
+
token0: string;
|
|
39
|
+
token1: string;
|
|
40
|
+
fee: BigNumber;
|
|
41
|
+
tickLower: BigNumber;
|
|
42
|
+
tickUpper: BigNumber;
|
|
43
|
+
liquidity: BigNumber;
|
|
44
|
+
feeGrowthInside0LastX128: BigNumber;
|
|
45
|
+
feeGrowthInside1LastX128: BigNumber;
|
|
46
|
+
tokensOwed0: BigNumber;
|
|
47
|
+
tokensOwed1: BigNumber;
|
|
48
|
+
},
|
|
49
|
+
Contract<any>
|
|
50
|
+
>;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
export const IUniswapV3NonFungibleTokenManager = contract<IUniswapV3NonFungibleTokenManager>()`
|
|
54
|
+
function positions(uint256 tokenId) view returns (uint96 nonce, address operator, address token0, address token1, uint24 fee, int24 tickLower, int24 tickUpper, uint128 liquidity, uint256 feeGrowthInside0LastX128, uint256 feeGrowthInside1LastX128, uint128 tokensOwed0, uint128 tokensOwed1)
|
|
55
|
+
`;
|
|
56
|
+
|
|
57
|
+
export async function createUniswapV3LiquidityPosition({
|
|
58
|
+
signer,
|
|
59
|
+
comptrollerProxy,
|
|
60
|
+
externalPositionManager,
|
|
61
|
+
token0,
|
|
62
|
+
token1,
|
|
63
|
+
}: {
|
|
64
|
+
signer: SignerWithAddress;
|
|
65
|
+
comptrollerProxy: ComptrollerLib;
|
|
66
|
+
externalPositionManager: ExternalPositionManager;
|
|
67
|
+
token0: AddressLike;
|
|
68
|
+
token1: AddressLike;
|
|
69
|
+
}) {
|
|
70
|
+
const initArgs = uniswapV3LiquidityPositionInitArgs({
|
|
71
|
+
token0,
|
|
72
|
+
token1,
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
const receipt = await comptrollerProxy
|
|
76
|
+
.connect(signer)
|
|
77
|
+
.callOnExtension(
|
|
78
|
+
externalPositionManager,
|
|
79
|
+
ExternalPositionManagerActionId.CreateExternalPosition,
|
|
80
|
+
encodeArgs(['uint256', 'bytes'], [ExternalPositionType.UniswapV3LiquidityPosition, initArgs]),
|
|
81
|
+
);
|
|
82
|
+
|
|
83
|
+
const vaultProxy = new VaultLib(await comptrollerProxy.getVaultProxy(), signer);
|
|
84
|
+
const externalPositions = await vaultProxy.getActiveExternalPositions.call();
|
|
85
|
+
const externalPositionProxyAddress = externalPositions[externalPositions.length - 1];
|
|
86
|
+
|
|
87
|
+
return { externalPositionProxyAddress, receipt };
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
export async function uniswapV3LiquidityPositionAddLiquidity({
|
|
91
|
+
signer,
|
|
92
|
+
comptrollerProxy,
|
|
93
|
+
externalPositionManager,
|
|
94
|
+
externalPositionProxy,
|
|
95
|
+
nftId,
|
|
96
|
+
amount0Desired,
|
|
97
|
+
amount1Desired,
|
|
98
|
+
amount0Min = 0,
|
|
99
|
+
amount1Min = 0,
|
|
100
|
+
}: {
|
|
101
|
+
signer: SignerWithAddress;
|
|
102
|
+
comptrollerProxy: ComptrollerLib;
|
|
103
|
+
externalPositionManager: ExternalPositionManager;
|
|
104
|
+
externalPositionProxy: AddressLike;
|
|
105
|
+
nftId: BigNumberish;
|
|
106
|
+
amount0Desired: BigNumberish;
|
|
107
|
+
amount1Desired: BigNumberish;
|
|
108
|
+
amount0Min?: BigNumberish;
|
|
109
|
+
amount1Min?: BigNumberish;
|
|
110
|
+
}) {
|
|
111
|
+
const actionArgs = uniswapV3LiquidityPositionAddLiquidityArgs({
|
|
112
|
+
amount0Desired,
|
|
113
|
+
amount0Min,
|
|
114
|
+
amount1Desired,
|
|
115
|
+
amount1Min,
|
|
116
|
+
nftId,
|
|
117
|
+
});
|
|
118
|
+
|
|
119
|
+
const callArgs = callOnExternalPositionArgs({
|
|
120
|
+
actionArgs,
|
|
121
|
+
actionId: UniswapV3LiquidityPositionActionId.AddLiquidity,
|
|
122
|
+
externalPositionProxy,
|
|
123
|
+
});
|
|
124
|
+
|
|
125
|
+
return comptrollerProxy
|
|
126
|
+
.connect(signer)
|
|
127
|
+
.callOnExtension(externalPositionManager, ExternalPositionManagerActionId.CallOnExternalPosition, callArgs);
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
export async function uniswapV3LiquidityPositionCollect({
|
|
131
|
+
signer,
|
|
132
|
+
comptrollerProxy,
|
|
133
|
+
externalPositionManager,
|
|
134
|
+
externalPositionProxy,
|
|
135
|
+
nftId,
|
|
136
|
+
}: {
|
|
137
|
+
signer: SignerWithAddress;
|
|
138
|
+
comptrollerProxy: ComptrollerLib;
|
|
139
|
+
externalPositionManager: ExternalPositionManager;
|
|
140
|
+
externalPositionProxy: AddressLike;
|
|
141
|
+
nftId: BigNumberish;
|
|
142
|
+
}) {
|
|
143
|
+
const actionArgs = uniswapV3LiquidityPositionCollectArgs({
|
|
144
|
+
nftId,
|
|
145
|
+
});
|
|
146
|
+
|
|
147
|
+
const callArgs = callOnExternalPositionArgs({
|
|
148
|
+
actionArgs,
|
|
149
|
+
actionId: UniswapV3LiquidityPositionActionId.Collect,
|
|
150
|
+
externalPositionProxy,
|
|
151
|
+
});
|
|
152
|
+
|
|
153
|
+
return comptrollerProxy
|
|
154
|
+
.connect(signer)
|
|
155
|
+
.callOnExtension(externalPositionManager, ExternalPositionManagerActionId.CallOnExternalPosition, callArgs);
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
export async function uniswapV3LiquidityPositionMint({
|
|
159
|
+
signer,
|
|
160
|
+
comptrollerProxy,
|
|
161
|
+
externalPositionManager,
|
|
162
|
+
externalPositionProxy,
|
|
163
|
+
fee,
|
|
164
|
+
tickLower,
|
|
165
|
+
tickUpper,
|
|
166
|
+
amount0Desired,
|
|
167
|
+
amount1Desired,
|
|
168
|
+
amount0Min = 0,
|
|
169
|
+
amount1Min = 0,
|
|
170
|
+
}: {
|
|
171
|
+
signer: SignerWithAddress;
|
|
172
|
+
comptrollerProxy: ComptrollerLib;
|
|
173
|
+
externalPositionManager: ExternalPositionManager;
|
|
174
|
+
externalPositionProxy: AddressLike;
|
|
175
|
+
fee: BigNumberish;
|
|
176
|
+
tickLower: BigNumberish;
|
|
177
|
+
tickUpper: BigNumberish;
|
|
178
|
+
amount0Desired: BigNumberish;
|
|
179
|
+
amount1Desired: BigNumberish;
|
|
180
|
+
amount0Min?: BigNumberish;
|
|
181
|
+
amount1Min?: BigNumberish;
|
|
182
|
+
}) {
|
|
183
|
+
const actionArgs = uniswapV3LiquidityPositionMintArgs({
|
|
184
|
+
amount0Desired,
|
|
185
|
+
amount0Min,
|
|
186
|
+
amount1Desired,
|
|
187
|
+
amount1Min,
|
|
188
|
+
fee,
|
|
189
|
+
tickLower,
|
|
190
|
+
tickUpper,
|
|
191
|
+
});
|
|
192
|
+
|
|
193
|
+
const callArgs = callOnExternalPositionArgs({
|
|
194
|
+
actionArgs,
|
|
195
|
+
actionId: UniswapV3LiquidityPositionActionId.Mint,
|
|
196
|
+
externalPositionProxy,
|
|
197
|
+
});
|
|
198
|
+
|
|
199
|
+
const receipt = await comptrollerProxy
|
|
200
|
+
.connect(signer)
|
|
201
|
+
.callOnExtension(externalPositionManager, ExternalPositionManagerActionId.CallOnExternalPosition, callArgs);
|
|
202
|
+
|
|
203
|
+
const externalPosition = new UniswapV3LiquidityPositionLib(externalPositionProxy, provider);
|
|
204
|
+
const nftId = extractEvent(receipt, externalPosition.abi.getEvent('NFTPositionAdded'))[0].args.tokenId;
|
|
205
|
+
|
|
206
|
+
return { nftId, receipt };
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
export async function uniswapV3LiquidityPositionPurge({
|
|
210
|
+
signer,
|
|
211
|
+
comptrollerProxy,
|
|
212
|
+
externalPositionManager,
|
|
213
|
+
externalPositionProxy,
|
|
214
|
+
nftId,
|
|
215
|
+
liquidity,
|
|
216
|
+
amount0Min = 0,
|
|
217
|
+
amount1Min = 0,
|
|
218
|
+
}: {
|
|
219
|
+
signer: SignerWithAddress;
|
|
220
|
+
comptrollerProxy: ComptrollerLib;
|
|
221
|
+
externalPositionManager: ExternalPositionManager;
|
|
222
|
+
externalPositionProxy: AddressLike;
|
|
223
|
+
nftId: BigNumberish;
|
|
224
|
+
liquidity: BigNumberish;
|
|
225
|
+
amount0Min?: BigNumberish;
|
|
226
|
+
amount1Min?: BigNumberish;
|
|
227
|
+
}) {
|
|
228
|
+
const actionArgs = uniswapV3LiquidityPositionPurgeArgs({
|
|
229
|
+
amount0Min,
|
|
230
|
+
amount1Min,
|
|
231
|
+
liquidity,
|
|
232
|
+
nftId,
|
|
233
|
+
});
|
|
234
|
+
|
|
235
|
+
const callArgs = callOnExternalPositionArgs({
|
|
236
|
+
actionArgs,
|
|
237
|
+
actionId: UniswapV3LiquidityPositionActionId.Purge,
|
|
238
|
+
externalPositionProxy,
|
|
239
|
+
});
|
|
240
|
+
|
|
241
|
+
return comptrollerProxy
|
|
242
|
+
.connect(signer)
|
|
243
|
+
.callOnExtension(externalPositionManager, ExternalPositionManagerActionId.CallOnExternalPosition, callArgs);
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
export async function uniswapV3LiquidityPositionRemoveLiquidity({
|
|
247
|
+
signer,
|
|
248
|
+
comptrollerProxy,
|
|
249
|
+
externalPositionManager,
|
|
250
|
+
externalPositionProxy,
|
|
251
|
+
nftId,
|
|
252
|
+
liquidity,
|
|
253
|
+
amount0Min = 0,
|
|
254
|
+
amount1Min = 0,
|
|
255
|
+
}: {
|
|
256
|
+
signer: SignerWithAddress;
|
|
257
|
+
comptrollerProxy: ComptrollerLib;
|
|
258
|
+
externalPositionManager: ExternalPositionManager;
|
|
259
|
+
externalPositionProxy: AddressLike;
|
|
260
|
+
nftId: BigNumberish;
|
|
261
|
+
liquidity: BigNumberish;
|
|
262
|
+
amount0Min?: BigNumberish;
|
|
263
|
+
amount1Min?: BigNumberish;
|
|
264
|
+
}) {
|
|
265
|
+
const actionArgs = uniswapV3LiquidityPositionRemoveLiquidityArgs({
|
|
266
|
+
amount0Min,
|
|
267
|
+
amount1Min,
|
|
268
|
+
liquidity,
|
|
269
|
+
nftId,
|
|
270
|
+
});
|
|
271
|
+
|
|
272
|
+
const callArgs = callOnExternalPositionArgs({
|
|
273
|
+
actionArgs,
|
|
274
|
+
actionId: UniswapV3LiquidityPositionActionId.RemoveLiquidity,
|
|
275
|
+
externalPositionProxy,
|
|
276
|
+
});
|
|
277
|
+
|
|
278
|
+
return comptrollerProxy
|
|
279
|
+
.connect(signer)
|
|
280
|
+
.callOnExtension(externalPositionManager, ExternalPositionManagerActionId.CallOnExternalPosition, callArgs);
|
|
281
|
+
}
|
|
282
|
+
|
|
283
|
+
export function uniswapV3OrderTokenPair({ tokenA, tokenB }: { tokenA: AddressLike; tokenB: AddressLike }) {
|
|
284
|
+
const tokenAAddress = resolveAddress(tokenA);
|
|
285
|
+
const tokenBAddress = resolveAddress(tokenB);
|
|
286
|
+
|
|
287
|
+
return tokenAAddress < tokenBAddress
|
|
288
|
+
? { token0: tokenAAddress, token1: tokenBAddress }
|
|
289
|
+
: { token0: tokenBAddress, token1: tokenAAddress };
|
|
290
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SignerWithAddress } from '@enzymefinance/hardhat';
|
|
1
|
+
import type { SignerWithAddress } from '@enzymefinance/hardhat';
|
|
2
2
|
import { FeeHook, feeManagerConfigArgs, FeeSettlementType, IFee } from '@enzymefinance/protocol';
|
|
3
3
|
import { constants, utils } from 'ethers';
|
|
4
4
|
|
|
@@ -1,17 +1,15 @@
|
|
|
1
|
-
import { SignerWithAddress } from '@enzymefinance/hardhat';
|
|
1
|
+
import type { SignerWithAddress } from '@enzymefinance/hardhat';
|
|
2
|
+
import type { AaveAdapter, ComptrollerLib, IntegrationManager, StandardToken } from '@enzymefinance/protocol';
|
|
2
3
|
import {
|
|
3
|
-
AaveAdapter,
|
|
4
4
|
aaveLendArgs,
|
|
5
5
|
aaveRedeemArgs,
|
|
6
6
|
callOnIntegrationArgs,
|
|
7
|
-
ComptrollerLib,
|
|
8
|
-
IntegrationManager,
|
|
9
7
|
IntegrationManagerActionId,
|
|
10
8
|
lendSelector,
|
|
11
9
|
redeemSelector,
|
|
12
|
-
StandardToken,
|
|
13
10
|
} from '@enzymefinance/protocol';
|
|
14
|
-
import { BigNumberish
|
|
11
|
+
import type { BigNumberish } from 'ethers';
|
|
12
|
+
import { utils } from 'ethers';
|
|
15
13
|
|
|
16
14
|
export async function aaveLend({
|
|
17
15
|
comptrollerProxy,
|
|
@@ -35,8 +33,8 @@ export async function aaveLend({
|
|
|
35
33
|
|
|
36
34
|
const callArgs = callOnIntegrationArgs({
|
|
37
35
|
adapter: aaveAdapter,
|
|
38
|
-
selector: lendSelector,
|
|
39
36
|
encodedCallArgs: lendArgs,
|
|
37
|
+
selector: lendSelector,
|
|
40
38
|
});
|
|
41
39
|
|
|
42
40
|
const lendTx = comptrollerProxy
|
|
@@ -68,8 +66,8 @@ export async function aaveRedeem({
|
|
|
68
66
|
|
|
69
67
|
const callArgs = callOnIntegrationArgs({
|
|
70
68
|
adapter: aaveAdapter,
|
|
71
|
-
selector: redeemSelector,
|
|
72
69
|
encodedCallArgs: redeemArgs,
|
|
70
|
+
selector: redeemSelector,
|
|
73
71
|
});
|
|
74
72
|
|
|
75
73
|
const redeemTx = comptrollerProxy
|
|
@@ -1,17 +1,16 @@
|
|
|
1
|
-
import { AddressLike, Contract,
|
|
2
|
-
import {
|
|
1
|
+
import type { AddressLike, Contract, Send } from '@enzymefinance/ethers';
|
|
2
|
+
import { contract, resolveAddress } from '@enzymefinance/ethers';
|
|
3
|
+
import type { SignerWithAddress } from '@enzymefinance/hardhat';
|
|
4
|
+
import type { CompoundAdapter, ComptrollerLib, IntegrationManager, VaultLib } from '@enzymefinance/protocol';
|
|
3
5
|
import {
|
|
4
6
|
callOnIntegrationArgs,
|
|
5
|
-
CompoundAdapter,
|
|
6
7
|
compoundArgs,
|
|
7
|
-
IntegrationManager,
|
|
8
8
|
IntegrationManagerActionId,
|
|
9
9
|
lendSelector,
|
|
10
10
|
redeemSelector,
|
|
11
|
-
VaultLib,
|
|
12
11
|
} from '@enzymefinance/protocol';
|
|
13
|
-
import { BigNumberish
|
|
14
|
-
import {
|
|
12
|
+
import type { BigNumberish } from 'ethers';
|
|
13
|
+
import { utils } from 'ethers';
|
|
15
14
|
|
|
16
15
|
export interface ICompoundComptroller extends Contract<ICompoundComptroller> {
|
|
17
16
|
claimComp: Send<(_account: AddressLike) => void>;
|
|
@@ -40,14 +39,14 @@ export async function compoundLend({
|
|
|
40
39
|
}) {
|
|
41
40
|
const lendArgs = compoundArgs({
|
|
42
41
|
cToken,
|
|
43
|
-
outgoingAssetAmount: tokenAmount,
|
|
44
42
|
minIncomingAssetAmount: cTokenAmount,
|
|
43
|
+
outgoingAssetAmount: tokenAmount,
|
|
45
44
|
});
|
|
46
45
|
|
|
47
46
|
const callArgs = callOnIntegrationArgs({
|
|
48
47
|
adapter: compoundAdapter,
|
|
49
|
-
selector: lendSelector,
|
|
50
48
|
encodedCallArgs: lendArgs,
|
|
49
|
+
selector: lendSelector,
|
|
51
50
|
});
|
|
52
51
|
|
|
53
52
|
const lendTx = comptrollerProxy
|
|
@@ -77,14 +76,14 @@ export async function compoundRedeem({
|
|
|
77
76
|
}) {
|
|
78
77
|
const redeemArgs = compoundArgs({
|
|
79
78
|
cToken: resolveAddress(cToken),
|
|
80
|
-
outgoingAssetAmount: cTokenAmount,
|
|
81
79
|
minIncomingAssetAmount: tokenAmount,
|
|
80
|
+
outgoingAssetAmount: cTokenAmount,
|
|
82
81
|
});
|
|
83
82
|
|
|
84
83
|
const callArgs = callOnIntegrationArgs({
|
|
85
84
|
adapter: compoundAdapter,
|
|
86
|
-
selector: redeemSelector,
|
|
87
85
|
encodedCallArgs: redeemArgs,
|
|
86
|
+
selector: redeemSelector,
|
|
88
87
|
});
|
|
89
88
|
|
|
90
89
|
const redeemTx = comptrollerProxy
|