Merge branch 'master' into ledger

# Conflicts: # .github/workflows/full_check.yaml # impls/monero.dart/lib/monero.dart # impls/monero.dart/pubspec.yaml # patches/monero/0016-add-dummy-device-for-ledger.patch
MrCyjaneK · Oct 7, 2024 · 98272ee · 98272ee
2 parents 04b29d8 + 67f4baa
commit 98272ee
Show file tree

Hide file tree

Showing 58 changed files with 2,125 additions and 447 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/cirruslabs/flutter:3.24.1
+FROM ghcr.io/cirruslabs/flutter:3.24.3
 # FROM debian:bookworm
 
 # Install dependencies

diff --git a/.github/workflows/full_check.yaml b/.github/workflows/full_check.yaml
@@ -137,7 +137,7 @@ jobs:
  coin: [monero, wownero]
  runs-on: ubuntu-latest
  container:
- image: debian:bookworm
+ image: debian:bullseye
  steps:
  - name: Install dependencies
  run: |
@@ -631,6 +631,12 @@ jobs:
  echo "const nanoNowNodesApiKey = '';" >> cw_nano/lib/.secrets.g.dart
  echo "const tronGridApiKey = '';" >> cw_tron/lib/.secrets.g.dart
  echo "const tronNowNodesApiKey = '';" >> cw_tron/lib/.secrets.g.dart
+ echo "const stealthExBearerToken = '';" >> lib/.secrets.g.dart
+ echo "const stealthExAdditionalFeePercent = '';" >> lib/.secrets.g.dart
+ echo "const letsExchangeBearerToken = '';" >> lib/.secrets.g.dart
+ echo "const letsExchangeAffiliateId = '';" >> lib/.secrets.g.dart
+ echo "const etherScanApiKey = '';" >> lib/.secrets.g.dart
+ echo "const polygonScanApiKey = '';" >> lib/.secrets.g.dart
 
  - name: Rename app
  run: |
@@ -654,68 +660,179 @@ jobs:
  rm -rf wownero/contrib/depends/built/*/android_ndk
  rm -rf wownero/contrib/depends/sources/android-ndk-r26d-linux.zip
 
- wallet_xmruw_android:
- needs: [ lib_android ]
- strategy:
- matrix:
- coin: [monero, wownero]
+ #wallet_xmruw_android:
+ # needs: [ lib_android ]
+ # strategy:
+ # matrix:
+ # coin: [monero, wownero]
+ # runs-on: ubuntu-latest
+ # steps:
+ # - name: Install dependencies
+ # run: |
+ # sudo apt update
+ # sudo apt install -y build-essential pkg-config autoconf libtool ccache make cmake gcc g++ git curl lbzip2 libtinfo5 gperf unzip python-is-python3 jq
+ # - uses: actions/download-artifact@v4
+ # with:
+ # name: android ${{ matrix.coin }}
+ # path: release/${{ matrix.coin }}
+ # - name: clone xmruw
+ # run: |
+ # git clone https://github.com/mrcyjanek/unnamed_monero_wallet
+ # cd unnamed_monero_wallet
+ # cp -a .fvm* ..
+ # - uses: kuhnroyal/flutter-fvm-config-action@v2
+ # id: fvm-config-action
+ # - uses: subosito/flutter-action@v2
+ # with:
+ # flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }}
+ # channel: ${{ steps.fvm-config-action.outputs.FLUTTER_CHANNEL }}
+ # - uses: actions/setup-java@v4
+ # with:
+ # distribution: 'zulu'
+ # java-version: '17'
+ # - name: build xmruw (${{ matrix.coin }})
+ # run: |
+ # cd unnamed_monero_wallet
+ # if [[ "${{ matrix.coin }}" == "monero" ]]; then ./codegen.sh -DCOIN_MONERO -DLIBSTEALTH_DISABLED; fi
+ # if [[ "${{ matrix.coin }}" == "wownero" ]]; then ./codegen.sh -DCOIN_WOWNERO -DLIBSTEALTH_DISABLED; fi
+ # flutter pub get
+ # make version
+ # ./build_changelog.sh
+ # cp ../release/${{ matrix.coin }}/aarch64-linux-android_libwallet2_api_c.so.xz android/app/src/main/jniLibs/arm64-v8a/lib${{ matrix.coin }}_libwallet2_api_c.so.xz
+ # cp ../release/${{ matrix.coin }}/x86_64-linux-android_libwallet2_api_c.so.xz android/app/src/main/jniLibs/x86_64/lib${{ matrix.coin }}_libwallet2_api_c.so.xz
+ # cp ../release/${{ matrix.coin }}/armv7a-linux-androideabi_libwallet2_api_c.so.xz android/app/src/main/jniLibs/armeabi-v7a/lib${{ matrix.coin }}_libwallet2_api_c.so.xz
+ # unxz -f android/app/src/main/jniLibs/*/*.xz
+ # flutter build apk --release --flavor clean_${{ matrix.coin }}
+ # - name: Upload APK
+ # uses: actions/upload-artifact@v4
+ # with:
+ # name: ${{ matrix.coin }} xmruw apk
+ # path: unnamed_monero_wallet/build/app/outputs/flutter-apk/*.apk
+ bulk_lib_release:
+ name: create single release file
  runs-on: ubuntu-latest
