status-im/meritocracy
2
0
Fork 0
mirror of https://github.com/status-im/meritocracy.git synced 2025-01-10 05:46:09 +00:00
Code Issues Projects Releases Wiki Activity

fix: change transferFrom to transfer

Browse Source 
Changed the transfer function when the contract is who initiates the token transfer.
transferFrom requires an approval to work.
This commit is contained in:
Richard Ramos 2019-03-20 10:26:55 -04:00
parent bf38c31452
commit eb0386afe4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/Meritocracy.sol
View File

@ -126,7 +126,7 @@ contract Meritocracy {
uint256 r = cReceiver.received; uint256 r = cReceiver.received;
cReceiver.received = 0; cReceiver.received = 0;
// cReceiver.inPot = false; // cReceiver.inPot = false;
token.transferFrom(address(this), cReceiver.addr, r); token.transfer(cReceiver.addr, r);
emit ContributorWithdrew(cReceiver.addr); emit ContributorWithdrew(cReceiver.addr);
} }
@ -289,7 +289,7 @@ contract Meritocracy {
c.received = 0; c.received = 0;
c.allocation = 0; c.allocation = 0;
// WARN: Should totalReceived and totalForfeited be zeroed-out? // WARN: Should totalReceived and totalForfeited be zeroed-out?
token.transferFrom(address(this), c.addr, r); // Transfer any owed tokens to contributor token.transfer(c.addr, r); // Transfer any owed tokens to contributor
} }
lastForfeit = block.timestamp; lastForfeit = block.timestamp;
token = ERC20Token(_token); token = ERC20Token(_token);
@ -299,7 +299,7 @@ contract Meritocracy {
// Failsafe, Owner can escape hatch all Tokens and ETH from Contract. // Failsafe, Owner can escape hatch all Tokens and ETH from Contract.
function escape() public onlyOwner { function escape() public onlyOwner {
// Body // Body
token.transferFrom(address(this), owner, token.balanceOf(address(this))); token.transfer(owner, token.balanceOf(address(this)));
owner.transfer(address(this).balance); owner.transfer(address(this).balance);
emit EscapeHatchTriggered(msg.sender); emit EscapeHatchTriggered(msg.sender);
} }
@ -309,7 +309,7 @@ contract Meritocracy {
function escape(address _token) external onlyOwner { function escape(address _token) external onlyOwner {
// Body // Body
ERC20Token t = ERC20Token(_token); ERC20Token t = ERC20Token(_token);
t.transferFrom(address(this), owner, t.balanceOf(address(this))); t.transfer(owner, t.balanceOf(address(this)));
escape(); escape();
} }