Tomasz Drwięga
fbc0e0039a
Bump clippy ( #1587 )
...
* Bumping clippy
* Fixing warnings
2016-07-12 10:34:08 +02:00
Tomasz Drwięga
2746c1c18c
Merge branch 'master' into evm-instructions
...
Conflicts:
evmbin/bench.sh
2016-07-12 10:32:40 +02:00
Tomasz Drwięga
c7a11418bb
Getting rid of get_info
2016-07-12 10:28:42 +02:00
Robert Habermeier
7200cfcbc9
expunge &Vec<T> pattern ( #1579 )
...
* expunge &Vec<T> pattern
* fix travis
2016-07-12 10:28:35 +02:00
Tomasz Drwięga
92fd00f41e
EVM gas for memory tiny optimization ( #1578 )
...
* EVM bin benches
* Optimizing mem gas cost
* Removing overflow_div since it's not used
* More benchmarks
2016-07-12 09:49:16 +02:00
Robert Habermeier
4269867ca4
remove unnecessary assertion
2016-07-11 19:56:27 +02:00
Robert Habermeier
7e13ce6185
v7 migration progress
2016-07-11 19:39:06 +02:00
Robert Habermeier
673cde6c7f
add block tests
2016-07-11 18:31:18 +02:00
Nikolay Volf
d3695d0b72
Major sync <-> client interactions refactoring ( #1572 )
...
* chain notify trait
* replaced network service with io service
* fix ethcore crate warnings
* refactored network service without generic
* ethcore fix
* ethsync refactoring
* proper linking of notify
* manage network interface
* rpc crate rebinding
* full rewire
* sync internal io service
* fix deadlock
* fix warnings and removed async io
* sync imported message propagation
* fix rpc warnings
* binart warnings
* test fixes
* rpc mocks and tests
* fix util doctest
* fix message name and removed empty notifier
* pointers mess & dark mode fixed
* fixed sync doctest
* added few warnings
* fix review
* new convention match
* fix error unwraps
* doctest fix
2016-07-11 17:02:42 +02:00
Robert Habermeier
49ba117f13
add account tests
2016-07-11 16:54:50 +02:00
Tomasz Drwięga
2d5d632d74
Optimizing instruction info
2016-07-11 16:18:27 +02:00
Robert Habermeier
24ec696062
rebuild uncles hash from uncle headers
2016-07-11 15:19:01 +02:00
Tomasz Drwięga
cca4efb861
Removing overflow_div since it's not used
2016-07-11 14:52:56 +02:00
Tomasz Drwięga
f1edd3d683
Optimizing mem gas cost
2016-07-11 13:22:25 +02:00
Robert Habermeier
da9e9692dc
remove outdated comment; prove panickers; update manifest
2016-07-11 13:17:26 +02:00
Robert Habermeier
b91d339bf2
merge with master
2016-07-11 11:19:19 +02:00
Robert Habermeier
c7af950992
ignore warnings temporarily
2016-07-11 11:10:08 +02:00
Robert Habermeier
3dd7ce5566
merge accountdb_migration
2016-07-11 11:08:41 +02:00
Robert Habermeier
bdf4446173
have AccountDB use address hash for uniqueness ( #1533 )
...
* partially done alternate migration scheme
* finish altering migration framework
* migrate tests to new migration framework
* address comments
* remove superfluous newline
[ci skip]
* TempIdx -> TempIndex
[ci skip]
* modify account_db to work on address hash, not address
* add a database migration for new accountdb
* preserve first 96 bits of keys when combining
* handle metadata keys in migration and preserve first 96 bits
* fix comments and hash address instead of hash
* different migrations based on pruning
* migrations mutably borrow self
* batch abstraction for migration
* added missing licence headers
* overlay recent v7 migration
* better error handling, migrate version key as well
* fix migration tests
* commit final batch and migrate journaled insertions
* two passes on journal to migrate all possible deleted keys
2016-07-11 09:46:33 +02:00
Tomasz Drwięga
2ed09de38e
Very basic EVM binary. ( #1574 )
...
* EVM binary - initial version
* Adding missing documentation
* Fixing warnings
* Basic evmbin options
* EVMbin crate.
2016-07-11 09:42:41 +02:00
Robert Habermeier
c8b565805e
merge with master
2016-07-10 21:43:16 +02:00
Nikolay Volf
e15f631ec7
Some obvious evm & uint optimizations ( #1576 )
...
* fix name and tests for endians
* using renamed func
* zero and sign opt
2016-07-10 20:18:23 +02:00
Tomasz Drwięga
d7caae2241
Fixing clippy warnings ( #1568 )
...
* Fixing clippy warnings
* Fixing more warnings
2016-07-10 13:18:33 +02:00
Robert Habermeier
895b027527
two passes on journal to migrate all possible deleted keys
2016-07-09 17:56:09 +02:00
Robert Habermeier
36dfa4743e
merge accountdb migration
2016-07-09 17:33:14 +02:00
Gav Wood
716de21873
Address review grumble.
2016-07-09 16:59:15 +02:00
Robert Habermeier
1f885254e1
commit final batch and migrate journaled insertions
2016-07-09 15:22:59 +02:00
Gav Wood
9a70f717ad
Merge remote-tracking branch 'origin/master' into dynamic-gas-price
2016-07-09 12:29:23 +02:00
Gav Wood
d4d63a5688
Merge branches 'kill_unwraps' and 'dynamic-gas-price' of github.com:ethcore/parity into dynamic-gas-price
2016-07-09 12:29:06 +02:00
Tomasz Drwięga
b304ce5838
Uncommenting simple Miner tests ( #1571 )
2016-07-09 11:23:06 +02:00
Gav Wood
9b1d1dc336
Merge remote-tracking branch 'origin/master' into kill_unwraps
2016-07-08 20:42:11 +02:00
Gav Wood
c648171f91
Fix the HTTP client for getting price.
2016-07-08 20:01:20 +02:00
Gav Wood
ef0a41c7b3
Merge remote-tracking branch 'origin/master' into dynamic-gas-price
2016-07-08 17:36:21 +02:00
Gav Wood
9afbc9816d
Merge branch 'master' into kill_unwraps
2016-07-08 17:31:30 +02:00
Gav Wood
25e6b2b827
Initial implementation of dynamic gas pricer.
2016-07-08 17:26:06 +02:00
Tomasz Drwięga
eef9586c57
Fixing deadlock in miner ( #1569 )
...
* Fixing deadlock in miner
* Adding more comments [ci skip]
2016-07-08 17:19:14 +02:00
Robert Habermeier
3b0b1375f2
better error handling, migrate version key as well
2016-07-08 16:45:04 +02:00
Robert Habermeier
aaf9490c91
Merge branch 'master' into accountdb_migration
2016-07-08 16:14:53 +02:00
Robert Habermeier
171e93752c
overlay recent v7 migration
2016-07-08 16:07:06 +02:00
Robert Habermeier
fe027e872c
added missing licence headers
2016-07-08 15:58:36 +02:00
Robert Habermeier
3e61d6f3f9
migrations mutably borrow self
2016-07-08 13:08:51 +02:00
Gav Wood
d7077c8ef7
Fix build.
2016-07-07 11:28:33 +02:00
NikVolf
3c046556b5
fix test url
2016-07-07 11:14:37 +03:00
Gav Wood
9f43526c88
Merge branch 'master' into kill_unwraps
2016-07-07 09:40:12 +02:00
Nikolay Volf
8282c7dd50
Client IPC Interface ( #1493 )
...
* btree map serializer
* serde tests
* state diff serialization
* basic layout
* more missing serializaers
* uncle returns rlp
* block queue info
* sorting with transaction result
* sorting out util imports
* transaction import result sorting also
* sorting filters & ranges
* error sorting out
* deriving ipc service compiling
* rpc & sync recompile
* sorting rpc using uncles
* fix compilation
* fix merging bugs
* fix unused imports
* fix all warnings
* tests stub
* some merge bugs
* ethcore compilation
* fix rpc compilation
* deriving attribute
* tests (and fixes)
* rpc test working
* fix warnings again
* rs.in -> rs
* missing attribute
* refactored tree changes
* paste reformat mess fix
* pub mod actually
* intendation fix
2016-07-07 09:39:32 +02:00
Gav Wood
3b662c285f
Switch out .X().unwrap() for .unwrapped_X
2016-07-07 09:37:31 +02:00
NikVolf
1f1b420230
Merge branch 'client-ipc-refact' into client-ipc-tests
2016-07-07 10:00:41 +03:00
Gav Wood
456ad9e21b
Remove .lock().unwrap() idiom into locked().
2016-07-06 19:52:34 +02:00
NikVolf
f06cff48b9
intendation fix
2016-07-06 20:33:20 +03:00
NikVolf
b1ca41dea8
pub mod actually
2016-07-06 20:31:48 +03:00
NikVolf
5dd5983568
paste reformat mess fix
2016-07-06 20:25:42 +03:00
NikVolf
2abf1df667
Merge branch 'master' into client-ipc-refact
2016-07-06 20:20:44 +03:00
NikVolf
1ac2987437
refactored tree changes
2016-07-06 20:07:24 +03:00
Gav Wood
cd7b046d80
Fix and add info messages ( #1552 )
...
* Display information on journal database on startup.
* Minor restyling.
* Client handles the enode message to avoid repeats.
* Avoid unneeded copies *and* reduce code.
* Fix up typo.
2016-07-06 18:28:11 +02:00
Gav Wood
095e51c39c
Fix indent of #1541 ( #1555 )
2016-07-06 17:42:01 +02:00
Nipunn Koorapati
4a9b9dc305
Update sealing just once when externally importing many blocks ( #1541 )
...
Fixes Issue #1372
2016-07-06 17:15:59 +02:00
NikVolf
baababea02
missing attribute
2016-07-06 14:49:27 +03:00
NikVolf
b25a37eb38
Merge branch 'master' into client-ipc-refact
2016-07-06 14:43:36 +03:00
Robert Habermeier
f8b56317b4
Merge pull request #1548 from ethcore/remove-soft
...
Remove soft-fork stuff.
2016-07-06 13:05:43 +02:00
Robert Habermeier
aaad0e87ae
merge with latest master
2016-07-06 12:26:03 +02:00
Robert Habermeier
a7103e2870
different migrations based on pruning
2016-07-06 12:15:03 +02:00
Robert Habermeier
e151fbb071
fix comments and hash address instead of hash
2016-07-06 12:15:03 +02:00
Robert Habermeier
e411399f13
handle metadata keys in migration and preserve first 96 bits
2016-07-06 12:15:03 +02:00
Robert Habermeier
0bbdcb13b3
preserve first 96 bits of keys when combining
2016-07-06 12:15:03 +02:00
Robert Habermeier
9b28e97ca8
add a database migration for new accountdb
2016-07-06 12:15:03 +02:00
Robert Habermeier
7df0aa2b60
modify account_db to work on address hash, not address
2016-07-06 12:15:03 +02:00
Robert Habermeier
b7d243368b
Extend migration framework ( #1546 )
...
* partially done alternate migration scheme
* finish altering migration framework
* migrate tests to new migration framework
* address comments
* remove superfluous newline
[ci skip]
* TempIdx -> TempIndex
[ci skip]
2016-07-06 12:05:23 +02:00
NikVolf
9783c93564
Merge branch 'master' into client-ipc-refact
2016-07-06 12:47:52 +03:00
NikVolf
29de69e39d
failing blockid test
2016-07-06 12:40:10 +03:00
Marek Kotewicz
bcb63bce12
serde is no longer util dependency ( #1534 )
...
* removed old json-tests
* simplify folds in triehash.rs
* removed unused json_aid
* removed unused squeeze.rs
* json branching tests for trie
* removing todos from util
* separated UsingQueue and Table
* further cleanup, removing unused code
* serde serialization of hash moved to rpc module
* uint wrapper for rpc in progress
* serialization of uint moved to rpc module
* updated eth-secp256k1
* updated igd, serde is no longer dependency of util
* loading trie consensus tests
* renamed aliases in rpc imports
2016-07-06 11:23:29 +02:00
Gav Wood
a084969d55
Fix tests.
2016-07-06 10:40:45 +02:00
Gav Wood
488ff88562
Remove soft-fork stuff.
2016-07-05 18:18:35 +02:00
Tomasz Drwięga
b8b55be0be
Skipping transactions with invalid nonces when pushing to block. ( #1545 )
...
* Changing some logging levels
* Skipping invalid nonce errors
2016-07-05 17:51:41 +02:00
Gav Wood
c26cfc1c5a
Silent running operating modes ( #1477 )
...
* Command=line options.
* Keep alive for the eth protocol.
* Wire up final pieces.
* No network when dark.
* Passive and dark mode work.
* Ensure all RPCs keep alive.
* Fix tests.
* Fix minor bug.
* Minor whitespace.
* Split out some of the sleep-state.
* Fix help text.
2016-07-05 17:50:46 +02:00
Robert Habermeier
2ea7a8d666
partially done alternate migration scheme
2016-07-05 17:15:01 +02:00
NikVolf
747818a349
rs.in -> rs
2016-07-05 17:12:06 +03:00
Marek Kotewicz
62b9c1b14f
util cleanup ( #1474 )
...
* removed old json-tests
* simplify folds in triehash.rs
* removed unused json_aid
* removed unused squeeze.rs
* json branching tests for trie
* loading trie consensus tests
2016-07-05 15:16:27 +02:00
Tomasz Drwięga
4c1b74a42e
Calculating gas using usize (if supplied gaslimit fits in usize) ( #1518 )
...
* Spliting gasometer out of interpreter
* Choosing right gas calculations implementation based on supplied gas
* Moving verification out of gasometer
* MemGasCost benchmark.
Conflicts:
ethcore/src/evm/benches/mod.rs
* Some simple benchmarks
* Benchmark for simple loop
* Calculating gas_for_memory only when it's actually needed
* Removing superfluous newline [ci skip]
2016-07-05 15:15:44 +02:00
NikVolf
fb0076d262
fix warnings again
2016-07-05 12:50:42 +03:00
NikVolf
78e7101f85
rpc test working
2016-07-05 12:48:32 +03:00
NikVolf
8052824f3f
tests (and fixes)
2016-07-05 12:23:56 +03:00
NikVolf
c96686620a
deriving attribute
2016-07-05 11:49:29 +03:00
NikVolf
a9a671dfc0
ethcore compilation
2016-07-05 11:45:31 +03:00
NikVolf
b58754cd26
some merge bugs
2016-07-05 11:33:38 +03:00
NikVolf
b873d3befb
Merge branch 'master' into client-ipc-refact
2016-07-05 11:29:46 +03:00
Nikolay Volf
bbf20c3637
Merge pull request #1538 from ethcore/bc-restore
...
Attempt to fix blochchain/extras DBs sync
2016-07-05 12:16:15 +04:00
Nikolay Volf
a2b4997888
Merge pull request #1525 from ethcore/client-api-refact2
...
Client API refactoring - limiting errors to crate-level error types
2016-07-05 12:15:38 +04:00
arkpar
548b4e164e
Attempt to fix blochchain DB sync
2016-07-04 18:24:14 +02:00
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