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 |
|
arkpar
|
9e7ff2c00e
|
Version 1.1
|
2016-03-14 01:00:17 +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 |
|
Tomasz Drwięga
|
e10457d235
|
Bumping clippy
|
2016-03-12 10:06:50 +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 |
|
Tomasz Drwięga
|
3a4a7ac822
|
Bumping clippy version
|
2016-03-11 10:35:26 +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 |
|
debris
|
0a7cda09ff
|
changed route name to enacted and retracted
|
2016-03-10 10:17:17 +01:00 |
|
Tomasz Drwięga
|
2f9b955210
|
Merge branch 'master' into ethminer_crate
Conflicts:
parity/main.rs
|
2016-03-10 09:39:26 +01:00 |
|
Tomasz Drwięga
|
c3803807a9
|
Merge pull request #648 from ethcore/bq-fix
Don't call mark_as_bad needlessly
|
2016-03-10 09:28:26 +01:00 |
|
debris
|
4750d2f667
|
Merge branch 'master' into import_route
|
2016-03-10 01:04:05 +01:00 |
|
Gav Wood
|
50c8d7f633
|
Merge pull request #607 from ethcore/tx_queue_integration
Transaction Queue Integration
|
2016-03-10 00:45:07 +01:00 |
|
arkpar
|
84a741d0f9
|
Don't call mark_as_bad needlessly
|
2016-03-10 00:21:07 +01:00 |
|
debris
|
f397fb210f
|
fixed typo
|
2016-03-10 00:11:35 +01:00 |
|
Nikolay Volf
|
0f056f3abb
|
Merge branch 'master' into clippy-dev
Conflicts:
Cargo.toml
|
2016-03-10 02:45:53 +04:00 |
|
debris
|
8b042ac875
|
blockchain import_route
|
2016-03-09 21:55:23 +01:00 |
|
Nikolay Volf
|
8a83e27d6a
|
cfg-test for noop verifier
|
2016-03-09 22:55:41 +04:00 |
|
debris
|
082a4d9078
|
jsonrpc uses client and sync interfaces as a preparetion for jsonrpc tests
|
2016-03-09 17:31:43 +01:00 |
|
debris
|
3655354980
|
Merge branch 'master' into jsonrpc_panic_handle
|
2016-03-09 13:46:08 +01:00 |
|
Tomasz Drwięga
|
5db84c3233
|
Adding transactions to block
|
2016-03-09 13:09:34 +01:00 |
|
debris
|
a1640dcf72
|
jsonrpc panic handle
|
2016-03-09 11:38:53 +01:00 |
|
arkpar
|
ca7d3b91d0
|
Merge branch 'master' of github.com:ethcore/parity into jdb_option2
|
2016-03-08 18:35:25 +01:00 |
|
Tomasz Drwięga
|
9acb36af87
|
Fixing tests compilation. Removing ethminer dependency on client
|
2016-03-08 16:23:32 +01:00 |
|
Tomasz Drwięga
|
99a6802b61
|
Moving block sealing and transaction_queue to separate create
|
2016-03-08 15:46:44 +01:00 |
|
Tomasz Drwięga
|
f973610b38
|
Merge branch 'master' into tx_queue_integration
|
2016-03-08 10:15:11 +01:00 |
|
arkpar
|
57485a73ec
|
Merge branch 'master' into thread
|
2016-03-07 15:10:15 +01:00 |
|
Tomasz Drwięga
|
ab42ec8c81
|
Removing unneeded lifetime
|
2016-03-07 14:40:39 +01:00 |
|
Tomasz Drwięga
|
cbc2c0cf0c
|
Fixing clippy warnings. When building on nightly it is required to enable clippy
|
2016-03-07 14:34:17 +01:00 |
|
Gav Wood
|
ec3698066b
|
Normal CLI options with geth.
Support node identity.
Support fine-grained JSONRPC API enabling.
|
2016-03-07 12:21:11 +01:00 |
|
Tomasz Drwięga
|
b0ac103900
|
Merge branch 'master' into tx_queue_integration
|
2016-03-07 09:54:07 +01:00 |
|
Gav Wood
|
bc2fb14b5d
|
Add memory usage reports.
Update to be similar to master.
|
2016-03-06 22:39:04 +01:00 |
|
arkpar
|
d77d9ad9d8
|
JournalDB with history overlay
|
2016-03-06 19:57:00 +01:00 |
|
Tomasz Drwięga
|
e91de78528
|
Renaming back bad as retracted
|
2016-03-06 11:12:02 +01:00 |
|
Tomasz Drwięga
|
cc3839ae57
|
Revert "Revert "Transaction Queue integration""
This reverts commit d330f0b7b7 .
Conflicts:
sync/src/transaction_queue.rs
|
2016-03-05 16:46:04 +01:00 |
|
Gav Wood
|
d330f0b7b7
|
Revert "Transaction Queue integration"
|
2016-03-05 12:53:54 +01:00 |
|
Nikolay Volf
|
c4fe307b06
|
Merge pull request #595 from ethcore/tx_queue_integration
Transaction Queue integration
|
2016-03-05 14:21:54 +03:00 |
|
Tomasz Drwięga
|
b9a6a70ced
|
Renaming bad blocks as retracted
|
2016-03-05 11:37:19 +01:00 |
|
debris
|
5ad5773014
|
verifier improvements
|
2016-03-05 10:45:05 +01:00 |
|
Gav Wood
|
504e74a9ad
|
Merge pull request #578 from ethcore/finduncles
Uncle inclusion in block authoring.
|
2016-03-05 09:47:51 +01:00 |
|
Tomasz Drwięga
|
77d526fd0b
|
Merge branch 'master' into tx_queue_integration
Conflicts:
ethcore/src/client.rs
sync/src/tests/helpers.rs
|
2016-03-05 00:57:45 +01:00 |
|
Gav Wood
|
e11b74e8d2
|
Merge pull request #589 from ethcore/disablejournaldb
JournalDB can now operate in "archive" mode
|
2016-03-04 23:51:21 +01:00 |
|
Gav Wood
|
8f00056171
|
Avoid sealing unnecessarily.
|
2016-03-04 23:43:59 +01:00 |
|
Gav Wood
|
86c34c7d10
|
Remove "fix".
|
2016-03-04 23:29:56 +01:00 |
|
Gav Wood
|
098a6ad2cc
|
Reset HISTORY .
|
2016-03-04 23:09:05 +01:00 |
|
Gav Wood
|
d63e535b3c
|
Merge branch 'master' into finduncles
|
2016-03-04 23:08:48 +01:00 |
|
Gav Wood
|
96617533c8
|
Remove unneeded field.
|
2016-03-04 22:57:44 +01:00 |
|
Gav Wood
|
559e01ea84
|
Review remarks resolved.
|
2016-03-04 22:54:59 +01:00 |
|
Gav Wood
|
bc018faedc
|
Avoid forcing a resync for the pre-existing journaldbs.
|
2016-03-04 21:17:42 +01:00 |
|
Gav Wood
|
bbbaffbc53
|
"--archive" option for disabling the journal DB
Fixes #579
|
2016-03-04 21:06:28 +01:00 |
|
Nikolay Volf
|
c72c27b47e
|
client integration
|
2016-03-04 20:09:21 +03:00 |
|
Tomasz Drwięga
|
bcaed67eaa
|
Swapping order of inserting block to chain and commiting to DB to avoid race conditions
|
2016-03-04 16:48:10 +01:00 |
|
debris
|
706ce5dfb6
|
verifier trait
|
2016-03-04 11:56:04 +01:00 |
|
Gav Wood
|
52dceff3ea
|
Merge branch 'master' into finduncles
|
2016-03-03 15:16:56 +01:00 |
|
Gav Wood
|
00b5fcebe3
|
Merge pull request #580 from ethcore/fixblockchainmem
shrink_to_fit after removing hashes.
|
2016-03-03 15:08:47 +01:00 |
|
Gav Wood
|
f8dc1f2e3a
|
Avoid leaking block_details.
Fixes #576
|
2016-03-03 12:56:34 +01:00 |
|
Gav Wood
|
09e01fa0f8
|
Merge pull request #504 from ethcore/rpc_poll_ids
support for rpc polling
|
2016-03-03 12:44:27 +01:00 |
|
Gav Wood
|
806f962b7d
|
Merge pull request #573 from ethcore/issue-test/568
fork test for Issue test/568
|
2016-03-03 12:41:32 +01:00 |
|
Gav Wood
|
dadc2a96ea
|
shrink_to_fit after removing hashes.
|
2016-03-03 12:39:19 +01:00 |
|
Gav Wood
|
df77f51bcc
|
History to 30 to pass tests.
|
2016-03-03 11:47:24 +01:00 |
|
Gav Wood
|
3daa4c6497
|
Fix max uncles.
|
2016-03-03 11:39:00 +01:00 |
|
Gav Wood
|
6933bb971b
|
Test.
|
2016-03-02 23:41:15 +01:00 |
|
Tomasz Drwięga
|
f4a71dc03c
|
Merge branch 'tx_queue' into tx_queue_integration
|
2016-03-02 21:27:08 +01:00 |
|
Gav Wood
|
039c0056bc
|
Uncle inclusion in block authoring. Still need tests.
|
2016-03-02 19:38:00 +01:00 |
|
Gav Wood
|
877270c35f
|
Fixes.
|
2016-03-02 18:32:54 +01:00 |
|
Gav Wood
|
42df98450c
|
Include uncles in exclused.
|
2016-03-02 18:05:47 +01:00 |
|
Gav Wood
|
671965d44f
|
Test for ancestry.
|
2016-03-02 17:31:42 +01:00 |
|
Gav Wood
|
c75737bcf0
|
Add ancestry iterator.
|
2016-03-02 17:04:44 +01:00 |
|
Gav Wood
|
3c7814c8ac
|
Remove debug line.
|
2016-03-02 15:43:48 +01:00 |
|
Nikolay Volf
|
028434f93d
|
Merge branch 'master' into issue-test/568
Conflicts:
ethcore/src/tests/client.rs
|
2016-03-02 17:15:09 +03:00 |
|
Nikolay Volf
|
02aad03f92
|
helpers
|
2016-03-02 17:06:53 +03:00 |
|
debris
|
03ffcd0e64
|
Merge branch 'master' into rpc_poll_ids
|
2016-03-02 13:59:03 +01:00 |
|
Gav Wood
|
47b4729332
|
Fix check.
|
2016-03-02 13:28:51 +01:00 |
|
Gav Wood
|
4fd926bfd6
|
Merge branch 'master' of github.com:ethcore/parity
|
2016-03-02 13:27:45 +01:00 |
|
Gav Wood
|
3b3399ccc3
|
Merge pull request #564 from ethcore/inclusive_bloom_ranges
chainfilter shouldnt exclude to_block from results
|
2016-03-02 13:05:45 +01:00 |
|
Gav Wood
|
13deb4f048
|
Merge branch 'master' of github.com:ethcore/parity
|
2016-03-02 13:01:48 +01:00 |
|
Gav Wood
|
162300a4a6
|
Merge pull request #547 from ethcore/mining
Mining
|
2016-03-02 13:00:22 +01:00 |
|
Gav Wood
|
3309959139
|
Additional check to ancient enactments.
|
2016-03-02 12:57:34 +01:00 |
|
debris
|
5a7dfa4df2
|
Merge branch 'master' into rpc_poll_ids
|
2016-03-02 12:27:38 +01:00 |
|
Nikolay Volf
|
6b9fde5790
|
Merge branch 'master' into mining
|
2016-03-02 08:54:21 +03:00 |
|
debris
|
a0acfd5113
|
Merge branch 'master' into rpc_poll_ids
|
2016-03-02 06:12:06 +01:00 |
|
debris
|
feff1f9e6e
|
chainfilter shouldnt exclude to_block from results
|
2016-03-02 06:09:27 +01:00 |
|