algosdk 2.8.0 → 3.0.0-beta.1

package/src/client/urlTokenBaseHTTPClient.ts

@@ -1,10 +1,9 @@
-import { Buffer } from 'buffer';
 import {
   BaseHTTPClient,
   BaseHTTPClientResponse,
   BaseHTTPClientError,
   Query,
-} from './baseHTTPClient';
+} from './baseHTTPClient.js';
 
 export interface AlgodTokenHeader {
   'X-Algo-API-Token': string;
@@ -23,7 +22,10 @@ export interface CustomTokenHeader {
 }
 
 class URLTokenBaseHTTPError extends Error implements BaseHTTPClientError {
-  constructor(message: string, public response: BaseHTTPClientResponse) {
+  constructor(
+    message: string,
+    public response: BaseHTTPClientResponse
+  ) {
     super(message);
     this.name = 'URLTokenBaseHTTPError';
     this.response = response;
@@ -40,6 +42,9 @@ export type TokenHeader =
  * Implementation of BaseHTTPClient that uses a URL and a token
  * and make the REST queries using fetch.
  * This is the default implementation of BaseHTTPClient.
+ *
+ * Additional fetch options can be configured by using the `customOptions` parameter on
+ * get/post/delete requests.
  */
 export class URLTokenBaseHTTPClient implements BaseHTTPClient {
   private readonly baseURL: URL;
@@ -111,13 +116,13 @@ export class URLTokenBaseHTTPClient implements BaseHTTPClient {
       return;
     }
 
-    let body: Uint8Array | null = null;
-    let bodyErrorMessage: string | null = null;
+    let body: Uint8Array | undefined;
+    let bodyErrorMessage: string | undefined;
 
     try {
       body = new Uint8Array(await res.arrayBuffer());
       const decoded: Record<string, any> = JSON.parse(
-        Buffer.from(body).toString()
+        new TextDecoder().decode(body)
       );
       if (decoded.message) {
         bodyErrorMessage = decoded.message;
@@ -132,7 +137,7 @@ export class URLTokenBaseHTTPClient implements BaseHTTPClient {
     }
 
     throw new URLTokenBaseHTTPError(message, {
-      body,
+      body: body ?? new Uint8Array(),
       status: res.status,
       headers: URLTokenBaseHTTPClient.formatFetchResponseHeaders(res.headers),
     });
@@ -152,17 +157,19 @@ export class URLTokenBaseHTTPClient implements BaseHTTPClient {
   async get(
     relativePath: string,
     query?: Query<string>,
-    requestHeaders: Record<string, string> = {}
+    requestHeaders?: Record<string, string>,
+    customOptions?: Record<string, unknown>
   ): Promise<BaseHTTPClientResponse> {
     // Expand headers for use in fetch
     const headers = {
       ...this.tokenHeader,
       ...this.defaultHeaders,
-      ...requestHeaders,
+      ...(requestHeaders ?? {}),
     };
 
     const res = await fetch(this.getURL(relativePath, query), {
       headers,
+      ...(customOptions ?? {}),
     });
 
     return URLTokenBaseHTTPClient.formatFetchResponse(res);
@@ -172,19 +179,21 @@ export class URLTokenBaseHTTPClient implements BaseHTTPClient {
     relativePath: string,
     data: Uint8Array,
     query?: Query<string>,
-    requestHeaders: Record<string, string> = {}
+    requestHeaders?: Record<string, string>,
+    customOptions?: Record<string, unknown>
   ): Promise<BaseHTTPClientResponse> {
     // Expand headers for use in fetch
     const headers = {
       ...this.tokenHeader,
       ...this.defaultHeaders,
-      ...requestHeaders,
+      ...(requestHeaders ?? {}),
     };
 
     const res = await fetch(this.getURL(relativePath, query), {
       method: 'POST',
       body: data,
       headers,
+      ...(customOptions ?? {}),
     });
 
     return URLTokenBaseHTTPClient.formatFetchResponse(res);
@@ -192,21 +201,23 @@ export class URLTokenBaseHTTPClient implements BaseHTTPClient {
 
   async delete(
     relativePath: string,
-    data: Uint8Array,
+    data?: Uint8Array,
     query?: Query<string>,
-    requestHeaders: Record<string, string> = {}
+    requestHeaders?: Record<string, string>,
+    customOptions?: Record<string, unknown>
   ): Promise<BaseHTTPClientResponse> {
     // Expand headers for use in fetch
     const headers = {
       ...this.tokenHeader,
       ...this.defaultHeaders,
-      ...requestHeaders,
+      ...(requestHeaders ?? {}),
     };
 
     const res = await fetch(this.getURL(relativePath, query), {
       method: 'DELETE',
       body: data,
       headers,
+      ...(customOptions ?? {}),
     });
 
     return URLTokenBaseHTTPClient.formatFetchResponse(res);

package/src/client/v2/algod/accountApplicationInformation.ts

@@ -1,20 +1,27 @@
-import JSONRequest from '../jsonrequest';
-import HTTPClient from '../../client';
-import IntDecoding from '../../../types/intDecoding';
+import JSONRequest from '../jsonrequest.js';
+import { HTTPClient, HTTPClientResponse } from '../../client.js';
+import { decodeJSON } from '../../../encoding/encoding.js';
+import { AccountApplicationResponse } from './models/types.js';
+import { Address } from '../../../encoding/address.js';
+
+export default class AccountApplicationInformation extends JSONRequest<AccountApplicationResponse> {
+  private account: string;
 
-export default class AccountApplicationInformation extends JSONRequest {
   constructor(
     c: HTTPClient,
-    intDecoding: IntDecoding,
-    private account: string,
+    account: string | Address,
     private applicationID: number
   ) {
-    super(c, intDecoding);
-    this.account = account;
-    this.applicationID = applicationID;
+    super(c);
+    this.account = account.toString();
   }
 
   path() {
     return `/v2/accounts/${this.account}/applications/${this.applicationID}`;
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(response: HTTPClientResponse): AccountApplicationResponse {
+    return decodeJSON(response.getJSONText(), AccountApplicationResponse);
+  }
 }

package/src/client/v2/algod/accountAssetInformation.ts

@@ -1,20 +1,27 @@
-import JSONRequest from '../jsonrequest';
-import HTTPClient from '../../client';
-import IntDecoding from '../../../types/intDecoding';
+import JSONRequest from '../jsonrequest.js';
+import { HTTPClient, HTTPClientResponse } from '../../client.js';
+import { decodeJSON } from '../../../encoding/encoding.js';
+import { AccountAssetResponse } from './models/types.js';
+import { Address } from '../../../encoding/address.js';
+
+export default class AccountAssetInformation extends JSONRequest<AccountAssetResponse> {
+  private account: string;
 
-export default class AccountAssetInformation extends JSONRequest {
   constructor(
     c: HTTPClient,
-    intDecoding: IntDecoding,
-    private account: string,
+    account: string | Address,
     private assetID: number
   ) {
-    super(c, intDecoding);
-    this.account = account;
-    this.assetID = assetID;
+    super(c);
+    this.account = account.toString();
   }
 
   path() {
     return `/v2/accounts/${this.account}/assets/${this.assetID}`;
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(response: HTTPClientResponse): AccountAssetResponse {
+    return decodeJSON(response.getJSONText(), AccountAssetResponse);
+  }
 }

package/src/client/v2/algod/accountInformation.ts

@@ -1,15 +1,15 @@
-import JSONRequest from '../jsonrequest';
-import HTTPClient from '../../client';
-import IntDecoding from '../../../types/intDecoding';
+import JSONRequest from '../jsonrequest.js';
+import { HTTPClient, HTTPClientResponse } from '../../client.js';
+import { decodeJSON } from '../../../encoding/encoding.js';
+import { Account } from './models/types.js';
+import { Address } from '../../../encoding/address.js';
 
-export default class AccountInformation extends JSONRequest {
-  constructor(
-    c: HTTPClient,
-    intDecoding: IntDecoding,
-    private account: string
-  ) {
-    super(c, intDecoding);
-    this.account = account;
+export default class AccountInformation extends JSONRequest<Account> {
+  private account: string;
+
+  constructor(c: HTTPClient, account: string | Address) {
+    super(c);
+    this.account = account.toString();
   }
 
   path() {
@@ -34,4 +34,9 @@ export default class AccountInformation extends JSONRequest {
     this.query.exclude = exclude;
     return this;
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  prepare(response: HTTPClientResponse): Account {
+    return decodeJSON(response.getJSONText(), Account);
+  }
 }

package/src/client/v2/algod/algod.ts

@@ -1,49 +1,50 @@
-import ServiceClient from '../serviceClient';
-import * as modelsv2 from './models/types';
-import AccountInformation from './accountInformation';
-import AccountAssetInformation from './accountAssetInformation';
-import AccountApplicationInformation from './accountApplicationInformation';
-import Block from './block';
-import Compile from './compile';
-import Dryrun from './dryrun';
-import Genesis from './genesis';
-import GetAssetByID from './getAssetByID';
-import GetApplicationByID from './getApplicationByID';
-import GetBlockHash from './getBlockHash';
-import GetBlockTxids from './getBlockTxids';
-import GetApplicationBoxByName from './getApplicationBoxByName';
-import GetApplicationBoxes from './getApplicationBoxes';
-import HealthCheck from './healthCheck';
-import PendingTransactionInformation from './pendingTransactionInformation';
-import PendingTransactions from './pendingTransactions';
-import PendingTransactionsByAddress from './pendingTransactionsByAddress';
-import GetTransactionProof from './getTransactionProof';
-import SendRawTransaction from './sendRawTransaction';
-import Status from './status';
-import StatusAfterBlock from './statusAfterBlock';
-import SuggestedParams from './suggestedParams';
-import Supply from './supply';
-import Versions from './versions';
-import { BaseHTTPClient } from '../../baseHTTPClient';
+import ServiceClient from '../serviceClient.js';
+import * as modelsv2 from './models/types.js';
+import AccountInformation from './accountInformation.js';
+import AccountAssetInformation from './accountAssetInformation.js';
+import AccountApplicationInformation from './accountApplicationInformation.js';
+import Block from './block.js';
+import Compile from './compile.js';
+import Dryrun from './dryrun.js';
+import Genesis from './genesis.js';
+import GetAssetByID from './getAssetByID.js';
+import GetApplicationByID from './getApplicationByID.js';
+import GetBlockHash from './getBlockHash.js';
+import GetBlockTxids from './getBlockTxids.js';
+import GetApplicationBoxByName from './getApplicationBoxByName.js';
+import GetApplicationBoxes from './getApplicationBoxes.js';
+import HealthCheck from './healthCheck.js';
+import PendingTransactionInformation from './pendingTransactionInformation.js';
+import PendingTransactions from './pendingTransactions.js';
+import PendingTransactionsByAddress from './pendingTransactionsByAddress.js';
+import GetTransactionProof from './getTransactionProof.js';
+import SendRawTransaction from './sendRawTransaction.js';
+import Status from './status.js';
+import StatusAfterBlock from './statusAfterBlock.js';
+import SuggestedParams from './suggestedParams.js';
+import Supply from './supply.js';
+import Versions from './versions.js';
+import { BaseHTTPClient } from '../../baseHTTPClient.js';
 import {
   AlgodTokenHeader,
   CustomTokenHeader,
-} from '../../urlTokenBaseHTTPClient';
-import LightBlockHeaderProof from './lightBlockHeaderProof';
-import StateProof from './stateproof';
-import SetSyncRound from './setSyncRound';
-import GetSyncRound from './getSyncRound';
-import SetBlockOffsetTimestamp from './setBlockOffsetTimestamp';
-import GetBlockOffsetTimestamp from './getBlockOffsetTimestamp';
-import Disassemble from './disassemble';
-import SimulateRawTransactions from './simulateTransaction';
-import { EncodedSignedTransaction } from '../../../types';
-import * as encoding from '../../../encoding/encoding';
-import Ready from './ready';
-import UnsetSyncRound from './unsetSyncRound';
-import GetLedgerStateDeltaForTransactionGroup from './getLedgerStateDeltaForTransactionGroup';
-import GetLedgerStateDelta from './getLedgerStateDelta';
-import GetTransactionGroupLedgerStateDeltasForRound from './getTransactionGroupLedgerStateDeltasForRound';
+} from '../../urlTokenBaseHTTPClient.js';
+import LightBlockHeaderProof from './lightBlockHeaderProof.js';
+import StateProof from './stateproof.js';
+import SetSyncRound from './setSyncRound.js';
+import GetSyncRound from './getSyncRound.js';
+import SetBlockOffsetTimestamp from './setBlockOffsetTimestamp.js';
+import GetBlockOffsetTimestamp from './getBlockOffsetTimestamp.js';
+import Disassemble from './disassemble.js';
+import SimulateRawTransactions from './simulateTransaction.js';
+import { SignedTransaction } from '../../../signedTransaction.js';
+import * as encoding from '../../../encoding/encoding.js';
+import Ready from './ready.js';
+import UnsetSyncRound from './unsetSyncRound.js';
+import GetLedgerStateDeltaForTransactionGroup from './getLedgerStateDeltaForTransactionGroup.js';
+import GetLedgerStateDelta from './getLedgerStateDelta.js';
+import GetTransactionGroupLedgerStateDeltasForRound from './getTransactionGroupLedgerStateDeltasForRound.js';
+import { Address } from '../../../encoding/address.js';
 
 /**
  * Algod client connects an application to the Algorand blockchain. The algod client requires a valid algod REST endpoint IP address and algod token from an Algorand node that is connected to the network you plan to interact with.
@@ -55,7 +56,7 @@ import GetTransactionGroupLedgerStateDeltasForRound from './getTransactionGroupL
  *
  * [Run Algod in Postman OAS3](https://developer.algorand.org/docs/rest-apis/restendpoints/?from_query=algod#algod-indexer-and-kmd-rest-endpoints)
  */
-export default class AlgodClient extends ServiceClient {
+export class AlgodClient extends ServiceClient {
   /**
    * Create an AlgodClient from
    * * either a token, baseServer, port, and optional headers
@@ -153,8 +154,8 @@ export default class AlgodClient extends ServiceClient {
    * @param account - The address of the account to look up.
    * @category GET
    */
-  accountInformation(account: string) {
-    return new AccountInformation(this.c, this.intDecoding, account);
+  accountInformation(account: string | Address) {
+    return new AccountInformation(this.c, account);
   }
 
   /**
@@ -172,13 +173,8 @@ export default class AlgodClient extends ServiceClient {
    * @param index - The asset ID to look up.
    * @category GET
    */
-  accountAssetInformation(account: string, index: number) {
-    return new AccountAssetInformation(
-      this.c,
-      this.intDecoding,
-      account,
-      index
-    );
+  accountAssetInformation(account: string | Address, index: number) {
+    return new AccountAssetInformation(this.c, account, index);
   }
 
   /**
@@ -196,13 +192,8 @@ export default class AlgodClient extends ServiceClient {
    * @param index - The application ID to look up.
    * @category GET
    */
-  accountApplicationInformation(account: string, index: number) {
-    return new AccountApplicationInformation(
-      this.c,
-      this.intDecoding,
-      account,
-      index
-    );
+  accountApplicationInformation(account: string | Address, index: number) {
+    return new AccountApplicationInformation(this.c, account, index);
   }
 
   /**
@@ -236,7 +227,7 @@ export default class AlgodClient extends ServiceClient {
    * @category GET
    */
   getBlockHash(roundNumber: number) {
-    return new GetBlockHash(this.c, this.intDecoding, roundNumber);
+    return new GetBlockHash(this.c, roundNumber);
   }
 
   /**
@@ -253,7 +244,7 @@ export default class AlgodClient extends ServiceClient {
    * @category GET
    */
   getBlockTxids(roundNumber: number) {
-    return new GetBlockTxids(this.c, this.intDecoding, roundNumber);
+    return new GetBlockTxids(this.c, roundNumber);
   }
 
   /**
@@ -332,7 +323,7 @@ export default class AlgodClient extends ServiceClient {
    * @param address - The address of the sender.
    * @category GET
    */
-  pendingTransactionByAddress(address: string) {
+  pendingTransactionByAddress(address: string | Address) {
     return new PendingTransactionsByAddress(this.c, address);
   }
 
@@ -348,7 +339,7 @@ export default class AlgodClient extends ServiceClient {
    * @category GET
    */
   status() {
-    return new Status(this.c, this.intDecoding);
+    return new Status(this.c);
   }
 
   /**
@@ -365,7 +356,7 @@ export default class AlgodClient extends ServiceClient {
    * @category GET
    */
   statusAfterBlock(round: number) {
-    return new StatusAfterBlock(this.c, this.intDecoding, round);
+    return new StatusAfterBlock(this.c, round);
   }
 
   /**
@@ -376,8 +367,8 @@ export default class AlgodClient extends ServiceClient {
    * const suggestedParams = await algodClient.getTransactionParams().do();
    * const amountInMicroAlgos = algosdk.algosToMicroalgos(2); // 2 Algos
    * const unsignedTxn = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
-   *   from: senderAddress,
-   *   to: receiverAddress,
+   *   sender: senderAddress,
+   *   receiver: receiverAddress,
    *   amount: amountInMicroAlgos,
    *   suggestedParams: suggestedParams,
    * });
@@ -406,7 +397,7 @@ export default class AlgodClient extends ServiceClient {
    * @category GET
    */
   supply() {
-    return new Supply(this.c, this.intDecoding);
+    return new Supply(this.c);
   }
 
   /**
@@ -476,8 +467,8 @@ export default class AlgodClient extends ServiceClient {
    * @param index - The asset ID to look up.
    * @category GET
    */
-  getAssetByID(index: number) {
-    return new GetAssetByID(this.c, this.intDecoding, index);
+  getAssetByID(index: number | bigint) {
+    return new GetAssetByID(this.c, index);
   }
 
   /**
@@ -494,8 +485,8 @@ export default class AlgodClient extends ServiceClient {
    * @param index - The application ID to look up.
    * @category GET
    */
-  getApplicationByID(index: number) {
-    return new GetApplicationByID(this.c, this.intDecoding, index);
+  getApplicationByID(index: number | bigint) {
+    return new GetApplicationByID(this.c, index);
   }
 
   /**
@@ -514,12 +505,7 @@ export default class AlgodClient extends ServiceClient {
    * @category GET
    */
   getApplicationBoxByName(index: number, boxName: Uint8Array) {
-    return new GetApplicationBoxByName(
-      this.c,
-      this.intDecoding,
-      index,
-      boxName
-    );
+    return new GetApplicationBoxByName(this.c, index, boxName);
   }
 
   /**
@@ -537,7 +523,7 @@ export default class AlgodClient extends ServiceClient {
    * @category GET
    */
   getApplicationBoxes(index: number) {
-    return new GetApplicationBoxes(this.c, this.intDecoding, index);
+    return new GetApplicationBoxes(this.c, index);
   }
 
   /**
@@ -552,7 +538,7 @@ export default class AlgodClient extends ServiceClient {
    * @category GET
    */
   genesis() {
-    return new Genesis(this.c, this.intDecoding);
+    return new Genesis(this.c);
   }
 
   /**
@@ -571,7 +557,7 @@ export default class AlgodClient extends ServiceClient {
    * @category GET
    */
   getTransactionProof(round: number, txID: string) {
-    return new GetTransactionProof(this.c, this.intDecoding, round, txID);
+    return new GetTransactionProof(this.c, round, txID);
   }
 
   /**
@@ -587,7 +573,7 @@ export default class AlgodClient extends ServiceClient {
    * @param round
    */
   getLightBlockHeaderProof(round: number) {
-    return new LightBlockHeaderProof(this.c, this.intDecoding, round);
+    return new LightBlockHeaderProof(this.c, round);
   }
 
   /**
@@ -603,7 +589,7 @@ export default class AlgodClient extends ServiceClient {
    * @param round
    */
   getStateProof(round: number) {
-    return new StateProof(this.c, this.intDecoding, round);
+    return new StateProof(this.c, round);
   }
 
   /**
@@ -628,13 +614,13 @@ export default class AlgodClient extends ServiceClient {
    * @category POST
    */
   simulateRawTransactions(stxOrStxs: Uint8Array | Uint8Array[]) {
-    const txnObjects: EncodedSignedTransaction[] = [];
+    const txnObjects: SignedTransaction[] = [];
     if (Array.isArray(stxOrStxs)) {
       for (const stxn of stxOrStxs) {
-        txnObjects.push(encoding.decode(stxn) as EncodedSignedTransaction);
+        txnObjects.push(encoding.decodeMsgpack(stxn, SignedTransaction));
       }
     } else {
-      txnObjects.push(encoding.decode(stxOrStxs) as EncodedSignedTransaction);
+      txnObjects.push(encoding.decodeMsgpack(stxOrStxs, SignedTransaction));
     }
     const request = new modelsv2.SimulateRequest({
       txnGroups: [
@@ -693,7 +679,7 @@ export default class AlgodClient extends ServiceClient {
    * @category POST
    */
   setBlockOffsetTimestamp(offset: number) {
-    return new SetBlockOffsetTimestamp(this.c, this.intDecoding, offset);
+    return new SetBlockOffsetTimestamp(this.c, offset);
   }
 
   /**
@@ -708,7 +694,7 @@ export default class AlgodClient extends ServiceClient {
    * @category GET
    */
   getBlockOffsetTimestamp() {
-    return new GetBlockOffsetTimestamp(this.c, this.intDecoding);
+    return new GetBlockOffsetTimestamp(this.c);
   }
 
   /**
@@ -725,7 +711,7 @@ export default class AlgodClient extends ServiceClient {
    * @category POST
    */
   setSyncRound(round: number) {
-    return new SetSyncRound(this.c, this.intDecoding, round);
+    return new SetSyncRound(this.c, round);
   }
 
   /**
@@ -740,7 +726,7 @@ export default class AlgodClient extends ServiceClient {
    * @category DELETE
    */
   unsetSyncRound() {
-    return new UnsetSyncRound(this.c, this.intDecoding);
+    return new UnsetSyncRound(this.c);
   }
 
   /**
@@ -755,7 +741,7 @@ export default class AlgodClient extends ServiceClient {
    * @category GET
    */
   getSyncRound() {
-    return new GetSyncRound(this.c, this.intDecoding);
+    return new GetSyncRound(this.c);
   }
 
   /**
@@ -770,7 +756,7 @@ export default class AlgodClient extends ServiceClient {
    * @category GET
    */
   ready() {
-    return new Ready(this.c, this.intDecoding);
+    return new Ready(this.c);
   }
 
   /**
@@ -787,11 +773,7 @@ export default class AlgodClient extends ServiceClient {
    * @category GET
    */
   getLedgerStateDeltaForTransactionGroup(id: string) {
-    return new GetLedgerStateDeltaForTransactionGroup(
-      this.c,
-      this.intDecoding,
-      id
-    );
+    return new GetLedgerStateDeltaForTransactionGroup(this.c, id);
   }
 
   /**
@@ -807,8 +789,8 @@ export default class AlgodClient extends ServiceClient {
    * @param round the round number to be searched for
    * @category GET
    */
-  getLedgerStateDelta(round: bigint) {
-    return new GetLedgerStateDelta(this.c, this.intDecoding, round);
+  getLedgerStateDelta(round: number) {
+    return new GetLedgerStateDelta(this.c, round);
   }
 
   /**
@@ -824,11 +806,7 @@ export default class AlgodClient extends ServiceClient {
    * @param round the round number to be searched for
    * @category GET
    */
-  getTransactionGroupLedgerStateDeltasForRound(round: bigint) {
-    return new GetTransactionGroupLedgerStateDeltasForRound(
-      this.c,
-      this.intDecoding,
-      round
-    );
+  getTransactionGroupLedgerStateDeltasForRound(round: number) {
+    return new GetTransactionGroupLedgerStateDeltasForRound(this.c, round);
   }
 }

package/src/client/v2/algod/block.ts

@@ -1,17 +1,16 @@
-import * as encoding from '../../../encoding/encoding';
-import JSONRequest from '../jsonrequest';
-import HTTPClient from '../../client';
+import JSONRequest from '../jsonrequest.js';
+import { HTTPClient, HTTPClientResponse } from '../../client.js';
+import { decodeMsgpack } from '../../../encoding/encoding.js';
+import { BlockResponse } from './models/types.js';
 
 /**
  * block gets the block info for the given round. this call may block
  */
-export default class Block extends JSONRequest {
+export default class Block extends JSONRequest<BlockResponse> {
   private round: number;
 
   constructor(c: HTTPClient, roundNumber: number) {
     super(c);
-    if (!Number.isInteger(roundNumber))
-      throw Error('roundNumber should be an integer');
     this.round = roundNumber;
     this.query = { format: 'msgpack' };
   }
@@ -21,10 +20,7 @@ export default class Block extends JSONRequest {
   }
 
   // eslint-disable-next-line class-methods-use-this
-  prepare(body: Uint8Array) {
-    if (body && body.byteLength > 0) {
-      return encoding.decode(body) as Record<string, any>;
-    }
-    return undefined;
+  prepare(response: HTTPClientResponse): BlockResponse {
+    return decodeMsgpack(response.body, BlockResponse);
   }
 }