Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions _includes/layout/base/helper-step-4.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ <h2 id="wizardFeaturesTitle" class="helper-title">{% translate wizard-feature-ti
<p class="helper-checkbox-description">{% translate wizard-feature-bech32-description choose-your-wallet %}</p>
</div>
</label>
<label class="checkbox-wrapper helper-checkbox-wrapper">
<input type="checkbox" name="features" value="taproot" class="checkbox js-helper-checkbox js-wizard-selector js-selector" />
<div class="checkbox-text helper-checkbox-text">
<p class="helper-checkbox-title">{% translate wizard-feature-taproot choose-your-wallet %}</p>
<p class="disabled-checkbox-text"><span>{% translate helper-note choose-your-wallet %}:</span> {% translate helper-feature-unavailable choose-your-wallet %}</p>
<p class="helper-checkbox-description">{% translate wizard-feature-taproot-description choose-your-wallet %}</p>
</div>
</label>
<label class="checkbox-wrapper helper-checkbox-wrapper">
<input type="checkbox" name="features" value="full_node" class="checkbox js-helper-checkbox js-wizard-selector js-selector" />
<div class="checkbox-text helper-checkbox-text">
Expand Down
17 changes: 17 additions & 0 deletions _includes/layout/base/wallets-selector.html
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,23 @@ <h3 id="sidebarFeaturesSelectorTitle" class="sidebar-selector-title">{% translat
</div>
</div>

</div>
<div class="important-checkbox-row">
<label class="checkbox-wrapper">
<input type="checkbox" name="features" value="taproot" class="checkbox js-wallet-selector js-selector" />
<div class="checkbox-text">{% translate wizard-feature-taproot choose-your-wallet %}</div>
</label>

<div class="sidebar-selector-info">
<p class="sidebar-selector-info-text">Not available</p>
<div class="tooltip-trigger">
<img src="/img/icons/info-alt.svg" alt="info">
<div class="wallet-selector-tooltip tooltip">
{% translate wizard-feature-taproot-description choose-your-wallet %}
</div>
</div>
</div>

</div>
<div class="important-checkbox-row">
<label class="checkbox-wrapper">
Expand Down
4 changes: 3 additions & 1 deletion _translations/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,9 @@ en:
wizard-feature-2fa: "2FA"
wizard-feature-2fa-description: "Two-factor authentication (2FA) is a way to add additional security to your wallet. The first 'factor' is your password for your wallet. The second 'factor' is a verification code retrieved via text message or from an app on a mobile device. 2FA is conceptually similar to a security token device that banks in some countries require for online banking. It likely requires relying on the availability of a third party to provide the service."
wizard-feature-bech32: "Bech32"
wizard-feature-bech32-description: "Bech32 is a special address format made possible by SegWit (see the feature description for SegWit for more info). This address format is also known as 'bc1 addresses'. Some bitcoin wallets and services do not yet support sending or receiving to Bech32 addresses."
wizard-feature-bech32-description: "Bech32 is a special address format made possible by SegWit (see the feature description for SegWit for more info). This address format is also known as 'bc1 addresses'. Some Bitcoin wallets and services do not yet support sending or receiving to Bech32 addresses."
wizard-feature-taproot: "Taproot"
wizard-feature-taproot-description: "Some wallets support Taproot, which can increase privacy and use block chain space more efficiently for complex transactions such as multisig. Some Bitcoin wallets and services do not yet support sending or receiving to the Bech32m addresses (which begin with 'bc1p') which Taproot uses."
wizard-feature-full_node: "Full Node"
wizard-feature-full_node-description: "Some wallets fully validate transactions and blocks. Almost all full nodes help the network by accepting transactions and blocks from other full nodes, validating those transactions and blocks, and then relaying them to further full nodes."
wizard-feature-hardware_wallet: "Hardware Wallet"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/bitbox.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ platform:
link: "https://bitbox.swiss/bitbox02/"
source: "https://github.com/BitBoxSwiss/bitbox02-firmware"
screenshot: "bitbox02.png"
features: "bech32 hardware_wallet legacy_addresses multisig segwit"
features: "bech32 hardware_wallet legacy_addresses multisig segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkneutralvalidationvariable"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/bitcoincore.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ platform:
link: "bitcoincore"
source: "https://github.com/bitcoin/bitcoin"
screenshot: "bitcoincore.png"
features: "bech32 full_node hardware_wallet legacy_addresses multisig segwit"
features: "bech32 full_node hardware_wallet legacy_addresses multisig segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkgoodvalidationfullnode"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/bitcoinknots.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ platform:
link: "https://bitcoinknots.org/"
source: "https://github.com/bitcoinknots/bitcoin/"
screenshot: "bitcoinknots.png"
features: "bech32 full_node legacy_addresses segwit"
features: "bech32 full_node legacy_addresses segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkgoodvalidationfullnode"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/bitcoinsafe.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ platform:
link: "https://bitcoin-safe.org/"
source: "https://github.com/andreasgriffin/bitcoin-safe/"
screenshot: "bitcoinsafe.png"
features: "bech32 hardware_wallet multisig segwit"
features: "bech32 hardware_wallet multisig segwit taproot"
check: &DEFAULT-CHECK
control: "checkgoodcontrolfull"
validation: "checkfailvalidationcentralized"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/cypherockx1.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ platform:
link: "https://www.cypherock.com/"
source: "https://github.com/Cypherock/x1_wallet_firmware"
screenshot: "cypherockx1.png"
features: "bech32 hardware_wallet legacy_addresses segwit"
features: "bech32 hardware_wallet legacy_addresses segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkneutralvalidationvariable"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/ginger.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ platform:
link: "https://gingerwallet.io/"
source: "https://github.com/GingerPrivacy/GingerWallet"
screenshot: "ginger.png"
features: "2fa bech32 hardware_wallet segwit"
features: "2fa bech32 hardware_wallet segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkfailvalidationcentralized"
Expand Down
6 changes: 3 additions & 3 deletions _wallets/green.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ platform:
link: "https://play.google.com/store/apps/details?id=com.greenaddress.greenbits_android_wallet"
source: "https://github.com/Blockstream/green_android/"
screenshot: "greenandroid.png"
features: "2fa bech32 hardware_wallet legacy_addresses segwit"
features: "2fa bech32 hardware_wallet legacy_addresses segwit taproot"
check:
control: "checkgoodcontrolfull" # full control for singlesig accounts, eventual full control for 2of2_csv decaying into singlesig after 12 months for 2FA multisig accounts, full control for 2of3 2FA multisig accounts
validation: "checkfailvalidationcentralized" # txs can be SPV validated (a la electrum) using the default electrum_url, and if a custom electrum server is set then it gets used for SPV validation
Expand All @@ -33,7 +33,7 @@ platform:
link: "https://apps.apple.com/us/app/green-bitcoin-wallet/id1402243590"
source: "https://github.com/Blockstream/green_ios/"
screenshot: "greenios.png"
features: "2fa bech32 hardware_wallet legacy_addresses segwit"
features: "2fa bech32 hardware_wallet legacy_addresses segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkfailvalidationcentralized"
Expand All @@ -52,7 +52,7 @@ platform:
link: "https://blockstream.com/green"
source: "https://github.com/Blockstream/green_qt/"
screenshot: "greendesktop.png"
features: "2fa bech32 hardware_wallet legacy_addresses segwit"
features: "2fa bech32 hardware_wallet legacy_addresses segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkfailvalidationcentralized"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/jade.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ platform:
link: "https://blockstream.com/jade/"
source: "https://github.com/Blockstream/Jade"
screenshot: "jade.png"
features: "bech32 hardware_wallet legacy_addresses multisig segwit"
features: "bech32 hardware_wallet legacy_addresses multisig segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkneutralvalidationvariable"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/krux.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ platform:
link: "https://selfcustody.github.io/krux/"
source: "https://github.com/selfcustody/krux"
screenshot: "krux.png"
features: "bech32 hardware_wallet legacy_addresses multisig segwit"
features: "bech32 hardware_wallet legacy_addresses multisig segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkneutralvalidationvariable"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/ledgernanos.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ platform:
link: "https://www.ledgerwallet.com/"
source: "https://github.com/LedgerHQ/nanos-nonsecure-firmware-releases"
screenshot: "ledgernanos.png"
features: "bech32 hardware_wallet legacy_addresses multisig segwit"
features: "bech32 hardware_wallet legacy_addresses multisig segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkneutralvalidationvariable"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/mycelium.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ platform:
link: "https://play.google.com/store/apps/details?id=com.mycelium.wallet"
source: "https://github.com/mycelium-com/wallet"
screenshot: "mycelium.png"
features: "bech32 hardware_wallet legacy_addresses segwit"
features: "bech32 hardware_wallet legacy_addresses segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkfailvalidationcentralized"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/onekeyclassic1s.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ platform:
link: "https://onekey.so/"
source: "https://github.com/OneKeyHQ/firmware-classic1s"
screenshot: "onekeyclassic1s.png"
features: "bech32 hardware_wallet legacy_addresses multisig segwit"
features: "bech32 hardware_wallet legacy_addresses multisig segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkneutralvalidationvariable"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/passport.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ platform:
link: "https://foundationdevices.com/passport/"
source: "https://github.com/Foundation-Devices/passport2"
screenshot: "passport.png"
features: "bech32 hardware_wallet legacy_addresses multisig segwit"
features: "bech32 hardware_wallet legacy_addresses multisig segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkneutralvalidationvariable"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/seedsigner.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ platform:
link: "https://seedsigner.com/hardware/"
source: "https://github.com/SeedSigner/seedsigner"
screenshot: "seedsigner.png"
features: "bech32 hardware_wallet legacy_addresses multisig segwit"
features: "bech32 hardware_wallet legacy_addresses multisig segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkneutralvalidationvariable"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/sparrow.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ platform:
link: "https://sparrowwallet.com/"
source: "https://github.com/sparrowwallet/sparrow/"
screenshot: "sparrow.png"
features: "bech32 hardware_wallet legacy_addresses multisig segwit"
features: "bech32 hardware_wallet legacy_addresses multisig segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkpassvalidationservers"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/specterdesktop.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ platform:
link: "https://specter.solutions/"
source: "https://github.com/cryptoadvance/specter-desktop"
screenshot: "specterdesktop.png"
features: "bech32 full_node hardware_wallet multisig segwit"
features: "bech32 full_node hardware_wallet multisig segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkgoodvalidationfullnode"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/trezormodelt.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ platform:
link: "https://trezor.io/"
source: "https://github.com/trezor/trezor-firmware"
screenshot: "trezormodelt.png"
features: "bech32 hardware_wallet legacy_addresses multisig segwit"
features: "bech32 hardware_wallet legacy_addresses multisig segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkneutralvalidationvariable"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/trezorone.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ platform:
link: "https://trezor.io/"
source: "https://github.com/trezor/trezor-firmware"
screenshot: "trezorone.png"
features: "bech32 hardware_wallet legacy_addresses multisig segwit"
features: "bech32 hardware_wallet legacy_addresses multisig segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkneutralvalidationvariable"
Expand Down
4 changes: 2 additions & 2 deletions _wallets/unstoppable.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ platform:
link: "https://apps.apple.com/app/bank-bitcoin-wallet/id1447619907?ls=1"
source: "https://github.com/horizontalsystems/unstoppable-wallet-ios"
screenshot: "unstoppable_ios.png"
features: "bech32 legacy_addresses segwit"
features: "bech32 legacy_addresses segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkpassvalidationspvp2p"
Expand All @@ -34,7 +34,7 @@ platform:
link: "https://play.google.com/store/apps/details?id=io.horizontalsystems.bankwallet"
source: "https://github.com/horizontalsystems/unstoppable-wallet-android"
screenshot: "unstoppable_android.png"
features: "bech32 legacy_addresses segwit"
features: "bech32 legacy_addresses segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkpassvalidationspvp2p"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/wasabi.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ platform:
link: "https://wasabiwallet.io/"
source: "https://github.com/WalletWasabi/WalletWasabi/"
screenshot: "wasabi.png"
features: "bech32 hardware_wallet segwit"
features: "bech32 hardware_wallet segwit taproot"
check:
control: "checkgoodcontrolfull"
validation: "checkfailvalidationcentralized"
Expand Down
11 changes: 10 additions & 1 deletion docs/managing-wallets.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ following features are available for assignment:
* lightning
* multisig
* segwit
* taproot

To determine whether a wallet supports a feature, we've described each one
below:
Expand All @@ -112,7 +113,7 @@ below:

* bech32: Bech32 is a special address format made possible by SegWit (see the
feature description for SegWit for more info). This address format is also
known as 'bc1 addresses'. Some bitcoin wallets and services do not yet support
known as 'bc1 addresses'. Some Bitcoin wallets and services do not yet support
sending or receiving to Bech32 addresses.

- To qualify for supporting this feature, the wallet must be able to send and receive Bech32 format addresses. Bech32 does not need to be the default receive address format, but it should be easy and obvious for users to generate a Bech32 format receive address.
Expand Down Expand Up @@ -160,6 +161,14 @@ below:

- To qualify for supporting this feature, the wallet must be able to receive SegWit transactions (with either Bech32 format or legacy format addresses).

* taproot: Taproot is a 2021 protocol upgrade that improves Bitcoin's privacy,
efficiency, and scripting flexibility, introducing Schnorr signatures. Taproot
uses the bech32m address format, also known as 'bc1p addresses'. Some
Bitcoin wallets and services do not yet support sending or receiving to Taproot
addresses.

- To qualify for supporting this feature, the wallet must be able to send and receive Bech32m (bc1p) format addresses. This does not need to be the default receive address format, but it should be easy and obvious for users to generate a Bech32m format receive address.

Assignment of the features are done below the `screenshot` field and assigning
multiple features can be done like so, for example:

Expand Down