Skip to content

Commit

Permalink
update stanfardToken contract
Browse files Browse the repository at this point in the history
  • Loading branch information
adibas03 committed May 6, 2018
1 parent e3cfbe9 commit 9638271
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 147 deletions.
179 changes: 34 additions & 145 deletions contracts/StandardToken.sol
Original file line number Diff line number Diff line change
@@ -1,279 +1,168 @@
//https://github.com/OpenZeppelin/zeppelin-solidity/blob/master/contracts/token/StandardToken.sol
pragma solidity ^0.4.11;
pragma solidity ^0.4.21;

import '../libraries/SafeMath.sol';

/**
* @title ERC20Basic
* @dev Simpler version of ERC20 interface
* @dev see https://github.com/ethereum/EIPs/issues/179
*/

contract ERC20Basic {

uint256 public totalSupply;

function balanceOf(address who) public constant returns (uint256);

function totalSupply() public view returns (uint256);
function balanceOf(address who) public view returns (uint256);
function transfer(address to, uint256 value) public returns (bool);

event Transfer(address indexed from, address indexed to, uint256 value);

}


/**
* @title ERC20 interface
* @dev see https://github.com/ethereum/EIPs/issues/20
*/

contract ERC20 is ERC20Basic {

function allowance(address owner, address spender) public constant returns (uint256);

function allowance(address owner, address spender) public view returns (uint256);
function transferFrom(address from, address to, uint256 value) public returns (bool);

function approve(address spender, uint256 value) public returns (bool);

event Approval(address indexed owner, address indexed spender, uint256 value);

}


/**
* @title Basic token
* @dev Basic version of StandardToken, with no allowances.
*/

contract BasicToken is ERC20Basic {

using SafeMath for uint256;



mapping(address => uint256) balances;


uint256 totalSupply_;

/**
* @dev total number of tokens in existence
*/
function totalSupply() public view returns (uint256) {
return totalSupply_;
}

/**
* @dev transfer token for a specified address
* @param _to The address to transfer to.
* @param _value The amount to be transferred.
*/

function transfer(address _to, uint256 _value) public returns (bool) {

require(_to != address(0));

require(_value <= balances[msg.sender]);



// SafeMath.sub will throw if there is not enough balance.

balances[msg.sender] = balances[msg.sender].sub(_value);

balances[_to] = balances[_to].add(_value);

Transfer(msg.sender, _to, _value);

emit Transfer(msg.sender, _to, _value);
return true;

}



/**
* @dev Gets the balance of the specified address.
* @param _owner The address to query the the balance of.
* @return An uint256 representing the amount owned by the passed address.
*/

function balanceOf(address _owner) public constant returns (uint256 balance) {

function balanceOf(address _owner) public view returns (uint256) {
return balances[_owner];

}



}


/**
* @title Standard ERC20 token
*
* @dev Implementation of the basic standard token.
* @dev https://github.com/ethereum/EIPs/issues/20
* @dev Based on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol
*/

contract StandardToken is ERC20, BasicToken {



mapping (address => mapping (address => uint256)) internal allowed;





/**
* @dev Transfer tokens from one address to another
* @param _from address The address which you want to send tokens from
* @param _to address The address which you want to transfer to
* @param _value uint256 the amount of tokens to be transferred
*/

function transferFrom(address _from, address _to, uint256 _value) public returns (bool) {

require(_to != address(0));

require(_value <= balances[_from]);

require(_value <= allowed[_from][msg.sender]);



balances[_from] = balances[_from].sub(_value);

balances[_to] = balances[_to].add(_value);

allowed[_from][msg.sender] = allowed[_from][msg.sender].sub(_value);

Transfer(_from, _to, _value);

emit Transfer(_from, _to, _value);
return true;

}



/**
* @dev Approve the passed address to spend the specified amount of tokens on behalf of msg.sender.
*
* Beware that changing an allowance with this method brings the risk that someone may use both the old
* and the new allowance by unfortunate transaction ordering. One possible solution to mitigate this
* race condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:
* https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729
* @param _spender The address which will spend the funds.
* @param _value The amount of tokens to be spent.
*/

function approve(address _spender, uint256 _value) public returns (bool) {

allowed[msg.sender][_spender] = _value;

Approval(msg.sender, _spender, _value);

emit Approval(msg.sender, _spender, _value);
return true;

}



/**
* @dev Function to check the amount of tokens that an owner allowed to a spender.
* @param _owner address The address which owns the funds.
* @param _spender address The address which will spend the funds.
* @return A uint256 specifying the amount of tokens still available for the spender.
*/

function allowance(address _owner, address _spender) public constant returns (uint256 remaining) {

function allowance(address _owner, address _spender) public view returns (uint256) {
return allowed[_owner][_spender];

}



/**
* @dev Increase the amount of tokens that an owner allowed to a spender.
*
* approve should be called when allowed[_spender] == 0. To increment
* allowed value is better to use this function to avoid 2 calls (and wait until
* the first transaction is mined)
* From MonolithDAO Token.sol
* @param _spender The address which will spend the funds.
* @param _addedValue The amount of tokens to increase the allowance by.
*/

function increaseApproval (address _spender, uint _addedValue) public returns (bool success) {

function increaseApproval(address _spender, uint _addedValue) public returns (bool) {
allowed[msg.sender][_spender] = allowed[msg.sender][_spender].add(_addedValue);

Approval(msg.sender, _spender, allowed[msg.sender][_spender]);

emit Approval(msg.sender, _spender, allowed[msg.sender][_spender]);
return true;

}



function decreaseApproval (address _spender, uint _subtractedValue) public returns (bool success) {

/**
* @dev Decrease the amount of tokens that an owner allowed to a spender.
*
* approve should be called when allowed[_spender] == 0. To decrement
* allowed value is better to use this function to avoid 2 calls (and wait until
* the first transaction is mined)
* From MonolithDAO Token.sol
* @param _spender The address which will spend the funds.
* @param _subtractedValue The amount of tokens to decrease the allowance by.
*/
function decreaseApproval(address _spender, uint _subtractedValue) public returns (bool) {
uint oldValue = allowed[msg.sender][_spender];

if (_subtractedValue > oldValue) {

allowed[msg.sender][_spender] = 0;

} else {

allowed[msg.sender][_spender] = oldValue.sub(_subtractedValue);

}

Approval(msg.sender, _spender, allowed[msg.sender][_spender]);

emit Approval(msg.sender, _spender, allowed[msg.sender][_spender]);
return true;

}



}
4 changes: 2 additions & 2 deletions contracts/standardTokenContract.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ contract standardTokenContract is StandardToken{

//Required to Instantiate nummber of tokens and give creator all the tokens
function standardTokenContract(){
totalSupply = 100000000;
balances[msg.sender] = totalSupply;
totalSupply_ = 100000000;
balances[msg.sender] = totalSupply();
}


Expand Down

0 comments on commit 9638271

Please sign in to comment.