Ledger queue (#527)

* Ledger refactor * Remove unused params * Add queue
PIVX-Labs · Feb 20, 2025 · ec6fdbd · ec6fdbd
1 parent 77ed216
commit ec6fdbd
Show file tree

Hide file tree

Showing 7 changed files with 362 additions and 229 deletions.
diff --git a/scripts/composables/use_wallet.js b/scripts/composables/use_wallet.js
@@ -1,9 +1,13 @@
 import { getEventEmitter } from '../event_bus.js';
-import { hasEncryptedWallet, wallet } from '../wallet.js';
+import {
+    hasEncryptedWallet,
+    wallet,
+    getNewAddress as guiGetNewAddress,
+} from '../wallet.js';
 import { ref, computed } from 'vue';
 import { fPublicMode, strCurrency, togglePublicMode } from '../settings.js';
 import { cOracle } from '../prices.js';
-import { ledgerSignTransaction } from '../ledger.js';
+import { LedgerController } from '../ledger.js';
 import { defineStore } from 'pinia';
 import { lockableFunction } from '../lock.js';
 import { blockCount as rawBlockCount } from '../global.js';
@@ -85,10 +89,22 @@ export const useWallet = defineStore('wallet', () => {
     });
     const createAndSendTransaction = lockableFunction(
         async (network, address, value, opts) => {
-            const tx = wallet.createTransaction(address, value, opts);
+            let tx;
             if (wallet.isHardwareWallet()) {
-                await ledgerSignTransaction(wallet, tx);
+                const [changeAddress] = await guiGetNewAddress({
+                    verify: true,
+                    nReceiving: 0,
+                });
+                tx = wallet.createTransaction(address, value, {
+                    ...opts,
+                    changeAddress,
+                });
+                await LedgerController.getInstance().signTransaction(
+                    wallet,
+                    tx
+                );
             } else {
+                tx = wallet.createTransaction(address, value, opts);
                 await wallet.sign(tx);
             }
             const res = await network.sendTransaction(tx.serialize());

diff --git a/scripts/dashboard/Dashboard.vue b/scripts/dashboard/Dashboard.vue
@@ -30,7 +30,7 @@ import {
     isStandardAddress,
 } from '../misc.js';
 import { getNetwork } from '../network/network_manager.js';
-import { strHardwareName } from '../ledger';
+import { LedgerController } from '../ledger';
 import { guiAddContactPrompt } from '../contacts-book';
 import { scanQRCode } from '../scanner';
 import { useWallet } from '../composables/use_wallet.js';
@@ -116,7 +116,10 @@ async function importWallet({
         createAlert(
             'info',
             tr(ALERTS.WALLET_HARDWARE_WALLET, [
-                { hardwareWallet: strHardwareName },
+                {
+                    hardwareWallet:
+                        LedgerController.getInstance().getHardwareName(),
+                },
             ]),
             12500
         );