react-native-zano 0.1.2 → 0.1.3

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 0.1.3 (2025-05-05)
+
+- fixed: Shield symbols for iOS builds using partial linking and symbol encapsulation.
+
 ## 0.1.2 (2025-04-29)
 
 - fixed: Republish with missing .so files

package/README.md

@@ -54,3 +54,9 @@ This script does the following tasks:
 - Compile an iOS universal static library and put it into an XCFramework.
 
 The `update-sources` script is also the place to make edits when upgrading any of the third-party dependencies. The react-native-zano repo doesn't include these third-party C++ sources, since they are enormous.
+
+For this to work, you need:
+
+- A recent Android SDK, installed at `$ANDROID_HOME`
+- Xcode command-line tools
+- `llvm-objcopy`, provided by `brew install llvm`

package/ios/ZanoModule.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>libzano-module.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libzano-module.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libzano-module.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libzano-module.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/lib/scripts/update-sources.js

@@ -32,6 +32,7 @@ const os_1 = require("os");
 const path_1 = require("path");
 const android_tools_1 = require("./utils/android-tools");
 const common_1 = require("./utils/common");
+const ios_tools_1 = require("./utils/ios-tools");
 exports.srcPath = (0, path_1.join)(__dirname, '../src');
 async function main() {
     await (0, promises_1.mkdir)(common_1.tmpPath, { recursive: true });
@@ -50,6 +51,11 @@ async function main() {
 async function downloadSources() {
     await (0, common_1.getRepo)('zano_native_lib', 'https://github.com/hyle-team/zano_native_lib.git', '391a965d1d609f917cc97908b9d354a7f54e0258');
     await (0, common_1.getRepo)('Boost-for-Android', 'https://github.com/moritz-wundke/Boost-for-Android.git', '51924ec5533a4fefb5edf99feaeded794c06a4fb');
+    // Rename the compress function in RIPEMD160.c,
+    // since that conflicts with Zlib:
+    const mdPath = (0, path_1.join)(common_1.tmpPath, 'zano_native_lib/Zano/src/crypto/RIPEMD160.h');
+    const mdText = await (0, promises_1.readFile)(mdPath, 'utf8');
+    await (0, promises_1.writeFile)(mdPath, '#define compress md_compress\n' + mdText);
 }
 // Compiler options:
 const includePaths = ['zano_native_lib/Zano/src/wallet'];
@@ -86,8 +92,8 @@ const iosPlatforms = [
     // { sdk: 'iphoneos', arch: 'armv7s' },
 ];
 const iosSdkTriples = {
-    iphoneos: '%arch%-apple-ios9.0',
-    iphonesimulator: '%arch%-apple-ios9.0-simulator'
+    iphoneos: '%arch%-apple-ios13.0',
+    iphonesimulator: '%arch%-apple-ios13.0-simulator'
 };
 /**
  * We compile our own Boost for Android,
@@ -183,6 +189,8 @@ async function buildIosZano(platform) {
     const ar = await (0, common_1.quietExec)('xcrun', ['--sdk', sdk, '--find', 'ar']);
     const cc = await (0, common_1.quietExec)('xcrun', ['--sdk', sdk, '--find', 'clang']);
     const cxx = await (0, common_1.quietExec)('xcrun', ['--sdk', sdk, '--find', 'clang++']);
+    const ld = await (0, common_1.quietExec)('xcrun', ['--sdk', sdk, '--find', 'ld']);
+    const objcopy = await (0, ios_tools_1.getObjcopyPath)();
     const sdkFlags = [
         '-arch',
         arch,
@@ -193,7 +201,7 @@ async function buildIosZano(platform) {
     ];
     const cflags = [
         ...includePaths.map(path => `-I${(0, path_1.join)(common_1.tmpPath, path)}`),
-        '-miphoneos-version-min=9.0',
+        '-miphoneos-version-min=13.0',
         '-O2',
         '-Werror=partial-availability'
     ];
@@ -247,30 +255,31 @@ async function buildIosZano(platform) {
         '--target',
         'install'
     ]);
-    // Explode Zano archives and gather the objects:
-    async function unpackLib(libPath, name) {
-        console.log(`Unpacking lib${name}.a`);
-        const outPath = (0, path_1.join)(working, `unpack/${name}`);
-        await (0, promises_1.rm)(outPath, { recursive: true, force: true });
-        await (0, promises_1.mkdir)(outPath, { recursive: true });
-        await (0, common_1.loudExec)('ar', ['-x', libPath], { cwd: outPath });
-        // Add object files to the list:
-        for (const file of await (0, promises_1.readdir)(outPath)) {
-            if (file.endsWith('.o'))
-                objects.push((0, path_1.join)(outPath, file));
-        }
-    }
-    for (const lib of zanoLibs) {
-        await unpackLib((0, path_1.join)(working, `lib/lib${lib}.a`), lib);
-    }
-    for (const lib of boostLibs) {
-        await unpackLib((0, path_1.join)(common_1.tmpPath, `zano_native_lib/_libs_ios/boost/stage/${sdk}/${arch}/libboost_${lib}.a`), `boost_${lib}`);
-    }
+    // Link everything together into a single giant .o file:
+    console.log(`Linking zano-module.o for ${sdk} ${arch}`);
+    const objectPath = (0, path_1.join)(working, 'zano-module.o');
+    await (0, common_1.loudExec)(ld, [
+        '-r',
+        '-o',
+        objectPath,
+        ...objects,
+        ...boostLibs.map(name => (0, path_1.join)(boostPath, `stage/${sdk}/${arch}/libboost_${name}.a`)),
+        ...zanoLibs.map(name => (0, path_1.join)(working, `lib/lib${name}.a`))
+    ]);
+    // Localize all symbols except the ones we really want,
+    // hiding them from future linking steps:
+    await (0, common_1.loudExec)(objcopy, [
+        objectPath,
+        '-w',
+        '-L*',
+        '-L!_zanoMethods',
+        '-L!_zanoMethodCount'
+    ]);
     // Generate a static library:
     console.log(`Building static library for ${sdk}-${arch}...`);
     const library = (0, path_1.join)(working, `libzano-module.a`);
     await (0, promises_1.rm)(library, { force: true });
-    await (0, common_1.loudExec)(ar, ['rcs', library, ...objects]);
+    await (0, common_1.loudExec)(ar, ['rcs', library, objectPath]);
 }
 /**
  * Creates a unified xcframework file out of the per-platform

package/lib/scripts/utils/ios-tools.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Finds llvm-objcopy in Homebrew.
+ *
+ * Homebrew doesn't symlink LLVM into the normal location,
+ * to avoid conflicting with Xcode's built-in tools.
+ * We can get around this by looking in the right places.
+ */
+export declare function getObjcopyPath(): Promise<string>;

package/lib/scripts/utils/ios-tools.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getObjcopyPath = void 0;
+const common_1 = require("./common");
+/**
+ * Finds llvm-objcopy in Homebrew.
+ *
+ * Homebrew doesn't symlink LLVM into the normal location,
+ * to avoid conflicting with Xcode's built-in tools.
+ * We can get around this by looking in the right places.
+ */
+async function getObjcopyPath() {
+    const whichPath = await (0, common_1.quietExec)('which', ['llvm-objcopy']).catch(() => { });
+    if (whichPath != null)
+        return whichPath;
+    const paths = [
+        '/opt/homebrew/opt/llvm/bin/llvm-objcopy',
+        '/usr/local/opt/llvm/bin/llvm-objcopy' // for Intel Macs
+    ];
+    for (const path of paths) {
+        if (await (0, common_1.fileExists)(path))
+            return path;
+    }
+    throw new Error('Please install `llvm-objcopy` using `brew install llvm`.');
+}
+exports.getObjcopyPath = getObjcopyPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-zano",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "React Native bindings for the Zano blockchain",
   "homepage": "https://github.com/EdgeApp/react-native-zano",
   "repository": {
@@ -9,7 +9,7 @@
   },
   "license": "BSD-3-Clause",
   "author": "Airbitz, Inc.",
-  "main": "lib/index.js",
+  "main": "lib/src/index.js",
   "types": "lib/src/index.d.ts",
   "files": [
     "/android/build.gradle",

package/react-native-zano.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.license      = package['license']
   s.authors      = package['author']
 
-  s.platform     = :ios, "9.0"
+  s.platform     = :ios, "13.0"
   s.requires_arc = true
   s.source = {
     :git => "https://github.com/EdgeApp/react-native-zano.git",