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

fix: revert usage of toBytes to fix compatibility (#16253)

This commit is contained in:
Justin Starry 2021-03-31 14:51:41 +08:00 committed by GitHub
parent 67b747938f
commit c344702fa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web3.js/src/stake-program.ts
View File

@ -506,13 +506,13 @@ export class StakeProgram {
const type = STAKE_INSTRUCTION_LAYOUTS.Initialize;
const data = encodeData(type, {
authorized: {
staker: toBuffer(authorized.staker.toBytes()),
withdrawer: toBuffer(authorized.withdrawer.toBytes()),
staker: toBuffer(authorized.staker.toBuffer()),
withdrawer: toBuffer(authorized.withdrawer.toBuffer()),
},
lockup: {
unixTimestamp: lockup.unixTimestamp,
epoch: lockup.epoch,
custodian: toBuffer(lockup.custodian.toBytes()),
custodian: toBuffer(lockup.custodian.toBuffer()),
},
});
const instructionData = {
@ -613,7 +613,7 @@ export class StakeProgram {
const type = STAKE_INSTRUCTION_LAYOUTS.Authorize;
const data = encodeData(type, {
newAuthorized: toBuffer(newAuthorizedPubkey.toBytes()),
newAuthorized: toBuffer(newAuthorizedPubkey.toBuffer()),
stakeAuthorizationType: stakeAuthorizationType.index,
});
@ -649,10 +649,10 @@ export class StakeProgram {
const type = STAKE_INSTRUCTION_LAYOUTS.AuthorizeWithSeed;
const data = encodeData(type, {
newAuthorized: toBuffer(newAuthorizedPubkey.toBytes()),
newAuthorized: toBuffer(newAuthorizedPubkey.toBuffer()),
stakeAuthorizationType: stakeAuthorizationType.index,
authoritySeed: authoritySeed,
authorityOwner: toBuffer(authorityOwner.toBytes()),
authorityOwner: toBuffer(authorityOwner.toBuffer()),
});
const keys = [

22
web3.js/src/system-program.ts
View File

@ -671,7 +671,7 @@ export class SystemProgram {
const data = encodeData(type, {
lamports: params.lamports,
space: params.space,
programId: toBuffer(params.programId.toBytes()),
programId: toBuffer(params.programId.toBuffer()),
});
return new TransactionInstruction({
@ -697,7 +697,7 @@ export class SystemProgram {
data = encodeData(type, {
lamports: params.lamports,
seed: params.seed,
programId: toBuffer(params.programId.toBytes()),
programId: toBuffer(params.programId.toBuffer()),
});
keys = [
{pubkey: params.fromPubkey, isSigner: false, isWritable: true},
@ -731,9 +731,9 @@ export class SystemProgram {
if ('basePubkey' in params) {
const type = SYSTEM_INSTRUCTION_LAYOUTS.AssignWithSeed;
data = encodeData(type, {
base: toBuffer(params.basePubkey.toBytes()),
base: toBuffer(params.basePubkey.toBuffer()),
seed: params.seed,
programId: toBuffer(params.programId.toBytes()),
programId: toBuffer(params.programId.toBuffer()),
});
keys = [
{pubkey: params.accountPubkey, isSigner: false, isWritable: true},
@ -742,7 +742,7 @@ export class SystemProgram {
} else {
const type = SYSTEM_INSTRUCTION_LAYOUTS.Assign;
data = encodeData(type, {
programId: toBuffer(params.programId.toBytes()),
programId: toBuffer(params.programId.toBuffer()),
});
keys = [{pubkey: params.accountPubkey, isSigner: true, isWritable: true}];
}
@ -763,11 +763,11 @@ export class SystemProgram {
): TransactionInstruction {
const type = SYSTEM_INSTRUCTION_LAYOUTS.CreateWithSeed;
const data = encodeData(type, {
base: toBuffer(params.basePubkey.toBytes()),
base: toBuffer(params.basePubkey.toBuffer()),
seed: params.seed,
lamports: params.lamports,
space: params.space,
programId: toBuffer(params.programId.toBytes()),
programId: toBuffer(params.programId.toBuffer()),
});
let keys = [
{pubkey: params.fromPubkey, isSigner: true, isWritable: true},
@ -832,7 +832,7 @@ export class SystemProgram {
): TransactionInstruction {
const type = SYSTEM_INSTRUCTION_LAYOUTS.InitializeNonceAccount;
const data = encodeData(type, {
authorized: toBuffer(params.authorizedPubkey.toBytes()),
authorized: toBuffer(params.authorizedPubkey.toBuffer()),
});
const instructionData = {
keys: [
@ -907,7 +907,7 @@ export class SystemProgram {
static nonceAuthorize(params: AuthorizeNonceParams): TransactionInstruction {
const type = SYSTEM_INSTRUCTION_LAYOUTS.AuthorizeNonceAccount;
const data = encodeData(type, {
authorized: toBuffer(params.newAuthorizedPubkey.toBytes()),
authorized: toBuffer(params.newAuthorizedPubkey.toBuffer()),
});
return new TransactionInstruction({
@ -931,10 +931,10 @@ export class SystemProgram {
if ('basePubkey' in params) {
const type = SYSTEM_INSTRUCTION_LAYOUTS.AllocateWithSeed;
data = encodeData(type, {
base: toBuffer(params.basePubkey.toBytes()),
base: toBuffer(params.basePubkey.toBuffer()),
seed: params.seed,
space: params.space,
programId: toBuffer(params.programId.toBytes()),
programId: toBuffer(params.programId.toBuffer()),
});
keys = [
{pubkey: params.accountPubkey, isSigner: false, isWritable: true},

2
web3.js/src/transaction.ts
View File

@ -569,7 +569,7 @@ export class Transaction {
}
} else {
if (
!nacl.sign.detached.verify(signData, signature, publicKey.toBytes())
!nacl.sign.detached.verify(signData, signature, publicKey.toBuffer())
) {
return false;
}