665-Enhance CMD Database Init (#680)

* cmd: put init db only where is needed

* cmd: add commad to generate proof of ownership

* cmd: add readme rollback

* cmd: fixing remove node reference func

Author: sukrawidhyawan

cmd/main.go

@@ -1,50 +1,18 @@
 package main
 
 import (
-	"log"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/zoobc/zoobc-core/cmd/signature"
-
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"github.com/zoobc/zoobc-core/cmd/account"
 	"github.com/zoobc/zoobc-core/cmd/block"
 	"github.com/zoobc/zoobc-core/cmd/genesisblock"
+	"github.com/zoobc/zoobc-core/cmd/noderegistry"
 	"github.com/zoobc/zoobc-core/cmd/parser"
 	"github.com/zoobc/zoobc-core/cmd/rollback"
+	"github.com/zoobc/zoobc-core/cmd/signature"
 	"github.com/zoobc/zoobc-core/cmd/transaction"
-	"github.com/zoobc/zoobc-core/common/database"
-	"github.com/zoobc/zoobc-core/common/util"
 )
 
-var (
-	dbPath, dbName   string
-	configPath       = "./resource"
-	sqliteDbInstance database.SqliteDBInstance
-)
-
-func init() {
-	dir, _ := os.Getwd()
-	if strings.Contains(dir, "cmd") {
-		configPath = "../resource"
-	}
-
-	if err := util.LoadConfig(configPath, "config", "toml"); err != nil {
-		panic(err)
-	}
-
-	dbName = viper.GetString("dbName")
-	dbPath = viper.GetString("dbPath")
-	if strings.Contains(dir, "cmd") {
-		dbPath = filepath.Join("../", viper.GetString("dbPath"))
-	}
-}
 func main() {
-
 	var (
 		rootCmd     *cobra.Command
 		generateCmd = &cobra.Command{
@@ -57,28 +25,20 @@ func main() {
 		}
 	)
 
-	sqliteDbInstance = database.NewSqliteDB()
-	if err := sqliteDbInstance.InitializeDB(dbPath, dbName); err != nil {
-		log.Fatalln("InitializeDB err: ", err.Error())
-	}
-	sqliteDB, err := sqliteDbInstance.OpenDB(dbPath, dbName, 10, 10, 20*time.Minute)
-	if err != nil {
-		log.Fatalln("OpenDB err: ", err.Error())
-	}
-
 	rootCmd = &cobra.Command{
 		Use:   "zoobc",
 		Short: "CLI app for zoobc core",
 		Long:  "Commandline Tools for zoobc core",
 	}
 	rootCmd.AddCommand(generateCmd)
 	rootCmd.AddCommand(genesisblock.Commands())
-	rootCmd.AddCommand(rollback.Commands(sqliteDB))
+	rootCmd.AddCommand(rollback.Commands())
 	rootCmd.AddCommand(parserCmd)
 	rootCmd.AddCommand(signature.Commands())
 	generateCmd.AddCommand(account.Commands())
-	generateCmd.AddCommand(transaction.Commands(sqliteDB))
+	generateCmd.AddCommand(transaction.Commands())
 	generateCmd.AddCommand(block.Commands())
+	generateCmd.AddCommand(noderegistry.Commands())
 	parserCmd.AddCommand(parser.Commands())
 	_ = rootCmd.Execute()
 

cmd/noderegistry/cmd.go

@@ -0,0 +1,100 @@
+package noderegistry
+
+import (
+	"encoding/hex"
+	"fmt"
+
+	"github.com/spf13/cobra"
+	"github.com/zoobc/zoobc-core/common/chaintype"
+	"github.com/zoobc/zoobc-core/common/constant"
+	"github.com/zoobc/zoobc-core/common/crypto"
+	"github.com/zoobc/zoobc-core/common/database"
+	"github.com/zoobc/zoobc-core/common/model"
+	"github.com/zoobc/zoobc-core/common/query"
+	"github.com/zoobc/zoobc-core/common/util"
+)
+
+var (
+	/*
+		Generate Proof of Ownership Node Registry Command
+	*/
+	generateProofOfOwnerShipCmd = &cobra.Command{
+		Use:   "poow",
+		Short: "geneate proof of ownership for node registry transaction",
+		Long: `geneate proof of ownership for transaction related with node registry.
+			For example:  register node transaction, update node transaction & claim node transaction`,
+	}
+)
+
+func init() {
+	generateProofOfOwnerShipCmd.Flags().StringVar(&outputType, "output-type", "hex", "defines the type of the output to be generated [\"hex\", \"bytes\"]")
+	generateProofOfOwnerShipCmd.Flags().StringVar(&nodeOwnerAccountAddress, "node-owner-account-address", "", "Account address of the owner of the node")
+	generateProofOfOwnerShipCmd.Flags().StringVar(&nodeSeed, "node-seed", "", "Private key of the node")
+	generateProofOfOwnerShipCmd.Flags().StringVar(&databasePath, "db-node-path", "../resource", "Database path of node, make sure to download the database from node or run this command on node")
+	generateProofOfOwnerShipCmd.Flags().StringVar(&databaseName, "db-node-name", "zoobc.db", "Database name of node, make sure to download the database from node or run this command on node")
+}
+
+// Commands will return  proof of owner ship cmd
+func Commands() *cobra.Command {
+	generateProofOfOwnerShipCmd.Run = GenerateProofOfOwnerShip
+	return generateProofOfOwnerShipCmd
+}
+
+// GenerateProofOfOwnerShip for generate Proof of ownership node registry
+func GenerateProofOfOwnerShip(*cobra.Command, []string) {
+	var (
+		poow = GetProofOfOwnerShip(
+			databasePath,
+			databaseName,
+			nodeOwnerAccountAddress,
+			nodeSeed)
+		poowBytes = util.GetProofOfOwnershipBytes(poow)
+	)
+
+	switch outputType {
+	case "hex":
+		fmt.Printf("Proof Of Owner Ship Hex:\n%v\n", hex.EncodeToString(poowBytes))
+	case "bytes":
+		fmt.Printf("Proof Of Owner Ship Bytes:\n%v\n", poowBytes)
+	default:
+		panic("Invalid Output type")
+	}
+}
+
+// GetProofOfOwnerShip will reuturn proof of ownership basd on provided nodeOwnerAccountAddress & nodeSeed in a DB
+func GetProofOfOwnerShip(
+	dbPath, dbname, nodeOwnerAccountAddress, nodeSeed string,
+) *model.ProofOfOwnership {
+	var (
+		sqliteDbInstance = database.NewSqliteDB()
+		sqliteDB, err    = sqliteDbInstance.OpenDB(
+			databasePath,
+			databaseName,
+			constant.SQLMaxOpenConnetion,
+			constant.SQLMaxIdleConnections,
+			constant.SQLMaxConnectionLifetime,
+		)
+	)
+	if err != nil {
+		panic(fmt.Sprintf("OpenDB err: %s", err.Error()))
+	}
+	lastBlock, err := util.GetLastBlock(query.NewQueryExecutor(sqliteDB), query.NewBlockQuery(chaintype.GetChainType(0)))
+	if err != nil {
+		panic(err)
+	}
+	poowMessage := &model.ProofOfOwnershipMessage{
+		AccountAddress: nodeOwnerAccountAddress,
+		BlockHash:      lastBlock.BlockHash,
+		BlockHeight:    lastBlock.Height,
+	}
+
+	poownMessageBytes := util.GetProofOfOwnershipMessageBytes(poowMessage)
+	signature := (&crypto.Signature{}).SignByNode(
+		poownMessageBytes,
+		nodeSeed)
+
+	return &model.ProofOfOwnership{
+		MessageBytes: poownMessageBytes,
+		Signature:    signature,
+	}
+}

cmd/noderegistry/const.go

@@ -0,0 +1,10 @@
+package noderegistry
+
+var (
+	// Proof Of Ownership
+	outputType              string
+	nodeSeed                string
+	databasePath            string
+	databaseName            string
+	nodeOwnerAccountAddress string
+)

cmd/readme.md

@@ -39,39 +39,38 @@ go run main.go generate transaction send-money --escrow true --approver-address
 ```
 
 ### Transaction Register Node
-
-```
-go run main.go generate transaction register-node --timestamp 1257894000 --sender-seed "concur vocalist rotten busload gap quote stinging undiluted surfer goofiness deviation starved" --node-owner-account-address VZvYd80p5S-rxSNQmMZwYXC7LyAzBmcfcj4MUUAdudWM --node-seed "sprinkled sneak species pork outpost thrift unwind cheesy vexingly dizzy neurology neatness" --node-address "127.0.0.1" --locked-balance 1000000000
+```bash
+go run main.go generate transaction register-node --timestamp 1257894000 --sender-seed "concur vocalist rotten busload gap quote stinging undiluted surfer goofiness deviation starved" --node-owner-account-address "VZvYd80p5S-rxSNQmMZwYXC7LyAzBmcfcj4MUUAdudWM" --node-seed "sprinkled sneak species pork outpost thrift unwind cheesy vexingly dizzy neurology neatness" --node-address "127.0.0.1:8001" --locked-balance 1000000000 --poow-hex "7233537248687a792d35726c71475f644f473258626a504263574f68445552495070465267675254732d327458d880d3d1e6d68a8afeaa2c030ce50b7562fca7b7cb2ddac419c6e2ee33e0a7030000004d4e8d33954aa3deee656de56289e77d17ba29baff32da82147500e354ceaacf6cdafd6437a1037f243574dbeb2b81f52dd459ae8f0ee2ce4cbc272f832"
 ```
 
 ### Transaction Update Node Registration
 
-```
-go run main.go generate transaction update-node --timestamp 1257894000 --sender-seed "concur vocalist rotten busload gap quote stinging undiluted surfer goofiness deviation starved" --node-owner-account-address VZvYd80p5S-rxSNQmMZwYXC7LyAzBmcfcj4MUUAdudWM --node-seed "sprinkled sneak species pork outpost thrift unwind cheesy vexingly dizzy neurology neatness" --node-address "127.0.0.1" --locked-balance 10050000000000
+```bash
+go run main.go generate transaction update-node --timestamp 1257894000 --sender-seed "concur vocalist rotten busload gap quote stinging undiluted surfer goofiness deviation starved" --node-owner-account-address VZvYd80p5S-rxSNQmMZwYXC7LyAzBmcfcj4MUUAdudWM --node-seed "sprinkled sneak species pork outpost thrift unwind cheesy vexingly dizzy neurology neatness" --node-address "127.0.0.1:8001" --locked-balance 10050000000000 --poow-hex "7233537248687a792d35726c71475f644f473258626a504263574f68445552495070465267675254732d327458d880d3d1e6d68a8afeaa2c030ce50b7562fca7b7cb2ddac419c6e2ee33e0a7030000004d4e8d33954aa3deee656de56289e77d17ba29baff32da82147500e354ceaacf6cdafd6437a1037f243574dbeb2b81f52dd459ae8f0ee2ce4cbc272f832"
 ```
 
 ### Transaction Claim Node
 
-```
-go run main.go generate transaction claim-node --timestamp 1257894000 --sender-seed "concur vocalist rotten busload gap quote stinging undiluted surfer goofiness deviation starved" --node-owner-account-address VZvYd80p5S-rxSNQmMZwYXC7LyAzBmcfcj4MUUAdudWM --node-seed "sprinkled sneak species pork outpost thrift unwind cheesy vexingly dizzy neurology neatness" --recipient VZvYd80p5S-rxSNQmMZwYXC7LyAzBmcfcj4MUUAdudWM
+```bash
+go run main.go generate transaction claim-node --timestamp 1257894000 --sender-seed "concur vocalist rotten busload gap quote stinging undiluted surfer goofiness deviation starved" --node-owner-account-address "VZvYd80p5S-rxSNQmMZwYXC7LyAzBmcfcj4MUUAdudWM" --node-seed "sprinkled sneak species pork outpost thrift unwind cheesy vexingly dizzy neurology neatness" --recipient "VZvYd80p5S-rxSNQmMZwYXC7LyAzBmcfcj4MUUAdudWM" --poow-hex "7233537248687a792d35726c71475f644f473258626a504263574f68445552495070465267675254732d327458d880d3d1e6d68a8afeaa2c030ce50b7562fca7b7cb2ddac419c6e2ee33e0a7030000004d4e8d33954aa3deee656de56289e77d17ba29baff32da82147500e354ceaacf6cdafd6437a1037f243574dbeb2b81f52dd459ae8f0ee2ce4cbc272f832"
 ```
 
 ### Transaction Remove Node
 
-```
+```bash
 go run main.go generate transaction remove-node --timestamp 1257894000 --sender-seed "concur vocalist rotten busload gap quote stinging undiluted surfer goofiness deviation starved"  --node-seed "sprinkled sneak species pork outpost thrift unwind cheesy vexingly dizzy neurology neatness"
 ```
 
 ### Transaction Set Account Dataset
 
-```
-go run main.go generate transaction set-account-dataset --timestamp 1257894000 --sender-seed "concur vocalist rotten busload gap quote stinging undiluted surfer goofiness deviation starved" --recipient VZvYd80p5S-rxSNQmMZwYXC7LyAzBmcfcj4MUUAdudWM --property "Member" --value "Welcome to the jungle"
+```bash
+go run main.go generate transaction set-account-dataset --timestamp 1257894000 --sender-seed "concur vocalist rotten busload gap quote stinging undiluted surfer goofiness deviation starved" --recipient "VZvYd80p5S-rxSNQmMZwYXC7LyAzBmcfcj4MUUAdudWM" --property "Member" --value "Welcome to the jungle"
 ```
 
 ### Transaction Remove Account Dataset
 
-```
-go run main.go generate transaction remove-account-dataset --timestamp 1257894000 --sender-seed "concur vocalist rotten busload gap quote stinging undiluted surfer goofiness deviation starved" --recipient VZvYd80p5S-rxSNQmMZwYXC7LyAzBmcfcj4MUUAdudWM --property "Member" --value "Good Boy"
+```bash
+go run main.go generate transaction remove-account-dataset --timestamp 1257894000 --sender-seed "concur vocalist rotten busload gap quote stinging undiluted surfer goofiness deviation starved" --recipient "VZvYd80p5S-rxSNQmMZwYXC7LyAzBmcfcj4MUUAdudWM" --property "Member" --value "Good Boy"
 ```
 
 ### Transaction Escrow Approval
@@ -81,7 +80,7 @@ go run main.go generate transaction remove-account-dataset --timestamp 125789400
 
 ### Block Generating Fake Blocks
 
-```
+```bash
 go run main.go generate block fake-blocks --numberOfBlocks=1000 --blocksmithSecretPhrase='sprinkled sneak species pork outpost thrift unwind cheesy vexingly dizzy neurology neatness' --out='../resource/zoobc.db'
 ```
 
@@ -112,7 +111,7 @@ ofiness deviation starved"
 
 ### Account Generating multisig
 ```bash
-go run main.go generate account multisig --addresses BCZnSfqpP5tqFQlMTYkDeBVFWnbyVK7vLr5ORFpTjgtN --addresses BCZD_VxfO2S9aziIL3cn_cXW7uPDVPOrnXuP98GEAUC7 --addresses BCZKLvgUYZ1KKx-jtF9KoJskjVPvB9jpIjfzzI6zDW0J —-min-sigs=2 --nonce=3
+go run main.go generate account multisig --addresses "BCZnSfqpP5tqFQlMTYkDeBVFWnbyVK7vLr5ORFpTjgtN" --addresses "BCZD_VxfO2S9aziIL3cn_cXW7uPDVPOrnXuP98GEAUC7" --addresses "BCZKLvgUYZ1KKx-jtF9KoJskjVPvB9jpIjfzzI6zDW0J" —-min-sigs=2 --nonce=3
 ```
 
 ### Account Generate with spesific signature type
@@ -123,7 +122,7 @@ go run main.go generate account random  --signature-type 1
 go run main.go genesis generate
 outputs cmd/genesis.go.new and cmd/cluster_config.json
 
-```
+```bash
 
 ### Genesis Generate From cmd/genesisblock/preRegisteredNodes.json and resource/zoobc.db
 
@@ -132,7 +131,7 @@ outputs cmd/genesis.go.new and cmd/cluster_config.json
 go run main.go genesis generate -w
 outputs cmd/genesis.go.new and cmd/cluster_config.json
 
-```
+```bash
 
 ### Genesis Generate From cmd/genesisblock/preRegisteredNodes.json and resource/zoobc.db, plus n random nodes registrations
 
@@ -144,3 +143,14 @@ outputs cmd/genesis.go.new and cmd/cluster_config.json
 ```
 
 ```
+
+### Generate Proof of Ownership Node Registry
+```bash
+go run main.go generate poow --node-seed "concur vocalist rotten busload gap quote stinging undiluted surfer goofiness deviation starved"   --node-owner-account-address "VZvYd80p5S-rxSNQmMZwYXC7LyAzBmcfcj4MUUAdudWM"  --db-node-path "../resource" --db-node-name "zoobc.db"
+--output-type "hex" 
+```
+
+### Rollback Blockchain State
+```bash
+go run main.go rollback blockchain --to-height 10 --db-path "../resource" --db-name "zoobc.db"
+```

cmd/rollback/rollback.go

@@ -2,18 +2,18 @@ package rollback
 
 import (
 	"database/sql"
-	"errors"
 	"fmt"
-	"time"
 
 	"github.com/spf13/cobra"
 	"github.com/zoobc/zoobc-core/common/chaintype"
+	"github.com/zoobc/zoobc-core/common/constant"
 	"github.com/zoobc/zoobc-core/common/database"
 	"github.com/zoobc/zoobc-core/common/model"
 	"github.com/zoobc/zoobc-core/common/query"
 )
 
 type (
+	// RunCommand represent of output function from rollback commands
 	RunCommand func(ccmd *cobra.Command, args []string)
 )
 
@@ -45,35 +45,26 @@ will call all existing rollback query and show the last status of database after
 func init() {
 	// Rollback Blockchain flag
 	rollbackBlockChainCmd.Flags().Uint32Var(&wantedBlockHeight, "to-height", 0, "Block height state wanted after rollback")
-	rollbackBlockChainCmd.Flags().StringVar(&dBPath, "db-path", "", "path of DB blockchain wanted to rollback")
-	rollbackBlockChainCmd.Flags().StringVar(&dBName, "db-name", "", "name of DB blockchain wanted to rollback")
+	rollbackBlockChainCmd.Flags().StringVar(&dBPath, "db-path", "../resource", "path of DB blockchain wanted to rollback")
+	rollbackBlockChainCmd.Flags().StringVar(&dBName, "db-name", "zoobc.db", "name of DB blockchain wanted to rollback")
 }
 
-func Commands(sqliteDB *sql.DB) *cobra.Command {
-	rollbackBlockChainCmd.Run = rollbackBlockChain(sqliteDB)
+// Commands return Instance of rollback command
+func Commands() *cobra.Command {
+	rollbackBlockChainCmd.Run = rollbackBlockChain()
 	rollbackCmd.AddCommand(rollbackBlockChainCmd)
 	return rollbackCmd
 }
 
 // RollbackBlockChain func to run rollback to all
-func rollbackBlockChain(defaultDB *sql.DB) RunCommand {
+func rollbackBlockChain() RunCommand {
 	var (
-		err               error
-		dB                = defaultDB
 		chaintypeRollback = chaintype.GetChainType(0)
+		dB, err           = getSqliteDB(dBPath, dBName)
 	)
-
-	// checking DB path and DB name flag, making sure both must use or both of them must default
-	if (dBPath == "" && dBName != "") || (dBPath != "" && dBName == "") {
-		panic(errors.New("please set both db-path and db-name"))
-	}
-
-	if dBPath != "" && dBName != "" {
-		dB, err = getSqliteDB(dBPath, dBName)
-		if err != nil {
-			fmt.Println("Failed get Db")
-			panic(err)
-		}
+	if err != nil {
+		fmt.Println("Failed get Db")
+		panic(err)
 	}
 
 	return func(ccmd *cobra.Command, args []string) {
@@ -131,7 +122,13 @@ func getSqliteDB(dbPath, dbName string) (*sql.DB, error) {
 	if err := sqliteDbInstance.InitializeDB(dbPath, dbName); err != nil {
 		return nil, err
 	}
-	sqliteDB, err := sqliteDbInstance.OpenDB(dbPath, dbName, 10, 10, 20*time.Minute)
+	sqliteDB, err := sqliteDbInstance.OpenDB(
+		dbPath,
+		dbName,
+		constant.SQLMaxOpenConnetion,
+		constant.SQLMaxIdleConnections,
+		constant.SQLMaxConnectionLifetime,
+	)
 	if err != nil {
 		return nil, err
 	}