Skip to content

New address encoding #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 18, 2024
Merged

New address encoding #356

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3bd5ec7
[common] rework address encoding
louisinger Oct 15, 2024
dc8dbfb
new address encoding
louisinger Oct 17, 2024
d6a243e
replace offchain address by vtxo output key in DB
louisinger Oct 17, 2024
653c9aa
merge migrations files into init one
louisinger Oct 17, 2024
01d7670
fix txbuilder fixtures
louisinger Oct 17, 2024
af18d53
Merge remote-tracking branch origin/master into address
louisinger Oct 18, 2024
f1ac986
fix transaction events
louisinger Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions api-spec/openapi/swagger/ark/v1/service.swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,17 @@
}
}
},
"v1AsyncPaymentInput": {
"type": "object",
"properties": {
"input": {
"$ref": "#/definitions/v1Input"
},
"forfeitLeafHash": {
"type": "string"
}
}
},
"v1CompletePaymentRequest": {
"type": "object",
"properties": {
Expand All @@ -524,7 +535,7 @@
"type": "array",
"items": {
"type": "object",
"$ref": "#/definitions/v1Input"
"$ref": "#/definitions/v1AsyncPaymentInput"
}
},
"outputs": {
Expand Down Expand Up @@ -717,9 +728,6 @@
"type": "string",
"format": "uint64",
"description": "Amount to send in satoshis."
},
"descriptor": {
"type": "string"
}
}
},
Expand Down Expand Up @@ -1046,9 +1054,6 @@
"outpoint": {
"$ref": "#/definitions/v1Outpoint"
},
"descriptor": {
"type": "string"
},
"spent": {
"type": "boolean"
},
Expand All @@ -1074,6 +1079,9 @@
"amount": {
"type": "string",
"format": "uint64"
},
"address": {
"type": "string"
}
}
}
Expand Down
27 changes: 15 additions & 12 deletions api-spec/protobuf/ark/v1/service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand All @@ -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 address = 10;
}


message GetTransactionsStreamRequest {}
message GetTransactionsStreamResponse {
oneof tx {
Expand Down
Loading
Loading