Skip to content
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.

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

Updating the fork to reflect the master #3

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
1fc48c3
[new] basic functions
amazingandyyy Oct 28, 2017
c7239a2
finished
amazingandyyy Oct 28, 2017
b636564
add requirement for Token
amazingandyyy Oct 29, 2017
c045dd1
queue implemented but not tested
Oct 29, 2017
e31d491
Merge pull request #1 from niteshanandan/master
Oct 29, 2017
6080f0d
Merge pull request #2 from Blockchain-for-Developers/master
j-paterson Oct 29, 2017
ce63b5a
Update Queue.sol
amazingandyyy Oct 29, 2017
197e1e9
Update Queue.sol
amazingandyyy Oct 29, 2017
e8492f7
drop tokensAmount in participant struct
amazingandyyy Oct 29, 2017
8eb669a
token should be done
j-paterson Oct 29, 2017
7d35bc8
Merge branch 'master' of https://github.com/j-paterson/Midterm
j-paterson Oct 29, 2017
c32a02e
an underbar
j-paterson Oct 29, 2017
58cd456
Added tests for Queue.sol
Oct 29, 2017
9af23aa
Resolved merge conflicts. Queue tests passing
Oct 29, 2017
6e61bb9
Fixed constructor
Oct 29, 2017
97f5f4a
Merge pull request #3 from niteshanandan/master
Oct 29, 2017
304b8f0
update styles
amazingandyyy Oct 29, 2017
4bc1e70
Merge branch 'master' of https://github.com/j-paterson/Midterm
amazingandyyy Oct 29, 2017
7e7d33d
update limite
amazingandyyy Oct 29, 2017
c2e6598
minor updates
amazingandyyy Oct 29, 2017
cbb8abe
fixed mutiple bugs
amazingandyyy Oct 29, 2017
0f13b2c
fix the missing currentSize initialization
amazingandyyy Oct 29, 2017
8b65796
fix styling
amazingandyyy Oct 30, 2017
ae508c0
update styling
amazingandyyy Oct 30, 2017
a4309ac
crowdsale test added
kwanhongyap Oct 30, 2017
bbad15c
crowdsale edited
kwanhongyap Oct 30, 2017
99c2588
crowdsale change again
kwanhongyap Oct 30, 2017
090a2ed
Merge branch 'master' of https://github.com/j-paterson/Midterm
amazingandyyy Oct 30, 2017
19a642a
update testing
amazingandyyy Oct 30, 2017
7069b2e
update testing
amazingandyyy Oct 30, 2017
7e12981
add removeContract
amazingandyyy Oct 30, 2017
638b018
up to date
amazingandyyy Oct 30, 2017
207a59a
many updates
kwanhongyap Oct 30, 2017
b9b9bfa
some tests
j-paterson Oct 30, 2017
4afe296
updated totalSupply()
j-paterson Oct 30, 2017
8bd3f84
add totalSupply to Toekn
amazingandyyy Oct 30, 2017
b6c3927
Merge branch 'master' of https://github.com/j-paterson/Midterm
amazingandyyy Oct 30, 2017
8f0e968
some tests
j-paterson Oct 30, 2017
fe695ab
Merge branch 'master' of https://github.com/j-paterson/Midterm
j-paterson Oct 30, 2017
c65c262
totalToken implemented instead
j-paterson Oct 30, 2017
07f6d07
Token tested and working
j-paterson Oct 30, 2017
4603a21
fix checkPlace
amazingandyyy Oct 30, 2017
89a2ca0
Merge branch 'master' of https://github.com/j-paterson/Midterm
amazingandyyy Oct 30, 2017
391ea5b
update testing
amazingandyyy Oct 30, 2017
98ffa8c
Some last minute crowdsale edits
j-paterson Oct 30, 2017
ac71162
Some last minute crowdsale edits
j-paterson Oct 30, 2017
8da5562
update styles
amazingandyyy Oct 31, 2017
69653c3
Merge branch 'master' of https://github.com/j-paterson/Midterm
amazingandyyy Oct 31, 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
Binary file added .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea
283 changes: 283 additions & 0 deletions build/contracts/Crowdsale.json

Large diffs are not rendered by default.

