Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-06-07 14:46:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wallet parse/send/create commands improvement (#2024)

Browse Source 
* Fix wallet parsing of multi tx data

* Output wallet msgs to stderr when creating/signing tx

* Fix go fmt

Co-authored-by: Ori Newman <orinewman1@gmail.com>
This commit is contained in:
biospb 2022-06-03 19:06:51 +03:00 committed by GitHub
parent b200b77541
commit 24848da895
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kaspawallet/create_unsigned_tx.go
View File

@ -3,6 +3,7 @@ package main
import ( import (
"context" "context"
"fmt" "fmt"
"os"
"github.com/kaspanet/kaspad/cmd/kaspawallet/daemon/client" "github.com/kaspanet/kaspad/cmd/kaspawallet/daemon/client"
"github.com/kaspanet/kaspad/cmd/kaspawallet/daemon/pb" "github.com/kaspanet/kaspad/cmd/kaspawallet/daemon/pb"
@ -29,7 +30,8 @@ func createUnsignedTransaction(conf *createUnsignedTransactionConfig) error {
return err return err
} }
fmt.Println("Created unsigned transaction") fmt.Fprintln(os.Stderr, "Created unsigned transaction")
fmt.Println(encodeTransactionsToHex(response.UnsignedTransactions)) fmt.Println(encodeTransactionsToHex(response.UnsignedTransactions))
return nil return nil
} }

8
cmd/kaspawallet/parse.go
View File

@ -29,17 +29,18 @@ func parse(conf *parseConfig) error {
transactionHex = strings.TrimSpace(string(transactionHexBytes)) transactionHex = strings.TrimSpace(string(transactionHexBytes))
} }
transaction, err := hex.DecodeString(transactionHex) transactions, err := decodeTransactionsFromHex(transactionHex)
if err != nil { if err != nil {
return err return err
} }
for i, transaction := range transactions {
partiallySignedTransaction, err := serialization.DeserializePartiallySignedTransaction(transaction) partiallySignedTransaction, err := serialization.DeserializePartiallySignedTransaction(transaction)
if err != nil { if err != nil {
return err return err
} }
fmt.Printf("Transaction ID: \t%s\n", consensushashing.TransactionID(partiallySignedTransaction.Tx)) fmt.Printf("Transaction #%d ID: \t%s\n", i+1, consensushashing.TransactionID(partiallySignedTransaction.Tx))
fmt.Println() fmt.Println()
allInputSompi := uint64(0) allInputSompi := uint64(0)
@ -77,7 +78,8 @@ func parse(conf *parseConfig) error {
} }
fmt.Println() fmt.Println()
fmt.Printf("Fee:\t%d Sompi\n", allInputSompi-allOutputSompi) fmt.Printf("Fee:\t%d Sompi\n\n", allInputSompi-allOutputSompi)
}
return nil return nil
} }

6
cmd/kaspawallet/sign.go
View File

@ -3,6 +3,7 @@ package main
import ( import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os"
"strings" "strings"
"github.com/kaspanet/kaspad/cmd/kaspawallet/keys" "github.com/kaspanet/kaspad/cmd/kaspawallet/keys"
@ -66,12 +67,11 @@ func sign(conf *signConfig) error {
} }
if areAllTransactionsFullySigned { if areAllTransactionsFullySigned {
fmt.Println("The transaction is signed and ready to broadcast") fmt.Fprintln(os.Stderr, "The transaction is signed and ready to broadcast")
} else { } else {
fmt.Println("Successfully signed transaction") fmt.Fprintln(os.Stderr, "Successfully signed transaction")
} }
fmt.Println("Transaction: ")
fmt.Println(encodeTransactionsToHex(updatedPartiallySignedTransactions)) fmt.Println(encodeTransactionsToHex(updatedPartiallySignedTransactions))
return nil return nil
} }