Skip to content

Commit aa35b3d

Browse files
Made suggested corrections along with making an epub version of the entire course.
1 parent d51c46b commit aa35b3d

14 files changed

Lines changed: 14 additions & 15 deletions

12_1_Using_Script_Conditionals.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ ELSE
8989
ENDIF
9090
9191
```
92-
Remember your reverse Polish notation! That `IF` statement if referring to the `OP_EQUAL` before it, not the `OP_CHECKSIG` after it!
92+
Remember your reverse Polish notation! That `IF` statement is referring to the `OP_EQUAL` before it, not the `OP_CHECKSIG` after it!
9393

9494
#### Run the True Branch
9595

@@ -136,7 +136,7 @@ Stack: [ True ]
136136
```
137137
#### Run the False Branch
138138

139-
Here's how it actally runs if unlocked with `<signatureB> <pubKeyB>`:
139+
Here's how it actually runs if unlocked with `<signatureB> <pubKeyB>`:
140140
```
141141
Script: <signatureB> <pubKeyB> OP_DUP OP_HASH160 <pubKeyHashA> OP_EQUAL IF OP_CHECKSIG ELSE OP_DUP OP_HASH160 <pubKeyHashB> OP_EQUALVERIFY OP_CHECKSIG ENDIF
142142
Stack: [ ]

12_2_Using_Other_Script_Commands.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Also see: `OP_CODESEPARATOR` (0xab), `OP_CHECKSIGVERIFY` (0xad), and `OP_CHECKMU
7878

7979
## Summary: Using Other Script Commands
8080

81-
Bitcoin Script includes a wide array of arithemetic, stack, and cryptographic opcodes. Most of these additional opcodes are probably not as common as the ones discussed in previous sections, but nonetheless they're available if they're just what you need to write your Script!
81+
Bitcoin Script includes a wide array of arithmetic, stack, and cryptographic opcodes. Most of these additional opcodes are probably not as common as the ones discussed in previous sections, but nonetheless they're available if they're just what you need to write your Script!
8282

8383
## What's Next?
8484

13_0_Designing_Real_Bitcoin_Scripts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Chapter 13: Designing Real Bitcoin Scripts
22

3-
Our Bitcoin Scripts to date have been largely theoretical examples, because we've still been putting together the puzzle pieces. Now, with the full Bitcoin Script repetoire in hand, we're ready to dig into several real-world Bitcoin Scripts and see how they work.
3+
Our Bitcoin Scripts to date have been largely theoretical examples, because we've still been putting together the puzzle pieces. Now, with the full Bitcoin Script repertoire in hand, we're ready to dig into several real-world Bitcoin Scripts and see how they work.
44

55
## Objectives for This Chapter
66

