Improve descriptors docs with a comparison to Core

diff --git a/content/descriptors/_index.md b/content/descriptors/_index.md
index d92f5ef6949af03f1c91edd35510d77a7524a261..1c1555a6c8965252812ba378abc67bc4067f7ee7 100644 (file)
--- a/content/descriptors/_index.md
+++ b/content/descriptors/_index.md
@@ -6,23 +6,96 @@ weight: 5
 pre: '<i class="fas fa-code"></i> '
 ---
 
-Magical Bitcoin extends the capabilities of [rust-miniscript](https://github.com/apoelstra/rust-miniscript) by introducing the concept of an *ExtendedDescriptor*: it represents a descriptor that contains one or more "derivable keys" like `xpubs` or `xprvs`
-and can be "derived" to a normal Descriptor by deriving every single one of its keys. It is currently called "StringDescriptor" in the code, because it's implemented as a wrapped `miniscript::Descriptor<String>`.
+Descriptors are a compact and semi-standard way to easily encode, or "describe", how scripts (and subsequently, addresses) of a wallet should be generated. They can be especially helpful when working with multisigs or even
+more complex scripts, where the structure of the script itself is not trivial. They are a big step forward in making wallets more portable across different tools and apps, because for the first time they create a common
+language to describe a full bitcoin script that developers can use and integrate in their software.
 
-ExtendedDescriptors are derived using a single index instead of a full derivation path: this is because normally most of the path is fixed and can be represented right after the xpub/xprv itself, and only the
-final index changes for each address. This is what's normally called a *DescriptorExtendedKey* in codebase, and it's the represented with a similar syntax to Bitcoin Core's, such as:
+The ecosystem around descriptors is still very much in its early stage, but they are starting to see some adoption in [Bitcoin Core](https://github.com/bitcoin/bitcoin/blob/master/doc/descriptors.md) and other projects. Magical Bitcoin
+aims to produce the first "Native Descriptor" Bitcoin library that can be used by developers to build their own ["Native Descriptor Wallets"](https://www.youtube.com/watch?v=xC25NzIjzog).
 
-```
-[d34db33f/44'/0'/0']xpub6ERApfZwUNrhL.......rBGRjaDMzQLcgJvLJuZZvRcEL/0/*
-```
+### Compatibility Matrix
+
+Below are some tables to highlight the differences between Bitcoin Core's descriptor support, rust-miniscript's one and Magical Bitcoin's.
+
+#### Key Types
+
+<div class="descriptor-support-table">
 
-For more details regarding this syntax, see [this document](https://github.com/bitcoin/bitcoin/blob/master/doc/descriptors.md). On top of this, ExtendedDescriptors also support other formats for public and private keys,
-like WIF and raw hexadecimal representation.
+| Key Type | Magical Bitcoin | rust-miniscript | Bitcoin Core |
+| -------- | --------------- | --------------- | ------------ |
+| Hex PublicKey | ✓ | ✓ | ✓ |
+| WIF PrivateKey | ✓ | ✗ | ✓ |
+| Extended Keys (xpub/xprv) | ✓ | ✗ | ✓ |
 
-Speaking of syntax, the general descriptor operators syntax is a bit different from what Core uses: the `multi()`/`sortedmulti()` are not available, and they are replaced by `thresh_m()`. Also the `combo()` operator is not
-available, and doesn't currently have any replacement. For more informations, see [this page](http://bitcoin.sipa.be/miniscript).
+</div>
+
+#### Script Types (top level)
+
+<div class="descriptor-support-table">
+
+| Script Type | Magical Bitcoin | rust-miniscript | Bitcoin Core |
+| -------- | --------------- | --------------- | ------------ |
+| `pk()` | ✓ | ✓ | ✓ |
+| `pkh()` | ✓ | ✓ | ✓ |
+| `wpkh()` | ✓ | ✓ | ✓ |
+| `sh(wpkh())` | ✓ | ✓ | ✓ |
+| `sh()` | ✓ | ✓ | ✓ |
+| `wsh()` | ✓ | ✓ | ✓ |
+| `sh(wsh())` | ✓ | ✓ | ✓ |
+| `combo()` | ✗  | ✗  | ✓ |
+| `addr()` | ✗  | ✗  | ✓ |
+| `raw()` | ✗  | ✗  | ✓ |
+| Bare scripts | ✓ | ✓ | ✗  |
+
+</div>
+
+#### Operators
+
+<div class="descriptor-support-table">
 
-Some examples of valid descriptors are:
+| Operator | Magical Bitcoin | rust-miniscript | Bitcoin Core |
+| -------- | --------------- | --------------- | ------------ |
+| `pk()` | ✓ | ✓ | ✓ |
+| `pk_h()` | ✓ | ✓ | ✓ - as `pkh()` |
+| `older()` | ✓ | ✓ | ✗  |
+| `after()` | ✓ | ✓ | ✗  |
+| `sha256()` | ✓ | ✓ | ✗  |
+| `hash256()` | ✓ | ✓ | ✗  |
+| `ripemd160()` | ✓ | ✓ | ✗  |
+| `hash160()` | ✓ | ✓ | ✗  |
+| `andor()` | ✓ | ✓ | ✗  |
+| `and_{v,b,n}()` | ✓ | ✓ | ✗  |
+| `or_{b,c,d,i}()` | ✓ | ✓ | ✗  |
+| `multi()` | ✓ | ✓ | ✓  |
+| `thresh()` | ✓ | ✓ | ✗  |
+| `sortedmulti()` | ✗ | ✗ | ✓  |
+
+</div>
+
+#### Modifiers
+
+<div class="descriptor-support-table">
+
+| Script Type | Magical Bitcoin | rust-miniscript | Bitcoin Core |
+| -------- | --------------- | --------------- | ------------ |
+| `a:` | ✓ | ✓ | ✗ |
+| `s:` | ✓ | ✓ | ✗ |
+| `c:` | ✓ | ✓ | ✗ |
+| `t:` | ✓ | ✓ | ✗ |
+| `d:` | ✓ | ✓ | ✗ |
+| `v:` | ✓ | ✓ | ✗ |
+| `j:` | ✓ | ✓ | ✗ |
+| `n:` | ✓ | ✓ | ✗ |
+| `l:` | ✓ | ✓ | ✗ |
+| `u:` | ✓ | ✓ | ✗ |
+
+</div>
+
+For a more thorough description of these operators and modifiers see [Sipa's Miniscript Page](http://bitcoin.sipa.be/miniscript/) and [Bitcoin Core's](https://github.com/bitcoin/bitcoin/blob/master/doc/descriptors.md).
+
+### Examples
+
+Some examples of valid Magical Bitcoin descriptors are:
 
 <div id="descriptor-examples-table">
 
@@ -30,7 +103,19 @@ Some examples of valid descriptors are:
 | --------------- | ---------- | --------- | --------- |
 | Static P2PKH    | `pkh(cSQPHDBwXGjVzWRqAHm6zfvQhaTuj1f2bFH58h55ghbjtFwvmeXR)` | mrkwtj5xpYQjHeJe5wsweNjVeTKkvR5fCr | mrkwtj5xpYQjHeJe5wsweNjVeTKkvR5fCr |
 | Static P2PKH, watch-only | `pkh(02e96fe52ef0e22d2f131dd425ce1893073a3c6ad20e8cac36726393dfb4856a4c)` | mrkwtj5xpYQjHeJe5wsweNjVeTKkvR5fCr | mrkwtj5xpYQjHeJe5wsweNjVeTKkvR5fCr |
-| P2WSH 2-of-2 with one private key | `wsh(thresh_m(2,tprv8ZgxMBicQKsPePmENhT9N9yiSfTtDoC1f39P7nNmgEyCB6Nm4Qiv1muq4CykB9jtnQg2VitBrWh8PJU8LHzoGMHTrS2VKBSgAz7Ssjf9S3P/0/*,tpubDBYDcH8P2PedrEN3HxWYJJJMZEdgnrqMsjeKpPNzwe7jmGwk5M3HRdSf5vudAXwrJPfUsfvUPFooKWmz79Lh111U51RNotagXiGNeJe3i6t/1/*))` | tb1qqsat6c82fvdy73rfzye8f7nwxcz3xny7t56azl73g95mt3tmzvgs9a8vjs | tb1q7sgx6gscgtau57jduend6a8l445ahpk3dt3u5zu58rx5qm27lhkqgfdjdr |
+| P2WSH 2-of-2 with one private key | `wsh(multi(2,tprv8ZgxMBicQKsPePmENhT9N9yiSfTtDoC1f39P7nNmgEyCB6Nm4Qiv1muq4CykB9jtnQg2VitBrWh8PJU8LHzoGMHTrS2VKBSgAz7Ssjf9S3P/0/*,tpubDBYDcH8P2PedrEN3HxWYJJJMZEdgnrqMsjeKpPNzwe7jmGwk5M3HRdSf5vudAXwrJPfUsfvUPFooKWmz79Lh111U51RNotagXiGNeJe3i6t/1/*))` | tb1qqsat6c82fvdy73rfzye8f7nwxcz3xny7t56azl73g95mt3tmzvgs9a8vjs | tb1q7sgx6gscgtau57jduend6a8l445ahpk3dt3u5zu58rx5qm27lhkqgfdjdr |
 | P2WSH-P2SH one key + 10 days timelock | `sh(wsh(and_v(vc:pk_h(tprv8ZgxMBicQKsPePmENhT9N9yiSfTtDoC1f39P7nNmgEyCB6Nm4Qiv1muq4CykB9jtnQg2VitBrWh8PJU8LHzoGMHTrS2VKBSgAz7Ssjf9S3P/0/*),older(1440))))` | 2Mtk2nyS98MCi2P7TkoBGLaJviBy956XxB1 | 2MuEStKzYhqb5HCFgHz9153tZsL5sVqV5xC |
 
 </div>
+
+### Implementation Details
+
+Magical Bitcoin extends the capabilities of [rust-miniscript](https://github.com/apoelstra/rust-miniscript) by introducing the concept of an *ExtendedDescriptor*: it represents a descriptor that contains one or more "derivable keys" like `xpubs` or `xprvs`
+and can be "derived" to a normal Descriptor by deriving every single one of its keys. It is currently called "StringDescriptor" in the code, because it's implemented as a wrapped `miniscript::Descriptor<String>`.
+
+ExtendedDescriptors are derived using a single index instead of a full derivation path: this is because normally most of the path is fixed and can be represented right after the xpub/xprv itself, and only the
+final index changes for each address. This is what's normally called a *DescriptorExtendedKey* in codebase, and it's the represented with a similar syntax to Bitcoin Core's, such as:
+
+```
+[d34db33f/44'/0'/0']xpub6ERApfZwUNrhL.......rBGRjaDMzQLcgJvLJuZZvRcEL/0/*
+```

diff --git a/static/css/style.css b/static/css/style.css
index 9f9f18e732f0d4087a7a3cdfc8981eb959c96fd9..a1fd8b0615956b88d399985496f93fa259b37345 100644 (file)
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -18,3 +18,7 @@
 #descriptor-examples-table > table > thead > tr > th:nth-child(2) {
     width: 45%;
 }
+
+.descriptor-support-table > table > thead > tr > th:nth-child(1) {
+    width: 25%;
+}