Skip to content

Commit

Permalink
Merge #454: Changed tutorial bitcoin config file to work with new cor…
Browse files Browse the repository at this point in the history
…e v0.17 format

16113d8 Removed redundant .rpcuser, .rpcpassword (wintercooled)
370e797 Changed config file to work with new core v0.17 format as well as previous versions (wintercooled)

Pull request description:

  Core v0.17 now handles config file settings differently and loads the existing config settings as mainnet and not regtest. This means our e1 and e2 nodes in the tutorial can't connect.

  This PR makes the bitcoin.conf file compatible with both formats. Without this change the tutorial code fails if you are using bitcoind v0.17.0.0.

  REF: https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.17.0.md

  If the following options are not in a section, they will only apply to mainnet:
  `addnode=`, `connect=`, `port=`, `bind=`, `rpcport=`, `rpcbind=` and `wallet=`.
  The options to choose a network (`regtest=` and `testnet=`) must be specified
  outside of sections.

  Tested with bitcoind v0.16.2.0 and v0.17.0.0

Tree-SHA512: 3136703da17570e410c1e86ab31f3ac0bca60847164dd10e75a57affd1b7b67fdfbba2be5437ad9ffdd5428c10f6d34073d3e746f55dacda858ab47b517cd3fc
  • Loading branch information
instagibbs committed Nov 2, 2018
2 parents 3d2a085 + 16113d8 commit f58d62e
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions contrib/assets_tutorial/bitcoin.conf
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
regtest=1
daemon=1
txindex=1

regtest.rpcport=18888
regtest.port=18889

rpcuser=user3
rpcpassword=password3
rpcport=18888
port=18889

regtest=1
testnet=0
daemon=1
txindex=1

0 comments on commit f58d62e

Please sign in to comment.