Skip to content

Allow funds to be sent directly to domains #1291

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

Draft
area wants to merge 18 commits into
base: develop
Choose a base branch
from
Draft

Allow funds to be sent directly to domains #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
764c8ff
Allow funds to be sent directly to domains
area Sep 11, 2024
bb6a0c7
Respect reward pots for domain-level claims; add event
area Sep 16, 2024
67700a6
Remove overly cautious checks in claimDomainFunds
area Sep 26, 2024
74dbc46
Rename deployCreateXIfNeeded
area Sep 26, 2024
195fc75
Root has to allow domains to receive reputation-earning tokens
area Oct 11, 2024
47ef94e
Update storage layouts for root permitting reputation token receipt i…
area Oct 14, 2024
d4fc398
Improve test coverage for ColonyFunding.sol
area Oct 14, 2024
36611e0
Improve logic around funding domains with tokens
area Oct 14, 2024
d85e956
Set up storage for direct domain funding in anticipation of proxy col…
area Oct 21, 2024
1ac0448
Directly fund domains review changes
area Oct 23, 2024
c84351e
Set colonyAddress for receiver on deployment once only
area Oct 24, 2024
6cc7c52
Receiving reputation-earning tokens is denominated in reputation, not…
area Oct 24, 2024
9cb10b6
More efficiently award address native tokens in tests
area Oct 24, 2024
b443984
Prevent direct calls of transferToColony
area Dec 5, 2024
f846233
Allow directly sending to domains to work with locked tokens
area Dec 5, 2024
df00028
Improvements following review
area Dec 18, 2024
3a007ea
Bump colony version
area Jan 27, 2025
15ee053
Some polishing
area Jan 27, 2025
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