Skip to content

Commit

Permalink
Merge pull request bitcoinbook#681 from bitcoinbook/wbnns-rm-colored-…
Browse files Browse the repository at this point in the history
…coins

Drop references to Colored Coins
  • Loading branch information
wbnns authored May 4, 2020
2 parents 3a140f5 + 694254f commit 02e9f77
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 155 deletions.
161 changes: 10 additions & 151 deletions ch12.asciidoc

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions glossary.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ coinbase transaction::
cold storage::
Refers to keeping a reserve of bitcoin offline. Cold storage is achieved when Bitcoin private keys are created and stored in a secure offline environment. Cold storage is important for anyone with bitcoin holdings. Online computers are vulnerable to hackers and should not be used to store a significant amount of bitcoin.

colored coins::
An open source Bitcoin 2.0 protocol that enables developers to create digital assets on top of bitcoin blockchain utilizing its functionalities beyond currency.

confirmations::
Once a transaction is included in a block, it has one confirmation. As soon as _another_ block is mined on the same blockchain, the transaction has two confirmations, and so on. Six or more confirmations is considered sufficient proof that a transaction cannot be reversed.

Expand Down Expand Up @@ -138,7 +135,7 @@ opcode::
Operation codes from the Bitcoin Script language which push data or perform functions within a pubkey script or signature script.

Open Assets protocol::
The Open Assets Protocol is a simple and powerful protocol built on top of the bitcoin blockchain. It allows issuance and transfer of user-created assets. The Open Assets protocol is an evolution of the concept of colored coins.
The Open Assets Protocol is a simple and powerful protocol built on top of the bitcoin blockchain. It allows issuance and transfer of user-created assets.

OP_RETURN::
An opcode used in one of the outputs in an OP_RETURN transaction. Not to be confused with OP_RETURN transaction.
Expand Down
Binary file modified images/mbc2_1201.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/mbc2_1202.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/mbc2_1203.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/mbc2_1204.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/mbc2_1205.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/mbc2_1206.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/mbc2_1207.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/mbc2_1208.png
Binary file not shown.
Binary file removed images/mbc2_1209.png
Binary file not shown.
Binary file removed images/mbc2_1210.png
Binary file not shown.

0 comments on commit 02e9f77

Please sign in to comment.