Commit Graph

1301 Commits

Author SHA1 Message Date
NikVolf 9fc5583fa3 Merge branch 'master' into fix-overflow 2016-12-14 13:08:45 +01:00
NikVolf c6858c64ae wip 2016-12-14 13:08:19 +01:00
NikVolf 79cc2f1b4e make satoshi 2016-12-14 12:57:47 +01:00
Svyatoslav Nikolsky e09401c7e9 Merge branch 'master' into rpc_raw_continue 2016-12-14 14:36:31 +03:00
Svyatoslav Nikolsky 64c059ee71 Merge pull request #328 from ethcore/fix_319
Replace non-final transactions in mempool + block assembler won't include such transactions in block
2016-12-14 14:33:23 +03:00
Svyatoslav Nikolsky be53bbdc3e added some more tests 2016-12-14 14:22:02 +03:00
Svyatoslav Nikolsky ab1e9311ff Merge pull request #329 from ethcore/verification-overflow
Move overflow checks into separate error type
2016-12-14 11:03:52 +03:00
Svyatoslav Nikolsky a9dcc0d6f7 fix bad pattern 2016-12-14 02:08:07 +03:00
NikVolf 4fdf56ccf4 move overflow into separate error type 2016-12-13 23:27:12 +01:00
NikVolf 5017956dbc move overflow into separate error type 2016-12-13 23:26:39 +01:00
NikVolf b67f33ce5b database drop 2016-12-13 23:22:36 +01:00
Svyatoslav Nikolsky 768912c759 fix after merhe 2016-12-14 00:23:23 +03:00
Svyatoslav Nikolsky f54b7691c4 Merge branch 'master' into fix_319 2016-12-14 00:17:47 +03:00
Svyatoslav Nikolsky 945c19a8eb replace non-final transactions in mempool 2016-12-14 00:14:07 +03:00
Nikolay Volf 4f2e61eb54 Merge pull request #326 from ethcore/read_and_hash
improvements for import
2016-12-13 22:11:47 +01:00
NikVolf 82189b7426 remove copy-paste artifact 2016-12-13 22:05:30 +01:00
NikVolf c0e134a36e verification of 1000-transaction blocks 2016-12-13 22:01:15 +01:00
debris a0fd492797 Merge branch 'master' of github.com:ethcore/parity-bitcoin into read_and_hash 2016-12-13 21:19:51 +01:00
debris 7baaa47b8c import is hashing blocks when reading, added --skip-verification flag 2016-12-13 20:49:41 +01:00
Nikolay Volf a9c897ec7b Merge pull request #321 from ethcore/network-rpc-cont-2
JSON RPC - getconnectioncount method
2016-12-13 20:08:22 +01:00
Nikolay Volf 8e5290d640 Merge pull request #320 from ethcore/network-rpc-cont
JSON RPC - getaddednodeinfo method
2016-12-13 20:07:58 +01:00
Svyatoslav Nikolsky cbd42cfa03 Merge pull request #323 from ethcore/read_and_hash
hash block and transactions while reading them
2016-12-13 21:22:26 +03:00
debris ce7af59ad3 hash block and transactions while reading them 2016-12-13 18:06:46 +01:00
NikVolf c216d12d34 connection count method 2016-12-13 16:54:56 +01:00
NikVolf 5f7ef32cce fix example 2016-12-13 16:20:11 +01:00
Svyatoslav Nikolsky da5fb2d0d2 flush 2016-12-13 18:16:48 +03:00
Svyatoslav Nikolsky 145634ed29 Merge pull request #314 from ethcore/rpc_raw_continue
Rpc raw continue
2016-12-13 18:15:53 +03:00
NikVolf f206634ce8 finalizing jsonrpc 2016-12-13 15:30:08 +01:00
Svyatoslav Nikolsky 6bccd1cb38 used TransactionOutputs in traits 2016-12-13 16:58:03 +03:00
Svyatoslav Nikolsky ea0727a4de Merge branch 'master' into rpc_raw_continue 2016-12-13 16:51:02 +03:00
NikVolf 92b103deb8 p2p api changes 2016-12-13 14:23:16 +01:00
Marek Kotewicz 591a642121 Merge pull request #316 from ethcore/few_optimizations_with_borrow_and_as_ref
few optimizations with Borrow and AsRef
2016-12-13 14:11:30 +01:00
debris b161ce1997 fix compilation 2016-12-13 13:52:06 +01:00
Svyatoslav Nikolsky d7f2828597 TransactionOutputs struct 2016-12-13 15:36:35 +03:00
debris 6ecdfd78c5 few optimizations with Borrow and AsRef 2016-12-13 13:33:06 +01:00
Nikolay Volf f087b795f6 Merge pull request #312 from ethcore/rpc_blockchain
`gettxout` implemented
2016-12-13 13:18:42 +01:00
NikVolf 1f75bbcb1f json-rpc layout 2016-12-13 13:17:57 +01:00
Nikolay Volf 5162075c6e Merge pull request #315 from ethcore/spendable_transactions
TransactionOutputBuilder always creates spendable transactions
2016-12-13 13:09:15 +01:00
debris 8d7a45f2ca TransactionOutputGenerator always creates spendable transactions 2016-12-13 12:41:27 +01:00
Svyatoslav Nikolsky 9ff3879e20 added curl examples for RPCs 2016-12-13 14:26:16 +03:00
Svyatoslav Nikolsky 3b31ef9216 fixed compilation 2016-12-13 14:03:55 +03:00
NikVolf 7b1e7eec2f Merge branch 'master' into network-rpc-cont 2016-12-13 11:49:07 +01:00
NikVolf 1930d83485 rpc method stub 2016-12-13 11:44:06 +01:00
Svyatoslav Nikolsky 6137914bc6 fix after merge 2016-12-13 13:42:39 +03:00
Svyatoslav Nikolsky f14f809401 Merge branch 'master' into rpc_blockchain 2016-12-13 13:39:46 +03:00
Svyatoslav Nikolsky 89290a05a5 fix after merge 2016-12-13 13:34:42 +03:00
Svyatoslav Nikolsky 3cc7ec96d1 Merge branch 'master' into rpc_raw_continue 2016-12-13 13:32:37 +03:00
Svyatoslav Nikolsky 80f17977c1 Merge pull request #311 from ethcore/block_assembler_tests
verification module refactor
2016-12-13 13:29:18 +03:00
Svyatoslav Nikolsky 59aad9ec30 continue work on 'raw' RPC methods 2016-12-13 13:27:45 +03:00
debris d0c480565d applying suggestions from review and adding comments 2016-12-13 10:50:56 +01:00