Tomasz Drwięga
34c89e5841
fixing json_tests
2016-06-24 10:49:13 +02:00
Tomasz Drwięga
6edb981bfa
Merge branch 'master' into miner-no-default
...
Conflicts:
sync/src/lib.rs
2016-06-23 21:18:43 +02:00
Gav Wood
bca9e1f31a
Merge branch 'master' into sfedgecase
2016-06-23 14:43:42 +02:00
Gav Wood
8fcec20398
Gas limit ceiling option.
2016-06-23 14:29:16 +02:00
Robert Habermeier
fb7ca8539e
Merge pull request #1402 from ethcore/txqueue-assert
...
Additional assertions for internal state of queue
2016-06-23 12:52:56 +02:00
Gav Wood
230c6c889a
Ensure judging the SF trigger by relative branch ( #1399 )
...
Rather than just the canon chain.
2016-06-22 21:33:10 +02:00
Gav Wood
5302a7dd58
Ensure judging the SF trigger by relative branch
...
Rather than just the canon chain.
2016-06-22 19:49:07 +02:00
Tomasz Drwięga
e2de1987c7
Fixing order of if statements to avoid overflows. ( #1384 )
...
* Removing old transactions
* Explanation comment [ci skip]
2016-06-22 11:15:22 +02:00
Arkadiy Paronyan
7c94b1495e
Merge pull request #1329 from ethcore/softforktrigger
...
Install trigger for DAO-rescue soft-fork.
2016-06-21 22:25:24 +02:00
Arkadiy Paronyan
613d4c95f6
Merge pull request #1364 from ethcore/miner-lock
...
Fix lock order when updating sealing
2016-06-21 17:41:44 +02:00
Tomasz Drwięga
fe09d8d291
Merge branch 'master' into txqueue-assert
...
Conflicts:
ethcore/src/miner/transaction_queue.rs
2016-06-21 16:35:18 +02:00
Arkadiy Paronyan
b2891fcdda
Update sealing on new transactions ( #1365 )
2016-06-21 16:00:34 +02:00
Gav Wood
840f961dc2
don't bother assigning queue.
2016-06-21 14:34:22 +02:00
Tomasz Drwięga
e0b4eab819
Fixing replacing transaction with lower gas_price in one of the edge cases ( #1343 )
2016-06-21 13:55:26 +02:00
Tomasz Drwięga
3de482a431
Additional assertions for internal state of queue
2016-06-21 12:31:50 +02:00
arkpar
b667378820
Release lock while pushing transactions
2016-06-21 11:26:43 +02:00
arkpar
c912bb8c17
Fix lock order
2016-06-20 23:48:47 +02:00
Tomasz Drwięga
8fa9a240cc
Fixing last nonce values in case transaction is replaced
2016-06-20 18:37:59 +02:00
Marek Kotewicz
75a38500f1
Merge pull request #1346 from ethcore/txqueue-future
...
Fixing future order and errors when reaching limit.
2016-06-20 15:31:39 +02:00
Tomasz Drwięga
c348508b40
Fixing future order and drops because of limit errors
2016-06-20 12:14:19 +02:00
Tomasz Drwięga
edd43cd5c3
Fixing local transactions prioritization
2016-06-20 11:32:29 +02:00
Tomasz Drwięga
d0b2df07db
Removing priority on local transactions
2016-06-20 10:32:52 +02:00
Tomasz Drwięga
a2f24a0083
Removing Default from Miner
2016-06-20 10:28:38 +02:00
Gav Wood
3ee3171b8c
Merge branch 'master' into softforktrigger
2016-06-20 00:37:40 +02:00
Marek Kotewicz
6b074e8fb2
secret store separated from util ( #1304 )
...
* bump rust-crypto
* initial version of account provider utilizing secret store
* update lazy_static to latest version
* AccountProvider accounts method
* new AccountProvider tests in progress
* basic tests for new AccountProvider
* ethcore compiles with new account provider and secret store
* ethcore-rpc build now compiling with new AccountProvider
* most rpc tests passing with new accounts_provider
* fixed basic_authority tests
* fixed eth_transaction_count rpc test
* fixed mocked/eth.rs tests
* fixed personal tests
* fixed personal signer rpc tests
* removed warnings
* parity compiling fine with new sstore
* fixed import direction
* do not unlock temporarily when we have the password
* removed TODO in account import
* display warning on auto account import failure
* fixed compiling of ethstore on windows
* ethstore as a part of parity repo
* added ethkey
2016-06-20 00:10:34 +02:00
Gav Wood
08522eec37
--geth prevent getTransactionReceipt from using pending. ( #1325 )
...
This mimics the fucntionality of Geth and the current unratified
JSONRPC spec (but not the functionality of eth and the ratified
spec).
2016-06-19 14:51:51 +02:00
Tomasz Drwięga
8fad728e9b
Fixing locks order ( #1328 )
2016-06-19 12:33:50 +02:00
Gav Wood
2582253f95
Install trigger for DAO-rescue soft-fork.
...
Soft-fork should only be primed to trigger if the gas-limit of
block #1760000 is at most 4,000,000.
To accomplish this we pass in the gas limit of that block to
EnvInfo so it can inform Schedule. This gets marshalled through
`OpenBlock`/`ClosedBlock` and the `enact` functions much like
`last_hashes`. `block.rs`'s `env_info()` takes care to ensure
that if the current block happens to be #1760000 , then we
populate with the current `gas_limit`.
2016-06-18 20:26:44 +02:00
debris
0b8710a2a1
removed redundant if condition
2016-06-14 03:04:06 +02:00
Marek Kotewicz
4ef4819bf9
removed try_seal from MinerClient interface ( #1262 )
2016-06-13 18:51:14 +02:00
debris
2a92e10fcd
Merge branch 'master' of github.com:ethcore/parity into simplified_block_opening
2016-06-09 11:09:12 -07:00
Gav Wood
4efd658577
Merge branch 'master' into txtracingforcall
2016-06-06 19:19:32 -07:00
debris
79919bdc3c
simplified block opening
2016-06-06 14:34:23 +02:00
Tomasz Drwięga
18ffd94674
Fixing warnings
2016-06-06 12:18:17 +02:00
Gav Wood
4675b7408f
Merge branch 'switchrpcns' into txtracingforcall
2016-06-05 21:35:58 +02:00
Gav Wood
4153052148
Fix fn call in miner.rs same as client.rs.
2016-06-05 17:23:27 +02:00
Gav Wood
a132fefcc7
Transaction tracing for eth_call.
2016-06-02 13:50:50 +02:00
Gav Wood
b9ec87548d
Minor renaming diff -> state_diff
2016-06-02 12:39:25 +02:00
Gav Wood
bc5c3da2af
Merge branch 'vmtracing' into diffing
2016-06-02 12:28:09 +02:00
Gav Wood
26da38a439
Merge remote-tracking branch 'origin/master' into vmtracing
2016-06-02 11:40:39 +02:00
Nikolay Volf
1ef4db82e8
doctest fixes
2016-06-01 14:50:06 +02:00
Nikolay Volf
c00b84e10b
merge fixes
2016-06-01 12:54:47 +02:00
Nikolay Volf
0c782bf34b
Merge branch 'master' into client-refact
2016-06-01 12:45:04 +02:00
Nikolay Volf
d45a676dc0
all tests fixed
2016-05-31 22:24:32 +02:00
Nikolay Volf
a845e08bc6
rename of the trait
2016-05-31 20:33:26 +02:00
Nikolay Volf
8e252d5f1b
refactored to merge client & client
2016-05-31 19:52:53 +02:00
