Skip to content

Commit

Permalink
Remove segwit appendix from book
Browse files Browse the repository at this point in the history
Renumbered index references in subsequent chapters
  • Loading branch information
aantonop committed Feb 3, 2018
1 parent 06158f9 commit 3bf14a5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
4 changes: 2 additions & 2 deletions appdx-bitcore.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
== Bitcore


((("Bitcore", id="bitcore17")))Bitcore is a suite of tools provided by BitPay. Its goal is to provide easy-to-use tools for Bitcoin developers. Almost all of Bitcore's code is written in JavaScript. There are some modules written specifically for NodeJS. Finally, the "node" module of Bitcore includes Bitcoin Core's C++ code. Please see https://bitcore.io for more information.
((("Bitcore", id="bitcore16")))Bitcore is a suite of tools provided by BitPay. Its goal is to provide easy-to-use tools for Bitcoin developers. Almost all of Bitcore's code is written in JavaScript. There are some modules written specifically for NodeJS. Finally, the "node" module of Bitcore includes Bitcoin Core's C++ code. Please see https://bitcore.io for more information.

=== Bitcore's Feature List

Expand Down Expand Up @@ -91,7 +91,7 @@ Broadcasting a transaction to the Bitcoin network
1. Copy the code below into a file called _broadcast.js_.
2. The +tx+ and +rbfTx+ variables are the output of +tx.serialize()+ and +rbfTx.serialize()+, respectively.
3. In order to replace-by-fee, the peer must support bitcoind option +mempoolreplace+ and have it set to +1+.
4. Run the file node _broadcast.js_((("", startref="bitcore17"))):
4. Run the file node _broadcast.js_((("", startref="bitcore16"))):

----
var p2p = require('bitcore-p2p');
Expand Down
10 changes: 5 additions & 5 deletions appdx-bx.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

== Bitcoin Explorer (bx) Commands

((("Bitcoin Explorer (bx) commands", id="BX19_1", range="startofrange")))Bitcoin Explorer (bx) is a command-line tool that offers a variety of commands for key management and transaction construction. It is part of the libbitcoin bitcoin library.
((("Bitcoin Explorer (bx) commands", id="BX18_1", range="startofrange")))Bitcoin Explorer (bx) is a command-line tool that offers a variety of commands for key management and transaction construction. It is part of the libbitcoin bitcoin library.

----
Usage: bx COMMAND [--help]
Expand Down Expand Up @@ -95,22 +95,22 @@ Generate a random "seed" value using the +seed+ command, which uses the operatin

----
$ bx seed | bx ec-new > private_key
$ cat private_key
$ cat private_key
73096ed11ab9f1db6135857958ece7d73ea7c30862145bcc4bbc7649075de474
----

Now, generate the public key from that private key using the +ec-to-public+ command. We pass the _private_key_ file into the standard input and save the standard output of the command into a new file _public_key_:

----
$ bx ec-to-public < private_key > public_key
$ cat public_key
$ cat public_key
02fca46a6006a62dfdd2dbb2149359d0d97a04f430f12a7626dd409256c12be500
----

We can reformat the +public_key+ as an address using the +ec-to-address+ command. We pass the _public_key_ into standard input:

----
$ bx ec-to-address < public_key
$ bx ec-to-address < public_key
17re1S4Q8ZHyCP8Kw7xQad1Lr6XUzWUnkG
----

Expand Down Expand Up @@ -178,4 +178,4 @@ $ bx mnemonic-decode < words
eb68ee9f3df6bd4441a9feadec179ff1
----

Mnemonic encoding can make the seed easier to record and even remember.(((range="endofrange", startref="BX19_1")))
Mnemonic encoding can make the seed easier to record and even remember.(((range="endofrange", startref="BX18_1")))
6 changes: 3 additions & 3 deletions appdx-pycoin.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The pycoin library supports both Python 2 (2.7.x) and Python 3 (after 3.3) and c

=== Key Utility (KU)

((("key utility (ku)", id="keyutil18")))The command-line utility +ku+ ("key utility") is a Swiss Army knife for manipulating keys. It supports BIP-32 keys, WIF, and addresses (bitcoin and alt coins). Following are some examples.
((("key utility (ku)", id="keyutil17")))The command-line utility +ku+ ("key utility") is a Swiss Army knife for manipulating keys. It supports BIP-32 keys, WIF, and addresses (bitcoin and alt coins). Following are some examples.

Create a BIP-32 key using the default entropy sources of GPG and _/dev/random_:

Expand Down Expand Up @@ -329,7 +329,7 @@ Dogecoin address : DFpN6QqFfUm3gKNaxN6tNcab1FArL9cZLE

==== Transaction Utility (TX)

((("transaction utility (TX)", id="TX18")))
((("transaction utility (TX)", id="TX17")))
The command-line utility +tx+ will display transactions in human-readable form, fetch base transactions from pycoin's transaction cache or from web services (blockchain.info, blockcypher.com, blockr.io and chain.so are currently supported), merge transactions, add or delete inputs or outputs, and sign transactions.

Following are some examples.
Expand Down Expand Up @@ -405,7 +405,7 @@ Total fees 0.00000 mBTC
all incoming transaction values validated
----

((("", startref="TX18")))Now, let's look at unspent outputs for a specific address (UTXO). In block #1, we see a coinbase transaction to +12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX+. Let's use +fetch_unspent+ to find all coins in this address:
((("", startref="TX17")))Now, let's look at unspent outputs for a specific address (UTXO). In block #1, we see a coinbase transaction to +12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX+. Let's use +fetch_unspent+ to find all coins in this address:

----
$ fetch_unspent 12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX
Expand Down
2 changes: 0 additions & 2 deletions book.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ include::appdx-scriptops.asciidoc[]

include::appdx-bips.asciidoc[]

include::appdx-segwit.asciidoc[]

include::appdx-bitcore.asciidoc[]

include::appdx-pycoin.asciidoc[]
Expand Down

0 comments on commit 3bf14a5

Please sign in to comment.