Merge branch 'v3.1-dev' into chore/update-dashcore-08ade6e8

Author: shumkov

packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_list/update_state_masternode_list/v0/mod.rs

@@ -64,10 +64,8 @@ where
                         // the ban_height was changed
                         validator.is_banned = maybe_ban_height.is_some();
                     }
-                    if let Some(maybe_address) = dmn_state_diff.service {
-                        if let Some(address) = maybe_address {
-                            validator.node_ip = address.ip().to_string();
-                        }
+                    if let Some(Some(address)) = dmn_state_diff.service {
+                        validator.node_ip = address.ip().to_string();
                     }
 
                     if let Some(p2p_port) = dmn_state_diff.platform_p2p_port {

packages/rs-sdk-ffi/build.rs

@@ -23,7 +23,16 @@ fn main() {
                 "/* This file is auto-generated. Do not modify manually. */\n/* Unified Dash SDK - includes both Core (SPV) and Platform functionality */".to_string(),
             ),
             after_includes: Some(
-                "/* Forward declarations for opaque types */\nstruct ShieldedPoolClient;\n".to_string(),
+                concat!(
+                    "/* Forward declarations for opaque types */\n",
+                    "struct ShieldedPoolClient;\n",
+                    "\n",
+                    "/* Forward declarations for dash-spv-ffi types used by the unified SDK.\n",
+                    " * These allow the header to compile standalone. The full iOS build\n",
+                    " * merges the complete dash_spv_ffi.h definitions via build_ios.sh. */\n",
+                    "typedef struct FFIClientConfig FFIClientConfig;\n",
+                    "typedef struct FFIDashSpvClient FFIDashSpvClient;\n",
+                ).to_string(),
             ),
             includes: vec![],
             sys_includes: vec!["stdint.h".to_string(), "stdbool.h".to_string()],

packages/rs-sdk-ffi/build_ios.sh

@@ -186,6 +186,38 @@ RUST_DASHCORE_PATH="$PROJECT_ROOT/../rust-dashcore"
 KEY_WALLET_HEADER_PATH="$RUST_DASHCORE_PATH/key-wallet-ffi/include/key_wallet_ffi.h"
 SPV_HEADER_PATH="$RUST_DASHCORE_PATH/dash-spv-ffi/include/dash_spv_ffi.h"
 
+# Generate missing FFI headers from rust-dashcore via a host build
+# The build.rs in each crate runs cbindgen to produce the header under include/
+if [ -d "$RUST_DASHCORE_PATH" ]; then
+    if [ ! -f "$KEY_WALLET_HEADER_PATH" ] || [ ! -f "$SPV_HEADER_PATH" ]; then
+        echo -e "${GREEN}Generating FFI headers from rust-dashcore (host build)...${NC}"
+        pushd "$RUST_DASHCORE_PATH" >/dev/null
+        DASHCORE_CARGO_CMD="cargo"
+        if [ -n "${RUST_DASHCORE_TOOLCHAIN:-}" ]; then
+            DASHCORE_CARGO_CMD="cargo +${RUST_DASHCORE_TOOLCHAIN}"
+        fi
+        if [ ! -f "$KEY_WALLET_HEADER_PATH" ]; then
+            echo -ne "  Generating key_wallet_ffi.h..."
+            if $DASHCORE_CARGO_CMD build --release -p key-wallet-ffi > /tmp/cargo_build_kwffi_host.log 2>&1; then
+                echo -e " ${GREEN}done${NC}"
+            else
+                echo -e " ${RED}failed${NC}"
+                cat /tmp/cargo_build_kwffi_host.log
+            fi
+        fi
+        if [ ! -f "$SPV_HEADER_PATH" ]; then
+            echo -ne "  Generating dash_spv_ffi.h..."
+            if $DASHCORE_CARGO_CMD build --release -p dash-spv-ffi > /tmp/cargo_build_spvffi_host.log 2>&1; then
+                echo -e " ${GREEN}done${NC}"
+            else
+                echo -e " ${RED}failed${NC}"
+                cat /tmp/cargo_build_spvffi_host.log
+            fi
+        fi
+        popd >/dev/null
+    fi
+fi
+
 if [ -f "$KEY_WALLET_HEADER_PATH" ] && [ -f "$SPV_HEADER_PATH" ]; then
     # Create merged header with unified include guard
     MERGED_HEADER="$OUTPUT_DIR/dash_unified_ffi.h"
@@ -348,9 +380,24 @@ EOF
     echo -e "${GREEN}✓ Headers merged successfully${NC}"
 else
     echo -e "${YELLOW}⚠ Key Wallet FFI or SPV FFI headers not found${NC}"
-    echo -e "${YELLOW}  Please build key-wallet-ffi and dash-spv-ffi first:${NC}"
-    echo -e "${YELLOW}  cd ../../../rust-dashcore/key-wallet-ffi && cargo build --release${NC}"
-    echo -e "${YELLOW}  cd ../../../rust-dashcore/dash-spv-ffi && cargo build --release${NC}"
+    echo -e "${YELLOW}  Patching dash_sdk_ffi.h with forward declarations as fallback...${NC}"
+    # Replace the #include "dash_spv_ffi.h" with forward declarations for the
+    # types that rs-sdk-ffi references from dash-spv-ffi, so the header compiles
+    # even without the external header file.
+    if [ -f "$OUTPUT_DIR/dash_sdk_ffi.h" ]; then
+        TEMP_HEADER=$(mktemp)
+        awk '
+        /^#include "dash_spv_ffi\.h"/ {
+            print "/* dash_spv_ffi.h not available; forward declarations injected */"
+            print "typedef struct FFIClientConfig FFIClientConfig;"
+            print "typedef struct FFIDashSpvClient { unsigned char _private[0]; } FFIDashSpvClient;"
+            next
+        }
+        { print }
+        ' "$OUTPUT_DIR/dash_sdk_ffi.h" > "$TEMP_HEADER"
+        mv "$TEMP_HEADER" "$OUTPUT_DIR/dash_sdk_ffi.h"
+        echo -e "${YELLOW}  ⚠ Header patched with minimal forward declarations${NC}"
+    fi
 fi
 
 # Build dash-spv-ffi from local rust-dashcore for device and simulator

packages/rs-sdk-ffi/include/dash_sdk_ffi.h

@@ -11,9 +11,14 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include "dash_spv_ffi.h"
+
+/* Forward declarations for types from dash-spv-ffi.
+ * When building the full unified SDK, the merge step in build_ios.sh replaces
+ * this header with one that includes the complete dash_spv_ffi.h definitions.
+ * These forward declarations keep the header self-contained for local use. */
+#ifndef DASH_SPV_FFI_H
+typedef struct FFIClientConfig FFIClientConfig;
+#endif
 
 // Authorized action takers for token operations
 typedef enum DashSDKAuthorizedActionTakers {