Skip to content

Commit 0b9d5ea

Browse files
DanielVFDanielVF
authored
Deploy 32 (#850)
* Remove mintMultiple test call (code already removed before) * Show cvx token address in debug report * mainnet deploy 32
1 parent 3fefd33 commit 0b9d5ea

File tree

9 files changed

+515
-53
lines changed

9 files changed

+515
-53
lines changed

‎contracts/contracts/strategies/ConvexStrategy.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ contract ConvexStrategy is BaseCurveStrategy {
3131

3232
address internal cvxDepositorAddress;
3333
address internal cvxRewardStakerAddress;
34-
address internal cvxRewardTokenAddress;
34+
address public cvxRewardTokenAddress;
3535
uint256 internal cvxDepositorPTokenId;
3636

3737
/**

‎contracts/deployments/mainnet/.migrations.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@
2727
"028_dai_default_aave": 1635960341,
2828
"029_convex": 1637241490,
2929
"030_staking_to_new_governor": 1637241517,
30-
"031_staking_add_rescue": 1637241582
30+
"031_staking_add_rescue": 1637241582,
31+
"032_convex_rewards": 1638551616
3132
}

‎contracts/deployments/mainnet/ConvexStrategy.json

Lines changed: 92 additions & 41 deletions
Large diffs are not rendered by default.

‎contracts/deployments/mainnet/solcInputs/a9ed004f4d203a17c07bb1c3b7c6c7b7.json

Lines changed: 317 additions & 0 deletions
Large diffs are not rendered by default.

‎contracts/smoke/mintRedeemTest.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ async function afterDeploy(hre, beforeDeployData) {
199199
const ousdAfterMint = await testMint(hre, beforeDeployData);
200200
await testRedeem(ousdAfterMint);
201201
await testTransfer();
202-
await testMultipleMint();
203202
}
204203

205204
module.exports = {

‎contracts/storageLayout/mainnet/ConvexStrategy.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,25 +70,25 @@
7070
"contract": "ConvexStrategy",
7171
"label": "cvxDepositorAddress",
7272
"type": "t_address",
73-
"src": "contracts/strategies/ConvexStrategy.sol:27"
73+
"src": "contracts/strategies/ConvexStrategy.sol:32"
7474
},
7575
{
7676
"contract": "ConvexStrategy",
7777
"label": "cvxRewardStakerAddress",
7878
"type": "t_address",
79-
"src": "contracts/strategies/ConvexStrategy.sol:28"
79+
"src": "contracts/strategies/ConvexStrategy.sol:33"
8080
},
8181
{
8282
"contract": "ConvexStrategy",
83-
"label": "crvRewardTokenAddress",
83+
"label": "cvxRewardTokenAddress",
8484
"type": "t_address",
85-
"src": "contracts/strategies/ConvexStrategy.sol:29"
85+
"src": "contracts/strategies/ConvexStrategy.sol:34"
8686
},
8787
{
8888
"contract": "ConvexStrategy",
8989
"label": "cvxDepositorPTokenId",
9090
"type": "t_uint256",
91-
"src": "contracts/strategies/ConvexStrategy.sol:30"
91+
"src": "contracts/strategies/ConvexStrategy.sol:35"
9292
}
9393
],
9494
"types": {

‎contracts/tasks/debug.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,10 @@ async function debug(taskArguments, hre) {
345345
"rewardTokenAddress:\t\t",
346346
await threePoolStrategy.rewardTokenAddress()
347347
);
348+
console.log(
349+
"cvxRewardTokenAddress:\t\t",
350+
await threePoolStrategy.cvxRewardTokenAddress()
351+
);
348352
console.log(
349353
"rewardLiquidationThreshold:\t",
350354
(await threePoolStrategy.rewardLiquidationThreshold()).toString()

‎dapp/network.mainnet.json

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2374,8 +2374,27 @@
23742374
]
23752375
},
23762376
"ConvexStrategy": {
2377-
"address": "0x08f3a0637851aA1B0E0750aA3d46E0E356f349aC",
2377+
"address": "0x16156a06bD1bd2d80134EA1Ee7e5FaEBDbFa20aa",
23782378
"abi": [
2379+
{
2380+
"anonymous": false,
2381+
"inputs": [
2382+
{
2383+
"indexed": false,
2384+
"internalType": "address",
2385+
"name": "_oldAddress",
2386+
"type": "address"
2387+
},
2388+
{
2389+
"indexed": false,
2390+
"internalType": "address",
2391+
"name": "_newAddress",
2392+
"type": "address"
2393+
}
2394+
],
2395+
"name": "CvxRewardTokenAddressUpdated",
2396+
"type": "event"
2397+
},
23792398
{
23802399
"anonymous": false,
23812400
"inputs": [
@@ -2636,6 +2655,19 @@
26362655
"stateMutability": "nonpayable",
26372656
"type": "function"
26382657
},
2658+
{
2659+
"inputs": [],
2660+
"name": "cvxRewardTokenAddress",
2661+
"outputs": [
2662+
{
2663+
"internalType": "address",
2664+
"name": "",
2665+
"type": "address"
2666+
}
2667+
],
2668+
"stateMutability": "view",
2669+
"type": "function"
2670+
},
26392671
{
26402672
"inputs": [
26412673
{
@@ -2693,7 +2725,7 @@
26932725
},
26942726
{
26952727
"internalType": "address",
2696-
"name": "_crvRewardTokenAddress",
2728+
"name": "_cvxRewardTokenAddress",
26972729
"type": "address"
26982730
},
26992731
{
@@ -2832,6 +2864,19 @@
28322864
"stateMutability": "nonpayable",
28332865
"type": "function"
28342866
},
2867+
{
2868+
"inputs": [
2869+
{
2870+
"internalType": "address",
2871+
"name": "_cvxRewardTokenAddress",
2872+
"type": "address"
2873+
}
2874+
],
2875+
"name": "setCvxRewardTokenAddress",
2876+
"outputs": [],
2877+
"stateMutability": "nonpayable",
2878+
"type": "function"
2879+
},
28352880
{
28362881
"inputs": [
28372882
{

‎dapp/prod.network.json

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2374,8 +2374,27 @@
23742374
]
23752375
},
23762376
"ConvexStrategy": {
2377-
"address": "0x08f3a0637851aA1B0E0750aA3d46E0E356f349aC",
2377+
"address": "0x16156a06bD1bd2d80134EA1Ee7e5FaEBDbFa20aa",
23782378
"abi": [
2379+
{
2380+
"anonymous": false,
2381+
"inputs": [
2382+
{
2383+
"indexed": false,
2384+
"internalType": "address",
2385+
"name": "_oldAddress",
2386+
"type": "address"
2387+
},
2388+
{
2389+
"indexed": false,
2390+
"internalType": "address",
2391+
"name": "_newAddress",
2392+
"type": "address"
2393+
}
2394+
],
2395+
"name": "CvxRewardTokenAddressUpdated",
2396+
"type": "event"
2397+
},
23792398
{
23802399
"anonymous": false,
23812400
"inputs": [
@@ -2636,6 +2655,19 @@
26362655
"stateMutability": "nonpayable",
26372656
"type": "function"
26382657
},
2658+
{
2659+
"inputs": [],
2660+
"name": "cvxRewardTokenAddress",
2661+
"outputs": [
2662+
{
2663+
"internalType": "address",
2664+
"name": "",
2665+
"type": "address"
2666+
}
2667+
],
2668+
"stateMutability": "view",
2669+
"type": "function"
2670+
},
26392671
{
26402672
"inputs": [
26412673
{
@@ -2693,7 +2725,7 @@
26932725
},
26942726
{
26952727
"internalType": "address",
2696-
"name": "_crvRewardTokenAddress",
2728+
"name": "_cvxRewardTokenAddress",
26972729
"type": "address"
26982730
},
26992731
{
@@ -2832,6 +2864,19 @@
28322864
"stateMutability": "nonpayable",
28332865
"type": "function"
28342866
},
2867+
{
2868+
"inputs": [
2869+
{
2870+
"internalType": "address",
2871+
"name": "_cvxRewardTokenAddress",
2872+
"type": "address"
2873+
}
2874+
],
2875+
"name": "setCvxRewardTokenAddress",
2876+
"outputs": [],
2877+
"stateMutability": "nonpayable",
2878+
"type": "function"
2879+
},
28352880
{
28362881
"inputs": [
28372882
{

0 commit comments

Comments
 (0)