Arkadiy Paronyan
|
bf84aee5f6
|
Merge pull request #658 from ethcore/fixjdb
Fix for option 1 of JournalDB
|
2016-03-12 15:37:47 +01:00 |
|
Gav Wood
|
51275f79f8
|
Merge branch 'master' of github.com:ethcore/parity
|
2016-03-12 14:41:00 +01:00 |
|
Tomasz Drwięga
|
451a5d78e3
|
Removing unused (?) serde::Error
|
2016-03-12 13:40:39 +01:00 |
|
Tomasz Drwięga
|
19b6c74675
|
Two more warnings
|
2016-03-12 13:39:17 +01:00 |
|
Gav Wood
|
6c6d919eac
|
Merge branch 'master' into fixjdb1
|
2016-03-12 12:16:08 +01:00 |
|
Gav Wood
|
98bae098be
|
Update cargo lock.
|
2016-03-12 12:10:55 +01:00 |
|
Gav Wood
|
3250e36b4a
|
Merge pull request #689 from ethcore/jdbrenames
Rename into something that is a little more descriptive.
|
2016-03-12 11:36:55 +01:00 |
|
Gav Wood
|
b03679e1a6
|
Fix typos.
|
2016-03-12 11:22:02 +01:00 |
|
Gav Wood
|
82a8810057
|
Rename into something that is a little more descriptive.
|
2016-03-12 11:19:42 +01:00 |
|
Gav Wood
|
d7039b72e2
|
Update archivedb.rs
|
2016-03-12 10:48:28 +01:00 |
|
Gav Wood
|
e1c0177932
|
Update main.rs
|
2016-03-12 10:44:48 +01:00 |
|
Tomasz Drwięga
|
65dadcc2a2
|
Adding todos
|
2016-03-12 10:44:24 +01:00 |
|
Tomasz Drwięga
|
c6dc6c0c41
|
One more warning
|
2016-03-12 10:41:35 +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 |
|
Gav Wood
|
9424d53062
|
Update lib.rs
|
2016-03-12 10:37:27 +01:00 |
|
Tomasz Drwięga
|
4fc8a8d5cd
|
Merge branch 'updating_clippy' of github.com:ethcore/parity into updating_clippy
|
2016-03-12 10:29:51 +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
|
c133a2fd35
|
Fixing warnings
|
2016-03-12 10:07:55 +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 |
|
Gav Wood
|
874393ba06
|
Fix tests,
|
2016-03-12 09:57:57 +01:00 |
|
Gav Wood
|
e6a273f3a7
|
Fix tests.
|
2016-03-12 09:53:54 +01:00 |
|
Gav Wood
|
12e1abdfb7
|
Port fixes to new infrastrtcutre.
|
2016-03-12 09:51: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 |
|
Tomasz Drwięga
|
05ff8a0b94
|
Merge branch 'ethminer_crate' of github.com:ethcore/parity into ethminer_crate
|
2016-03-12 00:05:21 +01:00 |
|
Tomasz Drwięga
|
7cfe1d258b
|
Adding more detailed logging
|
2016-03-11 23:49:32 +01:00 |
|
Arkadiy Paronyan
|
1031ce641d
|
Merge pull request #682 from ethcore/additional_sstore_test
additional (failing) SecretStore test
|
2016-03-11 22:45:43 +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
|
0c9c97fcb9
|
Merge pull request #670 from ethcore/updating_clippy
Updating clippy & fixing warnings.
|
2016-03-11 23:57:06 +03:00 |
|
Marek Kotewicz
|
e6aba74726
|
Merge pull request #681 from ethcore/jsonrpc_tests
rpc web3 tests
|
2016-03-11 20:53:13 +01:00 |
|
Marek Kotewicz
|
9e23a0c240
|
Merge pull request #677 from ethcore/personal-rpc-cli
Making personal json-rpc configurable via cli
|
2016-03-11 20:52:58 +01:00 |
|
Nikolay Volf
|
b1327a045f
|
fixed new account generation
|
2016-03-11 22:47:12 +04:00 |
|
debris
|
90e20cbcad
|
additional (failing) sstore test
|
2016-03-11 20:08:01 +01:00 |
|
Marek Kotewicz
|
cd835e88fc
|
Merge pull request #661 from ethcore/rpc_pending_filter
RPC Pending Transactions Filter
|
2016-03-11 19:40:35 +01:00 |
|
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 |
|