Use change address from fromAddress only if useExisting is set to true

This commit is contained in:
Ori Newman 2022-11-17 00:24:35 +02:00
parent 9ce6b2b187
commit 039cd40d02

View File

@ -10,13 +10,13 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
) )
func (s *server) changeAddress(useFirst bool, fromAddresses []*walletAddress) (util.Address, *walletAddress, error) { func (s *server) changeAddress(useExisting bool, fromAddresses []*walletAddress) (util.Address, *walletAddress, error) {
internalIndex := uint32(0)
var walletAddr *walletAddress var walletAddr *walletAddress
if len(fromAddresses) != 0 { if len(fromAddresses) != 0 && useExisting {
walletAddr = fromAddresses[0] walletAddr = fromAddresses[0]
} else { } else {
if !useFirst { internalIndex := uint32(0)
if !useExisting {
err := s.keysFile.SetLastUsedInternalIndex(s.keysFile.LastUsedInternalIndex() + 1) err := s.keysFile.SetLastUsedInternalIndex(s.keysFile.LastUsedInternalIndex() + 1)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err