Skip to content

Commit c163f97

Browse files
committed
Merge branch 'next-version' into delete-covenant
2 parents ca0aee8 + d1794b7 commit c163f97

File tree

104 files changed

+5854
-2343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+5854
-2343
lines changed

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,45 @@
105105
"ExplorerService"
106106
]
107107
}
108+
},
109+
"/v1/vtxos/{address}/subscribe": {
110+
"get": {
111+
"operationId": "ExplorerService_SubscribeForAddress",
112+
"responses": {
113+
"200": {
114+
"description": "A successful response.(streaming responses)",
115+
"schema": {
116+
"type": "object",
117+
"properties": {
118+
"result": {
119+
"$ref": "#/definitions/v1SubscribeForAddressResponse"
120+
},
121+
"error": {
122+
"$ref": "#/definitions/rpcStatus"
123+
}
124+
},
125+
"title": "Stream result of v1SubscribeForAddressResponse"
126+
}
127+
},
128+
"default": {
129+
"description": "An unexpected error response.",
130+
"schema": {
131+
"$ref": "#/definitions/rpcStatus"
132+
}
133+
}
134+
},
135+
"parameters": [
136+
{
137+
"name": "address",
138+
"in": "path",
139+
"required": true,
140+
"type": "string"
141+
}
142+
],
143+
"tags": [
144+
"ExplorerService"
145+
]
146+
}
108147
}
109148
},
110149
"definitions": {
@@ -242,6 +281,25 @@
242281
],
243282
"default": "ROUND_STAGE_UNSPECIFIED"
244283
},
284+
"v1SubscribeForAddressResponse": {
285+
"type": "object",
286+
"properties": {
287+
"newVtxos": {
288+
"type": "array",
289+
"items": {
290+
"type": "object",
291+
"$ref": "#/definitions/v1Vtxo"
292+
}
293+
},
294+
"spentVtxos": {
295+
"type": "array",
296+
"items": {
297+
"type": "object",
298+
"$ref": "#/definitions/v1Vtxo"
299+
}
300+
}
301+
}
302+
},
245303
"v1Tree": {
246304
"type": "object",
247305
"properties": {

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

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -531,8 +531,9 @@
531531
"type": "string",
532532
"format": "int64"
533533
},
534-
"boardingDescriptorTemplate": {
535-
"type": "string"
534+
"boardingExitDelay": {
535+
"type": "string",
536+
"format": "int64"
536537
},
537538
"vtxoDescriptorTemplates": {
538539
"type": "array",
@@ -545,6 +546,9 @@
545546
},
546547
"marketHour": {
547548
"$ref": "#/definitions/v1MarketHour"
549+
},
550+
"version": {
551+
"type": "string"
548552
}
549553
}
550554
},
@@ -677,7 +681,7 @@
677681
"type": "array",
678682
"items": {
679683
"type": "object",
680-
"$ref": "#/definitions/v1Outpoint"
684+
"$ref": "#/definitions/v1Vtxo"
681685
}
682686
},
683687
"spendableVtxos": {
@@ -686,6 +690,9 @@
686690
"type": "object",
687691
"$ref": "#/definitions/v1Vtxo"
688692
}
693+
},
694+
"hex": {
695+
"type": "string"
689696
}
690697
}
691698
},
@@ -828,7 +835,7 @@
828835
"type": "array",
829836
"items": {
830837
"type": "object",
831-
"$ref": "#/definitions/v1Outpoint"
838+
"$ref": "#/definitions/v1Vtxo"
832839
}
833840
},
834841
"spendableVtxos": {
@@ -844,6 +851,9 @@
844851
"type": "object",
845852
"$ref": "#/definitions/v1Outpoint"
846853
}
854+
},
855+
"hex": {
856+
"type": "string"
847857
}
848858
}
849859
},

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ service ExplorerService {
2121
get: "/v1/vtxos/{address}"
2222
};
2323
};
24+
rpc SubscribeForAddress(SubscribeForAddressRequest) returns (stream SubscribeForAddressResponse) {
25+
option (google.api.http) = {
26+
get: "/v1/vtxos/{address}/subscribe"
27+
};
28+
};
2429
}
2530

2631
message GetRoundRequest {
@@ -44,3 +49,11 @@ message ListVtxosResponse {
4449
repeated Vtxo spendable_vtxos = 1;
4550
repeated Vtxo spent_vtxos = 2;
4651
}
52+
53+
message SubscribeForAddressRequest {
54+
string address = 1;
55+
}
56+
message SubscribeForAddressResponse {
57+
repeated Vtxo new_vtxos = 2;
58+
repeated Vtxo spent_vtxos = 3;
59+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,11 @@ message GetInfoResponse {
9999
int64 round_interval = 4;
100100
string network = 5;
101101
int64 dust = 6;
102-
string boarding_descriptor_template = 7;
102+
int64 boarding_exit_delay = 7;
103103
repeated string vtxo_descriptor_templates = 8;
104104
string forfeit_address = 9;
105105
MarketHour market_hour = 10;
106+
string version = 11;
106107
}
107108

108109
message GetBoardingAddressRequest {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,17 @@ message Vtxo {
7171

7272
message RoundTransaction {
7373
string txid = 1;
74-
repeated Outpoint spent_vtxos = 2;
74+
repeated Vtxo spent_vtxos = 2;
7575
repeated Vtxo spendable_vtxos = 3;
7676
repeated Outpoint claimed_boarding_utxos = 4;
77+
string hex = 5;
7778
}
7879

7980
message RedeemTransaction {
8081
string txid = 1;
81-
repeated Outpoint spent_vtxos = 2;
82+
repeated Vtxo spent_vtxos = 2;
8283
repeated Vtxo spendable_vtxos = 3;
84+
string hex = 4;
8385
}
8486

8587
// This message is used to prove to the server that the user controls the vtxo without revealing the whole VTXO taproot tree.

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

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)