Skip to content

fix(sdk-coin-starknet): normalize signableHex and widen verifyTransaction guard #9072

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

Open
shubham-damkondwar wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −4
Open

fix(sdk-coin-starknet): normalize signableHex and widen verifyTransaction guard #9072

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
4 changes: 3 additions & 1 deletion modules/sdk-coin-starknet/src/lib/transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ export class Transaction extends BaseTransaction {
}

get signableHex(): string {
return this._starknetTransactionData?.transactionHash || '';
const hash = this._starknetTransactionData?.transactionHash;
if (!hash) return '';
return hash.replace(/^0x/i, '').padStart(64, '0');
}

get signedTransaction(): string | undefined {
Expand Down
2 changes: 1 addition & 1 deletion modules/sdk-coin-starknet/src/starknet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export class Starknet extends BaseCoin {
// 0x-prefixed txHex means this is the Starknet transaction hash (signableHex), not the
// full serialized transaction. Recipient verification already happened in prebuildAndSignTransaction
// using serializedTxHex — nothing to verify from a hash alone.
if (!txHex || txHex.startsWith('0x')) {
if (!txHex || txHex.startsWith('0x') || /^[0-9a-f]{64}$/i.test(txHex)) {
return true;
}

Expand Down
9 changes: 9 additions & 0 deletions modules/sdk-coin-starknet/test/unit/starknet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,15 @@ describe('Starknet', function () {
result.should.equal(true);
});

it('should return true when txHex is a 64-character unprefixed signableHex', async function () {
const result = await basecoin.verifyTransaction({
txParams: { recipients: [] },
txPrebuild: { txHex: 'deadbeefcafe1234567890abcdefdeadbeefcafe1234567890abcdef12345678' },
wallet: {} as any,
});
result.should.equal(true);
});

it('should return true when txHex is absent', async function () {
const result = await basecoin.verifyTransaction({
txParams: { recipients: [] },
Expand Down
2 changes: 1 addition & 1 deletion modules/sdk-coin-starknet/test/unit/transferBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('Starknet TransferBuilder', () => {
.amount('1000000000000000000');

const tx = (await builder.build()) as Transaction;
tx.signableHex.should.equal(tx.starknetTransactionData.transactionHash);
tx.signableHex.should.equal(tx.starknetTransactionData.transactionHash!.replace(/^0x/i, '').padStart(64, '0'));
tx.id.should.equal(tx.starknetTransactionData.transactionHash);
});

Expand Down
2 changes: 1 addition & 1 deletion modules/sdk-coin-starknet/test/unit/walletInitializationBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('Starknet WalletInitializationBuilder', () => {
builder.fromPublicKey(Accounts.account1.publicKey).nonce('0x0').chainId(chainId);

const tx = (await builder.build()) as Transaction;
tx.signableHex.should.equal(tx.starknetTransactionData.transactionHash);
tx.signableHex.should.equal(tx.starknetTransactionData.transactionHash!.replace(/^0x/i, '').padStart(64, '0'));
tx.id.should.equal(tx.starknetTransactionData.transactionHash);
});

Expand Down
Loading