chore: project restructure

Author: reez

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["lib", "cli"]
+members = ["lib", "cli", "cktap-ffi"]
 
 [profile.release-smaller]
 inherits = "release"

cktap-ffi/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "cktap-ffi"
+version = "0.1.0"
+edition = "2021"
+license = "MIT"
+
+[lib]
+name = "cktap_ffi"
+crate-type = ["staticlib", "cdylib"]
+
+[dependencies]
+rust-cktap = { path = "../lib" }
+uniffi = { version = "0.29", features = ["cli"], optional = true }
+
+[build-dependencies]
+uniffi = { version = "0.29", features = ["build"], optional = true }
+
+[features]
+default = []
+uniffi = ["dep:uniffi"] 

lib/src/uniffi-bindgen.rs cktap-ffi/src/bin/uniffi-bindgen.rslib/src/uniffi-bindgen.rs renamed to cktap-ffi/src/bin/uniffi-bindgen.rs

@@ -0,0 +1,18 @@
+#[cfg(feature = "uniffi")]
+uniffi::setup_scaffolding!();
+
+pub use rust_cktap::{
+    rand_chaincode, rand_nonce as core_rand_nonce, CkTapCard, Error, SatsCard, TapSigner,
+};
+
+#[cfg(feature = "uniffi")]
+#[derive(uniffi::Object)]
+pub struct TestStruct {
+    pub value: u32,
+}
+
+#[cfg(feature = "uniffi")]
+#[uniffi::export]
+pub fn rand_nonce() -> Vec<u8> {
+    core_rand_nonce().to_vec()
+}

cktap-ffi/src/lib.rs

@@ -5,8 +5,18 @@
 TARGETDIR="../target"
 OUTDIR="."
 RELDIR="release-smaller"
+
+FFI_LIB_NAME="cktap_ffi"
+FFI_PKG_NAME="cktap-ffi"
+
+DYLIB_FILENAME="lib${FFI_LIB_NAME}.dylib"
+HEADER_BASENAME="${FFI_LIB_NAME}FFI"
+HEADER_FILENAME="${HEADER_BASENAME}.h"
+MODULEMAP_FILENAME="module.modulemap"
+GENERATED_MODULEMAP="${FFI_LIB_NAME}FFI.modulemap"
+
 NAME="cktapFFI"
-STATIC_LIB_NAME="lib${NAME}.a"
+STATIC_LIB_FILENAME="lib${FFI_LIB_NAME}.a"
 NEW_HEADER_DIR="../target/include"
 
 # set required rust version and install component and targets
@@ -28,46 +38,62 @@ cd ../ || exit
 
 # Target architectures
 # macOS Intel
-cargo build --package rust-cktap --profile release-smaller --target x86_64-apple-darwin
+cargo build --package ${FFI_PKG_NAME} --features uniffi --profile ${RELDIR} --target x86_64-apple-darwin
 # macOS Apple Silicon
-cargo build --package rust-cktap --profile release-smaller --target aarch64-apple-darwin
+cargo build --package ${FFI_PKG_NAME} --features uniffi --profile ${RELDIR} --target aarch64-apple-darwin
 # Simulator on Intel Macs
-cargo build --package rust-cktap --profile release-smaller --target x86_64-apple-ios
+cargo build --package ${FFI_PKG_NAME} --features uniffi --profile ${RELDIR} --target x86_64-apple-ios
 # Simulator on Apple Silicon Mac
-cargo build --package rust-cktap --profile release-smaller --target aarch64-apple-ios-sim
+cargo build --package ${FFI_PKG_NAME} --features uniffi --profile ${RELDIR} --target aarch64-apple-ios-sim
 # iPhone devices
-cargo build --package rust-cktap --profile release-smaller --target aarch64-apple-ios
+cargo build --package ${FFI_PKG_NAME} --features uniffi --profile ${RELDIR} --target aarch64-apple-ios
 
 # Then run uniffi-bindgen
-cargo run --bin uniffi-bindgen generate \
-    --features uniffi \
-    --library target/aarch64-apple-ios/release-smaller/librust_cktap.dylib \
+cargo run --package ${FFI_PKG_NAME} --bin uniffi-bindgen --features uniffi generate \
+    --library target/aarch64-apple-ios/${RELDIR}/${DYLIB_FILENAME} \
     --language swift \
     --out-dir cktap-swift/Sources/CKTap \
     --no-format
 
 # Create universal library for simulator targets
