Merge branch 'master' into trial

ark-network · Oct 22, 2024 · 64cbdd0 · 64cbdd0
2 parents c4fc630 + b536a9e
commit 64cbdd0
Show file tree

Hide file tree

Showing 58 changed files with 2,215 additions and 1,868 deletions.
diff --git a/api-spec/openapi/swagger/ark/v1/service.swagger.json b/api-spec/openapi/swagger/ark/v1/service.swagger.json
@@ -506,6 +506,17 @@
         }
       }
     },
+    "v1AsyncPaymentInput": {
+      "type": "object",
+      "properties": {
+        "input": {
+          "$ref": "#/definitions/v1Input"
+        },
+        "forfeitLeafHash": {
+          "type": "string"
+        }
+      }
+    },
     "v1CompletePaymentRequest": {
       "type": "object",
       "properties": {
@@ -524,7 +535,7 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1Input"
+            "$ref": "#/definitions/v1AsyncPaymentInput"
           }
         },
         "outputs": {
@@ -717,9 +728,6 @@
           "type": "string",
           "format": "uint64",
           "description": "Amount to send in satoshis."
-        },
-        "descriptor": {
-          "type": "string"
         }
       }
     },
@@ -1046,9 +1054,6 @@
         "outpoint": {
           "$ref": "#/definitions/v1Outpoint"
         },
-        "descriptor": {
-          "type": "string"
-        },
         "spent": {
           "type": "boolean"
         },
@@ -1074,6 +1079,9 @@
         "amount": {
           "type": "string",
           "format": "uint64"
+        },
+        "pubkey": {
+          "type": "string"
         }
       }
     }

diff --git a/api-spec/protobuf/ark/v1/service.proto b/api-spec/protobuf/ark/v1/service.proto
@@ -187,8 +187,13 @@ message PingResponse {
 
 /* Async Payment API messages */
 
+message AsyncPaymentInput {
+  Input input = 1;
+  string forfeit_leaf_hash = 2;
+}
+
 message CreatePaymentRequest {
-  repeated Input inputs = 1;
+  repeated AsyncPaymentInput inputs = 1;
   repeated Output outputs = 2;
 }
 message CreatePaymentResponse {
@@ -290,7 +295,6 @@ message Input {
 message Output {
   string address = 1; // onchain or off-chain
   uint64 amount = 2; // Amount to send in satoshis.
-  string descriptor = 3; 
 }
 
 message Tree {
@@ -309,18 +313,17 @@ message Node {
 
 message Vtxo {
   Outpoint outpoint = 1;
-  string descriptor = 2;
-  bool spent = 3;
-  string round_txid = 4;
-  string spent_by = 5;
-  int64 expire_at = 6;
-  bool swept = 7;
-  bool pending = 8;
-  string redeem_tx = 9;
-  uint64 amount = 10;
+  bool spent = 2;
+  string round_txid = 3;
+  string spent_by = 4;
+  int64 expire_at = 5;
+  bool swept = 6;
+  bool pending = 7;
+  string redeem_tx = 8;
+  uint64 amount = 9;
+  string pubkey = 10;
 }
 
-
 message GetTransactionsStreamRequest {}
 message GetTransactionsStreamResponse {
   oneof tx {