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
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
Gav Wood
afe4cc6a05
Merge remote-tracking branch 'origin/master' into check-updates
2016-12-05 07:09:42 -08: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
Gav Wood
459babb1a8
Logging.
2016-12-05 06:39:56 -08:00
keorn
db59bd8731
update genesis seal
2016-12-05 14:28:50 +00:00
keorn
c39d504167
Merge branch 'spec-rlp-loading' into auth-bft
2016-12-05 14:11:06 +00: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
keorn
b30c1d5602
fix tests
2016-12-05 13:24:22 +00:00
Robert Habermeier
767d486014
fix config test
2016-12-05 14:12:40 +01:00
keorn
c946ffebf3
Merge branch 'master' into auth-bft
2016-12-05 11:30:11 +00:00
GitLab Build Bot
cf796d3ea4
[ci skip] js-precompiled 20161205-105433
2016-12-05 10:56:28 +00:00
Nicolas Gotchac
9a43e6d6c8
Update JS dependencies ( #3710 )
...
* Minor Versions NPM updates
* Remove unused packages
* No longer relevant JS test
* Update some major versions // Revert Rechartjs
* Update Redux/React-{Ace, RouterRedux}
* Updated React Tooltips
* Update mock-socket // Update tests to pass
* Updated React Router
* Removed `history` module that isn't necessary (instead of updating it)
* Updated redux-actions
* Removed commented hot store reload
2016-12-05 11:48:43 +01:00
Nicolas Gotchac
52b4ce0dd7
Use Webpack Aliases ( #3711 )
...
* Adds aliases to Webpack Build
* Use `ui` Webpack alias
* Use `views` alias
* Use `modals` aliase
* Use `providers` aliase
* Use `contracts` aliase
* Use '~' aliase
* from `ui` to from `~/ui`
* from to from
* from `modals` to from `~/modals`
* from `providers` to from `~/redux/providers`
* from `contracts` to from `~/contracts`
* Updated Webpack App config
2016-12-05 11:47:13 +01:00
Gav Wood
9d79cac36b
Cleanups.
2016-12-04 11:56:12 -08:00
keorn
f7a01b87b5
better gossip, better proposal collection
2016-12-04 19:43:24 +00:00
keorn
edef7a185f
remove tracing
2016-12-04 19:42:53 +00:00
Gav Wood
2911c549e3
Encode networkid as a u64.
2016-12-04 10:48:26 -08:00
Gav Wood
b8c492644b
Fix more build.
2016-12-04 10:47:05 -08:00
Gav Wood
356aca2db5
Fix build.
2016-12-04 09:13:23 -08:00
Gav Wood
90a20a217f
Merge branch 'master' into check-updates
2016-12-04 09:01:50 -08:00
Gav Wood
0c7b7fc8bc
Merge pull request #3627 from ethcore/rpc-middleware
...
Dapps-specific accounts
2016-12-04 08:46:05 -08:00
GitLab Build Bot
a9424bdf26
[ci skip] js-precompiled 20161204-042533
2016-12-04 04:27:27 +00:00
keorn
f1542b5612
better genesis seal rlp
2016-12-03 16:19:51 +00:00
GitLab Build Bot
ca4aa42615
[ci skip] js-precompiled 20161203-062111
2016-12-03 06:23:18 +00:00
Gav Wood
be7401c8bf
Merge pull request #3671 from ethcore/jg-signer-decoding
...
Signer method parameter decoding & destination info
2016-12-02 22:13:35 -08:00
GitLab Build Bot
f093b077a4
[ci skip] js-precompiled 20161203-043512
2016-12-03 04:37:04 +00:00
GitLab Build Bot
f15906fe8d
[ci skip] js-precompiled 20161202-201514
2016-12-02 20:18:10 +00:00
