aljaz/ark
1
0
Fork 0
mirror of https://github.com/aljazceru/ark.git synced 2025-12-18 12:44:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

[client] Improve coinselection & verbosity (#104)

Browse Source 
* cli logs + handle dust amount

* add wallet initialized

* Update client/common.go

Co-authored-by: Pietralberto Mazza <18440657+altafan@users.noreply.github.com>
Signed-off-by: Louis Singer <41042567+louisinger@users.noreply.github.com>

---------

Signed-off-by: Louis Singer <41042567+louisinger@users.noreply.github.com>
Co-authored-by: Pietralberto Mazza <18440657+altafan@users.noreply.github.com>
This commit is contained in:
Louis Singer
2024-02-12 18:02:09 +01:00
committed by GitHub
parent 7778b6b5a1
commit 9944a3cc48
3 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
client/common.go
View File

@@ -26,6 +26,10 @@ import (
"golang.org/x/term"
)
const (
DUST = 450
)
func hashPassword(password []byte) []byte {
hash := sha256.Sum256(password)
return hash[:]
@@ -57,15 +61,14 @@ func verifyPassword(password []byte) error {
}
func readPassword() ([]byte, error) {
fmt.Print("password: ")
fmt.Print("unlock your wallet with password: ")
passwordInput, err := term.ReadPassword(int(syscall.Stdin))
fmt.Println() // new line
if err != nil {
return nil, err
}
err = verifyPassword(passwordInput)
if err != nil {
if err := verifyPassword(passwordInput); err != nil {
return nil, err
}
@@ -92,7 +95,7 @@ func privateKeyFromPassword() (*secp256k1.PrivateKey, error) {
if err != nil {
return nil, err
}
fmt.Println("key unlocked")
fmt.Println("wallet unlocked")
cypher := NewAES128Cypher()
privateKeyBytes, err := cypher.Decrypt(encryptedPrivateKey, password)
@@ -144,10 +147,12 @@ func getServiceProviderPublicKey() (*secp256k1.PublicKey, error) {
func coinSelect(vtxos []vtxo, amount uint64) ([]vtxo, uint64, error) {
selected := make([]vtxo, 0)
notSelected := make([]vtxo, 0)
selectedAmount := uint64(0)
for _, vtxo := range vtxos {
if selectedAmount >= amount {
notSelected = append(notSelected, vtxo)
break
}
@@ -161,6 +166,13 @@ func coinSelect(vtxos []vtxo, amount uint64) ([]vtxo, uint64, error) {
change := selectedAmount - amount
if change < DUST {
if len(notSelected) > 0 {
selected = append(selected, notSelected[0])
change += notSelected[0].amount
}
}
return selected, change, nil
}
@@ -500,7 +512,7 @@ func handleRoundStream(
forfeits := event.GetRoundFinalization().GetForfeitTxs()
signedForfeits := make([]string, 0)
fmt.Println("signing forfeit txs...")
fmt.Print("signing forfeit txs... ")
explorer := NewExplorer()
@@ -533,7 +545,7 @@ func handleRoundStream(
// if no forfeit txs have been signed, start pinging again and wait for the next round
if len(signedForfeits) == 0 {
fmt.Println("no forfeit txs to sign, waiting for the next round...")
fmt.Printf("\nno forfeit txs to sign, waiting for the next round...\n")
pingStop = nil
for pingStop == nil {
pingStop = ping(ctx, client, pingReq)
@@ -541,13 +553,16 @@ func handleRoundStream(
continue
}
fmt.Printf("%d forfeit txs signed, finalizing payment...\n", len(signedForfeits))
fmt.Printf("%d signed\n", len(signedForfeits))
fmt.Print("finalizing payment... ")
_, err = client.FinalizePayment(ctx.Context, &arkv1.FinalizePaymentRequest{
SignedForfeitTxs: signedForfeits,
})
if err != nil {
return "", err
}
fmt.Print("done.\n")
fmt.Println("waiting for round finalization...")
continue
}