+ needs: [
+ lib_mingw, lib_android, lib_linux, lib_sailfishos_aarch64, lib_sailfishos_i486, lib_darwin, lib_macos, lib_ios
+ ]
+ steps:
+ - uses: actions/download-artifact@v4
+ with:
+ name: android monero
+ path: release/monero
+ - uses: actions/download-artifact@v4
+ with:
+ name: android wownero
+ path: release/wownero
+ - uses: actions/download-artifact@v4
+ with:
+ name: darwin monero
+ path: release/monero
+ - uses: actions/download-artifact@v4
+ with:
+ name: darwin wownero
+ path: release/wownero
+ - uses: actions/download-artifact@v4
+ with:
+ name: ios monero
+ path: release/monero
+ - uses: actions/download-artifact@v4
+ with:
+ name: ios wownero
+ path: release/wownero
+ - uses: actions/download-artifact@v4
+ with:
+ name: linux monero
+ path: release/monero
+ - uses: actions/download-artifact@v4
+ with:
+ name: linux wownero
+ path: release/wownero
+ - uses: actions/download-artifact@v4
+ with:
+ name: macos monero
+ path: release/monero
+ - uses: actions/download-artifact@v4
+ with:
+ name: macos wownero
+ path: release/wownero
+ - uses: actions/download-artifact@v4
+ with:
+ name: mingw monero
+ path: release/monero
+ - uses: actions/download-artifact@v4
+ with:
+ name: mingw wownero
+ path: release/wownero
+ - uses: actions/download-artifact@v4
+ with:
+ name: sfos aarch64 monero
+ path: release/monero
+ - uses: actions/download-artifact@v4
+ with:
+ name: sfos aarch64 wownero
+ path: release/wownero
+ - uses: actions/download-artifact@v4
+ with:
+ name: sfos_i486 monero
+ path: release/monero
+ - uses: actions/download-artifact@v4
+ with:
+ name: sfos_i486 wownero
+ path: release/wownero
+ - name: zip release dir
+ run: zip -r release-bundle.zip release
+ - name: Release
+ uses: softprops/action-gh-release@v2
+ if: startsWith(github.ref, 'refs/tags/')
+ with:
+ files: release-bundle.zip
+ token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
+ - name: Upload lib
+ uses: actions/upload-artifact@v4
+ with:
+ name: release-bulk
+ path: release
+ deno_monerots_test_linux:
+ name: test ts library
+ runs-on: ubuntu-24.04
+ needs: [
+ lib_linux
+ ]
  steps:
  - uses: actions/checkout@v4
  with:
  fetch-depth: 0
  submodules: recursive
- - name: Install dependencies
- run: |
- sudo apt update
- sudo apt install -y build-essential pkg-config autoconf libtool ccache make cmake gcc g++ git curl lbzip2 libtinfo5 gperf unzip python-is-python3 jq
  - uses: actions/download-artifact@v4
  with:
- name: android ${{ matrix.coin }}
- path: release/${{ matrix.coin }}
- - name: clone xmruw
+ name: linux monero
+ path: release/monero
+ - name: unpack and move monero_c
  run: |
