Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-459-12-words-btc

.github/workflows/cache_dependencies.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: '8.x'
+          java-version: '11.x'
 
       - name: Flutter action
         uses: subosito/flutter-action@v1

.github/workflows/pr_test_build.yml

@@ -2,11 +2,10 @@ name: PR Test Build
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   PR_test_build:
-
     runs-on: ubuntu-20.04
     env:
       STORE_PASS: test@cake_wallet
@@ -23,12 +22,12 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: '8.x'
+          java-version: "11.x"
 
       - name: Flutter action
         uses: subosito/flutter-action@v1
         with:
-          flutter-version: '3.10.x'
+          flutter-version: "3.10.x"
           channel: stable
 
       - name: Install package dependencies
@@ -39,10 +38,13 @@ jobs:
           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 $GITHUB_HEAD_REF
           cd cake_wallet/scripts/android/
           ./install_ndk.sh
           source ./app_env.sh cakewallet
+          chmod +x pubspec_gen.sh
           ./app_config.sh
 
       - name: Cache Externals
@@ -93,6 +95,7 @@ jobs:
           cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
           cd cw_haven && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
           cd cw_ethereum && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+          cd cw_bitcoin_cash && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
           cd cw_nano && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
           flutter packages pub run build_runner build --delete-conflicting-outputs
 
@@ -129,6 +132,10 @@ jobs:
           echo "const payfuraApiKey = '${{ secrets.PAYFURA_API_KEY }}';" >> lib/.secrets.g.dart
           echo "const etherScanApiKey = '${{ secrets.ETHER_SCAN_API_KEY }}';" >> cw_ethereum/lib/.secrets.g.dart
           echo "const chatwootWebsiteToken = '${{ secrets.CHATWOOT_WEBSITE_TOKEN }}';" >> lib/.secrets.g.dart
+          echo "const exolixApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
+          echo "const robinhoodApplicationId = '${{ secrets.ROBINHOOD_APPLICATION_ID }}';" >> lib/.secrets.g.dart
+          echo "const robinhoodCIdApiSecret = '${{ secrets.ROBINHOOD_CID_CLIENT_SECRET }}';" >> lib/.secrets.g.dart
+          echo "const walletConnectProjectId = '${{ secrets.WALLET_CONNECT_PROJECT_ID }}';" >> lib/.secrets.g.dart
 
       - name: Rename app
         run: echo -e "id=com.cakewallet.test\nname=$GITHUB_HEAD_REF" > /opt/android/cake_wallet/android/app.properties
@@ -138,18 +145,18 @@ jobs:
           cd /opt/android/cake_wallet
           flutter build apk --release
 
-#      - name: Push to App Center
-#        run: |
-#          echo 'Installing App Center CLI tools'
-#          npm install -g appcenter-cli
-#          echo "Publishing test to App Center"
-#          appcenter distribute release \
-#              --group "Testers" \
-#              --file "/opt/android/cake_wallet/build/app/outputs/apk/release/app-release.apk" \
-#              --release-notes ${GITHUB_HEAD_REF} \
-#              --app Cake-Labs/Cake-Wallet \
-#              --token ${{ secrets.APP_CENTER_TOKEN }} \
-#              --quiet
+#            - name: Push to App Center
+#              run: |
+#                echo 'Installing App Center CLI tools'
+#                npm install -g appcenter-cli
+#                echo "Publishing test to App Center"
+#                appcenter distribute release \
+#                    --group "Testers" \
+#                    --file "/opt/android/cake_wallet/build/app/outputs/apk/release/app-release.apk" \
+#                    --release-notes ${GITHUB_HEAD_REF} \
+#                    --app Cake-Labs/Cake-Wallet \
+#                    --token ${{ secrets.APP_CENTER_TOKEN }} \
+#                    --quiet
 
       - name: Rename apk file
         run: |
@@ -169,6 +176,6 @@ jobs:
           token: ${{ secrets.SLACK_APP_TOKEN }}
           path: /opt/android/cake_wallet/build/app/outputs/apk/release/app-release.apk
           channel: ${{ secrets.SLACK_APK_CHANNEL }}
-          title: '${{github.head_ref}}.apk'
+          title: "${{github.head_ref}}.apk"
           filename: ${{github.head_ref}}.apk
           initial_comment: ${{ github.event.head_commit.message }}

.gitignore

@@ -124,6 +124,8 @@ lib/bitcoin/bitcoin.dart
 lib/monero/monero.dart
 lib/haven/haven.dart
 lib/ethereum/ethereum.dart
+lib/bitcoin_cash/bitcoin_cash.dart
+lib/nano/nano.dart
 
 ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_180.png
 ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_120.png

android/app/build.gradle

@@ -75,7 +75,6 @@ android {
 
             shrinkResources false
             minifyEnabled false
-            useProguard false
 
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }

android/app/src/main/AndroidManifestBase.xml

@@ -3,6 +3,7 @@
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -25,10 +26,6 @@
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize"
             android:exported="true">
-            <meta-data
-                    android:name="io.flutter.embedding.android.SplashScreenDrawable"
-                    android:resource="@drawable/launch_background"
-            />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -46,6 +43,7 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="__APP_SCHEME__" />
                 <data android:scheme="bitcoin" />
                 <data android:scheme="bitcoin-wallet" />
                 <data android:scheme="bitcoin_wallet" />
@@ -55,6 +53,15 @@
                 <data android:scheme="litecoin" />
                 <data android:scheme="litecoin-wallet" />
                 <data android:scheme="litecoin_wallet" />
+                <data android:scheme="ethereum" />
+                <data android:scheme="ethereum-wallet" />
+                <data android:scheme="ethereum_wallet" />
+                <data android:scheme="nano" />
+                <data android:scheme="nano-wallet" />
+                <data android:scheme="nano_wallet" />
+                <data android:scheme="bitcoincash" />
+                <data android:scheme="bitcoincash-wallet" />
+                <data android:scheme="bitcoincash_wallet" />
             </intent-filter>
         </activity>
         <meta-data

android/app/src/main/res/drawable-night/launch_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <color android:color="#000000"/> <!-- Dark background color -->
+    </item>
+</layer-list>

android/app/src/main/res/drawable/ic_launcher_adaptive_back.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>

android/app/src/main/res/drawable/launch_background.xml

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item>
+        <color android:color="#FFFFFF"/> <!-- Light background color -->
+    </item>
 </layer-list>

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath 'com.google.gms:google-services:4.3.8'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }

android/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.enableR8=true
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true

assets/bitcoin_cash_electrum_server_list.yml

@@ -0,0 +1,3 @@
+-
+  uri: bitcoincash.stackwallet.com:50002
+  is_default: true

assets/faq/faq_de.json

