Skip to content

Revert "chore: parallellize keychain and queryPromise" #6559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kaustubhbitgo merged 1 commit into from
Jul 28, 2025
Merged

Revert "chore: parallellize keychain and queryPromise" #6559

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions modules/sdk-core/src/bitgo/wallet/wallet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2235,7 +2235,7 @@ export class Wallet implements IWallet {
}

// Doing a sanity check for password here to avoid doing further work if we know it's wrong
const keychainPromise = this.getKeychainsAndValidatePassphrase({
const keychains = await this.getKeychainsAndValidatePassphrase({
reqId: params.reqId,
walletPassphrase: params.walletPassphrase,
customSigningFunction: params.customSigningFunction,
Expand All @@ -2251,24 +2251,9 @@ export class Wallet implements IWallet {
} else {
txPrebuildQuery = params.prebuildTx ? Promise.resolve(params.prebuildTx) : this.prebuildTransaction(params);
}
let keychains: Keychain[] = [];
let txPrebuild: PrebuildTransactionResult;

const results = await Promise.allSettled([keychainPromise, txPrebuildQuery]);

// Handle keychain promise (index 0)
if (results[0].status === 'fulfilled') {
keychains = results[0].value as Keychain[];
} else {
throw results[0].reason;
}

// Handle txPrebuild promise (index 1)
if (results[1].status === 'fulfilled') {
txPrebuild = results[1].value as PrebuildTransactionResult;
} else {
throw results[1].reason;
}
// the prebuild can be overridden by providing an explicit tx
const txPrebuild = (await txPrebuildQuery) as PrebuildTransactionResult;

try {
await this.baseCoin.verifyTransaction({
Expand Down