crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

@0x:contracts-utils Removed SafeMath and the use of the contract throughout contracts/

Browse Source
This commit is contained in:
Alex Towle
2019-10-15 14:29:48 -07:00
parent 90193c8197
commit 41d99e77c7
16 changed files with 84 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
contracts/erc20/contracts/src/MintableERC20Token.sol
View File

@@ -18,22 +18,23 @@
pragma solidity ^0.5.9;
import "@0x/contracts-utils/contracts/src/SafeMath.sol";
import "@0x/contracts-utils/contracts/src/LibSafeMath.sol";
import "./UnlimitedAllowanceERC20Token.sol";
contract MintableERC20Token is
SafeMath,
contract MintableERC20Token is
UnlimitedAllowanceERC20Token
{
using LibSafeMath for uint256;
/// @dev Mints new tokens
/// @param _to Address of the beneficiary that will own the minted token
/// @param _value Amount of tokens to mint
function _mint(address _to, uint256 _value)
internal
{
balances[_to] = _safeAdd(_value, balances[_to]);
_totalSupply = _safeAdd(_totalSupply, _value);
balances[_to] = _value.safeAdd(balances[_to]);
_totalSupply = _totalSupply.safeAdd(_value);
emit Transfer(
address(0),
@@ -48,8 +49,8 @@ contract MintableERC20Token is
function _burn(address _owner, uint256 _value)
internal
{
balances[_owner] = _safeSub(balances[_owner], _value);
_totalSupply = _safeSub(_totalSupply, _value);
balances[_owner] = balances[_owner].safeSub(_value);
_totalSupply = _totalSupply.safeSub(_value);
emit Transfer(
_owner,

9
contracts/erc20/contracts/test/DummyERC20Token.sol
View File

@@ -18,14 +18,17 @@
pragma solidity ^0.5.5;
import "@0x/contracts-utils/contracts/src/LibSafeMath.sol";
import "@0x/contracts-utils/contracts/src/Ownable.sol";
import "../src/MintableERC20Token.sol";
contract DummyERC20Token is
contract DummyERC20Token is
Ownable,
MintableERC20Token
{
using LibSafeMath for uint256;
string public name;
string public symbol;
uint256 public decimals;
@@ -55,9 +58,9 @@ contract DummyERC20Token is
{
uint256 currBalance = balances[_target];
if (_value < currBalance) {
_totalSupply = _safeSub(_totalSupply, _safeSub(currBalance, _value));
_totalSupply = _totalSupply.safeSub(currBalance.safeSub(_value));
} else {
_totalSupply = _safeAdd(_totalSupply, _safeSub(_value, currBalance));
_totalSupply = _totalSupply.safeAdd(_value.safeSub(currBalance));
}
balances[_target] = _value;
}