diff --git a/web3.js/module.d.ts b/web3.js/module.d.ts index e90c245667..63b4d966b1 100644 --- a/web3.js/module.d.ts +++ b/web3.js/module.d.ts @@ -403,7 +403,7 @@ declare module '@solana/web3.js' { Transaction | TransactionInstruction | TransactionInstructionCtorFields > ): Transaction; - signData: Buffer; + serializeMessage(): Buffer; sign(...signers: Array): void; signPartial(...partialSigners: Array): void; addSignature(pubkey: PublicKey, signature: Buffer): void; diff --git a/web3.js/module.flow.js b/web3.js/module.flow.js index 93e98719f4..c9021da70c 100644 --- a/web3.js/module.flow.js +++ b/web3.js/module.flow.js @@ -411,7 +411,7 @@ declare module '@solana/web3.js' { Transaction | TransactionInstruction | TransactionInstructionCtorFields, > ): Transaction; - signData: Buffer; + serializeMessage(): Buffer; sign(...signers: Array): void; signPartial(...partialSigners: Array): void; addSigner(signer: Account): void; diff --git a/web3.js/src/transaction.js b/web3.js/src/transaction.js index bf66d801b4..4762ff6412 100644 --- a/web3.js/src/transaction.js +++ b/web3.js/src/transaction.js @@ -182,7 +182,7 @@ export class Transaction { /** * Get a buffer of the Transaction data that need to be covered by signatures */ - get signData(): Buffer { + serializeMessage(): Buffer { const {nonceInfo} = this; if (nonceInfo && this.instructions[0] != nonceInfo.nonceInstruction) { this.recentBlockhash = nonceInfo.nonce; @@ -377,7 +377,7 @@ export class Transaction { }, ); this.signatures = signatures; - const signData = this.signData; + const signData = this.serializeMessage(); partialSigners.forEach((accountOrPublicKey, index) => { if (accountOrPublicKey instanceof PublicKey) { @@ -398,7 +398,7 @@ export class Transaction { * `signPartial` */ addSigner(signer: Account) { - const signData = this.signData; + const signData = this.serializeMessage(); const signature = nacl.sign.detached(signData, signer.secretKey); this.addSignature(signer.publicKey, signature); } @@ -424,7 +424,7 @@ export class Transaction { */ verifySignatures(): boolean { let verified = true; - const signData = this.signData; + const signData = this.serializeMessage(); for (const {signature, publicKey} of this.signatures) { if ( !nacl.sign.detached.verify(signData, signature, publicKey.toBuffer()) @@ -446,7 +446,7 @@ export class Transaction { throw new Error('Transaction has not been signed'); } - const signData = this.signData; + const signData = this.serializeMessage(); const signatureCount = []; shortvec.encodeLength(signatureCount, signatures.length); const transactionLength = diff --git a/web3.js/test/transaction.test.js b/web3.js/test/transaction.test.js index 68a10b30ce..ece8961bc6 100644 --- a/web3.js/test/transaction.test.js +++ b/web3.js/test/transaction.test.js @@ -453,7 +453,7 @@ test('get sign data for transaction', () => { lamports: 42, }); tx.recentBlockhash = bs58.encode(recentBlockhash); - const tx_bytes = tx.signData; + const tx_bytes = tx.serializeMessage(); const signature = nacl.sign.detached(tx_bytes, from.secretKey); tx.addSignature(from.publicKey, signature); expect(tx.verifySignatures()).toBe(true);