From f215893501f286673ebc866b5288595561d45d01 Mon Sep 17 00:00:00 2001 From: Chris Duncan Date: Thu, 30 Apr 2026 22:02:50 -0700 Subject: [PATCH] Fix sign calls when refreshing accounts. Remove unused account index variables. --- src/lib/account/refresh.ts | 4 ++-- src/lib/wallet/refresh.ts | 6 +++--- src/lib/wallet/unopened.ts | 2 +- test/test.ledger.mjs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/account/refresh.ts b/src/lib/account/refresh.ts index 6fd7a98..c87e767 100644 --- a/src/lib/account/refresh.ts +++ b/src/lib/account/refresh.ts @@ -35,7 +35,7 @@ export async function _refresh (account: Account, rpc: unknown): Promise { if (typeof confirmedFrontierBlock[confirmedFrontierSubtype] !== 'function') { throw new TypeError('Unknown subtype of confirmed frontier block', { cause: confirmedFrontierSubtype }) } - confirmedFrontierBlock[confirmedFrontierSubtype](confirmedFrontierContents.link, 0).sign(confirmedFrontierContents.signature) + confirmedFrontierBlock[confirmedFrontierSubtype](confirmedFrontierContents.link, 0).signature = confirmedFrontierContents.signature account.confirmed_frontier_block = confirmedFrontierBlock const reqFrontier = { @@ -47,6 +47,6 @@ export async function _refresh (account: Account, rpc: unknown): Promise { if (typeof frontierBlock[frontierSubtype] !== 'function') { throw new TypeError('Unknown subtype of frontier block', { cause: frontierSubtype }) } - frontierBlock[frontierSubtype](frontierContents.link, 0).sign(frontierContents.signature) + frontierBlock[frontierSubtype](frontierContents.link, 0).signature = frontierContents.signature account.frontier_block = frontierBlock } diff --git a/src/lib/wallet/refresh.ts b/src/lib/wallet/refresh.ts index f154e50..13308f4 100644 --- a/src/lib/wallet/refresh.ts +++ b/src/lib/wallet/refresh.ts @@ -33,7 +33,7 @@ export async function _refresh (wallet: Wallet, rpc: unknown, from: unknown, to: if (from > to) [from as number, to as number] = [to, from] const accounts = await wallet.accounts(from, to) const addresses = [] - for (const [index, account] of accounts) { + for (const account of accounts.values()) { addresses.push(account.address) } const data = { @@ -44,7 +44,7 @@ export async function _refresh (wallet: Wallet, rpc: unknown, from: unknown, to: const { frontiers } = await rpc.post('accounts_frontiers', data) as { frontiers: { [address: string]: string } } const { representatives } = await rpc.post('accounts_representatives', data) as { representatives: { [address: string]: string } } const { blocks } = await rpc.post('blocks_info', { json_block: true, hashes: Object.values(frontiers) }) as BlockInfo - for (const [index, account] of accounts) { + for (const account of accounts.values()) { account.balance = balances[account.address]?.balance account.receivable = balances[account.address]?.receivable account.representative = representatives?.[account.address] @@ -56,7 +56,7 @@ export async function _refresh (wallet: Wallet, rpc: unknown, from: unknown, to: if (typeof frontierBlock[subtype] !== 'function') { throw new TypeError('Unknown frontier block subtype', { cause: subtype }) } - frontierBlock[subtype](link, 0).sign(signature) + frontierBlock[subtype](link, 0).signature = signature account.frontier_block = frontierBlock } } diff --git a/src/lib/wallet/unopened.ts b/src/lib/wallet/unopened.ts index d949908..14b40f0 100644 --- a/src/lib/wallet/unopened.ts +++ b/src/lib/wallet/unopened.ts @@ -19,7 +19,7 @@ export async function _unopened (wallet: Wallet, rpc: unknown, batchSize: unknow const to = from + batchSize const accounts = await wallet.accounts(from, to - 1) const addresses = [] - for (const [index, account] of accounts) { + for (const account of accounts.values()) { addresses.push(account.address) } const data = { diff --git a/test/test.ledger.mjs b/test/test.ledger.mjs index 3189164..e90957c 100644 --- a/test/test.ledger.mjs +++ b/test/test.ledger.mjs @@ -215,7 +215,7 @@ await Promise.all([ assert.exists(accounts) assert.equal(accounts.size, 2) - for (const [index, account] of accounts) { + for (const account of accounts.values()) { assert.ok(account instanceof Account) assert.exists(account.address) assert.exists(account.publicKey) @@ -227,7 +227,7 @@ await Promise.all([ const accounts = await wallet.refresh(rpc, 0, 2) assert.exists(accounts) - for (const [index, account] of accounts) { + for (const account of accounts.values()) { assert.ok(account instanceof Account) assert.exists(account.address) assert.exists(account.publicKey) -- 2.47.3