Merge branch 'master' of github.com:paritytech/parity-bitcoin into csv

This commit is contained in:
debris 2017-05-03 14:37:54 +02:00
commit 349bde9f87
4 changed files with 20 additions and 15 deletions

View File

@ -38,11 +38,11 @@ script:
- ./tools/bench.sh
- echo -en 'travis_fold:end:bench'
after_success: |
[ false ] &&
[ true ] &&
[ $TRAVIS_BRANCH = master ] &&
[ $TRAVIS_PULL_REQUEST = false ] &&
[ $TRAVIS_RUST_VERSION = stable ] &&
cargo doc --no-deps --verbose &&
cargo doc &&
echo '<meta http-equiv=refresh content=0;url=pbtc/index.html>' > target/doc/index.html &&
pip install --user ghp-import &&
/home/travis/.local/bin/ghp-import -n target/doc &&
@ -51,5 +51,5 @@ env:
global:
- CXX="g++-4.8"
- CC="gcc-4.8"
- secure: IbTkR3KY7N9e3lc6hreWuY2mhuKyf7k6LSRUMMrOeb1k9TIncYMbR6Sl2W1t5+CJVp7WqVoUbP9YIH8o8a9BBuFldTyAz3tapa908KrZKIRlb/uCTef11z/jzasye4Ttj+358DBrCXZqueFw5Bh5Bnaie3r5bSYWTcQU693Bm/tKFp0lh4fSjzGyk7kRZ4V4rz2YHudZOcNIXN+QfY8aY6dxQraw82GUnNXJLzGiC5GJgeSV1uSnxMUM/lb4+zP1qRlcLBLnwHSTH/3vHH5xsOaRwHEYOQT9pTDyxMnJzDgYfjH4mNu3jSvZ7WFrP+Sza/yR+3sjHpOCFN6rsWc88iTq6Nwp+ESfyjHiLT+jqWs7r57sg2VfwHXuzoEW5GGagrIoF/pDEWJvhtNRYvdYevDtlZYPTfhSR4WOPkMPCg7Ln2W7a7vrSH2iRNxawUDnq3bOIyGGBeGwBJFDOEd6CmP+ojjUUm9L5I4berYACgYEDuZ4bpRX3WpGR1yAhSF4o5BTh+88EWU/VhL2ceXreHlztma3KQ5526Ip46lC4eLFrl/w64zaupesEZFjLsOFm7U9Vx9IM6aqBzOFr8Mt8DlPLaTRmRrbzPRYqHg0MLpHkH8S/HyNbK0xvqbQFRHQ6XPXNJVJXZPz8XPUYWYPK9ayplVdRN9nonHQO7F0gV8=
- secure: RPpiXGV2RgRNv/S5XICdym33pauO5PNQu06+0kIuap6acsT6rjWZDeKU0kXIkCyv7XGu6TAE3m1/N6DSFvoeObdoodzakpUnzI9ysC9UbGbX3KgFAILrsuD+Th0HR1yZ2+boXEnetl7lp87X6m3HL4dz7ccuRJOGQFCdzo4iQd4RXMJXq1nS8pXYOnOiGtWy/K6SBqHus42End303vR6ptd71iuEYmX2qL5LUpXRQ5JuvE78JL4v5e1jrLwwrIG5hr3ej+EICiEKjAtZcv3C/CYq2+V7T8mI8FQFBsVG56FxP1Qq0G1jnv6r8i/pLb342DiQapeQZ+CZ1vHv3Ruzxm4+T9VLkwIcI5kOZmbOjt/BnO1yHFMr6uslxYuyEvSLZXsvnB7Qi2cB/nFWxi8nk19CzuYy2hjrnDA/bfeii65oQ4hyqAuF6QvHgZtMmSONbea679b1mbl9K67EWt04J4k67Hfuj6HvmIOT3KF0TPXO6K4b6a4OJ43PinNSWtIOlCb4658HrfUBTUEe1XN14uC/F8dyFw8PTrw/VQKkmNEDRvI0AuWF1s+qN1u1mm+CpyJaqxcPloUR+RgVBk3KrRd/Gm6neunx07G6STv/S2mGCZ2ZRIUpbSqha7XTmHltoWZRYFeM3dhVMXe3hgEYuJfm4n7HxGvp4b1s1ckenPI=
- RUST_BACKTRACE=1

View File

