@ethersphere/bee-js 5.2.0 → 6.0.0-pre.1

package/dist/mjs/utils/error.js

@@ -8,35 +8,4 @@ export class BeeArgumentError extends BeeError {
     super(message);
     this.value = value;
   }
-}
-export class BeeRequestError extends BeeError {
-  /**
-   * @param message
-   * @param requestOptions KyOptions that were used to assemble the request. THIS MIGHT NOT BE COMPLETE! If custom Ky instance was used that has set defaults then these defaults are not visible in this object!
-   */
-  constructor(message, requestOptions) {
-    super(message);
-    this.requestOptions = requestOptions;
-  }
-}
-export class BeeResponseError extends BeeError {
-  /**
-   * @param status HTTP status code number
-   * @param response Response returned from the server
-   * @param responseBody Response body as string which is returned from response.text() call
-   * @param requestOptions KyOptions that were used to assemble the request. THIS MIGHT NOT BE COMPLETE! If custom Ky instance was used that has set defaults then these defaults are not visible in this object!
-   * @param message
-   */
-  constructor(status, response, responseBody, requestOptions, message) {
-    super(message);
-    this.status = status;
-    this.response = response;
-    this.responseBody = responseBody;
-    this.requestOptions = requestOptions;
-  }
-}
-export class BeeNotAJsonError extends BeeError {
-  constructor() {
-    super(`Received response is not valid JSON.`);
-  }
 }

package/dist/mjs/utils/headers.js

