Commit Graph

7000 Commits

Author SHA1 Message Date
Kristoffer Ström
b2b00e9dbe Use Mutex from util 2016-12-09 22:26:08 +01:00
Kristoffer Ström
f700aa39fe Switch to jsonrpc request/response types 2016-12-09 22:26:07 +01:00
Kristoffer Ström
91b7780eb5 comment formating 2016-12-09 22:26:07 +01:00
Kristoffer Ström
7a176094d5 * Use try!/map_err instead of match
* Use jsonrpc_core for serializing/deserializing rpc messages
* Factor out unwraps
* Remove mem::replace
* Add nicer formating of ConfirmationRequests
2016-12-09 22:26:07 +01:00
Kristoffer Ström
273d7c00c3 Pass cli tests, remove compiler warnings 2016-12-09 22:26:07 +01:00
Kristoffer Ström
4e3f8bab10 Add Ws Json rpc client and command line utils 2016-12-09 22:26:05 +01:00
Gav Wood
2226324495 Merge pull request #3778 from ethcore/auth-round-test
AuthorityRound network simulation test
2016-12-09 20:58:05 +01:00
arkpar
97f358ced9 AuthorityRound network simulation test 2016-12-09 20:38:06 +01:00
Gav Wood
598fd42856 Merge pull request #3770 from ethcore/jg-execute-gas
GasPrice selection for contract execution
2016-12-09 20:24:10 +01:00
Gav Wood
0a4e63b462 Merge pull request #3762 from ethcore/tx-check
Reject existing transactions
2016-12-09 20:17:28 +01:00
Gav Wood
45ec84e627 Merge pull request #3752 from ethcore/jg-subscription-check
Allow autoRemove from api.subscribe based on callback return values
2016-12-09 20:16:34 +01:00
Gav Wood
2e1e167397 Merge pull request #3753 from ethcore/jg-fix-gitlab.yml
Replace misplaced & with && in gitlab-ci.yml
2016-12-09 20:16:10 +01:00
GitLab Build Bot
647b62b4a2 [ci skip] js-precompiled 20161209-182130 2016-12-09 18:23:46 +00:00
Gav Wood
cf0b1bb9b2 use path prefix 2016-12-09 19:21:39 +01:00
Gav Wood
b99403740a Merge pull request #3773 from ethcore/ng-enhanced-multisig
Lower gas usage for creating a Multisig Wallet
2016-12-09 19:15:46 +01:00
Arkadiy Paronyan
5758bb7cac Rust files are all non-js files 2016-12-09 19:11:00 +01:00
Gav Wood
9bfceeea21 Merge pull request #3761 from ethcore/io-stop
Added IO service explicit stop
2016-12-09 19:00:46 +01:00
Gav Wood
d5d9d78bd9 It's not either-or. 2016-12-09 18:58:37 +01:00
Jaco Greeff
290a4a40ff Merge branch 'master' into jg-subscription-check 2016-12-09 18:17:36 +01:00
Jaco Greeff
0cbef30508 Unsubscribe on true 2016-12-09 18:17:31 +01:00
Jaco Greeff
99846e2ad2 Merge branch 'master' into jg-subscription-check 2016-12-09 18:14:09 +01:00
Jaco Greeff
1b0945940b Test for boolean result before unsubscribe 2016-12-09 18:14:05 +01:00
GitLab Build Bot
fd23a2972c [ci skip] js-precompiled 20161209-165845 2016-12-09 17:00:59 +00:00
Jaco Greeff
ffd8314a11 Be lenient around invalid owners map (#3764)
* Be lenient around invalid owners map

* Filter invalid owners before render
2016-12-09 17:52:25 +01:00
Nicolas Gotchac
ff11634e1d PR Grumble 2016-12-09 16:55:43 +01:00
Nicolas Gotchac
bace05b154 Merge branch 'master' into ng-enhanced-multisig 2016-12-09 16:40:07 +01:00
Nicolas Gotchac
caf3a96c19 Add fallback Full Fleshed Wallet if no library 2016-12-09 16:29:57 +01:00
Nicolas Gotchac
efee55ae84 Updated Wallet Version ! Now only 500k gas for Wallet creation 2016-12-09 16:24:11 +01:00
Jaco Greeff
d992c642ff Adjust to final step on rejected/completed 2016-12-09 15:55:50 +01:00
Nicolas Gotchac
63137b1548 Add enhanced Wallet solidity code 2016-12-09 15:52:28 +01:00
Jaco Greeff
d2494d1425 GasPrice selection for contract execution 2016-12-09 15:43:24 +01:00
arkpar
cc8c2ea58d Reject existing tx 2016-12-09 14:37:11 +01:00
GitLab Build Bot
1213ada59c [ci skip] js-precompiled 20161209-125036 2016-12-09 12:52:50 +00:00
Jaco Greeff
2582514b58 GasEditor component (#3750)
* Initial split of component (WIP)

* GasPriceEditor externalised

* Fix lint
2016-12-09 13:44:35 +01:00
Jaco Greeff
befcc9cc1a Cleanups (#3742)
* Remove unused file

* Combine tx checks into single file

* Move UI components into UI

* DRY links

* Unused rollup config

* Cleanup util paths

* Revert "Move UI components into UI"

This reverts commit 3379e61246cde635c296d31322b71e63395a5cd4.

* Re-apply ~/util/tx move

* Cleanup unused styles
2016-12-09 13:44:10 +01:00
arkpar
364dd9dda4 Make stop const 2016-12-09 13:25:02 +01:00
arkpar
22a63f6fd3 Added IO Service explicit stop 2016-12-09 11:45:16 +01:00
GitLab Build Bot
83f791fa5d [ci skip] js-precompiled 20161209-044115 2016-12-09 04:43:19 +00:00
GitLab Build Bot
12592689dd [ci skip] js-precompiled 20161209-014235 2016-12-09 01:44:45 +00:00
Jaco Greeff
8f9fdb350c Merge branch 'master' into jg-subscription-check 2016-12-09 02:34:07 +01:00
Jaco Greeff
f9a24f3c8e Update babel, fix CI build due to breaking changes (#3754)
* Update babel to latest version

* Re-add circular deps plugin

* Bump for build

* Fixes for babel build
2016-12-09 02:33:12 +01:00
Jaco Greeff
6b65a1f872 Merge branch 'master' into jg-subscription-check 2016-12-09 01:41:44 +01:00
GitLab Build Bot
e1ad347cdb [ci skip] js-precompiled 20161209-003004 2016-12-09 00:32:45 +00:00
Nicolas Gotchac
09334ca3bd Small fixes to contract (#3751)
* Fix contracts execution will fallback function

* Fix contract execute modal

* Working execute from Contract

* Don't dupliacet events

* Gas * 1.2 in wallet confirmations
2016-12-09 01:21:51 +01:00
Jaco Greeff
b76a717720 Fix & with && 2016-12-09 00:58:53 +01:00
Jaco Greeff
13f962ae01 Attempt to fix ci webpack 2016-12-09 00:56:12 +01:00
Jaco Greeff
10c356de65 Simplify, consolidate uses between subscription managers 2016-12-09 00:52:21 +01:00
Jaco Greeff
3989e2642b Typo 2016-12-09 00:25:50 +01:00
Jaco Greeff
1ecda93de9 Align api.subscribe with contract 2016-12-09 00:15:39 +01:00
Jaco Greeff
4ce3142c63 Add autoRemove functionality to api.contract.subscribe 2016-12-09 00:15:27 +01:00