Skip to content

Commit

Permalink
Merge branch 'master' into release/1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@RCantu92
RCantu92 committed Dec 12, 2023
2 parents 7dcbefd + 3211fd3 commit a4a1186
Show file tree
Hide file tree
Showing 14 changed files with 689 additions and 35 deletions.
218 changes: 190 additions & 28 deletions .openzeppelin/polygon-mumbai.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25728,9 +25728,9 @@
}
}
},
"e4e39d4f48179890554261f8695a180ab6bf44e0ee08c631ce089716ebd9dc1d": {
"address": "0xf395Ee3EBe608e5f2E7F074433ce8D9ff5357EFb",
"txHash": "0x308ed38a9cabe0de9391e114b2a88e26db6cf1e24e52940fe4adb95159f486a9",
"ee056803b5a4e87acdb3b4a55599aa7a202ed955d094e623f22b477059d0bb27": {
"address": "0xaFd709C47646aDf5A098532b50880077465F3235",
"txHash": "0x025bc1a95a93f618e61562475e2577b05f1e5c0a2506e01b907323d0efe6c3e8",
"layout": {
"solcVersion": "0.8.9",
"storage": [
Expand Down Expand Up @@ -25763,7 +25763,7 @@
"label": "_accessControl",
"offset": 0,
"slot": "51",
"type": "t_contract(IAccessControl)9925",
"type": "t_contract(IAccessControl)15000",
"contract": "AccessManagedUpgradeable",
"src": "contracts/components/utils/AccessManaged.sol:16"
},
Expand Down Expand Up @@ -25818,35 +25818,83 @@
"src": "contracts/components/BaseComponentUpgradeable.sol:62"
},
{
"label": "_accountThreatProperties",
"label": "unclaimedRewards",
"offset": 0,
"slot": "301",
"type": "t_mapping(t_address,t_struct(ThreatProperties)28986_storage)",
"contract": "ThreatOracleCore",
"src": "contracts/components/threat_oracle/ThreatOracleCore.sol:19"
"type": "t_uint256",
"contract": "RewardsDistributor",
"src": "contracts/components/staking/rewards/RewardsDistributor.sol:36"
},
{
"label": "__gap",
"label": "_rewardsAccumulators",
"offset": 0,
"slot": "302",
"type": "t_array(t_uint256)49_storage",
"contract": "ThreatOracleCore",
"src": "contracts/components/threat_oracle/ThreatOracleCore.sol:106"
"type": "t_mapping(t_uint256,t_struct(DelegatedAccRewards)128442_storage)",
"contract": "RewardsDistributor",
"src": "contracts/components/staking/rewards/RewardsDistributor.sol:38"
},
{
"label": "__gap",
"label": "rewardsPerEpoch",
"offset": 0,
"slot": "351",
"type": "t_array(t_uint256)50_storage",
"contract": "ThreatOracle",
"src": "contracts/components/threat_oracle/ThreatOracle.sol:31"
"slot": "303",
"type": "t_mapping(t_uint256,t_mapping(t_uint256,t_uint256))",
"contract": "RewardsDistributor",
"src": "contracts/components/staking/rewards/RewardsDistributor.sol:40"
},
{
"label": "rewardedEpochs",
"offset": 0,
"slot": "304",
"type": "t_mapping(t_uint256,t_mapping(t_uint256,t_bool))",
"contract": "RewardsDistributor",
"src": "contracts/components/staking/rewards/RewardsDistributor.sol:42"
},
{
"label": "claimedRewardsPerEpoch",
"offset": 0,
"slot": "305",
"type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_bool)))",
"contract": "RewardsDistributor",
"src": "contracts/components/staking/rewards/RewardsDistributor.sol:44"
},
{
"label": "delegationFees",
"offset": 0,
"slot": "306",
"type": "t_mapping(t_uint256,t_array(t_struct(DelegationFee)128474_storage)2_storage)",
"contract": "RewardsDistributor",
"src": "contracts/components/staking/rewards/RewardsDistributor.sol:51"
},
{
"label": "delegationParamsEpochDelay",
"offset": 0,
"slot": "307",
"type": "t_uint256",
"contract": "RewardsDistributor",
"src": "contracts/components/staking/rewards/RewardsDistributor.sol:53"
},
{
"label": "defaultFeeBps",
"offset": 0,
"slot": "308",
"type": "t_uint256",
"contract": "RewardsDistributor",
"src": "contracts/components/staking/rewards/RewardsDistributor.sol:54"
}
],
"types": {
"t_address": {
"label": "address",
"numberOfBytes": "20"
},
"t_array(t_struct(DelegationFee)128474_storage)2_storage": {
"label": "struct RewardsDistributor.DelegationFee[2]",
"numberOfBytes": "64"
},
"t_array(t_struct(EpochCheckpoint)127855_storage)dyn_storage": {
"label": "struct Accumulators.EpochCheckpoint[]",
"numberOfBytes": "32"
},
"t_array(t_uint256)49_storage": {
"label": "uint256[49]",
"numberOfBytes": "1568"
Expand All @@ -25859,40 +25907,154 @@
"label": "bool",
"numberOfBytes": "1"
},
"t_contract(IAccessControl)9925": {
"t_contract(IAccessControl)15000": {
"label": "contract IAccessControl",
"numberOfBytes": "20"
},
"t_mapping(t_address,t_struct(ThreatProperties)28986_storage)": {
"label": "mapping(address => struct ThreatOracleCore.ThreatProperties)",
"t_mapping(t_address,t_bool)": {
"label": "mapping(address => bool)",
"numberOfBytes": "32"
},
"t_string_storage": {
"label": "string",
"t_mapping(t_address,t_struct(Accumulator)127860_storage)": {
"label": "mapping(address => struct Accumulators.Accumulator)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_array(t_struct(DelegationFee)128474_storage)2_storage)": {
"label": "mapping(uint256 => struct RewardsDistributor.DelegationFee[2])",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_bool)": {
"label": "mapping(uint256 => bool)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_mapping(t_address,t_bool))": {
"label": "mapping(uint256 => mapping(address => bool))",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_mapping(t_uint256,t_bool))": {
"label": "mapping(uint256 => mapping(uint256 => bool))",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_bool)))": {
"label": "mapping(uint256 => mapping(uint256 => mapping(address => bool)))",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_mapping(t_uint256,t_uint256))": {
"label": "mapping(uint256 => mapping(uint256 => uint256))",
"numberOfBytes": "32"
},
"t_struct(ThreatProperties)28986_storage": {
"label": "struct ThreatOracleCore.ThreatProperties",
"t_mapping(t_uint256,t_struct(DelegatedAccRewards)128442_storage)": {
"label": "mapping(uint256 => struct RewardsDistributor.DelegatedAccRewards)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_uint256)": {
"label": "mapping(uint256 => uint256)",
"numberOfBytes": "32"
},
"t_struct(Accumulator)127860_storage": {
"label": "struct Accumulators.Accumulator",
"members": [
{
"label": "category",
"type": "t_string_storage",
"label": "checkpoints",
"type": "t_array(t_struct(EpochCheckpoint)127855_storage)dyn_storage",
"offset": 0,
"slot": "0"
}
],
"numberOfBytes": "32"
},
"t_struct(DelegatedAccRewards)128442_storage": {
"label": "struct RewardsDistributor.DelegatedAccRewards",
"members": [
{
"label": "delegated",
"type": "t_struct(Accumulator)127860_storage",
"offset": 0,
"slot": "0"
},
{
"label": "confidenceScore",
"type": "t_uint8",
"label": "delegators",
"type": "t_struct(Accumulator)127860_storage",
"offset": 0,
"slot": "1"
},
{
"label": "delegatorsTotal",
"type": "t_struct(Accumulator)127860_storage",
"offset": 0,
"slot": "2"
},
{
"label": "delegatorsPortions",
"type": "t_mapping(t_address,t_struct(Accumulator)127860_storage)",
"offset": 0,
"slot": "3"
}
],
"numberOfBytes": "128"
},
"t_struct(DelegationFee)128474_storage": {
"label": "struct RewardsDistributor.DelegationFee",
"members": [
{
"label": "feeBps",
"type": "t_uint16",
"offset": 0,
"slot": "0"
},
{
"label": "sinceEpoch",
"type": "t_uint240",
"offset": 2,
"slot": "0"
}
],
"numberOfBytes": "32"
},
"t_struct(EpochCheckpoint)127855_storage": {
"label": "struct Accumulators.EpochCheckpoint",
"members": [
{
"label": "timestamp",
"type": "t_uint32",
"offset": 0,
"slot": "0"
},
{
"label": "rate",
"type": "t_uint224",
"offset": 4,
"slot": "0"
},
{
"label": "value",
"type": "t_uint256",
"offset": 0,
"slot": "1"
}
],
"numberOfBytes": "64"
},
"t_uint16": {
"label": "uint16",
"numberOfBytes": "2"
},
"t_uint224": {
"label": "uint224",
"numberOfBytes": "28"
},
"t_uint240": {
"label": "uint240",
"numberOfBytes": "30"
},
"t_uint256": {
"label": "uint256",
"numberOfBytes": "32"
},
"t_uint32": {
"label": "uint32",
"numberOfBytes": "4"
},
"t_uint8": {
"label": "uint8",
"numberOfBytes": "1"
Expand Down
Loading

0 comments on commit a4a1186

Please sign in to comment.