From 53fcef761ee024d945fc0700e0930675fe14565b Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Wed, 6 Mar 2013 13:12:27 +0100 Subject: [PATCH] BitCoin -> Bitcoin --- .../java/com/google/bitcoin/core/AbstractBlockChain.java | 2 +- core/src/main/java/com/google/bitcoin/core/Address.java | 2 +- core/src/main/java/com/google/bitcoin/core/Block.java | 4 ++-- core/src/main/java/com/google/bitcoin/core/ECKey.java | 2 +- core/src/main/java/com/google/bitcoin/core/Message.java | 2 +- .../java/com/google/bitcoin/core/NetworkParameters.java | 2 +- core/src/main/java/com/google/bitcoin/core/Transaction.java | 2 +- core/src/main/java/com/google/bitcoin/core/Utils.java | 6 +++--- core/src/main/java/com/google/bitcoin/core/VarInt.java | 2 +- core/src/main/java/com/google/bitcoin/core/Wallet.java | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/src/main/java/com/google/bitcoin/core/AbstractBlockChain.java b/core/src/main/java/com/google/bitcoin/core/AbstractBlockChain.java index 3144c822..663b35f0 100644 --- a/core/src/main/java/com/google/bitcoin/core/AbstractBlockChain.java +++ b/core/src/main/java/com/google/bitcoin/core/AbstractBlockChain.java @@ -79,7 +79,7 @@ public abstract class AbstractBlockChain { /** * Tracks the top of the best known chain.

* - * Following this one down to the genesis block produces the story of the economy from the creation of BitCoin + * Following this one down to the genesis block produces the story of the economy from the creation of Bitcoin * until the present day. The chain head can change if a new set of blocks is received that results in a chain of * greater work than the one obtained by following this one down. In that case a reorganize is triggered, * potentially invalidating transactions in our wallet. diff --git a/core/src/main/java/com/google/bitcoin/core/Address.java b/core/src/main/java/com/google/bitcoin/core/Address.java index 8c1e01ac..62137dd0 100644 --- a/core/src/main/java/com/google/bitcoin/core/Address.java +++ b/core/src/main/java/com/google/bitcoin/core/Address.java @@ -70,7 +70,7 @@ public class Address extends VersionedChecksummedBytes { } } - /** The (big endian) 20 byte hash that is the core of a BitCoin address. */ + /** The (big endian) 20 byte hash that is the core of a Bitcoin address. */ public byte[] getHash160() { return bytes; } diff --git a/core/src/main/java/com/google/bitcoin/core/Block.java b/core/src/main/java/com/google/bitcoin/core/Block.java index c06e7acb..315eb4e0 100644 --- a/core/src/main/java/com/google/bitcoin/core/Block.java +++ b/core/src/main/java/com/google/bitcoin/core/Block.java @@ -114,7 +114,7 @@ public class Block extends Message { } /** - * Contruct a block object from the BitCoin wire format. + * Contruct a block object from the Bitcoin wire format. * @param params NetworkParameters object. * @param parseLazy Whether to perform a full parse immediately or delay until a read is requested. * @param parseRetain Whether to retain the backing byte array for quick reserialization. @@ -811,7 +811,7 @@ public class Block extends Message { hash = null; } - /** Returns the version of the block data structure as defined by the BitCoin protocol. */ + /** Returns the version of the block data structure as defined by the Bitcoin protocol. */ public long getVersion() { maybeParseHeader(); return version; diff --git a/core/src/main/java/com/google/bitcoin/core/ECKey.java b/core/src/main/java/com/google/bitcoin/core/ECKey.java index 8e2ede9d..a404a13f 100644 --- a/core/src/main/java/com/google/bitcoin/core/ECKey.java +++ b/core/src/main/java/com/google/bitcoin/core/ECKey.java @@ -111,7 +111,7 @@ public class ECKey implements Serializable { } /** - * Construct an ECKey from an ASN.1 encoded private key. These are produced by OpenSSL and stored by the BitCoin + * Construct an ECKey from an ASN.1 encoded private key. These are produced by OpenSSL and stored by the Bitcoin * reference implementation in its wallet. Note that this is slow because it requires an EC point multiply. */ public static ECKey fromASN1(byte[] asn1privkey) { diff --git a/core/src/main/java/com/google/bitcoin/core/Message.java b/core/src/main/java/com/google/bitcoin/core/Message.java index 08d94b6b..6d5f0185 100644 --- a/core/src/main/java/com/google/bitcoin/core/Message.java +++ b/core/src/main/java/com/google/bitcoin/core/Message.java @@ -150,7 +150,7 @@ public abstract class Message implements Serializable { this(params, msg, offset, NetworkParameters.PROTOCOL_VERSION, parseLazy, parseRetain, length); } - // These methods handle the serialization/deserialization using the custom BitCoin protocol. + // These methods handle the serialization/deserialization using the custom Bitcoin protocol. // It's somewhat painful to work with in Java, so some of these objects support a second // serialization mechanism - the standard Java serialization system. This is used when things // are serialized to the wallet. diff --git a/core/src/main/java/com/google/bitcoin/core/NetworkParameters.java b/core/src/main/java/com/google/bitcoin/core/NetworkParameters.java index 40cb6d26..749dce59 100644 --- a/core/src/main/java/com/google/bitcoin/core/NetworkParameters.java +++ b/core/src/main/java/com/google/bitcoin/core/NetworkParameters.java @@ -61,7 +61,7 @@ public class NetworkParameters implements Serializable { /** *

Genesis block for this chain.

* - *

The first block in every chain is a well known constant shared between all BitCoin implemenetations. For a + *

The first block in every chain is a well known constant shared between all Bitcoin implemenetations. For a * block to be valid, it must be eventually possible to work backwards to the genesis block by following the * prevBlockHash pointers in the block headers.

* diff --git a/core/src/main/java/com/google/bitcoin/core/Transaction.java b/core/src/main/java/com/google/bitcoin/core/Transaction.java index 6d01998b..7996f490 100644 --- a/core/src/main/java/com/google/bitcoin/core/Transaction.java +++ b/core/src/main/java/com/google/bitcoin/core/Transaction.java @@ -529,7 +529,7 @@ public class Transaction extends ChildMessage implements Serializable { /** * A coinbase transaction is one that creates a new coin. They are the first transaction in each block and their - * value is determined by a formula that all implementations of BitCoin share. In 2011 the value of a coinbase + * value is determined by a formula that all implementations of Bitcoin share. In 2011 the value of a coinbase * transaction is 50 coins, but in future it will be less. A coinbase transaction is defined not only by its * position in a block but by the data in the inputs. */ diff --git a/core/src/main/java/com/google/bitcoin/core/Utils.java b/core/src/main/java/com/google/bitcoin/core/Utils.java index 988bfa9c..db8fe235 100644 --- a/core/src/main/java/com/google/bitcoin/core/Utils.java +++ b/core/src/main/java/com/google/bitcoin/core/Utils.java @@ -60,9 +60,9 @@ public class Utils { // TODO: Replace this nanocoins business with something better. /** - * How many "nanocoins" there are in a BitCoin. + * How many "nanocoins" there are in a Bitcoin. *

- * A nanocoin is the smallest unit that can be transferred using BitCoin. + * A nanocoin is the smallest unit that can be transferred using Bitcoin. * The term nanocoin is very misleading, though, because there are only 100 million * of them in a coin (whereas one would expect 1 billion. */ @@ -71,7 +71,7 @@ public class Utils { /** * How many "nanocoins" there are in 0.01 BitCoins. *

- * A nanocoin is the smallest unit that can be transferred using BitCoin. + * A nanocoin is the smallest unit that can be transferred using Bitcoin. * The term nanocoin is very misleading, though, because there are only 100 million * of them in a coin (whereas one would expect 1 billion). */ diff --git a/core/src/main/java/com/google/bitcoin/core/VarInt.java b/core/src/main/java/com/google/bitcoin/core/VarInt.java index 6a8b7ca4..2b1b4b66 100644 --- a/core/src/main/java/com/google/bitcoin/core/VarInt.java +++ b/core/src/main/java/com/google/bitcoin/core/VarInt.java @@ -30,7 +30,7 @@ public class VarInt { originallyEncodedSize = getSizeInBytes(); } - // BitCoin has its own varint format, known in the C++ source as "compact size". + // Bitcoin has its own varint format, known in the C++ source as "compact size". public VarInt(byte[] buf, int offset) { int first = 0xFF & buf[offset]; long val; diff --git a/core/src/main/java/com/google/bitcoin/core/Wallet.java b/core/src/main/java/com/google/bitcoin/core/Wallet.java index 9c6b9a90..34798237 100644 --- a/core/src/main/java/com/google/bitcoin/core/Wallet.java +++ b/core/src/main/java/com/google/bitcoin/core/Wallet.java @@ -127,7 +127,7 @@ public class Wallet implements Serializable, BlockChainListener { * may have unspent "change" outputs.

*

* Note: for now we will not allow spends of transactions that did not make it into the block chain. The code - * that handles this in BitCoin C++ is complicated. Satoshis code will not allow you to spend unconfirmed coins, + * that handles this in Bitcoin C++ is complicated. Satoshis code will not allow you to spend unconfirmed coins, * however, it does seem to support dependency resolution entirely within the context of the memory pool so * theoretically you could spend zero-conf coins and all of them would be included together. To simplify we'll * make people wait but it would be a good improvement to resolve this in future. @@ -1590,7 +1590,7 @@ public class Wallet implements Serializable, BlockChainListener { * prevent this, but that should only occur once the transaction has been accepted by the network. This implies * you cannot have more than one outstanding sending tx at once.

* - * @param address The BitCoin address to send the money to. + * @param address The Bitcoin address to send the money to. * @param nanocoins How much currency to send, in nanocoins. * @return either the created Transaction or null if there are insufficient coins. * coins as spent until commitTx is called on the result.