Merge branch 'master' of https://github.com/ProgrammingBlockchain/Pro…

…grammingBlockchain Conflicts: SUMMARY.md
molxyz · May 27, 2016 · 4eb9432 · 4eb9432
2 parents 65c1ae4 + a8ae35e
commit 4eb9432
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/SUMMARY.md b/SUMMARY.md
@@ -22,7 +22,7 @@
    * [“The Blockchain is more than just Bitcoin”](bitcoin_transfer/the_blockchain_is_more_than_just_bitcoin.md)
    * [Spend your coin](bitcoin_transfer/spend_your_coin.md)
    * [Proof of ownership as an authentication method](bitcoin_transfer/proof_of_ownership_as_an_authentication_method.md)
-* [Key storage and generation](key_storage_and_generation/README.md)
+   * [Key storage and generation](key_storage_and_generation/README.md)
    * [Is it random enough?](key_storage_and_generation/is_it_random_enough.md)
    * [Key Encryption](key_storage_and_generation/key_encryption.md)
    * [Key Generation](key_storage_and_generation/key_generation.md)
@@ -43,6 +43,4 @@
    * [Ricardian contracts](other_types_of_asset/ricardian_contracts.md)
    * [Liquid Democracy](other_types_of_asset/liquid_democracy.md)
    * [Proof of Burn and Reputation](other_types_of_asset/proof_of_burn_and_reputation.md)
-* [Case studies](implementations/README.md)
-   * [HiddenBitcoin: Key Storage (HD wallet)](implementations/hiddenbitcoinkey_storage_hd_wallet_md.md)
-
+   * [Protecting your private keys](security/protecting_your_private_keys.md)
diff --git a/bitcoin_transfer/spend_your_coin.md b/bitcoin_transfer/spend_your_coin.md
@@ -13,7 +13,7 @@ Have you already generated and noted a private key to yourself? Have you already
 ```cs
 var network = Network.Main;
 
-Key privateKey = new Key();
+var privateKey = new Key();
 var bitcoinPrivateKey = privateKey.GetWif(network);
 var address = bitcoinPrivateKey.GetAddress();
 
@@ -268,6 +268,6 @@ using (var node = Node.ConnectToLocal(network)) //Connect to the node
 }
 ```  
 
-The **using** code block will take care of closing the connection to the node. That it!
+The **using** code block will take care of closing the connection to the node. That's it!
 
-You can also connect directly to the Bitcoin network, However I advise you to connect to your own trusted node (faster and easier)  
+You can also connect directly to the Bitcoin network, however I advise you to connect to your own trusted node (faster and easier)  
diff --git a/bitcoin_transfer/the_blockchain_is_more_than_just_bitcoin.md b/bitcoin_transfer/the_blockchain_is_more_than_just_bitcoin.md
@@ -1,7 +1,7 @@
 ## “The Blockchain is more than just Bitcoin” {#the-blockchain-is-more-than-just-bitcoin}
 
 The interesting thing is that this same sentence is used by two different groups of people.  
-It is as used by Bitcoin-As-A-Currency believers as argument for their bullish prediction of Bitcoin’s value.  
+It is used by Bitcoin-As-A-Currency believers as argument for their bullish prediction of Bitcoin’s value.  
 It is also used by those who do not believe in the success of the currency, as an attempt to explain why Bitcoin has so much interest.  
 
 But there is one thing we all agree on: an immutable database that cannot be censored, tampered with, or erased that is duplicated all around the world will have tremendous impact on other industries.  

diff --git a/key_storage_and_generation/is_it_random_enough.md b/key_storage_and_generation/is_it_random_enough.md
@@ -1,6 +1,6 @@
 ## Is it random enough? {#is-it-random-enough}
 
-When you call **new Key()**, under the hood, you are using a PRNG (Pseudo-Random-Number-Generator) to generate your private key. On windows, it uses the **RNGCryptoServiceProvider** of Windows.
+When you call **new Key()**, under the hood, you are using a PRNG (Pseudo-Random-Number-Generator) to generate your private key. On windows, it uses the **RNGCryptoServiceProvider**, a .NET wrapper around the Windows Crypto API.
 
 On Android, I use the **SecureRandom**, and in fact, you can use your own implementation with **RandomUtils.Random**.
 

diff --git a/other_types_of_ownership/p2sh_pay_to_script_hash.md b/other_types_of_ownership/p2sh_pay_to_script_hash.md
@@ -31,11 +31,11 @@ Key bob = new Key();
 Key alice = new Key();
 Key satoshi = new Key();
 
-var scriptPubKey = PayToMultiSigTemplate
+var paymentScript = PayToMultiSigTemplate
     .Instance
-    .GenerateScriptPubKey(2, new[] { bob.PubKey, alice.PubKey, satoshi.PubKey });
+    .GenerateScriptPubKey(2, new[] { bob.PubKey, alice.PubKey, satoshi.PubKey }).PaymentScript;
 
-Console.WriteLine(scriptPubKey);
+Console.WriteLine(paymentScript);
 ```  
 
 ```
@@ -97,4 +97,4 @@ ScriptCoin coin = received.Outputs.AsCoins().First()
 
 ![](../assets/ScriptCoin.png)  
 
-The rest of the code concerning transaction generation and signing is exactly the same as in the previous part with native multi sig.
+The rest of the code concerning transaction generation and signing is exactly the same as in the previous part with native multi sig.