Skip to content

Update uniffi-dart and uniffi-bindgen-cs #1686

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
spacebear21 merged 1 commit into from
Jun 26, 2026
Merged

Update uniffi-dart and uniffi-bindgen-cs #1686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
89 changes: 44 additions & 45 deletions Cargo-minimal.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4775,28 +4775,27 @@ dependencies = [

[[package]]
name = "uniffi"
version = "0.31.1"
version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc5f2297ee5b893405bed1a6929faec4713a061df158ecf5198089f23910d470"
checksum = "46eefd5468602930da46b1f49d3448c6dfc2e81295f93120f23f8174fd70267f"
dependencies = [
"anyhow",
"cargo_metadata 0.19.0",
"uniffi_bindgen 0.31.1",
"uniffi_bindgen 0.31.2",
"uniffi_build",
"uniffi_core 0.31.1",
"uniffi_macros 0.31.1",
"uniffi_pipeline 0.31.1",
"uniffi_core 0.31.2",
"uniffi_macros 0.31.2",
"uniffi_pipeline 0.31.2",
]

[[package]]
name = "uniffi-bindgen-cs"
version = "0.11.0+v0.30.0"
source = "git+https://github.com/benalleng/uniffi-bindgen-cs.git?rev=71d6556aa60c29b487d931de47053f26ee8a1af1#71d6556aa60c29b487d931de47053f26ee8a1af1"
version = "0.11.0+v0.31.0"
source = "git+https://github.com/NordSecurity/uniffi-bindgen-cs?tag=v0.11.0%2Bv0.31.0#e10ce410eb3a10cc19c7928b93ea8d84e038c034"
dependencies = [
"anyhow",
"askama 0.13.0",
"camino",
"cargo_metadata 0.19.0",
"clap 3.1.0",
"extend",
"fs-err 2.7.0",
Expand All @@ -4806,15 +4805,15 @@ dependencies = [
"serde_json",
"textwrap 0.16.0",
"toml 0.8.0",
"uniffi_bindgen 0.30.0",
"uniffi_meta 0.30.0",
"uniffi_udl 0.30.0",
"uniffi_bindgen 0.31.2",
"uniffi_meta 0.31.2",
"uniffi_udl 0.31.2",
]

[[package]]
name = "uniffi-dart"
version = "0.1.0+v0.30.0"
source = "git+https://github.com/benalleng/uniffi-dart.git?rev=ce97870a934cd6046eef059c5805359ac0d59964#ce97870a934cd6046eef059c5805359ac0d59964"
version = "0.2.1+v0.31.2"
source = "git+https://github.com/Uniffi-Dart/uniffi-dart.git?tag=v0.2.1%2Bv0.31.2#872dcacdaa2e0760d787dccec5ca9b2e55e71f55"
dependencies = [
"anyhow",
"camino",
Expand All @@ -4827,8 +4826,8 @@ dependencies = [
"serde",
"stringcase 0.4.0",
"toml 0.8.0",
"uniffi 0.31.1",
"uniffi_bindgen 0.31.1",
"uniffi 0.31.2",
"uniffi_bindgen 0.31.2",
"uniffi_dart_macro",
]

Expand Down Expand Up @@ -4860,9 +4859,9 @@ dependencies = [

[[package]]
name = "uniffi_bindgen"
version = "0.31.1"
version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bc0c60a9607e7ab77a2ad47ec5530178015014839db25af7512447d2238016c"
checksum = "c4a0c9b375d32e1365cdb2bdd7cb495eecf6fac851ddbad077412b4ee1888514"
dependencies = [
"anyhow",
"askama 0.14.0",
Expand All @@ -4878,21 +4877,21 @@ dependencies = [
"tempfile",
"textwrap 0.16.0",
"toml 0.8.0",
"uniffi_internal_macros 0.31.1",
"uniffi_meta 0.31.1",
"uniffi_pipeline 0.31.1",
"uniffi_udl 0.31.1",
"uniffi_internal_macros 0.31.2",
"uniffi_meta 0.31.2",
"uniffi_pipeline 0.31.2",
"uniffi_udl 0.31.2",
]

[[package]]
name = "uniffi_build"
version = "0.31.1"
version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c39413c43b955e4aa8a4e2b34bbd1b6b5ff6bd85532b52f9eb92fbe88c14458"
checksum = "744fe15bcd3e2b1712a4573a45ce749af19cf28d69027ca5789619014955668c"
dependencies = [
"anyhow",
"camino",
"uniffi_bindgen 0.31.1",
"uniffi_bindgen 0.31.2",
]

[[package]]
Expand All @@ -4909,9 +4908,9 @@ dependencies = [

[[package]]
name = "uniffi_core"
version = "0.31.1"
version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77baf5d539fe2e1ad6805e942dbc5dbdeb2b83eb5f2b3a6535d422ca4b02a12f"
checksum = "eec017b112701681f6fbbe5d92014b5c468eb0b177a94389de03ceec40665095"
dependencies = [
"anyhow",
"async-compat",
Expand All @@ -4922,15 +4921,15 @@ dependencies = [

[[package]]
name = "uniffi_dart_macro"
version = "0.1.0+v0.30.0"
source = "git+https://github.com/benalleng/uniffi-dart.git?rev=ce97870a934cd6046eef059c5805359ac0d59964#ce97870a934cd6046eef059c5805359ac0d59964"
version = "0.2.1+v0.31.2"
source = "git+https://github.com/Uniffi-Dart/uniffi-dart.git?tag=v0.2.1%2Bv0.31.2#872dcacdaa2e0760d787dccec5ca9b2e55e71f55"
dependencies = [
"futures",
"proc-macro2",
"quote",
"stringcase 0.3.0",
"syn 1.0.74",
"uniffi 0.31.1",
"uniffi 0.31.2",
]

[[package]]
Expand All @@ -4948,9 +4947,9 @@ dependencies = [

[[package]]
name = "uniffi_internal_macros"
version = "0.31.1"
version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4b42137524f4be6400fcaca9d02c1d4ecb6ad917e4013c0b93235526d8396e5"
checksum = "4641669b48fefbc5e80ff08c5004d9c7617fb91232131a6734ab6712779cb04c"
dependencies = [
"anyhow",
"indexmap 2.6.0",
Expand Down Expand Up @@ -4978,9 +4977,9 @@ dependencies = [

[[package]]
name = "uniffi_macros"
version = "0.31.1"
version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9273ec45330d8fe9a3701b7b983cea7a4e218503359831967cb95d26b873561"
checksum = "eeb8617ee814de22caf7417bf514715ba0b3f46bd9d5a5d794413fd8282cb737"
dependencies = [
"camino",
"fs-err 2.7.0",
Expand All @@ -4990,7 +4989,7 @@ dependencies = [
"serde",
"syn 2.0.87",
"toml 0.8.0",
"uniffi_meta 0.31.1",
"uniffi_meta 0.31.2",
]

[[package]]
Expand All @@ -5007,14 +5006,14 @@ dependencies = [

[[package]]
name = "uniffi_meta"
version = "0.31.1"
version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "431d2f443e7828a6c29d188de98b6771a6491ee98bba2d4372643bf93f988a18"
checksum = "58d5b94fc92803d21b2928bd15c6f06e57609b95caf98ea561c99cda1b6d2a25"
dependencies = [
"anyhow",
"siphasher 1.0.0",
"uniffi_internal_macros 0.31.1",
"uniffi_pipeline 0.31.1",
"uniffi_internal_macros 0.31.2",
"uniffi_pipeline 0.31.2",
]

[[package]]
Expand All @@ -5032,15 +5031,15 @@ dependencies = [

[[package]]
name = "uniffi_pipeline"
version = "0.31.1"
version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "761ef74f6175e15603d0424cc5f98854c5baccfe7bf4ccb08e5816f9ab8af689"
checksum = "032739b3ec725576914c15899dedaf080163ced86b6934566c20ec2b20ce90ca"
dependencies = [
"anyhow",
"heck 0.5.0",
"indexmap 2.6.0",
"tempfile",
"uniffi_internal_macros 0.31.1",
"uniffi_internal_macros 0.31.2",
]

[[package]]
Expand All @@ -5057,13 +5056,13 @@ dependencies = [

[[package]]
name = "uniffi_udl"
version = "0.31.1"
version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68773ec0e1c067b6505a73bbf6a5782f31a7f9209333a0df97b87565c46bf370"
checksum = "fc0a1d0a0252ce1af9e8ce78ba67ac0d8937fb2bedaf10cbddd43d3614d06ec6"
dependencies = [
"anyhow",
"textwrap 0.16.0",
"uniffi_meta 0.31.1",
"uniffi_meta 0.31.2",
"weedle2",
]

Expand Down
19 changes: 9 additions & 10 deletions Cargo-recent.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4932,13 +4932,12 @@ dependencies = [

[[package]]
name = "uniffi-bindgen-cs"
version = "0.11.0+v0.30.0"
source = "git+https://github.com/benalleng/uniffi-bindgen-cs.git?rev=71d6556aa60c29b487d931de47053f26ee8a1af1#71d6556aa60c29b487d931de47053f26ee8a1af1"
version = "0.11.0+v0.31.0"
source = "git+https://github.com/NordSecurity/uniffi-bindgen-cs?tag=v0.11.0%2Bv0.31.0#e10ce410eb3a10cc19c7928b93ea8d84e038c034"
dependencies = [
"anyhow",
"askama 0.13.1",
"camino",
"cargo_metadata 0.19.2",
"clap 3.2.25",
"extend",
"fs-err 2.11.0",
Expand All @@ -4948,15 +4947,15 @@ dependencies = [
"serde_json",
"textwrap",
"toml 0.9.12+spec-1.1.0",
"uniffi_bindgen 0.30.0",
"uniffi_meta 0.30.0",
"uniffi_udl 0.30.0",
"uniffi_bindgen 0.31.2",
"uniffi_meta 0.31.2",
"uniffi_udl 0.31.2",
]

[[package]]
name = "uniffi-dart"
version = "0.1.0+v0.30.0"
source = "git+https://github.com/benalleng/uniffi-dart.git?rev=ce97870a934cd6046eef059c5805359ac0d59964#ce97870a934cd6046eef059c5805359ac0d59964"
version = "0.2.1+v0.31.2"
source = "git+https://github.com/Uniffi-Dart/uniffi-dart.git?tag=v0.2.1%2Bv0.31.2#872dcacdaa2e0760d787dccec5ca9b2e55e71f55"
dependencies = [
"anyhow",
"camino",
Expand Down Expand Up @@ -5064,8 +5063,8 @@ dependencies = [

[[package]]
name = "uniffi_dart_macro"
version = "0.1.0+v0.30.0"
source = "git+https://github.com/benalleng/uniffi-dart.git?rev=ce97870a934cd6046eef059c5805359ac0d59964#ce97870a934cd6046eef059c5805359ac0d59964"
version = "0.2.1+v0.31.2"
source = "git+https://github.com/Uniffi-Dart/uniffi-dart.git?tag=v0.2.1%2Bv0.31.2#872dcacdaa2e0760d787dccec5ca9b2e55e71f55"
dependencies = [
"futures",
"proc-macro2",
Expand Down
4 changes: 2 additions & 2 deletions payjoin-ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ serde_json = "1.0.149"
thiserror = "2.0.18"
tokio = { version = "1.52.3", features = ["full"], optional = true }
uniffi = { version = "0.30.0", features = ["cli"] }
uniffi-bindgen-cs = { git = "https://github.com/benalleng/uniffi-bindgen-cs.git", rev = "71d6556aa60c29b487d931de47053f26ee8a1af1", optional = true }
uniffi-dart = { git = "https://github.com/benalleng/uniffi-dart.git", rev = "ce97870a934cd6046eef059c5805359ac0d59964", optional = true }
uniffi-bindgen-cs = { git = "https://github.com/NordSecurity/uniffi-bindgen-cs", tag = "v0.11.0+v0.31.0", optional = true }
uniffi-dart = { git = "https://github.com/Uniffi-Dart/uniffi-dart.git", tag = "v0.2.1+v0.31.2", optional = true }
url = "2.5.4"

# Pinned transitive dependencies that appear unused to cargo-machete
Expand Down
36 changes: 18 additions & 18 deletions payjoin-ffi/csharp/IntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,16 +172,16 @@ private static InputPair[] GetInputs(RpcClient rpc)
{
var request = receiver.CreatePollRequest(ohttpRelay);
var response = await _httpClient!.PostAsync(
request.request.url,
new ByteArrayContent(request.request.body)
request.Request.Url,
new ByteArrayContent(request.Request.Body)
{
Headers = { ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(request.request.contentType) }
Headers = { ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(request.Request.ContentType) }
},
cancellationToken);

var responseBuffer = await response.Content.ReadAsByteArrayAsync(cancellationToken);

using var transition = receiver.ProcessResponse(responseBuffer, request.clientResponse);
using var transition = receiver.ProcessResponse(responseBuffer, request.ClientResponse);
using var outcome = transition.Save(recvPersister);

if (outcome is InitializedTransitionOutcome.Stasis)
Expand All @@ -191,7 +191,7 @@ private static InputPair[] GetInputs(RpcClient rpc)

if (outcome is InitializedTransitionOutcome.Progress progress)
{
using var proposal = progress.inner;
using var proposal = progress.Inner;
return await ProcessUncheckedProposal(proposal, receiverRpc, recvPersister);
}

Expand Down Expand Up @@ -484,17 +484,17 @@ public async Task TestIntegrationV2ToV2()
// Create V2 POST request with OHTTP
using var request = reqCtx.CreateV2PostRequest(ohttpRelay);
var response = await _httpClient!.PostAsync(
request.request.url,
new ByteArrayContent(request.request.body)
request.Request.Url,
new ByteArrayContent(request.Request.Body)
{
Headers = { ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(request.request.contentType) }
Headers = { ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(request.Request.ContentType) }
},
cancellationToken);

var responseBuffer = await response.Content.ReadAsByteArrayAsync(cancellationToken);

// Process sender response
using var senderResponseTransition = reqCtx.ProcessResponse(responseBuffer, request.ohttpCtx);
using var senderResponseTransition = reqCtx.ProcessResponse(responseBuffer, request.OhttpCtx);
using var sendCtx = senderResponseTransition.Save(senderPersister);

// *********************
Expand All @@ -507,15 +507,15 @@ public async Task TestIntegrationV2ToV2()
// Post the payjoin proposal back to the directory
using var proposalRequest = payjoinProposal!.CreatePostRequest(ohttpRelay);
using var proposalResponse = await _httpClient.PostAsync(
proposalRequest.request.url,
new ByteArrayContent(proposalRequest.request.body)
proposalRequest.Request.Url,
new ByteArrayContent(proposalRequest.Request.Body)
{
Headers = { ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(proposalRequest.request.contentType) }
Headers = { ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(proposalRequest.Request.ContentType) }
},
cancellationToken);

var proposalResponseBuffer = await proposalResponse.Content.ReadAsByteArrayAsync(cancellationToken);
payjoinProposal.ProcessResponse(proposalResponseBuffer, proposalRequest.clientResponse);
payjoinProposal.ProcessResponse(proposalResponseBuffer, proposalRequest.ClientResponse);

// *******************************
// SENDER SIDE (FINALIZATION)
Expand All @@ -526,15 +526,15 @@ public async Task TestIntegrationV2ToV2()
{
using var pollRequest = sendCtx.CreatePollRequest(ohttpRelay);
using var pollResponse = await _httpClient.PostAsync(
pollRequest.request.url,
new ByteArrayContent(pollRequest.request.body)
pollRequest.Request.Url,
new ByteArrayContent(pollRequest.Request.Body)
{
Headers = { ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(pollRequest.request.contentType) }
Headers = { ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(pollRequest.Request.ContentType) }
},
cancellationToken);

var pollResponseBuffer = await pollResponse.Content.ReadAsByteArrayAsync(cancellationToken);
using var pollTransition = sendCtx.ProcessResponse(pollResponseBuffer, pollRequest.ohttpCtx);
using var pollTransition = sendCtx.ProcessResponse(pollResponseBuffer, pollRequest.OhttpCtx);
pollOutcome = pollTransition.Save(senderPersister);

if (pollOutcome is PollingForProposalTransitionOutcome.Progress)
Expand All @@ -553,7 +553,7 @@ public async Task TestIntegrationV2ToV2()
var progressOutcome = (PollingForProposalTransitionOutcome.Progress)pollOutcome!;

// Sign the payjoin PSBT
var payjoinPsbt = progressOutcome.psbtBase64;
var payjoinPsbt = progressOutcome.PsbtBase64;
var processedPsbtJson = RpcCall(sender, "walletprocesspsbt", JsonSerializer.Serialize(payjoinPsbt));
using var processedDoc = JsonDocument.Parse(processedPsbtJson);
var processedPsbt = processedDoc.RootElement.GetProperty("psbt").GetString()!;
Expand Down
Loading