blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: fix buffer types

This commit is contained in:
Justin Starry 2021-03-15 10:42:53 +08:00 committed by Justin Starry
parent a5c840e672
commit 3ea23fe736
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web3.js/src/account.js
View File

@ -38,6 +38,6 @@ export class Account {
* The **unencrypted** secret key for this account * The **unencrypted** secret key for this account
*/ */
get secretKey(): Buffer { get secretKey(): Buffer {
return this._keypair.secretKey; return toBuffer(this._keypair.secretKey);
} }
} }

2
web3.js/src/publickey.js
View File

@ -113,7 +113,7 @@ export class PublicKey {
Buffer.from('ProgramDerivedAddress'), Buffer.from('ProgramDerivedAddress'),
]); ]);
let hash = await sha256(new Uint8Array(buffer)); let hash = await sha256(new Uint8Array(buffer));
let publicKeyBytes = new BN(hash, 16).toArray(null, 32); let publicKeyBytes = new BN(hash, 16).toArray(undefined, 32);
if (is_on_curve(publicKeyBytes)) { if (is_on_curve(publicKeyBytes)) {
throw new Error(`Invalid seeds, address must fall off the curve`); throw new Error(`Invalid seeds, address must fall off the curve`);
} }

13
web3.js/src/secp256k1-program.js
View File

@ -183,13 +183,20 @@ export class Secp256k1Program {
static createInstructionWithPrivateKey( static createInstructionWithPrivateKey(
params: CreateSecp256k1InstructionWithPrivateKeyParams, params: CreateSecp256k1InstructionWithPrivateKeyParams,
): TransactionInstruction { ): TransactionInstruction {
const {privateKey, message} = params; const {privateKey: pkey, message} = params;
assert( assert(
privateKey.length === PRIVATE_KEY_BYTES, pkey.length === PRIVATE_KEY_BYTES,
`Private key must be ${PRIVATE_KEY_BYTES} bytes but received ${privateKey.length} bytes`, `Private key must be ${PRIVATE_KEY_BYTES} bytes but received ${pkey.length} bytes`,
); );
let privateKey;
if (Array.isArray(pkey)) {
privateKey = Uint8Array.from(pkey);
} else {
privateKey = pkey;
}
try { try {
const publicKey = publicKeyCreate(privateKey, false).slice(1); // throw away leading byte const publicKey = publicKeyCreate(privateKey, false).slice(1); // throw away leading byte
const messageHash = Buffer.from( const messageHash = Buffer.from(

3
web3.js/src/transaction.js
View File

@ -11,6 +11,7 @@ import {PublicKey} from './publickey';
import {Account} from './account'; import {Account} from './account';
import * as shortvec from './util/shortvec-encoding'; import * as shortvec from './util/shortvec-encoding';
import type {Blockhash} from './blockhash'; import type {Blockhash} from './blockhash';
import {toBuffer} from './util/to-buffer';
/** /**
* @typedef {string} TransactionSignature * @typedef {string} TransactionSignature
@ -522,7 +523,7 @@ export class Transaction {
const signData = message.serialize(); const signData = message.serialize();
signers.forEach(signer => { signers.forEach(signer => {
const signature = nacl.sign.detached(signData, signer.secretKey); const signature = nacl.sign.detached(signData, signer.secretKey);
this._addSignature(signer.publicKey, signature); this._addSignature(signer.publicKey, toBuffer(signature));
}); });
} }