@ -1,7 +1,9 @@
# parity-bitcoin
The Parity Bitcoin client
[![Build Status][travis-image]][travis-url]
[![Build Status][travis-image]][travis-url]
Gitter [![Gitter https://gitter.im/paritytech/parity-bitcoin](https://badges.gitter.im/paritytech/parity-bitcoin.svg)](https://gitter.im/paritytech/parity-bitcoin)
- [Install guide](#install-guide)
@ -22,15 +24,15 @@ The Parity Bitcoin client
- [Project Graph][graph]
[graph]: ./tools/graph.svg
[travis-image]: https://travis-ci.com/ethcore/parity-bitcoin.svg?token=DMFvZu71iaTbUYx9UypX&branch=master
[travis-url]: https://travis-ci.com/ethcore/parity-bitcoin
[doc-url]: https://ethcore.github.io/parity-bitcoin/pbtc/index.html
[travis-image]: https://travis-ci.com/paritytech/parity-bitcoin.svg?token=DMFvZu71iaTbUYx9UypX&branch=master
[travis-url]: https://travis-ci.com/paritytech/parity-bitcoin
[doc-url]: https://paritytech.github.io/parity-bitcoin/pbtc/index.html
## Install guide
As for now `pbtc` can be installed only from source. It requires `rustc` and `cargo`.
Minimal supported version is `rustc 1.13.0 (2c6933acc 2016-11-07)`
Minimal supported version is `rustc 1.16.0 (30cf806ef 2017-03-10)`
#### Install rustc and cargo
@ -49,7 +51,7 @@ Windows binaries can be downloaded from [rust-lang website](https://www.rust-lan
Now let's clone `pbtc` and enter it's directory
```
git clone git@github.com:ethcore/parity-bitcoin.git
git clone https://github.com/paritytech/parity-bitcoin
cd parity-bitcoin
```
@ -150,13 +152,13 @@ Full list of cli options, which is available under `pbtc --help`
```
pbtc 0.1.0
Parity Technologies <admin@parity.io>
Parity bitcoin client
USAGE:
pbtc [FLAGS] [OPTIONS] [SUBCOMMAND]
FLAGS:
--db-cache Sets db cache size
-h, --help Prints help information
--no-jsonrpc Disable the JSON-RPC API server
--print-to-console Send sync info to console
@ -165,8 +167,10 @@ FLAGS:
-V, --version Prints version information
OPTIONS:
--blocknotify <command> Execute command when the best block changes (%s in cmd is replaced by block hash)
-c, --connect <IP> Connect only to the specified node
-d, --data-dir <PATH> Specify the database & configuration directory PATH
--db-cache <SIZE> Sets db cache size
--jsonrpc-apis <APIS> Specify the APIs available through the JSONRPC interface. APIS is a comma-delimited list of API name.
--jsonrpc-cors <URL> Specify CORS header for JSON-RPC API responses
--jsonrpc-hosts <HOSTS> List of allowed Host header values

View File

@ -4,6 +4,7 @@ BIPs that are implemented by pbtc
- `+` implemented
- `?` unknown
- `a` application layer
- `w` work in progress
| BIPs | pbtc | core | unlimited |
| ------ | ------ | ------ | ------ |
@ -13,14 +14,14 @@ BIPs that are implemented by pbtc
| [BIP 14][BIP14] | - | + | ? |
| [BIP 16][BIP16] | + | + | ? |
| [BIP 21][BIP21] | a | + | ? |
| [BIP 22][BIP22] | ? | + | ? |
| [BIP 23][BIP23] | ? | + | ? |
| [BIP 22][BIP22] | + | + | ? |
| [BIP 23][BIP23] | + | + | ? |
| [BIP 30][BIP30] | + | + | ? |
| [BIP 31][BIP31] | + | + | ? |
| [BIP 32][BIP32] | a | + | ? |
| [BIP 34][BIP34] | + | + | ? |
| [BIP 35][BIP35] | ? | + | ? |
| [BIP 37][BIP37] | ? | + | ? |
| [BIP 35][BIP35] | + | + | ? |
| [BIP 37][BIP37] | + | + | ? |
| [BIP 42][BIP42] | + | + | ? |
| [BIP 61][BIP61] | ? | + | ? |
| [BIP 65][BIP65] | + | + | ? |

View File

@ -1,6 +1,6 @@
name: pbtc
version: "0.1.0"
author: Ethcore <admin@ethcore.io>
author: Parity Technologies <admin@parity.io>
about: Parity bitcoin client
args:
- testnet: