TBD54566975 · KendallWeihe · Jul 3, 2024 · Jul 3, 2024 · Jul 3, 2024 · Jul 4, 2024
diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,5 @@ Cargo.lock
 
 .hermit/
 build/
-.gradle/
+.gradle/
+tmp/
diff --git a/Justfile b/Justfile
@@ -26,12 +26,11 @@ bind: setup
   just bind-kotlin
 
 bind-kotlin: setup
-  cargo build --release --package tbdex_uniffi
-  cargo run --package tbdex_uniffi \
+  cargo build --release --target aarch64-apple-darwin --package tbdex_uniffi
+  cargo run --release --package tbdex_uniffi \
     --bin uniffi-bindgen \
-    generate --library target/release/libtbdex_uniffi.dylib \
+    generate --library target/aarch64-apple-darwin/release/libtbdex_uniffi.dylib \
     --language kotlin \
     --out-dir target/bindgen-kotlin
-  cp target/release/libtbdex_uniffi.dylib bound/kt/src/main/resources/natives
-  cp target/bindgen-kotlin/tbdex/sdk/rust/tbdex.kt bound/kt/src/main/kotlin/tbdex/sdk/rust
-  cd bound/kt && ./fix-load.sh
+  cp target/aarch64-apple-darwin/release/libtbdex_uniffi.dylib bound/kt/src/main/resources
+  cp target/bindgen-kotlin/tbdex/sdk/rust/tbdex.kt bound/kt/src/main/kotlin/tbdex/sdk/rust
diff --git a/bin/[email protected] → bin/[email protected] b/bin/[email protected] → bin/[email protected]
diff --git a/bin/jaotc b/bin/jaotc
diff --git a/bin/jar b/bin/jar
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jarsigner b/bin/jarsigner
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/java b/bin/java
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/javac b/bin/javac
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/javadoc b/bin/javadoc
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/javap b/bin/javap
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jcmd b/bin/jcmd
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jconsole b/bin/jconsole
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jdb b/bin/jdb
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jdeprscan b/bin/jdeprscan
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jdeps b/bin/jdeps
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jfr b/bin/jfr
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jhsdb b/bin/jhsdb
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jimage b/bin/jimage
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jinfo b/bin/jinfo
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jjs b/bin/jjs
diff --git a/bin/jlink b/bin/jlink
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jmap b/bin/jmap
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jmod b/bin/jmod
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jpackage b/bin/jpackage
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jps b/bin/jps
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jrunscript b/bin/jrunscript
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jshell b/bin/jshell
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jstack b/bin/jstack
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jstat b/bin/jstat
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/jstatd b/bin/jstatd
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/keytool b/bin/keytool
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/pack200 b/bin/pack200
diff --git a/bin/rmic b/bin/rmic
diff --git a/bin/rmid b/bin/rmid
diff --git a/bin/rmiregistry b/bin/rmiregistry
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/serialver b/bin/serialver
@@ -1 +1 @@
-.openjdk@11.pkg
+.openjdk@17.pkg
diff --git a/bin/unpack200 b/bin/unpack200
diff --git a/bindings/tbdex_uniffi/Dockerfile b/bindings/tbdex_uniffi/Dockerfile
@@ -0,0 +1,18 @@
+FROM rust:latest
+
+RUN apt-get update && \
+    apt-get install -y musl-tools llvm && \
+    rustup target add x86_64-unknown-linux-musl
+
+WORKDIR /app
+
+COPY .cargo/ Cargo.toml Cargo.lock ./
+COPY crates/tbdex crates/tbdex
+COPY crates/pfi_exemplar_integration_test crates/pfi_exemplar_integration_test
+COPY bindings/tbdex_uniffi bindings/tbdex_uniffi
+
+WORKDIR /app/bindings/tbdex_uniffi
+
+RUN cargo build --release --target x86_64-unknown-linux-musl
+
+CMD tail -f /dev/null
diff --git a/bindings/tbdex_uniffi/DockerfileBindLinuxAmd64 b/bindings/tbdex_uniffi/DockerfileBindLinuxAmd64
@@ -0,0 +1,30 @@
+FROM --platform=linux/amd64 ubuntu:22.04
+
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    cmake \
+    pkg-config \
+    libssl-dev \
+    curl \
+    wget \
+    git \
+    ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+
+RUN rustup default 1.78.0
+
+WORKDIR /app
+
+COPY Cargo.toml Cargo.lock ./
+COPY crates/tbdex crates/tbdex
+COPY crates/pfi_exemplar_integration_test crates/pfi_exemplar_integration_test
+COPY bindings/tbdex_uniffi bindings/tbdex_uniffi
+
+WORKDIR /app/bindings/tbdex_uniffi
+
+RUN cargo build --release
+
+CMD tail -f /dev/null
diff --git a/bindings/tbdex_uniffi/DockerfileBuildAlpine b/bindings/tbdex_uniffi/DockerfileBuildAlpine
@@ -0,0 +1,29 @@
+FROM --platform=linux/amd64 alpine:latest
+
+RUN apk add --no-cache \
+    build-base \
+    cmake \
+    pkgconfig \
+    openssl-dev \
+    curl \
+    wget \
+    git \
+    ca-certificates
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+
+RUN rustup default 1.78.0
+
+WORKDIR /app
+
+COPY Cargo.toml Cargo.lock ./
+COPY crates/tbdex crates/tbdex
+COPY crates/pfi_exemplar_integration_test crates/pfi_exemplar_integration_test
+COPY bindings/tbdex_uniffi bindings/tbdex_uniffi
+
+WORKDIR /app/bindings/tbdex_uniffi
+
+RUN cargo build --release --target x86_64-unknown-linux-musl
+
+CMD tail -f /dev/null
diff --git a/bindings/tbdex_uniffi/DockerfileBuildAlpine_old b/bindings/tbdex_uniffi/DockerfileBuildAlpine_old
@@ -0,0 +1,41 @@
+FROM --platform=linux/amd64 alpine:latest
+
+# Install build dependencies
+RUN apk add --no-cache \
+    build-base \
+    cmake \
+    pkgconfig \
+    openssl-dev \
+    curl \
+    wget \
+    git \
+    ca-certificates \
+    linux-headers
+
+# Install rustup and set default toolchain
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+
+RUN rustup default 1.78.0
+
+# Set working directory
+WORKDIR /app
+
+# Copy project files
+COPY Cargo.toml Cargo.lock ./
+COPY crates/tbdex crates/tbdex
+COPY crates/pfi_exemplar_integration_test crates/pfi_exemplar_integration_test
+COPY bindings/tbdex_uniffi bindings/tbdex_uniffi
+
+WORKDIR /app/bindings/tbdex_uniffi
+
+# Set environment variables to help linker find OpenSSL libraries
+ENV OPENSSL_DIR=/usr
+ENV OPENSSL_LIB_DIR=/usr/lib
+ENV OPENSSL_INCLUDE_DIR=/usr/include
+ENV PKG_CONFIG_PATH=/usr/lib/pkgconfig
+
+# Build the project
+RUN RUSTFLAGS="-C target-feature=-crt-static" cargo build --release --target x86_64-unknown-linux-musl
+
+CMD tail -f /dev/null
diff --git a/bindings/tbdex_uniffi/docker-build-linux-amd64 b/bindings/tbdex_uniffi/docker-build-linux-amd64
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+docker build -f DockerfileBindLinuxAmd64 -t tbdex-uniffi-linux-amd64-image ../../
+docker run -d --name tbdex-uniffi-linux-amd64-container tbdex-uniffi-linux-amd64-image
+docker cp tbdex-uniffi-linux-amd64-container:/app/target/release/libtbdex_uniffi.so ../../bound/kt/src/main/resources
+docker stop tbdex-uniffi-linux-amd64-container
+docker rm tbdex-uniffi-linux-amd64-container
diff --git a/bound/kt/fix-load.sh b/bound/kt/fix-load.sh
diff --git a/bound/kt/src/main/kotlin/tbdex/sdk/rust/tbdex.kt b/bound/kt/src/main/kotlin/tbdex/sdk/rust/tbdex.kt
@@ -31,7 +31,6 @@ import java.nio.charset.CodingErrorAction
 import java.util.concurrent.atomic.AtomicLong
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicBoolean
-import java.nio.file.Files
 
 // This is a helper for safely working with byte buffers returned from the Rust code.
 // A rust-owned buffer is represented by its capacity, its current length, and a
