Skip to content

refactor: throw error on validation failure #7773

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
dpkjnr merged 1 commit into from
Dec 19, 2025
+16 −7
Merged

refactor: throw error on validation failure #7773

Show file tree
Hide file tree
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
9 changes: 8 additions & 1 deletion modules/sdk-coin-sol/src/sol.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import {
VerifyTransactionOptions,
TssVerifyAddressOptions,
verifyEddsaTssWalletAddress,
UnexpectedAddressError,
} from '@bitgo/sdk-core';
import { auditEddsaPrivateKey, getDerivationPath } from '@bitgo/sdk-lib-mpc';
import { BaseNetwork, CoinFamily, coins, SolCoin, BaseCoin as StaticsBaseCoin } from '@bitgo/statics';
Expand Down Expand Up @@ -603,11 +604,17 @@ export class Sol extends BaseCoin {
}

async isWalletAddress(params: TssVerifyAddressOptions): Promise<boolean> {
return verifyEddsaTssWalletAddress(
const result = await verifyEddsaTssWalletAddress(
params,
(address) => this.isValidAddress(address),
(publicKey) => this.getAddressFromPublicKey(publicKey)
);

if (!result) {
throw new UnexpectedAddressError(`address validation failure: ${params.address} is not a wallet address`);
}

return true;
}

/**
Expand Down
14 changes: 8 additions & 6 deletions modules/sdk-coin-sol/test/unit/sol.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3443,26 +3443,28 @@ describe('SOL:', function () {
result.should.equal(true);
});

it('should return false for address with incorrect keychain', async function () {
it('should throw error for address with incorrect keychain', async function () {
const address = '7YAesfwPk41VChUgr65bm8FEep7ymWqLSW5rpYB5zZPY';
const wrongKeychain =
'0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000';
const index = '1';
const keychains = [{ id: '1', type: 'tss' as const, commonKeychain: wrongKeychain }];

const result = await basecoin.isWalletAddress({ keychains, address, index });
result.should.equal(false);
await assert.rejects(async () => await basecoin.isWalletAddress({ keychains, address, index }), {
message: `address validation failure: ${address} is not a wallet address`,
});
});

it('should return false for address with incorrect index', async function () {
it('should throw error for address with incorrect index', async function () {
const address = '7YAesfwPk41VChUgr65bm8FEep7ymWqLSW5rpYB5zZPY';
const commonKeychain =
'8ea32ecacfc83effbd2e2790ee44fa7c59b4d86c29a12f09fb613d8195f93f4e21875cad3b98adada40c040c54c3569467df41a020881a6184096378701862bd';
const wrongIndex = '999';
const keychains = [{ id: '1', type: 'tss' as const, commonKeychain }];

const result = await basecoin.isWalletAddress({ keychains, address, index: wrongIndex });
result.should.equal(false);
await assert.rejects(async () => await basecoin.isWalletAddress({ keychains, address, index: wrongIndex }), {
message: `address validation failure: ${address} is not a wallet address`,
});
});

it('should throw error for invalid address', async function () {
Expand Down