Skip to content

Commit

Permalink
Deploy 091 - Upgrade OETHVaultCore (#2035)
Browse files Browse the repository at this point in the history 
* Deploy 091 - Upgrade OETHVaultCore

* Add proposal ID

* Update proposal description

* Update deployment ID
  • Loading branch information
@shahthepro
shahthepro committed Apr 30, 2024
1 parent 28c5457 commit 3f1afe9
Show file tree
Hide file tree
Showing 4 changed files with 166 additions and 109 deletions.
5 changes: 3 additions & 2 deletions contracts/deploy/091_simplified_oeth_vault.js
View file
Expand Up @@ -11,7 +11,8 @@ module.exports = deploymentWithGovernanceProposal(
// forceSkip: true,
// onlyOnFork: true, // this is only executed in forked environment
reduceQueueTime: true, // just to solve the issue of later active proposals failing
proposalId: "",
proposalId:
"78389253671544237322939434422056971914944279457140328550595948923573494383344",
},
async ({ ethers }) => {
const cOETHVaultProxy = await ethers.getContract("OETHVaultProxy");
Expand All @@ -28,7 +29,7 @@ module.exports = deploymentWithGovernanceProposal(
return {
name: "Simplified OETH mint and redeem\n\
\n\
Part of simplified OETH proposal. Trims down mint and redeem complexity on OETH Vault. Set redeem fees to zero. \
Part of simplified OETH proposal. Makes redeem WETH-only (no more LST-mix redeem). \
",
actions: [
{
Expand Down
3 changes: 2 additions & 1 deletion contracts/deployments/mainnet/.migrations.json
View file
Expand Up @@ -81,5 +81,6 @@
"087_reduce_redeem_fee": 1710470610,
"089_1inch_buyback": 1711371391,
"090_disable_compound": 1711469659,
"091_simplified_oeth_vault": 1714138519,
"092_woeth_ccip_zapper": 1714111493
}
}
179 changes: 109 additions & 70 deletions contracts/deployments/mainnet/OETHVaultCore.json
View file

Large diffs are not rendered by default.

88 changes: 52 additions & 36 deletions contracts/storageLayout/mainnet/OETHVaultCore.json
View file
Expand Up @@ -29,193 +29,209 @@
"label": "assets",
"offset": 0,
"slot": "51",
"type": "t_mapping(t_address,t_struct(Asset)42498_storage)",
"type": "t_mapping(t_address,t_struct(Asset)43795_storage)",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:73"
"src": "contracts/vault/VaultStorage.sol:75"
},
{
"label": "allAssets",
"offset": 0,
"slot": "52",
"type": "t_array(t_address)dyn_storage",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:75"
"src": "contracts/vault/VaultStorage.sol:78"
},
{
"label": "strategies",
"offset": 0,
"slot": "53",
"type": "t_mapping(t_address,t_struct(Strategy)42513_storage)",
"type": "t_mapping(t_address,t_struct(Strategy)43810_storage)",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:83"
"src": "contracts/vault/VaultStorage.sol:86"
},
{
"label": "allStrategies",
"offset": 0,
"slot": "54",
"type": "t_array(t_address)dyn_storage",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:85"
"src": "contracts/vault/VaultStorage.sol:88"
},
{
"label": "priceProvider",
"offset": 0,
"slot": "55",
"type": "t_address",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:89"
"src": "contracts/vault/VaultStorage.sol:92"
},
{
"label": "rebasePaused",
"offset": 20,
"slot": "55",
"type": "t_bool",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:91"
"src": "contracts/vault/VaultStorage.sol:94"
},
{
"label": "capitalPaused",
"offset": 21,
"slot": "55",
"type": "t_bool",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:94"
"src": "contracts/vault/VaultStorage.sol:97"
},
{
"label": "redeemFeeBps",
"offset": 0,
"slot": "56",
"type": "t_uint256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:96"
"src": "contracts/vault/VaultStorage.sol:99"
},
{
"label": "vaultBuffer",
"offset": 0,
"slot": "57",
"type": "t_uint256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:98"
"src": "contracts/vault/VaultStorage.sol:101"
},
{
"label": "autoAllocateThreshold",
"offset": 0,
"slot": "58",
"type": "t_uint256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:100"
"src": "contracts/vault/VaultStorage.sol:103"
},
{
"label": "rebaseThreshold",
"offset": 0,
"slot": "59",
"type": "t_uint256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:102"
"src": "contracts/vault/VaultStorage.sol:105"
},
{
"label": "oUSD",
"offset": 0,
"slot": "60",
"type": "t_contract(OUSD)36965",
"type": "t_contract(OUSD)37977",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:106"
"src": "contracts/vault/VaultStorage.sol:109"
},
{
"label": "_deprecated_rebaseHooksAddr",
"offset": 0,
"slot": "61",
"type": "t_address",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:113"
"src": "contracts/vault/VaultStorage.sol:116"
},
{
"label": "_deprecated_uniswapAddr",
"offset": 0,
"slot": "62",
"type": "t_address",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:117"
"src": "contracts/vault/VaultStorage.sol:120"
},
{
"label": "strategistAddr",
"offset": 0,
"slot": "63",
"type": "t_address",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:120"
"src": "contracts/vault/VaultStorage.sol:123"
},
{
"label": "assetDefaultStrategies",
"offset": 0,
"slot": "64",
"type": "t_mapping(t_address,t_address)",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:124"
"src": "contracts/vault/VaultStorage.sol:128"
},
{
"label": "maxSupplyDiff",
"offset": 0,
"slot": "65",
"type": "t_uint256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:127"
"src": "contracts/vault/VaultStorage.sol:132"
},
{
"label": "trusteeAddress",
"offset": 0,
"slot": "66",
"type": "t_address",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:130"
"src": "contracts/vault/VaultStorage.sol:135"
},
{
"label": "trusteeFeeBps",
"offset": 0,
"slot": "67",
"type": "t_uint256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:133"
"src": "contracts/vault/VaultStorage.sol:138"
},
{
"label": "_deprecated_swapTokens",
"offset": 0,
"slot": "68",
"type": "t_array(t_address)dyn_storage",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:136"
"src": "contracts/vault/VaultStorage.sol:141"
},
{
"label": "ousdMetaStrategy",
"offset": 0,
"slot": "69",
"type": "t_address",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:141"
"src": "contracts/vault/VaultStorage.sol:146"
},
{
"label": "netOusdMintedForStrategy",
"offset": 0,
"slot": "70",
"type": "t_int256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:144"
"src": "contracts/vault/VaultStorage.sol:149"
},
{
"label": "netOusdMintForStrategyThreshold",
"offset": 0,
"slot": "71",
"type": "t_uint256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:147"
"src": "contracts/vault/VaultStorage.sol:152"
},
{
"label": "swapConfig",
"offset": 0,
"slot": "72",
"type": "t_struct(SwapConfig)42619_storage",
"type": "t_struct(SwapConfig)43916_storage",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:161"
"src": "contracts/vault/VaultStorage.sol:166"
},
{
"label": "__gap",
"offset": 0,
"slot": "73",
"type": "t_array(t_uint256)50_storage",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:169"
},
{
"label": "wethAssetIndex",
"offset": 0,
"slot": "123",
"type": "t_uint256",
"contract": "OETHVaultCore",
"src": "contracts/vault/OETHVaultCore.sol:20"
}
],
"types": {
Expand All @@ -235,11 +251,11 @@
"label": "bool",
"numberOfBytes": "1"
},
"t_contract(OUSD)36965": {
"t_contract(OUSD)37977": {
"label": "contract OUSD",
"numberOfBytes": "20"
},
"t_enum(UnitConversion)42488": {
"t_enum(UnitConversion)43785": {
"label": "enum VaultStorage.UnitConversion",
"members": [
"DECIMALS",
Expand All @@ -255,15 +271,15 @@
"label": "mapping(address => address)",
"numberOfBytes": "32"
},
"t_mapping(t_address,t_struct(Asset)42498_storage)": {
"t_mapping(t_address,t_struct(Asset)43795_storage)": {
"label": "mapping(address => struct VaultStorage.Asset)",
"numberOfBytes": "32"
},
"t_mapping(t_address,t_struct(Strategy)42513_storage)": {
"t_mapping(t_address,t_struct(Strategy)43810_storage)": {
"label": "mapping(address => struct VaultStorage.Strategy)",
"numberOfBytes": "32"
},
"t_struct(Asset)42498_storage": {
"t_struct(Asset)43795_storage": {
"label": "struct VaultStorage.Asset",
"members": [
{
Expand All @@ -274,7 +290,7 @@
},
{
"label": "unitConversion",
"type": "t_enum(UnitConversion)42488",
"type": "t_enum(UnitConversion)43785",
"offset": 1,
"slot": "0"
},
Expand All @@ -293,7 +309,7 @@
],
"numberOfBytes": "32"
},
"t_struct(Strategy)42513_storage": {
"t_struct(Strategy)43810_storage": {
"label": "struct VaultStorage.Strategy",
"members": [
{
Expand All @@ -311,7 +327,7 @@
],
"numberOfBytes": "64"
},
"t_struct(SwapConfig)42619_storage": {
"t_struct(SwapConfig)43916_storage": {
"label": "struct VaultStorage.SwapConfig",
"members": [
{
Expand Down

0 comments on commit 3f1afe9

Please sign in to comment.