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.

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

Remove Tasks and Payments #1150

Merged
merged 20 commits into from
Oct 30, 2023
Merged

Remove Tasks and Payments #1150

merged 20 commits into from
Oct 30, 2023

Conversation

kronosapiens
Copy link
Member

@kronosapiens kronosapiens commented Jul 24, 2023

Closes #1126

Removes Tasks and Payments from the core contracts. Specifically:

  • Deletes ColonyTask.sol and ColonyPayments.sol and removes all references to them from the rest of the contracts
  • View functions remain, as does the ability to remove funds from existing Tasks and Payments
  • Migrates the test suite away from Tasks and towards Expenditures as a way of giving out tokens and reputations
  • For the reputation tests, migrates to direct reputation rewards and penalties

For simplicity, the tests have been left otherwise untouched, meaning that we still give out reputation in the same way as we did when we used Tasks (i.e. three recipients, penalties, etc).

A bit unrelated, but this PR also does the following:

  • Updates the OneTxPayment extension to set the globalClaimDelay to 0

@kronosapiens kronosapiens force-pushed the maint/the-culling branch 3 times, most recently from 26a30ad to 8637e58 Compare July 24, 2023 15:56
@kronosapiens kronosapiens force-pushed the maint/the-culling branch 3 times, most recently from 5ff9065 to 72675f5 Compare August 7, 2023 11:42
@kronosapiens kronosapiens force-pushed the maint/the-culling branch 12 times, most recently from dd94d84 to 8765f25 Compare August 14, 2023 12:27
contracts/colony/ColonyDataTypes.sol Outdated Show resolved Hide resolved
helpers/test-data-generator.js Outdated Show resolved Hide resolved
test/contracts-network/meta-colony.js Show resolved Hide resolved
contracts/colony/ColonyFunding.sol Outdated Show resolved Hide resolved
test/extensions/voting-rep.js Show resolved Hide resolved
@kronosapiens kronosapiens force-pushed the maint/the-culling branch 3 times, most recently from b844200 to 81cbc51 Compare August 29, 2023 16:54
@area
Copy link
Member

area commented Sep 7, 2023

Out of a meeting I've just had with Arren/Jack: OneTxPayment should work even if there is a non-zero global claim delay for expenditures.

Copy link
Member

@area area left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think of, in finishUpgrade of OneTxPayment:

  • Check if we (the extension) has root permission in the colony.
  • If not, no further actions and return
  • If it does, award itself arbitration permission in root domain

This obviously doesn't capture all scenarios, but will mean that the front-end team don't have to worry about handling the adding of the permission on upgrade, based on how the extension is currently used.

@kronosapiens
Copy link
Member Author

@area works for me. Do you want me to add it or you?

@area
Copy link
Member

area commented Oct 30, 2023

What do you think of, in finishUpgrade of OneTxPayment:

* Check if we (the extension) has root permission in the colony.

* If not, no further actions and return

* If it does, award itself arbitration permission in root domain

This obviously doesn't capture all scenarios, but will mean that the front-end team don't have to worry about handling the adding of the permission on upgrade, based on how the extension is currently used.

This doesn't actually work, OneTxPayment is only awarded Funding and Administration currently, so I'll remove the commit.

@area area force-pushed the maint/the-culling branch from 34afb91 to 03ea933 Compare October 30, 2023 08:24
@area area force-pushed the maint/the-culling branch from 03ea933 to 9775819 Compare October 30, 2023 10:39
@kronosapiens kronosapiens merged commit 93b9573 into develop Oct 30, 2023
2 checks passed
@kronosapiens kronosapiens deleted the maint/the-culling branch October 30, 2023 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Check (and fix) interaction between One Tx Payment extension and a non-zero global claim delay
2 participants