Skip to content

Commit

Permalink
[OETHb] Deploy 019 - Enable Async Withdrawals (#2292)
Browse files Browse the repository at this point in the history
  • Loading branch information
@shahthepro @sparrowDom
shahthepro authored and sparrowDom committed Oct 30, 2024
1 parent 8d60c3f commit 5795ca3
Show file tree
Hide file tree
Showing 6 changed files with 797 additions and 310 deletions.
5 changes: 4 additions & 1 deletion contracts/deployments/base/.migrations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@
"013_revoke_admin_role": 1727204761,
"014_fixed_rate_dripper": 1727409372,
"015_harvester": 1727718319,
"016_timelock_2d_delay": 1727845272
"016_timelock_2d_delay": 1727845272,
"017_upgrade_amo": 1728599745,
"018_strategist_as_executor": 1729078818,
"019_async_withdrawals": 1730100488
}
248 changes: 153 additions & 95 deletions contracts/deployments/base/OETHBaseVaultAdmin.json
View file

Large diffs are not rendered by default.

244 changes: 134 additions & 110 deletions contracts/deployments/base/OETHBaseVaultCore.json
View file

Large diffs are not rendered by default.

386 changes: 386 additions & 0 deletions contracts/deployments/base/solcInputs/2e6dbe2a469379057a74576762168c2c.json
View file

Large diffs are not rendered by default.

