diff --git a/book/src/programs.md b/book/src/programs.md index fa596bb32..f4815163c 100644 --- a/book/src/programs.md +++ b/book/src/programs.md @@ -3,8 +3,8 @@ A client *app* interacts with a Solana cluster by sending it *transactions* with one or more *instructions*. The Solana *runtime* passes those instructions to user-contributed *programs*. An instruction might, for example, tell a -program to move *tokens* from one *account* to another or create an interactive -contract that governs how tokens are moved. Instructions are executed +program to move *lamports* from one *account* to another or create an interactive +contract that governs how lamports are moved. Instructions are executed atomically. If any instruction is invalid, any changes made within the transaction are discarded. diff --git a/book/src/runtime.md b/book/src/runtime.md index 8165d5122..e1fda8be0 100644 --- a/book/src/runtime.md +++ b/book/src/runtime.md @@ -18,7 +18,7 @@ transaction fails to commit. ### Account Structure -Accounts maintain a token balance and program-specific memory. +Accounts maintain a lamport balance and program-specific memory. # Transaction Engine @@ -33,7 +33,7 @@ memory is committed. The TVU runtime ensures that PoH verification occurs before the runtime processes any transactions. - + Runtime pipeline At the *execute* stage, the loaded accounts have no data dependencies, so all the @@ -67,7 +67,7 @@ userdata array and assign it to a Program. * `Assign` - Allows the user to assign an existing account to a program. -* `Move` - Moves tokens between accounts. +* `Move` - Moves lamports between accounts. ## Program State Security @@ -101,7 +101,7 @@ program, the Account's userdata is zero initialized. * Runtime guarantees that a program's code is the only code that can modify Account userdata that the Account is assigned to. -* Runtime guarantees that the program can only spend tokens that are in +* Runtime guarantees that the program can only spend lamports that are in accounts that are assigned to it. * Runtime guarantees the balances belonging to accounts are balanced before diff --git a/book/src/tictactoe.md b/book/src/tictactoe.md index dd95f0f5d..54d999b1e 100644 --- a/book/src/tictactoe.md +++ b/book/src/tictactoe.md @@ -23,13 +23,13 @@ Next, follow the steps in the git repository's [README](https://github.com/solana-labs/example-tictactoe/blob/master/README.md). -## Getting tokens to users +## Getting lamports to users You may have noticed you interacted with the Solana cluster without first -needing to acquire tokens to pay transaction fees. Under the hood, the web +needing to acquire lamports to pay transaction fees. Under the hood, the web app creates a new ephemeral identity and sends a request to an off-chain service for a signed transaction authorizing a user to start a new game. The service is called a *drone*. When the app sends the signed transaction -to the Solana cluster, the drone's tokens are spent to pay the transaction +to the Solana cluster, the drone's lamports are spent to pay the transaction fee and start the game. In a real world app, the drone might request the user -watch an ad or pass a CAPTCHA before signing over its tokens. +watch an ad or pass a CAPTCHA before signing over its lamports. diff --git a/book/src/wallet.md b/book/src/wallet.md index 422db217f..400761a69 100644 --- a/book/src/wallet.md +++ b/book/src/wallet.md @@ -14,7 +14,7 @@ $ solana-wallet address ``` -#### Airdrop Tokens +#### Airdrop Lamports ```sh // Command @@ -78,7 +78,7 @@ $ solana-wallet pay 123 \ #### Authorized Transfer -A third party must send a signature to unlock the tokens. +A third party must send a signature to unlock the lamports. ```sh // Command $ solana-wallet pay 123 \ @@ -188,7 +188,7 @@ OPTIONS: SUBCOMMANDS: address Get your public key - airdrop Request a batch of tokens + airdrop Request a batch of lamports balance Get your balance cancel Cancel a transfer confirm Confirm transaction by signature @@ -214,7 +214,7 @@ FLAGS: ```manpage solana-wallet-airdrop -Request a batch of tokens +Request a batch of lamports USAGE: solana-wallet airdrop @@ -224,7 +224,7 @@ FLAGS: -V, --version Prints version information ARGS: - The number of tokens to request + The number of lamports to request ``` ```manpage @@ -311,11 +311,11 @@ FLAGS: OPTIONS: --after A timestamp after which transaction will execute --require-timestamp-from Require timestamp from this third party - --require-signature-from ... Any third party signatures required to unlock the tokens + --require-signature-from ... Any third party signatures required to unlock the lamports ARGS: The pubkey of recipient - The number of tokens to send + The number of lamports to send ``` ```manpage