Merge pull request #273 from EpicsDAO/update

small bug fix
EpicsDAO · Sep 5, 2024 · 0c78a3b · 0c78a3b
2 parents ea92737 + acf7b1a
commit 0c78a3b
Show file tree

Hide file tree

Showing 13 changed files with 176 additions and 114 deletions.
diff --git a/.changeset/ten-oranges-try.md b/.changeset/ten-oranges-try.md
@@ -0,0 +1,5 @@
+---
+'@epics-dao/solv': patch
+---
+
+small bug fix
diff --git a/README.md b/README.md
@@ -39,14 +39,13 @@ Documentation: [https://solv.epics.dev/](https://solv.epics.dev/)
 Login in to your Validator server by ssh and run the following command.
 
 ```bash
-$ bash -c "$(curl -sSfL "https://storage.googleapis.com/epics-bucket/resource/solv/v4.5.0/install")"
-$ cd ~ && source ~/.profile
-$ solv setup
+bash -c "$(curl -sSfL "https://storage.googleapis.com/epics-bucket/resource/solv/v4.5.0/install")"
+cd ~ && source ~/.profile
+solv setup
 ```
 
 ![](https://storage.googleapis.com/zenn-user-upload/949db29fc401-20240131.png)
 
-- Choose Language
 - Choose Network
 - Choose Node Type
 - Choose RPC Type or Validator Type
@@ -61,7 +60,7 @@ The Solana validator will start 🎊
 If your node does not start, you can try the following command.
 
 ```bash
-$ solv restart --rm
+solv restart --rm
 ```
 
 This will remove the snapshot and restart the Solana Validator from the new snapshot.
@@ -89,6 +88,12 @@ But this will be deprecated in the future.
 
 Now new config is migrating to `solv4.config.json` file.
 
+Please update your config file to `solv4.config.json` file.
+
+```bash
+solv update --config
+```
+
 ## Bug Fixes
 
 - `solv switch` command now works as expected.
@@ -137,7 +142,7 @@ By implementing solv MEV mode, you can maintain high security, ensure optimal pe
 Run the following command:
 
 ```bash
-$ solv mev
+solv mev
 ? Do you want to enable solv MEV Mode?(You can change it again) (y/N)
 ? Do you want to enable AUTO UPDATE? (Recommended) (y/N)
 ? Do you want to enable AUTO RESTART? (Recommended) (y/N)
@@ -167,39 +172,39 @@ $ solv mev
 Run the following command:
 
 ```bash
-$ solv mev
+solv mev
 ? Do you want to enable solv MEV Mode?(You can change it again) (y/N) n
 ✅ Cron Job successfully removed.
 ```
 
 ## Run solv Server CLI - from your validator server
 
 ```bash
-$ solv s
+solv s
 ```
 
 ![solv s](https://storage.googleapis.com/epics-bucket/solv/assets/solv-s.png)
 
 ## Solana Validator Logs
 
 ```bash
-$ solv log
+solv log
 ```
 
 or
 
 Show only error logs
 
 ```bash
-$ solv log -e
+solv log -e
 ```
 
 ## Show Solana Validator Config
 
 This command will show your all config paths which are used by solana validator.
 
 ```bash
-$ solv config
+solv config
 ```
 
 ## Solana Delegation Program
@@ -209,7 +214,7 @@ https://solana.org/delegation-program
 ## solv CLI
 
 ```bash
-$ solv --help
+solv --help
 Usage: solv [options] [command]
 
 💎 Solana Validator All-in-One CLI 💎

diff --git a/packages/solv/src/cli/jupiter/index.ts b/packages/solv/src/cli/jupiter/index.ts
@@ -36,6 +36,7 @@ export const jupiterCommands = () => {
     .description('Show Jupiter Logs')
     .action((options: { error: boolean }) => {
       jupiterLog(options.error)
+      process.exit(0)
     })
 
   jupiter

diff --git a/packages/solv/src/cli/log/index.ts b/packages/solv/src/cli/log/index.ts
@@ -13,5 +13,6 @@ export const logCommands = () => {
     .option('-a, --all', 'Follow All output', false)
     .action((options) => {
       tail(options)
+      process.exit(0)
     })
 }
diff --git a/packages/solv/src/cli/setup/setupV2.ts b/packages/solv/src/cli/setup/setupV2.ts
@@ -28,7 +28,7 @@ export const setupV2 = async (skipInitConfig = false, skipMount = false) => {
     }
 
     const latestConfig = await readConfig()
-    const isTest = latestConfig.TESTNET_SOLANA_VERSION === Network.TESTNET
+    const isTest = latestConfig.NETWORK === Network.TESTNET
     // Generate /mnt/ledger and /mnt/accounts
     setupDirs()
     if (!skipMount) {

diff --git a/packages/solv/src/cli/update/index.ts b/packages/solv/src/cli/update/index.ts
@@ -93,7 +93,7 @@ export const updateCommands = (config: DefaultConfigType) => {
             oldConfig.DISK_TYPES === 0
               ? MNT_DISK_TYPE.DOUBLE
               : MNT_DISK_TYPE.SINGLE,
-          RPC_TYPE: RpcType.JITO,
+          RPC_TYPE: isRPCOld ? RpcType.JITO : RpcType.NONE,
           VALIDATOR_TYPE: isJitoOld
             ? ValidatorType.JITO
             : isTestnetOld

diff --git a/website/solv-doc/articles/doc/en/quickstart/solv-swap.md b/website/solv-doc/articles/doc/en/quickstart/solv-swap.md
@@ -0,0 +1,7 @@
+---
+id: quickstart-solv-swap
+title: solv SWAP コマンド
+description: オープンソースのSolana バリデーター向けツールsolvのクイックスタート - SWAP コマンド
+---
+
+Comion Soon...
diff --git a/website/solv-doc/articles/doc/ja/quickstart/solv-swap.md b/website/solv-doc/articles/doc/ja/quickstart/solv-swap.md
@@ -0,0 +1,7 @@
+---
+id: quickstart-solv-swap
+title: solv SWAP コマンド
+description: オープンソースのSolana バリデーター向けツールsolvのクイックスタート - SWAP コマンド
+---
+
+Comion Soon...
diff --git a/website/solv-doc/articles/doc/ja/quickstart/start-solv.md b/website/solv-doc/articles/doc/ja/quickstart/start-solv.md
@@ -27,34 +27,65 @@ $ cd ~ && source ~/.profile
 $ solv setup
 ```
 
-![](https://storage.googleapis.com/zenn-user-upload/949db29fc401-20240131.png)
+- 新しいインストール写真
 
-そして、対象となるノードの種類を選択します。
+![](url)
 
-- `TESTNET_VALIDATOR`
-- `MAINNET_VALIDATOR`
-- `RPC_NODE`
+`solv setup` コマンドを実行すると、以下のようなプロンプトが表示されます。
+ネットワーク、ノードタイプ、RPC タイプまたはバリデータータイプを選択してください。
 
-起動後、スナップショットのダウンロードが自動で始まり、
+```
+? Choose Network (Use arrow keys)
+❯ mainnet-beta
+  testnet
+? Choose Node Type (Use arrow keys)
+❯ rpc
+  validator
+? Choose RPC Type (Use arrow keys)
+❯ agave
+  jito
+```
+
+バリデータータイプの場合は、コミッションなどもここで設定できます。
+
+設定完了後、スナップショットのダウンロードが自動で始まり、
 Solana バリデーターが起動します 🎊
 
-## New Jito MEV Setup
+スナップショットのダウンロードが完了しない場合は、Ctrl + C を押して中断し、
+その後、再度 `solv restart --rm` コマンドを実行してください。
 
-Jito MEV のメインネットを選択できるようになりました 🎉
+Solana バリデーターは、新規起動してから数十分から数時間かかる場合があります。
+以下のコマンドでログを確認してください。
 
-![](https://storage.googleapis.com/epics-bucket/solv/assets/mainnet-select.png)
+```bash
+solv log
+```
 
-## solv Server CLI を実行 - バリデーターサーバー
+または
 
 ```bash
-$ solv s
+solv m
 ```
 
-![solv s](https://storage.googleapis.com/epics-bucket/solv/assets/solv-s.png)
+## solv setup のオプション
 
-### Solana Delegation Program
+solv setup のオプションを使用して、特定の機能を有効にすることができます。
 
-https://solana.org/delegation-program
+```
+solv setup --help
+Usage: solv setup [options]
+
+Setup Solana Validator
+
+Options:
+  --vote              Setup Vote Account (default: false)
+  --key               Setup Validator Keypairs (default: false)
+  --relayer           Setup Jito Relayer (default: false)
+  --jupiter           Setup Jupiter Swap API (default: false)
+  --skip-init-config  Skip Initial Config (default: false)
+  --skip-mount        Skip Mount (default: false)
+  -h, --help          Display help for command
+```
 
 ## Solana バリデーターの開始
 
@@ -112,39 +143,52 @@ $ solv config
 $ solv --help
 Usage: solv [options] [command]
 
-💎 Solana Validator All-in-One CLI 💎
+🪄  solv - Solana Validator Tool ✨
 
 Options:
-  -V                   Output the current version
-  -h, --help           Display help for solv commands
+  -V                     Display version
+  -h, --help             Display help for command
 
 Commands:
-  server|s             Open solv Dashboard
-  start                Start Solana Validator
-  restart [options]    Restart Solana Validator
-  stop                 Stop Solana Validator
-  status               Show Solana Validator Status
-  update|u [options]   Update Solana Validator Version
-  log|l [options]      tail logs
-  install|i [options]  Install/Update Solana Version
-  stake                Solana Delegate Stake
-  unstake              Solana Delegate Stake
-  get <cmd>            Get Solana Validator Info Commands
-  scp <cmd>            Download/Upload Solana Validator Keypairs
-  cron <cmd>           Run Schedule Tasks
-  setup [options]      Setup Solana Validator
-  client|c             Open solv Client Dashboard
-  balance|bal          Show Keypairs Balance
-  mtr                  Mount Reload Command
-  disks                Show unmounted disks
-  relayer              Jiro Relayer Commands
-  rm:log               Remove Logs
-  rm:snapshot          Remove Snapshot
-  withdraw             Withdraw SOL from Vote Account to Authority Account
-  login                Login to Validatoors Cloud
-  change               Change Identity of Validator to New Validator
-  monitor|m            Monitor Solana Node
-  catchup|ca           Check Solana Catchup Status
-  config               Show Solv Config
-  help [cmd]           Display help for solv commands
+  start                  Start Solana Validator
+  restart [options]      Restart Solana Validator
+  stop                   Stop Solana Validator
+  status                 Check Solana Validator Status
+  update|u [options]     Update Command
+  log|l [options]        tail logs
+  install|i [options]    Install Solana Client
+  stake [options]        Stake SOL
+  unstake                Unstake SOL
+  get <cmd>              Get Solana Validator's Information
+  scp <cmd>              Scp Commands
+  cron                   Cron Job Commands
+  setup [options]        Setup Solana Validator
+  balance|bal [options]  Show Keypairs Balance
+  mtr                    Mount Reload Command
+  disks                  Show unmounted disks
+  relayer                Jito Relayer Commands
+  transfer|tr [options]  Transfer Solana Tokens/SPL Tokens
+  withdraw [options]     Withdraw SOL from Vote Account to Authority Account
+  harvest|hv             Harvest SOL from Validator Account to Authority Account
+  mev                    Enable MEV Mode
+  df                     Disk Free Command
+  swap [options]         Swap tokens
+  epochTimer             Check Solana Epoch Timer
+  switch [options]       Switch Validator Identity with No Downtime
+  jupiter                Jupiter API Commands
+  rm:log                 Remove Logs
+  rm:snapshot            Remove Snapshot
+  create:snapshot        Create Snapshot
+  monitor|m              Monitor Solana Node
+  catchup|c              Check Solana Catchup Status
+  config                 Show Solv Config
+  help [cmd]             Display help for command
 ```
+
+### Solana Foudation デリゲーションプログラム
+
+Solana Foundation デリゲーションプログラムに参加することで、多くのバリデーターが利用しているように、Solana バリデーターとしての運用に必要な SOL の委任を受けることが可能です。
+
+詳細については、以下のリンクをご確認ください。
+
+https://solana.org/delegation-program
diff --git a/website/solv-doc/public/locales/en/doc.json b/website/solv-doc/public/locales/en/doc.json
@@ -13,8 +13,8 @@
       "body": "Learn to use solv in three easy steps! This guide quickly introduces you to the essentials of the solv."
     },
     "tutorial": {
-      "title": "Tutorial",
-      "body": "A guide to actually starting the operation of a Solana validator using solv."
+      "title": "Swap Solana Tokens",
+      "body": "A guide to swapping Solana tokens using solv swap command. This guide will help you understand how to swap Solana tokens using solv."
     },
     "update": {
       "title": "No Downtime Update",
@@ -31,16 +31,9 @@
     "quickstart": {
       "groupTitle": "Quickstart",
       "start-solv": "Start solv",
+      "solv-swap": "solv Swap",
       "solv-mev-mode": "solv MEV Mode",
       "no-downtime-update": "No Downtime Update"
-    },
-    "tutorial": {
-      "groupTitle": "Tutorial",
-      "chapter1": "1. Solana Setup",
-      "chapter2": "2. Backup & Migrate",
-      "chapter3": "3. Cloud & Monitor",
-      "chapter4": "4. Revenue Analysis",
-      "chapter5": "5. Setup RPC Node"
     }
   },
   "headerNav": {

diff --git a/website/solv-doc/public/locales/ja/doc.json b/website/solv-doc/public/locales/ja/doc.json
@@ -13,8 +13,8 @@
       "body": "solv を使い始めるための簡単3ステップについて説明します。"
     },
     "tutorial": {
-      "title": "チュートリアル",
-      "body": "solv を使って実際にSolanaバリデーターの運用をスタートするためのガイドです。"
+      "title": "Swap Solana トークン",
+      "body": "solv swap コマンドを使用して Solana トークンを交換する方法について説明します。"
     },
     "update": {
       "title": "ノーダウンタイムアップデート",
@@ -31,16 +31,9 @@
     "quickstart": {
       "groupTitle": "クイックスタート",
       "start-solv": "solv をはじめる",
+      "solv-swap": "solv SWAP",
       "solv-mev-mode": "solv MEV モード",
       "no-downtime-update": "ノーダウンタイムアップデート"
-    },
-    "tutorial": {
-      "groupTitle": "チュートリアル",
-      "chapter1": "1. Solana バリデーター構築",
-      "chapter2": "2. バックアップと移転",
-      "chapter3": "3. クラウドと Solana 監視",
-      "chapter4": "4. 収益管理と分析",
-      "chapter5": "5. RPC ノードの構築"
     }
   },
   "headerNav": {

diff --git a/website/solv-doc/src/components/articles/doc/DocIndex.tsx b/website/solv-doc/src/components/articles/doc/DocIndex.tsx
@@ -28,9 +28,9 @@ const actions = [
     iconBackground: 'bg-yellow-50',
   },
   {
-    title: 'doc:actions.tutorial.title',
-    body: 'doc:actions.tutorial.body',
-    href: '/doc/tutorial/chapter1',
+    title: 'doc:actions.quickstart.title',
+    body: 'doc:actions.quickstart.body',
+    href: '/doc/quickstart/solv-swap',
     icon: AcademicCapIcon,
     iconForeground: 'text-green-700',
     iconBackground: 'bg-green-50',