grassrootseconomics
/
openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,090 Commits 1 Branch 329 Tags 59 MiB
Commit Graph

97 Commits

Author SHA1 Message Date
arkpar 9e7ff2c00e Version 1.1 2016-03-14 01:00:17 +01:00
Tomasz Drwięga 4cf18c728d Fixing sync invalid sync test 2016-03-13 20:53:47 +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
Tomasz Drwięga dac90992ad Merge branch 'master' into updating_clippy 
Conflicts:
	Cargo.lock
	util/src/journaldb/overlayrecentdb.rs
 2016-03-13 00:20:31 +01:00
arkpar 0b4355d549 rocksdb version bump 2016-03-12 19:03:33 +01:00
Gav Wood 98bae098be Update cargo lock. 2016-03-12 12:10:55 +01:00
Tomasz Drwięga e10457d235 Bumping clippy 2016-03-12 10:06:50 +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 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
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
Tomasz Drwięga 55a14b3aaf Fixing transaction queue test 2016-03-11 11:40:12 +01:00
Tomasz Drwięga eb8e92c37f Cargo.lock 2016-03-11 11:18:38 +01:00
Tomasz Drwięga 8709dd28f8 Fixing clippy warnings 2016-03-11 10:58:51 +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
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
Tomasz Drwięga 2f9b955210 Merge branch 'master' into ethminer_crate 
Conflicts:
	parity/main.rs
 2016-03-10 09:39:26 +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
Gav Wood ac42045155 Merge pull request #639 from ethcore/keys-cli 
Keys cli
 2016-03-10 00:25:01 +01:00
Nikolay Volf 0f056f3abb Merge branch 'master' into clippy-dev 
Conflicts:
	Cargo.toml
 2016-03-10 02:45:53 +04:00
debris 423dd7e0a9 updated jsonrpc-core and http-server libs 2016-03-09 18:04:13 +01:00
Nikolay Volf 6ad0ba8fe2 basic commands 2016-03-09 17:11:15 +04: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 cbc2c0cf0c Fixing clippy warnings. When building on nightly it is required to enable clippy 2016-03-07 14:34:17 +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
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
Nikolay Volf a4f4764e2a Merge pull request #559 from ethcore/tx_queue 
TransactionsQueue implementation
 2016-03-04 21:43:33 +03:00
Nikolay Volf 0d01099f44 moving unlock logics to secret-store itself 2016-03-04 16:23:00 +03:00
Tomasz Drwięga f4a71dc03c Merge branch 'tx_queue' into tx_queue_integration 2016-03-02 21:27:08 +01:00
Tomasz Drwięga 82866fcab5 Merge branch 'master' into tx_queue 2016-03-02 21:14:11 +01:00
debris 03ffcd0e64 Merge branch 'master' into rpc_poll_ids 2016-03-02 13:59:03 +01:00
debris 3b4d4a9b63 Merge branch 'master' into rpc_poll_ids 2016-03-02 05:15:21 +01:00
Gav Wood d55aa54412 Merge branch 'master' into mining 2016-03-02 00:59:39 +01:00
Tomasz Drwięga 7565625ce0 Integrating TransactionQueue with client 2016-03-01 22:30:23 +01:00
Tomasz Drwięga 725e894f9b TransactionsQueue implementation 2016-03-01 21:48:58 +01:00
Gav Wood 2266d74c2a Fix JSONRPC I/O. 2016-03-01 01:15:00 +01:00
Nikolay Volf d0125f3ff5 uint to separated crate 2016-03-01 00:21:15 +03:00
Gav Wood ffc5c2ea7b eth_getwork implemented. 2016-02-29 19:30:13 +01:00
Gav Wood 16bc7b57cb Merge pull request #526 from ethcore/serde_update 
udpated serde to version 0.7.0
 2016-02-27 16:09:44 +01:00
debris b60b84fe67 use transient-hashmap from crates.io 2016-02-27 15:56:41 +01:00
debris 11de5b4923 udpated serde to version 0.7.0 2016-02-27 13:14:58 +01:00
debris 2947a1415b Merge branch 'master' into rpc_poll_ids 2016-02-26 15:57:23 +01:00
arkpar 10ef7123c4 Merge branch 'master' of github.com:ethcore/parity into sync 2016-02-26 13:55:42 +01:00
arkpar c76fc14a5c rocksdb dependency version bump 2016-02-26 03:22:18 +01:00
arkpar 4660612e08 Merge branch 'master' of github.com:ethcore/parity into db 2016-02-25 20:52:31 +01:00
arkpar 937547f178 rocksdb dependency version bump 2016-02-25 20:20:00 +01:00
arkpar 21f62012d6 Merge branch 'master' of github.com:ethcore/parity into sync 2016-02-25 14:22:41 +01:00
debris 85350f3c66 updated version of unicase 2016-02-25 14:21:29 +01:00
arkpar 1b9f428183 Merge branch 'master' of github.com:ethcore/parity into sync 2016-02-25 14:20:28 +01:00