@ethersphere/bee-js 8.3.1 → 9.0.2

package/dist/mjs/bee.js

@@ -1,11 +1,8 @@
-import { Objects, System } from 'cafe-utility';
-import { makeSigner } from "./chunk/signer.js";
-import { downloadSingleOwnerChunk, uploadSingleOwnerChunkData } from "./chunk/soc.js";
+import { Binary, Objects, System, Types } from 'cafe-utility';
+import { makeContentAddressedChunk } from "./chunk/cac.js";
+import { downloadSingleOwnerChunk, makeSOCAddress, makeSingleOwnerChunk, uploadSingleOwnerChunkData } from "./chunk/soc.js";
 import { makeFeedReader, makeFeedWriter } from "./feed/index.js";
-import { getJsonData, setJsonData } from "./feed/json.js";
 import { areAllSequentialFeedsUpdateRetrievable } from "./feed/retrievable.js";
-import { makeTopic, makeTopicFromString } from "./feed/topic.js";
-import { DEFAULT_FEED_TYPE, assertFeedType } from "./feed/type.js";
 import * as bytes from "./modules/bytes.js";
 import * as bzz from "./modules/bzz.js";
 import * as chunk from "./modules/chunk.js";
@@ -17,25 +14,29 @@ import * as stake from "./modules/debug/stake.js";
 import * as stamps from "./modules/debug/stamps.js";
 import * as states from "./modules/debug/states.js";
 import * as debugStatus from "./modules/debug/status.js";
-import * as debugTag from "./modules/debug/tag.js";
 import * as transactions from "./modules/debug/transactions.js";
 import { postEnvelope } from "./modules/envelope.js";
-import { createFeedManifest } from "./modules/feed.js";
+import { createFeedManifest, fetchLatestFeedUpdate } from "./modules/feed.js";
 import * as grantee from "./modules/grantee.js";
+import * as gsoc from "./modules/gsoc.js";
 import * as pinning from "./modules/pinning.js";
 import * as pss from "./modules/pss.js";
 import * as status from "./modules/status.js";
 import * as stewardship from "./modules/stewardship.js";
 import * as tag from "./modules/tag.js";
-import { CHUNK_SIZE, SPAN_SIZE, STAMPS_AMOUNT_MIN, STAMPS_DEPTH_MAX, STAMPS_DEPTH_MIN } from "./types/index.js";
-import { wrapBytesWithHelpers } from "./utils/bytes.js";
+import { CHUNK_SIZE, STAMPS_DEPTH_MAX, STAMPS_DEPTH_MIN } from "./types/index.js";
+import { Bytes } from "./utils/bytes.js";
+import { hashDirectory, streamDirectory, streamFiles } from "./utils/chunk-stream.js";
 import { assertCollection, makeCollectionFromFileList } from "./utils/collection.js";
 import { makeCollectionFromFS } from "./utils/collection.node.js";
 import { prepareWebsocketData } from "./utils/data.js";
 import { BeeArgumentError, BeeError } from "./utils/error.js";
-import { makeEthAddress, makeHexEthAddress } from "./utils/eth.js";
 import { fileArrayBuffer, isFile } from "./utils/file.js";
-import { addCidConversionFunction, assertAddress, assertAddressPrefix, assertAllTagsOptions, assertBatchId, assertCashoutOptions, assertCollectionUploadOptions, assertData, assertFileData, assertFileUploadOptions, assertNonNegativeInteger, assertPositiveInteger, assertPostageBatchOptions, assertPssMessageHandler, assertPublicKey, assertReference, assertReferenceOrEns, assertRequestOptions, assertTransactionHash, assertTransactionOptions, assertUploadOptions, isReadable, isTag, makeReferenceOrEns, makeTagUid } from "./utils/type.js";
+import { ResourceLocator } from "./utils/resource-locator.js";
+import { getAmountForDuration, getDepthForSize, getStampCost } from "./utils/stamps.js";
+import { BZZ } from "./utils/tokens.js";
+import { asNumberString, assertData, assertFileData, makeTagUid, prepareAllTagsOptions, prepareBeeRequestOptions, prepareCollectionUploadOptions, prepareDownloadOptions, prepareFileUploadOptions, prepareGsocMessageHandler, preparePostageBatchOptions, preparePssMessageHandler, prepareRedundantUploadOptions, prepareTransactionOptions, prepareUploadOptions } from "./utils/type.js";
+import { BatchId, EthAddress, Identifier, PeerAddress, PrivateKey, PublicKey, Reference, Span, Topic, TransactionId } from "./utils/typed-bytes.js";
 import { assertBeeUrl, stripLastSlash } from "./utils/url.js";
 /**
  * The main component that abstracts operations available on the main Bee API.
@@ -55,11 +56,11 @@ export class Bee {
     // unnecessary redirects.
     this.url = stripLastSlash(url);
     if (options?.signer) {
-      this.signer = makeSigner(options.signer);
+      this.signer = new PrivateKey(options.signer);
     }
     this.requestOptions = {
       baseURL: this.url,
-      timeout: options?.timeout ?? false,
+      timeout: options?.timeout ?? 0,
       headers: options?.headers,
       onRequest: options?.onRequest,
       httpAgent: options?.httpAgent,
@@ -78,11 +79,10 @@ export class Bee {
    * @see [Bee API reference - `POST /bytes`](https://docs.ethswarm.org/api/#tag/Bytes/paths/~1bytes/post)
    */
   async uploadData(postageBatchId, data, options, requestOptions) {
-    assertBatchId(postageBatchId);
+    postageBatchId = new BatchId(postageBatchId);
     assertData(data);
-    assertRequestOptions(requestOptions);
     if (options) {
-      assertUploadOptions(options);
+      options = prepareRedundantUploadOptions(options);
     }
     return bytes.upload(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options);
   }
