Merge pull request #52 from KiraCore/feature/txExecuteScreen

Feature/tx execute screen

Author: PeepoFrog

gui/dialog_connect.go

@@ -234,14 +234,19 @@ func (g *Gui) ShowConnect() {
 		}
 
 		// / test ui block
-		// testButton := widget.NewButton("connect to tested env", func() {
-		// 	ipEntry.Text = "192.168.1.102"
-		// 	userEntry.Text = "d"
-		// 	passwordEntry.Text = "d"
-		// 	passphraseCheck.SetChecked(false)
+		testButton := widget.NewButton("connect to tested env", func() {
+			ipEntry.Text = "192.168.1.101"
+			userEntry.Text = "d"
+			passwordEntry.Text = "d"
+			passphraseCheck.SetChecked(false)
 
-		// 	submitFunc()
-		// })
+			submitFunc()
+		})
+
+		if !g.DeveloperMode {
+			testButton.Disable()
+			testButton.Hide()
+		}
 
 		///
 
@@ -259,7 +264,7 @@ func (g *Gui) ShowConnect() {
 				keyEntryBox,
 				privKeyCheck,
 				connectButton,
-				// testButton,
+				testButton,
 			),
 			nil, nil, nil,
 			container.NewBorder(nil, nil, nil, nil, container.NewVScroll(errorLabel)),

gui/dialog_executeSekaid.go

