Skip to content

Commit ed7ed35

Browse files
naddison36naddison36
authored
Enabled js lint for deploy scripts (#1718)
* Enabled js lint for deploy scripts * Fix failing fork test
1 parent 65e7e62 commit ed7ed35

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+223
-467
lines changed

‎contracts/deploy/000_mock.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ const {
1717
bytecode: MANAGER_BYTECODE,
1818
} = require("@uniswap/v3-periphery/artifacts/contracts/NonfungiblePositionManager.sol/NonfungiblePositionManager.json");
1919

20-
const {
21-
abi: TOKEN_DESCRIPTOR_ABI,
22-
bytecode: TOKEN_DESCRIPTOR_BYTECODE,
23-
} = require("@uniswap/v3-periphery/artifacts/contracts/NonfungibleTokenPositionDescriptor.sol/NonfungibleTokenPositionDescriptor.json");
24-
2520
const {
2621
abi: QUOTER_ABI,
2722
bytecode: QUOTER_BYTECODE,

‎contracts/deploy/001_core.js‎

Lines changed: 71 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ const deployAaveStrategy = async () => {
6060
await withConfirmation(
6161
cAaveStrategy
6262
.connect(sDeployer)
63+
// eslint-disable-next-line no-unexpected-multiline
6364
[initFunctionName](
6465
assetAddresses.AAVE_ADDRESS_PROVIDER,
6566
cVaultProxy.address,
@@ -189,23 +190,10 @@ const deployThreePoolStrategy = async () => {
189190
// Initialize Strategies
190191
const cVaultProxy = await ethers.getContract("VaultProxy");
191192
await withConfirmation(
192-
cThreePoolStrategy
193-
.connect(sDeployer)
194-
[
195-
"initialize(address,address,address[],address[],address[],address,address)"
196-
](
197-
assetAddresses.ThreePool,
198-
cVaultProxy.address,
199-
[assetAddresses.CRV],
200-
[assetAddresses.DAI, assetAddresses.USDC, assetAddresses.USDT],
201-
[
202-
assetAddresses.ThreePoolToken,
203-
assetAddresses.ThreePoolToken,
204-
assetAddresses.ThreePoolToken,
205-
],
206-
assetAddresses.ThreePoolGauge,
207-
assetAddresses.CRVMinter
208-
)
193+
cThreePoolStrategy.connect(sDeployer)[
194+
// eslint-disable-next-line no-unexpected-multiline
195+
"initialize(address,address,address[],address[],address[],address,address)"
196+
](assetAddresses.ThreePool, cVaultProxy.address, [assetAddresses.CRV], [assetAddresses.DAI, assetAddresses.USDC, assetAddresses.USDT], [assetAddresses.ThreePoolToken, assetAddresses.ThreePoolToken, assetAddresses.ThreePoolToken], assetAddresses.ThreePoolGauge, assetAddresses.CRVMinter)
209197
);
210198
log("Initialized ThreePoolStrategy");
211199

@@ -261,24 +249,23 @@ const deployConvexStrategy = async () => {
261249
const mockBooster = await ethers.getContract("MockBooster");
262250
const mockRewardPool = await ethers.getContract("MockRewardPool");
263251
await withConfirmation(
264-
cConvexStrategy
265-
.connect(sDeployer)
252+
cConvexStrategy.connect(sDeployer)[
253+
// eslint-disable-next-line no-unexpected-multiline
254+
"initialize(address,address,address[],address[],address[],address,address,uint256)"
255+
](
256+
assetAddresses.ThreePool,
257+
cVaultProxy.address,
258+
[assetAddresses.CRV, assetAddresses.CVX],
259+
[assetAddresses.DAI, assetAddresses.USDC, assetAddresses.USDT],
266260
[
267-
"initialize(address,address,address[],address[],address[],address,address,uint256)"
268-
](
269-
assetAddresses.ThreePool,
270-
cVaultProxy.address,
271-
[assetAddresses.CRV, assetAddresses.CVX],
272-
[assetAddresses.DAI, assetAddresses.USDC, assetAddresses.USDT],
273-
[
274-
assetAddresses.ThreePoolToken,
275-
assetAddresses.ThreePoolToken,
276-
assetAddresses.ThreePoolToken,
277-
],
278-
mockBooster.address, // _cvxDepositorAddress,
279-
mockRewardPool.address, // _cvxRewardStakerAddress,
280-
9 // _cvxDepositorPTokenId
281-
)
261+
assetAddresses.ThreePoolToken,
262+
assetAddresses.ThreePoolToken,
263+
assetAddresses.ThreePoolToken,
264+
],
265+
mockBooster.address, // _cvxDepositorAddress,
266+
mockRewardPool.address, // _cvxRewardStakerAddress,
267+
9 // _cvxDepositorPTokenId
268+
)
282269
);
283270
log("Initialized ConvexStrategy");
284271

@@ -339,29 +326,28 @@ const deployConvexLUSDMetaStrategy = async () => {
339326

340327
const LUSD = await ethers.getContract("MockLUSD");
341328
await withConfirmation(
342-
cConvexLUSDMetaStrategy
343-
.connect(sDeployer)
329+
cConvexLUSDMetaStrategy.connect(sDeployer)[
330+
// eslint-disable-next-line no-unexpected-multiline
331+
"initialize(address[],address[],address[],(address,address,address,address,address,address,address,uint256))"
332+
](
333+
[assetAddresses.CVX, assetAddresses.CRV],
334+
[assetAddresses.DAI, assetAddresses.USDC, assetAddresses.USDT],
344335
[
345-
"initialize(address[],address[],address[],(address,address,address,address,address,address,address,uint256))"
346-
](
347-
[assetAddresses.CVX, assetAddresses.CRV],
348-
[assetAddresses.DAI, assetAddresses.USDC, assetAddresses.USDT],
349-
[
350-
assetAddresses.ThreePoolToken,
351-
assetAddresses.ThreePoolToken,
352-
assetAddresses.ThreePoolToken,
353-
],
354-
[
355-
assetAddresses.ThreePool,
356-
cVaultProxy.address,
357-
mockBooster.address, // _cvxDepositorAddress,
358-
assetAddresses.ThreePoolLUSDMetapool, // metapool address,
359-
LUSD.address, // LUSD
360-
mockRewardPool.address, // _cvxRewardStakerAddress,
361-
assetAddresses.LUSDMetapoolToken, // metapoolLpToken
362-
lusdMetapoolLPCRVPid, // _cvxDepositorPTokenId
363-
]
364-
)
336+
assetAddresses.ThreePoolToken,
337+
assetAddresses.ThreePoolToken,
338+
assetAddresses.ThreePoolToken,
339+
],
340+
[
341+
assetAddresses.ThreePool,
342+
cVaultProxy.address,
343+
mockBooster.address, // _cvxDepositorAddress,
344+
assetAddresses.ThreePoolLUSDMetapool, // metapool address,
345+
LUSD.address, // LUSD
346+
mockRewardPool.address, // _cvxRewardStakerAddress,
347+
assetAddresses.LUSDMetapoolToken, // metapoolLpToken
348+
lusdMetapoolLPCRVPid, // _cvxDepositorPTokenId
349+
]
350+
)
365351
);
366352
log("Initialized ConvexLUSDMetaStrategy");
367353

@@ -422,29 +408,28 @@ const deployConvexOUSDMetaStrategy = async () => {
422408
const ousd = await ethers.getContract("OUSDProxy");
423409

424410
await withConfirmation(
425-
cConvexOUSDMetaStrategy
426-
.connect(sDeployer)
411+
cConvexOUSDMetaStrategy.connect(sDeployer)[
412+
// eslint-disable-next-line no-unexpected-multiline
413+
"initialize(address[],address[],address[],(address,address,address,address,address,address,address,uint256))"
414+
](
415+
[assetAddresses.CVX, assetAddresses.CRV],
416+
[assetAddresses.DAI, assetAddresses.USDC, assetAddresses.USDT],
427417
[
428-
"initialize(address[],address[],address[],(address,address,address,address,address,address,address,uint256))"
429-
](
430-
[assetAddresses.CVX, assetAddresses.CRV],
431-
[assetAddresses.DAI, assetAddresses.USDC, assetAddresses.USDT],
432-
[
433-
assetAddresses.ThreePoolToken,
434-
assetAddresses.ThreePoolToken,
435-
assetAddresses.ThreePoolToken,
436-
],
437-
[
438-
assetAddresses.ThreePool,
439-
cVaultProxy.address,
440-
mockBooster.address, // _cvxDepositorAddress,
441-
assetAddresses.ThreePoolOUSDMetapool, // metapool address,
442-
ousd.address, // _ousdAddress,
443-
mockRewardPool.address, // _cvxRewardStakerAddress,
444-
assetAddresses.ThreePoolOUSDMetapool, // metapoolLpToken (metapool address),
445-
metapoolLPCRVPid, // _cvxDepositorPTokenId
446-
]
447-
)
418+
assetAddresses.ThreePoolToken,
419+
assetAddresses.ThreePoolToken,
420+
assetAddresses.ThreePoolToken,
421+
],
422+
[
423+
assetAddresses.ThreePool,
424+
cVaultProxy.address,
425+
mockBooster.address, // _cvxDepositorAddress,
426+
assetAddresses.ThreePoolOUSDMetapool, // metapool address,
427+
ousd.address, // _ousdAddress,
428+
mockRewardPool.address, // _cvxRewardStakerAddress,
429+
assetAddresses.ThreePoolOUSDMetapool, // metapoolLpToken (metapool address),
430+
metapoolLPCRVPid, // _cvxDepositorPTokenId
431+
]
432+
)
448433
);
449434
log("Initialized ConvexOUSDMetaStrategy");
450435

@@ -1103,13 +1088,10 @@ const deployBuyback = async () => {
11031088

11041089
// Init proxy to implementation
11051090
await withConfirmation(
1106-
cBuybackProxy
1107-
.connect(sDeployer)
1108-
["initialize(address,address,bytes)"](
1109-
dBuybackImpl.address,
1110-
deployerAddr,
1111-
[]
1112-
)
1091+
cBuybackProxy.connect(sDeployer)[
1092+
// eslint-disable-next-line no-unexpected-multiline
1093+
"initialize(address,address,bytes)"
1094+
](dBuybackImpl.address, deployerAddr, [])
11131095
);
11141096

11151097
const cBuyback = await ethers.getContractAt("Buyback", cBuybackProxy.address);
@@ -1178,13 +1160,10 @@ const deployWOusd = async () => {
11781160
const wousdProxy = await ethers.getContract("WrappedOUSDProxy");
11791161
const wousd = await ethers.getContractAt("WrappedOusd", wousdProxy.address);
11801162

1181-
await wousdProxy
1182-
.connect(sDeployer)
1183-
["initialize(address,address,bytes)"](
1184-
dWrappedOusdImpl.address,
1185-
deployerAddr,
1186-
[]
1187-
);
1163+
await wousdProxy.connect(sDeployer)[
1164+
// eslint-disable-next-line no-unexpected-multiline
1165+
"initialize(address,address,bytes)"
1166+
](dWrappedOusdImpl.address, deployerAddr, []);
11881167
await wousd.connect(sDeployer)["initialize()"]();
11891168
await wousd.connect(sDeployer).transferGovernance(governorAddr);
11901169
await wousd.connect(sGovernor).claimGovernance();

‎contracts/deploy/008_ousd_reset.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,11 +411,9 @@ const deployVault = async () => {
411411
};
412412

413413
const upgradeAndResetOUSD = async () => {
414-
const { depoyerAddr, governorAddr, v1GovernorAddr } =
415-
await hre.getNamedAccounts();
414+
const { governorAddr, v1GovernorAddr } = await hre.getNamedAccounts();
416415

417416
// Signers
418-
const sDeployer = await ethers.provider.getSigner(depoyerAddr);
419417
const sGovernor = await ethers.provider.getSigner(governorAddr);
420418

421419
// Temporary OUSD for running a reset

‎contracts/deploy/009_ousd_fix.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,26 +74,24 @@ const fixOUSD = async () => {
7474
await withConfirmation(
7575
cOUSDProxy
7676
.connect(sGovernor)
77-
.upgradeTo(dOUSDReset.address, await getTxOpts(gasLimit))
77+
.upgradeTo(dOUSDReset.address, await getTxOpts())
7878
);
7979
log("Upgraded OUSD to reset implementation");
8080

8181
await withConfirmation(
8282
cOUSDReset
8383
.connect(sGovernor)
84-
.setVaultAddress(cVaultProxy.address, await getTxOpts(gasLimit))
84+
.setVaultAddress(cVaultProxy.address, await getTxOpts())
8585
);
8686
log("Vault address set");
8787

8888
await withConfirmation(
89-
cOUSDReset.connect(sGovernor).reset(await getTxOpts(gasLimit))
89+
cOUSDReset.connect(sGovernor).reset(await getTxOpts())
9090
);
9191
log("Called reset on OUSD");
9292

9393
await withConfirmation(
94-
cOUSDProxy
95-
.connect(sGovernor)
96-
.upgradeTo(dOUSD.address, await getTxOpts(gasLimit))
94+
cOUSDProxy.connect(sGovernor).upgradeTo(dOUSD.address, await getTxOpts())
9795
);
9896
log("Upgraded OUSD to standard implementation");
9997
}

‎contracts/deploy/011_ousd_fix.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ const fixOUSD = async (hre) => {
4646
log("Proposal executed.");
4747
} else {
4848
await withConfirmation(
49-
cOUSDProxy
50-
.connect(sGovernor)
51-
.upgradeTo(dOUSD.address, await getTxOpts(gasLimit))
49+
cOUSDProxy.connect(sGovernor).upgradeTo(dOUSD.address, await getTxOpts())
5250
);
5351
log("Upgraded OUSD to new implementation");
5452
}

‎contracts/deploy/012_upgrades.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,21 @@ const upgrades = async (hre) => {
7777
log("Proposal executed.");
7878
} else {
7979
await withConfirmation(
80-
cOUSDProxy
81-
.connect(sGovernor)
82-
.upgradeTo(dOUSD.address, await getTxOpts(gasLimit))
80+
cOUSDProxy.connect(sGovernor).upgradeTo(dOUSD.address, await getTxOpts())
8381
);
8482
log("Upgraded OUSD to new implementation");
8583

8684
await withConfirmation(
8785
cVaultCoreProxy
8886
.connect(sGovernor)
89-
.setAdminImpl(dVaultAdmin.address, await getTxOpts(gasLimit))
87+
.setAdminImpl(dVaultAdmin.address, await getTxOpts())
9088
);
9189
log("Upgraded VaultAdmin to new implementation");
9290

9391
await withConfirmation(
9492
cCompoundStrategyProxy
9593
.connect(sGovernor)
96-
.upgradeTo(dCompoundStrategy.address, await getTxOpts(gasLimit))
94+
.upgradeTo(dCompoundStrategy.address, await getTxOpts())
9795
);
9896
log("Upgraded CompoundStrategy to new implementation");
9997
}

‎contracts/deploy/013_trustee.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,21 @@ const trustee = async (hre) => {
7070
await withConfirmation(
7171
cVaultProxy
7272
.connect(sGovernor)
73-
.upgradeTo(dVaultCore.address, await getTxOpts(gasLimit))
73+
.upgradeTo(dVaultCore.address, await getTxOpts())
7474
);
7575
log("Upgraded VaultCore to new implementation");
7676

7777
await withConfirmation(
7878
cvaultAdmin
7979
.connect(sGovernor)
80-
.setTrusteeAddress(trusteeAddress, await getTxOpts(gasLimit))
80+
.setTrusteeAddress(trusteeAddress, await getTxOpts())
8181
);
8282
log("Trustee address set");
8383

8484
await withConfirmation(
8585
cvaultAdmin
8686
.connect(sGovernor)
87-
.setTrusteeFeeBps(trusteeFeeBps, await getTxOpts(gasLimit))
87+
.setTrusteeFeeBps(trusteeFeeBps, await getTxOpts())
8888
);
8989
log("Trustee fee bps set");
9090
}

‎contracts/deploy/014_3pool_strategy.js‎

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -70,23 +70,10 @@ const runDeployment = async (hre) => {
7070

7171
// Initialize 3Pool implementation.
7272
await withConfirmation(
73-
cThreePoolStrategy
74-
.connect(sDeployer)
75-
[
76-
"initialize(address,address,address,address[],address[],address,address)"
77-
](
78-
assetAddresses.ThreePool,
79-
cVaultProxy.address,
80-
assetAddresses.CRV,
81-
[assetAddresses.DAI, assetAddresses.USDC, assetAddresses.USDT],
82-
[
83-
assetAddresses.ThreePoolToken,
84-
assetAddresses.ThreePoolToken,
85-
assetAddresses.ThreePoolToken,
86-
],
87-
assetAddresses.ThreePoolGauge,
88-
assetAddresses.CRVMinter
89-
)
73+
cThreePoolStrategy.connect(sDeployer)[
74+
// eslint-disable-next-line
75+
"initialize(address,address,address,address[],address[],address,address)"
76+
](assetAddresses.ThreePool, cVaultProxy.address, assetAddresses.CRV, [assetAddresses.DAI, assetAddresses.USDC, assetAddresses.USDT], [assetAddresses.ThreePoolToken, assetAddresses.ThreePoolToken, assetAddresses.ThreePoolToken], assetAddresses.ThreePoolGauge, assetAddresses.CRVMinter)
9077
);
9178
log("Initialized ThreePoolStrategy");
9279

@@ -140,18 +127,13 @@ const runDeployment = async (hre) => {
140127
log("Proposal executed.");
141128
} else {
142129
await withConfirmation(
143-
cThreePoolStrategy
144-
.connect(sGovernor)
145-
.claimGovernance(await getTxOpts(gasLimit))
130+
cThreePoolStrategy.connect(sGovernor).claimGovernance(await getTxOpts())
146131
);
147132
log("Claimed governance of ThreePoolStrategy");
148133
await withConfirmation(
149134
cVault
150135
.connect(sGovernor)
151-
.approveStrategy(
152-
cThreePoolStrategyProxy.address,
153-
await getTxOpts(gasLimit)
154-
)
136+
.approveStrategy(cThreePoolStrategyProxy.address, await getTxOpts())
155137
);
156138
log("Approved ThreePoolStrategy on Vault");
157139
}

‎contracts/deploy/016_chainlink_and_buyback.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const runDeployment = async (hre) => {
105105
);
106106
log("Upgrade VaultCore implementation");
107107
await withConfirmation(
108-
cBuyback.connect(sGovernor).claimGovernance(await getTxOpts(gasLimit))
108+
cBuyback.connect(sGovernor).claimGovernance(await getTxOpts())
109109
);
110110
log("Claimed governance of Buyback contract");
111111
await withConfirmation(

0 commit comments

Comments
 (0)