@@ -1,7 +1,7 @@
 [
   {
     "question" : "Was ist der Unterschied zwischen verfügbarem Guthaben und vollständigem Guthaben?",
-    "answer" : "Nachdem Sie eine Transaktion getätigt oder Monero erhalten haben, muss die Transaktion noch bestätigt werden. In ungefähr 20 Minuten sollte Ihr \"verfügbares Guthaben\" aktualisiert werden!\nWenn Sie Monero senden, verringert sich manchmal Ihr verfügbares Guthaben um mehr als den Betrag, den Sie gesendet haben. Dies ist normal und zum Schutz Ihrer Privatsphäre erforderlich. Ihr \"vollständiges Gleichgewicht\" sollte in 20 Minuten wieder normal sein.\n"
+    "answer" : "Nachdem Sie eine Transaktion getätigt oder Monero erhalten haben, muss die Transaktion noch bestätigt werden. In ungefähr 20 Minuten sollte Ihr \"verfügbares Guthaben\" aktualisiert werden!\nWenn Sie Monero senden, verringert sich manchmal Ihr verfügbares Guthaben um mehr als den Betrag, den Sie gesendet haben. Dies ist normal und zum Schutz Ihrer Privatsphäre erforderlich. Ihr \"vollständiges Guthaben\" sollte in 20 Minuten wieder normal sein.\n"
   },
   {
     "question" : "Wie sende ich Monero an eine Börse, für die eine Zahlungs-ID erforderlich ist?",
@@ -12,24 +12,24 @@
     "answer" : "Obwohl unser Support Sie bei diesem Problem nicht direkt unterstützen kann, ist es ein sehr häufiges Problem, mit dem die meisten Börsen vertraut sind. Wenden Sie sich einfach an den Support der Börse, erklären Sie, dass Sie vergessen haben, Ihre Zahlungs-ID anzugeben, und senden Sie ihnen dann Ihre Transaktions-ID als Nachweis. Sie finden die Transaktions-ID, indem Sie auf die Transaktion in Ihrem Wallet-Bildschirm tippen.\n"
   },
   {
-    "question" : "Was bedeuten \"Samen\" und \"Schlüssel\"?",
-    "answer" : "Ihre Schlüssel verschlüsseln die privaten Informationen in Ihrer Brieftasche und ermöglichen es Ihnen, Münzen auszugeben und eingehende Transaktionen anzuzeigen.\nIhr Startwert ist nur eine Version Ihres privaten Schlüssels, die so geschrieben wurde, dass Sie sie leichter notieren können. Ihr Same und Schlüssel sind tatsächlich dasselbe, nur in verschiedenen Formen!\nGeben Sie niemals Ihren Samen oder Schlüssel an jemanden weiter. Ihr Geld wird gestohlen, wenn Sie Ihren Samen oder Schlüssel herausgeben. Bitte notieren Sie sich jedoch Ihren Samen und bewahren Sie ihn an einem sicheren Ort auf (so können Sie Ihre Brieftasche wiederherstellen, wenn Sie Ihr Telefon verlieren.)\n"
+    "question" : "Was bedeuten \"Seed\" und \"Schlüssel\"?",
+    "answer" : "Ihre Schlüssel verschlüsseln die privaten Informationen in Ihrer Brieftasche und ermöglichen es Ihnen, Münzen auszugeben und eingehende Transaktionen anzuzeigen.\nIhr Startwert ist nur eine Version Ihres privaten Schlüssels, die so geschrieben wurde, dass Sie sie leichter notieren können. Ihr Same und Schlüssel sind tatsächlich dasselbe, nur in verschiedenen Formen!\nGeben Sie niemals Ihren Seed oder Schlüssel an jemanden weiter. Ihr Geld wird gestohlen, wenn Sie Ihren Seed oder Schlüssel herausgeben. Bitte notieren Sie sich jedoch Ihren Seed und bewahren Sie ihn an einem sicheren Ort auf (so können Sie Ihr Wallet wiederherstellen, wenn Sie Ihr Telefon verlieren.)\n"
   },
   {
     "question" : "Wie viele Geldbörsen kann ich erstellen?",
     "answer" : "Es gibt keine Grenzen! Sie können so viele Brieftaschen erstellen, wie Sie möchten.\n"
   },
   {
-    "question" : "Wie kann ich meine Brieftasche wiederherstellen?",
-    "answer" : "Tippen Sie auf das Menü •••, wählen Sie „Brieftaschen“ und dann „Brieftasche wiederherstellen“. Geben Sie dann Ihren Startwert (oder Ihre Schlüssel) und optional ein Datum vor der ersten Transaktion in Ihrer Brieftasche ein (dies beschleunigt den Synchronisierungsvorgang) .) Möglicherweise müssen Sie die App 15 bis 30 Minuten geöffnet lassen, um Ihr Portemonnaie vollständig wiederherzustellen.\n"
+    "question" : "Wie kann ich mein Wallet wiederherstellen?",
+    "answer" : "Tippen Sie auf das Menü •••, wählen Sie „Wallest“ und dann „Wallet wiederherstellen“. Geben Sie dann Ihren Seed (oder Ihre Schlüssel) und optional ein Datum vor der ersten Transaktion in Ihrem Wallet ein (dies beschleunigt den Synchronisierungsvorgang) .) Möglicherweise müssen Sie die App 15 bis 30 Minuten geöffnet lassen, um Ihr Wallet vollständig wiederherzustellen.\n"
   },
   {
-    "question" : "Was kann ich tun, wenn ich meinen Samen verliere?",
-    "answer" : "Wenn Sie Ihren Samen vergessen haben, haben Sie ihn wahrscheinlich irgendwo aufgeschrieben. Bitte überprüfen Sie Ihre Notizen und schauen Sie sich auf Ihrem Computer um. Wenn Sie es nirgendwo finden, haben Sie möglicherweise Cake Wallet gesichert (in diesem Fall können Sie es aus diesem Backup wiederherstellen.) Wenn keines dieser Probleme auftritt, können wir leider nichts tun.\n"
+    "question" : "Was kann ich tun, wenn ich meinen Seed verliere?",
+    "answer" : "Wenn Sie Ihren Seed vergessen haben, haben Sie ihn wahrscheinlich irgendwo aufgeschrieben. Bitte überprüfen Sie Ihre Notizen und schauen Sie sich auf Ihrem Computer um. Wenn Sie es nirgendwo finden, haben Sie möglicherweise Cake Wallet gesichert (in diesem Fall können Sie es aus diesem Backup wiederherstellen.) Wenn keines dieser Probleme auftritt, können wir leider nichts tun.\n"
   },
   {
-    "question" : "Sammeln Sie Informationen zu meiner Brieftasche?",
-    "answer" : "Cake Wallet sammelt oder zeichnet keine Informationen über Ihre Brieftasche auf. Ihre Privatsphäre ist uns wichtig.\n"
+    "question" : "Sammeln Sie Informationen zu meinem Wallet?",
+    "answer" : "Cake Wallet sammelt oder zeichnet keine Informationen über Ihr Wallet auf. Ihre Privatsphäre ist uns wichtig.\n"
   },
   {
     "question" : "Kann ich eine Transaktion stornieren?",
@@ -37,7 +37,7 @@
   },
   {
     "question" : "Was sind Subadressen und wie verwende ich sie?",
-    "answer" : "Eine Unteradresse ist im Grunde eine eindeutige Adresse, die Sie jederzeit generieren können. An sie gesendete Münzen landen weiterhin in Ihrer Hauptbrieftasche, aber die Person, die die Münzen sendet, kann Ihre Hauptadresse nicht ermitteln. Unteradressen beginnen immer mit „8“.\nSie können eine neue Unteradresse im Empfangsbildschirm erstellen, indem Sie auf das „+“ neben der Schaltfläche Unteradressen tippen. Geben Sie einen Namen für die Unteradresse ein und tippen Sie auf \"Hinzufügen\". Dann tippen Sie einfach auf den Namen der Subadresse, wenn Sie ihn verwenden möchten!\nWenn Sie paranoid sind, sollten Sie wahrscheinlich jedes Mal, wenn Sie Monero erhalten, eine neue Unteradresse erstellen.\n"
+    "answer" : "Eine Unteradresse ist im Grunde eine eindeutige Adresse, die Sie jederzeit generieren können. An sie gesendete Münzen landen weiterhin in Ihrer Hauptwallet, aber die Person, die die Coins sendet, kann Ihre Hauptadresse nicht ermitteln. Unteradressen beginnen immer mit „8“.\nSie können eine neue Unteradresse im Empfangsbildschirm erstellen, indem Sie auf das „+“ neben der Schaltfläche Unteradressen tippen. Geben Sie einen Namen für die Unteradresse ein und tippen Sie auf \"Hinzufügen\". Dann tippen Sie einfach auf den Namen der Subadresse, wenn Sie ihn verwenden möchten!\nWenn Sie paranoid sind, sollten Sie wahrscheinlich jedes Mal, wenn Sie Monero erhalten, eine neue Unteradresse erstellen.\n"
   },
   {
     "question" : "Was ist eine Transaktions-ID?",
@@ -48,11 +48,11 @@
     "answer" : "Wenn Sie Ihren Monero nicht erhalten haben, möchten Sie möglicherweise auf das Menü ••• tippen und auf Reconnect (Neu verbinden) klicken. Wenn dies nicht funktioniert, gehen Sie in das Einstellungsmenü, tippen Sie auf das Feld \"Aktueller Knoten\" und wählen Sie einen Knoten mit einem grünen Punkt daneben aus.\n"
   },
   {
-    "question" : "Ich habe in der App keine Münzen aus dem Umtausch erhalten. Was kann ich tun?",
-    "answer" : "Wenn Sie Probleme mit einem Austausch haben, wenden Sie sich am besten an den Austausch. Wir sind eine Partnerschaft mit XMR.TO, Morph und ChangeNow eingegangen. Rufen Sie daher am besten http://xmr.to, http://changenow.io oder http://morphtoken.com auf und wenden Sie sich an deren Support.\n"
+    "question" : "Ich habe in der App keine Coins aus dem Umtausch erhalten. Was kann ich tun?",
+    "answer" : "Wenn Sie Probleme mit einem Austausch haben, besteht die beste Option, den Austausch selbst zu kontaktieren. Wir haben uns mit Chechenow, Simpleswap, Sideshift und Trocador zusammengetan. Am besten wechseln Sie zu https://changenow.io, https://simpleswap.io/, https://sideshift.ai/, https://trocador.app/ und kontaktieren Sie ihre Unterstützung.\n"
   },
   {
     "question" : "Wie kontaktiere ich den Cake Wallet-Support?",
     "answer" : "Senden Sie eine E-Mail an support@cakewallet.com, schließen Sie sich dem Telegramm unter @cakewallet_bot an oder twittern Sie @CakeWalletXMR!\n"
   }
-]
+]

assets/faq/faq_en.json

@@ -49,10 +49,10 @@
   },
   {
     "question" : "I didn't receive my coins from the exchange in the app. What can I do?",
-    "answer" : "If you're having issues with an exchange, the best option is to contact the exchange itself. We're partnered with XMR.TO, Morph and ChangeNow, so your best bet is to go to http://xmr.to, http://changenow.io, or http://morphtoken.com and contact their support.\n"
+    "answer" : "If you're having issues with an exchange, the best option is to contact the exchange itself. We're partnered with ChangeNow, SimpleSwap, SideShift and Trocador. So your best bet is to go to https://changenow.io, https://simpleswap.io/, https://sideshift.ai/, https://trocador.app/ and contact their support.\n"
   },
   {
     "question" : "How do I contact Cake Wallet support?",
     "answer" : "Email support@cakewallet.com, join the Telegram at @cakewallet_bot, or tweet @CakeWalletXMR!\n"
   }
-]
+]

assets/faq/faq_es.json

@@ -49,10 +49,10 @@
   },
   {
     "question" : "No recibí mis monedas del intercambio en la aplicación. ¿Que puedo hacer?",
-    "answer" : "Si tiene problemas con un intercambio, la mejor opción es ponerse en contacto con el intercambio en sí. Estamos asociados con XMR.TO, Morph y ChangeNow, por lo que su mejor opción es ir a http://xmr.to, http://changenow.io o http://morphtoken.com y contactar a su soporte.\n"
+    "answer" : "Si tiene problemas con un intercambio, la mejor opción es comunicarse con el intercambio en sí. Estamos asociados con ChangeNow, SimpleSwap, SideShift y Trocador. Entonces, su mejor opción es ir a https://changenow.io, https://simplewap.io/, https://sideshift.ai/, https://trocador.app/ y contactar su soporte.\n"
   },
   {
     "question" : "¿Cómo contacto al soporte de Cake Wallet?",
     "answer" : "¡Envíe un correo electrónico a support@cakewallet.com, únase al Telegram en @cakewallet_bot o envíe un tweet a @CakeWalletXMR!\n"
   }
-]
+]

assets/faq/faq_fr.json

@@ -50,7 +50,7 @@
   },
   {
     "question" : "Je n'ai pas reçu mes fonds en provenance de la plateforme d'échange dans l'application. Que puis-je faire ?",
-    "answer" : "Si vous avez des soucis avec une plateforme d'échange, le mieux est de contacter la plateforme d'échange directement. Nous avons des partenariats avec XMR.TO, Morph et ChangeNow, donc essayez http://xmr.to, http://changenow.io, ou http://morphtoken.com et contactez leur support.\n"
+    "answer" : "Si vous rencontrez des problèmes avec un échange, la meilleure option est de contacter l'échange lui-même. Nous sommes en partenariat avec Changenow, Simpleswap, Sideshift et le Trocador. Donc, votre meilleur pari est d'aller sur https://changenow.io, https://simpleswap.io/, https://sideshift.ai/, https://trocador.app/ et contactez leur support.\n"
   },
   {
     "question" : "Comment puis-je contacter le support de Cake Wallet ?",

assets/faq/faq_hi.json

@@ -49,10 +49,10 @@
   },
   {
     "question" : "मुझे ऐप में एक्सचेंज से मेरे सिक्के नहीं मिले। मैं क्या कर सकता हूँ?",
-    "answer" : "यदि आप एक एक्सचेंज के साथ समस्या कर रहे हैं, तो सबसे अच्छा विकल्प एक्सचेंज से संपर्क करना है। हम XMR.TO, Morph और ChangeNow के साथ भागीदारी कर रहे हैं, इसलिए आपका सबसे अच्छा दांव http://xmr.to, http://changenow.io, या http://morphtoken.com पर जाना है और उनके समर्थन से संपर्क करना है।\n"
+    "answer" : "यदि आप एक एक्सचेंज के साथ समस्याएं कर रहे हैं, तो सबसे अच्छा विकल्प एक्सचेंज से संपर्क करना है। हम चंगेनो, सिम्प्लेवैप, सिडशिफ्ट और ट्रोकैडर के साथ भागीदारी कर रहे हैं। तो आपका सबसे अच्छा दांव https://changenow.io, https://simpleswap.io/, https://sideshift.ai/, https://trocador.app/ पर जाना और उनके समर्थन से संपर्क करना है।\n"
   },
   {
     "question" : "मैं केक वॉलेट से कैसे संपर्क करूं?",
     "answer" : "ईमेल support@cakewallet.com, @cakewallet_bot पर टेलीग्राम में शामिल हों, या @CakeWalletXMR पर ट्वीट करें!\n"
   }
-]
+]

assets/faq/faq_ja.json

@@ -49,10 +49,10 @@
   },
   {
     "question" : "アプリの取引所からコインを受け取りませんでした。 私に何ができる？",
-    "answer" : "取引所に問題がある場合、最良の選択肢は取引所自体に連絡することです。 XMR.TO、Morph、ChangeNowと提携しているため、最善の策はhttp：//xmr.to、http：//changenow.io、またはhttp://morphtoken.comにアクセスしてサポートに連絡することです。\n"
+    "answer" : "交換に問題がある場合、最良の選択肢は、交換自体に連絡することです。 Changenow、SimpleSwap、Sideshift、Trocadorと提携しています。したがって、あなたの最善の策は、https：//changenow.io、https：//simpleswap.io/、https：//sideshift.ai/、https://trocador.app/に行くことです。\n"
   },
   {
     "question" : "Cake Walletサポートに連絡するにはどうすればよいですか？",
     "answer" : "support@cakewallet.comにメールを送信するか、@cakewallet_botで電報に参加するか、@CakeWalletXMRにツイートしてください。\n"
   }
