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

[N06] Not declaring uint as uint256 (fix) #593

Merged
merged 5 commits into from Jul 1, 2020
Merged

[N06] Not declaring uint as uint256 (fix) #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
026678d
Fix "Not declaring uint as uint256"
dmanjunath Jul 1, 2020
4d1cedf
Lint
dmanjunath Jul 1, 2020
68928ce
Better lint
dmanjunath Jul 1, 2020
00a77a7
Merge branch 'mainnet-audit-feedback' of github.com:AudiusProject/aud…
dmanjunath Jul 1, 2020
5c9f864
Merge branch 'mainnet-audit-feedback' of github.com:AudiusProject/aud…
dmanjunath Jul 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
62 changes: 31 additions & 31 deletions eth-contracts/contracts/ClaimsManager.sol
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@ contract ClaimsManager is InitializableV2 {
* Avg block time - 13s
* 604800 / 13 = 46523.0769231 blocks
*/
uint private fundingRoundBlockDiff;
uint256 private fundingRoundBlockDiff;

/**
* @notice - Configures the current funding amount per round
Expand All @@ -36,10 +36,10 @@ contract ClaimsManager is InitializableV2 {
* @dev - Past a certain block height, this schedule will be updated
* - Logic determining schedule will be sourced from an external contract
*/
uint private fundingAmount;
uint256 private fundingAmount;

// Denotes current round
uint private roundNumber;
uint256 private roundNumber;

// Staking contract ref
ERC20Mintable private audiusToken;
Expand All @@ -49,29 +49,29 @@ contract ClaimsManager is InitializableV2 {
// 2) Total funded for this round
// 3) Total claimed in round
struct Round {
uint fundBlock;
uint fundingAmount;
uint totalClaimedInRound;
uint256 fundBlock;
uint256 fundingAmount;
uint256 totalClaimedInRound;
}

// Current round information
Round private currentRound;

event RoundInitiated(
uint indexed _blockNumber,
uint indexed _roundNumber,
uint indexed _fundAmount
uint256 indexed _blockNumber,
uint256 indexed _roundNumber,
uint256 indexed _fundAmount
);

event ClaimProcessed(
address indexed _claimer,
uint indexed _rewards,
uint _oldTotal,
uint indexed _newTotal
uint256 indexed _rewards,
uint256 _oldTotal,
uint256 indexed _newTotal
);

event FundingAmountUpdated(uint indexed _amount);
event FundingRoundBlockDiffUpdated(uint indexed _blockDifference);
event FundingAmountUpdated(uint256 indexed _amount);
event FundingRoundBlockDiffUpdated(uint256 indexed _blockDifference);
event GovernanceAddressUpdated(address indexed _newGovernanceAddress);
event StakingAddressUpdated(address indexed _newStakingAddress);
event ServiceProviderFactoryAddressUpdated(address indexed _newServiceProviderFactoryAddress);
Expand Down Expand Up @@ -108,31 +108,31 @@ contract ClaimsManager is InitializableV2 {
}

/// @notice Get the duration of a funding round in blocks
function getFundingRoundBlockDiff() external view returns (uint blockDiff)
function getFundingRoundBlockDiff() external view returns (uint256 blockDiff)
{
_requireIsInitialized();

return fundingRoundBlockDiff;
}

/// @notice Get the last block where a funding round was initiated
function getLastFundBlock() external view returns (uint lastFundBlock)
function getLastFundBlock() external view returns (uint256 lastFundBlock)
{
_requireIsInitialized();

return currentRound.fundBlock;
}

/// @notice Get the amount funded per round in wei
function getFundsPerRound() external view returns (uint amount)
function getFundsPerRound() external view returns (uint256 amount)
{
_requireIsInitialized();

return fundingAmount;
}

/// @notice Get the total amount claimed in the current round
function getTotalClaimedInRound() external view returns (uint claimedAmount)
function getTotalClaimedInRound() external view returns (uint256 claimedAmount)
{
_requireIsInitialized();

Expand Down Expand Up @@ -263,8 +263,8 @@ contract ClaimsManager is InitializableV2 {
*/
function processClaim(
address _claimer,
uint _totalLockedForSP
) external returns (uint mintedRewards)
uint256 _totalLockedForSP
) external returns (uint256 mintedRewards)
{
_requireIsInitialized();
_requireStakingAddressIsSet();
Expand All @@ -278,9 +278,9 @@ contract ClaimsManager is InitializableV2 {

Staking stakingContract = Staking(stakingAddress);
// Prevent duplicate claim
uint lastUserClaimBlock = stakingContract.lastClaimedFor(_claimer);
uint256 lastUserClaimBlock = stakingContract.lastClaimedFor(_claimer);
require(lastUserClaimBlock <= currentRound.fundBlock, "Claim already processed for user");
uint totalStakedAtFundBlockForClaimer = stakingContract.totalStakedForAt(
uint256 totalStakedAtFundBlockForClaimer = stakingContract.totalStakedForAt(
_claimer,
currentRound.fundBlock);

Expand All @@ -290,11 +290,11 @@ contract ClaimsManager is InitializableV2 {

// Once they claim the zero reward amount, stake can be modified once again
// Subtract total locked amount for SP from stake at fund block
uint claimerTotalStake = totalStakedAtFundBlockForClaimer.sub(_totalLockedForSP);
uint totalStakedAtFundBlock = stakingContract.totalStakedAt(currentRound.fundBlock);
uint256 claimerTotalStake = totalStakedAtFundBlockForClaimer.sub(_totalLockedForSP);
uint256 totalStakedAtFundBlock = stakingContract.totalStakedAt(currentRound.fundBlock);

// Calculate claimer rewards
uint rewardsForClaimer = (
uint256 rewardsForClaimer = (
claimerTotalStake.mul(fundingAmount)
).div(totalStakedAtFundBlock);

Expand Down Expand Up @@ -325,7 +325,7 @@ contract ClaimsManager is InitializableV2 {
currentRound.totalClaimedInRound = currentRound.totalClaimedInRound.add(rewardsForClaimer);

// Update round claim value
uint newTotal = stakingContract.totalStakedFor(_claimer);
uint256 newTotal = stakingContract.totalStakedFor(_claimer);

emit ClaimProcessed(
_claimer,
Expand All @@ -341,8 +341,8 @@ contract ClaimsManager is InitializableV2 {
* @notice Modify funding amount per round
* @param _newAmount - new amount to fund per round in wei
*/
function updateFundingAmount(uint _newAmount)
external returns (uint newAmount)
function updateFundingAmount(uint256 _newAmount)
external returns (uint256 newAmount)
{
_requireIsInitialized();

Expand All @@ -366,8 +366,8 @@ contract ClaimsManager is InitializableV2 {
_requireStakingAddressIsSet();
_requireServiceProviderFactoryAddressIsSet();

uint lastClaimedForSP = Staking(stakingAddress).lastClaimedFor(_sp);
(,,,uint numEndpoints,,) = (
uint256 lastClaimedForSP = Staking(stakingAddress).lastClaimedFor(_sp);
(,,,uint256 numEndpoints,,) = (
ServiceProviderFactory(serviceProviderFactoryAddress).getServiceProviderDetails(_sp)
);
return (lastClaimedForSP < currentRound.fundBlock && numEndpoints > 0);
Expand All @@ -377,7 +377,7 @@ contract ClaimsManager is InitializableV2 {
* @notice Modify minimum block difference between funding rounds
* @param _newFundingRoundBlockDiff - new min block difference to set
*/
function updateFundingRoundBlockDiff(uint _newFundingRoundBlockDiff) external {
function updateFundingRoundBlockDiff(uint256 _newFundingRoundBlockDiff) external {
_requireIsInitialized();

require(
Expand Down