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.

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

Jump to bottom

Provided configurability into the EVT voting rounds #32

Merged
merged 40 commits into from Sep 18, 2018
Merged

Provided configurability into the EVT voting rounds #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
738f33e
Add deployment script, add some basic tests, allow to send as much to…
nklipa13 Aug 17, 2018
d106ae1
Add possiblity to have different criteria to win the vote, add possib…
nklipa13 Aug 17, 2018
473df07
Add openZepelin to package.json
nklipa13 Aug 17, 2018
0bb383d
Carry over half of votees to next round
nklipa13 Aug 23, 2018
323d9c0
Separate contract with basic and advanced functionalities
nklipa13 Aug 24, 2018
09203aa
Separe contracts with basic and advanced logic
nklipa13 Aug 24, 2018
969402f
Add possibility to delegate votes
nklipa13 Aug 24, 2018
a198619
Added script for getting config, added new networks to deploy migration'
nklipa13 Aug 30, 2018
3526bd2
Update contracts
sterlu Aug 31, 2018
33bf924
Add amount to voting for on token listing
sterlu Aug 31, 2018
f40e7aa
Add voting delegation
Matko95 Aug 31, 2018
bb688f6
Merge remote-tracking branch 'origin/master'
Matko95 Aug 31, 2018
9391611
Add contracts to reflect current state of NEC token, add more data ab…
nklipa13 Aug 31, 2018
825e672
Optimize contract for carrying votes
nklipa13 Aug 31, 2018
a934b31
Merge branch 'master' of github.com:nklipa13/community-gateway
nklipa13 Aug 31, 2018
6620dc5
Delegation text adjustment
Sep 4, 2018
d7c25b8
Adding tests for TokenListingManagerAdvanced
yippee-ki-yay Sep 11, 2018
bab462c
Check if proposal is active
nklipa13 Sep 11, 2018
0b665a8
Merge branch 'master' of github.com:nklipa13/community-gateway
nklipa13 Sep 11, 2018
adf47bc
Minor bug fixes
sterlu Sep 11, 2018
147992c
Display live data for active token listing proposal from ct
sterlu Sep 11, 2018
1b9cd4c
Token voting fix & improvements
sterlu Sep 11, 2018
1dc7fcd
Merge branch 'master' of github.com:nklipa13/community-gateway
nklipa13 Sep 11, 2018
5170e21
Gas optimizations and additional test
yippee-ki-yay Sep 12, 2018
6e55040
Merge branch 'master' of github.com:nklipa13/community-gateway
yippee-ki-yay Sep 12, 2018
79399c7
Merge branch 'master' of github.com:nklipa13/community-gateway
nklipa13 Sep 12, 2018
502715e
Optimize solidity code, add more limitations about delegates
nklipa13 Sep 12, 2018
3c9bc70
Vote delegation UI
sterlu Sep 12, 2018
e9f28fa
Icons on delegation page
sterlu Sep 13, 2018
00ff058
Adjust for recent stats
Sep 13, 2018
1095bd4
Prevent overflows when there is no proposals
nklipa13 Sep 14, 2018
00bfe04
Contract optimizations, add possibility to unset yourself as delegate
nklipa13 Sep 15, 2018
bba61d8
Small fixes based on review
nklipa13 Sep 16, 2018
f65eeb7
Allow multiple votes up to total balance
Sep 17, 2018
2207be3
Fix missing semi-colon
plutoegg Sep 17, 2018
e42612a
Fix overflow bug in voting method
yippee-ki-yay Sep 18, 2018
5ac57e4
Prevent delegate change if user has voted already
sterlu Sep 18, 2018
1ba7d2b
Fetch if token proposal is active from contract
sterlu Sep 18, 2018
ec4748a
Update Mainnet contracts
sterlu Sep 18, 2018
da7e18a
Merge branch 'master' into master
plutoegg Sep 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -6,3 +6,4 @@ src/constants/config.json
server/config.js
server/*.db
dist/
.env
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
"author": "Nikola Vukovic <nvukovic@decenter.com>",
"license": "MIT",
"scripts": {
"dev": "webpack-dev-server --https --history-api-fallback --compress --config ./build/webpack-dev.config.js --host=0.0.0.0",
"dev": "webpack-dev-server --history-api-fallback --compress --config ./build/webpack-dev.config.js --host=0.0.0.0",
"prod": "webpack --config ./build/webpack-prod.config.js",
"prod-serve": "webpack-dev-server --https --history-api-fallback --compress --config ./build/webpack-prod.config.js"
},
Expand Down Expand Up @@ -36,6 +36,7 @@
"image-webpack-loader": "^4.0.0",
"ledgerco": "^1.2.1",
"node-sass": "^4.7.2",
"openzeppelin-solidity": "1.12.0",
"optimize-css-assets-webpack-plugin": "^3.2.0",
"prop-types": "^15.6.0",
"react": "^16.2.0",
Expand Down
45,540 changes: 31,360 additions & 14,180 deletions solidity/build/contracts/ApproveAndCallFallBack.json
View file
Open in desktop

Large diffs are not rendered by default.

1,260 changes: 810 additions & 450 deletions solidity/build/contracts/Controlled.json
View file
Open in desktop

Large diffs are not rendered by default.