Use one of the From addresses as a change address

changelog.txt

@@ -1,3 +1,8 @@
+Kaspad v0.12.9 - 2022-10-23
+===========================
+
+* Create directory before locking lock file (#2160)
+
 Kaspad v0.12.8 - 2022-10-23
 ===========================
 

cmd/kaspawallet/daemon/server/address.go

@@ -10,27 +10,33 @@ import (
 	"github.com/pkg/errors"
 )
 
-func (s *server) changeAddress(useFirst bool) (util.Address, *walletAddress, error) {
+func (s *server) changeAddress(useFirst bool, fromAddresses []*walletAddress) (util.Address, *walletAddress, error) {
 	internalIndex := uint32(0)
-	if !useFirst {
-		err := s.keysFile.SetLastUsedInternalIndex(s.keysFile.LastUsedInternalIndex() + 1)
-		if err != nil {
-			return nil, nil, err
+	var walletAddr *walletAddress
+	if len(fromAddresses) != 0 {
+		walletAddr = fromAddresses[0]
+	} else {
+		if !useFirst {
+			err := s.keysFile.SetLastUsedInternalIndex(s.keysFile.LastUsedInternalIndex() + 1)
+			if err != nil {
+				return nil, nil, err
+			}
+
+			err = s.keysFile.Save()
+			if err != nil {
+				return nil, nil, err
+			}
+
+			internalIndex = s.keysFile.LastUsedInternalIndex()
 		}
 
-		err = s.keysFile.Save()
-		if err != nil {
-			return nil, nil, err
+		walletAddr = &walletAddress{
+			index:         internalIndex,
+			cosignerIndex: s.keysFile.CosignerIndex,
+			keyChain:      libkaspawallet.InternalKeychain,
 		}
-
-		internalIndex = s.keysFile.LastUsedInternalIndex()
 	}
 
-	walletAddr := &walletAddress{
-		index:         internalIndex,
-		cosignerIndex: s.keysFile.CosignerIndex,
-		keyChain:      libkaspawallet.InternalKeychain,
-	}
 	path := s.walletAddressPath(walletAddr)
 	address, err := libkaspawallet.Address(s.params, s.keysFile.ExtendedPublicKeys, s.keysFile.MinimumSignatures, path, s.keysFile.ECDSA)
 	if err != nil {

cmd/kaspawallet/daemon/server/create_unsigned_transaction.go

@@ -61,7 +61,7 @@ func (s *server) createUnsignedTransactions(address string, amount uint64, fromA
 		return nil, err
 	}
 
-	changeAddress, changeWalletAddress, err := s.changeAddress(useExistingChangeAddress)
+	changeAddress, changeWalletAddress, err := s.changeAddress(useExistingChangeAddress, fromAddresses)
 	if err != nil {
 		return nil, err
 	}

cmd/kaspawallet/keys/keys.go

@@ -414,6 +414,11 @@ func (d *File) TryLock() error {
 	}
 
 	lockFile := flock.New(d.path + ".lock")
+	err := createFileDirectoryIfDoesntExist(lockFile.Path())
+	if err != nil {
+		return err
+	}
+
 	flockMap[d.path] = lockFile
 
 	success, err := lockFile.TryLock()