diff --git a/_data/glossary/en/address.yaml b/_data/glossary/en/address.yaml index 37b185cc..98a9e2a6 100644 --- a/_data/glossary/en/address.yaml +++ b/_data/glossary/en/address.yaml @@ -8,7 +8,7 @@ required: summary_max_255_characters_no_formatting: > A 20-byte hash formatted using base58check to produce either a - P2PKH or P2SH Bitcoin address. Currently the most common way + P2PKH or P2SH Dash address. Currently the most common way users exchange payment information. synonyms_shown_in_glossary_capitalize_first_letter: diff --git a/_data/glossary/en/base58check.yaml b/_data/glossary/en/base58check.yaml index e23e3c35..a4f884c1 100644 --- a/_data/glossary/en/base58check.yaml +++ b/_data/glossary/en/base58check.yaml @@ -7,7 +7,7 @@ required: title_max_40_characters_no_formatting: Base58check, Bitcoin Address Encoding summary_max_255_characters_no_formatting: > - The method used in Bitcoin for converting 160-bit hashes into + The method used in Dash for converting 160-bit hashes into P2PKH and P2SH addresses. Also used in other parts of Bitcoin, such as encoding private keys for backup in WIP format. Not the same as other base58 implementations. diff --git a/_data/glossary/en/block-reward.yaml b/_data/glossary/en/block-reward.yaml index ecbdd283..4dd81918 100644 --- a/_data/glossary/en/block-reward.yaml +++ b/_data/glossary/en/block-reward.yaml @@ -9,7 +9,7 @@ required: summary_max_255_characters_no_formatting: > The amount that miners may claim as a reward for creating a block. Equal to the sum of the block subsidy (newly available - satoshis) plus the transactions fees paid by transactions + duffs) plus the transactions fees paid by transactions included in the block. synonyms_shown_in_glossary_capitalize_first_letter: diff --git a/_data/glossary/en/compactsize.yaml b/_data/glossary/en/compactsize.yaml index 0117e94c..0f2d59f3 100644 --- a/_data/glossary/en/compactsize.yaml +++ b/_data/glossary/en/compactsize.yaml @@ -7,8 +7,8 @@ required: title_max_40_characters_no_formatting: CompactSize Unsigned Integer summary_max_255_characters_no_formatting: > - A type of variable-length integer commonly used in the Bitcoin - P2P protocol and Bitcoin serialized data structures. + A type of variable-length integer commonly used in the Dash + P2P protocol and Dash serialized data structures. synonyms_shown_in_glossary_capitalize_first_letter: - CompactSize @@ -21,7 +21,7 @@ optional: - compactsize uints not_to_be_confused_with_capitalize_first_letter: - - VarInt (a data type Bitcoin Core uses for local data storage) + - VarInt (a data type Dash Core uses for local data storage) - Compact (the data type used for nBits in the block header) links_html_or_markdown_style_capitalize_first_letter: diff --git a/_data/glossary/en/dns-seed.yaml b/_data/glossary/en/dns-seed.yaml index 001545f1..3c69f8a8 100644 --- a/_data/glossary/en/dns-seed.yaml +++ b/_data/glossary/en/dns-seed.yaml @@ -8,7 +8,7 @@ required: summary_max_255_characters_no_formatting: > A DNS server which returns IP addresses of full nodes on the - Bitcoin network to assist in peer discovery. + Dash network to assist in peer discovery. synonyms_shown_in_glossary_capitalize_first_letter: - DNS seed diff --git a/_data/glossary/en/genesis-block.yaml b/_data/glossary/en/genesis-block.yaml index 518de6f4..17bcf645 100644 --- a/_data/glossary/en/genesis-block.yaml +++ b/_data/glossary/en/genesis-block.yaml @@ -7,7 +7,7 @@ required: title_max_40_characters_no_formatting: Genesis Block, Block 0 summary_max_255_characters_no_formatting: > - The first block in the Bitcoin block chain. + The first block in the Dash block chain. synonyms_shown_in_glossary_capitalize_first_letter: - Genesis block diff --git a/_data/glossary/en/inventory.yaml b/_data/glossary/en/inventory.yaml index ce9dfebc..1b8a8dd3 100644 --- a/_data/glossary/en/inventory.yaml +++ b/_data/glossary/en/inventory.yaml @@ -7,8 +7,8 @@ required: title_max_40_characters_no_formatting: Inventory, Block Or Transaction Inventory summary_max_255_characters_no_formatting: > - A data type identifier and a hash; used to identify transactions - and blocks available for download through the Bitcoin P2P network. + A data type identifier and a hash; used to identify transactions, + blocks, and objects available for download through the Dash P2P network. synonyms_shown_in_glossary_capitalize_first_letter: - Inventory diff --git a/_data/glossary/en/mainnet.yaml b/_data/glossary/en/mainnet.yaml index 9da228eb..3d14f5c9 100644 --- a/_data/glossary/en/mainnet.yaml +++ b/_data/glossary/en/mainnet.yaml @@ -4,11 +4,11 @@ required: #-------------40 characters-------------# - title_max_40_characters_no_formatting: Mainnet, Bitcoin Main Network + title_max_40_characters_no_formatting: Mainnet, Dash Main Network summary_max_255_characters_no_formatting: > - The original and main network for Bitcoin transactions, where - satoshis have real economic value. + The original and main network for Dash transactions, where + duffs have real economic value. synonyms_shown_in_glossary_capitalize_first_letter: - Mainnet diff --git a/_data/glossary/en/merkle-tree.yaml b/_data/glossary/en/merkle-tree.yaml index 75a06dd9..b1d60b35 100644 --- a/_data/glossary/en/merkle-tree.yaml +++ b/_data/glossary/en/merkle-tree.yaml @@ -9,7 +9,7 @@ required: summary_max_255_characters_no_formatting: > A tree constructed by hashing paired data (the leaves), then pairing and hashing the results until a single hash remains, the - merkle root. In Bitcoin, the leaves are almost always + merkle root. In Dash, the leaves are almost always transactions from a single block. synonyms_shown_in_glossary_capitalize_first_letter: diff --git a/_data/glossary/en/mining.yaml b/_data/glossary/en/mining.yaml index 9d48803e..446860d6 100644 --- a/_data/glossary/en/mining.yaml +++ b/_data/glossary/en/mining.yaml @@ -7,7 +7,7 @@ required: title_max_40_characters_no_formatting: Mining, Miner summary_max_255_characters_no_formatting: > - Mining is the act of creating valid Bitcoin blocks, which + Mining is the act of creating valid Dash blocks, which requires demonstrating proof of work, and miners are devices that mine or people who own those devices. diff --git a/_data/glossary/en/output.yaml b/_data/glossary/en/output.yaml index 589d0f3a..e0f5909f 100644 --- a/_data/glossary/en/output.yaml +++ b/_data/glossary/en/output.yaml @@ -8,9 +8,9 @@ required: summary_max_255_characters_no_formatting: > An output in a transaction which contains two fields: a value - field for transferring zero or more satoshis and a pubkey script + field for transferring zero or more duffs and a pubkey script for indicating what conditions must be fulfilled for those - satoshis to be further spent. + duffs to be further spent. synonyms_shown_in_glossary_capitalize_first_letter: - Output diff --git a/_data/glossary/en/p2pkh-address.yaml b/_data/glossary/en/p2pkh-address.yaml index 65ef91e4..9de3b223 100644 --- a/_data/glossary/en/p2pkh-address.yaml +++ b/_data/glossary/en/p2pkh-address.yaml @@ -7,7 +7,7 @@ required: title_max_40_characters_no_formatting: P2PKH Address, Pay To PubKey Hash summary_max_255_characters_no_formatting: > - A Bitcoin payment address comprising a hashed public key, + A Dash payment address comprising a hashed public key, allowing the spender to create a standard pubkey script that Pays To PubKey Hash (P2PKH). diff --git a/_data/glossary/en/p2sh-address.yaml b/_data/glossary/en/p2sh-address.yaml index f611391c..eec816e2 100644 --- a/_data/glossary/en/p2sh-address.yaml +++ b/_data/glossary/en/p2sh-address.yaml @@ -7,7 +7,7 @@ required: title_max_40_characters_no_formatting: P2SH Address, Pay To Script Hash summary_max_255_characters_no_formatting: > - A Bitcoin payment address comprising a hashed script, + A Dash payment address comprising a hashed script, allowing the spender to create a standard pubkey script that Pays To Script Hash (P2SH). The script can be almost any valid pubkey script. diff --git a/_data/glossary/en/pubkey-script.yaml b/_data/glossary/en/pubkey-script.yaml index fbeebe01..1e0a38fb 100644 --- a/_data/glossary/en/pubkey-script.yaml +++ b/_data/glossary/en/pubkey-script.yaml @@ -8,7 +8,7 @@ required: summary_max_255_characters_no_formatting: > A script included in outputs which sets the conditions that must - be fulfilled for those satoshis to be spent. Data for + be fulfilled for those duffs to be spent. Data for fulfilling the conditions can be provided in a signature script. Pubkey Scripts are called a scriptPubKey in code. diff --git a/_data/glossary/en/regression-test-mode.yaml b/_data/glossary/en/regression-test-mode.yaml index ea3644ca..02a72224 100644 --- a/_data/glossary/en/regression-test-mode.yaml +++ b/_data/glossary/en/regression-test-mode.yaml @@ -9,7 +9,7 @@ required: summary_max_255_characters_no_formatting: > A local testing environment in which developers can almost instantly generate blocks on demand for testing events, and can - create private satoshis with no real-world value. + create private duffs with no real-world value. synonyms_shown_in_glossary_capitalize_first_letter: - Regtest diff --git a/_data/glossary/en/rpc-byte-order.yaml b/_data/glossary/en/rpc-byte-order.yaml index 050c0656..3cdb9c0d 100644 --- a/_data/glossary/en/rpc-byte-order.yaml +++ b/_data/glossary/en/rpc-byte-order.yaml @@ -8,7 +8,7 @@ required: summary_max_255_characters_no_formatting: > A hash digest displayed with the byte order reversed; used in - Bitcoin Core RPCs, many block explorers, and other software. + Dash Core RPCs, many block explorers, and other software. synonyms_shown_in_glossary_capitalize_first_letter: - RPC byte order diff --git a/_data/glossary/en/serialized-transaction.yaml b/_data/glossary/en/serialized-transaction.yaml index a80c022d..6df77c08 100644 --- a/_data/glossary/en/serialized-transaction.yaml +++ b/_data/glossary/en/serialized-transaction.yaml @@ -9,7 +9,7 @@ required: summary_max_255_characters_no_formatting: > Complete transactions in their binary format; often represented using hexadecimal. Sometimes called raw format because of the - various Bitcoin Core commands with "raw" in their names. + various Dash Core commands with "raw" in their names. synonyms_shown_in_glossary_capitalize_first_letter: - Serialized transaction diff --git a/_data/glossary/en/start-string.yaml b/_data/glossary/en/start-string.yaml index f78fe404..f8133584 100644 --- a/_data/glossary/en/start-string.yaml +++ b/_data/glossary/en/start-string.yaml @@ -7,7 +7,7 @@ required: title_max_40_characters_no_formatting: Start String, Network Magic summary_max_255_characters_no_formatting: > - Four defined bytes which start every message in the Bitcoin P2P + Four defined bytes which start every message in the Dash P2P protocol to allow seeking to the next message. synonyms_shown_in_glossary_capitalize_first_letter: diff --git a/_data/glossary/en/testnet.yaml b/_data/glossary/en/testnet.yaml index 933d8f3b..0eca941c 100644 --- a/_data/glossary/en/testnet.yaml +++ b/_data/glossary/en/testnet.yaml @@ -8,8 +8,8 @@ required: summary_max_255_characters_no_formatting: > A global testing environment in which developers can obtain and - spend satoshis that have no real-world value on a network that - is very similar to the Bitcoin mainnet. + spend duffs that have no real-world value on a network that + is very similar to the Dash mainnet. synonyms_shown_in_glossary_capitalize_first_letter: - Testnet diff --git a/_data/glossary/en/wallet.yaml b/_data/glossary/en/wallet.yaml index 0436bcd0..7ef0cd38 100644 --- a/_data/glossary/en/wallet.yaml +++ b/_data/glossary/en/wallet.yaml @@ -9,7 +9,7 @@ required: summary_max_255_characters_no_formatting: > Software that stores private keys and monitors the block chain (sometimes as a client of a server that does the processing) to - allow users to spend and receive satoshis. + allow users to spend and receive duffs. synonyms_shown_in_glossary_capitalize_first_letter: - Wallet diff --git a/_includes/devdoc/ref_p2p_networking.md b/_includes/devdoc/ref_p2p_networking.md index 6c23ebd9..6f58dfa2 100644 --- a/_includes/devdoc/ref_p2p_networking.md +++ b/_includes/devdoc/ref_p2p_networking.md @@ -2074,7 +2074,7 @@ fees (to provide security in mixing). | ---------- | ----------- | --------- | -------- | -------- | | # | tx | `tx` message | Required | The transaction | 41 | vin | txIn | Required | Masternode unspent output -| 66* | vchSig | char[] | Required | Signature of this message by masternode verifiable via pubKeyMasternode (66 bytes in most cases. Length (1 byte) + Signature (65 bytes)) +| 66 | vchSig | char[] | Required | Signature of this message by masternode verifiable via pubKeyMasternode (Length (1 byte) + Signature (65 bytes)) | 8 | sigTime | int64_t | Require | Time this message was signed