Skip to content

Commit

Permalink
Deploy 13 (#545)
Browse files Browse the repository at this point in the history 
* Rinkeby deploy

* mainnet deploy
  • Loading branch information
@franckc
franckc committed Feb 3, 2021
1 parent d2231cd commit 6c8b30f
Show file tree
Hide file tree
Showing 8 changed files with 416 additions and 104 deletions.
2 changes: 1 addition & 1 deletion contracts/deploy/013_trustee.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const {
const { proposeArgs } = require("../utils/governor");
const { getTxOpts } = require("../utils/tx");

const deployName = "013_upgrades";
const deployName = "013_trustee";

/**
* Deploys the vault trustee feature:
Expand Down
3 changes: 2 additions & 1 deletion contracts/deployments/mainnet/.migrations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
"010_upgrade_single_asset_staking": 1609971639,
"011_ousd_fix": 1610148010,
"005_compensation_claims": 1610487584,
"012_upgrades": 1612303613
"012_upgrades": 1612303613,
"013_trustee": 1612380836
}
134 changes: 104 additions & 30 deletions contracts/deployments/mainnet/VaultCore.json
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion contracts/deployments/rinkeby/.migrations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"010_upgrade_single_asset_staking": 1609968697,
"011_ousd_fix": 1610146101,
"005_compensation_claims": 1612291029,
"012_upgrades": 1612292067
"012_upgrades": 1612292067,
"013_trustee": 1612380511
}
134 changes: 104 additions & 30 deletions contracts/deployments/rinkeby/VaultCore.json
View file

Large diffs are not rendered by default.

62 changes: 37 additions & 25 deletions contracts/storageLayout/mainnet/VaultCore.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,114 +21,126 @@
{
"contract": "VaultStorage",
"label": "assets",
"type": "t_mapping(t_address,t_struct(Asset)16756_storage)",
"src": "contracts/vault/VaultStorage.sol:52"
"type": "t_mapping(t_address,t_struct(Asset)16977_storage)",
"src": "contracts/vault/VaultStorage.sol:55"
},
{
"contract": "VaultStorage",
"label": "allAssets",
"type": "t_array(t_address)dyn_storage",
"src": "contracts/vault/VaultStorage.sol:53"
"src": "contracts/vault/VaultStorage.sol:56"
},
{
"contract": "VaultStorage",
"label": "strategies",
"type": "t_mapping(t_address,t_struct(Strategy)16768_storage)",
"src": "contracts/vault/VaultStorage.sol:60"
"type": "t_mapping(t_address,t_struct(Strategy)16989_storage)",
"src": "contracts/vault/VaultStorage.sol:63"
},
{
"contract": "VaultStorage",
"label": "allStrategies",
"type": "t_array(t_address)dyn_storage",
"src": "contracts/vault/VaultStorage.sol:61"
"src": "contracts/vault/VaultStorage.sol:64"
},
{
"contract": "VaultStorage",
"label": "priceProvider",
"type": "t_address",
"src": "contracts/vault/VaultStorage.sol:64"
"src": "contracts/vault/VaultStorage.sol:67"
},
{
"contract": "VaultStorage",
"label": "rebasePaused",
"type": "t_bool",
"src": "contracts/vault/VaultStorage.sol:66"
"src": "contracts/vault/VaultStorage.sol:69"
},
{
"contract": "VaultStorage",
"label": "capitalPaused",
"type": "t_bool",
"src": "contracts/vault/VaultStorage.sol:67"
"src": "contracts/vault/VaultStorage.sol:70"
},
{
"contract": "VaultStorage",
"label": "redeemFeeBps",
"type": "t_uint256",
"src": "contracts/vault/VaultStorage.sol:69"
"src": "contracts/vault/VaultStorage.sol:72"
},
{
"contract": "VaultStorage",
"label": "vaultBuffer",
"type": "t_uint256",
"src": "contracts/vault/VaultStorage.sol:71"
"src": "contracts/vault/VaultStorage.sol:74"
},
{
"contract": "VaultStorage",
"label": "autoAllocateThreshold",
"type": "t_uint256",
"src": "contracts/vault/VaultStorage.sol:73"
"src": "contracts/vault/VaultStorage.sol:76"
},
{
"contract": "VaultStorage",
"label": "rebaseThreshold",
"type": "t_uint256",
"src": "contracts/vault/VaultStorage.sol:75"
"src": "contracts/vault/VaultStorage.sol:78"
},
{
"contract": "VaultStorage",
"label": "oUSD",
"type": "t_contract(OUSD)13287",
"src": "contracts/vault/VaultStorage.sol:77"
"type": "t_contract(OUSD)13422",
"src": "contracts/vault/VaultStorage.sol:80"
},
{
"contract": "VaultStorage",
"label": "_deprecated_rebaseHooksAddr",
"type": "t_address",
"src": "contracts/vault/VaultStorage.sol:83"
"src": "contracts/vault/VaultStorage.sol:86"
},
{
"contract": "VaultStorage",
"label": "uniswapAddr",
"type": "t_address",
"src": "contracts/vault/VaultStorage.sol:86"
"src": "contracts/vault/VaultStorage.sol:89"
},
{
"contract": "VaultStorage",
"label": "strategistAddr",
"type": "t_address",
"src": "contracts/vault/VaultStorage.sol:89"
"src": "contracts/vault/VaultStorage.sol:92"
},
{
"contract": "VaultStorage",
"label": "assetDefaultStrategies",
"type": "t_mapping(t_address,t_address)",
"src": "contracts/vault/VaultStorage.sol:93"
"src": "contracts/vault/VaultStorage.sol:96"
},
{
"contract": "VaultStorage",
"label": "maxSupplyDiff",
"type": "t_uint256",
"src": "contracts/vault/VaultStorage.sol:95"
"src": "contracts/vault/VaultStorage.sol:98"
},
{
"contract": "VaultStorage",
"label": "trusteeAddress",
"type": "t_address",
"src": "contracts/vault/VaultStorage.sol:101"
},
{
"contract": "VaultStorage",
"label": "trusteeFeeBps",
"type": "t_uint256",
"src": "contracts/vault/VaultStorage.sol:104"
}
],
"types": {
"t_mapping(t_address,t_struct(Asset)16756_storage)": {
"t_mapping(t_address,t_struct(Asset)16977_storage)": {
"label": "mapping(address => struct VaultStorage.Asset)"
},
"t_address": {
"label": "address"
},
"t_struct(Asset)16756_storage": {
"t_struct(Asset)16977_storage": {
"label": "struct VaultStorage.Asset",
"members": [
{
Expand All @@ -143,10 +155,10 @@
"t_array(t_address)dyn_storage": {
"label": "address[]"
},
"t_mapping(t_address,t_struct(Strategy)16768_storage)": {
"t_mapping(t_address,t_struct(Strategy)16989_storage)": {
"label": "mapping(address => struct VaultStorage.Strategy)"
},
"t_struct(Strategy)16768_storage": {
"t_struct(Strategy)16989_storage": {
"label": "struct VaultStorage.Strategy",
"members": [
{
Expand All @@ -162,7 +174,7 @@
"t_uint256": {
"label": "uint256"
},
"t_contract(OUSD)13287": {
"t_contract(OUSD)13422": {
"label": "contract OUSD"
},
"t_mapping(t_address,t_address)": {
Expand Down
91 changes: 83 additions & 8 deletions dapp/network.mainnet.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10582,7 +10582,7 @@
]
},
"VaultCore": {
"address": "0xE54f14FC3fBc5915D070DE4758bcF591541BD1c3",
"address": "0x3e803eEA623eE4793f0f49790A813811da5249f4",
"abi": [
{
"constant": true,
Expand Down Expand Up @@ -10669,6 +10669,21 @@
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "trusteeFeeBps",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
Expand Down Expand Up @@ -10699,6 +10714,21 @@
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "trusteeAddress",
"outputs": [
{
"internalType": "address",
"name": "",
"type": "address"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
Expand Down Expand Up @@ -10930,13 +10960,7 @@
"constant": false,
"inputs": [],
"name": "rebase",
"outputs": [
{
"internalType": "uint256",
"name": "newTotalSupply",
"type": "uint256"
}
],
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
Expand Down Expand Up @@ -11285,6 +11309,57 @@
"name": "MaxSupplyDiffChanged",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "address",
"name": "_to",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "_yield",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint256",
"name": "_fee",
"type": "uint256"
}
],
"name": "YieldDistribution",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "uint256",
"name": "_basis",
"type": "uint256"
}
],
"name": "TrusteeFeeBpsChanged",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "address",
"name": "_address",
"type": "address"
}
],
"name": "TrusteeAddressChanged",
"type": "event"
},
{
"anonymous": false,
"inputs": [
Expand Down

0 comments on commit 6c8b30f

Please sign in to comment.