Commit Graph

2720 Commits

Author SHA1 Message Date
Jarrad 00d153b05a Merge pull request #14 from status-im/account-sync
Fix account inject/create functionality, remove datadir from create
2016-07-12 15:39:13 +02:00
Daniel Whitenack 32a364fb2a wq
Merge branch 'account-sync' of https://github.com/status-im/status-go into account-sync
2016-07-08 12:36:49 -05:00
Daniel Whitenack 1be919efa8 filepath fix 2016-07-08 12:36:28 -05:00
Jarrad 00ce499215 Merge pull request #13 from status-im/rpc-flags
rpc flags added to the start up context
2016-07-07 10:04:53 +02:00
Adrian Tiberius 64edf2ddf2 fix type and account manager in-memory object 2016-07-04 19:16:18 +03:00
Adrian Tiberius 72b84b05f8 added addPeer binding 2016-07-04 19:00:29 +03:00
Adrian Tiberius 032cc27901 use single account manager instead of creating new ones 2016-07-04 15:28:49 +03:00
Adrian Tiberius 0b34f85a43 wrong JNI version fix 2016-07-04 00:46:05 +03:00
Roman Volosovskyi e7a8371fe2 Merge branch 'rpc-flags' into light-rebase 2016-07-03 23:20:12 +03:00
Roman Volosovskyi b5436645c6 Merge branch 'jail' into light-rebase 2016-07-03 23:20:02 +03:00
Daniel Whitenack 994aaac679 rebase to light-stable, light flags 2016-07-03 14:44:31 -05:00
Jarrad a37e97cb03 light and testnet flags, omit noeth 2016-07-03 10:55:57 +02:00
Roman Volosovskyi 3ae7b939ae Merge remote-tracking branch 'origin/account-sync' into rpc-flags 2016-07-02 18:55:40 +03:00
Daniel Whitenack 8ac7e83305 try whisper key copy 2016-07-02 10:54:00 -05:00
Roman Volosovskyi 656e762656 Merge remote-tracking branch 'origin/account-sync' into rpc-flags 2016-07-02 14:12:45 +03:00
Daniel Whitenack 271a42a5a1 remove other debugging 2016-07-01 10:56:41 -05:00
Daniel Whitenack 372efe2965 debug remove 2016-07-01 10:48:37 -05:00
Roman Volosovskyi da53ece73a Merge remote-tracking branch 'origin/account-sync' into rpc-flags 2016-07-01 18:45:43 +03:00
Daniel Whitenack f34cef1d47 account sync pointer fix 2016-07-01 10:43:55 -05:00
Roman Volosovskyi ce2f2e7f8a Merge remote-tracking branch 'origin/account-sync' into rpc-flags 2016-07-01 17:38:57 +03:00
Daniel Whitenack 2241ceccd4 fix datadir for account create, and account sync 2016-07-01 08:23:39 -05:00
Roman Volosovskyi 5d7b297d80 Merge remote-tracking branch 'origin/node-object' into rpc-flags 2016-06-30 19:34:25 +03:00
Jarrad 9fd122d27a Merge pull request #7 from status-im/jail
Jail
2016-06-30 16:59:43 +02:00
Daniel Whitenack 9c472f9599 other rpc flags 2016-06-30 09:32:06 -05:00
Daniel Whitenack 4e88d5d5cc TODO flag for admin 2016-06-30 08:54:36 -05:00
Daniel Whitenack 59299d1b0e rpc flags added to the start up context 2016-06-30 08:50:28 -05:00
Jarrad 653e5fe406 Merge pull request #12 from status-im/light-decrypt
Light decrypt
2016-06-30 15:44:42 +02:00
Daniel Whitenack dbf21cdfba empty error values 2016-06-30 08:43:51 -05:00
Daniel Whitenack e95e22f067 error handling to C 2016-06-30 08:23:07 -05:00
Daniel Whitenack 8dcb47d97f change decrypt params to 2^12 and 6 2016-06-30 07:53:17 -05:00
Daniel Whitenack 89a6b09212 redirect logging to datadir 2016-06-29 17:48:21 -05:00
Daniel Whitenack e118c53e7e remove debug stuff 2016-06-29 06:57:21 -05:00
Daniel Whitenack f20608eaa7 re-name functions, modify inputs 2016-06-29 06:32:04 -05:00
Jarrad d26d566cde Merge pull request #5 from status-im/node-object
In memory node object.
2016-06-28 16:07:19 +02:00
Roman Volosovskyi 97907f89d6 Merge branch 'node-object-jni' into jail 2016-06-24 18:37:24 +03:00
rom 122aea9c80 library.c : fix JniAttach attach/detach status 2016-06-24 18:34:26 +03:00
Roman Volosovskyi 997d5ca20b Merge branch 'node-object-jni' into jail 2016-06-24 17:53:35 +03:00
rom 814e076d64 library.c : AttachCurrentThread for Android NDK 2016-06-24 17:49:42 +03:00
Roman Volosovskyi d104a9bf1c Merge branch 'node-object-jni' into jail 2016-06-24 17:35:04 +03:00
rom 7122e86b18 library.c : call static method com.statusim.GethService.signalEvent 2016-06-24 17:16:56 +03:00
Roman Volosovskyi 85abe12364 json output 2016-06-23 16:56:02 +03:00
Roman Volosovskyi 6f02c4cc3c Merge branch 'node-object' into jail 2016-06-23 16:17:00 +03:00
Daniel Whitenack 9272538432 account bindings update, return format, and tests 2016-06-22 13:56:27 -05:00
Roman Volosovskyi e827d3d22e oops 2016-06-22 18:31:22 +03:00
Roman Volosovskyi 7b795df475 return errors from jail 2016-06-22 15:46:00 +03:00
Daniel Whitenack 72bf6a236a simplify returns 2016-06-22 06:44:12 -05:00
Daniel Whitenack ff1be499e0 JSON output for bindings 2016-06-22 06:33:28 -05:00
Daniel Whitenack e47d7a024f JSON output for bindings 2016-06-22 06:29:35 -05:00
Roman Volosovskyi df47de9aea jail 2016-06-22 12:17:51 +03:00
Roman Volosovskyi a0cd61464c fix export 2016-06-22 12:15:38 +03:00