Add info to chained tx & Fix rest endpoint conflict

Author: altafan

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

@@ -287,14 +287,14 @@
         ]
       }
     },
-    "/v1/virtualTx/{txids}": {
+    "/v1/spendableVtxos/{address}": {
       "get": {
-        "operationId": "IndexerService_GetVirtualTxs",
+        "operationId": "IndexerService_GetSpendableVtxos",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1GetVirtualTxsResponse"
+              "$ref": "#/definitions/v1GetSpendableVtxosResponse"
             }
           },
           "default": {
@@ -306,15 +306,10 @@
         },
         "parameters": [
           {
-            "name": "txids",
+            "name": "address",
             "in": "path",
             "required": true,
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "collectionFormat": "csv",
-            "minItems": 1
+            "type": "string"
           },
           {
             "name": "page.size",
@@ -336,14 +331,14 @@
         ]
       }
     },
-    "/v1/vtxo/{outpoint.txid}/{outpoint.vout}/chain": {
+    "/v1/virtualTx/{txids}": {
       "get": {
-        "operationId": "IndexerService_GetVtxoChain",
+        "operationId": "IndexerService_GetVirtualTxs",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1GetVtxoChainResponse"
+              "$ref": "#/definitions/v1GetVirtualTxsResponse"
             }
           },
           "default": {
@@ -355,17 +350,15 @@
         },
         "parameters": [
           {
-            "name": "outpoint.txid",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "outpoint.vout",
+            "name": "txids",
             "in": "path",
             "required": true,
-            "type": "integer",
-            "format": "int64"
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "collectionFormat": "csv",
+            "minItems": 1
           },
           {
             "name": "page.size",
@@ -387,14 +380,14 @@
         ]
       }
     },
-    "/v1/vtxos/{address}": {
+    "/v1/vtxo/{outpoint.txid}/{outpoint.vout}/chain": {
       "get": {
-        "operationId": "IndexerService_GetSpendableVtxos",
+        "operationId": "IndexerService_GetVtxoChain",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1GetSpendableVtxosResponse"
+              "$ref": "#/definitions/v1GetVtxoChainResponse"
             }
           },
           "default": {
@@ -406,11 +399,18 @@
         },
         "parameters": [
           {
-            "name": "address",
+            "name": "outpoint.txid",
             "in": "path",
             "required": true,
             "type": "string"
           },
+          {
+            "name": "outpoint.vout",
+            "in": "path",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          },
           {
             "name": "page.size",
             "in": "query",
@@ -621,6 +621,26 @@
         }
       }
     },
+    "v1IndexerChain": {
+      "type": "object",
+      "properties": {
+        "txid": {
+          "type": "string"
+        },
+        "type": {
+          "$ref": "#/definitions/v1IndexerChainedTxType"
+        }
+      }
+    },
+    "v1IndexerChainedTxType": {
+      "type": "string",
+      "enum": [
+        "INDEXER_CHAINED_TX_TYPE_UNSPECIFIED",
+        "INDEXER_CHAINED_TX_TYPE_VIRTUAL",
+        "INDEXER_CHAINED_TX_TYPE_COMMITMENT"
+      ],
+      "default": "INDEXER_CHAINED_TX_TYPE_UNSPECIFIED"
+    },
     "v1IndexerNode": {
       "type": "object",
       "properties": {
@@ -688,8 +708,13 @@
         "txs": {
           "type": "array",
           "items": {
-            "type": "string"
+            "type": "object",
+            "$ref": "#/definitions/v1IndexerChain"
           }
+        },
+        "expiresAt": {
+          "type": "string",
+          "format": "int64"
         }
       }
     },

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

@@ -27,7 +27,7 @@ service IndexerService {
   };
   rpc GetSpendableVtxos(GetSpendableVtxosRequest) returns (GetSpendableVtxosResponse) {
     option (google.api.http) = {
-      get: "/v1/vtxos/{address}"
+      get: "/v1/spendableVtxos/{address}"
     };
   };
   rpc GetTransactionHistory(GetTransactionHistoryRequest) returns (GetTransactionHistoryResponse) {
@@ -143,10 +143,10 @@ message SubscribeForAddressesResponse {
 }
 
 message IndexerTransactions {
-  repeated string txs = 1;
+  repeated IndexerChain txs = 1;
+  int64 expires_at = 2;
 }
 
-
 message IndexerBatch {
   uint64 total_batch_amount = 1;
   uint64 total_forfeit_amount = 2;
@@ -180,6 +180,11 @@ message IndexerVtxo {
   string spent_by = 9;
 }
 
+message IndexerChain {
+  string txid = 1;
+  IndexerChainedTxType type = 2;
+}
+
 message IndexerTxHistoryRecord {
   oneof key {
     string boarding_txid = 1;
@@ -201,6 +206,12 @@ enum IndexerTxType {
   INDEXER_TX_TYPE_SWEEP = 3;
 }
 
+enum IndexerChainedTxType {
+  INDEXER_CHAINED_TX_TYPE_UNSPECIFIED = 0;
+  INDEXER_CHAINED_TX_TYPE_VIRTUAL = 1;
+  INDEXER_CHAINED_TX_TYPE_COMMITMENT = 2;
+}
+
 message IndexerPageRequest {
   int32 size = 1;
   int32 index = 2;