grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,835 Commits 1 Branch 329 Tags 59 MiB
1b6ebe1a6d
Commit Graph

6835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
2911c549e3
Encode networkid as a u64. 2016-12-04 10:48:26 -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
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
Jaco Greeff
b2a5d66c99 Fix slice test (#3712) 2016-12-02 21:10:22 +01:00
GitLab Build Bot
4c32d3ced4 [ci skip] js-precompiled 20161202-142708 2016-12-02 14:29:56 +00:00
Jaco Greeff
fbd3738096 Merge branch 'master' into jg-signer-decoding 2016-12-02 15:27:56 +01:00
Jaco Greeff
b8b9086dae React library update (#3704) 
* Update React & MaterialUI

* Adjust TabBar layouts for new MUI
 2016-12-02 15:21:25 +01:00
Nicolas Gotchac
456b50639c Adds Loading Component (#3707) 2016-12-02 15:21:11 +01:00
Nicolas Gotchac
c892a4f7ae Refactoring Transfer Modal (#3705) 
* Better Token Select in Transfer > Details

* Better Autocomplete

* Crete MobX store for Transfer modal

* Remove unused var

* Update Webpack Conf

* Small changes...

* Optional gas in MethodDecoding + better input

* New Contract `getAll` method // TxList Row component

* Method Decoding selections

* Rename `getAll` to `getAllLogs`
 2016-12-02 15:21:01 +01:00
Jaco Greeff
bd2e2b630c Fix extra scrollbars in dapps (#3706) 
* Fix extra scrollbars in dapps

* Dapps list padding

* spelling

* lint

* Height overflow fix
 2016-12-02 15:10:38 +01:00
Jaco Greeff
2dd2004ed5 Merge branch 'master' into jg-signer-decoding 
# Conflicts:
#	js/src/views/Signer/components/RequestFinished/requestFinished.js
 2016-12-02 11:21:17 +01:00
Robert Habermeier
3837114eb2 Merge pull request #3431 from ethcore/state-tests-indentation 
indent state tests
 2016-12-02 09:09:35 +01:00
GitLab Build Bot
986e8ef9a2 [ci skip] js-precompiled 20161202-052414 2016-12-02 05:26:08 +00:00
GitLab Build Bot
f30a8f79f2 [ci skip] js-precompiled 20161202-034812 2016-12-02 03:50:41 +00:00
Gav Wood
1dd13372b6
Merge remote-tracking branch 'origin/master' into rpc-middleware 2016-12-01 19:43:31 -08:00
Gav Wood
21a76c22fc Merge pull request #3698 from ethcore/jg-null-transaction 
Filter null transactions for display (not available on node)
 2016-12-01 19:40:16 -08:00
Gav Wood
5b829aece7 Merge pull request #3697 from ethcore/jr-move-recovery-print 
move recovery phrase print button
 2016-12-01 19:38:31 -08:00
Jannis Redmann
d4ec9049f6 merge #3701 from ethcore/ng-status-fix 
Fix padding bottom needed after fixed status
 2016-12-01 19:09:13 +01:00
Jannis R
9512794c7f
prevent status bar overlapping 2016-12-01 19:08:19 +01:00
Nicolas Gotchac
d5c630c1d2 Fix padding bottom needed after fixed status 2016-12-01 18:45:59 +01:00
Jannis R
7049336800
show recovery print button on first run 2016-12-01 15:40:20 +01:00
Jannis R
a1c1746667
show recovery print button if recovered account 2016-12-01 15:19:42 +01:00
Jaco Greeff
9087560344 gumbles 2016-12-01 14:08:32 +01:00
Jaco Greeff
077f32dce6 Cater for completely empty lists 2016-12-01 13:39:38 +01:00
Jaco Greeff
d5373e26b8 Filter null transactions (not available on node) 2016-12-01 13:36:23 +01:00
Jannis R
6822433a83
recovery phrase: move print helpers 2016-12-01 12:19:12 +01:00
Jannis R
08a6be5d62
recovery phrase: move print button to modal actions 2016-12-01 12:19:09 +01:00
GitLab Build Bot
0f987a2206 [ci skip] js-precompiled 20161201-044643 2016-12-01 04:48:29 +00:00
GitLab Build Bot
3ef569329a [ci skip] js-precompiled 20161201-011624 2016-12-01 01:21:59 +00:00
Gav Wood
ec38c68e30 Merge pull request #3695 from ethcore/snapshot-share 
Don't share the snapshot while downloading old blocks
 2016-12-01 01:11:22 +00:00
Gav Wood
6420ea4429 Merge pull request #3694 from ethcore/jr-print-recovery-phrase 
button to print recovery phrase
 2016-12-01 01:11:01 +00:00
Gav Wood
9053e2f27b Merge pull request #3692 from ethcore/jr-fixed-status 
fix status bar to bottom of the screen
 2016-12-01 01:09:29 +00:00
Gav Wood
c630fc5c1c Merge pull request #3642 from ethcore/confirmation 
Splitting serialization of signTransaction and sendTransaction confirmation requests
 2016-12-01 01:09:07 +00:00
Denis S. Soldatov aka General-Beck
61eb2a9104 Update test.sh 
add -j 8 for test
 2016-12-01 07:48:06 +07:00
Denis S. Soldatov aka General-Beck
70c6aebca5 Update gitlab-ci 
-j $(nproc) in build
 2016-12-01 07:15:35 +07:00
Denis S. Soldatov aka General-Beck
c4125a84b1 Update gitlab-ci 
CARGOFLAGS -> -j $(nproc)
 2016-12-01 07:07:52 +07:00