From 8ff4951fdb273f36bd74214794e063cdf65f182b Mon Sep 17 00:00:00 2001
From: elnosh <elnosh@pm.me>
Date: Wed, 20 Sep 2023 12:17:44 +0000
Subject: [PATCH] fix panic in send command (#53)

* get mint url for keyset in send command

* fix send regex

* use mint url from filteredKeySets
---
 cmd/cashu/feni.go      |  7 ++++---
 cmd/cashu/feni/send.go | 20 +++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/cmd/cashu/feni.go b/cmd/cashu/feni.go
index 9f00b70..7ceeaa6 100644
--- a/cmd/cashu/feni.go
+++ b/cmd/cashu/feni.go
@@ -2,14 +2,15 @@ package main
 
 import (
 	"fmt"
-	"github.com/c-bata/go-prompt"
-	"github.com/cashubtc/cashu-feni/cmd/cashu/feni"
 	"os"
 	"regexp"
 	"strings"
+
+	"github.com/c-bata/go-prompt"
+	"github.com/cashubtc/cashu-feni/cmd/cashu/feni"
 )
 
-var sendRegex = regexp.MustCompile("send [0-9] ")
+var sendRegex = regexp.MustCompile("send [0-9]")
 var advancedPrompt = &feni.CobraPrompt{
 	RootCmd:                  feni.RootCmd,
 	PersistFlagValues:        true,
diff --git a/cmd/cashu/feni/send.go b/cmd/cashu/feni/send.go
index ecebcb6..b3d237c 100644
--- a/cmd/cashu/feni/send.go
+++ b/cmd/cashu/feni/send.go
@@ -3,12 +3,13 @@ package feni
 import (
 	"bytes"
 	"fmt"
+	"strconv"
+
 	"github.com/c-bata/go-prompt"
 	"github.com/cashubtc/cashu-feni/cashu"
 	"github.com/cashubtc/cashu-feni/crypto"
 	"github.com/samber/lo"
 	"github.com/spf13/cobra"
-	"strconv"
 )
 
 func init() {
@@ -81,6 +82,7 @@ func askMintSelection(cmd *cobra.Command) error {
 	Wallet.loadDefaultMint()
 	return nil
 }
+
 func askInt(cmd *cobra.Command) int {
 	reader := cmd.InOrStdin()
 	in := []byte{}
@@ -101,7 +103,6 @@ func askInt(cmd *cobra.Command) int {
 	s, err := strconv.Atoi(string(in))
 	fmt.Printf("%d, %v", s, err)
 	return s
-	return 0
 }
 
 func send(cmd *cobra.Command, args []string) {
@@ -117,16 +118,20 @@ func send(cmd *cobra.Command, args []string) {
 	if lockFlag != "" && flagIsPay2ScriptHash() {
 		p2sh = true
 	}
+
 	mint, _ := strconv.Atoi(args[1])
 	Wallet.Client.Url = filteredKeySets[mint].MintUrl
 	Wallet.loadDefaultMint()
-	amount, err := strconv.Atoi(args[0])
+
+	amount, err := strconv.ParseUint(args[0], 10, 64)
 	if err != nil {
-		panic(err)
+		fmt.Println("invalid amount")
+		return
 	}
-	_, sendProofs, err := Wallet.SplitToSend(uint64(amount), lockFlag, true)
+	_, sendProofs, err := Wallet.SplitToSend(amount, lockFlag, true)
 	if err != nil {
-		panic(err)
+		fmt.Println(err)
+		return
 	}
 	var hide bool
 	if lockFlag != "" && !p2sh {
@@ -134,7 +139,8 @@ func send(cmd *cobra.Command, args []string) {
 	}
 	token, err := Wallet.serializeToken(sendProofs, hide)
 	if err != nil {
-		panic(err)
+		fmt.Println(err)
+		return
 	}
 	fmt.Println(token)
 }