Merge remote-tracking branch origin/master into debug-round-musig-failed

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

@@ -475,21 +475,6 @@
         }
       }
     },
-    "v1BoardingInput": {
-      "type": "object",
-      "properties": {
-        "txid": {
-          "type": "string"
-        },
-        "vout": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "descriptor": {
-          "type": "string"
-        }
-      }
-    },
     "v1ClaimPaymentRequest": {
       "type": "object",
       "properties": {
@@ -668,11 +653,11 @@
     "v1Input": {
       "type": "object",
       "properties": {
-        "vtxoInput": {
-          "$ref": "#/definitions/v1VtxoInput"
+        "outpoint": {
+          "$ref": "#/definitions/v1Outpoint"
         },
-        "boardingInput": {
-          "$ref": "#/definitions/v1BoardingInput"
+        "descriptor": {
+          "type": "string"
         }
       }
     },
@@ -709,12 +694,28 @@
         }
       }
     },
+    "v1Outpoint": {
+      "type": "object",
+      "properties": {
+        "txid": {
+          "type": "string"
+        },
+        "vout": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
     "v1Output": {
       "type": "object",
       "properties": {
         "address": {
           "type": "string",
-          "description": "Either the offchain or onchain address."
+          "title": "onchain"
+        },
+        "descriptor": {
+          "type": "string",
+          "title": "offchain"
         },
         "amount": {
           "type": "string",
@@ -838,12 +839,6 @@
         "poolTx": {
           "type": "string"
         },
-        "forfeitTxs": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
         "congestionTree": {
           "$ref": "#/definitions/v1Tree"
         },
@@ -852,6 +847,10 @@
           "items": {
             "type": "string"
           }
+        },
+        "minRelayFeeRate": {
+          "type": "string",
+          "format": "int64"
         }
       }
     },
@@ -970,10 +969,10 @@
       "type": "object",
       "properties": {
         "outpoint": {
-          "$ref": "#/definitions/v1Input"
+          "$ref": "#/definitions/v1Outpoint"
         },
-        "receiver": {
-          "$ref": "#/definitions/v1Output"
+        "descriptor": {
+          "type": "string"
         },
         "spent": {
           "type": "boolean"
@@ -996,18 +995,10 @@
         },
         "pendingData": {
           "$ref": "#/definitions/v1PendingPayment"
-        }
-      }
-    },
-    "v1VtxoInput": {
-      "type": "object",
-      "properties": {
-        "txid": {
-          "type": "string"
         },
-        "vout": {
-          "type": "integer",
-          "format": "int64"
+        "amount": {
+          "type": "string",
+          "format": "uint64"
         }
       }
     }

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

@@ -196,9 +196,9 @@ message GetInfoResponse {
 message RoundFinalizationEvent {
   string id = 1;
   string pool_tx = 2;
-  repeated string forfeit_txs = 3;
-  Tree congestion_tree = 4;
-  repeated string connectors = 5;
+  Tree congestion_tree = 3;
+  repeated string connectors = 4;
+  int64 min_relay_fee_rate = 5;
 }
 
 message RoundFinalizedEvent {
@@ -244,29 +244,23 @@ message Round {
   RoundStage stage = 8;
 }
 
-message VtxoInput {
+message Outpoint {
   string txid = 1;
   uint32 vout = 2;
 }
 
-message BoardingInput {
-  string txid = 1;
-  uint32 vout = 2;
-  string descriptor = 3;
-}
-
 message Input {
-  oneof input {
-    VtxoInput vtxo_input = 1;
-    BoardingInput boarding_input = 2;
-  }
+  Outpoint outpoint = 1;
+  string descriptor = 2;
 }
 
 message Output {
-  // Either the offchain or onchain address.
-  string address = 1;
+  oneof destination {
+    string address = 1; // onchain
+    string descriptor = 2; // offchain
+  }
   // Amount to send in satoshis.
-  uint64 amount = 2;
+  uint64 amount = 3;
 }
 
 message Tree {
@@ -284,15 +278,16 @@ message Node {
 }
 
 message Vtxo {
-  Input outpoint = 1;
-  Output receiver = 2;
+  Outpoint outpoint = 1;
+  string descriptor = 2;
   bool spent = 3;
   string pool_txid = 4;
   string spent_by = 5;
   int64 expire_at = 6;
   bool swept = 7;
   bool pending = 8;
   PendingPayment pending_data = 9;
+  uint64 amount = 10;
 }
 
 message PendingPayment {