Merge branch 'master' into ledger

MrCyjaneK · Oct 7, 2024 · 3c97440 · 3c97440
2 parents 98272ee + fdd92df
commit 3c97440
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 245 deletions.
diff --git a/.github/workflows/full_check.yaml b/.github/workflows/full_check.yaml
@@ -467,247 +467,6 @@ jobs:
         with:
           name: ios ${{ matrix.coin }}
           path: release/${{ matrix.coin }}
-
-  # Extra stuff below, not strictly required for monero_c, but we do want to ensure
-  # that nothing really broke the app when we work on some feature.
-
-  wallet_cake_android:
-    needs: [ lib_android ]
-    runs-on: ubuntu-20.04
-    env:
-      STORE_PASS: test@cake_wallet
-      KEY_PASS: test@cake_wallet
-      PR_NUMBER: ${{ github.ref_name }}
-
-    steps:
-      - name: set branch name
-        run: echo "BRANCH_NAME=${{ github.ref_name }}" >> $GITHUB_ENV
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          submodules: recursive
-      - uses: actions/download-artifact@v4
-        with:
-          name: android monero
-          path: release/monero
-      - uses: actions/download-artifact@v4
-        with:
-          name: android wownero
-          path: release/wownero
-
-      - name: unpack and move monero_c
-        run: |
-          unxz -f -k release/*/*.xz
-          mv release /opt/monero_c_release
-
-      - name: Free Disk Space (Ubuntu)
-        uses: insightsengineering/disk-space-reclaimer@v1
-        with:
-          tools-cache: true
-          android: false
-          dotnet: true
-          haskell: true
-          large-packages: true
-          swap-storage: true
-          docker-images: true
-
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: "17.x"
-      - name: Configure placeholder git details
-        run: |
-          git config --global user.email "[email protected]"
-          git config --global user.name "Cake Github Actions"
-      - name: Flutter action
-        uses: subosito/flutter-action@v2
-        with:
-          flutter-version: "3.19.6"
-          channel: stable
-
-      - name: Install package dependencies
-        run: sudo apt-get install -y curl unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake clang
-
-      - name: Execute Build and Setup Commands
-        run: |
-          main_dir="$PWD"
-          sudo mkdir -p /opt/android
-          sudo chown $USER /opt/android
-          cd /opt/android
-          -y curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-          cargo install cargo-ndk
-          git clone https://github.com/cake-tech/cake_wallet.git --branch main --depth=1
-          pushd cake_wallet/cw_monero
-            sed -i '/  monero:/,/path:/c\  monero:\n    path: '"$main_dir/impls/monero.dart" pubspec.yaml
-          popd
-          pushd cake_wallet/cw_wownero
-            sed -i '/  monero:/,/path:/c\  monero:\n    path: '"$main_dir/impls/monero.dart" pubspec.yaml
-          popd
-          cd cake_wallet/scripts/android/
-          ./install_ndk.sh
-          source ./app_env.sh cakewallet
-          chmod +x pubspec_gen.sh
-          ./app_config.sh
-          mkdir -p /opt/android/cake_wallet/scripts/monero_c
-          mv /opt/monero_c_release /opt/android/cake_wallet/scripts/monero_c/release
-
-      - name: Install Flutter dependencies
-        run: |
-          cd /opt/android/cake_wallet
-          flutter pub get
-
-      - name: Generate KeyStore
-        run: |
-          cd /opt/android/cake_wallet/android/app
-          keytool -genkey -v -keystore key.jks -keyalg RSA -keysize 2048 -validity 10000 -alias testKey -noprompt -dname "CN=CakeWallet, OU=CakeWallet, O=CakeWallet, L=Florida, S=America, C=USA" -storepass $STORE_PASS -keypass $KEY_PASS
-
-      - name: Generate key properties
-        run: |
-          cd /opt/android/cake_wallet
-          flutter packages pub run tool/generate_android_key_properties.dart keyAlias=testKey storeFile=key.jks storePassword=$STORE_PASS keyPassword=$KEY_PASS
-
-      - name: Generate localization
-        run: |
-          cd /opt/android/cake_wallet
-          flutter packages pub run tool/generate_localization.dart
-
-      - name: Build generated code
-        run: |
-          cd /opt/android/cake_wallet
-          ./model_generator.sh
-
-      - name: Add secrets
-        run: |
-          cd /opt/android/cake_wallet
-          touch lib/.secrets.g.dart
-          touch cw_evm/lib/.secrets.g.dart
-          touch cw_solana/lib/.secrets.g.dart
-          touch cw_core/lib/.secrets.g.dart
-          touch cw_nano/lib/.secrets.g.dart
-          touch cw_tron/lib/.secrets.g.dart
-          echo "const salt = 'd551f8841584b0ce37edf6fd59177d35';" > lib/.secrets.g.dart
-          echo "const keychainSalt = '34c626b6a4f8cb6789897c09';" >> lib/.secrets.g.dart
-          echo "const key = 'd8ab7230137ebadeb1c4e429395eced1';" >> lib/.secrets.g.dart
-          echo "const walletSalt = 'a9a49562';" >> lib/.secrets.g.dart
-          echo "const shortKey = 'c1b21c5050527842350dc8f5';" >> lib/.secrets.g.dart
-          echo "const backupSalt = 'b3e42404f90ca8e8';" >> lib/.secrets.g.dart
-          echo "const backupKeychainSalt = '9e0f3c4d347bc99509695a86';" >> lib/.secrets.g.dart
-          echo "const changeNowApiKey = '';" >> lib/.secrets.g.dart
-          echo "const changeNowApiKeyDesktop = '';" >> lib/.secrets.g.dart
-          echo "const wyreSecretKey = '';" >> lib/.secrets.g.dart
-          echo "const wyreApiKey = '';" >> lib/.secrets.g.dart
-          echo "const wyreAccountId = '';" >> lib/.secrets.g.dart
-          echo "const moonPayApiKey = '';" >> lib/.secrets.g.dart
-          echo "const moonPaySecretKey = '';" >> lib/.secrets.g.dart
-          echo "const sideShiftAffiliateId = '';" >> lib/.secrets.g.dart
-          echo "const simpleSwapApiKey = '';" >> lib/.secrets.g.dart
-          echo "const simpleSwapApiKeyDesktop = '';" >> lib/.secrets.g.dart
-          echo "const onramperApiKey = '';" >> lib/.secrets.g.dart
-          echo "const anypayToken = '';" >> lib/.secrets.g.dart
-          echo "const ioniaClientId = '';" >> lib/.secrets.g.dart
-          echo "const twitterBearerToken = '';" >> lib/.secrets.g.dart
-          echo "const trocadorApiKey = '';" >> lib/.secrets.g.dart
-          echo "const trocadorExchangeMarkup = '';" >> lib/.secrets.g.dart
-          echo "const anonPayReferralCode = '';" >> lib/.secrets.g.dart
-          echo "const fiatApiKey = '';" >> lib/.secrets.g.dart
-          echo "const payfuraApiKey = '';" >> lib/.secrets.g.dart
-          echo "const ankrApiKey = '';" >> lib/.secrets.g.dart
-          echo "const etherScanApiKey = '';" >> cw_evm/lib/.secrets.g.dart
-          echo "const moralisApiKey = '';" >> cw_evm/lib/.secrets.g.dart
-          echo "const chatwootWebsiteToken = '';" >> lib/.secrets.g.dart
-          echo "const exolixApiKey = '';" >> lib/.secrets.g.dart
-          echo "const robinhoodApplicationId = '';" >> lib/.secrets.g.dart
-          echo "const exchangeHelperApiKey = '';" >> lib/.secrets.g.dart
-          echo "const walletConnectProjectId = '';" >> lib/.secrets.g.dart
-          echo "const moralisApiKey = '';" >> lib/.secrets.g.dart
-          echo "const polygonScanApiKey = '';" >> cw_evm/lib/.secrets.g.dart
-          echo "const ankrApiKey = '';" >> cw_solana/lib/.secrets.g.dart
-          echo "const testCakePayApiKey = '';" >> lib/.secrets.g.dart
-          echo "const cakePayApiKey = '';" >> lib/.secrets.g.dart
-          echo "const authorization = '';" >> lib/.secrets.g.dart
-          echo "const CSRFToken = '';" >> lib/.secrets.g.dart
-          echo "const quantexExchangeMarkup = '';" >> lib/.secrets.g.dart
-          echo "const nano2ApiKey = '';" >> cw_nano/lib/.secrets.g.dart
-          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: |
-          echo -e "id=com.cakewallet.moneroc_${{ env.PR_NUMBER }}\nname=${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9=\n.]//g' > /opt/android/cake_wallet/android/app.properties
-
-      - name: Build
-        run: |
-          cd /opt/android/cake_wallet
-          flutter build apk --release --split-per-abi
-
-      - name: Upload APK
-        uses: actions/upload-artifact@v4
-        with:
-          name: cake wallet android
-          path: /opt/android/cake_wallet/build/app/outputs/flutter-apk/*.apk
-
-      - name: remove android_ndk
-        run: |
-          rm -rf monero/contrib/depends/built/*/android_ndk
-          rm -rf monero/contrib/depends/sources/android-ndk-r26d-linux.zip
-          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
   bulk_lib_release:
     name: create single release file
     runs-on: ubuntu-latest