176 changes: 176 additions & 0 deletions build/contracts/ERC20Interface.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
{
"contract_name": "ERC20Interface",
"abi": [
{
"constant": false,
"inputs": [
{
"name": "_spender",
"type": "address"
},
{
"name": "_value",
"type": "uint256"
}
],
"name": "approve",
"outputs": [
{
"name": "success",
"type": "bool"
}
],
"payable": false,
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "totalSupply",
"outputs": [
{
"name": "",
"type": "uint256"
}
],
"payable": false,
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "_from",
"type": "address"
},
{
"name": "_to",
"type": "address"
},
{
"name": "_value",
"type": "uint256"
}
],
"name": "transferFrom",
"outputs": [
{
"name": "success",
"type": "bool"
}
],
"payable": false,
"type": "function"
},
{
"constant": true,
"inputs": [
{
"name": "_owner",
"type": "address"
}
],
"name": "balanceOf",
"outputs": [
{
"name": "balance",
"type": "uint256"
}
],
"payable": false,
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "_to",
"type": "address"
},
{
"name": "_value",
"type": "uint256"
}
],
"name": "transfer",
"outputs": [
{
"name": "success",
"type": "bool"
}
],
"payable": false,
"type": "function"
},
{
"constant": true,
"inputs": [
{
"name": "_owner",
"type": "address"
},
{
"name": "_spender",
"type": "address"
}
],
"name": "allowance",
"outputs": [
{
"name": "remaining",
"type": "uint256"
}
],
"payable": false,
"type": "function"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"name": "_from",
"type": "address"
},
{
"indexed": true,
"name": "_to",
"type": "address"
},
{
"indexed": false,
"name": "_value",
"type": "uint256"
}
],
"name": "Transfer",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"name": "_owner",
"type": "address"
},
{
"indexed": true,
"name": "_spender",
"type": "address"
},
{
"indexed": false,
"name": "_value",
"type": "uint256"
}
],
"name": "Approval",
"type": "event"
}
],
"unlinked_binary": "0x",
"networks": {},
"schema_version": "0.0.5",
"updated_at": 1509337110556
}
8 changes: 8 additions & 0 deletions build/contracts/Math.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"contract_name": "Math",
"abi": [],
"unlinked_binary": "0x60606040523415600e57600080fd5b5b603680601c6000396000f30060606040525b600080fd00a165627a7a72305820eb855728139403df615f8e482c318da4945731be87bdeb0e632e84f60ec384f20029",
"networks": {},
"schema_version": "0.0.5",
"updated_at": 1509327704464
}
79 changes: 79 additions & 0 deletions build/contracts/Migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"contract_name": "Migrations",
"abi": [
{
"constant": false,
"inputs": [
{
"name": "new_address",
"type": "address"
}
],
"name": "upgrade",
"outputs": [],
"payable": false,
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "last_completed_migration",
"outputs": [
{
"name": "",
"type": "uint256"
}
],
"payable": false,
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "owner",
"outputs": [
{
"name": "",
"type": "address"
}
],
"payable": false,
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "completed",
"type": "uint256"
}
],
"name": "setCompleted",
"outputs": [],
"payable": false,
"type": "function"
},
{
"inputs": [],
"payable": false,
"type": "constructor"
}
],
"unlinked_binary": "0x6060604052341561000f57600080fd5b5b60008054600160a060020a03191633600160a060020a03161790555b5b6101e58061003c6000396000f300606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416630900f010811461005e578063445df0ac1461007f5780638da5cb5b146100a4578063fdacd576146100d3575b600080fd5b341561006957600080fd5b61007d600160a060020a03600435166100eb565b005b341561008a57600080fd5b610092610182565b60405190815260200160405180910390f35b34156100af57600080fd5b6100b7610188565b604051600160a060020a03909116815260200160405180910390f35b34156100de57600080fd5b61007d600435610197565b005b6000805433600160a060020a039081169116141561017c5781905080600160a060020a031663fdacd5766001546040517c010000000000000000000000000000000000000000000000000000000063ffffffff84160281526004810191909152602401600060405180830381600087803b151561016757600080fd5b6102c65a03f1151561017857600080fd5b5050505b5b5b5050565b60015481565b600054600160a060020a031681565b60005433600160a060020a03908116911614156101b45760018190555b5b5b505600a165627a7a72305820fa6c296ebecbcd435b3e1a79ab91aeceb41aeae9d1a346db95530ee00a20c6a80029",
"networks": {
"1509327668930": {
"events": {},
"links": {},
"address": "0x4ab54ed565a537e0495552c05a5700c255bfe68f",
"updated_at": 1509327705382
},
"1509337117897": {
"events": {},
"links": {},
"address": "0x2772684b8a88b4c1d7c02e70bf1fe1e06c551b40",
"updated_at": 1509337129593
}
},
"schema_version": "0.0.5",
"updated_at": 1509337129593
}
113 changes: 113 additions & 0 deletions build/contracts/Queue.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
{
"contract_name": "Queue",
"abi": [
{
"constant": true,
"inputs": [],
"name": "getFirst",
"outputs": [
{
"name": "",
"type": "address"
}
],
"payable": false,
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "qsize",
"outputs": [
{
"name": "",
"type": "uint8"
}
],
"payable": false,
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "addr",
"type": "address"
}
],
"name": "enqueue",
"outputs": [],
"payable": false,
"type": "function"
},
{
"constant": false,
"inputs": [],
"name": "dequeue",
"outputs": [],
"payable": false,
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "checkPlace",
"outputs": [
{
"name": "",
"type": "uint8"
}
],
"payable": false,
"type": "function"
},
{
"constant": false,
"inputs": [],
"name": "checkTime",
"outputs": [],
"payable": false,
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "empty",
"outputs": [
{
"name": "",
"type": "bool"
}
],
"payable": false,
"type": "function"
},
{
"inputs": [
{
"name": "_timeLimit",
"type": "uint256"
}
],
"payable": false,
"type": "constructor"
}
],
"unlinked_binary": "0x60606040526000805460ff19166005179055341561001c57600080fd5b6040516020806104a0833981016040528080519150505b6002805460ff1916905560018190555b505b61044c806100546000396000f300606060405236156100805763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416631e22314381146100855780633e3c9eae146100b45780638f807f6b146100dd578063957908d1146100fe578063ad7d59fc14610113578063e0c6190d1461013c578063f2a75fe414610151575b600080fd5b341561009057600080fd5b610098610178565b604051600160a060020a03909116815260200160405180910390f35b34156100bf57600080fd5b6100c76101c2565b60405160ff909116815260200160405180910390f35b34156100e857600080fd5b6100fc600160a060020a03600435166101cc565b005b341561010957600080fd5b6100fc610278565b005b341561011e57600080fd5b6100c76102e7565b60405160ff909116815260200160405180910390f35b341561014757600080fd5b6100fc610354565b005b341561015c57600080fd5b6101646103a4565b604051901515815260200160405180910390f35b60025460009060ff16819011156101bb5760038054600090811061019857fe5b906000526020600020906002020160005b5054600160a060020a031690506101bf565b5060005b90565b60025460ff165b90565b60005460025460ff9182169116106101e357600080fd5b60038054600181016101f583826103af565b916000526020600020906002020160005b60408051908101604052600160a060020a03851681524260208201529190508151815473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039190911617815560208201516001918201556002805460ff19811660ff9182169093011691909117905550505b50565b600254600060ff90911611156102e45760038054600090811061029757fe5b906000526020600020906002020160005b50805473ffffffffffffffffffffffffffffffffffffffff1916815560006001909101556002805460ff808216600019011660ff199091161790555b5b565b6000805b60025460ff908116908216101561034b5733600160a060020a031660038260ff1681548110151561031857fe5b906000526020600020906002020160005b5054600160a060020a0316141561034257809150610350565b5b6001016102eb565b600091505b5090565b600254600060ff9091161180156103935750426001546003600081548110151561037a57fe5b906000526020600020906002020160005b506001015401105b156102e4576102e4610278565b5b5b565b60025460ff16155b90565b8154818355818115116103db576002028160020283600052602060002091820191016103db91906103e1565b5b505050565b6101bf91905b8082111561035057805473ffffffffffffffffffffffffffffffffffffffff19168155600060018201556002016103e7565b5090565b905600a165627a7a72305820f5706623c3ea06a14b7c3d6b40fe3ac5596bec4e716bca83a051c0113bf66a690029",
"networks": {
"1509327668930": {
"events": {},
"links": {},
"address": "0xe3b08d118fdb4f6d5afceb5be95df1e44440e762",
"updated_at": 1509327705379
},
"1509337117897": {
"events": {},
"links": {},
"address": "0x0e14928a4e352bca36bc683b5a9465a6c77454db",
"updated_at": 1509337129592
}
},
"schema_version": "0.0.5",
"updated_at": 1509337129592
}
8 changes: 8 additions & 0 deletions build/contracts/SafeMath.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"contract_name": "SafeMath",
"abi": [],
"unlinked_binary": "0x60606040523415600e57600080fd5b5b603680601c6000396000f30060606040525b600080fd00a165627a7a723058206253a4a0942398dc417fdfc4a5f89e1806e15f4b38fac8b691b39e81ea2622bf0029",
"networks": {},
"schema_version": "0.0.5",
"updated_at": 1509327704464
}
Loading