Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/client/cli/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ var (
dataDir string
configPath string
nonInteractive bool
verbose bool
cfg *configs.Config
)

Expand All @@ -31,6 +32,11 @@ func init() {
if err := viper.BindPFlag("root_directory", rootCmd.PersistentFlags().Lookup("data_dir")); err != nil {
panic(err)
}

rootCmd.PersistentFlags().BoolVar(&verbose, "verbose", false, "Show verbose output")
if err := viper.BindPFlag("verbose", rootCmd.PersistentFlags().Lookup("verbose")); err != nil {
panic(err)
}
}

var rootCmd = &cobra.Command{
Expand Down
44 changes: 30 additions & 14 deletions app/client/cli/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"strconv"
"strings"

"github.com/pokt-network/pocket/logger"
"github.com/pokt-network/pocket/shared/codec"
coreTypes "github.com/pokt-network/pocket/shared/core/types"
"github.com/pokt-network/pocket/shared/crypto"
Expand Down Expand Up @@ -81,7 +80,7 @@ func keysCreateCommands() []*cobra.Command {
return err
}

logger.Global.Info().Str("address", kp.GetAddressString()).Msg("New Key Created")
fmt.Printf("New key created 🔐: %s\n", kp.GetAddressString())

return nil
},
Expand Down Expand Up @@ -129,7 +128,7 @@ func keysUpdateCommands() []*cobra.Command {
return err
}

logger.Global.Info().Str("address", addrHex).Msg("Key updated")
fmt.Printf("Key updated 🔐: %s\n", addrHex)

return nil
},
Expand Down Expand Up @@ -176,7 +175,7 @@ func keysDeleteCommands() []*cobra.Command {
return err
}

logger.Global.Info().Str("address", addrHex).Msg("Key deleted")
fmt.Printf("Key deleted ❌: %s\n", addrHex)

return nil
},
Expand Down Expand Up @@ -215,7 +214,10 @@ func keysGetCommands() []*cobra.Command {
return err
}

logger.Global.Info().Strs("addresses", addresses).Msg("Get all keys")
fmt.Println("All keys 🔑")
for _, addr := range addresses {
fmt.Println(addr)
}

return nil
},
Expand Down Expand Up @@ -244,7 +246,8 @@ func keysGetCommands() []*cobra.Command {
return err
}

logger.Global.Info().Str("address", addrHex).Str("public_key", kp.GetPublicKey().String()).Msg("Found key")
fmt.Println("Key details 🕵️")
fmt.Printf("Address: %s\nPublic Key: %s\n", addrHex, kp.GetPublicKey().String())

return nil
},
Expand Down Expand Up @@ -301,11 +304,11 @@ func keysExportCommands() []*cobra.Command {

// Write to stdout or file
if outputFile == "" {
logger.Global.Info().Str("private_key", exportString).Msg("Key exported")
fmt.Printf("Private Key 🔒: %s\n", exportString)
return nil
}

logger.Global.Info().Str("output_file", outputFile).Msg("Exporting private key string to file...")
fmt.Println("Writing private key to file")

return utils.WriteOutput(exportString, outputFile)
},
Expand Down Expand Up @@ -380,7 +383,7 @@ func keysImportCommands() []*cobra.Command {
return err
}

logger.Global.Info().Str("address", kp.GetAddressString()).Msg("Key imported")
fmt.Printf("Key imported 📥: %s\n", kp.GetAddressString())

return nil
},
Expand Down Expand Up @@ -436,7 +439,7 @@ func keysSignMsgCommands() []*cobra.Command {

sigHex := hex.EncodeToString(sigBz)

logger.Global.Info().Str("signature", sigHex).Str("address", addrHex).Msg("Message signed")
fmt.Printf("Message signed 🔏\nSignature: %s\n", sigHex)

return nil
},
Expand Down Expand Up @@ -475,7 +478,12 @@ func keysSignMsgCommands() []*cobra.Command {
return err
}

logger.Global.Info().Str("address", addrHex).Bool("valid", valid).Msg("Signature checked")
if !valid {
fmt.Println("Signature is not valid ❌")
return nil
}

fmt.Println("Signature is valid ✅")

return nil
},
Expand Down Expand Up @@ -563,7 +571,7 @@ func keysSignTxCommands() []*cobra.Command {
return err
}

logger.Global.Info().Str("signed_transaction_file", outputFile).Str("address", addrHex).Msg("Message signed")
fmt.Printf("Message signed 🔏\nKey Address: %s\nSignature file: %s\n", addrHex, outputFile)

return nil
},
Expand Down Expand Up @@ -627,7 +635,12 @@ func keysSignTxCommands() []*cobra.Command {
return err
}

