fix: improve MessageV0.getAccountKeys API ergonomics (#28042)

fix: improve MessageV0.getAccountKeys API flexibility
solana-labs · Sep 24, 2022 · 7810387 · 7810387
1 parent e85900e
commit 7810387
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/web3.js/src/message/v0.ts b/web3.js/src/message/v0.ts
@@ -42,10 +42,10 @@ export type CompileV0Args = {
 
 export type GetAccountKeysArgs =
   | {
-      accountKeysFromLookups: AccountKeysFromLookups;
+      accountKeysFromLookups?: AccountKeysFromLookups | null;
     }
   | {
-      addressLookupTableAccounts: AddressLookupTableAccount[];
+      addressLookupTableAccounts?: AddressLookupTableAccount[] | null;
     };
 
 export class MessageV0 {
@@ -77,7 +77,11 @@ export class MessageV0 {
 
   getAccountKeys(args?: GetAccountKeysArgs): MessageAccountKeys {
     let accountKeysFromLookups: AccountKeysFromLookups | undefined;
-    if (args && 'accountKeysFromLookups' in args) {
+    if (
+      args &&
+      'accountKeysFromLookups' in args &&
+      args.accountKeysFromLookups
+    ) {
       if (
         this.numAccountKeysFromLookups !=
         args.accountKeysFromLookups.writable.length +
@@ -88,7 +92,11 @@ export class MessageV0 {
         );
       }
       accountKeysFromLookups = args.accountKeysFromLookups;
-    } else if (args && 'addressLookupTableAccounts' in args) {
+    } else if (
+      args &&
+      'addressLookupTableAccounts' in args &&
+      args.addressLookupTableAccounts
+    ) {
       accountKeysFromLookups = this.resolveAddressTableLookups(
         args.addressLookupTableAccounts,
       );