Merge pull request #755 from alephium/next

next -> master: fixing dw and mw issues, prep for releases

.github/workflows/deploy-gh-pages-explorer.yml

@@ -6,7 +6,7 @@ on:
 
 env:
   VITE_BACKEND_URL: https://backend.testnet.alephium.org
-  VITE_NODE_URL: https://wallet.testnet.alephium.org
+  VITE_NODE_URL: https://node.testnet.alephium.org
   VITE_NETWORK_TYPE: testnet
 
 # Sets the GITHUB_TOKEN permissions to allow deployment to GitHub Pages

.github/workflows/deploy-mainnet-explorer.yml

@@ -9,9 +9,9 @@ env:
   AWS_DEFAULT_REGION: eu-central-1
   AWS_DISTRIBUTION_ID: ${{ secrets.AWS_DISTRIBUTION_ID_MAINNET }}
   AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME_MAINNET }}
-  VITE_BACKEND_URL: https://backend-v115.mainnet.alephium.org
+  VITE_BACKEND_URL: https://backend.mainnet.alephium.org
   VITE_NETWORK_TYPE: mainnet
-  VITE_NODE_URL: https://node-v20.mainnet.alephium.org
+  VITE_NODE_URL: https://node.mainnet.alephium.org
 
 jobs:
   deploy-mainnet-explorer:

.github/workflows/release-desktop.yml

@@ -4,6 +4,10 @@ on:
   push:
     tags: ['alephium-desktop-wallet@[0-9]+.[0-9]+.[0-9]+*']
 
+env:
+  GH_TOKEN: ${{ secrets.github_token }}
+  ADBLOCK: true
+
 jobs:
   release-desktop-wallet:
     runs-on: ${{ matrix.os }}
@@ -19,50 +23,70 @@ jobs:
       - name: 🏗 Setup monorepo
         uses: ./.github/actions/setup-monorepo
 
+      # macOS
       - name: Prepare for app notarization
         if: startsWith(matrix.os, 'macos')
         run: |
           mkdir -p ~/private_keys/
           echo '${{ secrets.api_key }}' > ~/private_keys/AuthKey_${{ secrets.api_key_id }}.p8
           echo '${{ secrets.mac_certs }}' | base64 -d > applecert.p12
 
-      - name: Extract args
+      - name: Build & release macOS Electron app
         if: startsWith(matrix.os, 'macos')
-        id: get-args
-        run: echo "args=--universal" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Install Snapcraft
-        uses: samuelmeuli/action-snapcraft@v2
-        if: startsWith(matrix.os, 'ubuntu')
-
-      - name: Build & release Electron app
-        uses: nop33/[email protected]
-        if: ${{ startsWith(github.ref, 'refs/tags/alephium-desktop-wallet@') }}
-        with:
-          package_root: 'apps/desktop-wallet'
-          build_script_name: 'ci:build'
-          is_monorepo: true
-          release: true
-          github_token: ${{ secrets.github_token }}
-          mac_certs: ${{ secrets.MAC_CERTS }}
-          mac_certs_password: ${{ secrets.MAC_CERTS_PASSWORD }}
-          args: ${{ steps.get-args.outputs.args }}
         env:
