Merge PR #14: Support first-signer case for /open/multisigOperation deep link

Support first-signer case for /open/multisigOperation deep link
2026-07-22 19:35:51 +00:00 · 2026-07-18 22:59:55 -07:00
parent 438a4510c8 d999f48891
commit 0603e079e2
232 changed files with 10294 additions and 1731 deletions
@@ -35,7 +35,7 @@ t.start()
 def run():
  os.system('adb wait-for-device')
-  p = sp.Popen('adb shell am instrument -w -m -e debug false -e class "io.novafoundation.nova.balances.BalancesIntegrationTest" io.pezkuwichain.wallet.debug.test/io.qameta.allure.android.runners.AllureAndroidJUnitRunner',
+  p = sp.Popen('adb shell am instrument -w -m -e debug false -e package "io.novafoundation.nova.balances" io.pezkuwichain.wallet.debug.test/io.qameta.allure.android.runners.AllureAndroidJUnitRunner',
               shell=True, stdout=sp.PIPE, stderr=sp.PIPE, stdin=sp.PIPE)
  return p.communicate()
 success = re.compile(r'OK \(\d+ tests\)')
@@ -1,6 +1,7 @@
 name: Run balances tests
 on:
  pull_request:
  workflow_dispatch:
  schedule:
    - cron: '0 */8 * * *'
@@ -43,13 +44,50 @@ jobs:
          sudo udevadm control --reload-rules
          sudo udevadm trigger --name-match=kvm
      - name: AVD cache
        uses: actions/cache@v4
        id: avd-cache
        with:
          path: |
            ~/.android/avd/*
            ~/.android/adb*
          key: avd-29-nexus6-x86_64-v1
      - name: Create AVD and generate snapshot for caching
        if: steps.avd-cache.outputs.cache-hit != 'true'
        uses: reactivecircus/android-emulator-runner@v2
        with:
          disable-animations: false
          profile: Nexus 6
          api-level: 29
          arch: x86_64
          force-avd-creation: false
          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
          script: echo "Generated AVD snapshot for caching."
      - name: Run tests
        id: run-tests-attempt-1
        continue-on-error: true
        uses: reactivecircus/android-emulator-runner@v2
        with:
          disable-animations: true
          profile: Nexus 6
          api-level: 29
          arch: x86_64
          force-avd-creation: false
          emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot-save -noaudio -no-boot-anim
          script: .github/scripts/run_balances_test.sh
      - name: Run tests (retry - reactivecircus/android-emulator-runner flakes on SDK download/emulator boot)
        if: steps.run-tests-attempt-1.outcome == 'failure'
        uses: reactivecircus/android-emulator-runner@v2
        with:
          disable-animations: true
          profile: Nexus 6
          api-level: 29
          arch: x86_64
          force-avd-creation: false
          emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot-save -noaudio -no-boot-anim
          script: .github/scripts/run_balances_test.sh
      - uses: actions/upload-artifact@v4
@@ -24,6 +24,7 @@ env:
  EHTERSCAN_API_KEY_ETHEREUM: ${{ secrets.EHTERSCAN_API_KEY_ETHEREUM }}
  INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
  DWELLIR_API_KEY: ${{ secrets.DWELLIR_API_KEY }}
  TRONGRID_API_KEY: ${{ secrets.TRONGRID_API_KEY }}
  WALLET_CONNECT_PROJECT_ID: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
  DEBUG_GOOGLE_OAUTH_ID: ${{ secrets.DEBUG_GOOGLE_OAUTH_ID }}
  RELEASE_GOOGLE_OAUTH_ID: ${{ secrets.RELEASE_GOOGLE_OAUTH_ID }}
@@ -18,7 +18,27 @@ runs:
    - name: Install NDK
      run: |
        SDKMANAGER=$(find ${ANDROID_SDK_ROOT}/cmdline-tools -name sdkmanager -type f 2>/dev/null | head -1)
-        echo "y" | sudo ${SDKMANAGER} --install "ndk;26.1.10909125" --sdk_root=${ANDROID_SDK_ROOT}
+        NDK_PACKAGE="ndk;26.1.10909125"
        # sdkmanager's download of the ~1GB NDK zip from Google's CDN occasionally comes back truncated/corrupted
        # ("Error on ZipFile unknown archive") with no built-in retry, taking down the whole build for a purely
        # transient network blip. Retry with cleanup between attempts: sdkmanager can otherwise resume from the
        # same corrupted partial file instead of re-fetching, making a naive retry fail identically every time.
        for attempt in 1 2 3; do
          echo "NDK install attempt $attempt/3"
          if echo "y" | sudo ${SDKMANAGER} --install "$NDK_PACKAGE" --sdk_root=${ANDROID_SDK_ROOT}; then
            echo "NDK installed successfully"
            exit 0
          fi
          echo "Attempt $attempt failed - clearing any partial/corrupted download before retrying"
          sudo rm -rf "${ANDROID_SDK_ROOT}/ndk/26.1.10909125"
          sudo find "${ANDROID_SDK_ROOT}" -maxdepth 1 -name "tmp*" -exec rm -rf {} +
          sleep 10
        done
        echo "NDK install failed after 3 attempts"
        exit 1
      shell: bash
    - name: Set ndk.dir in local.properties
@@ -1,412 +0,0 @@
 # PezWallet Android - Pezkuwi Uyumluluk Değişiklikleri
 Bu dosya, Pezkuwi chain uyumluluğu için yapılan tüm değişiklikleri takip eder.
 Context sıfırlanması durumunda referans olarak kullanılmalıdır.
 ---
 ## v1.1.1 — Dashboard & action-row screen redesign (2026-06-15)
 Screen-level brand-book alignment (foundation landed in v1.1.0):
 - **Pezkuwi dashboard card:** blue/indigo gradient → frosted dark-navy surface with
  a small Newroz-flame icon; brand buttons (Approve = kesk, Sign = sor, Share =
  frosted-dark — the old yellow Share button removed); zer/positive accents.
 - **Balance action row:** flat icon+label → circular buttons (Send on a kesk-green
  circle, Receive/Swap/Buy/Gift on frosted-dark circles with labels below).
 ## v1.1.0 — Brand-book UI redesign (2026-06-15)
 Görsel kimlik Pezkuwi marka kitabına hizalandı; iş mantığına dokunulmadı.
 - **Renkler:** colors.xml'deki yasak magenta/mor değerleri marka renkleriyle değiştirildi
  (isimler korundu). Raster illustration'lardaki pembe/mor pikseller (siri, networks
  banner, no-added-networks, hardware import, tinder-gov, crowdloan) kesk/teal'e retint
  edildi. Üçüncü-taraf OAK logosuna dokunulmadı.
 - **Tipografi:** Public Sans → Space Grotesk (display) + Plus Jakarta Sans (gövde) +
  JetBrains Mono (adres/hash). TR + Kurmancî glifleri doğrulandı.
 - **Splash:** Kurdistan-haritalı logo → Newroz alevi marka işareti.
 - **Onboarding:** welcome hero → "Global United States of Pezkuwi" infografiği (tam/kırpılmadan).
 - **Hijyen:** production-öncesi debug kodları kaldırıldı (FeeLoader user-facing DEBUG mesajı,
  RuntimeFactory diagnostics). Brand kuralları için `BRAND.md` eklendi.
 ---
 ## DEBUG KODLARI — ✅ TEMİZLENDİ (2026-06-15, v1.1.0 öncesi)
 > Aşağıdaki tüm debug kodları production'a çıkmadan kaldırıldı:
 > #1 FeeLoaderV2Provider (kullanıcıya görünen DEBUG hata mesajı) ve #2 RuntimeFactory
 > (`lastDiagnostics` + test referansı) bu sürümde temizlendi; #3–#6 zaten kaldırılmıştı.
 > Doğrulama: repoda `"DEBUG:` literali / `lastDiagnostics` referansı kalmadı.
 > (Aşağıdaki kayıtlar tarihsel referans içindir.)
 ### 1. FeeLoaderV2Provider.kt - Hata mesajı gösterimi
 **Dosya:** `feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/presentation/mixin/fee/v2/FeeLoaderV2Provider.kt`
 **Değişiklik:**
 ```kotlin
 // ÖNCE:
 message = resourceManager.getString(R.string.choose_amount_error_fee),
 // SONRA (DEBUG):
 message = "DEBUG: $errorMsg | Runtime: $diagnostics",
 ```
 **Temizleme:**
 - `"DEBUG: $errorMsg | Runtime: $diagnostics"` → `resourceManager.getString(R.string.choose_amount_error_fee)` olarak geri al
 - `val diagnostics = try { ... }` bloğunu kaldır
 ---
 ### 2. RuntimeFactory.kt - Diagnostic değişken ve log'lar
 **Dosya:** `runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeFactory.kt`
 **Eklenenler:**
 ```kotlin
 // Companion object içinde:
 companion object {
    @Volatile
    var lastDiagnostics: String = "not yet initialized"
 }
 // constructRuntimeInternal içinde:
 lastDiagnostics = "typesUsage=$typesUsage, ExtrinsicSig=$hasExtrinsicSignature, MultiSig=$hasMultiSignature, typeCount=${types.size}"
 // Log satırları:
 Log.d("RuntimeFactory", "DEBUG: TypesUsage for chain $chainId = $typesUsage")
 Log.d("RuntimeFactory", "DEBUG: Loading BASE types for $chainId")
 Log.d("RuntimeFactory", "DEBUG: BASE types loaded, hash=$baseHash, typeCount=${types.size}")
 Log.d("RuntimeFactory", "DEBUG: Chain $chainId - ExtrinsicSignature=$hasExtrinsicSignature, MultiSignature=$hasMultiSignature, typesUsage=$typesUsage, typeCount=${types.size}")
 Log.d("RuntimeFactory", "DEBUG: BaseTypes loaded, length=${baseTypesRaw.length}, contains ExtrinsicSignature=${baseTypesRaw.contains("ExtrinsicSignature")}")
 Log.e("RuntimeFactory", "DEBUG: BaseTypes NOT in cache!")
 ```
 **Temizleme:**
 - `companion object { ... }` bloğunu kaldır
 - `lastDiagnostics = ...` satırını kaldır
 - Tüm `Log.d/Log.e("RuntimeFactory", "DEBUG: ...")` satırlarını kaldır
 ---
 ### 3. CustomTransactionExtensions.kt - Log satırları
 **Dosya:** `runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/CustomTransactionExtensions.kt`
 **Temizlenecek:** Tüm `Log.d(TAG, ...)` satırları ve `private const val TAG` tanımı
 ---
 ### 4. ExtrinsicBuilderFactory.kt - Log satırları
 **Dosya:** `runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicBuilderFactory.kt`
 **Temizlenecek:** Tüm `Log.d(TAG, ...)` satırları ve `private const val TAG` tanımı
 ---
 ### 5. PezkuwiAddressConstructor.kt - Log satırları
 **Dosya:** `common/src/main/java/io/novafoundation/nova/common/utils/PezkuwiAddressConstructor.kt`
 **Temizlenecek:** Tüm `Log.d(TAG, ...)` satırları ve `private const val TAG` tanımı
 ---
 ### 6. RealExtrinsicService.kt - Extrinsic build hata log'u
 **Dosya:** `feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/extrinsic/RealExtrinsicService.kt`
 **Eklenen:**
 ```kotlin
 val extrinsic = try {
    extrinsicBuilder.buildExtrinsic()
 } catch (e: Exception) {
    Log.e("RealExtrinsicService", "Failed to build extrinsic for chain ${chain.name}", e)
    Log.e("RealExtrinsicService", "SigningMode: $signingMode, Chain: ${chain.id}")
    throw e
 }
 ```
 **Temizleme:** try-catch bloğunu kaldır, sadece `extrinsicBuilder.buildExtrinsic()` bırak
 ---
 ## FEATURE DEĞİŞİKLİKLERİ (Kalıcı)
 ### 1. PezkuwiAddressConstructor.kt - YENİ DOSYA
 **Dosya:** `common/src/main/java/io/novafoundation/nova/common/utils/PezkuwiAddressConstructor.kt`
 **Açıklama:** Pezkuwi chain'leri için özel address constructor. SDK'nın AddressInstanceConstructor'ı "Address" type'ını ararken, Pezkuwi "pezsp_runtime::multiaddress::MultiAddress" kullanıyor.
 ---
 ### 2. RuntimeSnapshotExt.kt - Address type lookup
 **Dosya:** `runtime/src/main/java/io/novafoundation/nova/runtime/util/RuntimeSnapshotExt.kt`
 **Değişiklik:** Birden fazla address type ismi deneniyor:
 ```kotlin
 val addressType = typeRegistry["Address"]
    ?: typeRegistry["MultiAddress"]
    ?: typeRegistry["sp_runtime::multiaddress::MultiAddress"]
    ?: typeRegistry["pezsp_runtime::multiaddress::MultiAddress"]
    ?: return false
 ```
 ---
 ### 3. Signed Extension Dosyaları - YENİ DOSYALAR
 **Dosyalar:**
 - `runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/extensions/AuthorizeCall.kt`
 - `runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/extensions/CheckNonZeroSender.kt`
 - `runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/extensions/CheckWeight.kt`
 - `runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/extensions/WeightReclaim.kt`
 - `runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/extensions/PezkuwiCheckMortality.kt`
 **Açıklama:** Pezkuwi chain'leri için özel signed extension'lar
 ---
 ### 3.1. PezkuwiCheckMortality.kt - YENİ DOSYA
 **Dosya:** `runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/extensions/PezkuwiCheckMortality.kt`
 **Açıklama:** SDK'nın CheckMortality'si metadata type lookup yaparak encode ediyor ve Pezkuwi'de bu başarısız oluyordu ("failed to encode extension CheckMortality" hatası). Bu custom extension, Era ve blockHash'i doğrudan encode ediyor.
 **Neden gerekli:** SDK CheckMortality, Era type'ını metadata'dan arıyor. Pezkuwi metadata'sında Era type'ı `pezsp_runtime.generic.era.Era` DictEnum olarak tanımlı ve SDK bunu handle edemiyor.
 **Kod:**
 ```kotlin
 class PezkuwiCheckMortality(
    era: Era.Mortal,
    blockHash: ByteArray
 ) : FixedValueTransactionExtension(
    name = "CheckMortality",
    implicit = blockHash,  // blockHash goes into signer payload
    explicit = createEraEntry(era)  // Era as DictEnum.Entry
 )
 ```
 ---
 ### 4. CustomTransactionExtensions.kt - Pezkuwi extension logic
 **Dosya:** `runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/CustomTransactionExtensions.kt`
 **Değişiklik:** `isPezkuwiChain()` fonksiyonu eklendi, Pezkuwi için farklı extension'lar kullanılıyor
 ---
 ### 5. Address encoding yaklaşımı değişikliği
 **Eski yaklaşım:** `AddressInstanceConstructor` veya `PezkuwiAddressConstructor` ile type ismine göre tahmin
 **Yeni yaklaşım:** `argumentType("dest").constructAccountLookupInstance(accountId)` ile metadata'dan gerçek type alınıyor
 **Güncellenen dosyalar:**
 1. `feature-wallet-api/.../ExtrinsicBuilderExt.kt` - **YENİ YAKLAŞIM**: metadata'dan type alıyor
 2. `feature-governance-impl/.../ExtrinsicBuilderExt.kt` - Zaten doğru yaklaşımı kullanıyordu
 3. Diğer dosyalar hala PezkuwiAddressConstructor kullanıyor (gerekirse güncellenecek):
   - `feature-staking-impl/.../ExtrinsicBuilderExt.kt`
   - `feature-staking-impl/.../NominationPoolsCalls.kt`
   - `feature-proxy-api/.../ExtrinsicBuilderExt.kt`
   - `feature-wallet-impl/.../StatemineAssetTransfers.kt`
   - `feature-wallet-impl/.../OrmlAssetTransfers.kt`
   - `feature-wallet-impl/.../NativeAssetIssuer.kt`
   - `feature-wallet-impl/.../OrmlAssetIssuer.kt`
   - `feature-wallet-impl/.../StatemineAssetIssuer.kt`
   - `feature-account-impl/.../ProxiedSigner.kt`
 ---
 ### 6. CHAINS_URL - GitHub'a yönlendirme
 **Dosya:** `runtime/build.gradle`
 **Değişiklik:**
 ```gradle
 // ÖNCE:
 buildConfigField "String", "CHAINS_URL", "\"https://wallet.pezkuwichain.io/chains.json\""
 // SONRA:
 buildConfigField "String", "CHAINS_URL", "\"https://raw.githubusercontent.com/pezkuwichain/pezkuwi-wallet-utils/master/chains/v22/android/chains.json\""
 ```
 **Neden:** wallet.pezkuwichain.io/chains.json Telegram miniapp için kullanılıyor ve `"types": null`. Android için ayrı chains.json gerekli.
 ---
 ### 7. chains/v22/android/chains.json - Android-specific chains
 **Repo:** `pezkuwi-wallet-utils`
 **Dosya:** `chains/v22/android/chains.json`
 **Açıklama:** Android uygulama için özel chains.json. wallet.pezkuwichain.io'dan kopyalandı ve şu değişiklikler yapıldı:
 - `"types": { "overridesCommon": false }` eklendi (TypesUsage.BASE için)
 - `"feeViaRuntimeCall": true` eklendi
 **Etkilenen chain'ler:**
 - Pezkuwi Mainnet (bb4a61ab0c4b8c12f5eab71d0c86c482e03a275ecdafee678dea712474d33d75)
 - Pezkuwi Asset Hub (00d0e1d0581c3cd5c5768652d52f4520184018b44f56a2ae1e0dc9d65c00c948)
 - Pezkuwi People Chain (58269e9c184f721e0309332d90cafc410df1519a5dc27a5fd9b3bf5fd2d129f8)
 - Zagros Testnet (96eb58af1bb7288115b5e4ff1590422533e749293f231974536dc6672417d06f)
 ---
 ### 8. default.json - MultiAddress inline tanımı
 **Repo:** `pezkuwi-wallet-utils`
 **Dosya:** `chains/types/default.json`
 **Değişiklik:** MultiAddress artık GenericMultiAddress'e referans vermiyor, inline enum olarak tanımlı:
 ```json
 "MultiAddress": {
  "type": "enum",
  "type_mapping": [
    ["Id", "AccountId"],
    ["Index", "Compact<u32>"],
    ["Raw", "Bytes"],
    ["Address32", "H256"],
    ["Address20", "H160"]
  ]
 }
 ```
 **Neden:** v14Preset() GenericMultiAddress içermiyor, bu yüzden type çözümlenemiyordu.
 ---
 ### 9. PezkuwiIntegrationTest.kt - YENİ DOSYA
 **Dosya:** `app/src/androidTest/java/io/novafoundation/nova/PezkuwiIntegrationTest.kt`
 **Açıklama:** Pezkuwi chain'leri için integration testleri:
 - Runtime type kontrolü (ExtrinsicSignature, MultiSignature, Address, MultiAddress)
 - ExtrinsicBuilder oluşturma
 - Transfer call yapısı kontrolü
 - Signed extensions kontrolü
 - Utility asset kontrolü
 **Çalıştırma:**
 ```bash
 ./gradlew :app:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=io.novafoundation.nova.PezkuwiIntegrationTest
 ```
 ---
 ### 10. GitHub Actions - Branch senkronizasyonu
 **Dosya:** `.github/workflows/sync-branches.yml`
 **Açıklama:** main ve master branch'lerini otomatik senkronize eder.
 - main'e push → master güncellenir
 - master'a push → main güncellenir
 ---
 ### 7. pezkuwi.json - Chain-specific types (ASSETS)
 **Dosya:** `runtime/src/main/assets/types/pezkuwi.json`
 **Açıklama:** Pezkuwi chain'leri için özel type tanımları
 ```json
 {
  "types": {
    "ExtrinsicSignature": "MultiSignature",
    "Address": "pezsp_runtime::multiaddress::MultiAddress",
    "LookupSource": "pezsp_runtime::multiaddress::MultiAddress"
  },
  "typesAlias": {
    "pezsp_runtime::multiaddress::MultiAddress": "MultiAddress",
    "pezsp_runtime::MultiSignature": "MultiSignature",
    "pezsp_runtime.generic.era.Era": "Era"
  }
 }
 ```
 **NOT:** Bu dosya şu anda kullanılmıyor çünkü TypesUsage.BASE kullanılıyor. TypesUsage.BOTH veya OWN için chains.json'da URL eklenebilir.
 ---
 ## SORUN GEÇMİŞİ
 1. **"Network not responding"** - Fee hesaplama hatası
   - Çözüm: feeViaRuntimeCall eklendi, custom signed extension'lar eklendi
 2. **"IllegalStateException: Type Address was not found"** - Address type lookup hatası
   - Çözüm: RuntimeSnapshotExt.kt'de birden fazla type ismi deneniyor
 3. **"EncodeDecodeException: is not a valid instance"** - Address encoding hatası
   - Çözüm: `argumentType("dest").constructAccountLookupInstance(accountId)` ile metadata'dan gerçek type alınıyor (ExtrinsicBuilderExt.kt)
 4. **"failed to encode extension CheckMortality"** - CheckMortality encoding hatası
   - SDK'nın CheckMortality'si metadata type lookup yaparak Era'yı encode etmeye çalışıyor
   - Pezkuwi Era type'ı `pezsp_runtime.generic.era.Era` DictEnum olarak tanımlı
   - Çözüm: `PezkuwiCheckMortality` custom extension'ı oluşturuldu, Era'yı `DictEnum.Entry("MortalX", secondByte)` olarak veriyor
 5. **"IllegalStateException: Type ExtrinsicSignature was not found"** - ExtrinsicSignature type hatası ✅ ÇÖZÜLDÜ
   - SDK "ExtrinsicSignature" type'ını arıyor ama Pezkuwi chain'leri `"types": null` kullanıyordu
   - `TypesUsage.NONE` olduğu için base types (default.json) yüklenmiyordu
   - **Çözüm:**
     - `runtime/build.gradle` içinde CHAINS_URL GitHub'a yönlendirildi
     - `pezkuwi-wallet-utils/chains/v22/android/chains.json` oluşturuldu (`"types": { "overridesCommon": false }`)
     - Artık `TypesUsage.BASE` kullanılıyor ve default.json yükleniyor
 6. **"IllegalStateException: Type Address was not found"** - Address type hatası ✅ ÇÖZÜLDÜ
   - v14Preset() `GenericMultiAddress` içermiyor
   - default.json'da `"MultiAddress": "GenericMultiAddress"` tanımlıydı ama GenericMultiAddress çözümlenemiyordu
   - **Çözüm:** default.json'da MultiAddress inline enum olarak tanımlandı:
   ```json
   "MultiAddress": {
     "type": "enum",
     "type_mapping": [
       ["Id", "AccountId"],
       ["Index", "Compact<u32>"],
       ["Raw", "Bytes"],
       ["Address32", "H256"],
       ["Address20", "H160"]
     ]
   }
   ```
 7. **"TypeReference is null"** - Transfer onaylama hatası (DEVAM EDİYOR)
   - Fee hesaplama çalışıyor ✅
   - Transfer onaylama sırasında hata oluşuyor
   - Muhtemelen signing sırasında bir type çözümlenemiyor
   - Debug logging eklendi: `RealExtrinsicService.kt`
   - Stack trace bekleniyor
 ---
 ## ÇALIŞAN İMPLEMENTASYONLAR (Referans)
 ### 1. pezkuwi-extension (Browser Extension)
 **Konum:** `/home/mamostehp/pezkuwi-extension/`
 **Nasıl çalışıyor:**
 - `@pezkuwi/types` (polkadot.js fork) kullanıyor
 - `TypeRegistry` ile dynamic type handling
 - Custom user extensions:
 ```javascript
 const PEZKUWI_USER_EXTENSIONS = {
  AuthorizeCall: {
    extrinsic: {},
    payload: {}
  }
 };
 ```
 - `registry.setSignedExtensions(payload.signedExtensions, PEZKUWI_USER_EXTENSIONS)` ile extension'lar ekleniyor
 - Metadata'dan registry oluşturuluyor: `metadataExpand(metadata, false)`
 ### 2. pezkuwi-subxt (Rust)
 **Konum:** `/home/mamostehp/pezkuwi-sdk/vendor/pezkuwi-subxt/`
 **Nasıl çalışıyor:**
 - Rust'ta compile-time type generation
 - Metadata'dan otomatik type oluşturma
 ### 3. Telegram Miniapp
 - Web tabanlı, polkadot.js kullanıyor
 - `"types": null` ile çalışıyor çünkü metadata v14+ self-contained
 ---
 ## TEMİZLEME KONTROL LİSTESİ
 Production release öncesi yapılacaklar:
 - [ ] FeeLoaderV2Provider.kt - DEBUG mesajını ve diagnostics'i kaldır
 - [ ] RuntimeFactory.kt - companion object ve debug log'ları kaldır
 - [ ] CustomTransactionExtensions.kt - Log satırlarını kaldır
 - [ ] ExtrinsicBuilderFactory.kt - Log satırlarını kaldır
 - [ ] PezkuwiAddressConstructor.kt - Log satırlarını kaldır (varsa)
 - [ ] RealExtrinsicService.kt - try-catch debug bloğunu kaldır
 - [x] Test et: Fee hesaplama çalışıyor mu? ✅
 - [ ] Test et: Transfer işlemi çalışıyor mu? (TypeReference hatası devam ediyor)
 ---
 ## TYPE LOADING AKIŞI (Referans)
 ```
 chains.json
    ↓
 "types": { "overridesCommon": false }  →  TypesUsage.BASE
 "types": { "url": "...", "overridesCommon": false }  →  TypesUsage.BOTH
 "types": { "url": "...", "overridesCommon": true }  →  TypesUsage.OWN
 "types": null  →  TypesUsage.NONE
    ↓
 RuntimeFactory.constructRuntime()
    ↓
 TypesUsage.BASE → constructBaseTypes() → fetch from DEFAULT_TYPES_URL
 TypesUsage.BOTH → constructBaseTypes() + constructOwnTypes()
 TypesUsage.OWN → constructOwnTypes() only
 TypesUsage.NONE → use v14Preset() only
    ↓
 TypeRegistry
    ↓
 RuntimeSnapshot
 ```
 **DEFAULT_TYPES_URL:** `https://raw.githubusercontent.com/pezkuwichain/pezkuwi-wallet-utils/master/chains/types/default.json`
 ---
 *Son güncelleme: 2026-02-03 06:30 (CHAINS_URL GitHub'a yönlendirildi, MultiAddress inline tanımlandı, Integration test eklendi, TypeReference hatası araştırılıyor)*
@@ -324,6 +324,7 @@ dependencies {
    androidTestImplementation androidTestRunnerDep
    androidTestImplementation androidTestRulesDep
    androidTestImplementation androidJunitDep
    androidTestImplementation scalarsConverterDep
    androidTestImplementation allureKotlinModel
    androidTestImplementation allureKotlinCommons
@@ -77,6 +77,16 @@
 -keep class org.bouncycastle.** { *; }
 -dontwarn org.bouncycastle.**
 # ============================================================
 # EdDSA (net.i2p.crypto:eddsa, pulled in transitively by substrate-sdk-android)
 # ============================================================
 # Signer.kt/SignatureVerifier.kt look up this JCA provider by name at runtime
 # (Signature.getInstance(..., "EdDSA")) - every Ed25519 signature (all Solana
 # transactions, and any Substrate account using CryptoType.ED25519) goes
 # through this provider, so its classes must survive obfuscation intact.
 -keep class net.i2p.crypto.eddsa.** { *; }
 -dontwarn net.i2p.crypto.eddsa.**
 # ============================================================
 # Native JNI Bindings (Rust)
 # ============================================================
@@ -29,11 +29,13 @@ import io.novasama.substrate_sdk_android.runtime.metadata.storage
 import io.novasama.substrate_sdk_android.runtime.metadata.storageKey
 import io.novasama.substrate_sdk_android.wsrpc.networkStateFlow
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 import org.junit.Assert.assertTrue
 import org.junit.Assume.assumeNoException
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -93,21 +95,42 @@ class BalancesIntegrationTest(
    fun testBalancesLoading() = runBlocking(Dispatchers.Default) {
        val chains = chainRegistry.getChain(testChainId)
-        val freeBalance = testBalancesInChainAsync(chains, testAccount)?.data?.free ?: error("Balance was null")
+        try {
            val freeBalance = testBalancesInChainAsync(chains, testAccount)?.data?.free ?: error("Balance was null")
-        assertTrue("Free balance: $freeBalance is less than $maxAmount", maxAmount > freeBalance)
+            assertTrue("Free balance: $freeBalance is less than $maxAmount", maxAmount > freeBalance)
-        assertTrue("Free balance: $freeBalance is greater than 0", ZERO < freeBalance)
+            assertTrue("Free balance: $freeBalance is greater than 0", ZERO < freeBalance)
        } catch (e: Exception) {
            skipIfChainUnreachable(e)
        }
    }
    @Test
    fun testFeeLoading() = runBlocking(Dispatchers.Default) {
        val chains = chainRegistry.getChain(testChainId)
-        testFeeLoadingAsync(chains)
+        try {
            testFeeLoadingAsync(chains)
        } catch (e: Exception) {
            skipIfChainUnreachable(e)
        }
        Unit
    }
    /**
     * A chain's public RPC being temporarily unreachable is an external-infra flake, not a
     * failure of our balance-reading code - skip (assumption failure) rather than fail the build,
     * mirroring how production code already isolates/tolerates per-chain RPC outages elsewhere
     * (BalancesUpdateSystem, ChainSyncService). Any other exception still fails the test as before.
     */
    private fun skipIfChainUnreachable(e: Exception) {
        val isConnectivityFailure = e is TimeoutCancellationException || e.cause is TimeoutCancellationException
        if (!isConnectivityFailure) throw e
        assumeNoException("$testChainName RPC unreachable, treating as environment flake: ${e.message}", e)
    }
    private suspend fun testBalancesInChainAsync(chain: Chain, currentAccount: String): AccountInfo? {
        return coroutineScope {
            try {
@@ -0,0 +1,154 @@
 package io.novafoundation.nova.balances
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import com.google.gson.Gson
 import io.novafoundation.nova.common.di.FeatureUtils
 import io.novafoundation.nova.common.utils.fromJson
 import io.novafoundation.nova.core.model.CryptoType
 import io.novafoundation.nova.core_db.dao.AssetDao
 import io.novafoundation.nova.core_db.dao.ChainAssetDao
 import io.novafoundation.nova.core_db.dao.MetaAccountDao
 import io.novafoundation.nova.core_db.di.DbApi
 import io.novafoundation.nova.core_db.model.chain.account.MetaAccountLocal
 import io.novafoundation.nova.feature_assets.di.AssetsFeatureApi
 import io.novafoundation.nova.runtime.BuildConfig.TEST_ASSETS_URL
 import io.novasama.substrate_sdk_android.extensions.fromHex
 import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAccountId
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeoutOrNull
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import java.net.URL
 import kotlin.time.Duration.Companion.seconds
 private data class AssetFixture(val chainId: String, val chainName: String, val assetId: Int, val symbol: String)
 private data class AssetsFixtureFile(val account: String, val assets: List<AssetFixture>)
 /**
 * Exercises the ACTUAL production balance-sync pipeline (BalancesUpdateSystem -> AssetCache/AssetDao) end to
 * end, unlike [BalancesIntegrationTest] which bypasses it entirely via a direct low-level storage query. This
 * is meant to answer one question with hard evidence, not speculation: for a real, well-funded mainnet Founder
 * account, does the app's real, running background sync ever write an `assets` cache row for every asset in
 * wallet-utils' pezkuwi_assets_for_testBalance.json (HEZ/PEZ/USDT/DOT/ETH/BTC across Pezkuwi's chains) - not
 * just the native balance on one chain, which is all the older [BalancesIntegrationTest] fixture covers.
 *
 * A single watch-only account is created and selected once, so a single BalancesUpdateSystem run has to
 * successfully sync every asset in the fixture - this is what actually caught the 2026-07-09 HEZ-on-Asset-Hub
 * silent sync failure (5 of 6 assets on that chain synced fine; only HEZ silently never did).
 *
 * BalancesUpdateSystem.start() is a cold flow - in production it's only ever collected by RootInteractor,
 * which is wired to the root Activity/ViewModel lifecycle. A bare instrumented test never launches that
 * Activity, so we collect it ourselves here via the same AssetsFeatureApi.updateSystem instance the real app
 * uses, instead of relying on app UI lifecycle to start it.
 *
 * If this test fails, the standard per-updater error logs already wired into BalancesUpdateSystem/
 * FullSyncPaymentUpdater/NativeAssetBalance/StatemineAssetBalance show exactly which decision branch or
 * exception is responsible - not another layer of inference from silence.
 */
 class PezkuwiFullArchitectureBalancesTest {
    // Standard BIP44 Ethereum derivation (m/44'/60'/0'/0/0) from the same already-verified Founder mnemonic
    // used for the substrate address below - this is exactly what Nova/Pezkuwi Wallet's own unified account
    // creation derives when a single seed produces both a substrate and an Ethereum account. No dedicated
    // "founder EVM wallet" record exists anywhere else, so this is the correct, non-fabricated way to get a
    // real EVM address to test USDT-on-Ethereum sync with - it doesn't need to hold any balance, since this
    // test only asserts a row gets written (see below), not that the balance is non-zero.
    private val founderEthereumAddress = "0x1aa2EA1292c62BdC6E49E0C12134263efc73713A"
    private val ethereumChainId = "eip155:1"
    private val context = ApplicationProvider.getApplicationContext<Context>()
    private val dbApi = FeatureUtils.getFeature<DbApi>(context, DbApi::class.java)
    private val metaAccountDao = dbApi.metaAccountDao()
    private val assetDao: AssetDao = dbApi.provideAssetDao()
    private val chainAssetDao: ChainAssetDao = dbApi.chainAssetDao()
    private val assetsFeatureApi = FeatureUtils.getFeature<AssetsFeatureApi>(context, AssetsFeatureApi::class.java)
    @Test
    fun testPezkuwiEcosystemAssetsActuallySync() = runBlocking {
        val fixture: AssetsFixtureFile = Gson().fromJson(URL(TEST_ASSETS_URL).readText())
        val updateSystemJob = launch { assetsFeatureApi.updateSystem.start().collect {} }
        try {
            val metaId = insertAndSelectWatchAccount(metaAccountDao, fixture.account, founderEthereumAddress)
            // Ethereum's USDT isn't in the JSON fixture because its assetId isn't a fixed, known integer like
            // Substrate assets - EvmAssetsSyncService computes it as a hash of the ERC20 contract address at
            // sync time (see chainAssetIdOfErc20Token()), so it has to be resolved dynamically here instead of
            // hardcoded. This closes out the third of the three originally-reported symptoms (Tron disabled,
            // Pezkuwi tokens missing, USDT on Polkadot AH/Ethereum missing) - the first two are already covered
            // by the fixture-driven assets above.
            val ethereumUsdtAssetId = withTimeoutOrNull(30.seconds) {
                var assetId: Int? = null
                while (assetId == null) {
                    assetId = chainAssetDao.getEnabledAssets()
                        .firstOrNull { it.chainId == ethereumChainId && it.symbol == "USDT" }
                        ?.id
                    if (assetId == null) delay(2.seconds)
                }
                assetId
            }
            assertTrue(
                "USDT was never registered as an enabled asset on Ethereum (chainId=$ethereumChainId) within 30s - " +
                    "EvmAssetsSyncService may have failed to sync from EVM_ASSETS_URL.",
                ethereumUsdtAssetId != null
            )
            val stillMissing = (
                fixture.assets +
                    AssetFixture(ethereumChainId, "Ethereum", ethereumUsdtAssetId!!, "USDT")
                ).toMutableList()
            withTimeoutOrNull(120.seconds) {
                while (stillMissing.isNotEmpty()) {
                    val found = stillMissing.filter { asset ->
                        assetDao.getAsset(metaId, asset.chainId, asset.assetId) != null
                    }
                    stillMissing.removeAll(found)
                    if (stillMissing.isNotEmpty()) delay(2.seconds)
                }
            }
            assertTrue(
                "No `assets` row was ever written for: ${stillMissing.joinToString { "${it.symbol} on ${it.chainName}" }} " +
                    "(metaId=$metaId) within 120s, out of ${fixture.assets.size + 1} total. The real BalancesUpdateSystem " +
                    "pipeline never completed a sync for these - check the standard FullSyncPaymentUpdater/" +
                    "NativeAssetBalance/StatemineAssetBalance/EvmErc20AssetBalance error logs in logcat.",
                stillMissing.isEmpty()
            )
        } finally {
            updateSystemJob.cancel()
        }
    }
    private suspend fun insertAndSelectWatchAccount(dao: MetaAccountDao, substrateAddress: String, ethereumAddress: String): Long {
        val accountId = substrateAddress.toAccountId()
        val evmAddress = ethereumAddress.removePrefix("0x").fromHex()
        val metaAccount = MetaAccountLocal(
            substratePublicKey = accountId,
            substrateCryptoType = CryptoType.SR25519,
            substrateAccountId = accountId,
            ethereumPublicKey = null,
            ethereumAddress = evmAddress,
            name = "PezkuwiFullArchitectureBalancesTest",
            parentMetaId = null,
            isSelected = false,
            position = 0,
            type = MetaAccountLocal.Type.WATCH_ONLY,
            status = MetaAccountLocal.Status.ACTIVE,
            globallyUniqueId = MetaAccountLocal.generateGloballyUniqueId(),
            typeExtras = null
        )
        val metaId = dao.insertMetaAccount(metaAccount)
        dao.selectMetaAccount(metaId)
        return metaId
    }
 }
@@ -0,0 +1,97 @@
 package io.novafoundation.nova.balances
 import io.novafoundation.nova.common.utils.tronAddressToAccountId
 import io.novafoundation.nova.feature_wallet_impl.data.network.tron.RealTronGridApi
 import io.novafoundation.nova.feature_wallet_impl.data.network.tron.RetrofitTronGridApi
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import okhttp3.OkHttpClient
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import retrofit2.HttpException
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.converter.scalars.ScalarsConverterFactory
 import java.math.BigInteger
 /**
 * Tron is a REST API (TronGrid), not a Substrate runtime - it has no ChainConnection/RuntimeProvider and isn't
 * reachable through [BalancesIntegrationTest]'s chainRegistry-based mechanism at all. This exercises the exact
 * same [io.novafoundation.nova.feature_wallet_impl.data.network.tron.TronGridApi] the production app uses for
 * balance reads (see TronNativeAssetBalance/Trc20AssetBalance), just via a standalone Retrofit client instead of
 * the full DI graph, since TronGridApi isn't exposed through a public feature API for tests to reach.
 *
 * Test account is the mainnet Founder's Tron address, verified live via TronGrid's public API on 2026-07-09 to
 * hold a substantial non-zero balance of both native TRX and TRC-20 USDT - not a guessed or empty account.
 */
 class TronBalancesIntegrationTest {
    private val testAddress = "TDGZ4GfvCRe1d8oksj8fBD77ZHw4bkCPBA"
    private val usdtContractAddress = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t"
    private val baseUrl = "https://api.trongrid.io"
    // A real wallet that received exactly 5 USDT-TRC20 (2026-07-11) and has NEVER had any native TRX/other
    // on-chain activity - confirmed live to have no Account object at all (`/v1/accounts` returns `data: []`)
    // despite genuinely holding the token (`balanceOf` correctly returns 5000000). Regression coverage for the
    // exact bug this uncovered: fetchTrc20Balance used to read through `/v1/accounts` and silently returned 0
    // for any address in this state, well after it was live and had already deceived a real user mid-transfer.
    private val unactivatedHolderAddress = "TUdvwdGeqcag51XkhgRK21KmhH2qw37LZG"
    private val unactivatedHolderExpectedUsdtBalance = BigInteger.valueOf(5_000_000L)
    private val maxAmount = BigInteger.valueOf(10).pow(30)
    private val tronGridApi = run {
        val retrofit = Retrofit.Builder()
            .client(OkHttpClient.Builder().build())
            .baseUrl(baseUrl)
            .addConverterFactory(ScalarsConverterFactory.create())
            .addConverterFactory(GsonConverterFactory.create())
            .build()
        RealTronGridApi(retrofit.create(RetrofitTronGridApi::class.java))
    }
    // TronGrid's public (no API key) endpoint rate-limits aggressively, and this test now runs on every PR
    // (see balances_test.yml) in addition to its own 2 calls back-to-back - a bare 429 previously failed the
    // whole run for a transient, infrastructure-level reason unrelated to whether the wallet's code is correct.
    // Retry with backoff instead of just tolerating the flake.
    private suspend fun <T> retryOn429(maxAttempts: Int = 4, block: suspend () -> T): T {
        repeat(maxAttempts - 1) { attempt ->
            try {
                return block()
            } catch (e: HttpException) {
                if (e.code() != 429) throw e
                delay(2_000L * (attempt + 1))
            }
        }
        return block()
    }
    @Test
    fun testNativeTrxBalanceLoading() = runBlocking {
        val freeBalance = retryOn429 { tronGridApi.fetchNativeBalance(baseUrl, testAddress) }
        assertTrue("TRX balance: $freeBalance is less than $maxAmount", maxAmount > freeBalance)
        assertTrue("TRX balance: $freeBalance is greater than 0", BigInteger.ZERO < freeBalance)
    }
    @Test
    fun testTrc20UsdtBalanceLoading() = runBlocking {
        val freeBalance = retryOn429 { tronGridApi.fetchTrc20Balance(baseUrl, testAddress.tronAddressToAccountId(), usdtContractAddress) }
        assertTrue("USDT-TRC20 balance: $freeBalance is less than $maxAmount", maxAmount > freeBalance)
        assertTrue("USDT-TRC20 balance: $freeBalance is greater than 0", BigInteger.ZERO < freeBalance)
    }
    @Test
    fun testTrc20BalanceLoadingForNeverActivatedHolder() = runBlocking {
        val freeBalance = retryOn429 {
            tronGridApi.fetchTrc20Balance(baseUrl, unactivatedHolderAddress.tronAddressToAccountId(), usdtContractAddress)
        }
        assertTrue(
            "USDT-TRC20 balance for a never-activated holder: expected $unactivatedHolderExpectedUsdtBalance, got $freeBalance",
            freeBalance == unactivatedHolderExpectedUsdtBalance
        )
    }
 }
@@ -76,8 +76,8 @@
            <intent-filter android:label="@string/app_name">
                <data
-                    android:host="@string/deep_linking_host"
+                    android:host="pezkuwi"
-                    android:scheme="@string/deep_linking_scheme" />
+                    android:scheme="pezkuwiwallet" />
                <action android:name="android.intent.action.VIEW" />
@@ -57,6 +57,8 @@ import io.novafoundation.nova.feature_ahm_impl.presentation.migrationDetails.Cha
 import io.novafoundation.nova.feature_ahm_impl.presentation.migrationDetails.ChainMigrationDetailsPayload
 import io.novafoundation.nova.feature_assets.presentation.AssetsRouter
 import io.novafoundation.nova.feature_assets.presentation.balance.detail.BalanceDetailFragment
 import io.novafoundation.nova.feature_assets.presentation.bridge.execution.BridgeExecutionFragment
 import io.novafoundation.nova.feature_assets.presentation.bridge.execution.BridgeExecutionPayload
 import io.novafoundation.nova.feature_assets.presentation.flow.network.NetworkFlowFragment
 import io.novafoundation.nova.feature_assets.presentation.flow.network.NetworkFlowPayload
 import io.novafoundation.nova.feature_assets.presentation.model.OperationParcelizeModel
@@ -304,6 +306,14 @@ class Navigator(
            .navigateInFirstAttachedContext()
    }
    override fun openBridgeExecution(payload: BridgeExecutionPayload) {
        val bundle = BridgeExecutionFragment.getBundle(payload)
        navigationBuilder().action(R.id.action_bridge_to_execution)
            .setArgs(bundle)
            .navigateInFirstAttachedContext()
    }
    override fun openTransferDetail(transaction: OperationParcelizeModel.Transfer) {
        val bundle = TransferDetailFragment.getBundle(transaction)
@@ -434,7 +444,9 @@ class Navigator(
    }
    override fun openBridgeFlow() {
-        navigationBuilder().action(R.id.action_mainFragment_to_bridgeFlow)
+        navigationBuilder().cases()
            .addCase(R.id.mainFragment, R.id.action_mainFragment_to_bridgeFlow)
            .addCase(R.id.balanceDetailFragment, R.id.action_balanceDetailFragment_to_bridgeFlow)
            .navigateInFirstAttachedContext()
    }
@@ -847,6 +847,14 @@
            app:popUpTo="@id/balanceDetailFragment"
            app:popUpToInclusive="true" />
        <action
            android:id="@+id/action_balanceDetailFragment_to_bridgeFlow"
            app:destination="@id/bridgeFragment"
            app:enterAnim="@anim/fragment_open_enter"
            app:exitAnim="@anim/fragment_open_exit"
            app:popEnterAnim="@anim/fragment_close_enter"
            app:popExitAnim="@anim/fragment_close_exit" />
    </fragment>
    <fragment
@@ -1201,8 +1209,22 @@
            app:popEnterAnim="@anim/fragment_close_enter"
            app:popExitAnim="@anim/fragment_close_exit" />
        <action
            android:id="@+id/action_bridge_to_execution"
            app:destination="@id/bridgeExecutionFragment"
            app:enterAnim="@anim/fragment_open_enter"
            app:exitAnim="@anim/fragment_open_exit"
            app:popEnterAnim="@anim/fragment_close_enter"
            app:popExitAnim="@anim/fragment_close_exit" />
    </fragment>
    <fragment
        android:id="@+id/bridgeExecutionFragment"
        android:name="io.novafoundation.nova.feature_assets.presentation.bridge.execution.BridgeExecutionFragment"
        android:label="BridgeExecutionFragment"
        tools:layout="@layout/fragment_bridge_execution" />
    <fragment
        android:id="@+id/tradeProvidersFragment"
        android:name="io.novafoundation.nova.feature_assets.presentation.trade.provider.TradeProviderListFragment"
@@ -1,7 +1,7 @@
 buildscript {
    ext {
        // App version
-        versionName = '1.1.1'
+        versionName = '1.1.2'
        versionCode = 1
        applicationId = "io.pezkuwichain.wallet"
@@ -1,9 +1,12 @@
 package io.novafoundation.nova.common.data.secrets.v2
 import io.emeraldpay.polkaj.scale.ScaleCodecReader
 import io.novafoundation.nova.common.utils.invoke
 import io.novasama.substrate_sdk_android.encrypt.keypair.Keypair
 import io.novasama.substrate_sdk_android.encrypt.keypair.substrate.Sr25519Keypair
 import io.novasama.substrate_sdk_android.extensions.fromHex
 import io.novasama.substrate_sdk_android.scale.EncodableStruct
 import io.novasama.substrate_sdk_android.scale.Field
 import io.novasama.substrate_sdk_android.scale.Schema
 import io.novasama.substrate_sdk_android.scale.byteArray
 import io.novasama.substrate_sdk_android.scale.schema
@@ -28,6 +31,78 @@ object MetaAccountSecrets : Schema<MetaAccountSecrets>() {
    val TronKeypair by schema(KeyPairSchema).optional()
    val TronDerivationPath by string().optional()
    val BitcoinKeypair by schema(KeyPairSchema).optional()
    val BitcoinDerivationPath by string().optional()
    val SolanaKeypair by schema(KeyPairSchema).optional()
    val SolanaDerivationPath by string().optional()
 }
 /**
 * `MetaAccountSecrets.read(hex)` (`Schema.read`'in kendisi) bir stored blob'u bu şemadaki TÜM alanları sırayla
 * okuyarak parse eder - herhangi bir alan arabellekte hiç yoksa (o alan eklenmeden ÖNCE yazılmış eski bir
 * hesapsa) `optional<T>.read()` zarifçe null dönmek yerine çöker (`reader.readBoolean()` EOF'ta istisna
 * fırlatıyor, kütüphanede hiç yakalama yok). Bu, gerçek cihazda backup ekranı açılırken doğrulandı: bu hesabın
 * verisi Solana alanları eklenmeden önce yazılmıştı, okuma "Cannot read 412 of 412" ile çöktü - ve Solana
 * migration'ının KENDİSİ de her çalışmada aynı çökmeyi kendi try/catch'inde sessizce yutuyordu (solanaAddress'in
 * hiç yazılamamasının, yani SOL'ün hiç görünmemesinin gerçek nedeni buydu). Tron/Bitcoin eklenirken de birebir
 * aynı riskli desen kullanılmıştı - muhtemelen şans eseri (eski blob'larda tesadüfi byte hizalaması) hiç yüzeye
 * çıkmamıştı.
 *
 * Denenen ilk düzeltme (alan bazında özel bir DataType sarmalayıcısı) YANLIŞ çıktı: `EncodableStruct.get()`
 * (kütüphanenin kendi `ScaleStruct.kt`'si) bir alan null olduğunda sadece `field.dataType is optional<*>` ise
 * null döner - `optional`'ın kendisi `final` bir sınıf, alt sınıflanamaz, ve genel bir `DataType` sarmalayıcısı
 * bu kontrolden geçemeyip AYNI çökmeyi okuma yerine erişim anında tekrar üretiyordu (gerçek CI testleri bunu
 * yakaladı).
 *
 * Doğru çözüm: şemayı (yukarıda) TAMAMEN orijinal haliyle bırak - `optional<T>` her zaman kütüphanenin kendi
 * sınıfı olsun ki `get()` doğru çalışsın - ve okumayı kendi elimizle, alan alan, arabelleğin nerede tükendiğini
 * yakalayarak yap. `EncodableStruct.set()`'i hiç ÇAĞIRMAMAK (bir alanı okumaya çalışmamak) `get()`'in zaten
 * doğru olan "değer yok + optional -> null" davranışını tetikler - kütüphaneyi değil, kendi okuma sırasını
 * genişletiyoruz.
 */
 fun readMetaAccountSecrets(hex: String): EncodableStruct<MetaAccountSecrets> {
    return try {
        MetaAccountSecrets.read(hex)
    } catch (e: Exception) {
        readMetaAccountSecretsTolerant(hex)
    }
 }
 private fun readMetaAccountSecretsTolerant(hex: String): EncodableStruct<MetaAccountSecrets> {
    val reader = ScaleCodecReader(hex.fromHex())
    val struct = EncodableStruct(MetaAccountSecrets)
    // Once one field's bytes don't exist, the reader's position is meaningless for everything after it too -
    // every field from that point on must be left unset (not attempted), same as it being absent gets treated
    // by EncodableStruct.get() for every already-real `.optional()` field above.
    var truncated = false
    fun <T> trySet(field: Field<T>) {
        if (truncated) return
        try {
            struct[field] = field.dataType.read(reader)
        } catch (e: Exception) {
            truncated = true
        }
    }
    trySet(MetaAccountSecrets.Entropy)
    trySet(MetaAccountSecrets.SubstrateSeed)
    trySet(MetaAccountSecrets.SubstrateKeypair)
    trySet(MetaAccountSecrets.SubstrateDerivationPath)
    trySet(MetaAccountSecrets.EthereumKeypair)
    trySet(MetaAccountSecrets.EthereumDerivationPath)
    trySet(MetaAccountSecrets.TronKeypair)
    trySet(MetaAccountSecrets.TronDerivationPath)
    trySet(MetaAccountSecrets.BitcoinKeypair)
    trySet(MetaAccountSecrets.BitcoinDerivationPath)
    trySet(MetaAccountSecrets.SolanaKeypair)
    trySet(MetaAccountSecrets.SolanaDerivationPath)
    return struct
 }
 object ChainAccountSecrets : Schema<ChainAccountSecrets>() {
@@ -47,6 +122,10 @@ fun MetaAccountSecrets(
    ethereumDerivationPath: String? = null,
    tronKeypair: Keypair? = null,
    tronDerivationPath: String? = null,
    bitcoinKeypair: Keypair? = null,
    bitcoinDerivationPath: String? = null,
    solanaKeypair: Keypair? = null,
    solanaDerivationPath: String? = null,
 ): EncodableStruct<MetaAccountSecrets> = MetaAccountSecrets { secrets ->
    secrets[Entropy] = entropy
    secrets[SubstrateSeed] = substrateSeed
@@ -75,6 +154,24 @@ fun MetaAccountSecrets(
        }
    }
    secrets[TronDerivationPath] = tronDerivationPath
    secrets[BitcoinKeypair] = bitcoinKeypair?.let {
        KeyPairSchema { keypair ->
            keypair[PublicKey] = it.publicKey
            keypair[PrivateKey] = it.privateKey
            keypair[Nonce] = null // bitcoin uses secp256k1 (like ethereum/tron), so nonce is always null
        }
    }
    secrets[BitcoinDerivationPath] = bitcoinDerivationPath
    secrets[SolanaKeypair] = solanaKeypair?.let {
        KeyPairSchema { keypair ->
            keypair[PublicKey] = it.publicKey
            keypair[PrivateKey] = it.privateKey
            keypair[Nonce] = null // Solana uses Ed25519, not Sr25519, so nonce is always null
        }
    }
    secrets[SolanaDerivationPath] = solanaDerivationPath
 }
 fun ChainAccountSecrets(
@@ -103,6 +200,12 @@ val EncodableStruct<MetaAccountSecrets>.ethereumDerivationPath
 val EncodableStruct<MetaAccountSecrets>.tronDerivationPath
    get() = get(MetaAccountSecrets.TronDerivationPath)
 val EncodableStruct<MetaAccountSecrets>.bitcoinDerivationPath
    get() = get(MetaAccountSecrets.BitcoinDerivationPath)
 val EncodableStruct<MetaAccountSecrets>.solanaDerivationPath
    get() = get(MetaAccountSecrets.SolanaDerivationPath)
 val EncodableStruct<MetaAccountSecrets>.entropy
    get() = get(MetaAccountSecrets.Entropy)
@@ -118,6 +221,12 @@ val EncodableStruct<MetaAccountSecrets>.ethereumKeypair
 val EncodableStruct<MetaAccountSecrets>.tronKeypair
    get() = get(MetaAccountSecrets.TronKeypair)
 val EncodableStruct<MetaAccountSecrets>.bitcoinKeypair
    get() = get(MetaAccountSecrets.BitcoinKeypair)
 val EncodableStruct<MetaAccountSecrets>.solanaKeypair
    get() = get(MetaAccountSecrets.SolanaKeypair)
 val EncodableStruct<ChainAccountSecrets>.derivationPath
    get() = get(ChainAccountSecrets.DerivationPath)
@@ -28,7 +28,7 @@ class SecretStoreV2(
    }
    suspend fun getMetaAccountSecrets(metaId: Long): EncodableStruct<MetaAccountSecrets>? = withContext(Dispatchers.IO) {
-        encryptedPreferences.getDecryptedString(metaAccountKey(metaId, ACCESS_SECRETS))?.let(MetaAccountSecrets::read)
+        encryptedPreferences.getDecryptedString(metaAccountKey(metaId, ACCESS_SECRETS))?.let(::readMetaAccountSecrets)
    }
    suspend fun putChainAccountSecrets(metaId: Long, accountId: ByteArray, secrets: EncodableStruct<ChainAccountSecrets>) = withContext(Dispatchers.IO) {
@@ -156,20 +156,32 @@ val AccountSecrets.isChainAccountSecrets
 suspend fun SecretStoreV2.getMetaAccountKeypair(
    metaId: Long,
    isEthereum: Boolean,
    isTron: Boolean = false,
    isBitcoin: Boolean = false,
    isSolana: Boolean = false,
 ): Keypair = withContext(Dispatchers.Default) {
    val secrets = getMetaAccountSecrets(metaId) ?: noMetaSecrets(metaId)
-    mapMetaAccountSecretsToKeypair(secrets, isEthereum)
+    mapMetaAccountSecretsToKeypair(secrets, isEthereum, isTron, isBitcoin, isSolana)
 }
 fun mapMetaAccountSecretsToKeypair(
    secrets: EncodableStruct<MetaAccountSecrets>,
    ethereum: Boolean,
    tron: Boolean = false,
    bitcoin: Boolean = false,
    solana: Boolean = false,
 ): Keypair {
-    val keypairStruct = if (ethereum) {
+    // Tron and Bitcoin both reuse Ethereum's secp256k1 curve but derive their own keypair under a different
-        secrets[MetaAccountSecrets.EthereumKeypair] ?: noEthereumSecret()
+    // SLIP-44 path - each must be checked before `ethereum`, not folded into it, or that account would get
-    } else {
+    // signed with the wrong (Ethereum) private key. Solana is Ed25519 (not secp256k1 at all) but the same
-        secrets[MetaAccountSecrets.SubstrateKeypair]
+    // "check before ethereum" reasoning applies - it's still its own distinct keypair.
    val keypairStruct = when {
        tron -> secrets[MetaAccountSecrets.TronKeypair] ?: noTronSecret()
        bitcoin -> secrets[MetaAccountSecrets.BitcoinKeypair] ?: noBitcoinSecret()
        solana -> secrets[MetaAccountSecrets.SolanaKeypair] ?: noSolanaSecret()
        ethereum -> secrets[MetaAccountSecrets.EthereumKeypair] ?: noEthereumSecret()
        else -> secrets[MetaAccountSecrets.SubstrateKeypair]
    }
    return mapKeypairStructToKeypair(keypairStruct)
@@ -178,8 +190,11 @@ fun mapMetaAccountSecretsToKeypair(
 fun mapMetaAccountSecretsToDerivationPath(
    secrets: EncodableStruct<MetaAccountSecrets>,
    ethereum: Boolean,
    bitcoin: Boolean = false,
 ): String? {
-    return if (ethereum) {
+    return if (bitcoin) {
        secrets[MetaAccountSecrets.BitcoinDerivationPath]
    } else if (ethereum) {
        secrets[MetaAccountSecrets.EthereumDerivationPath]
    } else {
        secrets[MetaAccountSecrets.SubstrateDerivationPath]
@@ -198,6 +213,12 @@ private fun noChainSecrets(metaId: Long, accountId: ByteArray): Nothing {
 private fun noEthereumSecret(): Nothing = error("No ethereum keypair found")
 private fun noBitcoinSecret(): Nothing = error("No bitcoin keypair found")
 private fun noTronSecret(): Nothing = error("No tron keypair found")
 private fun noSolanaSecret(): Nothing = error("No solana keypair found")
 fun mapKeypairStructToKeypair(struct: EncodableStruct<KeyPairSchema>): Keypair {
    return Keypair(
        publicKey = struct[KeyPairSchema.PublicKey],
@@ -0,0 +1,164 @@
 package io.novafoundation.nova.common.utils
 /**
 * Bech32 (BIP173) / Bech32m (BIP350) codec, hand-implemented since no such library is currently on this
 * project's classpath (same rationale as [Base58]/[Base58Check] for Tron - this is a deterministic text
 * encoding, not a secret-dependent cryptographic primitive).
 *
 * Direct port of the reference algorithm in BIP173/BIP350's `segwit_addr.py`. Cross-checked against BIP173's
 * and BIP350's official test vectors - see [Bech32Test].
 */
 object Bech32 {
    private const val CHARSET = "qpzry9x8gf2tvdw0s3jn54khce6mua7l"
    private const val BECH32_CONST = 1L
    private const val BECH32M_CONST = 0x2bc830a3L
    enum class Encoding(val const: Long) {
        BECH32(BECH32_CONST),
        BECH32M(BECH32M_CONST)
    }
    data class Decoded(val hrp: String, val values: IntArray, val encoding: Encoding)
    private fun polymod(values: IntArray): Long {
        val gen = longArrayOf(0x3b6a57b2, 0x26508e6d, 0x1ea119fa, 0x3d4233dd, 0x2a1462b3)
        var chk = 1L
        for (v in values) {
            val b = (chk ushr 25)
            chk = (chk and 0x1ffffff) shl 5 xor v.toLong()
            for (i in 0 until 5) {
                if ((b ushr i) and 1L == 1L) {
                    chk = chk xor gen[i]
                }
            }
        }
        return chk
    }
    private fun hrpExpand(hrp: String): IntArray {
        val lower = hrp.map { (it.code ushr 5) }
        val upper = hrp.map { (it.code and 31) }
        return (lower + listOf(0) + upper).toIntArray()
    }
    private fun createChecksum(hrp: String, data: IntArray, encoding: Encoding): IntArray {
        val values = hrpExpand(hrp) + data + IntArray(6)
        val mod = polymod(values) xor encoding.const
        return IntArray(6) { i -> ((mod ushr (5 * (5 - i))) and 31).toInt() }
    }
    fun encode(hrp: String, data: IntArray, encoding: Encoding): String {
        val checksum = createChecksum(hrp, data, encoding)
        val combined = data + checksum
        return hrp + "1" + combined.map { CHARSET[it] }.joinToString("")
    }
    fun decode(input: String): Decoded {
        require(input.length in 8..90) { "Bech32 string has invalid length: ${input.length}" }
        require(input == input.lowercase() || input == input.uppercase()) { "Bech32 string is mixed case: $input" }
        val lower = input.lowercase()
        val separatorIndex = lower.lastIndexOf('1')
        require(separatorIndex >= 1) { "Bech32 string is missing separator '1': $input" }
        require(separatorIndex + 7 <= lower.length) { "Bech32 data part too short: $input" }
        val hrp = lower.substring(0, separatorIndex)
        val dataPart = lower.substring(separatorIndex + 1)
        val values = IntArray(dataPart.length)
        for ((i, c) in dataPart.withIndex()) {
            val v = CHARSET.indexOf(c)
            require(v >= 0) { "Invalid Bech32 character: '$c' in $input" }
            values[i] = v
        }
        val checksumValue = polymod(hrpExpand(hrp) + values)
        val encoding = when (checksumValue) {
            BECH32_CONST -> Encoding.BECH32
            BECH32M_CONST -> Encoding.BECH32M
            else -> throw IllegalArgumentException("Invalid Bech32/Bech32m checksum: $input")
        }
        return Decoded(hrp, values.copyOfRange(0, values.size - 6), encoding)
    }
    /**
     * Regroups bits between arbitrary group sizes (e.g. 8-bit bytes <-> 5-bit Bech32 words). Direct port of
     * BIP173's `convertbits`.
     */
    fun convertBits(data: IntArray, fromBits: Int, toBits: Int, pad: Boolean): IntArray? {
        var acc = 0
        var bits = 0
        val ret = mutableListOf<Int>()
        val maxV = (1 shl toBits) - 1
        val maxAcc = (1 shl (fromBits + toBits - 1)) - 1
        for (value in data) {
            if (value < 0 || (value ushr fromBits) != 0) return null
            acc = ((acc shl fromBits) or value) and maxAcc
            bits += fromBits
            while (bits >= toBits) {
                bits -= toBits
                ret.add((acc ushr bits) and maxV)
            }
        }
        if (pad) {
            if (bits > 0) ret.add((acc shl (toBits - bits)) and maxV)
        } else if (bits >= fromBits || ((acc shl (toBits - bits)) and maxV) != 0) {
            return null
        }
        return ret.toIntArray()
    }
 }
 /**
 * Segwit address encoding/decoding (BIP173 witness v0, BIP350 witness v1+/Bech32m) on top of the raw [Bech32]
 * codec above. Only witness version 0 (P2WPKH/P2WSH) is actually used by this app today (native SegWit only -
 * Taproot/witness v1 is explicitly out of scope for now), but decode handles both since a user could paste any
 * valid segwit address.
 */
 object SegwitAddress {
    fun encode(hrp: String, witnessVersion: Int, witnessProgram: ByteArray): String {
        require(witnessVersion in 0..16) { "Invalid witness version: $witnessVersion" }
        require(witnessProgram.size in 2..40) { "Invalid witness program length: ${witnessProgram.size}" }
        val programWords = Bech32.convertBits(witnessProgram.map { it.toInt() and 0xff }.toIntArray(), 8, 5, true)
            ?: throw IllegalArgumentException("Failed to convert witness program to 5-bit words")
        val encoding = if (witnessVersion == 0) Bech32.Encoding.BECH32 else Bech32.Encoding.BECH32M
        return Bech32.encode(hrp, intArrayOf(witnessVersion) + programWords, encoding)
    }
    data class Decoded(val witnessVersion: Int, val witnessProgram: ByteArray)
    fun decode(expectedHrp: String, address: String): Decoded {
        val (hrp, values, encoding) = Bech32.decode(address)
        require(hrp == expectedHrp) { "Unexpected HRP: expected $expectedHrp, got $hrp" }
        require(values.isNotEmpty()) { "Empty Bech32 data part: $address" }
        val witnessVersion = values[0]
        val expectedEncoding = if (witnessVersion == 0) Bech32.Encoding.BECH32 else Bech32.Encoding.BECH32M
        require(encoding == expectedEncoding) {
            "Witness version $witnessVersion requires ${expectedEncoding.name} but address used ${encoding.name}: $address"
        }
        val programWords = values.copyOfRange(1, values.size)
        val programBytes = Bech32.convertBits(programWords, 5, 8, false)
            ?: throw IllegalArgumentException("Invalid witness program padding: $address")
        require(programBytes.size in 2..40) { "Invalid witness program length: $address" }
        if (witnessVersion == 0) {
            require(programBytes.size == 20 || programBytes.size == 32) {
                "Witness v0 program must be 20 (P2WPKH) or 32 (P2WSH) bytes: $address"
            }
        }
        return Decoded(witnessVersion, ByteArray(programBytes.size) { programBytes[it].toByte() })
    }
 }
@@ -0,0 +1,56 @@
 package io.novafoundation.nova.common.utils
 import io.novasama.substrate_sdk_android.runtime.AccountId
 import org.bouncycastle.jcajce.provider.digest.RIPEMD160
 /**
 * Native SegWit (P2WPKH) Bitcoin address support. Only witness v0 P2WPKH (`bc1q...`) is implemented - Taproot
 * and legacy/P2SH-SegWit are explicitly out of scope for this phase (see the BTC integration plan).
 *
 * Bitcoin's "account id" here is the 20-byte HASH160 of the compressed secp256k1 public key - unlike
 * Tron/Ethereum (which both derive their account id via keccak256 of the *uncompressed* pubkey), so this is
 * NOT interchangeable with [tronPublicKeyToAccountId]/`asEthereumPublicKey().toAccountId()` despite all three
 * using the same underlying secp256k1 keypair machinery.
 */
 private const val BITCOIN_MAINNET_HRP = "bc"
 /** RIPEMD160(SHA256(x)) - the "HASH160" function used throughout Bitcoin for pubkey hashes and script hashes. */
 fun ByteArray.hash160(): ByteArray {
    val ripemd160 = RIPEMD160.Digest()
    return ripemd160.digest(this.sha256())
 }
 /**
 * @param compressedPublicKey a 33-byte compressed secp256k1 public key (0x02/0x03 prefix + 32-byte x-coordinate).
 */
 fun ByteArray.bitcoinPublicKeyToAccountId(): AccountId {
    require(size == 33) { "Bitcoin native SegWit requires a compressed (33-byte) public key, got $size bytes" }
    return hash160()
 }
 /** P2WPKH scriptPubKey: `OP_0 <20-byte-push> <hash160>`, i.e. `0x00 0x14 <20 bytes>`. */
 fun AccountId.toP2wpkhScriptPubKey(): ByteArray {
    require(size == 20) { "Bitcoin account id (HASH160) must be 20 bytes, got $size" }
    return byteArrayOf(0x00, 0x14) + this
 }
 fun AccountId.toBitcoinAddress(): String {
    require(size == 20) { "Bitcoin account id (HASH160) must be 20 bytes, got $size" }
    return SegwitAddress.encode(BITCOIN_MAINNET_HRP, witnessVersion = 0, witnessProgram = this)
 }
 fun String.bitcoinAddressToAccountId(): AccountId {
    val decoded = SegwitAddress.decode(BITCOIN_MAINNET_HRP, this)
    require(decoded.witnessVersion == 0 && decoded.witnessProgram.size == 20) {
        "Not a native SegWit P2WPKH address: $this"
    }
    return decoded.witnessProgram
 }
 fun String.isValidBitcoinAddress(): Boolean = runCatching { bitcoinAddressToAccountId() }.isSuccess
 fun emptyBitcoinAccountId() = ByteArray(20) { 1 }
@@ -0,0 +1,79 @@
 package io.novafoundation.nova.common.utils
 private const val P2PKH_VERSION = 0x00
 private const val P2SH_VERSION = 0x05
 /**
 * Any Bitcoin address this wallet can SEND to - a strict superset of what it can derive/receive as its own
 * address (native SegWit only, see `BitcoinAddress.kt`). Needed because a real exchange withdrawal address was
 * confirmed live to be P2SH (`3...`), which this app's original native-SegWit-only `isValidBitcoinAddress()`
 * rejected outright, blocking the send with a misleading "QR can't be decoded" error (the QR was fine - a bare
 * P2SH address - the address TYPE just wasn't recognized as a valid destination at all).
 *
 * Deliberately kept separate from [bitcoinAddressToAccountId]/[AccountId] - that function's 20-byte output feeds
 * generic multi-chain code (`Chain.accountIdOf`) that assumes every account id is THIS wallet's own P2WPKH
 * shape. Silently reusing it for a P2SH/P2PKH recipient would produce a 20-byte hash with no type tag, and
 * downstream code would wrap it in the wrong (P2WPKH) scriptPubKey - sending funds to an address that doesn't
 * match what was actually asked for. [BitcoinDestination] carries its type through to [toScriptPubKey] instead.
 */
 sealed class BitcoinDestination {
    data class NativeSegwit(val witnessProgram: ByteArray) : BitcoinDestination()
    data class P2sh(val scriptHash: ByteArray) : BitcoinDestination()
    data class P2pkh(val pubKeyHash: ByteArray) : BitcoinDestination()
 }
 fun String.decodeBitcoinDestination(): BitcoinDestination {
    runCatching {
        val decoded = SegwitAddress.decode("bc", this)
        if (decoded.witnessVersion == 0 && decoded.witnessProgram.size == 20) {
            return BitcoinDestination.NativeSegwit(decoded.witnessProgram)
        }
    }
    // Base58Check itself is chain-agnostic (see TronAddress.kt) - a Bitcoin legacy address is 1 version byte +
    // 20-byte hash, same shape as Tron's own address, just a different version byte and no fixed prefix meaning.
    val decoded = Base58Check.decode(this)
    require(decoded.size == 21) { "Not a valid Bitcoin legacy address: $this" }
    val version = decoded[0].toInt() and 0xff
    val hash = decoded.copyOfRange(1, decoded.size)
    return when (version) {
        P2PKH_VERSION -> BitcoinDestination.P2pkh(hash)
        P2SH_VERSION -> BitcoinDestination.P2sh(hash)
        else -> error("Unsupported Bitcoin address version byte: $version")
    }
 }
 fun String.isValidBitcoinDestinationAddress(): Boolean = runCatching { decodeBitcoinDestination() }.isSuccess
 /**
 * The raw 20-byte hash underlying any destination type, with its type tag dropped - safe ONLY for consumers
 * that treat it as an opaque identicon/display seed (e.g. `Chain.accountIdOf` and, downstream, address icon
 * generation) and never feed it back into [toScriptPubKey] or re-encode it as an address. Real transaction
 * construction must keep using [decodeBitcoinDestination]/[toScriptPubKey] directly, which keep the type.
 */
 val BitcoinDestination.hash: ByteArray
    get() = when (this) {
        is BitcoinDestination.NativeSegwit -> witnessProgram
        is BitcoinDestination.P2sh -> scriptHash
        is BitcoinDestination.P2pkh -> pubKeyHash
    }
 /**
 * @return the scriptPubKey a transaction output must use to actually pay this destination - P2SH/P2PKH have
 * different script shapes from this wallet's own P2WPKH (see [toP2wpkhScriptPubKey]), despite all three being a
 * "20-byte hash wrapped in a short script."
 */
 fun BitcoinDestination.toScriptPubKey(): ByteArray = when (this) {
    is BitcoinDestination.NativeSegwit -> byteArrayOf(0x00, 0x14) + witnessProgram
    // OP_HASH160 <20-byte-push> OP_EQUAL
    is BitcoinDestination.P2sh -> byteArrayOf(0xa9.toByte(), 0x14) + scriptHash + byteArrayOf(0x87.toByte())
    // OP_DUP OP_HASH160 <20-byte-push> OP_EQUALVERIFY OP_CHECKSIG
    is BitcoinDestination.P2pkh -> byteArrayOf(0x76, 0xa9.toByte(), 0x14) + pubKeyHash + byteArrayOf(0x88.toByte(), 0xac.toByte())
 }
@@ -0,0 +1,170 @@
 package io.novafoundation.nova.common.utils
 import java.io.ByteArrayOutputStream
 /** SHA256(SHA256(x)) - Bitcoin's standard "double SHA256", used for both txids and the BIP143 sighash. */
 fun ByteArray.sha256d(): ByteArray = sha256().sha256()
 /** Bitcoin's variable-length integer ("CompactSize") encoding, used throughout raw transaction serialization. */
 fun Long.toBitcoinVarInt(): ByteArray {
    require(this >= 0) { "VarInt cannot encode a negative value: $this" }
    val out = ByteArrayOutputStream()
    when {
        this < 0xfd -> out.write(toInt())
        this <= 0xffff -> {
            out.write(0xfd)
            out.write(toInt() and 0xff)
            out.write((toInt() ushr 8) and 0xff)
        }
        this <= 0xffffffffL -> {
            out.write(0xfe)
            for (i in 0..3) out.write(((this ushr (8 * i)) and 0xff).toInt())
        }
        else -> {
            out.write(0xff)
            for (i in 0..7) out.write(((this ushr (8 * i)) and 0xff).toInt())
        }
    }
    return out.toByteArray()
 }
 private fun Int.toLeBytes(byteCount: Int): ByteArray = ByteArray(byteCount) { i -> ((this ushr (8 * i)) and 0xff).toByte() }
 private fun Long.toLeBytes(byteCount: Int): ByteArray = ByteArray(byteCount) { i -> ((this ushr (8 * i)) and 0xff).toByte() }
 /**
 * A single UTXO being spent, in the form needed to build and sign a transaction.
 *
 * @param txid the previous transaction's id in standard (RPC/explorer-display) byte order - this class reverses
 * it internally to the on-wire/internal order raw transactions actually use (see [reversedTxid]).
 */
 data class BitcoinInput(
    val txid: ByteArray,
    val vout: Int,
    val valueSat: Long,
    val sequence: Long = 0xfffffffdL, // RBF-signaling (BIP125), matching the exchange's proven, already-live choice
 ) {
    init {
        require(txid.size == 32) { "txid must be 32 bytes, got ${txid.size}" }
    }
    fun reversedTxid(): ByteArray = txid.reversedArray()
 }
 data class BitcoinOutput(
    val valueSat: Long,
    val scriptPubKey: ByteArray,
 )
 /**
 * Builds and signs native SegWit (P2WPKH-only) Bitcoin transactions using BIP143 sighashes - hand-implemented
 * since no Bitcoin transaction library (bitcoinj/PSBT/etc.) is on this project's classpath (same rationale as
 * [Bech32]/[DerSignature]). Verified byte-for-byte against BIP143's official "Native P2WPKH" worked example,
 * including the fully serialized signed transaction - see [BitcoinTransactionTest].
 */
 object BitcoinTransaction {
    private const val SIGHASH_ALL = 1
    /** P2PKH-shaped "scriptCode" BIP143 requires for a P2WPKH input - see BIP143's "Specification" section. */
    private fun p2wpkhScriptCode(accountId: ByteArray): ByteArray {
        require(accountId.size == 20)
        val script = byteArrayOf(0x76.toByte(), 0xa9.toByte(), 0x14) + accountId + byteArrayOf(0x88.toByte(), 0xac.toByte())
        return 25L.toBitcoinVarInt() + script
    }
    private fun serializeOutpoint(input: BitcoinInput): ByteArray = input.reversedTxid() + input.vout.toLeBytes(4)
    private fun hashPrevouts(inputs: List<BitcoinInput>): ByteArray =
        inputs.fold(ByteArray(0)) { acc, input -> acc + serializeOutpoint(input) }.sha256d()
    private fun hashSequence(inputs: List<BitcoinInput>): ByteArray =
        inputs.fold(ByteArray(0)) { acc, input -> acc + input.sequence.toLeBytes(4) }.sha256d()
    private fun serializeOutput(output: BitcoinOutput): ByteArray =
        output.valueSat.toLeBytes(8) + output.scriptPubKey.size.toLong().toBitcoinVarInt() + output.scriptPubKey
    private fun hashOutputs(outputs: List<BitcoinOutput>): ByteArray =
        outputs.fold(ByteArray(0)) { acc, output -> acc + serializeOutput(output) }.sha256d()
    /**
     * BIP143 sighash preimage + double-SHA256 for signing [inputIndex], which must be a P2WPKH input whose
     * pubkey hashes to [signingAccountId]. Always uses SIGHASH_ALL, no ANYONECANPAY/NONE/SINGLE - this app never
     * constructs those.
     */
    fun bip143Sighash(
        version: Int,
        inputs: List<BitcoinInput>,
        outputs: List<BitcoinOutput>,
        inputIndex: Int,
        signingAccountId: ByteArray,
        locktime: Int,
    ): ByteArray {
        val input = inputs[inputIndex]
        val preimage = version.toLeBytes(4) +
            hashPrevouts(inputs) +
            hashSequence(inputs) +
            serializeOutpoint(input) +
            p2wpkhScriptCode(signingAccountId) +
            input.valueSat.toLeBytes(8) +
            input.sequence.toLeBytes(4) +
            hashOutputs(outputs) +
            locktime.toLeBytes(4) +
            SIGHASH_ALL.toLeBytes(4)
        return preimage.sha256d()
    }
    /**
     * @param witnesses one (derSignatureWithoutSighashByte, compressedPublicKey) pair per input, in input order -
     * every input in this app's transactions is a P2WPKH input from this wallet's own single address, so every
     * witness has exactly 2 items (signature, pubkey), never a bare key-path/script-path Taproot witness or a
     * multisig-style stack.
     */
    fun serializeSigned(
        version: Int,
        inputs: List<BitcoinInput>,
        outputs: List<BitcoinOutput>,
        witnesses: List<Pair<ByteArray, ByteArray>>,
        locktime: Int,
    ): ByteArray {
        require(witnesses.size == inputs.size) { "Need exactly one witness per input" }
        val out = ByteArrayOutputStream()
        out.write(version.toLeBytes(4))
        out.write(0x00) // segwit marker
        out.write(0x01) // segwit flag
        out.write(inputs.size.toLong().toBitcoinVarInt())
        for (input in inputs) {
            out.write(input.reversedTxid())
            out.write(input.vout.toLeBytes(4))
            out.write(0L.toBitcoinVarInt()) // scriptSig: empty for a native SegWit input
            out.write(input.sequence.toLeBytes(4))
        }
        out.write(outputs.size.toLong().toBitcoinVarInt())
        for (output in outputs) {
            out.write(serializeOutput(output))
        }
        for ((derSignature, publicKey) in witnesses) {
            out.write(2L.toBitcoinVarInt()) // 2 witness items: signature, pubkey
            val sigWithHashType = derSignature + byteArrayOf(SIGHASH_ALL.toByte())
            out.write(sigWithHashType.size.toLong().toBitcoinVarInt())
            out.write(sigWithHashType)
            out.write(publicKey.size.toLong().toBitcoinVarInt())
            out.write(publicKey)
        }
        out.write(locktime.toLeBytes(4))
        return out.toByteArray()
    }
    /**
     * Estimated virtual size in vbytes for fee purposes - the same hardcoded heuristic already proven in
     * production by `pezkuwi-exchange/wallet-service` (`inputs*68 + outputs*31 + 11`), reused here rather than
     * computing an exact post-signing weight (which would require knowing final DER signature lengths ahead of
     * time - low-S-normalized DER signatures are 70-72 bytes almost always, making this heuristic accurate to
     * within a few vbytes in practice).
     */
    fun estimateVsize(inputCount: Int, outputCount: Int): Long = inputCount * 68L + outputCount * 31L + 11L
 }
@@ -0,0 +1,62 @@
 package io.novafoundation.nova.common.utils
 import java.math.BigInteger
 /**
 * DER-encodes a raw secp256k1 ECDSA (r, s) signature the way Bitcoin's script/witness format requires it -
 * unlike Tron/Ethereum, which both use a fixed-size compact r(32)+s(32)+v(1) format (see
 * [io.novafoundation.nova.feature_wallet_impl.data.network.tron.transaction.RealTronTransactionService]'s
 * doc-comment for that format), Bitcoin signatures are a variable-length ASN.1 DER `SEQUENCE(INTEGER r, INTEGER
 * s)`.
 *
 * `r`/`s` are taken as raw big-endian unsigned 32-byte values - exactly what
 * [io.novasama.substrate_sdk_android]'s `SignatureWrapper.Ecdsa` (reached via `SignedRaw.toEcdsaSignatureData()`)
 * already exposes for Ethereum-style signing, which this app already uses. No new signing call path is needed
 * for Bitcoin: only this pure, standalone encoding step is new.
 */
 object DerSignature {
    // secp256k1 curve order n, and n/2 - Bitcoin Core's standardness rules (BIP62) reject a signature whose `s`
    // is greater than n/2 ("high-S"); wallets are expected to always produce the "low-S" of the two equally
    // valid (r, s) and (r, n-s) signatures for a given message, or relay nodes/miners may refuse the transaction.
    private val CURVE_ORDER = BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141", 16)
    private val HALF_CURVE_ORDER = CURVE_ORDER.shiftRight(1)
    /**
     * @param r raw big-endian unsigned 32-byte value
     * @param s raw big-endian unsigned 32-byte value (will be normalized to low-S if not already)
     * @return DER-encoded `SEQUENCE(INTEGER r, INTEGER s)`, WITHOUT the trailing sighash-type byte (the caller
     * appends that when assembling the witness/scriptSig, since it is not part of the DER signature itself).
     */
    fun encode(r: ByteArray, s: ByteArray): ByteArray {
        val rInt = BigInteger(1, r)
        var sInt = BigInteger(1, s)
        if (sInt > HALF_CURVE_ORDER) {
            sInt = CURVE_ORDER.subtract(sInt)
        }
        val rEncoded = encodeInteger(rInt)
        val sEncoded = encodeInteger(sInt)
        val sequenceBody = rEncoded + sEncoded
        return byteArrayOf(0x30, sequenceBody.size.toDerLength()) + sequenceBody
    }
    /**
     * ASN.1 DER INTEGER: tag(0x02) + length + minimal big-endian two's-complement bytes. [BigInteger.toByteArray]
     * already produces minimal big-endian two's-complement (including the leading 0x00 disambiguation byte when
     * the high bit of the first byte would otherwise be set, which would make it read as negative) - since
     * `rInt`/`sInt` are always non-negative here, its output is exactly the DER INTEGER content we need.
     */
    private fun encodeInteger(value: BigInteger): ByteArray {
        val bytes = value.toByteArray()
        return byteArrayOf(0x02, bytes.size.toDerLength()) + bytes
    }
    private fun Int.toDerLength(): Byte {
        require(this in 0..127) { "DER length $this requires long-form encoding, not expected for a 32-byte ECDSA signature" }
        return toByte()
    }
 }
@@ -0,0 +1,97 @@
 package io.novafoundation.nova.common.utils
 import io.novasama.substrate_sdk_android.encrypt.keypair.BaseKeypair
 import io.novasama.substrate_sdk_android.encrypt.keypair.Keypair
 import io.novasama.substrate_sdk_android.runtime.AccountId
 import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters
 import javax.crypto.Mac
 import javax.crypto.spec.SecretKeySpec
 /**
 * Solana address format: the raw 32-byte Ed25519 public key, Base58-encoded directly - no
 * checksum, no prefix byte (unlike Tron's Base58Check, see [TronAddress.kt]'s [Base58Check]).
 * [Base58] (defined there) is reused as-is since it's exactly this: a plain, non-checksummed
 * Base58 codec.
 *
 * Solana's account id IS the public key itself (no separate keccak/hash-based derivation the way
 * Ethereum/Tron/Bitcoin have) - `AccountId` here is always exactly 32 bytes.
 *
 * Derivation: SLIP-0010 (Ed25519 hierarchical, hardened-only - Ed25519 has no public-key-only
 * derivation the way secp256k1/BIP32 does, so every path segment is implicitly hardened) at path
 * m/44'/501'/0'/0' (SLIP-44 coin type 501, the modern Phantom/Solflare/Solana CLI default - NOT
 * the older Sollet-style m/44'/501'/0' with no final change level). Cross-validated against an
 * independent implementation (the `slip10` PyPI package) for the standard BIP39 test mnemonic
 * ("abandon x11 about", empty passphrase): both agree on
 * HAgk14JpMQLgt6rVgv7cBQFJWFto5Dqxi472uT3DKpqk - see [SolanaAddressTest].
 */
 private const val SOLANA_SEED_HMAC_KEY = "ed25519 seed"
 object Bip32Ed25519KeypairFactory {
    /**
     * `seed` is the standard 64-byte BIP39 seed (the exact same one Ethereum/Tron/Bitcoin derive
     * via `Bip39SeedFactory.deriveSeed` - BIP39 seed generation itself is chain-agnostic, only
     * what happens to it afterward differs). `path` is a list of child indices - all implicitly
     * hardened, so callers pass plain ints (44, 501, 0, 0), not pre-marked/offset values.
     */
    fun generate(seed: ByteArray, path: List<Int>): Keypair {
        var (key, chainCode) = masterKeyFromSeed(seed)
        for (index in path) {
            val (childKey, childChainCode) = deriveHardenedChild(key, chainCode, index)
            key = childKey
            chainCode = childChainCode
        }
        val privateKeyParams = Ed25519PrivateKeyParameters(key, 0)
        val publicKey = privateKeyParams.generatePublicKey().encoded
        return BaseKeypair(privateKey = key, publicKey = publicKey)
    }
    private fun masterKeyFromSeed(seed: ByteArray): Pair<ByteArray, ByteArray> {
        val digest = hmacSha512(SOLANA_SEED_HMAC_KEY.toByteArray(Charsets.UTF_8), seed)
        return digest.copyOfRange(0, 32) to digest.copyOfRange(32, 64)
    }
    /** SLIP-0010's ed25519 child derivation is always hardened: `HMAC-SHA512(chainCode, 0x00 ++
     *  parentKey ++ ser32(index | 0x80000000))`, unlike BIP32 secp256k1 (which can also derive
     *  non-hardened children from a public key alone) - there is no non-hardened case to handle. */
    private fun deriveHardenedChild(key: ByteArray, chainCode: ByteArray, index: Int): Pair<ByteArray, ByteArray> {
        val hardenedIndex = index or (1 shl 31)
        val data = byteArrayOf(0) + key + ser32(hardenedIndex)
        val digest = hmacSha512(chainCode, data)
        return digest.copyOfRange(0, 32) to digest.copyOfRange(32, 64)
    }
    private fun ser32(value: Int): ByteArray = byteArrayOf(
        (value ushr 24).toByte(),
        (value ushr 16).toByte(),
        (value ushr 8).toByte(),
        value.toByte(),
    )
    private fun hmacSha512(key: ByteArray, data: ByteArray): ByteArray {
        val mac = Mac.getInstance("HmacSHA512")
        mac.init(SecretKeySpec(key, "HmacSHA512"))
        return mac.doFinal(data)
    }
 }
 fun AccountId.toSolanaAddress(): String {
    require(size == 32) { "Solana account id (public key) must be 32 bytes, got $size" }
    return Base58.encode(this)
 }
 fun String.solanaAddressToAccountId(): AccountId {
    val decoded = Base58.decode(this)
    require(decoded.size == 32) { "Not a valid Solana address: $this" }
    return decoded
 }
 fun String.isValidSolanaAddress(): Boolean = runCatching { solanaAddressToAccountId() }.isSuccess
 fun emptySolanaAccountId() = ByteArray(32) { 1 }
@@ -0,0 +1,112 @@
 package io.novafoundation.nova.common.utils
 /**
 * Solana's "shortvec"/compact-u16 length-prefix encoding used throughout the wire format below - LEB128-style,
 * 7 payload bits per byte with a continuation bit, matching https://solana.com/docs/rpc/http's message layout.
 * Cross-validated byte-for-byte against the `solders` Python library's own serialization of a real System
 * Program transfer message before being ported here (values used in this file never exceed 127, so this always
 * emits a single byte in practice, but the general algorithm is implemented for correctness/robustness).
 */
 object SolanaCompactU16 {
    fun encode(value: Int): ByteArray {
        require(value >= 0) { "compact-u16 cannot encode a negative value" }
        var remaining = value
        val bytes = mutableListOf<Byte>()
        while (true) {
            var elem = remaining and 0x7f
            remaining = remaining ushr 7
            if (remaining == 0) {
                bytes.add(elem.toByte())
                break
            } else {
                elem = elem or 0x80
                bytes.add(elem.toByte())
            }
        }
        return bytes.toByteArray()
    }
 }
 /** The System Program's id is the all-zero 32-byte pubkey (base58: 32 `1` characters) - not a derived/hashed value. */
 private val SOLANA_SYSTEM_PROGRAM_ID: ByteArray = ByteArray(32)
 /** `Transfer` is variant index 2 of the System Program's instruction enum. */
 private const val SOLANA_SYSTEM_INSTRUCTION_TRANSFER = 2
 object SolanaTransaction {
    /**
     * A legacy (unversioned) Message containing a single System Program `Transfer` instruction - the simplest,
     * maximally-compatible shape for a native SOL transfer (no address-lookup-tables/versioned-transaction
     * features needed). Layout: MessageHeader(3 bytes) + compact-u16 account count + accounts(32B each) +
     * recentBlockhash(32B) + compact-u16 instruction count + CompiledInstruction. Verified byte-for-byte
     * against `solders`' own serialization of an identical transfer message - see the class doc.
     *
     * [recentBlockhash] must be 32 raw bytes (Base58-decode the RPC's `blockhash` string before calling this).
     */
    fun buildTransferMessage(
        senderPublicKey: ByteArray,
        recipientPublicKey: ByteArray,
        lamports: Long,
        recentBlockhash: ByteArray,
    ): ByteArray {
        require(senderPublicKey.size == 32) { "senderPublicKey must be 32 bytes, got ${senderPublicKey.size}" }
        require(recipientPublicKey.size == 32) { "recipientPublicKey must be 32 bytes, got ${recipientPublicKey.size}" }
        require(recentBlockhash.size == 32) { "recentBlockhash must be 32 bytes, got ${recentBlockhash.size}" }
        require(lamports >= 0) { "lamports cannot be negative" }
        val accountKeys = listOf(senderPublicKey, recipientPublicKey, SOLANA_SYSTEM_PROGRAM_ID)
        val instructionData = ByteArray(4 + 8).also {
            writeUInt32LE(it, 0, SOLANA_SYSTEM_INSTRUCTION_TRANSFER)
            writeUInt64LE(it, 4, lamports)
        }
        val out = mutableListOf<Byte>()
        // MessageHeader: 1 required signature (sender), 0 readonly-signed, 1 readonly-unsigned (System Program)
        out.add(1)
        out.add(0)
        out.add(1)
        out.addAll(SolanaCompactU16.encode(accountKeys.size).asList())
        accountKeys.forEach { out.addAll(it.asList()) }
        out.addAll(recentBlockhash.asList())
        // Single instruction: System Program Transfer
        out.addAll(SolanaCompactU16.encode(1).asList())
        out.add(2) // program_id_index -> accountKeys[2] (System Program)
        out.addAll(SolanaCompactU16.encode(2).asList())
        out.add(0) // sender account index
        out.add(1) // recipient account index
        out.addAll(SolanaCompactU16.encode(instructionData.size).asList())
        out.addAll(instructionData.asList())
        return out.toByteArray()
    }
    /** A single-signer signed transaction: compact-u16(1) + the 64-byte Ed25519 signature + the message bytes. */
    fun serializeSigned(message: ByteArray, signature: ByteArray): ByteArray {
        require(signature.size == 64) { "Ed25519 signature must be 64 bytes, got ${signature.size}" }
        return SolanaCompactU16.encode(1) + signature + message
    }
    private fun writeUInt32LE(buffer: ByteArray, offset: Int, value: Int) {
        for (i in 0 until 4) {
            buffer[offset + i] = (value ushr (8 * i)).toByte()
        }
    }
    private fun writeUInt64LE(buffer: ByteArray, offset: Int, value: Long) {
        for (i in 0 until 8) {
            buffer[offset + i] = (value ushr (8 * i)).toByte()
        }
    }
 }
@@ -2,6 +2,7 @@ package io.novafoundation.nova.common.utils
 import io.novasama.substrate_sdk_android.extensions.asEthereumPublicKey
 import io.novasama.substrate_sdk_android.extensions.toAccountId
 import io.novasama.substrate_sdk_android.extensions.toHexString
 import io.novasama.substrate_sdk_android.runtime.AccountId
 import java.math.BigInteger
@@ -113,3 +114,21 @@ fun String.tronAddressToAccountId(): AccountId {
 fun String.isValidTronAddress(): Boolean = runCatching { tronAddressToAccountId() }.isSuccess
 fun emptyTronAccountId() = ByteArray(20) { 1 }
 /**
 * Hex form of a Tron address (`0x41` prefix byte ++ accountId, hex-encoded, no `0x` prefix), e.g.
 * `41a614f803b6fd780986a42c78ec9c7f77e6ded13c`. This is the format TronGrid's `/wallet/` transaction
 * construction/broadcast endpoints expect when called with `"visible": false` (as opposed to the human-facing
 * Base58Check form used by the `/v1/accounts/{address}` balance endpoint and by [toTronAddress]).
 */
 fun AccountId.toTronHexAddress(): String {
    require(size == 20) { "Tron account id must be 20 bytes, got $size" }
    return byteArrayOf(TRON_ADDRESS_PREFIX_BYTE).toHexString(withPrefix = false) + toHexString(withPrefix = false)
 }
 /**
 * Converts a human-facing Base58Check Tron address (e.g. a TRC20 `contractAddress` from chain config) directly
 * into the hex form described in [toTronHexAddress].
 */
 fun String.tronAddressToHexAddress(): String = tronAddressToAccountId().toTronHexAddress()
@@ -1,4 +1,4 @@
-package io.novafoundation.nova.feature_swap_impl.presentation.execution
+package io.novafoundation.nova.common.view
 import android.content.Context
 import android.os.CountDownTimer
@@ -14,13 +14,13 @@ import android.view.animation.RotateAnimation
 import android.widget.TextSwitcher
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import io.novafoundation.nova.common.R
 import io.novafoundation.nova.common.databinding.ViewExecutionTimerBinding
 import io.novafoundation.nova.common.utils.WithContextExtensions
 import io.novafoundation.nova.common.utils.inflater
 import io.novafoundation.nova.common.utils.makeGone
 import io.novafoundation.nova.common.utils.makeVisible
 import io.novafoundation.nova.common.utils.setTextColorRes
 import io.novafoundation.nova.feature_swap_impl.R
 import io.novafoundation.nova.feature_swap_impl.databinding.ViewExecutionTimerBinding
 import kotlin.math.cos
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
@@ -28,6 +28,13 @@ import kotlin.time.Duration.Companion.milliseconds
 private const val SECOND_MILLIS = 1000L
 private const val HIDE_SCALE = 0.7f
 /**
 * Reusable circular countdown/result indicator - originally swap-execution-only
 * (feature_swap_impl.presentation.execution), moved here since it has no swap-specific coupling
 * beyond a Duration input, so other features (e.g. the Bridge screen) can show the same
 * waiting/success/error UX instead of leaving the user with no feedback after submitting an
 * operation that takes real time to confirm.
 */
 class ExecutionTimerView @JvmOverloads constructor(
    context: Context,
    attrs: AttributeSet? = null,
@@ -64,4 +64,4 @@
        app:layout_constraintStart_toStartOf="@+id/executionProgress"
        app:layout_constraintTop_toBottomOf="@+id/executionTimeSwitcher" />
-</merge>
+</merge>
@@ -2756,7 +2756,7 @@
    <string name="bridge_enter_amount">Mîqdar binivîse</string>
    <string name="bridge_hez_to_dot_warning">Guherandina HEZ→DOT li gorî rewşa DOT sînordar dibe.</string>
    <string name="bridge_hez_to_dot_blocked">Guherandina HEZ→DOT niha tune. Dema DOT têr bibe dîsa biceribîne.</string>
-    <string name="bridge_wusdt_to_usdt_blocked">Guherandina USDT(Pez)→USDT(Pol) niha tune. Li benda damezrandina lîkîdîteya 1:1.</string>
+    <string name="bridge_wusdt_to_usdt_blocked">Ev mîqdar ji rezerva berdest a pireyê (%s USDT) zêdetir e. Mîqdarek biçûktir biceribîne.</string>
    <string name="staking_dashboard_syncing">Agahdariya staking tê barkirin…</string>
@@ -253,7 +253,7 @@ Sizin için en iyi seçeneği bulmak amacıyla tekliflerini karşılaştırın.<
    <string name="bridge_enter_amount">Tutar girin</string>
    <string name="bridge_hez_to_dot_warning">HEZ → DOT yönü manuel işlenir, 24 saate kadar sürebilir.</string>
    <string name="bridge_hez_to_dot_blocked">HEZ → DOT yönü şu anda devre dışı.</string>
-    <string name="bridge_wusdt_to_usdt_blocked">USDT(Pez) → USDT(Pol) yönü şu anda devre dışı.</string>
+    <string name="bridge_wusdt_to_usdt_blocked">Bu tutar köprünün mevcut rezervini (%s USDT) aşıyor. Daha küçük bir tutar deneyin.</string>
    <string name="wallet_asset_buy_sell">Al/Sat</string>
    <string name="account_ledger_import_start_step_otg">Telefon ayarlarınızda %s</string>
    <string name="account_ledger_import_start_step_otg_highlighted">OTG\'yi etkinleştir</string>
@@ -350,26 +350,36 @@
    <string name="wallet_asset_sell_tokens">Sell tokens</string>
    <string name="wallet_asset_buy_tokens">Buy tokens</string>
    <string name="wallet_asset_bridge">Bridge DOT ↔ HEZ</string>
    <string name="wallet_asset_bridge_usdt">Bridge USDT(DOT) ↔ USDT(HEZ)</string>
    <!-- Bridge Screen -->
-    <string name="bridge_title">DOT ↔ HEZ Bridge</string>
+    <string name="bridge_title">USDT Bridge</string>
    <string name="bridge_pair_usdt">USDT ⇄ USDT.p</string>
    <string name="bridge_you_send">You send</string>
    <string name="bridge_you_receive">You receive (estimated)</string>
    <string name="bridge_exchange_rate">Exchange rate</string>
    <string name="bridge_fee">Bridge fee</string>
    <string name="bridge_minimum">Minimum</string>
    <string name="bridge_rate_format">1 DOT = %s HEZ</string>
    <string name="bridge_rate_format_reverse">1 HEZ = %s DOT</string>
    <string name="bridge_swap_button">Swap</string>
    <string name="bridge_hez_to_dot_note">HEZ→DOT swaps are processed when sufficient DOT liquidity is available.</string>
    <string name="bridge_insufficient_balance">Insufficient balance</string>
    <string name="bridge_below_minimum">Amount below minimum</string>
    <string name="bridge_enter_amount">Enter amount</string>
-    <string name="bridge_hez_to_dot_warning">HEZ→DOT swaps may have limited availability based on current liquidity.</string>
+    <string name="bridge_wusdt_to_usdt_blocked">This amount exceeds the bridge\'s current available reserve (%s USDT). Try a smaller amount.</string>
-    <string name="bridge_hez_to_dot_blocked">HEZ→DOT swaps are temporarily unavailable. Please try again when DOT liquidity is sufficient.</string>
+    <string name="bridge_consent_required_message">This amount exceeds the automatic payout limit and needs approval from 3 of the bridge\'s 5 signatories - typically resolved within about 2 hours. You can reach them at t.me/pezkuwidestek in the meantime.</string>
-    <string name="bridge_wusdt_to_usdt_blocked">USDT(Pez)→USDT(Pol) swaps are temporarily unavailable. Waiting for 1:1 liquidity to be established.</string>
+    <string name="bridge_consent_checkbox_label">I understand this may take time to complete and want to proceed</string>
    <string name="bridge_sign_status_ok">Bridge allowance OK (%s)</string>
    <string name="bridge_sign_button">Sign renewal (%s)</string>
    <string name="bridge_sign_waiting_others">Signed — waiting for other signers</string>
    <string name="bridge_sign_in_progress">Signing…</string>
    <string name="bridge_sign_error">Signing failed, tap to retry</string>
    <string name="bridge_deposit_success_label">Bridge complete — funds delivered</string>
    <string name="bridge_deposit_pending_message">Still processing - this can take longer if it needs manual multisig review. Your funds are safe and recorded on-chain. Check back in a few minutes, or reach the signatories at t.me/pezkuwidestek.</string>
    <string name="bridge_execution_submitting_label">Submitting transfer…</string>
    <string name="bridge_execution_waiting_destination_label">Waiting for confirmation on %s…</string>
    <string name="bridge_execution_do_not_close">Do not close the app!</string>
    <string name="wallet_asset_buy_sell">Buy/Sell</string>
@@ -2767,6 +2777,12 @@
    <string name="pezkuwi_dashboard_start_tracking">Start Tracking</string>
    <string name="pezkuwi_dashboard_tracking_success">Score tracking started!</string>
    <string name="pezkuwi_dashboard_kurds_title">Hejmara Kurd Le Cihane</string>
    <string name="pezkuwi_dashboard_mining_simulation_title">Mining Simulation</string>
    <string name="pezkuwi_dashboard_mining_airdrop_label">PEZ Airdrop</string>
    <string name="pezkuwi_dashboard_mining_needs_trust_score">Trust score must be greater than 0 for mining to start</string>
    <string name="pending_signatures_title">Pending Signatures</string>
    <string name="pending_signatures_sign">Sign</string>
    <!-- Citizenship Application -->
    <string name="citizenship_title">Citizenship Application</string>
@@ -0,0 +1,179 @@
 package io.novafoundation.nova.common.utils
 import io.novasama.substrate_sdk_android.extensions.fromHex
 import io.novasama.substrate_sdk_android.extensions.toHexString
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertThrows
 import org.junit.Assert.assertTrue
 import org.junit.Test
 /**
 * All test vectors below are quoted verbatim from the official BIPs (fetched directly from
 * https://github.com/bitcoin/bips at implementation time), not invented for this test:
 * - BIP173 (https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki) for Bech32 checksum vectors.
 * - BIP350 (https://github.com/bitcoin/bips/blob/master/bip-0350.mediawiki) for Bech32m checksum vectors
 *   and the current (BIP350-superseding-BIP173) segwit address <-> scriptPubKey vectors - BIP173's own
 *   witness-v1+ vectors used plain Bech32 (since Bech32m didn't exist yet) and are now considered INVALID;
 *   only BIP173's witness-v0 vectors still apply unchanged under BIP350.
 */
 class Bech32Test {
    @Test
    fun `valid Bech32 checksums should decode without throwing`() {
        val validBech32 = listOf(
            "A12UEL5L",
            "a12uel5l",
            "an83characterlonghumanreadablepartthatcontainsthenumber1andtheexcludedcharactersbio1tt5tgs",
            "abcdef1qpzry9x8gf2tvdw0s3jn54khce6mua7lmqqqxw",
            "11qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqc8247j",
            "split1checkupstagehandshakeupstreamerranterredcaperred2y9e3w",
            "?1ezyfcl"
        )
        for (address in validBech32) {
            val decoded = Bech32.decode(address)
            assertEquals("$address should decode as Bech32 (not Bech32m)", Bech32.Encoding.BECH32, decoded.encoding)
        }
    }
    @Test
    fun `valid Bech32m checksums should decode without throwing`() {
        val validBech32m = listOf(
            "A1LQFN3A",
            "a1lqfn3a",
            "an83characterlonghumanreadablepartthatcontainsthetheexcludedcharactersbioandnumber11sg7hg6",
            "abcdef1l7aum6echk45nj3s0wdvt2fg8x9yrzpqzd3ryx",
            "11llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllludsr8",
            "split1checkupstagehandshakeupstreamerranterredcaperredlc445v",
            "?1v759aa"
        )
        for (address in validBech32m) {
            val decoded = Bech32.decode(address)
            assertEquals("$address should decode as Bech32m (not Bech32)", Bech32.Encoding.BECH32M, decoded.encoding)
        }
    }
    @Test
    fun `mixed case Bech32 string should be rejected`() {
        assertThrows(IllegalArgumentException::class.java) {
            Bech32.decode("tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q0sL5k7")
        }
    }
    // --- Segwit address <-> scriptPubKey (BIP350's updated table) ---
    private fun expectedWitnessVersionAndProgram(scriptPubKeyHex: String): Pair<Int, ByteArray> {
        val script = scriptPubKeyHex.fromHex()
        val versionByte = script[0].toInt() and 0xff
        val witnessVersion = if (versionByte == 0) 0 else versionByte - 0x50
        val programLength = script[1].toInt() and 0xff
        val program = script.copyOfRange(2, 2 + programLength)
        return witnessVersion to program
    }
    @Test
    fun `known mainnet P2WPKH address should decode to the documented scriptPubKey`() {
        val address = "BC1QW508D6QEJXTDG4Y5R3ZARVARY0C5XW7KV8F3T4"
        val (expectedVersion, expectedProgram) = expectedWitnessVersionAndProgram("0014751e76e8199196d454941c45d1b3a323f1433bd6")
        val decoded = SegwitAddress.decode("bc", address)
        assertEquals(expectedVersion, decoded.witnessVersion)
        assertTrue(decoded.witnessProgram.contentEquals(expectedProgram))
    }
    @Test
    fun `known testnet P2WSH address should decode to the documented scriptPubKey`() {
        val address = "tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q0sl5k7"
        val (expectedVersion, expectedProgram) =
            expectedWitnessVersionAndProgram("00201863143c14c5166804bd19203356da136c985678cd4d27a1b8c6329604903262")
        val decoded = SegwitAddress.decode("tb", address)
        assertEquals(expectedVersion, decoded.witnessVersion)
        assertTrue(decoded.witnessProgram.contentEquals(expectedProgram))
    }
    @Test
    fun `known testnet P2WPKH address (all-zero-ish program) should decode correctly`() {
        val address = "tb1qqqqqp399et2xygdj5xreqhjjvcmzhxw4aywxecjdzew6hylgvsesrxh6hy"
        val (expectedVersion, expectedProgram) =
            expectedWitnessVersionAndProgram("0020000000c4a5cad46221b2a187905e5266362b99d5e91c6ce24d165dab93e86433")
        val decoded = SegwitAddress.decode("tb", address)
        assertEquals(expectedVersion, decoded.witnessVersion)
        assertTrue(decoded.witnessProgram.contentEquals(expectedProgram))
    }
    @Test
    fun `known witness v1 taproot-style address (Bech32m) should decode correctly`() {
        val address = "bc1pw508d6qejxtdg4y5r3zarvary0c5xw7kw508d6qejxtdg4y5r3zarvary0c5xw7kt5nd6y"
        val (expectedVersion, expectedProgram) = expectedWitnessVersionAndProgram(
            "5128751e76e8199196d454941c45d1b3a323f1433bd6751e76e8199196d454941c45d1b3a323f1433bd6"
        )
        val decoded = SegwitAddress.decode("bc", address)
        assertEquals(1, expectedVersion)
        assertEquals(expectedVersion, decoded.witnessVersion)
        assertTrue(decoded.witnessProgram.contentEquals(expectedProgram))
    }
    @Test
    fun `P2WPKH encode should reproduce the exact known mainnet address (lowercase)`() {
        val (_, program) = expectedWitnessVersionAndProgram("0014751e76e8199196d454941c45d1b3a323f1433bd6")
        val encoded = SegwitAddress.encode("bc", witnessVersion = 0, witnessProgram = program)
        assertEquals("BC1QW508D6QEJXTDG4Y5R3ZARVARY0C5XW7KV8F3T4".lowercase(), encoded)
    }
    @Test
    fun `encode-decode should round trip for a fresh 20-byte P2WPKH program`() {
        val program = "0011223344556677889900112233445566778899".fromHex()
        assertEquals(20, program.size)
        val address = SegwitAddress.encode("bc", witnessVersion = 0, witnessProgram = program)
        val decoded = SegwitAddress.decode("bc", address)
        assertEquals(0, decoded.witnessVersion)
        assertTrue(decoded.witnessProgram.contentEquals(program))
    }
    @Test
    fun `invalid checksum should be rejected`() {
        assertThrows(IllegalArgumentException::class.java) {
            SegwitAddress.decode("bc", "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t5")
        }
    }
    @Test
    fun `wrong hrp should be rejected`() {
        assertThrows(IllegalArgumentException::class.java) {
            SegwitAddress.decode("bc", "tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q0sl5k7")
        }
    }
    @Test
    fun `invalid program length should be rejected`() {
        assertThrows(IllegalArgumentException::class.java) {
            SegwitAddress.decode("bc", "bc1rw5uspcuh")
        }
    }
    @Test
    fun `witness v0 with wrong program length per BIP141 should be rejected`() {
        assertThrows(IllegalArgumentException::class.java) {
            SegwitAddress.decode("bc", "BC1QR508D6QEJXTDG4Y5R3ZARVARYV98GJ9P")
        }
    }
    @Test
    fun `witness v0 encoded with Bech32m instead of Bech32 should be rejected (BIP350)`() {
        assertThrows(IllegalArgumentException::class.java) {
            SegwitAddress.decode("bc", "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kemeawh")
        }
    }
 }
@@ -0,0 +1,98 @@
 package io.novafoundation.nova.common.utils
 import io.novasama.substrate_sdk_android.extensions.fromHex
 import io.novasama.substrate_sdk_android.extensions.toHexString
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
 /**
 * [knownAccountId]/[knownAddress] is BIP173/BIP350's official segwit address test vector
 * (BC1QW508D6QEJXTDG4Y5R3ZARVARY0C5XW7KV8F3T4 <-> scriptPubKey 0014751e76e8199196d454941c45d1b3a323f1433bd6,
 * fetched directly from https://github.com/bitcoin/bips at implementation time) - an independently-verifiable,
 * real-world test vector, not invented for this test. [knownPublicKey] is BIP143's official Native P2WPKH
 * example pubkey, whose HASH160 is independently confirmed (via Bech32AddressTest and BitcoinTransactionTest)
 * to equal a *different* known account id - used here only to test [hash160]/[bitcoinPublicKeyToAccountId] in
 * isolation from address encoding.
 */
 class BitcoinAddressTest {
    private val knownAccountId = "751e76e8199196d454941c45d1b3a323f1433bd6".fromHex()
    private val knownAddress = "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4"
    private val knownPublicKey = "025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357".fromHex()
    private val knownPublicKeyAccountId = "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1".fromHex()
    @Test
    fun `accountId to address should produce the known BIP173 address`() {
        assertEquals(knownAddress, knownAccountId.toBitcoinAddress())
    }
    @Test
    fun `address to accountId should decode the known BIP173 address back to the known bytes`() {
        assertTrue(knownAddress.bitcoinAddressToAccountId().contentEquals(knownAccountId))
    }
    @Test
    fun `accountId to address and back should round trip`() {
        val decodedBack = knownAccountId.toBitcoinAddress().bitcoinAddressToAccountId()
        assertTrue(decodedBack.contentEquals(knownAccountId))
    }
    @Test
    fun `compressed public key to accountId should match the known BIP143 hash160`() {
        assertTrue(knownPublicKey.bitcoinPublicKeyToAccountId().contentEquals(knownPublicKeyAccountId))
    }
    @Test
    fun `uncompressed (65-byte) public key should be rejected`() {
        val uncompressed = ByteArray(65)
        try {
            uncompressed.bitcoinPublicKeyToAccountId()
            org.junit.Assert.fail("Expected an IllegalArgumentException for a non-33-byte public key")
        } catch (e: IllegalArgumentException) {
            // expected
        }
    }
    @Test
    fun `toP2wpkhScriptCode should produce OP_0 push-20 the account id`() {
        val scriptPubKey = knownAccountId.toP2wpkhScriptPubKey()
        assertEquals("0014751e76e8199196d454941c45d1b3a323f1433bd6", scriptPubKey.toHexString(withPrefix = false))
    }
    @Test
    fun `isValidBitcoinAddress should accept the known good address`() {
        assertTrue(knownAddress.isValidBitcoinAddress())
    }
    @Test
    fun `isValidBitcoinAddress should reject a corrupted checksum`() {
        val corrupted = "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t5"
        assertFalse(corrupted.isValidBitcoinAddress())
    }
    @Test
    fun `isValidBitcoinAddress should reject a testnet address`() {
        assertFalse("tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q0sl5k7".isValidBitcoinAddress())
    }
    @Test
    fun `isValidBitcoinAddress should reject a Tron address`() {
        assertFalse("TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t".isValidBitcoinAddress())
    }
    @Test
    fun `isValidBitcoinAddress should reject a P2WSH (32-byte program) address as not P2WPKH`() {
        assertFalse("bc1pw508d6qejxtdg4y5r3zarvary0c5xw7kw508d6qejxtdg4y5r3zarvary0c5xw7kt5nd6y".isValidBitcoinAddress())
    }
    @Test
    fun `hash160 known test vector should match independently-verified value`() {
        // hash160("hello") independently cross-checked via Python's hashlib (ripemd160(sha256(b"hello"))) at
        // implementation time - a different library from this project's BouncyCastle, not just self-consistency.
        assertEquals("b6a9c8c230722b7c748331a8b450f05566dc7d0f", "hello".toByteArray().hash160().toHexString(withPrefix = false))
    }
 }
@@ -0,0 +1,99 @@
 package io.novafoundation.nova.common.utils
 import io.novasama.substrate_sdk_android.extensions.toHexString
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
 /**
 * Test vectors:
 * - [genesisP2pkhAddress] is Satoshi's genesis coinbase address - real, independently-verifiable, its hash160
 *   cross-checked via Python's hashlib/base58 at implementation time.
 * - [okxWithdrawalAddress] is a real address confirmed live: an OKX BTC withdrawal QR, whose bare (non-BIP21)
 *   content this app's original native-SegWit-only address validation rejected outright, producing a misleading
 *   "QR can't be decoded" error - the actual bug this file's code fixes.
 */
 class BitcoinDestinationAddressTest {
    private val genesisP2pkhAddress = "1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa"
    private val genesisP2pkhHash160 = "62e907b15cbf27d5425399ebf6f0fb50ebb88f18"
    private val piVanityP2shAddress = "3P14159f73E4gFr7JterCCQh9QjiTjiZrG"
    private val okxWithdrawalAddress = "3QBsCZAv5hsZSrDpTcQYEqd82TdA8Qr3g9"
    private val okxWithdrawalHash160 = "f6c78c3a049bfa34ed05b22ca9515414cdcb46d1"
    private val nativeSegwitAddress = "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4"
    private val nativeSegwitAccountId = "751e76e8199196d454941c45d1b3a323f1433bd6"
    @Test
    fun `should decode a known P2PKH address to the correct hash160`() {
        val destination = genesisP2pkhAddress.decodeBitcoinDestination()
        assertTrue(destination is BitcoinDestination.P2pkh)
        assertEquals(genesisP2pkhHash160, (destination as BitcoinDestination.P2pkh).pubKeyHash.toHexString(withPrefix = false))
    }
    @Test
    fun `should decode a known P2SH address to a P2sh destination`() {
        val destination = piVanityP2shAddress.decodeBitcoinDestination()
        assertTrue(destination is BitcoinDestination.P2sh)
    }
    @Test
    fun `should decode the real OKX withdrawal address to the correct P2SH hash160`() {
        val destination = okxWithdrawalAddress.decodeBitcoinDestination()
        assertTrue(destination is BitcoinDestination.P2sh)
        assertEquals(okxWithdrawalHash160, (destination as BitcoinDestination.P2sh).scriptHash.toHexString(withPrefix = false))
    }
    @Test
    fun `should still decode a native segwit address as NativeSegwit`() {
        val destination = nativeSegwitAddress.decodeBitcoinDestination()
        assertTrue(destination is BitcoinDestination.NativeSegwit)
        assertEquals(nativeSegwitAccountId, (destination as BitcoinDestination.NativeSegwit).witnessProgram.toHexString(withPrefix = false))
    }
    @Test
    fun `isValidBitcoinDestinationAddress should accept P2PKH, P2SH and native segwit`() {
        assertTrue(genesisP2pkhAddress.isValidBitcoinDestinationAddress())
        assertTrue(piVanityP2shAddress.isValidBitcoinDestinationAddress())
        assertTrue(okxWithdrawalAddress.isValidBitcoinDestinationAddress())
        assertTrue(nativeSegwitAddress.isValidBitcoinDestinationAddress())
    }
    @Test
    fun `isValidBitcoinDestinationAddress should reject a corrupted checksum`() {
        assertFalse("1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNb".isValidBitcoinDestinationAddress())
    }
    @Test
    fun `isValidBitcoinDestinationAddress should reject a Tron address`() {
        assertFalse("TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t".isValidBitcoinDestinationAddress())
    }
    @Test
    fun `P2SH destination should produce OP_HASH160 push-20 OP_EQUAL scriptPubKey`() {
        val destination = okxWithdrawalAddress.decodeBitcoinDestination()
        assertEquals("a914${okxWithdrawalHash160}87", destination.toScriptPubKey().toHexString(withPrefix = false))
    }
    @Test
    fun `P2PKH destination should produce OP_DUP OP_HASH160 push-20 OP_EQUALVERIFY OP_CHECKSIG scriptPubKey`() {
        val destination = genesisP2pkhAddress.decodeBitcoinDestination()
        assertEquals("76a914${genesisP2pkhHash160}88ac", destination.toScriptPubKey().toHexString(withPrefix = false))
    }
    @Test
    fun `NativeSegwit destination should produce OP_0 push-20 scriptPubKey`() {
        val destination = nativeSegwitAddress.decodeBitcoinDestination()
        assertEquals("0014$nativeSegwitAccountId", destination.toScriptPubKey().toHexString(withPrefix = false))
    }
 }
@@ -0,0 +1,92 @@
 package io.novafoundation.nova.common.utils
 import io.novasama.substrate_sdk_android.extensions.fromHex
 import io.novasama.substrate_sdk_android.extensions.toHexString
 import org.junit.Assert.assertEquals
 import org.junit.Test
 /**
 * Verified byte-for-byte against BIP143's official "Native P2WPKH" worked example
 * (https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki, fetched directly at implementation time) -
 * every intermediate value below (hashPrevouts/hashSequence/hashOutputs/preimage/sighash/signed tx) is quoted
 * verbatim from that document, not invented for this test.
 *
 * The two inputs' txids are given here in the conventional *display* order (reversed from on-wire order) - the
 * same order a REST API like mempool.space returns - to exercise [BitcoinInput.reversedTxid]'s reversal for
 * real, rather than pre-reversing them and bypassing that logic.
 */
 class BitcoinTransactionTest {
    // BIP143 doc's wire-order txids, reversed here once (by hand, offline) to get the display-order string a
    // real API would hand back - see this test class's doc comment.
    private val input0Txid = "9f96ade4b41d5433f4eda31e1738ec2b36f6e7d1420d94a6af99801a88f7f7ff".fromHex()
    private val input1Txid = "8ac60eb9575db5b2d987e29f301b5b819ea83a5c6579d282d189cc04b8e151ef".fromHex()
    // sequence is the *value* that gets LE-encoded, NOT the wire bytes - the doc shows input 0's on-wire
    // sequence bytes as "eeffffff", which as a little-endian integer is 0xffffffee, not 0xeeffffff (a
    // transcription of this exact off-by-reversal was caught by a failing CI run before this fix).
    private val input0 = BitcoinInput(txid = input0Txid, vout = 0, valueSat = 625_000_000L, sequence = 0xffffffeeL)
    private val input1 = BitcoinInput(txid = input1Txid, vout = 1, valueSat = 600_000_000L, sequence = 0xffffffffL)
    private val output0 = BitcoinOutput(
        valueSat = 112_340_000L,
        scriptPubKey = "76a9148280b37df378db99f66f85c95a783a76ac7a6d5988ac".fromHex()
    )
    private val output1 = BitcoinOutput(
        valueSat = 223_450_000L,
        scriptPubKey = "76a9143bde42dbee7e4dbe6a21b2d50ce2f0167faa815988ac".fromHex()
    )
    private val signingAccountId = "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1".fromHex()
    private val publicKey = "025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357".fromHex()
    @Test
    fun `hash160 of the known public key should match the known account id`() {
        assertEquals(signingAccountId.toHexString(withPrefix = false), publicKey.hash160().toHexString(withPrefix = false))
    }
    @Test
    fun `bip143Sighash should match the known sighash for signing input 1`() {
        val sighash = BitcoinTransaction.bip143Sighash(
            version = 1,
            inputs = listOf(input0, input1),
            outputs = listOf(output0, output1),
            inputIndex = 1,
            signingAccountId = signingAccountId,
            locktime = 0x11,
        )
        assertEquals("c37af31116d1b27caf68aae9e3ac82f1477929014d5b917657d0eb49478cb670", sighash.toHexString(withPrefix = false))
    }
    @Test
    fun `serializeSigned should produce the exact expected bytes for a single-input all-P2WPKH transaction`() {
        // Hand-verified (not from a BIP143 vector, since BIP143's own worked example mixes a legacy P2PK input
        // with the P2WPKH one - this app only ever builds all-P2WPKH transactions since it only ever spends
        // from its own single P2WPKH address). Expected hex was independently computed byte-by-byte from this
        // function's own documented format (version/marker/flag/varints/witness) rather than copied from here.
        val txidWire = "0a1b2c3d4e5f60718293a4b5c6d7e8f90a1b2c3d4e5f60718293a4b5c6d7e8f9".fromHex()
        val txidDisplay = txidWire.reversedArray() // what a mempool.space-style API would actually return
        val input = BitcoinInput(txid = txidDisplay, vout = 3, valueSat = 100_000L, sequence = 0xfffffffdL)
        val output = BitcoinOutput(valueSat = 90_000L, scriptPubKey = "0014".fromHex() + "2222222222222222222222222222222222222222".fromHex())
        val derSignature = "3006020101020101".fromHex()
        val dummyPubKey = "0246e14bb0d93c0d64c265dd6b0eeeba6b9bd94aa88ce74aa302cf1cb8fdff9b6a".fromHex()
        val signed = BitcoinTransaction.serializeSigned(
            version = 2,
            inputs = listOf(input),
            outputs = listOf(output),
            witnesses = listOf(derSignature to dummyPubKey),
            locktime = 0,
        )
        val expected = "020000000001010a1b2c3d4e5f60718293a4b5c6d7e8f90a1b2c3d4e5f60718293a4b5c6d7e8f90300000000fdffffff01905f01000000000016001422222222222222222222222222222222222222220209300602010102010101210246e14bb0d93c0d64c265dd6b0eeeba6b9bd94aa88ce74aa302cf1cb8fdff9b6a00000000"
        assertEquals(expected, signed.toHexString(withPrefix = false))
    }
    @Test
    fun `estimateVsize should match the exchange's proven heuristic formula`() {
        assertEquals(1 * 68L + 2 * 31L + 11L, BitcoinTransaction.estimateVsize(inputCount = 1, outputCount = 2))
    }
 }
@@ -0,0 +1,72 @@
 package io.novafoundation.nova.common.utils
 import io.novasama.substrate_sdk_android.extensions.fromHex
 import io.novasama.substrate_sdk_android.extensions.toHexString
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import java.math.BigInteger
 class DerSignatureTest {
    private val curveOrder = BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141", 16)
    private fun ByteArray.pad32() = ByteArray(32 - size) + this
    @Test
    fun `small r and high-bit s should each get a leading zero byte per DER minimal-integer rule`() {
        // r = 1 (0x01, high bit clear -> no padding needed), s = 128 (0x80, high bit set -> needs 0x00 prefix
        // so it isn't misread as a negative two's-complement integer). Manually verified expected DER bytes.
        val r = BigInteger.valueOf(1).toByteArray().pad32()
        val s = BigInteger.valueOf(128).toByteArray().pad32() // 128 < half-curve-order, so no low-S flip happens
        val der = DerSignature.encode(r, s)
        assertEquals("30070201010202" + "0080", der.toHexString(withPrefix = false))
    }
    @Test
    fun `high-S signature should be normalized to low-S per BIP62`() {
        val r = BigInteger.valueOf(42).toByteArray().pad32()
        val highS = curveOrder.subtract(BigInteger.ONE) // curveOrder - 1: definitely > halfCurveOrder
        val s = highS.toByteArray().let { if (it.size > 32) it.copyOfRange(it.size - 32, it.size) else it }.pad32()
        val der = DerSignature.encode(r, s)
        // Expect the DER-encoded s to equal curveOrder - highS == 1, not the original high-S value.
        val expectedNormalizedS = curveOrder.subtract(highS)
        assertEquals(BigInteger.ONE, expectedNormalizedS)
        // Extract the s component back out of the DER bytes to check it against the expected normalized value.
        val rLen = der[3].toInt()
        val sTagIndex = 4 + rLen
        val sLen = der[sTagIndex + 1].toInt()
        val sBytes = der.copyOfRange(sTagIndex + 2, sTagIndex + 2 + sLen)
        assertEquals(expectedNormalizedS, BigInteger(1, sBytes))
    }
    @Test
    fun `already-low-S signature should be left unchanged`() {
        val r = BigInteger.valueOf(7).toByteArray().pad32()
        val lowS = BigInteger.valueOf(12345)
        val s = lowS.toByteArray().pad32()
        val der = DerSignature.encode(r, s)
        val rLen = der[3].toInt()
        val sTagIndex = 4 + rLen
        val sLen = der[sTagIndex + 1].toInt()
        val sBytes = der.copyOfRange(sTagIndex + 2, sTagIndex + 2 + sLen)
        assertEquals(lowS, BigInteger(1, sBytes))
    }
    @Test
    fun `DER output should start with SEQUENCE tag and correct overall length`() {
        val r = "0011223344556677889900112233445566778899aabbccddeeff0011223344".fromHex()
        val s = "1122334455667788990011223344556677889900112233445566778899aabb".fromHex()
        val der = DerSignature.encode(r, s)
        assertEquals(0x30.toByte(), der[0])
        assertEquals(der.size - 2, der[1].toInt())
    }
 }
@@ -0,0 +1,81 @@
 package io.novafoundation.nova.common.utils
 import io.novasama.substrate_sdk_android.extensions.fromHex
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
 class SolanaAddressTest {
    /**
     * The standard BIP39 test mnemonic ("abandon" x11 + "about", empty passphrase) - its 64-byte
     * seed is a well-known, independently-verifiable industry reference value (used identically
     * across Bitcoin/Ethereum/etc test vectors). Derived here at m/44'/501'/0'/0' (SLIP-0010
     * Ed25519, the Phantom/Solflare/Solana CLI default path) and cross-checked against an
     * independent second implementation (the `slip10` PyPI package, run standalone in Python
     * outside this codebase) - both agree exactly on this address, so this is a real,
     * cross-validated vector, not one invented for this test.
     */
    private val knownSeedHex =
        "5eb00bbddcf069084889a8ab9155568165f5c453ccb85e70811aaed6f6da5fc19a5ac40b389cd370d086206dec8aa6c43daea6690f20ad3d8d48b2d2ce9e38e4"
    private val knownPath = listOf(44, 501, 0, 0)
    private val knownAddress = "HAgk14JpMQLgt6rVgv7cBQFJWFto5Dqxi472uT3DKpqk"
    @Test
    fun `should derive the known reference Solana address from the standard test seed`() {
        val keypair = Bip32Ed25519KeypairFactory.generate(knownSeedHex.fromHex(), knownPath)
        assertEquals(knownAddress, keypair.publicKey.toSolanaAddress())
    }
    @Test
    fun `different derivation path should yield a different address`() {
        val keypair = Bip32Ed25519KeypairFactory.generate(knownSeedHex.fromHex(), listOf(44, 501, 0))
        assertFalse(keypair.publicKey.toSolanaAddress() == knownAddress)
    }
    @Test
    fun `address encode-decode should round trip`() {
        val keypair = Bip32Ed25519KeypairFactory.generate(knownSeedHex.fromHex(), knownPath)
        val address = keypair.publicKey.toSolanaAddress()
        val decoded = address.solanaAddressToAccountId()
        assertTrue(decoded.contentEquals(keypair.publicKey))
    }
    @Test
    fun `isValidSolanaAddress should accept known good address`() {
        assertTrue(knownAddress.isValidSolanaAddress())
    }
    @Test
    fun `isValidSolanaAddress should reject a Tron address`() {
        assertFalse("TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t".isValidSolanaAddress())
    }
    @Test
    fun `isValidSolanaAddress should reject too-short input`() {
        assertFalse("1111".isValidSolanaAddress())
    }
    @Test
    fun `toSolanaAddress should reject a non-32-byte input`() {
        val notThirtyTwoBytes = ByteArray(20)
        assertThrows(IllegalArgumentException::class.java) {
            notThirtyTwoBytes.toSolanaAddress()
        }
    }
    private fun assertThrows(expected: Class<out Throwable>, block: () -> Unit) {
        try {
            block()
        } catch (e: Throwable) {
            assertTrue("Expected ${expected.name} but got ${e::class.java.name}", expected.isInstance(e))
            return
        }
        throw AssertionError("Expected ${expected.name} to be thrown, but nothing was thrown")
    }
 }
@@ -0,0 +1,66 @@
 package io.novafoundation.nova.common.utils
 import io.novasama.substrate_sdk_android.extensions.fromHex
 import io.novasama.substrate_sdk_android.extensions.toHexString
 import org.junit.Assert.assertEquals
 import org.junit.Test
 class SolanaTransactionTest {
    /**
     * Independently built via the `solders` Python library (a real, widely-used Solana SDK, run standalone
     * outside this codebase): a System Program `Transfer` message from a fixed sender to a fixed recipient, a
     * fixed 123456789-lamport amount, and an all-zero 32-byte "recent blockhash" (chosen for a reproducible
     * fixed vector, not a real network value). This test asserts our hand-rolled message builder produces the
     * exact same bytes solders did for the identical inputs.
     */
    private val senderPublicKey = "8a88e3dd7409f195fd52db2d3cba5d72ca6709bf1d94121bf3748801b40f6f5c".fromHex()
    private val recipientPublicKey = "8139770ea87d175f56a35466c34c7ecccb8d8a91b4ee37a25df60f5b8fc9b394".fromHex()
    private val recentBlockhash = ByteArray(32)
    private val lamports = 123456789L
    private val expectedMessageHex = "010001038a88e3dd7409f195fd52db2d3cba5d72ca6709bf1d94121bf3748801b40f6f5c813" +
        "9770ea87d175f56a35466c34c7ecccb8d8a91b4ee37a25df60f5b8fc9b39400000000000000" +
        "000000000000000000000000000000000000000000000000000000000000000000000000000" +
        "00000000000000000000000000000000000000001020200010c0200000015cd5b0700000000"
    @Test
    fun `buildTransferMessage should match the independently-built solders reference vector`() {
        val message = SolanaTransaction.buildTransferMessage(senderPublicKey, recipientPublicKey, lamports, recentBlockhash)
        assertEquals(expectedMessageHex, message.toHexString(withPrefix = false))
    }
    @Test
    fun `serializeSigned should prefix a single-signature count byte and the signature before the message`() {
        val message = SolanaTransaction.buildTransferMessage(senderPublicKey, recipientPublicKey, lamports, recentBlockhash)
        val signature = ByteArray(64) { it.toByte() }
        val signedTx = SolanaTransaction.serializeSigned(message, signature)
        assertEquals(1, signedTx[0].toInt())
        assertEquals(signature.toList(), signedTx.copyOfRange(1, 65).toList())
        assertEquals(message.toList(), signedTx.copyOfRange(65, signedTx.size).toList())
    }
    @Test(expected = IllegalArgumentException::class)
    fun `serializeSigned should reject a non-64-byte signature`() {
        val message = SolanaTransaction.buildTransferMessage(senderPublicKey, recipientPublicKey, lamports, recentBlockhash)
        SolanaTransaction.serializeSigned(message, ByteArray(63))
    }
    @Test
    fun `compact-u16 should single-byte-encode every value used by a simple transfer message`() {
        assertEquals(listOf<Byte>(3), SolanaCompactU16.encode(3).toList())
        assertEquals(listOf<Byte>(1), SolanaCompactU16.encode(1).toList())
        assertEquals(listOf<Byte>(2), SolanaCompactU16.encode(2).toList())
        assertEquals(listOf<Byte>(12), SolanaCompactU16.encode(12).toList())
    }
    @Test
    fun `compact-u16 should multi-byte-encode a value at and above 128`() {
        // 128 = 0b1_0000000 -> low 7 bits (0) with continuation bit set, then high bit (1)
        assertEquals(listOf(0x80.toByte(), 0x01.toByte()), SolanaCompactU16.encode(128).toList())
    }
 }
@@ -44,6 +44,18 @@ class TronAddressTest {
        assertTrue(decodedBack.contentEquals(accountId))
    }
    @Test
    fun `toTronHexAddress should produce the known hex form`() {
        val accountId = knownTronAddressHex.fromHex().copyOfRange(1, 21)
        assertEquals(knownTronAddressHex, accountId.toTronHexAddress())
    }
    @Test
    fun `tronAddressToHexAddress should produce the known hex form directly from a Base58 address`() {
        assertEquals(knownTronAddressHex, knownTronAddress.tronAddressToHexAddress())
    }
    @Test
    fun `isValidTronAddress should accept known good address`() {
        assertTrue(knownTronAddress.isValidTronAddress())
@@ -58,6 +58,8 @@ fun chainOf(
    isTestNet = false,
    isEthereumBased = false,
    isTronBased = false,
    isBitcoinBased = false,
    isSolanaBased = false,
    hasCrowdloans = false,
    additional = "",
    governance = "governance",
@@ -94,6 +94,8 @@ import io.novafoundation.nova.core_db.migrations.AddStakingTypeToTotalRewards_44
 import io.novafoundation.nova.core_db.migrations.AddSwapOption_48_49
 import io.novafoundation.nova.core_db.migrations.AddTransactionVersionToRuntime_50_51
 import io.novafoundation.nova.core_db.migrations.AddTransferApisTable_29_30
 import io.novafoundation.nova.core_db.migrations.AddBitcoinSupport_74_75
 import io.novafoundation.nova.core_db.migrations.AddSolanaSupport_75_76
 import io.novafoundation.nova.core_db.migrations.AddTronSupport_73_74
 import io.novafoundation.nova.core_db.migrations.AddTypeExtrasToMetaAccount_68_69
 import io.novafoundation.nova.core_db.migrations.AddVersioningToGovernanceDapps_32_33
@@ -167,7 +169,7 @@ import io.novafoundation.nova.core_db.model.operation.SwapTypeLocal
 import io.novafoundation.nova.core_db.model.operation.TransferTypeLocal
@Database(
-    version = 74,
+    version = 76,
    entities = [
        AccountLocal::class,
        NodeLocal::class,
@@ -273,6 +275,8 @@ abstract class AppDatabase : RoomDatabase() {
                    .addMigrations(AddTypeExtrasToMetaAccount_68_69, AddMultisigCalls_69_70, AddMultisigSupportFlag_70_71)
                    .addMigrations(AddGifts_71_72, AddFieldsToContributions)
                    .addMigrations(AddTronSupport_73_74)
                    .addMigrations(AddBitcoinSupport_74_75)
                    .addMigrations(AddSolanaSupport_75_76)
                    .build()
            }
            return instance!!
@@ -164,7 +164,12 @@ abstract class ChainDao {
    // ------- Queries ------
-    @Query("SELECT * FROM chains")
+    // ORDER BY rowid: without an explicit order, SQLite gives no guarantee about row order for `SELECT *`.
    // The merged chains.json lists Pezkuwi's own chains first (see wallet-utils' merge_chains()), and that
    // order is what gets inserted first on initial sync - rowid tracks insertion order, so ordering by it
    // means Pezkuwi's chains reliably register/connect first instead of being interleaved unpredictably
    // among the ~90+ Nova-inherited chains, where they could otherwise end up processed last.
    @Query("SELECT * FROM chains ORDER BY rowid")
    @Transaction
    abstract suspend fun getJoinChainInfo(): List<JoinedChainInfo>
@@ -172,7 +177,7 @@ abstract class ChainDao {
    @Transaction
    abstract suspend fun getAllChainIds(): List<String>
-    @Query("SELECT * FROM chains")
+    @Query("SELECT * FROM chains ORDER BY rowid")
    @Transaction
    abstract fun joinChainInfoFlow(): Flow<List<JoinedChainInfo>>
@@ -0,0 +1,14 @@
 package io.novafoundation.nova.core_db.migrations
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 val AddBitcoinSupport_74_75 = object : Migration(74, 75) {
    override fun migrate(db: SupportSQLiteDatabase) {
        db.execSQL("ALTER TABLE chains ADD COLUMN isBitcoinBased INTEGER NOT NULL DEFAULT 0")
        db.execSQL("ALTER TABLE meta_accounts ADD COLUMN bitcoinPublicKey BLOB")
        db.execSQL("ALTER TABLE meta_accounts ADD COLUMN bitcoinAddress BLOB")
    }
 }
@@ -0,0 +1,14 @@
 package io.novafoundation.nova.core_db.migrations
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 val AddSolanaSupport_75_76 = object : Migration(75, 76) {
    override fun migrate(db: SupportSQLiteDatabase) {
        db.execSQL("ALTER TABLE chains ADD COLUMN isSolanaBased INTEGER NOT NULL DEFAULT 0")
        db.execSQL("ALTER TABLE meta_accounts ADD COLUMN solanaPublicKey BLOB")
        db.execSQL("ALTER TABLE meta_accounts ADD COLUMN solanaAddress BLOB")
    }
 }
@@ -23,6 +23,10 @@ data class ChainLocal(
    val isEthereumBased: Boolean,
    @ColumnInfo(defaultValue = "0")
    val isTronBased: Boolean,
    @ColumnInfo(defaultValue = "0")
    val isBitcoinBased: Boolean,
    @ColumnInfo(defaultValue = "0")
    val isSolanaBased: Boolean,
    val isTestNet: Boolean,
    @ColumnInfo(defaultValue = "1")
    val hasSubstrateRuntime: Boolean,
@@ -39,6 +39,10 @@ class MetaAccountLocal(
    val typeExtras: SerializedJson?,
    val tronPublicKey: ByteArray? = null,
    val tronAddress: ByteArray? = null,
    val bitcoinPublicKey: ByteArray? = null,
    val bitcoinAddress: ByteArray? = null,
    val solanaPublicKey: ByteArray? = null,
    val solanaAddress: ByteArray? = null,
 ) {
    enum class Status {
@@ -59,6 +63,12 @@ class MetaAccountLocal(
            const val TRON_PUBKEY = "tronPublicKey"
            const val TRON_ADDRESS = "tronAddress"
            const val BITCOIN_PUBKEY = "bitcoinPublicKey"
            const val BITCOIN_ADDRESS = "bitcoinAddress"
            const val SOLANA_PUBKEY = "solanaPublicKey"
            const val SOLANA_ADDRESS = "solanaAddress"
            const val NAME = "name"
            const val IS_SELECTED = "isSelected"
            const val POSITION = "position"
@@ -90,7 +100,106 @@ class MetaAccountLocal(
            globallyUniqueId = globallyUniqueId,
            typeExtras = typeExtras,
            tronPublicKey = tronPublicKey,
-            tronAddress = tronAddress
+            tronAddress = tronAddress,
            bitcoinPublicKey = bitcoinPublicKey,
            bitcoinAddress = bitcoinAddress,
            solanaPublicKey = solanaPublicKey,
            solanaAddress = solanaAddress,
        ).also {
            it.id = id
        }
    }
    // We do not use copy as we need explicitly set id
    fun addBitcoinAccount(
        bitcoinPublicKey: ByteArray,
        bitcoinAddress: ByteArray,
    ): MetaAccountLocal {
        return MetaAccountLocal(
            substratePublicKey = substratePublicKey,
            substrateCryptoType = substrateCryptoType,
            substrateAccountId = substrateAccountId,
            ethereumPublicKey = ethereumPublicKey,
            ethereumAddress = ethereumAddress,
            name = name,
            parentMetaId = parentMetaId,
            isSelected = isSelected,
            position = position,
            type = type,
            status = status,
            globallyUniqueId = globallyUniqueId,
            typeExtras = typeExtras,
            tronPublicKey = tronPublicKey,
            tronAddress = tronAddress,
            bitcoinPublicKey = bitcoinPublicKey,
            bitcoinAddress = bitcoinAddress,
            solanaPublicKey = solanaPublicKey,
            solanaAddress = solanaAddress,
        ).also {
            it.id = id
        }
    }
    // We do not use copy as we need explicitly set id
    fun addTronAccount(
        tronPublicKey: ByteArray,
        tronAddress: ByteArray,
    ): MetaAccountLocal {
        return MetaAccountLocal(
            substratePublicKey = substratePublicKey,
            substrateCryptoType = substrateCryptoType,
            substrateAccountId = substrateAccountId,
            ethereumPublicKey = ethereumPublicKey,
            ethereumAddress = ethereumAddress,
            name = name,
            parentMetaId = parentMetaId,
            isSelected = isSelected,
            position = position,
            type = type,
            status = status,
            globallyUniqueId = globallyUniqueId,
            typeExtras = typeExtras,
            tronPublicKey = tronPublicKey,
            tronAddress = tronAddress,
            // Previously missing - dropped bitcoin/solana on any account already carrying them. Since
            // this migration is deliberately unconditional/self-healing (re-runs every app start to
            // recover from a since-fixed bug re-losing a keypair), a re-run after Bitcoin/Solana were
            // already backfilled would silently wipe them back to null. See addBitcoinAccount/
            // addSolanaAccount - every addXAccount must carry every sibling chain-family field forward.
            bitcoinPublicKey = bitcoinPublicKey,
            bitcoinAddress = bitcoinAddress,
            solanaPublicKey = solanaPublicKey,
            solanaAddress = solanaAddress,
        ).also {
            it.id = id
        }
    }
    // We do not use copy as we need explicitly set id
    fun addSolanaAccount(
        solanaPublicKey: ByteArray,
        solanaAddress: ByteArray,
    ): MetaAccountLocal {
        return MetaAccountLocal(
            substratePublicKey = substratePublicKey,
            substrateCryptoType = substrateCryptoType,
            substrateAccountId = substrateAccountId,
            ethereumPublicKey = ethereumPublicKey,
            ethereumAddress = ethereumAddress,
            name = name,
            parentMetaId = parentMetaId,
            isSelected = isSelected,
            position = position,
            type = type,
            status = status,
            globallyUniqueId = globallyUniqueId,
            typeExtras = typeExtras,
            tronPublicKey = tronPublicKey,
            tronAddress = tronAddress,
            bitcoinPublicKey = bitcoinPublicKey,
            bitcoinAddress = bitcoinAddress,
            solanaPublicKey = solanaPublicKey,
            solanaAddress = solanaAddress,
        ).also {
            it.id = id
        }
@@ -109,6 +218,10 @@ class MetaAccountLocal(
        if (!ethereumAddress.contentEquals(other.ethereumAddress)) return false
        if (!tronPublicKey.contentEquals(other.tronPublicKey)) return false
        if (!tronAddress.contentEquals(other.tronAddress)) return false
        if (!bitcoinPublicKey.contentEquals(other.bitcoinPublicKey)) return false
        if (!bitcoinAddress.contentEquals(other.bitcoinAddress)) return false
        if (!solanaPublicKey.contentEquals(other.solanaPublicKey)) return false
        if (!solanaAddress.contentEquals(other.solanaAddress)) return false
        if (name != other.name) return false
        if (parentMetaId != other.parentMetaId) return false
        if (isSelected != other.isSelected) return false
@@ -130,6 +243,10 @@ class MetaAccountLocal(
        result = 31 * result + (ethereumAddress?.contentHashCode() ?: 0)
        result = 31 * result + (tronPublicKey?.contentHashCode() ?: 0)
        result = 31 * result + (tronAddress?.contentHashCode() ?: 0)
        result = 31 * result + (bitcoinPublicKey?.contentHashCode() ?: 0)
        result = 31 * result + (bitcoinAddress?.contentHashCode() ?: 0)
        result = 31 * result + (solanaPublicKey?.contentHashCode() ?: 0)
        result = 31 * result + (solanaAddress?.contentHashCode() ?: 0)
        result = 31 * result + name.hashCode()
        result = 31 * result + (parentMetaId?.hashCode() ?: 0)
        result = 31 * result + isSelected.hashCode()
@@ -1,190 +0,0 @@
 # Package Structure Rebrand Guide
 **Tarih:** 2026-01-23
 **Durum:** BEKLEMEDE - Büyük değişiklik, dikkatli planlama gerektirir
 ---
 ## Mevcut Durum
 | Öğe | Sayı |
 |-----|------|
 | `io.novafoundation` package referansları | ~49,041 |
 | Etkilenen Kotlin/Java dosyaları | ~2,000+ |
 | Module sayısı | 65+ |
 ---
 ## Hedef Dönüşüm
 ```
 io.novafoundation.nova  →  io.pezkuwichain.wallet
 ```
 ### Örnekler:
 | Mevcut | Hedef |
 |--------|-------|
 | `io.novafoundation.nova.app` | `io.pezkuwichain.wallet.app` |
 | `io.novafoundation.nova.common` | `io.pezkuwichain.wallet.common` |
 | `io.novafoundation.nova.feature_wallet_api` | `io.pezkuwichain.wallet.feature_wallet_api` |
 | `io.novafoundation.nova.runtime` | `io.pezkuwichain.wallet.runtime` |
 ---
 ## Değişiklik Kapsamı
 ### 1. Dizin Yapısı Değişikliği
 Her modülde:
 ```
 src/main/java/io/novafoundation/nova/
    ↓
 src/main/java/io/pezkuwichain/wallet/
 ```
 ### 2. Package Declaration Değişikliği
 Her Kotlin/Java dosyasının ilk satırı:
 ```kotlin
 // ÖNCE:
 package io.novafoundation.nova.feature_wallet_api.domain
 // SONRA:
 package io.pezkuwichain.wallet.feature_wallet_api.domain
 ```
 ### 3. Import Statement Değişikliği
 ```kotlin
 // ÖNCE:
 import io.novafoundation.nova.common.utils.Event
 import io.novafoundation.nova.feature_account_api.domain.model.Account
 // SONRA:
 import io.pezkuwichain.wallet.common.utils.Event
 import io.pezkuwichain.wallet.feature_account_api.domain.model.Account
 ```
 ---
 ## Otomatik Rebrand Script
 ```bash
 #!/bin/bash
 # package_rebrand.sh
 # DIKKAT: Bu script'i çalıştırmadan önce backup alın!
 WALLET_DIR="/home/mamostehp/pezWallet/pezkuwi-wallet-android"
 OLD_PACKAGE="io.novafoundation.nova"
 NEW_PACKAGE="io.pezkuwichain.wallet"
 OLD_PATH="io/novafoundation/nova"
 NEW_PATH="io/pezkuwichain/wallet"
 # 1. Dizin yapısını değiştir
 find "$WALLET_DIR" -type d -path "*/$OLD_PATH" | while read dir; do
    new_dir=$(echo "$dir" | sed "s|$OLD_PATH|$NEW_PATH|g")
    mkdir -p "$(dirname "$new_dir")"
    mv "$dir" "$new_dir"
 done
 # 2. Package declarations ve imports değiştir
 find "$WALLET_DIR" -type f \( -name "*.kt" -o -name "*.java" \) | while read file; do
    sed -i "s|$OLD_PACKAGE|$NEW_PACKAGE|g" "$file"
 done
 # 3. build.gradle namespace'lerini kontrol et (zaten yapıldı)
 # grep -rn "namespace" --include="*.gradle" "$WALLET_DIR"
 echo "Rebrand tamamlandı. Build test edin."
 ```
 ---
 ## Riskler ve Dikkat Edilmesi Gerekenler
 ### 1. Android Resource ID'leri
 - `R.drawable.*`, `R.string.*` gibi resource referansları etkilenmez
 - Ama `BuildConfig` referansları güncellenebilir
 ### 2. Dagger/Hilt Dependency Injection
 - Component, Module, Scope annotation'ları
 - Generated kod yeniden oluşturulmalı (clean build)
 ### 3. Room Database
 - Entity, DAO sınıfları
 - Migration'lar kontrol edilmeli
 ### 4. ProGuard/R8
 - `proguard-rules.pro` dosyalarındaki referanslar
 ### 5. AndroidManifest.xml
 - Activity, Service, Provider tanımları
 - Intent filter'lar
 ### 6. Test Dosyaları
 - `androidTest` ve `test` klasörlerindeki dosyalar da değişmeli
 ---
 ## Önerilen Yaklaşım
 ### Faz 1: Hazırlık (1-2 gün)
 1. [ ] Mevcut durumun tam backup'ı
 2. [ ] Tüm testlerin geçtiğini doğrula
 3. [ ] CI/CD pipeline'ı geçici olarak durdur
 ### Faz 2: Otomatik Dönüşüm (2-4 saat)
 1. [ ] Script'i çalıştır
 2. [ ] Build hatalarını kontrol et
 3. [ ] IDE'de proje yapısını yenile (Invalidate Caches)
 ### Faz 3: Manuel Düzeltmeler (1-2 gün)
 1. [ ] Build hatalarını düzelt
 2. [ ] Dagger/Hilt generated kod sorunları
 3. [ ] ProGuard kuralları güncelle
 ### Faz 4: Test (1 gün)
 1. [ ] Unit test'leri çalıştır
 2. [ ] Integration test'leri çalıştır
 3. [ ] Manual UI testing
 4. [ ] APK build ve install test
 ### Faz 5: Finalize
 1. [ ] Commit ve push
 2. [ ] CI/CD'yi yeniden aktif et
 3. [ ] Release build test
 ---
 ## Alternatif: Kademeli Rebrand
 Eğer tek seferde yapmak riskli görünüyorsa:
 1. **Modül bazlı değişiklik** - Her modülü ayrı ayrı rebrand et
 2. **Alias kullanımı** - Geçiş döneminde typealias ile uyumluluk
 3. **Git branch** - Ayrı bir branch'te çalış, test et, merge et
 ---
 ## Zaten Tamamlanan İşler
 ✅ Gradle namespace'ler: `io.novafoundation.nova.*` → `io.pezkuwichain.wallet.*`
 ✅ Display name'ler: "Nova Wallet" → "Pezkuwi Wallet"
 ✅ Deep link scheme: `novawallet://` → `pezkuwiwallet://`
 ✅ JavaScript interface: `Nova_*` → `Pezkuwi_*`
 ✅ Backup dosya adları: `novawallet_backup.json` → `pezkuwiwallet_backup.json`
 ✅ User-Agent: "Nova Wallet (Android)" → "Pezkuwi Wallet (Android)"
 ✅ Nevroz fire branding asset'leri
 ---
 ## Sonuç
 Bu değişiklik büyük ve riskli. Yapılması tavsiye edilir ama dikkatli planlama ile:
 1. **Şu an için:** Mevcut durum çalışır durumda, build alınabilir
 2. **Kısa vadede:** Package structure değişikliği planlanmalı
 3. **Uzun vadede:** Tamamen `io.pezkuwichain.wallet` kullanılmalı
 **Öneri:** Önce mevcut haliyle release build alıp test edin. Ardından bu değişikliği ayrı bir sprint'te planlayın.
@@ -63,6 +63,43 @@ class SubstrateFee(
    override val asset: Chain.Asset
 ) : Fee
 /**
 * Fee for a Bitcoin transaction, denominated in sats: `feeRate (sat/vB) * estimated vsize` - see
 * `RealBitcoinTransactionService` for how both are derived. The network only ever collects what miners include
 * in a block, which is exactly this amount (unlike account-model chains, a Bitcoin fee is not a cap/estimate
 * that gets partially refunded - it is the literal difference between input and output values).
 */
 class BitcoinFee(
    override val amount: BigInteger,
    override val submissionOrigin: SubmissionOrigin,
    override val asset: Chain.Asset
 ) : Fee
 /**
 * Fee for a Tron transaction (native TRX or TRC-20), always denominated in TRX (sun), regardless of which asset
 * is being sent - Tron has no separate "gas token" concept, network resources (bandwidth/energy) are always
 * burned as TRX. [amount] is this client's own estimate of that burn (see `RealTronTransactionService`); the
 * network only ever burns what it actually uses, so the real cost can be lower, but never higher than what this
 * client authorized via `fee_limit` when submitting.
 */
 class TronFee(
    override val amount: BigInteger,
    override val submissionOrigin: SubmissionOrigin,
    override val asset: Chain.Asset
 ) : Fee
 /**
 * Fee for a Solana transaction, denominated in lamports, always paid in native SOL regardless of which asset is
 * being sent (Solana has no separate "gas token" concept, same as Tron). [amount] is `getFeeForMessage`'s
 * authoritative, exact answer for this specific compiled message (not an estimate the way Bitcoin's vsize-based
 * fee is) - see `RealSolanaTransactionService`.
 */
 class SolanaFee(
    override val amount: BigInteger,
    override val submissionOrigin: SubmissionOrigin,
    override val asset: Chain.Asset
 ) : Fee
 class SubstrateFeeBase(
    override val amount: BigInteger,
    override val asset: Chain.Asset
@@ -4,6 +4,7 @@ import io.novafoundation.nova.common.address.AccountIdKey
 import io.novafoundation.nova.common.address.toHex
 import io.novafoundation.nova.common.utils.Identifiable
 import io.novafoundation.nova.feature_account_api.domain.model.MetaAccount
 import io.novafoundation.nova.feature_account_api.domain.model.MultisigMetaAccount
 import io.novafoundation.nova.feature_account_api.domain.model.addressIn
 import io.novafoundation.nova.feature_account_api.domain.multisig.CallHash
 import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain
@@ -18,9 +19,24 @@ class PendingMultisigOperation(
    val call: GenericCall.Instance?,
    val callHash: CallHash,
    val chain: Chain,
-    val timePoint: MultisigTimePoint,
+    /**
     * Null means this call has never been submitted on-chain yet (no `Multisig.Multisigs` entry
     * exists) - the "first signer" case reachable via a `/open/multisigOperation` deep link
     * before anyone has signed. `composeMultisigAsMulti`'s `maybeTimePoint` parameter already
     * accepts null for exactly this (see `MultisigSigner.wrapCallsInAsMulti`, which uses the
     * same null-timepoint-for-first-submission pattern for ordinary multisig-origin calls) -
     * this model just didn't have a way to represent that state before.
     */
    val timePoint: MultisigTimePoint?,
    val approvals: List<AccountIdKey>,
-    val depositor: AccountIdKey,
+    /**
     * Null for the same not-yet-submitted case as [timePoint] - nobody has deposited/proposed
     * this call yet, so there is no depositor. [userAction] already handles this correctly:
     * comparing [signatoryAccountId] to a null depositor is simply never true, so a signatory
     * viewing a not-yet-submitted call is never offered "Reject" (rejecting something that was
     * never proposed makes no sense - only cancel_as_multi on an *existing* operation does).
     */
    val depositor: AccountIdKey?,
    val deposit: BigInteger,
    val signatoryAccountId: AccountIdKey,
    val signatoryMetaId: Long,
@@ -30,6 +46,9 @@ class PendingMultisigOperation(
    val operationId = PendingMultisigOperationId(multisigMetaId, chain.id, callHash.toHex())
    val isSubmittedOnChain: Boolean
        get() = timePoint != null
    override val identifier: String = operationId.identifier()
    override fun toString(): String {
@@ -78,3 +97,35 @@ fun PendingMultisigOperation.Companion.createOperationHash(metaAccount: MetaAcco
 fun PendingMultisigOperationId.Companion.create(metaAccount: MetaAccount, chain: Chain, callHash: String): PendingMultisigOperationId {
    return PendingMultisigOperationId(metaAccount.id, chain.id, callHash)
 }
 /**
 * Builds a synthetic [PendingMultisigOperation] for a call that has never been submitted
 * on-chain - the deep-link "first signer" case (see `MultisigOperationDetailsDeepLinkHandler`
 * and `RealMultisigOperationDetailsInteractor.buildNotYetSubmittedOperation`). Unlike
 * `PendingMultisigOperation.from` (used by the chain-storage-driven syncer), this never touches
 * chain state - everything it needs (threshold, other signatories) is already known locally
 * from the already-added [MultisigMetaAccount], and [call] comes from the deep link's `callData`
 * param, whose hash the caller must already have verified matches the link's `callHash`.
 */
 fun PendingMultisigOperation.Companion.notYetSubmitted(
    multisigMetaAccount: MultisigMetaAccount,
    call: GenericCall.Instance,
    callHash: CallHash,
    chain: Chain,
    timestamp: Duration,
 ): PendingMultisigOperation {
    return PendingMultisigOperation(
        multisigMetaId = multisigMetaAccount.id,
        call = call,
        callHash = callHash,
        chain = chain,
        timePoint = null,
        approvals = emptyList(),
        depositor = null,
        deposit = BigInteger.ZERO,
        signatoryAccountId = multisigMetaAccount.signatoryAccountId,
        signatoryMetaId = multisigMetaAccount.signatoryMetaId,
        threshold = multisigMetaAccount.threshold,
        timestamp = timestamp,
    )
 }
@@ -25,14 +25,25 @@ suspend fun SecretStoreV2.getAccountSecrets(
 fun AccountSecrets.keypair(chain: Chain): Keypair {
    return fold(
-        left = { mapMetaAccountSecretsToKeypair(it, ethereum = chain.isEthereumBased) },
+        // `tron` was missing here already (found while adding `solana`) - without it, exporting a
        // Tron account's private key from this call site would have silently returned the wrong
        // (Ethereum) keypair instead of the Tron-specific one. Fixed alongside, not a separate change.
        left = {
            mapMetaAccountSecretsToKeypair(
                it,
                ethereum = chain.isEthereumBased,
                tron = chain.isTronBased,
                bitcoin = chain.isBitcoinBased,
                solana = chain.isSolanaBased,
            )
        },
        right = { mapChainAccountSecretsToKeypair(it) }
    )
 }
 fun AccountSecrets.derivationPath(chain: Chain): String? {
    return fold(
-        left = { mapMetaAccountSecretsToDerivationPath(it, ethereum = chain.isEthereumBased) },
+        left = { mapMetaAccountSecretsToDerivationPath(it, ethereum = chain.isEthereumBased, bitcoin = chain.isBitcoinBased) },
        right = { it[ChainAccountSecrets.DerivationPath] }
    )
 }
@@ -52,6 +52,14 @@ interface LightMetaAccount {
     */
    val tronAddress: ByteArray?
    val tronPublicKey: ByteArray?
    /** Bitcoin account id (HASH160 of the compressed pubkey - see [io.novafoundation.nova.common.utils.hash160]). */
    val bitcoinAddress: ByteArray?
    val bitcoinPublicKey: ByteArray?
    /** Solana account id, which IS the raw Ed25519 public key itself - see SolanaAddress.kt's doc. */
    val solanaAddress: ByteArray?
    val solanaPublicKey: ByteArray?
    val isSelected: Boolean
    val name: String
    val type: Type
@@ -90,6 +98,10 @@ fun LightMetaAccount(
    parentMetaId: Long?,
    tronAddress: ByteArray? = null,
    tronPublicKey: ByteArray? = null,
    bitcoinAddress: ByteArray? = null,
    bitcoinPublicKey: ByteArray? = null,
    solanaAddress: ByteArray? = null,
    solanaPublicKey: ByteArray? = null,
 ) = object : LightMetaAccount {
    override val id: Long = id
    override val globallyUniqueId: String = globallyUniqueId
@@ -100,6 +112,10 @@ fun LightMetaAccount(
    override val ethereumPublicKey: ByteArray? = ethereumPublicKey
    override val tronAddress: ByteArray? = tronAddress
    override val tronPublicKey: ByteArray? = tronPublicKey
    override val bitcoinAddress: ByteArray? = bitcoinAddress
    override val bitcoinPublicKey: ByteArray? = bitcoinPublicKey
    override val solanaAddress: ByteArray? = solanaAddress
    override val solanaPublicKey: ByteArray? = solanaPublicKey
    override val isSelected: Boolean = isSelected
    override val name: String = name
    override val type: LightMetaAccount.Type = type
@@ -53,7 +53,7 @@ fun TableCellView.showWallet(walletModel: WalletModel) {
    walletModel.icon?.let(::setImage)
 }
-fun TableCellView.showAccountWithLoading(loadingState: ExtendedLoadingState<AccountModel>) {
+fun TableCellView.showAccountWithLoading(loadingState: ExtendedLoadingState<AccountModel?>) {
    showLoadingState(loadingState) {
        showAccount(it)
    }
@@ -13,6 +13,16 @@ android {
    buildFeatures {
        viewBinding true
    }
    testOptions {
        unitTests {
            // android.util.Log.* throws "Method ... not mocked" by default in plain JVM unit tests (no real
            // Android framework, no Robolectric) - TronAddressBackfillMigrationTest is the first test in this
            // module to exercise code that calls Log.d/Log.e. This makes those stubbed calls return harmless
            // defaults instead of throwing, which is what the framework's own stubs are meant for in this context.
            returnDefaultValues = true
        }
    }
 }
 dependencies {
@@ -7,6 +7,8 @@ import io.novafoundation.nova.common.data.secrets.v2.KeyPairSchema
 import io.novafoundation.nova.common.data.secrets.v2.MetaAccountSecrets
 import io.novafoundation.nova.common.data.secrets.v2.SecretStoreV2
 import io.novafoundation.nova.common.data.secrets.v2.derivationPath
 import io.novafoundation.nova.common.data.secrets.v2.bitcoinDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.bitcoinKeypair
 import io.novafoundation.nova.common.data.secrets.v2.entropy
 import io.novafoundation.nova.common.data.secrets.v2.ethereumDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.ethereumKeypair
@@ -15,8 +17,12 @@ import io.novafoundation.nova.common.data.secrets.v2.nonce
 import io.novafoundation.nova.common.data.secrets.v2.privateKey
 import io.novafoundation.nova.common.data.secrets.v2.publicKey
 import io.novafoundation.nova.common.data.secrets.v2.seed
 import io.novafoundation.nova.common.data.secrets.v2.solanaDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.solanaKeypair
 import io.novafoundation.nova.common.data.secrets.v2.substrateDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.substrateKeypair
 import io.novafoundation.nova.common.data.secrets.v2.tronDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.tronKeypair
 import io.novafoundation.nova.common.utils.filterNotNull
 import io.novafoundation.nova.common.utils.findById
 import io.novafoundation.nova.common.utils.mapToSet
@@ -90,6 +96,9 @@ class RealLocalAccountsCloudBackupFacade(
            substrate = baseSecrets.getSubstrateBackupSecrets(),
            ethereum = baseSecrets.getEthereumBackupSecrets(),
            chainAccounts = emptyList(),
            bitcoin = baseSecrets.getBitcoinBackupSecrets(),
            tron = baseSecrets.getTronBackupSecrets(),
            solana = baseSecrets.getSolanaBackupSecrets(),
        )
        return CloudBackup(
@@ -357,6 +366,9 @@ class RealLocalAccountsCloudBackupFacade(
            substrate = prepareSubstrateBackupSecrets(baseSecrets, joinedMetaAccountInfo),
            ethereum = baseSecrets.getEthereumBackupSecrets(),
            chainAccounts = chainAccountsFromChainSecrets + chainAccountFromAdditionalSecrets,
            bitcoin = baseSecrets.getBitcoinBackupSecrets(),
            tron = baseSecrets.getTronBackupSecrets(),
            solana = baseSecrets.getSolanaBackupSecrets(),
        )
    }
@@ -466,7 +478,13 @@ class RealLocalAccountsCloudBackupFacade(
            substrateKeyPair = substrate?.keypair?.toLocalKeyPair() ?: return null,
            substrateDerivationPath = substrate?.derivationPath,
            ethereumKeypair = ethereum?.keypair?.toLocalKeyPair(),
-            ethereumDerivationPath = ethereum?.derivationPath
+            ethereumDerivationPath = ethereum?.derivationPath,
            bitcoinKeypair = bitcoin?.keypair?.toLocalKeyPair(),
            bitcoinDerivationPath = bitcoin?.derivationPath,
            tronKeypair = tron?.keypair?.toLocalKeyPair(),
            tronDerivationPath = tron?.derivationPath,
            solanaKeypair = solana?.keypair?.toLocalKeyPair(),
            solanaDerivationPath = solana?.derivationPath
        )
    }
@@ -479,6 +497,33 @@ class RealLocalAccountsCloudBackupFacade(
        )
    }
    private fun EncodableStruct<MetaAccountSecrets>?.getBitcoinBackupSecrets(): CloudBackup.WalletPrivateInfo.BitcoinSecrets? {
        if (this == null) return null
        return CloudBackup.WalletPrivateInfo.BitcoinSecrets(
            keypair = bitcoinKeypair?.toBackupKeypairSecrets() ?: return null,
            derivationPath = bitcoinDerivationPath
        )
    }
    private fun EncodableStruct<MetaAccountSecrets>?.getTronBackupSecrets(): CloudBackup.WalletPrivateInfo.TronSecrets? {
        if (this == null) return null
        return CloudBackup.WalletPrivateInfo.TronSecrets(
            keypair = tronKeypair?.toBackupKeypairSecrets() ?: return null,
            derivationPath = tronDerivationPath
        )
    }
    private fun EncodableStruct<MetaAccountSecrets>?.getSolanaBackupSecrets(): CloudBackup.WalletPrivateInfo.SolanaSecrets? {
        if (this == null) return null
        return CloudBackup.WalletPrivateInfo.SolanaSecrets(
            keypair = solanaKeypair?.toBackupKeypairSecrets() ?: return null,
            derivationPath = solanaDerivationPath
        )
    }
    private fun EncodableStruct<MetaAccountSecrets>?.getSubstrateBackupSecrets(): CloudBackup.WalletPrivateInfo.SubstrateSecrets? {
        if (this == null) return null
@@ -520,7 +565,13 @@ class RealLocalAccountsCloudBackupFacade(
            ethereumPublicKey = metaAccount.ethereumPublicKey,
            name = metaAccount.name,
            type = metaAccount.type.toBackupWalletType() ?: return null,
-            chainAccounts = chainAccounts.mapToSet { chainAccount -> chainAccount.toBackupPublicChainAccount(chainsById) }
+            chainAccounts = chainAccounts.mapToSet { chainAccount -> chainAccount.toBackupPublicChainAccount(chainsById) },
            bitcoinAddress = metaAccount.bitcoinAddress,
            bitcoinPublicKey = metaAccount.bitcoinPublicKey,
            tronAddress = metaAccount.tronAddress,
            tronPublicKey = metaAccount.tronPublicKey,
            solanaAddress = metaAccount.solanaAddress,
            solanaPublicKey = metaAccount.solanaPublicKey,
        )
    }
@@ -542,7 +593,13 @@ class RealLocalAccountsCloudBackupFacade(
            isSelected = isSelected,
            position = accountPosition,
            status = MetaAccountLocal.Status.ACTIVE,
-            typeExtras = null
+            typeExtras = null,
            bitcoinAddress = bitcoinAddress,
            bitcoinPublicKey = bitcoinPublicKey,
            tronAddress = tronAddress,
            tronPublicKey = tronPublicKey,
            solanaAddress = solanaAddress,
            solanaPublicKey = solanaPublicKey,
        ).also {
            if (localIdOverwrite != null) {
                it.id = localIdOverwrite
@@ -8,6 +8,7 @@ import io.novafoundation.nova.feature_account_api.data.signer.SigningContext
 import io.novafoundation.nova.common.utils.min
 import io.novafoundation.nova.feature_account_api.data.extrinsic.ExtrinsicSplitter
 import io.novafoundation.nova.feature_account_api.data.extrinsic.SplitCalls
 import io.novafoundation.nova.runtime.ext.isPezkuwiChain
 import io.novafoundation.nova.runtime.ext.requireGenesisHash
 import io.novafoundation.nova.runtime.extrinsic.CustomTransactionExtensions
 import io.novafoundation.nova.runtime.extrinsic.extensions.PezkuwiCheckImmortal
@@ -142,15 +143,16 @@ internal class RealExtrinsicSplitter @Inject constructor(
    ): SendableExtrinsic {
        val genesisHash = chain.requireGenesisHash().fromHex()
-        val isPezkuwi = runtime.metadata.extrinsic.signedExtensions.any { it.id == "AuthorizeCall" }
+        val builder = ExtrinsicBuilder(
        return ExtrinsicBuilder(
            runtime = runtime,
            extrinsicVersion = ExtrinsicVersion.V4,
            batchMode = BatchMode.BATCH,
        ).apply {
-            // Use custom CheckMortality for Pezkuwi chains to avoid DictEnum type lookup issues
+            // Use custom CheckMortality for Pezkuwi chains to avoid DictEnum type lookup issues.
-            if (isPezkuwi) {
+            // Gated on chain identity (not signed-extension presence): both Pezkuwi and Polkadot
            // Asset Hub declare "AuthorizeCall", so that alone can't tell the chains apart, and
            // PezkuwiCheckImmortal's raw DictEnum value fails Polkadot's own Era type codec.
            if (chain.isPezkuwiChain) {
                setTransactionExtension(PezkuwiCheckImmortal(genesisHash))
            } else {
                setTransactionExtension(CheckMortality(Era.Immortal, genesisHash))
@@ -167,6 +169,8 @@ internal class RealExtrinsicSplitter @Inject constructor(
            val signingContext = signingContextFactory.default(chain)
            signer.setSignerDataForFee(signingContext)
-        }.buildExtrinsic()
+        }
        return builder.buildExtrinsic()
    }
 }
@@ -65,6 +65,10 @@ class AccountMappers(
                    ethereumPublicKey = ethereumPublicKey,
                    tronAddress = tronAddress,
                    tronPublicKey = tronPublicKey,
                    bitcoinAddress = bitcoinAddress,
                    bitcoinPublicKey = bitcoinPublicKey,
                    solanaAddress = solanaAddress,
                    solanaPublicKey = solanaPublicKey,
                    isSelected = isSelected,
                    name = name,
                    status = mapMetaAccountStateFromLocal(status),
@@ -82,6 +86,10 @@ class AccountMappers(
                    ethereumPublicKey = ethereumPublicKey,
                    tronAddress = tronAddress,
                    tronPublicKey = tronPublicKey,
                    bitcoinAddress = bitcoinAddress,
                    bitcoinPublicKey = bitcoinPublicKey,
                    solanaAddress = solanaAddress,
                    solanaPublicKey = solanaPublicKey,
                    isSelected = isSelected,
                    name = name,
                    type = type,
@@ -101,6 +109,10 @@ class AccountMappers(
                    ethereumPublicKey = ethereumPublicKey,
                    tronAddress = tronAddress,
                    tronPublicKey = tronPublicKey,
                    bitcoinAddress = bitcoinAddress,
                    bitcoinPublicKey = bitcoinPublicKey,
                    solanaAddress = solanaAddress,
                    solanaPublicKey = solanaPublicKey,
                    isSelected = isSelected,
                    name = name,
                    type = type,
@@ -119,6 +131,10 @@ class AccountMappers(
                    ethereumPublicKey = ethereumPublicKey,
                    tronAddress = tronAddress,
                    tronPublicKey = tronPublicKey,
                    bitcoinAddress = bitcoinAddress,
                    bitcoinPublicKey = bitcoinPublicKey,
                    solanaAddress = solanaAddress,
                    solanaPublicKey = solanaPublicKey,
                    isSelected = isSelected,
                    name = name,
                    type = type,
@@ -138,6 +154,10 @@ class AccountMappers(
                    ethereumPublicKey = ethereumPublicKey,
                    tronAddress = tronAddress,
                    tronPublicKey = tronPublicKey,
                    bitcoinAddress = bitcoinAddress,
                    bitcoinPublicKey = bitcoinPublicKey,
                    solanaAddress = solanaAddress,
                    solanaPublicKey = solanaPublicKey,
                    isSelected = isSelected,
                    name = name,
                    type = type,
@@ -165,6 +185,10 @@ class AccountMappers(
                        ethereumPublicKey = ethereumPublicKey,
                        tronAddress = tronAddress,
                        tronPublicKey = tronPublicKey,
                        bitcoinAddress = bitcoinAddress,
                        bitcoinPublicKey = bitcoinPublicKey,
                        solanaAddress = solanaAddress,
                        solanaPublicKey = solanaPublicKey,
                        isSelected = isSelected,
                        name = name,
                        status = mapMetaAccountStateFromLocal(status),
@@ -183,6 +207,10 @@ class AccountMappers(
                        ethereumPublicKey = ethereumPublicKey,
                        tronAddress = tronAddress,
                        tronPublicKey = tronPublicKey,
                        bitcoinAddress = bitcoinAddress,
                        bitcoinPublicKey = bitcoinPublicKey,
                        solanaAddress = solanaAddress,
                        solanaPublicKey = solanaPublicKey,
                        chainAccounts = chainAccounts,
                        isSelected = isSelected,
                        name = name,
@@ -30,6 +30,9 @@ import io.novafoundation.nova.feature_account_impl.data.mappers.AccountMappers
 import io.novafoundation.nova.feature_account_impl.data.mappers.mapMetaAccountTypeToLocal
 import io.novafoundation.nova.feature_account_impl.data.mappers.mapMetaAccountWithBalanceFromLocal
 import io.novafoundation.nova.feature_account_impl.data.repository.datasource.migration.AccountDataMigration
 import io.novafoundation.nova.feature_account_impl.data.repository.datasource.migration.BitcoinAddressBackfillMigration
 import io.novafoundation.nova.feature_account_impl.data.repository.datasource.migration.SolanaAddressBackfillMigration
 import io.novafoundation.nova.feature_account_impl.data.repository.datasource.migration.TronAddressBackfillMigration
 import io.novafoundation.nova.feature_account_impl.data.repository.datasource.migration.model.ChainAccountInsertionData
 import io.novafoundation.nova.feature_account_impl.data.repository.datasource.migration.model.MetaAccountInsertionData
 import io.novafoundation.nova.runtime.ext.accountIdOf
@@ -64,15 +67,45 @@ class AccountDataSourceImpl(
    private val secretsMetaAccountLocalFactory: SecretsMetaAccountLocalFactory,
    secretStoreV1: SecretStoreV1,
    accountDataMigration: AccountDataMigration,
    tronAddressBackfillMigration: TronAddressBackfillMigration,
    bitcoinAddressBackfillMigration: BitcoinAddressBackfillMigration,
    solanaAddressBackfillMigration: SolanaAddressBackfillMigration,
 ) : AccountDataSource, SecretStoreV1 by secretStoreV1 {
    init {
-        migrateIfNeeded(accountDataMigration)
+        // Run sequentially in one coroutine, not as independent launches - the Tron/Bitcoin/Solana backfills
-    }
+        // read accounts/secrets that the legacy migration may still be in the middle of writing for very old
        // (pre-MetaAccount) installs, and separate GlobalScope.launch calls give no ordering guarantee
        // relative to each other.
        async {
            Log.d("AccountDataSourceImpl", "migrations block starting")
-    private fun migrateIfNeeded(migration: AccountDataMigration) = async {
+            if (accountDataMigration.migrationNeeded()) {
-        if (migration.migrationNeeded()) {
+                accountDataMigration.migrate(::saveSecuritySource)
-            migration.migrate(::saveSecuritySource)
+            }
            Log.d("AccountDataSourceImpl", "about to run tronAddressBackfillMigration")
            tronAddressBackfillMigration.migrate()
            Log.d("AccountDataSourceImpl", "about to run bitcoinAddressBackfillMigration")
            bitcoinAddressBackfillMigration.migrate()
            Log.d("AccountDataSourceImpl", "about to run solanaAddressBackfillMigration")
            solanaAddressBackfillMigration.migrate()
            Log.d("AccountDataSourceImpl", "migrations block done")
            metaAccountDao.getMetaAccounts().forEach {
                Log.d(
                    "TronDiag",
                    "metaId=${it.id} name=${it.name} type=${it.type} isSelected=${it.isSelected} " +
                        "tronAddress=${it.tronAddress?.joinToString("") { b -> "%02x".format(b) } ?: "NULL"} " +
                        "tronPublicKey=${if (it.tronPublicKey != null) "present(${it.tronPublicKey!!.size}B)" else "NULL"}"
                )
            }
        }
    }
@@ -2,6 +2,7 @@ package io.novafoundation.nova.feature_account_impl.data.repository.datasource
 import io.novafoundation.nova.common.data.secrets.v2.KeyPairSchema
 import io.novafoundation.nova.common.data.secrets.v2.MetaAccountSecrets
 import io.novafoundation.nova.common.utils.bitcoinPublicKeyToAccountId
 import io.novafoundation.nova.common.utils.substrateAccountId
 import io.novafoundation.nova.common.utils.tronPublicKeyToAccountId
 import io.novafoundation.nova.core.model.CryptoType
@@ -31,6 +32,8 @@ class RealSecretsMetaAccountLocalFactory : SecretsMetaAccountLocalFactory {
        val substratePublicKey = secrets[MetaAccountSecrets.SubstrateKeypair][KeyPairSchema.PublicKey]
        val ethereumPublicKey = secrets[MetaAccountSecrets.EthereumKeypair]?.get(KeyPairSchema.PublicKey)
        val tronPublicKey = secrets[MetaAccountSecrets.TronKeypair]?.get(KeyPairSchema.PublicKey)
        val bitcoinPublicKey = secrets[MetaAccountSecrets.BitcoinKeypair]?.get(KeyPairSchema.PublicKey)
        val solanaPublicKey = secrets[MetaAccountSecrets.SolanaKeypair]?.get(KeyPairSchema.PublicKey)
        return MetaAccountLocal(
            substratePublicKey = substratePublicKey,
@@ -47,7 +50,16 @@ class RealSecretsMetaAccountLocalFactory : SecretsMetaAccountLocalFactory {
            globallyUniqueId = MetaAccountLocal.generateGloballyUniqueId(),
            typeExtras = null,
            tronPublicKey = tronPublicKey,
-            tronAddress = tronPublicKey?.tronPublicKeyToAccountId()
+            tronAddress = tronPublicKey?.tronPublicKeyToAccountId(),
            bitcoinPublicKey = bitcoinPublicKey,
            // Bip32EcdsaKeypairFactory already yields a compressed (33-byte) public key (confirmed against
            // substrate-sdk-android's own source: ECDSAUtils.derivePublicKey -> compressedPublicKeyFromPrivate),
            // which is exactly the format both BIP143 (P2WPKH) and bitcoinPublicKeyToAccountId() require - no
            // extra compression/decompression step needed here, unlike Ethereum's uncompressed-key derivation.
            bitcoinAddress = bitcoinPublicKey?.bitcoinPublicKeyToAccountId(),
            // Solana's accountId IS the public key itself, no hash/transform step - see SolanaAddress.kt's doc.
            solanaPublicKey = solanaPublicKey,
            solanaAddress = solanaPublicKey
        )
    }
 }
@@ -0,0 +1,125 @@
 package io.novafoundation.nova.feature_account_impl.data.repository.datasource.migration
 import android.util.Log
 import io.novafoundation.nova.common.data.secrets.v2.ChainAccountSecrets
 import io.novafoundation.nova.common.data.secrets.v2.MetaAccountSecrets
 import io.novafoundation.nova.common.data.secrets.v2.SecretStoreV2
 import io.novafoundation.nova.common.data.secrets.v2.bitcoinDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.bitcoinKeypair
 import io.novafoundation.nova.common.data.secrets.v2.entropy
 import io.novafoundation.nova.common.data.secrets.v2.ethereumDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.ethereumKeypair
 import io.novafoundation.nova.common.data.secrets.v2.mapKeypairStructToKeypair
 import io.novafoundation.nova.common.data.secrets.v2.seed
 import io.novafoundation.nova.common.data.secrets.v2.solanaDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.solanaKeypair
 import io.novafoundation.nova.common.data.secrets.v2.substrateDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.substrateKeypair
 import io.novafoundation.nova.common.data.secrets.v2.tronDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.tronKeypair
 import io.novafoundation.nova.common.utils.bitcoinPublicKeyToAccountId
 import io.novafoundation.nova.core_db.dao.MetaAccountDao
 import io.novafoundation.nova.core_db.dao.updateMetaAccount
 import io.novafoundation.nova.core_db.model.chain.account.MetaAccountLocal
 import io.novafoundation.nova.feature_account_impl.data.secrets.AccountSecretsFactory
 import io.novafoundation.nova.feature_account_impl.data.secrets.BITCOIN_DEFAULT_DERIVATION_PATH
 import io.novasama.substrate_sdk_android.encrypt.mnemonic.MnemonicCreator
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 private const val TAG = "BitcoinAddressBackfill"
 /**
 * Idempotent, per-account backfill for accounts that don't yet have a Bitcoin keypair - mirrors
 * [TronAddressBackfillMigration]'s exact design (see that class for the full rationale): any account created
 * before Bitcoin support existed has no `MetaAccountSecrets.BitcoinKeypair`/`meta_accounts.bitcoinAddress` yet,
 * and this fills it in from the account's own mnemonic without requiring re-import.
 *
 * Deliberately has NO "have I already run once" flag, for the same reason as the Tron migration: a one-shot
 * flag that gets set even when backfill legitimately still didn't produce a key (e.g. a since-fixed bug kept
 * re-losing it) would permanently strand that account. This is cheap to call for an account that doesn't need
 * it, so it just runs unconditionally on every app start.
 *
 * Only touches accounts that are `Type.SECRETS` (mnemonic-derived) and still hold their `Entropy` in
 * [SecretStoreV2] - same restriction as the Tron migration, for the same reason (watch-only/Ledger/Json/
 * multisig/proxied accounts and raw-seed imports never had a Bitcoin-capable mnemonic to derive from).
 */
 class BitcoinAddressBackfillMigration(
    private val secretStoreV2: SecretStoreV2,
    private val metaAccountDao: MetaAccountDao,
    private val accountSecretsFactory: AccountSecretsFactory,
 ) {
    suspend fun migrate() = withContext(Dispatchers.Default) {
        val secretsAccounts = metaAccountDao.getMetaAccounts().filter { it.type == MetaAccountLocal.Type.SECRETS }
        Log.d(TAG, "migrate() starting - ${secretsAccounts.size} SECRETS-type account(s): ${secretsAccounts.map { it.id }}")
        secretsAccounts.forEach { account ->
            try {
                backfillIfNeeded(account)
            } catch (e: Throwable) {
                Log.e(TAG, "backfill failed for metaId=${account.id}, continuing with remaining accounts", e)
            }
        }
        Log.d(TAG, "migrate() done")
    }
    private suspend fun backfillIfNeeded(account: MetaAccountLocal) {
        val secrets = secretStoreV2.getMetaAccountSecrets(account.id)
        if (secrets == null) {
            Log.d(TAG, "metaId=${account.id}: no stored secrets at all (watch-only/Ledger/etc) - skipping")
            return
        }
        val entropy = secrets.entropy
        if (entropy == null) {
            Log.d(TAG, "metaId=${account.id}: no entropy (raw-seed import, not a mnemonic) - skipping")
            return
        }
        if (secrets.bitcoinKeypair != null) {
            Log.d(TAG, "metaId=${account.id}: already has a BitcoinKeypair - skipping")
            return
        }
        val substrateCryptoType = account.substrateCryptoType
        if (substrateCryptoType == null) {
            Log.d(TAG, "metaId=${account.id}: substrateCryptoType is null - skipping")
            return
        }
        Log.d(TAG, "metaId=${account.id}: deriving Bitcoin keypair")
        val mnemonic = MnemonicCreator.fromEntropy(entropy).words
        val bitcoinChainSecrets = accountSecretsFactory.chainAccountSecrets(
            derivationPath = BITCOIN_DEFAULT_DERIVATION_PATH,
            accountSource = AccountSecretsFactory.AccountSource.Mnemonic(substrateCryptoType, mnemonic),
            isEthereum = true
        ).secrets
        val bitcoinKeypair = mapKeypairStructToKeypair(bitcoinChainSecrets[ChainAccountSecrets.Keypair])
        val updatedSecrets = MetaAccountSecrets(
            substrateKeyPair = mapKeypairStructToKeypair(secrets.substrateKeypair),
            entropy = secrets.entropy,
            substrateSeed = secrets.seed,
            substrateDerivationPath = secrets.substrateDerivationPath,
            ethereumKeypair = secrets.ethereumKeypair?.let(::mapKeypairStructToKeypair),
            ethereumDerivationPath = secrets.ethereumDerivationPath,
            tronKeypair = secrets.tronKeypair?.let(::mapKeypairStructToKeypair),
            tronDerivationPath = secrets.tronDerivationPath,
            bitcoinKeypair = bitcoinKeypair,
            bitcoinDerivationPath = BITCOIN_DEFAULT_DERIVATION_PATH,
            // Must carry this forward unchanged - dropping it would silently wipe an already-backfilled
            // Solana keypair, since this migration re-runs unconditionally on every app start (see class doc).
            solanaKeypair = secrets.solanaKeypair?.let(::mapKeypairStructToKeypair),
            solanaDerivationPath = secrets.solanaDerivationPath,
        )
        secretStoreV2.putMetaAccountSecrets(account.id, updatedSecrets)
        val bitcoinAccountId = bitcoinKeypair.publicKey.bitcoinPublicKeyToAccountId()
        metaAccountDao.updateMetaAccount(account.id) { it.addBitcoinAccount(bitcoinKeypair.publicKey, bitcoinAccountId) }
        Log.d(TAG, "metaId=${account.id}: backfilled successfully, bitcoinAddress set (${bitcoinAccountId.size} bytes)")
    }
 }
@@ -0,0 +1,115 @@
 package io.novafoundation.nova.feature_account_impl.data.repository.datasource.migration
 import android.util.Log
 import io.novafoundation.nova.common.data.secrets.v2.MetaAccountSecrets
 import io.novafoundation.nova.common.data.secrets.v2.SecretStoreV2
 import io.novafoundation.nova.common.data.secrets.v2.bitcoinDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.bitcoinKeypair
 import io.novafoundation.nova.common.data.secrets.v2.entropy
 import io.novafoundation.nova.common.data.secrets.v2.ethereumDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.ethereumKeypair
 import io.novafoundation.nova.common.data.secrets.v2.mapKeypairStructToKeypair
 import io.novafoundation.nova.common.data.secrets.v2.seed
 import io.novafoundation.nova.common.data.secrets.v2.solanaKeypair
 import io.novafoundation.nova.common.data.secrets.v2.substrateDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.substrateKeypair
 import io.novafoundation.nova.common.data.secrets.v2.tronDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.tronKeypair
 import io.novafoundation.nova.common.utils.Bip32Ed25519KeypairFactory
 import io.novafoundation.nova.core_db.dao.MetaAccountDao
 import io.novafoundation.nova.core_db.dao.updateMetaAccount
 import io.novafoundation.nova.core_db.model.chain.account.MetaAccountLocal
 import io.novafoundation.nova.feature_account_impl.data.secrets.SOLANA_DEFAULT_DERIVATION_PATH
 import io.novafoundation.nova.feature_account_impl.data.secrets.SOLANA_DEFAULT_DERIVATION_PATH_SEGMENTS
 import io.novasama.substrate_sdk_android.encrypt.mnemonic.MnemonicCreator
 import io.novasama.substrate_sdk_android.encrypt.seed.bip39.Bip39SeedFactory
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 private const val TAG = "SolanaAddressBackfill"
 /**
 * Idempotent, per-account backfill for accounts that don't yet have a Solana keypair - mirrors
 * [TronAddressBackfillMigration]/[BitcoinAddressBackfillMigration]'s exact design (see those classes for the
 * full rationale). Deliberately has NO "have I already run once" flag, for the same stuck-flag reason.
 *
 * Only touches accounts that are `Type.SECRETS` and still hold their `Entropy` in [SecretStoreV2] - same
 * restriction as the Tron/Bitcoin migrations.
 *
 * Unlike Tron/Bitcoin (which reuse [io.novafoundation.nova.feature_account_impl.data.secrets.AccountSecretsFactory.chainAccountSecrets]
 * with `isEthereum = true`, since both are secp256k1/BIP32), Solana is Ed25519/SLIP-0010 - a different curve and
 * derivation scheme entirely - so this derives the seed directly via [Bip39SeedFactory.deriveSeed] (the exact
 * same chain-agnostic BIP39 seed step Tron/Bitcoin/Ethereum all use) and feeds it to [Bip32Ed25519KeypairFactory]
 * at [SOLANA_DEFAULT_DERIVATION_PATH_SEGMENTS], the same call `AccountSecretsFactory.metaAccountSecrets()` makes
 * for a fresh account - so a backfilled account ends up with byte-for-byte the same Solana address it would
 * have gotten had it been created today.
 *
 * Carries every other chain-family field (substrate/ethereum/tron/bitcoin) forward unchanged when rewriting
 * secrets - dropping any of them here would silently wipe an already-backfilled sibling key on retry.
 */
 class SolanaAddressBackfillMigration(
    private val secretStoreV2: SecretStoreV2,
    private val metaAccountDao: MetaAccountDao,
 ) {
    suspend fun migrate() = withContext(Dispatchers.Default) {
        val secretsAccounts = metaAccountDao.getMetaAccounts().filter { it.type == MetaAccountLocal.Type.SECRETS }
        Log.d(TAG, "migrate() starting - ${secretsAccounts.size} SECRETS-type account(s): ${secretsAccounts.map { it.id }}")
        secretsAccounts.forEach { account ->
            try {
                backfillIfNeeded(account)
            } catch (e: Throwable) {
                Log.e(TAG, "backfill failed for metaId=${account.id}, continuing with remaining accounts", e)
            }
        }
        Log.d(TAG, "migrate() done")
    }
    private suspend fun backfillIfNeeded(account: MetaAccountLocal) {
        val secrets = secretStoreV2.getMetaAccountSecrets(account.id)
        if (secrets == null) {
            Log.d(TAG, "metaId=${account.id}: no stored secrets at all (watch-only/Ledger/etc) - skipping")
            return
        }
        val entropy = secrets.entropy
        if (entropy == null) {
            Log.d(TAG, "metaId=${account.id}: no entropy (raw-seed import, not a mnemonic) - skipping")
            return
        }
        if (secrets.solanaKeypair != null) {
            Log.d(TAG, "metaId=${account.id}: already has a SolanaKeypair - skipping")
            return
        }
        Log.d(TAG, "metaId=${account.id}: deriving Solana keypair")
        val mnemonic = MnemonicCreator.fromEntropy(entropy).words
        val bip39Seed = Bip39SeedFactory.deriveSeed(mnemonic, null).seed
        val solanaKeypair = Bip32Ed25519KeypairFactory.generate(bip39Seed, SOLANA_DEFAULT_DERIVATION_PATH_SEGMENTS)
        val updatedSecrets = MetaAccountSecrets(
            substrateKeyPair = mapKeypairStructToKeypair(secrets.substrateKeypair),
            entropy = secrets.entropy,
            substrateSeed = secrets.seed,
            substrateDerivationPath = secrets.substrateDerivationPath,
            ethereumKeypair = secrets.ethereumKeypair?.let(::mapKeypairStructToKeypair),
            ethereumDerivationPath = secrets.ethereumDerivationPath,
            tronKeypair = secrets.tronKeypair?.let(::mapKeypairStructToKeypair),
            tronDerivationPath = secrets.tronDerivationPath,
            bitcoinKeypair = secrets.bitcoinKeypair?.let(::mapKeypairStructToKeypair),
            bitcoinDerivationPath = secrets.bitcoinDerivationPath,
            solanaKeypair = solanaKeypair,
            solanaDerivationPath = SOLANA_DEFAULT_DERIVATION_PATH
        )
        secretStoreV2.putMetaAccountSecrets(account.id, updatedSecrets)
        // Solana's accountId IS the public key itself - see SolanaAddress.kt's doc.
        metaAccountDao.updateMetaAccount(account.id) { it.addSolanaAccount(solanaKeypair.publicKey, solanaKeypair.publicKey) }
        Log.d(TAG, "metaId=${account.id}: backfilled successfully, solanaAddress set (${solanaKeypair.publicKey.size} bytes)")
    }
 }
@@ -0,0 +1,139 @@
 package io.novafoundation.nova.feature_account_impl.data.repository.datasource.migration
 import android.util.Log
 import io.novafoundation.nova.common.data.secrets.v2.ChainAccountSecrets
 import io.novafoundation.nova.common.data.secrets.v2.MetaAccountSecrets
 import io.novafoundation.nova.common.data.secrets.v2.SecretStoreV2
 import io.novafoundation.nova.common.data.secrets.v2.bitcoinDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.bitcoinKeypair
 import io.novafoundation.nova.common.data.secrets.v2.entropy
 import io.novafoundation.nova.common.data.secrets.v2.ethereumDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.ethereumKeypair
 import io.novafoundation.nova.common.data.secrets.v2.mapKeypairStructToKeypair
 import io.novafoundation.nova.common.data.secrets.v2.seed
 import io.novafoundation.nova.common.data.secrets.v2.solanaDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.solanaKeypair
 import io.novafoundation.nova.common.data.secrets.v2.substrateDerivationPath
 import io.novafoundation.nova.common.data.secrets.v2.substrateKeypair
 import io.novafoundation.nova.common.data.secrets.v2.tronKeypair
 import io.novafoundation.nova.common.utils.tronPublicKeyToAccountId
 import io.novafoundation.nova.core_db.dao.MetaAccountDao
 import io.novafoundation.nova.core_db.dao.updateMetaAccount
 import io.novafoundation.nova.core_db.model.chain.account.MetaAccountLocal
 import io.novafoundation.nova.feature_account_impl.data.secrets.AccountSecretsFactory
 import io.novafoundation.nova.feature_account_impl.data.secrets.TRON_DEFAULT_DERIVATION_PATH
 import io.novasama.substrate_sdk_android.encrypt.mnemonic.MnemonicCreator
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 private const val TAG = "TronAddressBackfill"
 /**
 * Idempotent, per-account backfill for accounts that don't yet have a Tron keypair - both accounts created
 * before Tron support existed, AND accounts whose Tron keypair was lost some other way (e.g. the cloud-backup
 * schema round trip that used to silently drop it before every wallet had a `tron` field to serialize into -
 * see CloudBackup.kt). `73_74_AddTronSupport` (the migration that added `meta_accounts.tronPublicKey`/
 * `tronAddress`) is, like every other migration in this codebase, pure `ALTER TABLE` - it never derives a value
 * for pre-existing rows.
 *
 * Deliberately has NO "have I already run once" flag: an earlier version of this class gated itself behind a
 * one-shot SharedPreferences flag, which meant that once it ran and marked itself done - even for an account
 * that legitimately still lacked a Tron keypair afterwards (e.g. because a *different*, since-fixed bug kept
 * re-losing it) - it would never run again for that account, ever, on that install. [backfillIfNeeded] is cheap
 * to call for an account that doesn't need it (a handful of null-checks, no derivation), so this just runs
 * unconditionally on every app start instead: self-healing by construction, no stuck-flag failure mode possible.
 *
 * Only touches accounts that are:
 * - `Type.SECRETS` (mnemonic-derived) - watch-only/Ledger/Json/multisig/proxied accounts never had a
 *   Tron-capable mnemonic and are correctly left with `tronAddress == null` forever, same as they already are
 *   for Ethereum.
 * - still holding their `Entropy` in [SecretStoreV2] - an account imported from a raw seed/keypair rather than
 *   a mnemonic has no entropy either and is likewise correctly left alone.
 * - missing a `TronKeypair` - i.e. not already backfilled and not created after Tron support shipped.
 *
 * The Tron keypair is derived via [AccountSecretsFactory.chainAccountSecrets] with `isEthereum = true` (Tron
 * reuses the exact same secp256k1/BIP32 derivation as Ethereum, just under its own SLIP-44 coin-type-195 path -
 * see that class's own doc comment) at [TRON_DEFAULT_DERIVATION_PATH], the same call this codebase's own
 * `metaAccountSecrets()` makes for a fresh account - so a backfilled account ends up with byte-for-byte the
 * same Tron address it would have gotten had it been created today, not a separately-reimplemented derivation.
 */
 class TronAddressBackfillMigration(
    private val secretStoreV2: SecretStoreV2,
    private val metaAccountDao: MetaAccountDao,
    private val accountSecretsFactory: AccountSecretsFactory,
 ) {
    suspend fun migrate() = withContext(Dispatchers.Default) {
        val secretsAccounts = metaAccountDao.getMetaAccounts().filter { it.type == MetaAccountLocal.Type.SECRETS }
        Log.d(TAG, "migrate() starting - ${secretsAccounts.size} SECRETS-type account(s): ${secretsAccounts.map { it.id }}")
        secretsAccounts.forEach { account ->
            try {
                backfillIfNeeded(account)
            } catch (e: Throwable) {
                Log.e(TAG, "backfill failed for metaId=${account.id}, continuing with remaining accounts", e)
            }
        }
        Log.d(TAG, "migrate() done")
    }
    private suspend fun backfillIfNeeded(account: MetaAccountLocal) {
        val secrets = secretStoreV2.getMetaAccountSecrets(account.id)
        if (secrets == null) {
            Log.d(TAG, "metaId=${account.id}: no stored secrets at all (watch-only/Ledger/etc) - skipping")
            return
        }
        val entropy = secrets.entropy
        if (entropy == null) {
            Log.d(TAG, "metaId=${account.id}: no entropy (raw-seed import, not a mnemonic) - skipping")
            return
        }
        if (secrets.tronKeypair != null) {
            Log.d(TAG, "metaId=${account.id}: already has a TronKeypair - skipping")
            return
        }
        val substrateCryptoType = account.substrateCryptoType
        if (substrateCryptoType == null) {
            Log.d(TAG, "metaId=${account.id}: substrateCryptoType is null - skipping")
            return
        }
        Log.d(TAG, "metaId=${account.id}: deriving Tron keypair")
        val mnemonic = MnemonicCreator.fromEntropy(entropy).words
        val tronChainSecrets = accountSecretsFactory.chainAccountSecrets(
            derivationPath = TRON_DEFAULT_DERIVATION_PATH,
            accountSource = AccountSecretsFactory.AccountSource.Mnemonic(substrateCryptoType, mnemonic),
            isEthereum = true
        ).secrets
        val tronKeypair = mapKeypairStructToKeypair(tronChainSecrets[ChainAccountSecrets.Keypair])
        val updatedSecrets = MetaAccountSecrets(
            substrateKeyPair = mapKeypairStructToKeypair(secrets.substrateKeypair),
            entropy = secrets.entropy,
            substrateSeed = secrets.seed,
            substrateDerivationPath = secrets.substrateDerivationPath,
            ethereumKeypair = secrets.ethereumKeypair?.let(::mapKeypairStructToKeypair),
            ethereumDerivationPath = secrets.ethereumDerivationPath,
            tronKeypair = tronKeypair,
            tronDerivationPath = TRON_DEFAULT_DERIVATION_PATH,
            // Must carry these forward unchanged - dropping them would silently wipe an
            // already-backfilled sibling keypair, since this migration re-runs unconditionally
            // on every app start (see class doc).
            bitcoinKeypair = secrets.bitcoinKeypair?.let(::mapKeypairStructToKeypair),
            bitcoinDerivationPath = secrets.bitcoinDerivationPath,
            solanaKeypair = secrets.solanaKeypair?.let(::mapKeypairStructToKeypair),
            solanaDerivationPath = secrets.solanaDerivationPath,
        )
        secretStoreV2.putMetaAccountSecrets(account.id, updatedSecrets)
        val tronAccountId = tronKeypair.publicKey.tronPublicKeyToAccountId()
        metaAccountDao.updateMetaAccount(account.id) { it.addTronAccount(tronKeypair.publicKey, tronAccountId) }
        Log.d(TAG, "metaId=${account.id}: backfilled successfully, tronAddress set (${tronAccountId.size} bytes)")
    }
 }
--- a/Show More
+++ b/Show More