* Update docs to show support for Nano X (#12647)
(cherry picked from commit 0ef3cac1f8)
# Conflicts:
# docs/src/wallet-guide/ledger-live.md
* Fix merge conflict
Co-authored-by: Dan Albert <dan@solana.com>
Co-authored-by: publish-docs.sh <maintainers@solana.com>
This commit is contained in:
mergify[bot]
GitHub
@ -66,12 +66,12 @@ description is below.
|
||||
#### Supported Wallets
|
||||
Staking operations are supported by the following wallet solutions:
|
||||
|
||||
- SolFlare.com in conjunction with a keystore file or a Ledger Nano S. Check
|
||||
out our [guide to using SolFlare](wallet-guide/solflare.md) for details.
|
||||
- SolFlare.com in conjunction with a keystore file or a Ledger Nano.
|
||||
Check out our [guide to using SolFlare](wallet-guide/solflare.md) for details.
|
||||
|
||||
- Solana command line tools can perform all stake operations in conjunction
|
||||
with a CLI-generated keypair file wallet, a paper wallet, or with a connected
|
||||
Ledger Nano S.
|
||||
Ledger Nano.
|
||||
[Staking commands using the Solana Command Line Tools](cli/delegate-stake.md).
|
||||
|
||||
#### Create a Stake Account
|
||||
|
||||
@ -19,7 +19,7 @@ hardware wallet.
|
||||
|
||||
The Solana CLI supports the following hardware wallets:
|
||||
|
||||
- [Ledger Nano S](hardware-wallets/ledger.md)
|
||||
- [Ledger Nano S and Ledger Nano X](hardware-wallets/ledger.md)
|
||||
|
||||
## Specify a Keypair URL
|
||||
|
||||
|
||||
@ -2,22 +2,21 @@
|
||||
title: Ledger Nano
|
||||
---
|
||||
|
||||
The Ledger Nano S hardware wallet offers secure storage of your Solana private
|
||||
keys. The Solana Ledger app enables derivation of essentially infinite keys, and
|
||||
secure transaction signing.
|
||||
This page describes how to use a Ledger Nano S or Nano X to interact with Solana
|
||||
using the command line tools. To see other solutions to interact with Solana with
|
||||
your Nano, [click here](../ledger-live.md#interact-with-the-solana-network).
|
||||
|
||||
## Before You Begin
|
||||
|
||||
- [Set up a Ledger Nano S with the Solana App](../ledger-live.md)
|
||||
- [Set up a Nano with the Solana App](../ledger-live.md)
|
||||
- [Install the Solana command-line tools](../../cli/install-solana-cli-tools.md)
|
||||
|
||||
## Use Ledger Nano S with Solana CLI
|
||||
## Use Ledger Nano with Solana CLI
|
||||
|
||||
1. Ensure the Ledger Live application is closed
|
||||
2. Plug your Ledger device into your computer's USB port
|
||||
3. Enter your pin and start the Solana app on the Ledger device
|
||||
4. Press both buttons to advance past the "Pending Ledger review" screen
|
||||
5. Ensure the screen reads "Application is ready"
|
||||
2. Plug your Nano into your computer's USB port
|
||||
3. Enter your pin and start the Solana app on the Nano
|
||||
4. Ensure the screen reads "Application is ready"
|
||||
|
||||
### View your Wallet ID
|
||||
|
||||
@ -29,16 +28,16 @@ solana-keygen pubkey usb://ledger
|
||||
|
||||
This confirms your Ledger device is connected properly and in the correct state
|
||||
to interact with the Solana CLI. The command returns your Ledger's unique
|
||||
_wallet ID_. When you have multiple Nano S devices connected to the same
|
||||
_wallet ID_. When you have multiple Nano devices connected to the same
|
||||
computer, you can use your wallet ID to specify which Ledger hardware wallet
|
||||
you want to use. If you only plan to use a single Nano S on your computer
|
||||
you want to use. If you only plan to use a single Nano on your computer
|
||||
at a time, you don't need to include the wallet ID. For information on
|
||||
using the wallet ID to use a specific Ledger, see
|
||||
[Manage Multiple Hardware Wallets](#manage-multiple-hardware-wallets).
|
||||
|
||||
### View your Wallet Addresses
|
||||
|
||||
Your Nano S supports an arbitrary number of valid wallet addresses and signers.
|
||||
Your Nano supports an arbitrary number of valid wallet addresses and signers.
|
||||
To view any address, use the `solana-keygen pubkey` command, as shown below,
|
||||
followed by a valid [keypair URL](../hardware-wallets.md#specify-a-keypair-url).
|
||||
|
||||
@ -59,7 +58,7 @@ solana-keygen pubkey usb://ledger?key=2
|
||||
You can use other values for the number after `key=` as well.
|
||||
Any of the addresses displayed by these commands are valid Solana wallet
|
||||
addresses. The private portion associated with each address is stored securely
|
||||
on the Nano S device, and is used to sign transactions from this address.
|
||||
on the Nano, and is used to sign transactions from this address.
|
||||
Just make a note of which keypair URL you used to derive any address you will be
|
||||
using to receive tokens.
|
||||
|
||||
@ -100,11 +99,11 @@ Ledger, will show as "Not Found" in the explorer. Empty accounts and non-existen
|
||||
accounts are treated the same in Solana. This will change when your account
|
||||
address has some SOL in it.
|
||||
|
||||
### Send SOL from a Ledger Nano S
|
||||
### Send SOL from a Nano
|
||||
|
||||
To send some tokens from an address controlled by your Nano S device, you will
|
||||
To send some tokens from an address controlled by your Nano, you will
|
||||
need to use the device to sign a transaction, using the same keypair URL you
|
||||
used to derive the address. To do this, make sure your Nano S is plugged in,
|
||||
used to derive the address. To do this, make sure your Nano is plugged in,
|
||||
unlocked with the PIN, Ledger Live is not running, and the Solana App is open
|
||||
on the device, showing "Application is Ready".
|
||||
|
||||
@ -160,7 +159,7 @@ choose which wallet to use for each signature.
|
||||
|
||||
Instead of using the interactive prompts, you can generate fully qualified
|
||||
URLs using the Solana CLI `resolve-signer` command. For example, try
|
||||
connecting a Ledger Nano-S to USB, unlock it with your pin, and running the
|
||||
connecting a Nano to USB, unlock it with your pin, and running the
|
||||
following command:
|
||||
|
||||
```text
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
---
|
||||
title: Ledger Nano S and Nano X
|
||||
title: Set up a Ledger Nano S or Nano X
|
||||
---
|
||||
|
||||
This document describes how to set up a
|
||||
|
||||
@ -13,7 +13,7 @@ SolFlare also supports staking of SOL tokens.
|
||||
As a _non-custodial_ wallet, your private keys are not stored by the SolFlare
|
||||
site itself, but rather they are stored in an encrypted
|
||||
[Keystore File](#using-a-keystore-file) or on a
|
||||
[Ledger Nano S hardware wallet](#using-a-ledger-nano-s-hardware-wallet).
|
||||
[Ledger Nano S or X hardware wallet](#using-a-ledger-nano-hardware-wallet).
|
||||
|
||||
This guide describes how to set up a wallet using SolFlare, how to send and
|
||||
receive SOL tokens, and how to create and manage a stake account.
|
||||
@ -22,7 +22,7 @@ receive SOL tokens, and how to create and manage a stake account.
|
||||
|
||||
Go to https://www.solflare.com in a supported browser. Most popular web browsers
|
||||
should work when interacting with a Keystore File, but currently only
|
||||
Chrome and Brave are supported when interacting with a Ledger Nano S.
|
||||
Chrome and Brave are supported when interacting with a Ledger Nano.
|
||||
|
||||
### Using a Keystore File
|
||||
|
||||
@ -48,21 +48,23 @@ Keystore file, you will be taken to the Access page directly.
|
||||
You will be prompted to enter the password and upload your Keystore file,
|
||||
then you will be taken to the wallet interface main page.
|
||||
|
||||
### Using a Ledger Nano S hardware wallet
|
||||
### Using a Ledger Nano hardware wallet
|
||||
|
||||
*NOTE: Please see [known issues](ledger-live.md#known-issues) for any current
|
||||
limitations in using the Nano.*
|
||||
|
||||
#### Initial Device Setup
|
||||
To use a Ledger Nano S with SolFlare, first ensure you have
|
||||
[set up your Nano S](ledger-live.md) and have [installed the latest version of
|
||||
To use a Ledger Nano with SolFlare, first ensure you have
|
||||
[set up your Nano](ledger-live.md) and have [installed the latest version of
|
||||
the Solana app](ledger-live.md#upgrade-to-the-latest-version-of-the-solana-app)
|
||||
on your device.
|
||||
|
||||
#### Select a Ledger address to access
|
||||
Plug in your Nano S and open the Solana app. Acknowledge a message of "Pending
|
||||
Ledger Review" by tapping both buttons at once so the device screen displays
|
||||
Plug in your Nano and open the Solana app so the device screen displays
|
||||
"Application is Ready".
|
||||
|
||||
From the SolFlare home page, click "Access a Wallet" then select "Using Ledger
|
||||
Nano S". Under "Select derivation path", select the only option:
|
||||
Nano S | Ledger Nano X". Under "Select derivation path", select the only option:
|
||||
|
||||
```Solana - 44`/501`/```
|
||||
|
||||
@ -174,10 +176,10 @@ it will be accepted by the network.
|
||||
If you accessed your wallet using a Keystore file, you will be prompted to enter
|
||||
your password any time the key is needed to sign a transaction.
|
||||
|
||||
### Using a Ledger Nano S
|
||||
If you accessed your wallet with a Ledger Nano S, you will be prompted to confirm
|
||||
the pending transaction details on your device whenever the key is needed to sign.
|
||||
On the Nano S, use the left and right buttons to view and confirm all of the
|
||||
### Using a Ledger Nano
|
||||
If you accessed your wallet with a Ledger Nano, you will be prompted to
|
||||
confirm the pending transaction details on your device whenever the key is needed
|
||||
to sign. On the Nano, use the left and right buttons to view and confirm all of the
|
||||
transaction details. If everything looks correct, keep clicking the right button
|
||||
until the screen shows "Approve". Click both buttons to approve the transaction.
|
||||
If something looks incorrect, press the right button once more so the screen shows
|
||||
|
||||
Reference in New Issue
Block a user