grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,640 Commits 1 Branch 329 Tags 59 MiB
655ed93ee8
Commit Graph

1034 Commits

Author SHA1 Message Date
Robert Habermeier
b487f00173 address rightward drift 2017-02-27 19:05:02 +01:00
Robert Habermeier
ac82a838b8 test case and handle in-place migration correctly 2017-02-26 19:22:51 +01:00
Robert Habermeier
c2c699abb9 change migration to v11 to be faster 2017-02-26 18:41:40 +01:00
keorn
7a773b42bf custom dev presets (#4671) 2017-02-24 17:36:52 +01:00
Maciej Hirsz
f97e775498 More CLI settings for IPFS API (#4608) 
* TEMP: Bind to 0.0.0.0, don't check Origin

* More CLI options for IPFS

* CORS and Hosts filtering

* Allow current interface as origin

* Correctly handle CORS settings

* fix grumbles
 2017-02-24 10:32:42 +01:00
Robert Habermeier
62b340f2b9 Save pending local transactions in the database (#4566) 
* Create new column family for local node info

* remove DBTransaction::new reliance on DB

* KeyValueDB trait

* InMemory KeyValueDB implementation

* journaldb generic over KVDB

* make most of `ethcore` generic over KVDB

* fix json tests compilation

* get all tests compiling

* implement local store (just for transactions)

* finish local store API, test

* put everything into place

* better test for skipping bad transactions

* fix warning

* update local store every 15 minutes

* remove superfluous `{}`s
 2017-02-20 17:21:55 +01:00
Svyatoslav Nikolsky
b9665c7cfe Secret store - initial version (#4567) 
* initial secret store commit

* various fixes

* license

* (sstore, secstore) -> secretstore

* marked KeyServer trait as IPC-ready

* fixed style

* ignore requests with Origin header

* fixed tests

* fixed Origin header check
 2017-02-20 16:13:21 +01:00
Robert Habermeier
39237e9d15 Merge pull request #4545 from ethcore/mh-ipfs 
IPFS MVP
 2017-02-17 17:19:56 +01:00
maciejhirsz
c4b4a22203 Rename parity-ipfs to parity-ipfs-api 2017-02-16 14:51:33 +01:00
maciejhirsz
ad8e3f0230 Added CLI flags 2017-02-16 14:41:33 +01:00
maciejhirsz
451cf42452 Adding CLI flags for IPFS 2017-02-15 20:29:29 +01:00
maciejhirsz
eb327338e8 Tests and grumbles 2017-02-15 18:07:30 +01:00
Tomasz Drwięga
5369a129ae Signer provenance (#4477) 
* Signer - Tracking Request Provenance

* Basic UI

* Changing messages

* VecDeque::from

* Fix dapps tests

* Addressing UI grumbles
 2017-02-14 22:45:43 +01:00
maciejhirsz
3c634701dd Squashed 2017-02-14 19:30:37 +01:00
Robert Habermeier
073ed1a87c lower default pruning history and memory (#4528) 
--pruning-history: 1200 -> 64
--pruning-memory: 150 -> 75
 2017-02-13 17:15:25 +01:00
Tomasz Drwięga
f1e99ea2e4 Serde 0.9 (#4508) 
* Porting json

* Dapps

* Rpc & Ethstore

* New ethabi

* Last bunch of fixes

* Fixing last test

* Removing build script

* Adding ethcore-ipc-tests back

* Fixing grumbles

* Fixing blockchain tests (inference regression?)
 2017-02-13 18:38:47 +03:00
Robert Habermeier
6bf97de9d8 Merge branch 'master' into lightrpc 2017-02-10 02:44:12 +01:00
Arkadiy Paronyan
a7e6d8727a Ledger wallet support (#4486) 
* Ledger devices support

* structs for RPC types
 2017-02-09 19:07:06 -05:00
Robert Habermeier
49f49194c5 use Dispatcher when starting RPCs 2017-02-08 20:44:40 +01:00
Tomasz Drwięga
248cd5e036 RPC middleware: Informant & Client.keep_alive (#4384) 
* Adding RPC informant structs

* RPC informant

* Middleware counting RPC requests

* Moving client keep_alive to middleware
 2017-02-04 22:18:19 +01:00
Svyatoslav Nikolsky
9ac4d83ca3 Initial commit for vaults (#4312) 
* initial commit for vaults

* fixed TODO

* public docs

* vault_file.json now contains enc(pwd hash)

* removed doc
 2017-01-30 13:44:09 +03:00
Tomasz Drwięga
47e1c5e2f1 Exposing all RPCs over dapps port as CLI option (#4346) 
* Exposing all RPC over dapps port as CLI option

* Fix test.
 2017-01-30 10:46:50 +01:00
Gav Wood
8404edb656 Fix whitespace (#4299) 
* Fix whitespace.

* Update copyright years/owner.

* Push release only for tags.
 2017-01-25 18:51:41 +01:00
Nikolay Volf
1acc8031ce Stratum up (#4233) 
* flush work

* flush work

* flush work

* flush work

* generalized notifiers

* general setup with modules

* general setup with modules

* all binded

* catch up with master

* all dependencies injected

* stratum another up

* tcp update

* submitwork routine

* finalize & fix warnings

* merge bugs, review fixes

* merge bugs, review fixes

* new cli mess cleanup

* usage.txt swap

* flush work

* cli adopt

* compilation with new cli sorted

* subid space in json

* serialization issues

* grumbles addressed

* more grumbles

* remove last_work note for now

* fix compilation

* fix tests

* merge bugs

* no obliged ipc

* moving notifiers

* no optional feature now

* refactored again

* working on tests

* refactor to new tcp/ip

* stratum lib ok

* ethcore crate ok

* wip on tests

* final test working

* fix warnings, \n-terminated response

* new compatibility

* re-pushing work once anybody submitted

* various review and general fixes

* reviewe fixes

* remove redundant notifier

* one symbol -> huge bug

* ensure write lock isn't held when calling handlers

* extern declarations moved

* options to stratum mod, SocketAddr strongly-typed instantiation

* Minor style fix.

* Whitespace and phrasing

* Whitespace
 2017-01-25 11:03:36 +01:00
Svyatoslav Nikolsky
092e24b9f2 Integration with zgp whitelist contract (#4215) 
* zgp-transactions checker

* polishing

* rename + refactor

* refuse-service-transactions cl option

* fixed tests compilation
 2017-01-22 16:15:22 +01:00
Robert Habermeier
203fd8a471 Memory-based pruning history size (#4114) 
* prune states based on memory param

* pruning memory CLI and usage in sync

* return purged value from memorydb

* calculate memory used incrementally in overlayrecentdb

* refactor shared history pruning code in client

* Fixed usage alignment

* journal_size function for fast memory calculation
 2017-01-20 13:25:53 +01:00
Tomasz Drwięga
24aec5191a Fixing minimal transaction queue price (#4204) 
* Fixing minimal transaction queue price

* Fixing tests
 2017-01-18 19:44:24 +01:00
keorn
73b80869f5 Remove unnecessary Engine method (#4184) 
* remove register_account_provider

* build rpc module

* new dummy client
 2017-01-18 18:49:50 +01:00
Arkadiy Paronyan
61bfe42d1d Fixed --base-path on windows (#4193) 
* Fixed --base-path on windows

* Add support for optional args with default text
 2017-01-18 18:45:30 +01:00
Arkadiy Paronyan
7cab6ac263 Updater fixes (#4196) 
* Minor typo to ensure it updates only when synced.

* Fix deadlock.

* Skip unneeded arg in making list.

* Allow auto-restart even when not running an update.

* Fix trace.

* Update update info on each loop.

* Fix build.

* Shutdown all sockets

* Remove superfluous use.
 2017-01-17 23:34:46 +01:00
Tomasz Drwięga
41da1a0a79 New jsonrpc-core with futures and metadata support (#3859) 
* Bumping serde & serde_json

* Super-initial usage of new jsonrpc

* Single event loop for jsonrpc

* Metadata

* Supporting metadata extraction for eth_accounts

* Fixing Cargo.lock

* Removing uneccessary clones

* Fixing unused import

* Unused import

* Fixing test
 2017-01-11 20:02:27 +01:00
Tomasz Drwięga
21006da125 Get rid of unsafe code in ethkey, propagate incorrect Secret errors. (#4119) 
* Implementing secret

* Fixing tests
 2017-01-11 12:16:47 +01:00
Gav Wood
e86b955815 Default to no auto-update. (#4092) 
* Default to no auto-update.

* Fix test.
 2017-01-09 18:33:53 +01:00
Tomasz Drwięga
9fec422a1b Fixing compilation without dapps. (#4088) 2017-01-09 11:16:05 +01:00
Tomasz Drwięga
e983339edd Opening local dapp (#4041) 
* Opening local dapp

* Using Path/PathBuf instead of Strings

* Fixing typo and adding some docs to apps::fs functions
 2017-01-06 16:05:58 +01:00
Tomasz Drwięga
a076ffaf8c Using local path on Windows (#4017) 
* Using non-roaming path on Windows

* Fixing test
 2017-01-05 13:12:54 +00:00
Robert Habermeier
f1dd96ca5d Merge pull request #3892 from ethcore/lightsync 
Naive light client synchronization
 2017-01-05 13:17:14 +01:00
maciejhirsz
a4b4263580 Adaptive hints 2017-01-04 16:51:27 +01:00
Robert Habermeier
0b9a0b138b remove --light CLI 2017-01-04 15:07:49 +01:00
maciejhirsz
516c41c1ee Move hints to constants 2017-01-04 14:48:32 +01:00
maciejhirsz
4b1b67bfeb Analog error messages for unlocking accounts 2017-01-04 14:05:32 +01:00
maciejhirsz
8ca0e09ffc Better error messages for PoA chains 2017-01-04 12:50:50 +01:00
Robert Habermeier
29e8b2a3b8 parse testnet chain as ropsten 2016-12-30 15:52:49 +01:00
Robert Habermeier
e6324a83f1 Merge branch 'master' into lightsync 2016-12-28 15:53:11 +01:00
Robert Habermeier
fe1f542c4f Owning views of blockchain data (#3982) 
* owning views of blockchain data

* port blockchain and client traits to owning views

* fix ethcore tests

* use strong headers and bodies in ethcore_light

* port ethsync to use owning views

* port rpc to owning views

* port parity informant and blockchain export
 2016-12-28 12:44:51 +00:00
Tomasz Drwięga
bc3dacc952 Fetch tests (first batch) (#3977) 
* Customizable fetch

* Some basic Fetch tests
 2016-12-27 15:38:55 +00:00
Robert Habermeier
8125b5690c Port try macro to new ? operator. (#3962) 
* initial untry sweep

* restore try in ipc codegen, fix inference

* change a few missed try instances
 2016-12-27 12:53:56 +01:00
Tomasz Drwięga
c7c309d152 Web Based Dapps (#3956) 
* Dapps web

Conflicts:
	dapps/src/apps/fetcher.rs
	dapps/src/handlers/fetch.rs

* Rewriting fetch

* Parity-wide fetch service

* Obey the limits and support cancellation.

* Removing temporary files.

* Actually use Fetch for dapps

* Re-implementing file fetching to avoid temporary files.

* Serde to 0.8.19

* Fixing content & dapps fetch

* Serving web content and injecting scripts

* Don't wait for old content, start a new download

* Supporting timeouts and query

* Simple GUI for the browser

* Proxy tokens validation

* Recovering from invalid web-based requests

* Remember last visisted URL

* Removing unused variables

* Addressing review comments

* Setting default account in web3

* Adding WebBrowser dapp to the list

* Actually prune old entries when generating new token
 2016-12-27 10:15:02 +00:00
Robert Habermeier
612f14188f remove unused fields in informant (#3963) 2016-12-23 18:45:51 +01:00
Arkadiy Paronyan
5a3c3bcb45 Sync reorg up to history size (#3874) 
* Allow sync reorg up to pruning history size

* Peer difficulty tracking

* Abort downloading block if received with NewBlock

* Set pruning history to 1200

* Renamed history size field
 2016-12-23 18:43:40 +01:00
Robert Habermeier
d0194f3ad3 Merge branch 'master' into lightsync 2016-12-23 13:39:06 +01:00
Tomasz Drwięga
f0387c33c6 Global Fetch Service (#3915) 
* Dapps web

Conflicts:
	dapps/src/apps/fetcher.rs
	dapps/src/handlers/fetch.rs

* Rewriting fetch

* Parity-wide fetch service

* Obey the limits and support cancellation.

* Removing temporary files.

* Actually use Fetch for dapps

* Re-implementing file fetching to avoid temporary files.

* Serde to 0.8.19

* Fixing content & dapps fetch
 2016-12-22 18:26:39 +01:00
Robert Habermeier
b44cd7b1db Merge pull request #3940 from gguoss/auth-bft 
Fixed compile error.
 2016-12-22 12:54:14 +01:00
gavinGuo
70c9f7c80d Fixed compile error. 2016-12-22 14:51:25 +08:00
Robert Habermeier
01b494ca2c Merge branch 'master' into lightsync 2016-12-21 13:42:07 +01:00
Gav Wood
cd8af0a497 Merge pull request #3904 from ethcore/new-dirs 
Fixed upgrading keys on the first run
 2016-12-19 22:24:37 +01:00
Robert Habermeier
70d53dcfd6 Merge branch 'master' into lightsync 2016-12-19 18:53:52 +01:00
arkpar
ddb242c969 Fixed upgrading keys on the first run 2016-12-19 17:41:55 +01:00
Gav Wood
002cec9e6f Merge pull request #3872 from ethcore/disable-light-server 
remove light server capability temporarily
 2016-12-19 15:22:44 +01:00
Robert Habermeier
2b1f51694b fix cli test 2016-12-19 14:01:19 +01:00
Robert Habermeier
a48435ca60 Merge branch 'master' into lightsync 2016-12-19 13:15:37 +01:00
Gav Wood
adb0f6fb26 Merge pull request #3880 from ethcore/fix-updater-permissions 
Fix updater permissions
 2016-12-17 12:15:05 +01:00
Robert Habermeier
5b0531e964 fix compiler warnings 2016-12-17 00:44:18 +01:00
Robert Habermeier
bd59ef05ac prettier informant 2016-12-17 00:41:02 +01:00
Robert Habermeier
8970946b74 basic --light parameter 2016-12-16 21:45:51 +01:00
Gav Wood
fa721f5cdf Merge pull request #3875 from ethcore/config-fix 
Loading default config from default path
 2016-12-16 20:24:12 +01:00
Gav Wood
14e4fefbcf
Fix updater permissions and refactor existing code. 2016-12-16 18:17:15 +01:00
Gav Wood
b9cd68e7e6 Minor paths change 2016-12-16 17:38:02 +01:00
arkpar
6966fd6c63 New paths 2016-12-16 15:25:53 +01:00
Tomasz Drwięga
f345458b65 Loading config from default path 2016-12-16 15:03:31 +01:00
Gav Wood
72f278efed Merge pull request #3868 from ethcore/new-dirs 
Base directory option
 2016-12-16 13:04:31 +01:00
Gav Wood
90d3d330f5
Use info! for blockchain status rather than stdout. 2016-12-16 11:00:17 +01:00
Gav Wood
396ab5b361
Refactor and make is_syncing. 2016-12-16 10:31:10 +01:00
Robert Habermeier
8f65a7bcc8 remove light server capability temporarily 2016-12-15 23:50:16 +01:00
Gav Wood
ca0d87da10
125 -> 69. 2016-12-15 22:05:54 +01:00
arkpar
e2371632c5 Base dir option 2016-12-15 21:56:45 +01:00
Gav Wood
4410fb635a
Respect system paths. 2016-12-15 19:53:13 +01:00
Gav Wood
801596395e
--release-track. 2016-12-15 19:23:25 +01:00
Gav Wood
995fafebee
Fix last remaining test. 2016-12-15 19:19:50 +01:00
Gav Wood
d737de0fc0
Fix tests. 2016-12-15 19:17:44 +01:00
Gav Wood
4a2b418fc2
Configurable update tracks to help testing. 2016-12-15 18:51:59 +01:00
Gav Wood
c12702fc51
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 18:23:02 +01:00
Gav Wood
590428e7f2
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 15:12:09 +01:00
Gav Wood
0da564a4c2 Merge branch 'master' into cli-rpc 2016-12-15 14:45:15 +01:00
Gav Wood
20b2f84d48 Merge pull request #3828 from ethcore/new-dirs 
New directory structure
 2016-12-15 14:34:01 +01:00
Jaco Greeff
054a6a9daf Merge branch 'master' into check-updates 
# Conflicts:
#	.gitlab-ci.yml
#	js/webpack/dev.server.js
 2016-12-15 13:52:28 +01:00
Gav Wood
a74bce2c06 Merge pull request #3759 from ethcore/auth-bft 
Tendermint Engine
 2016-12-15 13:18:15 +01:00
Vincent Serpoul
339b889ac4 spelling (#3839) 2016-12-14 15:15:19 +01:00
Jaco Greeff
2588aea6b2 Merge branch 'master' into check-updates 2016-12-14 14:37:38 +01:00
Tomasz Drwięga
1d80725f66 Merge branch 'master' into cli-rpc 2016-12-14 14:12:27 +01:00
arkpar
3280f071b1 Fixed moving dirs on windows 2016-12-14 01:33:57 +01:00
arkpar
be5fefe772 Merge branch 'master' of github.com:ethcore/parity into new-dirs 2016-12-14 00:04:11 +01:00
arkpar
6e3e1ea88b XDG paths 2016-12-13 23:38:29 +01:00
Gav Wood
6a48e9d9e5
Print output for commands, don't info! 2016-12-13 20:20:10 +01:00
Gav Wood
80d6e49070 Merge pull request #3812 from ethereumproject/splix/classic-replay-protection 
Network configuration for Ethereum Classic
 2016-12-13 17:39:33 +01:00
arkpar
5fd2e15313 Style and docs 2016-12-12 23:21:44 +01:00
keorn
fa504e510f Merge branch 'master' into auth-bft 2016-12-12 21:28:46 +01:00
Igor Artamonov
e61d14d7f7 reuse Morden for Classic Testnet 2016-12-12 19:50:32 +00:00
arkpar
85fd62917a Updated tests 2016-12-12 17:53:17 +01:00
arkpar
edb853ca35 KillDB command 2016-12-12 17:19:41 +01:00
arkpar
6601fde328 New data paths with upgrade 2016-12-12 16:51:07 +01:00
Gav Wood
758744449f
Expose all other RPCs. 2016-12-12 02:57:19 +01:00
Gav Wood
d81d9d77b2
Wire-in Updater to parity RPC 2016-12-11 23:15:52 +01:00
Gav Wood
58b72c521d
Rename ethcore -> parity in licenses. 2016-12-11 19:31:31 +01:00
Gav Wood
17cc2be4b5
Rename ethcore -> parity in license. 2016-12-11 19:30:54 +01:00
Gav Wood
10b0898bdf
Crate tidyups. 
- Move Updater into its own crate.
- Change ethcore -> parity in authors, homepages and licenses.
 2016-12-11 19:14:42 +01:00
Gav Wood
22cb5753d0
Improve capability information and disable old clients. 2016-12-11 16:52:41 +01:00
Gav Wood
74a6203f72
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-11 15:43:28 +01:00
Gav Wood
0e17cf8d3a
Fix tests. 2016-12-11 15:41:49 +01:00
Igor Artamonov
aed633d7df Testnet for Ethereum Classic 2016-12-11 19:25:02 +06:00
arkpar
a49ff3fb32 Merge branch 'master' of github.com:ethcore/parity into cli-rpc 2016-12-11 13:30:48 +01:00
Gav Wood
8d7a63bbea
Join up the final dots. 2016-12-11 13:10:33 +01:00
arkpar
a56443aa6c Tolerate error is user_defaults 2016-12-11 13:00:49 +01:00
arkpar
c777362d02 Sync channel for consensus test 2016-12-11 12:32:01 +01:00
Gav Wood
d9f6ea56ef
Don't restart if we're not in the cradle. 2016-12-11 04:05:02 +01:00
Gav Wood
2865cbaf70
Use file contents instead of symlink. 2016-12-11 03:33:10 +01:00
Gav Wood
7a1539cfb5
Fix deadlock. 2016-12-11 02:39:56 +01:00
Gav Wood
0302d582d2
Fix build. 2016-12-11 02:02:40 +01:00
Gav Wood
fa30dfd4b9
Refactor into system service, add exe redirect. 2016-12-10 23:58:39 +01:00
keorn
f3af0f46be Merge branch 'master' into auth-bft 2016-12-10 18:14:35 +01:00
Gav Wood
316c25d9f8
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-10 14:08:41 +01:00
Gav Wood
82efa2675e
Merge remote-tracking branch 'origin/master' into consistent-id 2016-12-10 13:36:30 +01:00
keorn
e5f8044cad Merge branch 'master' into auth-bft 2016-12-10 11:01:23 +01:00
Gav Wood
5f1fcf95e0
Make *ID names consistent with std Rust (Id) 2016-12-09 23:01:43 +01:00
Kristoffer Ström
0e516162c3 Rebased on master 2016-12-09 22:27:32 +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
46af3d18da
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-09 20:45:15 +01:00
Gav Wood
c2b6be95c8
Fetch and place in updates path. 2016-12-09 19:02:42 +01:00
keorn
fb71caffbd remove double registration 2016-12-09 11:05:44 +01:00
Robert Habermeier
eec1929658 Merge branch 'master' into lightserv 2016-12-09 01:29:46 +01:00
Robert Habermeier
6f5f1f5e26 light: integrate with sync + serve_light CLI 2016-12-08 23:21:47 +01:00
keorn
9ecb07434f fix informant 2016-12-08 21:13:32 +01:00
Gav Wood
2d6656fc43 Merge pull request #3725 from ethcore/engine-password 
Make engine hold AccountProvider
 2016-12-08 20:52:12 +01:00
Gav Wood
8903384840
Merge branch 'master' into check-updates 2016-12-07 19:19:44 +01:00
keorn
aa9caac750 revert cli default 2016-12-07 15:36:20 +01:00
keorn
e9743a3a75 Merge branch 'master' into auth-bft 2016-12-07 14:50:17 +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
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
keorn
b089aa7a6b fix password loading 2016-12-06 08:38:41 +00:00
keorn
0a2ec319ac rename to engine_signer 2016-12-05 21:31:38 +00:00
keorn
5e7c21ad4a add a cli flag 2016-12-05 19:23:03 +00: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
Gav Wood
43ec3d8f79
network_id -> u64 2016-12-05 06:54:31 -08: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
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
Robert Habermeier
80f98bc8b7 fix tests 2016-12-02 18:52:02 +01:00
Robert Habermeier
cd5b6fdf59 queue: CLI for auto-scaling and num verifiers 2016-12-02 18:21:54 +01:00
Gav Wood
1dd13372b6
Merge remote-tracking branch 'origin/master' into rpc-middleware 2016-12-01 19:43:31 -08:00
keorn
155da50fcd Merge branch 'master' into auth-bft 2016-11-30 13:06:21 +00:00
keorn
4ef5badcea fix parity tests merge 2016-11-30 12:58:45 +00:00
Gav Wood
d525a6d7f0 Merge pull request #3654 from ethcore/clippy-bump 
Bumping clippy
 2016-11-29 18:00:13 +01:00
Gav Wood
9115214cea Merge pull request #3636 from ethcore/fatdb 
Return of the Fat DB
 2016-11-29 16:47:09 +01:00
Tomasz Drwięga
c97c59f62f returning errors with extra fields in config file (#3663) 2016-11-29 13:23:28 +01:00
Tomasz Drwięga
2b3d100de2 Fixing some clippy warnings 2016-11-28 15:54:22 +01:00
arkpar
dfd17949ef Added a test 2016-11-28 12:08:12 +01:00
keorn
5c0e89ae9a Merge branch 'master' into auth-bft 2016-11-28 09:50:22 +00:00
arkpar
fa45413a90 Extened API 2016-11-28 01:37:25 +01:00
arkpar
c7b359fcee Style 2016-11-28 01:37:25 +01:00
arkpar
d0c80a6903 Updated tests 2016-11-28 01:37:25 +01:00
arkpar
3aceac60de Use sha3 for fat key 2016-11-28 01:37:24 +01:00
arkpar
e91f7977fb Storage export 2016-11-28 01:37:24 +01:00
arkpar
b0555fbe7c State export 2016-11-28 01:37:24 +01:00
Gav Wood
ce3f4911a2
Merge remote-tracking branch 'origin/master' into check-updates 2016-11-27 15:01:17 +01:00
Tomasz Drwięga
3b595a01ad Merge branch 'master' into rpc-middleware 2016-11-25 21:46:35 +01:00
Tomasz Drwięga
a9028ca986 Merge branch 'master' into rpc-middleware 
Conflicts:
	Cargo.lock
	rpc/src/v1/tests/mocked/parity_accounts.rs
 2016-11-25 21:18:02 +01:00
arkpar
ffa123c949 Set default tx price to 0.0025 USD 2016-11-25 15:13:51 +01:00
Tomasz Drwięga
9b9bdaa1b1 Appending logs by default (#3609) 2016-11-25 13:04:02 +01:00
keorn
a143da2cb8 fix complete build 2016-11-25 11:36:25 +00:00
keorn
1692c07ba6 Merge branch 'master' into auth-bft 2016-11-25 10:51:06 +00:00
Gav Wood
735df6c30f
More work. 2016-11-24 17:19:48 +01:00
Gav Wood
03ef95ba50
Compiles. 2016-11-23 20:35:21 +01:00
Gav Wood
5d62cfdf6f
Merge remote-tracking branch 'origin/master' into check-updates 2016-11-23 18:15:21 +01:00
Gav Wood
9d3b2352cc
More work. 2016-11-23 16:29:15 +01:00
Tomasz Drwięga
cd6f565f69 RPC Middleware & Get/Set dapp-specific accounts 2016-11-23 16:27:05 +01:00
arkpar
7da8f019d5 --no-ancient-blocks 2016-11-22 18:15:55 +01:00
keorn
340d377930 Revert "dont keep account provider in miner" 
This reverts commit 11ccacd6d0.
 2016-11-22 16:05:27 +00:00
Gav Wood
bf9ed2d444
Merge remote-tracking branch 'origin/master' into check-updates 2016-11-22 10:25:34 +01:00
Gav Wood
45dead9d49
Naming consistency and make Updater improvements. 
- ID -> Id (consistency with rust libs)
 2016-11-22 10:24:22 +01:00
Gav Wood
4c83eff912 Merge pull request #3552 from ethcore/import-msg 
Import account message
 2016-11-22 00:03:36 +01:00
arkpar
efdf017c43 Import account message 2016-11-21 15:03:20 +01:00
arkpar
8bb8ecac2d --testnet set to ropset 2016-11-21 14:39:26 +01:00
keorn
6e0bd4072b Merge branch 'master' into auth-bft 2016-11-21 12:17:00 +00:00
Tomasz Drwięga
94328e9784 Fixing main 2016-11-20 22:40:23 +01:00
Arkadiy Paronyan
efd1d9bd0e Ropsten network (#3539) 
* Ropsten network

* Sorted premine

* Comas

* Removed trailing coma
 2016-11-20 16:38:45 +01:00
keorn
9d61071dd7 Merge branch 'miner-no-ap' into auth-bft 2016-11-17 22:04:07 +00:00
keorn
11ccacd6d0 dont keep account provider in miner 2016-11-17 18:32:12 +00:00
keorn
6cb892f605 Merge remote-tracking branch 'parity/master' into bft 2016-11-17 12:19:30 +00:00
Gav Wood
25950345db Merge pull request #3379 from ethcore/new-token 
Signer new-token generates a link and opens browser
 2016-11-16 23:48:21 +08:00
keorn
8ac989cbeb Merge remote-tracking branch 'parity/master' into bft 2016-11-16 10:29:54 +00:00
Tomasz Drwięga
29271383dd signer new-token doesn't open the browser 2016-11-16 09:38:09 +01:00