@@ -26,9 +26,9 @@ function readTagUid(header) {
   return parseInt(header, 10);
 }
 export function readFileHeaders(headers) {
-  const name = readContentDispositionFilename(headers.get('content-disposition'));
-  const tagUid = readTagUid(headers.get('swarm-tag-uid'));
-  const contentType = headers.get('content-type') || undefined;
+  const name = readContentDispositionFilename(headers['content-disposition']);
+  const tagUid = readTagUid(headers['swarm-tag-uid']);
+  const contentType = headers['content-type'] || undefined;
   return {
     name,
     tagUid,

package/dist/mjs/utils/http.js

@@ -1,150 +1,22 @@
-import { BeeError, BeeNotAJsonError, BeeRequestError, BeeResponseError } from "./error.js";
-import { normalizeToReadableStream } from "./stream.js";
-import { isObject, isStrictlyObject } from "./type.js";
-import { deepMerge } from "./merge.js";
-export const DEFAULT_KY_CONFIG = {
+import axios from 'axios';
+import { Objects } from 'cafe-utility';
+export const DEFAULT_HTTP_CONFIG = {
   headers: {
     accept: 'application/json, text/plain, */*',
     'user-agent': `bee-js`
   }
 };
-function isHttpError(e) {
-  return isObject(e) && typeof e.response !== 'undefined';
-}
-function isHttpRequestError(e) {
-  return isObject(e) && typeof e.request !== 'undefined';
-}
-function headersToObject(header) {
-  return [...header.entries()].reduce((obj, [key, val]) => {
-    obj[key] = val;
-    return obj;
-  }, {});
-}
-function wrapRequest(request) {
-  return {
-    url: request.url,
-    method: request.method.toUpperCase(),
-    headers: headersToObject(request.headers)
-  };
-}
-export function wrapRequestClosure(cb) {
-  return async request => {
-    await cb(wrapRequest(request));
-  };
-}
-export function wrapResponseClosure(cb) {
-  return async (request, options, response) => {
-    await cb({
-      headers: headersToObject(response.headers),
-      status: response.status,
-      statusText: response.statusText,
-      request: wrapRequest(request)
-    });
-  };
-}
 /**
- * Filters out entries that has undefined value from headers object.
- * Modifies the original object!
- *
- * @param obj
+ * Main function to make HTTP requests.
+ * @param options User defined settings
+ * @param config Internal settings and/or Bee settings
  */
-// eslint-disable-next-line @typescript-eslint/ban-types
-export function filterHeaders(obj) {
-  if (obj === undefined) {
-    return undefined;
-  }
-  isStrictlyObject(obj);
-  const typedObj = obj;
-  for (const key in typedObj) {
-    if (typedObj[key] === undefined) {
-      delete typedObj[key];
-    }
-  }
-  if (Object.keys(typedObj).length === 0) {
-    return undefined;
-  }
-  return typedObj;
-}
-/**
- * Main utility function to make HTTP requests.
- * @param kyOptions
- * @param config
- */
-export async function http(kyOptions, config) {
+export async function http(options, config) {
   try {
-    const ky = await getKy();
-    const {
-      path,
-      responseType,
-      ...kyConfig
-    } = deepMerge(kyOptions, config);
-    const response = await ky(path, {
-      ...kyConfig,
-      searchParams: filterHeaders(kyConfig.searchParams)
-    });
-    switch (responseType) {
-      case 'stream':
-        if (!response.body) {
-          throw new BeeError('Response was expected to get data but did not get any!');
-        }
-        response.parsedData = normalizeToReadableStream(response.body);
-        break;
-      case 'arraybuffer':
-        response.parsedData = await response.arrayBuffer();
-        break;
-      case 'json':
-        try {
-          response.parsedData = await response.json();
-        } catch (e) {
-          throw new BeeNotAJsonError();
-        }
-        break;
-      default:
-        break;
-      // If responseType is not set, then no data are expected
-    }
-
+    const requestConfig = Objects.deepMerge3(DEFAULT_HTTP_CONFIG, config, options);
+    const response = await axios(requestConfig);
     return response;
   } catch (e) {
-    // Passthrough thrown errors
-    if (e instanceof BeeNotAJsonError) {
-      throw e;
-    }
-    if (isHttpError(e)) {
-      let message;
-      // We store the response body here as it can be read only once in Response's lifecycle so to make it exposed
-      // to the user in the BeeResponseError, for further analysis.
-      const body = await e.response.text();
-      try {
-        // The response can be Bee's JSON with structure `{code, message}` lets try to parse it
-        message = JSON.parse(body).message;
-      } catch (e) {}
-      if (message) {
-        throw new BeeResponseError(e.response.status, e.response, body, config, `${e.response.statusText}: ${message}`);
-      } else {
-        throw new BeeResponseError(e.response.status, e.response, body, config, e.response.statusText);
-      }
-    } else if (isHttpRequestError(e)) {
-      throw new BeeRequestError(e.message, config);
-    } else {
-      // Node 18 has native `fetch` implementation called Undici. Errors from this implementation have top level generic
-      // message "fetch failed" with the more specific error placed into `cause` property. Instead of "fetch failed" we
-      // expose the underlying problem.
-      if (e.cause) {
-        throw new BeeError(e.cause.message);
-      }
-      throw new BeeError(e.message);
-    }
-  }
-}
-let ky;
-async function getKy() {
-  if (ky) {
-    return ky;
-  }
-  ky = (await import('ky-universal')).default;
-  if (!ky) {
-    throw new Error('Ky was not found while it should have been!');
+    throw e;
   }
-  return ky;
 }

package/dist/mjs/utils/type.js

@@ -1,9 +1,9 @@
-import { ADDRESS_HEX_LENGTH, BATCH_ID_HEX_LENGTH, ENCRYPTED_REFERENCE_HEX_LENGTH, PUBKEY_HEX_LENGTH, REFERENCE_HEX_LENGTH, TAGS_LIMIT_MAX, TAGS_LIMIT_MIN, PSS_TARGET_HEX_LENGTH_MAX } from "../types/index.js";
+import { decodeCid, encodeReference } from '@ethersphere/swarm-cid';
+import { ADDRESS_HEX_LENGTH, BATCH_ID_HEX_LENGTH, ENCRYPTED_REFERENCE_HEX_LENGTH, PSS_TARGET_HEX_LENGTH_MAX, PUBKEY_HEX_LENGTH, REFERENCE_HEX_LENGTH, TAGS_LIMIT_MAX, TAGS_LIMIT_MIN } from "../types/index.js";
 import { BeeArgumentError, BeeError } from "./error.js";
 import { isFile } from "./file.js";
 import { assertHexString, assertPrefixedHexString, isHexString } from "./hex.js";
 import { isReadable } from "./stream.js";
-import { decodeCid, encodeReference } from '@ethersphere/swarm-cid';
 export function isUint8Array(obj) {
   return obj instanceof Uint8Array;
 }
@@ -164,9 +164,6 @@ export function assertRequestOptions(value, name = 'RequestOptions') {
   if (options.timeout) {
     assertNonNegativeInteger(options.timeout, `${name}.timeout`);
   }
-  if (options.fetch && typeof options.fetch !== 'function') {
-    throw new TypeError(`${name}.fetch has to be a function or undefined!`);
-  }
 }
 export function assertUploadOptions(value, name = 'UploadOptions') {
   if (!isStrictlyObject(value)) {

package/dist/types/bee-debug.d.ts

@@ -1,5 +1,5 @@
-import type { Address, AllSettlements, BalanceResponse, BeeVersions, ChainState, ChequebookAddressResponse, ChequebookBalanceResponse, ExtendedTag, Health, LastCashoutActionResponse, LastChequesForPeerResponse, LastChequesResponse, NodeAddresses, NodeInfo, NumberString, Peer, PeerBalance, PingResponse, PostageBatch, PostageBatchBuckets, RedistributionState, RemovePeerResponse, ReserveState, Settlements, Topology, TransactionHash, TransactionInfo, WalletBalance } from './types';
-import { BatchId, BeeOptions, CashoutOptions, PostageBatchOptions, RequestOptions, Tag, TransactionOptions } from './types';
+import type { Address, AllSettlements, BalanceResponse, BeeRequestOptions, BeeVersions, ChainState, ChequebookAddressResponse, ChequebookBalanceResponse, ExtendedTag, Health, LastCashoutActionResponse, LastChequesForPeerResponse, LastChequesResponse, NodeAddresses, NodeInfo, NumberString, Peer, PeerBalance, PingResponse, PostageBatch, PostageBatchBuckets, RedistributionState, RemovePeerResponse, ReserveState, Settlements, Topology, TransactionHash, TransactionInfo, WalletBalance } from './types';
+import { BatchId, BeeOptions, CashoutOptions, PostageBatchOptions, Tag, TransactionOptions } from './types';
 export declare class BeeDebug {
     /**
      * URL on which is the Debug API of Bee node exposed
@@ -9,10 +9,10 @@ export declare class BeeDebug {
      * Ky instance that defines connection to Bee node
      * @private
      */
-    private readonly kyOptions;
+    private readonly requestOptions;
     constructor(url: string, options?: BeeOptions);
-    getNodeAddresses(options?: RequestOptions): Promise<NodeAddresses>;
-    getBlocklist(options?: RequestOptions): Promise<Peer[]>;
+    getNodeAddresses(options?: BeeRequestOptions): Promise<NodeAddresses>;
+    getBlocklist(options?: BeeRequestOptions): Promise<Peer[]>;
     /**
      * Retrieve tag extended information from Bee node
      *
@@ -23,61 +23,61 @@ export declare class BeeDebug {
      * @see [Bee API reference - `GET /tags/{uid}`](https://docs.ethswarm.org/debug-api/#tag/Tag)
      *
      */
-    retrieveExtendedTag(tagUid: number | Tag, options?: RequestOptions): Promise<ExtendedTag>;
+    retrieveExtendedTag(tagUid: number | Tag, options?: BeeRequestOptions): Promise<ExtendedTag>;
     /**
      * Get list of peers for this node
      */
-    getPeers(options?: RequestOptions): Promise<Peer[]>;
-    removePeer(peer: string | Address, options?: RequestOptions): Promise<RemovePeerResponse>;
-    getTopology(options?: RequestOptions): Promise<Topology>;
-    pingPeer(peer: string | Address, options?: RequestOptions): Promise<PingResponse>;
+    getPeers(options?: BeeRequestOptions): Promise<Peer[]>;
+    removePeer(peer: string | Address, options?: BeeRequestOptions): Promise<RemovePeerResponse>;
+    getTopology(options?: BeeRequestOptions): Promise<Topology>;
+    pingPeer(peer: string | Address, options?: BeeRequestOptions): Promise<PingResponse>;
     /**
      * Get the balances with all known peers including prepaid services
      */
-    getAllBalances(options?: RequestOptions): Promise<BalanceResponse>;
+    getAllBalances(options?: BeeRequestOptions): Promise<BalanceResponse>;
     /**
      * Get the balances with a specific peer including prepaid services
      *
      * @param address Swarm address of peer
      */
-    getPeerBalance(address: Address | string, options?: RequestOptions): Promise<PeerBalance>;
+    getPeerBalance(address: Address | string, options?: BeeRequestOptions): Promise<PeerBalance>;
     /**
      * Get the past due consumption balances with all known peers
      */
-    getPastDueConsumptionBalances(options?: RequestOptions): Promise<BalanceResponse>;
+    getPastDueConsumptionBalances(options?: BeeRequestOptions): Promise<BalanceResponse>;
     /**
      * Get the past due consumption balance with a specific peer
      *
      * @param address Swarm address of peer
      */
-    getPastDueConsumptionPeerBalance(address: Address | string, options?: RequestOptions): Promise<PeerBalance>;
+    getPastDueConsumptionPeerBalance(address: Address | string, options?: BeeRequestOptions): Promise<PeerBalance>;
     /**
      * Get the address of the chequebook contract used.
      *
      * **Warning:** The address is returned with 0x prefix unlike all other calls.
      * https://github.com/ethersphere/bee/issues/1443
      */
-    getChequebookAddress(options?: RequestOptions): Promise<ChequebookAddressResponse>;
+    getChequebookAddress(options?: BeeRequestOptions): Promise<ChequebookAddressResponse>;
     /**
      * Get the balance of the chequebook
      */
-    getChequebookBalance(options?: RequestOptions): Promise<ChequebookBalanceResponse>;
+    getChequebookBalance(options?: BeeRequestOptions): Promise<ChequebookBalanceResponse>;
     /**
      * Get last cheques for all peers
      */
-    getLastCheques(options?: RequestOptions): Promise<LastChequesResponse>;
+    getLastCheques(options?: BeeRequestOptions): Promise<LastChequesResponse>;
     /**
      * Get last cheques for the peer
      *
      * @param address  Swarm address of peer
      */
-    getLastChequesForPeer(address: Address | string, options?: RequestOptions): Promise<LastChequesForPeerResponse>;
+    getLastChequesForPeer(address: Address | string, options?: BeeRequestOptions): Promise<LastChequesForPeerResponse>;
     /**
      * Get last cashout action for the peer
      *
      * @param address  Swarm address of peer
      */
-    getLastCashoutAction(address: Address | string, options?: RequestOptions): Promise<LastCashoutActionResponse>;
+    getLastCashoutAction(address: Address | string, options?: BeeRequestOptions): Promise<LastCashoutActionResponse>;
     /**
      * Cashout the last cheque for the peer
      *
@@ -86,7 +86,7 @@ export declare class BeeDebug {
      * @param options.gasPrice Gas price for the cashout transaction in WEI
      * @param options.gasLimit Gas limit for the cashout transaction in WEI
      */
-    cashoutLastCheque(address: string | Address, options?: CashoutOptions): Promise<string>;
+    cashoutLastCheque(address: string | Address, options?: CashoutOptions, requestOptions?: BeeRequestOptions): Promise<string>;
     /**
      * Deposit tokens from overlay address into chequebook
      *
@@ -94,7 +94,7 @@ export declare class BeeDebug {
      * @param gasPrice Gas Price in WEI for the transaction call
      * @return string  Hash of the transaction
      */
-    depositTokens(amount: number | NumberString, gasPrice?: NumberString, options?: RequestOptions): Promise<string>;
+    depositTokens(amount: number | NumberString, gasPrice?: NumberString, options?: BeeRequestOptions): Promise<string>;
     /**
      * Withdraw tokens from the chequebook to the overlay address
      *
@@ -102,36 +102,36 @@ export declare class BeeDebug {
      * @param gasPrice Gas Price in WEI for the transaction call
      * @return string  Hash of the transaction
      */
-    withdrawTokens(amount: number | NumberString, gasPrice?: NumberString, options?: RequestOptions): Promise<string>;
+    withdrawTokens(amount: number | NumberString, gasPrice?: NumberString, options?: BeeRequestOptions): Promise<string>;
     /**
      * Get amount of sent and received from settlements with a peer
      *
      * @param address  Swarm address of peer
      */
-    getSettlements(address: Address | string, options?: RequestOptions): Promise<Settlements>;
+    getSettlements(address: Address | string, options?: BeeRequestOptions): Promise<Settlements>;
     /**
      * Get settlements with all known peers and total amount sent or received
      */
-    getAllSettlements(options?: RequestOptions): Promise<AllSettlements>;
+    getAllSettlements(options?: BeeRequestOptions): Promise<AllSettlements>;
     /**
      * Get health of node
      */
-    getHealth(options?: RequestOptions): Promise<Health>;
+    getHealth(options?: BeeRequestOptions): Promise<Health>;
     /**
      * Get readiness of node
      */
-    getReadiness(options?: RequestOptions): Promise<boolean>;
+    getReadiness(options?: BeeRequestOptions): Promise<boolean>;
     /**
      * Get mode information of node
      */
-    getNodeInfo(options?: RequestOptions): Promise<NodeInfo>;
+    getNodeInfo(options?: BeeRequestOptions): Promise<NodeInfo>;
     /**
      * Connnects to a node and checks if it is a supported Bee version by the bee-js
      *
      * @returns true if the Bee node version is supported
      * @deprecated Use `BeeDebug.isSupportedExactVersion()` instead
      */
-    isSupportedVersion(options?: RequestOptions): Promise<boolean> | never;
+    isSupportedVersion(options?: BeeRequestOptions): Promise<boolean> | never;
     /**
      * Connects to a node and checks if its version matches with the one that bee-js supports.
      *
@@ -142,7 +142,7 @@ export declare class BeeDebug {
      *
      * @param options
      */
-    isSupportedExactVersion(options?: RequestOptions): Promise<boolean> | never;
+    isSupportedExactVersion(options?: BeeRequestOptions): Promise<boolean> | never;
     /**
      * Connects to a node and checks if its main's API version matches with the one that bee-js supports.
      *
@@ -151,7 +151,7 @@ export declare class BeeDebug {
      *
      * @param options
      */
-    isSupportedMainApiVersion(options?: RequestOptions): Promise<boolean> | never;
+    isSupportedMainApiVersion(options?: BeeRequestOptions): Promise<boolean> | never;
     /**
      * Connects to a node and checks if its Debug API version matches with the one that bee-js supports.
      *
@@ -160,7 +160,7 @@ export declare class BeeDebug {
      *
      * @param options
      */
-    isSupportedDebugApiVersion(options?: RequestOptions): Promise<boolean> | never;
+    isSupportedDebugApiVersion(options?: BeeRequestOptions): Promise<boolean> | never;
     /**
      *
      * Connects to a node and checks if its Main and Debug API versions matches with the one that bee-js supports.
@@ -169,28 +169,28 @@ export declare class BeeDebug {
      *
      * @param options
      */
-    isSupportedApiVersion(options?: RequestOptions): Promise<boolean> | never;
+    isSupportedApiVersion(options?: BeeRequestOptions): Promise<boolean> | never;
     /**
      * Returns object with all versions specified by the connected Bee node (properties prefixed with `bee*`)
      * and versions that bee-js supports (properties prefixed with `supported*`).
      *
      * @param options
      */
-    getVersions(options?: RequestOptions): Promise<BeeVersions> | never;
+    getVersions(options?: BeeRequestOptions): Promise<BeeVersions> | never;
     /**
      * Get reserve state
      */
-    getReserveState(options?: RequestOptions): Promise<ReserveState>;
+    getReserveState(options?: BeeRequestOptions): Promise<ReserveState>;
     /**
      * Get chain state
      */
-    getChainState(options?: RequestOptions): Promise<ChainState>;
+    getChainState(options?: BeeRequestOptions): Promise<ChainState>;
     /**
      * Get wallet balances for xDai and BZZ of the Bee node
      *
      * @param options
      */
-    getWalletBalance(options?: RequestOptions): Promise<WalletBalance>;
+    getWalletBalance(options?: BeeRequestOptions): Promise<WalletBalance>;
     /**
      * Creates new postage batch from the funds that the node has available in its Ethereum account.
      *
@@ -208,7 +208,7 @@ export declare class BeeDebug {
      * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/access-the-swarm/keep-your-data-alive)
      * @see [Bee Debug API reference - `POST /stamps`](https://docs.ethswarm.org/debug-api/#tag/Postage-Stamps/paths/~1stamps~1{amount}~1{depth}/post)
      */
-    createPostageBatch(amount: NumberString, depth: number, options?: PostageBatchOptions): Promise<BatchId>;
+    createPostageBatch(amount: NumberString, depth: number, options?: PostageBatchOptions, requestOptions?: BeeRequestOptions): Promise<BatchId>;
     /**
      * Topup a fresh amount of BZZ to given Postage Batch.
      *
@@ -224,7 +224,7 @@ export declare class BeeDebug {
      * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/access-the-swarm/keep-your-data-alive)
      * @see [Bee Debug API reference - `PATCH /stamps/topup/${id}/${amount}`](https://docs.ethswarm.org/debug-api/#tag/Postage-Stamps/paths/~1stamps~1topup~1{id}~1{amount}/patch)
      */
-    topUpBatch(postageBatchId: BatchId | string, amount: NumberString, options?: RequestOptions): Promise<void>;
+    topUpBatch(postageBatchId: BatchId | string, amount: NumberString, options?: BeeRequestOptions): Promise<void>;
     /**
      * Dilute given Postage Batch with new depth (that has to be bigger then the original depth), which allows
      * the Postage Batch to be used for more chunks.
@@ -241,7 +241,7 @@ export declare class BeeDebug {
      * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/access-the-swarm/keep-your-data-alive)
      * @see [Bee Debug API reference - `PATCH /stamps/topup/${id}/${amount}`](https://docs.ethswarm.org/debug-api/#tag/Postage-Stamps/paths/~1stamps~1topup~1{id}~1{amount}/patch)
      */
-    diluteBatch(postageBatchId: BatchId | string, depth: number, options?: RequestOptions): Promise<void>;
+    diluteBatch(postageBatchId: BatchId | string, depth: number, options?: BeeRequestOptions): Promise<void>;
     /**
      * Return details for specific postage batch.
      *
@@ -250,7 +250,7 @@ export declare class BeeDebug {
      * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/access-the-swarm/keep-your-data-alive)
      * @see [Bee Debug API reference - `GET /stamps/${id}`](https://docs.ethswarm.org/debug-api/#tag/Postage-Stamps/paths/~1stamps~1{id}/get)
      */
-    getPostageBatch(postageBatchId: BatchId | string, options?: RequestOptions): Promise<PostageBatch>;
+    getPostageBatch(postageBatchId: BatchId | string, options?: BeeRequestOptions): Promise<PostageBatch>;
     /**
      * Return detailed information related to buckets for specific postage batch.
      *
@@ -259,42 +259,42 @@ export declare class BeeDebug {
      * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/access-the-swarm/keep-your-data-alive)
      * @see [Bee Debug API reference - `GET /stamps/${id}/buckets`](https://docs.ethswarm.org/debug-api/#tag/Postage-Stamps/paths/~1stamps~1{id}~1buckets/get)
      */
-    getPostageBatchBuckets(postageBatchId: BatchId | string, options?: RequestOptions): Promise<PostageBatchBuckets>;
+    getPostageBatchBuckets(postageBatchId: BatchId | string, options?: BeeRequestOptions): Promise<PostageBatchBuckets>;
     /**
      * Return all postage batches that has the node available.
      *
      * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/access-the-swarm/keep-your-data-alive)
      * @see [Bee Debug API reference - `GET /stamps`](https://docs.ethswarm.org/debug-api/#tag/Postage-Stamps/paths/~1stamps/get)
      */
-    getAllPostageBatch(options?: RequestOptions): Promise<PostageBatch[]>;
+    getAllPostageBatch(options?: BeeRequestOptions): Promise<PostageBatch[]>;
     /**
      * Return lists of all current pending transactions that the Bee made
      */
-    getAllPendingTransactions(options?: RequestOptions): Promise<TransactionInfo[]>;
+    getAllPendingTransactions(options?: BeeRequestOptions): Promise<TransactionInfo[]>;
     /**
      * Return transaction information for specific transaction
      * @param transactionHash
      */
-    getPendingTransaction(transactionHash: TransactionHash | string, options?: RequestOptions): Promise<TransactionInfo>;
+    getPendingTransaction(transactionHash: TransactionHash | string, options?: BeeRequestOptions): Promise<TransactionInfo>;
     /**
      * Rebroadcast already created transaction.
      * This is mainly needed when your transaction fall off mempool from other reason is not incorporated into block.
      *
      * @param transactionHash
      */
-    rebroadcastPendingTransaction(transactionHash: TransactionHash | string, options?: RequestOptions): Promise<TransactionHash>;
+    rebroadcastPendingTransaction(transactionHash: TransactionHash | string, options?: BeeRequestOptions): Promise<TransactionHash>;
     /**
      * Cancel currently pending transaction
      * @param transactionHash
      * @param gasPrice
      */
-    cancelPendingTransaction(transactionHash: TransactionHash | string, gasPrice?: NumberString, options?: RequestOptions): Promise<TransactionHash>;
+    cancelPendingTransaction(transactionHash: TransactionHash | string, gasPrice?: NumberString, options?: BeeRequestOptions): Promise<TransactionHash>;
     /**
      * Gets the staked amount of BZZ (in PLUR unit) as number string.
      *
      * @param options
      */
-    getStake(options?: RequestOptions): Promise<NumberString>;
+    getStake(options?: BeeRequestOptions): Promise<NumberString>;
     /**
      * Deposits given amount of BZZ token (in PLUR unit).
      *
@@ -303,13 +303,13 @@ export declare class BeeDebug {
      * @param amount Amount of BZZ token (in PLUR unit) to be staked. Minimum is 100_000_000_000_000_000 PLUR (10 BZZ).
      * @param options
      */
-    depositStake(amount: NumberString, options?: RequestOptions & TransactionOptions): Promise<void>;
+    depositStake(amount: NumberString, options?: TransactionOptions, requestOptions?: BeeRequestOptions): Promise<void>;
     /**
      * Get current status of node in redistribution game
      *
      * @param options
      */
-    getRedistributionState(options?: RequestOptions): Promise<RedistributionState>;
+    getRedistributionState(options?: BeeRequestOptions): Promise<RedistributionState>;
     private waitForUsablePostageStamp;
-    private getKyOptionsForCall;
+    private getRequestOptionsForCall;
 }