logger.Global.Info().Str("address", addrHex).Bool("valid", valid).Msg("Signature checked")
if !valid {
fmt.Println("Signature is not valid ❌")
return nil
}

fmt.Println("Signature is valid ✅")

return nil
},
Expand Down Expand Up @@ -679,7 +692,10 @@ func keysSlipCommands() []*cobra.Command {
return err
}

logger.Global.Info().Str("address", kp.GetAddressString()).Str("parent", parentAddr).Uint32("index", index).Bool("stored", storeChild).Msg("Child key derived")
fmt.Printf("Child key created 🚸\nChild Address: %s\nParent Address: %s\n", kp.GetAddressString(), parentAddr)
if storeChild {
fmt.Println("Child key stored in the Keybase 🔐")
}

return nil
},
Expand Down
4 changes: 2 additions & 2 deletions app/client/cli/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"io"
"net/http"
"os"

"github.com/pokt-network/pocket/logger"
"github.com/pokt-network/pocket/rpc"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -47,7 +47,7 @@ func queryCommands() []*cobra.Command {
statusCode := response.StatusCode
body, err := io.ReadAll(response.Body)
if err != nil {
logger.Global.Error().Err(err).Msg("Error reading response body")
fmt.Fprintf(os.Stderr, "❌ Error reading response body: %s\n", err.Error())
return err
}
if statusCode == http.StatusOK {
Expand Down
Binary file modified build/debug_keybase/debug_keybase.bak
Binary file not shown.
11 changes: 7 additions & 4 deletions build/debug_keybase/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"github.com/pokt-network/pocket/app/client/keybase"
"github.com/pokt-network/pocket/runtime/configs"
"github.com/pokt-network/pocket/runtime/defaults"
cryptoPocket "github.com/pokt-network/pocket/shared/crypto"
"github.com/pokt-network/pocket/shared/utils"
)
Expand Down Expand Up @@ -52,7 +53,7 @@ func main() {
}

func dumpKeybase(privateKeysYamlBytes []byte, targetFilePath string) {
fmt.Println("⚙️ Initializing debug Keybase...")
fmt.Println("⚙️ Initializing debug Keybase...")

validatorKeysPairMap, err := parseValidatorPrivateKeysFromEmbeddedYaml(privateKeysYamlBytes)
if err != nil {
Expand All @@ -65,7 +66,9 @@ func dumpKeybase(privateKeysYamlBytes []byte, targetFilePath string) {
}
defer os.RemoveAll(tmpDir)

kb, err := keybase.NewKeybase(&configs.KeybaseConfig{})
kb, err := keybase.NewKeybase(&configs.KeybaseConfig{
FilePath: defaults.DefaultRootDirectory + "/keys",
})
if err != nil {
panic(err)
}
Expand All @@ -75,7 +78,7 @@ func dumpKeybase(privateKeysYamlBytes []byte, targetFilePath string) {
}

// Add validator addresses if not present
fmt.Println("✍️ Debug keybase initializing... Adding all the validator keys")
fmt.Println("✍️ Debug keybase initializing... Adding all the validator keys")

// Use writebatch to speed up bulk insert
wb := db.NewWriteBatch()
Expand Down Expand Up @@ -128,7 +131,7 @@ func dumpKeybase(privateKeysYamlBytes []byte, targetFilePath string) {

fmt.Println("✅ Keybase initialized!")

fmt.Println("⚙️ Creating a dump of the Keybase...")
fmt.Println("⚙️ Creating a dump of the Keybase...")
backupFile, err := os.Create(targetFilePath)
if err != nil {
panic(err)
Expand Down
10 changes: 8 additions & 2 deletions runtime/configs/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,22 @@ func ParseConfig(cfgFile string) *Config {
viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
viper.AutomaticEnv()

verbose := viper.GetBool("verbose")

if err := viper.ReadInConfig(); err != nil {
if _, ok := err.(viper.ConfigFileNotFoundError); ok && cfgFile == "" {
log.Default().Printf("No config provided, using defaults")
if verbose {
log.Default().Printf("No config provided, using defaults")
}
} else {
// TODO: This is a log call to avoid import cycles. Refactor logger_config.proto to avoid this.
log.Fatalf("[ERROR] fatal error reading config file %s", err.Error())
}
} else {
// TODO: This is a log call to avoid import cycles. Refactor logger_config.proto to avoid this.
log.Default().Printf("Using config file: %s", viper.ConfigFileUsed())
if verbose {
log.Default().Printf("Using config file: %s", viper.ConfigFileUsed())
}
}

decoderConfig := func(dc *mapstructure.DecoderConfig) {
Expand Down