Commit Graph

254 Commits

Author SHA1 Message Date
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
Ricardo Guilherme Schmidt 9d5518ea24 update to new solidity 2018-05-08 00:51:07 -03:00
Ricardo Guilherme Schmidt ae4221a2ec Merge remote-tracking branch 'origin/bootstrap' into minimetoken 2018-05-08 00:29:57 -03:00
Ricardo Guilherme Schmidt 7b79862005 make constructors internal of abstract contracts 2018-05-07 23:38:54 -03:00
Ricardo Guilherme Schmidt 9067b7a21c Implement TestToken 2018-05-07 23:38:01 -03:00
Ricardo Guilherme Schmidt bc3933b1f5 change ERC20Token to interface 2018-05-07 23:37:45 -03:00
Richard Ramos 23eb306fab Merge branch '096-tribute-to-talk' of https://github.com/status-im/contracts into 096-tribute-to-talk 2018-05-07 09:32:18 -04:00
Richard Ramos d9e0d463b3 Updated package.json to include embark 3.0.0 2018-05-07 09:32:06 -04:00
Richard Ramos abe83d47e6
Updating readme 2018-05-07 09:28:55 -04:00
Richard Ramos d89586a6fc
Updated documentation to add Ropsten address 2018-04-30 07:20:27 -04:00
Richard Ramos dc162ffbb8 Merge branch '096-tribute-to-talk' of https://github.com/status-im/contracts into 096-tribute-to-talk 2018-04-27 11:37:54 -04:00
Richard Ramos 4b6b338449 Formatting parameters 2018-04-27 11:37:19 -04:00
Richard Ramos 3b0d17c979
Typo fix. 2018-04-27 11:11:28 -04:00
Richard Ramos 6440a0d2b4 Updated documentation 2018-04-27 11:07:22 -04:00
Richard Ramos c168779225 Finished the documentation for contract 2018-04-27 11:05:11 -04:00
Richard Ramos 01eb5964e5 Link to docs in Readme 2018-04-27 10:14:01 -04:00
Richard Ramos 766d5f8255 Adding documentation 2018-04-27 10:12:52 -04:00
Richard Ramos 037517eab0 Scope fix 2018-04-26 17:15:38 -04:00
Richard Ramos e6b9d24dc0 Removed comments 2018-04-26 17:11:33 -04:00
Richard Ramos cb5265d824 Updated test unit to reflect message signing logic 2018-04-26 17:08:59 -04:00
Ricardo Guilherme Schmidt 3ac4be7bbd encapstulate message hashing as views 2018-04-26 01:48:14 -03:00
Ricardo Guilherme Schmidt 6fbb3b703a bump solidity version 2018-04-26 01:39:02 -03:00
Ricardo Guilherme Schmidt 839101af1d remove controller 2018-04-26 01:38:15 -03:00
Ricardo Guilherme Schmidt 6b3dfcbfd0 remove need of request transaction 2018-04-26 01:37:37 -03:00
Ricardo Guilherme Schmidt 6d133c35a2 fix ecrecover 2018-04-26 01:08:36 -03:00
Ricardo Guilherme Schmidt be4a54fe30 Merge branch 'bootstrap' into 096-tribute-to-talk 2018-04-26 01:05:02 -03:00
Ricardo Guilherme Schmidt 6600ee5ccf add basic ethereum signing message methods 2018-04-26 01:03:55 -03:00
Ricardo Guilherme Schmidt 80b44c9e89 remove friendlist 2018-04-26 00:48:31 -03:00
Ricardo Guilherme Schmidt 962ca2e35c make transfer only at granted audience 2018-04-26 00:09:19 -03:00
Ricardo Guilherme Schmidt c8f8bf5ebb fix misscommit 2018-04-26 00:00:16 -03:00
Ricardo Guilherme Schmidt 684b257dd8 missing refunds 2018-04-25 23:54:40 -03:00
Ricardo Guilherme Schmidt 6c0988e932 Remove need of deposit/withdraw using allowance 2018-04-25 23:45:25 -03:00
Ricardo Guilherme Schmidt 9d542b70eb generalize token 2018-04-25 10:03:54 -03:00
Ricardo Guilherme Schmidt 72a4b9e433 include dependency instance factory 2018-04-23 02:12:55 -03:00
Ricardo Guilherme Schmidt fade1238b3 reorg 2018-04-23 02:12:55 -03:00
Ricardo Guilherme Schmidt 5c93c14e35 reorg 2018-04-23 02:12:55 -03:00
Ricardo Guilherme Schmidt 31e362802f include dependency minimetoken 2018-04-23 02:12:55 -03:00
Ricardo Guilherme Schmidt 3ee96f0144 reorg 2018-04-23 02:12:55 -03:00
Ricardo Guilherme Schmidt a1dd9d14a9 reorg 2018-04-23 02:11:21 -03:00
Ricardo Guilherme Schmidt 37135766e7 cleanup contents and update solc 2018-04-23 02:04:49 -03:00
Ricardo Guilherme Schmidt 6750c665e8 cleanup bootstrap 2018-04-23 01:58:58 -03:00
Ricardo Guilherme Schmidt 706941acb0 add return factoried contract address + add emit keyword 2018-04-19 05:33:04 -03:00
Richard Ramos ea10012bfd Linting + nat/radspec 2018-04-16 10:13:07 -04:00
Ricardo Guilherme Schmidt 6a52cd4d09 reorganize contract 2018-04-13 15:33:58 -03:00
Ricardo Guilherme Schmidt 6c4fd0651e reduce gas usage 2018-04-13 15:33:12 -03:00
Richard Ramos a94156dd2f Merge from embark into develop 2018-04-09 10:18:44 -04:00
Richard Ramos cf3bed0821 Removing console.log 2018-04-06 15:56:21 -04:00
Richard Ramos 4d6de6852b Updated contract for tributes to be waived 2018-04-06 15:40:11 -04:00