Skip to content

Refactor/check effects interaction #120

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

Open
tcrosado wants to merge 4 commits into
base: dev
Choose a base branch
from
+8 −3
Open

Refactor/check effects interaction #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c52eb45
chore(package-lock): Remove unnecessary package file
tcrosado Feb 4, 2019
d632b06
refactor(Timelock): Change code order to respect Checks Effects Inter…
tcrosado Feb 4, 2019
f10abd6
refactor(Credits Balance): Change code order to respect Checks Effect…
tcrosado Feb 4, 2019
23b685b
Merge branch 'dev' into refactor/CheckEffectsInteraction
tcrosado Feb 14, 2019
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
7 changes: 5 additions & 2 deletions contracts/AppCoinsCreditsBalance.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,14 @@ contract AppCoinsCreditsBalance is Whitelist {
function depositFunds(uint _amount, bytes _merkleTreeHash)
public
onlyIfWhitelisted("depositFunds", msg.sender){
require(appc.allowance(msg.sender, address(this)) >= _amount);

registerBalanceProof(_merkleTreeHash);

appc.transferFrom(msg.sender, address(this), _amount);
balance = SafeMath.add(balance,_amount);

require(appc.allowance(msg.sender, address(this)) >= _amount);
appc.transferFrom(msg.sender, address(this), _amount);

emit Deposit(_amount);
}

Expand Down
4 changes: 3 additions & 1 deletion contracts/AppCoinsTimelock.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,12 @@ contract AppCoinsTimelock {
@param _amount uint of the amount to be stored
*/
function allocateFunds(address _address, uint256 _amount) public {

balances[_address] = SafeMath.add(balances[_address], _amount);

require(appc.allowance(msg.sender, address(this)) >= _amount);

appc.transferFrom(msg.sender, address(this), _amount);
balances[_address] = SafeMath.add(balances[_address], _amount);

emit NewFundsAllocated(_address, balances[_address]);
}
Expand Down