Skip to content

Commit 6c8b30f

Browse files
author
Franck
authored
Deploy 13 (#545)
* Rinkeby deploy * mainnet deploy
1 parent d2231cd commit 6c8b30f

File tree

8 files changed

+416
-104
lines changed

8 files changed

+416
-104
lines changed

‎contracts/deploy/013_trustee.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const {
1414
const { proposeArgs } = require("../utils/governor");
1515
const { getTxOpts } = require("../utils/tx");
1616

17-
const deployName = "013_upgrades";
17+
const deployName = "013_trustee";
1818

1919
/**
2020
* Deploys the vault trustee feature:

‎contracts/deployments/mainnet/.migrations.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@
99
"010_upgrade_single_asset_staking": 1609971639,
1010
"011_ousd_fix": 1610148010,
1111
"005_compensation_claims": 1610487584,
12-
"012_upgrades": 1612303613
12+
"012_upgrades": 1612303613,
13+
"013_trustee": 1612380836
1314
}

‎contracts/deployments/mainnet/VaultCore.json

Lines changed: 104 additions & 30 deletions
Large diffs are not rendered by default.

‎contracts/deployments/rinkeby/.migrations.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
"010_upgrade_single_asset_staking": 1609968697,
1111
"011_ousd_fix": 1610146101,
1212
"005_compensation_claims": 1612291029,
13-
"012_upgrades": 1612292067
13+
"012_upgrades": 1612292067,
14+
"013_trustee": 1612380511
1415
}

‎contracts/deployments/rinkeby/VaultCore.json

Lines changed: 104 additions & 30 deletions
Large diffs are not rendered by default.

‎contracts/storageLayout/mainnet/VaultCore.json

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,114 +21,126 @@
2121
{
2222
"contract": "VaultStorage",
2323
"label": "assets",
24-
"type": "t_mapping(t_address,t_struct(Asset)16756_storage)",
25-
"src": "contracts/vault/VaultStorage.sol:52"
24+
"type": "t_mapping(t_address,t_struct(Asset)16977_storage)",
25+
"src": "contracts/vault/VaultStorage.sol:55"
2626
},
2727
{
2828
"contract": "VaultStorage",
2929
"label": "allAssets",
3030
"type": "t_array(t_address)dyn_storage",
31-
"src": "contracts/vault/VaultStorage.sol:53"
31+
"src": "contracts/vault/VaultStorage.sol:56"
3232
},
3333
{
3434
"contract": "VaultStorage",
3535
"label": "strategies",
36-
"type": "t_mapping(t_address,t_struct(Strategy)16768_storage)",
37-
"src": "contracts/vault/VaultStorage.sol:60"
36+
"type": "t_mapping(t_address,t_struct(Strategy)16989_storage)",
37+
"src": "contracts/vault/VaultStorage.sol:63"
3838
},
3939
{
4040
"contract": "VaultStorage",
4141
"label": "allStrategies",
4242
"type": "t_array(t_address)dyn_storage",
43-
"src": "contracts/vault/VaultStorage.sol:61"
43+
"src": "contracts/vault/VaultStorage.sol:64"
4444
},
4545
{
4646
"contract": "VaultStorage",
4747
"label": "priceProvider",
4848
"type": "t_address",
49-
"src": "contracts/vault/VaultStorage.sol:64"
49+
"src": "contracts/vault/VaultStorage.sol:67"
5050
},
5151
{
5252
"contract": "VaultStorage",
5353
"label": "rebasePaused",
5454
"type": "t_bool",
55-
"src": "contracts/vault/VaultStorage.sol:66"
55+
"src": "contracts/vault/VaultStorage.sol:69"
5656
},
5757
{
5858
"contract": "VaultStorage",
5959
"label": "capitalPaused",
6060
"type": "t_bool",
61-
"src": "contracts/vault/VaultStorage.sol:67"
61+
"src": "contracts/vault/VaultStorage.sol:70"
6262
},
6363
{
6464
"contract": "VaultStorage",
6565
"label": "redeemFeeBps",
6666
"type": "t_uint256",
67-
"src": "contracts/vault/VaultStorage.sol:69"
67+
"src": "contracts/vault/VaultStorage.sol:72"
6868
},
6969
{
7070
"contract": "VaultStorage",
7171
"label": "vaultBuffer",
7272
"type": "t_uint256",
73-
"src": "contracts/vault/VaultStorage.sol:71"
73+
"src": "contracts/vault/VaultStorage.sol:74"
7474
},
7575
{
7676
"contract": "VaultStorage",
7777
"label": "autoAllocateThreshold",
7878
"type": "t_uint256",
79-
"src": "contracts/vault/VaultStorage.sol:73"
79+
"src": "contracts/vault/VaultStorage.sol:76"
8080
},
8181
{
8282
"contract": "VaultStorage",
8383
"label": "rebaseThreshold",
8484
"type": "t_uint256",
85-
"src": "contracts/vault/VaultStorage.sol:75"
85+
"src": "contracts/vault/VaultStorage.sol:78"
8686
},
8787
{
8888
"contract": "VaultStorage",
8989
"label": "oUSD",
90-
"type": "t_contract(OUSD)13287",
91-
"src": "contracts/vault/VaultStorage.sol:77"
90+
"type": "t_contract(OUSD)13422",
91+
"src": "contracts/vault/VaultStorage.sol:80"
9292
},
9393
{
9494
"contract": "VaultStorage",
9595
"label": "_deprecated_rebaseHooksAddr",
9696
"type": "t_address",
97-
"src": "contracts/vault/VaultStorage.sol:83"
97+
"src": "contracts/vault/VaultStorage.sol:86"
9898
},
9999
{
100100
"contract": "VaultStorage",
101101
"label": "uniswapAddr",
102102
"type": "t_address",
103-
"src": "contracts/vault/VaultStorage.sol:86"
103+
"src": "contracts/vault/VaultStorage.sol:89"
104104
},
105105
{
106106
"contract": "VaultStorage",
107107
"label": "strategistAddr",
108108
"type": "t_address",
109-
"src": "contracts/vault/VaultStorage.sol:89"
109+
"src": "contracts/vault/VaultStorage.sol:92"
110110
},
111111
{
112112
"contract": "VaultStorage",
113113
"label": "assetDefaultStrategies",
114114
"type": "t_mapping(t_address,t_address)",
115-
"src": "contracts/vault/VaultStorage.sol:93"
115+
"src": "contracts/vault/VaultStorage.sol:96"
116116
},
117117
{
118118
"contract": "VaultStorage",
119119
"label": "maxSupplyDiff",
120120
"type": "t_uint256",
121-
"src": "contracts/vault/VaultStorage.sol:95"
121+
"src": "contracts/vault/VaultStorage.sol:98"
122+
},
123+
{
124+
"contract": "VaultStorage",
125+
"label": "trusteeAddress",
126+
"type": "t_address",
127+
"src": "contracts/vault/VaultStorage.sol:101"
128+
},
129+
{
130+
"contract": "VaultStorage",
131+
"label": "trusteeFeeBps",
132+
"type": "t_uint256",
133+
"src": "contracts/vault/VaultStorage.sol:104"
122134
}
123135
],
124136
"types": {
125-
"t_mapping(t_address,t_struct(Asset)16756_storage)": {
137+
"t_mapping(t_address,t_struct(Asset)16977_storage)": {
126138
"label": "mapping(address => struct VaultStorage.Asset)"
127139
},
128140
"t_address": {
129141
"label": "address"
130142
},
131-
"t_struct(Asset)16756_storage": {
143+
"t_struct(Asset)16977_storage": {
132144
"label": "struct VaultStorage.Asset",
133145
"members": [
134146
{
@@ -143,10 +155,10 @@
143155
"t_array(t_address)dyn_storage": {
144156
"label": "address[]"
145157
},
146-
"t_mapping(t_address,t_struct(Strategy)16768_storage)": {
158+
"t_mapping(t_address,t_struct(Strategy)16989_storage)": {
147159
"label": "mapping(address => struct VaultStorage.Strategy)"
148160
},
149-
"t_struct(Strategy)16768_storage": {
161+
"t_struct(Strategy)16989_storage": {
150162
"label": "struct VaultStorage.Strategy",
151163
"members": [
152164
{
@@ -162,7 +174,7 @@
162174
"t_uint256": {
163175
"label": "uint256"
164176
},
165-
"t_contract(OUSD)13287": {
177+
"t_contract(OUSD)13422": {
166178
"label": "contract OUSD"
167179
},
168180
"t_mapping(t_address,t_address)": {

‎dapp/network.mainnet.json

Lines changed: 83 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10582,7 +10582,7 @@
1058210582
]
1058310583
},
1058410584
"VaultCore": {
10585-
"address": "0xE54f14FC3fBc5915D070DE4758bcF591541BD1c3",
10585+
"address": "0x3e803eEA623eE4793f0f49790A813811da5249f4",
1058610586
"abi": [
1058710587
{
1058810588
"constant": true,
@@ -10669,6 +10669,21 @@
1066910669
"stateMutability": "view",
1067010670
"type": "function"
1067110671
},
10672+
{
10673+
"constant": true,
10674+
"inputs": [],
10675+
"name": "trusteeFeeBps",
10676+
"outputs": [
10677+
{
10678+
"internalType": "uint256",
10679+
"name": "",
10680+
"type": "uint256"
10681+
}
10682+
],
10683+
"payable": false,
10684+
"stateMutability": "view",
10685+
"type": "function"
10686+
},
1067210687
{
1067310688
"constant": true,
1067410689
"inputs": [],
@@ -10699,6 +10714,21 @@
1069910714
"stateMutability": "view",
1070010715
"type": "function"
1070110716
},
10717+
{
10718+
"constant": true,
10719+
"inputs": [],
10720+
"name": "trusteeAddress",
10721+
"outputs": [
10722+
{
10723+
"internalType": "address",
10724+
"name": "",
10725+
"type": "address"
10726+
}
10727+
],
10728+
"payable": false,
10729+
"stateMutability": "view",
10730+
"type": "function"
10731+
},
1070210732
{
1070310733
"constant": true,
1070410734
"inputs": [],
@@ -10930,13 +10960,7 @@
1093010960
"constant": false,
1093110961
"inputs": [],
1093210962
"name": "rebase",
10933-
"outputs": [
10934-
{
10935-
"internalType": "uint256",
10936-
"name": "newTotalSupply",
10937-
"type": "uint256"
10938-
}
10939-
],
10963+
"outputs": [],
1094010964
"payable": false,
1094110965
"stateMutability": "nonpayable",
1094210966
"type": "function"
@@ -11285,6 +11309,57 @@
1128511309
"name": "MaxSupplyDiffChanged",
1128611310
"type": "event"
1128711311
},
11312+
{
11313+
"anonymous": false,
11314+
"inputs": [
11315+
{
11316+
"indexed": false,
11317+
"internalType": "address",
11318+
"name": "_to",
11319+
"type": "address"
11320+
},
11321+
{
11322+
"indexed": false,
11323+
"internalType": "uint256",
11324+
"name": "_yield",
11325+
"type": "uint256"
11326+
},
11327+
{
11328+
"indexed": false,
11329+
"internalType": "uint256",
11330+
"name": "_fee",
11331+
"type": "uint256"
11332+
}
11333+
],
11334+
"name": "YieldDistribution",
11335+
"type": "event"
11336+
},
11337+
{
11338+
"anonymous": false,
11339+
"inputs": [
11340+
{
11341+
"indexed": false,
11342+
"internalType": "uint256",
11343+
"name": "_basis",
11344+
"type": "uint256"
11345+
}
11346+
],
11347+
"name": "TrusteeFeeBpsChanged",
11348+
"type": "event"
11349+
},
11350+
{
11351+
"anonymous": false,
11352+
"inputs": [
11353+
{
11354+
"indexed": false,
11355+
"internalType": "address",
11356+
"name": "_address",
11357+
"type": "address"
11358+
}
11359+
],
11360+
"name": "TrusteeAddressChanged",
11361+
"type": "event"
11362+
},
1128811363
{
1128911364
"anonymous": false,
1129011365
"inputs": [

0 commit comments

Comments
 (0)