Merge pull request #30 from EpicsDAO/tds

update tds cmds

articles/doc/en/tutorial/chapter1.md

@@ -90,7 +90,7 @@ With the following one-liner command, you can install:
 - `solv CLI`
 
 ```bash
-sh -c "$(curl -sSfL "https://storage.googleapis.com/epics-bucket/resource/solv-cli/install-v1.7.2")"
+sh -c "$(curl -sSfL "https://storage.googleapis.com/epics-bucket/resource/solv-cli/v3.0.0/install")"
 ```
 
 ### ✅ If `npm` is already installed on your local computer.
@@ -113,8 +113,8 @@ The following command will create four keys:
 solv setup --key
 ✅ Successfully Generated - ~/solvKeys/upload/testnet-validator-keypair.json
 ✅ Successfully Generated - ~/solvKeys/upload/mainnet-validator-keypair.json
-✅ Successfully Generated - ~/solvKeys/upload/vote-account-keypair.json
-✅ Successfully Generated - ~/solvKeys/upload/authority-keypair.json
+✅ Successfully Generated - ~/solvKeys/upload/testnet-vote-account-keypair.json
+✅ Successfully Generated - ~/solvKeys/upload/testnet-authority-keypair.json
 ```
 
 The addresses for each key will be displayed in the log, so it's helpful to take note of them for future reference 💡
@@ -139,19 +139,25 @@ By participating in this program, it seems you can receive delegated stakes from
 Eligibility Criteria
 https://solana.org/delegation-criteria
 
+Solana Foundation Delegation Program Command-line Utility
+https://github.com/solana-foundation/stake-o-matic/tree/master/cli
+
 Furthermore, you need to sign your Pubkey with the following command (this step must be done on Ubuntu only):
 
 Installation
 
 ```bash
-$ sudo apt install libudev-dev
+$ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+$ source "$HOME/.cargo/env"
+$ sudo apt install build-essential libssl-dev pkg-config libudev-dev libhidapi-dev
 $ cargo install solana-foundation-delegation-program-cli
 $ solana-foundation-delegation-program --version
 ```
 
 Since the signing is done on the mainnet, a small amount of SOL is required.
 
 ```bash
+$ solana config set --url https://api.mainnet-beta.solana.com
 $ solana -um balance
 ```
 
@@ -161,14 +167,11 @@ Execution
 $ solana-foundation-delegation-program apply --mainnet ~/solvKeys/upload/mainnet-validator-keypair.json --testnet ~/solvKeys/upload/testnet-validator-keypair.json
 ```
 
-If you do not complete this step, you will be rejected by the following form:
-https://solana.org/delegation-program
-
 ## 🌐 Preparing Testnet SOL
 
 To participate in voting with a testnet validator, you will need approximately 315 test SOL per year.
 Additionally, staking any amount of SOL from any account to your own testnet validator can accelerate progress. Staking on this testnet can be done by changing the network to testnet in the developer settings of the Phantom wallet.
-(Staking to the address in `vote-account-keypair.json`)
+(Staking to the address in `testnet-vote-account-keypair.json`)
 
 ```bash
 $ solana airdrop 1
@@ -200,7 +203,7 @@ There are versions for Edgevana and Latitude, so please select the type you want
 Here, we assume participation in TDS and select `Edgevana`.
 
 ```bash
-$ sh -c "$(curl -sSfL "https://storage.googleapis.com/epics-bucket/resource/solv/v1.7.2/install")"
+$ sh -c "$(curl -sSfL "https://storage.googleapis.com/epics-bucket/resource/solv/v3.0.0/install")"
 ```
 
 This command will initially create a solv user, so you will need to set a password.
@@ -245,7 +248,7 @@ $ solv log -e
 You can check the current status of the validators with the following command.
 
 ```bash
-solv monitor
+solv get monitor
 ```
 
 ## ⏹️ Stopping the Validator

articles/doc/en/tutorial/chapter2.md

@@ -41,6 +41,14 @@ The key's randomart image is:
 
 A key pair for `ssh` connection has been created.
 
+Display the necessary SSH public key for the settings.
+
+```bash
+solv scp cat
+```
+
+Copy this public key and keep it.
+
 ## 🔗 Setting up SSH Connection on Validator Server - Establishing Secure Remote Access
 
 Connect to your validator node's server using `SSH`.
@@ -56,14 +64,6 @@ su solv
 cd ~ && source ~/.profile
 ```
 