-lipo target/aarch64-apple-ios-sim/release-smaller/librust_cktap.a target/x86_64-apple-ios/release-smaller/librust_cktap.a -create -output target/lipo-ios-sim/release-smaller/librust_cktap.a
+lipo target/aarch64-apple-ios-sim/${RELDIR}/${STATIC_LIB_FILENAME} \
+     target/x86_64-apple-ios/${RELDIR}/${STATIC_LIB_FILENAME} \
+     -create -output target/lipo-ios-sim/${RELDIR}/${STATIC_LIB_FILENAME}
 
 # Create universal library for mac targets
-lipo target/aarch64-apple-darwin/release-smaller/librust_cktap.a target/x86_64-apple-darwin/release-smaller/librust_cktap.a -create -output target/lipo-macos/release-smaller/librust_cktap.a
+lipo target/aarch64-apple-darwin/${RELDIR}/${STATIC_LIB_FILENAME} \
+     target/x86_64-apple-darwin/${RELDIR}/${STATIC_LIB_FILENAME} \
+     -create -output target/lipo-macos/${RELDIR}/${STATIC_LIB_FILENAME}
 
 cd cktap-swift || exit
 
 # move cktap-ffi static lib header files to temporary directory
-mv "Sources/CKTap/rust_cktapFFI.h" "${NEW_HEADER_DIR}"
-mv "Sources/CKTap/rust_cktapFFI.modulemap" "${NEW_HEADER_DIR}/module.modulemap"
+if [ -f "Sources/CKTap/${HEADER_FILENAME}" ]; then
+    mv "Sources/CKTap/${HEADER_FILENAME}" "${NEW_HEADER_DIR}/"
+else
+    echo "Warning: Could not find header file Sources/CKTap/${HEADER_FILENAME}"
+fi
+
+# Handle modulemap using the correct filename pattern
+if [ -f "Sources/CKTap/${GENERATED_MODULEMAP}" ]; then
+    mv "Sources/CKTap/${GENERATED_MODULEMAP}" "${NEW_HEADER_DIR}/${MODULEMAP_FILENAME}"
+else
+    echo "Creating a standard module map."
+    echo "framework module ${NAME} { umbrella header \"${HEADER_FILENAME}\" export * }" > "${NEW_HEADER_DIR}/${MODULEMAP_FILENAME}"
+fi
 
 # remove old xcframework directory
 rm -rf "${OUTDIR}/${NAME}.xcframework"
 
 # create new xcframework directory from cktap-ffi static libs and headers
 xcodebuild -create-xcframework \
-    -library "${TARGETDIR}/lipo-macos/${RELDIR}/librust_cktap.a" \
+    -library "${TARGETDIR}/lipo-macos/${RELDIR}/${STATIC_LIB_FILENAME}" \
     -headers "${NEW_HEADER_DIR}" \
-    -library "${TARGETDIR}/aarch64-apple-ios/${RELDIR}/librust_cktap.a" \
+    -library "${TARGETDIR}/aarch64-apple-ios/${RELDIR}/${STATIC_LIB_FILENAME}" \
     -headers "${NEW_HEADER_DIR}" \
-    -library "${TARGETDIR}/lipo-ios-sim/${RELDIR}/librust_cktap.a" \
+    -library "${TARGETDIR}/lipo-ios-sim/${RELDIR}/${STATIC_LIB_FILENAME}" \
     -headers "${NEW_HEADER_DIR}" \
     -output "${OUTDIR}/${NAME}.xcframework"
 
+echo "Building Swift package completed."
+

cktap-swift/build-xcframework.sh

@@ -5,7 +5,7 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
-crate-type = ["lib", "staticlib", "cdylib"]
+crate-type = ["lib"]
 name = "rust_cktap"
 
 
@@ -26,23 +26,13 @@ bitcoin = { version = "0.32", features = ["rand-std"] }
 # logging
 log = "0.4"
 
-# uniffi 
-uniffi = { version = "0.29", features = ["cli"], optional = true }
-
+# pcsc as optional
 pcsc = { version = "2", optional = true }
 
-[build-dependencies]
-uniffi = { version = "0.29.1", features = ["build"] }
-
 [features]
-uniffi = ["dep:uniffi"]
 default = []
 emulator = []
 
 [[example]]
 name = "pcsc"
 required-features = ["pcsc"]
-
-[[bin]]
-name = "uniffi-bindgen"
-path = "src/uniffi-bindgen.rs"

lib/Cargo.toml

@@ -1,6 +1,3 @@
-#[cfg(feature = "uniffi")]
-uniffi::setup_scaffolding!();
-
 extern crate core;
 
 use bitcoin::key::rand::Rng as _;
@@ -15,9 +12,6 @@ pub use bitcoin::secp256k1::{self, rand};
 #[cfg(feature = "emulator")]
 pub mod emulator;
 
-#[cfg(feature = "uniffi")]
-mod ffi;
-
 #[cfg(feature = "pcsc")]
 pub mod pcsc;
 pub mod sats_card;