Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
121 changes: 87 additions & 34 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[package]
name = "cbtc"
version = "0.4.2"
version = "0.6.0"
edition = "2024"
autoexamples = false

[lints.clippy]
uninlined_format_args = "allow"

[dependencies]
ledger = { git = "ssh://git@github.com/DLC-link/canton-lib", tag = "v0.5.0" }
keycloak = { git = "ssh://git@github.com/DLC-link/canton-lib", tag = "v0.5.0" }
registry = { git = "ssh://git@github.com/DLC-link/canton-lib", tag = "v0.5.0" }
common = { git = "ssh://git@github.com/DLC-link/canton-lib", tag = "v0.5.0" }
ledger = { git = "ssh://git@github.com/DLC-link/canton-lib", tag = "v0.6.0" }
keycloak = { git = "ssh://git@github.com/DLC-link/canton-lib", tag = "v0.6.0" }
registry = { git = "ssh://git@github.com/DLC-link/canton-lib", tag = "v0.6.0" }
common = { git = "ssh://git@github.com/DLC-link/canton-lib", tag = "v0.6.0" }
tokio = { version = "1.48.0", features = ["macros", "rt-multi-thread"] }
serde_json = "1"
chrono = "0.4.42"
Expand All @@ -22,7 +22,7 @@ futures = "0.3"
dotenvy = "0.15"
base64 = "0.22"
log = "0.4"
canton-api-client = "3.3.0-0.1.0"
canton-api-client = "3.6.0-0.1.0"
reqwest = { version = "0.12.24", features = ["json"] }
zip = "2"
semver = "1"
Expand Down
9 changes: 7 additions & 2 deletions examples/integration_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -823,9 +823,14 @@ async fn main() -> Result<(), String> {
.await
.map_err(|e| format!("Failed to list holdings for split: {}", e))?;

match holdings.first() {
// Pick a CBTC holding. list_holdings returns every Holding-template contract the
// sender owns, which on devnet includes legacy `CBTCV0RC8` instruments alongside
// `CBTC`. Splitting a non-CBTC holding while asserting `instrument_id = "CBTC"`
// below would make the registry reject the request with 400 "Given holdings are
// invalid".
match holdings.iter().find(|h| h.instrument_id == "CBTC") {
None => {
print_skip("(no holdings available to split)");
print_skip("(no CBTC holdings available to split)");
passed += 1;
}
Some(holding) => {
Expand Down
2 changes: 1 addition & 1 deletion examples/list_incoming_offers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ async fn main() -> Result<(), String> {
println!(" Full ID: {}", contract_id);

// Extract transfer details
if let Some(Some(create_arg)) = &transfer.created_event.create_argument {
if let Some(create_arg) = &transfer.created_event.create_argument {
if let Some(transfer_data) = create_arg.get("transfer") {
if let Some(sender) = transfer_data.get("sender") {
println!(" From: {}", sender.as_str().unwrap_or("unknown"));
Expand Down
2 changes: 1 addition & 1 deletion examples/list_outgoing_offers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ async fn main() -> Result<(), String> {
println!(" Full ID: {}", contract_id);

// Extract transfer details
if let Some(Some(create_arg)) = &transfer.created_event.create_argument {
if let Some(create_arg) = &transfer.created_event.create_argument {
if let Some(transfer_data) = create_arg.get("transfer") {
if let Some(receiver) = transfer_data.get("receiver") {
println!(" To: {}", receiver.as_str().unwrap_or("unknown"));
Expand Down
2 changes: 1 addition & 1 deletion src/accept.rs
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ pub async fn accept_all(params: AcceptAllParams) -> Result<AcceptAllResult, Stri
let mut amount = None;
let mut sender = None;

if let Some(Some(create_arg)) = &transfer.created_event.create_argument {
if let Some(create_arg) = &transfer.created_event.create_argument {
if let Some(transfer_data) = create_arg.get("transfer") {
if let Some(amt) = transfer_data.get("amount") {
amount = amt.as_str().map(|s| s.to_string());
Expand Down
2 changes: 1 addition & 1 deletion src/cancel_offers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ pub async fn withdraw_all(params: WithdrawAllParams) -> Result<WithdrawAllResult
let mut amount = None;
let mut receiver = None;

if let Some(Some(create_arg)) = &transfer.created_event.create_argument {
if let Some(create_arg) = &transfer.created_event.create_argument {
if let Some(transfer_data) = create_arg.get("transfer") {
if let Some(amt) = transfer_data.get("amount") {
amount = amt.as_str().map(|s| s.to_string());
Expand Down
12 changes: 5 additions & 7 deletions src/consolidate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -268,16 +268,12 @@ pub async fn consolidate_utxos(params: ConsolidateParams) -> Result<Vec<String>,
fn parse_consolidate_response(
response: &JsSubmitAndWaitForTransactionResponse,
) -> Result<Vec<String>, String> {
let events = response
.transaction
.events
.as_ref()
.ok_or("Failed to find events")?;
let events = &response.transaction.events;

let mut result_cids = Vec::new();
for event in events {
if let Some(exercised) = crate::event_helpers::as_exercised_event(event) {
if let Some(result) = exercised.exercise_result.as_ref() {
if let Some(Some(result)) = exercised.exercise_result.as_ref() {
// Extract receiverHoldingCids from the Daml-encoded payload
if let Some(receiver_cids) =
result["output"]["value"]["receiverHoldingCids"].as_array()
Expand Down Expand Up @@ -499,10 +495,12 @@ mod parser_tests {

#[test]
fn missing_events_returns_err() {
// `events` is required on the wire now, so an empty list stands in for
// "missing events"; the parser falls through to its post-loop check.
let response = transaction_response("tx-x", json!(null));
let err = parse_consolidate_response(&response).unwrap_err();
assert!(
err.contains("Failed to find events"),
err.contains("Failed to extract result holding CIDs"),
"unexpected error: {err}"
);
}
Expand Down
Loading