fix: rename `signData` to `serializeMessage()`
This commit is contained in:
parent
403448a91f
commit
7e642d5456
|
@ -403,7 +403,7 @@ declare module '@solana/web3.js' {
|
|||
Transaction | TransactionInstruction | TransactionInstructionCtorFields
|
||||
>
|
||||
): Transaction;
|
||||
signData: Buffer;
|
||||
serializeMessage(): Buffer;
|
||||
sign(...signers: Array<Account>): void;
|
||||
signPartial(...partialSigners: Array<PublicKey | Account>): void;
|
||||
addSignature(pubkey: PublicKey, signature: Buffer): void;
|
||||
|
|
|
@ -411,7 +411,7 @@ declare module '@solana/web3.js' {
|
|||
Transaction | TransactionInstruction | TransactionInstructionCtorFields,
|
||||
>
|
||||
): Transaction;
|
||||
signData: Buffer;
|
||||
serializeMessage(): Buffer;
|
||||
sign(...signers: Array<Account>): void;
|
||||
signPartial(...partialSigners: Array<PublicKey | Account>): void;
|
||||
addSigner(signer: Account): void;
|
||||
|
|
|
@ -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 =
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue