Merge branch 'main' into main

Fankouzu · May 21, 2024 · 38aa383 · 38aa383
2 parents 32ce866 + c9f6a36
commit 38aa383
Show file tree

Hide file tree

Showing 12 changed files with 311 additions and 154 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -0,0 +1,30 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+    - run: npm ci
+    - run: npm run deploy
diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts
@@ -37,10 +37,10 @@ function sidebarCLI(): DefaultTheme.SidebarItem[] {
       collapsed: false,
       items: [
         {
-          text: "connecting to a cluster",
+          text: "使用 Solana CLI 连接到集群",
           link: "/connecting-to-a-cluster",
         },
-        { text: "staking", link: "/staking" },
+        { text: "使用 Solana CLI 质押 SOL", link: "/staking" },
         { text: "使用 CLI 部署 Solana 程序", link: "/deploy-a-program" },
         { text: "Solana CLI 中的持久交易nonce", link: "/durable-nonce" },
         {
@@ -51,6 +51,14 @@ function sidebarCLI(): DefaultTheme.SidebarItem[] {
           text: "使用 Solana CLI 进行链下消息签名",
           link: "/sign-offchain-message",
         },
+        {
+          text: "使用本地集群进行开发",
+          link: "/test-validator",
+        },
+        {
+          text: "使用 Solana CLI 发送和接收代币",
+          link: "/transfer-tokens",
+        },
       ],
     },
   ];

