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

Restructure directories

Browse Source
This commit is contained in:
Amir Bandeali
2018-07-26 17:18:43 -07:00
parent 2743eee044
commit f5459164d2
6 changed files with 103 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/contracts/src/2.0.0/test/DummyERC20Token/DummyERC20Token.sol vendored
View File

@@ -18,13 +18,13 @@
pragma solidity 0.4.24;
import "../Mintable/Mintable.sol";
import "../../utils/Ownable/Ownable.sol";
import "../../tokens/ERC20Token/MintableERC20Token.sol";
contract DummyERC20Token is
Mintable,
Ownable
Ownable,
MintableERC20Token
{
string public name;
string public symbol;
@@ -45,8 +45,11 @@ contract DummyERC20Token is
balances[msg.sender] = _totalSupply;
}
/// @dev Sets the balance of target address
/// @param _target Address or which balance will be updated
/// @param _value New balance of target address
function setBalance(address _target, uint256 _value)
public
external
onlyOwner
{
uint256 currBalance = balances[_target];
@@ -57,4 +60,17 @@ contract DummyERC20Token is
}
balances[_target] = _value;
}
/// @dev Mints new tokens for sender
/// @param _value Amount of tokens to mint
function mint(uint256 _value)
external
{
require(
_value <= 100000000000000000000,
"VALUE_TOO_LARGE"
);
_mint(msg.sender, _value);
}
}

43
packages/contracts/src/2.0.0/test/Mintable/Mintable.sol vendored
View File

@@ -1,43 +0,0 @@
/*
Copyright 2018 ZeroEx Intl.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
pragma solidity 0.4.24;
import "../../tokens/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol";
import "../../utils/SafeMath/SafeMath.sol";
/*
* Mintable
* Base contract that creates a mintable UnlimitedAllowanceToken
*/
contract Mintable is
UnlimitedAllowanceToken,
SafeMath
{
function mint(uint256 _value)
public
{
require(
_value <= 100000000000000000000,
"Minting more than 100000000000000000000 is not allowed."
);
balances[msg.sender] = safeAdd(_value, balances[msg.sender]);
_totalSupply = safeAdd(_totalSupply, _value);
}
}

18
packages/contracts/src/2.0.0/tokens/ERC20Token/ERC20Token.sol vendored
View File

@@ -46,9 +46,16 @@ contract ERC20Token is
balances[_to] + _value >= balances[_to],
"UINT256_OVERFLOW"
);
balances[msg.sender] -= _value;
balances[_to] += _value;
emit Transfer(msg.sender, _to, _value);
emit Transfer(
msg.sender,
_to,
_value
);
return true;
}
@@ -77,10 +84,17 @@ contract ERC20Token is
balances[_to] + _value >= balances[_to],
"UINT256_OVERFLOW"
);
balances[_to] += _value;
balances[_from] -= _value;
allowed[_from][msg.sender] -= _value;
emit Transfer(_from, _to, _value);
emit Transfer(
_from,
_to,
_value
);
return true;
}

4
packages/contracts/src/2.0.0/tokens/ERC20Token/IERC20Token.sol vendored
View File

@@ -21,13 +21,13 @@ pragma solidity 0.4.24;
contract IERC20Token {
// solhint-disable-next-line no-simple-event-func-name
// solhint-disable no-simple-event-func-name
event Transfer(
address indexed _from,
address indexed _to,
uint256 _value
);
event Approval(
address indexed _owner,
address indexed _spender,

61
packages/contracts/src/2.0.0/tokens/ERC20Token/MintableERC20Token.sol vendored Normal file
View File

@@ -0,0 +1,61 @@
/*
Copyright 2018 ZeroEx Intl.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
pragma solidity 0.4.24;
import "../../utils/SafeMath/SafeMath.sol";
import "./UnlimitedAllowanceERC20Token.sol";
contract MintableERC20Token is
SafeMath,
UnlimitedAllowanceERC20Token
{
/// @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);
emit Transfer(
address(0),
_to,
_value
);
}
/// @dev Mints new tokens
/// @param _owner Owner of tokens that will be burned
/// @param _value Amount of tokens to burn
function _burn(address _owner, uint256 _value)
internal
{
balances[_owner] = safeSub(balances[_owner], _value);
_totalSupply = safeSub(_totalSupply, _value);
emit Transfer(
_owner,
address(0),
_value
);
}
}

5
packages/contracts/src/2.0.0/tokens/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol → packages/contracts/src/2.0.0/tokens/ERC20Token/UnlimitedAllowanceERC20Token.sol vendored
View File

@@ -21,7 +21,7 @@ pragma solidity 0.4.24;
import "../ERC20Token/ERC20Token.sol";
contract UnlimitedAllowanceToken is
contract UnlimitedAllowanceERC20Token is
ERC20Token
{
@@ -53,16 +53,19 @@ contract UnlimitedAllowanceToken is
balances[_to] + _value >= balances[_to],
"UINT256_OVERFLOW"
);
balances[_to] += _value;
balances[_from] -= _value;
if (allowance < MAX_UINT) {
allowed[_from][msg.sender] -= _value;
}
emit Transfer(
_from,
_to,
_value
);
return true;
}
}