147 Commits

Author SHA1 Message Date
Ricardo Guilherme Schmidt
09c3863025 bump solc version 2018-05-13 18:09:34 -03:00
Ricardo Guilherme Schmidt
79bad75e54 remove uint256 _purpose from getKey in ERC725 2018-05-13 18:09:20 -03:00
Ricardo Guilherme Schmidt
26a506383a merge 145-identity + 000-instance-factory 2018-05-13 18:04:35 -03:00
Ricardo Guilherme Schmidt
675cbd2377 instance factory merge bootstrap 2018-05-13 18:00:07 -03:00
Ricardo Guilherme Schmidt
eab0c133d1 fix tests 2018-05-13 17:54:05 -03:00
Ricardo Guilherme Schmidt
b2c07c63f7 add ERC20Receiver+tests 2018-05-13 14:01:59 -03:00
Ricardo Guilherme Schmidt
31fb6a416d add package-lock to.json .gitignore 2018-05-13 12:41:38 -03:00
Ricardo Guilherme Schmidt
87dbdbef39 missing emit 2018-05-13 06:17:39 -03:00
Ricardo Guilherme Schmidt
1d26c28408 fix test script 2018-05-13 05:46:39 -03:00
Ricardo Guilherme Schmidt
03a0e163e2 fix constructor + require messages 2018-05-13 05:46:32 -03:00
Ricardo Guilherme Schmidt
a23719a3e2 fix deploy 2018-05-13 05:46:14 -03:00
Ricardo Guilherme Schmidt
a35d849f6c internal constructors 2018-05-13 05:45:03 -03:00
Ricardo Guilherme Schmidt
841edfc4d8 merge 000-bootstrap 2018-05-13 02:53:50 -03:00
Ricardo Guilherme Schmidt
f8d71b40e4 Merge branch 'bootstrap' into 000-instance-factory 2018-05-13 02:51:28 -03:00
Ricardo Guilherme Schmidt
75d85c70be add react to package 2018-05-13 02:49:20 -03:00
Ricardo Guilherme Schmidt
ddf7dd916f no auto deploy of factory or instances 2018-05-13 02:48:14 -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
2ee4ec5c6c fix build and test 2018-05-13 02:39:10 -03:00
Ricardo Guilherme Schmidt
9f06e71d4c Merge branch 'bootstrap' into 145-identity 2018-05-13 01:42:11 -03:00
Ricardo Guilherme Schmidt
a89d67f11a fix in log 2018-05-13 01:40:56 -03:00
Ricardo Guilherme Schmidt
62bf93868c simple token UI 2018-05-13 01:31:01 -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
4e12bd0a16 improve constructor and small fix 2018-05-11 18:46:05 -03:00
Ricardo Guilherme Schmidt
e99ee43443 update to ERC735 rename claimType to topic 2018-05-11 10:44:18 -03:00
Ricardo Guilherme Schmidt
15975dbce3 improve replaceKey 2018-05-11 01:53:22 -03:00
Ricardo Guilherme Schmidt
5b7124fc57 remove loops from recovery by add salt to keys storage pointer 2018-05-11 01:22:11 -03:00
Ricardo Guilherme Schmidt
6f52b6cde8 cheaper recovery processing 2018-05-10 01:24:04 -03:00
Ricardo Guilherme Schmidt
3f9b282fe7 recoveryNewKey was recoveryManager 2018-05-10 00:37:54 -03:00
Ricardo Guilherme Schmidt
5d453489b5 reorder vars + public recoveryContract 2018-05-10 00:35:53 -03:00
Ricardo Guilherme Schmidt
ce79a64424 remove txCount, nonce++ in execute submit, pendingTx was multisigTx 2018-05-10 00:29:52 -03:00
Ricardo Guilherme Schmidt
011a923467 simplify transaction struct + small fix 2018-05-09 19:44:35 -03:00
Ricardo Guilherme Schmidt
036c6285a6 update ERC725 spec 2018-05-09 17:12:43 -03:00
Ricardo Guilherme Schmidt
3a62fcf5db "fix" replaceKey 2018-05-09 02:52:05 -03:00
Ricardo Guilherme Schmidt
66555cd4b5 comments + fix executeMessageSigned + constructor require key 2018-05-09 02:49:40 -03:00
Ricardo Guilherme Schmidt
3fefac4c74 use _execute in "shortcut" modifier to respect nonces, txCounts & events 2018-05-09 02:19:07 -03:00
Ricardo Guilherme Schmidt
86dd249b26 improve recovery call names and lock actions 2018-05-09 01:48:51 -03:00
Ricardo Guilherme Schmidt
a154220026 improve naming of modifier 2018-05-09 01:37:38 -03:00
Ricardo Guilherme Schmidt
310b0074f1 reorder functions 2018-05-09 01:34:33 -03:00
Ricardo Guilherme Schmidt
80aaa9a561 small change in addKey requirements 2018-05-09 01:20:36 -03:00
Ricardo Guilherme Schmidt
a14485c0b0 refactor execution and multisig process 2018-05-09 01:18:35 -03:00
Ricardo Guilherme Schmidt
8938d03911 use MessageSigned.sol abstract contract 2018-05-08 20:48:18 -03:00
Ricardo Guilherme Schmidt
2d8bc3a8fb Merge remote-tracking branch 'origin/bootstrap' into 145-identity 2018-05-08 20:31:16 -03:00
Ricardo Guilherme Schmidt
d26c31498a abstract modifier 2018-05-08 20:29:42 -03:00
Ricardo Guilherme Schmidt
00d2dcacc3 remove unused modifiers 2018-05-08 20:27:41 -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
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