return txid in Withdraw RPC

Author: louisinger

api-spec/openapi/swagger/ark/v1/admin.swagger.json

@@ -434,7 +434,7 @@
     "v1WithdrawResponse": {
       "type": "object",
       "properties": {
-        "txHex": {
+        "txid": {
           "type": "string"
         }
       }

api-spec/protobuf/ark/v1/admin.proto

@@ -124,5 +124,5 @@ message WithdrawRequest {
 }
 
 message WithdrawResponse {
-  string tx_hex = 1;
+  string txid = 1;
 }

api-spec/protobuf/gen/ark/v1/admin.pb.go

@@ -263,13 +263,13 @@ func walletWithdrawAction(ctx *cli.Context) error {
 	url := fmt.Sprintf("%s/v1/admin/withdraw", baseURL)
 	body := fmt.Sprintf(`{"address": "%s", "amount": %d}`, address, amount)
 
-	txHex, err := post[string](url, body, "txHex", macaroon, tlsCertPath)
+	txid, err := post[string](url, body, "txid", macaroon, tlsCertPath)
 	if err != nil {
 		return err
 	}
 
 	fmt.Println("transaction successfully broadcasted:")
-	fmt.Println(txHex)
+	fmt.Println(txid)
 	return nil
 }
 

server/cmd/arkd/commands.go

@@ -1221,7 +1221,9 @@ func (s *service) Withdraw(ctx context.Context, address string, amount uint64) (
 		return "", err
 	}
 
-	return hex.EncodeToString(buf.Bytes()), nil
+	txid := tx.TxHash().String()
+
+	return txid, nil
 }
 
 func (s *service) castNotification(tx *wtxmgr.TxRecord) map[string][]ports.VtxoWithValue {

server/internal/infrastructure/wallet/btc-embedded/wallet.go

@@ -18,6 +18,7 @@ import (
 	"github.com/lightningnetwork/lnd/lnwallet/chainfee"
 	"github.com/vulpemventures/go-elements/elementsutil"
 	"github.com/vulpemventures/go-elements/psetv2"
+	"github.com/vulpemventures/go-elements/transaction"
 )
 
 const (
@@ -285,7 +286,12 @@ func (s *service) Withdraw(ctx context.Context, address string, amount uint64) (
 		return "", err
 	}
 
-	return res.GetTxHex(), nil
+	tx, err := transaction.NewTxFromHex(res.GetTxHex())
+	if err != nil {
+		return "", err
+	}
+
+	return tx.TxHash().String(), nil
 }
 
 var minRate = chainfee.SatPerKVByte(0.2 * 1000)