@@ -876,14 +875,9 @@ internal open class UniffiVTableCallbackInterfaceSigner(
 internal interface UniffiLib : Library {
     companion object {
         internal val INSTANCE: UniffiLib by lazy {
-            val tempDir = Files.createTempDirectory("library")
-            val libraryPath = tempDir.resolve("libtbdex_uniffi.dylib")
-            Thread.currentThread().contextClassLoader.getResourceAsStream("natives/libtbdex_uniffi.dylib").use { input ->
-                Files.copy(input, libraryPath)
-            }
-            libraryPath.toFile().deleteOnExit()
-            val lib = Native.load(libraryPath.toString(), UniffiLib::class.java)
-            lib.also {                uniffiCheckContractApiVersion(lib)
+            loadIndirect<UniffiLib>(componentName = "tbdex")
+            .also { lib: UniffiLib ->
+                uniffiCheckContractApiVersion(lib)
                 uniffiCheckApiChecksums(lib)
                 uniffiCallbackInterfaceKeyManager.register(lib)
                 uniffiCallbackInterfaceSigner.register(lib)

diff --git a/...n/resources/natives/libtbdex_uniffi.dylib → .../src/main/resources/libtbdex_uniffi.dylib b/...n/resources/natives/libtbdex_uniffi.dylib → .../src/main/resources/libtbdex_uniffi.dylib
diff --git a/bound/kt/src/main/resources/libtbdex_uniffi.so b/bound/kt/src/main/resources/libtbdex_uniffi.so
diff --git a/bound/kt/src/test/kotlin/tbdex/sdk/httpclient/E2ePfiExemplarIntegrationTest.kt b/bound/kt/src/test/kotlin/tbdex/sdk/httpclient/E2ePfiExemplarIntegrationTest.kt
@@ -15,7 +15,8 @@ class E2ePfiExemplarIntegrationTest {
     @Disabled
     @Test
     fun `can make the happy path`() {
-        val pfiDidUri = "did:dht:swit41ctrddy1s38c5j46yfgbxmwo1emau71zo5hn1tws1g63hiy"
+//        val pfiDidUri = "did:dht:swit41ctrddy1s38c5j46yfgbxmwo1emau71zo5hn1tws1g63hiy"
+        val pfiDidUri = "did:web:localhost%3A8891"
 
         val didUri = "did:dht:1fs5hnxsgtxgdr4wzqi38cnj46b1whhn94ojwo66g8hsc5bt3fgy"
         val keyManager = InMemoryKeyManager(listOf())

diff --git a/examples/hosted-wallet-kt/Dockerfile b/examples/hosted-wallet-kt/Dockerfile
@@ -0,0 +1,21 @@
+FROM --platform=linux/amd64 ubuntu:22.04
+
+RUN apt-get update && apt-get install -y \
+    openjdk-17-jdk \
+    gradle \
+    maven \
+    git
+
+COPY bound/kt /app/bound/kt
+COPY examples/hosted-wallet-kt  /app/examples/hosted-wallet-kt
+
+WORKDIR /app/bound/kt
+RUN mvn install
+
+WORKDIR /app/examples/hosted-wallet-kt
+RUN ./gradlew build
+
+EXPOSE 8081
+EXPOSE 8082
+
+CMD ["bash"]