grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,693 Commits 1 Branch 329 Tags 59 MiB
78ceec6c6e
Commit Graph

2660 Commits

Author SHA1 Message Date
keorn
a61b1567d0 Strict validation transitions (#4988) 
* ability to make validation stricter

* fix consensus

* remove logger
 2017-03-28 10:46:52 +02:00
NikVolf
efe0f8449c Merge remote-tracking branch 'origin/master' into eip-213 2017-03-27 18:18:22 +03:00
NikVolf
c313857485 fix error handling 2017-03-27 18:17:49 +03:00
Robert Habermeier
1ca1a4b1cc Merge pull request #5019 from paritytech/snapshot-v2 
Fine grained snapshot chunking
 2017-03-27 16:57:02 +02:00
Marek Kotewicz
23d3b79d9a eip100b (#5027) 
* eip100b

* fix eip100b build and tests

* Conventional comparison order
 2017-03-27 11:42:40 +02:00
arkpar
387a5fb03b Doc 2017-03-26 13:26:20 +02:00
NikVolf
34fb39da5b avoid allocating string 2017-03-25 23:30:11 +03:00
arkpar
b0a9c1e0fa Limit by entry count 2017-03-25 15:25:20 +01:00
arkpar
b52c7bba4b Fewer allocations 2017-03-25 13:22:25 +01:00
arkpar
4ef89b5ccb Fine grained snapshot chunking 2017-03-25 13:22:25 +01:00
Robert Habermeier
109012cae8 force earliest era set in snapshot restore (#5021) 2017-03-25 10:00:50 +01:00
NikVolf
434ed1b91c remove alt_ 2017-03-24 15:35:00 +03:00
Robert Habermeier
da837fa9d8 Merge branch 'master' into lightcli 2017-03-23 14:12:42 +01:00
Tomasz Drwięga
bb1bbebfd6 Export account RPC (#4967) 
* Export account RPC

* Removing GethDirectory and ParityDirectory

* Updating ethstore-cli help.
 2017-03-23 13:23:03 +01:00
keorn
9fdd0e3a0a Switching ValidatorSet (#4961) 
* add multi validator set

* nicer comment

* validate in constructor

* reporting
 2017-03-23 13:19:28 +01:00
Robert Habermeier
64cec5ff7d Implement PIP messages, request builder, and handlers (#4945) 
* return errors on database corruption

* fix tests, json tests

* fix remainder of build

* buffer flow -> request credits

* proving state backend

* generate transaction proofs from provider

* network messages for transaction proof

* transaction proof test

* test for transaction proof message

* fix call bug

* request transaction proofs from on_demand

* most of proved_execution rpc

* proved execution future

* initial request definitions

* RLP encoding and decoding for requests

* proofs of non-existance in ProvingBlockChainClient

* new requests in provider.

* encode and decode responses

* complete initial request changes

* handle request packet in LightProtocol

* handle response packets

* implement requesting from

* re-do cost table

* get tests compiling

* fix cost table RLP encoding

* roundtrip tests for request types

* request builder tests

* move request_builder -> request::builder

* get network tests working

* return only complete headers responses

* request builder improvements

* New version of jsonrpc.

* split request filling into fill,complete

* Better invalid encoding messages

* Fixing deprecated methods of tokio_core

* use PIP messages in on_demand, old API

* migrate oneshot::complete to send in on_demand

* get on_demand tests to compile

* port ethsync to PIP messages

* adjust to minor on_demand API changes in RPC

* Using dedicated branch for jsonrpc

* Bump
 2017-03-23 13:17:05 +01:00
Robert Habermeier
0abbd7ac97 Merge branch 'pip-msg' into lightcli 2017-03-22 22:08:39 +01:00
Robert Habermeier
dd1a3fc60a migration to light client mode 2017-03-22 15:58:43 +01:00
Robert Habermeier
a0619fc101 Merge branch 'master' into pip-msg 2017-03-22 15:56:09 +01:00
NikVolf
9d23101c9a update for rv 2017-03-22 17:43:19 +03:00
Marek Kotewicz
044d070667 rlp deserialization refactor, 30% faster (#4901) 
* fixed naming of rlp modules

* RlpStream cleanup

* appending short rlp lists (0...55 bytes) is 25% faster

* RlpStream does not use bytes module, nor trait Stream

* removed unused code from rlp module

* compiling ethcore-util with new rlp serialization

* compiling parity with new rlp serialization

* fixed compiling ethcore-light with new rlp serialization

* fixed compiling ethsync with new rlp serialization

* moved rlp benches and rlp tests

* rlp deserialization refactor, 30% faster

* removed redundant comment, print

* fixed compiling parity with new rlp deserialization

* removed redundant double-space

* fixed failing test

* updated rlp docs, removed unused traits

* fixed rlp benchmarks

* replace usage of WriteBytesExt with ByteOrder

* removed unused, commented out code

* fixed merge conflict
 2017-03-22 14:41:46 +01:00
NikVolf
436ae1333c trace mapping fix 2017-03-22 16:40:44 +03:00
NikVolf
8a4537fc73 no-input test 2017-03-22 16:31:43 +03:00
NikVolf
d1293d9fb0 fix warnings 2017-03-22 15:54:19 +03:00
NikVolf
3e7dc57289 some tests for simple cases 2017-03-22 15:41:32 +03:00
Robert Habermeier
219eddf33e Merge branch 'master' into pip-msg 2017-03-22 13:14:28 +01:00
Tomasz Drwięga
7e87e9e8ad Updating JSON-RPC crates (#4934) 
* New version of jsonrpc.

* Better invalid encoding messages

* Fixing deprecated methods of tokio_core

* Using dedicated branch for jsonrpc

* Bump
 2017-03-22 07:02:14 +01:00
Marek Kotewicz
d530cc86f3 splitting part of util into smaller crates (#4956) 
* split path module from util

* moved RotatingLogger from util to logger crate

* fix tests

* fix tests

* use only one version of ansi_term crate
 2017-03-22 06:23:40 +01:00
NikVolf
5e34235a36 initial, fallable built-ins 2017-03-22 04:01:46 +03:00
Robert Habermeier
384aeda645 Merge branch 'pip-msg' into lightcli 2017-03-21 21:15:24 +01:00
Robert Habermeier
7ad36ee36c Merge remote-tracking branch 'upstream/new-jsonrpc' into pip-msg 2017-03-21 21:15:06 +01:00
Robert Habermeier
e99884d0c0 Merge branch 'master' into pip-msg 2017-03-21 21:05:01 +01:00
Robert Habermeier
bc9c1d4824 use a database in ethcore-light 2017-03-21 20:57:13 +01:00
Robert Habermeier
797a3e1cd9 EIP198 and built-in activation (#4926) 
* EIP198 and built-in activation

* address review
 2017-03-21 19:36:38 +03:00
Robert Habermeier
fe52e969b6 Merge branch 'master' into pip-msg 2017-03-21 15:24:47 +01:00
Tomasz Drwięga
958a8f66a0
Merge branch 'master' into new-jsonrpc 2017-03-21 09:35:50 +01:00
Tomasz Drwięga
badb3729c9 Changing Mutex into RwLock for transaction queue (#4951) 
* Changing Mutex into RwLock for transaction queue

* Fixing merge

* little fix
 2017-03-20 19:15:02 +01:00
keorn
e228de18e2 Disable max seal period for external sealing (#4927) 
* no max sealing when external

* force internal sealing
 2017-03-20 19:14:49 +01:00
Marek Kotewicz
a555686bcd rlp serialization refactor (#4873) 
* fixed naming of rlp modules

* RlpStream cleanup

* appending short rlp lists (0...55 bytes) is 25% faster

* RlpStream does not use bytes module, nor trait Stream

* removed unused code from rlp module

* compiling ethcore-util with new rlp serialization

* compiling parity with new rlp serialization

* fixed compiling ethcore-light with new rlp serialization

* fixed compiling ethsync with new rlp serialization

* removed redundant comment, print

* removed redundant double-space

* replace usage of WriteBytesExt with ByteOrder
 2017-03-20 19:14:29 +01:00
Tomasz Drwięga
6fa9393a25
Merge branch 'master' into new-jsonrpc 2017-03-20 10:30:53 +01:00
Tomasz Drwięga
34d28189ea Remove transaction RPC (#4949) 2017-03-19 08:46:51 +01:00
Robert Habermeier
8be41ad946 Merge branch 'master' into pip-msg 2017-03-17 14:13:10 +01:00
Tomasz Drwięga
44052e7d8d
Merge branch 'master' into new-jsonrpc 2017-03-16 16:04:30 +01:00
Tomasz Drwięga
491eeb9878
Better invalid encoding messages 2017-03-16 12:48:51 +01:00
NikVolf
daca82bdfc fix condition check 2017-03-16 04:16:05 +03:00
NikVolf
131aa14afa ensure sealing work enabled if notifier registed 2017-03-16 03:38:50 +03:00
keorn
1f7fb1591d Add reseal max period (#4903) 
* add reseal max period

* fix rpc
 2017-03-15 14:04:42 +01:00
Tomasz Drwięga
2dca24cc28 Traces error handling (#4849) 2017-03-14 13:04:32 +01:00
Arkadiy Paronyan
43871e393c Additional kovan params (#4892) 2017-03-14 11:41:56 +01:00
Arkadiy Paronyan
e0d554e0ca Recalculate receipt roots in close_and_lock (#4884) 2017-03-13 17:47:43 +01:00
Gav Wood
3041c95408 Chain-selection from UI (#4859) 
* First little bits for chain-selection.

* Provide RPCs and get settings through to user defaults.

* Hasty stash.

* Fix updater accidentally redownloading.

* Finish up.

* Add JS tests.

* Hypervisor should never run a binary modified before itself.

* Style.

* Help tweak.

* Fix test compile.

* Fix JS test

* Build fix for tests.

* Revert default chain name

* Another test

* Use spec name via client.

* Fix mock up.

* whitespace

[ci:skip]

* whitespace

[ci:skip]

* remove exit/restart endpoints.
 2017-03-13 12:10:53 +01:00
Marek Kotewicz
3fe3353696 removed redundant FixedHash trait, fixes #4029 (#4866) 2017-03-11 22:58:15 +04:00
Arkadiy Paronyan
9047b4b487 Supress USB error message (#4839) 2017-03-10 10:25:40 +01:00
Tomasz Drwięga
aedc473f64 Lowering threshold for transactions above gas limit (#4831) 2017-03-10 10:11:37 +01:00
Robert Habermeier
868f83e6ca Merge branch 'master' into pip-msg 2017-03-08 18:55:21 +01:00
keorn
be21671c1c Calibrate step before rejection (#4800) 
* calibrate before rejection

* change flag name

* fix merge
 2017-03-08 17:25:50 +01:00
keorn
a84a10ff03 Add replay protection (#4808) 
* add eip155

* make network_id default
 2017-03-08 14:44:07 +01:00
keorn
98be191b25 Fix validator contract syncing (#4789) 
* make validator set aware of various states

* fix updater build

* clean up contract call

* failing sync test

* adjust tests

* nicer indent [ci skip]

* revert bound divisor
 2017-03-08 14:41:24 +01:00
Robert Habermeier
8a3b5c6332 Remote transaction execution (#4684) 
* return errors on database corruption

* fix tests, json tests

* fix remainder of build

* buffer flow -> request credits

* proving state backend

* generate transaction proofs from provider

* network messages for transaction proof

* transaction proof test

* test for transaction proof message

* fix call bug

* request transaction proofs from on_demand

* most of proved_execution rpc

* proved execution future
 2017-03-08 14:39:44 +01:00
Gav Wood
cec37207be Update comments and reg ABI (#4787) 
* Update comments.

* Fix up new ABI.
 2017-03-06 21:37:38 +01:00
Robert Habermeier
8e9faa416d proofs of non-existance in ProvingBlockChainClient 2017-03-06 17:03:58 +01:00
Jaco Greeff
495e5790e9 Support both V1 & V2 DataChanged events in registry (#4734) 
* Add info on forks.

* Add new registry ABI

* Import registry2 & fix exports

* Select ABI based on code hash

* Render new event types (owner not available)

* New registry.

* Rename old chain.

* Fix test.

* Another fix.

* Finish rename.
 2017-03-03 13:33:49 +01:00
Gav Wood
3a0c4b6539 Add info on forks. (#4733) 2017-03-03 08:20:25 +01:00
Gav Wood
2862b3c21a New chains (#4720) 
* Add Kovan chain.

* Fix up --testnet.

* Fix tests.

* Fix test.

* fix test

* Fix test.
 2017-03-02 20:24:27 +01:00
keorn
ade5a13f5b Add registrar fields (#4716) 
* add registrar field

* use constructor for dev registrar

* fix test
 2017-03-02 12:25:55 +01:00
Robert Habermeier
c2c699abb9 change migration to v11 to be faster 2017-02-26 18:41:40 +01:00
Robert Habermeier
1ff0abc661 Merge branch 'master' into remote-tx-exec 2017-02-26 13:55:29 +01:00
Robert Habermeier
1bf2b27708 Propagate trie errors upwards from State (#4655) 
* state backend trait mirroring state_db API

* minimal state backend trait

make state module public

* fix json tests

* return errors on database corruption

* fix tests, json tests

* fix remainder of build

* add Backend bound on state
 2017-02-26 13:10:50 +01:00
Robert Habermeier
69e82e15a3 request transaction proofs from on_demand 2017-02-25 20:10:38 +01:00
Robert Habermeier
7c541117b3 fix call bug 2017-02-25 19:01:41 +01:00
Robert Habermeier
eb9ee35d6c Merge pull request #4632 from ethcore/state-backend 
Generic state backend
 2017-02-25 16:22:42 +01:00
Robert Habermeier
4cf62e816e Merge branch 'state-backend' into remote-tx-exec 2017-02-25 14:31:27 +01:00
Robert Habermeier
7863d1e978 add Backend bound on state 2017-02-25 14:28:26 +01:00
Robert Habermeier
32f906fe9f transaction proof test 2017-02-25 11:54:32 +01:00
Robert Habermeier
92e5982127 generate transaction proofs from provider 2017-02-25 00:27:48 +01:00
Robert Habermeier
ee7779df17 proving state backend 2017-02-24 20:16:32 +01:00
Arkadiy Paronyan
ef7998f473 Max gas limit and min gas price (#4661) 
* Max gas limit and min gas price

* Tests

* Limit gas limit ceiling
 2017-02-24 17:34:32 +01:00
keorn
9b5bcb81fd Fix Tendermint deadlock (#4654) 
* scope read

* consistent step
 2017-02-24 10:26:56 +01:00
Robert Habermeier
3f78c945d7 Merge pull request #4594 from ethcore/lightrpc 
Remainder of RPC APIs implemented for the light client
 2017-02-23 19:58:27 +01:00
Robert Habermeier
91753c53cd fix tests, json tests 2017-02-23 18:41:01 +01:00
Robert Habermeier
3655601693 return errors on database corruption 2017-02-23 17:40:03 +01:00
Gav Wood
3182540d9f Tweak some checks. (#4633) 
* Tweak some checks.

* Fixed build and added a difficulty test
 2017-02-22 18:24:22 +01:00
Robert Habermeier
636b2deb2e fix json tests 2017-02-22 10:52:58 +01:00
Robert Habermeier
1fba73c15e minimal state backend trait 
make state module public
 2017-02-21 12:35:21 +01:00
Robert Habermeier
ac9716a5ce state backend trait mirroring state_db API 2017-02-21 11:13:02 +01:00
Robert Habermeier
d8b1cfe082 Merge branch 'master' into lightrpc 2017-02-20 18:01:29 +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
keorn
ac6180a6fe seals_internally (#4613) 2017-02-20 16:35:53 +01:00
Tomasz Drwięga
72998d3ce3 Proper default accounts RPCs (#4580) 
* Default accounts setting - account provider

* RPC support for default accounts

* Updating JS code

* Rename whitelist to addresses
 2017-02-20 16:33:12 +01:00
Arkadiy Paronyan
0aad8a87ae Added pending transaction info to eth_getTransactionByHash (#4570) 
* Return condition info for pending transactions

* Fixed warnings
 2017-02-20 16:19:43 +01:00
Robert Habermeier
7a857a24ae use new histogram/corpus 2017-02-17 16:18:31 +01:00
Nikolay Volf
494a0de1e2 Key derivation in ethstore & rpc (#4515) 
* initial in secret store

* generation

* test

* refactor of the derivation

* signing

* account provider

* tests for account provider

* rpc types

* rpc types converts

* rpc tests

* fix warnings

* some extra docs

* derivate -> derive

* secret() -> as_raw()

* secret() -> as_raw() in rpc

* fix merge bug

* align with new serde changes
 2017-02-15 16:56:15 +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
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
Arkadiy Paronyan
1fa830d19b Fixed receipt decoding (#4521) 2017-02-13 12:14:05 +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
0246d5c734 Merge branch 'master' into lightrpc 2017-02-08 19:20:35 +01:00
Robert Habermeier
e73ea80954 dispatcher abstraction, port most things to it 2017-02-08 15:36:53 +01:00
Svyatoslav Nikolsky
a92bf65181 parity_getVaultMeta && parity_setVaultMeta (#4475) 2017-02-08 07:53:39 -05:00
keorn
b0248cad0b sort corpus when hitting genesis (#4470) 2017-02-08 08:55:56 +01:00
Tomasz Drwięga
5fe993f658 Fixing CORS headers for parity.web3.site (#4461) 2017-02-07 18:11:42 -05:00
Robert Habermeier
1fa5b07321 Merge branch 'master' into lightrpc 2017-02-07 17:13:18 +01:00
Robert Habermeier
4172a5369c Include total difficulty in CHTs and hide implementation details from consumers (#4428) 
* CHT builder and prover

* use CHT abstraction in provider

* hide CHT internals from header chain

* fix itertools conflict by updating all to 0.5

* cht proof checker, use it in on_demand
 2017-02-06 17:21:35 +01:00
Maciej Hirsz
127baed385 Merge pull request #4362 from ethcore/mh-tendermintrlpfix 
Fix RLP encoding for types recursively calling `RlpStream::append`
 2017-02-06 11:13:40 +01:00
Svyatoslav Nikolsky
2f340a547a Vaults RPCs (#4366) 
* vaults RPCs

* vault.password != vault_account.password

* moved vault RPCs to parityAccounts NS

* parity_listVaults + parity_listOpenedVaults
 2017-02-05 10:17:56 -05:00
Robert Habermeier
7c9064c856 Merge branch 'master' into lightrpc 2017-02-04 22:30:20 +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
Robert Habermeier
484b93abdc Merge branch 'cht-td' into lightrpc 2017-02-04 17:14:47 +01:00
Robert Habermeier
ca11138ce8 fix itertools conflict by updating all to 0.5 2017-02-04 17:07:39 +01:00
Arkadiy Paronyan
312aa72747 Transaction timestamp condition (#4419) 
* Transaction timestamp condtiion

* Updated docs

* Updated docs

* Check agains last block timestamp
 2017-02-03 19:32:10 +01:00
Robert Habermeier
83de16da88 use encoded::Header in HeaderChain 2017-02-03 15:32:22 +01:00
Tomasz Drwięga
853aae2b92 Validate dapps accounts with address book (#4407) 
* Parametrize address book

* Improving types in account_provider

* Filtering dapps_accounts

* Fixing RPC tests
 2017-02-03 13:56:47 +01:00
keorn
76c39e3e66 Fix lock and rename tracing (#4403) 
* tracing, timeouts

* remove env_logger
 2017-02-02 19:11:43 +01:00
maciejhirsz
687ae4d7fa Removed fixed TODO 2017-02-01 10:38:01 +01:00
Tomasz Drwięga
9fb2be8f2b Optional from field in Transaction Requests (#4332) 
* Infering default account when sending transactions if not provided

* Fixing test

* Fixing tests code

* Fixes.

* More fixes.

* Final fix.
 2017-01-30 21:08:36 +01:00
maciejhirsz
681fa10d4b Tests checking item sizes for changed types 2017-01-30 20:01:32 +01:00
maciejhirsz
6795068ea4 Fixed other types 2017-01-30 19:13:35 +01:00
maciejhirsz
5fe54901e7 Fix Step encoding 2017-01-30 18:13:14 +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
cf348dae60 Persistent tracking of dapps (#4302) 
* Tests for RPC

* Extracting dapp_id from Origin and x-parity-origin

* Separate type for DappId

* Persistent tracking of recent dapps

* Fixing tests

* Exposing dapp timestamps

* Fixing import to work on stable

* Fixing test again
 2017-01-30 10:59:46 +01:00
Arkadiy Paronyan
c012dfc3ef EIP-98: Optional transaction state root (#4296) 
* EIP98: Optional receipt state root

* Use if-else

* Fixing tests
 2017-01-25 20:22:48 +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
Tomasz Drwięga
67284cc1a2 Logging transaction duration (#4297) 
* Logging transaction duration

* Printing time also on heavy transactions [ci:skip]
 2017-01-25 11:02:03 +01:00
keorn
e9251a9325 Generic engine utilities (#4258) 
* move modules up

* make structs generic

* reound to view and tests

* fix
 2017-01-24 22:03:03 +01:00
Tomasz Drwięga
fa02b3ae54 Additional logs for own transactions (#4278) 2017-01-24 19:18:52 +00:00
keorn
ba0209678b ValidatorSet reporting (#4208) 
* remove register_account_provider

* build rpc module

* new dummy client

* common EngineSigner struct

* from -> into

* initial report via call

* separate safe from regular contract

* transact_contract

* fix build

* return Signature, docs

* add sign method to some engines

* add safeContract spec

* update specs to new contracts

* use AuthorityRound for contract spec

* add more reporting

* add reporting test

* use gas floor

* shorter
 2017-01-24 12:03:58 +03:00
keorn
b7f9b304c1 Chain scoring (#4218) 
* chain scoring

* use current steps
 2017-01-23 17:27:11 +03: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
keorn
97a60ceab1 Common EngineSigner (#4189) 
* remove register_account_provider

* build rpc module

* new dummy client

* common EngineSigner struct

* from -> into

* return Signature, docs
 2017-01-20 13:25:17 +01:00
Robert Habermeier
a791cb50a6 Light protocol syncing improvements (#4212) 
* remove old lint silencer

* dispatch requests only to peers with higher TD

* dynamic target for sync rounds

* use round pivots instead of frames, fix test

* fix total difficulty calculation for test client

* fix broken reorg algorithm

* fork test, fix ancestor search
 2017-01-20 12:41:59 +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
Tomasz Drwięga
b4ff08beb8 Fixing etherscan price parsing (#4202) 
* Fixing etherscan price parsing

* Handling all errors
 2017-01-18 17:56:21 +01:00
Svyatoslav Nikolsky
bac6293309 gas_limit for blocks, mined by Parity will be divisible by 37 (#4154) 
* gas_limit for new blocks will divide evenly by 13

* increased PARITY_GAS_LIMIT_DETERMINANT to 37

* separate method for marking mined block

* debug_asserts(gas_limit within protocol range)

* round_block_gas_limit method is now static

* made round_block_gas_limit free-function

* multiplier->multiple [ci skip]
 2017-01-16 14:29:51 +01:00
Gav Wood
c2f4716ee2 icarus -> update, increase web timeout. (#4165) 
* icarus -> update, increase web timeout.

* Fix estimate gas
 2017-01-13 16:30:16 +01:00
Tomasz Drwięga
e11353f94c UnverifiedTransaction type (#4134) 
* Introducing ValidSignedTransaction

* Verifiying transactions in engines

* Widening use of VerifiedSignedTransaction

* Renaming Transactions

* Uncommenting banning queue & Fixing tests

* Fixing json tests

* Fixing pre-homestead test

* Fixing imports

* Addressing grumbles

* Fixing test
 2017-01-13 08:51:36 +00:00
Gav Wood
311730ea95 Improvements and optimisations to estimate_gas (#4142) 
* Return 0 instead of error with out of gas on estimate_gas

* Fix stuff up.

* Another estimate gas fix.

* Alter balance to maximum possible rather than GP=0.

* Only increase to amount strictly necessary.

* Improvements and optimisations to estimate_gas.

- Introduce proper error type
- Avoid building costly traces

* Fix tests.

* Actually fix testsActually fix tests
 2017-01-12 11:06:12 +01:00
keorn
844b1f8c0d Refactor VoteCollector (#4101) 
* dir

* simple validator list

* stub validator contract

* make the engine hold Weak<Client> instead of IoChannel

* validator set factory

* register weak client with ValidatorContract

* check chain security

* add address array to generator

* register provider contract

* update validator set on notify

* add validator contract spec

* simple list test

* split update and contract test

* contract change

* use client in tendermint

* fix deadlock

* step duration in params

* adapt tendermint tests

* add storage fields to test spec

* constructor spec

* execute under wrong address

* create under correct address

* revert

* validator contract constructor

* move genesis block lookup

* add removal ability to contract

* validator contract adding validators

* fix basic authority

* validator changing test

* more docs

* update sync tests

* remove env_logger

* another env_logger

* cameltoe

* hold EngineClient instead of Client

* return error on misbehaviour

* nicer return

* sprinkle docs
 2017-01-11 17:56:50 +01:00
Gav Wood
56c546f465 Another minor estimation fix (#4133) 
* Return 0 instead of error with out of gas on estimate_gas

* Fix stuff up.

* Another estimate gas fix.

* Alter balance to maximum possible rather than GP=0.

* Only increase to amount strictly necessary.
 2017-01-11 17:51:48 +01:00
Robert Habermeier
7123f19a75 Test harness for lightsync (#4109) 
* make on_connect/disconnect public

* free flow params constructor

* Shared ownership of LES handlers

* light provider impl for test client

* skeleton for testing light sync

* have test_client use actual genesis

* fix underflow in provider

* test harnesses for lightsync

* fix tests

* fix test failure caused by test_client changes
 2017-01-11 14:39:03 +01:00
Gav Wood
7286d42b7d Fix call/estimate_gas (#4121) 
* Return 0 instead of error with out of gas on estimate_gas

* Fix stuff up.
 2017-01-11 14:28: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
23feb7998f Use binary chop to estimate gas accurately (#4100) 
* Initial sketch.

* Building.

* Fix a few things.

* Fix issue, add tracing.

* Address grumbles

* Raise upper limit if needed

* Fix test.
 2017-01-10 18:56:41 +01:00
Gav Wood
ae144b7f62 Ignore get_price_info test by default. (#4112) 2017-01-10 15:41:48 +01:00
keorn
be30c44179 Validator/authority contract (#3937) 
* dir

* simple validator list

* stub validator contract

* make the engine hold Weak<Client> instead of IoChannel

* validator set factory

* register weak client with ValidatorContract

* check chain security

* add address array to generator

* register provider contract

* update validator set on notify

* add validator contract spec

* simple list test

* split update and contract test

* contract change

* use client in tendermint

* fix deadlock

* step duration in params

* adapt tendermint tests

* add storage fields to test spec

* constructor spec

* execute under wrong address

* create under correct address

* revert

* validator contract constructor

* move genesis block lookup

* add removal ability to contract

* validator contract adding validators

* fix basic authority

* validator changing test

* more docs

* update sync tests

* remove env_logger

* another env_logger

* cameltoe

* hold EngineClient instead of Client

* add a comment about lock scope
 2017-01-10 12:23:59 +01:00
Tomasz Drwięga
a584c6396c Don't remove out of date local transactions (#4094) 2017-01-09 17:01:09 +01:00
Robert Habermeier
9c00eb4e8a Zero-alloc trie lookups (#3998) 
* triedb cleanup

* factor out common portion of trie query

* allocate far fewer times in node decoding

* fix bench compilation

* introduce OwnedNode variant to make iter fast again

* generalize recorder trait to Query

* decode trie outputs cost-free in state

* test for passing closure as query
 2017-01-06 16:18:45 +01:00
Tomasz Drwięga
eb0daea9b9 Removing old transactions from the queue (#4046) 
* Removing old transactions from the queue

* Addressing grumbles
 2017-01-05 21:16:52 +01:00
keorn
fbc9f0d7fb Add block rewards to more Engines (#4055) 
* add block rewards

* imports
 2017-01-05 21:16:13 +01:00
Robert Habermeier
b4e713efdc return old trie values on insert and remove (#4053) 
* return old trie values on insert and remove

* fix json tests
 2017-01-05 21:15:43 +01:00
Tomasz Drwięga
91f864b2b7 Fixing minGasLimit > ceil limit mining issue (#4018) 2017-01-05 12:59:16 +00:00
Maciej Hirsz
881066243b Merge pull request #4034 from maciejhirsz/mh-pwmsg 
Better error messages for PoA chains, closes #4030
 2017-01-05 11:13:45 +01:00
keorn
93237045b8 Merge pull request #4019 from ethcore/optional-spec 
Make some spec fields optional
 2017-01-04 19:25:42 +01:00
maciejhirsz
8ca0e09ffc Better error messages for PoA chains 2017-01-04 12:50:50 +01:00
Robert Habermeier
5d2cf22ef4 use basic_account in snapshot 2017-01-03 17:05:27 +01:00
Robert Habermeier
eb2b1ad5da move basic_account to types module 2017-01-03 16:43:22 +01:00
Robert Habermeier
7c715aeec3 basic account type 2017-01-03 16:32:50 +01:00
keorn
e5b3c092c8 Merge branch 'master' into optional-spec 2017-01-03 15:42:56 +01:00
Tomasz Drwięga
b24fc97cb6 Correct log index in transaction receipt (#3995) 
* Moving logs to separate, testable function

* Adding test

* Fixing log index

* Adding transaction log index

* Fixing rpc tests

* Making interface of  a bit cleaner.
 2016-12-29 18:48:28 +00: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
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
Robert Habermeier
546246c56b Unknown block error for RPC (#3965) 2016-12-23 18:46:17 +01:00
keorn
afc4cd2785 Allow contract constructors in chain spec (#3932) 
* constructor spec

* execute under wrong address

* create under correct address

* revert

* move genesis block lookup

* remove env_logger
 2016-12-23 18:44:39 +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
Igor Artamonov
be75cbfaaa set CHAIN_ID for Classic (#3934) 
* configurable CHAIN_ID

* set CHAIN_ID for Ethereum Classic
 2016-12-22 13:10:58 +01:00
keorn
552a772cc1 make fields defaulting to 0 optional 2016-12-22 07:06:40 +01:00
Nikolay Volf
af501e6467 Custom attribute for binary serialization (#3922) 
* derive(Binary) -> binary

* ethcore types refact

* fixup ethcore

* make binary optional

* fix common types

* fix updater

* remove condition
 2016-12-21 15:09:35 +01:00
Gav Wood
18965be047 Merge pull request #3903 from ethcore/test-mem-limit-deadlock 
fix deadlock in queue drop
 2016-12-19 22:23:56 +01:00
Robert Habermeier
ae8f77bc7c fix deadlock in queue drop 2016-12-19 18:10:26 +01:00
arkpar
d3486b45c5 Allow retry for future blocks 2016-12-19 14:47:48 +01:00
Gav Wood
e755c09446 Merge pull request #3884 from ethcore/fix-diff-adj 
Fix difficulty adjustment.
 2016-12-17 16:35:20 +01:00
Gav Wood
023d413610
Fix difficulty adjustment. 
Closes #3861
 2016-12-17 15:53:06 +01:00
arkpar
b34d3ee5a2 Fixin racy test 2016-12-17 12:28:31 +01:00
arkpar
65f07e5aa7 Renamed some functions 2016-12-16 14:54:26 +01:00
arkpar
6c9de9e6f8 Merge branch 'master' of github.com:ethcore/parity into tx-block 2016-12-16 13:36:07 +01:00
arkpar
f967713d08 Added a test 2016-12-16 13:27:14 +01:00
Gav Wood
6e5a583cb4 Merge pull request #3505 from ethcore/check-updates 
Auto-updating
 2016-12-16 13:01:49 +01:00
keorn
d8470cc5ca revert slack 2016-12-16 00:07:07 +01:00
keorn
447196398a fix start_step 2016-12-15 23:36:06 +01:00
Gav Wood
ca0d87da10
125 -> 69. 2016-12-15 22:05:54 +01:00
arkpar
060cc799a6 Minor tweaks 2016-12-15 21:44:31 +01:00
arkpar
27580586e0 Minor tweaks 2016-12-15 20:09:05 +01:00
keorn
b7b531ca75 more slack in test 2016-12-15 19:54:28 +01:00
keorn
b88d50dc9b fix naming collision 2016-12-15 19:27:06 +01:00
arkpar
f8961484c1 Merge branch 'master' of github.com:ethcore/parity into tx-block 2016-12-15 19:10:33 +01:00
Gav Wood
c12702fc51
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 18:23:02 +01:00
arkpar
2952ea1b85 Delayed transactions 2016-12-15 18:19:19 +01:00
Gav Wood
d455ac4a40
Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc 2016-12-15 17:12:18 +01:00
Gav Wood
db2e1dd01a
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 17:11:22 +01:00
Gav Wood
2e02db2d3e Merge pull request #3860 from ethcore/fix-channel 
Fix flaky test
 2016-12-15 17:10:41 +01:00
keorn
ee653bc262 unused import 2016-12-15 16:53:28 +01:00
keorn
9bfa69c6bd fix channel 2016-12-15 16:52:39 +01:00
Gav Wood
817a58cf64 Merge pull request #3844 from ethcore/trace-macros 
Converting traces API to AutoArgs
 2016-12-15 15:21:35 +01:00
Gav Wood
590428e7f2
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 15:12:09 +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
1ea521ea7d
Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc 2016-12-15 13:51:22 +01:00
keorn
0b9ab0797f fix build 2016-12-15 13:45:22 +01:00
keorn
943efc21bb add tendermint seal 2016-12-15 13:41:04 +01:00
Gav Wood
69eec105a7
Change default back to permissive for now. 2016-12-15 13:40:44 +01:00
Gav Wood
db73b0d66f
Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc 2016-12-15 13:28:37 +01:00
Gav Wood
a74bce2c06 Merge pull request #3759 from ethcore/auth-bft 
Tendermint Engine
 2016-12-15 13:18:15 +01:00
Gav Wood
a660024eac Merge pull request #3843 from ethcore/auth-round-seal 
AuthorityRound seal and simplify Generic seal Spec
 2016-12-15 13:08:50 +01:00
Gav Wood
c4406c9198 Merge pull request #3691 from ethcore/rotating-key 
Signing transactions with rotating token
 2016-12-15 13:08:19 +01:00
Tomasz Drwięga
6e51b23e30 Adding traces tests 2016-12-14 20:07:33 +01:00
Tomasz Drwięga
7eb9112613 Merge branch 'master' into rotating-key 
Conflicts:
	rpc/src/v1/traits/signer.rs
 2016-12-14 14:10:44 +01:00
keorn
f686fa3d6f update specs and generic conversion 2016-12-14 12:50:32 +01:00
keorn
e1d83d15b7 bump dev chain 2016-12-14 11:34:19 +01:00
arkpar
be5fefe772 Merge branch 'master' of github.com:ethcore/parity into new-dirs 2016-12-14 00:04:11 +01:00
Gav Wood
597c3a4770
Ensure chain state is at threshold security level before looking for updates. 2016-12-13 21:21:07 +01:00
Gav Wood
805b8cab2c
Add missing file. 2016-12-13 20:50:33 +01:00
Gav Wood
4424155d39
Similar checks on file changes to other tests. 2016-12-13 20:49:26 +01:00
keorn
c96826beaa expect instead of index 2016-12-13 18:22:56 +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
keorn
19adb84527 TestNet flushing and cleanup 2016-12-12 19:44:24 +01:00
keorn
f8ed5cf022 finalize unit tests 2016-12-12 17:20:20 +01:00
arkpar
6601fde328 New data paths with upgrade 2016-12-12 16:51:07 +01:00
Gav Wood
988ac8a22d
Add forks supported. 2016-12-12 16:47:57 +01:00
Gav Wood
ab4d666681
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-12 16:35:11 +01:00
Gav Wood
c0a2d5c8f5 Merge pull request #3796 from ethcore/tx-broadcast 
Avoid broadcasting transactions to peers that send them
 2016-12-12 04:13:56 +01:00
keorn
3c5d5856d2 nicer tracing 2016-12-11 22:54:48 +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
keorn
a4bf914683 Merge branch 'auth-bft' of https://github.com/ethcore/parity into auth-bft 2016-12-11 18:23:54 +01:00
Tomasz Drwięga
627b8a8414 Changing default policy 2016-12-11 17:56:12 +01:00
keorn
d4c9493b00 verification cache retrieval 2016-12-11 17:50:12 +01:00
Tomasz Drwięga
b56f12adc6 Merge branch 'master' into tx-broadcast 
Conflicts:
	ethcore/light/src/net/context.rs
	ethcore/light/src/net/tests/mod.rs
 2016-12-11 17:31:56 +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
b28537aa9a Merge pull request #3809 from ethcore/mining-min-gas-limit 
block: enforce gas limit falls within engine bounds
 2016-12-11 15:08:30 +01:00
Robert Habermeier
9252ebf93d block: enforce gas limit falls within engine bounds 2016-12-11 12:50:48 +01:00
arkpar
c777362d02 Sync channel for consensus test 2016-12-11 12:32:01 +01:00
Gav Wood
0a494962e4
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-11 02:13:52 +01:00
Gav Wood
120564ff29
Avoid pulling in hash_fetch. 2016-12-11 02:12:52 +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
Tomasz Drwięga
1e8638608c fixing tests 2016-12-10 22:59:35 +01:00
Tomasz Drwięga
19ca9ad460 Prevent broadcasting transactions to peer that send them. 2016-12-10 21:22:19 +01:00
keorn
b6c7ed24b7 Client trait reorg 2016-12-10 18:35:29 +01:00
keorn
f3af0f46be Merge branch 'master' into auth-bft 2016-12-10 18:14:35 +01:00
keorn
b9909da8b1 move Sealing methods to MiningBlockChainClient 2016-12-10 17:40:20 +01:00
Tomasz Drwięga
1f9adc8622 Merge branch 'master' into txqueue-gc 
Conflicts:
	ethcore/src/miner/miner.rs
 2016-12-10 17:00:29 +01:00
keorn
239ba61a99 move transition message to to_step 2016-12-10 16:50:23 +01:00
Tomasz Drwięga
704054ef40 Merge branch 'master' into tx-broadcast 
Conflicts:
	ethcore/src/client/traits.rs
 2016-12-10 15:23:53 +01:00
Tomasz Drwięga
e1ade5b375 Maintaining a list of transactions propagated from other peers 2016-12-10 15:18:44 +01:00
Tomasz Drwięga
27503e8e8c Merge branch 'master' into rotating-key 
Conflicts:
	ethstore/src/ethstore.rs
	ethstore/src/secret_store.rs
 2016-12-10 15:13:58 +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
Tomasz Drwięga
4696d7f606 Additional RPCs for dapps accounts management 2016-12-10 12:36:04 +01:00
keorn
e5f8044cad Merge branch 'master' into auth-bft 2016-12-10 11:01:23 +01:00
keorn
5f09eb9d04 update tests to new spec (#3790) 2016-12-10 10:38:10 +01:00
Gav Wood
edd5e76050
Merge branch 'consistent-id' into check-updates 2016-12-09 23:12:36 +01:00
Gav Wood
5f1fcf95e0
Make *ID names consistent with std Rust (Id) 2016-12-09 23:01:43 +01:00
Robert Habermeier
503b126c93 Merge branch 'master' into lightserv 2016-12-09 21:37:55 +01:00
Gav Wood
2226324495 Merge pull request #3778 from ethcore/auth-round-test 
AuthorityRound network simulation test
 2016-12-09 20:58:05 +01:00
keorn
b15edd095e Merge branch 'auth-bft' of https://github.com/ethcore/parity into auth-bft 2016-12-09 20:51:42 +01:00
Gav Wood
c82754874c
Fix typo. 2016-12-09 20:48:52 +01:00
keorn
08e7e79bfd more test 2016-12-09 20:48: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
e5e6b77984
Cleanups and avoid redownloading. 2016-12-09 20:40:24 +01:00
arkpar
97f358ced9 AuthorityRound network simulation test 2016-12-09 20:38:06 +01:00
Tomasz Drwięga
c91a614c3d Fixing tests 2016-12-09 20:24:33 +01:00
arkpar
ca7406773f AuthorityRound network simulation test 2016-12-09 19:27:16 +01:00
Gav Wood
c2b6be95c8
Fetch and place in updates path. 2016-12-09 19:02:42 +01:00
Tomasz Drwięga
cee07fef74 Trigger remove_old on new block 2016-12-09 15:54:13 +01:00
Tomasz Drwięga
5d054f08c3 Clearing old transactions 2016-12-09 15:05:03 +01:00
keorn
56e9dab9de add Engine stop method 2016-12-09 14:52:08 +01:00
arkpar
cc8c2ea58d Reject existing tx 2016-12-09 14:37:11 +01:00
Tomasz Drwięga
3ccdb7c143 Fixing unused imports 2016-12-09 10:52:42 +00:00
keorn
42c34b5c1b ignore flaky test 2016-12-09 10:53:38 +01:00
Tomasz Drwięga
930183831b Adding tests for ethstore 2016-12-09 09:45:34 +00:00
Tomasz Drwięga
8596134c0f Clearer updates handling 2016-12-09 08:31:58 +00:00
Tomasz Drwięga
93230dd4c2 Merge branch 'master' into rotating-key 
Conflicts:
	ethcore/src/account_provider/mod.rs
	rpc/src/v1/types/mod.rs.in
 2016-12-09 07:37:34 +00:00
Robert Habermeier
eec1929658 Merge branch 'master' into lightserv 2016-12-09 01:29:46 +01:00
keorn
7c42241466 remove merge code 2016-12-08 22:00:26 +01:00
keorn
74770e4773 better docstrings 2016-12-08 21:49:55 +01:00
keorn
cc284dd86f Merge branch 'master' into auth-bft 2016-12-08 21:35:08 +01:00
keorn
79ef64349c remove assert 2016-12-08 21:27:49 +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
keorn
dca752e9bb docs, tweaks 2016-12-08 20:09:30 +01:00
Robert Habermeier
efd66f566d ethsync: optional ipc codegen 2016-12-08 19:52:48 +01:00
Robert Habermeier
8d16f73795 first few LES tests, fix get_header logic bug 2016-12-08 12:20:18 +01:00
keorn
3ebfa1481d better proposal block handling 2016-12-08 12:03:34 +01:00
Gav Wood
8903384840
Merge branch 'master' into check-updates 2016-12-07 19:19:44 +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
keorn
347634ac6c dont rebroadcast propose 2016-12-07 16:42:58 +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
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
Robert Habermeier
b38d95328d light: conditional compilation 2016-12-07 10:50:24 +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
keorn
d9eb5e7f1d remove uncles 2016-12-07 09:32:36 +01:00
Robert Habermeier
085b8ad553 Merge pull request #3527 from ethcore/client-provider 
LES Part 2
 2016-12-07 09:31:50 +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
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
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
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
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
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
Gav Wood
459babb1a8
Logging. 2016-12-05 06:39:56 -08:00
keorn
c39d504167 Merge branch 'spec-rlp-loading' into auth-bft 2016-12-05 14:11:06 +00:00
keorn
22632e6324 make generic seal take valid rlp 2016-12-05 14:07:31 +00:00
keorn
b30c1d5602 fix tests 2016-12-05 13:24:22 +00:00
keorn
c946ffebf3 Merge branch 'master' into auth-bft 2016-12-05 11:30:11 +00: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
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
keorn
9084e6242d lock ordering 2016-12-02 20:04:12 +00:00
keorn
ff6240eff3 insert block into queue when sealing 2016-12-02 20:03:15 +00:00
Robert Habermeier
cd5b6fdf59 queue: CLI for auto-scaling and num verifiers 2016-12-02 18:21:54 +01:00
keorn
c8a3db4c52 new error proposal test 2016-12-02 13:59:54 +00:00
keorn
91099f62c9 add more gossip if step is stuck 2016-12-02 13:37:49 +00:00
keorn
e0f2fac441 new error type 2016-12-02 13:32:00 +00:00
keorn
0eb55cbd4d update message test 2016-12-02 13:31:28 +00:00
keorn
2c8c090598 stricter size verification 2016-12-02 13:30:43 +00:00
Robert Habermeier
6e1a1f9dec Merge branch 'master' into client-provider 2016-12-02 10:06:09 +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
Gav Wood
1dd13372b6
Merge remote-tracking branch 'origin/master' into rpc-middleware 2016-12-01 19:43:31 -08:00
keorn
f0e9eae244 remove difficulty check 2016-12-01 22:07:18 +00:00
keorn
df1cce8e7f simplify seal verification 2016-12-01 21:56:38 +00:00
keorn
e76ead40d1 update tracing message 2016-12-01 21:55:43 +00:00
keorn
39ea703c69 vote on message generation 2016-12-01 20:50:24 +00:00
arkpar
f1ef4a4935 Import sealed block immedtiatelly 2016-12-01 19:11:36 +01:00
keorn
9290fdde85 fix tests 2016-12-01 17:21:51 +00:00
keorn
498b2fb0b1 show verification error 2016-12-01 17:20:16 +00:00
keorn
e40e398eaa clean up some tracing 2016-12-01 17:19:40 +00:00
keorn
344999aaf7 return signing failure error 2016-12-01 14:10:42 +00:00
keorn
66b4f1ac47 remove unnecessary option 2016-12-01 14:10:22 +00:00
Gav Wood
d3e684698a
Merge remote-tracking branch 'origin/master' into fix-tx-rpc 2016-11-30 17:15:05 -08:00
keorn
dbf82c2e98 fix tests 2016-11-30 16:40:16 +00:00
keorn
d128c20dc2 remove proposer_nonce 2016-11-30 16:02:05 +00:00
keorn
bb8347477a gossip when not enough votes 2016-11-30 16:01:20 +00:00
Tomasz Drwięga
022ccb5bce Fixing tests 2016-11-30 16:33:42 +01:00
Tomasz Drwięga
c028f106b1 RPC for confirming with token 2016-11-30 16:11:41 +01:00
keorn
73e7908325 test password registration 2016-11-30 14:30:21 +00:00
Tomasz Drwięga
6397556cbb Sign with token support 2016-11-30 15:08:38 +01:00
keorn
155da50fcd Merge branch 'master' into auth-bft 2016-11-30 13:06:21 +00:00
keorn
34d5017950 hold password in engine, add rpc 2016-11-30 12:59:33 +00:00
Tomasz Drwięga
ad440a12bd EthMultiStore 2016-11-30 13:47:14 +01:00
Tomasz Drwięga
8e2aca719f Shared hash-fetch 2016-11-30 10:16:18 +01:00
Gav Wood
d525a6d7f0 Merge pull request #3654 from ethcore/clippy-bump 
Bumping clippy
 2016-11-29 18:00:13 +01:00
arkpar
95f81b2a2f Moved consensus networking into Parity handler 2016-11-29 16:54:30 +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
keorn
7929a145e7 fix deadlock 2016-11-29 14:55:54 +00:00
Tomasz Drwięga
762d8b89d6 Removing unused imports 2016-11-29 14:03:21 +01:00
keorn
294e89e5c0 use EngineError instead of BlockError 2016-11-29 12:51:27 +00:00
keorn
e784fa906e warn on double vote 2016-11-29 12:20:38 +00:00
keorn
49b953a9f4 order invariant seal equality 2016-11-29 11:18:40 +00:00
Igor Artamonov
8ec8bcd626 fix after code review, rel [748260b] 2016-11-29 17:18:33 +06:00
keorn
d0eab4a0d8 old message removal, avoid too many recoveries 2016-11-29 10:55:24 +00:00
keorn
61cf8b8b7e vote propose 2016-11-28 18:58:15 +00:00
keorn
0f1eefc00d disallow None seal sigs 2016-11-28 18:37:00 +00:00
Tomasz Drwięga
64b1b898f1 Fixing compilation on stable 2016-11-28 17:43:38 +01:00
keorn
e4ff614966 remove unused tracing 2016-11-28 15:50:55 +00:00
keorn
b454f7e307 use Io queue for messages 2016-11-28 15:42:36 +00:00
keorn
1326c6cf5a rebroadcast unseen messages 2016-11-28 15:24:22 +00:00
keorn
7d97ba5ee0 seal sigs test 2016-11-28 15:23:39 +00:00
Tomasz Drwięga
2b3d100de2 Fixing some clippy warnings 2016-11-28 15:54:22 +01:00
Igor Artamonov
748260bebe invalidate blocks from future 2016-11-28 20:14:43 +06:00
keorn
ef4ecce7bf nicer vote counting + test 2016-11-28 14:08:38 +00:00
keorn
09c28806d6 proper test IoHandler 2016-11-28 11:47:33 +00:00
keorn
5c0e89ae9a Merge branch 'master' into auth-bft 2016-11-28 09:50:22 +00:00
keorn
89f0bd714d test whole transitioning 2016-11-28 09:42:50 +00: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
b0555fbe7c State export 2016-11-28 01:37:24 +01:00
Gav Wood
3b6d886860
Fix up the transaction JSON serialisation for RPC. 2016-11-27 14:11:37 +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
Gav Wood
de8dd47ff9
Fetch binaries. 2016-11-25 19:29:13 +01:00
keorn
a7afbf4d25 tracing and vote test 2016-11-25 16:45:32 +00:00
keorn
8f72017bcc add transition tracing 2016-11-25 16:44:57 +00:00
keorn
f59746b2da order messages by signature 2016-11-25 16:44:18 +00:00
keorn
d2099d9f13 derive Eq for tests 2016-11-25 16:43:26 +00:00
Gav Wood
8cddf9976a
Better information. 2016-11-25 15:43:49 +01:00
Gav Wood
d0312b89ad Update test, fix number. (#3612) 2016-11-25 13:03:15 +01:00
Gav Wood
befb0bf2bd
Merge branch 'fix-number' into check-updates 2016-11-25 12:17:58 +01:00
keorn
1692c07ba6 Merge branch 'master' into auth-bft 2016-11-25 10:51:06 +00:00
keorn
da499b0a4a self contained test proposal 2016-11-24 19:59:08 +00:00
keorn
f867372dfe increase default proposal time 2016-11-24 19:58:29 +00:00
keorn
04acdd6ca0 reuse rlp generation 2016-11-24 19:57:58 +00:00
Gav Wood
45017c599a
Update test, fix number. 2016-11-24 19:11:29 +01:00
Gav Wood
735df6c30f
More work. 2016-11-24 17:19:48 +01:00
Gav Wood
e9197f5862 Merge pull request #3603 from ethcore/trace-fix 
Always insert traces for genesis.
 2016-11-24 17:16:37 +01:00
Gav Wood
46e5a84bc5 Merge pull request #3540 from ethcore/delete-accounts 
Real deleting accounts
 2016-11-24 17:16:26 +01:00
Tomasz Drwięga
aa52c72bda Traces for genesis are always present. 2016-11-24 15:05:52 +01:00
keorn
8f37807d4b seal checks 2016-11-24 13:57:54 +00:00
keorn
38f25fc195 message tests and fixes 2016-11-24 13:57:04 +00:00
keorn
207364929c improve error types 2016-11-24 13:55:16 +00: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
Gav Wood
820e291ac8 Merge pull request #3573 from ethcore/no-bg-download 
CLI option to disable ancient block downloading
 2016-11-23 16:06:45 +01:00
Gav Wood
4c9bb5aa25
Merge remote-tracking branch 'origin/master' into check-updates 2016-11-23 14:45:55 +01:00
Arkadiy Paronyan
a969c008d1 Fix panic on importing own invalid transaction (#3550) 2016-11-23 08:46:55 +01:00
arkpar
7da8f019d5 --no-ancient-blocks 2016-11-22 18:15:55 +01:00
keorn
8f6a464c51 new error types 2016-11-22 17:15:22 +00:00
Gav Wood
03d3e585af Merge pull request #2445 from ethcore/adaptive_queue_threads 
Use an adaptive number of threads in the verification queue
 2016-11-22 17:39:11 +01:00
keorn
340d377930 Revert "dont keep account provider in miner" 
This reverts commit 11ccacd6d0.
 2016-11-22 16:05:27 +00:00
Jaco Greeff
609e8912d8 Merge branch 'master' into delete-accounts 2016-11-22 16:19:40 +01: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
818e54d44e Merge pull request #3547 from ethcore/fix-flaky-auth 
Fix flaky test
 2016-11-22 00:01:51 +01:00
keorn
32bcd08b94 test utilities 2016-11-21 18:54:16 +00:00
keorn
66526af5a8 pass engine in tests 2016-11-21 18:53:53 +00:00
keorn
84fdaf966a correct seal verification 2016-11-21 16:02:26 +00:00
keorn
841d0941e0 remove WithSome block hash 2016-11-21 16:01:52 +00:00
keorn
12dbdc1d6e dont pass ap 2016-11-21 16:01:34 +00:00
Robert Habermeier
53afb8d22d queue: park directly instead of through condvar 2016-11-21 14:48:25 +01:00
Robert Habermeier
133796b7ff queue: verifier scaling tests 2016-11-21 14:23:34 +01:00
keorn
42ef7767da delete unused message type 2016-11-21 12:23:27 +00:00
keorn
6e0bd4072b Merge branch 'master' into auth-bft 2016-11-21 12:17:00 +00:00
keorn
959ccc705a fix indent 2016-11-21 12:07:43 +00:00
keorn
c6db157554 fix flaky test, clean up specs 2016-11-21 12:06:14 +00:00
keorn
e69be670de message serialization 2016-11-21 11:36:07 +00:00
Robert Habermeier
06f5bf809f Merge branch 'master' into client-provider 2016-11-21 12:19:11 +01:00
Gav Wood
601e0fb0fd
Merge remote-tracking branch 'origin/master' into check-updates 2016-11-21 11:43:29 +01:00
Arkadiy Paronyan
efd1d9bd0e Ropsten network (#3539) 
* Ropsten network

* Sorted premine

* Comas

* Removed trailing coma
 2016-11-20 16:38:45 +01:00
Gav Wood
2b8bed434c
RPC for deleting accounts. 2016-11-20 16:17:57 +01:00
Gav Wood
0848a9ec3c
Merge branch 'master' into transactions-propagate 2016-11-20 13:24:08 +01:00
Gav Wood
27a8608624
More information in the updater. 2016-11-20 13:18:56 +01:00
Gav Wood
44eda379ad
Merge remote-tracking branch 'origin/master' into check-updates 2016-11-19 03:43:43 +01:00
Robert Habermeier
58ca93c123 document lock order 2016-11-18 19:27:32 +01:00
Robert Habermeier
48df2e12fa exclusive access to each peer at a time 2016-11-18 19:26:05 +01:00
Robert Habermeier
4fd9670b33 support request sending 2016-11-18 19:12:20 +01:00
Arkadiy Paronyan
4a3bdf13df Check transaction signature when adding to the queue (#3508) 2016-11-18 17:45:19 +01:00
Robert Habermeier
f1c665081a Merge branch 'master' into client-provider 2016-11-18 16:07:50 +01:00
Robert Habermeier
63aa54cfc7 trigger event handlers, update capabilities 2016-11-18 15:30:06 +01:00
keorn
49cbd6ef98 unused imports, proposer_nonce 2016-11-18 13:38:04 +00:00
keorn
2f3b801296 rename transition 2016-11-18 13:37:47 +00:00
keorn
e90d814193 lock rounds 2016-11-18 12:27:00 +00:00
Gav Wood
4fd575b5ec
Add traces. 2016-11-18 19:52:11 +08:00
Robert Habermeier
3fabad5c0f event struct types 2016-11-18 12:36:31 +01:00
Gav Wood
cd770490ff
Remove unneeded file. 2016-11-18 19:22:47 +08:00
Gav Wood
401a4a37c1
Initial structure for auto-updater. 
- Add auto-gen'ed Operations and Registry ABIs.
- Add Updater for managing updates.
- Add fields in Client to enable update checking and registry.
 2016-11-18 19:14:52 +08:00
Gav Wood
28aabcdb6c
Merge branch 'master' into check-updates 2016-11-18 11:45:04 +08:00
keorn
c62795d09b ap registration 2016-11-17 23:36:24 +00:00
keorn
9d61071dd7 Merge branch 'miner-no-ap' into auth-bft 2016-11-17 22:04:07 +00:00
keorn
9d8ac7a09b extra line [ci skip] 2016-11-17 19:08:00 +00:00
keorn
11b6578bc3 update tests 2016-11-17 18:46:50 +00:00
keorn
11ccacd6d0 dont keep account provider in miner 2016-11-17 18:32:12 +00:00
keorn
3bac68419a last_lock 2016-11-17 17:12:37 +00:00
Robert Habermeier
8c0e511ebe rewrite scaling logic 2016-11-17 18:10:09 +01:00
Robert Habermeier
546cd00659 allocate verifiers up front, hibernate when not needed 2016-11-17 16:00:23 +01:00
keorn
ce711e321a remove unused vote accumulators 2016-11-17 13:28:29 +00:00
keorn
51ac38318a save proposal hash 2016-11-17 13:26:57 +00:00
Tomasz Drwięga
5c62e38a7c Cleanup 2016-11-17 13:52:09 +01:00
Tomasz Drwięga
fc4b51fe68 Prioritizing local transactions regardless of nonce 2016-11-17 13:42:45 +01:00
Tomasz Drwięga
74bf2c75f0 Transaction queue improvements 2016-11-17 13:32:13 +01:00
keorn
9563ccfbd2 message broadcasting methods 2016-11-17 12:18:20 +00:00
keorn
45027ea306 add new client messaging 2016-11-17 12:17:48 +00:00
Robert Habermeier
44dcd6bc3b increase readjustment period 2016-11-17 13:10:33 +01:00
Robert Habermeier
ada9d2b760 Merge branch 'master' into adaptive_queue_threads 2016-11-17 13:00:24 +01:00
keorn
802d5c669d transition rules 2016-11-16 18:01:09 +00:00
Tomasz Drwięga
cd686b5d68 Merge branch 'master' into transactions-propagate 2016-11-16 18:07:44 +01:00
Tomasz Drwięga
2cd2b10327 Local transactions RPC 2016-11-16 17:54:54 +01:00
keorn
51bbad66d0 add a path to submit seal from engine 2016-11-16 15:56:16 +00:00
Tomasz Drwięga
66e327dfcb Keep track of local transactions 2016-11-16 15:58:14 +01:00
keorn
3b0d5503b1 fix compilation 2016-11-16 13:13:21 +00:00
keorn
2fa34fd6a8 step transition messaging 2016-11-16 12:43:21 +00:00
keorn
8ac989cbeb Merge remote-tracking branch 'parity/master' into bft 2016-11-16 10:29:54 +00:00
Tomasz Drwięga
4febd0eb93 Maintaining the statistics for propagation of pending transactions 2016-11-16 10:45:55 +01:00
Arkadiy Paronyan
df1fbf50d8 Build fix (#3470) 2016-11-16 08:47:50 +01:00
Gav Wood
1daba384cc Merge pull request #3426 from ethcore/auth-round 
Authority round consensus engine
 2016-11-16 11:18:01 +08:00
Arkadiy Paronyan
4016c58ee9 Update test client with max code size 2016-11-15 19:48:15 +01:00
arkpar
e795f84664 fixed test 2016-11-15 19:46:25 +01:00
Robert Habermeier
7bfb9e4003 handle all LES requests 2016-11-15 18:19:16 +01:00
Gav Wood
062d55a046 Fix test. 2016-11-15 17:58:28 +01:00
Gav Wood
528bf17af5 Restrict max code size to 23999 bytes for EIP-150 and after. 2016-11-15 17:58:28 +01:00
keorn
1c958695c3 timeout loading 2016-11-15 15:25:30 +00:00
Robert Habermeier
cb54152c23 cut off headers after first missing 2016-11-15 15:47:08 +01:00
Robert Habermeier
abf39fde0a implement provider for client 2016-11-15 14:53:30 +01:00
keorn
7d0eafd5cd fix extra_info 2016-11-15 13:33:11 +00:00
keorn
8efaf08da3 typos and warning 2016-11-15 13:02:46 +00:00
keorn
06e5416537 header fns, extra_info 2016-11-15 11:27:09 +00:00
keorn
fde6ff2186 nicer extra info 2016-11-15 11:10:32 +00:00
keorn
d19e8c5505 Merge remote-tracking branch 'parity/master' into bft 2016-11-15 10:26:37 +00:00
keorn
ff2dc5dd57 vote counting 2016-11-15 10:21:49 +00:00
keorn
54e4956345 return errors from constructor 2016-11-15 10:21:18 +00:00
keorn
dd8ed42270 update timeouts 2016-11-15 10:20:42 +00:00
keorn
55a5402bf5 simplify messages 2016-11-15 10:20:14 +00:00
keorn
071e66c9a8 fix flaky test 2016-11-14 19:03:02 +00:00
keorn
9d46401626 revert to try! 2016-11-14 18:25:42 +00:00
keorn
ae5ae765a6 Merge branch 'master' into auth-round 2016-11-14 18:04:44 +00:00
keorn
06ebd5fa1a remove most panics 2016-11-14 17:42:56 +00:00
Robert Habermeier
25b0b8641e indent state tests 2016-11-14 17:47:56 +01:00
keorn
1e3ae9fff9 typos, header functions 2016-11-14 15:56:19 +00:00
Gav Wood
ae67bd5371 Merge pull request #3385 from ethcore/dev-chain 
Dev chain
 2016-11-14 16:28:58 +01:00
keorn
0b5a9a6e60 nicer bundled spec message 2016-11-14 14:29:33 +00:00
Robert Habermeier
3c7533831e Merge branch 'master' into client-provider 2016-11-14 15:16:26 +01:00
keorn
5de7d50bf8 add test for multi proposals 2016-11-14 14:15:31 +00:00
keorn
8be8b3e1cd ensure no double proposals 2016-11-14 13:35:45 +00:00
keorn
8a86c11375 enable force sealing 2016-11-14 13:35:16 +00:00
Robert Habermeier
18153b8d9e Merge branch 'master' into missing-code-by-prefix 2016-11-14 14:02:19 +01:00
keorn
165e2bef75 modify proposer test 2016-11-14 11:34:54 +00:00
keorn
b5c891814a fix merge 2016-11-14 11:09:57 +00:00
Gav Wood
2fa2f8342a
isLatest works. 2016-11-14 11:49:56 +01:00
keorn
501f6d3f49 Merge branch 'master' into auth-round 2016-11-14 10:08:14 +00:00
keorn
d8e6dbd981 Merge branch 'master' into dev-chain 2016-11-14 10:05:34 +00:00
keorn
2d4b4cf5c9 revert moves to Spec 2016-11-14 10:04:34 +00:00
Gav Wood
4bb4ed9551
Initial checking. 2016-11-13 15:52:33 +01:00
Gav Wood
4a92668c56 Fix chainspec storage field. (#3406) 
Add a test.
 2016-11-13 13:58:42 +01:00
Robert Habermeier
37f49aac1b abort snapshot restoration faster (#3356) 
* abort snapshot restoration faster

* flag-checking tests
 2016-11-13 13:52:53 +01:00
keorn
15d748c2f7 Merge branch 'master' into dev-chain 2016-11-11 20:40:05 +00:00
keorn
ea9c479fff update json_tests 2016-11-11 18:57:57 +00:00
keorn
53258cca6c add new dev spec 2016-11-11 17:27:20 +00:00
keorn
e63b7e51fb update instant_seal schedule 2016-11-11 17:26:41 +00:00
Robert Habermeier
87c668ba9c test previous code fetch 2016-11-11 18:24:12 +01:00
keorn
beaa014543 tix doc test 2016-11-11 16:59:22 +00:00
keorn
a719b91b63 move spec constructors to spec 2016-11-11 16:37:44 +00:00
Gav Wood
a7ad75d851 whitespace 
[ci:skip]
 2016-11-11 17:32:54 +01:00
Robert Habermeier
ed135bb9dc fetch known code from the database during restoration 
previously it kept all seen code in memory, leading to
high memory usage by the end of state restoration
 2016-11-11 17:18:31 +01:00
Robert Habermeier
3854b8a689 LES Part 1 (#3322) 
* stub implementations of light client trait

* Light provider trait

* light client sync stubs

* LES boilerplate

* stub implementation of provider for client

* skeleton and request traits

* request definitions

* new_list -> begin_list

* handle unknown packet

* revise light implementation strategy

* make verification module public

* Move all light client work to own crate

* experiment with answering requests

* buffer flow scaffolding

* remove LESv2 requests

* buffer flow basics, implement cost table

* begin status module

* implement handshake parsing and creation

* implement announcement serialization

* errors, punishment, and handshake

* handle announcements

* making announcements, clean up warnings

* allow dead code temporarily
 2016-11-10 18:30:17 +01:00
Robert Habermeier
8c2c048444 clean up errors 2016-11-10 14:05:47 +01:00
Tomasz Drwięga
2f98169539 In-browser signing support (#3231) 
* Signer RAW confirmations

* Returning address book as eth_accounts

* UI support for in-browser signing

* Post review fixes

* Adding new methods to jsonrpc

* Fixing eth_accounts

* Deterministic accounts ordering
 2016-11-10 11:27:05 +01:00
Robert Habermeier
11e6b08f02 Move ethcore-light crate into ethcore/light module 2016-11-09 23:39:56 +01:00
Robert Habermeier
ebff010d16 partial implementation of provider for client types 2016-11-09 23:25:54 +01:00
Robert Habermeier
60a8728121 Merge branch 'master' into les-impl 2016-11-09 18:06:12 +01:00
Gav Wood
4712b882e5 New transaction tests (#3313) 
* Add new transaction tests.

* Add new test.
 2016-11-09 18:02:24 +01:00
Arkadiy Paronyan
85ade4a2ec Fixed uncle details (#3299) 2016-11-09 13:17:40 +01:00
keorn
49f2a72d5d Merge branch 'master' into auth-round 2016-11-09 10:35:00 +00:00
keorn
4e36550890 message revamp 2016-11-08 18:01:31 +00:00
Robert Habermeier
b369cdd573 Merge branch 'master' into les-impl 2016-11-08 17:14:19 +01:00
keorn
ea960f1c27 Merge remote-tracking branch 'parity/master' into bft 2016-11-07 11:34:45 +00:00
Robert Habermeier
56fd88d1e8 ethash unsafety cleanup (#3210) 2016-11-05 10:39:15 +01:00
Gav Wood
744501c454 Mode improvements for UI (#3109) 
* `--mode=off` now works.

* Add Mode::Off as a persistent CLI option.

* "last" not "auto" as default.

* Commit accidentally unsaved file.

* Whitespace

[ci:skip]

* Mode CLI parse fix

* or offline

* Save mode when it gets changed.

* Fix Offline mode

* Fix up mode operations.

* Make passive default, but not overriding.

* Fix test

* Maybe not everyone wants to run an archive node...
 2016-11-05 10:38:00 +01:00
Igor Artamonov
2a19c33b8d delay bomb for Classic (ECIP-1010) (#3179) 
* delay bomb for classic (ECIP-1010)

* formatting fix after core review, rel [e6b5093]
 2016-11-04 23:09:23 +01:00
Robert Habermeier
c1a6dbe75f Move all light client work to own crate 2016-11-04 19:40:11 +01:00
Robert Habermeier
5cabb3008f make verification module public 2016-11-04 19:21:48 +01:00
Robert Habermeier
edf17d00c4 revise light implementation strategy 2016-11-04 18:40:31 +01:00
Tomasz Drwięga
f31d42d0c5 Exposing engine extra info in block RPC (#3169) 
* Exposing extra info in RPC

* Proper serialization and client trait API
 2016-11-04 17:35:02 +01:00
Robert Habermeier
eef9a355af request definitions 2016-11-04 17:19:01 +01:00
keorn
a8b688b469 allow permanent unlock for internal sealing 2016-11-04 15:50:56 +00:00
keorn
0e5060db18 update schedule 2016-11-04 15:04:19 +00:00
Gav Wood
0f16942186 EIP-155 update with Vitalik's new test vectors (#3166) 
* Vitalik's new test vectors.

* Update to latest EIP155 spec.

* Fix txs.

* Another fix.
 2016-11-04 15:13:51 +01:00
Robert Habermeier
1bc124f980 Merge branch 'master' into les-impl 2016-11-04 15:00:05 +01:00
keorn
255ec0c139 Merge branch 'master' into auth-round 2016-11-04 11:35:17 +00:00
Tomasz Drwięga
2e47842d66 Exposing state root and logsBloom in RPC receipts (#3174) 2016-11-04 12:33:13 +01:00
Gav Wood
d3de475205 EIPs 155, 160, 161 (#2976) 
* The front-end for each hard-fork, also EIP-160.

* Address EIP161 a/c

* Include EIP-161b

* EIP-161 part d.

* Fix test build.

* Fix one test, add another.

* Fix use of bloom & renaming.

* Initial groundwork for EIP-155

* Fix minor bug.

* Fix all tests finally.

* Rest of EIP-155.

* Add tests for EIP-155 algorithm.

Update transaction tests validation.

* Minor reformat.

* Address grumbles.

* Remove unused code.

* Fix SUICIDE gas mechanism and add consensus tests.

* Remove commented code.

* Set Frontier hardfork block number

* Fix warning.

* Transaction tests,
 2016-11-03 22:22:25 +01:00
keorn
0c2cfc9b6e Fix histogram (#3150) 
* fix histogram

* remove outdated comment
 2016-11-03 21:15:27 +01:00
keorn
00a3619392 header methods 2016-11-02 17:42:56 +00:00
keorn
03c9760de2 Merge remote-tracking branch 'parity/master' into auth-round-no-mocknet 2016-11-02 13:01:31 +00:00
keorn
26155f51d5 proper calculation of remaining step time 2016-11-02 12:13:47 +00:00
keorn
da3253133c ignore block timeout when sealing internally 2016-11-02 12:13:12 +00:00
keorn
3a6b56e99c check double signing, tracing 2016-11-01 18:12:06 +00:00
Tomasz Drwięga
8c1f8700ec Fixing last hashes for ethcall (#3043) 2016-11-01 11:24:46 +01:00
Robert Habermeier
42010acd68 execute periodic snapshot in new thread (#3029) 
to ensure that the I/O worker isn't stalled.
 2016-11-01 11:09:46 +01:00
Robert Habermeier
8599a11a0b Snapshot sync and block gap info in eth_syncing (#2948) 
* provide snapshot sync info in eth_syncing

* specify block gap in eth_syncing

* Extend eth_syncing with warp, format the output properly

* adjust serialization tests for sync info

* whitespace
 2016-10-31 17:32:53 +01:00
Gav Wood
547871f933 RPCs for mode change (#3002) 
* Allow warnings.

* Add RPCs to allow ad-hoc mode changes.

* Add the JSAPI interfaces

* Add missing file.
 2016-10-31 16:58:35 +01:00
Gav Wood
54a408fd88 Fix a test sensitive to slow execution. (#3014) 2016-10-31 16:55:30 +01:00
keorn
7af20a5db0 Modify gas price statistics (#2947) 
* gas price distribution + median + tests

* put histogram in util

* use the util histogram

* remove the default gas price implementation

* histogram rpc

* fix empty corpus

* Add JS ethcore_gasPriceHistogram

* Fix typo (s/types/type/) & subsequent failing test

* Fix return type & formatting

* bucketBounds

* Add jsapi e2e test verification
 2016-10-31 12:57:48 +01:00
keorn
fc4664ab12 Merge branch 'master' into auth-round-no-mocknet 2016-10-30 21:18:52 +00:00
Arkadiy Paronyan
bccc56b6b0 mio version bump (#2982) 2016-10-30 09:56:34 +01:00
Arkadiy Paronyan
8796574e5a Use separate lock for code cache (#2977) 2016-10-29 21:27:53 +02:00
Tomasz Drwięga
f17cad9dff Fixing clippy warnings 2 (#2961) 2016-10-29 13:08:49 +02:00
keorn
7976f46231 Merge branch 'master' into auth-round-no-mocknet 2016-10-28 17:53:23 +01:00
Tomasz Drwięga
0f0334275e Validating minimal required gas for a transaction (#2937) 
* Validating minimal required gas for a transaction

* Adding RPC case and note

* Fixing whitespace [ci skip]
 2016-10-28 16:42:24 +02:00
Robert Habermeier
2806f1d4c9 Even more snapshot validity checks (#2935) 
* clarify "cancelled periodic snapshot" message

* more rigorous checks for snapshot validity

* verify ancient blocks on import

* limit number of fed blocks

* make it possible to feed snapshot service canonical hashes

* fix failing test build

* swap ethash DAG only when more recent
 2016-10-28 16:10:30 +02:00
Robert Habermeier
29ab4ecac1 Shared code cache (#2921) 
* add a global code cache

* extract memory-limited lru cache to util

* use memory-limited code cache

* account for code cache size in mem_used
 2016-10-28 16:04:44 +02:00
Tomasz Drwięga
dedc4d5cfc Get rid of duplicated code (#2915) 2016-10-27 19:29:23 +02:00
Tomasz Drwięga
152a551e8b Transaction Queue banning (#2524) 
* Blacklisting transaction queue

* Using blacklisting queue in miner

* Restoring todo [ci:skip]

* Blacklisting recipients and code

* Renaming blacklisting->banning

* CLI option for banning.

* Fixing submodule commit [ci:skip]

* Fixing RPC tests

* Additional logging when dropping transactions

* whitespace

[ci:skip]

* Configurable ban duration

* Reverting fix for pruning history from config file
 2016-10-27 19:28:34 +02:00
Tomasz Drwięga
ce37b6dcb9 Revert to gas price ordering (#2919) 2016-10-27 19:27:08 +02:00
Robert Habermeier
3a5843c40f skeleton and request traits 2016-10-27 15:45:59 +02:00
Nikolay Volf
d315ec29e1 Apply pending block details on commit (#2254) 
* failing test

* Cache pending details

* [ci skip] updated comment
 2016-10-27 15:26:29 +02:00
Robert Habermeier
a7e420d9ec stub implementation of provider for client 2016-10-27 15:09:17 +02:00
Tomasz Drwięga
88997801d0 Clippy bump (#2877) 
* Bumping clippy

* Fixing warnings

* Fix the "fix"
 2016-10-27 08:28:12 +02:00
keorn
3ff26dd544 Merge branch 'master' into auth-round-no-mocknet 2016-10-26 17:50:04 +01:00
keorn
a1745624ce enable suicide test (#2893) 2016-10-26 16:27:38 +02:00
Arkadiy Paronyan
f024acd329 More snapshot fixes and optimizations (#2883) 
* More snapshot fixes and optimizations

* db drop
 2016-10-26 16:14:13 +02:00
Robert Habermeier
4b82392371 merge with master 2016-10-26 14:17:13 +02:00
Arkadiy Paronyan
5b978be034 Get rid of MemoryDB denote (#2881) 2016-10-26 13:53:47 +02:00
Arkadiy Paronyan
135d5d0e4c Snapshot fixes and optimizations (#2863) 2016-10-25 18:40:01 +02:00
Gav Wood
a6fd922ffb Don't fail badly when no transactions in last 100 blocks. (#2856) 2016-10-25 12:21:21 +02:00
Robert Habermeier
0fedc27332 Remove ethcore::common re-export module (#2792) 
* no longer export action_params

* remove transaction, header, receipt re-rexports from common

* remove env_info and builtins re-exports from common

* remove everything but util export from common

* replace common usages with util, remove module

* add a prelude module for ethcore-bigint
 2016-10-24 18:35:25 +02:00
Robert Habermeier
bc81ae0407 Snapshot and blockchain stability improvements (#2843) 
* allow taking snapshot from just-restored database without error

* make creation informant less spammy

* Ancestry iterator failure-resilient

* make uncle hash searching resilient to incomplete chain

* deduce pre-chunk info from last written block's details
 2016-10-24 18:27:23 +02:00
keorn
aa05823afe Merge remote-tracking branch 'parity/master' into auth-round-no-mocknet 2016-10-24 15:32:30 +01:00
arkpar
f543108cf5 Fixed tests 2016-10-24 16:31:37 +02:00
Arkadiy Paronyan
44a560e964 CLI option to skip seal check when importing (#2842) 2016-10-24 15:09:13 +02:00
Gav Wood
37a2ee98de Additional RPCs for password management (#2779) 
* Add personal_testPassword and stub for personal_changePassword

* Add change-password functionality.

* Address grumble.

* Update tests.

* Update build.
 2016-10-22 14:24:02 +01:00
Robert Habermeier
8e5c9ff162 rename State::snapshot to checkpoint to avoid confusion (#2796) 2016-10-22 14:22:16 +01:00
keorn
479657b23b Automatic compaction selection on Linux (#2785) 
* add auto compaction types

* pass db paths

* detect drive type on Linux

* use base db path

* add docstring

* limit the test to be side effect free

* use base db path

* more docs

* fix parsing test

* update error

* detect only on Linux

* make test Linux only

* add second device letter, update cli doc

* use spaces in cli doc

* import only on linux

* default->auto
 2016-10-21 23:21:57 +02:00
Robert Habermeier
49ef9a1aa4 Add empty account existence test from beta. (#2769) 
* add bloom filter existence test from beta

* fix U256 instantiation for master
 2016-10-21 20:36:40 +02:00
Robert Habermeier
96f4c10453 sweep most unwraps from ethcore crate, dapps crate (#2762) 
* sweep most unwraps from ethcore crate

* purge unwrap from dapps server

* whitespace

[ci:none]
 2016-10-20 23:41:15 +02:00
keorn
866ab9c7a3 Check queue to determine major importing (#2763) 
* simplify major sync detection

* fix typos

* fix merge

* more realistic EthTester

* add new synced state

* remove Blocks synced state

* move is_major_importing to rpc crate and check queue

* add tests
 2016-10-20 23:36:18 +02:00
Nicolas Gotchac
236fb82886 Trace filtering fix (#2760) 
* (#2751) Trace filtering fix:
  Don't test contract address against empty array in trace filtering

* Fixes spaces/typo

* Simplify the Trace Filtering (#2751)

* Removed unused `strictly_matches` fn
 2016-10-20 23:35:56 +02:00
Robert Habermeier
7359af8588 Incrementally calculate verification queue heap size (#2749) 
* incrementally calculate queue heap size

* query the correct queue sizes
 2016-10-20 17:19:31 +02:00
Arkadiy Paronyan
ae853a7557 Don't add empty accounts to bloom (#2753) 2016-10-20 16:49:27 +02:00
Arkadiy Paronyan
906dcd7bfe Block import optimization (#2748) 
* Block import optimization

* whitespace

[ci:none]
 2016-10-20 14:49:12 +02:00
Arkadiy Paronyan
20e1d575da Frontport commits from beta to master (#2743) 
* Remove count limit for local transactions (#2634)

* Fixed stalled sync
 2016-10-20 00:33:00 +02:00
keorn
aa52b04e31 Unify major syncing detection (#2699) 
* simplify major sync detection

* fix typos

* fix merge

* more realistic EthTester

* add new synced state
 2016-10-19 18:35:39 +02:00
Arkadiy Paronyan
487dfb0208 Snapshot sync part 2 (#2098) 
* Split block downloader into a module

* Snapshot sync progress

* Warp sync CLI option

* Increased snapshot chunk and ping timeouts

* Fixed an issue with delayed writes

* Updated bootnodes

* Don't run pending IO tasks on shutdown

* Optional first_block; removed insert_snapshot_block

* Fixing expect calls

* Fixed stalled sync

* style and docs

* Update block_sync.rs

[ci:skip]
 2016-10-18 18:16:00 +02:00
Tomasz Drwięga
4d48054cee Fixing importing traces for non-canon blockS (#2683) 2016-10-18 16:43:42 +02:00
Robert Habermeier
0eb8cb453b Merge pull request #2658 from ethcore/snapshot-earliest-era 
use pruning history in CLI snapshots
 2016-10-18 13:57:43 +02:00
Robert Habermeier
c2dd37bb69 use pruning history in CLI snapshots 2016-10-17 13:05:57 +02:00
keorn
303f922ebd steps based on unix epoch 2016-10-15 13:55:10 +01:00
Tomasz Drwięga
cceca916a1 [frontport] CLI to specify queue ordering strategy (#2494) (#2623) 
* CLI to specify queue ordering strategy (#2494)

* Alter gas priorities to include gas_price also

* CLI options and tests

* Adding ordering by gas

* whitespace

Conflicts:
	ethcore/src/miner/miner.rs
	ethcore/src/miner/mod.rs
	ethcore/src/miner/transaction_queue.rs
	parity/cli/usage.txt
	parity/configuration.rs

* fix build
 2016-10-15 14:46:33 +02:00
Tomasz Drwięga
03c1559ead Support for decryption in Signer (#2421) 
* Adding some tests

* Implementing decrypt in queue

* Removing code duplication.

* Printing public key in ethstore

* Bump UI

* Normalizing dapps format for signer.

* Fixing tests compilation

* fix whitespace

[ci:skip]
 2016-10-15 14:44:08 +02:00
Gav Wood
85eeb3ea6e EIP150.1c (#2591) 
* EIP150.1b first part.

* Add documentation.

[ci:skip]

* Tweak comment

* Fix some tests.

* Fix create

* Add the new EIP150 test. (#2563)

* Fix create some more.

* Another fix for create.

* Final fixes.

* Enable EIP150 test.

* Revert the costly suicides to respect EIP150.1b.

* Fixups for EIP150.1c

* Update tests.

* Updating tests

* Adding state tests

* Updating tests

* Updating HF block

* Removing flushln [ci:skip]

* Commenting out suicide test

* New tests.

* Switch to EIP tests.

* Rename some stuff, combine transition tests.

* Fix U256 overflows.

* Name cleanups and an effort to fix tests.

* Rename back for clarity.

* Fix non-EIP-150 OOG CALLs

* New transition block number & additional EIP150 tests

* Morden transition block set; Tests updated

* Added missing test
 2016-10-15 14:39:15 +02:00
Robert Habermeier
8263bd4be2 snapshot: single byte for empty accounts (#2625) 2016-10-14 15:45:45 +03:00
Robert Habermeier
f28b8352c1 Configurable history size in master (#2606) 
* split journaldb commit into two functions: journal_under and mark_canonical

* use new commit mechanism in client

* Configurable history size in master

* Reduce DB history

* Configurable history size

* Set min history size

* Test

* Fixed a test and reduced the limit
 2016-10-14 15:44:56 +03:00
Arkadiy Paronyan
835cd13c0e Database performance tweaks (#2619) 2016-10-14 15:44:11 +03:00
keorn
8ad1582208 enable suicide json test (#2626) 2016-10-14 14:28:02 +02:00
Robert Habermeier
19e6cbe0b2 Merge pull request #2329 from ethcore/journaldb_commit 
Split journaldb commit into two functions: journal_under and mark_canonical
 2016-10-14 13:57:17 +02:00
Arkadiy Paronyan
f9440f20b8 Fixed tx queue limit for local transactions (#2616) 
* Fixed tx queue limit for local tx

* Fixing test

* Increas gas limit to 20x
 2016-10-14 13:56:00 +02:00
Tomasz Drwięga
dbc25cf4e7 Additional logs when transactions is removed from queue (#2617) 2016-10-14 13:55:48 +02:00
Robert Habermeier
4581469e78 mitigate refcell conflict in state diffing (#2601) 
* mitigate refcell conflict in state diffing

Also uses RefCell::get_mut in a few places.

* Add test case
 2016-10-13 23:28:56 +02:00
Robert Habermeier
92f7f46fd3 Merge branch 'master' into journaldb_commit 2016-10-13 13:02:53 +02:00
Robert Habermeier
4bcc9e3b49 Merge pull request #2516 from ethcore/canon-cache-size 
Mostly configurable canonical cache size
 2016-10-12 21:48:29 +02:00
keorn
44f42ac7d3 Merge remote-tracking branch 'parity/master' into auth-round-no-mocknet 
Conflicts:
	ethcore/src/state/mod.rs
	ethcore/src/tests/mod.rs
 2016-10-12 18:39:31 +01:00
keorn
0189096caf Update json test suite (#2574) 
* update json test suite

* comment out the incomplete test
 2016-10-12 10:06:23 +02:00
keorn
214916a414 new vote counter 2016-10-11 18:38:05 +01:00
keorn
e343153f06 mixed merge and changes... 2016-10-11 18:37:31 +01:00
keorn
5e24a35272 dont close block if is_invalid (#2572) 2016-10-11 16:19:00 +02:00
Arkadiy Paronyan
55dbd5bb1f Fixed race condition in trace import (#2555) 2016-10-10 23:07:29 +02:00