14_2_Changing_Your_Bitcoin_Hidden_Services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ See [Bitcoin Onion Nodes](https://github.com/emmanuelrosa/bitcoin-onion-nodes) f
6363

6464
Afterward, restart `tor` and `bitcoind`.
6565

66-
You should now be communicating exlusively on Tor. But, unless you are in a hostile state, this level of anonymity is probably not required. It also is not particularly recommended: you might greatly decrease your number of potential peers, inviting problems of censorship or even correlation. You may also see lag. And, this setup may give you a false sense of anonymity that really doesn't exist on the Bitcoin network.
66+
You should now be communicating exclusively on Tor. But, unless you are in a hostile state, this level of anonymity is probably not required. It also is not particularly recommended: you might greatly decrease your number of potential peers, inviting problems of censorship or even correlation. You may also see lag. And, this setup may give you a false sense of anonymity that really doesn't exist on the Bitcoin network.
6767

6868
> :warning: **WARNING:** This setup is untested! Use at your own risk!
6969

17_4_Using_PSBTs_in_Libwally.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ The creator role is tasked with creating a PSBT with at least one input.
279279
A PSBT is created with a simple use of `wally_psbt_init_alloc`, telling it how many inputs and outputs you will eventually add:
280280
```
281281
struct wally_psbt *psbt;
282-
lw_response = wally_psbt_init_alloc(0,1,1,0,&psbt);
282+
lw_response = wally_psbt_init_alloc(0,1,1,0,0,&psbt);
283283
```
284284
But what you have is not yet a legal PSBT, because of the lack of inputs. You can create those by creating a transaction and setting it as the global transaction in the PSBT, which updates all the inputs and outputs:
285285
```

17_5_Using_Scripts_in_Libwally.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ a9 / 14 / 3f58b4f7b14847a9083694b9b3b52a4cea2569ed / 87
4141
```
4242
That's our old friend `OP_HASH160 3f58b4f7b14847a9083694b9b3b52a4cea2569ed OP_EQUAL`.
4343

44-
Basically, Libwally took your serialized redeem script, hashed it for you with SHA-256 and RIPEMD-160, and the applied the standard framing to turn it into a proper P2SH; You did similar work in [§10.2](10_2_Building_the_Structure_of_P2SH.md), but with an excess of shell commands.
44+
Basically, Libwally took your serialized redeem script, hashed it for you with SHA-256 and RIPEMD-160, and then applied the standard framing to turn it into a proper P2SH; You did similar work in [§10.2](10_2_Building_the_Structure_of_P2SH.md), but with an excess of shell commands.
4545

4646
In fact, you can double-check your work using the same commands from §10.2:
4747
```

17_7_Integrating_Libwally_and_Bitcoin-CLI.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@ $ bitcoin-cli getaddressesbylabel "LibwallyWO"
316316
"purpose": "receive"
317317
}
318318
}
319-
}
320319
```
321320

322321
## Summary: Integrating Libwally and Bitcoin-CLI

18_1_Accessing_Bitcoind_with_Go.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ tb1qutkcj34pw0aq7n9wgp3ktmz780szlycwddfmza
242242

243243
### Decode an Address
244244

245-
Creating an address took a look extra work, in specifying the appropiate chain. Using an address also will because you'll have to decode it prior to use.
245+
Creating an address took a little extra work, in specifying the appropriate chain. Using an address also will because you'll have to decode it prior to use.
246246

247247
The means that you'll have to import both the ```"github.com/btcsuite/btcutil"``` and ```"github.com/btcsuite/btcd/chaincfg"``` libraries.
248248
* ```btcutil``` allows for a Bitcoin address to be decoded in a way that the`rpcclient` can understand. This is necessary when working with addresses in `rpcclient`.

18_3_Accessing_Bitcoind_with_NodeJS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Obviously, your `user` and `pass` should again match what's in your `~/.bitcoin/
8585

8686
Using BCRPC, you can use the same RPC commands you would usually use via ```bitcoin-cli``` with your `RpcAgent`, except they need to be in camelCase. For example, ```getblockhash``` would be ```getBlockHash``` instead.
8787

88-
To print the newest block number, you just call `getBlockCount` thourgh your `RpcAgent`:
88+
To print the newest block number, you just call `getBlockCount` through your `RpcAgent`:
8989

9090
```
9191
agent.getBlockCount(function (err, blockCount) {

18_4_Accessing_Bitcoind_with_Python.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import logging
4141
```
4242
`pprint` will pretty print the `json` response from `bitcoind`.
4343

44-
`logging` will print out the call you make to `bitcoind` and `bitcoind`'s respose, which is useful when you make a bunch of calls together. If you don't want the excessive output in the terminal just comment out the `logging` block.
44+
`logging` will print out the call you make to `bitcoind` and `bitcoind`'s response, which is useful when you make a bunch of calls together. If you don't want the excessive output in the terminal just comment out the `logging` block.
4545

4646
## Build Your Connection
4747

@@ -357,7 +357,7 @@ There are five steps:
357357

358358
### 1. Select UTXO & Set Transaction Details
359359

360-
In the folowing code snippet you first select the UTXO which we want to spend. Then you get its address, transaction id, and the vector index of the output.
360+
In the following code snippet you first select the UTXO which we want to spend. Then you get its address, transaction id, and the vector index of the output.
361361

362362
```py
363363
utxos = rpc_client.listunspent()

0 commit comments

Comments
 (0)