From 05d61eed7560645c7a73ec92df8b96e2cea5b05b Mon Sep 17 00:00:00 2001 From: jorgearturonh <41529438+jorgearturonh@users.noreply.github.com> Date: Sat, 21 Jul 2018 22:37:10 -0400 Subject: [PATCH 1/8] Contract now has non-deprecated code. Have fun! thanks to the initial contributors --- ico-contract.sol | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ico-contract.sol b/ico-contract.sol index c638442..91511f4 100644 --- a/ico-contract.sol +++ b/ico-contract.sol @@ -74,7 +74,7 @@ contract Owned { event OwnershipTransferred(address indexed _from, address indexed _to); - function Owned() public { + constructor() public { owner = msg.sender; } @@ -88,7 +88,7 @@ contract Owned { } function acceptOwnership() public { require(msg.sender == newOwner); - OwnershipTransferred(owner, newOwner); + emit OwnershipTransferred(owner, newOwner); owner = newOwner; newOwner = address(0); } @@ -115,7 +115,7 @@ contract bitfwdToken is ERC20Interface, Owned, SafeMath { // ------------------------------------------------------------------------ // Constructor // ------------------------------------------------------------------------ - function bitfwdToken() public { + constructor() public { symbol = "FWD"; name = "bitfwd Token"; decimals = 18; @@ -149,7 +149,7 @@ contract bitfwdToken is ERC20Interface, Owned, SafeMath { function transfer(address to, uint tokens) public returns (bool success) { balances[msg.sender] = safeSub(balances[msg.sender], tokens); balances[to] = safeAdd(balances[to], tokens); - Transfer(msg.sender, to, tokens); + emit Transfer(msg.sender, to, tokens); return true; } @@ -164,7 +164,7 @@ contract bitfwdToken is ERC20Interface, Owned, SafeMath { // ------------------------------------------------------------------------ function approve(address spender, uint tokens) public returns (bool success) { allowed[msg.sender][spender] = tokens; - Approval(msg.sender, spender, tokens); + emit Approval(msg.sender, spender, tokens); return true; } @@ -182,7 +182,7 @@ contract bitfwdToken is ERC20Interface, Owned, SafeMath { balances[from] = safeSub(balances[from], tokens); allowed[from][msg.sender] = safeSub(allowed[from][msg.sender], tokens); balances[to] = safeAdd(balances[to], tokens); - Transfer(from, to, tokens); + emit Transfer(from, to, tokens); return true; } @@ -203,7 +203,7 @@ contract bitfwdToken is ERC20Interface, Owned, SafeMath { // ------------------------------------------------------------------------ function approveAndCall(address spender, uint tokens, bytes data) public returns (bool success) { allowed[msg.sender][spender] = tokens; - Approval(msg.sender, spender, tokens); + emit Approval(msg.sender, spender, tokens); ApproveAndCallFallBack(spender).receiveApproval(msg.sender, tokens, this, data); return true; } @@ -221,7 +221,7 @@ contract bitfwdToken is ERC20Interface, Owned, SafeMath { } balances[msg.sender] = safeAdd(balances[msg.sender], tokens); _totalSupply = safeAdd(_totalSupply, tokens); - Transfer(address(0), msg.sender, tokens); + emit Transfer(address(0), msg.sender, tokens); owner.transfer(msg.value); } From 047bf4fa841ffeb2edf7f3bd4fed77c3c6f0c1a8 Mon Sep 17 00:00:00 2001 From: Jorge Arturo <41529438+jorgearturonh@users.noreply.github.com> Date: Sat, 21 Jul 2018 22:52:03 -0400 Subject: [PATCH 2/8] Update README.md --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5379c35..72d0ae7 100644 --- a/README.md +++ b/README.md @@ -1 +1,7 @@ -# ICO-tutorial \ No newline at end of file +# ICO-tutorial + +21-07-2018: I just updated the deprecated code, added constructors of the functions and the new form of calling events "emit". + +Very thanks to the initial contributors. + +Jorge Naranjo From 0d45b464af28023d8ea8ab10f28683391bae23e0 Mon Sep 17 00:00:00 2001 From: Jorge Arturo <41529438+jorgearturonh@users.noreply.github.com> Date: Sat, 21 Jul 2018 23:19:37 -0400 Subject: [PATCH 3/8] Update ico-contract.sol --- ico-contract.sol | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ico-contract.sol b/ico-contract.sol index 91511f4..2b34958 100644 --- a/ico-contract.sol +++ b/ico-contract.sol @@ -1,17 +1,18 @@ pragma solidity ^0.4.18; // ---------------------------------------------------------------------------- -// 'bitfwd' CROWDSALE token contract +// 'JorgeArturo' CROWDSALE token contract // // Deployed to : 0xD0FDf2ECd4CadE671a7EE1063393eC0eB90816FD -// Symbol : FWD -// Name : bitfwd Token -// Total supply: Gazillion +// Symbol : JAT +// Name : JorgeArturo Token +// Total supply: 1000000000000 // Decimals : 18 // // Enjoy. // // (c) by Moritz Neto & Daniel Bar with BokkyPooBah / Bok Consulting Pty Ltd Au 2017. The MIT Licence. +// Forked by JorgeArturo. // ---------------------------------------------------------------------------- @@ -116,8 +117,8 @@ contract bitfwdToken is ERC20Interface, Owned, SafeMath { // Constructor // ------------------------------------------------------------------------ constructor() public { - symbol = "FWD"; - name = "bitfwd Token"; + symbol = "JAT"; + name = "JorgeArturo Token"; decimals = 18; bonusEnds = now + 1 weeks; endDate = now + 7 weeks; @@ -209,15 +210,15 @@ contract bitfwdToken is ERC20Interface, Owned, SafeMath { } // ------------------------------------------------------------------------ - // 1,000 FWD Tokens per 1 ETH + // 5,000 FWD Tokens per 1 ETH // ------------------------------------------------------------------------ function () public payable { require(now >= startDate && now <= endDate); uint tokens; if (now <= bonusEnds) { - tokens = msg.value * 1200; + tokens = msg.value * 5200; } else { - tokens = msg.value * 1000; + tokens = msg.value * 5000; } balances[msg.sender] = safeAdd(balances[msg.sender], tokens); _totalSupply = safeAdd(_totalSupply, tokens); From f76cc673531cde126624cf9b077f902d57ea00e0 Mon Sep 17 00:00:00 2001 From: Jorge Arturo <41529438+jorgearturonh@users.noreply.github.com> Date: Sun, 22 Jul 2018 20:25:54 -0400 Subject: [PATCH 4/8] Fixed supply ICO mode activated This crowdsale contract now supports a max supply of 600,000,000 tokens and a max buy of <5.0 ethers per person. --- ico-contract.sol | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/ico-contract.sol b/ico-contract.sol index 2b34958..a83e44c 100644 --- a/ico-contract.sol +++ b/ico-contract.sol @@ -100,11 +100,12 @@ contract Owned { // ERC20 Token, with the addition of symbol, name and decimals and assisted // token transfers // ---------------------------------------------------------------------------- -contract bitfwdToken is ERC20Interface, Owned, SafeMath { +contract jorgeArturoToken is ERC20Interface, Owned, SafeMath { string public symbol; string public name; uint8 public decimals; uint public _totalSupply; + uint public totalSold; uint public startDate; uint public bonusEnds; uint public endDate; @@ -117,11 +118,14 @@ contract bitfwdToken is ERC20Interface, Owned, SafeMath { // Constructor // ------------------------------------------------------------------------ constructor() public { - symbol = "JAT"; - name = "JorgeArturo Token"; + symbol = "AAG"; + name = "JorgeArturo Test Token 8"; decimals = 18; bonusEnds = now + 1 weeks; endDate = now + 7 weeks; + _totalSupply = 600000000000000000000000000; + balances[address(0)]= 40000000000000000000000000; + totalSold = balances[address(0)]; } @@ -130,7 +134,7 @@ contract bitfwdToken is ERC20Interface, Owned, SafeMath { // Total supply // ------------------------------------------------------------------------ function totalSupply() public constant returns (uint) { - return _totalSupply - balances[address(0)]; + return _totalSupply; } @@ -213,16 +217,16 @@ contract bitfwdToken is ERC20Interface, Owned, SafeMath { // 5,000 FWD Tokens per 1 ETH // ------------------------------------------------------------------------ function () public payable { - require(now >= startDate && now <= endDate); + require(now >= startDate && now <= endDate && totalSold < (totalSupply()-msg.value*52000000) && msg.value<5e18 ); uint tokens; if (now <= bonusEnds) { - tokens = msg.value * 5200; + tokens = msg.value * 52000000; } else { - tokens = msg.value * 5000; + tokens = msg.value * 52000000; } balances[msg.sender] = safeAdd(balances[msg.sender], tokens); - _totalSupply = safeAdd(_totalSupply, tokens); emit Transfer(address(0), msg.sender, tokens); + totalSold = totalSold+tokens; owner.transfer(msg.value); } From 1acf291afdc0083267ec15bcfe7861210c9e5186 Mon Sep 17 00:00:00 2001 From: Jorge Arturo <41529438+jorgearturonh@users.noreply.github.com> Date: Sun, 22 Jul 2018 20:27:18 -0400 Subject: [PATCH 5/8] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 72d0ae7..891d79f 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,6 @@ Very thanks to the initial contributors. +22-07-2018: Now the crowdsale is a fixed supply one, and max amount to buy per person is 5 Ethers. + Jorge Naranjo From 850bccf242deba88a2208bfd999a4e53adb31d2d Mon Sep 17 00:00:00 2001 From: Jorge Arturo <41529438+jorgearturonh@users.noreply.github.com> Date: Sun, 22 Jul 2018 20:27:40 -0400 Subject: [PATCH 6/8] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 891d79f..46de4c5 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ 21-07-2018: I just updated the deprecated code, added constructors of the functions and the new form of calling events "emit". -Very thanks to the initial contributors. - 22-07-2018: Now the crowdsale is a fixed supply one, and max amount to buy per person is 5 Ethers. + +Very thanks to the initial contributors. Jorge Naranjo From ad9c56a8f427954726c040efe7dedee1645939ba Mon Sep 17 00:00:00 2001 From: Jorge Arturo <41529438+jorgearturonh@users.noreply.github.com> Date: Tue, 24 Jul 2018 12:53:22 -0400 Subject: [PATCH 7/8] Working on the emition system --- ico-contract.sol | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/ico-contract.sol b/ico-contract.sol index a83e44c..4d6e4a0 100644 --- a/ico-contract.sol +++ b/ico-contract.sol @@ -118,14 +118,21 @@ contract jorgeArturoToken is ERC20Interface, Owned, SafeMath { // Constructor // ------------------------------------------------------------------------ constructor() public { - symbol = "AAG"; - name = "JorgeArturo Test Token 8"; + symbol = "RT2"; + name = "Rufi Token 2"; decimals = 18; bonusEnds = now + 1 weeks; endDate = now + 7 weeks; - _totalSupply = 600000000000000000000000000; - balances[address(0)]= 40000000000000000000000000; - totalSold = balances[address(0)]; + _totalSupply = 6e26; + + //Reserved tokens for Pandorum Founders + balances[address(0x092EaB8751CCB99b1C0b87ff816fa6dBd6513Ea5)]=42e24; + emit Transfer(address(0), 0x092EaB8751CCB99b1C0b87ff816fa6dBd6513Ea5, 42e24); + + //Reserved tokens for Merit System + balances[address(0)]= 198e24; + + totalSold = balances[address(0x092EaB8751CCB99b1C0b87ff816fa6dBd6513Ea5)] ; } @@ -134,7 +141,7 @@ contract jorgeArturoToken is ERC20Interface, Owned, SafeMath { // Total supply // ------------------------------------------------------------------------ function totalSupply() public constant returns (uint) { - return _totalSupply; + return _totalSupply-balances[address(0)]; } @@ -144,7 +151,9 @@ contract jorgeArturoToken is ERC20Interface, Owned, SafeMath { function balanceOf(address tokenOwner) public constant returns (uint balance) { return balances[tokenOwner]; } - + function tokensSold() public constant returns(uint){ + return totalSold; + } // ------------------------------------------------------------------------ // Transfer the balance from token owner's account to `to` account From 73133a9abc0f19965b05ec91601af8fd98f702ba Mon Sep 17 00:00:00 2001 From: Jorge Arturo <41529438+jorgearturonh@users.noreply.github.com> Date: Tue, 24 Jul 2018 13:01:26 -0400 Subject: [PATCH 8/8] Fixed by now Gotta implement emition system --- ico-contract.sol | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ico-contract.sol b/ico-contract.sol index 4d6e4a0..08f1f65 100644 --- a/ico-contract.sol +++ b/ico-contract.sol @@ -130,8 +130,8 @@ contract jorgeArturoToken is ERC20Interface, Owned, SafeMath { emit Transfer(address(0), 0x092EaB8751CCB99b1C0b87ff816fa6dBd6513Ea5, 42e24); //Reserved tokens for Merit System - balances[address(0)]= 198e24; - + // balances[address(0)]= 198e24; + totalSold = balances[address(0x092EaB8751CCB99b1C0b87ff816fa6dBd6513Ea5)] ; } @@ -141,7 +141,7 @@ contract jorgeArturoToken is ERC20Interface, Owned, SafeMath { // Total supply // ------------------------------------------------------------------------ function totalSupply() public constant returns (uint) { - return _totalSupply-balances[address(0)]; + return _totalSupply; }