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

fix: add TypeScript buffer type to message.ts

This commit is contained in:
steveluscher 2022-03-23 23:59:08 -07:00 committed by Steven Luscher
parent 741c85ca7c
commit 6686b7c534
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
web3.js/src/message.ts
View File

@ -118,7 +118,7 @@ export class Message {
const instructions = this.instructions.map(instruction => { const instructions = this.instructions.map(instruction => {
const {accounts, programIdIndex} = instruction; const {accounts, programIdIndex} = instruction;
const data = bs58.decode(instruction.data); const data = Array.from(bs58.decode(instruction.data));
let keyIndicesCount: number[] = []; let keyIndicesCount: number[] = [];
shortvec.encodeLength(keyIndicesCount, accounts.length); shortvec.encodeLength(keyIndicesCount, accounts.length);
@ -129,7 +129,7 @@ export class Message {
return { return {
programIdIndex, programIdIndex,
keyIndicesCount: Buffer.from(keyIndicesCount), keyIndicesCount: Buffer.from(keyIndicesCount),
keyIndices: Buffer.from(accounts), keyIndices: accounts,
dataLength: Buffer.from(dataCount), dataLength: Buffer.from(dataCount),
data, data,
}; };
@ -142,7 +142,15 @@ export class Message {
let instructionBufferLength = instructionCount.length; let instructionBufferLength = instructionCount.length;
instructions.forEach(instruction => { instructions.forEach(instruction => {
const instructionLayout = BufferLayout.struct([ const instructionLayout = BufferLayout.struct<
Readonly<{
data: number[];
dataLength: Uint8Array;
keyIndices: number[];
keyIndicesCount: Uint8Array;
programIdIndex: number;
}>
>([
BufferLayout.u8('programIdIndex'), BufferLayout.u8('programIdIndex'),
BufferLayout.blob( BufferLayout.blob(
@ -170,7 +178,16 @@ export class Message {
}); });
instructionBuffer = instructionBuffer.slice(0, instructionBufferLength); instructionBuffer = instructionBuffer.slice(0, instructionBufferLength);
const signDataLayout = BufferLayout.struct([ const signDataLayout = BufferLayout.struct<
Readonly<{
keyCount: Uint8Array;
keys: Uint8Array[];
numReadonlySignedAccounts: Uint8Array;
numReadonlyUnsignedAccounts: Uint8Array;
numRequiredSignatures: Uint8Array;
recentBlockhash: Uint8Array;
}>
>([
BufferLayout.blob(1, 'numRequiredSignatures'), BufferLayout.blob(1, 'numRequiredSignatures'),
BufferLayout.blob(1, 'numReadonlySignedAccounts'), BufferLayout.blob(1, 'numReadonlySignedAccounts'),
BufferLayout.blob(1, 'numReadonlyUnsignedAccounts'), BufferLayout.blob(1, 'numReadonlyUnsignedAccounts'),