Tomasz Drwięga
|
fadbc61dff
|
Merge branch 'ethminer_crate' into rpc_pending_filter
Conflicts:
miner/src/miner.rs
parity/main.rs
|
2016-03-11 19:27:09 +01: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
|
1e40997ff7
|
state query for archive jdb
|
2016-03-11 22:15:56 +04:00 |
|
Arkadiy Paronyan
|
c9f5a9bc9a
|
Merge pull request #678 from ethcore/reorgjdb
Rearrange journaldb infrastructure to make more extensible
|
2016-03-11 18:47:19 +01:00 |
|
Nikolay Volf
|
03a4f9e268
|
Merge pull request #673 from ethcore/boxjdb
JournalDB -> Box<JournalDB>, and it's a trait.
|
2016-03-11 20:03:39 +03:00 |
|
Nikolay Volf
|
08b4488ef3
|
Merge branch 'master' into personal-rpc-cli
Conflicts:
parity/main.rs
|
2016-03-11 20:54:18 +04:00 |
|
Nikolay Volf
|
eaf22198e2
|
Merge pull request #676 from ethcore/fix-tx-warnings
fix warning for transaction_queue.add usage
|
2016-03-11 19:48:05 +03:00 |
|
Nikolay Volf
|
87fb0b31eb
|
Merge branch 'master' into reorgjdb
|
2016-03-11 20:05:41 +04:00 |
|
Tomasz Drwięga
|
9f19d2993c
|
Merge branch 'master' into ethminer_crate
Conflicts:
util/bigint/src/uint.rs
|
2016-03-11 16:24:52 +01:00 |
|
debris
|
c6ba378b6b
|
rpc web3 tests
|
2016-03-11 16:17:09 +01:00 |
|
Arkadiy Paronyan
|
5d3ead91e2
|
Merge pull request #680 from ethcore/uint_mem
Adding std::mem back (only for asm)
|
2016-03-11 16:16:21 +01:00 |
|
Nikolay Volf
|
9b28e04b85
|
Merge pull request #679 from ethcore/master-readme-update
update readme to exclude beta step (stable is ok)
|
2016-03-11 18:11:25 +03:00 |
|
Nikolay Volf
|
89dbc2ac25
|
[ci skip] update readme to exclude beta spec (stable is ok)
|
2016-03-11 18:08:29 +03:00 |
|
Tomasz Drwięga
|
179569f9f8
|
Adding std::mem back
|
2016-03-11 16:01:18 +01:00 |
|
Tomasz Drwięga
|
0dbe6684ad
|
adding std::mem
|
2016-03-11 15:58:12 +01:00 |
|
Tomasz Drwięga
|
9c92d601b1
|
Merge branch 'master' into ethminer_crate
Conflicts:
rpc/src/v1/impls/eth.rs
|
2016-03-11 15:56:30 +01:00 |
|
Nikolay Volf
|
04af38bb0d
|
fix test compilation
|
2016-03-11 18:54:28 +04:00 |
|
Nikolay Volf
|
fcc0432856
|
Merge pull request #675 from ethcore/rpc_unit_tests
fixed U256 and transaction request deserialization
|
2016-03-11 17:25:13 +03:00 |
|
Gav Wood
|
5499f4530c
|
Fix tests.
|
2016-03-11 15:01:15 +01:00 |
|
Tomasz Drwięga
|
b458452f0e
|
TestSyncProvider fixes
|
2016-03-11 14:57:17 +01:00 |
|
Tomasz Drwięga
|
36ff65d050
|
Fixing warnings
|
2016-03-11 14:53:03 +01:00 |
|
Tomasz Drwięga
|
197ea7f7d6
|
Using miner in rpc instead of sync
|
2016-03-11 14:51:07 +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
|
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
|
7e8b6c3660
|
Merge branch 'boxjdb' into reorgjdb
|
2016-03-11 14:06:32 +01:00 |
|
Nikolay Volf
|
22d1def894
|
Merge pull request #666 from ethcore/moregethcli
More geth compatibility.
|
2016-03-11 16:05:27 +03: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 |
|
Marek Kotewicz
|
176b9a992d
|
Merge pull request #667 from ethcore/rpc_tests
rpc net submodule tests
|
2016-03-11 13:58:32 +01:00 |
|
Gav Wood
|
51cfd4b0ea
|
Remove unneeded clone.
|
2016-03-11 13:58:11 +01:00 |
|
debris
|
ecd33a6093
|
fixed U256 and transaction request deserialization, added tests for transaction request
|
2016-03-11 13:54:52 +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 |
|
Nikolay Volf
|
d3f83ad7be
|
Merge branch 'master' into personal-rpc-cli
|
2016-03-11 16:05:22 +04:00 |
|
Nikolay Volf
|
99c5794929
|
fix warning for transaction_queue.add usage
|
2016-03-11 16:00:30 +04: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 |
|
Nikolay Volf
|
70ee6aa942
|
refactoring to use generic account provider as web3 svc
|
2016-03-11 15:50:13 +04:00 |
|
Nikolay Volf
|
ed0047725c
|
adding cli extension
|
2016-03-11 15:49:49 +04:00 |
|
debris
|
1554d5adef
|
Merge branch 'master' into rpc_tests
|
2016-03-11 12:32:08 +01:00 |
|
debris
|
d1fa292956
|
Merge branch 'master' into rpc_unit_tests
|
2016-03-11 12:31:56 +01:00 |
|
debris
|
190630cc6b
|
separated transaction_request to its own submodule, added basic tests for it
|
2016-03-11 12:31:45 +01:00 |
|
Tomasz Drwięga
|
dd2fb4df67
|
Storing BlockNumber & transactions directly in enum
|
2016-03-11 12:31:42 +01:00 |
|
Nikolay Volf
|
62e94e1744
|
Merge pull request #665 from ethcore/client_submodules
Client module overhaul
|
2016-03-11 14:28:30 +03:00 |
|
arkpar
|
8f54c24e47
|
Merged changes from jdb_option1, keep LATEST_ERA from decreasing
|
2016-03-11 11:52:11 +01:00 |
|
Tomasz Drwięga
|
2fd036b073
|
Merge branch 'ethminer_crate' into rpc_pending_filter
Conflicts:
rpc/src/v1/helpers/poll_manager.rs
rpc/src/v1/impls/eth.rs
|
2016-03-11 11:44:44 +01:00 |
|