- git clone https://github.com/mrcyjanek/unnamed_monero_wallet
- cd unnamed_monero_wallet
- cp -a .fvm* ..
- - uses: kuhnroyal/flutter-fvm-config-action@v2
- id: fvm-config-action
- - uses: subosito/flutter-action@v2
- with:
- flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }}
- channel: ${{ steps.fvm-config-action.outputs.FLUTTER_CHANNEL }}
- - uses: actions/setup-java@v4
- with:
- distribution: 'zulu'
- java-version: '17'
- - name: build xmruw (${{ matrix.coin }})
- run: |
- main_dir=$PWD
- cd unnamed_monero_wallet
- if [[ "${{ matrix.coin }}" == "monero" ]]; then ./codegen.sh -DCOIN_MONERO -DLIBSTEALTH_DISABLED; fi
- if [[ "${{ matrix.coin }}" == "wownero" ]]; then ./codegen.sh -DCOIN_WOWNERO -DLIBSTEALTH_DISABLED; fi
- sed -i '/ monero:/,/path:/c\ monero:\n path: '"$main_dir/impls/monero.dart" pubspec.yaml
- flutter pub get
- make version
- ./build_changelog.sh
- cp ../release/${{ matrix.coin }}/aarch64-linux-android_libwallet2_api_c.so.xz android/app/src/main/jniLibs/arm64-v8a/lib${{ matrix.coin }}_libwallet2_api_c.so.xz
- cp ../release/${{ matrix.coin }}/x86_64-linux-android_libwallet2_api_c.so.xz android/app/src/main/jniLibs/x86_64/lib${{ matrix.coin }}_libwallet2_api_c.so.xz
- cp ../release/${{ matrix.coin }}/armv7a-linux-androideabi_libwallet2_api_c.so.xz android/app/src/main/jniLibs/armeabi-v7a/lib${{ matrix.coin }}_libwallet2_api_c.so.xz
- unxz -f android/app/src/main/jniLibs/*/*.xz
- flutter build apk --release --flavor clean_${{ matrix.coin }}
- - name: Upload APK
- uses: actions/upload-artifact@v4
+ unxz -f -k release/*/*.xz
+ - uses: denoland/setup-deno@v1
  with:
