Jaco Greeff
699a821775
Merge branch 'master' into jg-test-ui
2016-12-08 12:45:40 +01:00
Robert Habermeier
de4715bc67
Merge pull request #3732 from ethcore/jg-duplicate-accounts
...
Give accounts precedence over address_book entries
2016-12-08 12:27:26 +01:00
Jaco Greeff
b3f7c00780
ui/Container tests as per #2289
2016-12-08 12:22:40 +01:00
Jaco Greeff
ad8a191e95
Adjust specs to show location
2016-12-08 12:19:03 +01:00
Jaco Greeff
88e5ed9ea5
Allow mocha to use webpack aliasses via babel
2016-12-08 12:18:43 +01:00
Arkadiy Paronyan
15ec63750e
Enable Panic=abort ( #3423 )
...
* Enable panic=abort
* Update remaining crate versions to 1.5
* Run tests in release mode
* Enable panic=abort for release profile only
* Added travis_wait
* Travis timeout set to 40
2016-12-08 11:31:57 +01:00
Jaco Greeff
5f1021822d
Cleanups on js-precompiled ( #3738 )
...
* Cleanups on js-precompiled
* Combined
* Adjust based on Pr comments
2016-12-07 21:38:28 +01:00
GitLab Build Bot
9e8d90b5ba
[ci skip] js-precompiled 20161207-173717
2016-12-07 17:39:18 +00:00
Gav Wood
342357302b
Merge pull request #3735 from ethcore/jg-addressbook-delete
...
Add parity_removeAddress RPC
2016-12-07 18:31:22 +01:00
Jaco Greeff
dba8cf3a3b
Add test for RPC side
2016-12-07 17:58:22 +01:00
Jaco Greeff
7c054d2da0
Remove unneeded block scope
2016-12-07 17:07:28 +01:00
Jaco Greeff
46840d36c9
Add parity_removeAddress RPC
2016-12-07 16:53:46 +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
Jaco Greeff
5bdb6e4f22
Ignore meta.deleted for account name display
2016-12-07 11:51:48 +01:00
Jaco Greeff
f7586109df
Ignore meta.deleted for accounts
2016-12-07 11:48:08 +01:00
Jaco Greeff
21a3cf7b65
Swap order of addressbook & acocunts merge
2016-12-07 11:44:45 +01:00
Jaco Greeff
be90245ecb
PropTypes as function call ( #3731 )
2016-12-07 10:46:46 +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
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
GitLab Build Bot
0f76533713
[ci skip] js-precompiled 20161206-084538
2016-12-06 08:47:58 +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
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
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
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
Robert Habermeier
a6c2408562
IPC codegen in ethcore-light; remove network dependency
2016-12-05 16:56:21 +01:00
Robert Habermeier
61c3358447
move light to its own crate again
2016-12-05 16:55:33 +01:00
keorn
53b479fb7a
pass engine to snapshot service
2016-12-05 15:43:46 +00:00
keorn
94302f3f61
throw out difficulty checks
2016-12-05 15:27:44 +00:00
keorn
c61a0e97b3
make engine determine block order
2016-12-05 15:20:32 +00:00
GitLab Build Bot
e6ed49b2c9
[ci skip] js-precompiled 20161205-150312
2016-12-05 15:05:10 +00:00
Gav Wood
84c923ff6d
Merge pull request #3717 from ethcore/spec-rlp-loading
...
Use valid RLP in generic genesis seal spec
2016-12-05 06:57:24 -08:00
Gav Wood
43ec3d8f79
network_id -> u64
2016-12-05 06:54:31 -08:00
keorn
0860a3a767
ignore variable
2016-12-05 14:09:41 +00:00
keorn
22632e6324
make generic seal take valid rlp
2016-12-05 14:07:31 +00:00
NikVolf
42fc770d30
use crates.io crate
2016-12-05 16:25:03 +03:00