From 419391e9524f6b387476626f2ac8d3bf144057eb Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Fri, 27 Sep 2024 12:27:23 +0200 Subject: [PATCH] fix coin control drop xmruw ci for the time being --- .github/workflows/full_check.yaml | 100 +++++++++--------- .../monero/0018-fix-coin-control-patch.patch | 30 ++++++ 2 files changed, 80 insertions(+), 50 deletions(-) create mode 100644 patches/monero/0018-fix-coin-control-patch.patch diff --git a/.github/workflows/full_check.yaml b/.github/workflows/full_check.yaml index 03e6f377..67e86a19 100644 --- a/.github/workflows/full_check.yaml +++ b/.github/workflows/full_check.yaml @@ -650,54 +650,54 @@ 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] - 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 + #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 @@ -821,8 +821,8 @@ jobs: 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 diff --git a/patches/monero/0018-fix-coin-control-patch.patch b/patches/monero/0018-fix-coin-control-patch.patch new file mode 100644 index 00000000..001a1c08 --- /dev/null +++ b/patches/monero/0018-fix-coin-control-patch.patch @@ -0,0 +1,30 @@ +From 3d99b4efb5a79d7c52d596c349de25d1ca34c264 Mon Sep 17 00:00:00 2001 +From: Czarek Nakamoto +Date: Fri, 27 Sep 2024 12:20:49 +0200 +Subject: [PATCH] fix coin control patch + +--- + src/wallet/api/wallet.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp +index 3ead385ec..ec7d60ec0 100644 +--- a/src/wallet/api/wallet.cpp ++++ b/src/wallet/api/wallet.cpp +@@ -2174,11 +2174,11 @@ PendingTransaction *WalletImpl::createTransactionMultDest(const std::vectorm_pending_tx = m_wallet->create_transactions_2(dsts, fake_outs_count, + adjusted_priority, +- extra, subaddr_account, subaddr_indices); ++ extra, subaddr_account, subaddr_indices, preferred_input_list); + } else { + transaction->m_pending_tx = m_wallet->create_transactions_all(0, info.address, info.is_subaddress, 1, fake_outs_count, + adjusted_priority, +- extra, subaddr_account, subaddr_indices); ++ extra, subaddr_account, subaddr_indices, preferred_input_list); + } + pendingTxPostProcess(transaction); + +-- +2.39.5 (Apple Git-154) +