Gav Wood
|
2309e19fd9
|
Merge pull request #760 from ethcore/tx_queue_gas_limit
Avoid importing transactions with gas above 1.1*block_gas_limit to transaction queue
|
2016-03-18 18:05:26 +01:00 |
|
Gav Wood
|
a1fb0619bb
|
Merge pull request #752 from ethcore/tx_queue_invalid
Removing transactions that failed to be pushed to block.
|
2016-03-18 18:03:11 +01:00 |
|
Tomasz Drwięga
|
7d77324765
|
BlockGasLimit taken from push_transaction result
|
2016-03-18 14:22:50 +01:00 |
|
Tomasz Drwięga
|
0dc1ddef9a
|
Flipping sealing_enabled flag after no requests for sealing_block for some time
|
2016-03-18 13:59:11 +01:00 |
|
Tomasz Drwięga
|
58bb5e967a
|
Merge branch 'master' into tx_queue_gas_limit
Conflicts:
miner/src/transaction_queue.rs
|
2016-03-18 12:25:36 +01:00 |
|
Tomasz Drwięga
|
7fb365634a
|
Updating gas_limit in test_client generated blocks
|
2016-03-18 10:36:01 +01:00 |
|
Tomasz Drwięga
|
e58ec31e20
|
Fixing warnings
|
2016-03-18 10:14:19 +01:00 |
|
Tomasz Drwięga
|
48c72a168c
|
Merge branch 'master' into tx_queue_invalid
|
2016-03-18 09:44:31 +01:00 |
|
Tomasz Drwięga
|
7ae60056b2
|
Common error handling
|
2016-03-17 16:13:00 +01:00 |
|
debris
|
a3f6d36018
|
Merge branch 'master' of github.com:ethcore/parity into ethrpc_test
|
2016-03-17 15:52:09 +01:00 |
|
debris
|
c695b83e52
|
new way of loading PodState
|
2016-03-17 15:51:40 +01:00 |
|
Tomasz Drwięga
|
309af743e0
|
Ignoring transactions slightly above gas_limit
|
2016-03-17 15:23:25 +01:00 |
|
debris
|
1f03ae54d6
|
moved ethcores spec to its own module, added genesis
|
2016-03-17 15:15:10 +01:00 |
|
Tomasz Drwięga
|
c4021a77ca
|
Stop adding transactions right after we know that no other will make it to block.
|
2016-03-17 14:40:40 +01:00 |
|
Tomasz Drwięga
|
c382fa7eab
|
Removing invalid transactions from queue
|
2016-03-17 12:29:55 +01:00 |
|
Tomasz Drwięga
|
b1557b547b
|
Reverting check if block queue is empty
|
2016-03-17 11:47:41 +01:00 |
|
Tomasz Drwięga
|
fdba8de600
|
Validating senders balance before importing transaction to queue
|
2016-03-16 10:45:55 +01:00 |
|
Tomasz Drwięga
|
be32e79a7a
|
Merge branch 'master' into tx_queue
|
2016-03-16 09:28:37 +01:00 |
|
Tomasz Drwięga
|
188e325b20
|
Importing transactions from hashset. Notifying about every block
|
2016-03-15 23:01:36 +01:00 |
|
arkpar
|
9dea31031c
|
Enact block with uncles test
|
2016-03-15 14:35:45 +01:00 |
|
Arkadiy Paronyan
|
e5f54966af
|
Merge pull request #734 from ethcore/fixblockchainrace
Don't change best block until extras is committed.
|
2016-03-15 11:56:49 +01:00 |
|
Gav Wood
|
59d0d2df9a
|
Don't change best block until extras is committed.
|
2016-03-15 10:59:58 +01:00 |
|
Gav Wood
|
d6d0f8d4eb
|
Merge pull request #725 from ethcore/unclesminingfix
Add RLP, not a data item.
|
2016-03-14 20:20:45 +01:00 |
|
Gav Wood
|
7ba396b8d3
|
Merge pull request #687 from ethcore/pv63-receipts
PV63 receipts response
|
2016-03-14 20:18:10 +01:00 |
|
Gav Wood
|
7628df6fe6
|
Merge pull request #723 from ethcore/rpc_tests
another batch of rpc tests
|
2016-03-14 19:18:08 +01:00 |
|
Gav Wood
|
97051cb949
|
Add RLP, not a data item.
|
2016-03-14 18:20:24 +01:00 |
|
Nikolay Volf
|
8cdb013f9f
|
Merge branch 'master' into pv63-receipts
Conflicts:
ethcore/src/client/client.rs
|
2016-03-14 17:36:51 +01:00 |
|
debris
|
9b241faf01
|
uncle method mock
|
2016-03-14 17:01:29 +01:00 |
|
debris
|
0de73609d2
|
eth_hashrate && eth_submitHashrate tests
|
2016-03-14 14:18:29 +01:00 |
|
Arkadiy Paronyan
|
38de95cc3b
|
Merge pull request #719 from ethcore/targetgaslimit
Allow configuration of target gas limit.
|
2016-03-14 14:04:09 +01:00 |
|
Nikolay Volf
|
8f4323f3bb
|
Merge branch 'master' into pv63-receipts
Conflicts:
ethcore/src/client/test_client.rs
|
2016-03-14 11:06:28 +01:00 |
|
Nikolay Volf
|
3eb08b0d61
|
fix tests and deuncommented
|
2016-03-14 10:53:37 +01:00 |
|
Gav Wood
|
dc8b9c3205
|
Fix build.
|
2016-03-14 10:48:32 +01:00 |
|
Nikolay Volf
|
829ed4d0a6
|
commented empty slice/vec comparison
|
2016-03-14 10:47:22 +01:00 |
|
Gav Wood
|
f6b7884a1d
|
Allow configuration of target gas limit.
|
2016-03-14 02:00:22 +01:00 |
|
Gav Wood
|
5c964694b4
|
Merge pull request #706 from ethcore/fix-accountdb
Check for NULL_RLP in AccountDB
|
2016-03-13 22:29:19 +01:00 |
|
arkpar
|
420f473f90
|
Check for NULL_RLP in AccountDB
|
2016-03-13 21:28:57 +01:00 |
|
Gav Wood
|
b4f7f220f1
|
Merge remote-tracking branch 'origin/master' into merge_ethminer
|
2016-03-13 16:35:52 +01:00 |
|
Nikolay Volf
|
809c239ff8
|
fix rev
|
2016-03-13 15:59:25 +01:00 |
|
Gav Wood
|
76696e3b49
|
Minor build fixes.
|
2016-03-13 15:36:03 +01:00 |
|
Gav Wood
|
08b9cc2c41
|
Merge changes from #674 into branch.
|
2016-03-13 15:29:55 +01:00 |
|
Gav Wood
|
02f43f2e8c
|
Merge branch 'ethminer_crate'
|
2016-03-13 15:00:47 +01:00 |
|
debris
|
00820c342a
|
fixed eth_getCode and added tests for it
|
2016-03-13 14:45:39 +01:00 |
|
debris
|
487ba9b08a
|
implemented eth_storageAt rpc method, added more tests for rpc
|
2016-03-13 12:09:30 +01:00 |
|
Marek Kotewicz
|
1f8e0f86ac
|
Merge pull request #688 from ethcore/updating_clippy
Updating clippy
|
2016-03-13 10:07:44 +01:00 |
|
debris
|
e09de6ea3d
|
added missing eth_getBalance rpc method and tests for it
|
2016-03-12 19:51:24 +01:00 |
|
Nikolay Volf
|
0684abd345
|
fixed to return receipts grouped by requested block
|
2016-03-12 19:23:17 +01:00 |
|
Nikolay Volf
|
bd9cfb4ee5
|
Merge branch 'pv63-state' into pv63-receipts
|
2016-03-12 18:52:37 +01:00 |
|
Nikolay Volf
|
ade8b8356b
|
Merge branch 'master' into pv63-state
Conflicts:
ethcore/src/client/client.rs
|
2016-03-12 18:09:45 +01:00 |
|
Tomasz Drwięga
|
19b6c74675
|
Two more warnings
|
2016-03-12 13:39:17 +01:00 |
|
Tomasz Drwięga
|
65dadcc2a2
|
Adding todos
|
2016-03-12 10:44:24 +01:00 |
|
Tomasz Drwięga
|
d0f7555348
|
Merge branch 'master' into updating_clippy
Conflicts:
util/src/journaldb/archivedb.rs
|
2016-03-12 10:40:22 +01:00 |
|
Tomasz Drwięga
|
4b6e1dd4d2
|
Fixing warnings
|
2016-03-12 10:25:51 +01:00 |
|
Tomasz Drwięga
|
3ea52c2324
|
Merge branch 'master' into ethminer_crate
Conflicts:
parity/main.rs
|
2016-03-12 10:22:43 +01:00 |
|
Gav Wood
|
88e23fcb9a
|
Merge pull request #634 from ethcore/jdb_option2
JournalDB with in-memory overlay (option2)
|
2016-03-12 10:01:17 +01:00 |
|
Tomasz Drwięga
|
aebc91d96f
|
Merge branch 'master' into ethminer_crate
Conflicts:
Cargo.toml
rpc/Cargo.toml
sync/Cargo.toml
|
2016-03-12 09:50:18 +01:00 |
|
Nikolay Volf
|
fb51ac0d95
|
blockchain receipts rlp generation
|
2016-03-11 23:33:01 +01:00 |
|
arkpar
|
896ba57555
|
Merge branch 'master' of github.com:ethcore/parity into jdb_option2
|
2016-03-11 22:43:59 +01:00 |
|
Nikolay Volf
|
19f23f8445
|
increasing history to be useful for geth fast sync
|
2016-03-11 23:37:47 +04:00 |
|
Nikolay Volf
|
349584772b
|
redundant lines
|
2016-03-11 23:34:18 +04:00 |
|
Nikolay Volf
|
da6f6d57cd
|
state data query to client
|
2016-03-11 23:24:44 +04:00 |
|
Nikolay Volf
|
e970dd4530
|
client state data func
|
2016-03-11 23:09:14 +04:00 |
|
Tomasz Drwięga
|
c3a79c1478
|
Merge branch 'master' into ethminer_crate
Conflicts:
ethcore/src/client/client.rs
parity/main.rs
sync/src/chain.rs
sync/src/lib.rs
|
2016-03-11 19:22:40 +01:00 |
|
Tomasz Drwięga
|
f724cab92d
|
Merge branch 'master' into updating_clippy
Conflicts:
ethcore/src/lib.rs
sync/src/chain.rs
sync/src/lib.rs
util/src/keys/store.rs
util/src/lib.rs
|
2016-03-11 19:17:09 +01:00 |
|
Nikolay Volf
|
8d67316ece
|
Merge branch 'master' into reorgjdb
Conflicts:
parity/main.rs
|
2016-03-11 17:41:04 +04:00 |
|
Gav Wood
|
8ae103087d
|
Fixups for new API.
|
2016-03-11 15:07:43 +01:00 |
|
Gav Wood
|
cfe3b07130
|
Merge branch 'boxjdb' into reorgjdb
|
2016-03-11 15:03:43 +01:00 |
|
Gav Wood
|
5499f4530c
|
Fix tests.
|
2016-03-11 15:01:15 +01:00 |
|
Gav Wood
|
38d470f3bc
|
Reorganise command line options into more general engine.
|
2016-03-11 14:45:19 +01:00 |
|
Tomasz Drwięga
|
03da6c991f
|
Merge branch 'master' into ethminer_crate
Conflicts:
Cargo.lock
Cargo.toml
ethcore/src/client/client.rs
hook.sh
parity/main.rs
rpc/Cargo.toml
rpc/src/v1/impls/eth.rs
sync/Cargo.toml
sync/src/tests/helpers.rs
|
2016-03-11 14:37:07 +01:00 |
|
Gav Wood
|
b25551be7b
|
Merge pull request #671 from ethcore/clippy_hook
Removing running clippy by default on nightly.
|
2016-03-11 14:03:16 +01:00 |
|
Gav Wood
|
4771fdf0fb
|
Rearrange journaldb infrastructure.
|
2016-03-11 13:50:39 +01:00 |
|
Gav Wood
|
2a856a13f0
|
Obvious typo fix.
|
2016-03-11 13:21:53 +01:00 |
|
Gav Wood
|
d71c5d4c17
|
Place Sync/Send in trait.
|
2016-03-11 13:19:10 +01:00 |
|
Gav Wood
|
e461916f5a
|
Merge remote-tracking branch 'origin/master' into boxjdb
|
2016-03-11 12:56:33 +01:00 |
|
Gav Wood
|
756f964130
|
JournalDB -> Box<JournalDB>, and it's a trait.
|
2016-03-11 12:54:48 +01:00 |
|
arkpar
|
8f54c24e47
|
Merged changes from jdb_option1, keep LATEST_ERA from decreasing
|
2016-03-11 11:52:11 +01:00 |
|
debris
|
ebd2a92267
|
Merge branch 'master' of github.com:ethcore/parity into client_submodules
|
2016-03-11 11:17:08 +01:00 |
|
Tomasz Drwięga
|
d84e008e00
|
Removing superflous check for nightly
|
2016-03-11 11:16:49 +01:00 |
|
Marek Kotewicz
|
fd39975cf0
|
Merge pull request #587 from ethcore/rpc-signing-extend
Rpc transaction signing
|
2016-03-11 11:14:17 +01:00 |
|
debris
|
bfac5f9238
|
Merge branch 'master' of github.com:ethcore/parity into client_submodules
|
2016-03-11 11:03:52 +01:00 |
|
Tomasz Drwięga
|
8709dd28f8
|
Fixing clippy warnings
|
2016-03-11 10:58:51 +01:00 |
|
debris
|
a6d268db16
|
fixed missing reexport
|
2016-03-11 10:30:13 +01:00 |
|
debris
|
87dd42f7bc
|
Merge branch 'master' of github.com:ethcore/parity into client_submodules
|
2016-03-10 21:17:58 +01:00 |
|
arkpar
|
8785bd37e8
|
Merge branch 'master' of github.com:ethcore/parity into jdb_option2
|
2016-03-10 21:06:21 +01:00 |
|
arkpar
|
5f37f6edb4
|
Correct cache update order
|
2016-03-10 21:01:17 +01:00 |
|
debris
|
c5c8851b50
|
moved TestBlockChainClient to ethcore
|
2016-03-10 20:27:50 +01:00 |
|
Nikolay Volf
|
47aacbb819
|
work is in progress
|
2016-03-10 21:56:02 +04:00 |
|
arkpar
|
a6b5aad8c9
|
Merge branch 'master' of github.com:ethcore/parity into thread
|
2016-03-10 18:40:17 +01:00 |
|
Tomasz Drwięga
|
92022ac14d
|
Merge branch 'master' into ethminer_crate
Conflicts:
ethcore/src/client.rs
parity/main.rs
rpc/src/v1/impls/eth.rs
sync/src/chain.rs
|
2016-03-10 16:38:58 +01:00 |
|
Gav Wood
|
8dd41bfe0c
|
Merge pull request #641 from ethcore/jsonrpc_interfaces
jsonrpc uses client and sync interfaces
|
2016-03-10 15:44:05 +01:00 |
|
Tomasz Drwięga
|
0535fb30c6
|
Merge branch 'master' into ethminer_crate
Conflicts:
sync/src/lib.rs
|
2016-03-10 14:03:09 +01:00 |
|
Gav Wood
|
f708d36fad
|
Merge pull request #651 from ethcore/tx_queue_integration
Tx_queue_docs -> To master
|
2016-03-10 13:19:40 +01:00 |
|
Gav Wood
|
16e12b1ae5
|
Merge pull request #645 from ethcore/import_route
blockchain import_route
|
2016-03-10 13:14:56 +01:00 |
|
Tomasz Drwięga
|
2e72173620
|
Merge branch 'master' into ethminer_crate
Conflicts:
Cargo.lock
Cargo.toml
hook.sh
miner/src/transaction_queue.rs
rpc/Cargo.toml
sync/Cargo.toml
sync/src/chain.rs
|
2016-03-10 12:25:36 +01:00 |
|
debris
|
6681aaf76a
|
split client into few submodules
|
2016-03-10 11:32:10 +01:00 |
|
Tomasz Drwięga
|
d4e7eafede
|
Merge branch 'master' into tx_queue_integration
Conflicts:
sync/src/transaction_queue.rs
|
2016-03-10 11:23:39 +01:00 |
|
Tomasz Drwięga
|
6d0578e19c
|
Additional explanation for ordering of commit/insert_block
|
2016-03-10 11:16:54 +01:00 |
|
Gav Wood
|
249a89fc2d
|
Merge pull request #627 from ethcore/clippy-dev
`dev` feature enabled when compiling without `--release`
|
2016-03-10 11:05:56 +01:00 |
|
debris
|
190a2c3b35
|
Merge branch 'master' of github.com:ethcore/parity into import_route
|
2016-03-10 10:17:44 +01:00 |
|