Skip to content

Commit ae9705b

Browse files
committed
fix: part of deploy script
1 parent a568c1d commit ae9705b

1 file changed

Lines changed: 43 additions & 35 deletions

File tree

packages/contracts/tasks/vaults/vault.ts

Lines changed: 43 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,24 @@ task("optimized-vault:deploy")
4747

4848
const asset = await viem.getContractAt("IERC20MetadataUpgradeable", assetAddress);
4949
const symbol = await asset.read.symbol();
50-
// const optimizedVaultDep = await deployments.deploy(`OptimizedAPRVault_${symbol}_${assetAddress}`, {
51-
// contract: "OptimizedAPRVaultBase",
52-
// from: deployer,
53-
// log: true,
54-
// waitConfirmations: 1,
55-
// args: []
56-
// });
57-
// if (optimizedVaultDep.transactionHash) {
58-
// await publicClient.waitForTransactionReceipt({ hash: optimizedVaultDep.transactionHash as Address });
59-
// }
60-
// console.log("OptimizedAPRVault: ", optimizedVaultDep.address);
61-
62-
type Fee = { deposit: bigint; withdrawal: bigint; management: bigint; performance: bigint };
50+
const optimizedVaultDep = await deployments.deploy(`OptimizedAPRVault_${symbol}_${assetAddress}`, {
51+
contract: "OptimizedAPRVaultBase",
52+
from: deployer,
53+
log: true,
54+
waitConfirmations: 1,
55+
args: []
56+
});
57+
if (optimizedVaultDep.transactionHash) {
58+
await publicClient.waitForTransactionReceipt({ hash: optimizedVaultDep.transactionHash as Address });
59+
}
60+
console.log("OptimizedAPRVault: ", optimizedVaultDep.address);
61+
62+
type Fee = {
63+
deposit: bigint;
64+
withdrawal: bigint;
65+
management: bigint;
66+
performance: bigint
67+
};
6368

6469
const fees: Fee = {
6570
deposit: BigInt(0),
@@ -74,7 +79,7 @@ task("optimized-vault:deploy")
7479
let remainder = parseEther("1");
7580
const adapters = adaptersAddressesArray.map((adapterAddress: string, index: number) => {
7681
const config = {
77-
adapter: adapterAddress,
82+
adapter: adapterAddress as Address,
7883
allocation: parseEther("1") / BigInt(adaptersAddressesArray.length)
7984
};
8085

@@ -86,7 +91,10 @@ task("optimized-vault:deploy")
8691
if (remainder > BigInt(0)) {
8792
adapters[adapters.length - 1].allocation = adapters[adapters.length - 1].allocation + remainder;
8893
}
89-
type Adapter = { adapter: string; allocation: bigint };
94+
type Adapter = {
95+
adapter: Address;
96+
allocation: bigint
97+
};
9098
const tenAdapters: Adapter[] = adapters.concat(
9199
new Array(10 - adapters.length).fill({
92100
adapter: constants.AddressZero,
@@ -105,18 +113,19 @@ task("optimized-vault:deploy")
105113
"OptimizedVaultsRegistry",
106114
(await deployments.get("OptimizedVaultsRegistry")).address as Address
107115
);
108-
// const vaultFirstExtDep = await deployments.deploy("OptimizedAPRVaultFirstExtension", {
109-
// from: deployer,
110-
// log: true,
111-
// waitConfirmations: 1,
112-
// args: []
113-
// });
114-
// const vaultSecondExtDep = await deployments.deploy("OptimizedAPRVaultSecondExtension", {
115-
// from: deployer,
116-
// log: true,
117-
// waitConfirmations: 1,
118-
// args: []
119-
// });
116+
const vaultFirstExtDep = await deployments.deploy("OptimizedAPRVaultFirstExtension", {
117+
from: deployer,
118+
log: true,
119+
waitConfirmations: 1,
120+
args: []
121+
});
122+
const vaultSecondExtDep = await deployments.deploy("OptimizedAPRVaultSecondExtension", {
123+
from: deployer,
124+
log: true,
125+
waitConfirmations: 1,
126+
args: []
127+
});
128+
120129
const values: [
121130
string,
122131
Adapter[], // Matches "tuple(address adapter, uint64 allocation)[10]"
@@ -127,16 +136,16 @@ task("optimized-vault:deploy")
127136
string, // Matches "address"
128137
string // Matches "address"
129138
] = [
130-
assetAddress,
139+
assetAddress as Address,
131140
tenAdapters, // initial adapters
132-
adapters.length, // adapters count
141+
tenAdapters.length, // adapters count
133142
fees,
134-
deployer, // fee recipient
143+
deployer as Address, // fee recipient
135144
0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffn, // deposit limit
136-
registry.address,
137-
flywheelLogic.address
145+
registry.address as Address,
146+
flywheelLogic.address as Address
138147
];
139-
console.log(values);
148+
console.log('values generated', values);
140149

141150
const initData = encodeAbiParameters(
142151
[
@@ -155,8 +164,7 @@ task("optimized-vault:deploy")
155164
console.log(`initializing with values ${JSON.stringify(values)}`);
156165

157166
const optimizedVault = await viem.getContractAt("OptimizedAPRVaultBase", optimizedVaultDep.address as Address);
158-
159-
const tx = await optimizedVault.write.initialize([vaultFirstExtDep.address, vaultSecondExtDep.address], initData);
167+
await optimizedVault.write.initialize([vaultFirstExtDep.address, vaultSecondExtDep.address], initData);
160168
console.log(`initialized the vault at ${optimizedVault.address}`);
161169

162170
await run("optimized-vault:add", {

0 commit comments

Comments
 (0)