Commit Graph

7095 Commits

Author SHA1 Message Date
keorn 347634ac6c dont rebroadcast propose 2016-12-07 16:42:58 +01:00
keorn aa9caac750 revert cli default 2016-12-07 15:36:20 +01:00
keorn b73689f041 Merge branch 'engine-password' into auth-bft 2016-12-07 15:17:49 +01:00
keorn 727ace0561 add test 2016-12-07 15:14:21 +01:00
keorn e9743a3a75 Merge branch 'master' into auth-bft 2016-12-07 14:50:17 +01:00
keorn 4361cb53e7 Merge branch 'engine-password' into auth-bft 2016-12-07 14:49:42 +01:00
keorn 5faa4a85cb remove dummy type 2016-12-07 14:49:07 +01:00
keorn 6440ca2f68 move stuff around 2016-12-07 14:39:37 +01:00
Gav Wood 1f0a02b638 Merge pull request #3633 from ethcore/fix-tx-rpc
Fix up the transaction JSON serialisation for RPC.
2016-12-07 14:34:51 +01:00
Robert Habermeier 89726356a3 Merge pull request #3709 from ethcore/opt-in-verifier-scaling
queue: CLI for auto-scaling and num verifiers
2016-12-07 13:40:42 +01:00
GitLab Build Bot 3388eab76a [ci skip] js-precompiled 20161207-123833 2016-12-07 12:40:35 +00:00
GitLab Build Bot 2e40a00768 [ci skip] js-precompiled 20161207-122336 2016-12-07 12:26:14 +00:00
Nicolas Gotchac 8dbd56888d Add functionalities to multi-sig wallet (#3729)
* WIP Sending tokens in multi-sig wallet

* Working Token transfer for multi-sig wallet #3282

* Add operation hash to transfer modal

* Add existing wallet from address #3282

* Wallet delete redirect to Wallets/Accounts #3282

* Rightly check balance in Transfer // Get all accounts balances #3282

* Fix linting

* Better Header UI for Wallet

* Use the `~` webpack alias

* Use Webpack `~` alias
2016-12-07 12:47:44 +01:00
keorn c582540746 Merge branch 'engine-password' into auth-bft 2016-12-07 11:41:38 +01:00
keorn 3ae09de019 restore is_new_best 2016-12-07 11:40:46 +01:00
keorn a296c5e226 test client message handling 2016-12-07 11:38:09 +01:00
Jaco Greeff be90245ecb PropTypes as function call (#3731) 2016-12-07 10:46:46 +01:00
keorn da030fed51 Merge branch 'master' into auth-bft 2016-12-07 10:41:07 +01:00
keorn 5c333fce31 Merge branch 'engine-password' into auth-bft 2016-12-07 10:35:52 +01:00
keorn 71a96588b0 add the methods to engines 2016-12-07 10:34:06 +01:00
Jaco Greeff e2bb8ef6d1 Unify proptypes in util/proptypes.js (#3728)
* Unify proptypes in util/proptypes.js

* Add missing use of nodeOrStringProptype
2016-12-07 10:25:57 +01:00
keorn d9eb5e7f1d remove uncles 2016-12-07 09:32:36 +01:00
Robert Habermeier 60680e1913 Merge pull request #3730 from ethcore/jsonrpc-ipc-bump
bump jsonrpc-ipc-server to fix windows build
2016-12-07 09:32:10 +01:00
Robert Habermeier 085b8ad553 Merge pull request #3527 from ethcore/client-provider
LES Part 2
2016-12-07 09:31:50 +01:00
GitLab Build Bot 97e60a6e9c [ci skip] js-precompiled 20161207-042556 2016-12-07 04:28:25 +00:00
Robert Habermeier d28f615482 bump jsonrpc-ipc-server to fix windows build 2016-12-06 19:32:19 +01:00
Robert Habermeier 398b94e6e2 Merge branch 'master' into opt-in-verifier-scaling 2016-12-06 15:37:10 +01:00
keorn 8f641e67f3 Merge branch 'engine-password' into auth-bft 2016-12-06 13:13:02 +00:00
GitLab Build Bot 0f76533713 [ci skip] js-precompiled 20161206-084538 2016-12-06 08:47:58 +00:00
keorn b089aa7a6b fix password loading 2016-12-06 08:38:41 +00:00
Nicolas Gotchac bec3539651 First draft of the MultiSig Wallet (#3700)
* Wallet Creation Modal #3282

* Name and description to Wallet #3282

* Add Wallet to the Account Page and Wallet Page #3282

* Fix Linting

* Crete MobX store for Transfer modal

* WIP Wallet Redux Store

* Basic Details for Wallet #3282

* Fixing linting

* Refactoring Transfer store for Wallet

* Working wallet init transfer #3282

* Optional gas in MethodDecoding + better input

* Show confirmations for Wallet #3282

* Order confirmations

* Method Decoding selections

* MultiSig txs and confirm pending #3282

* MultiSig Wallet Revoke #3282

* Confirmations and Txs Update #3282

* Feedback for Confirmations #3282

* Merging master fixes...

* Remove unused CSS
2016-12-06 09:37:59 +01:00
keorn 0a2ec319ac rename to engine_signer 2016-12-05 21:31:38 +00:00
keorn 92d566c900 Merge branch 'master' into engine-password 2016-12-05 19:30:08 +00:00
keorn 46dd2543e5 rename rpc to match cli 2016-12-05 19:27:24 +00:00
keorn 5e7c21ad4a add a cli flag 2016-12-05 19:23:03 +00:00
Gav Wood ff7b918d82
Fix build. 2016-12-05 10:55:53 -08:00
Gav Wood 5e1fdc4b11
Merge remote-tracking branch 'origin/master' into fix-tx-rpc 2016-12-05 10:44:19 -08:00
Gav Wood ad36743122 Merge pull request #3719 from ethcore/engine-block-ordering
Engine block ordering
2016-12-05 10:37:36 -08:00
Gav Wood d708922d29 Merge pull request #3716 from ethcore/fdlimit
Use fdlimit utility crate from crates.io
2016-12-05 10:36:42 -08:00
GitLab Build Bot 98bfbdc5cb [ci skip] js-precompiled 20161205-174841 2016-12-05 17:50:43 +00:00
Jaco Greeff 873f451df1 Move decoding for contract deployment logic earlier (#3714)
* Move decoding deployment logic earlier

* Removed rendunant isContract
2016-12-05 18:42:44 +01:00
keorn 01bf483b63 remove unnecessary impls 2016-12-05 17:29:47 +00:00
Robert Habermeier 1b6ebe1a6d possible fix for queue drop deadlock (#3702)
* possible fix for #3686

* queue: simplify conclusion, don't block on joining

* queue: park verifiers with timeout to prevent race

* more robust verification loop

* queue: re-introduce wait for verifier joining
2016-12-05 18:18:56 +01:00
NikVolf ebd4173d21 bump version 2016-12-05 20:15:05 +03:00
keorn 81a756394a Merge branch 'master' into engine-password 2016-12-05 17:08:57 +00:00
keorn 529a7fc33c add password and AccountProvider 2016-12-05 17:08:16 +00:00
keorn 6fc943ca6d Merge branch 'master' into auth-bft 2016-12-05 16:37:35 +00:00
keorn 4f857642b5 rename set_sealer 2016-12-05 16:28:56 +00:00
Robert Habermeier a726472023 Merge pull request #3713 from ethcore/fix-v-u64
Encode networkid as a u64.
2016-12-05 17:14:07 +01:00
Robert Habermeier 5db93cd433 light: fix compile errors 2016-12-05 17:09:05 +01:00