Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow funds to be sent directly to domains #1291

Draft
wants to merge 13 commits into
base: develop
Choose a base branch
from
+1,076 −23
Draft

Allow funds to be sent directly to domains #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d133bc4
Allow funds to be sent directly to domains
area Sep 11, 2024
1d3c1c0
Respect reward pots for domain-level claims; add event
area Sep 16, 2024
97ed61b
Remove overly cautious checks in claimDomainFunds
area Sep 26, 2024
0096444
Rename deployCreateXIfNeeded
area Sep 26, 2024
2f6016c
Root has to allow domains to receive reputation-earning tokens
area Oct 11, 2024
1d6c15e
Update storage layouts for root permitting reputation token receipt i…
area Oct 14, 2024
344190a
Improve test coverage for ColonyFunding.sol
area Oct 14, 2024
6e6baeb
Improve logic around funding domains with tokens
area Oct 14, 2024
7adea8c
Set up storage for direct domain funding in anticipation of proxy col…
area Oct 21, 2024
1aaf273
Directly fund domains review changes
area Oct 23, 2024
ebcf2e8
Set colonyAddress for receiver on deployment once only
area Oct 24, 2024
ec26251
Receiving reputation-earning tokens is denominated in reputation, not…
area Oct 24, 2024
1294782
More efficiently award address native tokens in tests
area Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .storage-layouts-normalized/contracts/colony/Colony.sol:Colony.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,6 +1409,27 @@
"numberOfBytes": "32"
}
}
},
{
"contract": "contracts/colony/Colony.sol:Colony",
"label": "domainReputationApproval",
"offset": 0,
"slot": "39",
"type": {
"encoding": "mapping",
"key": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
},
"label": "mapping(uint256 => uint256)",
"numberOfBytes": "32",
"value": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
}
}
}
]
}
21 changes: 21 additions & 0 deletions ...ormalized/contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,6 +1409,27 @@
"numberOfBytes": "32"
}
}
},
{
"contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction",
"label": "domainReputationApproval",
"offset": 0,
"slot": "39",
"type": {
"encoding": "mapping",
"key": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
},
"label": "mapping(uint256 => uint256)",
"numberOfBytes": "32",
"value": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
}
}
}
]
}
21 changes: 21 additions & 0 deletions .storage-layouts-normalized/contracts/colony/ColonyDomains.sol:ColonyDomains.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,6 +1409,27 @@
"numberOfBytes": "32"
}
}
},
{
"contract": "contracts/colony/ColonyDomains.sol:ColonyDomains",
"label": "domainReputationApproval",
"offset": 0,
"slot": "39",
"type": {
"encoding": "mapping",
"key": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
},
"label": "mapping(uint256 => uint256)",
"numberOfBytes": "32",
"value": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
}
}
}
]
}
21 changes: 21 additions & 0 deletions .storage-layouts-normalized/contracts/colony/ColonyExpenditure.sol:ColonyExpenditure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,6 +1409,27 @@
"numberOfBytes": "32"
}
}
},
{
"contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure",
"label": "domainReputationApproval",
"offset": 0,
"slot": "39",
"type": {
"encoding": "mapping",
"key": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
},
"label": "mapping(uint256 => uint256)",
"numberOfBytes": "32",
"value": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
}
}
}
]
}
21 changes: 21 additions & 0 deletions .storage-layouts-normalized/contracts/colony/ColonyFunding.sol:ColonyFunding.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,6 +1409,27 @@
"numberOfBytes": "32"
}
}
},
{
"contract": "contracts/colony/ColonyFunding.sol:ColonyFunding",
"label": "domainReputationApproval",
"offset": 0,
"slot": "39",
"type": {
"encoding": "mapping",
"key": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
},
"label": "mapping(uint256 => uint256)",
"numberOfBytes": "32",
"value": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
}
}
}
]
}
21 changes: 21 additions & 0 deletions .storage-layouts-normalized/contracts/colony/ColonyRewards.sol:ColonyRewards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,6 +1409,27 @@
"numberOfBytes": "32"
}
}
},
{
"contract": "contracts/colony/ColonyRewards.sol:ColonyRewards",
"label": "domainReputationApproval",
"offset": 0,
"slot": "39",
"type": {
"encoding": "mapping",
"key": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
},
"label": "mapping(uint256 => uint256)",
"numberOfBytes": "32",
"value": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
}
}
}
]
}
21 changes: 21 additions & 0 deletions .storage-layouts-normalized/contracts/colony/ColonyRoles.sol:ColonyRoles.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,6 +1409,27 @@
"numberOfBytes": "32"
}
}
},
{
"contract": "contracts/colony/ColonyRoles.sol:ColonyRoles",
"label": "domainReputationApproval",
"offset": 0,
"slot": "39",
"type": {
"encoding": "mapping",
"key": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
},
"label": "mapping(uint256 => uint256)",
"numberOfBytes": "32",
"value": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
}
}
}
]
}
21 changes: 21 additions & 0 deletions .storage-layouts-normalized/contracts/colony/ColonyStorage.sol:ColonyStorage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,6 +1409,27 @@
"numberOfBytes": "32"
}
}
},
{
"contract": "contracts/colony/ColonyStorage.sol:ColonyStorage",
"label": "domainReputationApproval",
"offset": 0,
"slot": "39",
"type": {
"encoding": "mapping",
"key": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
},
"label": "mapping(uint256 => uint256)",
"numberOfBytes": "32",
"value": {
"encoding": "inplace",
"label": "uint256",
"numberOfBytes": "32"
}
}
}
]
}
11 changes: 11 additions & 0 deletions .storage-layouts-normalized/contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,17 @@
}
}
}
},
{
"contract": "contracts/colonyNetwork/ColonyNetwork.sol:ColonyNetwork",
"label": "domainReceiverResolverAddress",
"offset": 0,
"slot": "50",
"type": {
"encoding": "inplace",
"label": "address",
"numberOfBytes": "20"
}
}
]
}
11 changes: 11 additions & 0 deletions ...uts-normalized/contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,17 @@
}
}
}
},
{
"contract": "contracts/colonyNetwork/ColonyNetworkAuction.sol:ColonyNetworkAuction",
"label": "domainReceiverResolverAddress",
"offset": 0,
"slot": "50",
"type": {
"encoding": "inplace",
"label": "address",
"numberOfBytes": "20"
}
}
]
}
11 changes: 11 additions & 0 deletions ...s-normalized/contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,17 @@
}
}
}
},
{
"contract": "contracts/colonyNetwork/ColonyNetworkDeployer.sol:ColonyNetworkDeployer",
"label": "domainReceiverResolverAddress",
"offset": 0,
"slot": "50",
"type": {
"encoding": "inplace",
"label": "address",
"numberOfBytes": "20"
}
}
]
}
11 changes: 11 additions & 0 deletions ...age-layouts-normalized/contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,17 @@
}
}
}
},
{
"contract": "contracts/colonyNetwork/ColonyNetworkENS.sol:ColonyNetworkENS",
"label": "domainReceiverResolverAddress",
"offset": 0,
"slot": "50",
"type": {
"encoding": "inplace",
"label": "address",
"numberOfBytes": "20"
}
}
]
}
11 changes: 11 additions & 0 deletions ...rmalized/contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,17 @@
}
}
}
},
{
"contract": "contracts/colonyNetwork/ColonyNetworkExtensions.sol:ColonyNetworkExtensions",
"label": "domainReceiverResolverAddress",
"offset": 0,
"slot": "50",
"type": {
"encoding": "inplace",
"label": "address",
"numberOfBytes": "20"
}
}
]
}
11 changes: 11 additions & 0 deletions ...youts-normalized/contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,17 @@
}
}
}
},
{
"contract": "contracts/colonyNetwork/ColonyNetworkMining.sol:ColonyNetworkMining",
"label": "domainReceiverResolverAddress",
"offset": 0,
"slot": "50",
"type": {
"encoding": "inplace",
"label": "address",
"numberOfBytes": "20"
}
}
]
}
11 changes: 11 additions & 0 deletions ...youts-normalized/contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,17 @@
}
}
}
},
{
"contract": "contracts/colonyNetwork/ColonyNetworkSkills.sol:ColonyNetworkSkills",
"label": "domainReceiverResolverAddress",
"offset": 0,
"slot": "50",
"type": {
"encoding": "inplace",
"label": "address",
"numberOfBytes": "20"
}
}
]
}
11 changes: 11 additions & 0 deletions ...uts-normalized/contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,17 @@
}
}
}
},
{
"contract": "contracts/colonyNetwork/ColonyNetworkStorage.sol:ColonyNetworkStorage",
"label": "domainReceiverResolverAddress",
"offset": 0,
"slot": "50",
"type": {
"encoding": "inplace",
"label": "address",
"numberOfBytes": "20"
}
}
]
}
Loading