-]
+]

assets/faq/faq_ko.json

@@ -49,10 +49,10 @@
   },
   {
     "question" : "앱의 거래소에서 동전을받지 못했습니다. 내가 무엇을 할 수 있을지?",
-    "answer" : "교환에 문제가있는 경우 교환기에 연락하는 것이 가장 좋습니다. 우리는 XMR.TO, Morph 및 ChangeNow와 파트너 관계를 맺고 있으므로 가장 좋은 방법은 http://xmr.to, http://changenow.io 또는 http://morphtoken.com으로 이동하여 지원 부서에 문의하는 것입니다.\n"
+    "answer" : "교환에 문제가있는 경우 가장 좋은 선택은 Exchange 자체에 연락하는 것입니다. 우리는 Changenow, Simpleswap, Sideshift 및 Trocador와 파트너 관계를 맺고 있습니다. 따라서 가장 좋은 방법은 https://changenow.io, https://simpleswap.io/, https://sideshift.ai/, https://trocador.app/로 이동하여 지원에 연락하는 것입니다.\n"
   },
   {
     "question" : "Cake Wallet 지원팀에 연락하려면 어떻게해야합니까?",
     "answer" : "support@cakewallet.com로 이메일을 보내거나 @cakewallet_bot에서 전보에 가입하거나 @CakeWalletXMR을 트윗하십시오!\n"
   }
-]
+]

assets/faq/faq_nl.json

@@ -49,10 +49,10 @@
   },
   {
     "question" : "Ik heb mijn munten niet ontvangen van de beurs in de app. Wat kan ik doen?",
-    "answer" : "Als u problemen ondervindt met een uitwisseling, kunt u het beste contact opnemen met de uitwisseling zelf. We werken samen met XMR.TO, Morph en ChangeNow, dus u kunt het beste naar http://xmr.to, http://changenow.io of http://morphtoken.com gaan en contact opnemen met hun ondersteuning.\n"
+    "answer" : "Als u problemen heeft met een uitwisseling, is de beste optie om contact op te nemen met de uitwisseling zelf. We werken samen met ChangeNow, SimpleSwap, SideShift en Trocador. Dus het beste is om naar https://changenow.io, https://simpleswap.io/, https://sideshift.ai/, https://trocador.app/ te gaan en contact op te nemen met hun ondersteuning.\n"
   },
   {
     "question" : "Hoe neem ik contact op met Cake Wallet-ondersteuning?",
     "answer" : "E-mail support@cakewallet.com, word lid van het Telegram op @cakewallet_bot of tweet @CakeWalletXMR!\n"
   }
-]
+]

assets/faq/faq_pl.json

@@ -49,10 +49,10 @@
   },
   {
     "question" : "Nie otrzymałem moich monet z wymiany w aplikacji. Co mogę zrobić?",
-    "answer" : "Jeśli masz problemy z wymianą, najlepszym rozwiązaniem jest skontaktowanie się z samą giełdą. Współpracujemy z XMR.TO, Morph i ChangeNow, więc najlepiej postawić się na stronie http://xmr.to, http://changenow.io lub http://morphtoken.com i skontaktować się z ich wsparciem.\n"
+    "answer" : "Jeśli masz problemy z wymianą, najlepszą opcją jest skontaktowanie się z samą wymianą. Współpracujemy z Changenow, Simpleswap, Sideshift i Trocador. Więc najlepszym rozwiązaniem jest przejście na https://changenow.io, https://simpleswap.io/, https://sideshift.ai/, https://trocador.app/ i skontaktować się z ich obsługą.\n"
   },
   {
     "question" : "Jak skontaktować się z obsługą Cake Wallet?",
     "answer" : "Wyślij e-mail na adres support@cakewallet.com, dołącz do telegramu na @cakewallet_bot lub tweet @CakeWalletXMR!\n"
   }
-]
+]

assets/faq/faq_pt.json

@@ -49,10 +49,10 @@
   },
   {
     "question" : "Não recebi minhas moedas da troca no aplicativo. O que eu posso fazer?",
-    "answer" : "Se você estiver tendo problemas com uma troca, a melhor opção é entrar em contato com a troca. Somos parceiros do XMR.TO, Morph e ChangeNow, portanto, sua melhor aposta é ir para http://xmr.to, http://changenow.io ou http://morphtoken.com e entrar em contato com o suporte deles.\n"
+    "answer" : "Se você estiver com problemas com uma troca, a melhor opção é entrar em contato com a própria troca. Estamos em parceria com ChangeNow, SimpleSwap, Sideshift e Trocador. Portanto, sua melhor aposta é ir para https://changenow.io, https://simpleswap.io/, https://sideshift.ai/, https://trocador.app/ e entre em contato com seu suporte.\n"
   },
   {
     "question" : "Como entro em contato com o suporte da Cake Wallet?",
     "answer" : "Envie um e-mail para support@cakewallet.com, participe do Telegram em @cakewallet_bot ou envie um tweet para @CakeWalletXMR!\n"
   }
-]
+]

assets/faq/faq_ru.json

@@ -49,10 +49,10 @@
   },
   {
     "question" : "Я не получил свои монеты после обмена в приложении. Что я могу сделать?",
-    "answer" : "Если у вас возникли проблемы с обменом, лучше всего связаться с провайдером обмена. Мы сотрудничаем с XMR.TO, Morph и ChangeNow, поэтому вам лучше всего зайти на http://xmr.to, http://changenow.io или http://morphtoken.com и связаться с их поддержкой.\n"
+    "answer" : "Если у вас есть проблемы с обменом, лучший вариант - связаться с самой биржей. Мы сотрудничаем с Changenow, Simpleswap, SideShift и Trocador. Так что лучше всего пойти по адресу https://changenow.io, https://simpleswap.io/, https://sideshift.ai/, https://trocador.app/ и свяжитесь с их поддержкой.\n"
   },
   {
     "question" : "Как мне связаться со службой поддержки Cake Wallet?",
     "answer" : "По электронной почте support@cakewallet.com, присоединитесь к Telegram по адресу @cakewallet_bot или отправьте твит @CakeWalletXMR!\n"
   }
-]
+]

assets/faq/faq_uk.json

@@ -49,10 +49,10 @@
   },
   {
     "question" : "Я не отримав свої монети після обміну в додатку. Що я можу зробити?",
-    "answer" : "Якщо у вас виникли проблеми з обміном, найкраще зв'язатися з провайдером обміну. Ми співпрацюємо з XMR.TO, Morph і ChangeNow, тому вам найкраще зайти на http://xmr.to, http://changenow.io або http://morphtoken.com і зв'язатися з їх підтримкою.\n"
+    "answer" : "Якщо у вас є проблеми з обміном, найкращим варіантом є зв’язок із самою біржею. Ми співпрацюємо з Changenow, Simplewap, Sideshift та Trocador. Тож найкраща ставка - перейти на https://changenow.io, https://simpleswap.io/, https://sideshift.ai/, https://trocador.app/ та звернутися до їх підтримки.\n"
   },
   {
     "question" : "Як мені зв'язатися зі службою підтримки Cake Wallet?",
     "answer" : "По електронній пошті support@cakewallet.com, приєднайтеся до Telegram за адресою @cakewallet_bot або надішліть твіт @CakeWalletXMR!\n"
   }
-]
+]

assets/faq/faq_zh.json

@@ -49,10 +49,10 @@
   },
   {
     "question" : "我没有从应用程序中的交易所收到硬币。 我能做什么？",
-    "answer" : "如果您对交易所有疑问，最好的选择是与交易所本身联系。 我们与XMR.TO，Morph和ChangeNow合作，因此最好的选择是访问http：//xmr.to、http：//changenow.io或http://morphtoken.com，并与他们的支持部门联系。\n"
+    "answer" : "如果您对交易所有问题，最好的选择是与交易所本身联系。我们与ChangeNow，SimplesWap，SideShift和Trocador合作。因此，最好的选择是访问https://changenow.io，https://simpleswap.io/，https://sideshift.ai/，https：//trocador.app/并联系他们的支持。\n"
   },
   {
     "question" : "如何联系蛋糕钱包支持？",
     "answer" : "电子邮件support@cakewallet.com，通过@cakewallet_bot加入电报，或在@CakeWalletXMR上发布推文！\n"
   }
-]
+]

assets/images/cakewallet_android_icon/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@mipmap/ic_launcher_adaptive_back"/>
-  <foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
+    <background android:drawable="@mipmap/ic_launcher_adaptive_back"/>
+    <foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
 </adaptive-icon>

assets/images/monerocom_android_icon/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@mipmap/ic_launcher_adaptive_back"/>
-  <foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
+    <background android:drawable="@mipmap/ic_launcher_adaptive_back"/>
+    <foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
 </adaptive-icon>

assets/nano_pow_node_list.yml

@@ -5,4 +5,5 @@
 -
   uri: workers.perish.co
 -
-  uri: worker.nanoriver.cc:443
+  uri: worker.nanoriver.cc
+  useSSL: true

assets/node_list.yml

@@ -5,7 +5,8 @@
   uri: cakexmrl7bonq7ovjka5kuwuyd3f7qnkz6z6s6dmsy3uckwra7bvggyd.onion:18081
   is_default: false
 -
-  uri: node.sethforprivacy.com:18089
+  uri: node.sethforprivacy.com:443
+  useSSL: true
   is_default: false
 -
   uri: nodes.hashvault.pro:18081

assets/text/Monerocom_Release_Notes.txt

@@ -1,5 +1,4 @@
-Ability to Auto generate new Monero subaddress when used
-Coin Control for Monero
-In-app Live Chat support
-Additional themes
-Bug Fixes and performance enhancements
+UI enhancements
+Privacy settings enhancements
+Tablet/iPad fixes
+Bug fixes

assets/text/Release_Notes.txt

@@ -1,6 +1,5 @@
-Restore Ethereum from private key and QR
-Ability to Auto generate new Monero subaddress when used
-Coin Control for Monero
-In-app Live Chat support
-Additional themes
-Bug Fixes and performance enhancements
+WalletConnect enhancements
+UI enhancements
+Privacy settings enhancements
+Tablet/iPad fixes
+Bug fixes

configure_cake_wallet_android.sh

@@ -7,4 +7,6 @@ cd cw_monero && flutter pub get && flutter packages pub run build_runner build -
 cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
 cd cw_haven && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
 cd cw_ethereum && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+cd cw_nano && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+cd cw_bitcoin_cash && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
 flutter packages pub run build_runner build --delete-conflicting-outputs

cw_bitcoin/lib/bitcoin_mnemonic.dart

@@ -2304,4 +2304,4 @@ final englishWordlist = <String>[
   'zero',
   'zone',
   'zoo'
-];
+];

cw_bitcoin/lib/bitcoin_transaction_priority.dart

@@ -1,5 +1,4 @@
 import 'package:cw_core/transaction_priority.dart';
-//import 'package:cake_wallet/generated/i18n.dart';
 
 class BitcoinTransactionPriority extends TransactionPriority {
   const BitcoinTransactionPriority({required String title, required int raw})
@@ -100,4 +99,55 @@ class LitecoinTransactionPriority extends BitcoinTransactionPriority {
 
     return label;
   }
+
 }
