Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d5fcb3c
add GetCollectedFees admin endpoint for aggregate fee reporting, pers…
bitcoin-coder-bob Feb 25, 2026
63ccae1
make proto
bitcoin-coder-bob Feb 25, 2026
70650f3
fix collected fees: boarding input bug, BadgerDB persistence, failed …
bitcoin-coder-bob Feb 25, 2026
416ab54
Merge branch 'master' into bob/persist-collected-fees
bitcoin-coder-bob Feb 27, 2026
f56e6a6
alert tests, e2e test for new admin endpoint, commenting
bitcoin-coder-bob Feb 27, 2026
a754f93
exclude G118 in CI for context issue
bitcoin-coder-bob Feb 27, 2026
20e47e3
revert SelectExpiringLiquidityAmount unneeded type change
bitcoin-coder-bob Feb 27, 2026
37c1b51
allow time for TestEventListenerChurn test in CI
bitcoin-coder-bob Feb 27, 2026
7e7d431
timeout wg.Wait in TestEventListenerChurn to prevent CI hang
bitcoin-coder-bob Feb 27, 2026
9670a74
attempt to fix CI bugs
bitcoin-coder-bob Feb 27, 2026
a40b5ed
merge with master
bitcoin-coder-bob Feb 27, 2026
ba89583
bump integrationtest timeout
bitcoin-coder-bob Feb 28, 2026
8fa3c3c
bump go dep versions
bitcoin-coder-bob Feb 28, 2026
ccc1b60
terminal error surfacing
bitcoin-coder-bob Mar 2, 2026
bd4b66a
merge with master
bitcoin-coder-bob Mar 3, 2026
71df2ab
move fxns to utils, field rename for fees, e2e fee test enhancement
bitcoin-coder-bob Mar 3, 2026
3988d6c
fix test start time
bitcoin-coder-bob Mar 4, 2026
d0458d8
address PR #933 review feedback from louisinger
bitcoin-coder-bob Mar 13, 2026
5930e05
fix after merge with master
bitcoin-coder-bob Mar 13, 2026
c2c3447
change collectedfees from uint64 to int64
bitcoin-coder-bob Mar 13, 2026
6489413
merge with latest master
bitcoin-coder-bob Mar 13, 2026
cb215ff
fix e2e_test.go after merge with master
bitcoin-coder-bob Mar 13, 2026
a5ce204
merge with master
bitcoin-coder-bob Mar 22, 2026
7ec87a0
Merge master into bob/persist-collected-fees
bitcoin-coder-bob Apr 14, 2026
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
77 changes: 77 additions & 0 deletions api-spec/openapi/swagger/ark/v1/admin.openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,56 @@
}
}
},
"/v1/admin/fees/collected": {
"get": {
"tags": [
"AdminService"
],
"operationId": "AdminService_GetCollectedFees",
"parameters": [
{
"name": "after",
"in": "query",
"description": "Unix timestamp (UTC, exclusive). Only include rounds starting after this time. 0 means no lower bound.",
"schema": {
"type": "integer",
"format": "int64"
}
},
{
"name": "before",
"in": "query",
"description": "Unix timestamp (UTC, exclusive). Only include rounds starting before this time. 0 means no upper bound.",
"schema": {
"type": "integer",
"format": "int64"
}
}
],
"responses": {
"200": {
"description": "a successful response.",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/GetCollectedFeesResponse"
}
}
}
},
"default": {
"description": "An unexpected error response.",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/Status"
}
}
}
}
}
}
},
"/v1/admin/intentFees": {
"get": {
"tags": [
Expand Down Expand Up @@ -1169,6 +1219,33 @@
}
}
},
"GetCollectedFeesRequest": {
"title": "GetCollectedFeesRequest",
"type": "object",
"properties": {
"after": {
"type": "integer",
"description": "Unix timestamp (UTC, exclusive). Only include rounds starting after this time. 0 means no lower bound.",
"format": "int64"
},
"before": {
"type": "integer",
"description": "Unix timestamp (UTC, exclusive). Only include rounds starting before this time. 0 means no upper bound.",
"format": "int64"
}
}
},
"GetCollectedFeesResponse": {
"title": "GetCollectedFeesResponse",
"type": "object",
"properties": {
"collectedFees": {
"type": "integer",
"description": "Total collected fees in satoshis.",
"format": "uint64"
}
}
},
"GetConvictionsByRoundRequest": {
"title": "GetConvictionsByRoundRequest",
"type": "object",
Expand Down
13 changes: 13 additions & 0 deletions api-spec/protobuf/ark/v1/admin.proto
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ service AdminService {
get: "/v1/admin/liquidity/recoverable"
};
}
rpc GetCollectedFees(GetCollectedFeesRequest) returns (GetCollectedFeesResponse) {
Comment thread
louisinger marked this conversation as resolved.
option (meshapi.gateway.http) = {
get: "/v1/admin/fees/collected"
};
}
rpc Sweep(SweepRequest) returns (SweepResponse) {
option (meshapi.gateway.http) = {
post: "/v1/admin/sweep"
Expand Down Expand Up @@ -364,6 +369,14 @@ message GetRecoverableLiquidityResponse {
uint64 amount = 1;
}

message GetCollectedFeesRequest {
int64 after = 1; // Unix timestamp (UTC, exclusive). Only include rounds starting after this time. 0 means no lower bound.
int64 before = 2; // Unix timestamp (UTC, exclusive). Only include rounds starting before this time. 0 means no upper bound.
}
message GetCollectedFeesResponse {
uint64 collected_fees = 1; // Total collected fees in satoshis.
}

message SweepRequest {
bool connectors = 1;
repeated string commitment_txids = 2;
Expand Down
Loading
Loading