Add examples/hosted-wallet-kt (#65)

.gitignore

@@ -15,4 +15,6 @@ Cargo.lock
 
 # ---
 
-.hermit/
+.hermit/
+build/
+.gradle/

Cargo.toml

@@ -17,4 +17,4 @@ license-file = "LICENSE"
 serde = { version = "1.0.193", features = ["derive"] }
 serde_json = "1.0.108"
 thiserror = "1.0.50"
-web5 = { git = "https://github.com/TBD54566975/web5-rs", rev = "a73efd745036861a03bdf33984af6ae10536e6f4" }
+web5 = { git = "https://github.com/TBD54566975/web5-rs", rev = "ede4a64286cfaa3c4b5fcad71445c319488b892a" }

bin/.gradle-8.8.pkg

@@ -0,0 +1 @@
+hermit

bin/.maven-3.9.8.pkg

@@ -0,0 +1 @@
+hermit

bin/.openjdk@11.pkg

@@ -0,0 +1 @@
+hermit

bin/gradle

@@ -0,0 +1 @@
+.gradle-8.8.pkg

bin/jaotc

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jar

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jarsigner

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/java

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/javac

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/javadoc

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/javap

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jcmd

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jconsole

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jdb

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jdeprscan

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jdeps

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jfr

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jhsdb

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jimage

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jinfo

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jjs

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jlink

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jmap

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jmod

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jps

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jrunscript

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jshell

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jstack

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jstat

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/jstatd

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/keytool

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/mvn

@@ -0,0 +1 @@
+.maven-3.9.8.pkg

bin/mvnDebug

@@ -0,0 +1 @@
+.maven-3.9.8.pkg

bin/pack200

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/rmic

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/rmid

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/rmiregistry

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/serialver

@@ -0,0 +1 @@
+.openjdk@11.pkg

bin/unpack200

@@ -0,0 +1 @@
+.openjdk@11.pkg

bindings/tbdex_uniffi/Cargo.toml

@@ -12,7 +12,7 @@ tbdex = { path = "../../crates/tbdex" }
 thiserror = { workspace = true }
 uniffi = { version = "0.27.1", features = ["cli"] }
 web5 = { workspace = true }
-web5_uniffi_wrapper = { git = "https://github.com/TBD54566975/web5-rs", rev = "a73efd745036861a03bdf33984af6ae10536e6f4" }
+web5_uniffi_wrapper = { git = "https://github.com/TBD54566975/web5-rs", rev = "ede4a64286cfaa3c4b5fcad71445c319488b892a" }
 
 [build-dependencies]
 uniffi = { version = "0.27.1", features = ["build"] }

bindings/tbdex_uniffi/src/http_client/exchanges.rs

@@ -3,7 +3,9 @@ use crate::{
     messages::{close::Close, order::Order, order_status::OrderStatus, quote::Quote, rfq::Rfq},
 };
 use std::sync::{Arc, RwLock};
-use tbdex::http_client::exchanges::Exchange as InnerExchange;
+use tbdex::http_client::exchanges::{
+    CreateExchangeRequestBody as InnerCreateExchangeRequestBody, Exchange as InnerExchange,
+};
 use web5_uniffi_wrapper::dids::bearer_did::BearerDid;
 
 pub struct Exchange {
@@ -73,3 +75,26 @@ pub fn get_exchanges(pfi_did_uri: String, bearer_did: Arc<BearerDid>) -> Result<
         tbdex::http_client::exchanges::get_exchanges(&pfi_did_uri, &bearer_did.0.clone())?;
     Ok(exchange_ids)
 }
+
+#[derive(Clone)]
+pub struct CreateExchangeRequestBodyData {
+    pub rfq: Arc<Rfq>,
+    pub reply_to: Option<String>,
+}
+
+pub struct CreateExchangeRequestBody(pub CreateExchangeRequestBodyData);
+
+impl CreateExchangeRequestBody {
+    pub fn from_json_string(json: &str) -> Result<Self> {
+        let inner = InnerCreateExchangeRequestBody::from_json_string(json)?;
+        let rfq = Rfq::from_inner(inner.rfq);
+        Ok(Self(CreateExchangeRequestBodyData {
+            rfq: Arc::new(rfq),
+            reply_to: inner.reply_to,
+        }))
+    }
+
+    pub fn get_data(&self) -> CreateExchangeRequestBodyData {
+        self.0.clone()
+    }
+}

bindings/tbdex_uniffi/src/lib.rs

@@ -10,7 +10,7 @@ use crate::{
         balances::get_balances,
         exchanges::{
             create_exchange, get_exchange, get_exchanges, submit_close, submit_order,
-            Exchange as ExchangeData,
+            CreateExchangeRequestBody, CreateExchangeRequestBodyData, Exchange as ExchangeData,
         },
         offerings::get_offerings,
     },
@@ -50,12 +50,16 @@ use web5::{
             verification_method::VerificationMethod as VerificationMethodData,
         },
         did::Did as DidData,
+        portable_did::PortableDid as PortableDidData,
     },
 };
 use web5_uniffi_wrapper::{
     credentials::presentation_definition::PresentationDefinition,
     crypto::{dsa::Signer, in_memory_key_manager::InMemoryKeyManager, key_manager::KeyManager},
-    dids::bearer_did::{BearerDid, BearerDidData},
+    dids::{
+        bearer_did::{BearerDid, BearerDidData},
+        portable_did::PortableDid,
+    },
     errors::RustCoreError as Web5RustCoreError,
 };
 