-Display the necessary SSH public key for the settings.
-
-```bash
-solv scp cat
-```
-
-Copy this public key and keep it.
-
 Next, set up the SSH connection with the following command.
 
 ```bash
@@ -76,12 +76,12 @@ This completes the connection setup between your local computer and the validato
 
 ## 📦 Key Backup (Validator Node → Local Computer)
 
-In this step, we will introduce how to back up keys from the `validator node` to your `local computer`. The following four keys located in the `/mt/solana/` directory will be downloaded:
+In this step, we will introduce how to back up keys from the `validator node` to your `local computer`. The following four keys located in the `/home/solv` directory will be downloaded:
 
-- `/mt/solana/mainnet-validator-keypair.json`
-- `/mt/solana/testnet-validator-keypair.json`
-- `/mt/solana/vote-account-keypair.json`
-- `/mt/solana/authority-keypair.json`
+- `/home/solv/mainnet-validator-keypair.json`
+- `/home/solv/testnet-validator-keypair.json`
+- `/home/solv/testnet-vote-account-keypair.json`
+- `/home/solv/testnet-authority-keypair.json`
 
 ※ If you are uploading keys from your `local computer` to the `validator node`, please skip this step.
 
@@ -92,8 +92,8 @@ solv scp download
 ? Enter your Ubuntu Server IP (1.1.1.1)
 ✅ Successfully Generated - ~/solvKeys/download/testnet-validator-keypair.json
 ✅ Successfully Generated - ~/solvKeys/download/mainnet-validator-keypair.json
-✅ Successfully Generated - ~/solvKeys/download/vote-account-keypair.json
-✅ Successfully Generated - ~/solvKeys/download/authority-keypair.json
+✅ Successfully Generated - ~/solvKeys/download/testnet-vote-account-keypair.json
+✅ Successfully Generated - ~/solvKeys/download/testnet-authority-keypair.json
 ```
 
 The keys have been saved in the `~/solvKeys/download` directory 🎉
@@ -107,7 +107,7 @@ Execute the following command from your local computer and enter the IP address
 
 All keys created in the previous chapters will be uploaded to the
 
-`/mt/solana`
+`~/solvKeys/upload`
 
 directory.
 (Note: It is recommended to always take a backup as existing files with the same name will be overwritten.)
@@ -169,7 +169,7 @@ solv update -b
 If you decide to monitor later, you can check with the following command:
 
 ```bash
-solv monitor
+solv get monitor
 ```
 
 In the next chapter, we will introduce how to monitor validator nodes in a serverless environment.

articles/doc/ja/tutorial/chapter1.md

@@ -91,7 +91,7 @@ https://docs.solana.com/running-validator/validator-reqs
 を行います。
 
 ```bash
-sh -c "$(curl -sSfL "https://storage.googleapis.com/epics-bucket/resource/solv-cli/install-v1.7.2")"
+sh -c "$(curl -sSfL "https://storage.googleapis.com/epics-bucket/resource/solv-cli/v3.0.0/install")"
 ```
 
 ### ✅ すでにローカルコンピューターに `npm` がある場合。
@@ -114,8 +114,8 @@ solv i
 solv setup --key
 ✅ Successfully Generated - ~/solvKeys/upload/testnet-validator-keypair.json
 ✅ Successfully Generated - ~/solvKeys/upload/mainnet-validator-keypair.json
-✅ Successfully Generated - ~/solvKeys/upload/vote-account-keypair.json
-✅ Successfully Generated - ~/solvKeys/upload/authority-keypair.json
+✅ Successfully Generated - ~/solvKeys/upload/testnet-vote-account-keypair.json
+✅ Successfully Generated - ~/solvKeys/upload/testbet-authority-keypair.json
 ```
 
 ログに各キーのアドレスが表示されるので、メモをしておくと後に便利です 💡
@@ -142,12 +142,17 @@ https://solana.org/delegation-program
 必要な条件
 https://solana.org/delegation-criteria
 
+Solana Foundation Delegation Program Command-line Utility
+https://github.com/solana-foundation/stake-o-matic/tree/master/cli
+
 さらに、以下のコマンドで Pubkey に署名を行う必要があります。(このフローのみ Ubuntu で行う必要があります）
 
 インストール
 
 ```bash
-$ sudo apt install libudev-dev
+$ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+$ source "$HOME/.cargo/env"
+$ sudo apt install build-essential libssl-dev pkg-config libudev-dev libhidapi-dev
 $ cargo install solana-foundation-delegation-program-cli
 $ solana-foundation-delegation-program --version
 ```
@@ -156,6 +161,7 @@ $ solana-foundation-delegation-program --version
 多少の SOL が必要です。
 
 ```bash