@@ -92,39 +92,40 @@ export class Bee {
    * @see [Bee API reference - `HEAD /bytes/`](https://docs.ethswarm.org/api/#tag/Bytes/paths/~1bytes~1%7Breference%7D/head)
    */
   async probeData(reference, options) {
-    assertRequestOptions(options);
-    assertReferenceOrEns(reference);
+    reference = new Reference(reference);
     return bytes.head(this.getRequestOptionsForCall(options), reference);
   }
   /**
    * Download data as a byte array
    *
-   * @param reference Bee data reference in hex string (either 64 or 128 chars long) or ENS domain.
+   * @param resource Swarm reference, Swarm CID, or ENS domain
    * @param options Options that affects the request behavior
    * @throws TypeError if some of the input parameters is not expected type
    * @throws BeeArgumentError if there is passed ENS domain with invalid unicode characters
    * @see [Bee docs - Upload and download](https://docs.ethswarm.org/docs/develop/access-the-swarm/upload-and-download)
    * @see [Bee API reference - `GET /bytes`](https://docs.ethswarm.org/api/#tag/Bytes/paths/~1bytes~1{reference}/get)
    */
-  async downloadData(reference, options) {
-    assertRequestOptions(options);
-    assertReferenceOrEns(reference);
-    return bytes.download(this.getRequestOptionsForCall(options), reference);
+  async downloadData(resource, options, requestOptions) {
+    if (options) {
+      options = prepareDownloadOptions(options);
+    }
+    return bytes.download(this.getRequestOptionsForCall(requestOptions), new ResourceLocator(resource), options);
   }
   /**
    * Download data as a Readable stream
    *
-   * @param reference Bee data reference in hex string (either 64 or 128 chars long) or ENS domain.
+   * @param resource Swarm reference, Swarm CID, or ENS domain
    * @param options Options that affects the request behavior
    * @throws TypeError if some of the input parameters is not expected type
    * @throws BeeArgumentError if there is passed ENS domain with invalid unicode characters
    * @see [Bee docs - Upload and download](https://docs.ethswarm.org/docs/develop/access-the-swarm/upload-and-download)
    * @see [Bee API reference - `GET /bytes`](https://docs.ethswarm.org/api/#tag/Bytes/paths/~1bytes~1{reference}/get)
    */
-  async downloadReadableData(reference, options) {
-    assertRequestOptions(options);
-    assertReferenceOrEns(reference);
-    return bytes.downloadReadable(this.getRequestOptionsForCall(options), reference);
+  async downloadReadableData(resource, options, requestOptions) {
+    if (options) {
+      options = prepareDownloadOptions(options);
+    }
+    return bytes.downloadReadable(this.getRequestOptionsForCall(requestOptions), new ResourceLocator(resource), options);
   }
   /**
    * Upload chunk to a Bee node
@@ -138,18 +139,15 @@ export class Bee {
    * @see [Bee API reference - `POST /chunks`](https://docs.ethswarm.org/api/#tag/Chunk/paths/~1chunks/post)
    */
   async uploadChunk(stamp, data, options, requestOptions) {
-    assertRequestOptions(requestOptions);
-    if (!(data instanceof Uint8Array)) {
-      throw new TypeError('Data has to be Uint8Array instance!');
-    }
-    if (data.length < SPAN_SIZE) {
-      throw new BeeArgumentError(`Chunk has to have size of at least ${SPAN_SIZE}.`, data);
+    data = data instanceof Uint8Array ? data : data.data;
+    if (options) {
+      options = prepareUploadOptions(options);
     }
-    if (data.length > CHUNK_SIZE + SPAN_SIZE) {
-      throw new BeeArgumentError(`Chunk has to have size of at most ${CHUNK_SIZE}.`, data);
+    if (data.length < Span.LENGTH) {
+      throw new BeeArgumentError(`Chunk has to have size of at least ${Span.LENGTH}.`, data);
     }
-    if (options) {
-      assertUploadOptions(options);
+    if (data.length > CHUNK_SIZE + Span.LENGTH) {
+      throw new BeeArgumentError(`Chunk has to have size of at most ${CHUNK_SIZE + Span.LENGTH}.`, data);
     }
     return chunk.upload(this.getRequestOptionsForCall(requestOptions), data, stamp, options);
   }
@@ -163,10 +161,12 @@ export class Bee {
    * @see [Bee docs - Upload and download](https://docs.ethswarm.org/docs/develop/access-the-swarm/upload-and-download)
    * @see [Bee API reference - `GET /chunks`](https://docs.ethswarm.org/api/#tag/Chunk/paths/~1chunks~1{address}/get)
    */
-  async downloadChunk(reference, options) {
-    assertRequestOptions(options);
-    assertReferenceOrEns(reference);
-    return chunk.download(this.getRequestOptionsForCall(options), reference);
+  async downloadChunk(reference, options, requestOptions) {
+    reference = new Reference(reference);
+    if (options) {
+      options = prepareDownloadOptions(options);
+    }
+    return chunk.download(this.getRequestOptionsForCall(requestOptions), reference, options);
   }
   /**
    * Create a grantees list from the given array of public keys.
@@ -179,8 +179,8 @@ export class Bee {
    * @returns A promise that resolves to a `GranteesResult` object.
    */
   async createGrantees(postageBatchId, grantees, requestOptions) {
-    assertRequestOptions(requestOptions);
-    assertBatchId(postageBatchId);
+    postageBatchId = new BatchId(postageBatchId);
+    grantees = grantees.map(x => new PublicKey(x));
     return grantee.createGrantees(this.getRequestOptionsForCall(requestOptions), postageBatchId, grantees);
   }
   /**
@@ -191,7 +191,7 @@ export class Bee {
    * @returns A promise that resolves to a `GetGranteesResult` object.
    */
   async getGrantees(reference, requestOptions) {
-    assertRequestOptions(requestOptions);
+    reference = new Reference(reference);
     return grantee.getGrantees(reference, this.getRequestOptionsForCall(requestOptions));
   }
   /**
@@ -205,19 +205,18 @@ export class Bee {
    * @returns A Promise that resolves to to a `GranteesResult` object.
    */
   async patchGrantees(postageBatchId, reference, history, grantees, requestOptions) {
-    assertRequestOptions(requestOptions);
-    assertBatchId(postageBatchId);
-    return grantee.patchGrantees(postageBatchId, reference, history, {
-      add: grantees.add || [],
-      revoke: grantees.revoke || []
-    }, this.getRequestOptionsForCall(requestOptions));
+    postageBatchId = new BatchId(postageBatchId);
+    reference = new Reference(reference);
+    history = new Reference(history);
+    const publicKeys = {
+      add: grantees.add?.map(x => new PublicKey(x)) ?? [],
+      revoke: grantees.revoke?.map(x => new PublicKey(x)) ?? []
+    };
+    return grantee.patchGrantees(postageBatchId, reference, history, publicKeys, this.getRequestOptionsForCall(requestOptions));
   }
   /**
    * Upload single file to a Bee node.
    *
-   * **To make sure that you won't lose critical data it is highly recommended to also
-   * locally pin the data with `options.pin = true`**
-   *
    * @param postageBatchId Postage BatchId to be used to upload the data with
    * @param data    Data or file to be uploaded
    * @param name    Optional name of the uploaded file
@@ -229,11 +228,10 @@ export class Bee {
    * @returns reference is a content hash of the file
    */
   async uploadFile(postageBatchId, data, name, options, requestOptions) {
-    assertRequestOptions(requestOptions);
-    assertBatchId(postageBatchId);
+    postageBatchId = new BatchId(postageBatchId);
     assertFileData(data);
     if (options) {
-      assertFileUploadOptions(options);
+      options = prepareFileUploadOptions(options);
     }
     if (name && typeof name !== 'string') {
       throw new TypeError('name has to be string or undefined!');
@@ -246,20 +244,15 @@ export class Bee {
         contentType,
         ...options
       };
-      return addCidConversionFunction(await bzz.uploadFile(this.getRequestOptionsForCall(requestOptions), fileData, postageBatchId, fileName, fileOptions), 'manifest');
-    } else if (isReadable(data) && options?.tag && !options.size) {
-      // TODO: Needed until https://github.com/ethersphere/bee/issues/2317 is resolved
-      const result = await bzz.uploadFile(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, name, options);
-      await this.updateTag(options.tag, result.reference);
-      return addCidConversionFunction(result, 'manifest');
+      return bzz.uploadFile(this.getRequestOptionsForCall(requestOptions), fileData, postageBatchId, fileName, fileOptions);
     } else {
-      return addCidConversionFunction(await bzz.uploadFile(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, name, options), 'manifest');
+      return bzz.uploadFile(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, name, options);
     }
   }
   /**
    * Download single file.
    *
-   * @param reference Bee file reference in hex string (either 64 or 128 chars long), ENS domain or Swarm CID.
+   * @param resource Swarm reference, Swarm CID, or ENS domain
    * @param path If reference points to manifest, then this parameter defines path to the file
    * @param options Options that affects the request behavior
    * @throws TypeError if some of the input parameters is not expected type
@@ -268,10 +261,11 @@ export class Bee {
    * @see [Bee docs - Upload and download](https://docs.ethswarm.org/docs/develop/access-the-swarm/upload-and-download)
    * @see [Bee API reference - `GET /bzz`](https://docs.ethswarm.org/api/#tag/BZZ/paths/~1bzz~1%7Breference%7D~1%7Bpath%7D/get)
    */
-  async downloadFile(reference, path = '', options) {
-    assertRequestOptions(options);
-    reference = makeReferenceOrEns(reference, 'manifest');
-    return bzz.downloadFile(this.getRequestOptionsForCall(options), reference, path);
+  async downloadFile(resource, path = '', options, requestOptions) {
+    if (options) {
+      options = prepareDownloadOptions(options);
+    }
+    return bzz.downloadFile(this.getRequestOptionsForCall(requestOptions), new ResourceLocator(resource), path, options);
   }
   /**
    * Download single file as a readable stream
@@ -285,10 +279,12 @@ export class Bee {
    * @see [Bee docs - Upload and download](https://docs.ethswarm.org/docs/develop/access-the-swarm/upload-and-download)
    * @see [Bee API reference - `GET /bzz`](https://docs.ethswarm.org/api/#tag/BZZ/paths/~1bzz~1%7Breference%7D~1%7Bpath%7D/get)
    */
-  async downloadReadableFile(reference, path = '', options) {
-    assertRequestOptions(options);
-    reference = makeReferenceOrEns(reference, 'manifest');
-    return bzz.downloadFileReadable(this.getRequestOptionsForCall(options), reference, path);
+  async downloadReadableFile(reference, path = '', options, requestOptions) {
+    reference = new Reference(reference);
+    if (options) {
+      options = prepareDownloadOptions(options);
+    }
+    return bzz.downloadFileReadable(this.getRequestOptionsForCall(requestOptions), reference, path, options);
   }
   /**
    * Upload collection of files to a Bee node
@@ -307,13 +303,23 @@ export class Bee {
    * @see [Bee API reference - `POST /bzz`](https://docs.ethswarm.org/api/#tag/BZZ/paths/~1bzz/post)
    */
   async uploadFiles(postageBatchId, fileList, options, requestOptions) {
-    assertRequestOptions(requestOptions);
-    assertBatchId(postageBatchId);
+    postageBatchId = new BatchId(postageBatchId);
     if (options) {
-      assertCollectionUploadOptions(options);
+      options = prepareCollectionUploadOptions(options);
     }
-    const data = await makeCollectionFromFileList(fileList);
-    return addCidConversionFunction(await bzz.uploadCollection(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options), 'manifest');
+    const data = makeCollectionFromFileList(fileList);
+    return bzz.uploadCollection(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options);
+  }
+  async hashDirectory(dir) {
+    return hashDirectory(dir);
+  }
+  async streamDirectory(postageBatchId, dir, onUploadProgress, options, requestOptions) {
+    postageBatchId = new BatchId(postageBatchId);
+    return streamDirectory(this, dir, postageBatchId, onUploadProgress, options, this.getRequestOptionsForCall(requestOptions));
+  }
+  async streamFiles(postageBatchId, files, onUploadProgress, options, requestOptions) {
+    postageBatchId = new BatchId(postageBatchId);
+    return streamFiles(this, files, postageBatchId, onUploadProgress, options, this.getRequestOptionsForCall(requestOptions));
   }
   /**
    * Upload Collection that you can assembly yourself.
@@ -326,11 +332,12 @@ export class Bee {
    * @param options Collections and request options
    */
   async uploadCollection(postageBatchId, collection, options, requestOptions) {
-    assertRequestOptions(requestOptions);
-    assertBatchId(postageBatchId);
+    postageBatchId = new BatchId(postageBatchId);
     assertCollection(collection);
-    if (options) assertCollectionUploadOptions(options);
-    return addCidConversionFunction(await bzz.uploadCollection(this.getRequestOptionsForCall(this.requestOptions), collection, postageBatchId, options), 'manifest');
+    if (options) {
+      options = prepareCollectionUploadOptions(options);
+    }
+    return bzz.uploadCollection(this.getRequestOptionsForCall(requestOptions), collection, postageBatchId, options);
   }
   /**
    * Upload collection of files.
@@ -349,11 +356,12 @@ export class Bee {
    * @see [Bee API reference - `POST /bzz`](https://docs.ethswarm.org/api/#tag/BZZ/paths/~1bzz/post)
    */
   async uploadFilesFromDirectory(postageBatchId, dir, options, requestOptions) {
-    assertBatchId(postageBatchId);
-    assertRequestOptions(requestOptions);
-    if (options) assertCollectionUploadOptions(options);
+    postageBatchId = new BatchId(postageBatchId);
+    if (options) {
+      options = prepareCollectionUploadOptions(options);
+    }
     const data = await makeCollectionFromFS(dir);
-    return addCidConversionFunction(await bzz.uploadCollection(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options), 'manifest');
+    return bzz.uploadCollection(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options);
   }
   /**
    * Create a new Tag which is meant for tracking progres of syncing data across network.
@@ -363,7 +371,6 @@ export class Bee {
    * @see [Bee API reference - `POST /tags`](https://docs.ethswarm.org/api/#tag/Tag/paths/~1tags/post)
    */
   async createTag(options) {
-    assertRequestOptions(options);
     return tag.createTag(this.getRequestOptionsForCall(options));
   }
   /**
@@ -379,8 +386,9 @@ export class Bee {
    * @see [Bee API reference - `GET /tags`](https://docs.ethswarm.org/api/#tag/Tag/paths/~1tags/get)
    */
   async getAllTags(options, requestOptions) {
-    assertRequestOptions(requestOptions);
-    assertAllTagsOptions(options);
+    if (options) {
+      options = prepareAllTagsOptions(options);
+    }
     return tag.getAllTags(this.getRequestOptionsForCall(requestOptions), options?.offset, options?.limit);
   }
   /**
@@ -395,7 +403,6 @@ export class Bee {
    *
    */
   async retrieveTag(tagUid, options) {
-    assertRequestOptions(options);
     tagUid = makeTagUid(tagUid);
     return tag.retrieveTag(this.getRequestOptionsForCall(options), tagUid);
   }
@@ -411,7 +418,6 @@ export class Bee {
    * @see [Bee API reference - `DELETE /tags/{uid}`](https://docs.ethswarm.org/api/#tag/Tag/paths/~1tags~1{uid}/delete)
    */
   async deleteTag(tagUid, options) {
-    assertRequestOptions(options);
     tagUid = makeTagUid(tagUid);
     return tag.deleteTag(this.getRequestOptionsForCall(options), tagUid);
   }
@@ -431,8 +437,7 @@ export class Bee {
    * @see [Bee API reference - `PATCH /tags/{uid}`](https://docs.ethswarm.org/api/#tag/Tag/paths/~1tags~1{uid}/patch)
    */
   async updateTag(tagUid, reference, options) {
-    assertReference(reference);
-    assertRequestOptions(options);
+    reference = new Reference(reference);
     tagUid = makeTagUid(tagUid);
     return tag.updateTag(this.getRequestOptionsForCall(options), tagUid, reference);
   }
@@ -446,8 +451,7 @@ export class Bee {
    * @see [Bee docs - Pinning](https://docs.ethswarm.org/docs/develop/access-the-swarm/pinning)
    */
   async pin(reference, options) {
-    assertRequestOptions(options);
-    assertReference(reference);
+    reference = new Reference(reference);
     return pinning.pin(this.getRequestOptionsForCall(options), reference);
   }
   /**
@@ -460,8 +464,7 @@ export class Bee {
    * @see [Bee docs - Pinning](https://docs.ethswarm.org/docs/develop/access-the-swarm/pinning)
    */
   async unpin(reference, options) {
-    assertRequestOptions(options);
-    assertReference(reference);
+    reference = new Reference(reference);
     return pinning.unpin(this.getRequestOptionsForCall(options), reference);
   }
   /**
@@ -471,7 +474,6 @@ export class Bee {
    * @see [Bee docs - Pinning](https://docs.ethswarm.org/docs/develop/access-the-swarm/pinning)
    */
   async getAllPins(options) {
-    assertRequestOptions(options);
     return pinning.getAllPins(this.getRequestOptionsForCall(options));
   }
   /**
@@ -485,8 +487,7 @@ export class Bee {
    * @see [Bee docs - Pinning](https://docs.ethswarm.org/docs/develop/access-the-swarm/pinning)
    */
   async getPin(reference, options) {
-    assertRequestOptions(options);
-    assertReference(reference);
+    reference = new Reference(reference);
     return pinning.getPin(this.getRequestOptionsForCall(options), reference);
   }
   /**
@@ -500,10 +501,10 @@ export class Bee {
    *
    * @see [Bee API reference - `PUT /stewardship`](https://docs.ethswarm.org/api/#tag/Stewardship/paths/~1stewardship~1{reference}/put)
    */
-  async reuploadPinnedData(reference, options) {
-    assertRequestOptions(options);
-    assertReferenceOrEns(reference);
-    await stewardship.reupload(this.getRequestOptionsForCall(options), reference);
+  async reuploadPinnedData(postageBatchId, reference, options) {
+    postageBatchId = new BatchId(postageBatchId);
+    reference = new Reference(reference);
+    await stewardship.reupload(this.getRequestOptionsForCall(options), postageBatchId, reference);
   }
   /**
    * Checks if content specified by reference is retrievable from the network.
@@ -516,8 +517,7 @@ export class Bee {
    * @see [Bee API reference - `GET /stewardship`](https://docs.ethswarm.org/api/#tag/Stewardship/paths/~1stewardship~1{reference}/get)
    */
   async isReferenceRetrievable(reference, options) {
-    assertRequestOptions(options);
-    assertReferenceOrEns(reference);
+    reference = new Reference(reference);
     return stewardship.isRetrievable(this.getRequestOptionsForCall(options), reference);
   }
   /**
@@ -535,24 +535,25 @@ export class Bee {
    * @param index
    * @param options
    */
-  async isFeedRetrievable(type, owner, topic, index, options) {
-    const canonicalOwner = makeEthAddress(owner);
-    const canonicalTopic = makeTopic(topic);
+  async isFeedRetrievable(owner, topic, index, options, requestOptions) {
+    owner = new EthAddress(owner);
+    topic = new Topic(topic);
+    if (options) {
+      options = prepareDownloadOptions(options);
+    }
     if (!index) {
       try {
-        await this.makeFeedReader(type, canonicalTopic, canonicalOwner).download();
+        await this.makeFeedReader(topic, owner, requestOptions).download();
         return true;
       } catch (e) {
-        if (e?.status === 404 || e?.status === 500) {
+        const status = Objects.getDeep(e, 'status');
+        if (status === 404 || status === 500) {
           return false;
         }
         throw e;
       }
     }
-    if (type !== 'sequence') {
-      throw new BeeError('Only Sequence type of Feeds is supported at the moment');
-    }
-    return areAllSequentialFeedsUpdateRetrievable(this, canonicalOwner, canonicalTopic, index, this.getRequestOptionsForCall(options));
+    return areAllSequentialFeedsUpdateRetrievable(this, owner, topic, index, options, this.getRequestOptionsForCall(requestOptions));
   }
   /**
    * Send data to recipient or target with Postal Service for Swarm.
@@ -577,15 +578,10 @@ export class Bee {
    * @see [Bee API reference - `POST /pss`](https://docs.ethswarm.org/api/#tag/Postal-Service-for-Swarm/paths/~1pss~1send~1{topic}~1{targets}/post)
    */
   async pssSend(postageBatchId, topic, target, data, recipient, options) {
-    assertRequestOptions(options);
+    postageBatchId = new BatchId(postageBatchId);
     assertData(data);
-    assertBatchId(postageBatchId);
-    assertAddressPrefix(target);
-    if (typeof topic !== 'string') {
-      throw new TypeError('topic has to be an string!');
-    }
     if (recipient) {
-      assertPublicKey(recipient);
+      recipient = new PublicKey(recipient);
       return pss.send(this.getRequestOptionsForCall(options), topic, target, data, postageBatchId, recipient);
     } else {
       return pss.send(this.getRequestOptionsForCall(options), topic, target, data, postageBatchId);
@@ -606,11 +602,8 @@ export class Bee {
    * @see [Bee API reference - `GET /pss`](https://docs.ethswarm.org/api/#tag/Postal-Service-for-Swarm/paths/~1pss~1subscribe~1{topic}/get)
    */
   pssSubscribe(topic, handler) {
-    assertPssMessageHandler(handler);
-    if (typeof topic !== 'string') {
-      throw new TypeError('topic has to be an string!');
-    }
-    const ws = pss.subscribe(this.url, topic);
+    handler = preparePssMessageHandler(handler);
+    const ws = pss.subscribe(this.url, topic, this.requestOptions.headers);
     let cancelled = false;
     const cancel = () => {
       if (cancelled === false) {
@@ -618,24 +611,27 @@ export class Bee {
         // although the WebSocket API offers a `close` function, it seems that
         // with the library that we are using (isomorphic-ws) it doesn't close
         // the websocket properly, whereas `terminate` does
-        if (ws.terminate) ws.terminate();else ws.close(); // standard Websocket in browser does not have terminate function
+        if (ws.terminate) {
+          ws.terminate();
+        } else {
+          ws.close();
+        } // standard Websocket in browser does not have terminate function
       }
     };
     const subscription = {
       topic,
       cancel
     };
-    ws.onmessage = async ev => {
-      const data = await prepareWebsocketData(ev.data);
-      // ignore empty messages
-      if (data.length > 0) {
-        handler.onMessage(wrapBytesWithHelpers(data), subscription);
+    ws.onmessage = async event => {
+      const data = await prepareWebsocketData(event.data);
+      if (data.length) {
+        handler.onMessage(new Bytes(data), subscription);
       }
     };
-    ws.onerror = ev => {
+    ws.onerror = event => {
       // ignore errors after subscription was cancelled
       if (!cancelled) {
-        handler.onError(new BeeError(ev.message), subscription);
+        handler.onError(new BeeError(event.message), subscription);
       }
     };
     return subscription;
@@ -665,9 +661,6 @@ export class Bee {
    * @see [Bee API reference - `GET /pss`](https://docs.ethswarm.org/api/#tag/Postal-Service-for-Swarm/paths/~1pss~1subscribe~1{topic}/get)
    */
   async pssReceive(topic, timeoutMsec = 0) {
-    if (typeof topic !== 'string') {
-      throw new TypeError('topic has to be an string!');
-    }
     if (typeof timeoutMsec !== 'number') {
       throw new TypeError('timeoutMsc parameter has to be a number!');
     }
@@ -686,8 +679,6 @@ export class Bee {
         }
       });
       if (timeoutMsec > 0) {
-        // we need to cast the type because Typescript is getting confused with Node.js'
-        // alternative type definitions
         timeout = setTimeout(() => {
           subscription.cancel();
           reject(new BeeError('pssReceive timeout'));
@@ -695,13 +686,68 @@ export class Bee {
       }
     });
   }
+  gsocMine(targetOverlay, identifier, proximity = 12) {
+    targetOverlay = new PeerAddress(targetOverlay);
+    identifier = new Identifier(identifier);
+    const start = 0xb33n;
+    for (let i = 0n; i < 0xffffn; i++) {
+      const signer = new PrivateKey(Binary.numberToUint256(start + i, 'BE'));
+      const socAddress = makeSOCAddress(identifier, signer.publicKey().address());
+      const actualProximity = 256 - Binary.proximity(socAddress.toUint8Array(), targetOverlay.toUint8Array(), 256);
+      if (actualProximity <= 256 - proximity) {
+        return signer;
+      }
+    }
+    throw Error('Could not mine a valid signer');
+  }
+  async gsocSend(postageBatchId, signer, identifier, data, options, requestOptions) {
+    postageBatchId = new BatchId(postageBatchId);
+    signer = new PrivateKey(signer);
+    identifier = new Identifier(identifier);
+    const cac = makeContentAddressedChunk(data);
+    const soc = makeSingleOwnerChunk(cac, identifier, signer);
+    return gsoc.send(this.getRequestOptionsForCall(requestOptions), soc, postageBatchId, options);
+  }
+  gsocSubscribe(address, identifier, handler) {
+    address = new EthAddress(address);
+    identifier = new Identifier(identifier);
+    handler = prepareGsocMessageHandler(handler);
+    const socAddress = makeSOCAddress(identifier, address);
+    const ws = gsoc.subscribe(this.url, socAddress, this.requestOptions.headers);
+    let cancelled = false;
+    const cancel = () => {
+      if (cancelled === false) {
+        cancelled = true;
+        if (ws.terminate) {
+          ws.terminate();
+        } else {
+          ws.close();
+        }
+      }
+    };
+    const subscription = {
+      address,
+      cancel
+    };
+    ws.onmessage = async event => {
+      const data = await prepareWebsocketData(event.data);
+      if (data.length) {
+        handler.onMessage(new Bytes(data), subscription);
+      }
+    };
+    ws.onerror = event => {
+      if (!cancelled) {
+        handler.onError(new BeeError(event.message), subscription);
+      }
+    };
+    return subscription;
+  }
   /**
    * Create feed manifest chunk and return the reference to it.
    *
    * Feed manifest chunk allows for a feed to be able to be resolved through `/bzz` endpoint.
    *
    * @param postageBatchId  Postage BatchId to be used to create the Feed Manifest
-   * @param type            The type of the feed, can be 'epoch' or 'sequence'
    * @param topic           Topic in hex or bytes
    * @param owner           Owner's ethereum address in hex or bytes
    * @param options Options that affects the request behavior
@@ -709,129 +755,50 @@ export class Bee {
    * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/develop/tools-and-features/feeds)
    * @see [Bee API reference - `POST /feeds`](https://docs.ethswarm.org/api/#tag/Feed/paths/~1feeds~1{owner}~1{topic}/post)
    */
-  async createFeedManifest(stamp, type, topic, owner, options) {
-    assertRequestOptions(options);
-    assertFeedType(type);
-    const canonicalTopic = makeTopic(topic);
-    const canonicalOwner = makeHexEthAddress(owner);
-    const reference = await createFeedManifest(this.getRequestOptionsForCall(options), canonicalOwner, canonicalTopic, stamp);
-    return addCidConversionFunction({
-      reference
-    }, 'feed');
+  async createFeedManifest(postageBatchId, topic, owner, options, requestOptions) {
+    postageBatchId = new BatchId(postageBatchId);
+    topic = new Topic(topic);
+    owner = new EthAddress(owner);
+    if (options) {
+      options = prepareUploadOptions(options);
+    }
+    return createFeedManifest(this.getRequestOptionsForCall(requestOptions), owner, topic, postageBatchId, options);
   }
   /**
    * Make a new feed reader for downloading feed updates.
    *
-   * @param type    The type of the feed, can be 'epoch' or 'sequence'
    * @param topic   Topic in hex or bytes
    * @param owner   Owner's ethereum address in hex or bytes
    * @param options Options that affects the request behavior
    *
    * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/develop/tools-and-features/feeds)
    */
-  makeFeedReader(type, topic, owner, options) {
-    assertRequestOptions(options);
-    assertFeedType(type);
-    const canonicalTopic = makeTopic(topic);
-    const canonicalOwner = makeHexEthAddress(owner);
-    return makeFeedReader(this.getRequestOptionsForCall(options), type, canonicalTopic, canonicalOwner);
+  makeFeedReader(topic, owner, options) {
+    topic = new Topic(topic);
+    owner = new EthAddress(owner);
+    return makeFeedReader(this.getRequestOptionsForCall(options), topic, owner);
   }
   /**
    * Make a new feed writer for updating feeds
    *
-   * @param type    The type of the feed, can be 'epoch' or 'sequence'
    * @param topic   Topic in hex or bytes
    * @param signer  The signer's private key or a Signer instance that can sign data
    * @param options Options that affects the request behavior
    *
    * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/develop/tools-and-features/feeds)
    */
-  makeFeedWriter(type, topic, signer, options) {
-    assertRequestOptions(options);
-    assertFeedType(type);
-    const canonicalTopic = makeTopic(topic);
-    const canonicalSigner = this.resolveSigner(signer);
-    return makeFeedWriter(this.getRequestOptionsForCall(options), type, canonicalTopic, canonicalSigner);
-  }
-  /**
-   * High-level function that allows you to easily set JSON data to feed.
-   * JSON-like data types are supported.
-   *
-   * The default Signer of Bee instance is used if `options.signer` is not specified.
-   * If none of those two is set error is thrown.
-   *
-   * @param postageBatchId Postage BatchId to be used to upload the data with
-   * @param topic Human readable string, that is internally hashed so there are no constrains there.
-   * @param data JSON compatible data
-   * @param options
-   * @param options.signer Custom instance of Signer or string with private key.
-   * @param options.type Type of Feed
-   *
-   * @throws BeeError if `options.signer` is not specified nor the default Signer on Bee's instance is specified.
-   *
-   * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/develop/tools-and-features/feeds)
-   */
-  async setJsonFeed(postageBatchId, topic, data, options, requestOptions) {
-    assertRequestOptions(requestOptions, 'JsonFeedOptions');
-    assertBatchId(postageBatchId);
-    const hashedTopic = this.makeFeedTopic(topic);
-    const feedType = options?.type ?? DEFAULT_FEED_TYPE;
-    const writer = this.makeFeedWriter(feedType, hashedTopic, options?.signer, requestOptions);
-    return setJsonData(this, writer, postageBatchId, data, options, requestOptions);
-  }
-  /**
-   * High-level function that allows you to easily get data from feed.
-   * Returned data are parsed using JSON.parse().
-   *
-   * This method also supports specification of `signer` object passed to constructor. The order of evaluation is:
-   *  - `options.address`
-   *  - `options.signer`
-   *  - `this.signer`
-   *
-   * At least one of these has to be specified!
-   *
-   * @param topic Human readable string, that is internally hashed so there are no constrains there.
-   * @param options
-   * @param options.signer Custom instance of Signer or string with private key. This option is exclusive with `address` option.
-   * @param options.address Ethereum address of owner of the feed that signed it. This option is exclusive with `signer` option.
-   * @param options.type Type of Feed
-   *
-   * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/develop/tools-and-features/feeds)
-   */
-  async getJsonFeed(topic, options, requestOptions) {
-    assertRequestOptions(requestOptions);
-    const hashedTopic = this.makeFeedTopic(topic);
-    const feedType = options?.type ?? DEFAULT_FEED_TYPE;
-    if (options?.signer && options?.address) {
-      throw new BeeError('Both options "signer" and "address" can not be specified at one time!');
-    }
-    let address;
-    if (options?.address) {
-      address = makeEthAddress(options?.address);
-    } else {
-      try {
-        address = this.resolveSigner(options?.signer).address;
-      } catch (e) {
-        if (e instanceof BeeError) {
-          throw new BeeError('Either address, signer or default signer has to be specified!');
-        } else {
-          throw e;
-        }
-      }
+  makeFeedWriter(topic, signer, options) {
+    topic = new Topic(topic);
+    signer = signer ? new PrivateKey(signer) : this.signer;
+    if (!signer) {
+      throw Error('No signer provided');
     }
-    const reader = this.makeFeedReader(feedType, hashedTopic, address, requestOptions);
-    return getJsonData(this, reader);
+    return makeFeedWriter(this.getRequestOptionsForCall(options), topic, signer);
   }
-  /**
-   * Make a new feed topic from a string
-   *
-   * Because the topic has to be 32 bytes long this function
-   * hashes the input string to create a topic string of arbitrary length.
-   *
-   * @param topic The input string
-   */
-  makeFeedTopic(topic) {
-    return makeTopicFromString(topic);
+  async fetchLatestFeedUpdate(topic, owner, requestOptions) {
+    topic = new Topic(topic);
+    owner = new EthAddress(owner);
+    return fetchLatestFeedUpdate(this.getRequestOptionsForCall(requestOptions), owner, topic);
   }
   /**
    * Returns an object for reading single owner chunks
@@ -841,11 +808,10 @@ export class Bee {
    * @see [Bee docs - Chunk Types](https://docs.ethswarm.org/docs/develop/tools-and-features/chunk-types#single-owner-chunks)
    */
   makeSOCReader(ownerAddress, options) {
-    assertRequestOptions(options);
-    const canonicalOwner = makeEthAddress(ownerAddress);
+    ownerAddress = new EthAddress(ownerAddress);
     return {
-      owner: makeHexEthAddress(canonicalOwner),
-      download: downloadSingleOwnerChunk.bind(null, this.getRequestOptionsForCall(options), canonicalOwner)
+      owner: ownerAddress,
+      download: downloadSingleOwnerChunk.bind(null, this.getRequestOptionsForCall(options), ownerAddress)
     };
   }
   /**
@@ -856,15 +822,18 @@ export class Bee {
    * @see [Bee docs - Chunk Types](https://docs.ethswarm.org/docs/develop/tools-and-features/chunk-types#single-owner-chunks)
    */
   makeSOCWriter(signer, options) {
-    assertRequestOptions(options);
-    const canonicalSigner = this.resolveSigner(signer);
+    signer = signer ? new PrivateKey(signer) : this.signer;
+    if (!signer) {
+      throw Error('No signer provided');
+    }
     return {
-      ...this.makeSOCReader(canonicalSigner.address, options),
-      upload: uploadSingleOwnerChunkData.bind(null, this.getRequestOptionsForCall(options), canonicalSigner)
+      ...this.makeSOCReader(signer.publicKey().address(), options),
+      upload: uploadSingleOwnerChunkData.bind(null, this.getRequestOptionsForCall(options), signer)
     };
   }
   async createEnvelope(postageBatchId, reference, options) {
-    assertRequestOptions(options);
+    postageBatchId = new BatchId(postageBatchId);
+    reference = new Reference(reference);
     return postEnvelope(this.getRequestOptionsForCall(options), postageBatchId, reference);
   }
   /**
@@ -874,7 +843,6 @@ export class Bee {
    * @throws If connection was not successful throw error
    */
   async checkConnection(options) {
-    assertRequestOptions(options, 'PostageBatchOptions');
     return status.checkConnection(this.getRequestOptionsForCall(options));
   }
   /**
@@ -884,7 +852,6 @@ export class Bee {
    * @returns true if successful, false on error
    */
   async isConnected(options) {
-    assertRequestOptions(options, 'PostageBatchOptions');
     try {
       await status.checkConnection(this.getRequestOptionsForCall(options));
     } catch (e) {
@@ -894,53 +861,26 @@ export class Bee {
   }
   // Legacy debug API
   async getNodeAddresses(options) {
-    assertRequestOptions(options);
     return connectivity.getNodeAddresses(this.getRequestOptionsForCall(options));
   }
   async getBlocklist(options) {
-    assertRequestOptions(options);
     return connectivity.getBlocklist(this.getRequestOptionsForCall(options));
   }
-  /**
-   * Retrieve tag extended information from Bee node
-   *
-   * @param tagUid UID or tag object to be retrieved
-   * @throws TypeError if tagUid is in not correct format
-   *
-   * @see [Bee docs - Syncing / Tags](https://docs.ethswarm.org/docs/develop/access-the-swarm/syncing)
-   * @see [Bee API reference - `GET /tags/{uid}`](https://docs.ethswarm.org/debug-api/#tag/Tag)
-   *
-   */
-  async retrieveExtendedTag(tagUid, options) {
-    assertRequestOptions(options);
-    if (isTag(tagUid)) {
-      tagUid = tagUid.uid;
-    } else if (typeof tagUid === 'number') {
-      assertNonNegativeInteger(tagUid, 'UID');
-    } else {
-      throw new TypeError('tagUid has to be either Tag or a number (UID)!');
-    }
-    return debugTag.retrieveExtendedTag(this.getRequestOptionsForCall(options), tagUid);
-  }
   /**
    * Get list of peers for this node
    */
   async getPeers(options) {
-    assertRequestOptions(options);
     return connectivity.getPeers(this.getRequestOptionsForCall(options));
   }
   async removePeer(peer, options) {
-    assertRequestOptions(options);
-    assertAddress(peer);
+    peer = new PeerAddress(peer);
     return connectivity.removePeer(this.getRequestOptionsForCall(options), peer);
   }
   async getTopology(options) {
-    assertRequestOptions(options);
     return connectivity.getTopology(this.getRequestOptionsForCall(options));
   }
   async pingPeer(peer, options) {
-    assertRequestOptions(options);
-    assertAddress(peer);
+    peer = new PeerAddress(peer);
     return connectivity.pingPeer(this.getRequestOptionsForCall(options), peer);
   }
   /*
@@ -950,7 +890,6 @@ export class Bee {
    * Get the balances with all known peers including prepaid services
    */
   async getAllBalances(options) {
-    assertRequestOptions(options);
     return balance.getAllBalances(this.getRequestOptionsForCall(options));
   }
   /**
@@ -959,15 +898,13 @@ export class Bee {
    * @param address Swarm address of peer
    */
   async getPeerBalance(address, options) {
-    assertRequestOptions(options);
-    assertAddress(address);
+    address = new PeerAddress(address);
     return balance.getPeerBalance(this.getRequestOptionsForCall(options), address);
   }
   /**
    * Get the past due consumption balances with all known peers
    */
   async getPastDueConsumptionBalances(options) {
-    assertRequestOptions(options);
     return balance.getPastDueConsumptionBalances(this.getRequestOptionsForCall(options));
   }
   /**
@@ -976,8 +913,7 @@ export class Bee {
    * @param address Swarm address of peer
    */
   async getPastDueConsumptionPeerBalance(address, options) {
-    assertRequestOptions(options);
-    assertAddress(address);
+    address = new PeerAddress(address);
     return balance.getPastDueConsumptionPeerBalance(this.getRequestOptionsForCall(options), address);
   }
   /*
@@ -990,21 +926,18 @@ export class Bee {
    * https://github.com/ethersphere/bee/issues/1443
    */
   async getChequebookAddress(options) {
-    assertRequestOptions(options);
     return chequebook.getChequebookAddress(this.getRequestOptionsForCall(options));
   }
   /**
    * Get the balance of the chequebook
    */
   async getChequebookBalance(options) {
-    assertRequestOptions(options);
     return chequebook.getChequebookBalance(this.getRequestOptionsForCall(options));
   }
   /**
    * Get last cheques for all peers
    */
   async getLastCheques(options) {
-    assertRequestOptions(options);
     return chequebook.getLastCheques(this.getRequestOptionsForCall(options));
   }
   /**
@@ -1013,8 +946,7 @@ export class Bee {
    * @param address  Swarm address of peer
    */
   async getLastChequesForPeer(address, options) {
-    assertRequestOptions(options);
-    assertAddress(address);
+    address = new PeerAddress(address);
     return chequebook.getLastChequesForPeer(this.getRequestOptionsForCall(options), address);
   }
   /**
@@ -1023,8 +955,7 @@ export class Bee {
    * @param address  Swarm address of peer
    */
   async getLastCashoutAction(address, options) {
-    assertRequestOptions(options);
-    assertAddress(address);
+    address = new PeerAddress(address);
     return chequebook.getLastCashoutAction(this.getRequestOptionsForCall(options), address);
   }
   /**
@@ -1036,9 +967,10 @@ export class Bee {
    * @param options.gasLimit Gas limit for the cashout transaction in WEI
    */
   async cashoutLastCheque(address, options, requestOptions) {
-    assertCashoutOptions(options);
-    assertAddress(address);
-    assertRequestOptions(requestOptions);
+    address = new PeerAddress(address);
+    if (options) {
+      prepareTransactionOptions(options);
+    }
     return chequebook.cashoutLastCheque(this.getRequestOptionsForCall(requestOptions), address, options);
   }
   /**
@@ -1049,12 +981,18 @@ export class Bee {
    * @return string  Hash of the transaction
    */
   async depositTokens(amount, gasPrice, options) {
-    assertRequestOptions(options);
-    assertNonNegativeInteger(amount);
+    const amountString = amount instanceof BZZ ? amount.toPLURString() : asNumberString(amount, {
+      min: 1n,
+      name: 'amount'
+    });
+    let gasPriceString;
     if (gasPrice) {
-      assertNonNegativeInteger(gasPrice);
+      gasPriceString = asNumberString(amount, {
+        min: 0n,
+        name: 'gasPrice'
+      });
     }
-    return chequebook.depositTokens(this.getRequestOptionsForCall(options), amount, gasPrice);
+    return chequebook.depositTokens(this.getRequestOptionsForCall(options), amountString, gasPriceString);
   }
   /**
    * Withdraw tokens from the chequebook to the overlay address
@@ -1064,12 +1002,19 @@ export class Bee {
    * @return string  Hash of the transaction
    */
   async withdrawTokens(amount, gasPrice, options) {
-    assertRequestOptions(options);
-    assertNonNegativeInteger(amount);
+    // TODO: check BZZ in tests
+    const amountString = amount instanceof BZZ ? amount.toPLURString() : asNumberString(amount, {
+      min: 1n,
+      name: 'amount'
+    });
+    let gasPriceString;
     if (gasPrice) {
-      assertNonNegativeInteger(gasPrice);
+      gasPriceString = asNumberString(amount, {
+        min: 0n,
+        name: 'gasPrice'
+      });
     }
-    return chequebook.withdrawTokens(this.getRequestOptionsForCall(options), amount, gasPrice);
+    return chequebook.withdrawTokens(this.getRequestOptionsForCall(options), amountString, gasPriceString);
   }
   /*
    * Settlements endpoint
@@ -1080,81 +1025,47 @@ export class Bee {
    * @param address  Swarm address of peer
    */
   async getSettlements(address, options) {
-    assertRequestOptions(options);
-    assertAddress(address);
+    address = new PeerAddress(address);
     return settlements.getSettlements(this.getRequestOptionsForCall(options), address);
   }
   /**
    * Get settlements with all known peers and total amount sent or received
    */
   async getAllSettlements(options) {
-    assertRequestOptions(options);
     return settlements.getAllSettlements(this.getRequestOptionsForCall(options));
   }
   /**
    * Get status of node
    */
   async getStatus(options) {
-    assertRequestOptions(options);
     return debugStatus.getDebugStatus(this.getRequestOptionsForCall(options));
   }
   /**
    * Get health of node
    */
   async getHealth(options) {
-    assertRequestOptions(options);
     return debugStatus.getHealth(this.getRequestOptionsForCall(options));
   }
   /**
    * Get readiness of node
    */
   async getReadiness(options) {
-    assertRequestOptions(options);
     return debugStatus.getReadiness(this.getRequestOptionsForCall(options));
   }
   /**
    * Get mode information of node
    */
   async getNodeInfo(options) {
-    assertRequestOptions(options);
     return debugStatus.getNodeInfo(this.getRequestOptionsForCall(options));
   }
-  /**
-   * 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
-   */
-  async isSupportedVersion(options) {
-    assertRequestOptions(options);
-    return debugStatus.isSupportedVersion(this.getRequestOptionsForCall(options));
-  }
   /**
    * Connects to a node and checks if its version matches with the one that bee-js supports.
    *
-   * Be aware that this is the most strict version check and most probably
-   * you will want to use more relaxed API-versions based checks like
-   * `BeeDebug.isSupportedApiVersion()`, `BeeDebug.isSupportedMainApiVersion()` or `BeeDebug.isSupportedDebugApiVersion()`
-   * based on your use-case.
-   *
    * @param options
    */
   async isSupportedExactVersion(options) {
-    assertRequestOptions(options);
     return debugStatus.isSupportedExactVersion(this.getRequestOptionsForCall(options));
   }
-  /**
-   * Connects to a node and checks if its main's API version matches with the one that bee-js supports.
-   *
-   * This is useful if you are not using `BeeDebug` class (for anything else then this check)
-   * and want to make sure about compatibility.
-   *
-   * @param options
-   */
-  async isSupportedMainApiVersion(options) {
-    assertRequestOptions(options);
-    return debugStatus.isSupportedMainApiVersion(this.getRequestOptionsForCall(options));
-  }
   /**
    *
    * Connects to a node and checks if its Main API version matches with the one that bee-js supports.
@@ -1164,7 +1075,6 @@ export class Bee {
    * @param options
    */
   async isSupportedApiVersion(options) {
-    assertRequestOptions(options);
     return debugStatus.isSupportedApiVersion(this.getRequestOptionsForCall(options));
   }
   /**
@@ -1174,21 +1084,18 @@ export class Bee {
    * @param options
    */
   async getVersions(options) {
-    assertRequestOptions(options);
     return debugStatus.getVersions(this.getRequestOptionsForCall(options));
   }
   /**
    * Get reserve state
    */
   async getReserveState(options) {
-    assertRequestOptions(options);
     return states.getReserveState(this.getRequestOptionsForCall(options));
   }
   /**
    * Get chain state
    */
   async getChainState(options) {
-    assertRequestOptions(options);
     return states.getChainState(this.getRequestOptionsForCall(options));
   }
   /**
@@ -1197,7 +1104,6 @@ export class Bee {
    * @param options
    */
   async getWalletBalance(options) {
-    assertRequestOptions(options);
     return states.getWalletBalance(this.getRequestOptionsForCall(options));
   }
   /**
@@ -1215,48 +1121,107 @@ export class Bee {
    * @throws TypeError if non-integer value is passed to amount or depth
    *
    * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/develop/access-the-swarm/introduction/#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)
+   * @see [Bee Debug API reference - `POST /stamps`](https://docs.ethswarm.org/api/#tag/Postage-Stamps/paths/~1stamps~1{amount}~1{depth}/post)
    */
   async createPostageBatch(amount, depth, options, requestOptions) {
-    assertPostageBatchOptions(options);
-    assertPositiveInteger(amount);
-    assertNonNegativeInteger(depth);
-    assertRequestOptions(requestOptions);
-    if (depth < STAMPS_DEPTH_MIN) {
-      throw new BeeArgumentError(`Depth has to be at least ${STAMPS_DEPTH_MIN}`, depth);
+    const amountString = asNumberString(amount, {
+      min: 0n,
+      name: 'amount'
+    });
+    if (options) {
+      options = preparePostageBatchOptions(options);
     }
-    if (depth > STAMPS_DEPTH_MAX) {
-      throw new BeeArgumentError(`Depth has to be at most ${STAMPS_DEPTH_MAX}`, depth);
+    if (depth < STAMPS_DEPTH_MIN || depth > STAMPS_DEPTH_MAX) {
+      throw new BeeArgumentError(`Depth has to be between ${STAMPS_DEPTH_MIN}..${STAMPS_DEPTH_MAX}`, depth);
     }
-    if (parseInt(amount, 10) < STAMPS_AMOUNT_MIN) {
-      throw new BeeArgumentError(`Amount has to be at least ${STAMPS_AMOUNT_MIN} (1 day)`, amount);
+    const chainState = await this.getChainState();
+    const minimumAmount = BigInt(chainState.currentPrice) * 17280n;
+    if (BigInt(amountString) < minimumAmount) {
+      throw new BeeArgumentError(`Amount has to be at least ${minimumAmount} (1 day at current price ${chainState.currentPrice})`, amountString);
     }
-    const stamp = await stamps.createPostageBatch(this.getRequestOptionsForCall(requestOptions), amount, depth, options);
+    const stamp = await stamps.createPostageBatch(this.getRequestOptionsForCall(requestOptions), amountString, depth, options);
     if (options?.waitForUsable !== false) {
       await this.waitForUsablePostageStamp(stamp, options?.waitForUsableTimeout);
     }
     return stamp;
   }
+  async buyStorage(size, duration, options, requestOptions) {
+    const chainState = await this.getChainState(requestOptions);
+    const amount = getAmountForDuration(duration, chainState.currentPrice);
+    const depth = getDepthForSize(size);
+    if (options) {
+      options = preparePostageBatchOptions(options);
+    }
+    return this.createPostageBatch(amount, depth, options, requestOptions);
+  }
+  async getStorageCost(size, duration, options) {
+    const chainState = await this.getChainState(options);
+    const amount = getAmountForDuration(duration, chainState.currentPrice);
+    const depth = getDepthForSize(size);
+    return getStampCost(depth, amount);
+  }
+  async extendStorageSize(postageBatchId, size, options) {
+    const batch = await this.getPostageBatch(postageBatchId, options);
+    const depth = getDepthForSize(size);
+    const delta = depth - batch.depth;
+    if (delta <= 0) {
+      throw new BeeArgumentError('New depth has to be greater than the original depth', depth);
+    }
+    await this.topUpBatch(batch.batchID, BigInt(batch.amount) * 2n ** BigInt(delta - 1), options);
+    return this.diluteBatch(batch.batchID, depth, options);
+  }
+  async extendStorageDuration(postageBatchId, duration, options) {
+    const batch = await this.getPostageBatch(postageBatchId, options);
+    const chainState = await this.getChainState(options);
+    const amount = getAmountForDuration(duration, chainState.currentPrice);
+    return this.topUpBatch(batch.batchID, amount, options);
+  }
+  async getExtensionCost(postageBatchId, size, duration, options) {
+    const batch = await this.getPostageBatch(postageBatchId, options);
+    const chainState = await this.getChainState(options);
+    const amount = getAmountForDuration(duration, chainState.currentPrice);
+    const depth = getDepthForSize(size);
+    const currentValue = getStampCost(batch.depth, batch.amount);
+    const newValue = getStampCost(depth, amount);
+    return newValue.minus(currentValue);
+  }
+  async getSizeExtensionCost(postageBatchId, size, options) {
+    const batch = await this.getPostageBatch(postageBatchId, options);
+    const depth = getDepthForSize(size);
+    const delta = depth - batch.depth;
+    if (delta <= 0) {
+      throw new BeeArgumentError('New depth has to be greater than the original depth', depth);
+    }
+    const currentPaid = getStampCost(batch.depth, batch.amount);
+    const newPaid = getStampCost(depth, batch.amount);
+    return newPaid.minus(currentPaid);
+  }
+  async getDurationExtensionCost(postageBatchId, duration, options) {
+    const batch = await this.getPostageBatch(postageBatchId, options);
+    const chainState = await this.getChainState(options);
+    const amount = getAmountForDuration(duration, chainState.currentPrice);
+    return getStampCost(batch.depth, amount);
+  }
   /**
    * Topup a fresh amount of BZZ to given Postage Batch.
    *
    * For better understanding what each parameter means and what are the optimal values please see
    * [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/develop/access-the-swarm/introduction/#keep-your-data-alive).
    *
-   * **WARNING: THIS CREATES TRANSACTIONS THAT SPENDS MONEY**
-   *
    * @param postageBatchId Batch ID
    * @param amount Amount to be added to the batch
    * @param options Request options
    *
    * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/develop/access-the-swarm/introduction/#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)
+   * @see [Bee Debug API reference - `PATCH /stamps/topup/${id}/${amount}`](https://docs.ethswarm.org/api/#tag/Postage-Stamps/paths/~1stamps~1topup~1{batch_id}~1{amount}/patch)
    */
   async topUpBatch(postageBatchId, amount, options) {
-    assertRequestOptions(options);
-    assertNonNegativeInteger(amount, 'Amount');
-    assertBatchId(postageBatchId);
-    await stamps.topUpBatch(this.getRequestOptionsForCall(options), postageBatchId, amount);
+    postageBatchId = new BatchId(postageBatchId);
+    const amountString = asNumberString(amount, {
+      min: 1n,
+      name: 'amount'
+    });
+    return stamps.topUpBatch(this.getRequestOptionsForCall(options), postageBatchId, amountString);
   }
   /**
    * Dilute given Postage Batch with new depth (that has to be bigger then the original depth), which allows
@@ -1265,20 +1230,21 @@ export class Bee {
    * For better understanding what each parameter means and what are the optimal values please see
    * [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/develop/access-the-swarm/introduction/#keep-your-data-alive).
    *
-   * **WARNING: THIS CREATES TRANSACTIONS THAT SPENDS MONEY**
-   *
    * @param postageBatchId Batch ID
    * @param depth Amount to be added to the batch
    * @param options Request options
    *
    * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/develop/access-the-swarm/introduction/#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)
+   * @see [Bee Debug API reference - `PATCH /stamps/topup/${id}/${amount}`](https://docs.ethswarm.org/api/#tag/Postage-Stamps/paths/~1stamps~1dilute~1%7Bbatch_id%7D~1%7Bdepth%7D/patch)
    */
   async diluteBatch(postageBatchId, depth, options) {
-    assertRequestOptions(options);
-    assertNonNegativeInteger(depth, 'Depth');
-    assertBatchId(postageBatchId);
-    await stamps.diluteBatch(this.getRequestOptionsForCall(options), postageBatchId, depth);
+    postageBatchId = new BatchId(postageBatchId);
+    depth = Types.asNumber(depth, {
+      name: 'depth',
+      min: 18,
+      max: 255
+    });
+    return stamps.diluteBatch(this.getRequestOptionsForCall(options), postageBatchId, depth);
   }
   /**
    * Return details for specific postage batch.
@@ -1286,11 +1252,10 @@ export class Bee {
    * @param postageBatchId Batch ID
    *
    * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/develop/access-the-swarm/introduction/#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)
+   * @see [Bee Debug API reference - `GET /stamps/${id}`](https://docs.ethswarm.org/api/#tag/Postage-Stamps/paths/~1stamps~1%7Bbatch_id%7D/get)
    */
   async getPostageBatch(postageBatchId, options) {
-    assertRequestOptions(options);
-    assertBatchId(postageBatchId);
+    postageBatchId = new BatchId(postageBatchId);
     return stamps.getPostageBatch(this.getRequestOptionsForCall(options), postageBatchId);
   }
   /**
@@ -1299,35 +1264,31 @@ export class Bee {
    * @param postageBatchId Batch ID
    *
    * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/develop/access-the-swarm/introduction/#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)
+   * @see [Bee Debug API reference - `GET /stamps/${id}/buckets`](https://docs.ethswarm.org/api/#tag/Postage-Stamps/paths/~1stamps~1%7Bbatch_id%7D~1buckets/get)
    */
   async getPostageBatchBuckets(postageBatchId, options) {
-    assertRequestOptions(options);
-    assertBatchId(postageBatchId);
+    postageBatchId = new BatchId(postageBatchId);
     return stamps.getPostageBatchBuckets(this.getRequestOptionsForCall(options), postageBatchId);
   }
   /**
    * Return all postage batches that has the node available.
    *
    * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/develop/access-the-swarm/introduction/#keep-your-data-alive)
-   * @see [Bee Debug API reference - `GET /stamps`](https://docs.ethswarm.org/debug-api/#tag/Postage-Stamps/paths/~1stamps/get)
+   * @see [Bee Debug API reference - `GET /stamps`](https://docs.ethswarm.org/api/#tag/Postage-Stamps/paths/~1stamps/get)
    */
   async getAllPostageBatch(options) {
-    assertRequestOptions(options);
     return stamps.getAllPostageBatches(this.getRequestOptionsForCall(options));
   }
   /**
    * Return all globally available postage batches.
    */
   async getAllGlobalPostageBatch(options) {
-    assertRequestOptions(options);
     return stamps.getGlobalPostageBatches(this.getRequestOptionsForCall(options));
   }
   /**
    * Return lists of all current pending transactions that the Bee made
    */
   async getAllPendingTransactions(options) {
-    assertRequestOptions(options);
     return transactions.getAllTransactions(this.getRequestOptionsForCall(options));
   }
   /**
@@ -1335,8 +1296,7 @@ export class Bee {
    * @param transactionHash
    */
   async getPendingTransaction(transactionHash, options) {
-    assertRequestOptions(options);
-    assertTransactionHash(transactionHash);
+    transactionHash = new TransactionId(transactionHash);
     return transactions.getTransaction(this.getRequestOptionsForCall(options), transactionHash);
   }
   /**
@@ -1346,8 +1306,7 @@ export class Bee {
    * @param transactionHash
    */
   async rebroadcastPendingTransaction(transactionHash, options) {
-    assertRequestOptions(options);
-    assertTransactionHash(transactionHash);
+    transactionHash = new TransactionId(transactionHash);
     return transactions.rebroadcastTransaction(this.getRequestOptionsForCall(options), transactionHash);
   }
   /**
@@ -1356,12 +1315,15 @@ export class Bee {
    * @param gasPrice
    */
   async cancelPendingTransaction(transactionHash, gasPrice, options) {
-    assertRequestOptions(options);
-    assertTransactionHash(transactionHash);
+    transactionHash = new TransactionId(transactionHash);
+    let gasPriceString;
     if (gasPrice) {
-      assertNonNegativeInteger(gasPrice);
+      gasPriceString = asNumberString(gasPrice, {
+        min: 0n,
+        name: 'gasPrice'
+      });
     }
-    return transactions.cancelTransaction(this.getRequestOptionsForCall(options), transactionHash, gasPrice);
+    return transactions.cancelTransaction(this.getRequestOptionsForCall(options), transactionHash, gasPriceString);
   }
   /**
    * Gets the staked amount of BZZ (in PLUR unit) as number string.
@@ -1369,7 +1331,6 @@ export class Bee {
    * @param options
    */
   async getStake(options) {
-    assertRequestOptions(options);
     return stake.getStake(this.getRequestOptionsForCall(options));
   }
   /**
@@ -1381,9 +1342,14 @@ export class Bee {
    * @param options
    */
   async depositStake(amount, options, requestOptions) {
-    assertTransactionOptions(options);
-    assertRequestOptions(requestOptions);
-    await stake.stake(this.getRequestOptionsForCall(requestOptions), amount, options);
+    const amountString = amount instanceof BZZ ? amount.toPLURString() : asNumberString(amount, {
+      min: 1n,
+      name: 'amount'
+    });
+    if (options) {
+      options = prepareTransactionOptions(options);
+    }
+    return stake.stake(this.getRequestOptionsForCall(requestOptions), amountString, options);
   }
   /**
    * Get current status of node in redistribution game
@@ -1391,7 +1357,6 @@ export class Bee {
    * @param options
    */
   async getRedistributionState(options) {
-    assertRequestOptions(options);
     return stake.getRedistributionState(this.getRequestOptionsForCall(options));
   }
   async waitForUsablePostageStamp(id, timeout = 240000) {
@@ -1402,26 +1367,17 @@ export class Bee {
         if (stamp.usable) {
           return;
         }
-      } catch (error) {}
+      } catch (error) {
+        // ignore error
+      }
       await System.sleepMillis(TIME_STEP);
     }
     throw new BeeError('Timeout on waiting for postage stamp to become usable');
   }
-  /**
-   * @param signer
-   * @private
-   * @throws BeeError if either no Signer was passed or no default Signer was specified for the instance
-   */
-  resolveSigner(signer) {
-    if (signer) {
-      return makeSigner(signer);
-    }
-    if (this.signer) {
-      return this.signer;
-    }
-    throw new TypeError('You have to pass Signer as property to either the method call or constructor! Non found.');
-  }
   getRequestOptionsForCall(options) {
+    if (options) {
+      options = prepareBeeRequestOptions(options);
+    }
     return options ? Objects.deepMerge2(this.requestOptions, options) : this.requestOptions;
   }
 }