Merge #127: Update things now that Bitcoin Core master is usable

aac8243 Update Bitcoin Core usage docs (Andrew Chow)
daa99c7 Change to building from bitcoin master (Andrew Chow)

Pull request description:

  Updates `setup_environment.sh` to build Bitcoin Core master branch instead of my hww branch.

  Updates the Bitcoin Core usage documentation.

Tree-SHA512: f7a9f2c6cb10f67cfc8b4a8a757d37e2ef8c37e26d5297215e6c8612780496b476d41c614106286813141b1278173094149df2b34a02fc64a71aec844fb081dc
This commit is contained in:
Andrew Chow 2019-02-15 15:05:32 -05:00
commit dba7acd5ed
No known key found for this signature in database
GPG Key ID: 17565732E08E5E41
2 changed files with 2 additions and 4 deletions

View File

@ -14,9 +14,7 @@ We are not liable for any coins that may be lost through this method. The softwa
This method of using hardware wallets uses Bitcoin Core as the wallet for monitoring the blockchain. It allows a user to use their own full node instead of relying on an SPV wallet or vendor provided software.
However, Bitcoin Core needs a few changes for this work.
PRs [#14565](https://github.com/bitcoin/bitcoin/pull/14565), [#14491](https://github.com/bitcoin/bitcoin/pull/14491), [#14021](https://github.com/bitcoin/bitcoin/pull/14021), and [#14075](https://github.com/bitcoin/bitcoin/pull/14075) are required in order for this to work.
Since these PRs are still unmerged, A branch with them merged is available [here](https://github.com/achow101/bitcoin/tree/hww).
HWI works with Bitcoin Core as of commit [c576979b78b541bf3b4a7cbeee989b55d268e3e1](https://github.com/bitcoin/bitcoin/commit/c576979b78b541bf3b4a7cbeee989b55d268e3e1).
## Setup

View File

@ -149,7 +149,7 @@ cd ..
# Clone bitcoind if it doesn't exist, or update it if it does
bitcoind_setup_needed=false
if [ ! -d "bitcoin" ]; then
git clone https://github.com/achow101/bitcoin.git -b hww
git clone https://github.com/bitcoin/bitcoin.git
cd bitcoin
bitcoind_setup_needed=true
else