08a0d42ed3
Compilation fix
2016-04-21 20:53:44 +02:00
bacac7d0af
Fixing transaction_queue deadlock
2016-04-21 20:42:36 +02:00
ef9b49f0b2
Merge branch 'main-refactor' into rpc-shared-miner
2016-04-21 17:38:21 +02:00
f5c2bea134
Shared instance of ExternalMiner
2016-04-21 17:32:53 +02:00
c47d08e308
Fixing warnings
2016-04-21 16:06:54 +02:00
f2a08d57e4
Merge branch 'master' into rpc-logs
...
Conflicts:
rpc/src/v1/tests/ethcore.rs
rpc/src/v1/traits/ethcore.rs
2016-04-19 19:59:50 +02:00
225a5ee825
removed redundant unwraps ( #935 )
...
* removed redundant unwraps
* fixed compilation error, removed warnings
* fixed transaction queue merge conflict
* fixed failing ethminer doc test
2016-04-19 10:35:32 -07:00
407ab30503
Using ArrayVec to store logs
2016-04-19 19:22:14 +02:00
314ced57c8
fixed transaction queue merge conflict
2016-04-19 16:20:04 +02:00
46c8324c52
Merge pull request #974 from ethcore/tx-limit-conf
...
Configurable limit for transaction queue (CLI & Ethcore-RPC)
2016-04-19 16:02:28 +02:00
3c67ac636b
Merge branch 'master' into tx-limit-conf
...
Conflicts:
miner/src/transaction_queue.rs
2016-04-19 00:03:20 +02:00
10e2659600
Fixing last_nonces updating when transactions are removed because of the limit
2016-04-19 00:00:55 +02:00
5df817c8e0
Setting limit from CLI
2016-04-18 23:03:41 +02:00
cd044ec096
Merge branch 'master' into tx-limit-bug
...
Conflicts:
miner/src/transaction_queue.rs
2016-04-18 21:58:19 +02:00
caf4d179a2
Even more detailed errors for transaction queue ( #969 )
...
* Even more detailed errors for transaction queue
* Small rename
* Removing macros in favour of functions+try!()
2016-04-18 10:34:59 -07:00
58c47069d8
Enforce-limit + last_nonces bug
2016-04-18 18:39:14 +02:00
41153dd37c
Removing macros in favour of functions+try!()
2016-04-18 17:20:35 +02:00
2812f8cae6
Small rename
2016-04-18 13:35:19 +02:00
881678b613
Even more detailed errors for transaction queue
2016-04-18 13:16:46 +02:00
d093c5755e
Moving own transaction tracing to miner create
2016-04-17 20:36:37 +02:00
5086880093
Additional logging for transactions
2016-04-17 18:26:15 +02:00
00372cf747
Removing a transaction from queue now removes all from this sender with lower nonces. ( #950 )
...
* Changing to wipe-out all transactions from particular sender lower then given nonce.
* Changing given nonce to be client_nonce
* Fixing test_client to support proper nonces when transactions are added to blockchain
* Fixing logic for transactions from new blocks in chain
2016-04-14 22:38:23 -07:00
d909bc05c4
Sensible gas limits for eth_sendTransaction ( #953 )
...
* Sensible gas limits for eth_sendTransaction
Fixes #859
* Compile fix.
* Remove !.
2016-04-14 12:01:12 -07:00
fbc28ce493
Additional methods for ethcore-specific rpc. Altering miner parameters ( #934 )
2016-04-12 15:04:40 -07:00
6b03a3218c
Bumping clippy version
2016-04-12 13:51:39 +02:00
3fe21f5931
Ethcore-specific RPC methods ( #923 )
...
* Ethcore-specific rpc methods
* Initializing ethcore-rpc
2016-04-11 12:06:32 -07:00
c48374dbc6
Parameter to allow user to force the sealing mechanism ( #918 )
...
* Allow block sealing mechanism to be forced, even when not mining.
* Fix deadlock in dispatch_transaction. Fix tests.
* Horrible workaround for transaction importing.
* Reduce tracing. Cleanups.
* Remove logging.
* Remove broken code inherited from dodgy implementation.
* pre-query tx queue nonce also if any
* remove outside nonce queries
* remove queue nonces
2016-04-11 11:52:33 -07:00
3438cda432
Propagate transaction queue
2016-04-06 23:03:07 +02:00
5685fde606
Merge pull request #890 from ethcore/fix_875
...
fixed #875 and added tests for eth_sendTransaction
2016-04-06 16:24:32 +02:00
d14d590c2b
fixed #875 and added tests for eth_sendTransaction
2016-04-06 12:15:20 +02:00
85da55a537
Fixing warnings
2016-04-06 10:55:40 +02:00
e8fa429438
Bumping clippy
2016-04-06 09:53:56 +02:00
2a185963a9
More descriptive expectations to transaction queue consistency.
2016-04-04 08:56:59 +02:00
5d626c7dd3
Use sensible gas price.
2016-03-28 18:53:33 +02:00
d150529730
Merge remote-tracking branch 'origin/master' into bettermining
2016-03-27 22:16:24 +02:00
7c5b171e3f
Differentiate between ClosedBlock (can be reopened) and LockedBlock (cannot).
...
`ClosedBlock`s still keep the pre-finalised state (i.e. state after the last transaction).
`LockedBlock`s do not. New mining algo needs to reopen these `ClosedBlock`s, however enactment
system does not (and `ClosedBlock`s are slower & more hungry), hence the distinction.
2016-03-27 20:33:23 +02:00
6cac296366
Remove comments.
2016-03-27 15:39:45 +02:00
254ac6f253
checking tx queue
2016-03-27 16:12:21 +03:00
7d7b315511
Fix tests and a couple of warnings.
2016-03-26 23:35:36 +01:00
993e16afbd
Fix miner,
2016-03-26 20:36:03 +01:00
b45ed30936
Disable two tests that will require an improved TestBlockChainClient
2016-03-25 16:41:01 +01:00
d50c9f9fac
Merge remote-tracking branch 'origin/master' into bettermining
2016-03-24 23:10:54 +01:00
830ef7ddfc
New mining framework.
...
Fixes #756 .
2016-03-24 23:03:22 +01:00
01a39e4f4e
Merge pull request #807 from ethcore/tracegetwork
...
Fix mining from spinning
2016-03-24 18:27:17 +01:00
3be2763929
Merge branch 'master' into bettermining
2016-03-24 16:43:17 +00:00
e214489106
Fix compile.
2016-03-24 13:56:22 +00:00
0ab57c48c3
Add tracing.
2016-03-24 13:51:51 +00:00
1700b6a087
Add UsingQueue.
2016-03-24 07:49:54 +00:00
4e013ba2fc
Refactor pending_block to always return invalid txs and sometimes a block.
...
Docuemnt SealingWork properly.
2016-03-23 16:28:02 +00:00
97449afbb9
Merge branch 'master' into bettermining
2016-03-23 14:18:16 +01:00
c2d2e41624
Fixing future-current transactions clash
2016-03-23 12:23:50 +01:00
0e026ed11f
Fix author reporting. num_cpus for JSONRPC threads.
2016-03-22 19:12:17 +01:00
a134f939e9
Non-functioning draft of code.
2016-03-22 13:05:18 +01:00
ef10c6f637
Avoiding possible overflow when block number gets smaller.
2016-03-20 12:18:41 +01:00
48be70e4a8
Fixing ethminer doctest
2016-03-18 20:45:07 +01:00
f8dd1a6354
Merge branch 'master' into tx_queue_timeout
...
Conflicts:
ethcore/src/client/test_client.rs
miner/src/miner.rs
2016-03-18 19:36:32 +01:00
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
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
0dc1ddef9a
Flipping sealing_enabled flag after no requests for sealing_block for some time
2016-03-18 13:59:11 +01:00
58bb5e967a
Merge branch 'master' into tx_queue_gas_limit
...
Conflicts:
miner/src/transaction_queue.rs
2016-03-18 12:25:36 +01:00
942d38fb13
Removing allow dead_code
2016-03-18 10:22:00 +01:00
338e5fadb9
Bumping clippy
2016-03-18 10:08:47 +01:00
cee45e1a8e
Merge branch 'master' into tx_queue_live
...
Conflicts:
miner/src/miner.rs
2016-03-18 09:48:35 +01:00
a6bd15d333
Fixing compilation
2016-03-18 09:46:13 +01:00
48c72a168c
Merge branch 'master' into tx_queue_invalid
2016-03-18 09:44:31 +01:00
7ae60056b2
Common error handling
2016-03-17 16:13:00 +01:00
fece330ca4
Refactoring removing invalid transactions from queue
2016-03-17 15:30:03 +01:00
309af743e0
Ignoring transactions slightly above gas_limit
2016-03-17 15:23:25 +01:00
dec69651fd
Attempting to add all transactions to mined block
2016-03-17 13:41:30 +01:00
833c5fdd31
Merge branch 'master' into tx_queue_live
...
Conflicts:
sync/src/chain.rs
2016-03-17 13:35:01 +01:00
a76eb022d0
Merge pull request #746 from ethcore/tx_queue
...
Verify sender's balance before importing transaction to queue
2016-03-17 13:32:48 +01:00
e1c3ab1846
Renaming status fields to something more descriptive.
2016-03-17 13:07:34 +01:00
b684bc9ba0
Updating sealing when new transactions are received
2016-03-17 12:52:26 +01:00
c382fa7eab
Removing invalid transactions from queue
2016-03-17 12:29:55 +01:00
7247f9e27f
Fixing doctest
2016-03-17 12:23:15 +01:00
884f2dd873
Returning number of transactions pending in block not queue
2016-03-17 11:19:12 +01:00
95dda4aa68
Full transaction cost
2016-03-17 10:44:10 +01:00
0925968840
Adding test
2016-03-16 17:22:23 +01:00
8741a85443
Fixing build
2016-03-16 16:56:36 +01:00
fdba8de600
Validating senders balance before importing transaction to queue
2016-03-16 10:45:55 +01:00
974222aabd
Removing printlns
2016-03-15 23:13:53 +01:00
188e325b20
Importing transactions from hashset. Notifying about every block
2016-03-15 23:01:36 +01:00
40ac01b730
Fixing possible race in transaction queue
2016-03-15 10:54:19 +01:00
38de95cc3b
Merge pull request #719 from ethcore/targetgaslimit
...
Allow configuration of target gas limit.
2016-03-14 14:04:09 +01:00
7af0a1dc2c
Missing comma.
2016-03-14 02:02:32 +01:00
f6b7884a1d
Allow configuration of target gas limit.
2016-03-14 02:00:22 +01:00
9e7ff2c00e
Version 1.1
2016-03-14 01:00:17 +01:00
e2e067cdd0
Bumping clippy
2016-03-13 20:44:25 +01:00
76696e3b49
Minor build fixes.
2016-03-13 15:36:03 +01:00
08b9cc2c41
Merge changes from #674 into branch.
2016-03-13 15:29:55 +01:00
9424d53062
Update lib.rs
2016-03-12 10:37:27 +01:00
aebc91d96f
Merge branch 'master' into ethminer_crate
...
Conflicts:
Cargo.toml
rpc/Cargo.toml
sync/Cargo.toml
2016-03-12 09:50:18 +01:00
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
197ea7f7d6
Using miner in rpc instead of sync
2016-03-11 14:51:07 +01:00
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
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
55a14b3aaf
Fixing transaction queue test
2016-03-11 11:40:12 +01:00
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
c37370a8a7
PendingTransaction filter.
2016-03-10 16:04:59 +01:00
9ea3c0eba0
Fixing compilation on beta & stable
2016-03-10 15:20:54 +01:00
9db4720162
Fixing clippy warnings.
2016-03-10 14:15:47 +01:00
0535fb30c6
Merge branch 'master' into ethminer_crate
...
Conflicts:
sync/src/lib.rs
2016-03-10 14:03:09 +01:00
eb1fab9202
Adding clippy support to ethminer.
2016-03-10 12:33:29 +01:00
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
3c0587b375
Merge branch 'ethminer_crate' into tx_queue_min_gas
2016-03-09 15:27:27 +01:00
3d74e5bd47
Fixing doctest
2016-03-09 15:27:07 +01:00
493c61f09d
Minimal gas price threshold. Closes : #636
2016-03-09 15:22:11 +01:00
363de973c9
Adding documentation and ditching EthMiner
2016-03-09 14:26:28 +01:00
9d664336b5
Tratifying Miner
2016-03-09 13:30:59 +01:00
5db84c3233
Adding transactions to block
2016-03-09 13:09:34 +01:00
9acb36af87
Fixing tests compilation. Removing ethminer dependency on client
2016-03-08 16:23:32 +01:00
99a6802b61
Moving block sealing and transaction_queue to separate create
2016-03-08 15:46:44 +01:00
Tomasz Drwięga
Marek Kotewicz
Tomasz Drwięga
Gav Wood
arkpar
NikVolf
Gav Wood