approve added

hnamzian · Jun 9, 2018 · 05a24e0 · 05a24e0
1 parent 375f79a
commit 05a24e0
Show file tree

Hide file tree

Showing 8 changed files with 125 additions and 1,000 deletions.
diff --git a/contracts.json b/contracts.json
diff --git a/contracts/openZeppelin/token/ERC20/BasicToken.sol b/contracts/openZeppelin/token/ERC20/BasicToken.sol
@@ -14,7 +14,10 @@ contract BasicToken is ERC20Basic {
 
   mapping(address => uint256) balances;
 
+  uint8 public decimals_;
   uint256 totalSupply_;
+  string public name_;
+  string public symbol_;
 
   /**
   * @dev total number of tokens in existence

diff --git a/contracts/openZeppelin/token/ERC20/DetailedERC20.sol b/contracts/openZeppelin/token/ERC20/DetailedERC20.sol
diff --git a/contracts/openZeppelin/token/ERC20/StandardToken.sol b/contracts/openZeppelin/token/ERC20/StandardToken.sol
@@ -2,6 +2,7 @@ pragma solidity ^0.4.23;
 
 import "./BasicToken.sol";
 import "./ERC20.sol";
+import "../../ownership/Ownable.sol";
 
 
 /**
@@ -11,10 +12,15 @@ import "./ERC20.sol";
  * @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 {
+contract StandardToken is ERC20, BasicToken, Ownable {
 
   mapping (address => mapping (address => uint256)) internal allowed;
 
+  constructor() public {
+      decimals_ = 18;
+      totalSupply_ = 1e9 * 10 ** decimals_;
+      balances[owner] = totalSupply_;
+  }
 
   /**
    * @dev Transfer tokens from one address to another