diff --git a/_includes/devdoc/guide_contracts.md b/_includes/devdoc/guide_contracts.md index 5a503709..8037d332 100644 --- a/_includes/devdoc/guide_contracts.md +++ b/_includes/devdoc/guide_contracts.md @@ -170,9 +170,9 @@ spent anything so far, except possibly a small transaction fee, and he'll be able to broadcast the refund transaction in 24 hours for a full refund. -Now, when Alice does some work worth 1 millibitcoin, she asks Bob to create +Now, when Alice does some work worth 1 millidash, she asks Bob to create and sign a new version of the refund transaction. Version two of the -transaction spends 1 millibitcoin to Alice and the other 99 back to Bob; it does +transaction spends 1 millidash to Alice and the other 99 back to Bob; it does not have a locktime, so Alice can sign it and spend it whenever she wants. (But she doesn't do that immediately.) diff --git a/_includes/devdoc/guide_dash_features.md b/_includes/devdoc/guide_dash_features.md index d5dc5a23..bfc7f2bf 100644 --- a/_includes/devdoc/guide_dash_features.md +++ b/_includes/devdoc/guide_dash_features.md @@ -288,7 +288,7 @@ Once the syncing node receives the counts and inventories, it may request any *Governance Sync Data Flow* | **Syncing Node Message** | **Direction** | **Masternode Response** | **Description** | -| **Inital request** | | | **Requests all governance objects (without votes)** | +| **Initial request** | | | **Requests all governance objects (without votes)** | | `govsync` message | → | | Syncing node initiates governance sync (hash set to all zeros) | | ← | `ssc` message (govobj) | Number of governance objects (0 or more) | | ← | `ssc` message (govobjvote)| Number of governance object votes *(0 since votes are only returned if a specific hash is provided with the `govsync` message)* diff --git a/_includes/devdoc/guide_transactions.md b/_includes/devdoc/guide_transactions.md index 226750ef..db7e9cd4 100644 --- a/_includes/devdoc/guide_transactions.md +++ b/_includes/devdoc/guide_transactions.md @@ -506,7 +506,7 @@ Standard transactions must also meet the following conditions: opcodes which solely push data to the stack. * The transaction must not include any outputs which receive fewer than - 1/3 as many satoshis as it would take to spend it in a typical input. + 1/3 as many duffs as it would take to spend it in a typical input. That's currently 5460 duffs for a P2PKH or P2SH output on a Dash Core node with the default relay fee. Exception: standard null data outputs must receive zero duffs. diff --git a/_includes/devdoc/guide_wallets.md b/_includes/devdoc/guide_wallets.md index 57ded5a5..d84c92ea 100644 --- a/_includes/devdoc/guide_wallets.md +++ b/_includes/devdoc/guide_wallets.md @@ -280,7 +280,7 @@ In order to make copying of private keys less prone to error, [Wallet Import For 1. Take a private key. -2. Add a 0x80 byte in front of it for mainnet addresses or 0xef for testnet addresses. +2. Add a 0xCC byte in front of it for mainnet addresses or 0xEF for testnet addresses. 3. Append a 0x01 byte after it if it should be used with compressed public keys (described in a later subsection). Nothing is appended if diff --git a/docs/setting-up-your-environment.md b/docs/setting-up-your-environment.md index 93e46219..a8efffb6 100644 --- a/docs/setting-up-your-environment.md +++ b/docs/setting-up-your-environment.md @@ -158,14 +158,9 @@ Plugins include: | Plugin | Seconds | Remote APIs | Used For |--------------|---------|----------------|------------------------ -| alerts | 5 | -- | Network alert pages | autocrossref | 90 | -- | Developer documentation -| contributors | 5 | GitHub.com | Contributor listings -| events | 5 | Google Maps | Events page | glossary | 30 | -- | Developer glossary | redirects | 20 | -- | Redirects from old URLs -| releases | 10 | -- | Bitcoin Core release notes; Download -page | sitemap | 10 | -- | /sitemap.xml Notes: some plugins interact with each other or with translations; for example diff --git a/img/dev/en-blockchain-overview.dot b/img/dev/en-blockchain-overview.dot index 10a28983..34314012 100644 --- a/img/dev/en-blockchain-overview.dot +++ b/img/dev/en-blockchain-overview.dot @@ -56,5 +56,5 @@ _transactions0 -> _transactions1 -> _transactions2 [ style = "invis", minlen = 2 invis1 -> _transactions0 [ style = "invis", minlen = 1 ]; -label = "\nSimplified Bitcoin Block Chain"; +label = "\nSimplified Dash Block Chain"; } diff --git a/img/dev/en-blockchain-overview.png b/img/dev/en-blockchain-overview.png index 50bd90ff..5a842cba 100644 Binary files a/img/dev/en-blockchain-overview.png and b/img/dev/en-blockchain-overview.png differ diff --git a/img/dev/en-blockchain-overview.svg b/img/dev/en-blockchain-overview.svg index fea05ed6..59e7c12c 100644 --- a/img/dev/en-blockchain-overview.svg +++ b/img/dev/en-blockchain-overview.svg @@ -1,119 +1,119 @@ - - - + + blockchain - -Simplified Bitcoin Block Chain -cluster_block0header - -Block 1 -Header + +Simplified Dash Block Chain +cluster_block0header + +Block 1 +Header -cluster_block1header - -Block 2 -Header +cluster_block1header + +Block 2 +Header -cluster_block2header - -Block 3 -Header +cluster_block2header + +Block 3 +Header _transactions0 - -Block 1 -Transactions + +Block 1 +Transactions -hashMerkleRoot0 - -Merkle Root +hashMerkleRoot0 + +Merkle Root -_transactions0->hashMerkleRoot0 - - +_transactions0->hashMerkleRoot0 + + -_transactions1 - -Block 2 -Transactions +_transactions1 + +Block 2 +Transactions -hashBlock0 - -Hash Of Previous -Block Header +hashBlock0 + +Hash Of Previous +Block Header -_blockHeader0->hashBlock0 - - +_blockHeader0->hashBlock0 + + -hashBlock9 - -Hash Of Previous -Block Header +hashBlock9 + +Hash Of Previous +Block Header -hashMerkleRoot1 - -Merkle Root +hashMerkleRoot1 + +Merkle Root -_transactions1->hashMerkleRoot1 - - +_transactions1->hashMerkleRoot1 + + -_transactions2 - -Block 3 -Transactions +_transactions2 + +Block 3 +Transactions -hashBlock1 - -Hash Of Previous -Block Header +hashBlock1 + +Hash Of Previous +Block Header -_blockHeader1->hashBlock1 - - +_blockHeader1->hashBlock1 + + -hashMerkleRoot2 - -Merkle Root +hashMerkleRoot2 + +Merkle Root -_transactions2->hashMerkleRoot2 - - +_transactions2->hashMerkleRoot2 + + -invis0->hashBlock9 - - +invis0->hashBlock9 + + diff --git a/img/dev/en-micropayment-channel.dot b/img/dev/en-micropayment-channel.dot index 3276b5cf..b3bb080c 100644 --- a/img/dev/en-micropayment-channel.dot +++ b/img/dev/en-micropayment-channel.dot @@ -40,9 +40,9 @@ subgraph cluster_bob { btx2v1 -> atx2v1s [ label = "B: Please sign refund version 1,\nwhich is a full refund of the bond\nthat can't be spent for 24 hours" ]; atx2v1s -> btx1v2 [ style = dashed, label = "A: Signed; please send me the bond to\nprove you funded the account" ]; btx1v2 -> atx1v2 [ label = "B: Here's the bond; please start working" ]; -atx1v2 -> btx2v2s [ style = dashed, label = "A: Some work done; please sign refund v2\nreducing your refund by 1 mBTC" ]; +atx1v2 -> btx2v2s [ style = dashed, label = "A: Some work done; please sign refund v2\nreducing your refund by 1 mDASH" ]; btx2v2s -> atx2v3 [ label = "B: Signed; refund now pays Bob: 99; Alice: 1" ]; -atx2v3 -> btx2v3 [ style = dashed, label = "A: More work done; please sign v3\nreducing your refund by another 1 mBTC" ]; +atx2v3 -> btx2v3 [ style = dashed, label = "A: More work done; please sign v3\nreducing your refund by another 1 mDASH" ]; btx2v3 -> atx2v4 [ label = "B: Signed; refund now pays Bob: 98; Alice: 2" ]; atx2v4 -> btx2v4 [ style = dashed, label = "A: [...]" ]; btx2v4 -> atx2v5 [ label = "B: [...]" ]; @@ -50,5 +50,5 @@ btx2v4 -> atx2v5 [ label = "B: [...]" ]; atx2v5 -> btx2v5 [ style = dashed, label = "A: I'm done for the day. I'm\ngoing to broadcast refund v45" ]; -label = " \n \nAlice broadcasts the bond to the Bitcoin network immediately.\nShe broadcasts the final version of the refund when she finishes work\nor before the locktime. If she fails to broadcast before refund v1's time lock\nexpires, Bob can broadcast refund v1 to get a full refund.\n \nBitcoin Micropayment Channels (As Implemented In Bitcoinj)" +label = " \n \nAlice broadcasts the bond to the Dash network immediately.\nShe broadcasts the final version of the refund when she finishes work\nor before the locktime. If she fails to broadcast before refund v1's time lock\nexpires, Bob can broadcast refund v1 to get a full refund.\n \nDash Micropayment Channels" } diff --git a/img/dev/en-micropayment-channel.png b/img/dev/en-micropayment-channel.png index b61ece0b..3d8d3dbb 100644 Binary files a/img/dev/en-micropayment-channel.png and b/img/dev/en-micropayment-channel.png differ diff --git a/img/dev/en-micropayment-channel.svg b/img/dev/en-micropayment-channel.svg index 76b1b9d7..c3cbaec9 100644 --- a/img/dev/en-micropayment-channel.svg +++ b/img/dev/en-micropayment-channel.svg @@ -1,128 +1,128 @@ - - - + + paymentchannel - - - -Alice broadcasts the bond to the Bitcoin network immediately. -She broadcasts the final version of the refund when she finishes work -or before the locktime.  If she fails to broadcast before refund v1's time lock -expires, Bob can broadcast refund v1 to get a full refund. - -Bitcoin Micropayment Channels (As Implemented In Bitcoinj) -cluster_alice - -Alice's Computer -(Server) + + + +Alice broadcasts the bond to the Dash network immediately. +She broadcasts the final version of the refund when she finishes work +or before the locktime.  If she fails to broadcast before refund v1's time lock +expires, Bob can broadcast refund v1 to get a full refund. + +Dash Micropayment Channels +cluster_alice + +Alice's Computer +(Server) -cluster_bob - -Bob's Computer -(Client) +cluster_bob + +Bob's Computer +(Client) -atx2v1s->btx1v2 - - -A: Signed; please send me the bond to -prove you funded the account +atx2v1s->btx1v2 + + +A: Signed; please send me the bond to +prove you funded the account -atx1v2 - -Bond -(2-of-2 -multisig) +atx1v2 + +Bond +(2-of-2 +multisig) -atx1v2->btx2v2s - - -A: Some work done; please sign refund v2 -reducing your refund by 1 mBTC +atx1v2->btx2v2s + + +A: Some work done; please sign refund v2 +reducing your refund by 1 mDASH -atx2v3->btx2v3 - - -A: More work done; please sign v3 -reducing your refund by another 1 mBTC +atx2v3->btx2v3 + + +A: More work done; please sign v3 +reducing your refund by another 1 mDASH -atx2v4->btx2v4 - - -A: [...] +atx2v4->btx2v4 + + +A: [...] -atx2v5 - -Refund v45 -Bob: 66 - Alice: 44 -(No Lock) +atx2v5 + +Refund v45 +Bob: 66 + Alice: 44 +(No Lock) -atx2v5->btx2v5 - - -A: I'm done for the day.  I'm -going to broadcast refund v45 +atx2v5->btx2v5 + + +A: I'm done for the day.  I'm +going to broadcast refund v45 -btx2v1 - -Refund v1 -Bob: 100 -Alice: 0 -(Locktime) +btx2v1 + +Refund v1 +Bob: 100 +Alice: 0 +(Locktime) -btx2v1->atx2v1s - - -B: Please sign refund version 1, -which is a full refund of the bond -that can't be spent for 24 hours +btx2v1->atx2v1s + + +B: Please sign refund version 1, +which is a full refund of the bond +that can't be spent for 24 hours -btx1v2->atx1v2 - - -B: Here's the bond; please start working +btx1v2->atx1v2 + + +B: Here's the bond; please start working -btx2v2s->atx2v3 - - -B: Signed; refund now pays Bob: 99; Alice: 1 +btx2v2s->atx2v3 + + +B: Signed; refund now pays Bob: 99; Alice: 1 -btx2v3->atx2v4 - - -B: Signed; refund now pays Bob: 98; Alice: 2 +btx2v3->atx2v4 + + +B: Signed; refund now pays Bob: 98; Alice: 2 -btx2v4->atx2v5 - - -B: [...] +btx2v4->atx2v5 + + +B: [...] diff --git a/img/dev/en-pooled-mining-overview.dot b/img/dev/en-pooled-mining-overview.dot index 1e67ef22..a7160879 100644 --- a/img/dev/en-pooled-mining-overview.dot +++ b/img/dev/en-pooled-mining-overview.dot @@ -21,5 +21,5 @@ asic0 -> software [ label = "←Headers\nBelow\nTarget" ]; software -> pool0 [ constraint = false, label = "←Shares" ]; -label = "Pool-Based Bitcoin Mining Workflow" +label = "Pool-Based Dash Mining Workflow" } diff --git a/img/dev/en-solo-mining-overview.dot b/img/dev/en-solo-mining-overview.dot index c9cc5e1a..ddf3eebe 100644 --- a/img/dev/en-solo-mining-overview.dot +++ b/img/dev/en-solo-mining-overview.dot @@ -10,7 +10,7 @@ nodesep = 0.5; p2pnetwork [ label = "P2P\nNetwork" ] asic0 [ label = "ASIC" ]; software [ label = "Mining\nSoftware" ] -pool0 [ label = "bitcoind" ]; +pool0 [ label = "dashd" ]; pool0 -> software [ label = "Block\nTemplate→" ]; p2pnetwork -> pool0 [ label = "TXes→" ]; @@ -21,5 +21,5 @@ asic0 -> software [ label = "←Headers\nBelow\nTarget" ]; software -> pool0 [ constraint = false, label = "←Blocks" ]; -label = "Solo Bitcoin Mining Workflow" +label = "Solo Dash Mining Workflow" } diff --git a/img/dev/en-transaction-propagation.dot b/img/dev/en-transaction-propagation.dot index 2b7a014f..33fd6e7d 100644 --- a/img/dev/en-transaction-propagation.dot +++ b/img/dev/en-transaction-propagation.dot @@ -82,5 +82,5 @@ tx4_output0 -> tx6_input0 [ label = "10k" ] tx5_output0 -> tx6_input1 [ label = "10k" ] tx3_output0 -> utxo0 [ style=dashed, labelfloat = true, minlen = 2, label = "20k Unspent TX\nOutput (UTXO)" ] tx6_output0 -> utxo1 [ style=dashed, label = "10k\nUTXO" ] -label = "Triple-Entry Bookkeeping (Transaction-To-Transaction Payments) As Used By Bitcoin" +label = "Triple-Entry Bookkeeping (Transaction-To-Transaction Payments) As Used By Dash" } diff --git a/img/dev/en-transaction-propagation.png b/img/dev/en-transaction-propagation.png index a28b8bb0..0c52e5ee 100644 Binary files a/img/dev/en-transaction-propagation.png and b/img/dev/en-transaction-propagation.png differ diff --git a/img/dev/en-transaction-propagation.svg b/img/dev/en-transaction-propagation.svg index 8e111aaf..ce646deb 100644 --- a/img/dev/en-transaction-propagation.svg +++ b/img/dev/en-transaction-propagation.svg @@ -9,7 +9,7 @@ blockchain -Triple-Entry Bookkeeping (Transaction-To-Transaction Payments) As Used By Bitcoin +Triple-Entry Bookkeeping (Transaction-To-Transaction Payments) As Used By Dash cluster_tx0 Transaction 0 diff --git a/img/dev/en-tx-overview-spending.dot b/img/dev/en-tx-overview-spending.dot index 7ee80ffe..957f932f 100644 --- a/img/dev/en-tx-overview-spending.dot +++ b/img/dev/en-tx-overview-spending.dot @@ -22,7 +22,7 @@ subgraph cluster_tx0 { subgraph cluster_outputs { pubkey_script [ label = "Pubkey\nScript" ]; - amount [ label = "Amount\n(satoshis)" ]; + amount [ label = "Amount\n(duffs)" ]; output0_label [ shape = "none", label = "Output 0\n(Implied)" ] label = "Example Output Paying A Pubkey Script" } diff --git a/img/dev/en-tx-overview-spending.png b/img/dev/en-tx-overview-spending.png index a01168c1..e47b585c 100644 Binary files a/img/dev/en-tx-overview-spending.png and b/img/dev/en-tx-overview-spending.png differ diff --git a/img/dev/en-tx-overview-spending.svg b/img/dev/en-tx-overview-spending.svg index 3872aee4..120e4dcf 100644 --- a/img/dev/en-tx-overview-spending.svg +++ b/img/dev/en-tx-overview-spending.svg @@ -1,108 +1,108 @@ - - - + + tx_overview - -Overview Of Transaction Spending -cluster_tx0 - + +Overview Of Transaction Spending +cluster_tx0 + -cluster_outputs - -Example Output Paying A Pubkey Script +cluster_outputs + +Example Output Paying A Pubkey Script -cluster_tx1 - +cluster_tx1 + -cluster_inputs - -Example Input Spending The Example Output +cluster_inputs + +Example Input Spending The Example Output tx1_label -Transaction -1 +Transaction +1 tx0_label -Transaction -0 +Transaction +0 -txid - -Transaction -Identifier +txid + +Transaction +Identifier -tx0_label->txid - - +tx0_label->txid + + -tx1_notshown -Not Shown: -Version, Outputs, -Locktime +tx1_notshown +Not Shown: +Version, Outputs, +Locktime -tx0_notshown -Not Shown: -Version, Inputs, -Locktime +tx0_notshown +Not Shown: +Version, Inputs, +Locktime -pubkey_script - -Pubkey -Script +pubkey_script + +Pubkey +Script -signature_script - -Signature -Script +signature_script + +Signature +Script -pubkey_script->signature_script - - +pubkey_script->signature_script + + -amount - -Amount -(satoshis) +amount + +Amount +(duffs) -output0_label -Output 0 -(Implied) +output0_label +Output 0 +(Implied) -index - -Output -Index +index + +Output +Index -output0_label->index - - +output0_label->index + + -sequence - -Sequence -Number +sequence + +Sequence +Number