Gav Wood
6da9e19f73
Add generalbeck's token
2016-03-28 15:47:57 +02:00
Gav Wood
cd6a09c0df
Merge pull request #846 from ethcore/fixmining
...
Fix response for mining.
2016-03-28 12:43:05 +02:00
Gav Wood
6a7c25e2be
Fix response for mining.
2016-03-28 11:23:22 +02:00
Gav Wood
c20ca0fa4e
Merge pull request #843 from ethcore/usdgaspricing
...
USD-based pricing of gas.
2016-03-28 10:53:38 +02:00
Gav Wood
3ebfd0183a
Merge pull request #811 from ethcore/bettermining
...
Parity can accept older work packages
2016-03-28 10:48:35 +02:00
Gav Wood
63a9fa172c
Avoid openssl dep.
2016-03-28 10:25:19 +02:00
Gav Wood
d7c377dea6
Fix build.
2016-03-28 10:12:15 +02:00
Gav Wood
75b23aac02
Merge remote-tracking branch 'origin/master' into bettermining
2016-03-28 09:44:34 +02:00
Gav Wood
ad86feb667
Rename spawn -> boxed_clone
2016-03-28 09:42:50 +02:00
Arkadiy Paronyan
2178f09eec
Merge pull request #841 from peterjoel/ethcompute
...
Caching for computing seed hashes (#541 )
2016-03-28 01:43:45 +02:00
Gav Wood
b606fb68cf
USD-based pricing of gas.
2016-03-28 00:49:35 +02:00
Gav Wood
d150529730
Merge remote-tracking branch 'origin/master' into bettermining
2016-03-27 22:16:24 +02:00
Peter
9655ce8dbf
Caching for computing seed hashes ( #541 )
...
Code review changes
2016-03-27 20:42:24 +01:00
Gav Wood
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
Gav Wood
6b8e7bdfb3
Merge pull request #838 from ethcore/tx-queue-resp
...
checking transaction queue for pending transaction
2016-03-27 19:51:37 +02:00
NikVolf
a8c725a891
test for pending
2016-03-27 17:16:15 +03:00
Gav Wood
6cac296366
Remove comments.
2016-03-27 15:39:45 +02:00
Gav Wood
8bb49f05d0
Merge pull request #817 from ethcore/state_tests
...
refactored loading of state tests
2016-03-27 15:35:16 +02:00
Nikolay Volf
8b7e0a0dbe
Merge pull request #837 from ethcore/835
...
tests for deserialization of transaction from issue #835
2016-03-27 17:13:21 +04:00
NikVolf
254ac6f253
checking tx queue
2016-03-27 16:12:21 +03:00
Gav Wood
43e1d89067
Fix State cloning.
2016-03-27 14:35:27 +02:00
debris
0d453e52ad
tests for deserialization of issue #835
2016-03-27 14:14:05 +02:00
Gav Wood
f608db3a68
Merge pull request #834 from ethcore/unlock-pass
...
unlocks with no expiration [on top of 833]
2016-03-27 11:53:06 +02:00
NikVolf
6db02134e9
Merge branch 'master' into unlock-pass
2016-03-27 04:49:02 +03:00
Nikolay Volf
bdd6674958
Merge pull request #833 from ethcore/unlockcli
...
Unlock accounts on CLI.
2016-03-27 05:47:34 +04:00
Gav Wood
156a2336de
Allow passwords on multiple lines in --password files.
2016-03-27 03:15:41 +02:00
NikVolf
cbe1e4599d
fix test
2016-03-27 03:49:12 +03:00
NikVolf
32fd35843f
in cli call
2016-03-27 03:45:43 +03:00
NikVolf
a37647b3d1
Merge remote-tracking branch 'origin/unlockcli' into unlock-pass
2016-03-27 03:42:32 +03:00
NikVolf
edc527b3ab
unlimited unlock
2016-03-27 03:41:57 +03:00
Gav Wood
8805d04183
Minor refactor.
2016-03-27 01:41:28 +01:00
Gav Wood
53c4ed09a3
Unlock accounts on CLI.
2016-03-27 01:35:42 +01:00
Gav Wood
fc211f0934
Merge remote-tracking branch 'origin/master' into bettermining
2016-03-26 23:35:51 +01:00
Gav Wood
7d7b315511
Fix tests and a couple of warnings.
2016-03-26 23:35:36 +01:00
Gav Wood
c8ac1a2351
Fix test.
2016-03-26 23:32:54 +01:00
Gav Wood
ff0e6eb0d5
Merge pull request #829 from ethcore/optionalblocknumberinrpc-master
...
Make BlockNumber optional, fix eth_call
2016-03-26 23:29:53 +01:00
Gav Wood
993e16afbd
Fix miner,
2016-03-26 20:36:03 +01:00
Gav Wood
785e9d1be6
Merge pull request #831 from ethcore/test-socket-devtools
...
Test socket to common test code (ethcore-devtools)
2016-03-26 20:07:40 +01:00
NikVolf
f9c0e0c152
removed from util
2016-03-26 19:08:06 +03:00
NikVolf
579d41b174
fix lib
2016-03-26 19:04:42 +03:00
NikVolf
c2ffb6c255
test socket to common test tools
2016-03-26 19:04:12 +03:00
Gav Wood
64819981f2
Merge branch 'master' into bettermining
2016-03-26 13:45:38 +01:00
Gav Wood
00685f357f
Remove info!s.
2016-03-26 13:45:13 +01:00
Gav Wood
845fa97da1
Fix eth_call so it doesn't need the secret of the sender.
2016-03-26 13:30:02 +01:00
Gav Wood
aaf04e793d
Make BlockNumber optional.
2016-03-26 12:41:24 +01:00
Gav Wood
b34ff82987
Merge branch 'master' of github.com:ethcore/parity
2016-03-26 12:40:04 +01:00
Gav Wood
af14c68acc
Merge pull request #822 from ethcore/netidfix
...
Use network id for the web3_net_version return.
2016-03-26 11:25:09 +01:00
Gav Wood
2aa3183c16
Merge branch 'master' of github.com:ethcore/parity
2016-03-26 11:21:49 +01:00
Gav Wood
8ea53b69eb
Merge pull request #824 from ethcore/web3-sha3
...
json-rpc web3_sha3
2016-03-26 11:20:52 +01:00
Gav Wood
44d9ccf2c5
Update web3.rs
...
[ci-skip]
2016-03-26 11:19:51 +01:00
