Commit Graph

7608 Commits

Author SHA1 Message Date
Gav Wood 90d3d330f5
Use info! for blockchain status rather than stdout. 2016-12-16 11:00:17 +01:00
Gav Wood 396ab5b361
Refactor and make is_syncing. 2016-12-16 10:31:10 +01:00
Gav Wood 35b18485d4
Don't check for updates while syncing. 2016-12-16 10:14:44 +01:00
Gav Wood ba60e046be
Tone down logging. 2016-12-16 10:02:42 +01:00
Gav Wood a6a8e431f5
Fix lint 2016-12-15 22:46:36 +01:00
Gav Wood 7cac50601f
Add JS tests for parity_netPeers 2016-12-15 22:45:35 +01:00
Gav Wood 869fbf5108
Fix linting. 2016-12-15 22:07:25 +01:00
Gav Wood ca0d87da10
125 -> 69. 2016-12-15 22:05:54 +01:00
Gav Wood 5bab14e0c0
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 21:15:25 +01:00
Gav Wood 5fb34573c6 Merge pull request #3864 from ethcore/jr-fix-verification
fix verification stores
2016-12-15 21:13:05 +01:00
Gav Wood 1a790b784f
Fix centos's reported build platform. 2016-12-15 20:49:09 +01:00
Jannis R d2962fe47b
store certifier index in constant 2016-12-15 20:47:41 +01:00
Gav Wood 4410fb635a
Respect system paths. 2016-12-15 19:53:13 +01:00
Gav Wood 801596395e
--release-track. 2016-12-15 19:23:25 +01:00
Gav Wood 995fafebee
Fix last remaining test. 2016-12-15 19:19:50 +01:00
Gav Wood d737de0fc0
Fix tests. 2016-12-15 19:17:44 +01:00
Gav Wood 4a2b418fc2
Configurable update tracks to help testing. 2016-12-15 18:51:59 +01:00
Gav Wood fa319ff64c
Remove duplicate line. 2016-12-15 18:24:18 +01:00
GitLab Build Bot 867fdb9eac [ci skip] js-precompiled 20161215-172100 2016-12-15 17:23:53 +00:00
Gav Wood c12702fc51
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 18:23:02 +01:00
Jannis Redmann 5939575c87 Merge #3863 from ethcore/jg-contract-subid
Store subscriptionId, align with main subscription model
2016-12-15 18:14:33 +01:00
Jannis R 7fdcc70825
Merge jg-contract-subid into jr-fix-verification 2016-12-15 18:12:45 +01:00
Jaco Greeff 1f1dc8b89d Store subscriptionId, use it to send changes 2016-12-15 18:09:59 +01:00
Jannis R 0e963da27b
fix verification stores 🐛 2016-12-15 18:09:52 +01:00
Gav Wood 4d6b4d9d72 Merge pull request #3792 from ethcore/dapps-accounts-rpc
Additional RPCs for dapps accounts management
2016-12-15 18:09:40 +01:00
Jaco Greeff 2be5247567 Merge branch 'master' into jg-contract-subid 2016-12-15 18:06:45 +01:00
Gav Wood eb90d70be1 Merge pull request #3830 from ethcore/cli-rpc
Add Ws Json rpc client and command line utils (take 2)
2016-12-15 18:04:35 +01:00
GitLab Build Bot 87f1486907 [ci skip] js-precompiled 20161215-170041 2016-12-15 17:03:27 +00:00
Jannis Redmann 29457c11ef Merge #3862 from ethcore/jg-fix-contracts-send
Fix typo in method call (broken contract interface)
2016-12-15 17:54:42 +01:00
Jaco Greeff 17781a5ac4 Fix typo in method call 2016-12-15 17:52:28 +01:00
Gav Wood 943f58487c
Merge remote-tracking branch 'origin/master' into cli-rpc 2016-12-15 17:13:51 +01:00
Gav Wood d455ac4a40
Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc 2016-12-15 17:12:18 +01:00
Gav Wood db2e1dd01a
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 17:11:22 +01:00
Gav Wood 2e02db2d3e Merge pull request #3860 from ethcore/fix-channel
Fix flaky test
2016-12-15 17:10:41 +01:00
keorn ee653bc262 unused import 2016-12-15 16:53:28 +01:00
keorn 9bfa69c6bd fix channel 2016-12-15 16:52:39 +01:00
Jaco Greeff 9dd1268b69 Add keys for steps (future-proof) 2016-12-15 15:56:58 +01:00
Gav Wood 5e59e0b9d3
Fix build. 2016-12-15 15:35:46 +01:00
Gav Wood 817a58cf64 Merge pull request #3844 from ethcore/trace-macros
Converting traces API to AutoArgs
2016-12-15 15:21:35 +01:00
Gav Wood 590428e7f2
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 15:12:09 +01:00
Gav Wood d1040e4127 Whitespace 2016-12-15 15:03:34 +01:00
Gav Wood 8f5e0cf7d9
Fix build 2016-12-15 14:54:02 +01:00
GitLab Build Bot 7e76d6494c [ci skip] js-precompiled 20161215-134858 2016-12-15 13:52:59 +00:00
Gav Wood ca63bc2f44 Update parking_lot dep 2016-12-15 14:46:31 +01:00
Gav Wood 0da564a4c2 Merge branch 'master' into cli-rpc 2016-12-15 14:45:15 +01:00
Gav Wood d76239ed48 Merge pull request #3768 from ethcore/jr-use-badge-reg
get certifications from BadgeReg, show them in accounts overview
2016-12-15 14:43:05 +01:00
Gav Wood 20b2f84d48 Merge pull request #3828 from ethcore/new-dirs
New directory structure
2016-12-15 14:34:01 +01:00
GitLab Build Bot 6dfcbd4156 [ci skip] js-precompiled 20161215-130206 2016-12-15 13:06:03 +00:00
Jaco Greeff 054a6a9daf Merge branch 'master' into check-updates
# Conflicts:
#	.gitlab-ci.yml
#	js/webpack/dev.server.js
2016-12-15 13:52:28 +01:00
Gav Wood be0d5ca516 Merge pull request #3827 from ethcore/jr-first-run
first run: skip account creation if they already have accounts
2016-12-15 13:52:01 +01:00