Skip to content
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

Get Txos min/max received block index is now String and doc updates #582

Merged
merged 2 commits into from
Nov 16, 2022
Merged

Get Txos min/max received block index is now String and doc updates #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7bbbd7
implemented fix and updated docs
briancorbin Nov 15, 2022
fc9cc1e
Merge branch 'develop' into feature/updating-get-txos-and-docs
briancorbin Nov 16, 2022
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
8 changes: 6 additions & 2 deletions docs/v2/api-endpoints/get_txos.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ description: Get TXOs for a given account with offset and limit parameters
| `account_id` | The account on which to perform this action. | Account must exist in the wallet. |
| `address` | The address b58 on which to perform this action. | Address must exist in the wallet. |
| `status` | Txo status filer. Available status': "unverified", "unspent", "spent", "orphaned", "pending", "secreted", | |
| `min_received_block_index` | The minimum block index to query for received txos, inclusive | |
| `max_received_block_index` | The maximum block index to query for received txos, inclusive | |
| `offset` | The pagination offset. Results start at the offset index. | |
| `limit` | Limit for the number of results.| |

Expand All @@ -25,6 +27,8 @@ description: Get TXOs for a given account with offset and limit parameters
"method": "get_txos",
"params": {
"account_id": "b59b3d0efd6840ace19cdc258f035cc87e6a63b6c24498763c478c417c1f44ca",
"min_received_block_index": "128567",
"max_received_block_index": "128567",
"offset": 2,
"limit": 8
},
Expand Down Expand Up @@ -88,7 +92,7 @@ description: Get TXOs for a given account with offset and limit parameters
"confirmation": "0a204488e153cce1e4bcdd4419eecb778f3d2d2b024b39aaa29532d2e47e238b2e31",
"public_key": "0a20e6736474f73e440686736bfd045d838c2b3bc056ffc647ad6b1c990f5a46b123",
"received_account_id": "36fdf8fbdaa35ad8e661209b8a7c7057f29bf16a1e399a34aa92c3873dfb853c",
"received_block_index": null,
"received_block_index": 128567,
"spent_block_index": null,
"subaddress_index": null,
"target_key": "0a20762d8a723aae2aa70cc11c62c91af715f957a7455b695641fe8c94210812cf1b",
Expand All @@ -111,7 +115,7 @@ description: Get TXOs for a given account with offset and limit parameters
"confirmation": null,
"public_key": "0a20d803a979c9ec0531f106363a885dde29101fcd70209f9ed686905512dfd14d5f",
"received_account_id": "a4db032dcedc14e39608fe6f26deadf57e306e8c03823b52065724fb4d274c10",
"received_block_index": "79",
"received_block_index": "128567",
"spent_block_index": null,
"subaddress_index": "0",
"target_key": "0a209abadbfcec6c81b3d184dc104e51cac4c4faa8bab4da21a3714901519810c20d",
Expand Down
4 changes: 2 additions & 2 deletions full-service/src/json_rpc/v2/api/request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ pub enum JsonCommandRequest {
address: Option<String>,
status: Option<String>,
token_id: Option<String>,
min_received_block_index: Option<u64>,
max_received_block_index: Option<u64>,
min_received_block_index: Option<String>,
max_received_block_index: Option<String>,
offset: Option<u64>,
limit: Option<u64>,
},
Expand Down
10 changes: 10 additions & 0 deletions full-service/src/json_rpc/v2/api/wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,16 @@ where
None => None,
};

let min_received_block_index = match min_received_block_index {
Some(i) => Some(i.parse::<u64>().map_err(format_error)?),
None => None,
};

let max_received_block_index = match max_received_block_index {
Some(i) => Some(i.parse::<u64>().map_err(format_error)?),
None => None,
};

let txos_and_statuses = service
.list_txos(
account_id,
Expand Down