feat: optimize create network process

cathayddt · Jan 29, 2024 · e71d7af · e71d7af
1 parent 3d58125
commit e71d7af
Show file tree

Hide file tree

Showing 6 changed files with 116 additions and 76 deletions.
diff --git a/src/quorum/command/network/create.ts b/src/quorum/command/network/create.ts
@@ -2,6 +2,7 @@ import { ethers } from 'ethers'
 import prompts from 'prompts'
 import { Argv, Arguments } from 'yargs'
 import Network from '../../service/network'
+import Backup from '../../service/backup'
 import { onCancel } from '../../../util/error'
 import { NetworkCreateType } from '../../model/type/network.type'
 import config from '../../config'
@@ -26,11 +27,12 @@ export const builder = (yargs: Argv<OptType>) => {
 
 export const handler = async (argv: Arguments<OptType>) => {
   const network = new Network(config)
+  const backup = new Backup(config)
   const wallet = new Wallet()
   // check bdkPath files exist or not (include useless file e.g. .DS_Store)
   const confirm: boolean = await (async () => {
     network.createBdkFolder()
-    const fileList = network.getBdkFiles()
+    const fileList = network.getNetworkFiles()
     if (fileList.length !== 0) {
       const confirmDelete = (await prompts({
         type: 'confirm',
@@ -40,8 +42,11 @@ export const handler = async (argv: Arguments<OptType>) => {
       }, { onCancel })).value
       if (confirmDelete) {
         const spinner = ora('Quorum Network Create ...').start()
+        // backup before remove
+        await backup.exportAll()
+
         network.removeBdkFiles(fileList)
-        spinner.succeed('Remove all existing files!')
+        spinner.succeed('Backup and remove all existing files!')
       }
       return confirmDelete
     } else {

diff --git a/src/quorum/command/network/generate.ts b/src/quorum/command/network/generate.ts
@@ -1,6 +1,7 @@
 import prompts from 'prompts'
 import { Argv, Arguments } from 'yargs'
 import Network from '../../service/network'
+import Backup from '../../service/backup'
 import { onCancel, ParamsError } from '../../../util/error'
 import { NetworkGenerateType } from '../../model/type/network.type'
 import config from '../../config'
@@ -22,6 +23,7 @@ export const builder = (yargs: Argv<OptType>) => {
 
 export const handler = async (argv: Arguments<OptType>) => {
   const network = new Network(config)
+  const backup = new Backup(config)
   // check bdkPath files exist or not (include useless file e.g. .DS_Store)
   const confirm: boolean = await (async () => {
     network.createBdkFolder()
@@ -34,9 +36,12 @@ export const handler = async (argv: Arguments<OptType>) => {
         initial: false,
       }, { onCancel })).value
       if (confirmDelete) {
-        const spinner = ora('Quorum Network Generate ...').start()
+        const spinner = ora('Quorum Network Create ...').start()
+        // backup before remove
+        await backup.exportAll()
+
         network.removeBdkFiles(fileList)
-        spinner.succeed('Remove all existing files!')
+        spinner.succeed('Backup and remove all existing files!')
       }
       return confirmDelete
     } else {

diff --git a/src/quorum/instance/bdkFile.ts b/src/quorum/instance/bdkFile.ts
@@ -1,7 +1,7 @@
 import ExplorerDockerComposeYaml from '../model/yaml/docker-compose/explorerDockerComposeYaml'
 import fs from 'fs-extra'
 import { Config } from '../config'
-import { GenesisJsonType } from '../model/type/network.type'
+import { GenesisJsonType, NetworkInfoItem } from '../model/type/network.type'
 import ValidatorDockerComposeYaml from '../model/yaml/docker-compose/validatorDockerComposeYaml'
 import MemberDockerComposeYaml from '../model/yaml/docker-compose/memberDockerCompose'
 import { PathError } from '../../util/error'
@@ -50,6 +50,10 @@ export default class BdkFile {
     fs.writeFileSync(`${this.bdkPath}/artifacts/goQuorum/static-nodes.json`, JSON.stringify(staticNodesJson, null, 2))
   }
 
+  public createNetworkInfoJson (networkInfoJson: Array<NetworkInfoItem>) {
+    fs.writeFileSync(`${this.bdkPath}/network-info.json`, JSON.stringify(networkInfoJson, null, 2))
+  }
+
   public createPrivateKey (dir: string, privateKey: string) {
     fs.mkdirSync(`${this.bdkPath}/${dir}`, { recursive: true })
     fs.writeFileSync(`${this.bdkPath}/${dir}/nodekey`, privateKey)
@@ -217,6 +221,12 @@ export default class BdkFile {
     return JSON.parse(staticNodesJson)
   }
 
+  public getNetworkInfoJson () {
+    this.checkPathExist(this.bdkPath)
+    const networkInfoJson = fs.readFileSync(`${this.bdkPath}/network-info.json`, 'utf8')
+    return JSON.parse(networkInfoJson)
+  }
+
   public getPermissionedNodesJson () {
     this.checkPathExist(this.bdkPath)
     const permissionedNodesJson = fs.readFileSync(`${this.bdkPath}/artifacts/goQuorum/permissioned-nodes.json`, 'utf8')

diff --git a/src/quorum/model/type/network.type.ts b/src/quorum/model/type/network.type.ts
@@ -98,3 +98,8 @@ export interface AddMemberRemoteType {
   discoveryPort: string
   ipAddress: string
 }
+
+export interface NetworkInfoItem {
+  label: string
+  value: string
+}