From cf7abee0ec4dd2440a3a534ed4ccaec69a373afe Mon Sep 17 00:00:00 2001 From: Alex Rea Date: Wed, 28 Aug 2024 12:32:48 +0100 Subject: [PATCH] Update storage-layouts for proxy contracts --- .../bridging/ProxyColony.sol:ProxyColony.json | 79 +++++ ...yColonyNetwork.sol:ProxyColonyNetwork.json | 91 +++++ .../contracts/colony/Colony.sol:Colony.json | 115 ++++++- ...action.sol:ColonyArbitraryTransaction.json | 115 ++++++- .../ColonyDomains.sol:ColonyDomains.json | 115 ++++++- ...lonyExpenditure.sol:ColonyExpenditure.json | 115 ++++++- .../ColonyFunding.sol:ColonyFunding.json | 115 ++++++- .../ColonyRewards.sol:ColonyRewards.json | 115 ++++++- .../colony/ColonyRoles.sol:ColonyRoles.json | 115 ++++++- .../ColonyStorage.sol:ColonyStorage.json | 115 ++++++- ...ony.sol:FunctionsNotAvailableOnColony.json | 115 ++++++- ...LimitSubdomains.sol:NoLimitSubdomains.json | 115 ++++++- .../bridging/ProxyColony.sol:ProxyColony.json | 68 ++++ ...yColonyNetwork.sol:ProxyColonyNetwork.json | 89 +++++ ...ForColony.sol:WormholeBridgeForColony.json | 20 +- .../contracts/colony/Colony.sol:Colony.json | 313 ++++++++++-------- ...action.sol:ColonyArbitraryTransaction.json | 313 ++++++++++-------- .../ColonyAuthority.sol:ColonyAuthority.json | 20 +- .../ColonyDomains.sol:ColonyDomains.json | 313 ++++++++++-------- ...lonyExpenditure.sol:ColonyExpenditure.json | 313 ++++++++++-------- .../ColonyFunding.sol:ColonyFunding.json | 313 ++++++++++-------- .../ColonyRewards.sol:ColonyRewards.json | 313 ++++++++++-------- .../colony/ColonyRoles.sol:ColonyRoles.json | 313 ++++++++++-------- .../ColonyStorage.sol:ColonyStorage.json | 313 ++++++++++-------- .../ColonyNetwork.sol:ColonyNetwork.json | 202 +++++------ ...tworkAuction.sol:ColonyNetworkAuction.json | 202 +++++------ ...kAuthority.sol:ColonyNetworkAuthority.json | 18 +- ...orkDeployer.sol:ColonyNetworkDeployer.json | 202 +++++------ ...ColonyNetworkENS.sol:ColonyNetworkENS.json | 202 +++++------ ...xtensions.sol:ColonyNetworkExtensions.json | 202 +++++------ ...NetworkMining.sol:ColonyNetworkMining.json | 202 +++++------ ...NetworkSkills.sol:ColonyNetworkSkills.json | 202 +++++------ ...tworkStorage.sol:ColonyNetworkStorage.json | 202 +++++------ .../CommonAuthority.sol:CommonAuthority.json | 18 +- .../CommonStorage.sol:CommonStorage.json | 20 +- ...ContractRecovery.sol:ContractRecovery.json | 20 +- .../common/DomainRoles.sol:DomainRoles.json | 18 +- .../common/EtherRouter.sol:EtherRouter.json | 14 +- ...rRouterCreate3.sol:EtherRouterCreate3.json | 14 +- .../common/Resolver.sol:Resolver.json | 10 +- .../ens/ENSRegistry.sol:ENSRegistry.json | 16 +- .../CoinMachine.sol:CoinMachine.json | 56 ++-- .../ColonyExtension.sol:ColonyExtension.json | 18 +- ...ExtensionMeta.sol:ColonyExtensionMeta.json | 84 ++--- ...dExpenditure.sol:EvaluatedExpenditure.json | 20 +- .../FundingQueue.sol:FundingQueue.json | 80 ++--- .../OneTxPayment.sol:OneTxPayment.json | 20 +- ...otstrapper.sol:ReputationBootstrapper.json | 114 +++---- ...agedExpenditure.sol:StagedExpenditure.json | 86 ++--- ...akedExpenditure.sol:StakedExpenditure.json | 100 +++--- ...reamingPayments.sol:StreamingPayments.json | 114 +++---- .../TokenSupplier.sol:TokenSupplier.json | 30 +- .../extensions/Whitelist.sol:Whitelist.json | 28 +- ...VotingReputation.sol:VotingReputation.json | 112 +++---- ...ol:VotingReputationMisalignedRecovery.json | 106 +++--- ...onStaking.sol:VotingReputationStaking.json | 112 +++---- ...onStorage.sol:VotingReputationStorage.json | 112 +++---- .../DSAuthMeta.sol:DSAuthMeta.json | 8 +- .../MetaTxToken.sol:MetaTxToken.json | 22 +- .../PatriciaTree.sol:PatriciaTree.json | 44 +-- ...PatriciaTreeBase.sol:PatriciaTreeBase.json | 44 +-- ...iciaTreeNoHash.sol:PatriciaTreeNoHash.json | 44 +-- ...MiningCycle.sol:ReputationMiningCycle.json | 112 +++---- ...sol:ReputationMiningCycleBinarySearch.json | 112 +++---- ...ommon.sol:ReputationMiningCycleCommon.json | 112 +++---- ...pond.sol:ReputationMiningCycleRespond.json | 112 +++---- ...rage.sol:ReputationMiningCycleStorage.json | 112 +++---- ...ony.sol:FunctionsNotAvailableOnColony.json | 313 ++++++++++-------- .../GasGuzzler.sol:GasGuzzler.json | 86 ++--- ...LimitSubdomains.sol:NoLimitSubdomains.json | 313 ++++++++++-------- ...ligned.sol:VotingReputationMisaligned.json | 104 +++--- .../TestExtension0.sol:TestExtension0.json | 84 ++--- .../TestExtension1.sol:TestExtension1.json | 84 ++--- .../TestExtension2.sol:TestExtension2.json | 84 ++--- .../TestExtension3.sol:TestExtension3.json | 84 ++--- .../TestVotingToken.sol:TestVotingToken.json | 84 ++--- .../TokenLocking.sol:TokenLocking.json | 46 +-- ...ockingStorage.sol:TokenLockingStorage.json | 46 +-- 78 files changed, 5397 insertions(+), 3630 deletions(-) create mode 100644 .storage-layouts-normalized/contracts/bridging/ProxyColony.sol:ProxyColony.json create mode 100644 .storage-layouts-normalized/contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork.json create mode 100644 .storage-layouts/contracts/bridging/ProxyColony.sol:ProxyColony.json create mode 100644 .storage-layouts/contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork.json diff --git a/.storage-layouts-normalized/contracts/bridging/ProxyColony.sol:ProxyColony.json b/.storage-layouts-normalized/contracts/bridging/ProxyColony.sol:ProxyColony.json new file mode 100644 index 0000000000..f020621b32 --- /dev/null +++ b/.storage-layouts-normalized/contracts/bridging/ProxyColony.sol:ProxyColony.json @@ -0,0 +1,79 @@ +{ + "storage": [ + { + "contract": "contracts/bridging/ProxyColony.sol:ProxyColony", + "label": "authority", + "offset": 0, + "slot": "0", + "type": { + "encoding": "inplace", + "label": "contract DSAuthority", + "numberOfBytes": "20" + } + }, + { + "contract": "contracts/bridging/ProxyColony.sol:ProxyColony", + "label": "owner", + "offset": 0, + "slot": "1", + "type": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + } + }, + { + "contract": "contracts/bridging/ProxyColony.sol:ProxyColony", + "label": "resolver", + "offset": 0, + "slot": "2", + "type": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + } + }, + { + "contract": "contracts/bridging/ProxyColony.sol:ProxyColony", + "label": "metatransactionNonces", + "offset": 0, + "slot": "3", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + }, + { + "contract": "contracts/bridging/ProxyColony.sol:ProxyColony", + "label": "tokenBalances", + "offset": 0, + "slot": "4", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + ] +} \ No newline at end of file diff --git a/.storage-layouts-normalized/contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork.json b/.storage-layouts-normalized/contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork.json new file mode 100644 index 0000000000..176e709fd0 --- /dev/null +++ b/.storage-layouts-normalized/contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork.json @@ -0,0 +1,91 @@ +{ + "storage": [ + { + "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork", + "label": "authority", + "offset": 0, + "slot": "0", + "type": { + "encoding": "inplace", + "label": "contract DSAuthority", + "numberOfBytes": "20" + } + }, + { + "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork", + "label": "owner", + "offset": 0, + "slot": "1", + "type": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + } + }, + { + "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork", + "label": "resolver", + "offset": 0, + "slot": "2", + "type": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + } + }, + { + "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork", + "label": "colonyBridgeAddress", + "offset": 0, + "slot": "3", + "type": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + } + }, + { + "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork", + "label": "homeChainId", + "offset": 0, + "slot": "4", + "type": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + }, + { + "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork", + "label": "proxyColonyResolverAddress", + "offset": 0, + "slot": "5", + "type": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + } + }, + { + "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork", + "label": "shellColonies", + "offset": 0, + "slot": "6", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => bool)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "bool", + "numberOfBytes": "1" + } + } + } + ] +} \ No newline at end of file diff --git a/.storage-layouts-normalized/contracts/colony/Colony.sol:Colony.json b/.storage-layouts-normalized/contracts/colony/Colony.sol:Colony.json index 48766fa83c..775738037b 100644 --- a/.storage-layouts-normalized/contracts/colony/Colony.sol:Colony.json +++ b/.storage-layouts-normalized/contracts/colony/Colony.sol:Colony.json @@ -506,9 +506,71 @@ "label": "uint256", "numberOfBytes": "32" } + }, + { + "contract": "contracts/colony/Colony.sol:Colony", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + }, + { + "contract": "contracts/colony/Colony.sol:Colony", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } } ], - "numberOfBytes": "160" + "numberOfBytes": "224" } } }, @@ -1353,6 +1415,57 @@ "numberOfBytes": "1" } } + }, + { + "contract": "contracts/colony/Colony.sol:Colony", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(address => uint256)))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + } + } } ] } \ No newline at end of file diff --git a/.storage-layouts-normalized/contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction.json b/.storage-layouts-normalized/contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction.json index cecaf0fb53..188c4f480a 100644 --- a/.storage-layouts-normalized/contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction.json +++ b/.storage-layouts-normalized/contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction.json @@ -506,9 +506,71 @@ "label": "uint256", "numberOfBytes": "32" } + }, + { + "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + }, + { + "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } } ], - "numberOfBytes": "160" + "numberOfBytes": "224" } } }, @@ -1353,6 +1415,57 @@ "numberOfBytes": "1" } } + }, + { + "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(address => uint256)))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + } + } } ] } \ No newline at end of file diff --git a/.storage-layouts-normalized/contracts/colony/ColonyDomains.sol:ColonyDomains.json b/.storage-layouts-normalized/contracts/colony/ColonyDomains.sol:ColonyDomains.json index b4810fb556..3b857e16e7 100644 --- a/.storage-layouts-normalized/contracts/colony/ColonyDomains.sol:ColonyDomains.json +++ b/.storage-layouts-normalized/contracts/colony/ColonyDomains.sol:ColonyDomains.json @@ -506,9 +506,71 @@ "label": "uint256", "numberOfBytes": "32" } + }, + { + "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + }, + { + "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } } ], - "numberOfBytes": "160" + "numberOfBytes": "224" } } }, @@ -1353,6 +1415,57 @@ "numberOfBytes": "1" } } + }, + { + "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(address => uint256)))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + } + } } ] } \ No newline at end of file diff --git a/.storage-layouts-normalized/contracts/colony/ColonyExpenditure.sol:ColonyExpenditure.json b/.storage-layouts-normalized/contracts/colony/ColonyExpenditure.sol:ColonyExpenditure.json index e67c83a8db..18ca6c4db2 100644 --- a/.storage-layouts-normalized/contracts/colony/ColonyExpenditure.sol:ColonyExpenditure.json +++ b/.storage-layouts-normalized/contracts/colony/ColonyExpenditure.sol:ColonyExpenditure.json @@ -506,9 +506,71 @@ "label": "uint256", "numberOfBytes": "32" } + }, + { + "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + }, + { + "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } } ], - "numberOfBytes": "160" + "numberOfBytes": "224" } } }, @@ -1353,6 +1415,57 @@ "numberOfBytes": "1" } } + }, + { + "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(address => uint256)))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + } + } } ] } \ No newline at end of file diff --git a/.storage-layouts-normalized/contracts/colony/ColonyFunding.sol:ColonyFunding.json b/.storage-layouts-normalized/contracts/colony/ColonyFunding.sol:ColonyFunding.json index 0124a6e3d4..d36cb7ef92 100644 --- a/.storage-layouts-normalized/contracts/colony/ColonyFunding.sol:ColonyFunding.json +++ b/.storage-layouts-normalized/contracts/colony/ColonyFunding.sol:ColonyFunding.json @@ -506,9 +506,71 @@ "label": "uint256", "numberOfBytes": "32" } + }, + { + "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + }, + { + "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } } ], - "numberOfBytes": "160" + "numberOfBytes": "224" } } }, @@ -1353,6 +1415,57 @@ "numberOfBytes": "1" } } + }, + { + "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(address => uint256)))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + } + } } ] } \ No newline at end of file diff --git a/.storage-layouts-normalized/contracts/colony/ColonyRewards.sol:ColonyRewards.json b/.storage-layouts-normalized/contracts/colony/ColonyRewards.sol:ColonyRewards.json index 8ea84d7908..c6da1d58ab 100644 --- a/.storage-layouts-normalized/contracts/colony/ColonyRewards.sol:ColonyRewards.json +++ b/.storage-layouts-normalized/contracts/colony/ColonyRewards.sol:ColonyRewards.json @@ -506,9 +506,71 @@ "label": "uint256", "numberOfBytes": "32" } + }, + { + "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + }, + { + "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } } ], - "numberOfBytes": "160" + "numberOfBytes": "224" } } }, @@ -1353,6 +1415,57 @@ "numberOfBytes": "1" } } + }, + { + "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(address => uint256)))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + } + } } ] } \ No newline at end of file diff --git a/.storage-layouts-normalized/contracts/colony/ColonyRoles.sol:ColonyRoles.json b/.storage-layouts-normalized/contracts/colony/ColonyRoles.sol:ColonyRoles.json index 5aa0104c12..db99c1015a 100644 --- a/.storage-layouts-normalized/contracts/colony/ColonyRoles.sol:ColonyRoles.json +++ b/.storage-layouts-normalized/contracts/colony/ColonyRoles.sol:ColonyRoles.json @@ -506,9 +506,71 @@ "label": "uint256", "numberOfBytes": "32" } + }, + { + "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + }, + { + "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } } ], - "numberOfBytes": "160" + "numberOfBytes": "224" } } }, @@ -1353,6 +1415,57 @@ "numberOfBytes": "1" } } + }, + { + "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(address => uint256)))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + } + } } ] } \ No newline at end of file diff --git a/.storage-layouts-normalized/contracts/colony/ColonyStorage.sol:ColonyStorage.json b/.storage-layouts-normalized/contracts/colony/ColonyStorage.sol:ColonyStorage.json index 2fad267b5a..cadaf6e13c 100644 --- a/.storage-layouts-normalized/contracts/colony/ColonyStorage.sol:ColonyStorage.json +++ b/.storage-layouts-normalized/contracts/colony/ColonyStorage.sol:ColonyStorage.json @@ -506,9 +506,71 @@ "label": "uint256", "numberOfBytes": "32" } + }, + { + "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + }, + { + "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } } ], - "numberOfBytes": "160" + "numberOfBytes": "224" } } }, @@ -1353,6 +1415,57 @@ "numberOfBytes": "1" } } + }, + { + "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(address => uint256)))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + } + } } ] } \ No newline at end of file diff --git a/.storage-layouts-normalized/contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony.json b/.storage-layouts-normalized/contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony.json index c9857d8439..17fe922fbd 100644 --- a/.storage-layouts-normalized/contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony.json +++ b/.storage-layouts-normalized/contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony.json @@ -506,9 +506,71 @@ "label": "uint256", "numberOfBytes": "32" } + }, + { + "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + }, + { + "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } } ], - "numberOfBytes": "160" + "numberOfBytes": "224" } } }, @@ -1353,6 +1415,57 @@ "numberOfBytes": "1" } } + }, + { + "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(address => uint256)))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + } + } } ] } \ No newline at end of file diff --git a/.storage-layouts-normalized/contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains.json b/.storage-layouts-normalized/contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains.json index a5d491b66e..bacc3ff6a5 100644 --- a/.storage-layouts-normalized/contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains.json +++ b/.storage-layouts-normalized/contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains.json @@ -506,9 +506,71 @@ "label": "uint256", "numberOfBytes": "32" } + }, + { + "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + }, + { + "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } } ], - "numberOfBytes": "160" + "numberOfBytes": "224" } } }, @@ -1353,6 +1415,57 @@ "numberOfBytes": "1" } } + }, + { + "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(uint256 => mapping(address => uint256)))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + }, + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32", + "value": { + "encoding": "mapping", + "key": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } + } + } + } } ] } \ No newline at end of file diff --git a/.storage-layouts/contracts/bridging/ProxyColony.sol:ProxyColony.json b/.storage-layouts/contracts/bridging/ProxyColony.sol:ProxyColony.json new file mode 100644 index 0000000000..d74dbd1c98 --- /dev/null +++ b/.storage-layouts/contracts/bridging/ProxyColony.sol:ProxyColony.json @@ -0,0 +1,68 @@ +{ + "storage": [ + { + "astId": 50475, + "contract": "contracts/bridging/ProxyColony.sol:ProxyColony", + "label": "authority", + "offset": 0, + "slot": "0", + "type": "t_contract(DSAuthority)50461" + }, + { + "astId": 50477, + "contract": "contracts/bridging/ProxyColony.sol:ProxyColony", + "label": "owner", + "offset": 0, + "slot": "1", + "type": "t_address" + }, + { + "astId": 2590, + "contract": "contracts/bridging/ProxyColony.sol:ProxyColony", + "label": "resolver", + "offset": 0, + "slot": "2", + "type": "t_address" + }, + { + "astId": 2594, + "contract": "contracts/bridging/ProxyColony.sol:ProxyColony", + "label": "metatransactionNonces", + "offset": 0, + "slot": "3", + "type": "t_mapping(t_address,t_uint256)" + }, + { + "astId": 2598, + "contract": "contracts/bridging/ProxyColony.sol:ProxyColony", + "label": "tokenBalances", + "offset": 0, + "slot": "4", + "type": "t_mapping(t_address,t_uint256)" + } + ], + "types": { + "t_address": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "t_contract(DSAuthority)50461": { + "encoding": "inplace", + "label": "contract DSAuthority", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_uint256)": { + "encoding": "mapping", + "key": "t_address", + "label": "mapping(address => uint256)", + "numberOfBytes": "32", + "value": "t_uint256" + }, + "t_uint256": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } +} diff --git a/.storage-layouts/contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork.json b/.storage-layouts/contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork.json new file mode 100644 index 0000000000..961d401525 --- /dev/null +++ b/.storage-layouts/contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork.json @@ -0,0 +1,89 @@ +{ + "storage": [ + { + "astId": 50475, + "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork", + "label": "authority", + "offset": 0, + "slot": "0", + "type": "t_contract(DSAuthority)50461" + }, + { + "astId": 50477, + "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork", + "label": "owner", + "offset": 0, + "slot": "1", + "type": "t_address" + }, + { + "astId": 2891, + "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork", + "label": "resolver", + "offset": 0, + "slot": "2", + "type": "t_address" + }, + { + "astId": 2896, + "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork", + "label": "colonyBridgeAddress", + "offset": 0, + "slot": "3", + "type": "t_address" + }, + { + "astId": 2898, + "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork", + "label": "homeChainId", + "offset": 0, + "slot": "4", + "type": "t_uint256" + }, + { + "astId": 2900, + "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork", + "label": "proxyColonyResolverAddress", + "offset": 0, + "slot": "5", + "type": "t_address" + }, + { + "astId": 2904, + "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork", + "label": "shellColonies", + "offset": 0, + "slot": "6", + "type": "t_mapping(t_address,t_bool)" + } + ], + "types": { + "t_address": { + "encoding": "inplace", + "label": "address", + "numberOfBytes": "20" + }, + "t_bool": { + "encoding": "inplace", + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(DSAuthority)50461": { + "encoding": "inplace", + "label": "contract DSAuthority", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_bool)": { + "encoding": "mapping", + "key": "t_address", + "label": "mapping(address => bool)", + "numberOfBytes": "32", + "value": "t_bool" + }, + "t_uint256": { + "encoding": "inplace", + "label": "uint256", + "numberOfBytes": "32" + } + } +} diff --git a/.storage-layouts/contracts/bridging/WormholeBridgeForColony.sol:WormholeBridgeForColony.json b/.storage-layouts/contracts/bridging/WormholeBridgeForColony.sol:WormholeBridgeForColony.json index 3e6fb88a62..2a5377daca 100644 --- a/.storage-layouts/contracts/bridging/WormholeBridgeForColony.sol:WormholeBridgeForColony.json +++ b/.storage-layouts/contracts/bridging/WormholeBridgeForColony.sol:WormholeBridgeForColony.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/bridging/WormholeBridgeForColony.sol:WormholeBridgeForColony", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/bridging/WormholeBridgeForColony.sol:WormholeBridgeForColony", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 2581, + "astId": 3103, "contract": "contracts/bridging/WormholeBridgeForColony.sol:WormholeBridgeForColony", "label": "colonyNetwork", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 2584, + "astId": 3106, "contract": "contracts/bridging/WormholeBridgeForColony.sol:WormholeBridgeForColony", "label": "wormhole", "offset": 0, "slot": "3", - "type": "t_contract(IWormhole)54533" + "type": "t_contract(IWormhole)54351" }, { - "astId": 2588, + "astId": 3110, "contract": "contracts/bridging/WormholeBridgeForColony.sol:WormholeBridgeForColony", "label": "colonyBridges", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 2592, + "astId": 3114, "contract": "contracts/bridging/WormholeBridgeForColony.sol:WormholeBridgeForColony", "label": "evmChainIdToWormholeChainId", "offset": 0, @@ -55,12 +55,12 @@ "label": "address", "numberOfBytes": "20" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IWormhole)54533": { + "t_contract(IWormhole)54351": { "encoding": "inplace", "label": "contract IWormhole", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/colony/Colony.sol:Colony.json b/.storage-layouts/contracts/colony/Colony.sol:Colony.json index f839404e4b..0a97bbd6c7 100644 --- a/.storage-layouts/contracts/colony/Colony.sol:Colony.json +++ b/.storage-layouts/contracts/colony/Colony.sol:Colony.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colony/Colony.sol:Colony", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colony/Colony.sol:Colony", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colony/Colony.sol:Colony", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colony/Colony.sol:Colony", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colony/Colony.sol:Colony", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colony/Colony.sol:Colony", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colony/Colony.sol:Colony", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colony/Colony.sol:Colony", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10724, + "astId": 11718, "contract": "contracts/colony/Colony.sol:Colony", "label": "colonyNetworkAddress", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_address" }, { - "astId": 10726, + "astId": 11720, "contract": "contracts/colony/Colony.sol:Colony", "label": "token", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_address" }, { - "astId": 10728, + "astId": 11722, "contract": "contracts/colony/Colony.sol:Colony", "label": "rewardInverse", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 10730, + "astId": 11724, "contract": "contracts/colony/Colony.sol:Colony", "label": "DEPRECATED_taskCount", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 10732, + "astId": 11726, "contract": "contracts/colony/Colony.sol:Colony", "label": "fundingPotCount", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 10734, + "astId": 11728, "contract": "contracts/colony/Colony.sol:Colony", "label": "domainCount", "offset": 0, @@ -113,15 +113,15 @@ "type": "t_uint256" }, { - "astId": 10741, + "astId": 11735, "contract": "contracts/colony/Colony.sol:Colony", "label": "DEPRECATED_reviewers", "offset": 0, "slot": "12", - "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)" + "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)" }, { - "astId": 10745, + "astId": 11739, "contract": "contracts/colony/Colony.sol:Colony", "label": "DEPRECATED_roleAssignmentSigs", "offset": 0, @@ -129,31 +129,31 @@ "type": "t_mapping(t_bytes4,t_bool)" }, { - "astId": 10750, + "astId": 11744, "contract": "contracts/colony/Colony.sol:Colony", "label": "DEPRECATED_tasks", "offset": 0, "slot": "14", - "type": "t_mapping(t_uint256,t_struct(Task)6083_storage)" + "type": "t_mapping(t_uint256,t_struct(Task)6772_storage)" }, { - "astId": 10755, + "astId": 11749, "contract": "contracts/colony/Colony.sol:Colony", "label": "fundingPots", "offset": 0, "slot": "15", - "type": "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)" + "type": "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)" }, { - "astId": 10760, + "astId": 11754, "contract": "contracts/colony/Colony.sol:Colony", "label": "rewardPayoutCycles", "offset": 0, "slot": "16", - "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)" + "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)" }, { - "astId": 10764, + "astId": 11758, "contract": "contracts/colony/Colony.sol:Colony", "label": "pendingRewardPayments", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10768, + "astId": 11762, "contract": "contracts/colony/Colony.sol:Colony", "label": "nonRewardPotsTotal", "offset": 0, @@ -169,23 +169,23 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10773, + "astId": 11767, "contract": "contracts/colony/Colony.sol:Colony", "label": "DEPRECATED_taskWorkRatings", "offset": 0, "slot": "19", - "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)" + "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)" }, { - "astId": 10778, + "astId": 11772, "contract": "contracts/colony/Colony.sol:Colony", "label": "domains", "offset": 0, "slot": "20", - "type": "t_mapping(t_uint256,t_struct(Domain)5898_storage)" + "type": "t_mapping(t_uint256,t_struct(Domain)6579_storage)" }, { - "astId": 10782, + "astId": 11776, "contract": "contracts/colony/Colony.sol:Colony", "label": "DEPRECATED_taskChangeNonces", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 10784, + "astId": 11778, "contract": "contracts/colony/Colony.sol:Colony", "label": "DEPRECATED_paymentCount", "offset": 0, @@ -201,15 +201,15 @@ "type": "t_uint256" }, { - "astId": 10789, + "astId": 11783, "contract": "contracts/colony/Colony.sol:Colony", "label": "DEPRECATED_payments", "offset": 0, "slot": "23", - "type": "t_mapping(t_uint256,t_struct(Payment)6112_storage)" + "type": "t_mapping(t_uint256,t_struct(Payment)6801_storage)" }, { - "astId": 10791, + "astId": 11785, "contract": "contracts/colony/Colony.sol:Colony", "label": "expenditureCount", "offset": 0, @@ -217,23 +217,23 @@ "type": "t_uint256" }, { - "astId": 10796, + "astId": 11790, "contract": "contracts/colony/Colony.sol:Colony", "label": "expenditures", "offset": 0, "slot": "25", - "type": "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)" + "type": "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)" }, { - "astId": 10803, + "astId": 11797, "contract": "contracts/colony/Colony.sol:Colony", "label": "expenditureSlots", "offset": 0, "slot": "26", - "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))" + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))" }, { - "astId": 10811, + "astId": 11805, "contract": "contracts/colony/Colony.sol:Colony", "label": "expenditureSlotPayouts", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" }, { - "astId": 10819, + "astId": 11813, "contract": "contracts/colony/Colony.sol:Colony", "label": "approvals", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10827, + "astId": 11821, "contract": "contracts/colony/Colony.sol:Colony", "label": "obligations", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10829, + "astId": 11823, "contract": "contracts/colony/Colony.sol:Colony", "label": "tokenLockingAddress", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_address" }, { - "astId": 10835, + "astId": 11829, "contract": "contracts/colony/Colony.sol:Colony", "label": "tokenLocks", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 10841, + "astId": 11835, "contract": "contracts/colony/Colony.sol:Colony", "label": "tokenApprovals", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))" }, { - "astId": 10845, + "astId": 11839, "contract": "contracts/colony/Colony.sol:Colony", "label": "tokenApprovalTotals", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10847, + "astId": 11841, "contract": "contracts/colony/Colony.sol:Colony", "label": "defaultGlobalClaimDelay", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 10854, + "astId": 11848, "contract": "contracts/colony/Colony.sol:Colony", "label": "metatransactionNonces", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10856, + "astId": 11850, "contract": "contracts/colony/Colony.sol:Colony", "label": "rootLocalSkill", "offset": 0, @@ -313,12 +313,20 @@ "type": "t_uint256" }, { - "astId": 10860, + "astId": 11854, "contract": "contracts/colony/Colony.sol:Colony", "label": "localSkills", "offset": 0, "slot": "37", "type": "t_mapping(t_uint256,t_bool)" + }, + { + "astId": 11864, + "contract": "contracts/colony/Colony.sol:Colony", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))" } ], "types": { @@ -332,8 +340,8 @@ "label": "address payable", "numberOfBytes": "20" }, - "t_array(t_enum(TaskRole)6049)2_storage": { - "base": "t_enum(TaskRole)6049", + "t_array(t_enum(TaskRole)6738)2_storage": { + "base": "t_enum(TaskRole)6738", "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole[2]", "numberOfBytes": "32" @@ -359,32 +367,32 @@ "label": "bytes4", "numberOfBytes": "4" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_enum(ExpenditureStatus)5862": { + "t_enum(ExpenditureStatus)6531": { "encoding": "inplace", "label": "enum ColonyDataTypes.ExpenditureStatus", "numberOfBytes": "1" }, - "t_enum(FundingPotAssociatedType)5877": { + "t_enum(FundingPotAssociatedType)6546": { "encoding": "inplace", "label": "enum ColonyDataTypes.FundingPotAssociatedType", "numberOfBytes": "1" }, - "t_enum(TaskRatings)6045": { + "t_enum(TaskRatings)6734": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRatings", "numberOfBytes": "1" }, - "t_enum(TaskRole)6049": { + "t_enum(TaskRole)6738": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole", "numberOfBytes": "1" }, - "t_enum(TaskStatus)6053": { + "t_enum(TaskStatus)6742": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskStatus", "numberOfBytes": "1" @@ -429,12 +437,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)": { + "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)": { "encoding": "mapping", "key": "t_bytes4", "label": "mapping(bytes4 => enum ColonyDataTypes.TaskRole[2])", "numberOfBytes": "32", - "value": "t_array(t_enum(TaskRole)6049)2_storage" + "value": "t_array(t_enum(TaskRole)6738)2_storage" }, "t_mapping(t_bytes4,t_bool)": { "encoding": "mapping", @@ -464,68 +472,75 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, - "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))": { + "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))": { + "encoding": "mapping", + "key": "t_uint256", + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" + }, + "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)" + "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)" }, - "t_mapping(t_uint256,t_struct(Domain)5898_storage)": { + "t_mapping(t_uint256,t_struct(Domain)6579_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Domain)", "numberOfBytes": "32", - "value": "t_struct(Domain)5898_storage" + "value": "t_struct(Domain)6579_storage" }, - "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)": { + "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Expenditure)", "numberOfBytes": "32", - "value": "t_struct(Expenditure)5847_storage" + "value": "t_struct(Expenditure)6516_storage" }, - "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)": { + "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot)", "numberOfBytes": "32", - "value": "t_struct(ExpenditureSlot)5857_storage" + "value": "t_struct(ExpenditureSlot)6526_storage" }, - "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)": { + "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.FundingPot)", "numberOfBytes": "32", - "value": "t_struct(FundingPot)5893_storage" + "value": "t_struct(FundingPot)6574_storage" }, - "t_mapping(t_uint256,t_struct(Payment)6112_storage)": { + "t_mapping(t_uint256,t_struct(Payment)6801_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Payment)", "numberOfBytes": "32", - "value": "t_struct(Payment)6112_storage" + "value": "t_struct(Payment)6801_storage" }, - "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)": { + "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RatingSecrets)", "numberOfBytes": "32", - "value": "t_struct(RatingSecrets)6100_storage" + "value": "t_struct(RatingSecrets)6789_storage" }, - "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)": { + "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RewardPayoutCycle)", "numberOfBytes": "32", - "value": "t_struct(RewardPayoutCycle)5833_storage" + "value": "t_struct(RewardPayoutCycle)6502_storage" }, - "t_mapping(t_uint256,t_struct(Task)6083_storage)": { + "t_mapping(t_uint256,t_struct(Task)6772_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Task)", "numberOfBytes": "32", - "value": "t_struct(Task)6083_storage" + "value": "t_struct(Task)6772_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -548,19 +563,19 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_uint256)" }, - "t_mapping(t_uint8,t_struct(Role)6091_storage)": { + "t_mapping(t_uint8,t_struct(Role)6780_storage)": { "encoding": "mapping", "key": "t_uint8", "label": "mapping(uint8 => struct ColonyDataTypes.Role)", "numberOfBytes": "32", - "value": "t_struct(Role)6091_storage" + "value": "t_struct(Role)6780_storage" }, - "t_struct(Domain)5898_storage": { + "t_struct(Domain)6579_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Domain", "members": [ { - "astId": 5895, + "astId": 6576, "contract": "contracts/colony/Colony.sol:Colony", "label": "skillId", "offset": 0, @@ -568,7 +583,7 @@ "type": "t_uint256" }, { - "astId": 5897, + "astId": 6578, "contract": "contracts/colony/Colony.sol:Colony", "label": "fundingPotId", "offset": 0, @@ -578,20 +593,20 @@ ], "numberOfBytes": "64" }, - "t_struct(Expenditure)5847_storage": { + "t_struct(Expenditure)6516_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Expenditure", "members": [ { - "astId": 5836, + "astId": 6505, "contract": "contracts/colony/Colony.sol:Colony", "label": "status", "offset": 0, "slot": "0", - "type": "t_enum(ExpenditureStatus)5862" + "type": "t_enum(ExpenditureStatus)6531" }, { - "astId": 5838, + "astId": 6507, "contract": "contracts/colony/Colony.sol:Colony", "label": "owner", "offset": 1, @@ -599,7 +614,7 @@ "type": "t_address" }, { - "astId": 5840, + "astId": 6509, "contract": "contracts/colony/Colony.sol:Colony", "label": "fundingPotId", "offset": 0, @@ -607,7 +622,7 @@ "type": "t_uint256" }, { - "astId": 5842, + "astId": 6511, "contract": "contracts/colony/Colony.sol:Colony", "label": "domainId", "offset": 0, @@ -615,7 +630,7 @@ "type": "t_uint256" }, { - "astId": 5844, + "astId": 6513, "contract": "contracts/colony/Colony.sol:Colony", "label": "finalizedTimestamp", "offset": 0, @@ -623,7 +638,7 @@ "type": "t_uint256" }, { - "astId": 5846, + "astId": 6515, "contract": "contracts/colony/Colony.sol:Colony", "label": "globalClaimDelay", "offset": 0, @@ -633,12 +648,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ExpenditureSlot)5857_storage": { + "t_struct(ExpenditureSlot)6526_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.ExpenditureSlot", "members": [ { - "astId": 5849, + "astId": 6518, "contract": "contracts/colony/Colony.sol:Colony", "label": "recipient", "offset": 0, @@ -646,7 +661,7 @@ "type": "t_address_payable" }, { - "astId": 5851, + "astId": 6520, "contract": "contracts/colony/Colony.sol:Colony", "label": "claimDelay", "offset": 0, @@ -654,7 +669,7 @@ "type": "t_uint256" }, { - "astId": 5853, + "astId": 6522, "contract": "contracts/colony/Colony.sol:Colony", "label": "payoutModifier", "offset": 0, @@ -662,7 +677,7 @@ "type": "t_int256" }, { - "astId": 5856, + "astId": 6525, "contract": "contracts/colony/Colony.sol:Colony", "label": "skills", "offset": 0, @@ -672,12 +687,12 @@ ], "numberOfBytes": "128" }, - "t_struct(FundingPot)5893_storage": { + "t_struct(FundingPot)6574_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.FundingPot", "members": [ { - "astId": 5881, + "astId": 6550, "contract": "contracts/colony/Colony.sol:Colony", "label": "balance", "offset": 0, @@ -685,15 +700,15 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5884, + "astId": 6553, "contract": "contracts/colony/Colony.sol:Colony", "label": "associatedType", "offset": 0, "slot": "1", - "type": "t_enum(FundingPotAssociatedType)5877" + "type": "t_enum(FundingPotAssociatedType)6546" }, { - "astId": 5886, + "astId": 6555, "contract": "contracts/colony/Colony.sol:Colony", "label": "associatedTypeId", "offset": 0, @@ -701,7 +716,7 @@ "type": "t_uint256" }, { - "astId": 5890, + "astId": 6559, "contract": "contracts/colony/Colony.sol:Colony", "label": "payouts", "offset": 0, @@ -709,22 +724,38 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5892, + "astId": 6561, "contract": "contracts/colony/Colony.sol:Colony", "label": "payoutsWeCannotMake", "offset": 0, "slot": "4", "type": "t_uint256" + }, + { + "astId": 6567, + "contract": "contracts/colony/Colony.sol:Colony", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" + }, + { + "astId": 6573, + "contract": "contracts/colony/Colony.sol:Colony", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" } ], - "numberOfBytes": "160" + "numberOfBytes": "224" }, - "t_struct(Payment)6112_storage": { + "t_struct(Payment)6801_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Payment", "members": [ { - "astId": 6102, + "astId": 6791, "contract": "contracts/colony/Colony.sol:Colony", "label": "recipient", "offset": 0, @@ -732,7 +763,7 @@ "type": "t_address_payable" }, { - "astId": 6104, + "astId": 6793, "contract": "contracts/colony/Colony.sol:Colony", "label": "finalized", "offset": 20, @@ -740,7 +771,7 @@ "type": "t_bool" }, { - "astId": 6106, + "astId": 6795, "contract": "contracts/colony/Colony.sol:Colony", "label": "fundingPotId", "offset": 0, @@ -748,7 +779,7 @@ "type": "t_uint256" }, { - "astId": 6108, + "astId": 6797, "contract": "contracts/colony/Colony.sol:Colony", "label": "domainId", "offset": 0, @@ -756,7 +787,7 @@ "type": "t_uint256" }, { - "astId": 6111, + "astId": 6800, "contract": "contracts/colony/Colony.sol:Colony", "label": "skills", "offset": 0, @@ -766,12 +797,12 @@ ], "numberOfBytes": "128" }, - "t_struct(RatingSecrets)6100_storage": { + "t_struct(RatingSecrets)6789_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RatingSecrets", "members": [ { - "astId": 6093, + "astId": 6782, "contract": "contracts/colony/Colony.sol:Colony", "label": "count", "offset": 0, @@ -779,7 +810,7 @@ "type": "t_uint256" }, { - "astId": 6095, + "astId": 6784, "contract": "contracts/colony/Colony.sol:Colony", "label": "timestamp", "offset": 0, @@ -787,7 +818,7 @@ "type": "t_uint256" }, { - "astId": 6099, + "astId": 6788, "contract": "contracts/colony/Colony.sol:Colony", "label": "secret", "offset": 0, @@ -797,12 +828,12 @@ ], "numberOfBytes": "96" }, - "t_struct(RewardPayoutCycle)5833_storage": { + "t_struct(RewardPayoutCycle)6502_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RewardPayoutCycle", "members": [ { - "astId": 5818, + "astId": 6487, "contract": "contracts/colony/Colony.sol:Colony", "label": "reputationState", "offset": 0, @@ -810,7 +841,7 @@ "type": "t_bytes32" }, { - "astId": 5820, + "astId": 6489, "contract": "contracts/colony/Colony.sol:Colony", "label": "colonyWideReputation", "offset": 0, @@ -818,7 +849,7 @@ "type": "t_uint256" }, { - "astId": 5822, + "astId": 6491, "contract": "contracts/colony/Colony.sol:Colony", "label": "totalTokens", "offset": 0, @@ -826,7 +857,7 @@ "type": "t_uint256" }, { - "astId": 5824, + "astId": 6493, "contract": "contracts/colony/Colony.sol:Colony", "label": "amount", "offset": 0, @@ -834,7 +865,7 @@ "type": "t_uint256" }, { - "astId": 5826, + "astId": 6495, "contract": "contracts/colony/Colony.sol:Colony", "label": "tokenAddress", "offset": 0, @@ -842,7 +873,7 @@ "type": "t_address" }, { - "astId": 5828, + "astId": 6497, "contract": "contracts/colony/Colony.sol:Colony", "label": "blockTimestamp", "offset": 0, @@ -850,7 +881,7 @@ "type": "t_uint256" }, { - "astId": 5830, + "astId": 6499, "contract": "contracts/colony/Colony.sol:Colony", "label": "amountRemaining", "offset": 0, @@ -858,7 +889,7 @@ "type": "t_uint256" }, { - "astId": 5832, + "astId": 6501, "contract": "contracts/colony/Colony.sol:Colony", "label": "finalized", "offset": 0, @@ -868,12 +899,12 @@ ], "numberOfBytes": "256" }, - "t_struct(Role)6091_storage": { + "t_struct(Role)6780_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Role", "members": [ { - "astId": 6085, + "astId": 6774, "contract": "contracts/colony/Colony.sol:Colony", "label": "user", "offset": 0, @@ -881,7 +912,7 @@ "type": "t_address_payable" }, { - "astId": 6087, + "astId": 6776, "contract": "contracts/colony/Colony.sol:Colony", "label": "rateFail", "offset": 20, @@ -889,22 +920,22 @@ "type": "t_bool" }, { - "astId": 6090, + "astId": 6779, "contract": "contracts/colony/Colony.sol:Colony", "label": "rating", "offset": 21, "slot": "0", - "type": "t_enum(TaskRatings)6045" + "type": "t_enum(TaskRatings)6734" } ], "numberOfBytes": "32" }, - "t_struct(Task)6083_storage": { + "t_struct(Task)6772_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Task", "members": [ { - "astId": 6055, + "astId": 6744, "contract": "contracts/colony/Colony.sol:Colony", "label": "specificationHash", "offset": 0, @@ -912,7 +943,7 @@ "type": "t_bytes32" }, { - "astId": 6057, + "astId": 6746, "contract": "contracts/colony/Colony.sol:Colony", "label": "deliverableHash", "offset": 0, @@ -920,15 +951,15 @@ "type": "t_bytes32" }, { - "astId": 6060, + "astId": 6749, "contract": "contracts/colony/Colony.sol:Colony", "label": "status", "offset": 0, "slot": "2", - "type": "t_enum(TaskStatus)6053" + "type": "t_enum(TaskStatus)6742" }, { - "astId": 6062, + "astId": 6751, "contract": "contracts/colony/Colony.sol:Colony", "label": "dueDate", "offset": 0, @@ -936,7 +967,7 @@ "type": "t_uint256" }, { - "astId": 6064, + "astId": 6753, "contract": "contracts/colony/Colony.sol:Colony", "label": "fundingPotId", "offset": 0, @@ -944,7 +975,7 @@ "type": "t_uint256" }, { - "astId": 6066, + "astId": 6755, "contract": "contracts/colony/Colony.sol:Colony", "label": "completionTimestamp", "offset": 0, @@ -952,7 +983,7 @@ "type": "t_uint256" }, { - "astId": 6068, + "astId": 6757, "contract": "contracts/colony/Colony.sol:Colony", "label": "domainId", "offset": 0, @@ -960,7 +991,7 @@ "type": "t_uint256" }, { - "astId": 6071, + "astId": 6760, "contract": "contracts/colony/Colony.sol:Colony", "label": "skills", "offset": 0, @@ -968,15 +999,15 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 6076, + "astId": 6765, "contract": "contracts/colony/Colony.sol:Colony", "label": "roles", "offset": 0, "slot": "8", - "type": "t_mapping(t_uint8,t_struct(Role)6091_storage)" + "type": "t_mapping(t_uint8,t_struct(Role)6780_storage)" }, { - "astId": 6082, + "astId": 6771, "contract": "contracts/colony/Colony.sol:Colony", "label": "payouts", "offset": 0, diff --git a/.storage-layouts/contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction.json b/.storage-layouts/contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction.json index 2dc11b9ce9..094e777a71 100644 --- a/.storage-layouts/contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction.json +++ b/.storage-layouts/contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10724, + "astId": 11718, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "colonyNetworkAddress", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_address" }, { - "astId": 10726, + "astId": 11720, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "token", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_address" }, { - "astId": 10728, + "astId": 11722, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "rewardInverse", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 10730, + "astId": 11724, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "DEPRECATED_taskCount", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 10732, + "astId": 11726, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "fundingPotCount", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 10734, + "astId": 11728, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "domainCount", "offset": 0, @@ -113,15 +113,15 @@ "type": "t_uint256" }, { - "astId": 10741, + "astId": 11735, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "DEPRECATED_reviewers", "offset": 0, "slot": "12", - "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)" + "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)" }, { - "astId": 10745, + "astId": 11739, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "DEPRECATED_roleAssignmentSigs", "offset": 0, @@ -129,31 +129,31 @@ "type": "t_mapping(t_bytes4,t_bool)" }, { - "astId": 10750, + "astId": 11744, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "DEPRECATED_tasks", "offset": 0, "slot": "14", - "type": "t_mapping(t_uint256,t_struct(Task)6083_storage)" + "type": "t_mapping(t_uint256,t_struct(Task)6772_storage)" }, { - "astId": 10755, + "astId": 11749, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "fundingPots", "offset": 0, "slot": "15", - "type": "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)" + "type": "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)" }, { - "astId": 10760, + "astId": 11754, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "rewardPayoutCycles", "offset": 0, "slot": "16", - "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)" + "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)" }, { - "astId": 10764, + "astId": 11758, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "pendingRewardPayments", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10768, + "astId": 11762, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "nonRewardPotsTotal", "offset": 0, @@ -169,23 +169,23 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10773, + "astId": 11767, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "DEPRECATED_taskWorkRatings", "offset": 0, "slot": "19", - "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)" + "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)" }, { - "astId": 10778, + "astId": 11772, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "domains", "offset": 0, "slot": "20", - "type": "t_mapping(t_uint256,t_struct(Domain)5898_storage)" + "type": "t_mapping(t_uint256,t_struct(Domain)6579_storage)" }, { - "astId": 10782, + "astId": 11776, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "DEPRECATED_taskChangeNonces", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 10784, + "astId": 11778, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "DEPRECATED_paymentCount", "offset": 0, @@ -201,15 +201,15 @@ "type": "t_uint256" }, { - "astId": 10789, + "astId": 11783, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "DEPRECATED_payments", "offset": 0, "slot": "23", - "type": "t_mapping(t_uint256,t_struct(Payment)6112_storage)" + "type": "t_mapping(t_uint256,t_struct(Payment)6801_storage)" }, { - "astId": 10791, + "astId": 11785, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "expenditureCount", "offset": 0, @@ -217,23 +217,23 @@ "type": "t_uint256" }, { - "astId": 10796, + "astId": 11790, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "expenditures", "offset": 0, "slot": "25", - "type": "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)" + "type": "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)" }, { - "astId": 10803, + "astId": 11797, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "expenditureSlots", "offset": 0, "slot": "26", - "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))" + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))" }, { - "astId": 10811, + "astId": 11805, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "expenditureSlotPayouts", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" }, { - "astId": 10819, + "astId": 11813, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "approvals", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10827, + "astId": 11821, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "obligations", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10829, + "astId": 11823, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "tokenLockingAddress", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_address" }, { - "astId": 10835, + "astId": 11829, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "tokenLocks", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 10841, + "astId": 11835, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "tokenApprovals", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))" }, { - "astId": 10845, + "astId": 11839, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "tokenApprovalTotals", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10847, + "astId": 11841, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "defaultGlobalClaimDelay", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 10854, + "astId": 11848, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "metatransactionNonces", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10856, + "astId": 11850, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "rootLocalSkill", "offset": 0, @@ -313,12 +313,20 @@ "type": "t_uint256" }, { - "astId": 10860, + "astId": 11854, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "localSkills", "offset": 0, "slot": "37", "type": "t_mapping(t_uint256,t_bool)" + }, + { + "astId": 11864, + "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))" } ], "types": { @@ -332,8 +340,8 @@ "label": "address payable", "numberOfBytes": "20" }, - "t_array(t_enum(TaskRole)6049)2_storage": { - "base": "t_enum(TaskRole)6049", + "t_array(t_enum(TaskRole)6738)2_storage": { + "base": "t_enum(TaskRole)6738", "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole[2]", "numberOfBytes": "32" @@ -359,32 +367,32 @@ "label": "bytes4", "numberOfBytes": "4" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_enum(ExpenditureStatus)5862": { + "t_enum(ExpenditureStatus)6531": { "encoding": "inplace", "label": "enum ColonyDataTypes.ExpenditureStatus", "numberOfBytes": "1" }, - "t_enum(FundingPotAssociatedType)5877": { + "t_enum(FundingPotAssociatedType)6546": { "encoding": "inplace", "label": "enum ColonyDataTypes.FundingPotAssociatedType", "numberOfBytes": "1" }, - "t_enum(TaskRatings)6045": { + "t_enum(TaskRatings)6734": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRatings", "numberOfBytes": "1" }, - "t_enum(TaskRole)6049": { + "t_enum(TaskRole)6738": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole", "numberOfBytes": "1" }, - "t_enum(TaskStatus)6053": { + "t_enum(TaskStatus)6742": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskStatus", "numberOfBytes": "1" @@ -429,12 +437,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)": { + "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)": { "encoding": "mapping", "key": "t_bytes4", "label": "mapping(bytes4 => enum ColonyDataTypes.TaskRole[2])", "numberOfBytes": "32", - "value": "t_array(t_enum(TaskRole)6049)2_storage" + "value": "t_array(t_enum(TaskRole)6738)2_storage" }, "t_mapping(t_bytes4,t_bool)": { "encoding": "mapping", @@ -464,68 +472,75 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, - "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))": { + "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))": { + "encoding": "mapping", + "key": "t_uint256", + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" + }, + "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)" + "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)" }, - "t_mapping(t_uint256,t_struct(Domain)5898_storage)": { + "t_mapping(t_uint256,t_struct(Domain)6579_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Domain)", "numberOfBytes": "32", - "value": "t_struct(Domain)5898_storage" + "value": "t_struct(Domain)6579_storage" }, - "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)": { + "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Expenditure)", "numberOfBytes": "32", - "value": "t_struct(Expenditure)5847_storage" + "value": "t_struct(Expenditure)6516_storage" }, - "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)": { + "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot)", "numberOfBytes": "32", - "value": "t_struct(ExpenditureSlot)5857_storage" + "value": "t_struct(ExpenditureSlot)6526_storage" }, - "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)": { + "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.FundingPot)", "numberOfBytes": "32", - "value": "t_struct(FundingPot)5893_storage" + "value": "t_struct(FundingPot)6574_storage" }, - "t_mapping(t_uint256,t_struct(Payment)6112_storage)": { + "t_mapping(t_uint256,t_struct(Payment)6801_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Payment)", "numberOfBytes": "32", - "value": "t_struct(Payment)6112_storage" + "value": "t_struct(Payment)6801_storage" }, - "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)": { + "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RatingSecrets)", "numberOfBytes": "32", - "value": "t_struct(RatingSecrets)6100_storage" + "value": "t_struct(RatingSecrets)6789_storage" }, - "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)": { + "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RewardPayoutCycle)", "numberOfBytes": "32", - "value": "t_struct(RewardPayoutCycle)5833_storage" + "value": "t_struct(RewardPayoutCycle)6502_storage" }, - "t_mapping(t_uint256,t_struct(Task)6083_storage)": { + "t_mapping(t_uint256,t_struct(Task)6772_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Task)", "numberOfBytes": "32", - "value": "t_struct(Task)6083_storage" + "value": "t_struct(Task)6772_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -548,19 +563,19 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_uint256)" }, - "t_mapping(t_uint8,t_struct(Role)6091_storage)": { + "t_mapping(t_uint8,t_struct(Role)6780_storage)": { "encoding": "mapping", "key": "t_uint8", "label": "mapping(uint8 => struct ColonyDataTypes.Role)", "numberOfBytes": "32", - "value": "t_struct(Role)6091_storage" + "value": "t_struct(Role)6780_storage" }, - "t_struct(Domain)5898_storage": { + "t_struct(Domain)6579_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Domain", "members": [ { - "astId": 5895, + "astId": 6576, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "skillId", "offset": 0, @@ -568,7 +583,7 @@ "type": "t_uint256" }, { - "astId": 5897, + "astId": 6578, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "fundingPotId", "offset": 0, @@ -578,20 +593,20 @@ ], "numberOfBytes": "64" }, - "t_struct(Expenditure)5847_storage": { + "t_struct(Expenditure)6516_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Expenditure", "members": [ { - "astId": 5836, + "astId": 6505, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "status", "offset": 0, "slot": "0", - "type": "t_enum(ExpenditureStatus)5862" + "type": "t_enum(ExpenditureStatus)6531" }, { - "astId": 5838, + "astId": 6507, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "owner", "offset": 1, @@ -599,7 +614,7 @@ "type": "t_address" }, { - "astId": 5840, + "astId": 6509, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "fundingPotId", "offset": 0, @@ -607,7 +622,7 @@ "type": "t_uint256" }, { - "astId": 5842, + "astId": 6511, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "domainId", "offset": 0, @@ -615,7 +630,7 @@ "type": "t_uint256" }, { - "astId": 5844, + "astId": 6513, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "finalizedTimestamp", "offset": 0, @@ -623,7 +638,7 @@ "type": "t_uint256" }, { - "astId": 5846, + "astId": 6515, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "globalClaimDelay", "offset": 0, @@ -633,12 +648,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ExpenditureSlot)5857_storage": { + "t_struct(ExpenditureSlot)6526_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.ExpenditureSlot", "members": [ { - "astId": 5849, + "astId": 6518, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "recipient", "offset": 0, @@ -646,7 +661,7 @@ "type": "t_address_payable" }, { - "astId": 5851, + "astId": 6520, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "claimDelay", "offset": 0, @@ -654,7 +669,7 @@ "type": "t_uint256" }, { - "astId": 5853, + "astId": 6522, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "payoutModifier", "offset": 0, @@ -662,7 +677,7 @@ "type": "t_int256" }, { - "astId": 5856, + "astId": 6525, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "skills", "offset": 0, @@ -672,12 +687,12 @@ ], "numberOfBytes": "128" }, - "t_struct(FundingPot)5893_storage": { + "t_struct(FundingPot)6574_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.FundingPot", "members": [ { - "astId": 5881, + "astId": 6550, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "balance", "offset": 0, @@ -685,15 +700,15 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5884, + "astId": 6553, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "associatedType", "offset": 0, "slot": "1", - "type": "t_enum(FundingPotAssociatedType)5877" + "type": "t_enum(FundingPotAssociatedType)6546" }, { - "astId": 5886, + "astId": 6555, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "associatedTypeId", "offset": 0, @@ -701,7 +716,7 @@ "type": "t_uint256" }, { - "astId": 5890, + "astId": 6559, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "payouts", "offset": 0, @@ -709,22 +724,38 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5892, + "astId": 6561, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "payoutsWeCannotMake", "offset": 0, "slot": "4", "type": "t_uint256" + }, + { + "astId": 6567, + "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" + }, + { + "astId": 6573, + "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" } ], - "numberOfBytes": "160" + "numberOfBytes": "224" }, - "t_struct(Payment)6112_storage": { + "t_struct(Payment)6801_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Payment", "members": [ { - "astId": 6102, + "astId": 6791, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "recipient", "offset": 0, @@ -732,7 +763,7 @@ "type": "t_address_payable" }, { - "astId": 6104, + "astId": 6793, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "finalized", "offset": 20, @@ -740,7 +771,7 @@ "type": "t_bool" }, { - "astId": 6106, + "astId": 6795, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "fundingPotId", "offset": 0, @@ -748,7 +779,7 @@ "type": "t_uint256" }, { - "astId": 6108, + "astId": 6797, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "domainId", "offset": 0, @@ -756,7 +787,7 @@ "type": "t_uint256" }, { - "astId": 6111, + "astId": 6800, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "skills", "offset": 0, @@ -766,12 +797,12 @@ ], "numberOfBytes": "128" }, - "t_struct(RatingSecrets)6100_storage": { + "t_struct(RatingSecrets)6789_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RatingSecrets", "members": [ { - "astId": 6093, + "astId": 6782, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "count", "offset": 0, @@ -779,7 +810,7 @@ "type": "t_uint256" }, { - "astId": 6095, + "astId": 6784, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "timestamp", "offset": 0, @@ -787,7 +818,7 @@ "type": "t_uint256" }, { - "astId": 6099, + "astId": 6788, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "secret", "offset": 0, @@ -797,12 +828,12 @@ ], "numberOfBytes": "96" }, - "t_struct(RewardPayoutCycle)5833_storage": { + "t_struct(RewardPayoutCycle)6502_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RewardPayoutCycle", "members": [ { - "astId": 5818, + "astId": 6487, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "reputationState", "offset": 0, @@ -810,7 +841,7 @@ "type": "t_bytes32" }, { - "astId": 5820, + "astId": 6489, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "colonyWideReputation", "offset": 0, @@ -818,7 +849,7 @@ "type": "t_uint256" }, { - "astId": 5822, + "astId": 6491, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "totalTokens", "offset": 0, @@ -826,7 +857,7 @@ "type": "t_uint256" }, { - "astId": 5824, + "astId": 6493, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "amount", "offset": 0, @@ -834,7 +865,7 @@ "type": "t_uint256" }, { - "astId": 5826, + "astId": 6495, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "tokenAddress", "offset": 0, @@ -842,7 +873,7 @@ "type": "t_address" }, { - "astId": 5828, + "astId": 6497, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "blockTimestamp", "offset": 0, @@ -850,7 +881,7 @@ "type": "t_uint256" }, { - "astId": 5830, + "astId": 6499, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "amountRemaining", "offset": 0, @@ -858,7 +889,7 @@ "type": "t_uint256" }, { - "astId": 5832, + "astId": 6501, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "finalized", "offset": 0, @@ -868,12 +899,12 @@ ], "numberOfBytes": "256" }, - "t_struct(Role)6091_storage": { + "t_struct(Role)6780_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Role", "members": [ { - "astId": 6085, + "astId": 6774, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "user", "offset": 0, @@ -881,7 +912,7 @@ "type": "t_address_payable" }, { - "astId": 6087, + "astId": 6776, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "rateFail", "offset": 20, @@ -889,22 +920,22 @@ "type": "t_bool" }, { - "astId": 6090, + "astId": 6779, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "rating", "offset": 21, "slot": "0", - "type": "t_enum(TaskRatings)6045" + "type": "t_enum(TaskRatings)6734" } ], "numberOfBytes": "32" }, - "t_struct(Task)6083_storage": { + "t_struct(Task)6772_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Task", "members": [ { - "astId": 6055, + "astId": 6744, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "specificationHash", "offset": 0, @@ -912,7 +943,7 @@ "type": "t_bytes32" }, { - "astId": 6057, + "astId": 6746, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "deliverableHash", "offset": 0, @@ -920,15 +951,15 @@ "type": "t_bytes32" }, { - "astId": 6060, + "astId": 6749, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "status", "offset": 0, "slot": "2", - "type": "t_enum(TaskStatus)6053" + "type": "t_enum(TaskStatus)6742" }, { - "astId": 6062, + "astId": 6751, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "dueDate", "offset": 0, @@ -936,7 +967,7 @@ "type": "t_uint256" }, { - "astId": 6064, + "astId": 6753, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "fundingPotId", "offset": 0, @@ -944,7 +975,7 @@ "type": "t_uint256" }, { - "astId": 6066, + "astId": 6755, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "completionTimestamp", "offset": 0, @@ -952,7 +983,7 @@ "type": "t_uint256" }, { - "astId": 6068, + "astId": 6757, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "domainId", "offset": 0, @@ -960,7 +991,7 @@ "type": "t_uint256" }, { - "astId": 6071, + "astId": 6760, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "skills", "offset": 0, @@ -968,15 +999,15 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 6076, + "astId": 6765, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "roles", "offset": 0, "slot": "8", - "type": "t_mapping(t_uint8,t_struct(Role)6091_storage)" + "type": "t_mapping(t_uint8,t_struct(Role)6780_storage)" }, { - "astId": 6082, + "astId": 6771, "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction", "label": "payouts", "offset": 0, diff --git a/.storage-layouts/contracts/colony/ColonyAuthority.sol:ColonyAuthority.json b/.storage-layouts/contracts/colony/ColonyAuthority.sol:ColonyAuthority.json index ba43f3428d..cbc17f493d 100644 --- a/.storage-layouts/contracts/colony/ColonyAuthority.sol:ColonyAuthority.json +++ b/.storage-layouts/contracts/colony/ColonyAuthority.sol:ColonyAuthority.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colony/ColonyAuthority.sol:ColonyAuthority", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colony/ColonyAuthority.sol:ColonyAuthority", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 51141, + "astId": 50959, "contract": "contracts/colony/ColonyAuthority.sol:ColonyAuthority", "label": "_root_users", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 51145, + "astId": 50963, "contract": "contracts/colony/ColonyAuthority.sol:ColonyAuthority", "label": "_user_roles", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_mapping(t_address,t_bytes32)" }, { - "astId": 51151, + "astId": 50969, "contract": "contracts/colony/ColonyAuthority.sol:ColonyAuthority", "label": "_capability_roles", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_mapping(t_address,t_mapping(t_bytes4,t_bytes32))" }, { - "astId": 51157, + "astId": 50975, "contract": "contracts/colony/ColonyAuthority.sol:ColonyAuthority", "label": "_public_capabilities", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_mapping(t_bytes4,t_bool))" }, { - "astId": 20916, + "astId": 21202, "contract": "contracts/colony/ColonyAuthority.sol:ColonyAuthority", "label": "userDomainRoles", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bytes32))" }, { - "astId": 5071, + "astId": 5720, "contract": "contracts/colony/ColonyAuthority.sol:ColonyAuthority", "label": "colony", "offset": 0, @@ -86,7 +86,7 @@ "label": "bytes4", "numberOfBytes": "4" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/colony/ColonyDomains.sol:ColonyDomains.json b/.storage-layouts/contracts/colony/ColonyDomains.sol:ColonyDomains.json index b1daa070a1..92e2087789 100644 --- a/.storage-layouts/contracts/colony/ColonyDomains.sol:ColonyDomains.json +++ b/.storage-layouts/contracts/colony/ColonyDomains.sol:ColonyDomains.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10724, + "astId": 11718, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "colonyNetworkAddress", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_address" }, { - "astId": 10726, + "astId": 11720, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "token", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_address" }, { - "astId": 10728, + "astId": 11722, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "rewardInverse", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 10730, + "astId": 11724, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "DEPRECATED_taskCount", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 10732, + "astId": 11726, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "fundingPotCount", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 10734, + "astId": 11728, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "domainCount", "offset": 0, @@ -113,15 +113,15 @@ "type": "t_uint256" }, { - "astId": 10741, + "astId": 11735, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "DEPRECATED_reviewers", "offset": 0, "slot": "12", - "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)" + "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)" }, { - "astId": 10745, + "astId": 11739, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "DEPRECATED_roleAssignmentSigs", "offset": 0, @@ -129,31 +129,31 @@ "type": "t_mapping(t_bytes4,t_bool)" }, { - "astId": 10750, + "astId": 11744, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "DEPRECATED_tasks", "offset": 0, "slot": "14", - "type": "t_mapping(t_uint256,t_struct(Task)6083_storage)" + "type": "t_mapping(t_uint256,t_struct(Task)6772_storage)" }, { - "astId": 10755, + "astId": 11749, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "fundingPots", "offset": 0, "slot": "15", - "type": "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)" + "type": "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)" }, { - "astId": 10760, + "astId": 11754, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "rewardPayoutCycles", "offset": 0, "slot": "16", - "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)" + "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)" }, { - "astId": 10764, + "astId": 11758, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "pendingRewardPayments", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10768, + "astId": 11762, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "nonRewardPotsTotal", "offset": 0, @@ -169,23 +169,23 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10773, + "astId": 11767, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "DEPRECATED_taskWorkRatings", "offset": 0, "slot": "19", - "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)" + "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)" }, { - "astId": 10778, + "astId": 11772, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "domains", "offset": 0, "slot": "20", - "type": "t_mapping(t_uint256,t_struct(Domain)5898_storage)" + "type": "t_mapping(t_uint256,t_struct(Domain)6579_storage)" }, { - "astId": 10782, + "astId": 11776, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "DEPRECATED_taskChangeNonces", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 10784, + "astId": 11778, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "DEPRECATED_paymentCount", "offset": 0, @@ -201,15 +201,15 @@ "type": "t_uint256" }, { - "astId": 10789, + "astId": 11783, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "DEPRECATED_payments", "offset": 0, "slot": "23", - "type": "t_mapping(t_uint256,t_struct(Payment)6112_storage)" + "type": "t_mapping(t_uint256,t_struct(Payment)6801_storage)" }, { - "astId": 10791, + "astId": 11785, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "expenditureCount", "offset": 0, @@ -217,23 +217,23 @@ "type": "t_uint256" }, { - "astId": 10796, + "astId": 11790, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "expenditures", "offset": 0, "slot": "25", - "type": "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)" + "type": "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)" }, { - "astId": 10803, + "astId": 11797, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "expenditureSlots", "offset": 0, "slot": "26", - "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))" + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))" }, { - "astId": 10811, + "astId": 11805, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "expenditureSlotPayouts", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" }, { - "astId": 10819, + "astId": 11813, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "approvals", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10827, + "astId": 11821, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "obligations", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10829, + "astId": 11823, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "tokenLockingAddress", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_address" }, { - "astId": 10835, + "astId": 11829, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "tokenLocks", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 10841, + "astId": 11835, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "tokenApprovals", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))" }, { - "astId": 10845, + "astId": 11839, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "tokenApprovalTotals", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10847, + "astId": 11841, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "defaultGlobalClaimDelay", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 10854, + "astId": 11848, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "metatransactionNonces", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10856, + "astId": 11850, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "rootLocalSkill", "offset": 0, @@ -313,12 +313,20 @@ "type": "t_uint256" }, { - "astId": 10860, + "astId": 11854, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "localSkills", "offset": 0, "slot": "37", "type": "t_mapping(t_uint256,t_bool)" + }, + { + "astId": 11864, + "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))" } ], "types": { @@ -332,8 +340,8 @@ "label": "address payable", "numberOfBytes": "20" }, - "t_array(t_enum(TaskRole)6049)2_storage": { - "base": "t_enum(TaskRole)6049", + "t_array(t_enum(TaskRole)6738)2_storage": { + "base": "t_enum(TaskRole)6738", "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole[2]", "numberOfBytes": "32" @@ -359,32 +367,32 @@ "label": "bytes4", "numberOfBytes": "4" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_enum(ExpenditureStatus)5862": { + "t_enum(ExpenditureStatus)6531": { "encoding": "inplace", "label": "enum ColonyDataTypes.ExpenditureStatus", "numberOfBytes": "1" }, - "t_enum(FundingPotAssociatedType)5877": { + "t_enum(FundingPotAssociatedType)6546": { "encoding": "inplace", "label": "enum ColonyDataTypes.FundingPotAssociatedType", "numberOfBytes": "1" }, - "t_enum(TaskRatings)6045": { + "t_enum(TaskRatings)6734": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRatings", "numberOfBytes": "1" }, - "t_enum(TaskRole)6049": { + "t_enum(TaskRole)6738": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole", "numberOfBytes": "1" }, - "t_enum(TaskStatus)6053": { + "t_enum(TaskStatus)6742": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskStatus", "numberOfBytes": "1" @@ -429,12 +437,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)": { + "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)": { "encoding": "mapping", "key": "t_bytes4", "label": "mapping(bytes4 => enum ColonyDataTypes.TaskRole[2])", "numberOfBytes": "32", - "value": "t_array(t_enum(TaskRole)6049)2_storage" + "value": "t_array(t_enum(TaskRole)6738)2_storage" }, "t_mapping(t_bytes4,t_bool)": { "encoding": "mapping", @@ -464,68 +472,75 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, - "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))": { + "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))": { + "encoding": "mapping", + "key": "t_uint256", + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" + }, + "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)" + "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)" }, - "t_mapping(t_uint256,t_struct(Domain)5898_storage)": { + "t_mapping(t_uint256,t_struct(Domain)6579_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Domain)", "numberOfBytes": "32", - "value": "t_struct(Domain)5898_storage" + "value": "t_struct(Domain)6579_storage" }, - "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)": { + "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Expenditure)", "numberOfBytes": "32", - "value": "t_struct(Expenditure)5847_storage" + "value": "t_struct(Expenditure)6516_storage" }, - "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)": { + "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot)", "numberOfBytes": "32", - "value": "t_struct(ExpenditureSlot)5857_storage" + "value": "t_struct(ExpenditureSlot)6526_storage" }, - "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)": { + "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.FundingPot)", "numberOfBytes": "32", - "value": "t_struct(FundingPot)5893_storage" + "value": "t_struct(FundingPot)6574_storage" }, - "t_mapping(t_uint256,t_struct(Payment)6112_storage)": { + "t_mapping(t_uint256,t_struct(Payment)6801_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Payment)", "numberOfBytes": "32", - "value": "t_struct(Payment)6112_storage" + "value": "t_struct(Payment)6801_storage" }, - "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)": { + "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RatingSecrets)", "numberOfBytes": "32", - "value": "t_struct(RatingSecrets)6100_storage" + "value": "t_struct(RatingSecrets)6789_storage" }, - "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)": { + "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RewardPayoutCycle)", "numberOfBytes": "32", - "value": "t_struct(RewardPayoutCycle)5833_storage" + "value": "t_struct(RewardPayoutCycle)6502_storage" }, - "t_mapping(t_uint256,t_struct(Task)6083_storage)": { + "t_mapping(t_uint256,t_struct(Task)6772_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Task)", "numberOfBytes": "32", - "value": "t_struct(Task)6083_storage" + "value": "t_struct(Task)6772_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -548,19 +563,19 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_uint256)" }, - "t_mapping(t_uint8,t_struct(Role)6091_storage)": { + "t_mapping(t_uint8,t_struct(Role)6780_storage)": { "encoding": "mapping", "key": "t_uint8", "label": "mapping(uint8 => struct ColonyDataTypes.Role)", "numberOfBytes": "32", - "value": "t_struct(Role)6091_storage" + "value": "t_struct(Role)6780_storage" }, - "t_struct(Domain)5898_storage": { + "t_struct(Domain)6579_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Domain", "members": [ { - "astId": 5895, + "astId": 6576, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "skillId", "offset": 0, @@ -568,7 +583,7 @@ "type": "t_uint256" }, { - "astId": 5897, + "astId": 6578, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "fundingPotId", "offset": 0, @@ -578,20 +593,20 @@ ], "numberOfBytes": "64" }, - "t_struct(Expenditure)5847_storage": { + "t_struct(Expenditure)6516_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Expenditure", "members": [ { - "astId": 5836, + "astId": 6505, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "status", "offset": 0, "slot": "0", - "type": "t_enum(ExpenditureStatus)5862" + "type": "t_enum(ExpenditureStatus)6531" }, { - "astId": 5838, + "astId": 6507, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "owner", "offset": 1, @@ -599,7 +614,7 @@ "type": "t_address" }, { - "astId": 5840, + "astId": 6509, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "fundingPotId", "offset": 0, @@ -607,7 +622,7 @@ "type": "t_uint256" }, { - "astId": 5842, + "astId": 6511, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "domainId", "offset": 0, @@ -615,7 +630,7 @@ "type": "t_uint256" }, { - "astId": 5844, + "astId": 6513, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "finalizedTimestamp", "offset": 0, @@ -623,7 +638,7 @@ "type": "t_uint256" }, { - "astId": 5846, + "astId": 6515, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "globalClaimDelay", "offset": 0, @@ -633,12 +648,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ExpenditureSlot)5857_storage": { + "t_struct(ExpenditureSlot)6526_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.ExpenditureSlot", "members": [ { - "astId": 5849, + "astId": 6518, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "recipient", "offset": 0, @@ -646,7 +661,7 @@ "type": "t_address_payable" }, { - "astId": 5851, + "astId": 6520, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "claimDelay", "offset": 0, @@ -654,7 +669,7 @@ "type": "t_uint256" }, { - "astId": 5853, + "astId": 6522, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "payoutModifier", "offset": 0, @@ -662,7 +677,7 @@ "type": "t_int256" }, { - "astId": 5856, + "astId": 6525, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "skills", "offset": 0, @@ -672,12 +687,12 @@ ], "numberOfBytes": "128" }, - "t_struct(FundingPot)5893_storage": { + "t_struct(FundingPot)6574_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.FundingPot", "members": [ { - "astId": 5881, + "astId": 6550, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "balance", "offset": 0, @@ -685,15 +700,15 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5884, + "astId": 6553, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "associatedType", "offset": 0, "slot": "1", - "type": "t_enum(FundingPotAssociatedType)5877" + "type": "t_enum(FundingPotAssociatedType)6546" }, { - "astId": 5886, + "astId": 6555, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "associatedTypeId", "offset": 0, @@ -701,7 +716,7 @@ "type": "t_uint256" }, { - "astId": 5890, + "astId": 6559, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "payouts", "offset": 0, @@ -709,22 +724,38 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5892, + "astId": 6561, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "payoutsWeCannotMake", "offset": 0, "slot": "4", "type": "t_uint256" + }, + { + "astId": 6567, + "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" + }, + { + "astId": 6573, + "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" } ], - "numberOfBytes": "160" + "numberOfBytes": "224" }, - "t_struct(Payment)6112_storage": { + "t_struct(Payment)6801_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Payment", "members": [ { - "astId": 6102, + "astId": 6791, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "recipient", "offset": 0, @@ -732,7 +763,7 @@ "type": "t_address_payable" }, { - "astId": 6104, + "astId": 6793, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "finalized", "offset": 20, @@ -740,7 +771,7 @@ "type": "t_bool" }, { - "astId": 6106, + "astId": 6795, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "fundingPotId", "offset": 0, @@ -748,7 +779,7 @@ "type": "t_uint256" }, { - "astId": 6108, + "astId": 6797, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "domainId", "offset": 0, @@ -756,7 +787,7 @@ "type": "t_uint256" }, { - "astId": 6111, + "astId": 6800, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "skills", "offset": 0, @@ -766,12 +797,12 @@ ], "numberOfBytes": "128" }, - "t_struct(RatingSecrets)6100_storage": { + "t_struct(RatingSecrets)6789_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RatingSecrets", "members": [ { - "astId": 6093, + "astId": 6782, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "count", "offset": 0, @@ -779,7 +810,7 @@ "type": "t_uint256" }, { - "astId": 6095, + "astId": 6784, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "timestamp", "offset": 0, @@ -787,7 +818,7 @@ "type": "t_uint256" }, { - "astId": 6099, + "astId": 6788, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "secret", "offset": 0, @@ -797,12 +828,12 @@ ], "numberOfBytes": "96" }, - "t_struct(RewardPayoutCycle)5833_storage": { + "t_struct(RewardPayoutCycle)6502_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RewardPayoutCycle", "members": [ { - "astId": 5818, + "astId": 6487, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "reputationState", "offset": 0, @@ -810,7 +841,7 @@ "type": "t_bytes32" }, { - "astId": 5820, + "astId": 6489, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "colonyWideReputation", "offset": 0, @@ -818,7 +849,7 @@ "type": "t_uint256" }, { - "astId": 5822, + "astId": 6491, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "totalTokens", "offset": 0, @@ -826,7 +857,7 @@ "type": "t_uint256" }, { - "astId": 5824, + "astId": 6493, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "amount", "offset": 0, @@ -834,7 +865,7 @@ "type": "t_uint256" }, { - "astId": 5826, + "astId": 6495, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "tokenAddress", "offset": 0, @@ -842,7 +873,7 @@ "type": "t_address" }, { - "astId": 5828, + "astId": 6497, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "blockTimestamp", "offset": 0, @@ -850,7 +881,7 @@ "type": "t_uint256" }, { - "astId": 5830, + "astId": 6499, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "amountRemaining", "offset": 0, @@ -858,7 +889,7 @@ "type": "t_uint256" }, { - "astId": 5832, + "astId": 6501, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "finalized", "offset": 0, @@ -868,12 +899,12 @@ ], "numberOfBytes": "256" }, - "t_struct(Role)6091_storage": { + "t_struct(Role)6780_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Role", "members": [ { - "astId": 6085, + "astId": 6774, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "user", "offset": 0, @@ -881,7 +912,7 @@ "type": "t_address_payable" }, { - "astId": 6087, + "astId": 6776, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "rateFail", "offset": 20, @@ -889,22 +920,22 @@ "type": "t_bool" }, { - "astId": 6090, + "astId": 6779, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "rating", "offset": 21, "slot": "0", - "type": "t_enum(TaskRatings)6045" + "type": "t_enum(TaskRatings)6734" } ], "numberOfBytes": "32" }, - "t_struct(Task)6083_storage": { + "t_struct(Task)6772_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Task", "members": [ { - "astId": 6055, + "astId": 6744, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "specificationHash", "offset": 0, @@ -912,7 +943,7 @@ "type": "t_bytes32" }, { - "astId": 6057, + "astId": 6746, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "deliverableHash", "offset": 0, @@ -920,15 +951,15 @@ "type": "t_bytes32" }, { - "astId": 6060, + "astId": 6749, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "status", "offset": 0, "slot": "2", - "type": "t_enum(TaskStatus)6053" + "type": "t_enum(TaskStatus)6742" }, { - "astId": 6062, + "astId": 6751, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "dueDate", "offset": 0, @@ -936,7 +967,7 @@ "type": "t_uint256" }, { - "astId": 6064, + "astId": 6753, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "fundingPotId", "offset": 0, @@ -944,7 +975,7 @@ "type": "t_uint256" }, { - "astId": 6066, + "astId": 6755, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "completionTimestamp", "offset": 0, @@ -952,7 +983,7 @@ "type": "t_uint256" }, { - "astId": 6068, + "astId": 6757, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "domainId", "offset": 0, @@ -960,7 +991,7 @@ "type": "t_uint256" }, { - "astId": 6071, + "astId": 6760, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "skills", "offset": 0, @@ -968,15 +999,15 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 6076, + "astId": 6765, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "roles", "offset": 0, "slot": "8", - "type": "t_mapping(t_uint8,t_struct(Role)6091_storage)" + "type": "t_mapping(t_uint8,t_struct(Role)6780_storage)" }, { - "astId": 6082, + "astId": 6771, "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains", "label": "payouts", "offset": 0, diff --git a/.storage-layouts/contracts/colony/ColonyExpenditure.sol:ColonyExpenditure.json b/.storage-layouts/contracts/colony/ColonyExpenditure.sol:ColonyExpenditure.json index 7d0a301ea8..3b461327be 100644 --- a/.storage-layouts/contracts/colony/ColonyExpenditure.sol:ColonyExpenditure.json +++ b/.storage-layouts/contracts/colony/ColonyExpenditure.sol:ColonyExpenditure.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10724, + "astId": 11718, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "colonyNetworkAddress", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_address" }, { - "astId": 10726, + "astId": 11720, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "token", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_address" }, { - "astId": 10728, + "astId": 11722, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "rewardInverse", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 10730, + "astId": 11724, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "DEPRECATED_taskCount", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 10732, + "astId": 11726, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "fundingPotCount", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 10734, + "astId": 11728, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "domainCount", "offset": 0, @@ -113,15 +113,15 @@ "type": "t_uint256" }, { - "astId": 10741, + "astId": 11735, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "DEPRECATED_reviewers", "offset": 0, "slot": "12", - "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)" + "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)" }, { - "astId": 10745, + "astId": 11739, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "DEPRECATED_roleAssignmentSigs", "offset": 0, @@ -129,31 +129,31 @@ "type": "t_mapping(t_bytes4,t_bool)" }, { - "astId": 10750, + "astId": 11744, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "DEPRECATED_tasks", "offset": 0, "slot": "14", - "type": "t_mapping(t_uint256,t_struct(Task)6083_storage)" + "type": "t_mapping(t_uint256,t_struct(Task)6772_storage)" }, { - "astId": 10755, + "astId": 11749, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "fundingPots", "offset": 0, "slot": "15", - "type": "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)" + "type": "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)" }, { - "astId": 10760, + "astId": 11754, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "rewardPayoutCycles", "offset": 0, "slot": "16", - "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)" + "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)" }, { - "astId": 10764, + "astId": 11758, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "pendingRewardPayments", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10768, + "astId": 11762, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "nonRewardPotsTotal", "offset": 0, @@ -169,23 +169,23 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10773, + "astId": 11767, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "DEPRECATED_taskWorkRatings", "offset": 0, "slot": "19", - "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)" + "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)" }, { - "astId": 10778, + "astId": 11772, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "domains", "offset": 0, "slot": "20", - "type": "t_mapping(t_uint256,t_struct(Domain)5898_storage)" + "type": "t_mapping(t_uint256,t_struct(Domain)6579_storage)" }, { - "astId": 10782, + "astId": 11776, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "DEPRECATED_taskChangeNonces", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 10784, + "astId": 11778, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "DEPRECATED_paymentCount", "offset": 0, @@ -201,15 +201,15 @@ "type": "t_uint256" }, { - "astId": 10789, + "astId": 11783, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "DEPRECATED_payments", "offset": 0, "slot": "23", - "type": "t_mapping(t_uint256,t_struct(Payment)6112_storage)" + "type": "t_mapping(t_uint256,t_struct(Payment)6801_storage)" }, { - "astId": 10791, + "astId": 11785, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "expenditureCount", "offset": 0, @@ -217,23 +217,23 @@ "type": "t_uint256" }, { - "astId": 10796, + "astId": 11790, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "expenditures", "offset": 0, "slot": "25", - "type": "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)" + "type": "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)" }, { - "astId": 10803, + "astId": 11797, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "expenditureSlots", "offset": 0, "slot": "26", - "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))" + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))" }, { - "astId": 10811, + "astId": 11805, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "expenditureSlotPayouts", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" }, { - "astId": 10819, + "astId": 11813, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "approvals", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10827, + "astId": 11821, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "obligations", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10829, + "astId": 11823, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "tokenLockingAddress", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_address" }, { - "astId": 10835, + "astId": 11829, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "tokenLocks", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 10841, + "astId": 11835, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "tokenApprovals", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))" }, { - "astId": 10845, + "astId": 11839, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "tokenApprovalTotals", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10847, + "astId": 11841, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "defaultGlobalClaimDelay", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 10854, + "astId": 11848, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "metatransactionNonces", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10856, + "astId": 11850, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "rootLocalSkill", "offset": 0, @@ -313,12 +313,20 @@ "type": "t_uint256" }, { - "astId": 10860, + "astId": 11854, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "localSkills", "offset": 0, "slot": "37", "type": "t_mapping(t_uint256,t_bool)" + }, + { + "astId": 11864, + "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))" } ], "types": { @@ -332,8 +340,8 @@ "label": "address payable", "numberOfBytes": "20" }, - "t_array(t_enum(TaskRole)6049)2_storage": { - "base": "t_enum(TaskRole)6049", + "t_array(t_enum(TaskRole)6738)2_storage": { + "base": "t_enum(TaskRole)6738", "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole[2]", "numberOfBytes": "32" @@ -359,32 +367,32 @@ "label": "bytes4", "numberOfBytes": "4" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_enum(ExpenditureStatus)5862": { + "t_enum(ExpenditureStatus)6531": { "encoding": "inplace", "label": "enum ColonyDataTypes.ExpenditureStatus", "numberOfBytes": "1" }, - "t_enum(FundingPotAssociatedType)5877": { + "t_enum(FundingPotAssociatedType)6546": { "encoding": "inplace", "label": "enum ColonyDataTypes.FundingPotAssociatedType", "numberOfBytes": "1" }, - "t_enum(TaskRatings)6045": { + "t_enum(TaskRatings)6734": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRatings", "numberOfBytes": "1" }, - "t_enum(TaskRole)6049": { + "t_enum(TaskRole)6738": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole", "numberOfBytes": "1" }, - "t_enum(TaskStatus)6053": { + "t_enum(TaskStatus)6742": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskStatus", "numberOfBytes": "1" @@ -429,12 +437,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)": { + "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)": { "encoding": "mapping", "key": "t_bytes4", "label": "mapping(bytes4 => enum ColonyDataTypes.TaskRole[2])", "numberOfBytes": "32", - "value": "t_array(t_enum(TaskRole)6049)2_storage" + "value": "t_array(t_enum(TaskRole)6738)2_storage" }, "t_mapping(t_bytes4,t_bool)": { "encoding": "mapping", @@ -464,68 +472,75 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, - "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))": { + "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))": { + "encoding": "mapping", + "key": "t_uint256", + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" + }, + "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)" + "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)" }, - "t_mapping(t_uint256,t_struct(Domain)5898_storage)": { + "t_mapping(t_uint256,t_struct(Domain)6579_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Domain)", "numberOfBytes": "32", - "value": "t_struct(Domain)5898_storage" + "value": "t_struct(Domain)6579_storage" }, - "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)": { + "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Expenditure)", "numberOfBytes": "32", - "value": "t_struct(Expenditure)5847_storage" + "value": "t_struct(Expenditure)6516_storage" }, - "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)": { + "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot)", "numberOfBytes": "32", - "value": "t_struct(ExpenditureSlot)5857_storage" + "value": "t_struct(ExpenditureSlot)6526_storage" }, - "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)": { + "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.FundingPot)", "numberOfBytes": "32", - "value": "t_struct(FundingPot)5893_storage" + "value": "t_struct(FundingPot)6574_storage" }, - "t_mapping(t_uint256,t_struct(Payment)6112_storage)": { + "t_mapping(t_uint256,t_struct(Payment)6801_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Payment)", "numberOfBytes": "32", - "value": "t_struct(Payment)6112_storage" + "value": "t_struct(Payment)6801_storage" }, - "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)": { + "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RatingSecrets)", "numberOfBytes": "32", - "value": "t_struct(RatingSecrets)6100_storage" + "value": "t_struct(RatingSecrets)6789_storage" }, - "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)": { + "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RewardPayoutCycle)", "numberOfBytes": "32", - "value": "t_struct(RewardPayoutCycle)5833_storage" + "value": "t_struct(RewardPayoutCycle)6502_storage" }, - "t_mapping(t_uint256,t_struct(Task)6083_storage)": { + "t_mapping(t_uint256,t_struct(Task)6772_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Task)", "numberOfBytes": "32", - "value": "t_struct(Task)6083_storage" + "value": "t_struct(Task)6772_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -548,19 +563,19 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_uint256)" }, - "t_mapping(t_uint8,t_struct(Role)6091_storage)": { + "t_mapping(t_uint8,t_struct(Role)6780_storage)": { "encoding": "mapping", "key": "t_uint8", "label": "mapping(uint8 => struct ColonyDataTypes.Role)", "numberOfBytes": "32", - "value": "t_struct(Role)6091_storage" + "value": "t_struct(Role)6780_storage" }, - "t_struct(Domain)5898_storage": { + "t_struct(Domain)6579_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Domain", "members": [ { - "astId": 5895, + "astId": 6576, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "skillId", "offset": 0, @@ -568,7 +583,7 @@ "type": "t_uint256" }, { - "astId": 5897, + "astId": 6578, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "fundingPotId", "offset": 0, @@ -578,20 +593,20 @@ ], "numberOfBytes": "64" }, - "t_struct(Expenditure)5847_storage": { + "t_struct(Expenditure)6516_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Expenditure", "members": [ { - "astId": 5836, + "astId": 6505, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "status", "offset": 0, "slot": "0", - "type": "t_enum(ExpenditureStatus)5862" + "type": "t_enum(ExpenditureStatus)6531" }, { - "astId": 5838, + "astId": 6507, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "owner", "offset": 1, @@ -599,7 +614,7 @@ "type": "t_address" }, { - "astId": 5840, + "astId": 6509, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "fundingPotId", "offset": 0, @@ -607,7 +622,7 @@ "type": "t_uint256" }, { - "astId": 5842, + "astId": 6511, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "domainId", "offset": 0, @@ -615,7 +630,7 @@ "type": "t_uint256" }, { - "astId": 5844, + "astId": 6513, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "finalizedTimestamp", "offset": 0, @@ -623,7 +638,7 @@ "type": "t_uint256" }, { - "astId": 5846, + "astId": 6515, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "globalClaimDelay", "offset": 0, @@ -633,12 +648,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ExpenditureSlot)5857_storage": { + "t_struct(ExpenditureSlot)6526_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.ExpenditureSlot", "members": [ { - "astId": 5849, + "astId": 6518, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "recipient", "offset": 0, @@ -646,7 +661,7 @@ "type": "t_address_payable" }, { - "astId": 5851, + "astId": 6520, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "claimDelay", "offset": 0, @@ -654,7 +669,7 @@ "type": "t_uint256" }, { - "astId": 5853, + "astId": 6522, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "payoutModifier", "offset": 0, @@ -662,7 +677,7 @@ "type": "t_int256" }, { - "astId": 5856, + "astId": 6525, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "skills", "offset": 0, @@ -672,12 +687,12 @@ ], "numberOfBytes": "128" }, - "t_struct(FundingPot)5893_storage": { + "t_struct(FundingPot)6574_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.FundingPot", "members": [ { - "astId": 5881, + "astId": 6550, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "balance", "offset": 0, @@ -685,15 +700,15 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5884, + "astId": 6553, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "associatedType", "offset": 0, "slot": "1", - "type": "t_enum(FundingPotAssociatedType)5877" + "type": "t_enum(FundingPotAssociatedType)6546" }, { - "astId": 5886, + "astId": 6555, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "associatedTypeId", "offset": 0, @@ -701,7 +716,7 @@ "type": "t_uint256" }, { - "astId": 5890, + "astId": 6559, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "payouts", "offset": 0, @@ -709,22 +724,38 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5892, + "astId": 6561, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "payoutsWeCannotMake", "offset": 0, "slot": "4", "type": "t_uint256" + }, + { + "astId": 6567, + "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" + }, + { + "astId": 6573, + "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" } ], - "numberOfBytes": "160" + "numberOfBytes": "224" }, - "t_struct(Payment)6112_storage": { + "t_struct(Payment)6801_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Payment", "members": [ { - "astId": 6102, + "astId": 6791, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "recipient", "offset": 0, @@ -732,7 +763,7 @@ "type": "t_address_payable" }, { - "astId": 6104, + "astId": 6793, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "finalized", "offset": 20, @@ -740,7 +771,7 @@ "type": "t_bool" }, { - "astId": 6106, + "astId": 6795, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "fundingPotId", "offset": 0, @@ -748,7 +779,7 @@ "type": "t_uint256" }, { - "astId": 6108, + "astId": 6797, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "domainId", "offset": 0, @@ -756,7 +787,7 @@ "type": "t_uint256" }, { - "astId": 6111, + "astId": 6800, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "skills", "offset": 0, @@ -766,12 +797,12 @@ ], "numberOfBytes": "128" }, - "t_struct(RatingSecrets)6100_storage": { + "t_struct(RatingSecrets)6789_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RatingSecrets", "members": [ { - "astId": 6093, + "astId": 6782, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "count", "offset": 0, @@ -779,7 +810,7 @@ "type": "t_uint256" }, { - "astId": 6095, + "astId": 6784, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "timestamp", "offset": 0, @@ -787,7 +818,7 @@ "type": "t_uint256" }, { - "astId": 6099, + "astId": 6788, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "secret", "offset": 0, @@ -797,12 +828,12 @@ ], "numberOfBytes": "96" }, - "t_struct(RewardPayoutCycle)5833_storage": { + "t_struct(RewardPayoutCycle)6502_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RewardPayoutCycle", "members": [ { - "astId": 5818, + "astId": 6487, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "reputationState", "offset": 0, @@ -810,7 +841,7 @@ "type": "t_bytes32" }, { - "astId": 5820, + "astId": 6489, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "colonyWideReputation", "offset": 0, @@ -818,7 +849,7 @@ "type": "t_uint256" }, { - "astId": 5822, + "astId": 6491, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "totalTokens", "offset": 0, @@ -826,7 +857,7 @@ "type": "t_uint256" }, { - "astId": 5824, + "astId": 6493, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "amount", "offset": 0, @@ -834,7 +865,7 @@ "type": "t_uint256" }, { - "astId": 5826, + "astId": 6495, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "tokenAddress", "offset": 0, @@ -842,7 +873,7 @@ "type": "t_address" }, { - "astId": 5828, + "astId": 6497, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "blockTimestamp", "offset": 0, @@ -850,7 +881,7 @@ "type": "t_uint256" }, { - "astId": 5830, + "astId": 6499, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "amountRemaining", "offset": 0, @@ -858,7 +889,7 @@ "type": "t_uint256" }, { - "astId": 5832, + "astId": 6501, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "finalized", "offset": 0, @@ -868,12 +899,12 @@ ], "numberOfBytes": "256" }, - "t_struct(Role)6091_storage": { + "t_struct(Role)6780_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Role", "members": [ { - "astId": 6085, + "astId": 6774, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "user", "offset": 0, @@ -881,7 +912,7 @@ "type": "t_address_payable" }, { - "astId": 6087, + "astId": 6776, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "rateFail", "offset": 20, @@ -889,22 +920,22 @@ "type": "t_bool" }, { - "astId": 6090, + "astId": 6779, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "rating", "offset": 21, "slot": "0", - "type": "t_enum(TaskRatings)6045" + "type": "t_enum(TaskRatings)6734" } ], "numberOfBytes": "32" }, - "t_struct(Task)6083_storage": { + "t_struct(Task)6772_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Task", "members": [ { - "astId": 6055, + "astId": 6744, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "specificationHash", "offset": 0, @@ -912,7 +943,7 @@ "type": "t_bytes32" }, { - "astId": 6057, + "astId": 6746, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "deliverableHash", "offset": 0, @@ -920,15 +951,15 @@ "type": "t_bytes32" }, { - "astId": 6060, + "astId": 6749, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "status", "offset": 0, "slot": "2", - "type": "t_enum(TaskStatus)6053" + "type": "t_enum(TaskStatus)6742" }, { - "astId": 6062, + "astId": 6751, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "dueDate", "offset": 0, @@ -936,7 +967,7 @@ "type": "t_uint256" }, { - "astId": 6064, + "astId": 6753, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "fundingPotId", "offset": 0, @@ -944,7 +975,7 @@ "type": "t_uint256" }, { - "astId": 6066, + "astId": 6755, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "completionTimestamp", "offset": 0, @@ -952,7 +983,7 @@ "type": "t_uint256" }, { - "astId": 6068, + "astId": 6757, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "domainId", "offset": 0, @@ -960,7 +991,7 @@ "type": "t_uint256" }, { - "astId": 6071, + "astId": 6760, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "skills", "offset": 0, @@ -968,15 +999,15 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 6076, + "astId": 6765, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "roles", "offset": 0, "slot": "8", - "type": "t_mapping(t_uint8,t_struct(Role)6091_storage)" + "type": "t_mapping(t_uint8,t_struct(Role)6780_storage)" }, { - "astId": 6082, + "astId": 6771, "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure", "label": "payouts", "offset": 0, diff --git a/.storage-layouts/contracts/colony/ColonyFunding.sol:ColonyFunding.json b/.storage-layouts/contracts/colony/ColonyFunding.sol:ColonyFunding.json index d880927ca7..56123f2d02 100644 --- a/.storage-layouts/contracts/colony/ColonyFunding.sol:ColonyFunding.json +++ b/.storage-layouts/contracts/colony/ColonyFunding.sol:ColonyFunding.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10724, + "astId": 11718, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "colonyNetworkAddress", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_address" }, { - "astId": 10726, + "astId": 11720, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "token", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_address" }, { - "astId": 10728, + "astId": 11722, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "rewardInverse", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 10730, + "astId": 11724, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "DEPRECATED_taskCount", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 10732, + "astId": 11726, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "fundingPotCount", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 10734, + "astId": 11728, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "domainCount", "offset": 0, @@ -113,15 +113,15 @@ "type": "t_uint256" }, { - "astId": 10741, + "astId": 11735, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "DEPRECATED_reviewers", "offset": 0, "slot": "12", - "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)" + "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)" }, { - "astId": 10745, + "astId": 11739, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "DEPRECATED_roleAssignmentSigs", "offset": 0, @@ -129,31 +129,31 @@ "type": "t_mapping(t_bytes4,t_bool)" }, { - "astId": 10750, + "astId": 11744, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "DEPRECATED_tasks", "offset": 0, "slot": "14", - "type": "t_mapping(t_uint256,t_struct(Task)6083_storage)" + "type": "t_mapping(t_uint256,t_struct(Task)6772_storage)" }, { - "astId": 10755, + "astId": 11749, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "fundingPots", "offset": 0, "slot": "15", - "type": "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)" + "type": "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)" }, { - "astId": 10760, + "astId": 11754, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "rewardPayoutCycles", "offset": 0, "slot": "16", - "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)" + "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)" }, { - "astId": 10764, + "astId": 11758, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "pendingRewardPayments", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10768, + "astId": 11762, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "nonRewardPotsTotal", "offset": 0, @@ -169,23 +169,23 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10773, + "astId": 11767, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "DEPRECATED_taskWorkRatings", "offset": 0, "slot": "19", - "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)" + "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)" }, { - "astId": 10778, + "astId": 11772, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "domains", "offset": 0, "slot": "20", - "type": "t_mapping(t_uint256,t_struct(Domain)5898_storage)" + "type": "t_mapping(t_uint256,t_struct(Domain)6579_storage)" }, { - "astId": 10782, + "astId": 11776, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "DEPRECATED_taskChangeNonces", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 10784, + "astId": 11778, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "DEPRECATED_paymentCount", "offset": 0, @@ -201,15 +201,15 @@ "type": "t_uint256" }, { - "astId": 10789, + "astId": 11783, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "DEPRECATED_payments", "offset": 0, "slot": "23", - "type": "t_mapping(t_uint256,t_struct(Payment)6112_storage)" + "type": "t_mapping(t_uint256,t_struct(Payment)6801_storage)" }, { - "astId": 10791, + "astId": 11785, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "expenditureCount", "offset": 0, @@ -217,23 +217,23 @@ "type": "t_uint256" }, { - "astId": 10796, + "astId": 11790, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "expenditures", "offset": 0, "slot": "25", - "type": "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)" + "type": "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)" }, { - "astId": 10803, + "astId": 11797, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "expenditureSlots", "offset": 0, "slot": "26", - "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))" + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))" }, { - "astId": 10811, + "astId": 11805, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "expenditureSlotPayouts", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" }, { - "astId": 10819, + "astId": 11813, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "approvals", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10827, + "astId": 11821, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "obligations", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10829, + "astId": 11823, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "tokenLockingAddress", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_address" }, { - "astId": 10835, + "astId": 11829, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "tokenLocks", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 10841, + "astId": 11835, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "tokenApprovals", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))" }, { - "astId": 10845, + "astId": 11839, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "tokenApprovalTotals", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10847, + "astId": 11841, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "defaultGlobalClaimDelay", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 10854, + "astId": 11848, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "metatransactionNonces", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10856, + "astId": 11850, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "rootLocalSkill", "offset": 0, @@ -313,12 +313,20 @@ "type": "t_uint256" }, { - "astId": 10860, + "astId": 11854, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "localSkills", "offset": 0, "slot": "37", "type": "t_mapping(t_uint256,t_bool)" + }, + { + "astId": 11864, + "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))" } ], "types": { @@ -332,8 +340,8 @@ "label": "address payable", "numberOfBytes": "20" }, - "t_array(t_enum(TaskRole)6049)2_storage": { - "base": "t_enum(TaskRole)6049", + "t_array(t_enum(TaskRole)6738)2_storage": { + "base": "t_enum(TaskRole)6738", "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole[2]", "numberOfBytes": "32" @@ -359,32 +367,32 @@ "label": "bytes4", "numberOfBytes": "4" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_enum(ExpenditureStatus)5862": { + "t_enum(ExpenditureStatus)6531": { "encoding": "inplace", "label": "enum ColonyDataTypes.ExpenditureStatus", "numberOfBytes": "1" }, - "t_enum(FundingPotAssociatedType)5877": { + "t_enum(FundingPotAssociatedType)6546": { "encoding": "inplace", "label": "enum ColonyDataTypes.FundingPotAssociatedType", "numberOfBytes": "1" }, - "t_enum(TaskRatings)6045": { + "t_enum(TaskRatings)6734": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRatings", "numberOfBytes": "1" }, - "t_enum(TaskRole)6049": { + "t_enum(TaskRole)6738": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole", "numberOfBytes": "1" }, - "t_enum(TaskStatus)6053": { + "t_enum(TaskStatus)6742": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskStatus", "numberOfBytes": "1" @@ -429,12 +437,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)": { + "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)": { "encoding": "mapping", "key": "t_bytes4", "label": "mapping(bytes4 => enum ColonyDataTypes.TaskRole[2])", "numberOfBytes": "32", - "value": "t_array(t_enum(TaskRole)6049)2_storage" + "value": "t_array(t_enum(TaskRole)6738)2_storage" }, "t_mapping(t_bytes4,t_bool)": { "encoding": "mapping", @@ -464,68 +472,75 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, - "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))": { + "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))": { + "encoding": "mapping", + "key": "t_uint256", + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" + }, + "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)" + "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)" }, - "t_mapping(t_uint256,t_struct(Domain)5898_storage)": { + "t_mapping(t_uint256,t_struct(Domain)6579_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Domain)", "numberOfBytes": "32", - "value": "t_struct(Domain)5898_storage" + "value": "t_struct(Domain)6579_storage" }, - "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)": { + "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Expenditure)", "numberOfBytes": "32", - "value": "t_struct(Expenditure)5847_storage" + "value": "t_struct(Expenditure)6516_storage" }, - "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)": { + "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot)", "numberOfBytes": "32", - "value": "t_struct(ExpenditureSlot)5857_storage" + "value": "t_struct(ExpenditureSlot)6526_storage" }, - "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)": { + "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.FundingPot)", "numberOfBytes": "32", - "value": "t_struct(FundingPot)5893_storage" + "value": "t_struct(FundingPot)6574_storage" }, - "t_mapping(t_uint256,t_struct(Payment)6112_storage)": { + "t_mapping(t_uint256,t_struct(Payment)6801_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Payment)", "numberOfBytes": "32", - "value": "t_struct(Payment)6112_storage" + "value": "t_struct(Payment)6801_storage" }, - "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)": { + "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RatingSecrets)", "numberOfBytes": "32", - "value": "t_struct(RatingSecrets)6100_storage" + "value": "t_struct(RatingSecrets)6789_storage" }, - "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)": { + "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RewardPayoutCycle)", "numberOfBytes": "32", - "value": "t_struct(RewardPayoutCycle)5833_storage" + "value": "t_struct(RewardPayoutCycle)6502_storage" }, - "t_mapping(t_uint256,t_struct(Task)6083_storage)": { + "t_mapping(t_uint256,t_struct(Task)6772_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Task)", "numberOfBytes": "32", - "value": "t_struct(Task)6083_storage" + "value": "t_struct(Task)6772_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -548,19 +563,19 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_uint256)" }, - "t_mapping(t_uint8,t_struct(Role)6091_storage)": { + "t_mapping(t_uint8,t_struct(Role)6780_storage)": { "encoding": "mapping", "key": "t_uint8", "label": "mapping(uint8 => struct ColonyDataTypes.Role)", "numberOfBytes": "32", - "value": "t_struct(Role)6091_storage" + "value": "t_struct(Role)6780_storage" }, - "t_struct(Domain)5898_storage": { + "t_struct(Domain)6579_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Domain", "members": [ { - "astId": 5895, + "astId": 6576, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "skillId", "offset": 0, @@ -568,7 +583,7 @@ "type": "t_uint256" }, { - "astId": 5897, + "astId": 6578, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "fundingPotId", "offset": 0, @@ -578,20 +593,20 @@ ], "numberOfBytes": "64" }, - "t_struct(Expenditure)5847_storage": { + "t_struct(Expenditure)6516_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Expenditure", "members": [ { - "astId": 5836, + "astId": 6505, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "status", "offset": 0, "slot": "0", - "type": "t_enum(ExpenditureStatus)5862" + "type": "t_enum(ExpenditureStatus)6531" }, { - "astId": 5838, + "astId": 6507, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "owner", "offset": 1, @@ -599,7 +614,7 @@ "type": "t_address" }, { - "astId": 5840, + "astId": 6509, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "fundingPotId", "offset": 0, @@ -607,7 +622,7 @@ "type": "t_uint256" }, { - "astId": 5842, + "astId": 6511, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "domainId", "offset": 0, @@ -615,7 +630,7 @@ "type": "t_uint256" }, { - "astId": 5844, + "astId": 6513, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "finalizedTimestamp", "offset": 0, @@ -623,7 +638,7 @@ "type": "t_uint256" }, { - "astId": 5846, + "astId": 6515, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "globalClaimDelay", "offset": 0, @@ -633,12 +648,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ExpenditureSlot)5857_storage": { + "t_struct(ExpenditureSlot)6526_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.ExpenditureSlot", "members": [ { - "astId": 5849, + "astId": 6518, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "recipient", "offset": 0, @@ -646,7 +661,7 @@ "type": "t_address_payable" }, { - "astId": 5851, + "astId": 6520, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "claimDelay", "offset": 0, @@ -654,7 +669,7 @@ "type": "t_uint256" }, { - "astId": 5853, + "astId": 6522, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "payoutModifier", "offset": 0, @@ -662,7 +677,7 @@ "type": "t_int256" }, { - "astId": 5856, + "astId": 6525, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "skills", "offset": 0, @@ -672,12 +687,12 @@ ], "numberOfBytes": "128" }, - "t_struct(FundingPot)5893_storage": { + "t_struct(FundingPot)6574_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.FundingPot", "members": [ { - "astId": 5881, + "astId": 6550, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "balance", "offset": 0, @@ -685,15 +700,15 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5884, + "astId": 6553, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "associatedType", "offset": 0, "slot": "1", - "type": "t_enum(FundingPotAssociatedType)5877" + "type": "t_enum(FundingPotAssociatedType)6546" }, { - "astId": 5886, + "astId": 6555, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "associatedTypeId", "offset": 0, @@ -701,7 +716,7 @@ "type": "t_uint256" }, { - "astId": 5890, + "astId": 6559, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "payouts", "offset": 0, @@ -709,22 +724,38 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5892, + "astId": 6561, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "payoutsWeCannotMake", "offset": 0, "slot": "4", "type": "t_uint256" + }, + { + "astId": 6567, + "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" + }, + { + "astId": 6573, + "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" } ], - "numberOfBytes": "160" + "numberOfBytes": "224" }, - "t_struct(Payment)6112_storage": { + "t_struct(Payment)6801_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Payment", "members": [ { - "astId": 6102, + "astId": 6791, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "recipient", "offset": 0, @@ -732,7 +763,7 @@ "type": "t_address_payable" }, { - "astId": 6104, + "astId": 6793, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "finalized", "offset": 20, @@ -740,7 +771,7 @@ "type": "t_bool" }, { - "astId": 6106, + "astId": 6795, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "fundingPotId", "offset": 0, @@ -748,7 +779,7 @@ "type": "t_uint256" }, { - "astId": 6108, + "astId": 6797, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "domainId", "offset": 0, @@ -756,7 +787,7 @@ "type": "t_uint256" }, { - "astId": 6111, + "astId": 6800, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "skills", "offset": 0, @@ -766,12 +797,12 @@ ], "numberOfBytes": "128" }, - "t_struct(RatingSecrets)6100_storage": { + "t_struct(RatingSecrets)6789_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RatingSecrets", "members": [ { - "astId": 6093, + "astId": 6782, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "count", "offset": 0, @@ -779,7 +810,7 @@ "type": "t_uint256" }, { - "astId": 6095, + "astId": 6784, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "timestamp", "offset": 0, @@ -787,7 +818,7 @@ "type": "t_uint256" }, { - "astId": 6099, + "astId": 6788, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "secret", "offset": 0, @@ -797,12 +828,12 @@ ], "numberOfBytes": "96" }, - "t_struct(RewardPayoutCycle)5833_storage": { + "t_struct(RewardPayoutCycle)6502_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RewardPayoutCycle", "members": [ { - "astId": 5818, + "astId": 6487, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "reputationState", "offset": 0, @@ -810,7 +841,7 @@ "type": "t_bytes32" }, { - "astId": 5820, + "astId": 6489, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "colonyWideReputation", "offset": 0, @@ -818,7 +849,7 @@ "type": "t_uint256" }, { - "astId": 5822, + "astId": 6491, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "totalTokens", "offset": 0, @@ -826,7 +857,7 @@ "type": "t_uint256" }, { - "astId": 5824, + "astId": 6493, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "amount", "offset": 0, @@ -834,7 +865,7 @@ "type": "t_uint256" }, { - "astId": 5826, + "astId": 6495, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "tokenAddress", "offset": 0, @@ -842,7 +873,7 @@ "type": "t_address" }, { - "astId": 5828, + "astId": 6497, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "blockTimestamp", "offset": 0, @@ -850,7 +881,7 @@ "type": "t_uint256" }, { - "astId": 5830, + "astId": 6499, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "amountRemaining", "offset": 0, @@ -858,7 +889,7 @@ "type": "t_uint256" }, { - "astId": 5832, + "astId": 6501, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "finalized", "offset": 0, @@ -868,12 +899,12 @@ ], "numberOfBytes": "256" }, - "t_struct(Role)6091_storage": { + "t_struct(Role)6780_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Role", "members": [ { - "astId": 6085, + "astId": 6774, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "user", "offset": 0, @@ -881,7 +912,7 @@ "type": "t_address_payable" }, { - "astId": 6087, + "astId": 6776, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "rateFail", "offset": 20, @@ -889,22 +920,22 @@ "type": "t_bool" }, { - "astId": 6090, + "astId": 6779, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "rating", "offset": 21, "slot": "0", - "type": "t_enum(TaskRatings)6045" + "type": "t_enum(TaskRatings)6734" } ], "numberOfBytes": "32" }, - "t_struct(Task)6083_storage": { + "t_struct(Task)6772_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Task", "members": [ { - "astId": 6055, + "astId": 6744, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "specificationHash", "offset": 0, @@ -912,7 +943,7 @@ "type": "t_bytes32" }, { - "astId": 6057, + "astId": 6746, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "deliverableHash", "offset": 0, @@ -920,15 +951,15 @@ "type": "t_bytes32" }, { - "astId": 6060, + "astId": 6749, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "status", "offset": 0, "slot": "2", - "type": "t_enum(TaskStatus)6053" + "type": "t_enum(TaskStatus)6742" }, { - "astId": 6062, + "astId": 6751, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "dueDate", "offset": 0, @@ -936,7 +967,7 @@ "type": "t_uint256" }, { - "astId": 6064, + "astId": 6753, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "fundingPotId", "offset": 0, @@ -944,7 +975,7 @@ "type": "t_uint256" }, { - "astId": 6066, + "astId": 6755, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "completionTimestamp", "offset": 0, @@ -952,7 +983,7 @@ "type": "t_uint256" }, { - "astId": 6068, + "astId": 6757, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "domainId", "offset": 0, @@ -960,7 +991,7 @@ "type": "t_uint256" }, { - "astId": 6071, + "astId": 6760, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "skills", "offset": 0, @@ -968,15 +999,15 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 6076, + "astId": 6765, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "roles", "offset": 0, "slot": "8", - "type": "t_mapping(t_uint8,t_struct(Role)6091_storage)" + "type": "t_mapping(t_uint8,t_struct(Role)6780_storage)" }, { - "astId": 6082, + "astId": 6771, "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding", "label": "payouts", "offset": 0, diff --git a/.storage-layouts/contracts/colony/ColonyRewards.sol:ColonyRewards.json b/.storage-layouts/contracts/colony/ColonyRewards.sol:ColonyRewards.json index 39df96f803..ac9bcb2e8e 100644 --- a/.storage-layouts/contracts/colony/ColonyRewards.sol:ColonyRewards.json +++ b/.storage-layouts/contracts/colony/ColonyRewards.sol:ColonyRewards.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10724, + "astId": 11718, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "colonyNetworkAddress", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_address" }, { - "astId": 10726, + "astId": 11720, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "token", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_address" }, { - "astId": 10728, + "astId": 11722, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "rewardInverse", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 10730, + "astId": 11724, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "DEPRECATED_taskCount", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 10732, + "astId": 11726, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "fundingPotCount", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 10734, + "astId": 11728, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "domainCount", "offset": 0, @@ -113,15 +113,15 @@ "type": "t_uint256" }, { - "astId": 10741, + "astId": 11735, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "DEPRECATED_reviewers", "offset": 0, "slot": "12", - "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)" + "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)" }, { - "astId": 10745, + "astId": 11739, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "DEPRECATED_roleAssignmentSigs", "offset": 0, @@ -129,31 +129,31 @@ "type": "t_mapping(t_bytes4,t_bool)" }, { - "astId": 10750, + "astId": 11744, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "DEPRECATED_tasks", "offset": 0, "slot": "14", - "type": "t_mapping(t_uint256,t_struct(Task)6083_storage)" + "type": "t_mapping(t_uint256,t_struct(Task)6772_storage)" }, { - "astId": 10755, + "astId": 11749, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "fundingPots", "offset": 0, "slot": "15", - "type": "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)" + "type": "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)" }, { - "astId": 10760, + "astId": 11754, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "rewardPayoutCycles", "offset": 0, "slot": "16", - "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)" + "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)" }, { - "astId": 10764, + "astId": 11758, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "pendingRewardPayments", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10768, + "astId": 11762, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "nonRewardPotsTotal", "offset": 0, @@ -169,23 +169,23 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10773, + "astId": 11767, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "DEPRECATED_taskWorkRatings", "offset": 0, "slot": "19", - "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)" + "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)" }, { - "astId": 10778, + "astId": 11772, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "domains", "offset": 0, "slot": "20", - "type": "t_mapping(t_uint256,t_struct(Domain)5898_storage)" + "type": "t_mapping(t_uint256,t_struct(Domain)6579_storage)" }, { - "astId": 10782, + "astId": 11776, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "DEPRECATED_taskChangeNonces", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 10784, + "astId": 11778, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "DEPRECATED_paymentCount", "offset": 0, @@ -201,15 +201,15 @@ "type": "t_uint256" }, { - "astId": 10789, + "astId": 11783, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "DEPRECATED_payments", "offset": 0, "slot": "23", - "type": "t_mapping(t_uint256,t_struct(Payment)6112_storage)" + "type": "t_mapping(t_uint256,t_struct(Payment)6801_storage)" }, { - "astId": 10791, + "astId": 11785, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "expenditureCount", "offset": 0, @@ -217,23 +217,23 @@ "type": "t_uint256" }, { - "astId": 10796, + "astId": 11790, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "expenditures", "offset": 0, "slot": "25", - "type": "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)" + "type": "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)" }, { - "astId": 10803, + "astId": 11797, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "expenditureSlots", "offset": 0, "slot": "26", - "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))" + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))" }, { - "astId": 10811, + "astId": 11805, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "expenditureSlotPayouts", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" }, { - "astId": 10819, + "astId": 11813, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "approvals", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10827, + "astId": 11821, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "obligations", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10829, + "astId": 11823, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "tokenLockingAddress", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_address" }, { - "astId": 10835, + "astId": 11829, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "tokenLocks", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 10841, + "astId": 11835, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "tokenApprovals", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))" }, { - "astId": 10845, + "astId": 11839, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "tokenApprovalTotals", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10847, + "astId": 11841, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "defaultGlobalClaimDelay", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 10854, + "astId": 11848, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "metatransactionNonces", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10856, + "astId": 11850, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "rootLocalSkill", "offset": 0, @@ -313,12 +313,20 @@ "type": "t_uint256" }, { - "astId": 10860, + "astId": 11854, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "localSkills", "offset": 0, "slot": "37", "type": "t_mapping(t_uint256,t_bool)" + }, + { + "astId": 11864, + "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))" } ], "types": { @@ -332,8 +340,8 @@ "label": "address payable", "numberOfBytes": "20" }, - "t_array(t_enum(TaskRole)6049)2_storage": { - "base": "t_enum(TaskRole)6049", + "t_array(t_enum(TaskRole)6738)2_storage": { + "base": "t_enum(TaskRole)6738", "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole[2]", "numberOfBytes": "32" @@ -359,32 +367,32 @@ "label": "bytes4", "numberOfBytes": "4" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_enum(ExpenditureStatus)5862": { + "t_enum(ExpenditureStatus)6531": { "encoding": "inplace", "label": "enum ColonyDataTypes.ExpenditureStatus", "numberOfBytes": "1" }, - "t_enum(FundingPotAssociatedType)5877": { + "t_enum(FundingPotAssociatedType)6546": { "encoding": "inplace", "label": "enum ColonyDataTypes.FundingPotAssociatedType", "numberOfBytes": "1" }, - "t_enum(TaskRatings)6045": { + "t_enum(TaskRatings)6734": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRatings", "numberOfBytes": "1" }, - "t_enum(TaskRole)6049": { + "t_enum(TaskRole)6738": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole", "numberOfBytes": "1" }, - "t_enum(TaskStatus)6053": { + "t_enum(TaskStatus)6742": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskStatus", "numberOfBytes": "1" @@ -429,12 +437,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)": { + "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)": { "encoding": "mapping", "key": "t_bytes4", "label": "mapping(bytes4 => enum ColonyDataTypes.TaskRole[2])", "numberOfBytes": "32", - "value": "t_array(t_enum(TaskRole)6049)2_storage" + "value": "t_array(t_enum(TaskRole)6738)2_storage" }, "t_mapping(t_bytes4,t_bool)": { "encoding": "mapping", @@ -464,68 +472,75 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, - "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))": { + "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))": { + "encoding": "mapping", + "key": "t_uint256", + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" + }, + "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)" + "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)" }, - "t_mapping(t_uint256,t_struct(Domain)5898_storage)": { + "t_mapping(t_uint256,t_struct(Domain)6579_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Domain)", "numberOfBytes": "32", - "value": "t_struct(Domain)5898_storage" + "value": "t_struct(Domain)6579_storage" }, - "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)": { + "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Expenditure)", "numberOfBytes": "32", - "value": "t_struct(Expenditure)5847_storage" + "value": "t_struct(Expenditure)6516_storage" }, - "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)": { + "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot)", "numberOfBytes": "32", - "value": "t_struct(ExpenditureSlot)5857_storage" + "value": "t_struct(ExpenditureSlot)6526_storage" }, - "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)": { + "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.FundingPot)", "numberOfBytes": "32", - "value": "t_struct(FundingPot)5893_storage" + "value": "t_struct(FundingPot)6574_storage" }, - "t_mapping(t_uint256,t_struct(Payment)6112_storage)": { + "t_mapping(t_uint256,t_struct(Payment)6801_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Payment)", "numberOfBytes": "32", - "value": "t_struct(Payment)6112_storage" + "value": "t_struct(Payment)6801_storage" }, - "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)": { + "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RatingSecrets)", "numberOfBytes": "32", - "value": "t_struct(RatingSecrets)6100_storage" + "value": "t_struct(RatingSecrets)6789_storage" }, - "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)": { + "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RewardPayoutCycle)", "numberOfBytes": "32", - "value": "t_struct(RewardPayoutCycle)5833_storage" + "value": "t_struct(RewardPayoutCycle)6502_storage" }, - "t_mapping(t_uint256,t_struct(Task)6083_storage)": { + "t_mapping(t_uint256,t_struct(Task)6772_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Task)", "numberOfBytes": "32", - "value": "t_struct(Task)6083_storage" + "value": "t_struct(Task)6772_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -548,19 +563,19 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_uint256)" }, - "t_mapping(t_uint8,t_struct(Role)6091_storage)": { + "t_mapping(t_uint8,t_struct(Role)6780_storage)": { "encoding": "mapping", "key": "t_uint8", "label": "mapping(uint8 => struct ColonyDataTypes.Role)", "numberOfBytes": "32", - "value": "t_struct(Role)6091_storage" + "value": "t_struct(Role)6780_storage" }, - "t_struct(Domain)5898_storage": { + "t_struct(Domain)6579_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Domain", "members": [ { - "astId": 5895, + "astId": 6576, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "skillId", "offset": 0, @@ -568,7 +583,7 @@ "type": "t_uint256" }, { - "astId": 5897, + "astId": 6578, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "fundingPotId", "offset": 0, @@ -578,20 +593,20 @@ ], "numberOfBytes": "64" }, - "t_struct(Expenditure)5847_storage": { + "t_struct(Expenditure)6516_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Expenditure", "members": [ { - "astId": 5836, + "astId": 6505, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "status", "offset": 0, "slot": "0", - "type": "t_enum(ExpenditureStatus)5862" + "type": "t_enum(ExpenditureStatus)6531" }, { - "astId": 5838, + "astId": 6507, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "owner", "offset": 1, @@ -599,7 +614,7 @@ "type": "t_address" }, { - "astId": 5840, + "astId": 6509, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "fundingPotId", "offset": 0, @@ -607,7 +622,7 @@ "type": "t_uint256" }, { - "astId": 5842, + "astId": 6511, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "domainId", "offset": 0, @@ -615,7 +630,7 @@ "type": "t_uint256" }, { - "astId": 5844, + "astId": 6513, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "finalizedTimestamp", "offset": 0, @@ -623,7 +638,7 @@ "type": "t_uint256" }, { - "astId": 5846, + "astId": 6515, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "globalClaimDelay", "offset": 0, @@ -633,12 +648,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ExpenditureSlot)5857_storage": { + "t_struct(ExpenditureSlot)6526_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.ExpenditureSlot", "members": [ { - "astId": 5849, + "astId": 6518, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "recipient", "offset": 0, @@ -646,7 +661,7 @@ "type": "t_address_payable" }, { - "astId": 5851, + "astId": 6520, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "claimDelay", "offset": 0, @@ -654,7 +669,7 @@ "type": "t_uint256" }, { - "astId": 5853, + "astId": 6522, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "payoutModifier", "offset": 0, @@ -662,7 +677,7 @@ "type": "t_int256" }, { - "astId": 5856, + "astId": 6525, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "skills", "offset": 0, @@ -672,12 +687,12 @@ ], "numberOfBytes": "128" }, - "t_struct(FundingPot)5893_storage": { + "t_struct(FundingPot)6574_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.FundingPot", "members": [ { - "astId": 5881, + "astId": 6550, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "balance", "offset": 0, @@ -685,15 +700,15 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5884, + "astId": 6553, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "associatedType", "offset": 0, "slot": "1", - "type": "t_enum(FundingPotAssociatedType)5877" + "type": "t_enum(FundingPotAssociatedType)6546" }, { - "astId": 5886, + "astId": 6555, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "associatedTypeId", "offset": 0, @@ -701,7 +716,7 @@ "type": "t_uint256" }, { - "astId": 5890, + "astId": 6559, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "payouts", "offset": 0, @@ -709,22 +724,38 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5892, + "astId": 6561, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "payoutsWeCannotMake", "offset": 0, "slot": "4", "type": "t_uint256" + }, + { + "astId": 6567, + "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" + }, + { + "astId": 6573, + "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" } ], - "numberOfBytes": "160" + "numberOfBytes": "224" }, - "t_struct(Payment)6112_storage": { + "t_struct(Payment)6801_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Payment", "members": [ { - "astId": 6102, + "astId": 6791, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "recipient", "offset": 0, @@ -732,7 +763,7 @@ "type": "t_address_payable" }, { - "astId": 6104, + "astId": 6793, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "finalized", "offset": 20, @@ -740,7 +771,7 @@ "type": "t_bool" }, { - "astId": 6106, + "astId": 6795, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "fundingPotId", "offset": 0, @@ -748,7 +779,7 @@ "type": "t_uint256" }, { - "astId": 6108, + "astId": 6797, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "domainId", "offset": 0, @@ -756,7 +787,7 @@ "type": "t_uint256" }, { - "astId": 6111, + "astId": 6800, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "skills", "offset": 0, @@ -766,12 +797,12 @@ ], "numberOfBytes": "128" }, - "t_struct(RatingSecrets)6100_storage": { + "t_struct(RatingSecrets)6789_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RatingSecrets", "members": [ { - "astId": 6093, + "astId": 6782, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "count", "offset": 0, @@ -779,7 +810,7 @@ "type": "t_uint256" }, { - "astId": 6095, + "astId": 6784, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "timestamp", "offset": 0, @@ -787,7 +818,7 @@ "type": "t_uint256" }, { - "astId": 6099, + "astId": 6788, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "secret", "offset": 0, @@ -797,12 +828,12 @@ ], "numberOfBytes": "96" }, - "t_struct(RewardPayoutCycle)5833_storage": { + "t_struct(RewardPayoutCycle)6502_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RewardPayoutCycle", "members": [ { - "astId": 5818, + "astId": 6487, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "reputationState", "offset": 0, @@ -810,7 +841,7 @@ "type": "t_bytes32" }, { - "astId": 5820, + "astId": 6489, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "colonyWideReputation", "offset": 0, @@ -818,7 +849,7 @@ "type": "t_uint256" }, { - "astId": 5822, + "astId": 6491, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "totalTokens", "offset": 0, @@ -826,7 +857,7 @@ "type": "t_uint256" }, { - "astId": 5824, + "astId": 6493, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "amount", "offset": 0, @@ -834,7 +865,7 @@ "type": "t_uint256" }, { - "astId": 5826, + "astId": 6495, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "tokenAddress", "offset": 0, @@ -842,7 +873,7 @@ "type": "t_address" }, { - "astId": 5828, + "astId": 6497, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "blockTimestamp", "offset": 0, @@ -850,7 +881,7 @@ "type": "t_uint256" }, { - "astId": 5830, + "astId": 6499, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "amountRemaining", "offset": 0, @@ -858,7 +889,7 @@ "type": "t_uint256" }, { - "astId": 5832, + "astId": 6501, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "finalized", "offset": 0, @@ -868,12 +899,12 @@ ], "numberOfBytes": "256" }, - "t_struct(Role)6091_storage": { + "t_struct(Role)6780_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Role", "members": [ { - "astId": 6085, + "astId": 6774, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "user", "offset": 0, @@ -881,7 +912,7 @@ "type": "t_address_payable" }, { - "astId": 6087, + "astId": 6776, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "rateFail", "offset": 20, @@ -889,22 +920,22 @@ "type": "t_bool" }, { - "astId": 6090, + "astId": 6779, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "rating", "offset": 21, "slot": "0", - "type": "t_enum(TaskRatings)6045" + "type": "t_enum(TaskRatings)6734" } ], "numberOfBytes": "32" }, - "t_struct(Task)6083_storage": { + "t_struct(Task)6772_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Task", "members": [ { - "astId": 6055, + "astId": 6744, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "specificationHash", "offset": 0, @@ -912,7 +943,7 @@ "type": "t_bytes32" }, { - "astId": 6057, + "astId": 6746, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "deliverableHash", "offset": 0, @@ -920,15 +951,15 @@ "type": "t_bytes32" }, { - "astId": 6060, + "astId": 6749, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "status", "offset": 0, "slot": "2", - "type": "t_enum(TaskStatus)6053" + "type": "t_enum(TaskStatus)6742" }, { - "astId": 6062, + "astId": 6751, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "dueDate", "offset": 0, @@ -936,7 +967,7 @@ "type": "t_uint256" }, { - "astId": 6064, + "astId": 6753, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "fundingPotId", "offset": 0, @@ -944,7 +975,7 @@ "type": "t_uint256" }, { - "astId": 6066, + "astId": 6755, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "completionTimestamp", "offset": 0, @@ -952,7 +983,7 @@ "type": "t_uint256" }, { - "astId": 6068, + "astId": 6757, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "domainId", "offset": 0, @@ -960,7 +991,7 @@ "type": "t_uint256" }, { - "astId": 6071, + "astId": 6760, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "skills", "offset": 0, @@ -968,15 +999,15 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 6076, + "astId": 6765, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "roles", "offset": 0, "slot": "8", - "type": "t_mapping(t_uint8,t_struct(Role)6091_storage)" + "type": "t_mapping(t_uint8,t_struct(Role)6780_storage)" }, { - "astId": 6082, + "astId": 6771, "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards", "label": "payouts", "offset": 0, diff --git a/.storage-layouts/contracts/colony/ColonyRoles.sol:ColonyRoles.json b/.storage-layouts/contracts/colony/ColonyRoles.sol:ColonyRoles.json index eacf7cf53f..01e4a711db 100644 --- a/.storage-layouts/contracts/colony/ColonyRoles.sol:ColonyRoles.json +++ b/.storage-layouts/contracts/colony/ColonyRoles.sol:ColonyRoles.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10724, + "astId": 11718, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "colonyNetworkAddress", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_address" }, { - "astId": 10726, + "astId": 11720, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "token", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_address" }, { - "astId": 10728, + "astId": 11722, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "rewardInverse", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 10730, + "astId": 11724, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "DEPRECATED_taskCount", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 10732, + "astId": 11726, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "fundingPotCount", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 10734, + "astId": 11728, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "domainCount", "offset": 0, @@ -113,15 +113,15 @@ "type": "t_uint256" }, { - "astId": 10741, + "astId": 11735, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "DEPRECATED_reviewers", "offset": 0, "slot": "12", - "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)" + "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)" }, { - "astId": 10745, + "astId": 11739, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "DEPRECATED_roleAssignmentSigs", "offset": 0, @@ -129,31 +129,31 @@ "type": "t_mapping(t_bytes4,t_bool)" }, { - "astId": 10750, + "astId": 11744, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "DEPRECATED_tasks", "offset": 0, "slot": "14", - "type": "t_mapping(t_uint256,t_struct(Task)6083_storage)" + "type": "t_mapping(t_uint256,t_struct(Task)6772_storage)" }, { - "astId": 10755, + "astId": 11749, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "fundingPots", "offset": 0, "slot": "15", - "type": "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)" + "type": "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)" }, { - "astId": 10760, + "astId": 11754, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "rewardPayoutCycles", "offset": 0, "slot": "16", - "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)" + "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)" }, { - "astId": 10764, + "astId": 11758, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "pendingRewardPayments", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10768, + "astId": 11762, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "nonRewardPotsTotal", "offset": 0, @@ -169,23 +169,23 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10773, + "astId": 11767, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "DEPRECATED_taskWorkRatings", "offset": 0, "slot": "19", - "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)" + "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)" }, { - "astId": 10778, + "astId": 11772, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "domains", "offset": 0, "slot": "20", - "type": "t_mapping(t_uint256,t_struct(Domain)5898_storage)" + "type": "t_mapping(t_uint256,t_struct(Domain)6579_storage)" }, { - "astId": 10782, + "astId": 11776, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "DEPRECATED_taskChangeNonces", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 10784, + "astId": 11778, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "DEPRECATED_paymentCount", "offset": 0, @@ -201,15 +201,15 @@ "type": "t_uint256" }, { - "astId": 10789, + "astId": 11783, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "DEPRECATED_payments", "offset": 0, "slot": "23", - "type": "t_mapping(t_uint256,t_struct(Payment)6112_storage)" + "type": "t_mapping(t_uint256,t_struct(Payment)6801_storage)" }, { - "astId": 10791, + "astId": 11785, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "expenditureCount", "offset": 0, @@ -217,23 +217,23 @@ "type": "t_uint256" }, { - "astId": 10796, + "astId": 11790, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "expenditures", "offset": 0, "slot": "25", - "type": "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)" + "type": "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)" }, { - "astId": 10803, + "astId": 11797, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "expenditureSlots", "offset": 0, "slot": "26", - "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))" + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))" }, { - "astId": 10811, + "astId": 11805, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "expenditureSlotPayouts", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" }, { - "astId": 10819, + "astId": 11813, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "approvals", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10827, + "astId": 11821, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "obligations", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10829, + "astId": 11823, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "tokenLockingAddress", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_address" }, { - "astId": 10835, + "astId": 11829, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "tokenLocks", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 10841, + "astId": 11835, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "tokenApprovals", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))" }, { - "astId": 10845, + "astId": 11839, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "tokenApprovalTotals", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10847, + "astId": 11841, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "defaultGlobalClaimDelay", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 10854, + "astId": 11848, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "metatransactionNonces", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10856, + "astId": 11850, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "rootLocalSkill", "offset": 0, @@ -313,12 +313,20 @@ "type": "t_uint256" }, { - "astId": 10860, + "astId": 11854, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "localSkills", "offset": 0, "slot": "37", "type": "t_mapping(t_uint256,t_bool)" + }, + { + "astId": 11864, + "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))" } ], "types": { @@ -332,8 +340,8 @@ "label": "address payable", "numberOfBytes": "20" }, - "t_array(t_enum(TaskRole)6049)2_storage": { - "base": "t_enum(TaskRole)6049", + "t_array(t_enum(TaskRole)6738)2_storage": { + "base": "t_enum(TaskRole)6738", "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole[2]", "numberOfBytes": "32" @@ -359,32 +367,32 @@ "label": "bytes4", "numberOfBytes": "4" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_enum(ExpenditureStatus)5862": { + "t_enum(ExpenditureStatus)6531": { "encoding": "inplace", "label": "enum ColonyDataTypes.ExpenditureStatus", "numberOfBytes": "1" }, - "t_enum(FundingPotAssociatedType)5877": { + "t_enum(FundingPotAssociatedType)6546": { "encoding": "inplace", "label": "enum ColonyDataTypes.FundingPotAssociatedType", "numberOfBytes": "1" }, - "t_enum(TaskRatings)6045": { + "t_enum(TaskRatings)6734": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRatings", "numberOfBytes": "1" }, - "t_enum(TaskRole)6049": { + "t_enum(TaskRole)6738": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole", "numberOfBytes": "1" }, - "t_enum(TaskStatus)6053": { + "t_enum(TaskStatus)6742": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskStatus", "numberOfBytes": "1" @@ -429,12 +437,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)": { + "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)": { "encoding": "mapping", "key": "t_bytes4", "label": "mapping(bytes4 => enum ColonyDataTypes.TaskRole[2])", "numberOfBytes": "32", - "value": "t_array(t_enum(TaskRole)6049)2_storage" + "value": "t_array(t_enum(TaskRole)6738)2_storage" }, "t_mapping(t_bytes4,t_bool)": { "encoding": "mapping", @@ -464,68 +472,75 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, - "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))": { + "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))": { + "encoding": "mapping", + "key": "t_uint256", + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" + }, + "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)" + "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)" }, - "t_mapping(t_uint256,t_struct(Domain)5898_storage)": { + "t_mapping(t_uint256,t_struct(Domain)6579_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Domain)", "numberOfBytes": "32", - "value": "t_struct(Domain)5898_storage" + "value": "t_struct(Domain)6579_storage" }, - "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)": { + "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Expenditure)", "numberOfBytes": "32", - "value": "t_struct(Expenditure)5847_storage" + "value": "t_struct(Expenditure)6516_storage" }, - "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)": { + "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot)", "numberOfBytes": "32", - "value": "t_struct(ExpenditureSlot)5857_storage" + "value": "t_struct(ExpenditureSlot)6526_storage" }, - "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)": { + "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.FundingPot)", "numberOfBytes": "32", - "value": "t_struct(FundingPot)5893_storage" + "value": "t_struct(FundingPot)6574_storage" }, - "t_mapping(t_uint256,t_struct(Payment)6112_storage)": { + "t_mapping(t_uint256,t_struct(Payment)6801_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Payment)", "numberOfBytes": "32", - "value": "t_struct(Payment)6112_storage" + "value": "t_struct(Payment)6801_storage" }, - "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)": { + "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RatingSecrets)", "numberOfBytes": "32", - "value": "t_struct(RatingSecrets)6100_storage" + "value": "t_struct(RatingSecrets)6789_storage" }, - "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)": { + "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RewardPayoutCycle)", "numberOfBytes": "32", - "value": "t_struct(RewardPayoutCycle)5833_storage" + "value": "t_struct(RewardPayoutCycle)6502_storage" }, - "t_mapping(t_uint256,t_struct(Task)6083_storage)": { + "t_mapping(t_uint256,t_struct(Task)6772_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Task)", "numberOfBytes": "32", - "value": "t_struct(Task)6083_storage" + "value": "t_struct(Task)6772_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -548,19 +563,19 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_uint256)" }, - "t_mapping(t_uint8,t_struct(Role)6091_storage)": { + "t_mapping(t_uint8,t_struct(Role)6780_storage)": { "encoding": "mapping", "key": "t_uint8", "label": "mapping(uint8 => struct ColonyDataTypes.Role)", "numberOfBytes": "32", - "value": "t_struct(Role)6091_storage" + "value": "t_struct(Role)6780_storage" }, - "t_struct(Domain)5898_storage": { + "t_struct(Domain)6579_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Domain", "members": [ { - "astId": 5895, + "astId": 6576, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "skillId", "offset": 0, @@ -568,7 +583,7 @@ "type": "t_uint256" }, { - "astId": 5897, + "astId": 6578, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "fundingPotId", "offset": 0, @@ -578,20 +593,20 @@ ], "numberOfBytes": "64" }, - "t_struct(Expenditure)5847_storage": { + "t_struct(Expenditure)6516_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Expenditure", "members": [ { - "astId": 5836, + "astId": 6505, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "status", "offset": 0, "slot": "0", - "type": "t_enum(ExpenditureStatus)5862" + "type": "t_enum(ExpenditureStatus)6531" }, { - "astId": 5838, + "astId": 6507, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "owner", "offset": 1, @@ -599,7 +614,7 @@ "type": "t_address" }, { - "astId": 5840, + "astId": 6509, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "fundingPotId", "offset": 0, @@ -607,7 +622,7 @@ "type": "t_uint256" }, { - "astId": 5842, + "astId": 6511, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "domainId", "offset": 0, @@ -615,7 +630,7 @@ "type": "t_uint256" }, { - "astId": 5844, + "astId": 6513, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "finalizedTimestamp", "offset": 0, @@ -623,7 +638,7 @@ "type": "t_uint256" }, { - "astId": 5846, + "astId": 6515, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "globalClaimDelay", "offset": 0, @@ -633,12 +648,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ExpenditureSlot)5857_storage": { + "t_struct(ExpenditureSlot)6526_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.ExpenditureSlot", "members": [ { - "astId": 5849, + "astId": 6518, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "recipient", "offset": 0, @@ -646,7 +661,7 @@ "type": "t_address_payable" }, { - "astId": 5851, + "astId": 6520, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "claimDelay", "offset": 0, @@ -654,7 +669,7 @@ "type": "t_uint256" }, { - "astId": 5853, + "astId": 6522, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "payoutModifier", "offset": 0, @@ -662,7 +677,7 @@ "type": "t_int256" }, { - "astId": 5856, + "astId": 6525, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "skills", "offset": 0, @@ -672,12 +687,12 @@ ], "numberOfBytes": "128" }, - "t_struct(FundingPot)5893_storage": { + "t_struct(FundingPot)6574_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.FundingPot", "members": [ { - "astId": 5881, + "astId": 6550, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "balance", "offset": 0, @@ -685,15 +700,15 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5884, + "astId": 6553, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "associatedType", "offset": 0, "slot": "1", - "type": "t_enum(FundingPotAssociatedType)5877" + "type": "t_enum(FundingPotAssociatedType)6546" }, { - "astId": 5886, + "astId": 6555, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "associatedTypeId", "offset": 0, @@ -701,7 +716,7 @@ "type": "t_uint256" }, { - "astId": 5890, + "astId": 6559, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "payouts", "offset": 0, @@ -709,22 +724,38 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5892, + "astId": 6561, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "payoutsWeCannotMake", "offset": 0, "slot": "4", "type": "t_uint256" + }, + { + "astId": 6567, + "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" + }, + { + "astId": 6573, + "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" } ], - "numberOfBytes": "160" + "numberOfBytes": "224" }, - "t_struct(Payment)6112_storage": { + "t_struct(Payment)6801_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Payment", "members": [ { - "astId": 6102, + "astId": 6791, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "recipient", "offset": 0, @@ -732,7 +763,7 @@ "type": "t_address_payable" }, { - "astId": 6104, + "astId": 6793, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "finalized", "offset": 20, @@ -740,7 +771,7 @@ "type": "t_bool" }, { - "astId": 6106, + "astId": 6795, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "fundingPotId", "offset": 0, @@ -748,7 +779,7 @@ "type": "t_uint256" }, { - "astId": 6108, + "astId": 6797, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "domainId", "offset": 0, @@ -756,7 +787,7 @@ "type": "t_uint256" }, { - "astId": 6111, + "astId": 6800, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "skills", "offset": 0, @@ -766,12 +797,12 @@ ], "numberOfBytes": "128" }, - "t_struct(RatingSecrets)6100_storage": { + "t_struct(RatingSecrets)6789_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RatingSecrets", "members": [ { - "astId": 6093, + "astId": 6782, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "count", "offset": 0, @@ -779,7 +810,7 @@ "type": "t_uint256" }, { - "astId": 6095, + "astId": 6784, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "timestamp", "offset": 0, @@ -787,7 +818,7 @@ "type": "t_uint256" }, { - "astId": 6099, + "astId": 6788, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "secret", "offset": 0, @@ -797,12 +828,12 @@ ], "numberOfBytes": "96" }, - "t_struct(RewardPayoutCycle)5833_storage": { + "t_struct(RewardPayoutCycle)6502_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RewardPayoutCycle", "members": [ { - "astId": 5818, + "astId": 6487, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "reputationState", "offset": 0, @@ -810,7 +841,7 @@ "type": "t_bytes32" }, { - "astId": 5820, + "astId": 6489, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "colonyWideReputation", "offset": 0, @@ -818,7 +849,7 @@ "type": "t_uint256" }, { - "astId": 5822, + "astId": 6491, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "totalTokens", "offset": 0, @@ -826,7 +857,7 @@ "type": "t_uint256" }, { - "astId": 5824, + "astId": 6493, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "amount", "offset": 0, @@ -834,7 +865,7 @@ "type": "t_uint256" }, { - "astId": 5826, + "astId": 6495, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "tokenAddress", "offset": 0, @@ -842,7 +873,7 @@ "type": "t_address" }, { - "astId": 5828, + "astId": 6497, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "blockTimestamp", "offset": 0, @@ -850,7 +881,7 @@ "type": "t_uint256" }, { - "astId": 5830, + "astId": 6499, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "amountRemaining", "offset": 0, @@ -858,7 +889,7 @@ "type": "t_uint256" }, { - "astId": 5832, + "astId": 6501, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "finalized", "offset": 0, @@ -868,12 +899,12 @@ ], "numberOfBytes": "256" }, - "t_struct(Role)6091_storage": { + "t_struct(Role)6780_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Role", "members": [ { - "astId": 6085, + "astId": 6774, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "user", "offset": 0, @@ -881,7 +912,7 @@ "type": "t_address_payable" }, { - "astId": 6087, + "astId": 6776, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "rateFail", "offset": 20, @@ -889,22 +920,22 @@ "type": "t_bool" }, { - "astId": 6090, + "astId": 6779, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "rating", "offset": 21, "slot": "0", - "type": "t_enum(TaskRatings)6045" + "type": "t_enum(TaskRatings)6734" } ], "numberOfBytes": "32" }, - "t_struct(Task)6083_storage": { + "t_struct(Task)6772_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Task", "members": [ { - "astId": 6055, + "astId": 6744, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "specificationHash", "offset": 0, @@ -912,7 +943,7 @@ "type": "t_bytes32" }, { - "astId": 6057, + "astId": 6746, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "deliverableHash", "offset": 0, @@ -920,15 +951,15 @@ "type": "t_bytes32" }, { - "astId": 6060, + "astId": 6749, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "status", "offset": 0, "slot": "2", - "type": "t_enum(TaskStatus)6053" + "type": "t_enum(TaskStatus)6742" }, { - "astId": 6062, + "astId": 6751, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "dueDate", "offset": 0, @@ -936,7 +967,7 @@ "type": "t_uint256" }, { - "astId": 6064, + "astId": 6753, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "fundingPotId", "offset": 0, @@ -944,7 +975,7 @@ "type": "t_uint256" }, { - "astId": 6066, + "astId": 6755, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "completionTimestamp", "offset": 0, @@ -952,7 +983,7 @@ "type": "t_uint256" }, { - "astId": 6068, + "astId": 6757, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "domainId", "offset": 0, @@ -960,7 +991,7 @@ "type": "t_uint256" }, { - "astId": 6071, + "astId": 6760, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "skills", "offset": 0, @@ -968,15 +999,15 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 6076, + "astId": 6765, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "roles", "offset": 0, "slot": "8", - "type": "t_mapping(t_uint8,t_struct(Role)6091_storage)" + "type": "t_mapping(t_uint8,t_struct(Role)6780_storage)" }, { - "astId": 6082, + "astId": 6771, "contract": "contracts/colony/ColonyRoles.sol:ColonyRoles", "label": "payouts", "offset": 0, diff --git a/.storage-layouts/contracts/colony/ColonyStorage.sol:ColonyStorage.json b/.storage-layouts/contracts/colony/ColonyStorage.sol:ColonyStorage.json index f285392a49..f66d914aca 100644 --- a/.storage-layouts/contracts/colony/ColonyStorage.sol:ColonyStorage.json +++ b/.storage-layouts/contracts/colony/ColonyStorage.sol:ColonyStorage.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10724, + "astId": 11718, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "colonyNetworkAddress", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_address" }, { - "astId": 10726, + "astId": 11720, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "token", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_address" }, { - "astId": 10728, + "astId": 11722, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "rewardInverse", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 10730, + "astId": 11724, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "DEPRECATED_taskCount", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 10732, + "astId": 11726, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "fundingPotCount", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 10734, + "astId": 11728, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "domainCount", "offset": 0, @@ -113,15 +113,15 @@ "type": "t_uint256" }, { - "astId": 10741, + "astId": 11735, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "DEPRECATED_reviewers", "offset": 0, "slot": "12", - "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)" + "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)" }, { - "astId": 10745, + "astId": 11739, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "DEPRECATED_roleAssignmentSigs", "offset": 0, @@ -129,31 +129,31 @@ "type": "t_mapping(t_bytes4,t_bool)" }, { - "astId": 10750, + "astId": 11744, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "DEPRECATED_tasks", "offset": 0, "slot": "14", - "type": "t_mapping(t_uint256,t_struct(Task)6083_storage)" + "type": "t_mapping(t_uint256,t_struct(Task)6772_storage)" }, { - "astId": 10755, + "astId": 11749, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "fundingPots", "offset": 0, "slot": "15", - "type": "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)" + "type": "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)" }, { - "astId": 10760, + "astId": 11754, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "rewardPayoutCycles", "offset": 0, "slot": "16", - "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)" + "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)" }, { - "astId": 10764, + "astId": 11758, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "pendingRewardPayments", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10768, + "astId": 11762, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "nonRewardPotsTotal", "offset": 0, @@ -169,23 +169,23 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10773, + "astId": 11767, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "DEPRECATED_taskWorkRatings", "offset": 0, "slot": "19", - "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)" + "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)" }, { - "astId": 10778, + "astId": 11772, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "domains", "offset": 0, "slot": "20", - "type": "t_mapping(t_uint256,t_struct(Domain)5898_storage)" + "type": "t_mapping(t_uint256,t_struct(Domain)6579_storage)" }, { - "astId": 10782, + "astId": 11776, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "DEPRECATED_taskChangeNonces", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 10784, + "astId": 11778, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "DEPRECATED_paymentCount", "offset": 0, @@ -201,15 +201,15 @@ "type": "t_uint256" }, { - "astId": 10789, + "astId": 11783, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "DEPRECATED_payments", "offset": 0, "slot": "23", - "type": "t_mapping(t_uint256,t_struct(Payment)6112_storage)" + "type": "t_mapping(t_uint256,t_struct(Payment)6801_storage)" }, { - "astId": 10791, + "astId": 11785, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "expenditureCount", "offset": 0, @@ -217,23 +217,23 @@ "type": "t_uint256" }, { - "astId": 10796, + "astId": 11790, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "expenditures", "offset": 0, "slot": "25", - "type": "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)" + "type": "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)" }, { - "astId": 10803, + "astId": 11797, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "expenditureSlots", "offset": 0, "slot": "26", - "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))" + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))" }, { - "astId": 10811, + "astId": 11805, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "expenditureSlotPayouts", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" }, { - "astId": 10819, + "astId": 11813, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "approvals", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10827, + "astId": 11821, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "obligations", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10829, + "astId": 11823, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "tokenLockingAddress", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_address" }, { - "astId": 10835, + "astId": 11829, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "tokenLocks", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 10841, + "astId": 11835, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "tokenApprovals", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))" }, { - "astId": 10845, + "astId": 11839, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "tokenApprovalTotals", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10847, + "astId": 11841, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "defaultGlobalClaimDelay", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 10854, + "astId": 11848, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "metatransactionNonces", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10856, + "astId": 11850, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "rootLocalSkill", "offset": 0, @@ -313,12 +313,20 @@ "type": "t_uint256" }, { - "astId": 10860, + "astId": 11854, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "localSkills", "offset": 0, "slot": "37", "type": "t_mapping(t_uint256,t_bool)" + }, + { + "astId": 11864, + "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))" } ], "types": { @@ -332,8 +340,8 @@ "label": "address payable", "numberOfBytes": "20" }, - "t_array(t_enum(TaskRole)6049)2_storage": { - "base": "t_enum(TaskRole)6049", + "t_array(t_enum(TaskRole)6738)2_storage": { + "base": "t_enum(TaskRole)6738", "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole[2]", "numberOfBytes": "32" @@ -359,32 +367,32 @@ "label": "bytes4", "numberOfBytes": "4" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_enum(ExpenditureStatus)5862": { + "t_enum(ExpenditureStatus)6531": { "encoding": "inplace", "label": "enum ColonyDataTypes.ExpenditureStatus", "numberOfBytes": "1" }, - "t_enum(FundingPotAssociatedType)5877": { + "t_enum(FundingPotAssociatedType)6546": { "encoding": "inplace", "label": "enum ColonyDataTypes.FundingPotAssociatedType", "numberOfBytes": "1" }, - "t_enum(TaskRatings)6045": { + "t_enum(TaskRatings)6734": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRatings", "numberOfBytes": "1" }, - "t_enum(TaskRole)6049": { + "t_enum(TaskRole)6738": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole", "numberOfBytes": "1" }, - "t_enum(TaskStatus)6053": { + "t_enum(TaskStatus)6742": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskStatus", "numberOfBytes": "1" @@ -429,12 +437,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)": { + "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)": { "encoding": "mapping", "key": "t_bytes4", "label": "mapping(bytes4 => enum ColonyDataTypes.TaskRole[2])", "numberOfBytes": "32", - "value": "t_array(t_enum(TaskRole)6049)2_storage" + "value": "t_array(t_enum(TaskRole)6738)2_storage" }, "t_mapping(t_bytes4,t_bool)": { "encoding": "mapping", @@ -464,68 +472,75 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, - "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))": { + "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))": { + "encoding": "mapping", + "key": "t_uint256", + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" + }, + "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)" + "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)" }, - "t_mapping(t_uint256,t_struct(Domain)5898_storage)": { + "t_mapping(t_uint256,t_struct(Domain)6579_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Domain)", "numberOfBytes": "32", - "value": "t_struct(Domain)5898_storage" + "value": "t_struct(Domain)6579_storage" }, - "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)": { + "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Expenditure)", "numberOfBytes": "32", - "value": "t_struct(Expenditure)5847_storage" + "value": "t_struct(Expenditure)6516_storage" }, - "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)": { + "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot)", "numberOfBytes": "32", - "value": "t_struct(ExpenditureSlot)5857_storage" + "value": "t_struct(ExpenditureSlot)6526_storage" }, - "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)": { + "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.FundingPot)", "numberOfBytes": "32", - "value": "t_struct(FundingPot)5893_storage" + "value": "t_struct(FundingPot)6574_storage" }, - "t_mapping(t_uint256,t_struct(Payment)6112_storage)": { + "t_mapping(t_uint256,t_struct(Payment)6801_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Payment)", "numberOfBytes": "32", - "value": "t_struct(Payment)6112_storage" + "value": "t_struct(Payment)6801_storage" }, - "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)": { + "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RatingSecrets)", "numberOfBytes": "32", - "value": "t_struct(RatingSecrets)6100_storage" + "value": "t_struct(RatingSecrets)6789_storage" }, - "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)": { + "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RewardPayoutCycle)", "numberOfBytes": "32", - "value": "t_struct(RewardPayoutCycle)5833_storage" + "value": "t_struct(RewardPayoutCycle)6502_storage" }, - "t_mapping(t_uint256,t_struct(Task)6083_storage)": { + "t_mapping(t_uint256,t_struct(Task)6772_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Task)", "numberOfBytes": "32", - "value": "t_struct(Task)6083_storage" + "value": "t_struct(Task)6772_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -548,19 +563,19 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_uint256)" }, - "t_mapping(t_uint8,t_struct(Role)6091_storage)": { + "t_mapping(t_uint8,t_struct(Role)6780_storage)": { "encoding": "mapping", "key": "t_uint8", "label": "mapping(uint8 => struct ColonyDataTypes.Role)", "numberOfBytes": "32", - "value": "t_struct(Role)6091_storage" + "value": "t_struct(Role)6780_storage" }, - "t_struct(Domain)5898_storage": { + "t_struct(Domain)6579_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Domain", "members": [ { - "astId": 5895, + "astId": 6576, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "skillId", "offset": 0, @@ -568,7 +583,7 @@ "type": "t_uint256" }, { - "astId": 5897, + "astId": 6578, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "fundingPotId", "offset": 0, @@ -578,20 +593,20 @@ ], "numberOfBytes": "64" }, - "t_struct(Expenditure)5847_storage": { + "t_struct(Expenditure)6516_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Expenditure", "members": [ { - "astId": 5836, + "astId": 6505, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "status", "offset": 0, "slot": "0", - "type": "t_enum(ExpenditureStatus)5862" + "type": "t_enum(ExpenditureStatus)6531" }, { - "astId": 5838, + "astId": 6507, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "owner", "offset": 1, @@ -599,7 +614,7 @@ "type": "t_address" }, { - "astId": 5840, + "astId": 6509, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "fundingPotId", "offset": 0, @@ -607,7 +622,7 @@ "type": "t_uint256" }, { - "astId": 5842, + "astId": 6511, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "domainId", "offset": 0, @@ -615,7 +630,7 @@ "type": "t_uint256" }, { - "astId": 5844, + "astId": 6513, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "finalizedTimestamp", "offset": 0, @@ -623,7 +638,7 @@ "type": "t_uint256" }, { - "astId": 5846, + "astId": 6515, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "globalClaimDelay", "offset": 0, @@ -633,12 +648,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ExpenditureSlot)5857_storage": { + "t_struct(ExpenditureSlot)6526_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.ExpenditureSlot", "members": [ { - "astId": 5849, + "astId": 6518, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "recipient", "offset": 0, @@ -646,7 +661,7 @@ "type": "t_address_payable" }, { - "astId": 5851, + "astId": 6520, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "claimDelay", "offset": 0, @@ -654,7 +669,7 @@ "type": "t_uint256" }, { - "astId": 5853, + "astId": 6522, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "payoutModifier", "offset": 0, @@ -662,7 +677,7 @@ "type": "t_int256" }, { - "astId": 5856, + "astId": 6525, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "skills", "offset": 0, @@ -672,12 +687,12 @@ ], "numberOfBytes": "128" }, - "t_struct(FundingPot)5893_storage": { + "t_struct(FundingPot)6574_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.FundingPot", "members": [ { - "astId": 5881, + "astId": 6550, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "balance", "offset": 0, @@ -685,15 +700,15 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5884, + "astId": 6553, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "associatedType", "offset": 0, "slot": "1", - "type": "t_enum(FundingPotAssociatedType)5877" + "type": "t_enum(FundingPotAssociatedType)6546" }, { - "astId": 5886, + "astId": 6555, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "associatedTypeId", "offset": 0, @@ -701,7 +716,7 @@ "type": "t_uint256" }, { - "astId": 5890, + "astId": 6559, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "payouts", "offset": 0, @@ -709,22 +724,38 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5892, + "astId": 6561, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "payoutsWeCannotMake", "offset": 0, "slot": "4", "type": "t_uint256" + }, + { + "astId": 6567, + "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" + }, + { + "astId": 6573, + "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" } ], - "numberOfBytes": "160" + "numberOfBytes": "224" }, - "t_struct(Payment)6112_storage": { + "t_struct(Payment)6801_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Payment", "members": [ { - "astId": 6102, + "astId": 6791, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "recipient", "offset": 0, @@ -732,7 +763,7 @@ "type": "t_address_payable" }, { - "astId": 6104, + "astId": 6793, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "finalized", "offset": 20, @@ -740,7 +771,7 @@ "type": "t_bool" }, { - "astId": 6106, + "astId": 6795, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "fundingPotId", "offset": 0, @@ -748,7 +779,7 @@ "type": "t_uint256" }, { - "astId": 6108, + "astId": 6797, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "domainId", "offset": 0, @@ -756,7 +787,7 @@ "type": "t_uint256" }, { - "astId": 6111, + "astId": 6800, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "skills", "offset": 0, @@ -766,12 +797,12 @@ ], "numberOfBytes": "128" }, - "t_struct(RatingSecrets)6100_storage": { + "t_struct(RatingSecrets)6789_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RatingSecrets", "members": [ { - "astId": 6093, + "astId": 6782, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "count", "offset": 0, @@ -779,7 +810,7 @@ "type": "t_uint256" }, { - "astId": 6095, + "astId": 6784, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "timestamp", "offset": 0, @@ -787,7 +818,7 @@ "type": "t_uint256" }, { - "astId": 6099, + "astId": 6788, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "secret", "offset": 0, @@ -797,12 +828,12 @@ ], "numberOfBytes": "96" }, - "t_struct(RewardPayoutCycle)5833_storage": { + "t_struct(RewardPayoutCycle)6502_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RewardPayoutCycle", "members": [ { - "astId": 5818, + "astId": 6487, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "reputationState", "offset": 0, @@ -810,7 +841,7 @@ "type": "t_bytes32" }, { - "astId": 5820, + "astId": 6489, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "colonyWideReputation", "offset": 0, @@ -818,7 +849,7 @@ "type": "t_uint256" }, { - "astId": 5822, + "astId": 6491, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "totalTokens", "offset": 0, @@ -826,7 +857,7 @@ "type": "t_uint256" }, { - "astId": 5824, + "astId": 6493, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "amount", "offset": 0, @@ -834,7 +865,7 @@ "type": "t_uint256" }, { - "astId": 5826, + "astId": 6495, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "tokenAddress", "offset": 0, @@ -842,7 +873,7 @@ "type": "t_address" }, { - "astId": 5828, + "astId": 6497, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "blockTimestamp", "offset": 0, @@ -850,7 +881,7 @@ "type": "t_uint256" }, { - "astId": 5830, + "astId": 6499, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "amountRemaining", "offset": 0, @@ -858,7 +889,7 @@ "type": "t_uint256" }, { - "astId": 5832, + "astId": 6501, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "finalized", "offset": 0, @@ -868,12 +899,12 @@ ], "numberOfBytes": "256" }, - "t_struct(Role)6091_storage": { + "t_struct(Role)6780_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Role", "members": [ { - "astId": 6085, + "astId": 6774, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "user", "offset": 0, @@ -881,7 +912,7 @@ "type": "t_address_payable" }, { - "astId": 6087, + "astId": 6776, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "rateFail", "offset": 20, @@ -889,22 +920,22 @@ "type": "t_bool" }, { - "astId": 6090, + "astId": 6779, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "rating", "offset": 21, "slot": "0", - "type": "t_enum(TaskRatings)6045" + "type": "t_enum(TaskRatings)6734" } ], "numberOfBytes": "32" }, - "t_struct(Task)6083_storage": { + "t_struct(Task)6772_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Task", "members": [ { - "astId": 6055, + "astId": 6744, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "specificationHash", "offset": 0, @@ -912,7 +943,7 @@ "type": "t_bytes32" }, { - "astId": 6057, + "astId": 6746, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "deliverableHash", "offset": 0, @@ -920,15 +951,15 @@ "type": "t_bytes32" }, { - "astId": 6060, + "astId": 6749, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "status", "offset": 0, "slot": "2", - "type": "t_enum(TaskStatus)6053" + "type": "t_enum(TaskStatus)6742" }, { - "astId": 6062, + "astId": 6751, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "dueDate", "offset": 0, @@ -936,7 +967,7 @@ "type": "t_uint256" }, { - "astId": 6064, + "astId": 6753, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "fundingPotId", "offset": 0, @@ -944,7 +975,7 @@ "type": "t_uint256" }, { - "astId": 6066, + "astId": 6755, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "completionTimestamp", "offset": 0, @@ -952,7 +983,7 @@ "type": "t_uint256" }, { - "astId": 6068, + "astId": 6757, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "domainId", "offset": 0, @@ -960,7 +991,7 @@ "type": "t_uint256" }, { - "astId": 6071, + "astId": 6760, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "skills", "offset": 0, @@ -968,15 +999,15 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 6076, + "astId": 6765, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "roles", "offset": 0, "slot": "8", - "type": "t_mapping(t_uint8,t_struct(Role)6091_storage)" + "type": "t_mapping(t_uint8,t_struct(Role)6780_storage)" }, { - "astId": 6082, + "astId": 6771, "contract": "contracts/colony/ColonyStorage.sol:ColonyStorage", "label": "payouts", "offset": 0, diff --git a/.storage-layouts/contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork.json b/.storage-layouts/contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork.json index d4ef0120ea..74284f93e3 100644 --- a/.storage-layouts/contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork.json +++ b/.storage-layouts/contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18905, + "astId": 19230, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "colonyCount", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 18907, + "astId": 19232, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "currentColonyVersion", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 18909, + "astId": 19234, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "metaColony", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 18911, + "astId": 19236, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "tokenLocking", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_address" }, { - "astId": 18913, + "astId": 19238, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "feeInverse", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 18915, + "astId": 19240, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "skillCount", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 18917, + "astId": 19242, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "reputationMiningSkillId", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 18919, + "astId": 19244, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "reputationRootHash", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_bytes32" }, { - "astId": 18921, + "astId": 19246, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "reputationRootHashNLeaves", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 18923, + "astId": 19248, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "miningCycleResolver", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_address" }, { - "astId": 18925, + "astId": 19250, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "activeReputationMiningCycle", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_address" }, { - "astId": 18927, + "astId": 19252, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "inactiveReputationMiningCycle", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_address" }, { - "astId": 18931, + "astId": 19256, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "colonies", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18935, + "astId": 19260, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "_isColony", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18939, + "astId": 19264, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "colonyVersionResolver", "offset": 0, @@ -185,15 +185,15 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18944, + "astId": 19269, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "skills", "offset": 0, "slot": "21", - "type": "t_mapping(t_uint256,t_struct(Skill)14308_storage)" + "type": "t_mapping(t_uint256,t_struct(Skill)15407_storage)" }, { - "astId": 18948, + "astId": 19273, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "stakedBalances", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18952, + "astId": 19277, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "recentAuctions", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18954, + "astId": 19279, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "ens", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_address" }, { - "astId": 18956, + "astId": 19281, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "rootNode", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_bytes32" }, { - "astId": 18958, + "astId": 19283, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "userNode", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_bytes32" }, { - "astId": 18960, + "astId": 19285, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "colonyNode", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_bytes32" }, { - "astId": 18964, + "astId": 19289, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "colonyLabels", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18968, + "astId": 19293, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "userLabels", "offset": 0, @@ -257,23 +257,23 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18973, + "astId": 19298, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "records", "offset": 0, "slot": "30", - "type": "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)" + "type": "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)" }, { - "astId": 18980, + "astId": 19305, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "replacementReputationUpdateLog", "offset": 0, "slot": "31", - "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))" + "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))" }, { - "astId": 18984, + "astId": 19309, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "replacementReputationUpdateLogsExist", "offset": 0, @@ -281,15 +281,15 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18989, + "astId": 19314, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "miningStakes", "offset": 0, "slot": "33", - "type": "t_mapping(t_address,t_struct(MiningStake)14331_storage)" + "type": "t_mapping(t_address,t_struct(MiningStake)15430_storage)" }, { - "astId": 18993, + "astId": 19318, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "pendingMiningRewards", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18995, + "astId": 19320, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "totalMinerRewardPerCycle", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_uint256" }, { - "astId": 18997, + "astId": 19322, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "DEPRECATED_annualMetaColonyStipend", "offset": 0, @@ -313,7 +313,7 @@ "type": "t_uint256" }, { - "astId": 18999, + "astId": 19324, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "DEPRECATED_lastMetaColonyStipendIssued", "offset": 0, @@ -321,7 +321,7 @@ "type": "t_uint256" }, { - "astId": 19005, + "astId": 19330, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "resolvers", "offset": 0, @@ -329,7 +329,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_address))" }, { - "astId": 19011, + "astId": 19336, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "installations", "offset": 0, @@ -337,7 +337,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_address,t_address_payable))" }, { - "astId": 19015, + "astId": 19340, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "payoutWhitelist", "offset": 0, @@ -345,7 +345,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 19022, + "astId": 19347, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "metatransactionNonces", "offset": 0, @@ -353,7 +353,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 19026, + "astId": 19351, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "miningDelegators", "offset": 0, @@ -361,7 +361,7 @@ "type": "t_mapping(t_address,t_address)" }, { - "astId": 19028, + "astId": 19353, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "reputationMiningChainId", "offset": 0, @@ -369,7 +369,7 @@ "type": "t_uint256" }, { - "astId": 19030, + "astId": 19355, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "colonyBridgeAddress", "offset": 0, @@ -377,7 +377,7 @@ "type": "t_address" }, { - "astId": 19034, + "astId": 19359, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "bridgeCurrentRootHashNonces", "offset": 0, @@ -385,7 +385,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19038, + "astId": 19363, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "networkSkillCounts", "offset": 0, @@ -393,7 +393,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19044, + "astId": 19369, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "pendingSkillAdditions", "offset": 0, @@ -401,7 +401,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_uint256))" }, { - "astId": 19050, + "astId": 19375, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "reputationUpdateCount", "offset": 0, @@ -409,12 +409,12 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, { - "astId": 19059, + "astId": 19384, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "pendingReputationUpdates", "offset": 0, "slot": "49", - "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))" + "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))" } ], "types": { @@ -444,7 +444,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" @@ -475,19 +475,19 @@ "numberOfBytes": "32", "value": "t_bool" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)" + "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)" + "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)" }, "t_mapping(t_address,t_string_storage)": { "encoding": "mapping", @@ -496,12 +496,12 @@ "numberOfBytes": "32", "value": "t_string_storage" }, - "t_mapping(t_address,t_struct(MiningStake)14331_storage)": { + "t_mapping(t_address,t_struct(MiningStake)15430_storage)": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => struct ColonyNetworkDataTypes.MiningStake)", "numberOfBytes": "32", - "value": "t_struct(MiningStake)14331_storage" + "value": "t_struct(MiningStake)15430_storage" }, "t_mapping(t_address,t_uint256)": { "encoding": "mapping", @@ -524,12 +524,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_address)" }, - "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)": { + "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)": { "encoding": "mapping", "key": "t_bytes32", "label": "mapping(bytes32 => struct ColonyNetworkDataTypes.ENSRecord)", "numberOfBytes": "32", - "value": "t_struct(ENSRecord)14313_storage" + "value": "t_struct(ENSRecord)15412_storage" }, "t_mapping(t_uint256,t_address)": { "encoding": "mapping", @@ -538,12 +538,12 @@ "numberOfBytes": "32", "value": "t_address" }, - "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))": { + "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)))", "numberOfBytes": "32", - "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))" + "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))" }, "t_mapping(t_uint256,t_mapping(t_address,t_uint256))": { "encoding": "mapping", @@ -559,26 +559,26 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_uint256)" }, - "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)": { + "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)", "numberOfBytes": "32", - "value": "t_struct(PendingReputationUpdate)14342_storage" + "value": "t_struct(PendingReputationUpdate)15441_storage" }, - "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)": { + "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry)", "numberOfBytes": "32", - "value": "t_struct(ReputationLogEntry)14326_storage" + "value": "t_struct(ReputationLogEntry)15425_storage" }, - "t_mapping(t_uint256,t_struct(Skill)14308_storage)": { + "t_mapping(t_uint256,t_struct(Skill)15407_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.Skill)", "numberOfBytes": "32", - "value": "t_struct(Skill)14308_storage" + "value": "t_struct(Skill)15407_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -592,12 +592,12 @@ "label": "string", "numberOfBytes": "32" }, - "t_struct(ENSRecord)14313_storage": { + "t_struct(ENSRecord)15412_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ENSRecord", "members": [ { - "astId": 14310, + "astId": 15409, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "addr", "offset": 0, @@ -605,7 +605,7 @@ "type": "t_address" }, { - "astId": 14312, + "astId": 15411, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "orbitdb", "offset": 0, @@ -615,12 +615,12 @@ ], "numberOfBytes": "64" }, - "t_struct(MiningStake)14331_storage": { + "t_struct(MiningStake)15430_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.MiningStake", "members": [ { - "astId": 14328, + "astId": 15427, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "amount", "offset": 0, @@ -628,7 +628,7 @@ "type": "t_uint256" }, { - "astId": 14330, + "astId": 15429, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "timestamp", "offset": 0, @@ -638,12 +638,12 @@ ], "numberOfBytes": "64" }, - "t_struct(PendingReputationUpdate)14342_storage": { + "t_struct(PendingReputationUpdate)15441_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.PendingReputationUpdate", "members": [ { - "astId": 14333, + "astId": 15432, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "user", "offset": 0, @@ -651,7 +651,7 @@ "type": "t_address" }, { - "astId": 14335, + "astId": 15434, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "amount", "offset": 0, @@ -659,7 +659,7 @@ "type": "t_int256" }, { - "astId": 14337, + "astId": 15436, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "skillId", "offset": 0, @@ -667,7 +667,7 @@ "type": "t_uint256" }, { - "astId": 14339, + "astId": 15438, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "colony", "offset": 0, @@ -675,7 +675,7 @@ "type": "t_address" }, { - "astId": 14341, + "astId": 15440, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "timestamp", "offset": 0, @@ -685,12 +685,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ReputationLogEntry)14326_storage": { + "t_struct(ReputationLogEntry)15425_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ReputationLogEntry", "members": [ { - "astId": 14315, + "astId": 15414, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "user", "offset": 0, @@ -698,7 +698,7 @@ "type": "t_address" }, { - "astId": 14317, + "astId": 15416, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "amount", "offset": 0, @@ -706,7 +706,7 @@ "type": "t_int256" }, { - "astId": 14319, + "astId": 15418, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "skillId", "offset": 0, @@ -714,7 +714,7 @@ "type": "t_uint256" }, { - "astId": 14321, + "astId": 15420, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "colony", "offset": 0, @@ -722,7 +722,7 @@ "type": "t_address" }, { - "astId": 14323, + "astId": 15422, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "nUpdates", "offset": 0, @@ -730,7 +730,7 @@ "type": "t_uint128" }, { - "astId": 14325, + "astId": 15424, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "nPreviousUpdates", "offset": 16, @@ -740,12 +740,12 @@ ], "numberOfBytes": "160" }, - "t_struct(Skill)14308_storage": { + "t_struct(Skill)15407_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.Skill", "members": [ { - "astId": 14295, + "astId": 15394, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "nParents", "offset": 0, @@ -753,7 +753,7 @@ "type": "t_uint128" }, { - "astId": 14297, + "astId": 15396, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "nChildren", "offset": 16, @@ -761,7 +761,7 @@ "type": "t_uint128" }, { - "astId": 14300, + "astId": 15399, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "parents", "offset": 0, @@ -769,7 +769,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14303, + "astId": 15402, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "children", "offset": 0, @@ -777,7 +777,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14305, + "astId": 15404, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "DEPRECATED_globalSkill", "offset": 0, @@ -785,7 +785,7 @@ "type": "t_bool" }, { - "astId": 14307, + "astId": 15406, "contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork", "label": "deprecated", "offset": 1, diff --git a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction.json b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction.json index b9e37d33f2..df00b924ab 100644 --- a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction.json +++ b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18905, + "astId": 19230, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "colonyCount", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 18907, + "astId": 19232, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "currentColonyVersion", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 18909, + "astId": 19234, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "metaColony", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 18911, + "astId": 19236, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "tokenLocking", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_address" }, { - "astId": 18913, + "astId": 19238, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "feeInverse", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 18915, + "astId": 19240, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "skillCount", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 18917, + "astId": 19242, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "reputationMiningSkillId", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 18919, + "astId": 19244, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "reputationRootHash", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_bytes32" }, { - "astId": 18921, + "astId": 19246, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "reputationRootHashNLeaves", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 18923, + "astId": 19248, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "miningCycleResolver", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_address" }, { - "astId": 18925, + "astId": 19250, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "activeReputationMiningCycle", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_address" }, { - "astId": 18927, + "astId": 19252, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "inactiveReputationMiningCycle", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_address" }, { - "astId": 18931, + "astId": 19256, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "colonies", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18935, + "astId": 19260, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "_isColony", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18939, + "astId": 19264, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "colonyVersionResolver", "offset": 0, @@ -185,15 +185,15 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18944, + "astId": 19269, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "skills", "offset": 0, "slot": "21", - "type": "t_mapping(t_uint256,t_struct(Skill)14308_storage)" + "type": "t_mapping(t_uint256,t_struct(Skill)15407_storage)" }, { - "astId": 18948, + "astId": 19273, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "stakedBalances", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18952, + "astId": 19277, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "recentAuctions", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18954, + "astId": 19279, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "ens", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_address" }, { - "astId": 18956, + "astId": 19281, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "rootNode", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_bytes32" }, { - "astId": 18958, + "astId": 19283, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "userNode", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_bytes32" }, { - "astId": 18960, + "astId": 19285, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "colonyNode", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_bytes32" }, { - "astId": 18964, + "astId": 19289, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "colonyLabels", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18968, + "astId": 19293, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "userLabels", "offset": 0, @@ -257,23 +257,23 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18973, + "astId": 19298, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "records", "offset": 0, "slot": "30", - "type": "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)" + "type": "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)" }, { - "astId": 18980, + "astId": 19305, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "replacementReputationUpdateLog", "offset": 0, "slot": "31", - "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))" + "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))" }, { - "astId": 18984, + "astId": 19309, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "replacementReputationUpdateLogsExist", "offset": 0, @@ -281,15 +281,15 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18989, + "astId": 19314, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "miningStakes", "offset": 0, "slot": "33", - "type": "t_mapping(t_address,t_struct(MiningStake)14331_storage)" + "type": "t_mapping(t_address,t_struct(MiningStake)15430_storage)" }, { - "astId": 18993, + "astId": 19318, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "pendingMiningRewards", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18995, + "astId": 19320, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "totalMinerRewardPerCycle", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_uint256" }, { - "astId": 18997, + "astId": 19322, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "DEPRECATED_annualMetaColonyStipend", "offset": 0, @@ -313,7 +313,7 @@ "type": "t_uint256" }, { - "astId": 18999, + "astId": 19324, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "DEPRECATED_lastMetaColonyStipendIssued", "offset": 0, @@ -321,7 +321,7 @@ "type": "t_uint256" }, { - "astId": 19005, + "astId": 19330, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "resolvers", "offset": 0, @@ -329,7 +329,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_address))" }, { - "astId": 19011, + "astId": 19336, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "installations", "offset": 0, @@ -337,7 +337,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_address,t_address_payable))" }, { - "astId": 19015, + "astId": 19340, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "payoutWhitelist", "offset": 0, @@ -345,7 +345,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 19022, + "astId": 19347, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "metatransactionNonces", "offset": 0, @@ -353,7 +353,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 19026, + "astId": 19351, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "miningDelegators", "offset": 0, @@ -361,7 +361,7 @@ "type": "t_mapping(t_address,t_address)" }, { - "astId": 19028, + "astId": 19353, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "reputationMiningChainId", "offset": 0, @@ -369,7 +369,7 @@ "type": "t_uint256" }, { - "astId": 19030, + "astId": 19355, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "colonyBridgeAddress", "offset": 0, @@ -377,7 +377,7 @@ "type": "t_address" }, { - "astId": 19034, + "astId": 19359, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "bridgeCurrentRootHashNonces", "offset": 0, @@ -385,7 +385,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19038, + "astId": 19363, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "networkSkillCounts", "offset": 0, @@ -393,7 +393,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19044, + "astId": 19369, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "pendingSkillAdditions", "offset": 0, @@ -401,7 +401,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_uint256))" }, { - "astId": 19050, + "astId": 19375, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "reputationUpdateCount", "offset": 0, @@ -409,12 +409,12 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, { - "astId": 19059, + "astId": 19384, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "pendingReputationUpdates", "offset": 0, "slot": "49", - "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))" + "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))" } ], "types": { @@ -444,7 +444,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" @@ -475,19 +475,19 @@ "numberOfBytes": "32", "value": "t_bool" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)" + "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)" + "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)" }, "t_mapping(t_address,t_string_storage)": { "encoding": "mapping", @@ -496,12 +496,12 @@ "numberOfBytes": "32", "value": "t_string_storage" }, - "t_mapping(t_address,t_struct(MiningStake)14331_storage)": { + "t_mapping(t_address,t_struct(MiningStake)15430_storage)": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => struct ColonyNetworkDataTypes.MiningStake)", "numberOfBytes": "32", - "value": "t_struct(MiningStake)14331_storage" + "value": "t_struct(MiningStake)15430_storage" }, "t_mapping(t_address,t_uint256)": { "encoding": "mapping", @@ -524,12 +524,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_address)" }, - "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)": { + "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)": { "encoding": "mapping", "key": "t_bytes32", "label": "mapping(bytes32 => struct ColonyNetworkDataTypes.ENSRecord)", "numberOfBytes": "32", - "value": "t_struct(ENSRecord)14313_storage" + "value": "t_struct(ENSRecord)15412_storage" }, "t_mapping(t_uint256,t_address)": { "encoding": "mapping", @@ -538,12 +538,12 @@ "numberOfBytes": "32", "value": "t_address" }, - "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))": { + "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)))", "numberOfBytes": "32", - "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))" + "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))" }, "t_mapping(t_uint256,t_mapping(t_address,t_uint256))": { "encoding": "mapping", @@ -559,26 +559,26 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_uint256)" }, - "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)": { + "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)", "numberOfBytes": "32", - "value": "t_struct(PendingReputationUpdate)14342_storage" + "value": "t_struct(PendingReputationUpdate)15441_storage" }, - "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)": { + "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry)", "numberOfBytes": "32", - "value": "t_struct(ReputationLogEntry)14326_storage" + "value": "t_struct(ReputationLogEntry)15425_storage" }, - "t_mapping(t_uint256,t_struct(Skill)14308_storage)": { + "t_mapping(t_uint256,t_struct(Skill)15407_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.Skill)", "numberOfBytes": "32", - "value": "t_struct(Skill)14308_storage" + "value": "t_struct(Skill)15407_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -592,12 +592,12 @@ "label": "string", "numberOfBytes": "32" }, - "t_struct(ENSRecord)14313_storage": { + "t_struct(ENSRecord)15412_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ENSRecord", "members": [ { - "astId": 14310, + "astId": 15409, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "addr", "offset": 0, @@ -605,7 +605,7 @@ "type": "t_address" }, { - "astId": 14312, + "astId": 15411, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "orbitdb", "offset": 0, @@ -615,12 +615,12 @@ ], "numberOfBytes": "64" }, - "t_struct(MiningStake)14331_storage": { + "t_struct(MiningStake)15430_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.MiningStake", "members": [ { - "astId": 14328, + "astId": 15427, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "amount", "offset": 0, @@ -628,7 +628,7 @@ "type": "t_uint256" }, { - "astId": 14330, + "astId": 15429, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "timestamp", "offset": 0, @@ -638,12 +638,12 @@ ], "numberOfBytes": "64" }, - "t_struct(PendingReputationUpdate)14342_storage": { + "t_struct(PendingReputationUpdate)15441_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.PendingReputationUpdate", "members": [ { - "astId": 14333, + "astId": 15432, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "user", "offset": 0, @@ -651,7 +651,7 @@ "type": "t_address" }, { - "astId": 14335, + "astId": 15434, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "amount", "offset": 0, @@ -659,7 +659,7 @@ "type": "t_int256" }, { - "astId": 14337, + "astId": 15436, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "skillId", "offset": 0, @@ -667,7 +667,7 @@ "type": "t_uint256" }, { - "astId": 14339, + "astId": 15438, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "colony", "offset": 0, @@ -675,7 +675,7 @@ "type": "t_address" }, { - "astId": 14341, + "astId": 15440, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "timestamp", "offset": 0, @@ -685,12 +685,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ReputationLogEntry)14326_storage": { + "t_struct(ReputationLogEntry)15425_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ReputationLogEntry", "members": [ { - "astId": 14315, + "astId": 15414, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "user", "offset": 0, @@ -698,7 +698,7 @@ "type": "t_address" }, { - "astId": 14317, + "astId": 15416, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "amount", "offset": 0, @@ -706,7 +706,7 @@ "type": "t_int256" }, { - "astId": 14319, + "astId": 15418, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "skillId", "offset": 0, @@ -714,7 +714,7 @@ "type": "t_uint256" }, { - "astId": 14321, + "astId": 15420, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "colony", "offset": 0, @@ -722,7 +722,7 @@ "type": "t_address" }, { - "astId": 14323, + "astId": 15422, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "nUpdates", "offset": 0, @@ -730,7 +730,7 @@ "type": "t_uint128" }, { - "astId": 14325, + "astId": 15424, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "nPreviousUpdates", "offset": 16, @@ -740,12 +740,12 @@ ], "numberOfBytes": "160" }, - "t_struct(Skill)14308_storage": { + "t_struct(Skill)15407_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.Skill", "members": [ { - "astId": 14295, + "astId": 15394, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "nParents", "offset": 0, @@ -753,7 +753,7 @@ "type": "t_uint128" }, { - "astId": 14297, + "astId": 15396, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "nChildren", "offset": 16, @@ -761,7 +761,7 @@ "type": "t_uint128" }, { - "astId": 14300, + "astId": 15399, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "parents", "offset": 0, @@ -769,7 +769,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14303, + "astId": 15402, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "children", "offset": 0, @@ -777,7 +777,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14305, + "astId": 15404, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "DEPRECATED_globalSkill", "offset": 0, @@ -785,7 +785,7 @@ "type": "t_bool" }, { - "astId": 14307, + "astId": 15406, "contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction", "label": "deprecated", "offset": 1, diff --git a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkAuthority.sol:ColonyNetworkAuthority.json b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkAuthority.sol:ColonyNetworkAuthority.json index 39f2301268..998269c390 100644 --- a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkAuthority.sol:ColonyNetworkAuthority.json +++ b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkAuthority.sol:ColonyNetworkAuthority.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colonyNetwork/ColonyNetworkAuthority.sol:ColonyNetworkAuthority", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colonyNetwork/ColonyNetworkAuthority.sol:ColonyNetworkAuthority", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 51141, + "astId": 50959, "contract": "contracts/colonyNetwork/ColonyNetworkAuthority.sol:ColonyNetworkAuthority", "label": "_root_users", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 51145, + "astId": 50963, "contract": "contracts/colonyNetwork/ColonyNetworkAuthority.sol:ColonyNetworkAuthority", "label": "_user_roles", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_mapping(t_address,t_bytes32)" }, { - "astId": 51151, + "astId": 50969, "contract": "contracts/colonyNetwork/ColonyNetworkAuthority.sol:ColonyNetworkAuthority", "label": "_capability_roles", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_mapping(t_address,t_mapping(t_bytes4,t_bytes32))" }, { - "astId": 51157, + "astId": 50975, "contract": "contracts/colonyNetwork/ColonyNetworkAuthority.sol:ColonyNetworkAuthority", "label": "_public_capabilities", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_mapping(t_bytes4,t_bool))" }, { - "astId": 20916, + "astId": 21202, "contract": "contracts/colonyNetwork/ColonyNetworkAuthority.sol:ColonyNetworkAuthority", "label": "userDomainRoles", "offset": 0, @@ -78,7 +78,7 @@ "label": "bytes4", "numberOfBytes": "4" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer.json b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer.json index 93b20d41c4..8f43177c4f 100644 --- a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer.json +++ b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18905, + "astId": 19230, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "colonyCount", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 18907, + "astId": 19232, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "currentColonyVersion", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 18909, + "astId": 19234, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "metaColony", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 18911, + "astId": 19236, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "tokenLocking", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_address" }, { - "astId": 18913, + "astId": 19238, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "feeInverse", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 18915, + "astId": 19240, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "skillCount", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 18917, + "astId": 19242, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "reputationMiningSkillId", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 18919, + "astId": 19244, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "reputationRootHash", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_bytes32" }, { - "astId": 18921, + "astId": 19246, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "reputationRootHashNLeaves", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 18923, + "astId": 19248, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "miningCycleResolver", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_address" }, { - "astId": 18925, + "astId": 19250, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "activeReputationMiningCycle", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_address" }, { - "astId": 18927, + "astId": 19252, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "inactiveReputationMiningCycle", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_address" }, { - "astId": 18931, + "astId": 19256, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "colonies", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18935, + "astId": 19260, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "_isColony", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18939, + "astId": 19264, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "colonyVersionResolver", "offset": 0, @@ -185,15 +185,15 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18944, + "astId": 19269, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "skills", "offset": 0, "slot": "21", - "type": "t_mapping(t_uint256,t_struct(Skill)14308_storage)" + "type": "t_mapping(t_uint256,t_struct(Skill)15407_storage)" }, { - "astId": 18948, + "astId": 19273, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "stakedBalances", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18952, + "astId": 19277, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "recentAuctions", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18954, + "astId": 19279, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "ens", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_address" }, { - "astId": 18956, + "astId": 19281, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "rootNode", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_bytes32" }, { - "astId": 18958, + "astId": 19283, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "userNode", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_bytes32" }, { - "astId": 18960, + "astId": 19285, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "colonyNode", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_bytes32" }, { - "astId": 18964, + "astId": 19289, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "colonyLabels", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18968, + "astId": 19293, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "userLabels", "offset": 0, @@ -257,23 +257,23 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18973, + "astId": 19298, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "records", "offset": 0, "slot": "30", - "type": "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)" + "type": "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)" }, { - "astId": 18980, + "astId": 19305, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "replacementReputationUpdateLog", "offset": 0, "slot": "31", - "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))" + "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))" }, { - "astId": 18984, + "astId": 19309, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "replacementReputationUpdateLogsExist", "offset": 0, @@ -281,15 +281,15 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18989, + "astId": 19314, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "miningStakes", "offset": 0, "slot": "33", - "type": "t_mapping(t_address,t_struct(MiningStake)14331_storage)" + "type": "t_mapping(t_address,t_struct(MiningStake)15430_storage)" }, { - "astId": 18993, + "astId": 19318, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "pendingMiningRewards", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18995, + "astId": 19320, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "totalMinerRewardPerCycle", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_uint256" }, { - "astId": 18997, + "astId": 19322, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "DEPRECATED_annualMetaColonyStipend", "offset": 0, @@ -313,7 +313,7 @@ "type": "t_uint256" }, { - "astId": 18999, + "astId": 19324, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "DEPRECATED_lastMetaColonyStipendIssued", "offset": 0, @@ -321,7 +321,7 @@ "type": "t_uint256" }, { - "astId": 19005, + "astId": 19330, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "resolvers", "offset": 0, @@ -329,7 +329,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_address))" }, { - "astId": 19011, + "astId": 19336, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "installations", "offset": 0, @@ -337,7 +337,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_address,t_address_payable))" }, { - "astId": 19015, + "astId": 19340, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "payoutWhitelist", "offset": 0, @@ -345,7 +345,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 19022, + "astId": 19347, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "metatransactionNonces", "offset": 0, @@ -353,7 +353,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 19026, + "astId": 19351, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "miningDelegators", "offset": 0, @@ -361,7 +361,7 @@ "type": "t_mapping(t_address,t_address)" }, { - "astId": 19028, + "astId": 19353, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "reputationMiningChainId", "offset": 0, @@ -369,7 +369,7 @@ "type": "t_uint256" }, { - "astId": 19030, + "astId": 19355, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "colonyBridgeAddress", "offset": 0, @@ -377,7 +377,7 @@ "type": "t_address" }, { - "astId": 19034, + "astId": 19359, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "bridgeCurrentRootHashNonces", "offset": 0, @@ -385,7 +385,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19038, + "astId": 19363, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "networkSkillCounts", "offset": 0, @@ -393,7 +393,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19044, + "astId": 19369, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "pendingSkillAdditions", "offset": 0, @@ -401,7 +401,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_uint256))" }, { - "astId": 19050, + "astId": 19375, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "reputationUpdateCount", "offset": 0, @@ -409,12 +409,12 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, { - "astId": 19059, + "astId": 19384, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "pendingReputationUpdates", "offset": 0, "slot": "49", - "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))" + "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))" } ], "types": { @@ -444,7 +444,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" @@ -475,19 +475,19 @@ "numberOfBytes": "32", "value": "t_bool" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)" + "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)" + "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)" }, "t_mapping(t_address,t_string_storage)": { "encoding": "mapping", @@ -496,12 +496,12 @@ "numberOfBytes": "32", "value": "t_string_storage" }, - "t_mapping(t_address,t_struct(MiningStake)14331_storage)": { + "t_mapping(t_address,t_struct(MiningStake)15430_storage)": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => struct ColonyNetworkDataTypes.MiningStake)", "numberOfBytes": "32", - "value": "t_struct(MiningStake)14331_storage" + "value": "t_struct(MiningStake)15430_storage" }, "t_mapping(t_address,t_uint256)": { "encoding": "mapping", @@ -524,12 +524,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_address)" }, - "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)": { + "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)": { "encoding": "mapping", "key": "t_bytes32", "label": "mapping(bytes32 => struct ColonyNetworkDataTypes.ENSRecord)", "numberOfBytes": "32", - "value": "t_struct(ENSRecord)14313_storage" + "value": "t_struct(ENSRecord)15412_storage" }, "t_mapping(t_uint256,t_address)": { "encoding": "mapping", @@ -538,12 +538,12 @@ "numberOfBytes": "32", "value": "t_address" }, - "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))": { + "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)))", "numberOfBytes": "32", - "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))" + "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))" }, "t_mapping(t_uint256,t_mapping(t_address,t_uint256))": { "encoding": "mapping", @@ -559,26 +559,26 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_uint256)" }, - "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)": { + "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)", "numberOfBytes": "32", - "value": "t_struct(PendingReputationUpdate)14342_storage" + "value": "t_struct(PendingReputationUpdate)15441_storage" }, - "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)": { + "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry)", "numberOfBytes": "32", - "value": "t_struct(ReputationLogEntry)14326_storage" + "value": "t_struct(ReputationLogEntry)15425_storage" }, - "t_mapping(t_uint256,t_struct(Skill)14308_storage)": { + "t_mapping(t_uint256,t_struct(Skill)15407_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.Skill)", "numberOfBytes": "32", - "value": "t_struct(Skill)14308_storage" + "value": "t_struct(Skill)15407_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -592,12 +592,12 @@ "label": "string", "numberOfBytes": "32" }, - "t_struct(ENSRecord)14313_storage": { + "t_struct(ENSRecord)15412_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ENSRecord", "members": [ { - "astId": 14310, + "astId": 15409, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "addr", "offset": 0, @@ -605,7 +605,7 @@ "type": "t_address" }, { - "astId": 14312, + "astId": 15411, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "orbitdb", "offset": 0, @@ -615,12 +615,12 @@ ], "numberOfBytes": "64" }, - "t_struct(MiningStake)14331_storage": { + "t_struct(MiningStake)15430_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.MiningStake", "members": [ { - "astId": 14328, + "astId": 15427, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "amount", "offset": 0, @@ -628,7 +628,7 @@ "type": "t_uint256" }, { - "astId": 14330, + "astId": 15429, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "timestamp", "offset": 0, @@ -638,12 +638,12 @@ ], "numberOfBytes": "64" }, - "t_struct(PendingReputationUpdate)14342_storage": { + "t_struct(PendingReputationUpdate)15441_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.PendingReputationUpdate", "members": [ { - "astId": 14333, + "astId": 15432, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "user", "offset": 0, @@ -651,7 +651,7 @@ "type": "t_address" }, { - "astId": 14335, + "astId": 15434, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "amount", "offset": 0, @@ -659,7 +659,7 @@ "type": "t_int256" }, { - "astId": 14337, + "astId": 15436, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "skillId", "offset": 0, @@ -667,7 +667,7 @@ "type": "t_uint256" }, { - "astId": 14339, + "astId": 15438, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "colony", "offset": 0, @@ -675,7 +675,7 @@ "type": "t_address" }, { - "astId": 14341, + "astId": 15440, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "timestamp", "offset": 0, @@ -685,12 +685,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ReputationLogEntry)14326_storage": { + "t_struct(ReputationLogEntry)15425_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ReputationLogEntry", "members": [ { - "astId": 14315, + "astId": 15414, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "user", "offset": 0, @@ -698,7 +698,7 @@ "type": "t_address" }, { - "astId": 14317, + "astId": 15416, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "amount", "offset": 0, @@ -706,7 +706,7 @@ "type": "t_int256" }, { - "astId": 14319, + "astId": 15418, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "skillId", "offset": 0, @@ -714,7 +714,7 @@ "type": "t_uint256" }, { - "astId": 14321, + "astId": 15420, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "colony", "offset": 0, @@ -722,7 +722,7 @@ "type": "t_address" }, { - "astId": 14323, + "astId": 15422, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "nUpdates", "offset": 0, @@ -730,7 +730,7 @@ "type": "t_uint128" }, { - "astId": 14325, + "astId": 15424, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "nPreviousUpdates", "offset": 16, @@ -740,12 +740,12 @@ ], "numberOfBytes": "160" }, - "t_struct(Skill)14308_storage": { + "t_struct(Skill)15407_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.Skill", "members": [ { - "astId": 14295, + "astId": 15394, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "nParents", "offset": 0, @@ -753,7 +753,7 @@ "type": "t_uint128" }, { - "astId": 14297, + "astId": 15396, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "nChildren", "offset": 16, @@ -761,7 +761,7 @@ "type": "t_uint128" }, { - "astId": 14300, + "astId": 15399, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "parents", "offset": 0, @@ -769,7 +769,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14303, + "astId": 15402, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "children", "offset": 0, @@ -777,7 +777,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14305, + "astId": 15404, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "DEPRECATED_globalSkill", "offset": 0, @@ -785,7 +785,7 @@ "type": "t_bool" }, { - "astId": 14307, + "astId": 15406, "contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer", "label": "deprecated", "offset": 1, diff --git a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS.json b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS.json index 05a39754f4..8cf2f29944 100644 --- a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS.json +++ b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18905, + "astId": 19230, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "colonyCount", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 18907, + "astId": 19232, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "currentColonyVersion", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 18909, + "astId": 19234, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "metaColony", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 18911, + "astId": 19236, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "tokenLocking", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_address" }, { - "astId": 18913, + "astId": 19238, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "feeInverse", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 18915, + "astId": 19240, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "skillCount", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 18917, + "astId": 19242, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "reputationMiningSkillId", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 18919, + "astId": 19244, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "reputationRootHash", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_bytes32" }, { - "astId": 18921, + "astId": 19246, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "reputationRootHashNLeaves", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 18923, + "astId": 19248, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "miningCycleResolver", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_address" }, { - "astId": 18925, + "astId": 19250, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "activeReputationMiningCycle", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_address" }, { - "astId": 18927, + "astId": 19252, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "inactiveReputationMiningCycle", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_address" }, { - "astId": 18931, + "astId": 19256, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "colonies", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18935, + "astId": 19260, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "_isColony", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18939, + "astId": 19264, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "colonyVersionResolver", "offset": 0, @@ -185,15 +185,15 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18944, + "astId": 19269, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "skills", "offset": 0, "slot": "21", - "type": "t_mapping(t_uint256,t_struct(Skill)14308_storage)" + "type": "t_mapping(t_uint256,t_struct(Skill)15407_storage)" }, { - "astId": 18948, + "astId": 19273, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "stakedBalances", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18952, + "astId": 19277, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "recentAuctions", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18954, + "astId": 19279, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "ens", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_address" }, { - "astId": 18956, + "astId": 19281, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "rootNode", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_bytes32" }, { - "astId": 18958, + "astId": 19283, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "userNode", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_bytes32" }, { - "astId": 18960, + "astId": 19285, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "colonyNode", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_bytes32" }, { - "astId": 18964, + "astId": 19289, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "colonyLabels", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18968, + "astId": 19293, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "userLabels", "offset": 0, @@ -257,23 +257,23 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18973, + "astId": 19298, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "records", "offset": 0, "slot": "30", - "type": "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)" + "type": "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)" }, { - "astId": 18980, + "astId": 19305, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "replacementReputationUpdateLog", "offset": 0, "slot": "31", - "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))" + "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))" }, { - "astId": 18984, + "astId": 19309, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "replacementReputationUpdateLogsExist", "offset": 0, @@ -281,15 +281,15 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18989, + "astId": 19314, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "miningStakes", "offset": 0, "slot": "33", - "type": "t_mapping(t_address,t_struct(MiningStake)14331_storage)" + "type": "t_mapping(t_address,t_struct(MiningStake)15430_storage)" }, { - "astId": 18993, + "astId": 19318, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "pendingMiningRewards", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18995, + "astId": 19320, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "totalMinerRewardPerCycle", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_uint256" }, { - "astId": 18997, + "astId": 19322, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "DEPRECATED_annualMetaColonyStipend", "offset": 0, @@ -313,7 +313,7 @@ "type": "t_uint256" }, { - "astId": 18999, + "astId": 19324, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "DEPRECATED_lastMetaColonyStipendIssued", "offset": 0, @@ -321,7 +321,7 @@ "type": "t_uint256" }, { - "astId": 19005, + "astId": 19330, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "resolvers", "offset": 0, @@ -329,7 +329,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_address))" }, { - "astId": 19011, + "astId": 19336, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "installations", "offset": 0, @@ -337,7 +337,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_address,t_address_payable))" }, { - "astId": 19015, + "astId": 19340, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "payoutWhitelist", "offset": 0, @@ -345,7 +345,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 19022, + "astId": 19347, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "metatransactionNonces", "offset": 0, @@ -353,7 +353,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 19026, + "astId": 19351, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "miningDelegators", "offset": 0, @@ -361,7 +361,7 @@ "type": "t_mapping(t_address,t_address)" }, { - "astId": 19028, + "astId": 19353, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "reputationMiningChainId", "offset": 0, @@ -369,7 +369,7 @@ "type": "t_uint256" }, { - "astId": 19030, + "astId": 19355, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "colonyBridgeAddress", "offset": 0, @@ -377,7 +377,7 @@ "type": "t_address" }, { - "astId": 19034, + "astId": 19359, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "bridgeCurrentRootHashNonces", "offset": 0, @@ -385,7 +385,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19038, + "astId": 19363, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "networkSkillCounts", "offset": 0, @@ -393,7 +393,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19044, + "astId": 19369, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "pendingSkillAdditions", "offset": 0, @@ -401,7 +401,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_uint256))" }, { - "astId": 19050, + "astId": 19375, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "reputationUpdateCount", "offset": 0, @@ -409,12 +409,12 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, { - "astId": 19059, + "astId": 19384, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "pendingReputationUpdates", "offset": 0, "slot": "49", - "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))" + "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))" } ], "types": { @@ -444,7 +444,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" @@ -475,19 +475,19 @@ "numberOfBytes": "32", "value": "t_bool" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)" + "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)" + "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)" }, "t_mapping(t_address,t_string_storage)": { "encoding": "mapping", @@ -496,12 +496,12 @@ "numberOfBytes": "32", "value": "t_string_storage" }, - "t_mapping(t_address,t_struct(MiningStake)14331_storage)": { + "t_mapping(t_address,t_struct(MiningStake)15430_storage)": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => struct ColonyNetworkDataTypes.MiningStake)", "numberOfBytes": "32", - "value": "t_struct(MiningStake)14331_storage" + "value": "t_struct(MiningStake)15430_storage" }, "t_mapping(t_address,t_uint256)": { "encoding": "mapping", @@ -524,12 +524,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_address)" }, - "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)": { + "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)": { "encoding": "mapping", "key": "t_bytes32", "label": "mapping(bytes32 => struct ColonyNetworkDataTypes.ENSRecord)", "numberOfBytes": "32", - "value": "t_struct(ENSRecord)14313_storage" + "value": "t_struct(ENSRecord)15412_storage" }, "t_mapping(t_uint256,t_address)": { "encoding": "mapping", @@ -538,12 +538,12 @@ "numberOfBytes": "32", "value": "t_address" }, - "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))": { + "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)))", "numberOfBytes": "32", - "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))" + "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))" }, "t_mapping(t_uint256,t_mapping(t_address,t_uint256))": { "encoding": "mapping", @@ -559,26 +559,26 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_uint256)" }, - "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)": { + "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)", "numberOfBytes": "32", - "value": "t_struct(PendingReputationUpdate)14342_storage" + "value": "t_struct(PendingReputationUpdate)15441_storage" }, - "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)": { + "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry)", "numberOfBytes": "32", - "value": "t_struct(ReputationLogEntry)14326_storage" + "value": "t_struct(ReputationLogEntry)15425_storage" }, - "t_mapping(t_uint256,t_struct(Skill)14308_storage)": { + "t_mapping(t_uint256,t_struct(Skill)15407_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.Skill)", "numberOfBytes": "32", - "value": "t_struct(Skill)14308_storage" + "value": "t_struct(Skill)15407_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -592,12 +592,12 @@ "label": "string", "numberOfBytes": "32" }, - "t_struct(ENSRecord)14313_storage": { + "t_struct(ENSRecord)15412_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ENSRecord", "members": [ { - "astId": 14310, + "astId": 15409, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "addr", "offset": 0, @@ -605,7 +605,7 @@ "type": "t_address" }, { - "astId": 14312, + "astId": 15411, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "orbitdb", "offset": 0, @@ -615,12 +615,12 @@ ], "numberOfBytes": "64" }, - "t_struct(MiningStake)14331_storage": { + "t_struct(MiningStake)15430_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.MiningStake", "members": [ { - "astId": 14328, + "astId": 15427, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "amount", "offset": 0, @@ -628,7 +628,7 @@ "type": "t_uint256" }, { - "astId": 14330, + "astId": 15429, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "timestamp", "offset": 0, @@ -638,12 +638,12 @@ ], "numberOfBytes": "64" }, - "t_struct(PendingReputationUpdate)14342_storage": { + "t_struct(PendingReputationUpdate)15441_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.PendingReputationUpdate", "members": [ { - "astId": 14333, + "astId": 15432, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "user", "offset": 0, @@ -651,7 +651,7 @@ "type": "t_address" }, { - "astId": 14335, + "astId": 15434, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "amount", "offset": 0, @@ -659,7 +659,7 @@ "type": "t_int256" }, { - "astId": 14337, + "astId": 15436, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "skillId", "offset": 0, @@ -667,7 +667,7 @@ "type": "t_uint256" }, { - "astId": 14339, + "astId": 15438, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "colony", "offset": 0, @@ -675,7 +675,7 @@ "type": "t_address" }, { - "astId": 14341, + "astId": 15440, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "timestamp", "offset": 0, @@ -685,12 +685,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ReputationLogEntry)14326_storage": { + "t_struct(ReputationLogEntry)15425_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ReputationLogEntry", "members": [ { - "astId": 14315, + "astId": 15414, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "user", "offset": 0, @@ -698,7 +698,7 @@ "type": "t_address" }, { - "astId": 14317, + "astId": 15416, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "amount", "offset": 0, @@ -706,7 +706,7 @@ "type": "t_int256" }, { - "astId": 14319, + "astId": 15418, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "skillId", "offset": 0, @@ -714,7 +714,7 @@ "type": "t_uint256" }, { - "astId": 14321, + "astId": 15420, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "colony", "offset": 0, @@ -722,7 +722,7 @@ "type": "t_address" }, { - "astId": 14323, + "astId": 15422, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "nUpdates", "offset": 0, @@ -730,7 +730,7 @@ "type": "t_uint128" }, { - "astId": 14325, + "astId": 15424, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "nPreviousUpdates", "offset": 16, @@ -740,12 +740,12 @@ ], "numberOfBytes": "160" }, - "t_struct(Skill)14308_storage": { + "t_struct(Skill)15407_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.Skill", "members": [ { - "astId": 14295, + "astId": 15394, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "nParents", "offset": 0, @@ -753,7 +753,7 @@ "type": "t_uint128" }, { - "astId": 14297, + "astId": 15396, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "nChildren", "offset": 16, @@ -761,7 +761,7 @@ "type": "t_uint128" }, { - "astId": 14300, + "astId": 15399, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "parents", "offset": 0, @@ -769,7 +769,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14303, + "astId": 15402, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "children", "offset": 0, @@ -777,7 +777,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14305, + "astId": 15404, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "DEPRECATED_globalSkill", "offset": 0, @@ -785,7 +785,7 @@ "type": "t_bool" }, { - "astId": 14307, + "astId": 15406, "contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS", "label": "deprecated", "offset": 1, diff --git a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions.json b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions.json index f2e9a56802..5cfe2f1a22 100644 --- a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions.json +++ b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18905, + "astId": 19230, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "colonyCount", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 18907, + "astId": 19232, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "currentColonyVersion", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 18909, + "astId": 19234, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "metaColony", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 18911, + "astId": 19236, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "tokenLocking", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_address" }, { - "astId": 18913, + "astId": 19238, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "feeInverse", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 18915, + "astId": 19240, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "skillCount", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 18917, + "astId": 19242, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "reputationMiningSkillId", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 18919, + "astId": 19244, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "reputationRootHash", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_bytes32" }, { - "astId": 18921, + "astId": 19246, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "reputationRootHashNLeaves", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 18923, + "astId": 19248, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "miningCycleResolver", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_address" }, { - "astId": 18925, + "astId": 19250, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "activeReputationMiningCycle", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_address" }, { - "astId": 18927, + "astId": 19252, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "inactiveReputationMiningCycle", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_address" }, { - "astId": 18931, + "astId": 19256, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "colonies", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18935, + "astId": 19260, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "_isColony", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18939, + "astId": 19264, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "colonyVersionResolver", "offset": 0, @@ -185,15 +185,15 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18944, + "astId": 19269, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "skills", "offset": 0, "slot": "21", - "type": "t_mapping(t_uint256,t_struct(Skill)14308_storage)" + "type": "t_mapping(t_uint256,t_struct(Skill)15407_storage)" }, { - "astId": 18948, + "astId": 19273, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "stakedBalances", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18952, + "astId": 19277, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "recentAuctions", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18954, + "astId": 19279, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "ens", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_address" }, { - "astId": 18956, + "astId": 19281, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "rootNode", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_bytes32" }, { - "astId": 18958, + "astId": 19283, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "userNode", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_bytes32" }, { - "astId": 18960, + "astId": 19285, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "colonyNode", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_bytes32" }, { - "astId": 18964, + "astId": 19289, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "colonyLabels", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18968, + "astId": 19293, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "userLabels", "offset": 0, @@ -257,23 +257,23 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18973, + "astId": 19298, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "records", "offset": 0, "slot": "30", - "type": "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)" + "type": "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)" }, { - "astId": 18980, + "astId": 19305, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "replacementReputationUpdateLog", "offset": 0, "slot": "31", - "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))" + "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))" }, { - "astId": 18984, + "astId": 19309, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "replacementReputationUpdateLogsExist", "offset": 0, @@ -281,15 +281,15 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18989, + "astId": 19314, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "miningStakes", "offset": 0, "slot": "33", - "type": "t_mapping(t_address,t_struct(MiningStake)14331_storage)" + "type": "t_mapping(t_address,t_struct(MiningStake)15430_storage)" }, { - "astId": 18993, + "astId": 19318, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "pendingMiningRewards", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18995, + "astId": 19320, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "totalMinerRewardPerCycle", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_uint256" }, { - "astId": 18997, + "astId": 19322, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "DEPRECATED_annualMetaColonyStipend", "offset": 0, @@ -313,7 +313,7 @@ "type": "t_uint256" }, { - "astId": 18999, + "astId": 19324, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "DEPRECATED_lastMetaColonyStipendIssued", "offset": 0, @@ -321,7 +321,7 @@ "type": "t_uint256" }, { - "astId": 19005, + "astId": 19330, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "resolvers", "offset": 0, @@ -329,7 +329,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_address))" }, { - "astId": 19011, + "astId": 19336, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "installations", "offset": 0, @@ -337,7 +337,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_address,t_address_payable))" }, { - "astId": 19015, + "astId": 19340, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "payoutWhitelist", "offset": 0, @@ -345,7 +345,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 19022, + "astId": 19347, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "metatransactionNonces", "offset": 0, @@ -353,7 +353,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 19026, + "astId": 19351, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "miningDelegators", "offset": 0, @@ -361,7 +361,7 @@ "type": "t_mapping(t_address,t_address)" }, { - "astId": 19028, + "astId": 19353, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "reputationMiningChainId", "offset": 0, @@ -369,7 +369,7 @@ "type": "t_uint256" }, { - "astId": 19030, + "astId": 19355, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "colonyBridgeAddress", "offset": 0, @@ -377,7 +377,7 @@ "type": "t_address" }, { - "astId": 19034, + "astId": 19359, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "bridgeCurrentRootHashNonces", "offset": 0, @@ -385,7 +385,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19038, + "astId": 19363, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "networkSkillCounts", "offset": 0, @@ -393,7 +393,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19044, + "astId": 19369, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "pendingSkillAdditions", "offset": 0, @@ -401,7 +401,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_uint256))" }, { - "astId": 19050, + "astId": 19375, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "reputationUpdateCount", "offset": 0, @@ -409,12 +409,12 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, { - "astId": 19059, + "astId": 19384, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "pendingReputationUpdates", "offset": 0, "slot": "49", - "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))" + "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))" } ], "types": { @@ -444,7 +444,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" @@ -475,19 +475,19 @@ "numberOfBytes": "32", "value": "t_bool" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)" + "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)" + "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)" }, "t_mapping(t_address,t_string_storage)": { "encoding": "mapping", @@ -496,12 +496,12 @@ "numberOfBytes": "32", "value": "t_string_storage" }, - "t_mapping(t_address,t_struct(MiningStake)14331_storage)": { + "t_mapping(t_address,t_struct(MiningStake)15430_storage)": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => struct ColonyNetworkDataTypes.MiningStake)", "numberOfBytes": "32", - "value": "t_struct(MiningStake)14331_storage" + "value": "t_struct(MiningStake)15430_storage" }, "t_mapping(t_address,t_uint256)": { "encoding": "mapping", @@ -524,12 +524,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_address)" }, - "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)": { + "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)": { "encoding": "mapping", "key": "t_bytes32", "label": "mapping(bytes32 => struct ColonyNetworkDataTypes.ENSRecord)", "numberOfBytes": "32", - "value": "t_struct(ENSRecord)14313_storage" + "value": "t_struct(ENSRecord)15412_storage" }, "t_mapping(t_uint256,t_address)": { "encoding": "mapping", @@ -538,12 +538,12 @@ "numberOfBytes": "32", "value": "t_address" }, - "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))": { + "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)))", "numberOfBytes": "32", - "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))" + "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))" }, "t_mapping(t_uint256,t_mapping(t_address,t_uint256))": { "encoding": "mapping", @@ -559,26 +559,26 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_uint256)" }, - "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)": { + "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)", "numberOfBytes": "32", - "value": "t_struct(PendingReputationUpdate)14342_storage" + "value": "t_struct(PendingReputationUpdate)15441_storage" }, - "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)": { + "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry)", "numberOfBytes": "32", - "value": "t_struct(ReputationLogEntry)14326_storage" + "value": "t_struct(ReputationLogEntry)15425_storage" }, - "t_mapping(t_uint256,t_struct(Skill)14308_storage)": { + "t_mapping(t_uint256,t_struct(Skill)15407_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.Skill)", "numberOfBytes": "32", - "value": "t_struct(Skill)14308_storage" + "value": "t_struct(Skill)15407_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -592,12 +592,12 @@ "label": "string", "numberOfBytes": "32" }, - "t_struct(ENSRecord)14313_storage": { + "t_struct(ENSRecord)15412_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ENSRecord", "members": [ { - "astId": 14310, + "astId": 15409, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "addr", "offset": 0, @@ -605,7 +605,7 @@ "type": "t_address" }, { - "astId": 14312, + "astId": 15411, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "orbitdb", "offset": 0, @@ -615,12 +615,12 @@ ], "numberOfBytes": "64" }, - "t_struct(MiningStake)14331_storage": { + "t_struct(MiningStake)15430_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.MiningStake", "members": [ { - "astId": 14328, + "astId": 15427, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "amount", "offset": 0, @@ -628,7 +628,7 @@ "type": "t_uint256" }, { - "astId": 14330, + "astId": 15429, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "timestamp", "offset": 0, @@ -638,12 +638,12 @@ ], "numberOfBytes": "64" }, - "t_struct(PendingReputationUpdate)14342_storage": { + "t_struct(PendingReputationUpdate)15441_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.PendingReputationUpdate", "members": [ { - "astId": 14333, + "astId": 15432, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "user", "offset": 0, @@ -651,7 +651,7 @@ "type": "t_address" }, { - "astId": 14335, + "astId": 15434, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "amount", "offset": 0, @@ -659,7 +659,7 @@ "type": "t_int256" }, { - "astId": 14337, + "astId": 15436, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "skillId", "offset": 0, @@ -667,7 +667,7 @@ "type": "t_uint256" }, { - "astId": 14339, + "astId": 15438, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "colony", "offset": 0, @@ -675,7 +675,7 @@ "type": "t_address" }, { - "astId": 14341, + "astId": 15440, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "timestamp", "offset": 0, @@ -685,12 +685,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ReputationLogEntry)14326_storage": { + "t_struct(ReputationLogEntry)15425_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ReputationLogEntry", "members": [ { - "astId": 14315, + "astId": 15414, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "user", "offset": 0, @@ -698,7 +698,7 @@ "type": "t_address" }, { - "astId": 14317, + "astId": 15416, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "amount", "offset": 0, @@ -706,7 +706,7 @@ "type": "t_int256" }, { - "astId": 14319, + "astId": 15418, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "skillId", "offset": 0, @@ -714,7 +714,7 @@ "type": "t_uint256" }, { - "astId": 14321, + "astId": 15420, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "colony", "offset": 0, @@ -722,7 +722,7 @@ "type": "t_address" }, { - "astId": 14323, + "astId": 15422, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "nUpdates", "offset": 0, @@ -730,7 +730,7 @@ "type": "t_uint128" }, { - "astId": 14325, + "astId": 15424, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "nPreviousUpdates", "offset": 16, @@ -740,12 +740,12 @@ ], "numberOfBytes": "160" }, - "t_struct(Skill)14308_storage": { + "t_struct(Skill)15407_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.Skill", "members": [ { - "astId": 14295, + "astId": 15394, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "nParents", "offset": 0, @@ -753,7 +753,7 @@ "type": "t_uint128" }, { - "astId": 14297, + "astId": 15396, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "nChildren", "offset": 16, @@ -761,7 +761,7 @@ "type": "t_uint128" }, { - "astId": 14300, + "astId": 15399, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "parents", "offset": 0, @@ -769,7 +769,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14303, + "astId": 15402, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "children", "offset": 0, @@ -777,7 +777,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14305, + "astId": 15404, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "DEPRECATED_globalSkill", "offset": 0, @@ -785,7 +785,7 @@ "type": "t_bool" }, { - "astId": 14307, + "astId": 15406, "contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions", "label": "deprecated", "offset": 1, diff --git a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining.json b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining.json index 9254cfc42a..ef3f0adc34 100644 --- a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining.json +++ b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18905, + "astId": 19230, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "colonyCount", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 18907, + "astId": 19232, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "currentColonyVersion", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 18909, + "astId": 19234, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "metaColony", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 18911, + "astId": 19236, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "tokenLocking", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_address" }, { - "astId": 18913, + "astId": 19238, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "feeInverse", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 18915, + "astId": 19240, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "skillCount", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 18917, + "astId": 19242, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "reputationMiningSkillId", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 18919, + "astId": 19244, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "reputationRootHash", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_bytes32" }, { - "astId": 18921, + "astId": 19246, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "reputationRootHashNLeaves", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 18923, + "astId": 19248, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "miningCycleResolver", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_address" }, { - "astId": 18925, + "astId": 19250, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "activeReputationMiningCycle", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_address" }, { - "astId": 18927, + "astId": 19252, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "inactiveReputationMiningCycle", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_address" }, { - "astId": 18931, + "astId": 19256, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "colonies", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18935, + "astId": 19260, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "_isColony", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18939, + "astId": 19264, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "colonyVersionResolver", "offset": 0, @@ -185,15 +185,15 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18944, + "astId": 19269, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "skills", "offset": 0, "slot": "21", - "type": "t_mapping(t_uint256,t_struct(Skill)14308_storage)" + "type": "t_mapping(t_uint256,t_struct(Skill)15407_storage)" }, { - "astId": 18948, + "astId": 19273, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "stakedBalances", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18952, + "astId": 19277, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "recentAuctions", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18954, + "astId": 19279, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "ens", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_address" }, { - "astId": 18956, + "astId": 19281, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "rootNode", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_bytes32" }, { - "astId": 18958, + "astId": 19283, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "userNode", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_bytes32" }, { - "astId": 18960, + "astId": 19285, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "colonyNode", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_bytes32" }, { - "astId": 18964, + "astId": 19289, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "colonyLabels", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18968, + "astId": 19293, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "userLabels", "offset": 0, @@ -257,23 +257,23 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18973, + "astId": 19298, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "records", "offset": 0, "slot": "30", - "type": "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)" + "type": "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)" }, { - "astId": 18980, + "astId": 19305, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "replacementReputationUpdateLog", "offset": 0, "slot": "31", - "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))" + "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))" }, { - "astId": 18984, + "astId": 19309, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "replacementReputationUpdateLogsExist", "offset": 0, @@ -281,15 +281,15 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18989, + "astId": 19314, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "miningStakes", "offset": 0, "slot": "33", - "type": "t_mapping(t_address,t_struct(MiningStake)14331_storage)" + "type": "t_mapping(t_address,t_struct(MiningStake)15430_storage)" }, { - "astId": 18993, + "astId": 19318, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "pendingMiningRewards", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18995, + "astId": 19320, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "totalMinerRewardPerCycle", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_uint256" }, { - "astId": 18997, + "astId": 19322, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "DEPRECATED_annualMetaColonyStipend", "offset": 0, @@ -313,7 +313,7 @@ "type": "t_uint256" }, { - "astId": 18999, + "astId": 19324, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "DEPRECATED_lastMetaColonyStipendIssued", "offset": 0, @@ -321,7 +321,7 @@ "type": "t_uint256" }, { - "astId": 19005, + "astId": 19330, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "resolvers", "offset": 0, @@ -329,7 +329,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_address))" }, { - "astId": 19011, + "astId": 19336, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "installations", "offset": 0, @@ -337,7 +337,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_address,t_address_payable))" }, { - "astId": 19015, + "astId": 19340, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "payoutWhitelist", "offset": 0, @@ -345,7 +345,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 19022, + "astId": 19347, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "metatransactionNonces", "offset": 0, @@ -353,7 +353,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 19026, + "astId": 19351, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "miningDelegators", "offset": 0, @@ -361,7 +361,7 @@ "type": "t_mapping(t_address,t_address)" }, { - "astId": 19028, + "astId": 19353, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "reputationMiningChainId", "offset": 0, @@ -369,7 +369,7 @@ "type": "t_uint256" }, { - "astId": 19030, + "astId": 19355, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "colonyBridgeAddress", "offset": 0, @@ -377,7 +377,7 @@ "type": "t_address" }, { - "astId": 19034, + "astId": 19359, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "bridgeCurrentRootHashNonces", "offset": 0, @@ -385,7 +385,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19038, + "astId": 19363, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "networkSkillCounts", "offset": 0, @@ -393,7 +393,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19044, + "astId": 19369, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "pendingSkillAdditions", "offset": 0, @@ -401,7 +401,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_uint256))" }, { - "astId": 19050, + "astId": 19375, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "reputationUpdateCount", "offset": 0, @@ -409,12 +409,12 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, { - "astId": 19059, + "astId": 19384, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "pendingReputationUpdates", "offset": 0, "slot": "49", - "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))" + "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))" } ], "types": { @@ -444,7 +444,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" @@ -475,19 +475,19 @@ "numberOfBytes": "32", "value": "t_bool" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)" + "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)" + "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)" }, "t_mapping(t_address,t_string_storage)": { "encoding": "mapping", @@ -496,12 +496,12 @@ "numberOfBytes": "32", "value": "t_string_storage" }, - "t_mapping(t_address,t_struct(MiningStake)14331_storage)": { + "t_mapping(t_address,t_struct(MiningStake)15430_storage)": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => struct ColonyNetworkDataTypes.MiningStake)", "numberOfBytes": "32", - "value": "t_struct(MiningStake)14331_storage" + "value": "t_struct(MiningStake)15430_storage" }, "t_mapping(t_address,t_uint256)": { "encoding": "mapping", @@ -524,12 +524,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_address)" }, - "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)": { + "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)": { "encoding": "mapping", "key": "t_bytes32", "label": "mapping(bytes32 => struct ColonyNetworkDataTypes.ENSRecord)", "numberOfBytes": "32", - "value": "t_struct(ENSRecord)14313_storage" + "value": "t_struct(ENSRecord)15412_storage" }, "t_mapping(t_uint256,t_address)": { "encoding": "mapping", @@ -538,12 +538,12 @@ "numberOfBytes": "32", "value": "t_address" }, - "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))": { + "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)))", "numberOfBytes": "32", - "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))" + "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))" }, "t_mapping(t_uint256,t_mapping(t_address,t_uint256))": { "encoding": "mapping", @@ -559,26 +559,26 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_uint256)" }, - "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)": { + "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)", "numberOfBytes": "32", - "value": "t_struct(PendingReputationUpdate)14342_storage" + "value": "t_struct(PendingReputationUpdate)15441_storage" }, - "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)": { + "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry)", "numberOfBytes": "32", - "value": "t_struct(ReputationLogEntry)14326_storage" + "value": "t_struct(ReputationLogEntry)15425_storage" }, - "t_mapping(t_uint256,t_struct(Skill)14308_storage)": { + "t_mapping(t_uint256,t_struct(Skill)15407_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.Skill)", "numberOfBytes": "32", - "value": "t_struct(Skill)14308_storage" + "value": "t_struct(Skill)15407_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -592,12 +592,12 @@ "label": "string", "numberOfBytes": "32" }, - "t_struct(ENSRecord)14313_storage": { + "t_struct(ENSRecord)15412_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ENSRecord", "members": [ { - "astId": 14310, + "astId": 15409, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "addr", "offset": 0, @@ -605,7 +605,7 @@ "type": "t_address" }, { - "astId": 14312, + "astId": 15411, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "orbitdb", "offset": 0, @@ -615,12 +615,12 @@ ], "numberOfBytes": "64" }, - "t_struct(MiningStake)14331_storage": { + "t_struct(MiningStake)15430_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.MiningStake", "members": [ { - "astId": 14328, + "astId": 15427, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "amount", "offset": 0, @@ -628,7 +628,7 @@ "type": "t_uint256" }, { - "astId": 14330, + "astId": 15429, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "timestamp", "offset": 0, @@ -638,12 +638,12 @@ ], "numberOfBytes": "64" }, - "t_struct(PendingReputationUpdate)14342_storage": { + "t_struct(PendingReputationUpdate)15441_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.PendingReputationUpdate", "members": [ { - "astId": 14333, + "astId": 15432, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "user", "offset": 0, @@ -651,7 +651,7 @@ "type": "t_address" }, { - "astId": 14335, + "astId": 15434, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "amount", "offset": 0, @@ -659,7 +659,7 @@ "type": "t_int256" }, { - "astId": 14337, + "astId": 15436, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "skillId", "offset": 0, @@ -667,7 +667,7 @@ "type": "t_uint256" }, { - "astId": 14339, + "astId": 15438, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "colony", "offset": 0, @@ -675,7 +675,7 @@ "type": "t_address" }, { - "astId": 14341, + "astId": 15440, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "timestamp", "offset": 0, @@ -685,12 +685,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ReputationLogEntry)14326_storage": { + "t_struct(ReputationLogEntry)15425_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ReputationLogEntry", "members": [ { - "astId": 14315, + "astId": 15414, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "user", "offset": 0, @@ -698,7 +698,7 @@ "type": "t_address" }, { - "astId": 14317, + "astId": 15416, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "amount", "offset": 0, @@ -706,7 +706,7 @@ "type": "t_int256" }, { - "astId": 14319, + "astId": 15418, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "skillId", "offset": 0, @@ -714,7 +714,7 @@ "type": "t_uint256" }, { - "astId": 14321, + "astId": 15420, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "colony", "offset": 0, @@ -722,7 +722,7 @@ "type": "t_address" }, { - "astId": 14323, + "astId": 15422, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "nUpdates", "offset": 0, @@ -730,7 +730,7 @@ "type": "t_uint128" }, { - "astId": 14325, + "astId": 15424, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "nPreviousUpdates", "offset": 16, @@ -740,12 +740,12 @@ ], "numberOfBytes": "160" }, - "t_struct(Skill)14308_storage": { + "t_struct(Skill)15407_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.Skill", "members": [ { - "astId": 14295, + "astId": 15394, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "nParents", "offset": 0, @@ -753,7 +753,7 @@ "type": "t_uint128" }, { - "astId": 14297, + "astId": 15396, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "nChildren", "offset": 16, @@ -761,7 +761,7 @@ "type": "t_uint128" }, { - "astId": 14300, + "astId": 15399, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "parents", "offset": 0, @@ -769,7 +769,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14303, + "astId": 15402, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "children", "offset": 0, @@ -777,7 +777,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14305, + "astId": 15404, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "DEPRECATED_globalSkill", "offset": 0, @@ -785,7 +785,7 @@ "type": "t_bool" }, { - "astId": 14307, + "astId": 15406, "contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining", "label": "deprecated", "offset": 1, diff --git a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills.json b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills.json index ebac331df0..8d650b6088 100644 --- a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills.json +++ b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18905, + "astId": 19230, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "colonyCount", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 18907, + "astId": 19232, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "currentColonyVersion", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 18909, + "astId": 19234, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "metaColony", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 18911, + "astId": 19236, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "tokenLocking", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_address" }, { - "astId": 18913, + "astId": 19238, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "feeInverse", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 18915, + "astId": 19240, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "skillCount", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 18917, + "astId": 19242, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "reputationMiningSkillId", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 18919, + "astId": 19244, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "reputationRootHash", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_bytes32" }, { - "astId": 18921, + "astId": 19246, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "reputationRootHashNLeaves", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 18923, + "astId": 19248, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "miningCycleResolver", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_address" }, { - "astId": 18925, + "astId": 19250, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "activeReputationMiningCycle", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_address" }, { - "astId": 18927, + "astId": 19252, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "inactiveReputationMiningCycle", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_address" }, { - "astId": 18931, + "astId": 19256, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "colonies", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18935, + "astId": 19260, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "_isColony", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18939, + "astId": 19264, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "colonyVersionResolver", "offset": 0, @@ -185,15 +185,15 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18944, + "astId": 19269, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "skills", "offset": 0, "slot": "21", - "type": "t_mapping(t_uint256,t_struct(Skill)14308_storage)" + "type": "t_mapping(t_uint256,t_struct(Skill)15407_storage)" }, { - "astId": 18948, + "astId": 19273, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "stakedBalances", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18952, + "astId": 19277, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "recentAuctions", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18954, + "astId": 19279, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "ens", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_address" }, { - "astId": 18956, + "astId": 19281, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "rootNode", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_bytes32" }, { - "astId": 18958, + "astId": 19283, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "userNode", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_bytes32" }, { - "astId": 18960, + "astId": 19285, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "colonyNode", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_bytes32" }, { - "astId": 18964, + "astId": 19289, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "colonyLabels", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18968, + "astId": 19293, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "userLabels", "offset": 0, @@ -257,23 +257,23 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18973, + "astId": 19298, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "records", "offset": 0, "slot": "30", - "type": "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)" + "type": "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)" }, { - "astId": 18980, + "astId": 19305, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "replacementReputationUpdateLog", "offset": 0, "slot": "31", - "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))" + "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))" }, { - "astId": 18984, + "astId": 19309, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "replacementReputationUpdateLogsExist", "offset": 0, @@ -281,15 +281,15 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18989, + "astId": 19314, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "miningStakes", "offset": 0, "slot": "33", - "type": "t_mapping(t_address,t_struct(MiningStake)14331_storage)" + "type": "t_mapping(t_address,t_struct(MiningStake)15430_storage)" }, { - "astId": 18993, + "astId": 19318, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "pendingMiningRewards", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18995, + "astId": 19320, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "totalMinerRewardPerCycle", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_uint256" }, { - "astId": 18997, + "astId": 19322, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "DEPRECATED_annualMetaColonyStipend", "offset": 0, @@ -313,7 +313,7 @@ "type": "t_uint256" }, { - "astId": 18999, + "astId": 19324, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "DEPRECATED_lastMetaColonyStipendIssued", "offset": 0, @@ -321,7 +321,7 @@ "type": "t_uint256" }, { - "astId": 19005, + "astId": 19330, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "resolvers", "offset": 0, @@ -329,7 +329,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_address))" }, { - "astId": 19011, + "astId": 19336, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "installations", "offset": 0, @@ -337,7 +337,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_address,t_address_payable))" }, { - "astId": 19015, + "astId": 19340, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "payoutWhitelist", "offset": 0, @@ -345,7 +345,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 19022, + "astId": 19347, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "metatransactionNonces", "offset": 0, @@ -353,7 +353,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 19026, + "astId": 19351, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "miningDelegators", "offset": 0, @@ -361,7 +361,7 @@ "type": "t_mapping(t_address,t_address)" }, { - "astId": 19028, + "astId": 19353, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "reputationMiningChainId", "offset": 0, @@ -369,7 +369,7 @@ "type": "t_uint256" }, { - "astId": 19030, + "astId": 19355, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "colonyBridgeAddress", "offset": 0, @@ -377,7 +377,7 @@ "type": "t_address" }, { - "astId": 19034, + "astId": 19359, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "bridgeCurrentRootHashNonces", "offset": 0, @@ -385,7 +385,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19038, + "astId": 19363, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "networkSkillCounts", "offset": 0, @@ -393,7 +393,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19044, + "astId": 19369, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "pendingSkillAdditions", "offset": 0, @@ -401,7 +401,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_uint256))" }, { - "astId": 19050, + "astId": 19375, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "reputationUpdateCount", "offset": 0, @@ -409,12 +409,12 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, { - "astId": 19059, + "astId": 19384, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "pendingReputationUpdates", "offset": 0, "slot": "49", - "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))" + "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))" } ], "types": { @@ -444,7 +444,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" @@ -475,19 +475,19 @@ "numberOfBytes": "32", "value": "t_bool" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)" + "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)" + "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)" }, "t_mapping(t_address,t_string_storage)": { "encoding": "mapping", @@ -496,12 +496,12 @@ "numberOfBytes": "32", "value": "t_string_storage" }, - "t_mapping(t_address,t_struct(MiningStake)14331_storage)": { + "t_mapping(t_address,t_struct(MiningStake)15430_storage)": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => struct ColonyNetworkDataTypes.MiningStake)", "numberOfBytes": "32", - "value": "t_struct(MiningStake)14331_storage" + "value": "t_struct(MiningStake)15430_storage" }, "t_mapping(t_address,t_uint256)": { "encoding": "mapping", @@ -524,12 +524,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_address)" }, - "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)": { + "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)": { "encoding": "mapping", "key": "t_bytes32", "label": "mapping(bytes32 => struct ColonyNetworkDataTypes.ENSRecord)", "numberOfBytes": "32", - "value": "t_struct(ENSRecord)14313_storage" + "value": "t_struct(ENSRecord)15412_storage" }, "t_mapping(t_uint256,t_address)": { "encoding": "mapping", @@ -538,12 +538,12 @@ "numberOfBytes": "32", "value": "t_address" }, - "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))": { + "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)))", "numberOfBytes": "32", - "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))" + "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))" }, "t_mapping(t_uint256,t_mapping(t_address,t_uint256))": { "encoding": "mapping", @@ -559,26 +559,26 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_uint256)" }, - "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)": { + "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)", "numberOfBytes": "32", - "value": "t_struct(PendingReputationUpdate)14342_storage" + "value": "t_struct(PendingReputationUpdate)15441_storage" }, - "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)": { + "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry)", "numberOfBytes": "32", - "value": "t_struct(ReputationLogEntry)14326_storage" + "value": "t_struct(ReputationLogEntry)15425_storage" }, - "t_mapping(t_uint256,t_struct(Skill)14308_storage)": { + "t_mapping(t_uint256,t_struct(Skill)15407_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.Skill)", "numberOfBytes": "32", - "value": "t_struct(Skill)14308_storage" + "value": "t_struct(Skill)15407_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -592,12 +592,12 @@ "label": "string", "numberOfBytes": "32" }, - "t_struct(ENSRecord)14313_storage": { + "t_struct(ENSRecord)15412_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ENSRecord", "members": [ { - "astId": 14310, + "astId": 15409, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "addr", "offset": 0, @@ -605,7 +605,7 @@ "type": "t_address" }, { - "astId": 14312, + "astId": 15411, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "orbitdb", "offset": 0, @@ -615,12 +615,12 @@ ], "numberOfBytes": "64" }, - "t_struct(MiningStake)14331_storage": { + "t_struct(MiningStake)15430_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.MiningStake", "members": [ { - "astId": 14328, + "astId": 15427, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "amount", "offset": 0, @@ -628,7 +628,7 @@ "type": "t_uint256" }, { - "astId": 14330, + "astId": 15429, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "timestamp", "offset": 0, @@ -638,12 +638,12 @@ ], "numberOfBytes": "64" }, - "t_struct(PendingReputationUpdate)14342_storage": { + "t_struct(PendingReputationUpdate)15441_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.PendingReputationUpdate", "members": [ { - "astId": 14333, + "astId": 15432, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "user", "offset": 0, @@ -651,7 +651,7 @@ "type": "t_address" }, { - "astId": 14335, + "astId": 15434, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "amount", "offset": 0, @@ -659,7 +659,7 @@ "type": "t_int256" }, { - "astId": 14337, + "astId": 15436, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "skillId", "offset": 0, @@ -667,7 +667,7 @@ "type": "t_uint256" }, { - "astId": 14339, + "astId": 15438, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "colony", "offset": 0, @@ -675,7 +675,7 @@ "type": "t_address" }, { - "astId": 14341, + "astId": 15440, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "timestamp", "offset": 0, @@ -685,12 +685,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ReputationLogEntry)14326_storage": { + "t_struct(ReputationLogEntry)15425_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ReputationLogEntry", "members": [ { - "astId": 14315, + "astId": 15414, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "user", "offset": 0, @@ -698,7 +698,7 @@ "type": "t_address" }, { - "astId": 14317, + "astId": 15416, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "amount", "offset": 0, @@ -706,7 +706,7 @@ "type": "t_int256" }, { - "astId": 14319, + "astId": 15418, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "skillId", "offset": 0, @@ -714,7 +714,7 @@ "type": "t_uint256" }, { - "astId": 14321, + "astId": 15420, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "colony", "offset": 0, @@ -722,7 +722,7 @@ "type": "t_address" }, { - "astId": 14323, + "astId": 15422, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "nUpdates", "offset": 0, @@ -730,7 +730,7 @@ "type": "t_uint128" }, { - "astId": 14325, + "astId": 15424, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "nPreviousUpdates", "offset": 16, @@ -740,12 +740,12 @@ ], "numberOfBytes": "160" }, - "t_struct(Skill)14308_storage": { + "t_struct(Skill)15407_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.Skill", "members": [ { - "astId": 14295, + "astId": 15394, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "nParents", "offset": 0, @@ -753,7 +753,7 @@ "type": "t_uint128" }, { - "astId": 14297, + "astId": 15396, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "nChildren", "offset": 16, @@ -761,7 +761,7 @@ "type": "t_uint128" }, { - "astId": 14300, + "astId": 15399, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "parents", "offset": 0, @@ -769,7 +769,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14303, + "astId": 15402, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "children", "offset": 0, @@ -777,7 +777,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14305, + "astId": 15404, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "DEPRECATED_globalSkill", "offset": 0, @@ -785,7 +785,7 @@ "type": "t_bool" }, { - "astId": 14307, + "astId": 15406, "contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills", "label": "deprecated", "offset": 1, diff --git a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage.json b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage.json index dfa19319d8..25e0e86f14 100644 --- a/.storage-layouts/contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage.json +++ b/.storage-layouts/contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18905, + "astId": 19230, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "colonyCount", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 18907, + "astId": 19232, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "currentColonyVersion", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 18909, + "astId": 19234, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "metaColony", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 18911, + "astId": 19236, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "tokenLocking", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_address" }, { - "astId": 18913, + "astId": 19238, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "feeInverse", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 18915, + "astId": 19240, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "skillCount", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 18917, + "astId": 19242, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "reputationMiningSkillId", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 18919, + "astId": 19244, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "reputationRootHash", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_bytes32" }, { - "astId": 18921, + "astId": 19246, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "reputationRootHashNLeaves", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 18923, + "astId": 19248, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "miningCycleResolver", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_address" }, { - "astId": 18925, + "astId": 19250, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "activeReputationMiningCycle", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_address" }, { - "astId": 18927, + "astId": 19252, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "inactiveReputationMiningCycle", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_address" }, { - "astId": 18931, + "astId": 19256, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "colonies", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18935, + "astId": 19260, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "_isColony", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18939, + "astId": 19264, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "colonyVersionResolver", "offset": 0, @@ -185,15 +185,15 @@ "type": "t_mapping(t_uint256,t_address)" }, { - "astId": 18944, + "astId": 19269, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "skills", "offset": 0, "slot": "21", - "type": "t_mapping(t_uint256,t_struct(Skill)14308_storage)" + "type": "t_mapping(t_uint256,t_struct(Skill)15407_storage)" }, { - "astId": 18948, + "astId": 19273, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "stakedBalances", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18952, + "astId": 19277, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "recentAuctions", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18954, + "astId": 19279, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "ens", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_address" }, { - "astId": 18956, + "astId": 19281, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "rootNode", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_bytes32" }, { - "astId": 18958, + "astId": 19283, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "userNode", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_bytes32" }, { - "astId": 18960, + "astId": 19285, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "colonyNode", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_bytes32" }, { - "astId": 18964, + "astId": 19289, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "colonyLabels", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18968, + "astId": 19293, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "userLabels", "offset": 0, @@ -257,23 +257,23 @@ "type": "t_mapping(t_address,t_string_storage)" }, { - "astId": 18973, + "astId": 19298, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "records", "offset": 0, "slot": "30", - "type": "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)" + "type": "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)" }, { - "astId": 18980, + "astId": 19305, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "replacementReputationUpdateLog", "offset": 0, "slot": "31", - "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))" + "type": "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))" }, { - "astId": 18984, + "astId": 19309, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "replacementReputationUpdateLogsExist", "offset": 0, @@ -281,15 +281,15 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 18989, + "astId": 19314, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "miningStakes", "offset": 0, "slot": "33", - "type": "t_mapping(t_address,t_struct(MiningStake)14331_storage)" + "type": "t_mapping(t_address,t_struct(MiningStake)15430_storage)" }, { - "astId": 18993, + "astId": 19318, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "pendingMiningRewards", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 18995, + "astId": 19320, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "totalMinerRewardPerCycle", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_uint256" }, { - "astId": 18997, + "astId": 19322, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "DEPRECATED_annualMetaColonyStipend", "offset": 0, @@ -313,7 +313,7 @@ "type": "t_uint256" }, { - "astId": 18999, + "astId": 19324, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "DEPRECATED_lastMetaColonyStipendIssued", "offset": 0, @@ -321,7 +321,7 @@ "type": "t_uint256" }, { - "astId": 19005, + "astId": 19330, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "resolvers", "offset": 0, @@ -329,7 +329,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_address))" }, { - "astId": 19011, + "astId": 19336, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "installations", "offset": 0, @@ -337,7 +337,7 @@ "type": "t_mapping(t_bytes32,t_mapping(t_address,t_address_payable))" }, { - "astId": 19015, + "astId": 19340, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "payoutWhitelist", "offset": 0, @@ -345,7 +345,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 19022, + "astId": 19347, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "metatransactionNonces", "offset": 0, @@ -353,7 +353,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 19026, + "astId": 19351, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "miningDelegators", "offset": 0, @@ -361,7 +361,7 @@ "type": "t_mapping(t_address,t_address)" }, { - "astId": 19028, + "astId": 19353, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "reputationMiningChainId", "offset": 0, @@ -369,7 +369,7 @@ "type": "t_uint256" }, { - "astId": 19030, + "astId": 19355, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "colonyBridgeAddress", "offset": 0, @@ -377,7 +377,7 @@ "type": "t_address" }, { - "astId": 19034, + "astId": 19359, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "bridgeCurrentRootHashNonces", "offset": 0, @@ -385,7 +385,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19038, + "astId": 19363, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "networkSkillCounts", "offset": 0, @@ -393,7 +393,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 19044, + "astId": 19369, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "pendingSkillAdditions", "offset": 0, @@ -401,7 +401,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_uint256))" }, { - "astId": 19050, + "astId": 19375, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "reputationUpdateCount", "offset": 0, @@ -409,12 +409,12 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, { - "astId": 19059, + "astId": 19384, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "pendingReputationUpdates", "offset": 0, "slot": "49", - "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))" + "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))" } ], "types": { @@ -444,7 +444,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" @@ -475,19 +475,19 @@ "numberOfBytes": "32", "value": "t_bool" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)" + "value": "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)" }, - "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage))": { + "t_mapping(t_address,t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)" + "value": "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)" }, "t_mapping(t_address,t_string_storage)": { "encoding": "mapping", @@ -496,12 +496,12 @@ "numberOfBytes": "32", "value": "t_string_storage" }, - "t_mapping(t_address,t_struct(MiningStake)14331_storage)": { + "t_mapping(t_address,t_struct(MiningStake)15430_storage)": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => struct ColonyNetworkDataTypes.MiningStake)", "numberOfBytes": "32", - "value": "t_struct(MiningStake)14331_storage" + "value": "t_struct(MiningStake)15430_storage" }, "t_mapping(t_address,t_uint256)": { "encoding": "mapping", @@ -524,12 +524,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_address)" }, - "t_mapping(t_bytes32,t_struct(ENSRecord)14313_storage)": { + "t_mapping(t_bytes32,t_struct(ENSRecord)15412_storage)": { "encoding": "mapping", "key": "t_bytes32", "label": "mapping(bytes32 => struct ColonyNetworkDataTypes.ENSRecord)", "numberOfBytes": "32", - "value": "t_struct(ENSRecord)14313_storage" + "value": "t_struct(ENSRecord)15412_storage" }, "t_mapping(t_uint256,t_address)": { "encoding": "mapping", @@ -538,12 +538,12 @@ "numberOfBytes": "32", "value": "t_address" }, - "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)))": { + "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(address => mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)))", "numberOfBytes": "32", - "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage))" + "value": "t_mapping(t_address,t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage))" }, "t_mapping(t_uint256,t_mapping(t_address,t_uint256))": { "encoding": "mapping", @@ -559,26 +559,26 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_uint256)" }, - "t_mapping(t_uint256,t_struct(PendingReputationUpdate)14342_storage)": { + "t_mapping(t_uint256,t_struct(PendingReputationUpdate)15441_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.PendingReputationUpdate)", "numberOfBytes": "32", - "value": "t_struct(PendingReputationUpdate)14342_storage" + "value": "t_struct(PendingReputationUpdate)15441_storage" }, - "t_mapping(t_uint256,t_struct(ReputationLogEntry)14326_storage)": { + "t_mapping(t_uint256,t_struct(ReputationLogEntry)15425_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.ReputationLogEntry)", "numberOfBytes": "32", - "value": "t_struct(ReputationLogEntry)14326_storage" + "value": "t_struct(ReputationLogEntry)15425_storage" }, - "t_mapping(t_uint256,t_struct(Skill)14308_storage)": { + "t_mapping(t_uint256,t_struct(Skill)15407_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyNetworkDataTypes.Skill)", "numberOfBytes": "32", - "value": "t_struct(Skill)14308_storage" + "value": "t_struct(Skill)15407_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -592,12 +592,12 @@ "label": "string", "numberOfBytes": "32" }, - "t_struct(ENSRecord)14313_storage": { + "t_struct(ENSRecord)15412_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ENSRecord", "members": [ { - "astId": 14310, + "astId": 15409, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "addr", "offset": 0, @@ -605,7 +605,7 @@ "type": "t_address" }, { - "astId": 14312, + "astId": 15411, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "orbitdb", "offset": 0, @@ -615,12 +615,12 @@ ], "numberOfBytes": "64" }, - "t_struct(MiningStake)14331_storage": { + "t_struct(MiningStake)15430_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.MiningStake", "members": [ { - "astId": 14328, + "astId": 15427, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "amount", "offset": 0, @@ -628,7 +628,7 @@ "type": "t_uint256" }, { - "astId": 14330, + "astId": 15429, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "timestamp", "offset": 0, @@ -638,12 +638,12 @@ ], "numberOfBytes": "64" }, - "t_struct(PendingReputationUpdate)14342_storage": { + "t_struct(PendingReputationUpdate)15441_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.PendingReputationUpdate", "members": [ { - "astId": 14333, + "astId": 15432, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "user", "offset": 0, @@ -651,7 +651,7 @@ "type": "t_address" }, { - "astId": 14335, + "astId": 15434, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "amount", "offset": 0, @@ -659,7 +659,7 @@ "type": "t_int256" }, { - "astId": 14337, + "astId": 15436, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "skillId", "offset": 0, @@ -667,7 +667,7 @@ "type": "t_uint256" }, { - "astId": 14339, + "astId": 15438, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "colony", "offset": 0, @@ -675,7 +675,7 @@ "type": "t_address" }, { - "astId": 14341, + "astId": 15440, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "timestamp", "offset": 0, @@ -685,12 +685,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ReputationLogEntry)14326_storage": { + "t_struct(ReputationLogEntry)15425_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.ReputationLogEntry", "members": [ { - "astId": 14315, + "astId": 15414, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "user", "offset": 0, @@ -698,7 +698,7 @@ "type": "t_address" }, { - "astId": 14317, + "astId": 15416, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "amount", "offset": 0, @@ -706,7 +706,7 @@ "type": "t_int256" }, { - "astId": 14319, + "astId": 15418, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "skillId", "offset": 0, @@ -714,7 +714,7 @@ "type": "t_uint256" }, { - "astId": 14321, + "astId": 15420, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "colony", "offset": 0, @@ -722,7 +722,7 @@ "type": "t_address" }, { - "astId": 14323, + "astId": 15422, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "nUpdates", "offset": 0, @@ -730,7 +730,7 @@ "type": "t_uint128" }, { - "astId": 14325, + "astId": 15424, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "nPreviousUpdates", "offset": 16, @@ -740,12 +740,12 @@ ], "numberOfBytes": "160" }, - "t_struct(Skill)14308_storage": { + "t_struct(Skill)15407_storage": { "encoding": "inplace", "label": "struct ColonyNetworkDataTypes.Skill", "members": [ { - "astId": 14295, + "astId": 15394, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "nParents", "offset": 0, @@ -753,7 +753,7 @@ "type": "t_uint128" }, { - "astId": 14297, + "astId": 15396, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "nChildren", "offset": 16, @@ -761,7 +761,7 @@ "type": "t_uint128" }, { - "astId": 14300, + "astId": 15399, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "parents", "offset": 0, @@ -769,7 +769,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14303, + "astId": 15402, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "children", "offset": 0, @@ -777,7 +777,7 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 14305, + "astId": 15404, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "DEPRECATED_globalSkill", "offset": 0, @@ -785,7 +785,7 @@ "type": "t_bool" }, { - "astId": 14307, + "astId": 15406, "contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage", "label": "deprecated", "offset": 1, diff --git a/.storage-layouts/contracts/common/CommonAuthority.sol:CommonAuthority.json b/.storage-layouts/contracts/common/CommonAuthority.sol:CommonAuthority.json index 7bb88ee868..8be2b809a5 100644 --- a/.storage-layouts/contracts/common/CommonAuthority.sol:CommonAuthority.json +++ b/.storage-layouts/contracts/common/CommonAuthority.sol:CommonAuthority.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/common/CommonAuthority.sol:CommonAuthority", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/common/CommonAuthority.sol:CommonAuthority", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 51141, + "astId": 50959, "contract": "contracts/common/CommonAuthority.sol:CommonAuthority", "label": "_root_users", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 51145, + "astId": 50963, "contract": "contracts/common/CommonAuthority.sol:CommonAuthority", "label": "_user_roles", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_mapping(t_address,t_bytes32)" }, { - "astId": 51151, + "astId": 50969, "contract": "contracts/common/CommonAuthority.sol:CommonAuthority", "label": "_capability_roles", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_mapping(t_address,t_mapping(t_bytes4,t_bytes32))" }, { - "astId": 51157, + "astId": 50975, "contract": "contracts/common/CommonAuthority.sol:CommonAuthority", "label": "_public_capabilities", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_mapping(t_bytes4,t_bool))" }, { - "astId": 20916, + "astId": 21202, "contract": "contracts/common/CommonAuthority.sol:CommonAuthority", "label": "userDomainRoles", "offset": 0, @@ -78,7 +78,7 @@ "label": "bytes4", "numberOfBytes": "4" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/common/CommonStorage.sol:CommonStorage.json b/.storage-layouts/contracts/common/CommonStorage.sol:CommonStorage.json index 20c9726be5..23c1adc8b4 100644 --- a/.storage-layouts/contracts/common/CommonStorage.sol:CommonStorage.json +++ b/.storage-layouts/contracts/common/CommonStorage.sol:CommonStorage.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/common/CommonStorage.sol:CommonStorage", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/common/CommonStorage.sol:CommonStorage", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/common/CommonStorage.sol:CommonStorage", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/common/CommonStorage.sol:CommonStorage", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/common/CommonStorage.sol:CommonStorage", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/common/CommonStorage.sol:CommonStorage", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/common/CommonStorage.sol:CommonStorage", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/common/CommonStorage.sol:CommonStorage", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -76,7 +76,7 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/common/ContractRecovery.sol:ContractRecovery.json b/.storage-layouts/contracts/common/ContractRecovery.sol:ContractRecovery.json index 2d30c16719..6a02f255cf 100644 --- a/.storage-layouts/contracts/common/ContractRecovery.sol:ContractRecovery.json +++ b/.storage-layouts/contracts/common/ContractRecovery.sol:ContractRecovery.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/common/ContractRecovery.sol:ContractRecovery", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/common/ContractRecovery.sol:ContractRecovery", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/common/ContractRecovery.sol:ContractRecovery", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/common/ContractRecovery.sol:ContractRecovery", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/common/ContractRecovery.sol:ContractRecovery", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/common/ContractRecovery.sol:ContractRecovery", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/common/ContractRecovery.sol:ContractRecovery", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/common/ContractRecovery.sol:ContractRecovery", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -76,7 +76,7 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/common/DomainRoles.sol:DomainRoles.json b/.storage-layouts/contracts/common/DomainRoles.sol:DomainRoles.json index d2c1ca584f..c9bcc40588 100644 --- a/.storage-layouts/contracts/common/DomainRoles.sol:DomainRoles.json +++ b/.storage-layouts/contracts/common/DomainRoles.sol:DomainRoles.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/common/DomainRoles.sol:DomainRoles", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/common/DomainRoles.sol:DomainRoles", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 51141, + "astId": 50959, "contract": "contracts/common/DomainRoles.sol:DomainRoles", "label": "_root_users", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 51145, + "astId": 50963, "contract": "contracts/common/DomainRoles.sol:DomainRoles", "label": "_user_roles", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_mapping(t_address,t_bytes32)" }, { - "astId": 51151, + "astId": 50969, "contract": "contracts/common/DomainRoles.sol:DomainRoles", "label": "_capability_roles", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_mapping(t_address,t_mapping(t_bytes4,t_bytes32))" }, { - "astId": 51157, + "astId": 50975, "contract": "contracts/common/DomainRoles.sol:DomainRoles", "label": "_public_capabilities", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_mapping(t_bytes4,t_bool))" }, { - "astId": 20916, + "astId": 21202, "contract": "contracts/common/DomainRoles.sol:DomainRoles", "label": "userDomainRoles", "offset": 0, @@ -78,7 +78,7 @@ "label": "bytes4", "numberOfBytes": "4" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/common/EtherRouter.sol:EtherRouter.json b/.storage-layouts/contracts/common/EtherRouter.sol:EtherRouter.json index 1d92cdf2a6..2eedea32dc 100644 --- a/.storage-layouts/contracts/common/EtherRouter.sol:EtherRouter.json +++ b/.storage-layouts/contracts/common/EtherRouter.sol:EtherRouter.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/common/EtherRouter.sol:EtherRouter", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/common/EtherRouter.sol:EtherRouter", "label": "owner", "offset": 0, @@ -17,12 +17,12 @@ "type": "t_address" }, { - "astId": 21256, + "astId": 21542, "contract": "contracts/common/EtherRouter.sol:EtherRouter", "label": "resolver", "offset": 0, "slot": "2", - "type": "t_contract(Resolver)21764" + "type": "t_contract(Resolver)22055" } ], "types": { @@ -31,12 +31,12 @@ "label": "address", "numberOfBytes": "20" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(Resolver)21764": { + "t_contract(Resolver)22055": { "encoding": "inplace", "label": "contract Resolver", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/common/EtherRouterCreate3.sol:EtherRouterCreate3.json b/.storage-layouts/contracts/common/EtherRouterCreate3.sol:EtherRouterCreate3.json index 1f0ebcd64c..9cc693f383 100644 --- a/.storage-layouts/contracts/common/EtherRouterCreate3.sol:EtherRouterCreate3.json +++ b/.storage-layouts/contracts/common/EtherRouterCreate3.sol:EtherRouterCreate3.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/common/EtherRouterCreate3.sol:EtherRouterCreate3", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/common/EtherRouterCreate3.sol:EtherRouterCreate3", "label": "owner", "offset": 0, @@ -17,12 +17,12 @@ "type": "t_address" }, { - "astId": 21256, + "astId": 21542, "contract": "contracts/common/EtherRouterCreate3.sol:EtherRouterCreate3", "label": "resolver", "offset": 0, "slot": "2", - "type": "t_contract(Resolver)21764" + "type": "t_contract(Resolver)22055" } ], "types": { @@ -31,12 +31,12 @@ "label": "address", "numberOfBytes": "20" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(Resolver)21764": { + "t_contract(Resolver)22055": { "encoding": "inplace", "label": "contract Resolver", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/common/Resolver.sol:Resolver.json b/.storage-layouts/contracts/common/Resolver.sol:Resolver.json index 98c0874ae9..a4dc548abe 100644 --- a/.storage-layouts/contracts/common/Resolver.sol:Resolver.json +++ b/.storage-layouts/contracts/common/Resolver.sol:Resolver.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/common/Resolver.sol:Resolver", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/common/Resolver.sol:Resolver", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 21715, + "astId": 22006, "contract": "contracts/common/Resolver.sol:Resolver", "label": "pointers", "offset": 0, @@ -36,7 +36,7 @@ "label": "bytes4", "numberOfBytes": "4" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/ens/ENSRegistry.sol:ENSRegistry.json b/.storage-layouts/contracts/ens/ENSRegistry.sol:ENSRegistry.json index e9a090dc88..5e8d4e9293 100644 --- a/.storage-layouts/contracts/ens/ENSRegistry.sol:ENSRegistry.json +++ b/.storage-layouts/contracts/ens/ENSRegistry.sol:ENSRegistry.json @@ -1,12 +1,12 @@ { "storage": [ { - "astId": 22039, + "astId": 22330, "contract": "contracts/ens/ENSRegistry.sol:ENSRegistry", "label": "records", "offset": 0, "slot": "0", - "type": "t_mapping(t_bytes32,t_struct(Record)22034_storage)" + "type": "t_mapping(t_bytes32,t_struct(Record)22325_storage)" } ], "types": { @@ -20,19 +20,19 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_mapping(t_bytes32,t_struct(Record)22034_storage)": { + "t_mapping(t_bytes32,t_struct(Record)22325_storage)": { "encoding": "mapping", "key": "t_bytes32", "label": "mapping(bytes32 => struct ENSRegistry.Record)", "numberOfBytes": "32", - "value": "t_struct(Record)22034_storage" + "value": "t_struct(Record)22325_storage" }, - "t_struct(Record)22034_storage": { + "t_struct(Record)22325_storage": { "encoding": "inplace", "label": "struct ENSRegistry.Record", "members": [ { - "astId": 22029, + "astId": 22320, "contract": "contracts/ens/ENSRegistry.sol:ENSRegistry", "label": "owner", "offset": 0, @@ -40,7 +40,7 @@ "type": "t_address" }, { - "astId": 22031, + "astId": 22322, "contract": "contracts/ens/ENSRegistry.sol:ENSRegistry", "label": "resolver", "offset": 0, @@ -48,7 +48,7 @@ "type": "t_address" }, { - "astId": 22033, + "astId": 22324, "contract": "contracts/ens/ENSRegistry.sol:ENSRegistry", "label": "ttl", "offset": 20, diff --git a/.storage-layouts/contracts/extensions/CoinMachine.sol:CoinMachine.json b/.storage-layouts/contracts/extensions/CoinMachine.sol:CoinMachine.json index 48241359a1..b95fa1c172 100644 --- a/.storage-layouts/contracts/extensions/CoinMachine.sol:CoinMachine.json +++ b/.storage-layouts/contracts/extensions/CoinMachine.sol:CoinMachine.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 22296, + "astId": 22586, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "purchaseToken", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_address" }, { - "astId": 22298, + "astId": 22588, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "periodLength", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 22300, + "astId": 22590, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "alpha", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_uint256" }, { - "astId": 22302, + "astId": 22592, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "windowSize", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 22304, + "astId": 22594, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "targetPerPeriod", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 22306, + "astId": 22596, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "maxPerPeriod", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 22308, + "astId": 22598, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "tokensToSell_DEPRECATED", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 22310, + "astId": 22600, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "activePeriod", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 22312, + "astId": 22602, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "activePrice", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 22314, + "astId": 22604, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "activeSold", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 22316, + "astId": 22606, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "activeIntake", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 22318, + "astId": 22608, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "emaIntake", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 22320, + "astId": 22610, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "token", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_address" }, { - "astId": 22322, + "astId": 22612, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "whitelist", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_address" }, { - "astId": 22324, + "astId": 22614, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "evolvePrice", "offset": 20, @@ -161,7 +161,7 @@ "type": "t_bool" }, { - "astId": 22326, + "astId": 22616, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "userLimitFraction", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_uint256" }, { - "astId": 22328, + "astId": 22618, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "soldTotal", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_uint256" }, { - "astId": 22332, + "astId": 22622, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "soldUser", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 22336, + "astId": 22626, "contract": "contracts/extensions/CoinMachine.sol:CoinMachine", "label": "metatransactionNonces", "offset": 0, @@ -204,12 +204,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/extensions/ColonyExtension.sol:ColonyExtension.json b/.storage-layouts/contracts/extensions/ColonyExtension.sol:ColonyExtension.json index ce0cefdb78..1b4f3dfc46 100644 --- a/.storage-layouts/contracts/extensions/ColonyExtension.sol:ColonyExtension.json +++ b/.storage-layouts/contracts/extensions/ColonyExtension.sol:ColonyExtension.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/ColonyExtension.sol:ColonyExtension", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/ColonyExtension.sol:ColonyExtension", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/extensions/ColonyExtension.sol:ColonyExtension", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/extensions/ColonyExtension.sol:ColonyExtension", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/extensions/ColonyExtension.sol:ColonyExtension", "label": "deprecated", "offset": 20, @@ -52,12 +52,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta.json b/.storage-layouts/contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta.json index cf3ce773a3..19f86b5bdd 100644 --- a/.storage-layouts/contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta.json +++ b/.storage-layouts/contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 23562, + "astId": 23884, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "metatransactionNonces", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 23590, + "astId": 23912, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder00", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 23592, + "astId": 23914, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder01", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_uint256" }, { - "astId": 23594, + "astId": 23916, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder02", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 23596, + "astId": 23918, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder03", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 23598, + "astId": 23920, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder04", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 23600, + "astId": 23922, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder05", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 23602, + "astId": 23924, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder06", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 23604, + "astId": 23926, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder07", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 23606, + "astId": 23928, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder08", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 23608, + "astId": 23930, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder09", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 23610, + "astId": 23932, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder10", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 23612, + "astId": 23934, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder11", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 23614, + "astId": 23936, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder12", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 23616, + "astId": 23938, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder13", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_uint256" }, { - "astId": 23618, + "astId": 23940, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder14", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_uint256" }, { - "astId": 23620, + "astId": 23942, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder15", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_uint256" }, { - "astId": 23622, + "astId": 23944, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder16", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_uint256" }, { - "astId": 23624, + "astId": 23946, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder17", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_uint256" }, { - "astId": 23626, + "astId": 23948, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder18", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_uint256" }, { - "astId": 23628, + "astId": 23950, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder19", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_uint256" }, { - "astId": 23630, + "astId": 23952, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder20", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_uint256" }, { - "astId": 23632, + "astId": 23954, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder21", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_uint256" }, { - "astId": 23634, + "astId": 23956, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder22", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_uint256" }, { - "astId": 23636, + "astId": 23958, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder23", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_uint256" }, { - "astId": 23638, + "astId": 23960, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder24", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_uint256" }, { - "astId": 23640, + "astId": 23962, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder25", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_uint256" }, { - "astId": 23642, + "astId": 23964, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder26", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_uint256" }, { - "astId": 23644, + "astId": 23966, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder27", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_uint256" }, { - "astId": 23646, + "astId": 23968, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder28", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_uint256" }, { - "astId": 23648, + "astId": 23970, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder29", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_uint256" }, { - "astId": 23650, + "astId": 23972, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder30", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 23652, + "astId": 23974, "contract": "contracts/extensions/ColonyExtensionMeta.sol:ColonyExtensionMeta", "label": "placeholder31", "offset": 0, @@ -316,12 +316,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/extensions/EvaluatedExpenditure.sol:EvaluatedExpenditure.json b/.storage-layouts/contracts/extensions/EvaluatedExpenditure.sol:EvaluatedExpenditure.json index 31e7e5cb80..856e4cb8c5 100644 --- a/.storage-layouts/contracts/extensions/EvaluatedExpenditure.sol:EvaluatedExpenditure.json +++ b/.storage-layouts/contracts/extensions/EvaluatedExpenditure.sol:EvaluatedExpenditure.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/EvaluatedExpenditure.sol:EvaluatedExpenditure", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/EvaluatedExpenditure.sol:EvaluatedExpenditure", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/extensions/EvaluatedExpenditure.sol:EvaluatedExpenditure", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/extensions/EvaluatedExpenditure.sol:EvaluatedExpenditure", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/extensions/EvaluatedExpenditure.sol:EvaluatedExpenditure", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 23682, + "astId": 24002, "contract": "contracts/extensions/EvaluatedExpenditure.sol:EvaluatedExpenditure", "label": "metatransactionNonces", "offset": 0, @@ -60,12 +60,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/extensions/FundingQueue.sol:FundingQueue.json b/.storage-layouts/contracts/extensions/FundingQueue.sol:FundingQueue.json index 91bda993a8..9b46c0d909 100644 --- a/.storage-layouts/contracts/extensions/FundingQueue.sol:FundingQueue.json +++ b/.storage-layouts/contracts/extensions/FundingQueue.sol:FundingQueue.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "deprecated", "offset": 20, @@ -41,23 +41,23 @@ "type": "t_bool" }, { - "astId": 24008, + "astId": 24255, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "colonyNetwork", "offset": 0, "slot": "4", - "type": "t_contract(IColonyNetwork)20072" + "type": "t_contract(IColonyNetwork)20358" }, { - "astId": 24011, + "astId": 24258, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "tokenLocking", "offset": 0, "slot": "5", - "type": "t_contract(ITokenLocking)49221" + "type": "t_contract(ITokenLocking)49039" }, { - "astId": 24013, + "astId": 24260, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "token", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_address" }, { - "astId": 24048, + "astId": 24295, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "proposalCount", "offset": 0, @@ -73,15 +73,15 @@ "type": "t_uint256" }, { - "astId": 24053, + "astId": 24300, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "proposals", "offset": 0, "slot": "8", - "type": "t_mapping(t_uint256,t_struct(Proposal)24046_storage)" + "type": "t_mapping(t_uint256,t_struct(Proposal)24293_storage)" }, { - "astId": 24059, + "astId": 24306, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "supporters", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, { - "astId": 24063, + "astId": 24310, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "queue", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 24067, + "astId": 24314, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "metatransactionNonces", "offset": 0, @@ -116,27 +116,27 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" }, - "t_contract(IColonyNetwork)20072": { + "t_contract(IColonyNetwork)20358": { "encoding": "inplace", "label": "contract IColonyNetwork", "numberOfBytes": "20" }, - "t_contract(ITokenLocking)49221": { + "t_contract(ITokenLocking)49039": { "encoding": "inplace", "label": "contract ITokenLocking", "numberOfBytes": "20" }, - "t_enum(ProposalState)24018": { + "t_enum(ProposalState)24265": { "encoding": "inplace", "label": "enum FundingQueue.ProposalState", "numberOfBytes": "1" @@ -155,12 +155,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_uint256)" }, - "t_mapping(t_uint256,t_struct(Proposal)24046_storage)": { + "t_mapping(t_uint256,t_struct(Proposal)24293_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct FundingQueue.Proposal)", "numberOfBytes": "32", - "value": "t_struct(Proposal)24046_storage" + "value": "t_struct(Proposal)24293_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -169,20 +169,20 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(Proposal)24046_storage": { + "t_struct(Proposal)24293_storage": { "encoding": "inplace", "label": "struct FundingQueue.Proposal", "members": [ { - "astId": 24021, + "astId": 24268, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "state", "offset": 0, "slot": "0", - "type": "t_enum(ProposalState)24018" + "type": "t_enum(ProposalState)24265" }, { - "astId": 24023, + "astId": 24270, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "creator", "offset": 1, @@ -190,7 +190,7 @@ "type": "t_address" }, { - "astId": 24025, + "astId": 24272, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "token", "offset": 0, @@ -198,7 +198,7 @@ "type": "t_address" }, { - "astId": 24027, + "astId": 24274, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "domainId", "offset": 0, @@ -206,7 +206,7 @@ "type": "t_uint256" }, { - "astId": 24029, + "astId": 24276, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "domainTotalRep", "offset": 0, @@ -214,7 +214,7 @@ "type": "t_uint256" }, { - "astId": 24031, + "astId": 24278, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "fromPot", "offset": 0, @@ -222,7 +222,7 @@ "type": "t_uint256" }, { - "astId": 24033, + "astId": 24280, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "toPot", "offset": 0, @@ -230,7 +230,7 @@ "type": "t_uint256" }, { - "astId": 24035, + "astId": 24282, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "fromChildSkillIndex", "offset": 0, @@ -238,7 +238,7 @@ "type": "t_uint256" }, { - "astId": 24037, + "astId": 24284, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "toChildSkillIndex", "offset": 0, @@ -246,7 +246,7 @@ "type": "t_uint256" }, { - "astId": 24039, + "astId": 24286, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "totalRequested", "offset": 0, @@ -254,7 +254,7 @@ "type": "t_uint256" }, { - "astId": 24041, + "astId": 24288, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "totalPaid", "offset": 0, @@ -262,7 +262,7 @@ "type": "t_uint256" }, { - "astId": 24043, + "astId": 24290, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "lastUpdated", "offset": 0, @@ -270,7 +270,7 @@ "type": "t_uint256" }, { - "astId": 24045, + "astId": 24292, "contract": "contracts/extensions/FundingQueue.sol:FundingQueue", "label": "totalSupport", "offset": 0, diff --git a/.storage-layouts/contracts/extensions/OneTxPayment.sol:OneTxPayment.json b/.storage-layouts/contracts/extensions/OneTxPayment.sol:OneTxPayment.json index 5c31ab8260..3a0be41ddc 100644 --- a/.storage-layouts/contracts/extensions/OneTxPayment.sol:OneTxPayment.json +++ b/.storage-layouts/contracts/extensions/OneTxPayment.sol:OneTxPayment.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/OneTxPayment.sol:OneTxPayment", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/OneTxPayment.sol:OneTxPayment", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/extensions/OneTxPayment.sol:OneTxPayment", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/extensions/OneTxPayment.sol:OneTxPayment", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/extensions/OneTxPayment.sol:OneTxPayment", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 25395, + "astId": 25598, "contract": "contracts/extensions/OneTxPayment.sol:OneTxPayment", "label": "metatransactionNonces", "offset": 0, @@ -60,12 +60,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper.json b/.storage-layouts/contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper.json index 4ab3cbd941..a9fcd625fa 100644 --- a/.storage-layouts/contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper.json +++ b/.storage-layouts/contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 23562, + "astId": 23884, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "metatransactionNonces", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 23590, + "astId": 23912, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder00", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 23592, + "astId": 23914, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder01", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_uint256" }, { - "astId": 23594, + "astId": 23916, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder02", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 23596, + "astId": 23918, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder03", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 23598, + "astId": 23920, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder04", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 23600, + "astId": 23922, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder05", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 23602, + "astId": 23924, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder06", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 23604, + "astId": 23926, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder07", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 23606, + "astId": 23928, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder08", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 23608, + "astId": 23930, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder09", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 23610, + "astId": 23932, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder10", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 23612, + "astId": 23934, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder11", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 23614, + "astId": 23936, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder12", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 23616, + "astId": 23938, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder13", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_uint256" }, { - "astId": 23618, + "astId": 23940, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder14", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_uint256" }, { - "astId": 23620, + "astId": 23942, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder15", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_uint256" }, { - "astId": 23622, + "astId": 23944, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder16", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_uint256" }, { - "astId": 23624, + "astId": 23946, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder17", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_uint256" }, { - "astId": 23626, + "astId": 23948, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder18", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_uint256" }, { - "astId": 23628, + "astId": 23950, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder19", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_uint256" }, { - "astId": 23630, + "astId": 23952, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder20", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_uint256" }, { - "astId": 23632, + "astId": 23954, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder21", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_uint256" }, { - "astId": 23634, + "astId": 23956, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder22", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_uint256" }, { - "astId": 23636, + "astId": 23958, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder23", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_uint256" }, { - "astId": 23638, + "astId": 23960, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder24", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_uint256" }, { - "astId": 23640, + "astId": 23962, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder25", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_uint256" }, { - "astId": 23642, + "astId": 23964, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder26", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_uint256" }, { - "astId": 23644, + "astId": 23966, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder27", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_uint256" }, { - "astId": 23646, + "astId": 23968, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder28", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_uint256" }, { - "astId": 23648, + "astId": 23970, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder29", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_uint256" }, { - "astId": 23650, + "astId": 23972, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder30", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 23652, + "astId": 23974, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "placeholder31", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_uint256" }, { - "astId": 26481, + "astId": 26598, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "token", "offset": 0, @@ -313,7 +313,7 @@ "type": "t_address" }, { - "astId": 26483, + "astId": 26600, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "decayPeriod", "offset": 0, @@ -321,7 +321,7 @@ "type": "t_uint256" }, { - "astId": 26485, + "astId": 26602, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "decayNumerator", "offset": 0, @@ -329,7 +329,7 @@ "type": "t_uint256" }, { - "astId": 26487, + "astId": 26604, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "decayDenominator", "offset": 0, @@ -337,7 +337,7 @@ "type": "t_uint256" }, { - "astId": 26489, + "astId": 26606, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "totalPayableGrants", "offset": 0, @@ -345,15 +345,15 @@ "type": "t_uint256" }, { - "astId": 26496, + "astId": 26613, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "grants", "offset": 0, "slot": "42", - "type": "t_mapping(t_bool,t_mapping(t_bytes32,t_struct(Grant)26479_storage))" + "type": "t_mapping(t_bool,t_mapping(t_bytes32,t_struct(Grant)26596_storage))" }, { - "astId": 26500, + "astId": 26617, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "committedSecrets", "offset": 0, @@ -377,12 +377,12 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" @@ -394,19 +394,19 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_mapping(t_bool,t_mapping(t_bytes32,t_struct(Grant)26479_storage))": { + "t_mapping(t_bool,t_mapping(t_bytes32,t_struct(Grant)26596_storage))": { "encoding": "mapping", "key": "t_bool", "label": "mapping(bool => mapping(bytes32 => struct ReputationBootstrapper.Grant))", "numberOfBytes": "32", - "value": "t_mapping(t_bytes32,t_struct(Grant)26479_storage)" + "value": "t_mapping(t_bytes32,t_struct(Grant)26596_storage)" }, - "t_mapping(t_bytes32,t_struct(Grant)26479_storage)": { + "t_mapping(t_bytes32,t_struct(Grant)26596_storage)": { "encoding": "mapping", "key": "t_bytes32", "label": "mapping(bytes32 => struct ReputationBootstrapper.Grant)", "numberOfBytes": "32", - "value": "t_struct(Grant)26479_storage" + "value": "t_struct(Grant)26596_storage" }, "t_mapping(t_bytes32,t_uint256)": { "encoding": "mapping", @@ -415,12 +415,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(Grant)26479_storage": { + "t_struct(Grant)26596_storage": { "encoding": "inplace", "label": "struct ReputationBootstrapper.Grant", "members": [ { - "astId": 26476, + "astId": 26593, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "amount", "offset": 0, @@ -428,7 +428,7 @@ "type": "t_uint256" }, { - "astId": 26478, + "astId": 26595, "contract": "contracts/extensions/ReputationBootstrapper.sol:ReputationBootstrapper", "label": "timestamp", "offset": 0, diff --git a/.storage-layouts/contracts/extensions/StagedExpenditure.sol:StagedExpenditure.json b/.storage-layouts/contracts/extensions/StagedExpenditure.sol:StagedExpenditure.json index 6e130dc4ab..c4cb0aba24 100644 --- a/.storage-layouts/contracts/extensions/StagedExpenditure.sol:StagedExpenditure.json +++ b/.storage-layouts/contracts/extensions/StagedExpenditure.sol:StagedExpenditure.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 23562, + "astId": 23884, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "metatransactionNonces", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 23590, + "astId": 23912, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder00", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 23592, + "astId": 23914, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder01", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_uint256" }, { - "astId": 23594, + "astId": 23916, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder02", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 23596, + "astId": 23918, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder03", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 23598, + "astId": 23920, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder04", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 23600, + "astId": 23922, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder05", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 23602, + "astId": 23924, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder06", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 23604, + "astId": 23926, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder07", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 23606, + "astId": 23928, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder08", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 23608, + "astId": 23930, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder09", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 23610, + "astId": 23932, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder10", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 23612, + "astId": 23934, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder11", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 23614, + "astId": 23936, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder12", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 23616, + "astId": 23938, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder13", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_uint256" }, { - "astId": 23618, + "astId": 23940, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder14", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_uint256" }, { - "astId": 23620, + "astId": 23942, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder15", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_uint256" }, { - "astId": 23622, + "astId": 23944, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder16", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_uint256" }, { - "astId": 23624, + "astId": 23946, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder17", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_uint256" }, { - "astId": 23626, + "astId": 23948, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder18", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_uint256" }, { - "astId": 23628, + "astId": 23950, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder19", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_uint256" }, { - "astId": 23630, + "astId": 23952, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder20", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_uint256" }, { - "astId": 23632, + "astId": 23954, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder21", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_uint256" }, { - "astId": 23634, + "astId": 23956, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder22", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_uint256" }, { - "astId": 23636, + "astId": 23958, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder23", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_uint256" }, { - "astId": 23638, + "astId": 23960, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder24", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_uint256" }, { - "astId": 23640, + "astId": 23962, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder25", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_uint256" }, { - "astId": 23642, + "astId": 23964, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder26", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_uint256" }, { - "astId": 23644, + "astId": 23966, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder27", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_uint256" }, { - "astId": 23646, + "astId": 23968, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder28", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_uint256" }, { - "astId": 23648, + "astId": 23970, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder29", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_uint256" }, { - "astId": 23650, + "astId": 23972, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder30", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 23652, + "astId": 23974, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "placeholder31", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_uint256" }, { - "astId": 27114, + "astId": 27195, "contract": "contracts/extensions/StagedExpenditure.sol:StagedExpenditure", "label": "stagedExpenditures", "offset": 0, @@ -324,12 +324,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/extensions/StakedExpenditure.sol:StakedExpenditure.json b/.storage-layouts/contracts/extensions/StakedExpenditure.sol:StakedExpenditure.json index d514f3108e..5e5708a8ee 100644 --- a/.storage-layouts/contracts/extensions/StakedExpenditure.sol:StakedExpenditure.json +++ b/.storage-layouts/contracts/extensions/StakedExpenditure.sol:StakedExpenditure.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 23562, + "astId": 23884, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "metatransactionNonces", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 23590, + "astId": 23912, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder00", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 23592, + "astId": 23914, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder01", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_uint256" }, { - "astId": 23594, + "astId": 23916, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder02", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 23596, + "astId": 23918, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder03", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 23598, + "astId": 23920, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder04", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 23600, + "astId": 23922, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder05", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 23602, + "astId": 23924, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder06", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 23604, + "astId": 23926, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder07", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 23606, + "astId": 23928, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder08", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 23608, + "astId": 23930, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder09", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 23610, + "astId": 23932, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder10", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 23612, + "astId": 23934, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder11", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 23614, + "astId": 23936, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder12", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 23616, + "astId": 23938, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder13", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_uint256" }, { - "astId": 23618, + "astId": 23940, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder14", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_uint256" }, { - "astId": 23620, + "astId": 23942, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder15", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_uint256" }, { - "astId": 23622, + "astId": 23944, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder16", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_uint256" }, { - "astId": 23624, + "astId": 23946, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder17", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_uint256" }, { - "astId": 23626, + "astId": 23948, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder18", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_uint256" }, { - "astId": 23628, + "astId": 23950, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder19", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_uint256" }, { - "astId": 23630, + "astId": 23952, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder20", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_uint256" }, { - "astId": 23632, + "astId": 23954, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder21", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_uint256" }, { - "astId": 23634, + "astId": 23956, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder22", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_uint256" }, { - "astId": 23636, + "astId": 23958, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder23", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_uint256" }, { - "astId": 23638, + "astId": 23960, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder24", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_uint256" }, { - "astId": 23640, + "astId": 23962, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder25", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_uint256" }, { - "astId": 23642, + "astId": 23964, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder26", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_uint256" }, { - "astId": 23644, + "astId": 23966, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder27", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_uint256" }, { - "astId": 23646, + "astId": 23968, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder28", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_uint256" }, { - "astId": 23648, + "astId": 23970, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder29", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_uint256" }, { - "astId": 23650, + "astId": 23972, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder30", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 23652, + "astId": 23974, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "placeholder31", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_uint256" }, { - "astId": 27552, + "astId": 27567, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "stakeFraction", "offset": 0, @@ -313,12 +313,12 @@ "type": "t_uint256" }, { - "astId": 27557, + "astId": 27572, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "stakes", "offset": 0, "slot": "38", - "type": "t_mapping(t_uint256,t_struct(Stake)27550_storage)" + "type": "t_mapping(t_uint256,t_struct(Stake)27565_storage)" } ], "types": { @@ -332,12 +332,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" @@ -349,19 +349,19 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_mapping(t_uint256,t_struct(Stake)27550_storage)": { + "t_mapping(t_uint256,t_struct(Stake)27565_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct StakedExpenditure.Stake)", "numberOfBytes": "32", - "value": "t_struct(Stake)27550_storage" + "value": "t_struct(Stake)27565_storage" }, - "t_struct(Stake)27550_storage": { + "t_struct(Stake)27565_storage": { "encoding": "inplace", "label": "struct StakedExpenditure.Stake", "members": [ { - "astId": 27547, + "astId": 27562, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "creator", "offset": 0, @@ -369,7 +369,7 @@ "type": "t_address" }, { - "astId": 27549, + "astId": 27564, "contract": "contracts/extensions/StakedExpenditure.sol:StakedExpenditure", "label": "amount", "offset": 0, diff --git a/.storage-layouts/contracts/extensions/StreamingPayments.sol:StreamingPayments.json b/.storage-layouts/contracts/extensions/StreamingPayments.sol:StreamingPayments.json index 1b44af4854..a71f6d569d 100644 --- a/.storage-layouts/contracts/extensions/StreamingPayments.sol:StreamingPayments.json +++ b/.storage-layouts/contracts/extensions/StreamingPayments.sol:StreamingPayments.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 23562, + "astId": 23884, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "metatransactionNonces", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 23590, + "astId": 23912, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder00", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 23592, + "astId": 23914, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder01", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_uint256" }, { - "astId": 23594, + "astId": 23916, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder02", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 23596, + "astId": 23918, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder03", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 23598, + "astId": 23920, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder04", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 23600, + "astId": 23922, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder05", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 23602, + "astId": 23924, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder06", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 23604, + "astId": 23926, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder07", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 23606, + "astId": 23928, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder08", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 23608, + "astId": 23930, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder09", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 23610, + "astId": 23932, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder10", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 23612, + "astId": 23934, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder11", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 23614, + "astId": 23936, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder12", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 23616, + "astId": 23938, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder13", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_uint256" }, { - "astId": 23618, + "astId": 23940, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder14", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_uint256" }, { - "astId": 23620, + "astId": 23942, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder15", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_uint256" }, { - "astId": 23622, + "astId": 23944, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder16", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_uint256" }, { - "astId": 23624, + "astId": 23946, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder17", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_uint256" }, { - "astId": 23626, + "astId": 23948, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder18", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_uint256" }, { - "astId": 23628, + "astId": 23950, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder19", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_uint256" }, { - "astId": 23630, + "astId": 23952, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder20", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_uint256" }, { - "astId": 23632, + "astId": 23954, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder21", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_uint256" }, { - "astId": 23634, + "astId": 23956, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder22", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_uint256" }, { - "astId": 23636, + "astId": 23958, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder23", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_uint256" }, { - "astId": 23638, + "astId": 23960, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder24", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_uint256" }, { - "astId": 23640, + "astId": 23962, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder25", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_uint256" }, { - "astId": 23642, + "astId": 23964, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder26", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_uint256" }, { - "astId": 23644, + "astId": 23966, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder27", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_uint256" }, { - "astId": 23646, + "astId": 23968, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder28", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_uint256" }, { - "astId": 23648, + "astId": 23970, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder29", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_uint256" }, { - "astId": 23650, + "astId": 23972, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder30", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 23652, + "astId": 23974, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "placeholder31", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_uint256" }, { - "astId": 28332, + "astId": 28277, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "numStreamingPayments", "offset": 0, @@ -313,15 +313,15 @@ "type": "t_uint256" }, { - "astId": 28337, + "astId": 28282, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "streamingPayments", "offset": 0, "slot": "38", - "type": "t_mapping(t_uint256,t_struct(StreamingPayment)28330_storage)" + "type": "t_mapping(t_uint256,t_struct(StreamingPayment)28275_storage)" }, { - "astId": 28339, + "astId": 28284, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "nUnresolvedStreamingPayments", "offset": 0, @@ -345,12 +345,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" @@ -362,19 +362,19 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_mapping(t_uint256,t_struct(StreamingPayment)28330_storage)": { + "t_mapping(t_uint256,t_struct(StreamingPayment)28275_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct StreamingPayments.StreamingPayment)", "numberOfBytes": "32", - "value": "t_struct(StreamingPayment)28330_storage" + "value": "t_struct(StreamingPayment)28275_storage" }, - "t_struct(StreamingPayment)28330_storage": { + "t_struct(StreamingPayment)28275_storage": { "encoding": "inplace", "label": "struct StreamingPayments.StreamingPayment", "members": [ { - "astId": 28315, + "astId": 28260, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "recipient", "offset": 0, @@ -382,7 +382,7 @@ "type": "t_address_payable" }, { - "astId": 28317, + "astId": 28262, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "domainId", "offset": 0, @@ -390,7 +390,7 @@ "type": "t_uint256" }, { - "astId": 28319, + "astId": 28264, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "startTime", "offset": 0, @@ -398,7 +398,7 @@ "type": "t_uint256" }, { - "astId": 28321, + "astId": 28266, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "endTime", "offset": 0, @@ -406,7 +406,7 @@ "type": "t_uint256" }, { - "astId": 28323, + "astId": 28268, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "interval", "offset": 0, @@ -414,7 +414,7 @@ "type": "t_uint256" }, { - "astId": 28325, + "astId": 28270, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "token", "offset": 0, @@ -422,7 +422,7 @@ "type": "t_address" }, { - "astId": 28327, + "astId": 28272, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "amount", "offset": 0, @@ -430,7 +430,7 @@ "type": "t_uint256" }, { - "astId": 28329, + "astId": 28274, "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments", "label": "pseudoAmountClaimedFromStart", "offset": 0, diff --git a/.storage-layouts/contracts/extensions/TokenSupplier.sol:TokenSupplier.json b/.storage-layouts/contracts/extensions/TokenSupplier.sol:TokenSupplier.json index ea45144b55..b5ebfecbe0 100644 --- a/.storage-layouts/contracts/extensions/TokenSupplier.sol:TokenSupplier.json +++ b/.storage-layouts/contracts/extensions/TokenSupplier.sol:TokenSupplier.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/TokenSupplier.sol:TokenSupplier", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/TokenSupplier.sol:TokenSupplier", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/extensions/TokenSupplier.sol:TokenSupplier", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/extensions/TokenSupplier.sol:TokenSupplier", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/extensions/TokenSupplier.sol:TokenSupplier", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 29576, + "astId": 29387, "contract": "contracts/extensions/TokenSupplier.sol:TokenSupplier", "label": "token", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_address" }, { - "astId": 29578, + "astId": 29389, "contract": "contracts/extensions/TokenSupplier.sol:TokenSupplier", "label": "tokenSupplyCeiling", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 29580, + "astId": 29391, "contract": "contracts/extensions/TokenSupplier.sol:TokenSupplier", "label": "tokenIssuanceRate", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_uint256" }, { - "astId": 29582, + "astId": 29393, "contract": "contracts/extensions/TokenSupplier.sol:TokenSupplier", "label": "lastIssue", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 29584, + "astId": 29395, "contract": "contracts/extensions/TokenSupplier.sol:TokenSupplier", "label": "lastRateUpdate", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 29588, + "astId": 29399, "contract": "contracts/extensions/TokenSupplier.sol:TokenSupplier", "label": "metatransactionNonces", "offset": 0, @@ -100,12 +100,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/extensions/Whitelist.sol:Whitelist.json b/.storage-layouts/contracts/extensions/Whitelist.sol:Whitelist.json index 61972c3963..5a9056e74a 100644 --- a/.storage-layouts/contracts/extensions/Whitelist.sol:Whitelist.json +++ b/.storage-layouts/contracts/extensions/Whitelist.sol:Whitelist.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/Whitelist.sol:Whitelist", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/Whitelist.sol:Whitelist", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/extensions/Whitelist.sol:Whitelist", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/extensions/Whitelist.sol:Whitelist", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/extensions/Whitelist.sol:Whitelist", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 30040, + "astId": 29802, "contract": "contracts/extensions/Whitelist.sol:Whitelist", "label": "useApprovals", "offset": 21, @@ -49,7 +49,7 @@ "type": "t_bool" }, { - "astId": 30042, + "astId": 29804, "contract": "contracts/extensions/Whitelist.sol:Whitelist", "label": "agreementHash", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_string_storage" }, { - "astId": 30046, + "astId": 29808, "contract": "contracts/extensions/Whitelist.sol:Whitelist", "label": "approvals", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 30050, + "astId": 29812, "contract": "contracts/extensions/Whitelist.sol:Whitelist", "label": "signatures", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 30054, + "astId": 29816, "contract": "contracts/extensions/Whitelist.sol:Whitelist", "label": "metatransactionNonces", "offset": 0, @@ -92,12 +92,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation.json b/.storage-layouts/contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation.json index bce48d91d3..0bb9a3310e 100644 --- a/.storage-layouts/contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation.json +++ b/.storage-layouts/contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "deprecated", "offset": 20, @@ -41,31 +41,31 @@ "type": "t_bool" }, { - "astId": 34430, + "astId": 34123, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "state", "offset": 21, "slot": "3", - "type": "t_enum(ExtensionState)32678" + "type": "t_enum(ExtensionState)32371" }, { - "astId": 34433, + "astId": 34126, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "colonyNetwork", "offset": 0, "slot": "4", - "type": "t_contract(IColonyNetwork)20072" + "type": "t_contract(IColonyNetwork)20358" }, { - "astId": 34436, + "astId": 34129, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "tokenLocking", "offset": 0, "slot": "5", - "type": "t_contract(ITokenLocking)49221" + "type": "t_contract(ITokenLocking)49039" }, { - "astId": 34438, + "astId": 34131, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "token", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_address" }, { - "astId": 34440, + "astId": 34133, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "totalStakeFraction", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 34442, + "astId": 34135, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "voterRewardFraction", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 34444, + "astId": 34137, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "userMinStakeFraction", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 34446, + "astId": 34139, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "maxVoteFraction", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 34448, + "astId": 34141, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "stakePeriod", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 34450, + "astId": 34143, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "submitPeriod", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 34452, + "astId": 34145, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "revealPeriod", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 34454, + "astId": 34147, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "escalationPeriod", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 34456, + "astId": 34149, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "motionCount", "offset": 0, @@ -145,15 +145,15 @@ "type": "t_uint256" }, { - "astId": 34461, + "astId": 34154, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "motions", "offset": 0, "slot": "16", - "type": "t_mapping(t_uint256,t_struct(Motion)32726_storage)" + "type": "t_mapping(t_uint256,t_struct(Motion)32419_storage)" }, { - "astId": 34469, + "astId": 34162, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "stakes", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 34475, + "astId": 34168, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "voteSecrets", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_bytes32))" }, { - "astId": 34479, + "astId": 34172, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "expenditurePastVotes_DEPRECATED", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 34483, + "astId": 34176, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "expenditureMotionCounts_DEPRECATED", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 34487, + "astId": 34180, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "metatransactionNonces", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 34491, + "astId": 34184, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "expenditurePastVotes", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 34495, + "astId": 34188, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "expenditureMotionLocks", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 34497, + "astId": 34190, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "motionCountV10", "offset": 0, @@ -255,27 +255,27 @@ "label": "bytes", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" }, - "t_contract(IColonyNetwork)20072": { + "t_contract(IColonyNetwork)20358": { "encoding": "inplace", "label": "contract IColonyNetwork", "numberOfBytes": "20" }, - "t_contract(ITokenLocking)49221": { + "t_contract(ITokenLocking)49039": { "encoding": "inplace", "label": "contract ITokenLocking", "numberOfBytes": "20" }, - "t_enum(ExtensionState)32678": { + "t_enum(ExtensionState)32371": { "encoding": "inplace", "label": "enum VotingReputationDataTypes.ExtensionState", "numberOfBytes": "1" @@ -322,12 +322,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_mapping(t_uint256,t_uint256))" }, - "t_mapping(t_uint256,t_struct(Motion)32726_storage)": { + "t_mapping(t_uint256,t_struct(Motion)32419_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct VotingReputationDataTypes.Motion)", "numberOfBytes": "32", - "value": "t_struct(Motion)32726_storage" + "value": "t_struct(Motion)32419_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -336,12 +336,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(Motion)32726_storage": { + "t_struct(Motion)32419_storage": { "encoding": "inplace", "label": "struct VotingReputationDataTypes.Motion", "members": [ { - "astId": 32691, + "astId": 32384, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "events", "offset": 0, @@ -349,7 +349,7 @@ "type": "t_array(t_uint64)3_storage" }, { - "astId": 32693, + "astId": 32386, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "rootHash", "offset": 0, @@ -357,7 +357,7 @@ "type": "t_bytes32" }, { - "astId": 32695, + "astId": 32388, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "domainId", "offset": 0, @@ -365,7 +365,7 @@ "type": "t_uint256" }, { - "astId": 32697, + "astId": 32390, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "skillId", "offset": 0, @@ -373,7 +373,7 @@ "type": "t_uint256" }, { - "astId": 32699, + "astId": 32392, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "skillRep", "offset": 0, @@ -381,7 +381,7 @@ "type": "t_uint256" }, { - "astId": 32701, + "astId": 32394, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "repSubmitted", "offset": 0, @@ -389,7 +389,7 @@ "type": "t_uint256" }, { - "astId": 32703, + "astId": 32396, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "paidVoterComp", "offset": 0, @@ -397,7 +397,7 @@ "type": "t_uint256" }, { - "astId": 32707, + "astId": 32400, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "pastVoterComp", "offset": 0, @@ -405,7 +405,7 @@ "type": "t_array(t_uint256)2_storage" }, { - "astId": 32711, + "astId": 32404, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "stakes", "offset": 0, @@ -413,7 +413,7 @@ "type": "t_array(t_uint256)2_storage" }, { - "astId": 32715, + "astId": 32408, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "votes", "offset": 0, @@ -421,7 +421,7 @@ "type": "t_array(t_uint256)2_storage" }, { - "astId": 32717, + "astId": 32410, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "escalated", "offset": 0, @@ -429,7 +429,7 @@ "type": "t_bool" }, { - "astId": 32719, + "astId": 32412, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "finalized", "offset": 1, @@ -437,7 +437,7 @@ "type": "t_bool" }, { - "astId": 32721, + "astId": 32414, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "altTarget", "offset": 2, @@ -445,7 +445,7 @@ "type": "t_address" }, { - "astId": 32723, + "astId": 32416, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "sig", "offset": 22, @@ -453,7 +453,7 @@ "type": "t_bytes4" }, { - "astId": 32725, + "astId": 32418, "contract": "contracts/extensions/votingReputation/VotingReputation.sol:VotingReputation", "label": "action", "offset": 0, diff --git a/.storage-layouts/contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery.json b/.storage-layouts/contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery.json index ab9c9a100b..fb3e386f11 100644 --- a/.storage-layouts/contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery.json +++ b/.storage-layouts/contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 32836, + "astId": 32529, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 32839, + "astId": 32532, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 32841, + "astId": 32534, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "DO_NOT_USE_deprecated", "offset": 20, @@ -41,31 +41,31 @@ "type": "t_bool" }, { - "astId": 32844, + "astId": 32537, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "DO_NOT_USE_state", "offset": 21, "slot": "3", - "type": "t_enum(ExtensionState)32678" + "type": "t_enum(ExtensionState)32371" }, { - "astId": 32847, + "astId": 32540, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "colonyNetwork", "offset": 0, "slot": "4", - "type": "t_contract(IColonyNetwork)20072" + "type": "t_contract(IColonyNetwork)20358" }, { - "astId": 32850, + "astId": 32543, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "tokenLocking", "offset": 0, "slot": "5", - "type": "t_contract(ITokenLocking)49221" + "type": "t_contract(ITokenLocking)49039" }, { - "astId": 32852, + "astId": 32545, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "token", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_address" }, { - "astId": 32854, + "astId": 32547, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "totalStakeFraction", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 32856, + "astId": 32549, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "DO_NOT_USE_voterRewardFraction", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 32858, + "astId": 32551, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "DO_NOT_USE_userMinStakeFraction", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 32860, + "astId": 32553, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "DO_NOT_USE_maxVoteFraction", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 32862, + "astId": 32555, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "DO_NOT_USE_stakePeriod", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 32864, + "astId": 32557, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "DO_NOT_USE_submitPeriod", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 32866, + "astId": 32559, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "DO_NOT_USE_revealPeriod", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 32868, + "astId": 32561, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "DO_NOT_USE_escalationPeriod", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 32872, + "astId": 32565, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "DO_NOT_USE_metatransactionNonces", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 32874, + "astId": 32567, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "DO_NOT_USE_motionCount", "offset": 0, @@ -153,15 +153,15 @@ "type": "t_uint256" }, { - "astId": 32879, + "astId": 32572, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "motions", "offset": 0, "slot": "17", - "type": "t_mapping(t_uint256,t_struct(Motion)32726_storage)" + "type": "t_mapping(t_uint256,t_struct(Motion)32419_storage)" }, { - "astId": 32887, + "astId": 32580, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "stakes", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 32893, + "astId": 32586, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "DO_NOT_USE_voteSecrets", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_bytes32))" }, { - "astId": 32897, + "astId": 32590, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "DO_NOT_USE_expenditurePastVotes", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 32901, + "astId": 32594, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "DO_NOT_USE_expenditureMotionCounts", "offset": 0, @@ -231,27 +231,27 @@ "label": "bytes", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" }, - "t_contract(IColonyNetwork)20072": { + "t_contract(IColonyNetwork)20358": { "encoding": "inplace", "label": "contract IColonyNetwork", "numberOfBytes": "20" }, - "t_contract(ITokenLocking)49221": { + "t_contract(ITokenLocking)49039": { "encoding": "inplace", "label": "contract ITokenLocking", "numberOfBytes": "20" }, - "t_enum(ExtensionState)32678": { + "t_enum(ExtensionState)32371": { "encoding": "inplace", "label": "enum VotingReputationDataTypes.ExtensionState", "numberOfBytes": "1" @@ -298,12 +298,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_mapping(t_uint256,t_uint256))" }, - "t_mapping(t_uint256,t_struct(Motion)32726_storage)": { + "t_mapping(t_uint256,t_struct(Motion)32419_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct VotingReputationDataTypes.Motion)", "numberOfBytes": "32", - "value": "t_struct(Motion)32726_storage" + "value": "t_struct(Motion)32419_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -312,12 +312,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(Motion)32726_storage": { + "t_struct(Motion)32419_storage": { "encoding": "inplace", "label": "struct VotingReputationDataTypes.Motion", "members": [ { - "astId": 32691, + "astId": 32384, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "events", "offset": 0, @@ -325,7 +325,7 @@ "type": "t_array(t_uint64)3_storage" }, { - "astId": 32693, + "astId": 32386, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "rootHash", "offset": 0, @@ -333,7 +333,7 @@ "type": "t_bytes32" }, { - "astId": 32695, + "astId": 32388, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "domainId", "offset": 0, @@ -341,7 +341,7 @@ "type": "t_uint256" }, { - "astId": 32697, + "astId": 32390, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "skillId", "offset": 0, @@ -349,7 +349,7 @@ "type": "t_uint256" }, { - "astId": 32699, + "astId": 32392, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "skillRep", "offset": 0, @@ -357,7 +357,7 @@ "type": "t_uint256" }, { - "astId": 32701, + "astId": 32394, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "repSubmitted", "offset": 0, @@ -365,7 +365,7 @@ "type": "t_uint256" }, { - "astId": 32703, + "astId": 32396, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "paidVoterComp", "offset": 0, @@ -373,7 +373,7 @@ "type": "t_uint256" }, { - "astId": 32707, + "astId": 32400, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "pastVoterComp", "offset": 0, @@ -381,7 +381,7 @@ "type": "t_array(t_uint256)2_storage" }, { - "astId": 32711, + "astId": 32404, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "stakes", "offset": 0, @@ -389,7 +389,7 @@ "type": "t_array(t_uint256)2_storage" }, { - "astId": 32715, + "astId": 32408, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "votes", "offset": 0, @@ -397,7 +397,7 @@ "type": "t_array(t_uint256)2_storage" }, { - "astId": 32717, + "astId": 32410, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "escalated", "offset": 0, @@ -405,7 +405,7 @@ "type": "t_bool" }, { - "astId": 32719, + "astId": 32412, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "finalized", "offset": 1, @@ -413,7 +413,7 @@ "type": "t_bool" }, { - "astId": 32721, + "astId": 32414, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "altTarget", "offset": 2, @@ -421,7 +421,7 @@ "type": "t_address" }, { - "astId": 32723, + "astId": 32416, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "sig", "offset": 22, @@ -429,7 +429,7 @@ "type": "t_bytes4" }, { - "astId": 32725, + "astId": 32418, "contract": "contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol:VotingReputationMisalignedRecovery", "label": "action", "offset": 0, diff --git a/.storage-layouts/contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking.json b/.storage-layouts/contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking.json index 7086e44a5e..0bac7da7c9 100644 --- a/.storage-layouts/contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking.json +++ b/.storage-layouts/contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "deprecated", "offset": 20, @@ -41,31 +41,31 @@ "type": "t_bool" }, { - "astId": 34430, + "astId": 34123, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "state", "offset": 21, "slot": "3", - "type": "t_enum(ExtensionState)32678" + "type": "t_enum(ExtensionState)32371" }, { - "astId": 34433, + "astId": 34126, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "colonyNetwork", "offset": 0, "slot": "4", - "type": "t_contract(IColonyNetwork)20072" + "type": "t_contract(IColonyNetwork)20358" }, { - "astId": 34436, + "astId": 34129, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "tokenLocking", "offset": 0, "slot": "5", - "type": "t_contract(ITokenLocking)49221" + "type": "t_contract(ITokenLocking)49039" }, { - "astId": 34438, + "astId": 34131, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "token", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_address" }, { - "astId": 34440, + "astId": 34133, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "totalStakeFraction", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 34442, + "astId": 34135, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "voterRewardFraction", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 34444, + "astId": 34137, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "userMinStakeFraction", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 34446, + "astId": 34139, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "maxVoteFraction", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 34448, + "astId": 34141, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "stakePeriod", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 34450, + "astId": 34143, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "submitPeriod", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 34452, + "astId": 34145, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "revealPeriod", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 34454, + "astId": 34147, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "escalationPeriod", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 34456, + "astId": 34149, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "motionCount", "offset": 0, @@ -145,15 +145,15 @@ "type": "t_uint256" }, { - "astId": 34461, + "astId": 34154, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "motions", "offset": 0, "slot": "16", - "type": "t_mapping(t_uint256,t_struct(Motion)32726_storage)" + "type": "t_mapping(t_uint256,t_struct(Motion)32419_storage)" }, { - "astId": 34469, + "astId": 34162, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "stakes", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 34475, + "astId": 34168, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "voteSecrets", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_bytes32))" }, { - "astId": 34479, + "astId": 34172, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "expenditurePastVotes_DEPRECATED", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 34483, + "astId": 34176, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "expenditureMotionCounts_DEPRECATED", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 34487, + "astId": 34180, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "metatransactionNonces", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 34491, + "astId": 34184, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "expenditurePastVotes", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 34495, + "astId": 34188, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "expenditureMotionLocks", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 34497, + "astId": 34190, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "motionCountV10", "offset": 0, @@ -255,27 +255,27 @@ "label": "bytes", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" }, - "t_contract(IColonyNetwork)20072": { + "t_contract(IColonyNetwork)20358": { "encoding": "inplace", "label": "contract IColonyNetwork", "numberOfBytes": "20" }, - "t_contract(ITokenLocking)49221": { + "t_contract(ITokenLocking)49039": { "encoding": "inplace", "label": "contract ITokenLocking", "numberOfBytes": "20" }, - "t_enum(ExtensionState)32678": { + "t_enum(ExtensionState)32371": { "encoding": "inplace", "label": "enum VotingReputationDataTypes.ExtensionState", "numberOfBytes": "1" @@ -322,12 +322,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_mapping(t_uint256,t_uint256))" }, - "t_mapping(t_uint256,t_struct(Motion)32726_storage)": { + "t_mapping(t_uint256,t_struct(Motion)32419_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct VotingReputationDataTypes.Motion)", "numberOfBytes": "32", - "value": "t_struct(Motion)32726_storage" + "value": "t_struct(Motion)32419_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -336,12 +336,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(Motion)32726_storage": { + "t_struct(Motion)32419_storage": { "encoding": "inplace", "label": "struct VotingReputationDataTypes.Motion", "members": [ { - "astId": 32691, + "astId": 32384, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "events", "offset": 0, @@ -349,7 +349,7 @@ "type": "t_array(t_uint64)3_storage" }, { - "astId": 32693, + "astId": 32386, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "rootHash", "offset": 0, @@ -357,7 +357,7 @@ "type": "t_bytes32" }, { - "astId": 32695, + "astId": 32388, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "domainId", "offset": 0, @@ -365,7 +365,7 @@ "type": "t_uint256" }, { - "astId": 32697, + "astId": 32390, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "skillId", "offset": 0, @@ -373,7 +373,7 @@ "type": "t_uint256" }, { - "astId": 32699, + "astId": 32392, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "skillRep", "offset": 0, @@ -381,7 +381,7 @@ "type": "t_uint256" }, { - "astId": 32701, + "astId": 32394, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "repSubmitted", "offset": 0, @@ -389,7 +389,7 @@ "type": "t_uint256" }, { - "astId": 32703, + "astId": 32396, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "paidVoterComp", "offset": 0, @@ -397,7 +397,7 @@ "type": "t_uint256" }, { - "astId": 32707, + "astId": 32400, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "pastVoterComp", "offset": 0, @@ -405,7 +405,7 @@ "type": "t_array(t_uint256)2_storage" }, { - "astId": 32711, + "astId": 32404, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "stakes", "offset": 0, @@ -413,7 +413,7 @@ "type": "t_array(t_uint256)2_storage" }, { - "astId": 32715, + "astId": 32408, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "votes", "offset": 0, @@ -421,7 +421,7 @@ "type": "t_array(t_uint256)2_storage" }, { - "astId": 32717, + "astId": 32410, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "escalated", "offset": 0, @@ -429,7 +429,7 @@ "type": "t_bool" }, { - "astId": 32719, + "astId": 32412, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "finalized", "offset": 1, @@ -437,7 +437,7 @@ "type": "t_bool" }, { - "astId": 32721, + "astId": 32414, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "altTarget", "offset": 2, @@ -445,7 +445,7 @@ "type": "t_address" }, { - "astId": 32723, + "astId": 32416, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "sig", "offset": 22, @@ -453,7 +453,7 @@ "type": "t_bytes4" }, { - "astId": 32725, + "astId": 32418, "contract": "contracts/extensions/votingReputation/VotingReputationStaking.sol:VotingReputationStaking", "label": "action", "offset": 0, diff --git a/.storage-layouts/contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage.json b/.storage-layouts/contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage.json index 1ff6baf1c9..8834ad4866 100644 --- a/.storage-layouts/contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage.json +++ b/.storage-layouts/contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "deprecated", "offset": 20, @@ -41,31 +41,31 @@ "type": "t_bool" }, { - "astId": 34430, + "astId": 34123, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "state", "offset": 21, "slot": "3", - "type": "t_enum(ExtensionState)32678" + "type": "t_enum(ExtensionState)32371" }, { - "astId": 34433, + "astId": 34126, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "colonyNetwork", "offset": 0, "slot": "4", - "type": "t_contract(IColonyNetwork)20072" + "type": "t_contract(IColonyNetwork)20358" }, { - "astId": 34436, + "astId": 34129, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "tokenLocking", "offset": 0, "slot": "5", - "type": "t_contract(ITokenLocking)49221" + "type": "t_contract(ITokenLocking)49039" }, { - "astId": 34438, + "astId": 34131, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "token", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_address" }, { - "astId": 34440, + "astId": 34133, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "totalStakeFraction", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 34442, + "astId": 34135, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "voterRewardFraction", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 34444, + "astId": 34137, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "userMinStakeFraction", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 34446, + "astId": 34139, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "maxVoteFraction", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 34448, + "astId": 34141, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "stakePeriod", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 34450, + "astId": 34143, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "submitPeriod", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 34452, + "astId": 34145, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "revealPeriod", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 34454, + "astId": 34147, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "escalationPeriod", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 34456, + "astId": 34149, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "motionCount", "offset": 0, @@ -145,15 +145,15 @@ "type": "t_uint256" }, { - "astId": 34461, + "astId": 34154, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "motions", "offset": 0, "slot": "16", - "type": "t_mapping(t_uint256,t_struct(Motion)32726_storage)" + "type": "t_mapping(t_uint256,t_struct(Motion)32419_storage)" }, { - "astId": 34469, + "astId": 34162, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "stakes", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 34475, + "astId": 34168, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "voteSecrets", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_bytes32))" }, { - "astId": 34479, + "astId": 34172, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "expenditurePastVotes_DEPRECATED", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 34483, + "astId": 34176, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "expenditureMotionCounts_DEPRECATED", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 34487, + "astId": 34180, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "metatransactionNonces", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 34491, + "astId": 34184, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "expenditurePastVotes", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 34495, + "astId": 34188, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "expenditureMotionLocks", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 34497, + "astId": 34190, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "motionCountV10", "offset": 0, @@ -255,27 +255,27 @@ "label": "bytes", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" }, - "t_contract(IColonyNetwork)20072": { + "t_contract(IColonyNetwork)20358": { "encoding": "inplace", "label": "contract IColonyNetwork", "numberOfBytes": "20" }, - "t_contract(ITokenLocking)49221": { + "t_contract(ITokenLocking)49039": { "encoding": "inplace", "label": "contract ITokenLocking", "numberOfBytes": "20" }, - "t_enum(ExtensionState)32678": { + "t_enum(ExtensionState)32371": { "encoding": "inplace", "label": "enum VotingReputationDataTypes.ExtensionState", "numberOfBytes": "1" @@ -322,12 +322,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_mapping(t_uint256,t_uint256))" }, - "t_mapping(t_uint256,t_struct(Motion)32726_storage)": { + "t_mapping(t_uint256,t_struct(Motion)32419_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct VotingReputationDataTypes.Motion)", "numberOfBytes": "32", - "value": "t_struct(Motion)32726_storage" + "value": "t_struct(Motion)32419_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -336,12 +336,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(Motion)32726_storage": { + "t_struct(Motion)32419_storage": { "encoding": "inplace", "label": "struct VotingReputationDataTypes.Motion", "members": [ { - "astId": 32691, + "astId": 32384, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "events", "offset": 0, @@ -349,7 +349,7 @@ "type": "t_array(t_uint64)3_storage" }, { - "astId": 32693, + "astId": 32386, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "rootHash", "offset": 0, @@ -357,7 +357,7 @@ "type": "t_bytes32" }, { - "astId": 32695, + "astId": 32388, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "domainId", "offset": 0, @@ -365,7 +365,7 @@ "type": "t_uint256" }, { - "astId": 32697, + "astId": 32390, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "skillId", "offset": 0, @@ -373,7 +373,7 @@ "type": "t_uint256" }, { - "astId": 32699, + "astId": 32392, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "skillRep", "offset": 0, @@ -381,7 +381,7 @@ "type": "t_uint256" }, { - "astId": 32701, + "astId": 32394, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "repSubmitted", "offset": 0, @@ -389,7 +389,7 @@ "type": "t_uint256" }, { - "astId": 32703, + "astId": 32396, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "paidVoterComp", "offset": 0, @@ -397,7 +397,7 @@ "type": "t_uint256" }, { - "astId": 32707, + "astId": 32400, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "pastVoterComp", "offset": 0, @@ -405,7 +405,7 @@ "type": "t_array(t_uint256)2_storage" }, { - "astId": 32711, + "astId": 32404, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "stakes", "offset": 0, @@ -413,7 +413,7 @@ "type": "t_array(t_uint256)2_storage" }, { - "astId": 32715, + "astId": 32408, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "votes", "offset": 0, @@ -421,7 +421,7 @@ "type": "t_array(t_uint256)2_storage" }, { - "astId": 32717, + "astId": 32410, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "escalated", "offset": 0, @@ -429,7 +429,7 @@ "type": "t_bool" }, { - "astId": 32719, + "astId": 32412, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "finalized", "offset": 1, @@ -437,7 +437,7 @@ "type": "t_bool" }, { - "astId": 32721, + "astId": 32414, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "altTarget", "offset": 2, @@ -445,7 +445,7 @@ "type": "t_address" }, { - "astId": 32723, + "astId": 32416, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "sig", "offset": 22, @@ -453,7 +453,7 @@ "type": "t_bytes4" }, { - "astId": 32725, + "astId": 32418, "contract": "contracts/extensions/votingReputation/VotingReputationStorage.sol:VotingReputationStorage", "label": "action", "offset": 0, diff --git a/.storage-layouts/contracts/metaTxToken/DSAuthMeta.sol:DSAuthMeta.json b/.storage-layouts/contracts/metaTxToken/DSAuthMeta.sol:DSAuthMeta.json index c103317a55..da2bdd8250 100644 --- a/.storage-layouts/contracts/metaTxToken/DSAuthMeta.sol:DSAuthMeta.json +++ b/.storage-layouts/contracts/metaTxToken/DSAuthMeta.sol:DSAuthMeta.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 35572, + "astId": 35224, "contract": "contracts/metaTxToken/DSAuthMeta.sol:DSAuthMeta", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 35574, + "astId": 35226, "contract": "contracts/metaTxToken/DSAuthMeta.sol:DSAuthMeta", "label": "owner", "offset": 0, @@ -23,7 +23,7 @@ "label": "address", "numberOfBytes": "20" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/metaTxToken/MetaTxToken.sol:MetaTxToken.json b/.storage-layouts/contracts/metaTxToken/MetaTxToken.sol:MetaTxToken.json index 911737ad3b..7b2cdec5fb 100644 --- a/.storage-layouts/contracts/metaTxToken/MetaTxToken.sol:MetaTxToken.json +++ b/.storage-layouts/contracts/metaTxToken/MetaTxToken.sol:MetaTxToken.json @@ -1,7 +1,7 @@ { "storage": [ { - "astId": 35705, + "astId": 35357, "contract": "contracts/metaTxToken/MetaTxToken.sol:MetaTxToken", "label": "_supply", "offset": 0, @@ -9,7 +9,7 @@ "type": "t_uint256" }, { - "astId": 35709, + "astId": 35361, "contract": "contracts/metaTxToken/MetaTxToken.sol:MetaTxToken", "label": "_balances", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 35715, + "astId": 35367, "contract": "contracts/metaTxToken/MetaTxToken.sol:MetaTxToken", "label": "_approvals", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))" }, { - "astId": 35572, + "astId": 35224, "contract": "contracts/metaTxToken/MetaTxToken.sol:MetaTxToken", "label": "authority", "offset": 0, "slot": "3", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 35574, + "astId": 35226, "contract": "contracts/metaTxToken/MetaTxToken.sol:MetaTxToken", "label": "owner", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_address" }, { - "astId": 35903, + "astId": 35555, "contract": "contracts/metaTxToken/MetaTxToken.sol:MetaTxToken", "label": "symbol", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_string_storage" }, { - "astId": 35905, + "astId": 35557, "contract": "contracts/metaTxToken/MetaTxToken.sol:MetaTxToken", "label": "name", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_string_storage" }, { - "astId": 35907, + "astId": 35559, "contract": "contracts/metaTxToken/MetaTxToken.sol:MetaTxToken", "label": "locked", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_bool" }, { - "astId": 35913, + "astId": 35565, "contract": "contracts/metaTxToken/MetaTxToken.sol:MetaTxToken", "label": "metatransactionNonces", "offset": 0, @@ -84,7 +84,7 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/patriciaTree/PatriciaTree.sol:PatriciaTree.json b/.storage-layouts/contracts/patriciaTree/PatriciaTree.sol:PatriciaTree.json index cfeaaa14be..61b092055e 100644 --- a/.storage-layouts/contracts/patriciaTree/PatriciaTree.sol:PatriciaTree.json +++ b/.storage-layouts/contracts/patriciaTree/PatriciaTree.sol:PatriciaTree.json @@ -1,17 +1,17 @@ { "storage": [ { - "astId": 37330, + "astId": 36982, "contract": "contracts/patriciaTree/PatriciaTree.sol:PatriciaTree", "label": "tree", "offset": 0, "slot": "0", - "type": "t_struct(Tree)36439_storage" + "type": "t_struct(Tree)36091_storage" } ], "types": { - "t_array(t_struct(Edge)36422_storage)2_storage": { - "base": "t_struct(Edge)36422_storage", + "t_array(t_struct(Edge)36074_storage)2_storage": { + "base": "t_struct(Edge)36074_storage", "encoding": "inplace", "label": "struct Data.Edge[2]", "numberOfBytes": "192" @@ -21,19 +21,19 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_mapping(t_bytes32,t_struct(Node)36428_storage)": { + "t_mapping(t_bytes32,t_struct(Node)36080_storage)": { "encoding": "mapping", "key": "t_bytes32", "label": "mapping(bytes32 => struct Data.Node)", "numberOfBytes": "32", - "value": "t_struct(Node)36428_storage" + "value": "t_struct(Node)36080_storage" }, - "t_struct(Edge)36422_storage": { + "t_struct(Edge)36074_storage": { "encoding": "inplace", "label": "struct Data.Edge", "members": [ { - "astId": 36418, + "astId": 36070, "contract": "contracts/patriciaTree/PatriciaTree.sol:PatriciaTree", "label": "node", "offset": 0, @@ -41,22 +41,22 @@ "type": "t_bytes32" }, { - "astId": 36421, + "astId": 36073, "contract": "contracts/patriciaTree/PatriciaTree.sol:PatriciaTree", "label": "label", "offset": 0, "slot": "1", - "type": "t_struct(Label)36416_storage" + "type": "t_struct(Label)36068_storage" } ], "numberOfBytes": "96" }, - "t_struct(Label)36416_storage": { + "t_struct(Label)36068_storage": { "encoding": "inplace", "label": "struct Data.Label", "members": [ { - "astId": 36413, + "astId": 36065, "contract": "contracts/patriciaTree/PatriciaTree.sol:PatriciaTree", "label": "data", "offset": 0, @@ -64,7 +64,7 @@ "type": "t_bytes32" }, { - "astId": 36415, + "astId": 36067, "contract": "contracts/patriciaTree/PatriciaTree.sol:PatriciaTree", "label": "length", "offset": 0, @@ -74,27 +74,27 @@ ], "numberOfBytes": "64" }, - "t_struct(Node)36428_storage": { + "t_struct(Node)36080_storage": { "encoding": "inplace", "label": "struct Data.Node", "members": [ { - "astId": 36427, + "astId": 36079, "contract": "contracts/patriciaTree/PatriciaTree.sol:PatriciaTree", "label": "children", "offset": 0, "slot": "0", - "type": "t_array(t_struct(Edge)36422_storage)2_storage" + "type": "t_array(t_struct(Edge)36074_storage)2_storage" } ], "numberOfBytes": "192" }, - "t_struct(Tree)36439_storage": { + "t_struct(Tree)36091_storage": { "encoding": "inplace", "label": "struct Data.Tree", "members": [ { - "astId": 36430, + "astId": 36082, "contract": "contracts/patriciaTree/PatriciaTree.sol:PatriciaTree", "label": "root", "offset": 0, @@ -102,20 +102,20 @@ "type": "t_bytes32" }, { - "astId": 36433, + "astId": 36085, "contract": "contracts/patriciaTree/PatriciaTree.sol:PatriciaTree", "label": "rootEdge", "offset": 0, "slot": "1", - "type": "t_struct(Edge)36422_storage" + "type": "t_struct(Edge)36074_storage" }, { - "astId": 36438, + "astId": 36090, "contract": "contracts/patriciaTree/PatriciaTree.sol:PatriciaTree", "label": "nodes", "offset": 0, "slot": "4", - "type": "t_mapping(t_bytes32,t_struct(Node)36428_storage)" + "type": "t_mapping(t_bytes32,t_struct(Node)36080_storage)" } ], "numberOfBytes": "160" diff --git a/.storage-layouts/contracts/patriciaTree/PatriciaTreeBase.sol:PatriciaTreeBase.json b/.storage-layouts/contracts/patriciaTree/PatriciaTreeBase.sol:PatriciaTreeBase.json index 64b1341352..4456254417 100644 --- a/.storage-layouts/contracts/patriciaTree/PatriciaTreeBase.sol:PatriciaTreeBase.json +++ b/.storage-layouts/contracts/patriciaTree/PatriciaTreeBase.sol:PatriciaTreeBase.json @@ -1,17 +1,17 @@ { "storage": [ { - "astId": 37330, + "astId": 36982, "contract": "contracts/patriciaTree/PatriciaTreeBase.sol:PatriciaTreeBase", "label": "tree", "offset": 0, "slot": "0", - "type": "t_struct(Tree)36439_storage" + "type": "t_struct(Tree)36091_storage" } ], "types": { - "t_array(t_struct(Edge)36422_storage)2_storage": { - "base": "t_struct(Edge)36422_storage", + "t_array(t_struct(Edge)36074_storage)2_storage": { + "base": "t_struct(Edge)36074_storage", "encoding": "inplace", "label": "struct Data.Edge[2]", "numberOfBytes": "192" @@ -21,19 +21,19 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_mapping(t_bytes32,t_struct(Node)36428_storage)": { + "t_mapping(t_bytes32,t_struct(Node)36080_storage)": { "encoding": "mapping", "key": "t_bytes32", "label": "mapping(bytes32 => struct Data.Node)", "numberOfBytes": "32", - "value": "t_struct(Node)36428_storage" + "value": "t_struct(Node)36080_storage" }, - "t_struct(Edge)36422_storage": { + "t_struct(Edge)36074_storage": { "encoding": "inplace", "label": "struct Data.Edge", "members": [ { - "astId": 36418, + "astId": 36070, "contract": "contracts/patriciaTree/PatriciaTreeBase.sol:PatriciaTreeBase", "label": "node", "offset": 0, @@ -41,22 +41,22 @@ "type": "t_bytes32" }, { - "astId": 36421, + "astId": 36073, "contract": "contracts/patriciaTree/PatriciaTreeBase.sol:PatriciaTreeBase", "label": "label", "offset": 0, "slot": "1", - "type": "t_struct(Label)36416_storage" + "type": "t_struct(Label)36068_storage" } ], "numberOfBytes": "96" }, - "t_struct(Label)36416_storage": { + "t_struct(Label)36068_storage": { "encoding": "inplace", "label": "struct Data.Label", "members": [ { - "astId": 36413, + "astId": 36065, "contract": "contracts/patriciaTree/PatriciaTreeBase.sol:PatriciaTreeBase", "label": "data", "offset": 0, @@ -64,7 +64,7 @@ "type": "t_bytes32" }, { - "astId": 36415, + "astId": 36067, "contract": "contracts/patriciaTree/PatriciaTreeBase.sol:PatriciaTreeBase", "label": "length", "offset": 0, @@ -74,27 +74,27 @@ ], "numberOfBytes": "64" }, - "t_struct(Node)36428_storage": { + "t_struct(Node)36080_storage": { "encoding": "inplace", "label": "struct Data.Node", "members": [ { - "astId": 36427, + "astId": 36079, "contract": "contracts/patriciaTree/PatriciaTreeBase.sol:PatriciaTreeBase", "label": "children", "offset": 0, "slot": "0", - "type": "t_array(t_struct(Edge)36422_storage)2_storage" + "type": "t_array(t_struct(Edge)36074_storage)2_storage" } ], "numberOfBytes": "192" }, - "t_struct(Tree)36439_storage": { + "t_struct(Tree)36091_storage": { "encoding": "inplace", "label": "struct Data.Tree", "members": [ { - "astId": 36430, + "astId": 36082, "contract": "contracts/patriciaTree/PatriciaTreeBase.sol:PatriciaTreeBase", "label": "root", "offset": 0, @@ -102,20 +102,20 @@ "type": "t_bytes32" }, { - "astId": 36433, + "astId": 36085, "contract": "contracts/patriciaTree/PatriciaTreeBase.sol:PatriciaTreeBase", "label": "rootEdge", "offset": 0, "slot": "1", - "type": "t_struct(Edge)36422_storage" + "type": "t_struct(Edge)36074_storage" }, { - "astId": 36438, + "astId": 36090, "contract": "contracts/patriciaTree/PatriciaTreeBase.sol:PatriciaTreeBase", "label": "nodes", "offset": 0, "slot": "4", - "type": "t_mapping(t_bytes32,t_struct(Node)36428_storage)" + "type": "t_mapping(t_bytes32,t_struct(Node)36080_storage)" } ], "numberOfBytes": "160" diff --git a/.storage-layouts/contracts/patriciaTree/PatriciaTreeNoHash.sol:PatriciaTreeNoHash.json b/.storage-layouts/contracts/patriciaTree/PatriciaTreeNoHash.sol:PatriciaTreeNoHash.json index 45aee89c0e..b381b261e9 100644 --- a/.storage-layouts/contracts/patriciaTree/PatriciaTreeNoHash.sol:PatriciaTreeNoHash.json +++ b/.storage-layouts/contracts/patriciaTree/PatriciaTreeNoHash.sol:PatriciaTreeNoHash.json @@ -1,17 +1,17 @@ { "storage": [ { - "astId": 37330, + "astId": 36982, "contract": "contracts/patriciaTree/PatriciaTreeNoHash.sol:PatriciaTreeNoHash", "label": "tree", "offset": 0, "slot": "0", - "type": "t_struct(Tree)36439_storage" + "type": "t_struct(Tree)36091_storage" } ], "types": { - "t_array(t_struct(Edge)36422_storage)2_storage": { - "base": "t_struct(Edge)36422_storage", + "t_array(t_struct(Edge)36074_storage)2_storage": { + "base": "t_struct(Edge)36074_storage", "encoding": "inplace", "label": "struct Data.Edge[2]", "numberOfBytes": "192" @@ -21,19 +21,19 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_mapping(t_bytes32,t_struct(Node)36428_storage)": { + "t_mapping(t_bytes32,t_struct(Node)36080_storage)": { "encoding": "mapping", "key": "t_bytes32", "label": "mapping(bytes32 => struct Data.Node)", "numberOfBytes": "32", - "value": "t_struct(Node)36428_storage" + "value": "t_struct(Node)36080_storage" }, - "t_struct(Edge)36422_storage": { + "t_struct(Edge)36074_storage": { "encoding": "inplace", "label": "struct Data.Edge", "members": [ { - "astId": 36418, + "astId": 36070, "contract": "contracts/patriciaTree/PatriciaTreeNoHash.sol:PatriciaTreeNoHash", "label": "node", "offset": 0, @@ -41,22 +41,22 @@ "type": "t_bytes32" }, { - "astId": 36421, + "astId": 36073, "contract": "contracts/patriciaTree/PatriciaTreeNoHash.sol:PatriciaTreeNoHash", "label": "label", "offset": 0, "slot": "1", - "type": "t_struct(Label)36416_storage" + "type": "t_struct(Label)36068_storage" } ], "numberOfBytes": "96" }, - "t_struct(Label)36416_storage": { + "t_struct(Label)36068_storage": { "encoding": "inplace", "label": "struct Data.Label", "members": [ { - "astId": 36413, + "astId": 36065, "contract": "contracts/patriciaTree/PatriciaTreeNoHash.sol:PatriciaTreeNoHash", "label": "data", "offset": 0, @@ -64,7 +64,7 @@ "type": "t_bytes32" }, { - "astId": 36415, + "astId": 36067, "contract": "contracts/patriciaTree/PatriciaTreeNoHash.sol:PatriciaTreeNoHash", "label": "length", "offset": 0, @@ -74,27 +74,27 @@ ], "numberOfBytes": "64" }, - "t_struct(Node)36428_storage": { + "t_struct(Node)36080_storage": { "encoding": "inplace", "label": "struct Data.Node", "members": [ { - "astId": 36427, + "astId": 36079, "contract": "contracts/patriciaTree/PatriciaTreeNoHash.sol:PatriciaTreeNoHash", "label": "children", "offset": 0, "slot": "0", - "type": "t_array(t_struct(Edge)36422_storage)2_storage" + "type": "t_array(t_struct(Edge)36074_storage)2_storage" } ], "numberOfBytes": "192" }, - "t_struct(Tree)36439_storage": { + "t_struct(Tree)36091_storage": { "encoding": "inplace", "label": "struct Data.Tree", "members": [ { - "astId": 36430, + "astId": 36082, "contract": "contracts/patriciaTree/PatriciaTreeNoHash.sol:PatriciaTreeNoHash", "label": "root", "offset": 0, @@ -102,20 +102,20 @@ "type": "t_bytes32" }, { - "astId": 36433, + "astId": 36085, "contract": "contracts/patriciaTree/PatriciaTreeNoHash.sol:PatriciaTreeNoHash", "label": "rootEdge", "offset": 0, "slot": "1", - "type": "t_struct(Edge)36422_storage" + "type": "t_struct(Edge)36074_storage" }, { - "astId": 36438, + "astId": 36090, "contract": "contracts/patriciaTree/PatriciaTreeNoHash.sol:PatriciaTreeNoHash", "label": "nodes", "offset": 0, "slot": "4", - "type": "t_mapping(t_bytes32,t_struct(Node)36428_storage)" + "type": "t_mapping(t_bytes32,t_struct(Node)36080_storage)" } ], "numberOfBytes": "160" diff --git a/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle.json b/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle.json index 572226c474..7bc1c4033a 100644 --- a/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle.json +++ b/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 43948, + "astId": 43600, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 43950, + "astId": 43602, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "colonyNetworkAddress", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_address_payable" }, { - "astId": 43952, + "astId": 43604, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "tokenLockingAddress", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_address" }, { - "astId": 43954, + "astId": 43606, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "clnyTokenAddress", "offset": 0, @@ -49,15 +49,15 @@ "type": "t_address" }, { - "astId": 43958, + "astId": 43610, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "reputationUpdateLog", "offset": 0, "slot": "6", - "type": "t_array(t_struct(ReputationLogEntry)41465_storage)dyn_storage" + "type": "t_array(t_struct(ReputationLogEntry)41117_storage)dyn_storage" }, { - "astId": 43967, + "astId": 43619, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "submittedHashes", "offset": 0, @@ -65,15 +65,15 @@ "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_mapping(t_bytes32,t_array(t_address)dyn_storage)))" }, { - "astId": 43972, + "astId": 43624, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "reputationHashSubmissions", "offset": 0, "slot": "8", - "type": "t_mapping(t_address,t_struct(Submission)41474_storage)" + "type": "t_mapping(t_address,t_struct(Submission)41126_storage)" }, { - "astId": 43974, + "astId": 43626, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "reputationMiningWindowOpenTimestamp", "offset": 0, @@ -81,15 +81,15 @@ "type": "t_uint256" }, { - "astId": 43980, + "astId": 43632, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "disputeRounds", "offset": 0, "slot": "10", - "type": "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41495_storage)dyn_storage)" + "type": "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41147_storage)dyn_storage)" }, { - "astId": 43984, + "astId": 43636, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "nHashesCompletedChallengeRound", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 43987, + "astId": 43639, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "nUniqueSubmittedHashes", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 43990, + "astId": 43642, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "nInvalidatedHashes", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 43996, + "astId": 43648, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "submittedEntries", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 44015, + "astId": 43667, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "firstIncompleteRound", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 44019, + "astId": 43671, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "respondedToChallenge", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 44021, + "astId": 43673, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "stakeLost", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 44023, + "astId": 43675, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "rewardsPaidOut", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 44025, + "astId": 43677, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "cachedDisputeRewardSize", "offset": 0, @@ -178,14 +178,14 @@ "label": "address[]", "numberOfBytes": "32" }, - "t_array(t_struct(DisputedEntry)41495_storage)dyn_storage": { - "base": "t_struct(DisputedEntry)41495_storage", + "t_array(t_struct(DisputedEntry)41147_storage)dyn_storage": { + "base": "t_struct(DisputedEntry)41147_storage", "encoding": "dynamic_array", "label": "struct ReputationMiningCycleDataTypes.DisputedEntry[]", "numberOfBytes": "32" }, - "t_array(t_struct(ReputationLogEntry)41465_storage)dyn_storage": { - "base": "t_struct(ReputationLogEntry)41465_storage", + "t_array(t_struct(ReputationLogEntry)41117_storage)dyn_storage": { + "base": "t_struct(ReputationLogEntry)41117_storage", "encoding": "dynamic_array", "label": "struct ReputationMiningCycleDataTypes.ReputationLogEntry[]", "numberOfBytes": "32" @@ -200,7 +200,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" @@ -224,12 +224,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_bool)" }, - "t_mapping(t_address,t_struct(Submission)41474_storage)": { + "t_mapping(t_address,t_struct(Submission)41126_storage)": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => struct ReputationMiningCycleDataTypes.Submission)", "numberOfBytes": "32", - "value": "t_struct(Submission)41474_storage" + "value": "t_struct(Submission)41126_storage" }, "t_mapping(t_bytes32,t_array(t_address)dyn_storage)": { "encoding": "mapping", @@ -245,12 +245,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_mapping(t_bytes32,t_array(t_address)dyn_storage))" }, - "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41495_storage)dyn_storage)": { + "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41147_storage)dyn_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ReputationMiningCycleDataTypes.DisputedEntry[])", "numberOfBytes": "32", - "value": "t_array(t_struct(DisputedEntry)41495_storage)dyn_storage" + "value": "t_array(t_struct(DisputedEntry)41147_storage)dyn_storage" }, "t_mapping(t_uint256,t_bool)": { "encoding": "mapping", @@ -273,12 +273,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(DisputedEntry)41495_storage": { + "t_struct(DisputedEntry)41147_storage": { "encoding": "inplace", "label": "struct ReputationMiningCycleDataTypes.DisputedEntry", "members": [ { - "astId": 41476, + "astId": 41128, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "firstSubmitter", "offset": 0, @@ -286,7 +286,7 @@ "type": "t_address" }, { - "astId": 41478, + "astId": 41130, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "lastResponseTimestamp", "offset": 0, @@ -294,7 +294,7 @@ "type": "t_uint256" }, { - "astId": 41480, + "astId": 41132, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "challengeStepCompleted", "offset": 0, @@ -302,7 +302,7 @@ "type": "t_uint256" }, { - "astId": 41482, + "astId": 41134, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "intermediateReputationHash", "offset": 0, @@ -310,7 +310,7 @@ "type": "t_bytes32" }, { - "astId": 41484, + "astId": 41136, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "intermediateReputationNLeaves", "offset": 0, @@ -318,7 +318,7 @@ "type": "t_uint256" }, { - "astId": 41486, + "astId": 41138, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "lowerBound", "offset": 0, @@ -326,7 +326,7 @@ "type": "t_uint256" }, { - "astId": 41488, + "astId": 41140, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "upperBound", "offset": 0, @@ -334,7 +334,7 @@ "type": "t_uint256" }, { - "astId": 41490, + "astId": 41142, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "targetHashDuringSearch", "offset": 0, @@ -342,7 +342,7 @@ "type": "t_bytes32" }, { - "astId": 41492, + "astId": 41144, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "hash1", "offset": 0, @@ -350,7 +350,7 @@ "type": "t_bytes32" }, { - "astId": 41494, + "astId": 41146, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "hash2", "offset": 0, @@ -360,12 +360,12 @@ ], "numberOfBytes": "320" }, - "t_struct(ReputationLogEntry)41465_storage": { + "t_struct(ReputationLogEntry)41117_storage": { "encoding": "inplace", "label": "struct ReputationMiningCycleDataTypes.ReputationLogEntry", "members": [ { - "astId": 41454, + "astId": 41106, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "user", "offset": 0, @@ -373,7 +373,7 @@ "type": "t_address" }, { - "astId": 41456, + "astId": 41108, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "amount", "offset": 0, @@ -381,7 +381,7 @@ "type": "t_int256" }, { - "astId": 41458, + "astId": 41110, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "skillId", "offset": 0, @@ -389,7 +389,7 @@ "type": "t_uint256" }, { - "astId": 41460, + "astId": 41112, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "colony", "offset": 0, @@ -397,7 +397,7 @@ "type": "t_address" }, { - "astId": 41462, + "astId": 41114, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "nUpdates", "offset": 0, @@ -405,7 +405,7 @@ "type": "t_uint128" }, { - "astId": 41464, + "astId": 41116, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "nPreviousUpdates", "offset": 16, @@ -415,12 +415,12 @@ ], "numberOfBytes": "160" }, - "t_struct(Submission)41474_storage": { + "t_struct(Submission)41126_storage": { "encoding": "inplace", "label": "struct ReputationMiningCycleDataTypes.Submission", "members": [ { - "astId": 41467, + "astId": 41119, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "proposedNewRootHash", "offset": 0, @@ -428,7 +428,7 @@ "type": "t_bytes32" }, { - "astId": 41469, + "astId": 41121, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "nLeaves", "offset": 0, @@ -436,7 +436,7 @@ "type": "t_uint256" }, { - "astId": 41471, + "astId": 41123, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "jrh", "offset": 0, @@ -444,7 +444,7 @@ "type": "t_bytes32" }, { - "astId": 41473, + "astId": 41125, "contract": "contracts/reputationMiningCycle/ReputationMiningCycle.sol:ReputationMiningCycle", "label": "jrhNLeaves", "offset": 0, diff --git a/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch.json b/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch.json index fd28cda41b..701af14d13 100644 --- a/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch.json +++ b/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 43948, + "astId": 43600, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 43950, + "astId": 43602, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "colonyNetworkAddress", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_address_payable" }, { - "astId": 43952, + "astId": 43604, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "tokenLockingAddress", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_address" }, { - "astId": 43954, + "astId": 43606, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "clnyTokenAddress", "offset": 0, @@ -49,15 +49,15 @@ "type": "t_address" }, { - "astId": 43958, + "astId": 43610, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "reputationUpdateLog", "offset": 0, "slot": "6", - "type": "t_array(t_struct(ReputationLogEntry)41465_storage)dyn_storage" + "type": "t_array(t_struct(ReputationLogEntry)41117_storage)dyn_storage" }, { - "astId": 43967, + "astId": 43619, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "submittedHashes", "offset": 0, @@ -65,15 +65,15 @@ "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_mapping(t_bytes32,t_array(t_address)dyn_storage)))" }, { - "astId": 43972, + "astId": 43624, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "reputationHashSubmissions", "offset": 0, "slot": "8", - "type": "t_mapping(t_address,t_struct(Submission)41474_storage)" + "type": "t_mapping(t_address,t_struct(Submission)41126_storage)" }, { - "astId": 43974, + "astId": 43626, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "reputationMiningWindowOpenTimestamp", "offset": 0, @@ -81,15 +81,15 @@ "type": "t_uint256" }, { - "astId": 43980, + "astId": 43632, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "disputeRounds", "offset": 0, "slot": "10", - "type": "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41495_storage)dyn_storage)" + "type": "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41147_storage)dyn_storage)" }, { - "astId": 43984, + "astId": 43636, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "nHashesCompletedChallengeRound", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 43987, + "astId": 43639, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "nUniqueSubmittedHashes", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 43990, + "astId": 43642, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "nInvalidatedHashes", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 43996, + "astId": 43648, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "submittedEntries", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 44015, + "astId": 43667, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "firstIncompleteRound", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 44019, + "astId": 43671, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "respondedToChallenge", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 44021, + "astId": 43673, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "stakeLost", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 44023, + "astId": 43675, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "rewardsPaidOut", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 44025, + "astId": 43677, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "cachedDisputeRewardSize", "offset": 0, @@ -178,14 +178,14 @@ "label": "address[]", "numberOfBytes": "32" }, - "t_array(t_struct(DisputedEntry)41495_storage)dyn_storage": { - "base": "t_struct(DisputedEntry)41495_storage", + "t_array(t_struct(DisputedEntry)41147_storage)dyn_storage": { + "base": "t_struct(DisputedEntry)41147_storage", "encoding": "dynamic_array", "label": "struct ReputationMiningCycleDataTypes.DisputedEntry[]", "numberOfBytes": "32" }, - "t_array(t_struct(ReputationLogEntry)41465_storage)dyn_storage": { - "base": "t_struct(ReputationLogEntry)41465_storage", + "t_array(t_struct(ReputationLogEntry)41117_storage)dyn_storage": { + "base": "t_struct(ReputationLogEntry)41117_storage", "encoding": "dynamic_array", "label": "struct ReputationMiningCycleDataTypes.ReputationLogEntry[]", "numberOfBytes": "32" @@ -200,7 +200,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" @@ -224,12 +224,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_bool)" }, - "t_mapping(t_address,t_struct(Submission)41474_storage)": { + "t_mapping(t_address,t_struct(Submission)41126_storage)": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => struct ReputationMiningCycleDataTypes.Submission)", "numberOfBytes": "32", - "value": "t_struct(Submission)41474_storage" + "value": "t_struct(Submission)41126_storage" }, "t_mapping(t_bytes32,t_array(t_address)dyn_storage)": { "encoding": "mapping", @@ -245,12 +245,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_mapping(t_bytes32,t_array(t_address)dyn_storage))" }, - "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41495_storage)dyn_storage)": { + "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41147_storage)dyn_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ReputationMiningCycleDataTypes.DisputedEntry[])", "numberOfBytes": "32", - "value": "t_array(t_struct(DisputedEntry)41495_storage)dyn_storage" + "value": "t_array(t_struct(DisputedEntry)41147_storage)dyn_storage" }, "t_mapping(t_uint256,t_bool)": { "encoding": "mapping", @@ -273,12 +273,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(DisputedEntry)41495_storage": { + "t_struct(DisputedEntry)41147_storage": { "encoding": "inplace", "label": "struct ReputationMiningCycleDataTypes.DisputedEntry", "members": [ { - "astId": 41476, + "astId": 41128, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "firstSubmitter", "offset": 0, @@ -286,7 +286,7 @@ "type": "t_address" }, { - "astId": 41478, + "astId": 41130, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "lastResponseTimestamp", "offset": 0, @@ -294,7 +294,7 @@ "type": "t_uint256" }, { - "astId": 41480, + "astId": 41132, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "challengeStepCompleted", "offset": 0, @@ -302,7 +302,7 @@ "type": "t_uint256" }, { - "astId": 41482, + "astId": 41134, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "intermediateReputationHash", "offset": 0, @@ -310,7 +310,7 @@ "type": "t_bytes32" }, { - "astId": 41484, + "astId": 41136, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "intermediateReputationNLeaves", "offset": 0, @@ -318,7 +318,7 @@ "type": "t_uint256" }, { - "astId": 41486, + "astId": 41138, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "lowerBound", "offset": 0, @@ -326,7 +326,7 @@ "type": "t_uint256" }, { - "astId": 41488, + "astId": 41140, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "upperBound", "offset": 0, @@ -334,7 +334,7 @@ "type": "t_uint256" }, { - "astId": 41490, + "astId": 41142, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "targetHashDuringSearch", "offset": 0, @@ -342,7 +342,7 @@ "type": "t_bytes32" }, { - "astId": 41492, + "astId": 41144, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "hash1", "offset": 0, @@ -350,7 +350,7 @@ "type": "t_bytes32" }, { - "astId": 41494, + "astId": 41146, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "hash2", "offset": 0, @@ -360,12 +360,12 @@ ], "numberOfBytes": "320" }, - "t_struct(ReputationLogEntry)41465_storage": { + "t_struct(ReputationLogEntry)41117_storage": { "encoding": "inplace", "label": "struct ReputationMiningCycleDataTypes.ReputationLogEntry", "members": [ { - "astId": 41454, + "astId": 41106, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "user", "offset": 0, @@ -373,7 +373,7 @@ "type": "t_address" }, { - "astId": 41456, + "astId": 41108, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "amount", "offset": 0, @@ -381,7 +381,7 @@ "type": "t_int256" }, { - "astId": 41458, + "astId": 41110, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "skillId", "offset": 0, @@ -389,7 +389,7 @@ "type": "t_uint256" }, { - "astId": 41460, + "astId": 41112, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "colony", "offset": 0, @@ -397,7 +397,7 @@ "type": "t_address" }, { - "astId": 41462, + "astId": 41114, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "nUpdates", "offset": 0, @@ -405,7 +405,7 @@ "type": "t_uint128" }, { - "astId": 41464, + "astId": 41116, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "nPreviousUpdates", "offset": 16, @@ -415,12 +415,12 @@ ], "numberOfBytes": "160" }, - "t_struct(Submission)41474_storage": { + "t_struct(Submission)41126_storage": { "encoding": "inplace", "label": "struct ReputationMiningCycleDataTypes.Submission", "members": [ { - "astId": 41467, + "astId": 41119, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "proposedNewRootHash", "offset": 0, @@ -428,7 +428,7 @@ "type": "t_bytes32" }, { - "astId": 41469, + "astId": 41121, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "nLeaves", "offset": 0, @@ -436,7 +436,7 @@ "type": "t_uint256" }, { - "astId": 41471, + "astId": 41123, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "jrh", "offset": 0, @@ -444,7 +444,7 @@ "type": "t_bytes32" }, { - "astId": 41473, + "astId": 41125, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleBinarySearch.sol:ReputationMiningCycleBinarySearch", "label": "jrhNLeaves", "offset": 0, diff --git a/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon.json b/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon.json index d7726211c8..168a46be58 100644 --- a/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon.json +++ b/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 43948, + "astId": 43600, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 43950, + "astId": 43602, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "colonyNetworkAddress", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_address_payable" }, { - "astId": 43952, + "astId": 43604, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "tokenLockingAddress", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_address" }, { - "astId": 43954, + "astId": 43606, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "clnyTokenAddress", "offset": 0, @@ -49,15 +49,15 @@ "type": "t_address" }, { - "astId": 43958, + "astId": 43610, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "reputationUpdateLog", "offset": 0, "slot": "6", - "type": "t_array(t_struct(ReputationLogEntry)41465_storage)dyn_storage" + "type": "t_array(t_struct(ReputationLogEntry)41117_storage)dyn_storage" }, { - "astId": 43967, + "astId": 43619, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "submittedHashes", "offset": 0, @@ -65,15 +65,15 @@ "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_mapping(t_bytes32,t_array(t_address)dyn_storage)))" }, { - "astId": 43972, + "astId": 43624, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "reputationHashSubmissions", "offset": 0, "slot": "8", - "type": "t_mapping(t_address,t_struct(Submission)41474_storage)" + "type": "t_mapping(t_address,t_struct(Submission)41126_storage)" }, { - "astId": 43974, + "astId": 43626, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "reputationMiningWindowOpenTimestamp", "offset": 0, @@ -81,15 +81,15 @@ "type": "t_uint256" }, { - "astId": 43980, + "astId": 43632, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "disputeRounds", "offset": 0, "slot": "10", - "type": "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41495_storage)dyn_storage)" + "type": "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41147_storage)dyn_storage)" }, { - "astId": 43984, + "astId": 43636, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "nHashesCompletedChallengeRound", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 43987, + "astId": 43639, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "nUniqueSubmittedHashes", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 43990, + "astId": 43642, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "nInvalidatedHashes", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 43996, + "astId": 43648, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "submittedEntries", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 44015, + "astId": 43667, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "firstIncompleteRound", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 44019, + "astId": 43671, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "respondedToChallenge", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 44021, + "astId": 43673, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "stakeLost", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 44023, + "astId": 43675, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "rewardsPaidOut", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 44025, + "astId": 43677, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "cachedDisputeRewardSize", "offset": 0, @@ -178,14 +178,14 @@ "label": "address[]", "numberOfBytes": "32" }, - "t_array(t_struct(DisputedEntry)41495_storage)dyn_storage": { - "base": "t_struct(DisputedEntry)41495_storage", + "t_array(t_struct(DisputedEntry)41147_storage)dyn_storage": { + "base": "t_struct(DisputedEntry)41147_storage", "encoding": "dynamic_array", "label": "struct ReputationMiningCycleDataTypes.DisputedEntry[]", "numberOfBytes": "32" }, - "t_array(t_struct(ReputationLogEntry)41465_storage)dyn_storage": { - "base": "t_struct(ReputationLogEntry)41465_storage", + "t_array(t_struct(ReputationLogEntry)41117_storage)dyn_storage": { + "base": "t_struct(ReputationLogEntry)41117_storage", "encoding": "dynamic_array", "label": "struct ReputationMiningCycleDataTypes.ReputationLogEntry[]", "numberOfBytes": "32" @@ -200,7 +200,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" @@ -224,12 +224,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_bool)" }, - "t_mapping(t_address,t_struct(Submission)41474_storage)": { + "t_mapping(t_address,t_struct(Submission)41126_storage)": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => struct ReputationMiningCycleDataTypes.Submission)", "numberOfBytes": "32", - "value": "t_struct(Submission)41474_storage" + "value": "t_struct(Submission)41126_storage" }, "t_mapping(t_bytes32,t_array(t_address)dyn_storage)": { "encoding": "mapping", @@ -245,12 +245,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_mapping(t_bytes32,t_array(t_address)dyn_storage))" }, - "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41495_storage)dyn_storage)": { + "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41147_storage)dyn_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ReputationMiningCycleDataTypes.DisputedEntry[])", "numberOfBytes": "32", - "value": "t_array(t_struct(DisputedEntry)41495_storage)dyn_storage" + "value": "t_array(t_struct(DisputedEntry)41147_storage)dyn_storage" }, "t_mapping(t_uint256,t_bool)": { "encoding": "mapping", @@ -273,12 +273,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(DisputedEntry)41495_storage": { + "t_struct(DisputedEntry)41147_storage": { "encoding": "inplace", "label": "struct ReputationMiningCycleDataTypes.DisputedEntry", "members": [ { - "astId": 41476, + "astId": 41128, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "firstSubmitter", "offset": 0, @@ -286,7 +286,7 @@ "type": "t_address" }, { - "astId": 41478, + "astId": 41130, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "lastResponseTimestamp", "offset": 0, @@ -294,7 +294,7 @@ "type": "t_uint256" }, { - "astId": 41480, + "astId": 41132, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "challengeStepCompleted", "offset": 0, @@ -302,7 +302,7 @@ "type": "t_uint256" }, { - "astId": 41482, + "astId": 41134, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "intermediateReputationHash", "offset": 0, @@ -310,7 +310,7 @@ "type": "t_bytes32" }, { - "astId": 41484, + "astId": 41136, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "intermediateReputationNLeaves", "offset": 0, @@ -318,7 +318,7 @@ "type": "t_uint256" }, { - "astId": 41486, + "astId": 41138, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "lowerBound", "offset": 0, @@ -326,7 +326,7 @@ "type": "t_uint256" }, { - "astId": 41488, + "astId": 41140, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "upperBound", "offset": 0, @@ -334,7 +334,7 @@ "type": "t_uint256" }, { - "astId": 41490, + "astId": 41142, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "targetHashDuringSearch", "offset": 0, @@ -342,7 +342,7 @@ "type": "t_bytes32" }, { - "astId": 41492, + "astId": 41144, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "hash1", "offset": 0, @@ -350,7 +350,7 @@ "type": "t_bytes32" }, { - "astId": 41494, + "astId": 41146, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "hash2", "offset": 0, @@ -360,12 +360,12 @@ ], "numberOfBytes": "320" }, - "t_struct(ReputationLogEntry)41465_storage": { + "t_struct(ReputationLogEntry)41117_storage": { "encoding": "inplace", "label": "struct ReputationMiningCycleDataTypes.ReputationLogEntry", "members": [ { - "astId": 41454, + "astId": 41106, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "user", "offset": 0, @@ -373,7 +373,7 @@ "type": "t_address" }, { - "astId": 41456, + "astId": 41108, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "amount", "offset": 0, @@ -381,7 +381,7 @@ "type": "t_int256" }, { - "astId": 41458, + "astId": 41110, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "skillId", "offset": 0, @@ -389,7 +389,7 @@ "type": "t_uint256" }, { - "astId": 41460, + "astId": 41112, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "colony", "offset": 0, @@ -397,7 +397,7 @@ "type": "t_address" }, { - "astId": 41462, + "astId": 41114, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "nUpdates", "offset": 0, @@ -405,7 +405,7 @@ "type": "t_uint128" }, { - "astId": 41464, + "astId": 41116, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "nPreviousUpdates", "offset": 16, @@ -415,12 +415,12 @@ ], "numberOfBytes": "160" }, - "t_struct(Submission)41474_storage": { + "t_struct(Submission)41126_storage": { "encoding": "inplace", "label": "struct ReputationMiningCycleDataTypes.Submission", "members": [ { - "astId": 41467, + "astId": 41119, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "proposedNewRootHash", "offset": 0, @@ -428,7 +428,7 @@ "type": "t_bytes32" }, { - "astId": 41469, + "astId": 41121, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "nLeaves", "offset": 0, @@ -436,7 +436,7 @@ "type": "t_uint256" }, { - "astId": 41471, + "astId": 41123, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "jrh", "offset": 0, @@ -444,7 +444,7 @@ "type": "t_bytes32" }, { - "astId": 41473, + "astId": 41125, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleCommon.sol:ReputationMiningCycleCommon", "label": "jrhNLeaves", "offset": 0, diff --git a/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond.json b/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond.json index 368226d5ac..2a5b258b69 100644 --- a/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond.json +++ b/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 43948, + "astId": 43600, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 43950, + "astId": 43602, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "colonyNetworkAddress", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_address_payable" }, { - "astId": 43952, + "astId": 43604, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "tokenLockingAddress", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_address" }, { - "astId": 43954, + "astId": 43606, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "clnyTokenAddress", "offset": 0, @@ -49,15 +49,15 @@ "type": "t_address" }, { - "astId": 43958, + "astId": 43610, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "reputationUpdateLog", "offset": 0, "slot": "6", - "type": "t_array(t_struct(ReputationLogEntry)41465_storage)dyn_storage" + "type": "t_array(t_struct(ReputationLogEntry)41117_storage)dyn_storage" }, { - "astId": 43967, + "astId": 43619, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "submittedHashes", "offset": 0, @@ -65,15 +65,15 @@ "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_mapping(t_bytes32,t_array(t_address)dyn_storage)))" }, { - "astId": 43972, + "astId": 43624, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "reputationHashSubmissions", "offset": 0, "slot": "8", - "type": "t_mapping(t_address,t_struct(Submission)41474_storage)" + "type": "t_mapping(t_address,t_struct(Submission)41126_storage)" }, { - "astId": 43974, + "astId": 43626, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "reputationMiningWindowOpenTimestamp", "offset": 0, @@ -81,15 +81,15 @@ "type": "t_uint256" }, { - "astId": 43980, + "astId": 43632, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "disputeRounds", "offset": 0, "slot": "10", - "type": "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41495_storage)dyn_storage)" + "type": "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41147_storage)dyn_storage)" }, { - "astId": 43984, + "astId": 43636, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "nHashesCompletedChallengeRound", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 43987, + "astId": 43639, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "nUniqueSubmittedHashes", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 43990, + "astId": 43642, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "nInvalidatedHashes", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 43996, + "astId": 43648, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "submittedEntries", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 44015, + "astId": 43667, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "firstIncompleteRound", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 44019, + "astId": 43671, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "respondedToChallenge", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 44021, + "astId": 43673, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "stakeLost", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 44023, + "astId": 43675, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "rewardsPaidOut", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 44025, + "astId": 43677, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "cachedDisputeRewardSize", "offset": 0, @@ -178,14 +178,14 @@ "label": "address[]", "numberOfBytes": "32" }, - "t_array(t_struct(DisputedEntry)41495_storage)dyn_storage": { - "base": "t_struct(DisputedEntry)41495_storage", + "t_array(t_struct(DisputedEntry)41147_storage)dyn_storage": { + "base": "t_struct(DisputedEntry)41147_storage", "encoding": "dynamic_array", "label": "struct ReputationMiningCycleDataTypes.DisputedEntry[]", "numberOfBytes": "32" }, - "t_array(t_struct(ReputationLogEntry)41465_storage)dyn_storage": { - "base": "t_struct(ReputationLogEntry)41465_storage", + "t_array(t_struct(ReputationLogEntry)41117_storage)dyn_storage": { + "base": "t_struct(ReputationLogEntry)41117_storage", "encoding": "dynamic_array", "label": "struct ReputationMiningCycleDataTypes.ReputationLogEntry[]", "numberOfBytes": "32" @@ -200,7 +200,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" @@ -224,12 +224,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_bool)" }, - "t_mapping(t_address,t_struct(Submission)41474_storage)": { + "t_mapping(t_address,t_struct(Submission)41126_storage)": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => struct ReputationMiningCycleDataTypes.Submission)", "numberOfBytes": "32", - "value": "t_struct(Submission)41474_storage" + "value": "t_struct(Submission)41126_storage" }, "t_mapping(t_bytes32,t_array(t_address)dyn_storage)": { "encoding": "mapping", @@ -245,12 +245,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_mapping(t_bytes32,t_array(t_address)dyn_storage))" }, - "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41495_storage)dyn_storage)": { + "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41147_storage)dyn_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ReputationMiningCycleDataTypes.DisputedEntry[])", "numberOfBytes": "32", - "value": "t_array(t_struct(DisputedEntry)41495_storage)dyn_storage" + "value": "t_array(t_struct(DisputedEntry)41147_storage)dyn_storage" }, "t_mapping(t_uint256,t_bool)": { "encoding": "mapping", @@ -273,12 +273,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(DisputedEntry)41495_storage": { + "t_struct(DisputedEntry)41147_storage": { "encoding": "inplace", "label": "struct ReputationMiningCycleDataTypes.DisputedEntry", "members": [ { - "astId": 41476, + "astId": 41128, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "firstSubmitter", "offset": 0, @@ -286,7 +286,7 @@ "type": "t_address" }, { - "astId": 41478, + "astId": 41130, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "lastResponseTimestamp", "offset": 0, @@ -294,7 +294,7 @@ "type": "t_uint256" }, { - "astId": 41480, + "astId": 41132, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "challengeStepCompleted", "offset": 0, @@ -302,7 +302,7 @@ "type": "t_uint256" }, { - "astId": 41482, + "astId": 41134, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "intermediateReputationHash", "offset": 0, @@ -310,7 +310,7 @@ "type": "t_bytes32" }, { - "astId": 41484, + "astId": 41136, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "intermediateReputationNLeaves", "offset": 0, @@ -318,7 +318,7 @@ "type": "t_uint256" }, { - "astId": 41486, + "astId": 41138, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "lowerBound", "offset": 0, @@ -326,7 +326,7 @@ "type": "t_uint256" }, { - "astId": 41488, + "astId": 41140, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "upperBound", "offset": 0, @@ -334,7 +334,7 @@ "type": "t_uint256" }, { - "astId": 41490, + "astId": 41142, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "targetHashDuringSearch", "offset": 0, @@ -342,7 +342,7 @@ "type": "t_bytes32" }, { - "astId": 41492, + "astId": 41144, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "hash1", "offset": 0, @@ -350,7 +350,7 @@ "type": "t_bytes32" }, { - "astId": 41494, + "astId": 41146, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "hash2", "offset": 0, @@ -360,12 +360,12 @@ ], "numberOfBytes": "320" }, - "t_struct(ReputationLogEntry)41465_storage": { + "t_struct(ReputationLogEntry)41117_storage": { "encoding": "inplace", "label": "struct ReputationMiningCycleDataTypes.ReputationLogEntry", "members": [ { - "astId": 41454, + "astId": 41106, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "user", "offset": 0, @@ -373,7 +373,7 @@ "type": "t_address" }, { - "astId": 41456, + "astId": 41108, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "amount", "offset": 0, @@ -381,7 +381,7 @@ "type": "t_int256" }, { - "astId": 41458, + "astId": 41110, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "skillId", "offset": 0, @@ -389,7 +389,7 @@ "type": "t_uint256" }, { - "astId": 41460, + "astId": 41112, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "colony", "offset": 0, @@ -397,7 +397,7 @@ "type": "t_address" }, { - "astId": 41462, + "astId": 41114, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "nUpdates", "offset": 0, @@ -405,7 +405,7 @@ "type": "t_uint128" }, { - "astId": 41464, + "astId": 41116, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "nPreviousUpdates", "offset": 16, @@ -415,12 +415,12 @@ ], "numberOfBytes": "160" }, - "t_struct(Submission)41474_storage": { + "t_struct(Submission)41126_storage": { "encoding": "inplace", "label": "struct ReputationMiningCycleDataTypes.Submission", "members": [ { - "astId": 41467, + "astId": 41119, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "proposedNewRootHash", "offset": 0, @@ -428,7 +428,7 @@ "type": "t_bytes32" }, { - "astId": 41469, + "astId": 41121, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "nLeaves", "offset": 0, @@ -436,7 +436,7 @@ "type": "t_uint256" }, { - "astId": 41471, + "astId": 41123, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "jrh", "offset": 0, @@ -444,7 +444,7 @@ "type": "t_bytes32" }, { - "astId": 41473, + "astId": 41125, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleRespond.sol:ReputationMiningCycleRespond", "label": "jrhNLeaves", "offset": 0, diff --git a/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage.json b/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage.json index b96821eb18..463f83b678 100644 --- a/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage.json +++ b/.storage-layouts/contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 43948, + "astId": 43600, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 43950, + "astId": 43602, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "colonyNetworkAddress", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_address_payable" }, { - "astId": 43952, + "astId": 43604, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "tokenLockingAddress", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_address" }, { - "astId": 43954, + "astId": 43606, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "clnyTokenAddress", "offset": 0, @@ -49,15 +49,15 @@ "type": "t_address" }, { - "astId": 43958, + "astId": 43610, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "reputationUpdateLog", "offset": 0, "slot": "6", - "type": "t_array(t_struct(ReputationLogEntry)41465_storage)dyn_storage" + "type": "t_array(t_struct(ReputationLogEntry)41117_storage)dyn_storage" }, { - "astId": 43967, + "astId": 43619, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "submittedHashes", "offset": 0, @@ -65,15 +65,15 @@ "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_mapping(t_bytes32,t_array(t_address)dyn_storage)))" }, { - "astId": 43972, + "astId": 43624, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "reputationHashSubmissions", "offset": 0, "slot": "8", - "type": "t_mapping(t_address,t_struct(Submission)41474_storage)" + "type": "t_mapping(t_address,t_struct(Submission)41126_storage)" }, { - "astId": 43974, + "astId": 43626, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "reputationMiningWindowOpenTimestamp", "offset": 0, @@ -81,15 +81,15 @@ "type": "t_uint256" }, { - "astId": 43980, + "astId": 43632, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "disputeRounds", "offset": 0, "slot": "10", - "type": "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41495_storage)dyn_storage)" + "type": "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41147_storage)dyn_storage)" }, { - "astId": 43984, + "astId": 43636, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "nHashesCompletedChallengeRound", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 43987, + "astId": 43639, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "nUniqueSubmittedHashes", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 43990, + "astId": 43642, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "nInvalidatedHashes", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 43996, + "astId": 43648, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "submittedEntries", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 44015, + "astId": 43667, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "firstIncompleteRound", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 44019, + "astId": 43671, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "respondedToChallenge", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_mapping(t_address,t_bool)" }, { - "astId": 44021, + "astId": 43673, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "stakeLost", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 44023, + "astId": 43675, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "rewardsPaidOut", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 44025, + "astId": 43677, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "cachedDisputeRewardSize", "offset": 0, @@ -178,14 +178,14 @@ "label": "address[]", "numberOfBytes": "32" }, - "t_array(t_struct(DisputedEntry)41495_storage)dyn_storage": { - "base": "t_struct(DisputedEntry)41495_storage", + "t_array(t_struct(DisputedEntry)41147_storage)dyn_storage": { + "base": "t_struct(DisputedEntry)41147_storage", "encoding": "dynamic_array", "label": "struct ReputationMiningCycleDataTypes.DisputedEntry[]", "numberOfBytes": "32" }, - "t_array(t_struct(ReputationLogEntry)41465_storage)dyn_storage": { - "base": "t_struct(ReputationLogEntry)41465_storage", + "t_array(t_struct(ReputationLogEntry)41117_storage)dyn_storage": { + "base": "t_struct(ReputationLogEntry)41117_storage", "encoding": "dynamic_array", "label": "struct ReputationMiningCycleDataTypes.ReputationLogEntry[]", "numberOfBytes": "32" @@ -200,7 +200,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" @@ -224,12 +224,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_bool)" }, - "t_mapping(t_address,t_struct(Submission)41474_storage)": { + "t_mapping(t_address,t_struct(Submission)41126_storage)": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => struct ReputationMiningCycleDataTypes.Submission)", "numberOfBytes": "32", - "value": "t_struct(Submission)41474_storage" + "value": "t_struct(Submission)41126_storage" }, "t_mapping(t_bytes32,t_array(t_address)dyn_storage)": { "encoding": "mapping", @@ -245,12 +245,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_mapping(t_bytes32,t_array(t_address)dyn_storage))" }, - "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41495_storage)dyn_storage)": { + "t_mapping(t_uint256,t_array(t_struct(DisputedEntry)41147_storage)dyn_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ReputationMiningCycleDataTypes.DisputedEntry[])", "numberOfBytes": "32", - "value": "t_array(t_struct(DisputedEntry)41495_storage)dyn_storage" + "value": "t_array(t_struct(DisputedEntry)41147_storage)dyn_storage" }, "t_mapping(t_uint256,t_bool)": { "encoding": "mapping", @@ -273,12 +273,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(DisputedEntry)41495_storage": { + "t_struct(DisputedEntry)41147_storage": { "encoding": "inplace", "label": "struct ReputationMiningCycleDataTypes.DisputedEntry", "members": [ { - "astId": 41476, + "astId": 41128, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "firstSubmitter", "offset": 0, @@ -286,7 +286,7 @@ "type": "t_address" }, { - "astId": 41478, + "astId": 41130, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "lastResponseTimestamp", "offset": 0, @@ -294,7 +294,7 @@ "type": "t_uint256" }, { - "astId": 41480, + "astId": 41132, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "challengeStepCompleted", "offset": 0, @@ -302,7 +302,7 @@ "type": "t_uint256" }, { - "astId": 41482, + "astId": 41134, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "intermediateReputationHash", "offset": 0, @@ -310,7 +310,7 @@ "type": "t_bytes32" }, { - "astId": 41484, + "astId": 41136, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "intermediateReputationNLeaves", "offset": 0, @@ -318,7 +318,7 @@ "type": "t_uint256" }, { - "astId": 41486, + "astId": 41138, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "lowerBound", "offset": 0, @@ -326,7 +326,7 @@ "type": "t_uint256" }, { - "astId": 41488, + "astId": 41140, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "upperBound", "offset": 0, @@ -334,7 +334,7 @@ "type": "t_uint256" }, { - "astId": 41490, + "astId": 41142, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "targetHashDuringSearch", "offset": 0, @@ -342,7 +342,7 @@ "type": "t_bytes32" }, { - "astId": 41492, + "astId": 41144, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "hash1", "offset": 0, @@ -350,7 +350,7 @@ "type": "t_bytes32" }, { - "astId": 41494, + "astId": 41146, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "hash2", "offset": 0, @@ -360,12 +360,12 @@ ], "numberOfBytes": "320" }, - "t_struct(ReputationLogEntry)41465_storage": { + "t_struct(ReputationLogEntry)41117_storage": { "encoding": "inplace", "label": "struct ReputationMiningCycleDataTypes.ReputationLogEntry", "members": [ { - "astId": 41454, + "astId": 41106, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "user", "offset": 0, @@ -373,7 +373,7 @@ "type": "t_address" }, { - "astId": 41456, + "astId": 41108, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "amount", "offset": 0, @@ -381,7 +381,7 @@ "type": "t_int256" }, { - "astId": 41458, + "astId": 41110, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "skillId", "offset": 0, @@ -389,7 +389,7 @@ "type": "t_uint256" }, { - "astId": 41460, + "astId": 41112, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "colony", "offset": 0, @@ -397,7 +397,7 @@ "type": "t_address" }, { - "astId": 41462, + "astId": 41114, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "nUpdates", "offset": 0, @@ -405,7 +405,7 @@ "type": "t_uint128" }, { - "astId": 41464, + "astId": 41116, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "nPreviousUpdates", "offset": 16, @@ -415,12 +415,12 @@ ], "numberOfBytes": "160" }, - "t_struct(Submission)41474_storage": { + "t_struct(Submission)41126_storage": { "encoding": "inplace", "label": "struct ReputationMiningCycleDataTypes.Submission", "members": [ { - "astId": 41467, + "astId": 41119, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "proposedNewRootHash", "offset": 0, @@ -428,7 +428,7 @@ "type": "t_bytes32" }, { - "astId": 41469, + "astId": 41121, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "nLeaves", "offset": 0, @@ -436,7 +436,7 @@ "type": "t_uint256" }, { - "astId": 41471, + "astId": 41123, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "jrh", "offset": 0, @@ -444,7 +444,7 @@ "type": "t_bytes32" }, { - "astId": 41473, + "astId": 41125, "contract": "contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol:ReputationMiningCycleStorage", "label": "jrhNLeaves", "offset": 0, diff --git a/.storage-layouts/contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony.json b/.storage-layouts/contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony.json index 3be7ebdc97..d662bbfdc4 100644 --- a/.storage-layouts/contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony.json +++ b/.storage-layouts/contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10724, + "astId": 11718, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "colonyNetworkAddress", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_address" }, { - "astId": 10726, + "astId": 11720, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "token", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_address" }, { - "astId": 10728, + "astId": 11722, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "rewardInverse", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 10730, + "astId": 11724, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "DEPRECATED_taskCount", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 10732, + "astId": 11726, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "fundingPotCount", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 10734, + "astId": 11728, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "domainCount", "offset": 0, @@ -113,15 +113,15 @@ "type": "t_uint256" }, { - "astId": 10741, + "astId": 11735, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "DEPRECATED_reviewers", "offset": 0, "slot": "12", - "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)" + "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)" }, { - "astId": 10745, + "astId": 11739, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "DEPRECATED_roleAssignmentSigs", "offset": 0, @@ -129,31 +129,31 @@ "type": "t_mapping(t_bytes4,t_bool)" }, { - "astId": 10750, + "astId": 11744, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "DEPRECATED_tasks", "offset": 0, "slot": "14", - "type": "t_mapping(t_uint256,t_struct(Task)6083_storage)" + "type": "t_mapping(t_uint256,t_struct(Task)6772_storage)" }, { - "astId": 10755, + "astId": 11749, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "fundingPots", "offset": 0, "slot": "15", - "type": "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)" + "type": "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)" }, { - "astId": 10760, + "astId": 11754, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "rewardPayoutCycles", "offset": 0, "slot": "16", - "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)" + "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)" }, { - "astId": 10764, + "astId": 11758, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "pendingRewardPayments", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10768, + "astId": 11762, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "nonRewardPotsTotal", "offset": 0, @@ -169,23 +169,23 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10773, + "astId": 11767, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "DEPRECATED_taskWorkRatings", "offset": 0, "slot": "19", - "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)" + "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)" }, { - "astId": 10778, + "astId": 11772, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "domains", "offset": 0, "slot": "20", - "type": "t_mapping(t_uint256,t_struct(Domain)5898_storage)" + "type": "t_mapping(t_uint256,t_struct(Domain)6579_storage)" }, { - "astId": 10782, + "astId": 11776, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "DEPRECATED_taskChangeNonces", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 10784, + "astId": 11778, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "DEPRECATED_paymentCount", "offset": 0, @@ -201,15 +201,15 @@ "type": "t_uint256" }, { - "astId": 10789, + "astId": 11783, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "DEPRECATED_payments", "offset": 0, "slot": "23", - "type": "t_mapping(t_uint256,t_struct(Payment)6112_storage)" + "type": "t_mapping(t_uint256,t_struct(Payment)6801_storage)" }, { - "astId": 10791, + "astId": 11785, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "expenditureCount", "offset": 0, @@ -217,23 +217,23 @@ "type": "t_uint256" }, { - "astId": 10796, + "astId": 11790, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "expenditures", "offset": 0, "slot": "25", - "type": "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)" + "type": "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)" }, { - "astId": 10803, + "astId": 11797, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "expenditureSlots", "offset": 0, "slot": "26", - "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))" + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))" }, { - "astId": 10811, + "astId": 11805, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "expenditureSlotPayouts", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" }, { - "astId": 10819, + "astId": 11813, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "approvals", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10827, + "astId": 11821, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "obligations", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10829, + "astId": 11823, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "tokenLockingAddress", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_address" }, { - "astId": 10835, + "astId": 11829, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "tokenLocks", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 10841, + "astId": 11835, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "tokenApprovals", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))" }, { - "astId": 10845, + "astId": 11839, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "tokenApprovalTotals", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10847, + "astId": 11841, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "defaultGlobalClaimDelay", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 10854, + "astId": 11848, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "metatransactionNonces", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10856, + "astId": 11850, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "rootLocalSkill", "offset": 0, @@ -313,12 +313,20 @@ "type": "t_uint256" }, { - "astId": 10860, + "astId": 11854, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "localSkills", "offset": 0, "slot": "37", "type": "t_mapping(t_uint256,t_bool)" + }, + { + "astId": 11864, + "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))" } ], "types": { @@ -332,8 +340,8 @@ "label": "address payable", "numberOfBytes": "20" }, - "t_array(t_enum(TaskRole)6049)2_storage": { - "base": "t_enum(TaskRole)6049", + "t_array(t_enum(TaskRole)6738)2_storage": { + "base": "t_enum(TaskRole)6738", "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole[2]", "numberOfBytes": "32" @@ -359,32 +367,32 @@ "label": "bytes4", "numberOfBytes": "4" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_enum(ExpenditureStatus)5862": { + "t_enum(ExpenditureStatus)6531": { "encoding": "inplace", "label": "enum ColonyDataTypes.ExpenditureStatus", "numberOfBytes": "1" }, - "t_enum(FundingPotAssociatedType)5877": { + "t_enum(FundingPotAssociatedType)6546": { "encoding": "inplace", "label": "enum ColonyDataTypes.FundingPotAssociatedType", "numberOfBytes": "1" }, - "t_enum(TaskRatings)6045": { + "t_enum(TaskRatings)6734": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRatings", "numberOfBytes": "1" }, - "t_enum(TaskRole)6049": { + "t_enum(TaskRole)6738": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole", "numberOfBytes": "1" }, - "t_enum(TaskStatus)6053": { + "t_enum(TaskStatus)6742": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskStatus", "numberOfBytes": "1" @@ -429,12 +437,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)": { + "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)": { "encoding": "mapping", "key": "t_bytes4", "label": "mapping(bytes4 => enum ColonyDataTypes.TaskRole[2])", "numberOfBytes": "32", - "value": "t_array(t_enum(TaskRole)6049)2_storage" + "value": "t_array(t_enum(TaskRole)6738)2_storage" }, "t_mapping(t_bytes4,t_bool)": { "encoding": "mapping", @@ -464,68 +472,75 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, - "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))": { + "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))": { + "encoding": "mapping", + "key": "t_uint256", + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" + }, + "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)" + "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)" }, - "t_mapping(t_uint256,t_struct(Domain)5898_storage)": { + "t_mapping(t_uint256,t_struct(Domain)6579_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Domain)", "numberOfBytes": "32", - "value": "t_struct(Domain)5898_storage" + "value": "t_struct(Domain)6579_storage" }, - "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)": { + "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Expenditure)", "numberOfBytes": "32", - "value": "t_struct(Expenditure)5847_storage" + "value": "t_struct(Expenditure)6516_storage" }, - "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)": { + "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot)", "numberOfBytes": "32", - "value": "t_struct(ExpenditureSlot)5857_storage" + "value": "t_struct(ExpenditureSlot)6526_storage" }, - "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)": { + "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.FundingPot)", "numberOfBytes": "32", - "value": "t_struct(FundingPot)5893_storage" + "value": "t_struct(FundingPot)6574_storage" }, - "t_mapping(t_uint256,t_struct(Payment)6112_storage)": { + "t_mapping(t_uint256,t_struct(Payment)6801_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Payment)", "numberOfBytes": "32", - "value": "t_struct(Payment)6112_storage" + "value": "t_struct(Payment)6801_storage" }, - "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)": { + "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RatingSecrets)", "numberOfBytes": "32", - "value": "t_struct(RatingSecrets)6100_storage" + "value": "t_struct(RatingSecrets)6789_storage" }, - "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)": { + "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RewardPayoutCycle)", "numberOfBytes": "32", - "value": "t_struct(RewardPayoutCycle)5833_storage" + "value": "t_struct(RewardPayoutCycle)6502_storage" }, - "t_mapping(t_uint256,t_struct(Task)6083_storage)": { + "t_mapping(t_uint256,t_struct(Task)6772_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Task)", "numberOfBytes": "32", - "value": "t_struct(Task)6083_storage" + "value": "t_struct(Task)6772_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -548,19 +563,19 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_uint256)" }, - "t_mapping(t_uint8,t_struct(Role)6091_storage)": { + "t_mapping(t_uint8,t_struct(Role)6780_storage)": { "encoding": "mapping", "key": "t_uint8", "label": "mapping(uint8 => struct ColonyDataTypes.Role)", "numberOfBytes": "32", - "value": "t_struct(Role)6091_storage" + "value": "t_struct(Role)6780_storage" }, - "t_struct(Domain)5898_storage": { + "t_struct(Domain)6579_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Domain", "members": [ { - "astId": 5895, + "astId": 6576, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "skillId", "offset": 0, @@ -568,7 +583,7 @@ "type": "t_uint256" }, { - "astId": 5897, + "astId": 6578, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "fundingPotId", "offset": 0, @@ -578,20 +593,20 @@ ], "numberOfBytes": "64" }, - "t_struct(Expenditure)5847_storage": { + "t_struct(Expenditure)6516_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Expenditure", "members": [ { - "astId": 5836, + "astId": 6505, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "status", "offset": 0, "slot": "0", - "type": "t_enum(ExpenditureStatus)5862" + "type": "t_enum(ExpenditureStatus)6531" }, { - "astId": 5838, + "astId": 6507, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "owner", "offset": 1, @@ -599,7 +614,7 @@ "type": "t_address" }, { - "astId": 5840, + "astId": 6509, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "fundingPotId", "offset": 0, @@ -607,7 +622,7 @@ "type": "t_uint256" }, { - "astId": 5842, + "astId": 6511, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "domainId", "offset": 0, @@ -615,7 +630,7 @@ "type": "t_uint256" }, { - "astId": 5844, + "astId": 6513, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "finalizedTimestamp", "offset": 0, @@ -623,7 +638,7 @@ "type": "t_uint256" }, { - "astId": 5846, + "astId": 6515, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "globalClaimDelay", "offset": 0, @@ -633,12 +648,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ExpenditureSlot)5857_storage": { + "t_struct(ExpenditureSlot)6526_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.ExpenditureSlot", "members": [ { - "astId": 5849, + "astId": 6518, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "recipient", "offset": 0, @@ -646,7 +661,7 @@ "type": "t_address_payable" }, { - "astId": 5851, + "astId": 6520, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "claimDelay", "offset": 0, @@ -654,7 +669,7 @@ "type": "t_uint256" }, { - "astId": 5853, + "astId": 6522, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "payoutModifier", "offset": 0, @@ -662,7 +677,7 @@ "type": "t_int256" }, { - "astId": 5856, + "astId": 6525, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "skills", "offset": 0, @@ -672,12 +687,12 @@ ], "numberOfBytes": "128" }, - "t_struct(FundingPot)5893_storage": { + "t_struct(FundingPot)6574_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.FundingPot", "members": [ { - "astId": 5881, + "astId": 6550, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "balance", "offset": 0, @@ -685,15 +700,15 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5884, + "astId": 6553, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "associatedType", "offset": 0, "slot": "1", - "type": "t_enum(FundingPotAssociatedType)5877" + "type": "t_enum(FundingPotAssociatedType)6546" }, { - "astId": 5886, + "astId": 6555, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "associatedTypeId", "offset": 0, @@ -701,7 +716,7 @@ "type": "t_uint256" }, { - "astId": 5890, + "astId": 6559, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "payouts", "offset": 0, @@ -709,22 +724,38 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5892, + "astId": 6561, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "payoutsWeCannotMake", "offset": 0, "slot": "4", "type": "t_uint256" + }, + { + "astId": 6567, + "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" + }, + { + "astId": 6573, + "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" } ], - "numberOfBytes": "160" + "numberOfBytes": "224" }, - "t_struct(Payment)6112_storage": { + "t_struct(Payment)6801_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Payment", "members": [ { - "astId": 6102, + "astId": 6791, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "recipient", "offset": 0, @@ -732,7 +763,7 @@ "type": "t_address_payable" }, { - "astId": 6104, + "astId": 6793, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "finalized", "offset": 20, @@ -740,7 +771,7 @@ "type": "t_bool" }, { - "astId": 6106, + "astId": 6795, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "fundingPotId", "offset": 0, @@ -748,7 +779,7 @@ "type": "t_uint256" }, { - "astId": 6108, + "astId": 6797, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "domainId", "offset": 0, @@ -756,7 +787,7 @@ "type": "t_uint256" }, { - "astId": 6111, + "astId": 6800, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "skills", "offset": 0, @@ -766,12 +797,12 @@ ], "numberOfBytes": "128" }, - "t_struct(RatingSecrets)6100_storage": { + "t_struct(RatingSecrets)6789_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RatingSecrets", "members": [ { - "astId": 6093, + "astId": 6782, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "count", "offset": 0, @@ -779,7 +810,7 @@ "type": "t_uint256" }, { - "astId": 6095, + "astId": 6784, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "timestamp", "offset": 0, @@ -787,7 +818,7 @@ "type": "t_uint256" }, { - "astId": 6099, + "astId": 6788, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "secret", "offset": 0, @@ -797,12 +828,12 @@ ], "numberOfBytes": "96" }, - "t_struct(RewardPayoutCycle)5833_storage": { + "t_struct(RewardPayoutCycle)6502_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RewardPayoutCycle", "members": [ { - "astId": 5818, + "astId": 6487, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "reputationState", "offset": 0, @@ -810,7 +841,7 @@ "type": "t_bytes32" }, { - "astId": 5820, + "astId": 6489, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "colonyWideReputation", "offset": 0, @@ -818,7 +849,7 @@ "type": "t_uint256" }, { - "astId": 5822, + "astId": 6491, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "totalTokens", "offset": 0, @@ -826,7 +857,7 @@ "type": "t_uint256" }, { - "astId": 5824, + "astId": 6493, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "amount", "offset": 0, @@ -834,7 +865,7 @@ "type": "t_uint256" }, { - "astId": 5826, + "astId": 6495, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "tokenAddress", "offset": 0, @@ -842,7 +873,7 @@ "type": "t_address" }, { - "astId": 5828, + "astId": 6497, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "blockTimestamp", "offset": 0, @@ -850,7 +881,7 @@ "type": "t_uint256" }, { - "astId": 5830, + "astId": 6499, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "amountRemaining", "offset": 0, @@ -858,7 +889,7 @@ "type": "t_uint256" }, { - "astId": 5832, + "astId": 6501, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "finalized", "offset": 0, @@ -868,12 +899,12 @@ ], "numberOfBytes": "256" }, - "t_struct(Role)6091_storage": { + "t_struct(Role)6780_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Role", "members": [ { - "astId": 6085, + "astId": 6774, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "user", "offset": 0, @@ -881,7 +912,7 @@ "type": "t_address_payable" }, { - "astId": 6087, + "astId": 6776, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "rateFail", "offset": 20, @@ -889,22 +920,22 @@ "type": "t_bool" }, { - "astId": 6090, + "astId": 6779, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "rating", "offset": 21, "slot": "0", - "type": "t_enum(TaskRatings)6045" + "type": "t_enum(TaskRatings)6734" } ], "numberOfBytes": "32" }, - "t_struct(Task)6083_storage": { + "t_struct(Task)6772_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Task", "members": [ { - "astId": 6055, + "astId": 6744, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "specificationHash", "offset": 0, @@ -912,7 +943,7 @@ "type": "t_bytes32" }, { - "astId": 6057, + "astId": 6746, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "deliverableHash", "offset": 0, @@ -920,15 +951,15 @@ "type": "t_bytes32" }, { - "astId": 6060, + "astId": 6749, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "status", "offset": 0, "slot": "2", - "type": "t_enum(TaskStatus)6053" + "type": "t_enum(TaskStatus)6742" }, { - "astId": 6062, + "astId": 6751, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "dueDate", "offset": 0, @@ -936,7 +967,7 @@ "type": "t_uint256" }, { - "astId": 6064, + "astId": 6753, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "fundingPotId", "offset": 0, @@ -944,7 +975,7 @@ "type": "t_uint256" }, { - "astId": 6066, + "astId": 6755, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "completionTimestamp", "offset": 0, @@ -952,7 +983,7 @@ "type": "t_uint256" }, { - "astId": 6068, + "astId": 6757, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "domainId", "offset": 0, @@ -960,7 +991,7 @@ "type": "t_uint256" }, { - "astId": 6071, + "astId": 6760, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "skills", "offset": 0, @@ -968,15 +999,15 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 6076, + "astId": 6765, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "roles", "offset": 0, "slot": "8", - "type": "t_mapping(t_uint8,t_struct(Role)6091_storage)" + "type": "t_mapping(t_uint8,t_struct(Role)6780_storage)" }, { - "astId": 6082, + "astId": 6771, "contract": "contracts/testHelpers/FunctionsNotAvailableOnColony.sol:FunctionsNotAvailableOnColony", "label": "payouts", "offset": 0, diff --git a/.storage-layouts/contracts/testHelpers/GasGuzzler.sol:GasGuzzler.json b/.storage-layouts/contracts/testHelpers/GasGuzzler.sol:GasGuzzler.json index b2bb2ee099..8636b3eaf8 100644 --- a/.storage-layouts/contracts/testHelpers/GasGuzzler.sol:GasGuzzler.json +++ b/.storage-layouts/contracts/testHelpers/GasGuzzler.sol:GasGuzzler.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 23562, + "astId": 23884, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "metatransactionNonces", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 23590, + "astId": 23912, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder00", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 23592, + "astId": 23914, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder01", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_uint256" }, { - "astId": 23594, + "astId": 23916, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder02", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 23596, + "astId": 23918, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder03", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 23598, + "astId": 23920, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder04", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 23600, + "astId": 23922, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder05", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 23602, + "astId": 23924, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder06", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 23604, + "astId": 23926, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder07", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 23606, + "astId": 23928, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder08", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 23608, + "astId": 23930, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder09", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 23610, + "astId": 23932, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder10", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 23612, + "astId": 23934, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder11", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 23614, + "astId": 23936, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder12", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 23616, + "astId": 23938, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder13", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_uint256" }, { - "astId": 23618, + "astId": 23940, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder14", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_uint256" }, { - "astId": 23620, + "astId": 23942, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder15", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_uint256" }, { - "astId": 23622, + "astId": 23944, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder16", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_uint256" }, { - "astId": 23624, + "astId": 23946, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder17", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_uint256" }, { - "astId": 23626, + "astId": 23948, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder18", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_uint256" }, { - "astId": 23628, + "astId": 23950, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder19", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_uint256" }, { - "astId": 23630, + "astId": 23952, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder20", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_uint256" }, { - "astId": 23632, + "astId": 23954, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder21", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_uint256" }, { - "astId": 23634, + "astId": 23956, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder22", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_uint256" }, { - "astId": 23636, + "astId": 23958, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder23", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_uint256" }, { - "astId": 23638, + "astId": 23960, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder24", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_uint256" }, { - "astId": 23640, + "astId": 23962, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder25", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_uint256" }, { - "astId": 23642, + "astId": 23964, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder26", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_uint256" }, { - "astId": 23644, + "astId": 23966, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder27", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_uint256" }, { - "astId": 23646, + "astId": 23968, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder28", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_uint256" }, { - "astId": 23648, + "astId": 23970, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder29", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_uint256" }, { - "astId": 23650, + "astId": 23972, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder30", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 23652, + "astId": 23974, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "placeholder31", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_uint256" }, { - "astId": 44536, + "astId": 44188, "contract": "contracts/testHelpers/GasGuzzler.sol:GasGuzzler", "label": "storageVar", "offset": 0, @@ -324,12 +324,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains.json b/.storage-layouts/contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains.json index 54b2a98393..c3d9812f1a 100644 --- a/.storage-layouts/contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains.json +++ b/.storage-layouts/contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 20460, + "astId": 20746, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 20462, + "astId": 20748, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "recoveryMode", "offset": 20, @@ -33,7 +33,7 @@ "type": "t_bool" }, { - "astId": 20464, + "astId": 20750, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "recoveryRolesCount", "offset": 21, @@ -41,7 +41,7 @@ "type": "t_uint64" }, { - "astId": 20466, + "astId": 20752, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "recoveryApprovalCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_uint64" }, { - "astId": 20468, + "astId": 20754, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "recoveryEditedTimestamp", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 20472, + "astId": 20758, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "recoveryApprovalTimestamps", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10724, + "astId": 11718, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "colonyNetworkAddress", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_address" }, { - "astId": 10726, + "astId": 11720, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "token", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_address" }, { - "astId": 10728, + "astId": 11722, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "rewardInverse", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 10730, + "astId": 11724, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "DEPRECATED_taskCount", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 10732, + "astId": 11726, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "fundingPotCount", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 10734, + "astId": 11728, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "domainCount", "offset": 0, @@ -113,15 +113,15 @@ "type": "t_uint256" }, { - "astId": 10741, + "astId": 11735, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "DEPRECATED_reviewers", "offset": 0, "slot": "12", - "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)" + "type": "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)" }, { - "astId": 10745, + "astId": 11739, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "DEPRECATED_roleAssignmentSigs", "offset": 0, @@ -129,31 +129,31 @@ "type": "t_mapping(t_bytes4,t_bool)" }, { - "astId": 10750, + "astId": 11744, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "DEPRECATED_tasks", "offset": 0, "slot": "14", - "type": "t_mapping(t_uint256,t_struct(Task)6083_storage)" + "type": "t_mapping(t_uint256,t_struct(Task)6772_storage)" }, { - "astId": 10755, + "astId": 11749, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "fundingPots", "offset": 0, "slot": "15", - "type": "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)" + "type": "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)" }, { - "astId": 10760, + "astId": 11754, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "rewardPayoutCycles", "offset": 0, "slot": "16", - "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)" + "type": "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)" }, { - "astId": 10764, + "astId": 11758, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "pendingRewardPayments", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10768, + "astId": 11762, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "nonRewardPotsTotal", "offset": 0, @@ -169,23 +169,23 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10773, + "astId": 11767, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "DEPRECATED_taskWorkRatings", "offset": 0, "slot": "19", - "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)" + "type": "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)" }, { - "astId": 10778, + "astId": 11772, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "domains", "offset": 0, "slot": "20", - "type": "t_mapping(t_uint256,t_struct(Domain)5898_storage)" + "type": "t_mapping(t_uint256,t_struct(Domain)6579_storage)" }, { - "astId": 10782, + "astId": 11776, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "DEPRECATED_taskChangeNonces", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_uint256,t_uint256)" }, { - "astId": 10784, + "astId": 11778, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "DEPRECATED_paymentCount", "offset": 0, @@ -201,15 +201,15 @@ "type": "t_uint256" }, { - "astId": 10789, + "astId": 11783, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "DEPRECATED_payments", "offset": 0, "slot": "23", - "type": "t_mapping(t_uint256,t_struct(Payment)6112_storage)" + "type": "t_mapping(t_uint256,t_struct(Payment)6801_storage)" }, { - "astId": 10791, + "astId": 11785, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "expenditureCount", "offset": 0, @@ -217,23 +217,23 @@ "type": "t_uint256" }, { - "astId": 10796, + "astId": 11790, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "expenditures", "offset": 0, "slot": "25", - "type": "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)" + "type": "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)" }, { - "astId": 10803, + "astId": 11797, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "expenditureSlots", "offset": 0, "slot": "26", - "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))" + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))" }, { - "astId": 10811, + "astId": 11805, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "expenditureSlotPayouts", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" }, { - "astId": 10819, + "astId": 11813, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "approvals", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10827, + "astId": 11821, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "obligations", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 10829, + "astId": 11823, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "tokenLockingAddress", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_address" }, { - "astId": 10835, + "astId": 11829, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "tokenLocks", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 10841, + "astId": 11835, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "tokenApprovals", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))" }, { - "astId": 10845, + "astId": 11839, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "tokenApprovalTotals", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10847, + "astId": 11841, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "defaultGlobalClaimDelay", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 10854, + "astId": 11848, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "metatransactionNonces", "offset": 0, @@ -305,7 +305,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 10856, + "astId": 11850, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "rootLocalSkill", "offset": 0, @@ -313,12 +313,20 @@ "type": "t_uint256" }, { - "astId": 10860, + "astId": 11854, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "localSkills", "offset": 0, "slot": "37", "type": "t_mapping(t_uint256,t_bool)" + }, + { + "astId": 11864, + "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", + "label": "expenditureSlotChainPayouts", + "offset": 0, + "slot": "38", + "type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))" } ], "types": { @@ -332,8 +340,8 @@ "label": "address payable", "numberOfBytes": "20" }, - "t_array(t_enum(TaskRole)6049)2_storage": { - "base": "t_enum(TaskRole)6049", + "t_array(t_enum(TaskRole)6738)2_storage": { + "base": "t_enum(TaskRole)6738", "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole[2]", "numberOfBytes": "32" @@ -359,32 +367,32 @@ "label": "bytes4", "numberOfBytes": "4" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_enum(ExpenditureStatus)5862": { + "t_enum(ExpenditureStatus)6531": { "encoding": "inplace", "label": "enum ColonyDataTypes.ExpenditureStatus", "numberOfBytes": "1" }, - "t_enum(FundingPotAssociatedType)5877": { + "t_enum(FundingPotAssociatedType)6546": { "encoding": "inplace", "label": "enum ColonyDataTypes.FundingPotAssociatedType", "numberOfBytes": "1" }, - "t_enum(TaskRatings)6045": { + "t_enum(TaskRatings)6734": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRatings", "numberOfBytes": "1" }, - "t_enum(TaskRole)6049": { + "t_enum(TaskRole)6738": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskRole", "numberOfBytes": "1" }, - "t_enum(TaskStatus)6053": { + "t_enum(TaskStatus)6742": { "encoding": "inplace", "label": "enum ColonyDataTypes.TaskStatus", "numberOfBytes": "1" @@ -429,12 +437,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6049)2_storage)": { + "t_mapping(t_bytes4,t_array(t_enum(TaskRole)6738)2_storage)": { "encoding": "mapping", "key": "t_bytes4", "label": "mapping(bytes4 => enum ColonyDataTypes.TaskRole[2])", "numberOfBytes": "32", - "value": "t_array(t_enum(TaskRole)6049)2_storage" + "value": "t_array(t_enum(TaskRole)6738)2_storage" }, "t_mapping(t_bytes4,t_bool)": { "encoding": "mapping", @@ -464,68 +472,75 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" }, - "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage))": { + "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256))))": { + "encoding": "mapping", + "key": "t_uint256", + "label": "mapping(uint256 => mapping(uint256 => mapping(uint256 => mapping(address => uint256))))", + "numberOfBytes": "32", + "value": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_address,t_uint256)))" + }, + "t_mapping(t_uint256,t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage))": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot))", "numberOfBytes": "32", - "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)" + "value": "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)" }, - "t_mapping(t_uint256,t_struct(Domain)5898_storage)": { + "t_mapping(t_uint256,t_struct(Domain)6579_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Domain)", "numberOfBytes": "32", - "value": "t_struct(Domain)5898_storage" + "value": "t_struct(Domain)6579_storage" }, - "t_mapping(t_uint256,t_struct(Expenditure)5847_storage)": { + "t_mapping(t_uint256,t_struct(Expenditure)6516_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Expenditure)", "numberOfBytes": "32", - "value": "t_struct(Expenditure)5847_storage" + "value": "t_struct(Expenditure)6516_storage" }, - "t_mapping(t_uint256,t_struct(ExpenditureSlot)5857_storage)": { + "t_mapping(t_uint256,t_struct(ExpenditureSlot)6526_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.ExpenditureSlot)", "numberOfBytes": "32", - "value": "t_struct(ExpenditureSlot)5857_storage" + "value": "t_struct(ExpenditureSlot)6526_storage" }, - "t_mapping(t_uint256,t_struct(FundingPot)5893_storage)": { + "t_mapping(t_uint256,t_struct(FundingPot)6574_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.FundingPot)", "numberOfBytes": "32", - "value": "t_struct(FundingPot)5893_storage" + "value": "t_struct(FundingPot)6574_storage" }, - "t_mapping(t_uint256,t_struct(Payment)6112_storage)": { + "t_mapping(t_uint256,t_struct(Payment)6801_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Payment)", "numberOfBytes": "32", - "value": "t_struct(Payment)6112_storage" + "value": "t_struct(Payment)6801_storage" }, - "t_mapping(t_uint256,t_struct(RatingSecrets)6100_storage)": { + "t_mapping(t_uint256,t_struct(RatingSecrets)6789_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RatingSecrets)", "numberOfBytes": "32", - "value": "t_struct(RatingSecrets)6100_storage" + "value": "t_struct(RatingSecrets)6789_storage" }, - "t_mapping(t_uint256,t_struct(RewardPayoutCycle)5833_storage)": { + "t_mapping(t_uint256,t_struct(RewardPayoutCycle)6502_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.RewardPayoutCycle)", "numberOfBytes": "32", - "value": "t_struct(RewardPayoutCycle)5833_storage" + "value": "t_struct(RewardPayoutCycle)6502_storage" }, - "t_mapping(t_uint256,t_struct(Task)6083_storage)": { + "t_mapping(t_uint256,t_struct(Task)6772_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct ColonyDataTypes.Task)", "numberOfBytes": "32", - "value": "t_struct(Task)6083_storage" + "value": "t_struct(Task)6772_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -548,19 +563,19 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_uint256)" }, - "t_mapping(t_uint8,t_struct(Role)6091_storage)": { + "t_mapping(t_uint8,t_struct(Role)6780_storage)": { "encoding": "mapping", "key": "t_uint8", "label": "mapping(uint8 => struct ColonyDataTypes.Role)", "numberOfBytes": "32", - "value": "t_struct(Role)6091_storage" + "value": "t_struct(Role)6780_storage" }, - "t_struct(Domain)5898_storage": { + "t_struct(Domain)6579_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Domain", "members": [ { - "astId": 5895, + "astId": 6576, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "skillId", "offset": 0, @@ -568,7 +583,7 @@ "type": "t_uint256" }, { - "astId": 5897, + "astId": 6578, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "fundingPotId", "offset": 0, @@ -578,20 +593,20 @@ ], "numberOfBytes": "64" }, - "t_struct(Expenditure)5847_storage": { + "t_struct(Expenditure)6516_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Expenditure", "members": [ { - "astId": 5836, + "astId": 6505, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "status", "offset": 0, "slot": "0", - "type": "t_enum(ExpenditureStatus)5862" + "type": "t_enum(ExpenditureStatus)6531" }, { - "astId": 5838, + "astId": 6507, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "owner", "offset": 1, @@ -599,7 +614,7 @@ "type": "t_address" }, { - "astId": 5840, + "astId": 6509, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "fundingPotId", "offset": 0, @@ -607,7 +622,7 @@ "type": "t_uint256" }, { - "astId": 5842, + "astId": 6511, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "domainId", "offset": 0, @@ -615,7 +630,7 @@ "type": "t_uint256" }, { - "astId": 5844, + "astId": 6513, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "finalizedTimestamp", "offset": 0, @@ -623,7 +638,7 @@ "type": "t_uint256" }, { - "astId": 5846, + "astId": 6515, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "globalClaimDelay", "offset": 0, @@ -633,12 +648,12 @@ ], "numberOfBytes": "160" }, - "t_struct(ExpenditureSlot)5857_storage": { + "t_struct(ExpenditureSlot)6526_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.ExpenditureSlot", "members": [ { - "astId": 5849, + "astId": 6518, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "recipient", "offset": 0, @@ -646,7 +661,7 @@ "type": "t_address_payable" }, { - "astId": 5851, + "astId": 6520, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "claimDelay", "offset": 0, @@ -654,7 +669,7 @@ "type": "t_uint256" }, { - "astId": 5853, + "astId": 6522, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "payoutModifier", "offset": 0, @@ -662,7 +677,7 @@ "type": "t_int256" }, { - "astId": 5856, + "astId": 6525, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "skills", "offset": 0, @@ -672,12 +687,12 @@ ], "numberOfBytes": "128" }, - "t_struct(FundingPot)5893_storage": { + "t_struct(FundingPot)6574_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.FundingPot", "members": [ { - "astId": 5881, + "astId": 6550, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "balance", "offset": 0, @@ -685,15 +700,15 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5884, + "astId": 6553, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "associatedType", "offset": 0, "slot": "1", - "type": "t_enum(FundingPotAssociatedType)5877" + "type": "t_enum(FundingPotAssociatedType)6546" }, { - "astId": 5886, + "astId": 6555, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "associatedTypeId", "offset": 0, @@ -701,7 +716,7 @@ "type": "t_uint256" }, { - "astId": 5890, + "astId": 6559, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "payouts", "offset": 0, @@ -709,22 +724,38 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5892, + "astId": 6561, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "payoutsWeCannotMake", "offset": 0, "slot": "4", "type": "t_uint256" + }, + { + "astId": 6567, + "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", + "label": "chainBalances", + "offset": 0, + "slot": "5", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" + }, + { + "astId": 6573, + "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", + "label": "chainPayouts", + "offset": 0, + "slot": "6", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))" } ], - "numberOfBytes": "160" + "numberOfBytes": "224" }, - "t_struct(Payment)6112_storage": { + "t_struct(Payment)6801_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Payment", "members": [ { - "astId": 6102, + "astId": 6791, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "recipient", "offset": 0, @@ -732,7 +763,7 @@ "type": "t_address_payable" }, { - "astId": 6104, + "astId": 6793, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "finalized", "offset": 20, @@ -740,7 +771,7 @@ "type": "t_bool" }, { - "astId": 6106, + "astId": 6795, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "fundingPotId", "offset": 0, @@ -748,7 +779,7 @@ "type": "t_uint256" }, { - "astId": 6108, + "astId": 6797, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "domainId", "offset": 0, @@ -756,7 +787,7 @@ "type": "t_uint256" }, { - "astId": 6111, + "astId": 6800, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "skills", "offset": 0, @@ -766,12 +797,12 @@ ], "numberOfBytes": "128" }, - "t_struct(RatingSecrets)6100_storage": { + "t_struct(RatingSecrets)6789_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RatingSecrets", "members": [ { - "astId": 6093, + "astId": 6782, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "count", "offset": 0, @@ -779,7 +810,7 @@ "type": "t_uint256" }, { - "astId": 6095, + "astId": 6784, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "timestamp", "offset": 0, @@ -787,7 +818,7 @@ "type": "t_uint256" }, { - "astId": 6099, + "astId": 6788, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "secret", "offset": 0, @@ -797,12 +828,12 @@ ], "numberOfBytes": "96" }, - "t_struct(RewardPayoutCycle)5833_storage": { + "t_struct(RewardPayoutCycle)6502_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.RewardPayoutCycle", "members": [ { - "astId": 5818, + "astId": 6487, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "reputationState", "offset": 0, @@ -810,7 +841,7 @@ "type": "t_bytes32" }, { - "astId": 5820, + "astId": 6489, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "colonyWideReputation", "offset": 0, @@ -818,7 +849,7 @@ "type": "t_uint256" }, { - "astId": 5822, + "astId": 6491, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "totalTokens", "offset": 0, @@ -826,7 +857,7 @@ "type": "t_uint256" }, { - "astId": 5824, + "astId": 6493, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "amount", "offset": 0, @@ -834,7 +865,7 @@ "type": "t_uint256" }, { - "astId": 5826, + "astId": 6495, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "tokenAddress", "offset": 0, @@ -842,7 +873,7 @@ "type": "t_address" }, { - "astId": 5828, + "astId": 6497, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "blockTimestamp", "offset": 0, @@ -850,7 +881,7 @@ "type": "t_uint256" }, { - "astId": 5830, + "astId": 6499, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "amountRemaining", "offset": 0, @@ -858,7 +889,7 @@ "type": "t_uint256" }, { - "astId": 5832, + "astId": 6501, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "finalized", "offset": 0, @@ -868,12 +899,12 @@ ], "numberOfBytes": "256" }, - "t_struct(Role)6091_storage": { + "t_struct(Role)6780_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Role", "members": [ { - "astId": 6085, + "astId": 6774, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "user", "offset": 0, @@ -881,7 +912,7 @@ "type": "t_address_payable" }, { - "astId": 6087, + "astId": 6776, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "rateFail", "offset": 20, @@ -889,22 +920,22 @@ "type": "t_bool" }, { - "astId": 6090, + "astId": 6779, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "rating", "offset": 21, "slot": "0", - "type": "t_enum(TaskRatings)6045" + "type": "t_enum(TaskRatings)6734" } ], "numberOfBytes": "32" }, - "t_struct(Task)6083_storage": { + "t_struct(Task)6772_storage": { "encoding": "inplace", "label": "struct ColonyDataTypes.Task", "members": [ { - "astId": 6055, + "astId": 6744, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "specificationHash", "offset": 0, @@ -912,7 +943,7 @@ "type": "t_bytes32" }, { - "astId": 6057, + "astId": 6746, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "deliverableHash", "offset": 0, @@ -920,15 +951,15 @@ "type": "t_bytes32" }, { - "astId": 6060, + "astId": 6749, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "status", "offset": 0, "slot": "2", - "type": "t_enum(TaskStatus)6053" + "type": "t_enum(TaskStatus)6742" }, { - "astId": 6062, + "astId": 6751, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "dueDate", "offset": 0, @@ -936,7 +967,7 @@ "type": "t_uint256" }, { - "astId": 6064, + "astId": 6753, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "fundingPotId", "offset": 0, @@ -944,7 +975,7 @@ "type": "t_uint256" }, { - "astId": 6066, + "astId": 6755, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "completionTimestamp", "offset": 0, @@ -952,7 +983,7 @@ "type": "t_uint256" }, { - "astId": 6068, + "astId": 6757, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "domainId", "offset": 0, @@ -960,7 +991,7 @@ "type": "t_uint256" }, { - "astId": 6071, + "astId": 6760, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "skills", "offset": 0, @@ -968,15 +999,15 @@ "type": "t_array(t_uint256)dyn_storage" }, { - "astId": 6076, + "astId": 6765, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "roles", "offset": 0, "slot": "8", - "type": "t_mapping(t_uint8,t_struct(Role)6091_storage)" + "type": "t_mapping(t_uint8,t_struct(Role)6780_storage)" }, { - "astId": 6082, + "astId": 6771, "contract": "contracts/testHelpers/NoLimitSubdomains.sol:NoLimitSubdomains", "label": "payouts", "offset": 0, diff --git a/.storage-layouts/contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned.json b/.storage-layouts/contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned.json index 6bb77faf26..66d8a6ff48 100644 --- a/.storage-layouts/contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned.json +++ b/.storage-layouts/contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "deprecated", "offset": 20, @@ -41,31 +41,31 @@ "type": "t_bool" }, { - "astId": 45251, + "astId": 44903, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "state", "offset": 21, "slot": "3", - "type": "t_enum(ExtensionState)45248" + "type": "t_enum(ExtensionState)44900" }, { - "astId": 45254, + "astId": 44906, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "colonyNetwork", "offset": 0, "slot": "4", - "type": "t_contract(IColonyNetwork)20072" + "type": "t_contract(IColonyNetwork)20358" }, { - "astId": 45257, + "astId": 44909, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "tokenLocking", "offset": 0, "slot": "5", - "type": "t_contract(ITokenLocking)49221" + "type": "t_contract(ITokenLocking)49039" }, { - "astId": 45259, + "astId": 44911, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "token", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_address" }, { - "astId": 45261, + "astId": 44913, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "totalStakeFraction", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 45263, + "astId": 44915, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "voterRewardFraction", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 45265, + "astId": 44917, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "userMinStakeFraction", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 45267, + "astId": 44919, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "maxVoteFraction", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 45269, + "astId": 44921, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "stakePeriod", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 45271, + "astId": 44923, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "submitPeriod", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 45273, + "astId": 44925, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "revealPeriod", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 45275, + "astId": 44927, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "escalationPeriod", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 45279, + "astId": 44931, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "metatransactionNonces", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 45611, + "astId": 45263, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "motionCount", "offset": 0, @@ -153,15 +153,15 @@ "type": "t_uint256" }, { - "astId": 45616, + "astId": 45268, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "motions", "offset": 0, "slot": "17", - "type": "t_mapping(t_uint256,t_struct(Motion)45609_storage)" + "type": "t_mapping(t_uint256,t_struct(Motion)45261_storage)" }, { - "astId": 45624, + "astId": 45276, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "stakes", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_uint256,t_uint256)))" }, { - "astId": 45630, + "astId": 45282, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "voteSecrets", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_uint256,t_mapping(t_address,t_bytes32))" }, { - "astId": 45634, + "astId": 45286, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "expenditurePastVotes", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 45638, + "astId": 45290, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "expenditureMotionCounts", "offset": 0, @@ -226,27 +226,27 @@ "label": "bytes", "numberOfBytes": "32" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" }, - "t_contract(IColonyNetwork)20072": { + "t_contract(IColonyNetwork)20358": { "encoding": "inplace", "label": "contract IColonyNetwork", "numberOfBytes": "20" }, - "t_contract(ITokenLocking)49221": { + "t_contract(ITokenLocking)49039": { "encoding": "inplace", "label": "contract ITokenLocking", "numberOfBytes": "20" }, - "t_enum(ExtensionState)45248": { + "t_enum(ExtensionState)44900": { "encoding": "inplace", "label": "enum VotingReputationMisaligned.ExtensionState", "numberOfBytes": "1" @@ -293,12 +293,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_mapping(t_uint256,t_uint256))" }, - "t_mapping(t_uint256,t_struct(Motion)45609_storage)": { + "t_mapping(t_uint256,t_struct(Motion)45261_storage)": { "encoding": "mapping", "key": "t_uint256", "label": "mapping(uint256 => struct VotingReputationMisaligned.Motion)", "numberOfBytes": "32", - "value": "t_struct(Motion)45609_storage" + "value": "t_struct(Motion)45261_storage" }, "t_mapping(t_uint256,t_uint256)": { "encoding": "mapping", @@ -307,12 +307,12 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(Motion)45609_storage": { + "t_struct(Motion)45261_storage": { "encoding": "inplace", "label": "struct VotingReputationMisaligned.Motion", "members": [ { - "astId": 45576, + "astId": 45228, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "events", "offset": 0, @@ -320,7 +320,7 @@ "type": "t_array(t_uint64)3_storage" }, { - "astId": 45578, + "astId": 45230, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "rootHash", "offset": 0, @@ -328,7 +328,7 @@ "type": "t_bytes32" }, { - "astId": 45580, + "astId": 45232, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "domainId", "offset": 0, @@ -336,7 +336,7 @@ "type": "t_uint256" }, { - "astId": 45582, + "astId": 45234, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "skillId", "offset": 0, @@ -344,7 +344,7 @@ "type": "t_uint256" }, { - "astId": 45584, + "astId": 45236, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "skillRep", "offset": 0, @@ -352,7 +352,7 @@ "type": "t_uint256" }, { - "astId": 45586, + "astId": 45238, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "repSubmitted", "offset": 0, @@ -360,7 +360,7 @@ "type": "t_uint256" }, { - "astId": 45588, + "astId": 45240, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "paidVoterComp", "offset": 0, @@ -368,7 +368,7 @@ "type": "t_uint256" }, { - "astId": 45592, + "astId": 45244, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "pastVoterComp", "offset": 0, @@ -376,7 +376,7 @@ "type": "t_array(t_uint256)2_storage" }, { - "astId": 45596, + "astId": 45248, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "stakes", "offset": 0, @@ -384,7 +384,7 @@ "type": "t_array(t_uint256)2_storage" }, { - "astId": 45600, + "astId": 45252, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "votes", "offset": 0, @@ -392,7 +392,7 @@ "type": "t_array(t_uint256)2_storage" }, { - "astId": 45602, + "astId": 45254, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "escalated", "offset": 0, @@ -400,7 +400,7 @@ "type": "t_bool" }, { - "astId": 45604, + "astId": 45256, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "finalized", "offset": 1, @@ -408,7 +408,7 @@ "type": "t_bool" }, { - "astId": 45606, + "astId": 45258, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "altTarget", "offset": 2, @@ -416,7 +416,7 @@ "type": "t_address" }, { - "astId": 45608, + "astId": 45260, "contract": "contracts/testHelpers/VotingReputationMisaligned.sol:VotingReputationMisaligned", "label": "action", "offset": 0, diff --git a/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0.json b/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0.json index ac0aa18632..68cd4cfe75 100644 --- a/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0.json +++ b/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 23562, + "astId": 23884, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "metatransactionNonces", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 23590, + "astId": 23912, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder00", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 23592, + "astId": 23914, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder01", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_uint256" }, { - "astId": 23594, + "astId": 23916, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder02", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 23596, + "astId": 23918, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder03", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 23598, + "astId": 23920, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder04", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 23600, + "astId": 23922, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder05", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 23602, + "astId": 23924, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder06", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 23604, + "astId": 23926, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder07", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 23606, + "astId": 23928, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder08", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 23608, + "astId": 23930, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder09", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 23610, + "astId": 23932, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder10", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 23612, + "astId": 23934, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder11", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 23614, + "astId": 23936, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder12", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 23616, + "astId": 23938, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder13", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_uint256" }, { - "astId": 23618, + "astId": 23940, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder14", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_uint256" }, { - "astId": 23620, + "astId": 23942, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder15", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_uint256" }, { - "astId": 23622, + "astId": 23944, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder16", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_uint256" }, { - "astId": 23624, + "astId": 23946, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder17", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_uint256" }, { - "astId": 23626, + "astId": 23948, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder18", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_uint256" }, { - "astId": 23628, + "astId": 23950, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder19", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_uint256" }, { - "astId": 23630, + "astId": 23952, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder20", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_uint256" }, { - "astId": 23632, + "astId": 23954, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder21", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_uint256" }, { - "astId": 23634, + "astId": 23956, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder22", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_uint256" }, { - "astId": 23636, + "astId": 23958, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder23", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_uint256" }, { - "astId": 23638, + "astId": 23960, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder24", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_uint256" }, { - "astId": 23640, + "astId": 23962, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder25", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_uint256" }, { - "astId": 23642, + "astId": 23964, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder26", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_uint256" }, { - "astId": 23644, + "astId": 23966, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder27", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_uint256" }, { - "astId": 23646, + "astId": 23968, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder28", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_uint256" }, { - "astId": 23648, + "astId": 23970, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder29", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_uint256" }, { - "astId": 23650, + "astId": 23972, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder30", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 23652, + "astId": 23974, "contract": "contracts/testHelpers/testExtensions/TestExtension0.sol:TestExtension0", "label": "placeholder31", "offset": 0, @@ -316,12 +316,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1.json b/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1.json index c78936c07b..5ccaecaf45 100644 --- a/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1.json +++ b/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 23562, + "astId": 23884, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "metatransactionNonces", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 23590, + "astId": 23912, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder00", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 23592, + "astId": 23914, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder01", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_uint256" }, { - "astId": 23594, + "astId": 23916, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder02", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 23596, + "astId": 23918, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder03", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 23598, + "astId": 23920, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder04", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 23600, + "astId": 23922, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder05", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 23602, + "astId": 23924, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder06", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 23604, + "astId": 23926, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder07", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 23606, + "astId": 23928, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder08", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 23608, + "astId": 23930, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder09", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 23610, + "astId": 23932, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder10", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 23612, + "astId": 23934, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder11", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 23614, + "astId": 23936, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder12", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 23616, + "astId": 23938, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder13", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_uint256" }, { - "astId": 23618, + "astId": 23940, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder14", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_uint256" }, { - "astId": 23620, + "astId": 23942, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder15", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_uint256" }, { - "astId": 23622, + "astId": 23944, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder16", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_uint256" }, { - "astId": 23624, + "astId": 23946, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder17", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_uint256" }, { - "astId": 23626, + "astId": 23948, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder18", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_uint256" }, { - "astId": 23628, + "astId": 23950, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder19", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_uint256" }, { - "astId": 23630, + "astId": 23952, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder20", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_uint256" }, { - "astId": 23632, + "astId": 23954, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder21", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_uint256" }, { - "astId": 23634, + "astId": 23956, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder22", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_uint256" }, { - "astId": 23636, + "astId": 23958, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder23", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_uint256" }, { - "astId": 23638, + "astId": 23960, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder24", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_uint256" }, { - "astId": 23640, + "astId": 23962, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder25", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_uint256" }, { - "astId": 23642, + "astId": 23964, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder26", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_uint256" }, { - "astId": 23644, + "astId": 23966, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder27", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_uint256" }, { - "astId": 23646, + "astId": 23968, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder28", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_uint256" }, { - "astId": 23648, + "astId": 23970, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder29", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_uint256" }, { - "astId": 23650, + "astId": 23972, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder30", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 23652, + "astId": 23974, "contract": "contracts/testHelpers/testExtensions/TestExtension1.sol:TestExtension1", "label": "placeholder31", "offset": 0, @@ -316,12 +316,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2.json b/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2.json index f3c767b07c..34a254ed0f 100644 --- a/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2.json +++ b/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 23562, + "astId": 23884, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "metatransactionNonces", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 23590, + "astId": 23912, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder00", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 23592, + "astId": 23914, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder01", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_uint256" }, { - "astId": 23594, + "astId": 23916, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder02", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 23596, + "astId": 23918, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder03", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 23598, + "astId": 23920, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder04", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 23600, + "astId": 23922, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder05", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 23602, + "astId": 23924, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder06", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 23604, + "astId": 23926, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder07", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 23606, + "astId": 23928, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder08", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 23608, + "astId": 23930, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder09", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 23610, + "astId": 23932, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder10", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 23612, + "astId": 23934, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder11", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 23614, + "astId": 23936, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder12", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 23616, + "astId": 23938, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder13", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_uint256" }, { - "astId": 23618, + "astId": 23940, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder14", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_uint256" }, { - "astId": 23620, + "astId": 23942, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder15", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_uint256" }, { - "astId": 23622, + "astId": 23944, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder16", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_uint256" }, { - "astId": 23624, + "astId": 23946, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder17", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_uint256" }, { - "astId": 23626, + "astId": 23948, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder18", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_uint256" }, { - "astId": 23628, + "astId": 23950, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder19", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_uint256" }, { - "astId": 23630, + "astId": 23952, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder20", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_uint256" }, { - "astId": 23632, + "astId": 23954, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder21", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_uint256" }, { - "astId": 23634, + "astId": 23956, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder22", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_uint256" }, { - "astId": 23636, + "astId": 23958, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder23", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_uint256" }, { - "astId": 23638, + "astId": 23960, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder24", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_uint256" }, { - "astId": 23640, + "astId": 23962, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder25", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_uint256" }, { - "astId": 23642, + "astId": 23964, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder26", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_uint256" }, { - "astId": 23644, + "astId": 23966, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder27", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_uint256" }, { - "astId": 23646, + "astId": 23968, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder28", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_uint256" }, { - "astId": 23648, + "astId": 23970, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder29", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_uint256" }, { - "astId": 23650, + "astId": 23972, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder30", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 23652, + "astId": 23974, "contract": "contracts/testHelpers/testExtensions/TestExtension2.sol:TestExtension2", "label": "placeholder31", "offset": 0, @@ -316,12 +316,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3.json b/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3.json index 5b61a54053..4018c25d33 100644 --- a/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3.json +++ b/.storage-layouts/contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 23562, + "astId": 23884, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "metatransactionNonces", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 23590, + "astId": 23912, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder00", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 23592, + "astId": 23914, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder01", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_uint256" }, { - "astId": 23594, + "astId": 23916, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder02", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 23596, + "astId": 23918, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder03", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 23598, + "astId": 23920, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder04", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 23600, + "astId": 23922, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder05", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 23602, + "astId": 23924, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder06", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 23604, + "astId": 23926, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder07", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 23606, + "astId": 23928, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder08", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 23608, + "astId": 23930, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder09", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 23610, + "astId": 23932, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder10", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 23612, + "astId": 23934, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder11", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 23614, + "astId": 23936, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder12", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 23616, + "astId": 23938, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder13", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_uint256" }, { - "astId": 23618, + "astId": 23940, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder14", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_uint256" }, { - "astId": 23620, + "astId": 23942, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder15", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_uint256" }, { - "astId": 23622, + "astId": 23944, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder16", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_uint256" }, { - "astId": 23624, + "astId": 23946, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder17", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_uint256" }, { - "astId": 23626, + "astId": 23948, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder18", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_uint256" }, { - "astId": 23628, + "astId": 23950, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder19", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_uint256" }, { - "astId": 23630, + "astId": 23952, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder20", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_uint256" }, { - "astId": 23632, + "astId": 23954, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder21", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_uint256" }, { - "astId": 23634, + "astId": 23956, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder22", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_uint256" }, { - "astId": 23636, + "astId": 23958, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder23", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_uint256" }, { - "astId": 23638, + "astId": 23960, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder24", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_uint256" }, { - "astId": 23640, + "astId": 23962, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder25", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_uint256" }, { - "astId": 23642, + "astId": 23964, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder26", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_uint256" }, { - "astId": 23644, + "astId": 23966, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder27", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_uint256" }, { - "astId": 23646, + "astId": 23968, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder28", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_uint256" }, { - "astId": 23648, + "astId": 23970, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder29", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_uint256" }, { - "astId": 23650, + "astId": 23972, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder30", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 23652, + "astId": 23974, "contract": "contracts/testHelpers/testExtensions/TestExtension3.sol:TestExtension3", "label": "placeholder31", "offset": 0, @@ -316,12 +316,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken.json b/.storage-layouts/contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken.json index 10b4177897..17164581a1 100644 --- a/.storage-layouts/contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken.json +++ b/.storage-layouts/contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 23397, + "astId": 23653, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "resolver", "offset": 0, @@ -25,15 +25,15 @@ "type": "t_address" }, { - "astId": 23400, + "astId": 23656, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "colony", "offset": 0, "slot": "3", - "type": "t_contract(IColony)12697" + "type": "t_contract(IColony)13756" }, { - "astId": 23402, + "astId": 23658, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "deprecated", "offset": 20, @@ -41,7 +41,7 @@ "type": "t_bool" }, { - "astId": 23562, + "astId": 23884, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "metatransactionNonces", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 23590, + "astId": 23912, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder00", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_uint256" }, { - "astId": 23592, + "astId": 23914, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder01", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_uint256" }, { - "astId": 23594, + "astId": 23916, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder02", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_uint256" }, { - "astId": 23596, + "astId": 23918, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder03", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_uint256" }, { - "astId": 23598, + "astId": 23920, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder04", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_uint256" }, { - "astId": 23600, + "astId": 23922, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder05", "offset": 0, @@ -97,7 +97,7 @@ "type": "t_uint256" }, { - "astId": 23602, + "astId": 23924, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder06", "offset": 0, @@ -105,7 +105,7 @@ "type": "t_uint256" }, { - "astId": 23604, + "astId": 23926, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder07", "offset": 0, @@ -113,7 +113,7 @@ "type": "t_uint256" }, { - "astId": 23606, + "astId": 23928, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder08", "offset": 0, @@ -121,7 +121,7 @@ "type": "t_uint256" }, { - "astId": 23608, + "astId": 23930, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder09", "offset": 0, @@ -129,7 +129,7 @@ "type": "t_uint256" }, { - "astId": 23610, + "astId": 23932, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder10", "offset": 0, @@ -137,7 +137,7 @@ "type": "t_uint256" }, { - "astId": 23612, + "astId": 23934, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder11", "offset": 0, @@ -145,7 +145,7 @@ "type": "t_uint256" }, { - "astId": 23614, + "astId": 23936, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder12", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_uint256" }, { - "astId": 23616, + "astId": 23938, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder13", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_uint256" }, { - "astId": 23618, + "astId": 23940, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder14", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_uint256" }, { - "astId": 23620, + "astId": 23942, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder15", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_uint256" }, { - "astId": 23622, + "astId": 23944, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder16", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_uint256" }, { - "astId": 23624, + "astId": 23946, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder17", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_uint256" }, { - "astId": 23626, + "astId": 23948, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder18", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_uint256" }, { - "astId": 23628, + "astId": 23950, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder19", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_uint256" }, { - "astId": 23630, + "astId": 23952, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder20", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_uint256" }, { - "astId": 23632, + "astId": 23954, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder21", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_uint256" }, { - "astId": 23634, + "astId": 23956, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder22", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_uint256" }, { - "astId": 23636, + "astId": 23958, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder23", "offset": 0, @@ -241,7 +241,7 @@ "type": "t_uint256" }, { - "astId": 23638, + "astId": 23960, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder24", "offset": 0, @@ -249,7 +249,7 @@ "type": "t_uint256" }, { - "astId": 23640, + "astId": 23962, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder25", "offset": 0, @@ -257,7 +257,7 @@ "type": "t_uint256" }, { - "astId": 23642, + "astId": 23964, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder26", "offset": 0, @@ -265,7 +265,7 @@ "type": "t_uint256" }, { - "astId": 23644, + "astId": 23966, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder27", "offset": 0, @@ -273,7 +273,7 @@ "type": "t_uint256" }, { - "astId": 23646, + "astId": 23968, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder28", "offset": 0, @@ -281,7 +281,7 @@ "type": "t_uint256" }, { - "astId": 23648, + "astId": 23970, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder29", "offset": 0, @@ -289,7 +289,7 @@ "type": "t_uint256" }, { - "astId": 23650, + "astId": 23972, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder30", "offset": 0, @@ -297,7 +297,7 @@ "type": "t_uint256" }, { - "astId": 23652, + "astId": 23974, "contract": "contracts/testHelpers/testExtensions/TestVotingToken.sol:TestVotingToken", "label": "placeholder31", "offset": 0, @@ -316,12 +316,12 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" }, - "t_contract(IColony)12697": { + "t_contract(IColony)13756": { "encoding": "inplace", "label": "contract IColony", "numberOfBytes": "20" diff --git a/.storage-layouts/contracts/tokenLocking/TokenLocking.sol:TokenLocking.json b/.storage-layouts/contracts/tokenLocking/TokenLocking.sol:TokenLocking.json index 3a6f973d05..82bc5382b9 100644 --- a/.storage-layouts/contracts/tokenLocking/TokenLocking.sol:TokenLocking.json +++ b/.storage-layouts/contracts/tokenLocking/TokenLocking.sol:TokenLocking.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/tokenLocking/TokenLocking.sol:TokenLocking", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/tokenLocking/TokenLocking.sol:TokenLocking", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 50276, + "astId": 50094, "contract": "contracts/tokenLocking/TokenLocking.sol:TokenLocking", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 50278, + "astId": 50096, "contract": "contracts/tokenLocking/TokenLocking.sol:TokenLocking", "label": "colonyNetwork", "offset": 0, @@ -33,15 +33,15 @@ "type": "t_address" }, { - "astId": 50285, + "astId": 50103, "contract": "contracts/tokenLocking/TokenLocking.sol:TokenLocking", "label": "userLocks", "offset": 0, "slot": "4", - "type": "t_mapping(t_address,t_mapping(t_address,t_struct(Lock)50262_storage))" + "type": "t_mapping(t_address,t_mapping(t_address,t_struct(Lock)50080_storage))" }, { - "astId": 50289, + "astId": 50107, "contract": "contracts/tokenLocking/TokenLocking.sol:TokenLocking", "label": "totalLockCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 50297, + "astId": 50115, "contract": "contracts/tokenLocking/TokenLocking.sol:TokenLocking", "label": "approvals", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_address,t_uint256)))" }, { - "astId": 50305, + "astId": 50123, "contract": "contracts/tokenLocking/TokenLocking.sol:TokenLocking", "label": "obligations", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_address,t_uint256)))" }, { - "astId": 50311, + "astId": 50129, "contract": "contracts/tokenLocking/TokenLocking.sol:TokenLocking", "label": "totalObligations", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))" }, { - "astId": 50317, + "astId": 50135, "contract": "contracts/tokenLocking/TokenLocking.sol:TokenLocking", "label": "lockers", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_address))" }, { - "astId": 50321, + "astId": 50139, "contract": "contracts/tokenLocking/TokenLocking.sol:TokenLocking", "label": "metatransactionNonces", "offset": 0, @@ -95,7 +95,7 @@ "label": "address", "numberOfBytes": "20" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" @@ -107,12 +107,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_mapping(t_address,t_uint256))" }, - "t_mapping(t_address,t_mapping(t_address,t_struct(Lock)50262_storage))": { + "t_mapping(t_address,t_mapping(t_address,t_struct(Lock)50080_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(address => struct TokenLockingDataTypes.Lock))", "numberOfBytes": "32", - "value": "t_mapping(t_address,t_struct(Lock)50262_storage)" + "value": "t_mapping(t_address,t_struct(Lock)50080_storage)" }, "t_mapping(t_address,t_mapping(t_address,t_uint256))": { "encoding": "mapping", @@ -128,12 +128,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_address)" }, - "t_mapping(t_address,t_struct(Lock)50262_storage)": { + "t_mapping(t_address,t_struct(Lock)50080_storage)": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => struct TokenLockingDataTypes.Lock)", "numberOfBytes": "32", - "value": "t_struct(Lock)50262_storage" + "value": "t_struct(Lock)50080_storage" }, "t_mapping(t_address,t_uint256)": { "encoding": "mapping", @@ -149,12 +149,12 @@ "numberOfBytes": "32", "value": "t_address" }, - "t_struct(Lock)50262_storage": { + "t_struct(Lock)50080_storage": { "encoding": "inplace", "label": "struct TokenLockingDataTypes.Lock", "members": [ { - "astId": 50255, + "astId": 50073, "contract": "contracts/tokenLocking/TokenLocking.sol:TokenLocking", "label": "lockCount", "offset": 0, @@ -162,7 +162,7 @@ "type": "t_uint256" }, { - "astId": 50257, + "astId": 50075, "contract": "contracts/tokenLocking/TokenLocking.sol:TokenLocking", "label": "balance", "offset": 0, @@ -170,7 +170,7 @@ "type": "t_uint256" }, { - "astId": 50259, + "astId": 50077, "contract": "contracts/tokenLocking/TokenLocking.sol:TokenLocking", "label": "DEPRECATED_timestamp", "offset": 0, @@ -178,7 +178,7 @@ "type": "t_uint256" }, { - "astId": 50261, + "astId": 50079, "contract": "contracts/tokenLocking/TokenLocking.sol:TokenLocking", "label": "pendingBalance", "offset": 0, diff --git a/.storage-layouts/contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage.json b/.storage-layouts/contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage.json index 0b4bc7bd0a..582ac48c1d 100644 --- a/.storage-layouts/contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage.json +++ b/.storage-layouts/contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage.json @@ -1,15 +1,15 @@ { "storage": [ { - "astId": 50657, + "astId": 50475, "contract": "contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage", "label": "authority", "offset": 0, "slot": "0", - "type": "t_contract(DSAuthority)50643" + "type": "t_contract(DSAuthority)50461" }, { - "astId": 50659, + "astId": 50477, "contract": "contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage", "label": "owner", "offset": 0, @@ -17,7 +17,7 @@ "type": "t_address" }, { - "astId": 50276, + "astId": 50094, "contract": "contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage", "label": "resolver", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_address" }, { - "astId": 50278, + "astId": 50096, "contract": "contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage", "label": "colonyNetwork", "offset": 0, @@ -33,15 +33,15 @@ "type": "t_address" }, { - "astId": 50285, + "astId": 50103, "contract": "contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage", "label": "userLocks", "offset": 0, "slot": "4", - "type": "t_mapping(t_address,t_mapping(t_address,t_struct(Lock)50262_storage))" + "type": "t_mapping(t_address,t_mapping(t_address,t_struct(Lock)50080_storage))" }, { - "astId": 50289, + "astId": 50107, "contract": "contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage", "label": "totalLockCount", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 50297, + "astId": 50115, "contract": "contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage", "label": "approvals", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_address,t_uint256)))" }, { - "astId": 50305, + "astId": 50123, "contract": "contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage", "label": "obligations", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_address,t_uint256)))" }, { - "astId": 50311, + "astId": 50129, "contract": "contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage", "label": "totalObligations", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))" }, { - "astId": 50317, + "astId": 50135, "contract": "contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage", "label": "lockers", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_address))" }, { - "astId": 50321, + "astId": 50139, "contract": "contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage", "label": "metatransactionNonces", "offset": 0, @@ -95,7 +95,7 @@ "label": "address", "numberOfBytes": "20" }, - "t_contract(DSAuthority)50643": { + "t_contract(DSAuthority)50461": { "encoding": "inplace", "label": "contract DSAuthority", "numberOfBytes": "20" @@ -107,12 +107,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_address,t_mapping(t_address,t_uint256))" }, - "t_mapping(t_address,t_mapping(t_address,t_struct(Lock)50262_storage))": { + "t_mapping(t_address,t_mapping(t_address,t_struct(Lock)50080_storage))": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => mapping(address => struct TokenLockingDataTypes.Lock))", "numberOfBytes": "32", - "value": "t_mapping(t_address,t_struct(Lock)50262_storage)" + "value": "t_mapping(t_address,t_struct(Lock)50080_storage)" }, "t_mapping(t_address,t_mapping(t_address,t_uint256))": { "encoding": "mapping", @@ -128,12 +128,12 @@ "numberOfBytes": "32", "value": "t_mapping(t_uint256,t_address)" }, - "t_mapping(t_address,t_struct(Lock)50262_storage)": { + "t_mapping(t_address,t_struct(Lock)50080_storage)": { "encoding": "mapping", "key": "t_address", "label": "mapping(address => struct TokenLockingDataTypes.Lock)", "numberOfBytes": "32", - "value": "t_struct(Lock)50262_storage" + "value": "t_struct(Lock)50080_storage" }, "t_mapping(t_address,t_uint256)": { "encoding": "mapping", @@ -149,12 +149,12 @@ "numberOfBytes": "32", "value": "t_address" }, - "t_struct(Lock)50262_storage": { + "t_struct(Lock)50080_storage": { "encoding": "inplace", "label": "struct TokenLockingDataTypes.Lock", "members": [ { - "astId": 50255, + "astId": 50073, "contract": "contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage", "label": "lockCount", "offset": 0, @@ -162,7 +162,7 @@ "type": "t_uint256" }, { - "astId": 50257, + "astId": 50075, "contract": "contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage", "label": "balance", "offset": 0, @@ -170,7 +170,7 @@ "type": "t_uint256" }, { - "astId": 50259, + "astId": 50077, "contract": "contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage", "label": "DEPRECATED_timestamp", "offset": 0, @@ -178,7 +178,7 @@ "type": "t_uint256" }, { - "astId": 50261, + "astId": 50079, "contract": "contracts/tokenLocking/TokenLockingStorage.sol:TokenLockingStorage", "label": "pendingBalance", "offset": 0,