+          CSC_LINK: ${{ secrets.MAC_CERTS }}
+          CSC_KEY_PASSWORD: ${{ secrets.MAC_CERTS_PASSWORD }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
           APPLEID: ${{ secrets.APPLE_ID }}
           APPLEIDPASS: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
-          WINDOWS_SIGN_USER_NAME: ${{ secrets.WINDOWS_SIGN_USER_NAME }}
-          WINDOWS_SIGN_PASSWORD: ${{ secrets.WINDOWS_SIGN_PASSWORD }}
-          WINDOWS_SIGN_CREDENTIAL_ID: ${{ secrets.WINDOWS_SIGN_CREDENTIAL_ID }}
-          WINDOWS_SIGN_TOTP_SECRET: ${{ secrets.WINDOWS_SIGN_TOTP_SECRET }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
+        run: |
+          echo "Enter desktop wallet dir, install deps, build app, package it with electron-builder, and release it"
+          cd apps/desktop-wallet
+          pnpm install
+          pnpm ci:build
+          pnpm electron-builder --mac --universal --publish always
 
       - name: Upload notarization-error.log
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: notarization-error-log
           path: ${{ github.workspace }}/apps/desktop-wallet/notarization-error.log
+
+      # Windows
+      - name: Build & release Windows Electron app
+        if: startsWith(matrix.os, 'windows')
+        env:
+          # Replace WINDOWS_ vars with CSC_ ones if you want to use the code signing tool of electron-builder
+          # CSC_LINK: ${{ secrets.WINDOW_CERTS }}
+          # CSC_KEY_PASSWORD: ${{ secrets.WINDOWS_CERTS_PASSWORD }}
+          # Following vars are needed in the apps/desktop-wallet/.signWindows.js file
+          WINDOWS_SIGN_USER_NAME: ${{ secrets.WINDOWS_SIGN_USER_NAME }}
+          WINDOWS_SIGN_PASSWORD: ${{ secrets.WINDOWS_SIGN_PASSWORD }}
+          WINDOWS_SIGN_CREDENTIAL_ID: ${{ secrets.WINDOWS_SIGN_CREDENTIAL_ID }}
+          WINDOWS_SIGN_TOTP_SECRET: ${{ secrets.WINDOWS_SIGN_TOTP_SECRET }}
+        run: |
+          echo "Enter desktop wallet dir, install deps, build app, package it with electron-builder, and release it"
+          cd apps/desktop-wallet
+          pnpm install
+          pnpm ci:build
+          pnpm electron-builder --windows --publish always
+
+      # Linux
+      - name: Install Snapcraft
+        uses: samuelmeuli/action-snapcraft@v2
+        if: startsWith(matrix.os, 'ubuntu')
+
+      - name: Build & release Linux Electron app
+        if: startsWith(matrix.os, 'ubuntu')
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
+        run: |
+          echo "Enter desktop wallet dir, install deps, build app, package it with electron-builder, and release it"
+          cd apps/desktop-wallet
+          pnpm install
+          pnpm ci:build
+          pnpm electron-builder --linux --publish always

apps/desktop-wallet/.signWindows.js

@@ -90,20 +90,7 @@ async function sign(configuration) {
     console.log('---CONFIG FILE CONTENTS END---\n')
     fs.writeFileSync(destConfig, sourceConfig, { encoding: 'utf-8', flag: 'w' })
 
-    let execCmd = path.join(ARCHIVE_PATH, CODESIGNTOOL_WINDOWS_RUN_CMD)
-    let batScriptContents = fs.readFileSync(execCmd, { encoding: 'utf-8', flag: 'r' })
-
-    console.log('\n---BAT SCRIPT FILE CONTENTS START---')
-    console.log(batScriptContents)
-    console.log('---BAT SCRIPT FILE CONTENTS END---\n')
-
-    console.log('\nTweaking bat script to add -Xmx and " around args...')
-    batScriptContents = batScriptContents.replace(/java -jar/g, 'java -Xmx2048M -jar').replace(/\$@/g, `"\$@"`)
-
-    console.log('\n---BAT SCRIPT FILE CONTENTS AFTER TWEAKING START---')
-    console.log(batScriptContents)
-    console.log('---BAT SCRIPT FILE CONTENTS AFTER TWEAKING END---\n')
-    fs.writeFileSync(execCmd, batScriptContents, { encoding: 'utf-8', flag: 'w' })
+    const execCmd = path.join(ARCHIVE_PATH, CODESIGNTOOL_WINDOWS_RUN_CMD)
     fs.chmodSync(execCmd, '0755')
 
     process.env['CODE_SIGN_TOOL_PATH'] = ARCHIVE_PATH

apps/desktop-wallet/CHANGELOG.md

@@ -1,5 +1,11 @@
 # alephium-desktop-wallet
 
+## 2.3.7
+
+### Patch Changes
+
+- 2e044c9: Fix missing default address
+
 ## 2.3.5
 
 ### Patch Changes

apps/desktop-wallet/locales/de-DE/translation.json

@@ -106,6 +106,7 @@
   "Download": "Herunterladen",
   "Download failed": "Herunterladen fehlgeschlagen",
   "Try again later.": "Versuchen Sie es später erneut.",
+  "Downloading version {{ newVersion }}...": "Lade Version {{ newVersion }} herunter ...",
   "Duration in minutes after which an idle wallet will lock automatically.": "Dauer in Minuten, nach der eine inaktive Wallet automatisch gesperrt wird.",
   "Easily organize your addresses and your contacts for a more serene transfer experience.": "Organisieren Sie einfach Ihre Adressen und Kontakte für ein angenehmeres Transfererlebnis.",
   "Edit": "Bearbeiten",
@@ -320,7 +321,6 @@
   "The group of the selected address ({{ addressGroup }}) does not match the group required by WalletConnect ({{ walletConnectGroup }})": "Die Gruppe der ausgewählten Adresse ({{ addressGroup }}) entspricht nicht der von WalletConnect benötigten Gruppe ({{ walletConnectGroup }})",
   "The wallet is offline.": "Die Wallet ist offline.",
   "Theme": "Erscheinungsbild",
-  "There are no addresses in the required group: {{ group }}": "Keine Adressen in der benötigten Gruppe: {{ group }}",
   "There are no addresses with available balance. Please, send some funds to one of your addresses, and try again.": "Es gibt keine Adressen mit verfügbarem Guthaben. Bitte senden Sie Guthaben an eine Ihrer Adressen und versuchen Sie es erneut.",
   "There are no available addresses.": "Keine Adressen verfügbar.",
   "This address is not valid": "Diese Adresse ist nicht gültig",
@@ -368,6 +368,7 @@
   "Version": "Version",
   "Version {{ newVersion }} is available": "Version {{ newVersion }} ist verfügbar",
   "Please, download it and install it to avoid any issues with the wallet.": "Bitte laden Sie sie herunter und installieren Sie sie, um Probleme mit der Wallet zu vermeiden.",
+  "Download finished": "Herunterladen beendet",
   "Wallet": "Wallet",
   "Wallet list": "Walletliste",
   "Wallet name": "Walletname",

apps/desktop-wallet/locales/el-GR/translation.json

@@ -320,7 +320,6 @@
   "The group of the selected address ({{ addressGroup }}) does not match the group required by WalletConnect ({{ walletConnectGroup }})": "Η ομάδα της επιλεγμένης διεύθυνσης ({{ addressGroup }}) δεν ταιριάζει με την ομάδα που απαιτείται από το WalletConnect ({{ walletConnectGroup }})",
   "The wallet is offline.": "Το πορτοφόλι είναι εκτός σύνδεσης.",
   "Theme": "Θέμα",
-  "There are no addresses in the required group: {{ group }}": "Δεν υπάρχουν διευθύνσεις στην απαιτούμενη ομάδα: {{ group }}",
   "There are no addresses with available balance. Please, send some funds to one of your addresses, and try again.": "Δεν υπάρχουν διευθύνσεις με διαθέσιμο υπόλοιπο. Παρακαλώ, στείλτε χρήματα σε μία από τις διευθύνσεις σας και προσπαθήστε ξανά.",
   "There are no available addresses.": "Δεν υπάρχουν διαθέσιμες διευθύνσεις.",
   "This address is not valid": "Αυτή η διεύθυνση δεν είναι έγκυρη",

apps/desktop-wallet/locales/en-US/translation.json

@@ -321,7 +321,6 @@
   "The group of the selected address ({{ addressGroup }}) does not match the group required by WalletConnect ({{ walletConnectGroup }})": "The group of the selected address ({{ addressGroup }}) does not match the group required by WalletConnect ({{ walletConnectGroup }})",
   "The wallet is offline.": "The wallet is offline.",
   "Theme": "Theme",
-  "There are no addresses in the required group: {{ group }}": "There are no addresses in the required group: {{ group }}",
   "There are no addresses with available balance. Please, send some funds to one of your addresses, and try again.": "There are no addresses with available balance. Please, send some funds to one of your addresses, and try again.",
   "There are no available addresses.": "There are no available addresses.",
   "This address is not valid": "This address is not valid",
@@ -453,5 +452,6 @@
   "Copy ID": "Copy ID",
   "To delete this wallet use it without a passphrase": "To delete this wallet use it without a passphrase",
   "To export this wallet use it without a passphrase": "To export this wallet use it without a passphrase",
-  "The proposal does not include a list of required chains": "The proposal does not include a list of required chains"
+  "The proposal does not include a list of required chains": "The proposal does not include a list of required chains",
+  "All UTXOs are already consolidated for this address. No consolidation is needed.": "All UTXOs are already consolidated for this address. No consolidation is needed."
 }

apps/desktop-wallet/locales/fr-FR/translation.json

@@ -320,7 +320,6 @@
   "The group of the selected address ({{ addressGroup }}) does not match the group required by WalletConnect ({{ walletConnectGroup }})": "Le groupe de l'adresse sélectionnée ({{ addressGroup }}) ne correspond pas au groupe requis par WalletConnect ({{ walletConnectGroup }})",
   "The wallet is offline.": "Le portefeuille est hors ligne.",
   "Theme": "Thème",
-  "There are no addresses in the required group: {{ group }}": "Il n'y a pas d'adresses dans le groupe requis: {{ group }}",
   "There are no addresses with available balance. Please, send some funds to one of your addresses, and try again.": "Aucune adresse avec des fonds. Envoyez s'il vous plaît des fonds sur une de vos adresse puis recommencer.",
   "There are no available addresses.": "Il n'y a pas d'adresse disponible.",
   "This address is not valid": "Cette adresse n'est pas valide",

apps/desktop-wallet/locales/id-ID/translation.json

@@ -273,7 +273,6 @@
   "The group number will be automatically be appended to the addresses’ label.": "Nomor grup akan ditambahkan secara otomatis ke label alamat.",
   "The group of the selected address ({{ addressGroup }}) does not match the group required by WalletConnect ({{ walletConnectGroup }})": "Grup alamat yang telah dipilih ({{ addressGroup }}) tidak cocok dengan grup yang diperlukan oleh WalletConnect ({{ walletConnectGroup }})",
   "Theme": "Tema",
-  "There are no addresses in the required group: {{ group }}": "Tidak ada alamat di dalam grup yang wajib: {{ group }}",
   "There are no addresses with available balance. Please, send some funds to one of your addresses, and try again.": "Tidak ada alamat dengan saldo yang tersedia. Tolong, kirimkan sejumlah dana ke salah satu alamat Anda, dan coba lagi.",
   "There are no available addresses.": "Tidak ada alamat yang tersedia.",
   "This asset cannot have more than {{ decimals }} decimals": "Aset ini tidak boleh memiliki lebih dari {{ decimals }} desimal",

apps/desktop-wallet/locales/it-IT/translation.json

@@ -313,7 +313,6 @@
   "The group of the selected address ({{ addressGroup }}) does not match the group required by WalletConnect ({{ walletConnectGroup }})": "Il gruppo dell'indirizzo selezionato ({{ addressGroup }}) non corrisponde al gruppo richiesto da WalletConnect ({{ walletConnectGroup }})",
   "The wallet is offline.": "Il portafoglio è offline.",
   "Theme": "Tema",
-  "There are no addresses in the required group: {{ group }}": "Non ci sono indirizzi nel gruppo richiesto: {{ group }}",
   "There are no addresses with available balance. Please, send some funds to one of your addresses, and try again.": "Non ci sono indirizzi con saldo disponibile. Per favore, invia dei fondi a uno dei tuoi indirizzi e riprova.",
   "There are no available addresses.": "Non ci sono indirizzi disponibili.",
   "This address is not valid": "Questo indirizzo non è valido",

apps/desktop-wallet/locales/pt-PT/translation.json

@@ -106,6 +106,7 @@
   "Download": "Descarregar",
   "Download failed": "O descarregamento falhou",
   "Try again later.": "Tente novamente mais tarde.",
+  "Downloading version {{ newVersion }}...": "Baixando a versão {{ newVersion }}...",
   "Duration in minutes after which an idle wallet will lock automatically.": "Duração em minutos depois do qual uma carteira inativa será bloqueada automaticamente.",
   "Easily organize your addresses and your contacts for a more serene transfer experience.": "Organize seus endereços e seus contatos facilmente para uma experiência de transferência mais serena.",
   "Edit": "Editar",
@@ -320,7 +321,6 @@
   "The group of the selected address ({{ addressGroup }}) does not match the group required by WalletConnect ({{ walletConnectGroup }})": "O grupo do endereço selecionado ({{ addressGroup }}) não corresponde ao grupo exigido pelo WalletConnect ({{ walletConnectGroup }})",
   "The wallet is offline.": "A carteira está offline.",
   "Theme": "Tema",
-  "There are no addresses in the required group: {{ group }}": "Não há nenhum endereço no grupo solicitado: {{ group }}",
   "There are no addresses with available balance. Please, send some funds to one of your addresses, and try again.": "Não há endereços com saldo disponível. Por favor, envie alguns fundos para um dos seus endereços, e tente novamente.",
   "There are no available addresses.": "Não há endereços disponíveis.",
   "This address is not valid": "Este endereço não é válido",
@@ -368,6 +368,7 @@
   "Version": "Versão",
   "Version {{ newVersion }} is available": "A versão {{ newVersion }} está disponível",
   "Please, download it and install it to avoid any issues with the wallet.": "Clique em \"Atualizar\" para evitar qualquer problema com a carteira digital.",
+  "Download finished": "Download concluído",
   "Wallet": "Carteira",
   "Wallet list": "Lista de carteiras",
   "Wallet name": "Nome da carteira",
@@ -450,5 +451,6 @@
   "ID": "ID",
   "Copy ID": "Copiar ID",
   "To delete this wallet use it without a passphrase": "Para excluir essa carteira, use-a sem uma senha",
-  "To export this wallet use it without a passphrase": "Para exportar esta carteira use-a sem uma frase-senha"
+  "To export this wallet use it without a passphrase": "Para exportar esta carteira use-a sem uma frase-senha",
+  "The proposal does not include a list of required chains": "A proposta não inclui uma lista de cadeias necessárias"
 }

apps/desktop-wallet/locales/ru-RU/translation.json

@@ -300,7 +300,6 @@
   "The group number will be automatically be appended to the addresses’ label.": "Номер группы будет автоматически добавлен к имени адреса.",
   "The group of the selected address ({{ addressGroup }}) does not match the group required by WalletConnect ({{ walletConnectGroup }})": "Группа ({{ addressGroup }}) выбранного адреса не совпадает с группой, требуемой ({{ walletConnectGroup }})",
   "Theme": "Тема",
-  "There are no addresses in the required group: {{ group }}": "В требуемой группе нет адресов: {{ group }}",
   "There are no addresses with available balance. Please, send some funds to one of your addresses, and try again.": "Нет адресов с доступным балансом. Пожалуйста, отправьте немного средств на один из ваших адресов и повторите попытку.",
   "There are no available addresses.": "Нет доступных адресов.",
   "This address is not valid": "Этот адрес не действителен",

apps/desktop-wallet/locales/th-TH/translation.json

@@ -0,0 +1 @@
+{}

apps/desktop-wallet/locales/vi-VN/translation.json

@@ -305,7 +305,7 @@
   "Status": "Trạng thái",
   "Submit": "Gửi",
   "Swapped": "Đã hoán đổi",
-  "Sweep": "Sweep",
+  "Sweep": "Dọn",
   "Sweep address": "Sweep địa chỉ ví",
   "Sweep all the unlocked funds of this address to another address.": "Sweep tất cả tài sản khả dụng từ địa chỉ ví này sang địa chỉ ví khác.",
   "sweepOperationFromTo": "Thao tác này sẽ sweep toàn bộ tài sản từ <1>{{ from }}</1> và di chuyển đến <3>{{ to }}</3>.",
@@ -320,7 +320,6 @@
   "The group of the selected address ({{ addressGroup }}) does not match the group required by WalletConnect ({{ walletConnectGroup }})": "Nhóm hiện đang được chọn ({{ addressGroup }}) không trùng khớp với nhóm được yêu cầu bởi WalletConnect ({{ walletConnectGroup }})",
   "The wallet is offline.": "Ví đang ngoại tuyến.",
   "Theme": "Giao diện",
-  "There are no addresses in the required group: {{ group }}": "Không có các địa chỉ ví nào trùng khớp với nhóm: {{ group }}",
   "There are no addresses with available balance. Please, send some funds to one of your addresses, and try again.": "Không có địa chỉ ví nào có đủ số dư. Vui lòng nạp thêm vào tài khoản và thử lại.",
   "There are no available addresses.": "Không có bất kỳ địa chỉ ví nào khả dụng.",
   "This address is not valid": "Địa chỉ ví này không khả dụng",