@@ -1,30 +1,61 @@
 package gui
 
 import (
+	"encoding/json"
 	"fmt"
 	"log"
+	"strings"
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/data/binding"
 	"fyne.io/fyne/v2/widget"
 	dialogWizard "github.com/KiraCore/kensho/gui/dialogs"
+	"github.com/KiraCore/kensho/helper/httph"
+	"github.com/KiraCore/kensho/types"
 )
 
 func showSekaiExecuteDialog(g *Gui) {
 	var wizard *dialogWizard.Wizard
 
-	cmdEntry := widget.NewEntry()
+	sekaidCmdName := "/sekaid"
+	cmdData := binding.NewString()
+	cmdEntry := widget.NewEntryWithData(cmdData)
 	cmdEntry.MultiLine = true
 	cmdEntry.Wrapping = fyne.TextWrapWord
 
 	doneAction := binding.NewDataListener(func() {
 		g.WaitDialog.ShowWaitDialog()
 		log.Printf("Trying to execute: %v", cmdEntry.Text)
+		cmd, _ := cmdData.Get()
+		cmd = strings.ReplaceAll(cmd, "\n", " ")
+		cmd = fmt.Sprintf("%v %v", sekaidCmdName, cmd)
 
-		// execute submit
+		cmdArgs := strings.Split(cmd, " ")
+		cmdArgs = RemoveEmptyAndWhitespaceStrings(cmdArgs)
+
+		cmdStruct := types.ExecSekaiCommands{Command: "sekaid", ExecArgs: types.ExecArgs{Exec: cmdArgs}}
+
+		payload, err := json.Marshal(cmdStruct)
+		if err != nil {
+			log.Printf("error when marshaling cmdStruct: %v", err.Error())
+			g.WaitDialog.HideWaitDialog()
+			g.showErrorDialog(err, binding.NewDataListener(func() {}))
+			return
+		}
+
+		o, err := httph.ExecHttpRequestBySSHTunnel(g.sshClient, types.SEKIN_EXECUTE_ENDPOINT, "POST", payload)
+		if err != nil {
+			log.Printf("error when executing cmdStruct: %v", err.Error())
+			g.WaitDialog.HideWaitDialog()
+			g.showErrorDialog(err, binding.NewDataListener(func() {}))
+			return
+		}
+
+		log.Printf("output of <%v>:\n%v", cmd, string(o))
 		g.WaitDialog.HideWaitDialog()
-		wizard.Hide()
+
+		showInfoDialog(g, "Out", string(o))
 	})
 
 	submitButton := widget.NewButton("Submit", func() {
@@ -37,14 +68,36 @@ func showSekaiExecuteDialog(g *Gui) {
 		wizard.Hide()
 	})
 	submitButton.Importance = widget.HighImportance
+
+	hintCmd := "'tx bank send <from_key_or_address> <to_address> 1000ukex --chain-id=chaosnet2 --home=/sekai --fees=100ukex \n--keyring-backend=test --yes --broadcast-mode=block --log_format=json --output=json'  "
+	hintText := &widget.TextSegment{Text: hintCmd, Style: widget.RichTextStyleBlockquote}
+	welcomeText := &widget.TextSegment{Text: "Example:", Style: widget.RichTextStyle{TextStyle: fyne.TextStyle{Bold: true}}}
+
+	hintTextWidget := widget.NewRichText(welcomeText, hintText)
+	// hintTextWidget.Wrapping = fyne.TextWrapWord  // dont use word wrapping, richtext glitches with this one
+
+	entryItem := widget.NewFormItem(sekaidCmdName[1:]+":", container.NewVBox(cmdEntry))
+
 	content := container.NewBorder(
-		widget.NewLabel("Enter sekai command below"),
+		nil,
 		container.NewVBox(submitButton, closeButton),
-		nil, nil,
-		cmdEntry,
+		nil,
+		nil,
+		container.NewVBox(widget.NewForm(entryItem), hintTextWidget),
 	)
-
-	wizard = dialogWizard.NewWizard("Sekai cmd executor", content)
+	wizard = dialogWizard.NewWizard("Sekai executor", content)
 	wizard.Show(g.Window)
-	wizard.Resize(fyne.NewSize(900, 200))
+	wizard.Resize(fyne.NewSize(800, 200))
+
+}
+
+func RemoveEmptyAndWhitespaceStrings(input []string) []string {
+	var result []string
+	for _, str := range input {
+		trimmedStr := strings.TrimSpace(str)
+		if trimmedStr != "" {
+			result = append(result, trimmedStr)
+		}
+	}
+	return result
 }

gui/dialogs.go

@@ -15,6 +15,7 @@ import (
 
 	dialogWizard "github.com/KiraCore/kensho/gui/dialogs"
 	"github.com/KiraCore/kensho/helper/gssh"
+	"github.com/KiraCore/kensho/utils"
 	"github.com/atotto/clipboard"
 )
 
@@ -76,7 +77,8 @@ func showInfoDialog(g *Gui, infoTitle, infoString string) {
 	closeButton := widget.NewButton("Close", func() { wizard.Hide() })
 	infoLabel := widget.NewLabel(infoString)
 	infoLabel.Wrapping = 2
-	content := container.NewBorder(nil, closeButton, nil, nil,
+	copyButton := widget.NewButton("Copy", func() { utils.CopyToClipboard(infoLabel.Text) })
+	content := container.NewBorder(nil, container.NewVBox(copyButton, closeButton), nil, nil,
 		container.NewHScroll(
 			container.NewVScroll(
 				infoLabel,

gui/gui.go

@@ -29,7 +29,8 @@ type Gui struct {
 	NodeInfo                nodeInfoScreen
 	TxExec                  TxExecBinding
 
-	Version string
+	DeveloperMode bool
+	Version       string
 }
 
 type TxExecBinding struct {
@@ -42,6 +43,8 @@ type Host struct {
 }
 
 func (g *Gui) MakeGui() fyne.CanvasObject {
+	log.Printf("Developer mode: %v\n", g.DeveloperMode)
+
 	title := widget.NewLabel(appName)
 	info := widget.NewLabel("Welcome to  Kensho. Navigate trough panel on the left side")
 	mainWindow := container.NewStack()

gui/screen_nodeInfo.go

@@ -171,7 +171,7 @@ func makeNodeInfoTab(g *Gui) fyne.CanvasObject {
 		widget.NewFormItem("Val.NodeID:", nodeIDLabel),
 		widget.NewFormItem("Gen.SHA256:", genesisChecksumLabel),
 	)
-	execFunc := func(args types.ExecSekaiCmd) {
+	execFunc := func(args types.ExecSekaiMaintenanceCommands) {
 		g.TxExec.TxExecutionStatusBinding.Set(true)
 
 		request := types.RequestTXPayload{Command: "tx", Args: args}
@@ -195,7 +195,7 @@ func makeNodeInfoTab(g *Gui) fyne.CanvasObject {
 	monikerEntryData := binding.NewString()
 	claimDataListener := binding.NewDataListener(func() {
 		moniker, _ := monikerEntryData.Get()
-		execFunc(types.ExecSekaiCmd{TX: types.ClaimValidatorSeat, Moniker: moniker})
+		execFunc(types.ExecSekaiMaintenanceCommands{TX: types.ClaimValidatorSeat, Moniker: moniker})
 	})
 
 	claimValidatorSeatFunc := func() {
@@ -204,15 +204,15 @@ func makeNodeInfoTab(g *Gui) fyne.CanvasObject {
 	}
 	pauseValidatorFunc := func() {
 		// pause
-		execFunc(types.ExecSekaiCmd{TX: types.Pause})
+		execFunc(types.ExecSekaiMaintenanceCommands{TX: types.Pause})
 	}
 	unpauseValidatorFunc := func() {
 		// unpause tx
-		execFunc(types.ExecSekaiCmd{TX: types.Unpause})
+		execFunc(types.ExecSekaiMaintenanceCommands{TX: types.Unpause})
 	}
 	activateValidatorFunc := func() {
 		// activate
-		execFunc(types.ExecSekaiCmd{TX: types.Activate})
+		execFunc(types.ExecSekaiMaintenanceCommands{TX: types.Activate})
 	}
 
 	errBinding := binding.NewUntyped()
@@ -365,5 +365,8 @@ func makeNodeInfoTab(g *Gui) fyne.CanvasObject {
 	validatorsTopPart := container.NewHBox(activeValidatorsBox, pausedValidatorsBox, inactiveValidatorsBox, jailedValidatorsBox, waitingValidatorsBox)
 
 	// return container.NewBorder(nil, refreshButton, nil, validatorsRightPart, mainInfo)
-	return container.NewBorder(container.NewCenter(validatorsTopPart), validatorControlButton, nil, nil, mainInfo)
+	executeSekaiCmdButton := widget.NewButton("Execute sekai command", func() {
+		showSekaiExecuteDialog(g)
+	})
+	return container.NewBorder(container.NewCenter(validatorsTopPart), container.NewVBox(validatorControlButton, executeSekaiCmdButton), nil, nil, mainInfo)
 }

helper/httph/httph.go

@@ -147,7 +147,7 @@ func ValidateIP(input string) bool {
 }
 
 func ExecHttpRequestBySSHTunnel(sshClient *ssh.Client, address, method string, payload []byte) ([]byte, error) {
-	log.Printf("requesting <%v>\nPayload: %+v", address, payload)
+	log.Printf("requesting <%v>\nPayload: %+v", address, string(payload))
 	dialer := func(network, addr string) (net.Conn, error) {
 		conn, err := sshClient.Dial(network, addr)
 		if err != nil {

main.go

@@ -1,19 +1,25 @@
 package main
 
 import (
+	"flag"
+
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/app"
 	"github.com/KiraCore/kensho/gui"
 )
 
 func main() {
+	devMode := flag.Bool("dev", false, "Enable developer mode")
+	flag.Parse()
+
 	a := app.NewWithID("Kensho")
 	w := a.NewWindow("Kensho")
 	w.SetMaster()
 	w.Resize(fyne.NewSize(1024, 768))
 	g := gui.Gui{
-		Window:  w,
-		Version: a.Metadata().Version,
+		DeveloperMode: *devMode,
+		Window:        w,
+		Version:       a.Metadata().Version,
 	}
 	g.WaitDialog = gui.NewWaitDialog(&g)
 	content := g.MakeGui()

types/types.go

@@ -37,10 +37,19 @@ const (
 )
 
 type RequestTXPayload struct {
-	Command string       `json:"command"`
-	Args    ExecSekaiCmd `json:"args"`
+	Command string                       `json:"command"`
+	Args    ExecSekaiMaintenanceCommands `json:"args"`
 }
-type ExecSekaiCmd struct {
+type ExecSekaiMaintenanceCommands struct {
 	TX      Cmd    `json:"tx"` //pause, unpause, activate,
 	Moniker string `json:"moniker"`
 }
+
+type ExecSekaiCommands struct {
+	Command  string   `json:"command"`
+	ExecArgs ExecArgs `json:"args"`
+}
+
+type ExecArgs struct {
+	Exec []string `json:"exec"`
+}

utils/utils.go

@@ -0,0 +1,16 @@
+package utils
+
+import (
+	"fmt"
+
+	"github.com/atotto/clipboard"
+)
+
+func CopyToClipboard(text string) error {
+	// Copy the provided text to the clipboard
+	err := clipboard.WriteAll(text)
+	if err != nil {
+		return fmt.Errorf("failed to copy text to clipboard: %w", err)
+	}
+	return nil
+}