Merge pull request #1475 from bhandras/commitvirtualpsbts-custom-lock

taprpc: support custom lock ID and expiration in CommitVirtualPsbts

Author: guggero

.golangci.yml

@@ -1,6 +1,6 @@
 run:
   # timeout for analysis
-  timeout: 4m
+  timeout: 10m
 
 linters-settings:
   errorlint:

rpcserver.go

@@ -2532,8 +2532,10 @@ func (r *rpcServer) CommitVirtualPsbts(ctx context.Context,
 		Template: &walletrpc.FundPsbtRequest_CoinSelect{
 			CoinSelect: coinSelect,
 		},
-		MinConfs:   1,
-		ChangeType: P2TRChangeType,
+		MinConfs:              1,
+		ChangeType:            P2TRChangeType,
+		CustomLockId:          req.CustomLockId,
+		LockExpirationSeconds: req.LockExpirationSeconds,
 	}
 
 	// Unfortunately we can't use the same RPC types, so we have to do a