From 741c85ca7c2d75df0736048db209cc6645d56164 Mon Sep 17 00:00:00 2001
From: steveluscher <github@steveluscher.com>
Date: Wed, 23 Mar 2022 23:49:11 -0700
Subject: [PATCH] fix: add TypeScript buffer type to loader.ts

---
 web3.js/src/loader.ts | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/web3.js/src/loader.ts b/web3.js/src/loader.ts
index e5c4213f44..6e3781a304 100644
--- a/web3.js/src/loader.ts
+++ b/web3.js/src/loader.ts
@@ -9,6 +9,7 @@ import {sleep} from './util/sleep';
 import type {Connection} from './connection';
 import type {Signer} from './keypair';
 import {SystemProgram} from './system-program';
+import {IInstructionInputData} from './instruction';
 
 // Keep program chunks under PACKET_DATA_SIZE, leaving enough room for the
 // rest of the Transaction fields
@@ -137,7 +138,15 @@ export class Loader {
       }
     }
 
-    const dataLayout = BufferLayout.struct([
+    const dataLayout = BufferLayout.struct<
+      Readonly<{
+        bytes: number[];
+        bytesLength: number;
+        bytesLengthPadding: number;
+        instruction: number;
+        offset: number;
+      }>
+    >([
       BufferLayout.u32('instruction'),
       BufferLayout.u32('offset'),
       BufferLayout.u32('bytesLength'),
@@ -160,7 +169,9 @@ export class Loader {
         {
           instruction: 0, // Load instruction
           offset,
-          bytes,
+          bytes: bytes as number[],
+          bytesLength: 0,
+          bytesLengthPadding: 0,
         },
         data,
       );
@@ -189,7 +200,9 @@ export class Loader {
 
     // Finalize the account loaded with program data for execution
     {
-      const dataLayout = BufferLayout.struct([BufferLayout.u32('instruction')]);
+      const dataLayout = BufferLayout.struct<IInstructionInputData>([
+        BufferLayout.u32('instruction'),
+      ]);
 
       const data = Buffer.alloc(dataLayout.span);
       dataLayout.encode(