Commit Graph

245 Commits

Author SHA1 Message Date
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 ffb4fa6ef5 replace repeated logic in a modifier, change const names, change event 2018-05-08 20:12:32 -03:00
Ricardo Guilherme Schmidt 6cbf61424a makes possible to deploy contracts gas relayed 2018-05-08 19:28:24 -03:00
Ricardo Guilherme Schmidt 468b8c11c4 Merge remote-tracking branch 'origin/minimetoken' into 150-gas-abstraction 2018-05-08 14:51:01 -03:00
Richard Ramos 2bc2bae396 Updating embark version 2018-05-08 09:48:05 -04:00
Richard Ramos cd0f768d17 Fixing bug verifiying instance 2018-05-08 09:46:03 -04: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
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 7126b4e3e0 Bug fixing 2018-05-04 09:25:10 -04:00
Richard Ramos 03512703fb Small note in readme. Must expand this 2018-05-03 15:53:17 -04:00
Richard Ramos 9cd85e6541 Contract code verification 2018-05-03 15:41:25 -04:00
Richard Ramos b90ac50ec9 Changed baseToken to its own row 2018-05-03 11:26:35 -04:00
Richard Ramos 8e32274461 Fixing estimation connection error 2018-05-03 10:59:28 -04:00
Richard Ramos 520859cd27 Adding approveAndCallGasRelayed base component 2018-05-03 10:59:12 -04:00
Richard Ramos 293c585d87 Fixing estimated gas verification 2018-05-03 09:36:44 -04:00
Richard Ramos c39d765af5 Merge branch '150-gas-abstraction' of https://github.com/status-im/contracts into 000-gas-relayer-node 2018-05-02 17:03:00 -04:00