Skip to content

Feature/add payment manager #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martdn wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Feature/add payment manager #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
139f533
add func changeDiscount
Dec 20, 2017
3644c8a
change sale logic
Dec 20, 2017
0070ade
add <payment manager>
Dec 21, 2017
30750b1
add <payment manager>
Dec 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 51 additions & 51 deletions build/contracts/ERC20Extending.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@
"deployedBytecode": "0x",
"sourceMap": "",
"deployedSourceMap": "",
"source": "pragma solidity ^0.4.18;\r\n\r\nimport \"./TokenERC20.sol\";\r\n\r\ncontract ERC20Extending is TokenERC20\r\n{\r\n using SafeMath for uint;\r\n\r\n /**\r\n * Function for transfer ethereum from contract to any address\r\n *\r\n * @param _to - address of the recipient\r\n * @param amount - ethereum\r\n */\r\n function transferEthFromContract(address _to, uint amount) public onlyOwner\r\n {\r\n _to.transfer(amount);\r\n }\r\n\r\n /**\r\n * Function for transfer tokens from contract to any address\r\n *\r\n */\r\n function transferTokensFromContract(address _to, uint256 _value) public onlyOwner\r\n {\r\n avaliableSupply = avaliableSupply.sub(_value);\r\n _transfer(this, _to, _value);\r\n }\r\n}\r\n",
"source": "pragma solidity ^0.4.18;\r\n\r\nimport \"./TokenERC20.sol\";\r\n\r\ncontract ERC20Extending is TokenERC20\r\n{\r\n using SafeMath for uint;\r\n\r\n /**\r\n * Function for transfer ethereum from contract to any address\r\n *\r\n * @param _to - address of the recipient\r\n * @param amount - ethereum\r\n */\r\n function transferEthFromContract(address _to, uint256 amount) public onlyOwner\r\n {\r\n _to.transfer(amount);\r\n }\r\n\r\n /**\r\n * Function for transfer tokens from contract to any address\r\n *\r\n */\r\n function transferTokensFromContract(address _to, uint256 _value) public onlyOwner\r\n {\r\n avaliableSupply = avaliableSupply.sub(_value);\r\n _transfer(this, _to, _value);\r\n }\r\n}\r\n",
"sourcePath": "C:\\Users\\pirno\\Desktop\\stm-smartcontract origina\\contracts\\ERC20Extending.sol",
"ast": {
"attributes": {
Expand All @@ -470,7 +470,7 @@
},
{
"attributes": {
"SourceUnit": 1308,
"SourceUnit": 1386,
"absolutePath": "/C/Users/pirno/Desktop/stm-smartcontract origina/contracts/TokenERC20.sol",
"file": "./TokenERC20.sol",
"scope": 48,
Expand All @@ -487,14 +487,14 @@
"attributes": {
"contractDependencies": [
160,
1307
1385
],
"contractKind": "contract",
"documentation": null,
"fullyImplemented": false,
"linearizedBaseContracts": [
47,
1307,
1385,
160
],
"name": "ERC20Extending",
Expand All @@ -512,7 +512,7 @@
"attributes": {
"contractScope": null,
"name": "TokenERC20",
"referencedDeclaration": 1307,
"referencedDeclaration": 1385,
"type": "contract TokenERC20"
},
"id": 3,
Expand All @@ -530,7 +530,7 @@
"attributes": {
"contractScope": null,
"name": "SafeMath",
"referencedDeclaration": 325,
"referencedDeclaration": 333,
"type": "library SafeMath"
},
"id": 5,
Expand Down Expand Up @@ -606,22 +606,22 @@
"children": [
{
"attributes": {
"name": "uint",
"name": "uint256",
"type": "uint256"
},
"id": 10,
"name": "ElementaryTypeName",
"src": "350:4:0"
"src": "350:7:0"
}
],
"id": 11,
"name": "VariableDeclaration",
"src": "350:11:0"
"src": "350:14:0"
}
],
"id": 12,
"name": "ParameterList",
"src": "336:26:0"
"src": "336:29:0"
},
{
"attributes": {
Expand All @@ -632,7 +632,7 @@
"children": [],
"id": 15,
"name": "ParameterList",
"src": "385:0:0"
"src": "388:0:0"
},
{
"attributes": {
Expand All @@ -653,12 +653,12 @@
},
"id": 13,
"name": "Identifier",
"src": "370:9:0"
"src": "373:9:0"
}
],
"id": 14,
"name": "ModifierInvocation",
"src": "370:9:0"
"src": "373:9:0"
},
{
"children": [
Expand Down Expand Up @@ -708,12 +708,12 @@
},
"id": 16,
"name": "Identifier",
"src": "396:3:0"
"src": "399:3:0"
}
],
"id": 18,
"name": "MemberAccess",
"src": "396:12:0"
"src": "399:12:0"
},
{
"attributes": {
Expand All @@ -727,27 +727,27 @@
},
"id": 19,
"name": "Identifier",
"src": "409:6:0"
"src": "412:6:0"
}
],
"id": 20,
"name": "FunctionCall",
"src": "396:20:0"
"src": "399:20:0"
}
],
"id": 21,
"name": "ExpressionStatement",
"src": "396:20:0"
"src": "399:20:0"
}
],
"id": 22,
"name": "Block",
"src": "385:39:0"
"src": "388:39:0"
}
],
"id": 23,
"name": "FunctionDefinition",
"src": "304:120:0"
"src": "304:123:0"
},
{
"attributes": {
Expand Down Expand Up @@ -783,12 +783,12 @@
},
"id": 24,
"name": "ElementaryTypeName",
"src": "557:7:0"
"src": "560:7:0"
}
],
"id": 25,
"name": "VariableDeclaration",
"src": "557:11:0"
"src": "560:11:0"
},
{
"attributes": {
Expand All @@ -809,17 +809,17 @@
},
"id": 26,
"name": "ElementaryTypeName",
"src": "570:7:0"
"src": "573:7:0"
}
],
"id": 27,
"name": "VariableDeclaration",
"src": "570:14:0"
"src": "573:14:0"
}
],
"id": 28,
"name": "ParameterList",
"src": "556:29:0"
"src": "559:29:0"
},
{
"attributes": {
Expand All @@ -830,7 +830,7 @@
"children": [],
"id": 31,
"name": "ParameterList",
"src": "608:0:0"
"src": "611:0:0"
},
{
"attributes": {
Expand All @@ -851,12 +851,12 @@
},
"id": 29,
"name": "Identifier",
"src": "593:9:0"
"src": "596:9:0"
}
],
"id": 30,
"name": "ModifierInvocation",
"src": "593:9:0"
"src": "596:9:0"
},
{
"children": [
Expand All @@ -879,13 +879,13 @@
"overloadedDeclarations": [
null
],
"referencedDeclaration": 788,
"referencedDeclaration": 866,
"type": "uint256",
"value": "avaliableSupply"
},
"id": 32,
"name": "Identifier",
"src": "619:15:0"
"src": "622:15:0"
},
{
"attributes": {
Expand Down Expand Up @@ -915,7 +915,7 @@
"isPure": false,
"lValueRequested": false,
"member_name": "sub",
"referencedDeclaration": 300,
"referencedDeclaration": 308,
"type": "function (uint256,uint256) pure returns (uint256)"
},
"children": [
Expand All @@ -925,18 +925,18 @@
"overloadedDeclarations": [
null
],
"referencedDeclaration": 788,
"referencedDeclaration": 866,
"type": "uint256",
"value": "avaliableSupply"
},
"id": 33,
"name": "Identifier",
"src": "637:15:0"
"src": "640:15:0"
}
],
"id": 34,
"name": "MemberAccess",
"src": "637:19:0"
"src": "640:19:0"
},
{
"attributes": {
Expand All @@ -950,22 +950,22 @@
},
"id": 35,
"name": "Identifier",
"src": "657:6:0"
"src": "660:6:0"
}
],
"id": 36,
"name": "FunctionCall",
"src": "637:27:0"
"src": "640:27:0"
}
],
"id": 37,
"name": "Assignment",
"src": "619:45:0"
"src": "622:45:0"
}
],
"id": 38,
"name": "ExpressionStatement",
"src": "619:45:0"
"src": "622:45:0"
},
{
"children": [
Expand Down Expand Up @@ -1003,27 +1003,27 @@
"overloadedDeclarations": [
null
],
"referencedDeclaration": 949,
"referencedDeclaration": 1027,
"type": "function (address,address,uint256)",
"value": "_transfer"
},
"id": 39,
"name": "Identifier",
"src": "675:9:0"
"src": "678:9:0"
},
{
"attributes": {
"argumentTypes": null,
"overloadedDeclarations": [
null
],
"referencedDeclaration": 1338,
"referencedDeclaration": 1416,
"type": "contract ERC20Extending",
"value": "this"
},
"id": 40,
"name": "Identifier",
"src": "685:4:0"
"src": "688:4:0"
},
{
"attributes": {
Expand All @@ -1037,7 +1037,7 @@
},
"id": 41,
"name": "Identifier",
"src": "691:3:0"
"src": "694:3:0"
},
{
"attributes": {
Expand All @@ -1051,43 +1051,43 @@
},
"id": 42,
"name": "Identifier",
"src": "696:6:0"
"src": "699:6:0"
}
],
"id": 43,
"name": "FunctionCall",
"src": "675:28:0"
"src": "678:28:0"
}
],
"id": 44,
"name": "ExpressionStatement",
"src": "675:28:0"
"src": "678:28:0"
}
],
"id": 45,
"name": "Block",
"src": "608:103:0"
"src": "611:103:0"
}
],
"id": 46,
"name": "FunctionDefinition",
"src": "521:190:0"
"src": "524:190:0"
}
],
"id": 47,
"name": "ContractDefinition",
"src": "58:656:0"
"src": "58:659:0"
}
],
"id": 48,
"name": "SourceUnit",
"src": "0:716:0"
"src": "0:719:0"
},
"compiler": {
"name": "solc",
"version": "0.4.18+commit.9cf6e910.Emscripten.clang"
},
"networks": {},
"schemaVersion": "1.0.1",
"updatedAt": "2017-12-12T17:32:23.389Z"
"updatedAt": "2017-12-21T23:40:56.023Z"
}
Loading