@solana/web3.js 1.61.1 → 1.62.0

package/lib/index.d.ts

@@ -1578,6 +1578,8 @@ declare module '@solana/web3.js' {
     get version(): 0;
     get numAccountKeysFromLookups(): number;
     getAccountKeys(args?: GetAccountKeysArgs): MessageAccountKeys;
+    isAccountSigner(index: number): boolean;
+    isAccountWritable(index: number): boolean;
     resolveAddressTableLookups(
       addressLookupTableAccounts: AddressLookupTableAccount[],
     ): AccountKeysFromLookups;

package/lib/index.esm.js

@@ -808,7 +808,17 @@ class Message {
   }
 
   isAccountWritable(index) {
-    return index < this.header.numRequiredSignatures - this.header.numReadonlySignedAccounts || index >= this.header.numRequiredSignatures && index < this.accountKeys.length - this.header.numReadonlyUnsignedAccounts;
+    const numSignedAccounts = this.header.numRequiredSignatures;
+
+    if (index >= this.header.numRequiredSignatures) {
+      const unsignedAccountIndex = index - numSignedAccounts;
+      const numUnsignedAccounts = this.accountKeys.length - numSignedAccounts;
+      const numWritableUnsignedAccounts = numUnsignedAccounts - this.header.numReadonlyUnsignedAccounts;
+      return unsignedAccountIndex < numWritableUnsignedAccounts;
+    } else {
+      const numWritableSignedAccounts = numSignedAccounts - this.header.numReadonlySignedAccounts;
+      return index < numWritableSignedAccounts;
+    }
   }
 
   isProgramId(index) {
@@ -981,6 +991,29 @@ class MessageV0 {
     return new MessageAccountKeys(this.staticAccountKeys, accountKeysFromLookups);
   }
 
+  isAccountSigner(index) {
+    return index < this.header.numRequiredSignatures;
+  }
+
+  isAccountWritable(index) {
+    const numSignedAccounts = this.header.numRequiredSignatures;
+    const numStaticAccountKeys = this.staticAccountKeys.length;
+
+    if (index >= numStaticAccountKeys) {
+      const lookupAccountKeysIndex = index - numStaticAccountKeys;
+      const numWritableLookupAccountKeys = this.addressTableLookups.reduce((count, lookup) => count + lookup.writableIndexes.length, 0);
+      return lookupAccountKeysIndex < numWritableLookupAccountKeys;
+    } else if (index >= this.header.numRequiredSignatures) {
+      const unsignedAccountIndex = index - numSignedAccounts;
+      const numUnsignedAccounts = numStaticAccountKeys - numSignedAccounts;
+      const numWritableUnsignedAccounts = numUnsignedAccounts - this.header.numReadonlyUnsignedAccounts;
+      return unsignedAccountIndex < numWritableUnsignedAccounts;
+    } else {
+      const numWritableSignedAccounts = numSignedAccounts - this.header.numReadonlySignedAccounts;
+      return index < numWritableSignedAccounts;
+    }
+  }
+
   resolveAddressTableLookups(addressLookupTableAccounts) {
     const accountKeysFromLookups = {
       writable: [],