github-such-software/hash-wallet
1
0
Fork 1
mirror of https://github.com/Such-Software/hash-wallet.git synced 2026-10-17 05:41:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "monero: update dependencies (#3064)" (#3114)

Browse Source 
This reverts commit e37f478588.
This commit is contained in:
Omar Hatem
2026-03-20 15:56:26 +01:00
committed by GitHub
parent a418980e80
commit 2d034091ff
27 changed files with 88 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/pr_test_build_linux.yml
+7 -10
View File
@@ -113,15 +113,12 @@ jobs:
- name: Build monero_c
run: |
./scripts/prepare_moneroc.sh
mkdir -p scripts/monero_c/release
pushd scripts/monero_c/release
mkdir -p $(git describe --tags)
pushd $(git describe --tags)
wget https://github.com/MrCyjaneK/monero_c/releases/download/v0.18.4.6-RC1/release-bundle.zip
unzip release-bundle.zip
rm release-bundle.zip
popd
mkdir -p scripts/monero_c
pushd scripts/monero_c
wget https://github.com/MrCyjaneK/monero_c/releases/download/v0.18.4.0-RC9/release-bundle.zip
unzip release-bundle.zip
rm release-bundle.zip
unxz -fv release/*/*.xz
popd
- name: Execute Build and Setup Commands
@@ -221,7 +218,7 @@ jobs:
exec timeout --signal=SIGKILL 900 flutter drive --driver=test_driver/integration_test.dart --target=integration_test/test_suites/restore_wallet_through_seeds_flow_test.dart
- name: Test [cw_monero]
timeout-minutes: 15
run: cd cw_monero && flutter test
run: cd cw_monero && flutter test --verbose
- name: Stop screen recording, encrypt and upload
if: always()
run: |
android/app/src/main/jniLibs/.gitignore
-1
View File
@@ -1 +0,0 @@
lib*_wallet2_api_c.so
android/app/src/main/jniLibs/arm64-v8a/libmonero_libwallet2_api_c.so
Symlink
+1
View File
@@ -0,0 +1 @@
../../../../../../scripts/monero_c/release/monero/aarch64-linux-android_libwallet2_api_c.so
android/app/src/main/jniLibs/arm64-v8a/libwownero_libwallet2_api_c.so
Symlink
+1
View File
@@ -0,0 +1 @@
../../../../../../scripts/monero_c/release/wownero/aarch64-linux-android_libwallet2_api_c.so
android/app/src/main/jniLibs/arm64-v8a/libzano_libwallet2_api_c.so
Symlink
+1
View File
@@ -0,0 +1 @@
../../../../../../scripts/monero_c/release/zano/aarch64-linux-android_libwallet2_api_c.so
android/app/src/main/jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so
Symlink
+1
View File
@@ -0,0 +1 @@
../../../../../../scripts/monero_c/release/monero/armv7a-linux-androideabi_libwallet2_api_c.so
android/app/src/main/jniLibs/armeabi-v7a/libwownero_libwallet2_api_c.so
Symlink
+1
View File
@@ -0,0 +1 @@
../../../../../../scripts/monero_c/release/wownero/armv7a-linux-androideabi_libwallet2_api_c.so
android/app/src/main/jniLibs/armeabi-v7a/libzano_libwallet2_api_c.so
Symlink
+1
View File
@@ -0,0 +1 @@
../../../../../../scripts/monero_c/release/zano/armv7a-linux-androideabi_libwallet2_api_c.so
android/app/src/main/jniLibs/x86_64/libmonero_libwallet2_api_c.so
Symlink
+1
View File
@@ -0,0 +1 @@
../../../../../../scripts/monero_c/release/monero/x86_64-linux-android_libwallet2_api_c.so
android/app/src/main/jniLibs/x86_64/libwownero_libwallet2_api_c.so
Symlink
+1
View File
@@ -0,0 +1 @@
../../../../../../scripts/monero_c/release/wownero/x86_64-linux-android_libwallet2_api_c.so
android/app/src/main/jniLibs/x86_64/libzano_libwallet2_api_c.so
Symlink
+1
View File
@@ -0,0 +1 @@
../../../../../../scripts/monero_c/release/zano/x86_64-linux-android_libwallet2_api_c.so
cw_monero/pubspec.lock
+2 -2
View File
@@ -582,8 +582,8 @@ packages:
dependency: "direct main"
description:
path: "impls/monero.dart"
ref: c157cb82973b05d1226b39b4d8de0bec4aa10000
resolved-ref: c157cb82973b05d1226b39b4d8de0bec4aa10000
ref: "411e8a1cdb3f4c2812d83f28c335d2a4eb18bd29"
resolved-ref: "411e8a1cdb3f4c2812d83f28c335d2a4eb18bd29"
url: "https://github.com/mrcyjanek/monero_c"
source: git
version: "0.0.0"
cw_monero/pubspec.yaml
+2 -1
View File
@@ -26,7 +26,7 @@ dependencies:
monero:
git:
url: https://github.com/mrcyjanek/monero_c
ref: c157cb82973b05d1226b39b4d8de0bec4aa10000
ref: 411e8a1cdb3f4c2812d83f28c335d2a4eb18bd29
path: impls/monero.dart
mutex: ^3.1.0
ledger_flutter_plus: ^1.4.1
@@ -54,6 +54,7 @@ flutter:
# be modified. They are used by the tooling to maintain consistency when
# adding or updating assets for this project.
# To add assets to your plugin package, add an assets section, like this:
# assets:
# - images/a_dot_burr.jpeg
cw_monero/test/monero_wallet_service_test.dart
+2 -2
View File
@@ -18,7 +18,7 @@ import 'utils/setup_monero_c.dart';
Future<void> main() async {
group("MoneroWalletService Tests", () {
late MoneroWalletService walletService;
File? moneroCBinary;
late File moneroCBinary;
setUpAll(() async {
await initDb(pathOverride: './test/data/db');
@@ -34,7 +34,7 @@ Future<void> main() async {
tearDownAll(() {
Directory('./test/data').deleteSync(recursive: true);
moneroCBinary!.deleteSync();
moneroCBinary.deleteSync();
});
group("Create wallet", () {
cw_monero/test/utils/setup_monero_c.dart
+9 -20
View File
@@ -1,27 +1,16 @@
import 'dart:io';
import 'package:path/path.dart' as p;
File getMoneroCBinary() {
final baseDir = Directory('../scripts/monero_c/release');
final versionDir =
baseDir.listSync().whereType<Directory>().map((d) => d.path).firstWhere(
(path) => p.basename(path).startsWith('v'),
);
if (Platform.isWindows) {
return File(p.join(
versionDir, 'x86_64-w64-mingw32', 'libmonero_wallet2_api_c.dll'));
}
if (Platform.isMacOS) {
return File(p.join(versionDir, 'macos', 'libmonero_wallet2_api_c.dylib'));
}
return File(
p.join(versionDir, 'x86_64-linux-gnu', 'libmonero_wallet2_api_c.so'));
if (Platform.isWindows)
return File(
'../scripts/monero_c/release/monero/x86_64-w64-mingw32_libwallet2_api_c.dll');
if (Platform.isMacOS) return File('../macos/monero_libwallet2_api_c.dylib');
return File('../scripts/monero_c/release/monero/x86_64-linux-gnu_libwallet2_api_c.so');
}
String get moneroCBinaryName {
if (Platform.isWindows) return "libmonero_wallet2_api_c.dll";
if (Platform.isMacOS) return "libmonero_wallet2_api_c.dylib";
return "/usr/lib/libmonero_wallet2_api_c.so";
if (Platform.isWindows)
return "monero_libwallet2_api_c.dll";
if (Platform.isMacOS) return "monero_libwallet2_api_c.dylib";
return "/usr/lib/monero_libwallet2_api_c.so";
}
cw_wownero/pubspec.lock
+2 -2
View File
@@ -502,8 +502,8 @@ packages:
dependency: "direct main"
description:
path: "impls/monero.dart"
ref: "c157cb82973b05d1226b39b4d8de0bec4aa10000"
resolved-ref: "c157cb82973b05d1226b39b4d8de0bec4aa10000"
ref: "411e8a1cdb3f4c2812d83f28c335d2a4eb18bd29"
resolved-ref: "411e8a1cdb3f4c2812d83f28c335d2a4eb18bd29"
url: "https://github.com/mrcyjanek/monero_c"
source: git
version: "0.0.0"
cw_wownero/pubspec.yaml
+2 -1
View File
@@ -24,7 +24,7 @@ dependencies:
monero:
git:
url: https://github.com/mrcyjanek/monero_c
ref: c157cb82973b05d1226b39b4d8de0bec4aa10000 # monero_c hash
ref: 411e8a1cdb3f4c2812d83f28c335d2a4eb18bd29 # monero_c hash
path: impls/monero.dart
mutex: ^3.1.0
@@ -49,6 +49,7 @@ flutter:
# be modified. They are used by the tooling to maintain consistency when
# adding or updating assets for this project.
# To add assets to your plugin package, add an assets section, like this:
# assets:
# - images/a_dot_burr.jpeg
cw_zano/pubspec.lock
+2 -2
View File
@@ -507,8 +507,8 @@ packages:
dependency: "direct main"
description:
path: "impls/monero.dart"
ref: "c157cb82973b05d1226b39b4d8de0bec4aa10000"
resolved-ref: "c157cb82973b05d1226b39b4d8de0bec4aa10000"
ref: "411e8a1cdb3f4c2812d83f28c335d2a4eb18bd29"
resolved-ref: "411e8a1cdb3f4c2812d83f28c335d2a4eb18bd29"
url: "https://github.com/mrcyjanek/monero_c"
source: git
version: "0.0.0"
cw_zano/pubspec.yaml
+2 -1
View File
@@ -25,7 +25,7 @@ dependencies:
monero:
git:
url: https://github.com/mrcyjanek/monero_c
ref: c157cb82973b05d1226b39b4d8de0bec4aa10000 # monero_c hash
ref: 411e8a1cdb3f4c2812d83f28c335d2a4eb18bd29 # monero_c hash
path: impls/monero.dart
dev_dependencies:
flutter_test:
@@ -38,6 +38,7 @@ dev_dependencies:
dependency_overrides:
watcher: ^1.1.0
# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec
linux/CMakeLists.txt
+6 -29
View File
@@ -113,37 +113,14 @@ else()
set(LIB_TRIPLET "x86_64-linux-gnu")
endif()
execute_process(
COMMAND git describe --tags
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/monero_c
OUTPUT_VARIABLE MONERO_C_TAG
OUTPUT_STRIP_TRAILING_WHITESPACE
)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../scripts/zcash_lib/target/release/libwarp_api_ffi.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libwarp_api_ffi.so"
COMPONENT Runtime)
set(MONERO_C_RELEASE_DIR
"${CMAKE_CURRENT_SOURCE_DIR}/../scripts/monero_c/release/${MONERO_C_TAG}/${LIB_TRIPLET}"
)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../scripts/monero_c/release/monero/${LIB_TRIPLET}_libwallet2_api_c.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "monero_libwallet2_api_c.so"
COMPONENT Runtime)
install(
FILES "${CMAKE_CURRENT_SOURCE_DIR}/../scripts/zcash_lib/target/release/libwarp_api_ffi.so"
DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
RENAME "libwarp_api_ffi.so"
COMPONENT Runtime
)
install(
FILES "${MONERO_C_RELEASE_DIR}/libmonero_wallet2_api_c.so"
DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
RENAME "libmonero_wallet2_api_c.so"
COMPONENT Runtime
)
install(
FILES "${MONERO_C_RELEASE_DIR}/libwownero_wallet2_api_c.so"
DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
RENAME "libwownero_wallet2_api_c.so"
COMPONENT Runtime
)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../scripts/monero_c/release/wownero/${LIB_TRIPLET}_libwallet2_api_c.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "wownero_libwallet2_api_c.so"
COMPONENT Runtime)
install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
COMPONENT Runtime)
scripts/android/build_monero_all.sh
+3 -21
View File
@@ -1,7 +1,7 @@
#!/bin/bash
source "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/functions.sh"
# Usage: env USE_DOCKER= ./build_all.sh
# Usage: env USE_DOCKER= ./build_all.sh
set -x -e
@@ -12,33 +12,15 @@ cd "$(dirname "$0")"
for COIN in monero wownero zano;
do
pushd ../monero_c
monero_c_tag=$(git describe --tags)
for target in {x86_64,aarch64}-linux-android armv7a-linux-androideabi
do
if [[ -f "release/${monero_c_tag}/${target}/${COIN}_libwallet2_api_c.so" ]];
if [[ -f "release/${COIN}/${target}_libwallet2_api_c.so" ]];
then
echo "file exist, not building monero_c for ${COIN}/$target.";
else
./build_single.sh ${COIN} $target -j$MAKE_JOB_COUNT
unxz -f ../monero_c/release/${COIN}/${target}_libwallet2_api_c.so.xz
fi
case $target in
x86_64-linux-android)
mkdir -p ../../android/app/src/main/jniLibs/x86_64 || true
cp ../monero_c/release/${monero_c_tag}/${target}/lib${COIN}_wallet2_api_c.so ../../android/app/src/main/jniLibs/x86_64/
;;
armv7a-linux-androideabi)
mkdir -p ../../android/app/src/main/jniLibs/armeabi-v7a || true
cp ../monero_c/release/${monero_c_tag}/${target}/lib${COIN}_wallet2_api_c.so ../../android/app/src/main/jniLibs/armeabi-v7a/
;;
aarch64-linux-android)
mkdir -p ../../android/app/src/main/jniLibs/arm64-v8a || true
cp ../monero_c/release/${monero_c_tag}/${target}/lib${COIN}_wallet2_api_c.so ../../android/app/src/main/jniLibs/arm64-v8a/
;;
*)
echo "Unsupported target: $target"
exit 1;
esac
done
popd
done
scripts/ios/build_monero_all.sh
+11 -3
View File
@@ -1,5 +1,5 @@
#!/bin/sh
source "$(cd "$(dirname "$0")/.." && pwd)/functions.sh"
source "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/functions.sh"
. ./config.sh
# ./install_missing_headers.sh
@@ -19,8 +19,16 @@ for COIN in monero wownero zano;
do
pushd ../monero_c
./build_single.sh ${COIN} aarch64-apple-ios -j$MAKE_JOB_COUNT
./build_single.sh ${COIN} aarch64-apple-ios-simulator -j$MAKE_JOB_COUNT
./build_single.sh ${COIN} aarch64-apple-iossimulator -j$MAKE_JOB_COUNT
popd
done
./gen_framework.sh
unxz -fk ../monero_c/release/monero/aarch64-apple-ios_libwallet2_api_c.dylib.xz
unxz -fk ../monero_c/release/wownero/aarch64-apple-ios_libwallet2_api_c.dylib.xz
unxz -fk ../monero_c/release/zano/aarch64-apple-ios_libwallet2_api_c.dylib.xz
unxz -fk ../monero_c/release/monero/aarch64-apple-iossimulator_libwallet2_api_c.dylib.xz
unxz -fk ../monero_c/release/wownero/aarch64-apple-iossimulator_libwallet2_api_c.dylib.xz
unxz -fk ../monero_c/release/zano/aarch64-apple-iossimulator_libwallet2_api_c.dylib.xz
./gen_framework.sh
scripts/ios/gen_framework.sh
+5 -6
View File
@@ -2,8 +2,7 @@
set -e
IOS_DIR="$(pwd)/../../ios"
monero_c_tag=$(cd $(pwd)/../../scripts/monero_c/; git describe --tags)
DYLIB_PATH="$(pwd)/../../scripts/monero_c/release/${monero_c_tag}/"
DYLIB_PATH="$(pwd)/../../scripts/monero_c/release"
TMP_DIR="${IOS_DIR}/tmp"
rm -rf "${IOS_DIR:?}/MoneroWallet.xcframework" "${IOS_DIR:?}/WowneroWallet.xcframework" "${IOS_DIR:?}/ZanoWallet.xcframework"
@@ -17,7 +16,7 @@ write_info_plist() {
target="$3"
plist_path="${framework_bundle}/Info.plist"
if [[ "x$target" = "xios-simulator" ]]; then
if [[ "x$target" = "xiossimulator" ]]; then
platform="iPhoneSimulator"
dtplatformname="iphonesimulator"
dtsdkname="iphonesimulator17.4"
@@ -98,11 +97,11 @@ create_framework() {
echo "Creating ${framework_name}.framework for target ${target} in ${out_dir}..."
framework_bundle="${out_dir}/${framework_name}.framework"
rm -rf "$framework_bundle"
mkdir -p "$framework_bundle"
input_dylib="${DYLIB_PATH}/aarch64-apple-${target}/lib${wallet}_wallet2_api_c.dylib"
input_dylib="${DYLIB_PATH}/${wallet}/aarch64-apple-${target}_libwallet2_api_c.dylib"
if [[ ! -f "$input_dylib" ]]; then
echo "Error: Input dylib not found: $input_dylib"
exit 1
@@ -145,7 +144,7 @@ for i in "${!wallets[@]}"; do
mkdir -p "$device_out" "$simulator_out"
create_framework "$wallet" "$framework_name" "ios" "$device_out"
create_framework "$wallet" "$framework_name" "ios-simulator" "$simulator_out"
create_framework "$wallet" "$framework_name" "iossimulator" "$simulator_out"
device_framework="${device_out}/${framework_name}.framework"
simulator_framework="${simulator_out}/${framework_name}.framework"
scripts/linux/build_monero_all.sh
+9 -3
View File
@@ -16,7 +16,13 @@ do
else
target="x86_64-linux-gnu"
fi
./build_single.sh ${COIN} $target -j$MAKE_JOB_COUNT
if [[ -f "release/${COIN}/${target}_libwallet2_api_c.so" ]];
then
echo "file exist, not building monero_c for ${COIN}/$target.";
else
./build_single.sh ${COIN} $target -j$MAKE_JOB_COUNT
unxz -f ../monero_c/release/${COIN}/${target}_libwallet2_api_c.so.xz
fi
popd
done
done
scripts/macos/build_monero_all.sh
+4 -4
View File
@@ -6,8 +6,8 @@ cd "$(dirname "$0")"
NPROC="-j$(sysctl -n hw.logicalcpu)"
MONERO_LIBS=""
WOWNERO_LIBS=""
monero_c_tag=$(cd ../monero_c/; git describe --tags)
MONEROC_RELEASE_DIR="../monero_c/release/${monero_c_tag}"
MONEROC_RELEASE_DIR="../monero_c/release/monero"
WOWNEROC_RELEASE_DIR="../monero_c/release/wownero"
../prepare_moneroc.sh
@@ -35,8 +35,8 @@ else
HOST="x86_64-apple-darwin"
fi
MONERO_LIBS="$MONERO_LIBS -arch ${ARCH} ${MONEROC_RELEASE_DIR}/${HOST}/libmonero_libwallet2_api_c.dylib"
WOWNERO_LIBS="$WOWNERO_LIBS -arch ${ARCH} ${MONEROC_RELEASE_DIR}/${HOST}/libwownero_libwallet2_api_c.dylib"
MONERO_LIBS="$MONERO_LIBS -arch ${ARCH} ${MONEROC_RELEASE_DIR}/${HOST}_libwallet2_api_c.dylib"
WOWNERO_LIBS="$WOWNERO_LIBS -arch ${ARCH} ${WOWNEROC_RELEASE_DIR}/${HOST}_libwallet2_api_c.dylib"
pushd ../monero_c
./build_single.sh ${COIN} ${HOST} -j$MAKE_JOB_COUNT
scripts/prepare_moneroc.sh
+8 -7
View File
@@ -9,17 +9,18 @@ then
rm -rf monero_c
git clone https://github.com/mrcyjanek/monero_c --branch master monero_c
cd monero_c
# NOTE: Make sure to update monero_c prebuilds link in workflow files
# https://github.com/MrCyjaneK/monero_c/releases/download/v0.18.4.0-RC9/release-bundle.zip
git checkout 411e8a1cdb3f4c2812d83f28c335d2a4eb18bd29
git reset --hard
git submodule update --init --force --recursive
./apply_patches.sh monero
./apply_patches.sh wownero
./apply_patches.sh zano
else
cd monero_c
fi
# NOTE: Make sure to update monero_c prebuilds link in workflow files
# https://github.com/MrCyjaneK/monero_c/releases/download/v0.18.4.6-RC1/release-bundle.zip
git fetch -a
git checkout c157cb82973b05d1226b39b4d8de0bec4aa10000
git reset --hard
git submodule update --init --force --recursive
for coin in monero wownero zano;
do
if [[ ! -f "$coin/.patch-applied" ]];
tool/download_moneroc_prebuilds.dart
+3 -1
View File
@@ -20,11 +20,13 @@ final List<String> triplets = [
"x86_64-w64-mingw32",
// "x86_64-apple-darwin11", // Intel macbooks (contrib) - not used by cake
// "aarch64-apple-darwin11", // apple silicon macbooks (contrib) - not used by cake
// "host-apple-darwin", // not available on CI (yet)
// "x86_64-host-apple-darwin", // not available on CI (yet)
"aarch64-apple-darwin", // apple silicon macbooks
"x86_64-apple-darwin", // intel macbooks
"aarch64-host-apple-darwin", // apple silicon macbooks (local builds)
"aarch64-apple-ios",
"aarch64-apple-ios-simulator",
"aarch64-apple-iossimulator",
];
Future<void> main() async {