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

fix(guild-kick): member is jailed during the kick process #524

Merged
merged 10 commits into from
Mar 17, 2022

Conversation

adridadou
Copy link
Member

@adridadou adridadou commented Mar 15, 2022

Proposed Changes

  • A member is put in jail if his address is part of a guild kick proposal.
  • The member is allowed to interact with the DAO, and can even ragequit (totally or partially), but the funds can not be moved while the member is in jail.
  • Member is not allowed to move ERC721 or ERC1155 tokens while in jail, but can withdraw the tokens if he/she is the owner.

@adridadou adridadou requested a review from fforbeck March 15, 2022 15:06
@codecov
Copy link

codecov bot commented Mar 15, 2022

Codecov Report

Merging #524 (dcff9da) into master (340856f) will increase coverage by 0.07%.
The diff coverage is 93.75%.

@@            Coverage Diff             @@
##           master     #524      +/-   ##
==========================================
+ Coverage   84.38%   84.45%   +0.07%     
==========================================
  Files          52       52              
  Lines        1857     1859       +2     
  Branches      433      442       +9     
==========================================
+ Hits         1567     1570       +3     
+ Misses        290      289       -1     
Impacted Files Coverage Δ
...ntracts/adapters/voting/KickBadReporterAdapter.sol 0.00% <0.00%> (ø)
contracts/adapters/voting/OffchainVoting.sol 41.25% <0.00%> (ø)
contracts/adapters/ERC1155Adapter.sol 100.00% <100.00%> (ø)
contracts/adapters/GuildKick.sol 95.65% <100.00%> (ø)
contracts/adapters/Ragequit.sol 100.00% <100.00%> (ø)
contracts/core/DaoRegistry.sol 87.70% <100.00%> (+0.84%) ⬆️
contracts/extensions/bank/Bank.sol 80.85% <100.00%> (+0.27%) ⬆️
...racts/extensions/erc1155/ERC1155TokenExtension.sol 97.26% <100.00%> (+0.03%) ⬆️
contracts/extensions/nft/NFT.sol 100.00% <100.00%> (ø)
contracts/helpers/DaoHelper.sol 93.93% <100.00%> (+3.03%) ⬆️
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 340856f...dcff9da. Read the comment docs.

contracts/core/DaoRegistry.sol Show resolved Hide resolved
contracts/core/DaoRegistry.sol Show resolved Hide resolved
contracts/adapters/ERC1155Adapter.sol Outdated Show resolved Hide resolved
@adridadou adridadou marked this pull request as ready for review March 16, 2022 12:53
@fforbeck fforbeck added the fix important fix label Mar 16, 2022
@fforbeck fforbeck changed the title jail member so it cannot move any tokens while being guild kick fix(guild-kick): member is jailed during the kick process, but still can interact with the dao Mar 16, 2022
@fforbeck fforbeck changed the title fix(guild-kick): member is jailed during the kick process, but still can interact with the dao fix(guild-kick): member is jailed during the kick process, but can not move tokens Mar 16, 2022
@fforbeck fforbeck changed the title fix(guild-kick): member is jailed during the kick process, but can not move tokens fix(guild-kick): member is jailed during the kick process Mar 17, 2022
Signed-off-by: Felipe Forbeck <felipe.forbeck@gmail.com>
@fforbeck fforbeck merged commit 8e8e9aa into master Mar 17, 2022
@fforbeck fforbeck deleted the fix-guildkick-nth branch March 17, 2022 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fix important fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants