Fix btc wallet restore (covenantless asp) (#332)

* first account = default btcwallet account (account index 0) * Update server/internal/infrastructure/wallet/btc-embedded/wallet.go Co-authored-by: Pietralberto Mazza <[email protected]> Signed-off-by: Louis Singer <[email protected]> * fix restoration * increase arkd timeout * fix connector signature --------- Signed-off-by: Louis Singer <[email protected]> Co-authored-by: Pietralberto Mazza <[email protected]>
ark-network · Sep 27, 2024 · 72e31d8 · 72e31d8
1 parent ab6ae36
commit 72e31d8
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 102 deletions.
diff --git a/common/fees.go b/common/fees.go
@@ -21,9 +21,9 @@ var TreeTxSize = (&input.TxWeightEstimator{}).
 var CovenantTreeTxSize = TreeTxSize * 2
 
 var ConnectorTxSize = (&input.TxWeightEstimator{}).
-	AddP2WKHInput().
-	AddP2WKHOutput().
-	AddP2WKHOutput().
+	AddTaprootKeySpendInput(txscript.SigHashDefault).
+	AddP2TROutput().
+	AddP2TROutput().
 	VSize()
 
 func ComputeForfeitMinRelayFee(

diff --git a/server/cmd/arkd/commands.go b/server/cmd/arkd/commands.go
@@ -77,6 +77,8 @@ var (
 	}
 )
 
+var timeout = time.Minute
+
 func walletStatusAction(ctx *cli.Context) error {
 	baseURL := ctx.String("url")
 	tlsCertPath := ctx.String("tls-cert-path")
@@ -220,7 +222,7 @@ func post[T any](url, body, key, macaroon, tlsCert string) (result T, err error)
 		req.Header.Add("X-Macaroon", macaroon)
 	}
 	client := &http.Client{
-		Timeout: 30 * time.Second,
+		Timeout: timeout,
 		Transport: &http.Transport{
 			TLSClientConfig: tlsConfig,
 		},
@@ -267,7 +269,7 @@ func get[T any](url, key, macaroon, tlsCert string) (result T, err error) {
 	}
 
 	client := &http.Client{
-		Timeout: 30 * time.Second,
+		Timeout: timeout,
 		Transport: &http.Transport{
 			TLSClientConfig: tlsConfig,
 		},
@@ -331,7 +333,7 @@ func getBalance(url, macaroon, tlsCert string) (*balance, error) {
 		req.Header.Add("X-Macaroon", macaroon)
 	}
 	client := &http.Client{
-		Timeout: 30 * time.Second,
+		Timeout: timeout,
 		Transport: &http.Transport{
 			TLSClientConfig: tlsConfig,
 		},
@@ -384,7 +386,7 @@ func getStatus(url, tlsCert string) (*status, error) {
 	req.Header.Add("Content-Type", "application/json")
 
 	client := &http.Client{
-		Timeout: 30 * time.Second,
+		Timeout: timeout,
 		Transport: &http.Transport{
 			TLSClientConfig: tlsConfig,
 		},

diff --git a/server/internal/infrastructure/wallet/btc-embedded/psbt.go b/server/internal/infrastructure/wallet/btc-embedded/psbt.go
@@ -70,14 +70,11 @@ func (s *service) signPsbt(packet *psbt.Packet, inputsToSign []int) ([]uint32, e
 		}
 
 		var managedAddress waddrmgr.ManagedPubKeyAddress
-		var isTaproot bool
+		isTaproot := txscript.IsPayToTaproot(in.WitnessUtxo.PkScript)
 
-		if len(in.TaprootLeafScript) > 0 && txscript.IsPayToTaproot(in.WitnessUtxo.PkScript) {
-			// segwit v1
-			isTaproot = true
-			managedAddress = s.aspTaprootAddr
+		if len(in.TaprootLeafScript) > 0 {
+			managedAddress = s.aspKeyAddr
 		} else {
-			// segwit v0
 			var err error
 			managedAddress, _, _, err = s.wallet.ScriptForOutput(in.WitnessUtxo)
 			if err != nil {