@solana/web3.js 1.54.1 → 1.56.1

package/lib/index.cjs.js

@@ -896,16 +896,24 @@ class MessageV0 {
 
 // eslint-disable-next-line no-redeclare
 const VersionedMessage = {
-  deserialize: serializedMessage => {
+  deserializeMessageVersion(serializedMessage) {
     const prefix = serializedMessage[0];
     const maskedPrefix = prefix & VERSION_PREFIX_MASK; // if the highest bit of the prefix is not set, the message is not versioned
 
     if (maskedPrefix === prefix) {
-      return Message.from(serializedMessage);
+      return 'legacy';
     } // the lower 7 bits of the prefix indicate the message version
 
 
-    const version = maskedPrefix;
+    return maskedPrefix;
+  },
+
+  deserialize: serializedMessage => {
+    const version = VersionedMessage.deserializeMessageVersion(serializedMessage);
+
+    if (version === 'legacy') {
+      return Message.from(serializedMessage);
+    }
 
     if (version === 0) {
       return MessageV0.deserialize(serializedMessage);
@@ -3289,6 +3297,28 @@ function notificationResultAndContext(value) {
     value
   });
 }
+/**
+ * @internal
+ */
+
+
+function versionedMessageFromResponse(version, response) {
+  if (version === 0) {
+    return new MessageV0({
+      header: response.header,
+      staticAccountKeys: response.accountKeys.map(accountKey => new PublicKey(accountKey)),
+      recentBlockhash: response.recentBlockhash,
+      compiledInstructions: response.instructions.map(ix => ({
+        programIdIndex: ix.programIdIndex,
+        accountKeyIndexes: ix.accounts,
+        data: bs58__default["default"].decode(ix.data)
+      })),
+      addressTableLookups: response.addressTableLookups
+    });
+  } else {
+    return new Message(response);
+  }
+}
 /**
  * The level of commitment desired when querying state
  * <pre>
@@ -3852,6 +3882,11 @@ const GetSignatureStatusesRpcResult = jsonRpcResultAndContext(superstruct.array(
  */
 
 const GetMinimumBalanceForRentExemptionRpcResult = jsonRpcResult(superstruct.number());
+const AddressTableLookupStruct = superstruct.type({
+  accountKey: PublicKeyFromString,
+  writableIndexes: superstruct.array(superstruct.number()),
+  readonlyIndexes: superstruct.array(superstruct.number())
+});
 const ConfirmedTransactionResult = superstruct.type({
   signatures: superstruct.array(superstruct.string()),
   message: superstruct.type({
@@ -3866,7 +3901,8 @@ const ConfirmedTransactionResult = superstruct.type({
       data: superstruct.string(),
       programIdIndex: superstruct.number()
     })),
-    recentBlockhash: superstruct.string()
+    recentBlockhash: superstruct.string(),
+    addressTableLookups: superstruct.optional(superstruct.array(AddressTableLookupStruct))
   })
 });
 const ParsedInstructionResult = superstruct.type({
@@ -3909,7 +3945,8 @@ const ParsedConfirmedTransactionResult = superstruct.type({
       writable: superstruct.boolean()
     })),
     instructions: superstruct.array(ParsedOrRawInstruction),
-    recentBlockhash: superstruct.string()
+    recentBlockhash: superstruct.string(),
+    addressTableLookups: superstruct.optional(superstruct.nullable(superstruct.array(AddressTableLookupStruct)))
   })
 });
 const TokenBalanceResult = superstruct.type({
@@ -3962,6 +3999,7 @@ const ParsedConfirmedTransactionMetaResult = superstruct.type({
   postTokenBalances: superstruct.optional(superstruct.nullable(superstruct.array(TokenBalanceResult))),
   loadedAddresses: superstruct.optional(LoadedAddressesResult)
 });
+const TransactionVersionStruct = superstruct.union([superstruct.literal(0), superstruct.literal('legacy')]);
 /**
  * Expected JSON RPC response for the "getBlock" message
  */
@@ -3972,7 +4010,8 @@ const GetBlockRpcResult = jsonRpcResult(superstruct.nullable(superstruct.type({
   parentSlot: superstruct.number(),
   transactions: superstruct.array(superstruct.type({
     transaction: ConfirmedTransactionResult,
-    meta: superstruct.nullable(ConfirmedTransactionMetaResult)
+    meta: superstruct.nullable(ConfirmedTransactionMetaResult),
+    version: superstruct.optional(TransactionVersionStruct)
   })),
   rewards: superstruct.optional(superstruct.array(superstruct.type({
     pubkey: superstruct.string(),
@@ -4024,7 +4063,8 @@ const GetTransactionRpcResult = jsonRpcResult(superstruct.nullable(superstruct.t
   slot: superstruct.number(),
   meta: ConfirmedTransactionMetaResult,
   blockTime: superstruct.optional(superstruct.nullable(superstruct.number())),
-  transaction: ConfirmedTransactionResult
+  transaction: ConfirmedTransactionResult,
+  version: superstruct.optional(TransactionVersionStruct)
 })));
 /**
  * Expected parsed JSON RPC response for the "getTransaction" message
@@ -4034,7 +4074,8 @@ const GetParsedTransactionRpcResult = jsonRpcResult(superstruct.nullable(superst
   slot: superstruct.number(),
   transaction: ParsedConfirmedTransactionResult,
   meta: superstruct.nullable(ParsedConfirmedTransactionMetaResult),
-  blockTime: superstruct.optional(superstruct.nullable(superstruct.number()))
+  blockTime: superstruct.optional(superstruct.nullable(superstruct.number())),
+  version: superstruct.optional(TransactionVersionStruct)
 })));
 /**
  * Expected JSON RPC response for the "getRecentBlockhash" message
@@ -5277,9 +5318,16 @@ class Connection {
   }
   /**
    * Fetch a processed block from the cluster.
+   *
+   * @deprecated Instead, call `getBlock` using a `GetVersionedBlockConfig` by
+   * setting the `maxSupportedTransactionVersion` property.
    */
 
 
+  /**
+   * Fetch a processed block from the cluster.
+   */
+  // eslint-disable-next-line no-dupe-class-members
   async getBlock(slot, rawConfig) {
     const {
       commitment,
@@ -5302,16 +5350,15 @@ class Connection {
     return { ...result,
       transactions: result.transactions.map(({
         transaction,
-        meta
-      }) => {
-        const message = new Message(transaction.message);
-        return {
-          meta,
-          transaction: { ...transaction,
-            message
-          }
-        };
-      })
+        meta,
+        version
+      }) => ({
+        meta,
+        transaction: { ...transaction,
+          message: versionedMessageFromResponse(version, transaction.message)
+        },
+        version
+      }))
     };
   }
   /*
@@ -5371,9 +5418,17 @@ class Connection {
   }
   /**
    * Fetch a confirmed or finalized transaction from the cluster.
+   *
+   * @deprecated Instead, call `getTransaction` using a
+   * `GetVersionedTransactionConfig` by setting the
+   * `maxSupportedTransactionVersion` property.
    */
 
 
+  /**
+   * Fetch a confirmed or finalized transaction from the cluster.
+   */
+  // eslint-disable-next-line no-dupe-class-members
   async getTransaction(signature, rawConfig) {
     const {
       commitment,
@@ -5395,7 +5450,7 @@ class Connection {
     if (!result) return result;
     return { ...result,
       transaction: { ...result.transaction,
-        message: new Message(result.transaction.message)
+        message: versionedMessageFromResponse(result.version, result.transaction.message)
       }
     };
   }
@@ -5454,9 +5509,19 @@ class Connection {
   /**
    * Fetch transaction details for a batch of confirmed transactions.
    * Similar to {@link getParsedTransactions} but returns a {@link TransactionResponse}.
+   *
+   * @deprecated Instead, call `getTransactions` using a
+   * `GetVersionedTransactionConfig` by setting the
+   * `maxSupportedTransactionVersion` property.
    */
 
 
+  /**
+   * Fetch transaction details for a batch of confirmed transactions.
+   * Similar to {@link getParsedTransactions} but returns a {@link
+   * VersionedTransactionResponse}.
+   */
+  // eslint-disable-next-line no-dupe-class-members
   async getTransactions(signatures, commitmentOrConfig) {
     const {
       commitment,
@@ -5484,7 +5549,7 @@ class Connection {
       if (!result) return result;
       return { ...result,
         transaction: { ...result.transaction,
-          message: new Message(result.transaction.message)
+          message: versionedMessageFromResponse(result.version, result.transaction.message)
         }
       };
     });