Skip to content

Commit 0e51a35

Browse files
authored
Update tests for after upgrade (#116)
* Update tests for after upgrade * Update transaction for mainnet * Fix tests * replace getBalance with balance.current * Fix redundant import * Update FeesEscrow test * Update RewardEthToken totalSupply * Fix tests for updated total supply * Remove redundant import * Remove upgrade function from RewardEthToken * Remove RewardEthToken upgrade test * Fix incorrect file removal * Deploy RewardEthToken 2.1.1 * Upgrade RewardEthToken proxy * Upload updated Pessimistic report * Update proxies test
1 parent 29a802e commit 0e51a35

File tree

18 files changed

+9788
-9987
lines changed

18 files changed

+9788
-9987
lines changed

.openzeppelin/mainnet.json

Lines changed: 301 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3497,6 +3497,307 @@
34973497
}
34983498
}
34993499
}
3500+
},
3501+
"0570d8b09dfa923c4a3464f14202ab3ff5998108ca1a59eae09600cf2bd12927": {
3502+
"address": "0x04f439c341221Da7AE086b6F585e4Cd7a7E54622",
3503+
"txHash": "0xfd5e59bb0472ffc5695cb9fcbe4031a416e1517467861de78657698e5e9ed329",
3504+
"layout": {
3505+
"storage": [
3506+
{
3507+
"contract": "Initializable",
3508+
"label": "_initialized",
3509+
"type": "t_bool",
3510+
"src": "@openzeppelin/contracts-upgradeable/proxy/Initializable.sol:25"
3511+
},
3512+
{
3513+
"contract": "Initializable",
3514+
"label": "_initializing",
3515+
"type": "t_bool",
3516+
"src": "@openzeppelin/contracts-upgradeable/proxy/Initializable.sol:30"
3517+
},
3518+
{
3519+
"contract": "ContextUpgradeable",
3520+
"label": "__gap",
3521+
"type": "t_array(t_uint256)50_storage",
3522+
"src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:31"
3523+
},
3524+
{
3525+
"contract": "PausableUpgradeable",
3526+
"label": "_paused",
3527+
"type": "t_bool",
3528+
"src": "@openzeppelin/contracts-upgradeable/utils/PausableUpgradeable.sol:28"
3529+
},
3530+
{
3531+
"contract": "PausableUpgradeable",
3532+
"label": "__gap",
3533+
"type": "t_array(t_uint256)49_storage",
3534+
"src": "@openzeppelin/contracts-upgradeable/utils/PausableUpgradeable.sol:96"
3535+
},
3536+
{
3537+
"contract": "AccessControlUpgradeable",
3538+
"label": "_roles",
3539+
"type": "t_mapping(t_bytes32,t_struct(RoleData)39_storage)",
3540+
"src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:61"
3541+
},
3542+
{
3543+
"contract": "AccessControlUpgradeable",
3544+
"label": "__gap",
3545+
"type": "t_array(t_uint256)49_storage",
3546+
"src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:225"
3547+
},
3548+
{
3549+
"contract": "ERC20Upgradeable",
3550+
"label": "_allowances",
3551+
"type": "t_mapping(t_address,t_mapping(t_address,t_uint256))",
3552+
"src": "contracts/tokens/ERC20Upgradeable.sol:38"
3553+
},
3554+
{
3555+
"contract": "ERC20Upgradeable",
3556+
"label": "_name",
3557+
"type": "t_string_storage",
3558+
"src": "contracts/tokens/ERC20Upgradeable.sol:40"
3559+
},
3560+
{
3561+
"contract": "ERC20Upgradeable",
3562+
"label": "_symbol",
3563+
"type": "t_string_storage",
3564+
"src": "contracts/tokens/ERC20Upgradeable.sol:41"
3565+
},
3566+
{
3567+
"contract": "ERC20Upgradeable",
3568+
"label": "_decimals",
3569+
"type": "t_uint8",
3570+
"src": "contracts/tokens/ERC20Upgradeable.sol:42"
3571+
},
3572+
{
3573+
"contract": "ERC20Upgradeable",
3574+
"label": "__gap",
3575+
"type": "t_array(t_uint256)44_storage",
3576+
"src": "contracts/tokens/ERC20Upgradeable.sol:225"
3577+
},
3578+
{
3579+
"contract": "EIP712Upgradeable",
3580+
"label": "_HASHED_NAME",
3581+
"type": "t_bytes32",
3582+
"src": "@openzeppelin/contracts-upgradeable/drafts/EIP712Upgradeable.sol:27"
3583+
},
3584+
{
3585+
"contract": "EIP712Upgradeable",
3586+
"label": "_HASHED_VERSION",
3587+
"type": "t_bytes32",
3588+
"src": "@openzeppelin/contracts-upgradeable/drafts/EIP712Upgradeable.sol:28"
3589+
},
3590+
{
3591+
"contract": "EIP712Upgradeable",
3592+
"label": "__gap",
3593+
"type": "t_array(t_uint256)50_storage",
3594+
"src": "@openzeppelin/contracts-upgradeable/drafts/EIP712Upgradeable.sol:120"
3595+
},
3596+
{
3597+
"contract": "ERC20PermitUpgradeable",
3598+
"label": "_nonces",
3599+
"type": "t_mapping(t_address,t_struct(Counter)1781_storage)",
3600+
"src": "contracts/tokens/ERC20PermitUpgradeable.sol:26"
3601+
},
3602+
{
3603+
"contract": "ERC20PermitUpgradeable",
3604+
"label": "_PERMIT_TYPEHASH",
3605+
"type": "t_bytes32",
3606+
"src": "contracts/tokens/ERC20PermitUpgradeable.sol:29"
3607+
},
3608+
{
3609+
"contract": "ERC20PermitUpgradeable",
3610+
"label": "__gap",
3611+
"type": "t_array(t_uint256)49_storage",
3612+
"src": "contracts/tokens/ERC20PermitUpgradeable.sol:88"
3613+
},
3614+
{
3615+
"contract": "RewardEthToken",
3616+
"label": "stakedEthToken",
3617+
"type": "t_contract(IStakedEthToken)6737",
3618+
"src": "contracts/tokens/RewardEthToken.sol:26"
3619+
},
3620+
{
3621+
"contract": "RewardEthToken",
3622+
"label": "oracles",
3623+
"type": "t_address",
3624+
"src": "contracts/tokens/RewardEthToken.sol:29"
3625+
},
3626+
{
3627+
"contract": "RewardEthToken",
3628+
"label": "checkpoints",
3629+
"type": "t_mapping(t_address,t_struct(Checkpoint)6501_storage)",
3630+
"src": "contracts/tokens/RewardEthToken.sol:32"
3631+
},
3632+
{
3633+
"contract": "RewardEthToken",
3634+
"label": "protocolFeeRecipient",
3635+
"type": "t_address",
3636+
"src": "contracts/tokens/RewardEthToken.sol:35"
3637+
},
3638+
{
3639+
"contract": "RewardEthToken",
3640+
"label": "protocolFee",
3641+
"type": "t_uint256",
3642+
"src": "contracts/tokens/RewardEthToken.sol:38"
3643+
},
3644+
{
3645+
"contract": "RewardEthToken",
3646+
"label": "totalRewards",
3647+
"type": "t_uint128",
3648+
"src": "contracts/tokens/RewardEthToken.sol:41"
3649+
},
3650+
{
3651+
"contract": "RewardEthToken",
3652+
"label": "rewardPerToken",
3653+
"type": "t_uint128",
3654+
"src": "contracts/tokens/RewardEthToken.sol:44"
3655+
},
3656+
{
3657+
"contract": "RewardEthToken",
3658+
"label": "lastUpdateBlockNumber",
3659+
"type": "t_uint256",
3660+
"src": "contracts/tokens/RewardEthToken.sol:47"
3661+
},
3662+
{
3663+
"contract": "RewardEthToken",
3664+
"label": "merkleDistributor",
3665+
"type": "t_address",
3666+
"src": "contracts/tokens/RewardEthToken.sol:50"
3667+
},
3668+
{
3669+
"contract": "RewardEthToken",
3670+
"label": "rewardsDisabled",
3671+
"type": "t_mapping(t_address,t_bool)",
3672+
"src": "contracts/tokens/RewardEthToken.sol:53"
3673+
},
3674+
{
3675+
"contract": "RewardEthToken",
3676+
"label": "feesEscrow",
3677+
"type": "t_contract(IFeesEscrow)5710",
3678+
"src": "contracts/tokens/RewardEthToken.sol:56"
3679+
}
3680+
],
3681+
"types": {
3682+
"t_contract(IStakedEthToken)6737": {
3683+
"label": "contract IStakedEthToken"
3684+
},
3685+
"t_address": {
3686+
"label": "address"
3687+
},
3688+
"t_mapping(t_address,t_struct(Checkpoint)6501_storage)": {
3689+
"label": "mapping(address => struct IRewardEthToken.Checkpoint)"
3690+
},
3691+
"t_struct(Checkpoint)6501_storage": {
3692+
"label": "struct IRewardEthToken.Checkpoint",
3693+
"members": [
3694+
{
3695+
"label": "reward",
3696+
"type": "t_uint128"
3697+
},
3698+
{
3699+
"label": "rewardPerToken",
3700+
"type": "t_uint128"
3701+
}
3702+
]
3703+
},
3704+
"t_uint128": {
3705+
"label": "uint128"
3706+
},
3707+
"t_uint256": {
3708+
"label": "uint256"
3709+
},
3710+
"t_mapping(t_address,t_bool)": {
3711+
"label": "mapping(address => bool)"
3712+
},
3713+
"t_bool": {
3714+
"label": "bool"
3715+
},
3716+
"t_contract(IFeesEscrow)5710": {
3717+
"label": "contract IFeesEscrow"
3718+
},
3719+
"t_mapping(t_address,t_struct(Counter)1781_storage)": {
3720+
"label": "mapping(address => struct CountersUpgradeable.Counter)"
3721+
},
3722+
"t_struct(Counter)1781_storage": {
3723+
"label": "struct CountersUpgradeable.Counter",
3724+
"members": [
3725+
{
3726+
"label": "_value",
3727+
"type": "t_uint256"
3728+
}
3729+
]
3730+
},
3731+
"t_bytes32": {
3732+
"label": "bytes32"
3733+
},
3734+
"t_array(t_uint256)49_storage": {
3735+
"label": "uint256[49]"
3736+
},
3737+
"t_array(t_uint256)50_storage": {
3738+
"label": "uint256[50]"
3739+
},
3740+
"t_mapping(t_address,t_mapping(t_address,t_uint256))": {
3741+
"label": "mapping(address => mapping(address => uint256))"
3742+
},
3743+
"t_mapping(t_address,t_uint256)": {
3744+
"label": "mapping(address => uint256)"
3745+
},
3746+
"t_string_storage": {
3747+
"label": "string"
3748+
},
3749+
"t_uint8": {
3750+
"label": "uint8"
3751+
},
3752+
"t_array(t_uint256)44_storage": {
3753+
"label": "uint256[44]"
3754+
},
3755+
"t_mapping(t_bytes32,t_struct(RoleData)39_storage)": {
3756+
"label": "mapping(bytes32 => struct AccessControlUpgradeable.RoleData)"
3757+
},
3758+
"t_struct(RoleData)39_storage": {
3759+
"label": "struct AccessControlUpgradeable.RoleData",
3760+
"members": [
3761+
{
3762+
"label": "members",
3763+
"type": "t_struct(AddressSet)2097_storage"
3764+
},
3765+
{
3766+
"label": "adminRole",
3767+
"type": "t_bytes32"
3768+
}
3769+
]
3770+
},
3771+
"t_struct(AddressSet)2097_storage": {
3772+
"label": "struct EnumerableSetUpgradeable.AddressSet",
3773+
"members": [
3774+
{
3775+
"label": "_inner",
3776+
"type": "t_struct(Set)1832_storage"
3777+
}
3778+
]
3779+
},
3780+
"t_struct(Set)1832_storage": {
3781+
"label": "struct EnumerableSetUpgradeable.Set",
3782+
"members": [
3783+
{
3784+
"label": "_values",
3785+
"type": "t_array(t_bytes32)dyn_storage"
3786+
},
3787+
{
3788+
"label": "_indexes",
3789+
"type": "t_mapping(t_bytes32,t_uint256)"
3790+
}
3791+
]
3792+
},
3793+
"t_array(t_bytes32)dyn_storage": {
3794+
"label": "bytes32[]"
3795+
},
3796+
"t_mapping(t_bytes32,t_uint256)": {
3797+
"label": "mapping(bytes32 => uint256)"
3798+
}
3799+
}
3800+
}
35003801
}
35013802
}
35023803
}

0 commit comments

Comments
 (0)