@@ -831,8 +590,6 @@ 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
     ]
     steps:
       - uses: actions/github-script@v7

diff --git a/external/libexpat b/external/libexpat
diff --git a/external/libsodium b/external/libsodium
+1 −1		.github/workflows/autotools-cmake.yml
+1 −1		.github/workflows/clang-format.yml
+1 −1		.github/workflows/clang-tidy.yml
+1 −1		.github/workflows/cmake-required-version.yml
+1 −1		.github/workflows/codespell.yml
+1 −1		.github/workflows/coverage.yml
+1 −1		.github/workflows/cppcheck.yml
+1 −1		.github/workflows/expat_config_h.yml
+1 −1		.github/workflows/fuzzing.yml
+1 −1		.github/workflows/linux.yml
+1 −1		.github/workflows/macos.yml
+1 −1		.github/workflows/valid-xml.yml
+1 −0		expat/CMakeLists.txt
+42 −3		expat/README.md
+35 −34		.github/workflows/dotnet-core.yml
+1 −1		configure
+1 −1		configure.ac
+1 −0		dist-build/android-armv7-a.sh
+1 −0		dist-build/android-armv8-a.sh
+0 −1		dist-build/android-build.sh
+1 −0		dist-build/android-x86.sh
+1 −0		dist-build/android-x86_64.sh
+3 −1		src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c
+3 −1		src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c
+9 −8		src/libsodium/randombytes/internal/randombytes_internal_random.c
+1 −0		src/libsodium/randombytes/randombytes.c
+0 −1		test/default/scalarmult2.c
+0 −1		test/default/scalarmult5.c