+$ solana config set --url https://api.mainnet-beta.solana.com
 $ solana -um balance
 ```
 
@@ -172,7 +178,7 @@ https://solana.org/delegation-program
 
 テストネットバリデーターで投票に参加するには、年間およそ 315 テスト SOL 必要になります。
 その他に、自分のテストネットバリデーターにどのアカウントからでも数 SOL で良いのでステーキングを行うと進行が早まります。このテストネットでのステイキングは Phantom ウォレットのディベロッパー設定からネットワークをテストネットに変更することで行えます。
-(`vote-account-keypair.json`のアドレスにステイキング)
+(`testnet-vote-account-keypair.json`のアドレスにステイキング)
 
 ```bash
 $ solana airdrop 1
@@ -201,12 +207,10 @@ $ ssh username@<your-server-ip-address>
 
 そして solv ドキュメントページにあるステップ１のコードをコピー&ペーストして実行します。
 
-Edgevana と Latitude 版があるので、使用するタイプをタブで選択して下さい。
-
-ここでは TDS に参加することを想定し、`Edgevana`を選択します。
+ここでは TDS に参加することを想定しています。
 
 ```bash
-$ sh -c "$(curl -sSfL "https://storage.googleapis.com/epics-bucket/resource/solv/v1.7.2/install")"
+$ sh -c "$(curl -sSfL "https://storage.googleapis.com/epics-bucket/resource/solv/v3.0.0/install")"
 ```
 
 このコマンドで最初に solv ユーザーを作成するので、
@@ -252,7 +256,7 @@ $ solv log -e
 以下のコマンドで現在のバリデーターの状態を確認することができます。
 
 ```bash
-solv monitor
+solv get monitor
 ```
 
 ## ⏹️ バリデーターの停止

articles/doc/ja/tutorial/chapter2.md

@@ -41,6 +41,14 @@ The key's randomart image is:
 
 `ssh` 接続のためのキーペアが作成されました。
 
+設定に必要な SSH 公開鍵を表示します。
+
+```bash
+solv scp cat
+```
+
+この公開鍵をコピーしておきます。
+
 ## 🔗 バリデーターサーバーで SSH 接続設定 - セキュアなリモートアクセスの確立
 
 バリデーターノードのサーバーへ `SSH`接続します。
@@ -56,14 +64,6 @@ su solv
 cd ~ && source ~/.profile
 ```
 
-設定に必要な SSH 公開鍵を表示します。
-
-```bash
-solv scp cat
-```
-
-この公開鍵をコピーしておきます。
-
 次に以下のコマンドで SSH 接続設定を行います。
 
 ```bash
@@ -77,12 +77,12 @@ solv scp create
 ## 📦 鍵のバックアップ（バリデーターノード → ローカルコンピュータ）
 
 このステップでは `バリデーターノード` から `ローカルコンピュータ` へ鍵のバックアップを取る方法を紹介します。
-`/mt/solana/` ディレクトリにある以下の 4 つの鍵がダウンロードされます。
+`/home/solv` ディレクトリにある以下の 4 つの鍵がダウンロードされます。
 
-- `/mt/solana/mainnet-validator-keypair.json`
-- `/mt/solana/testnet-validator-keypair.json`
-- `/mt/solana/vote-account-keypair.json`
-- `/mt/solana/authority-keypair.json`
+- `/home/solv/mainnet-validator-keypair.json`
+- `/home/solv/testnet-validator-keypair.json`
+- `/home/solv/testnet-vote-account-keypair.json`
+- `/home/solv/testnet-authority-keypair.json`
 
 ※鍵を `ローカルコンピュータ` から `バリデーターノード`へアップロードする方はこのステップをスキップして下さい。
 
@@ -94,8 +94,8 @@ solv scp download
 ? Enter your Ubuntu Server IP (1.1.1.1)
 ✅ Successfully Generated - ~/solvKeys/download/testnet-validator-keypair.json
 ✅ Successfully Generated - ~/solvKeys/download/mainnet-validator-keypair.json
-✅ Successfully Generated - ~/solvKeys/download/vote-account-keypair.json
-✅ Successfully Generated - ~/solvKeys/download/authority-keypair.json
+✅ Successfully Generated - ~/solvKeys/download/testnet-vote-account-keypair.json
+✅ Successfully Generated - ~/solvKeys/download/testnet-authority-keypair.json
 ```
 
 `~/solvKeys/download` ディレクトリに鍵が保存されました 🎉
@@ -110,7 +110,7 @@ solv scp download
 
 に全章で作成された鍵が
 
-`/mt/solana`
+`~/solvKeys/upload`
 
 ディレクトリにアップロードされます。
 (※同じファイル名がある場合上書きされるので必ずバックアップを取ることをお勧めします。)
@@ -176,7 +176,7 @@ solv update -b
 あとからモニターする場合でも以下のコマンドで確認することができます。
 
 ```bash
-solv monitor
+solv get monitor
 ```
 
 次の章ではサーバーレス環境でバリデーターノードを監視する方法についてご紹介したいと思います。