automerge
This commit is contained in:
@ -1,13 +1,15 @@
|
|||||||
# Table of contents
|
# Table of contents
|
||||||
|
|
||||||
* [Introduction](introduction.md)
|
* [Introduction](introduction.md)
|
||||||
* [Install the Solana Tool Suite](install-solana.md)
|
* [Wallet Guide](wallet/README.md)
|
||||||
* [Command-line Guide](cli/README.md)
|
* [App Wallets](wallet/app-wallets.md)
|
||||||
* [Choose a Wallet](cli/choose-a-wallet.md)
|
* [Command-line Wallets](wallet/cli-wallets.md)
|
||||||
* [Hardware Wallets](remote-wallet/README.md)
|
* [Hardware Wallets](remote-wallet/README.md)
|
||||||
* [Ledger Hardware Wallet](remote-wallet/ledger.md)
|
* [Ledger Hardware Wallet](remote-wallet/ledger.md)
|
||||||
* [Paper Wallet](paper-wallet/README.md)
|
* [Paper Wallet](paper-wallet/README.md)
|
||||||
* [Paper Wallet Usage](paper-wallet/usage.md)
|
* [Paper Wallet Usage](paper-wallet/usage.md)
|
||||||
|
* [Command Line Guide](cli/README.md)
|
||||||
|
* [Install the Solana Command Line Tool Suite](cli/install-solana-cli-tools.md)
|
||||||
* [Generate Keys](cli/generate-keys.md)
|
* [Generate Keys](cli/generate-keys.md)
|
||||||
* [Send and Receive Tokens](cli/transfer-tokens.md)
|
* [Send and Receive Tokens](cli/transfer-tokens.md)
|
||||||
* [Delegate Stake](cli/delegate-stake.md)
|
* [Delegate Stake](cli/delegate-stake.md)
|
||||||
|
@ -4,8 +4,8 @@ In this section, we will generate a keypair, query it for its public key,
|
|||||||
and verify you control its private key. Before you begin, you will need
|
and verify you control its private key. Before you begin, you will need
|
||||||
to:
|
to:
|
||||||
|
|
||||||
* [Install the Solana Tool Suite](../install-solana.md)
|
* [Install the Solana Tool Suite](install-solana-cli-tools.md)
|
||||||
* [Choose a wallet](choose-a-wallet.md)
|
* [Choose a wallet](cli-wallets.md)
|
||||||
|
|
||||||
## Generate an FS Wallet Keypair
|
## Generate an FS Wallet Keypair
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ To receive tokens, you will need an address for others to send tokens to. In
|
|||||||
Solana, an address is the public key of a keypair. There are a variety
|
Solana, an address is the public key of a keypair. There are a variety
|
||||||
of techniques for generating keypairs. The method you choose will depend on how
|
of techniques for generating keypairs. The method you choose will depend on how
|
||||||
you choose to store keypairs. Keypairs are stored in wallets. Before receiving
|
you choose to store keypairs. Keypairs are stored in wallets. Before receiving
|
||||||
tokens, you will need to [choose a wallet](choose-a-wallet.md) and
|
tokens, you will need to [choose a wallet](cli-wallets.md) and
|
||||||
[generate keys](generate-keys.md). Once completed, you should have a public key
|
[generate keys](generate-keys.md). Once completed, you should have a public key
|
||||||
for each keypair you generated. The public key is a long string of base58
|
for each keypair you generated. The public key is a long string of base58
|
||||||
characters. Its length varies from 32 to 44 characters.
|
characters. Its length varies from 32 to 44 characters.
|
||||||
|
@ -12,7 +12,7 @@ protect against this scenario.
|
|||||||
|
|
||||||
## Before You Begin
|
## Before You Begin
|
||||||
|
|
||||||
- [Install the Solana command-line tools](../install-solana.md)
|
- [Install the Solana command-line tools](../cli/install-solana-cli-tools.md)
|
||||||
|
|
||||||
### Check your installation
|
### Check your installation
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ secure transaction signing.
|
|||||||
|
|
||||||
## Before You Begin
|
## Before You Begin
|
||||||
|
|
||||||
- [Install the Solana command-line tools](../install-solana.md)
|
- [Install the Solana command-line tools](../cli/install-solana-cli-tools.md)
|
||||||
- [Initialize your Ledger Nano S](https://support.ledger.com/hc/en-us/articles/360000613793)
|
- [Initialize your Ledger Nano S](https://support.ledger.com/hc/en-us/articles/360000613793)
|
||||||
- [Install the latest device firmware](https://support.ledgerwallet.com/hc/en-us/articles/360002731113-Update-Ledger-Nano-S-firmware)
|
- [Install the latest device firmware](https://support.ledgerwallet.com/hc/en-us/articles/360002731113-Update-Ledger-Nano-S-firmware)
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ Here are our recommendations for low, medium, and high end machine specification
|
|||||||
## Software
|
## Software
|
||||||
|
|
||||||
* We build and run on Ubuntu 18.04. Some users have had trouble when running on Ubuntu 16.04
|
* We build and run on Ubuntu 18.04. Some users have had trouble when running on Ubuntu 16.04
|
||||||
* See [Installing Solana](../install-solana.md) for the current Solana software release.
|
* See [Installing Solana](../cli/install-solana-cli-tools.md) for the current Solana software release.
|
||||||
|
|
||||||
Be sure to ensure that the machine used is not behind a residential NAT to avoid
|
Be sure to ensure that the machine used is not behind a residential NAT to avoid
|
||||||
NAT traversal issues. A cloud-hosted machine works best. **Ensure that IP ports 8000 through 10000 are not blocked for Internet inbound and outbound traffic.**
|
NAT traversal issues. A cloud-hosted machine works best. **Ensure that IP ports 8000 through 10000 are not blocked for Internet inbound and outbound traffic.**
|
||||||
|
4
docs/src/wallet/README.md
Normal file
4
docs/src/wallet/README.md
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
# Solana Wallet
|
||||||
|
This document describes the different wallet options that are available to users
|
||||||
|
of Solana who want to be able to send, receive and interact with
|
||||||
|
SOL tokens on the Solana blockchain.
|
1
docs/src/wallet/app-wallets.md
Normal file
1
docs/src/wallet/app-wallets.md
Normal file
@ -0,0 +1 @@
|
|||||||
|
Documentation of supported for App Wallets coming soon!
|
@ -1,11 +1,13 @@
|
|||||||
# Choose a Wallet
|
# Command Line Wallets
|
||||||
|
|
||||||
Keypairs are stored in *wallets* and wallets come in many forms. A wallet might
|
Solana supports several different types of wallets that can be used to interface
|
||||||
be a directory in your computer's file system, a piece of paper, or a
|
directly with the Solana command-line tools.
|
||||||
specialized device called a *hardware wallet*. Some wallets are easier to use
|
|
||||||
than others. Some are more secure than others. In this section, we will compare
|
**If you are unfamiliar with using command line programs and just want to be able
|
||||||
and contrast different types of wallets and help you choose the wallet that
|
to send and receive SOL tokens, we recommend setting up a third-party
|
||||||
best fits your needs.
|
[Web Wallet](app-wallets.md)**.
|
||||||
|
|
||||||
|
To use a Command Line Wallet, you must first [install the Solana CLI tools](../cli/install-solana-cli-tools.md)
|
||||||
|
|
||||||
## File System Wallet
|
## File System Wallet
|
||||||
|
|
Reference in New Issue
Block a user