From 039cd40d0212d8b37e392d16a6895a46f4d388b7 Mon Sep 17 00:00:00 2001 From: Ori Newman Date: Thu, 17 Nov 2022 00:24:35 +0200 Subject: [PATCH] Use change address from fromAddress only if useExisting is set to true --- cmd/kaspawallet/daemon/server/address.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kaspawallet/daemon/server/address.go b/cmd/kaspawallet/daemon/server/address.go index 991753871..acd80c6b4 100644 --- a/cmd/kaspawallet/daemon/server/address.go +++ b/cmd/kaspawallet/daemon/server/address.go @@ -10,13 +10,13 @@ import ( "github.com/pkg/errors" ) -func (s *server) changeAddress(useFirst bool, fromAddresses []*walletAddress) (util.Address, *walletAddress, error) { - internalIndex := uint32(0) +func (s *server) changeAddress(useExisting bool, fromAddresses []*walletAddress) (util.Address, *walletAddress, error) { var walletAddr *walletAddress - if len(fromAddresses) != 0 { + if len(fromAddresses) != 0 && useExisting { walletAddr = fromAddresses[0] } else { - if !useFirst { + internalIndex := uint32(0) + if !useExisting { err := s.keysFile.SetLastUsedInternalIndex(s.keysFile.LastUsedInternalIndex() + 1) if err != nil { return nil, nil, err