Richard Ramos
|
a9c54f50b9
|
Finally running plasma_cash with Embark
|
2018-07-31 20:38:43 -04:00 |
|
Richard Ramos
|
6d37870846
|
Setting up same version of openzeppelin as loom example
|
2018-07-31 14:45:14 -04:00 |
|
Richard Ramos
|
ace956e796
|
Updating RootChain contract
|
2018-07-31 13:41:21 -04:00 |
|
Richard Ramos
|
98f2f077a2
|
Adding back register function
|
2018-07-31 12:13:22 -04:00 |
|
Richard Ramos
|
9309f2bfac
|
Reorganizing contracts and adding NFTTypes
|
2018-07-31 10:31:49 -04:00 |
|
Richard Ramos
|
fc6f49523b
|
Added token to convert from ERC20 to ERC721
|
2018-07-31 10:03:31 -04:00 |
|
Richard Ramos
|
e2a4074e29
|
Adding required contracts for PlasmaChain
|
2018-07-31 09:11:14 -04:00 |
|
Richard Ramos
|
fe7c0020e1
|
Possible underflows
|
2018-07-03 10:34:39 -04:00 |
|
Richard Ramos
|
5907339d4d
|
Formatting results
|
2018-06-28 16:22:11 -04:00 |
|
Richard Ramos
|
ff338bb7b0
|
Allowing voting / unvoting
|
2018-06-27 21:42:17 -04:00 |
|
Richard Ramos
|
c2ba506f5e
|
Loading vote information and balance available for voting
|
2018-06-27 21:18:49 -04:00 |
|
Richard Ramos
|
b7528bbdee
|
Users can vote
|
2018-06-27 20:45:31 -04:00 |
|
Richard Ramos
|
bfad0ae88e
|
Simplified contract to only gather votes without requiring options
|
2018-06-27 17:23:27 -04:00 |
|
Richard Ramos
|
79d0763a7d
|
Added custom vote option
|
2018-06-27 13:27:01 -04:00 |
|
Richard Ramos
|
58be366bd9
|
Removing start block
|
2018-06-26 17:02:04 -04:00 |
|
Richard Ramos
|
f7985fb57c
|
Added quadratic voting
|
2018-06-26 16:34:28 -04:00 |
|
Richard Ramos
|
2979fbcc2e
|
Changed constructor
|
2018-06-26 15:41:28 -04:00 |
|
Richard Ramos
|
9eb347e32c
|
Linting and removing warnings
|
2018-06-26 14:44:45 -04:00 |
|
Richard Ramos
|
3759522633
|
Created test case to demonstrate how to use contracts
|
2018-06-26 13:34:24 -04:00 |
|
Richard Ramos
|
a712cece85
|
Poll contracts
|
2018-06-26 10:19:04 -04:00 |
|
Richard Ramos
|
98dcb1f803
|
Adding topic, to, value and data
|
2018-06-25 17:06:19 -04:00 |
|
Richard Ramos
|
9f122d36ff
|
Tabulation and determining final result
|
2018-06-25 14:35:16 -04:00 |
|
Richard Ramos
|
93d96c07da
|
Last tabulation condition was incorrect
|
2018-06-25 10:25:15 -04:00 |
|
Richard Ramos
|
e160a028cf
|
Voting form did not display during pagination
|
2018-06-25 10:19:10 -04:00 |
|
Richard Ramos
|
da4306b5e1
|
Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp
|
2018-06-22 16:26:47 -04:00 |
|
Richard Ramos
|
9a0284aa9a
|
Adding poll manager
|
2018-06-22 16:26:24 -04:00 |
Ricardo Guilherme Schmidt
|
f4efa8a607
|
add taulation block delay setter and default value of 7 days
|
2018-06-22 16:40:20 -03:00 |
|
Richard Ramos
|
8cec6507eb
|
Updating proposal manager with changes from 000-tcr
|
2018-06-21 15:46:58 -04:00 |
|
Richard Ramos
|
05aa20650b
|
Merged changes on ProposalCuration from 000-tcr
|
2018-06-21 13:58:05 -04:00 |
|
Richard Ramos
|
b50e5bf59e
|
Merged with changes on ProposalManager from 000-tcr
|
2018-06-21 13:48:19 -04:00 |
|
Richard Ramos
|
01afa35a39
|
Displaying buttons depending on proposal state
|
2018-06-03 12:08:53 -04:00 |
|
Richard Ramos
|
2f2a3fee27
|
Added voting
|
2018-05-30 10:32:38 -04:00 |
|
Richard Ramos
|
08d5665245
|
Loading proposals, and reorganized code
|
2018-05-29 20:29:40 -04:00 |
|
Ricardo Guilherme Schmidt
|
b4e83ec6f1
|
move storage to concrete
|
2018-05-22 13:01:24 -03:00 |
|
Ricardo Guilherme Schmidt
|
aa93e03035
|
refactor
|
2018-05-22 07:46:29 -03:00 |
|
Ricardo Guilherme Schmidt
|
f021b36058
|
merge 000-instance-factory
|
2018-05-22 07:44:49 -03:00 |
|
Ricardo Guilherme Schmidt
|
ea0ea87ba1
|
Merge branch 'minimetoken' into 172-topic-democracy
|
2018-05-21 14:46:36 -03:00 |
|
Ricardo Guilherme Schmidt
|
3a31893538
|
require tokenfactory in mmt constructor, fixes in interfaces, bump solcv
|
2018-05-19 16:53:46 -03:00 |
|
Ricardo Guilherme Schmidt
|
cfb26fc1c3
|
Merge branch 'bootstrap' into minimetoken
|
2018-05-19 16:17:29 -03:00 |
|
Ricardo Guilherme Schmidt
|
675cbd2377
|
instance factory merge bootstrap
|
2018-05-13 18:00:07 -03:00 |
|
Ricardo Guilherme Schmidt
|
b2c07c63f7
|
add ERC20Receiver+tests
|
2018-05-13 14:01:59 -03:00 |
|
Ricardo Guilherme Schmidt
|
87dbdbef39
|
missing emit
|
2018-05-13 06:17:39 -03:00 |
|
Ricardo Guilherme Schmidt
|
5dab2021c0
|
update to latest solc
|
2018-05-13 02:47:51 -03:00 |
|
Ricardo Guilherme Schmidt
|
d1a92c93b7
|
Merge branch 'bootstrap' into 000-instance-factory
|
2018-05-13 02:41:13 -03:00 |
|
Ricardo Guilherme Schmidt
|
611649fbd7
|
rename return value
|
2018-05-13 01:28:15 -03:00 |
|
Ricardo Guilherme Schmidt
|
0a1cbb5fff
|
test script for testtoken and erc20token
|
2018-05-12 21:16:18 -03:00 |
|
Ricardo Guilherme Schmidt
|
04e13c6913
|
small fixes
|
2018-05-08 20:17:00 -03:00 |
|
Ricardo Guilherme Schmidt
|
72dffc3a47
|
Merge remote-tracking branch 'origin/bootstrap' into minimetoken
|
2018-05-08 00:54:10 -03:00 |
|
Ricardo Guilherme Schmidt
|
a597410b66
|
fix comment blocks
|
2018-05-08 00:53:51 -03:00 |
|
Ricardo Guilherme Schmidt
|
0e77dafacd
|
Merge branch 'bootstrap' of https://github.com/status-im/contracts into bootstrap
|
2018-05-08 00:52:19 -03:00 |