Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
thephez committed Dec 12, 2024
2 parents e31a341 + 02e41cd commit ca00712
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 6 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

Dash Core Documentation

**Note: this documentation was migrated to the [dashpay/docs repository](https://github.com/dashpay/docs) after the Dash Core v21 release. Once Dash Core v22 is released, this documentation will be available at https://docs.dash.org/en/stable/docs/core and no further documentation updates will be made in this repository.**

Welcome to the Dash Core developer documentation. You’ll find sections for
reference information, API details, guides, examples and Dash Core wallet
information to help you start working with Dash as quickly as possible. This
Expand Down
6 changes: 6 additions & 0 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
'sphinx.ext.autodoc',
'sphinx_copybutton',
'sphinx_design',
'sphinxcontrib.googleanalytics',
'sphinx.ext.intersphinx',
]

Expand Down Expand Up @@ -157,6 +158,11 @@
"doc_path": "",
}

# -- Google analytics config ----------------------------------------------

googleanalytics_id = 'G-X6K8R91RDR'
googleanalytics_enabled = True

def setup(app):
app.add_js_file('js/pydata-search-close.js')
app.add_js_file('js/redirect.js')
2 changes: 1 addition & 1 deletion docs/guide/dash-features-chainlocks.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ If a valid [`clsig` message](../reference/p2p-network-instantsend-messages.md#cl

With LLMQ-based [InstantSend](../resources/glossary.md#instantsend), a ChainLock is only attempted once all [transactions](../resources/glossary.md#transaction) in the block are locked via InstantSend. If a block contains unlocked transactions, retroactive InstantSend locks are established prior to a ChainLock.

ChainLocks have been active on the Dash network since block <a href="https://insight.dashevo.org/insight/block/00000000000000112e41e4b3afda8b233b8cc07c532d2eac5de097b68358c43e" target="_blank">1088640</a> in June of 2019. Please read [DIP8 ChainLocks](https://github.com/dashpay/dips/blob/master/dip-0008.md) for additional details.
ChainLocks have been active on the Dash network since block <a href="https://insight.dash.org/insight/block/00000000000000112e41e4b3afda8b233b8cc07c532d2eac5de097b68358c43e" target="_blank">1088640</a> in June of 2019. Please read [DIP8 ChainLocks](https://github.com/dashpay/dips/blob/master/dip-0008.md) for additional details.
6 changes: 3 additions & 3 deletions docs/guide/dash-features-coinjoin.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ The CoinJoin denominations include a bit mapping to easily differentiate them. T

Protocol version 70213 added a 5th denomination (0.001 DASH).

[Example Testnet denomination creation transaction](https://testnet-insight.dashevo.org/insight/tx/f0174fc87d68a18617c2990df4d9455c0459c601d2d6473934357a66f9b8b70a)
[Example Testnet denomination creation transaction](https://insight.testnet.networks.dash.org:3002/insight/tx/f0174fc87d68a18617c2990df4d9455c0459c601d2d6473934357a66f9b8b70a)

**Creating Collaterals**

Collaterals are used to pay CoinJoin fees, but are kept separate from the denominations to maximize privacy. Since protocol version 70213, the minimum collateral fee is 1/10 of the smallest denomination for all sessions regardless of denomination. In Dash Core, collaterals are created with enough value to pay 4 collateral fees (4 x 0.001 DASH). ([Dash Core Reference](https://github.com/dashpay/dash/blob/v21.1.x/src/coinjoin/common.h#L109))

In protocol versions > 70208, Dash Core can use any [input](../resources/glossary.md#input) from 1x the minimum collateral amount to the maximum collateral amount.

[Example Testnet collateral creation transaction](https://testnet-insight.dashevo.org/insight/tx/8f9b15973983876f7ce4eb2c32b09690dfb0432d2caf6c6df516196a8d17689f)
[Example Testnet collateral creation transaction](https://insight.testnet.networks.dash.org:3002/insight/tx/8f9b15973983876f7ce4eb2c32b09690dfb0432d2caf6c6df516196a8d17689f)

[Example Testnet collateral payment transaction](https://testnet-insight.dashevo.org/insight/tx/de51e6f7c5ef75aad0dbb0a808ef4873d7ef6d67b25f3a658d5a241db4f3eeeb)
[Example Testnet collateral payment transaction](https://insight.testnet.networks.dash.org:3002/insight/tx/de51e6f7c5ef75aad0dbb0a808ef4873d7ef6d67b25f3a658d5a241db4f3eeeb)

## CoinJoin Processing

Expand Down
4 changes: 2 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ dashcore/wallet-configuration-file
:hidden:
resources/glossary
Mainnet Block Explorer <https://insight.dashevo.org/insight/>
Testnet Block Explorer <https://testnet-insight.dashevo.org/insight/>
Mainnet Block Explorer <https://insight.dash.org/insight/>
Testnet Block Explorer <https://insight.testnet.networks.dash.org:3002/insight/>
Testnet Faucet <http://faucet.testnet.networks.dash.org/>
API Services <https://www.dash.org/providers-and-tools/#custody-and-api>
SDK Resources <https://docs.dash.org/en/stable/docs/user/developers/integration-sdks.html>
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Babel==2.12.1
myst-parser==2.0.0
pydata-sphinx-theme==0.14.4
sphinx==7.2.6
sphinxcontrib-googleanalytics==0.4
sphinx-copybutton==0.5.2
sphinx-hoverxref==1.3.0
sphinx-multiproject==1.0.0rc1
Expand Down

0 comments on commit ca00712

Please sign in to comment.