- name: ${{ matrix.coin }} xmruw apk
- path: unnamed_monero_wallet/build/app/outputs/flutter-apk/*.apk
+ deno-version: vx.x.x
+ - name: Create symlink
+ run: |
+ cd impls/monero.ts
+ mkdir lib
+ cd lib
+ ln -s ../../../release/monero/x86_64-linux-gnu_libwallet2_api_c.so
+ mv x86_64-linux-gnu_libwallet2_api_c.so monero_libwallet2_api_c.so
+ cd ..
+ - name: Run tests
+ run: |
+ cd impls/monero.ts
+ deno run --unstable-ffi --allow-ffi checksum.ts
 
  comment_pr:
  name: comment on pr
  runs-on: ubuntu-latest
  needs: [
  lib_mingw, lib_android, lib_linux, lib_sailfishos_aarch64, lib_sailfishos_i486, lib_darwin, lib_macos, lib_ios,
- wallet_cake_android,
- wallet_xmruw_android
+ wallet_cake_android #,
+ #wallet_xmruw_android
  ]
  steps:
  - uses: actions/github-script@v7
@@ -762,4 +879,4 @@ jobs:
  with:
  issue-number: ${{steps.get_issue_number.outputs.result}}
  body: |
- [download artifacts #${{github.run_id}}](https://nightly.link/MrCyjaneK/monero_c/actions/runs/${{github.run_id}}) (this comment will update whenever you push)
+ [download artifacts #${{github.run_id}}](https://nightly.link/MrCyjaneK/monero_c/actions/runs/${{github.run_id}}) (this comment will update whenever you push)
diff --git a/.gitmodules b/.gitmodules
@@ -20,10 +20,11 @@
  branch = build
 [submodule "external/OpenSSL-for-iPhone"]
  path = external/OpenSSL-for-iPhone
- url = https://github.com/x2on/OpenSSL-for-iPhone.git
+ url = https://github.com/MrCyjaneK/OpenSSL-for-iPhone.git
 [submodule "external/libsodium"]
  path = external/libsodium
  url = https://github.com/jedisct1/libsodium.git
+ branch = stable
 [submodule "external/unbound"]
  path = external/unbound
  url = https://github.com/NLnetLabs/unbound.git

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "deno.enable": true
+}
diff --git a/apply_patches.sh b/apply_patches.sh
@@ -31,7 +31,7 @@ fi
 
 set -e
 cd $repo
-git am -3 ../patches/$repo/*.patch
+git am -3 --whitespace=fix --reject ../patches/$repo/*.patch
 if [[ "$repo" == "wownero" ]];
 then
  pushd external/randomwow

diff --git a/external/OpenSSL-for-iPhone b/external/OpenSSL-for-iPhone
diff --git a/external/ios-cmake b/external/ios-cmake
diff --git a/external/ios/libsodium_apple-ios.sh b/external/ios/libsodium_apple-ios.sh
@@ -100,7 +100,9 @@ build_ios() {
 
 mkdir -p "${PREFIX}/tmp"
 
-echo "Building for iOS..."
+echo "Building for iOS... ($LOG_FILE)"
+./autogen.sh
+./configure
 build_ios >"$LOG_FILE" 2>&1 || exit 1
 
 echo "Adding the Clibsodium module map for Swift..."

diff --git a/external/libexpat b/external/libexpat
diff --git a/external/libsodium b/external/libsodium
diff --git a/external/libzmq b/external/libzmq
diff --git a/generate_checksum.sh b/generate_checksum.sh
@@ -1,14 +1,18 @@
 #!/bin/bash
 cd "$(realpath $(dirname $0))"
 
+if [[ "$(uname)" == "Darwin" ]];
+then
+ function sha256sum() { shasum -a 256 "$@" ; } && export -f sha256sum
+fi
+
 for coin in monero wownero;
 do
+ submodule_hash=$(git ls-tree HEAD ${coin} | xargs | awk '{ print $3 }')
  COIN=$(echo "$coin" | tr a-z A-Z)
  COIN_wallet2_api_c_h_sha256=$(sha256sum ${coin}_libwallet2_api_c/src/main/cpp/wallet2_api_c.h | xargs | awk '{ print $1 }')
- COIN_wallet2_api_c_cpp_sha256=$(sha256sum ${coin}_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp | xargs | awk '{ print $1 }')
+ COIN_wallet2_api_c_cpp_sha256=$(sha256sum ${coin}_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp | xargs | awk '{ print $1 }')-${submodule_hash}
  COIN_wallet2_api_c_exp_sha256=$(sha256sum ${coin}_libwallet2_api_c/${coin}_libwallet2_api_c.exp | xargs | awk '{ print $1 }')
- COIN_libwallet2_api_c_version=$(git log --exclude=${coin}_checksum.h --oneline -- ${coin}_libwallet2_api_c | wc -l)
- COIN_libwallet2_api_c_date=$(git log --exclude=${coin}_checksum.h -1 --format=%ai -- ${coin}_libwallet2_api_c)
 
  cat > ${coin}_libwallet2_api_c/src/main/cpp/${coin}_checksum.h << EOF
 #ifndef MONEROC_CHECKSUMS
@@ -23,6 +27,13 @@ EOF
 const String wallet2_api_c_h_sha256 = "${COIN_wallet2_api_c_h_sha256}";
 const String wallet2_api_c_cpp_sha256 = "${COIN_wallet2_api_c_cpp_sha256}";
 const String wallet2_api_c_exp_sha256 = "${COIN_wallet2_api_c_exp_sha256}";
+EOF
+ cat > impls/monero.ts/checksum_${coin}.ts << EOF
+export const ${coin}Checksum = {
+ wallet2_api_c_h_sha256: "${COIN_wallet2_api_c_h_sha256}",
+ wallet2_api_c_cpp_sha256: "${COIN_wallet2_api_c_cpp_sha256}",
+ wallet2_api_c_exp_sha256: "${COIN_wallet2_api_c_exp_sha256}",
+}
 EOF
 done
 
diff --git a/impls/monero.c#/README.md b/impls/monero.c#/README.md
@@ -0,0 +1,7 @@
+# monero.c#
+
+> C# port for monero
+
+This is not a ready-to-use package (as opposed to monero.dart and monero.ts), but it works. You can check the `monero_wrapper.cs`.
+
+Currently C# code is optimized to be used in Godot.., if you are not planning to use it there - simply do not extend Node class and remove Godot import, if you are planning to use it in production, please let me know - we can work on a better approach to using monero with proper package code in here.