+class BitcoinCashTransactionPriority extends BitcoinTransactionPriority {
+  const BitcoinCashTransactionPriority({required String title, required int raw})
+      : super(title: title, raw: raw);
+
+  static const List<BitcoinCashTransactionPriority> all = [fast, medium, slow];
+  static const BitcoinCashTransactionPriority slow =
+  BitcoinCashTransactionPriority(title: 'Slow', raw: 0);
+  static const BitcoinCashTransactionPriority medium =
+  BitcoinCashTransactionPriority(title: 'Medium', raw: 1);
+  static const BitcoinCashTransactionPriority fast =
+  BitcoinCashTransactionPriority(title: 'Fast', raw: 2);
+
+  static BitcoinCashTransactionPriority deserialize({required int raw}) {
+    switch (raw) {
+      case 0:
+        return slow;
+      case 1:
+        return medium;
+      case 2:
+        return fast;
+      default:
+        throw Exception('Unexpected token: $raw for BitcoinCashTransactionPriority deserialize');
+    }
+  }
+
+  @override
+  String get units => 'Satoshi';
+
+  @override
+  String toString() {
+    var label = '';
+
+    switch (this) {
+      case BitcoinCashTransactionPriority.slow:
+        label = 'Slow'; // S.current.transaction_priority_slow;
+        break;
+      case BitcoinCashTransactionPriority.medium:
+        label = 'Medium'; // S.current.transaction_priority_medium;
+        break;
+      case BitcoinCashTransactionPriority.fast:
+        label = 'Fast'; // S.current.transaction_priority_fast;
+        break;
+      default:
+        break;
+    }
+
+    return label;
+  }
+}
+

cw_bitcoin/lib/bitcoin_unspent.dart

@@ -1,24 +1,15 @@
 import 'package:cw_bitcoin/bitcoin_address_record.dart';
+import 'package:cw_core/unspent_transaction_output.dart';
 
-class BitcoinUnspent {
-  BitcoinUnspent(this.address, this.hash, this.value, this.vout)
-      : isSending = true,
-        isFrozen = false,
-        note = '';
+class BitcoinUnspent extends Unspent {
+  BitcoinUnspent(BitcoinAddressRecord addressRecord, String hash, int value, int vout)
+      : bitcoinAddressRecord = addressRecord,
+        super(addressRecord.address, hash, value, vout, null);
 
   factory BitcoinUnspent.fromJSON(
-          BitcoinAddressRecord address, Map<String, dynamic> json) =>
+      BitcoinAddressRecord address, Map<String, dynamic> json) =>
       BitcoinUnspent(address, json['tx_hash'] as String, json['value'] as int,
           json['tx_pos'] as int);
 
-  final BitcoinAddressRecord address;
-  final String hash;
-  final int value;
-  final int vout;
-
-  bool get isP2wpkh =>
-      address.address.startsWith('bc') || address.address.startsWith('ltc');
-  bool isSending;
-  bool isFrozen;
-  String note;
+  final BitcoinAddressRecord bitcoinAddressRecord;
 }

cw_bitcoin/lib/bitcoin_wallet.dart

@@ -125,4 +125,4 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
         initialRegularAddressIndex: snp.regularAddressIndex,
         initialChangeAddressIndex: snp.changeAddressIndex);
   }
-}
+}

cw_bitcoin/lib/bitcoin_wallet_addresses.dart

@@ -1,39 +1,34 @@
 import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
-import 'package:cw_bitcoin/electrum.dart';
-import 'package:cw_bitcoin/utils.dart';
 import 'package:cw_bitcoin/bitcoin_address_record.dart';
+import 'package:cw_bitcoin/electrum.dart';
 import 'package:cw_bitcoin/electrum_wallet_addresses.dart';
+import 'package:cw_bitcoin/utils.dart';
 import 'package:cw_core/wallet_info.dart';
-import 'package:flutter/foundation.dart';
 import 'package:mobx/mobx.dart';
 
 part 'bitcoin_wallet_addresses.g.dart';
 
-class BitcoinWalletAddresses = BitcoinWalletAddressesBase
-    with _$BitcoinWalletAddresses;
+class BitcoinWalletAddresses = BitcoinWalletAddressesBase with _$BitcoinWalletAddresses;
 
-abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses
-    with Store {
-  BitcoinWalletAddressesBase(
-      WalletInfo walletInfo,
+abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses with Store {
+  BitcoinWalletAddressesBase(WalletInfo walletInfo,
       {required bitcoin.HDWallet mainHd,
-        required bitcoin.HDWallet sideHd,
-        required bitcoin.NetworkType networkType,
-        required ElectrumClient electrumClient,
-        List<BitcoinAddressRecord>? initialAddresses,
-        int initialRegularAddressIndex = 0,
-        int initialChangeAddressIndex = 0})
-      : super(
-        walletInfo,
-        initialAddresses: initialAddresses,
-        initialRegularAddressIndex: initialRegularAddressIndex,
-        initialChangeAddressIndex: initialChangeAddressIndex,
-        mainHd: mainHd,
-        sideHd: sideHd,
-        electrumClient: electrumClient,
-        networkType: networkType);
+      required bitcoin.HDWallet sideHd,
+      required bitcoin.NetworkType networkType,
+      required ElectrumClient electrumClient,
+      List<BitcoinAddressRecord>? initialAddresses,
+      int initialRegularAddressIndex = 0,
+      int initialChangeAddressIndex = 0})
+      : super(walletInfo,
+            initialAddresses: initialAddresses,
+            initialRegularAddressIndex: initialRegularAddressIndex,
+            initialChangeAddressIndex: initialChangeAddressIndex,
+            mainHd: mainHd,
+            sideHd: sideHd,
+            electrumClient: electrumClient,
+            networkType: networkType);
 
   @override
   String getAddress({required int index, required bitcoin.HDWallet hd}) =>
       generateP2WPKHAddress(hd: hd, index: index, networkType: networkType);
-}
+}

cw_bitcoin/lib/bitcoin_wallet_creation_credentials.dart

@@ -31,4 +31,4 @@ class BitcoinRestoreWalletFromWIFCredentials extends WalletCredentials {
       : super(name: name, password: password, walletInfo: walletInfo);
 
   final String wif;
-}
+}

cw_bitcoin/lib/electrum_wallet.dart

@@ -2,45 +2,49 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
-import 'package:cw_core/unspent_coins_info.dart';
-import 'package:hive/hive.dart';
-import 'package:cw_bitcoin/electrum_wallet_addresses.dart';
-import 'package:mobx/mobx.dart';
-import 'package:rxdart/subjects.dart';
-import 'package:flutter/foundation.dart';
+
 import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
-import 'package:cw_bitcoin/electrum_transaction_info.dart';
-import 'package:cw_core/pathForWallet.dart';
+import 'package:collection/collection.dart';
 import 'package:cw_bitcoin/address_to_output_script.dart';
 import 'package:cw_bitcoin/bitcoin_address_record.dart';
-import 'package:cw_bitcoin/electrum_balance.dart';
 import 'package:cw_bitcoin/bitcoin_transaction_credentials.dart';
-import 'package:cw_bitcoin/electrum_transaction_history.dart';
 import 'package:cw_bitcoin/bitcoin_transaction_no_inputs_exception.dart';
 import 'package:cw_bitcoin/bitcoin_transaction_priority.dart';
 import 'package:cw_bitcoin/bitcoin_transaction_wrong_balance_exception.dart';
 import 'package:cw_bitcoin/bitcoin_unspent.dart';
 import 'package:cw_bitcoin/bitcoin_wallet_keys.dart';
+import 'package:cw_bitcoin/electrum.dart';
+import 'package:cw_bitcoin/electrum_balance.dart';
+import 'package:cw_bitcoin/electrum_transaction_history.dart';
+import 'package:cw_bitcoin/electrum_transaction_info.dart';
+import 'package:cw_bitcoin/electrum_wallet_addresses.dart';
 import 'package:cw_bitcoin/file.dart';
 import 'package:cw_bitcoin/pending_bitcoin_transaction.dart';
 import 'package:cw_bitcoin/script_hash.dart';
 import 'package:cw_bitcoin/utils.dart';
-import 'package:cw_core/wallet_base.dart';
-import 'package:cw_core/node.dart';
-import 'package:cw_core/sync_status.dart';
-import 'package:cw_core/transaction_priority.dart';
-import 'package:cw_core/wallet_info.dart';
-import 'package:cw_bitcoin/electrum.dart';
-import 'package:hex/hex.dart';
 import 'package:cw_core/crypto_currency.dart';
-import 'package:collection/collection.dart';
+import 'package:cw_core/node.dart';
+import 'package:cw_core/pathForWallet.dart';
+import 'package:cw_core/pending_transaction.dart';
+import 'package:cw_core/sync_status.dart';
+import 'package:cw_core/transaction_direction.dart';
+import 'package:cw_core/transaction_priority.dart';
+import 'package:cw_core/unspent_coins_info.dart';
+import 'package:cw_core/wallet_base.dart';
+import 'package:cw_core/wallet_info.dart';
+import 'package:flutter/foundation.dart';
+import 'package:hex/hex.dart';
+import 'package:hive/hive.dart';
+import 'package:mobx/mobx.dart';
+import 'package:rxdart/subjects.dart';
 
 part 'electrum_wallet.g.dart';
 
 class ElectrumWallet = ElectrumWalletBase with _$ElectrumWallet;
 
-abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
-    ElectrumTransactionHistory, ElectrumTransactionInfo> with Store {
+abstract class ElectrumWalletBase
+    extends WalletBase<ElectrumBalance, ElectrumTransactionHistory, ElectrumTransactionInfo>
+    with Store {
   ElectrumWalletBase(
       {required String password,
       required WalletInfo walletInfo,
@@ -52,27 +56,31 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       ElectrumClient? electrumClient,
       ElectrumBalance? initialBalance,
       CryptoCurrency? currency})
-      : hd = bitcoin.HDWallet.fromSeed(seedBytes, network: networkType)
-            .derivePath("m/0'/0"),
+      : hd = currency == CryptoCurrency.bch
+            ? bitcoinCashHDWallet(seedBytes)
+            : bitcoin.HDWallet.fromSeed(seedBytes, network: networkType).derivePath("m/0'/0"),
         syncStatus = NotConnectedSyncStatus(),
         _password = password,
         _feeRates = <int>[],
         _isTransactionUpdating = false,
         unspentCoins = [],
         _scripthashesUpdateSubject = {},
-        balance = ObservableMap<CryptoCurrency, ElectrumBalance>.of(
-          currency != null
-           ? {currency: initialBalance ?? const ElectrumBalance(confirmed: 0, unconfirmed: 0,
-          frozen: 0)}
-           : {}),
+        balance = ObservableMap<CryptoCurrency, ElectrumBalance>.of(currency != null
+            ? {
+                currency:
+                    initialBalance ?? const ElectrumBalance(confirmed: 0, unconfirmed: 0, frozen: 0)
+              }
+            : {}),
         this.unspentCoinsInfo = unspentCoinsInfo,
         super(walletInfo) {
     this.electrumClient = electrumClient ?? ElectrumClient();
     this.walletInfo = walletInfo;
-    transactionHistory =
-        ElectrumTransactionHistory(walletInfo: walletInfo, password: password);
+    transactionHistory = ElectrumTransactionHistory(walletInfo: walletInfo, password: password);
   }
 
+  static bitcoin.HDWallet bitcoinCashHDWallet(Uint8List seedBytes) =>
+      bitcoin.HDWallet.fromSeed(seedBytes).derivePath("m/44'/145'/0'/0");
+
   static int estimatedTransactionSize(int inputsCount, int outputsCounts) =>
       inputsCount * 146 + outputsCounts * 33 + 8;
 
@@ -98,9 +106,9 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       .toList();
 
   List<String> get publicScriptHashes => walletAddresses.addresses
-    .where((addr) => !addr.isHidden)
-    .map((addr) => scriptHash(addr.address, networkType: networkType))
-    .toList();
+      .where((addr) => !addr.isHidden)
+      .map((addr) => scriptHash(addr.address, networkType: networkType))
+      .toList();
 
   String get xpub => hd.base58!;
 
@@ -110,8 +118,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
   bitcoin.NetworkType networkType;
 
   @override
-  BitcoinWalletKeys get keys => BitcoinWalletKeys(
-      wif: hd.wif!, privateKey: hd.privKey!, publicKey: hd.pubKey!);
+  BitcoinWalletKeys get keys =>
+      BitcoinWalletKeys(wif: hd.wif!, privateKey: hd.privKey!, publicKey: hd.pubKey!);
 
   String _password;
   List<BitcoinUnspent> unspentCoins;
@@ -139,8 +147,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       await updateBalance();
       _feeRates = await electrumClient.feeRates();
 
-      Timer.periodic(const Duration(minutes: 1),
-          (timer) async => _feeRates = await electrumClient.feeRates());
+      Timer.periodic(
+          const Duration(minutes: 1), (timer) async => _feeRates = await electrumClient.feeRates());
 
       syncStatus = SyncedSyncStatus();
     } catch (e, stacktrace) {
@@ -169,8 +177,7 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
   }
 
   @override
-  Future<PendingBitcoinTransaction> createTransaction(
-      Object credentials) async {
+  Future<PendingTransaction> createTransaction(Object credentials) async {
     const minAmount = 546;
     final transactionCredentials = credentials as BitcoinTransactionCredentials;
     final inputs = <BitcoinUnspent>[];
@@ -204,13 +211,11 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
     var fee = 0;
 
     if (hasMultiDestination) {
-      if (outputs.any((item) => item.sendAll
-          || item.formattedCryptoAmount! <= 0)) {
+      if (outputs.any((item) => item.sendAll || item.formattedCryptoAmount! <= 0)) {
         throw BitcoinTransactionWrongBalanceException(currency);
       }
 
-      credentialsAmount = outputs.fold(0, (acc, value) =>
-          acc + value.formattedCryptoAmount!);
+      credentialsAmount = outputs.fold(0, (acc, value) => acc + value.formattedCryptoAmount!);
 
       if (allAmount - credentialsAmount < minAmount) {
         throw BitcoinTransactionWrongBalanceException(currency);
@@ -227,9 +232,7 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       }
     } else {
       final output = outputs.first;
-      credentialsAmount = !output.sendAll
-          ? output.formattedCryptoAmount!
-          : 0;
+      credentialsAmount = !output.sendAll ? output.formattedCryptoAmount! : 0;
 
       if (credentialsAmount > allAmount) {
         throw BitcoinTransactionWrongBalanceException(currency);
@@ -290,10 +293,12 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       if (input.isP2wpkh) {
         final p2wpkh = bitcoin
             .P2WPKH(
-            data: generatePaymentData(
-              hd: input.address.isHidden ? walletAddresses.sideHd : walletAddresses.mainHd,
-              index: input.address.index),
-            network: networkType)
+                data: generatePaymentData(
+                    hd: input.bitcoinAddressRecord.isHidden
+                        ? walletAddresses.sideHd
+                        : walletAddresses.mainHd,
+                    index: input.bitcoinAddressRecord.index),
+                network: networkType)
             .data;
 
         txb.addInput(input.hash, input.vout, null, p2wpkh.output);
@@ -303,19 +308,12 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
     });
 
     outputs.forEach((item) {
-      final outputAmount = hasMultiDestination
-          ? item.formattedCryptoAmount
-          : amount;
-      final outputAddress = item.isParsedAddress
-          ? item.extractedAddress!
-          : item.address;
-      txb.addOutput(
-          addressToOutputScript(outputAddress, networkType),
-          outputAmount!);
+      final outputAmount = hasMultiDestination ? item.formattedCryptoAmount : amount;
+      final outputAddress = item.isParsedAddress ? item.extractedAddress! : item.address;
+      txb.addOutput(addressToOutputScript(outputAddress, networkType), outputAmount!);
     });
 
-    final estimatedSize =
-      estimatedTransactionSize(inputs.length, outputs.length + 1);
+    final estimatedSize = estimatedTransactionSize(inputs.length, outputs.length + 1);
     var feeAmount = 0;
 
     if (transactionCredentials.feeRate != null) {
@@ -333,8 +331,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
     for (var i = 0; i < inputs.length; i++) {
       final input = inputs[i];
       final keyPair = generateKeyPair(
-          hd: input.address.isHidden ? walletAddresses.sideHd : walletAddresses.mainHd,
-          index: input.address.index,
+          hd: input.bitcoinAddressRecord.isHidden ? walletAddresses.sideHd : walletAddresses.mainHd,
+          index: input.bitcoinAddressRecord.index,
           network: networkType);
       final witnessValue = input.isP2wpkh ? input.value : null;
 
@@ -364,34 +362,29 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       }
 
       return 0;
-    } catch(_) {
+    } catch (_) {
       return 0;
     }
   }
 
-  int feeAmountForPriority(BitcoinTransactionPriority priority, int inputsCount,
-          int outputsCount) =>
+  int feeAmountForPriority(
+          BitcoinTransactionPriority priority, int inputsCount, int outputsCount) =>
       feeRate(priority) * estimatedTransactionSize(inputsCount, outputsCount);
 
-  int feeAmountWithFeeRate(int feeRate, int inputsCount,
-          int outputsCount) =>
+  int feeAmountWithFeeRate(int feeRate, int inputsCount, int outputsCount) =>
       feeRate * estimatedTransactionSize(inputsCount, outputsCount);
 
   @override
-  int calculateEstimatedFee(TransactionPriority? priority, int? amount,
-    {int? outputsCount}) {
+  int calculateEstimatedFee(TransactionPriority? priority, int? amount, {int? outputsCount}) {
     if (priority is BitcoinTransactionPriority) {
-      return calculateEstimatedFeeWithFeeRate(
-        feeRate(priority),
-        amount,
-        outputsCount: outputsCount);
+      return calculateEstimatedFeeWithFeeRate(feeRate(priority), amount,
+          outputsCount: outputsCount);
     }
 
     return 0;
   }
 
-  int calculateEstimatedFeeWithFeeRate(int feeRate, int? amount,
-  {int? outputsCount}) {
+  int calculateEstimatedFeeWithFeeRate(int feeRate, int? amount, {int? outputsCount}) {
     int inputsCount = 0;
 
     if (amount != null) {
@@ -420,8 +413,7 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
     // If send all, then we have no change value
     final _outputsCount = outputsCount ?? (amount != null ? 2 : 1);
 
-    return feeAmountWithFeeRate(
-        feeRate, inputsCount, _outputsCount);
+    return feeAmountWithFeeRate(feeRate, inputsCount, _outputsCount);
   }
 
   @override
@@ -436,8 +428,7 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
     final currentWalletPath = await pathForWallet(name: walletInfo.name, type: type);
     final currentWalletFile = File(currentWalletPath);
 
-    final currentDirPath =
-        await pathForWalletDir(name: walletInfo.name, type: type);
+    final currentDirPath = await pathForWalletDir(name: walletInfo.name, type: type);
     final currentTransactionsFile = File('$currentDirPath/$transactionsHistoryFileName');
 
     // Copies current wallet files into new wallet name's dir and files
@@ -474,22 +465,23 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
     } catch (_) {}
   }
 
-  Future<String> makePath() async =>
-      pathForWallet(name: walletInfo.name, type: walletInfo.type);
+  Future<String> makePath() async => pathForWallet(name: walletInfo.name, type: walletInfo.type);
 
   Future<void> updateUnspent() async {
-    final unspent = await Future.wait(walletAddresses
-        .addresses.map((address) => electrumClient
+    final unspent = await Future.wait(walletAddresses.addresses.map((address) => electrumClient
         .getListUnspentWithAddress(address.address, networkType)
-        .then((unspent) => unspent
-            .map((unspent) {
+        .then((unspent) => unspent.map((unspent) {
               try {
                 return BitcoinUnspent.fromJSON(address, unspent);
-              } catch(_) {
+              } catch (_) {
                 return null;
               }
             }).whereNotNull())));
     unspentCoins = unspent.expand((e) => e).toList();
+    unspentCoins.forEach((coin) async {
+      final tx = await fetchTransactionInfo(hash: coin.hash, height: 0);
+      coin.isChange = tx!.direction == TransactionDirection.outgoing;
+    });
 
     if (unspentCoinsInfo.isEmpty) {
       unspentCoins.forEach((coin) => _addCoinInfo(coin));
@@ -498,8 +490,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
 
     if (unspentCoins.isNotEmpty) {
       unspentCoins.forEach((coin) {
-        final coinInfoList = unspentCoinsInfo.values.where((element) =>
-          element.walletId.contains(id) && element.hash.contains(coin.hash));
+        final coinInfoList = unspentCoinsInfo.values
+            .where((element) => element.walletId.contains(id) && element.hash.contains(coin.hash));
 
         if (coinInfoList.isNotEmpty) {
           final coinInfo = coinInfoList.first;
@@ -518,14 +510,15 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
 
   Future<void> _addCoinInfo(BitcoinUnspent coin) async {
     final newInfo = UnspentCoinsInfo(
-        walletId: id,
-        hash: coin.hash,
-        isFrozen: coin.isFrozen,
-        isSending: coin.isSending,
-        noteRaw: coin.note,
-        address: coin.address.address,
-        value: coin.value,
-        vout: coin.vout,
+      walletId: id,
+      hash: coin.hash,
+      isFrozen: coin.isFrozen,
+      isSending: coin.isSending,
+      noteRaw: coin.note,
+      address: coin.bitcoinAddressRecord.address,
+      value: coin.value,
+      vout: coin.vout,
+      isChange: coin.isChange,
     );
 
     await unspentCoinsInfo.add(newInfo);
@@ -534,8 +527,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
   Future<void> _refreshUnspentCoinsInfo() async {
     try {
       final List<dynamic> keys = <dynamic>[];
-      final currentWalletUnspentCoins = unspentCoinsInfo.values
-          .where((element) => element.walletId.contains(id));
+      final currentWalletUnspentCoins =
+          unspentCoinsInfo.values.where((element) => element.walletId.contains(id));
 
       if (currentWalletUnspentCoins.isNotEmpty) {
         currentWalletUnspentCoins.forEach((element) {
@@ -571,27 +564,19 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       ins.add(tx);
     }
 
-    return ElectrumTransactionBundle(
-      original,
-      ins: ins,
-      time: time,
-      confirmations: confirmations);
+    return ElectrumTransactionBundle(original, ins: ins, time: time, confirmations: confirmations);
   }
 
   Future<ElectrumTransactionInfo?> fetchTransactionInfo(
       {required String hash, required int height}) async {
-        try {
-    final tx = await getTransactionExpanded(hash: hash, height: height);
-    final addresses = walletAddresses.addresses.map((addr) => addr.address).toSet();
-    return ElectrumTransactionInfo.fromElectrumBundle(
-      tx,
-      walletInfo.type,
-      networkType,
-      addresses: addresses,
-      height: height);
-      } catch(_) {
-        return null;
-      }
+    try {
+      final tx = await getTransactionExpanded(hash: hash, height: height);
+      final addresses = walletAddresses.addresses.map((addr) => addr.address).toSet();
+      return ElectrumTransactionInfo.fromElectrumBundle(tx, walletInfo.type, networkType,
+          addresses: addresses, height: height);
+    } catch (_) {
+      return null;
+    }
   }
 
   @override
@@ -602,10 +587,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       final sh = scriptHash(addressRecord.address, networkType: networkType);
       addressHashes[sh] = addressRecord;
     });
-    final histories =
-        addressHashes.keys.map((scriptHash) => electrumClient
-          .getHistory(scriptHash)
-          .then((history) => {scriptHash: history}));
+    final histories = addressHashes.keys.map((scriptHash) =>
+        electrumClient.getHistory(scriptHash).then((history) => {scriptHash: history}));
     final historyResults = await Future.wait(histories);
     historyResults.forEach((history) {
       history.entries.forEach((historyItem) {
@@ -616,19 +599,16 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
         }
       });
     });
-    final historiesWithDetails = await Future.wait(
-      normalizedHistories
-        .map((transaction) {
-          try {
-            return fetchTransactionInfo(
-              hash: transaction['tx_hash'] as String,
-              height: transaction['height'] as int);
-          } catch(_) {
-            return Future.value(null);
-          }
-        }));
-    return historiesWithDetails.fold<Map<String, ElectrumTransactionInfo>>(
-        <String, ElectrumTransactionInfo>{}, (acc, tx) {
+    final historiesWithDetails = await Future.wait(normalizedHistories.map((transaction) {
+      try {
+        return fetchTransactionInfo(
+            hash: transaction['tx_hash'] as String, height: transaction['height'] as int);
+      } catch (_) {
+        return Future.value(null);
+      }
+    }));
+    return historiesWithDetails
+        .fold<Map<String, ElectrumTransactionInfo>>(<String, ElectrumTransactionInfo>{}, (acc, tx) {
       if (tx == null) {
         return acc;
       }
@@ -680,7 +660,6 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
   Future<ElectrumBalance> _fetchBalances() async {
     final addresses = walletAddresses.addresses.toList();
     final balanceFutures = <Future<Map<String, dynamic>>>[];
-
     for (var i = 0; i < addresses.length; i++) {
       final addressRecord = addresses[i];
       final sh = scriptHash(addressRecord.address, networkType: networkType);
@@ -691,8 +670,10 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
     var totalFrozen = 0;
     unspentCoinsInfo.values.forEach((info) {
       unspentCoins.forEach((element) {
-        if (element.hash == info.hash && info.isFrozen && element.address.address == info.address
-            && element.value == info.value) {
+        if (element.hash == info.hash &&
+            info.isFrozen &&
+            element.bitcoinAddressRecord.address == info.address &&
+            element.value == info.value) {
           totalFrozen += element.value;
         }
       });
@@ -715,8 +696,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       }
     }
 
-    return ElectrumBalance(confirmed: totalConfirmed, unconfirmed: totalUnconfirmed,
-    frozen: totalFrozen);
+    return ElectrumBalance(
+        confirmed: totalConfirmed, unconfirmed: totalUnconfirmed, frozen: totalFrozen);
   }
 
   Future<void> updateBalance() async {
@@ -727,9 +708,7 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
   String getChangeAddress() {
     const minCountOfHiddenAddresses = 5;
     final random = Random();
-    var addresses = walletAddresses.addresses
-      .where((addr) => addr.isHidden)
-      .toList();
+    var addresses = walletAddresses.addresses.where((addr) => addr.isHidden).toList();
 
     if (addresses.length < minCountOfHiddenAddresses) {
       addresses = walletAddresses.addresses.toList();
@@ -740,4 +719,14 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
 
   @override
   void setExceptionHandler(void Function(FlutterErrorDetails) onError) => _onError = onError;
+
+  @override
+  String signMessage(String message, {String? address = null}) {
+    final index = address != null
+        ? walletAddresses.addresses.firstWhere((element) => element.address == address).index
+        : null;
+    return index == null
+        ? base64Encode(hd.sign(message))
+        : base64Encode(hd.derive(index).sign(message));
+  }
 }

cw_bitcoin/lib/electrum_wallet_addresses.dart

@@ -1,9 +1,11 @@
 import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
+import 'package:bitbox/bitbox.dart' as bitbox;
 import 'package:cw_bitcoin/bitcoin_address_record.dart';
 import 'package:cw_bitcoin/electrum.dart';
 import 'package:cw_bitcoin/script_hash.dart';
 import 'package:cw_core/wallet_addresses.dart';
 import 'package:cw_core/wallet_info.dart';
+import 'package:cw_core/wallet_type.dart';
 import 'package:mobx/mobx.dart';
 
 part 'electrum_wallet_addresses.g.dart';
@@ -38,6 +40,8 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
   static const defaultChangeAddressesCount = 17;
   static const gap = 20;
 
+  static String toCashAddr(String address) => bitbox.Address.toCashAddress(address);
+
   final ObservableList<BitcoinAddressRecord> addresses;
   final ObservableList<BitcoinAddressRecord> receiveAddresses;
   final ObservableList<BitcoinAddressRecord> changeAddresses;
@@ -50,10 +54,12 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
   @computed
   String get address {
     if (receiveAddresses.isEmpty) {
-      return generateNewAddress().address;
+      final address = generateNewAddress().address;
+      return walletInfo.type == WalletType.bitcoinCash ? toCashAddr(address) : address;
     }
+    final receiveAddress = receiveAddresses.first.address;
 
-    return receiveAddresses.first.address;
+    return walletInfo.type == WalletType.bitcoinCash ? toCashAddr(receiveAddress) : receiveAddress;
   }
 
   @override
@@ -105,10 +111,9 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
   @action
   Future<String> getChangeAddress() async {
     updateChangeAddresses();
-    
+
     if (changeAddresses.isEmpty) {
-      final newAddresses = await _createNewAddresses(
-        gap,
+      final newAddresses = await _createNewAddresses(gap,
         hd: sideHd,
         startIndex: totalCountOfChangeAddresses > 0
           ? totalCountOfChangeAddresses -  1
@@ -179,7 +184,7 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
     } else {
       addrs = await _createNewAddresses(
           isHidden
-            ? defaultChangeAddressesCount
+            ?  defaultChangeAddressesCount
             : defaultReceiveAddressesCount,
           startIndex: 0,
           hd: hd,

cw_bitcoin/lib/electrum_wallet_snapshot.dart

@@ -67,4 +67,4 @@ class ElectrumWallletSnapshot {
         derivationType: derivationType,
         derivationPath: derivationPath);
   }
-}
+}

cw_bitcoin/pubspec.lock

@@ -66,6 +66,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.6"
+  bitbox:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: master
+      resolved-ref: ea65073efbaf395a5557e8cd7bd72f195cd7eb11
+      url: "https://github.com/cake-tech/bitbox-flutter.git"
+    source: git
+    version: "1.0.1"
   bitcoin_flutter:
     dependency: "direct main"
     description:
@@ -472,50 +481,50 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: dcea5feb97d8abf90cab9e9030b497fb7c3cbf26b7a1fe9e3ef7dcb0a1ddec95
+      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.12"
+    version: "2.1.1"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: a776c088d671b27f6e3aa8881d64b87b3e80201c64e8869b811325de7a76c15e
+      sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.22"
+    version: "2.2.1"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "62a68e7e1c6c459f9289859e2fae58290c981ce21d1697faf54910fe1faa4c74"
+      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.3.1"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
+    version: "2.2.1"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76
+      sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
+    version: "2.1.1"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c
+      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.2.1"
   platform:
     dependency: transitive
     description:
@@ -601,6 +610,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.99"
+  socks5_proxy:
+    dependency: transitive
+    description:
+      name: socks5_proxy
+      sha256: "1d21b5606169654bbf4cfb904e8e6ed897e9f763358709f87310c757096d909a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
   source_gen:
     dependency: transitive
     description:
@@ -681,6 +698,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
+  tor:
+    dependency: transitive
+    description:
+      path: "."
+      ref: main
+      resolved-ref: "09ba92cb11d4e3cacf97256e57863b805f79f2e5"
+      url: "https://github.com/cake-tech/tor.git"
+    source: git
+    version: "0.0.1"
   typed_data:
     dependency: transitive
     description:
@@ -747,4 +773,4 @@ packages:
     version: "3.1.1"
 sdks:
   dart: ">=3.0.0 <4.0.0"
-  flutter: ">=3.0.0"
+  flutter: ">=3.7.0"

cw_bitcoin/pubspec.yaml

@@ -23,6 +23,10 @@ dependencies:
     git:
       url: https://github.com/cake-tech/bitcoin_flutter.git
       ref: cake-update-v3
+  bitbox:
+    git:
+      url: https://github.com/cake-tech/bitbox-flutter.git
+      ref: master
   rxdart: ^0.27.5
   unorm_dart: ^0.2.0
   cryptography: ^2.0.5

cw_bitcoin_cash/.gitignore

@@ -0,0 +1,30 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+.dart_tool/
+.packages
+build/

cw_bitcoin_cash/.metadata

@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: b06b8b2710955028a6b562f5aa6fe62941d6febf
+  channel: stable
+
+project_type: package

cw_bitcoin_cash/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.0.1
+
+* TODO: Describe initial release.

cw_bitcoin_cash/LICENSE

@@ -0,0 +1 @@
+TODO: Add your license here.

cw_bitcoin_cash/README.md

@@ -0,0 +1,39 @@
+<!--
+This README describes the package. If you publish this package to pub.dev,
+this README's contents appear on the landing page for your package.
+
+For information about how to write a good package README, see the guide for
+[writing package pages](https://dart.dev/guides/libraries/writing-package-pages).
+
+For general information about developing packages, see the Dart guide for
+[creating packages](https://dart.dev/guides/libraries/create-library-packages)
+and the Flutter guide for
+[developing packages and plugins](https://flutter.dev/developing-packages).
+-->
+
+TODO: Put a short description of the package here that helps potential users
+know whether this package might be useful for them.
+
+## Features
+
+TODO: List what your package can do. Maybe include images, gifs, or videos.
+
+## Getting started
+
+TODO: List prerequisites and provide or point to information on how to
+start using the package.
+
+## Usage
+
+TODO: Include short and useful examples for package users. Add longer examples
+to `/example` folder.
+
+```dart
+const like = 'sample';
+```
+
+## Additional information
+
+TODO: Tell users more about the package: where to find more information, how to
+contribute to the package, how to file issues, what response they can expect
+from the package authors, and more.

cw_bitcoin_cash/analysis_options.yaml

@@ -0,0 +1,4 @@
+include: package:flutter_lints/flutter.yaml
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

cw_bitcoin_cash/lib/cw_bitcoin_cash.dart

@@ -0,0 +1,9 @@
+library cw_bitcoin_cash;
+
+export 'src/bitcoin_cash_base.dart';
+
+/// A Calculator.
+class Calculator {
+  /// Returns [value] plus 1.
+  int addOne(int value) => value + 1;
+}

cw_bitcoin_cash/lib/src/bitcoin_cash_address_utils.dart

@@ -0,0 +1,6 @@
+import 'package:bitbox/bitbox.dart' as bitbox;
+
+class AddressUtils {
+  static String getCashAddrFormat(String address) => bitbox.Address.toCashAddress(address);
+  static String toLegacyAddress(String address) => bitbox.Address.toLegacyAddress(address);
+}

cw_bitcoin_cash/lib/src/bitcoin_cash_base.dart

@@ -0,0 +1,7 @@
+export 'bitcoin_cash_wallet.dart';
+export 'bitcoin_cash_wallet_addresses.dart';
+export 'bitcoin_cash_wallet_creation_credentials.dart';
+export 'bitcoin_cash_wallet_service.dart';
+export 'exceptions/exceptions.dart';
+export 'mnemonic.dart';
+export 'bitcoin_cash_address_utils.dart';

cw_bitcoin_cash/lib/src/bitcoin_cash_wallet.dart

@@ -0,0 +1,311 @@
+import 'dart:convert';
+
+import 'package:bitbox/bitbox.dart' as bitbox;
+import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
+import 'package:cw_bitcoin/bitcoin_address_record.dart';
+import 'package:cw_bitcoin/bitcoin_transaction_credentials.dart';
+import 'package:cw_bitcoin/bitcoin_transaction_no_inputs_exception.dart';
+import 'package:cw_bitcoin/bitcoin_transaction_priority.dart';
+import 'package:cw_bitcoin/bitcoin_transaction_wrong_balance_exception.dart';
+import 'package:cw_bitcoin/bitcoin_unspent.dart';
+import 'package:cw_bitcoin/electrum_balance.dart';
+import 'package:cw_bitcoin/electrum_wallet.dart';
+import 'package:cw_bitcoin/electrum_wallet_snapshot.dart';
+import 'package:cw_bitcoin_cash/src/pending_bitcoin_cash_transaction.dart';
+import 'package:cw_core/crypto_currency.dart';
+import 'package:cw_core/transaction_priority.dart';
+import 'package:cw_core/unspent_coins_info.dart';
+import 'package:cw_core/wallet_info.dart';
+import 'package:flutter/foundation.dart';
+import 'package:hive/hive.dart';
+import 'package:mobx/mobx.dart';
+
+import 'bitcoin_cash_base.dart';
+
+part 'bitcoin_cash_wallet.g.dart';
+
+class BitcoinCashWallet = BitcoinCashWalletBase with _$BitcoinCashWallet;
+
+abstract class BitcoinCashWalletBase extends ElectrumWallet with Store {
+  BitcoinCashWalletBase(
+      {required String mnemonic,
+      required String password,
+      required WalletInfo walletInfo,
+      required Box<UnspentCoinsInfo> unspentCoinsInfo,
+      required Uint8List seedBytes,
+      List<BitcoinAddressRecord>? initialAddresses,
+      ElectrumBalance? initialBalance,
+      int initialRegularAddressIndex = 0,
+      int initialChangeAddressIndex = 0})
+      : super(
+            mnemonic: mnemonic,
+            password: password,
+            walletInfo: walletInfo,
+            unspentCoinsInfo: unspentCoinsInfo,
+            networkType: bitcoin.bitcoin,
+            initialAddresses: initialAddresses,
+            initialBalance: initialBalance,
+            seedBytes: seedBytes,
+            currency: CryptoCurrency.bch) {
+    walletAddresses = BitcoinCashWalletAddresses(walletInfo,
+        electrumClient: electrumClient,
+        initialAddresses: initialAddresses,
+        initialRegularAddressIndex: initialRegularAddressIndex,
+        initialChangeAddressIndex: initialChangeAddressIndex,
+        mainHd: hd,
+        sideHd: bitcoin.HDWallet.fromSeed(seedBytes)
+            .derivePath("m/44'/145'/0'/1"),
+        networkType: networkType);
+  }
+
+
+  static Future<BitcoinCashWallet> create(
+      {required String mnemonic,
+      required String password,
+      required WalletInfo walletInfo,
+      required Box<UnspentCoinsInfo> unspentCoinsInfo,
+      List<BitcoinAddressRecord>? initialAddresses,
+      ElectrumBalance? initialBalance,
+      int initialRegularAddressIndex = 0,
+      int initialChangeAddressIndex = 0}) async {
+    return BitcoinCashWallet(
+        mnemonic: mnemonic,
+        password: password,
+        walletInfo: walletInfo,
+        unspentCoinsInfo: unspentCoinsInfo,
+        initialAddresses: initialAddresses,
+        initialBalance: initialBalance,
+        seedBytes: await Mnemonic.toSeed(mnemonic),
+        initialRegularAddressIndex: initialRegularAddressIndex,
+        initialChangeAddressIndex: initialChangeAddressIndex);
+  }
+
+  static Future<BitcoinCashWallet> open({
+    required String name,
+    required WalletInfo walletInfo,
+    required Box<UnspentCoinsInfo> unspentCoinsInfo,
+    required String password,
+  }) async {
+    final snp = await ElectrumWallletSnapshot.load(name, walletInfo.type, password);
+    return BitcoinCashWallet(
+        mnemonic: snp.mnemonic,
+        password: password,
+        walletInfo: walletInfo,
+        unspentCoinsInfo: unspentCoinsInfo,
+        initialAddresses: snp.addresses,
+        initialBalance: snp.balance,
+        seedBytes: await Mnemonic.toSeed(snp.mnemonic),
+        initialRegularAddressIndex: snp.regularAddressIndex,
+        initialChangeAddressIndex: snp.changeAddressIndex);
+  }
+
+  @override
+  Future<PendingBitcoinCashTransaction> createTransaction(Object credentials) async {
+    const minAmount = 546;
+    final transactionCredentials = credentials as BitcoinTransactionCredentials;
+    final inputs = <BitcoinUnspent>[];
+    final outputs = transactionCredentials.outputs;
+    final hasMultiDestination = outputs.length > 1;
+
+    var allInputsAmount = 0;
+
+    if (unspentCoins.isEmpty) await updateUnspent();
+
+    for (final utx in unspentCoins) {
+      if (utx.isSending) {
+        allInputsAmount += utx.value;
+        inputs.add(utx);
+      }
+    }
+
+    if (inputs.isEmpty) throw BitcoinTransactionNoInputsException();
+
+    final allAmountFee = transactionCredentials.feeRate != null
+        ? feeAmountWithFeeRate(transactionCredentials.feeRate!, inputs.length, outputs.length)
+        : feeAmountForPriority(transactionCredentials.priority!, inputs.length, outputs.length);
+
+    final allAmount = allInputsAmount - allAmountFee;
+
+    var credentialsAmount = 0;
+    var amount = 0;
+    var fee = 0;
+
+    if (hasMultiDestination) {
+      if (outputs.any((item) => item.sendAll || item.formattedCryptoAmount! <= 0)) {
+        throw BitcoinTransactionWrongBalanceException(currency);
+      }
+
+      credentialsAmount = outputs.fold(0, (acc, value) => acc + value.formattedCryptoAmount!);
+
+      if (allAmount - credentialsAmount < minAmount) {
+        throw BitcoinTransactionWrongBalanceException(currency);
+      }
+
+      amount = credentialsAmount;
+
+      if (transactionCredentials.feeRate != null) {
+        fee = calculateEstimatedFeeWithFeeRate(transactionCredentials.feeRate!, amount,
+            outputsCount: outputs.length + 1);
+      } else {
+        fee = calculateEstimatedFee(transactionCredentials.priority, amount,
+            outputsCount: outputs.length + 1);
+      }
+    } else {
+      final output = outputs.first;
+      credentialsAmount = !output.sendAll ? output.formattedCryptoAmount! : 0;
+
+      if (credentialsAmount > allAmount) {
+        throw BitcoinTransactionWrongBalanceException(currency);
+      }
+
+      amount = output.sendAll || allAmount - credentialsAmount < minAmount
+          ? allAmount
+          : credentialsAmount;
+
+      if (output.sendAll || amount == allAmount) {
+        fee = allAmountFee;
+      } else if (transactionCredentials.feeRate != null) {
+        fee = calculateEstimatedFeeWithFeeRate(transactionCredentials.feeRate!, amount);
+      } else {
+        fee = calculateEstimatedFee(transactionCredentials.priority, amount);
+      }
+    }
+
+    if (fee == 0) {
+      throw BitcoinTransactionWrongBalanceException(currency);
+    }
+
+    final totalAmount = amount + fee;
+
+    if (totalAmount > balance[currency]!.confirmed || totalAmount > allInputsAmount) {
+      throw BitcoinTransactionWrongBalanceException(currency);
+    }
+    final txb = bitbox.Bitbox.transactionBuilder(testnet: false);
+
+    final changeAddress = await walletAddresses.getChangeAddress();
+    var leftAmount = totalAmount;
+    var totalInputAmount = 0;
+
+    inputs.clear();
+
+    for (final utx in unspentCoins) {
+      if (utx.isSending) {
+        leftAmount = leftAmount - utx.value;
+        totalInputAmount += utx.value;
+        inputs.add(utx);
+
+        if (leftAmount <= 0) {
+          break;
+        }
+      }
+    }
+
+    if (inputs.isEmpty) throw BitcoinTransactionNoInputsException();
+
+    if (amount <= 0 || totalInputAmount < totalAmount) {
+      throw BitcoinTransactionWrongBalanceException(currency);
+    }
+
+    inputs.forEach((input) {
+      txb.addInput(input.hash, input.vout);
+    });
+
+    outputs.forEach((item) {
+      final outputAmount = hasMultiDestination ? item.formattedCryptoAmount : amount;
+      final outputAddress = item.isParsedAddress ? item.extractedAddress! : item.address;
+      txb.addOutput(outputAddress, outputAmount!);
+    });
+
+    final estimatedSize = bitbox.BitcoinCash.getByteCount(inputs.length, outputs.length + 1);
+
+    var feeAmount = 0;
+
+    if (transactionCredentials.feeRate != null) {
+      feeAmount = transactionCredentials.feeRate! * estimatedSize;
+    } else {
+      feeAmount = feeRate(transactionCredentials.priority!) * estimatedSize;
+    }
+
+    final changeValue = totalInputAmount - amount - feeAmount;
+
+    if (changeValue > minAmount) {
+      txb.addOutput(changeAddress, changeValue);
+    }
+
+    for (var i = 0; i < inputs.length; i++) {
+      final input = inputs[i];
+      final keyPair = generateKeyPair(
+          hd: input.bitcoinAddressRecord.isHidden ? walletAddresses.sideHd : walletAddresses.mainHd,
+          index: input.bitcoinAddressRecord.index);
+      txb.sign(i, keyPair, input.value);
+    }
+
+    // Build the transaction
+    final tx = txb.build();
+
+    return PendingBitcoinCashTransaction(tx, type,
+        electrumClient: electrumClient, amount: amount, fee: fee);
+  }
+
+  bitbox.ECPair generateKeyPair(
+          {required bitcoin.HDWallet hd,
+          required int index}) =>
+      bitbox.ECPair.fromWIF(hd.derive(index).wif!);
+
+  @override
+  int feeAmountForPriority(
+          BitcoinTransactionPriority priority, int inputsCount, int outputsCount) =>
+      feeRate(priority) * bitbox.BitcoinCash.getByteCount(inputsCount, outputsCount);
+
+  int feeAmountWithFeeRate(int feeRate, int inputsCount, int outputsCount) =>
+      feeRate * bitbox.BitcoinCash.getByteCount(inputsCount, outputsCount);
+
+  int calculateEstimatedFeeWithFeeRate(int feeRate, int? amount, {int? outputsCount}) {
+    int inputsCount = 0;
+    int totalValue = 0;
+
+    for (final input in unspentCoins) {
+      if (input.isSending) {
+        inputsCount++;
+        totalValue += input.value;
+      }
+      if (amount != null && totalValue >= amount) {
+        break;
+      }
+    }
+
+    if (amount != null && totalValue < amount) return 0;
+
+    final _outputsCount = outputsCount ?? (amount != null ? 2 : 1);
+
+    return feeAmountWithFeeRate(feeRate, inputsCount, _outputsCount);
+  }
+
+  @override
+  int feeRate(TransactionPriority priority) {
+    if (priority is BitcoinCashTransactionPriority) {
+      switch (priority) {
+        case BitcoinCashTransactionPriority.slow:
+          return 1;
+        case BitcoinCashTransactionPriority.medium:
+          return 5;
+        case BitcoinCashTransactionPriority.fast:
+          return 10;
+      }
+    }
+
+    return 0;
+  }
+
+  @override
+  String signMessage(String message, {String? address = null}) {
+    final index = address != null
+        ? walletAddresses.addresses
+            .firstWhere((element) => element.address == AddressUtils.toLegacyAddress(address))
+            .index
+        : null;
+    return index == null
+        ? base64Encode(hd.sign(message))
+        : base64Encode(hd.derive(index).sign(message));
+  }
+}

cw_bitcoin_cash/lib/src/bitcoin_cash_wallet_addresses.dart

@@ -0,0 +1,34 @@
+import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
+import 'package:cw_bitcoin/bitcoin_address_record.dart';
+import 'package:cw_bitcoin/electrum.dart';
+import 'package:cw_bitcoin/electrum_wallet_addresses.dart';
+import 'package:cw_bitcoin/utils.dart';
+import 'package:cw_core/wallet_info.dart';
+import 'package:mobx/mobx.dart';
+
+part 'bitcoin_cash_wallet_addresses.g.dart';
+
+class BitcoinCashWalletAddresses = BitcoinCashWalletAddressesBase with _$BitcoinCashWalletAddresses;
+
+abstract class BitcoinCashWalletAddressesBase extends ElectrumWalletAddresses with Store {
+  BitcoinCashWalletAddressesBase(WalletInfo walletInfo,
+      {required bitcoin.HDWallet mainHd,
+      required bitcoin.HDWallet sideHd,
+      required bitcoin.NetworkType networkType,
+      required ElectrumClient electrumClient,
+      List<BitcoinAddressRecord>? initialAddresses,
+      int initialRegularAddressIndex = 0,
+      int initialChangeAddressIndex = 0})
+      : super(walletInfo,
+            initialAddresses: initialAddresses,
+            initialRegularAddressIndex: initialRegularAddressIndex,
+            initialChangeAddressIndex: initialChangeAddressIndex,
+            mainHd: mainHd,
+            sideHd: sideHd,
+            electrumClient: electrumClient,
+            networkType: networkType);
+
+  @override
+  String getAddress({required int index, required bitcoin.HDWallet hd}) =>
+      generateP2PKHAddress(hd: hd, index: index, networkType: networkType);
+}

cw_bitcoin_cash/lib/src/bitcoin_cash_wallet_creation_credentials.dart

@@ -0,0 +1,26 @@
+import 'package:cw_core/wallet_credentials.dart';
+import 'package:cw_core/wallet_info.dart';
+
+class BitcoinCashNewWalletCredentials extends WalletCredentials {
+  BitcoinCashNewWalletCredentials({required String name, WalletInfo? walletInfo})
+      : super(name: name, walletInfo: walletInfo);
+}
+
+class BitcoinCashRestoreWalletFromSeedCredentials extends WalletCredentials {
+  BitcoinCashRestoreWalletFromSeedCredentials(
+      {required String name,
+      required String password,
+      required this.mnemonic,
+      WalletInfo? walletInfo})
+      : super(name: name, password: password, walletInfo: walletInfo);
+
+  final String mnemonic;
+}
+
+class BitcoinCashRestoreWalletFromWIFCredentials extends WalletCredentials {
+  BitcoinCashRestoreWalletFromWIFCredentials(
+      {required String name, required String password, required this.wif, WalletInfo? walletInfo})
+      : super(name: name, password: password, walletInfo: walletInfo);
+
+  final String wif;
+}

cw_bitcoin_cash/lib/src/bitcoin_cash_wallet_service.dart

@@ -0,0 +1,112 @@
+import 'dart:io';
+
+import 'package:bip39/bip39.dart';
+import 'package:cw_bitcoin_cash/cw_bitcoin_cash.dart';
+import 'package:cw_core/balance.dart';
+import 'package:cw_core/pathForWallet.dart';
+import 'package:cw_core/transaction_history.dart';
+import 'package:cw_core/transaction_info.dart';
+import 'package:cw_core/unspent_coins_info.dart';
+import 'package:cw_core/wallet_base.dart';
+import 'package:cw_core/wallet_info.dart';
+import 'package:cw_core/wallet_service.dart';
+import 'package:cw_core/wallet_type.dart';
+import 'package:collection/collection.dart';
+import 'package:hive/hive.dart';
+
+class BitcoinCashWalletService extends WalletService<BitcoinCashNewWalletCredentials,
+    BitcoinCashRestoreWalletFromSeedCredentials,
+    BitcoinCashRestoreWalletFromWIFCredentials> {
+  BitcoinCashWalletService(this.walletInfoSource, this.unspentCoinsInfoSource);
+
+  final Box<WalletInfo> walletInfoSource;
+  final Box<UnspentCoinsInfo> unspentCoinsInfoSource;
+
+  @override
+  WalletType getType() => WalletType.bitcoinCash;
+
+  @override
+  Future<bool> isWalletExit(String name) async =>
+      File(await pathForWallet(name: name, type: getType())).existsSync();
+
+  @override
+  Future<BitcoinCashWallet> create(
+      credentials) async {
+    final strength = (credentials.seedPhraseLength == 12)
+        ? 128
+        : (credentials.seedPhraseLength == 24)
+        ? 256
+        : 128;
+    final wallet = await BitcoinCashWalletBase.create(
+        mnemonic: await Mnemonic.generate(strength: strength),
+        password: credentials.password!,
+        walletInfo: credentials.walletInfo!,
+        unspentCoinsInfo: unspentCoinsInfoSource);
+    await wallet.save();
+    await wallet.init();
+    return wallet;
+  }
+
+  @override
+  Future<BitcoinCashWallet> openWallet(String name, String password) async {
+    final walletInfo = walletInfoSource.values.firstWhereOrNull(
+            (info) => info.id == WalletBase.idFor(name, getType()))!;
+    final wallet = await BitcoinCashWalletBase.open(
+        password: password, name: name, walletInfo: walletInfo,
+        unspentCoinsInfo: unspentCoinsInfoSource);
+    await wallet.init();
+    return wallet;
+  }
+
+  @override
+  Future<void> remove(String wallet) async {
+    File(await pathForWalletDir(name: wallet, type: getType()))
+        .delete(recursive: true);
+    final walletInfo = walletInfoSource.values.firstWhereOrNull(
+            (info) => info.id == WalletBase.idFor(wallet, getType()))!;
+    await walletInfoSource.delete(walletInfo.key);
+  }
+
+  @override
+  Future<void> rename(String currentName, String password, String newName) async {
+    final currentWalletInfo = walletInfoSource.values.firstWhereOrNull(
+            (info) => info.id == WalletBase.idFor(currentName, getType()))!;
+    final currentWallet = await BitcoinCashWalletBase.open(
+        password: password,
+        name: currentName,
+        walletInfo: currentWalletInfo,
+        unspentCoinsInfo: unspentCoinsInfoSource);
+
+    await currentWallet.renameWalletFiles(newName);
+
+    final newWalletInfo = currentWalletInfo;
+    newWalletInfo.id = WalletBase.idFor(newName, getType());
+    newWalletInfo.name = newName;
+
+    await walletInfoSource.put(currentWalletInfo.key, newWalletInfo);
+  }
+
+  @override
+  Future<BitcoinCashWallet>
+  restoreFromKeys(credentials) {
+    // TODO: implement restoreFromKeys
+    throw UnimplementedError('restoreFromKeys() is not implemented');
+  }
+
+  @override
+  Future<BitcoinCashWallet> restoreFromSeed(
+      BitcoinCashRestoreWalletFromSeedCredentials credentials) async {
+    if (!validateMnemonic(credentials.mnemonic)) {
+      throw BitcoinCashMnemonicIsIncorrectException();
+    }
+
+    final wallet = await BitcoinCashWalletBase.create(
+        password: credentials.password!,
+        mnemonic: credentials.mnemonic,
+        walletInfo: credentials.walletInfo!,
+        unspentCoinsInfo: unspentCoinsInfoSource);
+    await wallet.save();
+    await wallet.init();
+    return wallet;
+  }
+}

cw_bitcoin_cash/lib/src/exceptions/bitcoin_cash_mnemonic_is_incorrect_exception.dart

@@ -0,0 +1,5 @@
+class BitcoinCashMnemonicIsIncorrectException implements Exception {
+  @override
+  String toString() =>
+      'Bitcoin Cash mnemonic has incorrect format. Mnemonic should contain 12 or 24 words separated by space.';
+}

cw_bitcoin_cash/lib/src/exceptions/exceptions.dart

@@ -0,0 +1 @@
+export 'bitcoin_cash_mnemonic_is_incorrect_exception.dart';

cw_bitcoin_cash/lib/src/mnemonic.dart

@@ -0,0 +1,11 @@
+import 'dart:typed_data';
+
+import 'package:bip39/bip39.dart' as bip39;
+
+class Mnemonic {
+  /// Generate bip39 mnemonic
+  static String generate({int strength = 128}) => bip39.generateMnemonic(strength: strength);
+
+  /// Create root seed from mnemonic
+  static Uint8List toSeed(String mnemonic) => bip39.mnemonicToSeed(mnemonic);
+}

cw_bitcoin_cash/lib/src/pending_bitcoin_cash_transaction.dart

@@ -0,0 +1,62 @@
+import 'package:cw_bitcoin/bitcoin_commit_transaction_exception.dart';
+import 'package:bitbox/bitbox.dart' as bitbox;
+import 'package:cw_core/pending_transaction.dart';
+import 'package:cw_bitcoin/electrum.dart';
+import 'package:cw_bitcoin/bitcoin_amount_format.dart';
+import 'package:cw_bitcoin/electrum_transaction_info.dart';
+import 'package:cw_core/transaction_direction.dart';
+import 'package:cw_core/wallet_type.dart';
+
+class PendingBitcoinCashTransaction with PendingTransaction {
+  PendingBitcoinCashTransaction(this._tx, this.type,
+      {required this.electrumClient,
+      required this.amount,
+      required this.fee})
+      : _listeners = <void Function(ElectrumTransactionInfo transaction)>[];
+
+  final WalletType type;
+  final bitbox.Transaction _tx;
+  final ElectrumClient electrumClient;
+  final int amount;
+  final int fee;
+
+  @override
+  String get id => _tx.getId();
+
+  @override
+  String get hex => _tx.toHex();
+
+  @override
+  String get amountFormatted => bitcoinAmountToString(amount: amount);
+
+  @override
+  String get feeFormatted => bitcoinAmountToString(amount: fee);
+
+  final List<void Function(ElectrumTransactionInfo transaction)> _listeners;
+
+  @override
+  Future<void> commit() async {
+    final result =
+      await electrumClient.broadcastTransaction(transactionRaw: _tx.toHex());
+
+    if (result.isEmpty) {
+      throw BitcoinCommitTransactionException();
+    }
+
+    _listeners?.forEach((listener) => listener(transactionInfo()));
+  }
+
+  void addListener(
+          void Function(ElectrumTransactionInfo transaction) listener) =>
+      _listeners.add(listener);
+
+  ElectrumTransactionInfo transactionInfo() => ElectrumTransactionInfo(type,
+      id: id,
+      height: 0,
+      amount: amount,
+      direction: TransactionDirection.outgoing,
+      date: DateTime.now(),
+      isPending: true,
+      confirmations: 0,
+      fee: fee);
+}

cw_bitcoin_cash/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux

@@ -0,0 +1 @@
+/Users/omarhatem/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/