110 changes: 59 additions & 51 deletions contracts/storageLayout/localhost/OETHBaseVaultAdmin.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,233 +29,241 @@
"label": "assets",
"offset": 0,
"slot": "51",
"type": "t_mapping(t_address,t_struct(Asset)50021_storage)",
"type": "t_mapping(t_address,t_struct(Asset)34500_storage)",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:91"
"src": "contracts/vault/VaultStorage.sol:92"
},
{
"label": "allAssets",
"offset": 0,
"slot": "52",
"type": "t_array(t_address)dyn_storage",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:94"
"src": "contracts/vault/VaultStorage.sol:95"
},
{
"label": "strategies",
"offset": 0,
"slot": "53",
"type": "t_mapping(t_address,t_struct(Strategy)50036_storage)",
"type": "t_mapping(t_address,t_struct(Strategy)34515_storage)",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:103"
"src": "contracts/vault/VaultStorage.sol:104"
},
{
"label": "allStrategies",
"offset": 0,
"slot": "54",
"type": "t_array(t_address)dyn_storage",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:105"
"src": "contracts/vault/VaultStorage.sol:106"
},
{
"label": "priceProvider",
"offset": 0,
"slot": "55",
"type": "t_address",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:109"
"src": "contracts/vault/VaultStorage.sol:110"
},
{
"label": "rebasePaused",
"offset": 20,
"slot": "55",
"type": "t_bool",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:111"
"src": "contracts/vault/VaultStorage.sol:112"
},
{
"label": "capitalPaused",
"offset": 21,
"slot": "55",
"type": "t_bool",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:114"
"src": "contracts/vault/VaultStorage.sol:115"
},
{
"label": "redeemFeeBps",
"offset": 0,
"slot": "56",
"type": "t_uint256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:116"
"src": "contracts/vault/VaultStorage.sol:117"
},
{
"label": "vaultBuffer",
"offset": 0,
"slot": "57",
"type": "t_uint256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:118"
"src": "contracts/vault/VaultStorage.sol:119"
},
{
"label": "autoAllocateThreshold",
"offset": 0,
"slot": "58",
"type": "t_uint256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:120"
"src": "contracts/vault/VaultStorage.sol:121"
},
{
"label": "rebaseThreshold",
"offset": 0,
"slot": "59",
"type": "t_uint256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:122"
"src": "contracts/vault/VaultStorage.sol:123"
},
{
"label": "oUSD",
"offset": 0,
"slot": "60",
"type": "t_contract(OUSD)42724",
"type": "t_contract(OUSD)27570",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:126"
"src": "contracts/vault/VaultStorage.sol:127"
},
{
"label": "_deprecated_rebaseHooksAddr",
"offset": 0,
"slot": "61",
"type": "t_address",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:133"
"src": "contracts/vault/VaultStorage.sol:134"
},
{
"label": "_deprecated_uniswapAddr",
"offset": 0,
"slot": "62",
"type": "t_address",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:137"
"src": "contracts/vault/VaultStorage.sol:138"
},
{
"label": "strategistAddr",
"offset": 0,
"slot": "63",
"type": "t_address",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:140"
"src": "contracts/vault/VaultStorage.sol:141"
},
{
"label": "assetDefaultStrategies",
"offset": 0,
"slot": "64",
"type": "t_mapping(t_address,t_address)",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:145"
"src": "contracts/vault/VaultStorage.sol:146"
},
{
"label": "maxSupplyDiff",
"offset": 0,
"slot": "65",
"type": "t_uint256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:149"
"src": "contracts/vault/VaultStorage.sol:150"
},
{
"label": "trusteeAddress",
"offset": 0,
"slot": "66",
"type": "t_address",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:152"
"src": "contracts/vault/VaultStorage.sol:153"
},
{
"label": "trusteeFeeBps",
"offset": 0,
"slot": "67",
"type": "t_uint256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:155"
"src": "contracts/vault/VaultStorage.sol:156"
},
{
"label": "_deprecated_swapTokens",
"offset": 0,
"slot": "68",
"type": "t_array(t_address)dyn_storage",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:158"
"src": "contracts/vault/VaultStorage.sol:159"
},
{
"label": "ousdMetaStrategy",
"offset": 0,
"slot": "69",
"type": "t_address",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:166"
"src": "contracts/vault/VaultStorage.sol:167"
},
{
"label": "netOusdMintedForStrategy",
"offset": 0,
"slot": "70",
"type": "t_int256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:170"
"src": "contracts/vault/VaultStorage.sol:171"
},
{
"label": "netOusdMintForStrategyThreshold",
"offset": 0,
"slot": "71",
"type": "t_uint256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:174"
"src": "contracts/vault/VaultStorage.sol:175"
},
{
"label": "swapConfig",
"offset": 0,
"slot": "72",
"type": "t_struct(SwapConfig)50136_storage",
"type": "t_struct(SwapConfig)34615_storage",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:190"
"src": "contracts/vault/VaultStorage.sol:191"
},
{
"label": "isMintWhitelistedStrategy",
"offset": 0,
"slot": "73",
"type": "t_mapping(t_address,t_bool)",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:195"
"src": "contracts/vault/VaultStorage.sol:196"
},
{
"label": "dripper",
"offset": 0,
"slot": "74",
"type": "t_address",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:201"
"src": "contracts/vault/VaultStorage.sol:202"
},
{
"label": "withdrawalQueueMetadata",
"offset": 0,
"slot": "75",
"type": "t_struct(WithdrawalQueueMetadata)50162_storage",
"type": "t_struct(WithdrawalQueueMetadata)34641_storage",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:223"
"src": "contracts/vault/VaultStorage.sol:224"
},
{
"label": "withdrawalRequests",
"offset": 0,
"slot": "77",
"type": "t_mapping(t_uint256,t_struct(WithdrawalRequest)50177_storage)",
"type": "t_mapping(t_uint256,t_struct(WithdrawalRequest)34656_storage)",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:237"
"src": "contracts/vault/VaultStorage.sol:238"
},
{
"label": "__gap",
"label": "withdrawalClaimDelay",
"offset": 0,
"slot": "78",
"type": "t_array(t_uint256)45_storage",
"type": "t_uint256",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:245"
},
{
"label": "__gap",
"offset": 0,
"slot": "79",
"type": "t_array(t_uint256)44_storage",
"contract": "VaultStorage",
"src": "contracts/vault/VaultStorage.sol:240"
"src": "contracts/vault/VaultStorage.sol:249"
}
],
"types": {
Expand All @@ -267,9 +275,9 @@
"label": "address[]",
"numberOfBytes": "32"
},
"t_array(t_uint256)45_storage": {
"label": "uint256[45]",
"numberOfBytes": "1440"
"t_array(t_uint256)44_storage": {
"label": "uint256[44]",
"numberOfBytes": "1408"
},
"t_array(t_uint256)50_storage": {
"label": "uint256[50]",
Expand All @@ -279,11 +287,11 @@
"label": "bool",
"numberOfBytes": "1"
},
"t_contract(OUSD)42724": {
"t_contract(OUSD)27570": {
"label": "contract OUSD",
"numberOfBytes": "20"
},
"t_enum(UnitConversion)50011": {
"t_enum(UnitConversion)34490": {
"label": "enum VaultStorage.UnitConversion",
"members": [
"DECIMALS",
Expand All @@ -303,19 +311,19 @@
"label": "mapping(address => bool)",
"numberOfBytes": "32"
},
"t_mapping(t_address,t_struct(Asset)50021_storage)": {
"t_mapping(t_address,t_struct(Asset)34500_storage)": {
"label": "mapping(address => struct VaultStorage.Asset)",
"numberOfBytes": "32"
},
"t_mapping(t_address,t_struct(Strategy)50036_storage)": {
"t_mapping(t_address,t_struct(Strategy)34515_storage)": {
"label": "mapping(address => struct VaultStorage.Strategy)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_struct(WithdrawalRequest)50177_storage)": {
"t_mapping(t_uint256,t_struct(WithdrawalRequest)34656_storage)": {
"label": "mapping(uint256 => struct VaultStorage.WithdrawalRequest)",
"numberOfBytes": "32"
},
"t_struct(Asset)50021_storage": {
"t_struct(Asset)34500_storage": {
"label": "struct VaultStorage.Asset",
"members": [
{
Expand All @@ -326,7 +334,7 @@
},
{
"label": "unitConversion",
"type": "t_enum(UnitConversion)50011",
"type": "t_enum(UnitConversion)34490",
"offset": 1,
"slot": "0"
},
Expand All @@ -345,7 +353,7 @@
],
"numberOfBytes": "32"
},
"t_struct(Strategy)50036_storage": {
"t_struct(Strategy)34515_storage": {
"label": "struct VaultStorage.Strategy",
"members": [
{
Expand All @@ -363,7 +371,7 @@
],
"numberOfBytes": "64"
},
"t_struct(SwapConfig)50136_storage": {
"t_struct(SwapConfig)34615_storage": {
"label": "struct VaultStorage.SwapConfig",
"members": [
{
Expand All @@ -381,7 +389,7 @@
],
"numberOfBytes": "32"
},
"t_struct(WithdrawalQueueMetadata)50162_storage": {
"t_struct(WithdrawalQueueMetadata)34641_storage": {
"label": "struct VaultStorage.WithdrawalQueueMetadata",
"members": [
{
Expand Down Expand Up @@ -411,7 +419,7 @@
],
"numberOfBytes": "64"
},
"t_struct(WithdrawalRequest)50177_storage": {
"t_struct(WithdrawalRequest)34656_storage": {
"label": "struct VaultStorage.WithdrawalRequest",
"members": [
{
Expand Down
Loading

0 comments on commit 5795ca3

Please sign in to comment.