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

Token & Hybrid Voting #915

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Token & Hybrid Voting #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ce4966
Create VotingBase, VotingHybrid, VotingReputation2
kronosapiens Dec 22, 2020
b905d04
Optimize contract length
kronosapiens Oct 20, 2021
ad34b0c
Update smoke tests
kronosapiens Nov 1, 2021
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
4 changes: 1 addition & 3 deletions contracts/colony/ColonyFunding.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,7 @@ contract ColonyFunding is ColonyStorage, PatriciaTreeProofs { // ignore-swc-123
function startNextRewardPayout(address _token, bytes memory key, bytes memory value, uint256 branchMask, bytes32[] memory siblings)
public stoppable auth
{
ITokenLocking tokenLocking = ITokenLocking(tokenLockingAddress);
uint256 totalLockCount = tokenLocking.lockToken(token);
uint256 totalLockCount = ITokenLocking(tokenLockingAddress).lockToken(token);
uint256 thisPayoutAmount = sub(fundingPots[0].balance[_token], pendingRewardPayments[_token]);
require(thisPayoutAmount > 0, "colony-reward-payout-no-rewards");
pendingRewardPayments[_token] = add(pendingRewardPayments[_token], thisPayoutAmount);
Expand Down Expand Up @@ -444,7 +443,6 @@ contract ColonyFunding is ColonyStorage, PatriciaTreeProofs { // ignore-swc-123

require(mul(squareRoots[4], squareRoots[4]) <= numerator, "colony-reward-payout-invalid-parameter-numerator");
require(mul(squareRoots[5], squareRoots[5]) >= denominator, "colony-reward-payout-invalid-parameter-denominator");

uint256 reward = (mul(squareRoots[4], squareRoots[6]) / squareRoots[5]) ** 2;

return (payout.tokenAddress, reward);
Expand Down
Loading