fixes

Author: QuantumExplorer

.github/workflows/tests-rs-sdk-ffi-build.yml

@@ -92,10 +92,15 @@ jobs:
           BLST_PORTABLE: "1"
           IPHONEOS_DEPLOYMENT_TARGET: "18.0"
           IPHONESIMULATOR_DEPLOYMENT_TARGET: "18.0"
-          RUSTFLAGS: "-C link-arg=-mios-version-min=18.0"
+          CARGO_TARGET_AARCH64_APPLE_IOS_RUSTFLAGS: "-C link-arg=-mios-version-min=18.0"
+          CARGO_TARGET_AARCH64_APPLE_IOS_SIM_RUSTFLAGS: "-C link-arg=-mios-version-min=18.0"
+          CARGO_TARGET_X86_64_APPLE_IOS_RUSTFLAGS: "-C link-arg=-mios-version-min=18.0"
         run: |
           echo "Using BLST_PORTABLE=${BLST_PORTABLE} to avoid iOS linker issues"
-          echo "Minimum iOS deployment target: ${IPHONEOS_DEPLOYMENT_TARGET} (RUSTFLAGS=${RUSTFLAGS})"
+          echo "Minimum iOS deployment target: ${IPHONEOS_DEPLOYMENT_TARGET}"
+          echo "AARCH64 iOS rustflags: ${CARGO_TARGET_AARCH64_APPLE_IOS_RUSTFLAGS}"
+          echo "AARCH64 iOS-sim rustflags: ${CARGO_TARGET_AARCH64_APPLE_IOS_SIM_RUSTFLAGS}"
+          echo "x86_64 iOS rustflags: ${CARGO_TARGET_X86_64_APPLE_IOS_RUSTFLAGS}"
           cargo build --release --target ${{ matrix.target }}
 
       - name: Verify build output

packages/rs-sdk-ffi/Cargo.toml

@@ -17,8 +17,7 @@ drive-proof-verifier = { path = "../rs-drive-proof-verifier" }
 rs-sdk-trusted-context-provider = { path = "../rs-sdk-trusted-context-provider", features = ["dpns-contract"] }
 simple-signer = { path = "../simple-signer" }
 
-[target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]
-# Core SDK integration (always included for unified SDK); relative to this crate
+# Core SDK integration (always included for unified SDK)
 dash-spv-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "befd0356bebfcd0d06d1028d8a03bfa4c78bd219", optional = true }
 dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "befd0356bebfcd0d06d1028d8a03bfa4c78bd219" }
 

packages/rs-sdk-ffi/build_ios.sh

@@ -37,12 +37,16 @@ FRAMEWORK_NAME="DashSDKFFI"
 # Set iOS deployment targets to match Xcode 16 SDKs and avoid 10.0 default
 export IPHONEOS_DEPLOYMENT_TARGET="18.0"
 export IPHONESIMULATOR_DEPLOYMENT_TARGET="18.0"
-# Ensure linker uses the same min version when rustc links
-export RUSTFLAGS="${RUSTFLAGS:-} -C link-arg=-mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
+# Ensure linker uses the same min version when rustc links, but only for iOS targets
+export CARGO_TARGET_AARCH64_APPLE_IOS_RUSTFLAGS="${CARGO_TARGET_AARCH64_APPLE_IOS_RUSTFLAGS:-} -C link-arg=-mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
+export CARGO_TARGET_AARCH64_APPLE_IOS_SIM_RUSTFLAGS="${CARGO_TARGET_AARCH64_APPLE_IOS_SIM_RUSTFLAGS:-} -C link-arg=-mios-version-min=${IPHONESIMULATOR_DEPLOYMENT_TARGET}"
+export CARGO_TARGET_X86_64_APPLE_IOS_RUSTFLAGS="${CARGO_TARGET_X86_64_APPLE_IOS_RUSTFLAGS:-} -C link-arg=-mios-version-min=${IPHONESIMULATOR_DEPLOYMENT_TARGET}"
 
 echo "Using IPHONEOS_DEPLOYMENT_TARGET=${IPHONEOS_DEPLOYMENT_TARGET}"
 echo "Using IPHONESIMULATOR_DEPLOYMENT_TARGET=${IPHONESIMULATOR_DEPLOYMENT_TARGET}"
-echo "RUSTFLAGS=${RUSTFLAGS}"
+echo "CARGO_TARGET_AARCH64_APPLE_IOS_RUSTFLAGS=${CARGO_TARGET_AARCH64_APPLE_IOS_RUSTFLAGS}"
+echo "CARGO_TARGET_AARCH64_APPLE_IOS_SIM_RUSTFLAGS=${CARGO_TARGET_AARCH64_APPLE_IOS_SIM_RUSTFLAGS}"
+echo "CARGO_TARGET_X86_64_APPLE_IOS_RUSTFLAGS=${CARGO_TARGET_X86_64_APPLE_IOS_RUSTFLAGS}"
 
 echo -e "${GREEN}Building Dash SDK FFI for iOS ($BUILD_ARCH)${NC}"
 

packages/rs-sdk-ffi/src/lib.rs

@@ -51,8 +51,6 @@ pub use protocol_version::*;
 pub use sdk::*;
 pub use signer::*;
 pub use signer_simple::*;
-#[cfg(feature = "dash_spv")]
-pub use spv_bridge::*;
 pub use system::*;
 pub use token::*;
 pub use types::*;

packages/rs-sdk-ffi/src/spv_bridge.rs

@@ -1,9 +1,7 @@
 #![allow(non_camel_case_types)]
 
-#[cfg(feature = "local-dashcore")]
 use std::os::raw::{c_char, c_int};
 
-#[cfg(feature = "local-dashcore")]
 #[no_mangle]
 pub extern "C" fn dash_spv_ffi_config_add_peer(
     config: *mut dash_spv_ffi::FFIClientConfig,
@@ -13,7 +11,6 @@ pub extern "C" fn dash_spv_ffi_config_add_peer(
     unsafe { dash_spv_ffi::dash_spv_ffi_config_add_peer(config, addr) }
 }
 
-#[cfg(feature = "local-dashcore")]
 #[no_mangle]
 pub extern "C" fn dash_spv_ffi_config_set_restrict_to_configured_peers(
     config: *mut dash_spv_ffi::FFIClientConfig,