diff --git a/docs/Account/Keypair.md b/docs/Account/Keypair.md
diff --git a/docs/Account/LuckyAccount.md b/docs/Account/LuckyAccount.md
diff --git a/docs/Account/Payer.md b/docs/Account/Payer.md
diff --git a/docs/CLI/connecting-to-a-cluster.md b/docs/CLI/connecting-to-a-cluster.md
@@ -0,0 +1,34 @@
+# 使用 Solana CLI 连接到集群
+
+## 配置命令行工具
+
+查看当前连接的集群
+
+```sh
+$ solana config get
+```
+
+使用solana config set命令来连接到特定的集群。设置后，任何未来的子命令将会发送/接收来自该集群的信息。
+
+例如，要连接到 Devnet 集群，请运行：
+
+```sh
+$ solana config set --url https://api.devnet.solana.com
+```
+
+## 确保版本匹配
+
+最好本地CLI版本大于或等于集群版本。
+
+要获取本地安装的 CLI 版本，请运行：
+
+```sh
+$ solana --version
+```
+
+要获取集群版本，请运行：
+
+```sh
+$ solana cluster-version
+```
+
diff --git a/docs/CLI/create-token.md b/docs/CLI/create-token.md
diff --git a/docs/CLI/spl.md b/docs/CLI/spl.md
diff --git a/docs/CLI/staking.md b/docs/CLI/staking.md
@@ -0,0 +1,144 @@
+# 使用 Solana CLI 质押 SOL
+
+接收到 SOL 后，你可以考虑将其用于委托给验证者。Stake 是我们在 stake 账户中称为的代币。Solana 通过委托给验证者的 stake 数量来权衡验证者的投票权，从而使这些验证者在确定区块链中下一个有效交易块时具有更多的影响力。Solana 然后定期生成新的 SOL 以奖励委托者和验证者。你委托的 stake 越多，就可以获得更多的奖励。
+
+## 创建质押账户
+
+
+如果您想委托质押, 您需要两步操作: 
+
+1. 您需要将一些token转入stake账户。 
+2. 要创建stake帐户，您将需要密钥对, 公钥将作为stake账户的地址。 这里不需要密码或加密；创建完之后, 这个密钥对就会被丢弃.
+
+#### 第一步: 生成密钥对
+```
+solana-keygen new --no-passphrase -o stake-account.json
+```
+
+输出公钥(stake账户地址):
+
+```
+pubkey: GKvqsuNcnwWqPzzuhLmGi4rzzh55FhJtGizkhHaEJqiV
+```
+
+复制公钥并妥善保管。后面要用. 
+
+#### 第二步: 创建一个stake账户,并转入代币：
+
+```
+solana create-stake-account --from <KEYPAIR> stake-account.json <AMOUNT> \
+    --stake-authority <KEYPAIR> --withdraw-authority <KEYPAIR> \
+    --fee-payer <KEYPAIR>
+```
+
+`KEYPAIR`: 你的密钥对
+
+`AMOUNT`: 转移的代币数量
+
+`stake-account.json`: 你的stake账户的公钥文件路径
+
+现在可以删除 `stake-account.json` 文件了。要授权其他操作，您可以使用 --stake-authority 或 --withdraw-authority 密钥对，而不是 `stake-account.json`。
+
+使用 solana stake-account 命令查看新的权益账户：
+
+```
+solana stake-account <STAKE_ACCOUNT_ADDRESS>
+```
+
+输出将类似于以下内容：
+
+```
+Total Stake: 5000 SOL
+Stake account is undelegated
+Stake Authority: EXU95vqs93yPeCeAU7mPPu6HbRUmTFPEiGug9oCdvQ5F
+Withdraw Authority: EXU95vqs93yPeCeAU7mPPu6HbRUmTFPEiGug9oCdvQ5F
+```
+
+## 设置质押和取款权限
+
+
+质押和取款权限可以在创建账户时通过 --stake-authority 和 --withdraw-authority 选项来设置，或者后面通过 solana stake-authorize 命令来设置。
+
+例如，要设置一个新的质押权限，运行:
+
+```
+solana stake-authorize <STAKE_ACCOUNT_ADDRESS> \
+    --stake-authority <KEYPAIR> --new-stake-authority <PUBKEY> \
+    --fee-payer <KEYPAIR>
+```
+
+`KEYPAIR`: stake账户的权限所有者
+
+`STAKE_ACCOUNT_ADDRESS`: stake账户地址
+
+`PUBKEY`: 新的权限所有者
+
+这里做了一个质押的权限的移交. 
+
+
+## 委托质押
+
+要将您的质押委托给验证人，您需要知道它的投票账户地址。通过使用`solana validators`命令查询群集以获取所有验证人及其投票账户列表来找到它：
+
+```
+solana validators
+```
+
+每行的第一列包含验证人的身份，第二列是投票账户地址。
+
+选择一个验证人
+
+运行以下命令, 把你的质押委托给验证人: 
+
+```
+solana delegate-stake --stake-authority <KEYPAIR> <STAKE_ACCOUNT_ADDRESS> <VOTE_ACCOUNT_ADDRESS> \
+    --fee-payer <KEYPAIR>
+```
+
+`VOTE_ACCOUNT_ADDRESS`: 验证人地址
+
+`KEYPAIR`: 你的密钥对
+
+`STAKE_ACCOUNT_ADDRESS`: 你的stake账户
+
+委托后，使用solana stake-account观察stake账户的变化：
+
+```
+solana stake-account <STAKE_ACCOUNT_ADDRESS>
+```
+
+您将在输出中看到新的字段"代币委托"和"代币委托账户地址"。 输出将类似于这样：
+```
+Total Stake: 5000 SOL
+Credits Observed: 147462
+Delegated Stake: 4999.99771712 SOL
+Delegated Vote Account Address: CcaHc2L43ZWjwCHART3oZoJvHLAe9hzT2DJNUpBzoTN1
+Stake activates starting from epoch: 42
+Stake Authority: EXU95vqs93yPeCeAU7mPPu6HbRUmTFPEiGug9oCdvQ5F
+Withdraw Authority: EXU95vqs93yPeCeAU7mPPu6HbRUmTFPEiGug9oCdvQ5F
+```
+
+
+## 取消委托
+
+您可以使用 solana deactivate-stake 取消委托：
+
+```
+solana deactivate-stake --stake-authority <KEYPAIR> <STAKE_ACCOUNT_ADDRESS> \
+    --fee-payer <KEYPAIR>
+```
+
+请注意，刚刚委托的权益账户有冷却期, 不能马上取消委托. 
+
+## 取出质押
+
+```
+solana withdraw-stake --withdraw-authority <KEYPAIR> <STAKE_ACCOUNT_ADDRESS> <RECIPIENT_ADDRESS> <AMOUNT> \
+    --fee-payer <KEYPAIR>
+```
+
+`RECIPIENT_ADDRESS`: 取出到哪个地址
+
+`KEYPAIR`: 你的密钥对
+
+`STAKE_ACCOUNT_ADDRESS`: 现在的stake账户