bindings/tbdex_uniffi/src/messages/rfq.rs

@@ -31,6 +31,10 @@ impl Rfq {
         Ok(Self(Arc::new(RwLock::new(rfq))))
     }
 
+    pub fn from_inner(inner_rfq: InnerRfq) -> Self {
+        Self(Arc::new(RwLock::new(inner_rfq)))
+    }
+
     pub fn from_json_string(json: &str, require_all_private_data: bool) -> Result<Self> {
         let inner_rfq = InnerRfq::from_json_string(json, require_all_private_data)?;
 

bindings/tbdex_uniffi/src/tbdex.udl

@@ -224,7 +224,16 @@ dictionary ExchangeData {
   Close? close;
 };
 
+dictionary CreateExchangeRequestBodyData {
+  Rfq rfq;
+  string? reply_to;
+};
 
+interface CreateExchangeRequestBody {
+  [Name=from_json_string, Throws=RustCoreError]
+  constructor([ByRef] string json);
+  CreateExchangeRequestBodyData get_data();
+};
 
 
 
@@ -311,6 +320,18 @@ interface InMemoryKeyManager {
   KeyManager get_as_key_manager();
 };
 
+dictionary PortableDidData {
+  string did_uri;
+  DocumentData document;
+  sequence<JwkData> private_jwks;
+};
+
+interface PortableDid {
+  [Throws=Web5RustCoreError]
+  constructor([ByRef] string json);
+  PortableDidData get_data();
+};
+
 dictionary BearerDidData {
   DidData did;
   DocumentData document;
@@ -320,6 +341,8 @@ dictionary BearerDidData {
 interface BearerDid {
   [Throws=Web5RustCoreError]
   constructor([ByRef] string uri, KeyManager key_manager);
+  [Throws=Web5RustCoreError, Name=from_portable_did]
+  constructor(PortableDid portable_did);
   BearerDidData get_data();
   [Throws=Web5RustCoreError]
   Signer get_signer(string key_id);

bound/kt/src/main/kotlin/tbdex/sdk/httpclient/Exchanges.kt

@@ -8,6 +8,7 @@ import tbdex.sdk.rust.submitOrder as rustCoreSubmitOrder
 import tbdex.sdk.rust.submitClose as rustCoreSubmitClose
 import tbdex.sdk.rust.getExchange as rustCoreGetExchange
 import tbdex.sdk.rust.getExchanges as rustCoreGetExchanges
+import tbdex.sdk.rust.CreateExchangeRequestBody as RustCoreCreateExchangeRequestBody
 
 data class Exchange(
     val rfq: Rfq,
@@ -48,4 +49,16 @@ fun getExchange(pfiDidUri: String, bearerDid: BearerDid, exchangeId: String): Ex
 
 fun getExchanges(pfiDidUri: String, bearerDid: BearerDid): List<String> {
     return rustCoreGetExchanges(pfiDidUri, bearerDid.rustCoreBearerDid)
+}
+
+class CreateExchangeRequestBody {
+    val rfq: Rfq
+    val replyTo: String?
+
+    constructor(json: String) {
+        val rustCoreCreateExchangeRequestBody = RustCoreCreateExchangeRequestBody.fromJsonString(json)
+        val data = rustCoreCreateExchangeRequestBody.getData()
+        this.rfq = Rfq(data.rfq)
+        this.replyTo = data.replyTo
+    }
 }

bound/kt/src/main/kotlin/tbdex/sdk/messages/Rfq.kt

@@ -1,6 +1,5 @@
 package tbdex.sdk.messages
 
-import com.fasterxml.jackson.databind.JsonNode
 import tbdex.sdk.Json
 import tbdex.sdk.resources.Offering
 import tbdex.sdk.web5.BearerDid
@@ -80,13 +79,13 @@ data class CreateRfqData(
 
 data class CreateSelectedPayinMethod(
     val kind: String,
-    val paymentDetails: JsonNode? = null,
+    val paymentDetails: Map<String, Any?>? = null,
     val amount: String
 )
 
 data class CreateSelectedPayoutMethod(
     val kind: String,
-    val paymentDetails: JsonNode? = null
+    val paymentDetails: Map<String, Any?>? = null
 )
 
 data class RfqData(
@@ -115,5 +114,5 @@ data class RfqPrivateData(
 )
 
 data class PrivatePaymentDetails(
-    val paymentDetails: JsonNode? = null
+    val paymentDetails: Map<String, Any?>? = null
 )

bound/kt/src/main/kotlin/tbdex/sdk/resources/Offering.kt

@@ -1,6 +1,5 @@
 package tbdex.sdk.resources
 
-import com.fasterxml.jackson.databind.JsonNode
 import tbdex.sdk.Json
 import tbdex.sdk.web5.BearerDid
 import tbdex.sdk.web5.PresentationDefinition
@@ -68,7 +67,7 @@ data class PayinMethod(
     val name: String? = null,
     val description: String? = null,
     val group: String? = null,
-    val requiredPaymentDetails: JsonNode? = null,
+    val requiredPaymentDetails: Map<String, Any?>? = null,
     val fee: String? = null,
     val min: String? = null,
     val max: String? = null
@@ -86,7 +85,7 @@ data class PayoutMethod(
     val name: String? = null,
     val description: String? = null,
     val group: String? = null,
-    val requiredPaymentDetails: JsonNode? = null,
+    val requiredPaymentDetails: Map<String, Any?>? = null,
     val fee: String? = null,
     val min: String? = null,
     val max: String? = null,