NikVolf
cfcf061e41
tests stub
2016-07-04 14:51:50 +03:00
Robert Habermeier
465aae71e7
merge branch accountdb_migration into pv64
2016-07-04 12:53:01 +02:00
Robert Habermeier
601ebcf3cc
add a database migration for new accountdb
2016-07-04 12:47:03 +02:00
Tomasz Drwięga
5c438cc58a
Bumping clippy ( #1532 )
2016-07-04 11:52:59 +02:00
NikVolf
8f6e48e4c3
fix tests
2016-07-02 20:08:52 +03:00
NikVolf
43027b36ea
Merge branch 'master' into client-api-refact2
2016-07-01 22:43:51 +03:00
NikVolf
edb8663195
ethcore finished
2016-07-01 22:34:50 +03:00
NikVolf
46b0af6121
flush work
2016-07-01 22:13:56 +03:00
Arkadiy Paronyan
d91e8ccd34
Save the block reference in the queue on notification ( #1501 )
2016-07-01 19:38:37 +01:00
Nikolay Volf
8102fb9306
Client api cleaning - uncles are returned as rlp ( #1516 )
...
* uncle as rlp in the api
* uncle rlp in block view
* fix warning
2016-07-01 19:37:17 +01:00
NikVolf
07521c17b4
dedicated types
2016-07-01 21:33:59 +03:00
Marek Kotewicz
d8a4cca817
Fatdb integration with CLI ( #1464 )
...
* fatdb integration
* --fat-db
* rerun with --pruning=archive comment
2016-07-01 19:29:56 +01:00
NikVolf
0907722fc8
fix warning
2016-07-01 16:34:15 +03:00
NikVolf
d4ff3e51e9
uncle rlp in block view
2016-07-01 16:33:37 +03:00
Robert Habermeier
d42ea6b69e
modify account_db to work on address hash, not address
2016-07-01 14:36:07 +02:00
Nikolay Volf
c71dff04c5
Merge pull request #1514 from ethcore/fix-warnings
...
Fix warnings
2016-07-01 14:55:17 +04:00
NikVolf
7ad8599324
uncle as rlp in the api
2016-07-01 13:26:44 +03:00
Tomasz Drwięga
52f4034bdd
Formatting
2016-07-01 02:21:22 +02:00
Tomasz Drwięga
5c2ca9a0cb
Fixing warnings
2016-07-01 02:08:14 +02:00
Gav Wood
1d780f456a
Fix is_new.
2016-06-30 23:14:54 +02:00
Gav Wood
29b6ba4a87
Fix the reseal mechanism.
2016-06-30 22:35:59 +02:00
Robert Habermeier
456619001a
parallelize account trie creation
2016-06-30 20:43:54 +02:00
NikVolf
ba38cc0ccc
fix all warnings
2016-06-30 21:00:52 +03:00
NikVolf
cdd1c6dd90
fix unused imports
2016-06-30 20:57:07 +03:00
NikVolf
bad02d65a1
fix merging bugs
2016-06-30 20:44:24 +03:00
NikVolf
97eb311cb0
Merge branch 'master' into client-ipc-refact
2016-06-30 20:32:13 +03:00
Gav Wood
9c58ebf2d2
Merge branch 'master' into clone-work
2016-06-30 13:16:48 +02:00
Arkadiy Paronyan
ff29c82c9e
Merge pull request #1495 from ethcore/work-notify
...
Workaround for hyper panic
2016-06-30 13:14:24 +02:00
Gav Wood
dff7d9603c
Fix for fake new work packages.
2016-06-30 13:12:15 +02:00
Gav Wood
9c07e5c355
Optionally clone block behind work-package.
2016-06-30 12:56:58 +02:00
arkpar
51c6b85f80
Workaround hyper panic
2016-06-30 10:07:33 +02:00
Gav Wood
5a794b21cf
Make output less green.
2016-06-30 08:20:34 +02:00
Gav Wood
6ca2e6b29b
Remove extraneous messages.
2016-06-30 08:20:34 +02:00
Gav Wood
93a89049ed
More colour!
2016-06-30 08:20:34 +02:00
Gav Wood
92edf7f511
Safe coloured logging.
2016-06-30 08:20:34 +02:00
Gav Wood
4a6206c514
Log for when we mine a block with lots of info.
...
Fixes #1468
2016-06-30 08:20:34 +02:00
Arkadiy Paronyan
60270083e5
Merge pull request #1491 from ethcore/work-notify
...
Work notification over HTTP
2016-06-30 08:19:45 +02:00
NikVolf
8fc03e2dc2
deriving ipc service compiling
2016-06-30 01:09:35 +03:00
NikVolf
3c061857c4
error sorting out
2016-06-30 00:56:12 +03:00
NikVolf
2891b7b4ea
sorting filters & ranges
2016-06-30 00:15:34 +03:00
Gav Wood
86ba6f1912
Fix test compilation.
2016-06-29 22:05:00 +02:00
arkpar
ee01ad1324
Shortcut sealed block into the chain
2016-06-29 21:49:22 +02:00
NikVolf
d5be0fae54
transaction import result sorting also
2016-06-29 21:48:22 +03:00
NikVolf
f6ec1eae4a
sorting out util imports
2016-06-29 21:37:23 +03:00
NikVolf
a14f2391ff
sorting with transaction result
2016-06-29 21:35:22 +03:00
NikVolf
f31ddec3a8
block queue info
2016-06-29 21:28:21 +03:00
Gav Wood
f24ba94fbd
Merge branch 'work-notify' of github.com:ethcore/parity into work-notify
2016-06-29 20:14:32 +02:00
Gav Wood
dc24448900
Include number in eth_getWork.
2016-06-29 20:09:13 +02:00
NikVolf
5337de8d42
uncle returns rlp
2016-06-29 21:08:34 +03:00
arkpar
b3f37f3cb4
HTTP work notifier
2016-06-29 20:07:21 +02:00
Gav Wood
e24f9c9936
Add CLI option and route to MinerOptions.
2016-06-29 20:06:03 +02:00
arkpar
5958c87e56
HTTP work notifier
2016-06-29 20:04:52 +02:00
NikVolf
562e591ed3
more missing serializaers
2016-06-29 20:59:13 +03:00
NikVolf
dec083a5ed
basic layout
2016-06-29 20:25:05 +03:00
NikVolf
3cca6c869e
state diff serialization
2016-06-29 19:56:47 +03:00
Robert Habermeier
6ecd6eaa12
batch state trie writes
2016-06-29 18:37:17 +02:00
NikVolf
bfbcb8d551
btree map serializer
2016-06-29 19:35:36 +03:00
Robert Habermeier
83c967c082
Merge pull request #1487 from ethcore/vm-fact
...
vm factory to mining client
2016-06-29 18:00:54 +02:00
Gav Wood
98ae9cad6f
Minor additions to allow resetting of code. ( #1482 )
...
* Minor additions to allow resetting of code.
* Add test.
2016-06-29 16:29:04 +02:00
Gav Wood
5d1ff3d7ba
Introduce options for fine-grained management of work queue. ( #1484 )
...
* Introduce options for fine-grained management of work queue.
- Minimum reseal period between non-mandatory (transaction) reseals.
- Maximum historical cached block size.
Defaults changed to reflect real-world scenarios (2s, 20 blocks).
* Fix test bug.
* 50 -> 20.
2016-06-29 16:26:19 +02:00
NikVolf
580913fa7d
vm factory to mining client
2016-06-29 17:23:29 +03:00
Robert Habermeier
6977d335e9
Merge branch 'master' into pv64
2016-06-29 16:11:06 +02:00
Gav Wood
7c27f9dfed
Add CLI option and route to MinerOptions.
2016-06-29 15:37:11 +02:00
Gav Wood
c096c087df
Ensure we don't reject our own transactions for gasprice. ( #1485 )
...
* Ensure we don't reject our own transactions for gasprice.
* Add test.
2016-06-29 15:23:41 +02:00
Robert Habermeier
49024a4f28
Merge with master
2016-06-29 14:46:29 +02:00
debris
2462193df8
Merge branch 'master' of github.com:ethcore/parity into tests_for_views
2016-06-28 14:28:54 +02:00
debris
0b86723e68
tests for HeaderView and BlockView, fixed #144
2016-06-28 14:28:42 +02:00
Marek Kotewicz
af891f65a7
verifier is no longer a template type of client ( #1467 )
...
* verifier is no longer a template type of client
* added missing ,
2016-06-28 13:23:15 +02:00
debris
4ecf23df9a
tests for TransactionView
2016-06-28 12:08:30 +02:00
Gav Wood
599a6104b7
Minor renaming.
2016-06-28 10:40:35 +02:00
Gav Wood
31de739122
U256 instead of Option<U256>. Fix up tests.
2016-06-28 10:21:29 +02:00
Gav Wood
af935df553
Merge branch 'master' into miner-improvements
2016-06-28 10:02:33 +02:00
Gav Wood
c221f69ccd
Clean up some of the FP stuff.
2016-06-28 10:00:28 +02:00
Gav Wood
495e56034f
Merge branch 'master' into miner-improvements
2016-06-27 21:02:55 +02:00
arkpar
150d7c1c78
Merge remote-tracking branch 'origin/master' into db-config-ext
2016-06-27 20:33:07 +02:00
Gav Wood
10aa32b0f5
Include RPC configurability for max tx gas limit.
...
Also Move the gas limit into the transaction queue from the miner.
2016-06-27 20:19:01 +02:00
Arkadiy Paronyan
60b70dada1
Reduced IO messages; removed panics on IO notifications ( #1457 )
2016-06-27 19:30:13 +02:00
Gav Wood
2a51a30d41
Fix up the pending set stuff.
2016-06-27 19:06:54 +02:00
Nikolay Volf
9f4bfd9e7a
fix tests
2016-06-27 18:47:50 +02:00
Gav Wood
1667808ecb
More miner options.
...
- Optional limit for the amount of gas transactions may have;
- option to restruct transactions returned/queried to only those
which have been executed.
2016-06-27 18:27:06 +02:00
Gav Wood
6c1802e412
Allow configuration of when to reseal blocks.
2016-06-27 17:23:54 +02:00
Arkadiy Paronyan
6859152c21
Fixed losing queued blocks on ancient block error ( #1453 )
2016-06-27 15:59:45 +02:00
Nikolay Volf
2e5d5f12dd
ethcore client config
2016-06-27 13:58:12 +02:00
Tomasz Drwięga
6bbaced3cd
Merge branch 'master' into miner-no-default
...
Conflicts:
ethcore/src/miner/miner.rs
parity/main.rs
2016-06-26 22:44:34 +02:00
Arkadiy Paronyan
a72d8ee0e7
v1.3.0 ( #1421 )
2016-06-25 10:32:05 +02:00
Arkadiy Paronyan
3c63244c00
Merge pull request #1418 from ethcore/newblocknumber
...
Update SF blocknumber to 1800000.
2016-06-24 17:50:03 +02:00
Gav Wood
60d259c9d5
Update SF blocknumber to 1800000.
2016-06-24 14:20:50 +02:00
Arkadiy Paronyan
4e0d6f735a
Merge pull request #1405 from ethcore/sfedgecase
...
Configurable gas limit cap.
2016-06-24 13:36:40 +02:00
Gav Wood
84ce5af2b0
max/min incorrect
2016-06-24 11:40:25 +02:00
Tomasz Drwięga
dc7c53d59a
Fixing json tests
2016-06-24 10:57:44 +02:00
Tomasz Drwięga
34c89e5841
fixing json_tests
2016-06-24 10:49:13 +02:00
Tomasz Drwięga
6edb981bfa
Merge branch 'master' into miner-no-default
...
Conflicts:
sync/src/lib.rs
2016-06-23 21:18:43 +02:00
Nikolay Volf
1d31cee524
Merge pull request #1406 from ethcore/jit
...
Fixing jit compilation
2016-06-23 18:32:14 +03:00
Tomasz Drwięga
19585947a5
Fixing jit compilation
2016-06-23 14:46:33 +02:00
Gav Wood
bca9e1f31a
Merge branch 'master' into sfedgecase
2016-06-23 14:43:42 +02:00
Gav Wood
41e0769e63
Fix tests,
2016-06-23 14:43:20 +02:00
Gav Wood
8fcec20398
Gas limit ceiling option.
2016-06-23 14:29:16 +02:00
Robert Habermeier
082294fe81
Merge pull request #1403 from ethcore/bump-clippy
...
Bump clippy
2016-06-23 14:23:46 +02:00
Arkadiy Paronyan
f3486c48ea
Merge pull request #1401 from ethcore/sfedgecase
...
Shortcut SF condition when canon known
2016-06-23 13:08:30 +02:00
Robert Habermeier
fb7ca8539e
Merge pull request #1402 from ethcore/txqueue-assert
...
Additional assertions for internal state of queue
2016-06-23 12:52:56 +02:00
Tomasz Drwięga
5bf906625b
Fixing warnings
2016-06-23 12:19:38 +02:00
Gav Wood
129ce97ad5
Constants for SF# and update.
2016-06-23 11:30:48 +02:00
Gav Wood
4f39fb2551
Merge branch 'master' into sfedgecase
2016-06-23 11:19:19 +02:00
keorn
be8f922b3f
Replace deprecated hashdb trait names ( #1394 )
...
* replace deprecated hashdb method names
* spaces -> tabs
2016-06-23 11:16:11 +02:00
Tomasz Drwięga
a76e3a134f
Bumping clippy
2016-06-23 10:54:25 +02:00
Gav Wood
fc9ceb9131
Merge branch 'master' into sfedgecase
2016-06-22 21:38:56 +02:00
Gav Wood
1602906b56
Shortcut SF condition when canon known
2016-06-22 21:37:29 +02:00
Gav Wood
230c6c889a
Ensure judging the SF trigger by relative branch ( #1399 )
...
Rather than just the canon chain.
2016-06-22 21:33:10 +02:00
Tomasz Drwięga
9a1e1b7c89
Signer with Unlocked Account ( #1398 )
2016-06-22 21:32:26 +02:00
Gav Wood
5302a7dd58
Ensure judging the SF trigger by relative branch
...
Rather than just the canon chain.
2016-06-22 19:49:07 +02:00
Gav Wood
353b9e91e6
Update SF to latest spec ( #1386 )
...
* Introduce whitelist for softfork
* Use extradata for fork id.
* Fix condition.
2016-06-22 15:37:25 +02:00
Tomasz Drwięga
e2de1987c7
Fixing order of if statements to avoid overflows. ( #1384 )
...
* Removing old transactions
* Explanation comment [ci skip]
2016-06-22 11:15:22 +02:00
Arkadiy Paronyan
7c94b1495e
Merge pull request #1329 from ethcore/softforktrigger
...
Install trigger for DAO-rescue soft-fork.
2016-06-21 22:25:24 +02:00
Arkadiy Paronyan
613d4c95f6
Merge pull request #1364 from ethcore/miner-lock
...
Fix lock order when updating sealing
2016-06-21 17:41:44 +02:00
Tomasz Drwięga
fe09d8d291
Merge branch 'master' into txqueue-assert
...
Conflicts:
ethcore/src/miner/transaction_queue.rs
2016-06-21 16:35:18 +02:00
Arkadiy Paronyan
b2891fcdda
Update sealing on new transactions ( #1365 )
2016-06-21 16:00:34 +02:00
Arkadiy Paronyan
bca4e23df6
Fixed panic on aborted connection ( #1370 )
2016-06-21 15:56:00 +02:00
Gav Wood
840f961dc2
don't bother assigning queue.
2016-06-21 14:34:22 +02:00
Tomasz Drwięga
e0b4eab819
Fixing replacing transaction with lower gas_price in one of the edge cases ( #1343 )
2016-06-21 13:55:26 +02:00
Tomasz Drwięga
3de482a431
Additional assertions for internal state of queue
2016-06-21 12:31:50 +02:00
arkpar
b667378820
Release lock while pushing transactions
2016-06-21 11:26:43 +02:00
arkpar
c912bb8c17
Fix lock order
2016-06-20 23:48:47 +02:00
Arkadiy Paronyan
f58e211b11
Merge pull request #1335 from ethcore/tx_perf
...
Transaction processing queue
2016-06-20 23:47:35 +02:00
Arkadiy Paronyan
7e424d2713
Merge pull request #1359 from ethcore/lastnonce-fix
...
Fixing last nonce values in case transaction is replaced
2016-06-20 23:03:09 +02:00
Arkadiy Paronyan
855ae91c4c
Merge pull request #1354 from ethcore/warnings-fix
...
Fixing clippy warnings
2016-06-20 21:21:51 +02:00
Gav Wood
72debeebcf
Update code hash.
2016-06-20 20:47:07 +02:00
arkpar
09b8116cde
TX processing queue
2016-06-20 18:42:50 +02:00
Tomasz Drwięga
8fa9a240cc
Fixing last nonce values in case transaction is replaced
2016-06-20 18:37:59 +02:00
Arkadiy Paronyan
8b845e56da
Merge pull request #1348 from ethcore/db-cache-size
...
Configurable rocksdb cache size
2016-06-20 17:29:18 +02:00
Marek Kotewicz
75a38500f1
Merge pull request #1346 from ethcore/txqueue-future
...
Fixing future order and errors when reaching limit.
2016-06-20 15:31:39 +02:00
Marek Kotewicz
e9900be6ea
Merge pull request #1342 from ethcore/txqueue-local-noprio
...
Removing priority on local transactions
2016-06-20 15:31:06 +02:00
Tomasz Drwięga
da7b30628b
Fixing warnings
2016-06-20 15:20:55 +02:00
Nikolay Volf
c6616431b0
fix tests
2016-06-20 14:20:13 +03:00
Nikolay Volf
7e452ab2e0
configurable cache size
2016-06-20 13:42:04 +03:00
Tomasz Drwięga
c348508b40
Fixing future order and drops because of limit errors
2016-06-20 12:14:19 +02:00
Tomasz Drwięga
edd43cd5c3
Fixing local transactions prioritization
2016-06-20 11:32:29 +02:00
arkpar
1dd87a39f5
Fixed tests
2016-06-20 10:44:15 +02:00
Tomasz Drwięga
d0b2df07db
Removing priority on local transactions
2016-06-20 10:32:52 +02:00
Tomasz Drwięga
a2f24a0083
Removing Default from Miner
2016-06-20 10:28:38 +02:00
Gav Wood
3ee3171b8c
Merge branch 'master' into softforktrigger
2016-06-20 00:37:40 +02:00
Marek Kotewicz
6b074e8fb2
secret store separated from util ( #1304 )
...
* bump rust-crypto
* initial version of account provider utilizing secret store
* update lazy_static to latest version
* AccountProvider accounts method
* new AccountProvider tests in progress
* basic tests for new AccountProvider
* ethcore compiles with new account provider and secret store
* ethcore-rpc build now compiling with new AccountProvider
* most rpc tests passing with new accounts_provider
* fixed basic_authority tests
* fixed eth_transaction_count rpc test
* fixed mocked/eth.rs tests
* fixed personal tests
* fixed personal signer rpc tests
* removed warnings
* parity compiling fine with new sstore
* fixed import direction
* do not unlock temporarily when we have the password
* removed TODO in account import
* display warning on auto account import failure
* fixed compiling of ethstore on windows
* ethstore as a part of parity repo
* added ethkey
2016-06-20 00:10:34 +02:00
Gav Wood
08522eec37
--geth prevent getTransactionReceipt from using pending. ( #1325 )
...
This mimics the fucntionality of Geth and the current unratified
JSONRPC spec (but not the functionality of eth and the ratified
spec).
2016-06-19 14:51:51 +02:00
Gav Wood
5ceb1b084c
Add missing args and some new JSONs for testing.
2016-06-19 14:49:06 +02:00
Gav Wood
2245baaaab
Provide CLI options to disable aspects of soft-fork.
...
Soft-fork will remain default behaviour, but you can now disable
either the whole mechanism (you'll lose money if you mine with this
when the majority network doesn't) or just vote against it but
otherwise go with the flow.
2016-06-19 13:20:14 +02:00
Tomasz Drwięga
8fad728e9b
Fixing locks order ( #1328 )
2016-06-19 12:33:50 +02:00
debris
026bfd6741
fixed incomplete merge
2016-06-19 02:09:17 +02:00
Gav Wood
bff1c5bdcb
Merge branch 'master' into softforktrigger
2016-06-18 20:55:50 +02:00
Gav Wood
d915eae7f7
Remove comment.
2016-06-18 20:54:44 +02:00
Gav Wood
2582253f95
Install trigger for DAO-rescue soft-fork.
...
Soft-fork should only be primed to trigger if the gas-limit of
block #1760000 is at most 4,000,000.
To accomplish this we pass in the gas limit of that block to
EnvInfo so it can inform Schedule. This gets marshalled through
`OpenBlock`/`ClosedBlock` and the `enact` functions much like
`last_hashes`. `block.rs`'s `env_info()` takes care to ensure
that if the current block happens to be #1760000 , then we
populate with the current `gas_limit`.
2016-06-18 20:26:44 +02:00
Marek Kotewicz
3617923d3c
Merge pull request #1324 from ethcore/renamefield
...
Update default gas limit, rename field
2016-06-18 20:22:05 +02:00