From 616530fa3fbd7e8ff958d1185121e7bc6c5e976c Mon Sep 17 00:00:00 2001 From: POPPIN-FUMI Date: Mon, 22 Jan 2024 17:25:23 +0100 Subject: [PATCH] update tds cmds --- articles/doc/en/tutorial/chapter1.md | 15 +++++++++------ articles/doc/en/tutorial/chapter2.md | 14 +++++++------- articles/doc/ja/tutorial/chapter1.md | 12 +++++++++--- articles/doc/ja/tutorial/chapter2.md | 12 ++++++------ 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/articles/doc/en/tutorial/chapter1.md b/articles/doc/en/tutorial/chapter1.md index 42dc321..bb08845 100644 --- a/articles/doc/en/tutorial/chapter1.md +++ b/articles/doc/en/tutorial/chapter1.md @@ -135,12 +135,17 @@ 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 ``` @@ -148,18 +153,16 @@ $ 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 ``` Execution ```bash -$ solana-foundation-delegation-program apply --mainnet ~/solvKeys/upload/mainnet-validator-keypair.json --testnet ~/solvKeys/upload/testnet-validator-keypair.json +$ solana-foundation-delegation-program apply --mainnet mainnet-validator-keypair.json --testnet 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. @@ -196,7 +199,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.0/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. diff --git a/articles/doc/en/tutorial/chapter2.md b/articles/doc/en/tutorial/chapter2.md index b480761..bf2e0bc 100644 --- a/articles/doc/en/tutorial/chapter2.md +++ b/articles/doc/en/tutorial/chapter2.md @@ -72,12 +72,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 `/mnt/` 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` +- `/mnt/mainnet-validator-keypair.json` +- `/mnt/testnet-validator-keypair.json` +- `/mnt/vote-account-keypair.json` +- `/mnt/authority-keypair.json` ※ If you are uploading keys from your `local computer` to the `validator node`, please skip this step. @@ -103,7 +103,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` +`/mnt` directory. (Note: It is recommended to always take a backup as existing files with the same name will be overwritten.) @@ -165,7 +165,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. diff --git a/articles/doc/ja/tutorial/chapter1.md b/articles/doc/ja/tutorial/chapter1.md index 958582f..6f1e352 100644 --- a/articles/doc/ja/tutorial/chapter1.md +++ b/articles/doc/ja/tutorial/chapter1.md @@ -138,12 +138,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 ``` @@ -152,13 +157,14 @@ $ solana-foundation-delegation-program --version 多少の SOL が必要です。 ```bash +$ solana config set --url https://api.mainnet-beta.solana.com $ solana -um balance ``` 実行 ```bash -$ solana-foundation-delegation-program apply --mainnet ~/solvKeys/upload/mainnet-validator-keypair.json --testnet ~/solvKeys/upload/testnet-validator-keypair.json +$ solana-foundation-delegation-program apply --mainnet mainnet-validator-keypair.json --testnet testnet-validator-keypair.json ``` これを行なっていないと以下のフォームで弾かれます @@ -202,7 +208,7 @@ Edgevana と Latitude 版があるので、使用するタイプをタブで選 ここでは TDS に参加することを想定し、`Edgevana`を選択します。 ```bash -$ sh -c "$(curl -sSfL "https://storage.googleapis.com/epics-bucket/resource/solv/v1.7.0/install")" +$ sh -c "$(curl -sSfL "https://storage.googleapis.com/epics-bucket/resource/solv/v3.0.0/install")" ``` このコマンドで最初に solv ユーザーを作成するので、 diff --git a/articles/doc/ja/tutorial/chapter2.md b/articles/doc/ja/tutorial/chapter2.md index 6cd7969..20eb519 100644 --- a/articles/doc/ja/tutorial/chapter2.md +++ b/articles/doc/ja/tutorial/chapter2.md @@ -73,12 +73,12 @@ solv scp create ## 📦 鍵のバックアップ（バリデーターノード → ローカルコンピュータ） このステップでは `バリデーターノード` から `ローカルコンピュータ` へ鍵のバックアップを取る方法を紹介します。 -`/mt/solana/` ディレクトリにある以下の 4 つの鍵がダウンロードされます。 +`/mnt/` ディレクトリにある以下の 4 つの鍵がダウンロードされます。 -- `/mt/solana/mainnet-validator-keypair.json` -- `/mt/solana/testnet-validator-keypair.json` -- `/mt/solana/vote-account-keypair.json` -- `/mt/solana/authority-keypair.json` +- `/mnt/mainnet-validator-keypair.json` +- `/mnt/testnet-validator-keypair.json` +- `/mnt/vote-account-keypair.json` +- `/mnt/authority-keypair.json` ※鍵を `ローカルコンピュータ` から `バリデーターノード`へアップロードする方はこのステップをスキップして下さい。 @@ -106,7 +106,7 @@ solv scp backup に全章で作成された鍵が -`/mt/solana` +`/mnt` ディレクトリにアップロードされます。 (※同じファイル名がある場合上書きされるので必ずバックアップを取ることをお勧めします。)