@ethersphere/bee-js 8.3.0 → 9.0.1

package/dist/cjs/bee.js

@@ -25,13 +25,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bee = void 0;
 const cafe_utility_1 = require("cafe-utility");
-const signer_1 = require("./chunk/signer");
+const cac_1 = require("./chunk/cac");
 const soc_1 = require("./chunk/soc");
 const feed_1 = require("./feed");
-const json_1 = require("./feed/json");
 const retrievable_1 = require("./feed/retrievable");
-const topic_1 = require("./feed/topic");
-const type_1 = require("./feed/type");
 const bytes = __importStar(require("./modules/bytes"));
 const bzz = __importStar(require("./modules/bzz"));
 const chunk = __importStar(require("./modules/chunk"));
@@ -43,11 +40,11 @@ const stake = __importStar(require("./modules/debug/stake"));
 const stamps = __importStar(require("./modules/debug/stamps"));
 const states = __importStar(require("./modules/debug/states"));
 const debugStatus = __importStar(require("./modules/debug/status"));
-const debugTag = __importStar(require("./modules/debug/tag"));
 const transactions = __importStar(require("./modules/debug/transactions"));
 const envelope_1 = require("./modules/envelope");
 const feed_2 = require("./modules/feed");
 const grantee = __importStar(require("./modules/grantee"));
+const gsoc = __importStar(require("./modules/gsoc"));
 const pinning = __importStar(require("./modules/pinning"));
 const pss = __importStar(require("./modules/pss"));
 const status = __importStar(require("./modules/status"));
@@ -55,13 +52,17 @@ const stewardship = __importStar(require("./modules/stewardship"));
 const tag = __importStar(require("./modules/tag"));
 const types_1 = require("./types");
 const bytes_1 = require("./utils/bytes");
+const chunk_stream_1 = require("./utils/chunk-stream");
 const collection_1 = require("./utils/collection");
 const collection_node_1 = require("./utils/collection.node");
 const data_1 = require("./utils/data");
 const error_1 = require("./utils/error");
-const eth_1 = require("./utils/eth");
 const file_1 = require("./utils/file");
-const type_2 = require("./utils/type");
+const resource_locator_1 = require("./utils/resource-locator");
+const stamps_1 = require("./utils/stamps");
+const tokens_1 = require("./utils/tokens");
+const type_1 = require("./utils/type");
+const typed_bytes_1 = require("./utils/typed-bytes");
 const url_1 = require("./utils/url");
 /**
  * The main component that abstracts operations available on the main Bee API.
@@ -81,11 +82,11 @@ class Bee {
         // unnecessary redirects.
         this.url = (0, url_1.stripLastSlash)(url);
         if (options?.signer) {
-            this.signer = (0, signer_1.makeSigner)(options.signer);
+            this.signer = new typed_bytes_1.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,
@@ -104,11 +105,10 @@ class Bee {
      * @see [Bee API reference - `POST /bytes`](https://docs.ethswarm.org/api/#tag/Bytes/paths/~1bytes/post)
      */
     async uploadData(postageBatchId, data, options, requestOptions) {
-        (0, type_2.assertBatchId)(postageBatchId);
-        (0, type_2.assertData)(data);
-        (0, type_2.assertRequestOptions)(requestOptions);
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
+        (0, type_1.assertData)(data);
         if (options) {
-            (0, type_2.assertUploadOptions)(options);
+            options = (0, type_1.prepareRedundantUploadOptions)(options);
         }
         return bytes.upload(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options);
     }
@@ -118,39 +118,40 @@ 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) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertReferenceOrEns)(reference);
+        reference = new typed_bytes_1.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) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertReferenceOrEns)(reference);
-        return bytes.download(this.getRequestOptionsForCall(options), reference);
+    async downloadData(resource, options, requestOptions) {
+        if (options) {
+            options = (0, type_1.prepareDownloadOptions)(options);
+        }
+        return bytes.download(this.getRequestOptionsForCall(requestOptions), new resource_locator_1.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) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertReferenceOrEns)(reference);
-        return bytes.downloadReadable(this.getRequestOptionsForCall(options), reference);
+    async downloadReadableData(resource, options, requestOptions) {
+        if (options) {
+            options = (0, type_1.prepareDownloadOptions)(options);
+        }
+        return bytes.downloadReadable(this.getRequestOptionsForCall(requestOptions), new resource_locator_1.ResourceLocator(resource), options);
     }
     /**
      * Upload chunk to a Bee node
@@ -164,18 +165,15 @@ class Bee {
      * @see [Bee API reference - `POST /chunks`](https://docs.ethswarm.org/api/#tag/Chunk/paths/~1chunks/post)
      */
     async uploadChunk(stamp, data, options, requestOptions) {
-        (0, type_2.assertRequestOptions)(requestOptions);
-        if (!(data instanceof Uint8Array)) {
-            throw new TypeError('Data has to be Uint8Array instance!');
-        }
-        if (data.length < types_1.SPAN_SIZE) {
-            throw new error_1.BeeArgumentError(`Chunk has to have size of at least ${types_1.SPAN_SIZE}.`, data);
+        data = data instanceof Uint8Array ? data : data.data;
+        if (options) {
+            options = (0, type_1.prepareUploadOptions)(options);
         }
-        if (data.length > types_1.CHUNK_SIZE + types_1.SPAN_SIZE) {
-            throw new error_1.BeeArgumentError(`Chunk has to have size of at most ${types_1.CHUNK_SIZE}.`, data);
+        if (data.length < typed_bytes_1.Span.LENGTH) {
+            throw new error_1.BeeArgumentError(`Chunk has to have size of at least ${typed_bytes_1.Span.LENGTH}.`, data);
         }
-        if (options) {
-            (0, type_2.assertUploadOptions)(options);
+        if (data.length > types_1.CHUNK_SIZE + typed_bytes_1.Span.LENGTH) {
+            throw new error_1.BeeArgumentError(`Chunk has to have size of at most ${types_1.CHUNK_SIZE + typed_bytes_1.Span.LENGTH}.`, data);
         }
         return chunk.upload(this.getRequestOptionsForCall(requestOptions), data, stamp, options);
     }
@@ -189,10 +187,12 @@ 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) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertReferenceOrEns)(reference);
-        return chunk.download(this.getRequestOptionsForCall(options), reference);
+    async downloadChunk(reference, options, requestOptions) {
+        reference = new typed_bytes_1.Reference(reference);
+        if (options) {
+            options = (0, type_1.prepareDownloadOptions)(options);
+        }
+        return chunk.download(this.getRequestOptionsForCall(requestOptions), reference, options);
     }
     /**
      * Create a grantees list from the given array of public keys.
@@ -205,8 +205,8 @@ class Bee {
      * @returns A promise that resolves to a `GranteesResult` object.
      */
     async createGrantees(postageBatchId, grantees, requestOptions) {
-        (0, type_2.assertRequestOptions)(requestOptions);
-        (0, type_2.assertBatchId)(postageBatchId);
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
+        grantees = grantees.map(x => new typed_bytes_1.PublicKey(x));
         return grantee.createGrantees(this.getRequestOptionsForCall(requestOptions), postageBatchId, grantees);
     }
     /**
@@ -217,7 +217,7 @@ class Bee {
      * @returns A promise that resolves to a `GetGranteesResult` object.
      */
     async getGrantees(reference, requestOptions) {
-        (0, type_2.assertRequestOptions)(requestOptions);
+        reference = new typed_bytes_1.Reference(reference);
         return grantee.getGrantees(reference, this.getRequestOptionsForCall(requestOptions));
     }
     /**
@@ -231,16 +231,18 @@ class Bee {
      * @returns A Promise that resolves to to a `GranteesResult` object.
      */
     async patchGrantees(postageBatchId, reference, history, grantees, requestOptions) {
-        (0, type_2.assertRequestOptions)(requestOptions);
-        (0, type_2.assertBatchId)(postageBatchId);
-        return grantee.patchGrantees(postageBatchId, reference, history, { add: grantees.add || [], revoke: grantees.revoke || [] }, this.getRequestOptionsForCall(requestOptions));
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
+        reference = new typed_bytes_1.Reference(reference);
+        history = new typed_bytes_1.Reference(history);
+        const publicKeys = {
+            add: grantees.add?.map(x => new typed_bytes_1.PublicKey(x)) ?? [],
+            revoke: grantees.revoke?.map(x => new typed_bytes_1.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
@@ -252,11 +254,10 @@ class Bee {
      * @returns reference is a content hash of the file
      */
     async uploadFile(postageBatchId, data, name, options, requestOptions) {
-        (0, type_2.assertRequestOptions)(requestOptions);
-        (0, type_2.assertBatchId)(postageBatchId);
-        (0, type_2.assertFileData)(data);
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
+        (0, type_1.assertFileData)(data);
         if (options) {
-            (0, type_2.assertFileUploadOptions)(options);
+            options = (0, type_1.prepareFileUploadOptions)(options);
         }
         if (name && typeof name !== 'string') {
             throw new TypeError('name has to be string or undefined!');
@@ -266,22 +267,16 @@ class Bee {
             const fileName = name ?? data.name;
             const contentType = data.type;
             const fileOptions = { contentType, ...options };
-            return (0, type_2.addCidConversionFunction)(await bzz.uploadFile(this.getRequestOptionsForCall(requestOptions), fileData, postageBatchId, fileName, fileOptions), 'manifest');
-        }
-        else if ((0, type_2.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 (0, type_2.addCidConversionFunction)(result, 'manifest');
+            return bzz.uploadFile(this.getRequestOptionsForCall(requestOptions), fileData, postageBatchId, fileName, fileOptions);
         }
         else {
-            return (0, type_2.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
@@ -290,10 +285,11 @@ 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) {
-        (0, type_2.assertRequestOptions)(options);
-        reference = (0, type_2.makeReferenceOrEns)(reference, 'manifest');
-        return bzz.downloadFile(this.getRequestOptionsForCall(options), reference, path);
+    async downloadFile(resource, path = '', options, requestOptions) {
+        if (options) {
+            options = (0, type_1.prepareDownloadOptions)(options);
+        }
+        return bzz.downloadFile(this.getRequestOptionsForCall(requestOptions), new resource_locator_1.ResourceLocator(resource), path, options);
     }
     /**
      * Download single file as a readable stream
@@ -307,10 +303,12 @@ 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) {
-        (0, type_2.assertRequestOptions)(options);
-        reference = (0, type_2.makeReferenceOrEns)(reference, 'manifest');
-        return bzz.downloadFileReadable(this.getRequestOptionsForCall(options), reference, path);
+    async downloadReadableFile(reference, path = '', options, requestOptions) {
+        reference = new typed_bytes_1.Reference(reference);
+        if (options) {
+            options = (0, type_1.prepareDownloadOptions)(options);
+        }
+        return bzz.downloadFileReadable(this.getRequestOptionsForCall(requestOptions), reference, path, options);
     }
     /**
      * Upload collection of files to a Bee node
@@ -329,13 +327,23 @@ class Bee {
      * @see [Bee API reference - `POST /bzz`](https://docs.ethswarm.org/api/#tag/BZZ/paths/~1bzz/post)
      */
     async uploadFiles(postageBatchId, fileList, options, requestOptions) {
-        (0, type_2.assertRequestOptions)(requestOptions);
-        (0, type_2.assertBatchId)(postageBatchId);
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
         if (options) {
-            (0, type_2.assertCollectionUploadOptions)(options);
+            options = (0, type_1.prepareCollectionUploadOptions)(options);
         }
-        const data = await (0, collection_1.makeCollectionFromFileList)(fileList);
-        return (0, type_2.addCidConversionFunction)(await bzz.uploadCollection(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options), 'manifest');
+        const data = (0, collection_1.makeCollectionFromFileList)(fileList);
+        return bzz.uploadCollection(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options);
+    }
+    async hashDirectory(dir) {
+        return (0, chunk_stream_1.hashDirectory)(dir);
+    }
+    async streamDirectory(postageBatchId, dir, onUploadProgress, options, requestOptions) {
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
+        return (0, chunk_stream_1.streamDirectory)(this, dir, postageBatchId, onUploadProgress, options, this.getRequestOptionsForCall(requestOptions));
+    }
+    async streamFiles(postageBatchId, files, onUploadProgress, options, requestOptions) {
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
+        return (0, chunk_stream_1.streamFiles)(this, files, postageBatchId, onUploadProgress, options, this.getRequestOptionsForCall(requestOptions));
     }
     /**
      * Upload Collection that you can assembly yourself.
@@ -348,12 +356,12 @@ class Bee {
      * @param options Collections and request options
      */
     async uploadCollection(postageBatchId, collection, options, requestOptions) {
-        (0, type_2.assertRequestOptions)(requestOptions);
-        (0, type_2.assertBatchId)(postageBatchId);
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
         (0, collection_1.assertCollection)(collection);
-        if (options)
-            (0, type_2.assertCollectionUploadOptions)(options);
-        return (0, type_2.addCidConversionFunction)(await bzz.uploadCollection(this.getRequestOptionsForCall(this.requestOptions), collection, postageBatchId, options), 'manifest');
+        if (options) {
+            options = (0, type_1.prepareCollectionUploadOptions)(options);
+        }
+        return bzz.uploadCollection(this.getRequestOptionsForCall(requestOptions), collection, postageBatchId, options);
     }
     /**
      * Upload collection of files.
@@ -372,12 +380,12 @@ class Bee {
      * @see [Bee API reference - `POST /bzz`](https://docs.ethswarm.org/api/#tag/BZZ/paths/~1bzz/post)
      */
     async uploadFilesFromDirectory(postageBatchId, dir, options, requestOptions) {
-        (0, type_2.assertBatchId)(postageBatchId);
-        (0, type_2.assertRequestOptions)(requestOptions);
-        if (options)
-            (0, type_2.assertCollectionUploadOptions)(options);
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
+        if (options) {
+            options = (0, type_1.prepareCollectionUploadOptions)(options);
+        }
         const data = await (0, collection_node_1.makeCollectionFromFS)(dir);
-        return (0, type_2.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.
@@ -387,7 +395,6 @@ class Bee {
      * @see [Bee API reference - `POST /tags`](https://docs.ethswarm.org/api/#tag/Tag/paths/~1tags/post)
      */
     async createTag(options) {
-        (0, type_2.assertRequestOptions)(options);
         return tag.createTag(this.getRequestOptionsForCall(options));
     }
     /**
@@ -403,8 +410,9 @@ class Bee {
      * @see [Bee API reference - `GET /tags`](https://docs.ethswarm.org/api/#tag/Tag/paths/~1tags/get)
      */
     async getAllTags(options, requestOptions) {
-        (0, type_2.assertRequestOptions)(requestOptions);
-        (0, type_2.assertAllTagsOptions)(options);
+        if (options) {
+            options = (0, type_1.prepareAllTagsOptions)(options);
+        }
         return tag.getAllTags(this.getRequestOptionsForCall(requestOptions), options?.offset, options?.limit);
     }
     /**
@@ -419,8 +427,7 @@ class Bee {
      *
      */
     async retrieveTag(tagUid, options) {
-        (0, type_2.assertRequestOptions)(options);
-        tagUid = (0, type_2.makeTagUid)(tagUid);
+        tagUid = (0, type_1.makeTagUid)(tagUid);
         return tag.retrieveTag(this.getRequestOptionsForCall(options), tagUid);
     }
     /**
@@ -435,8 +442,7 @@ 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) {
-        (0, type_2.assertRequestOptions)(options);
-        tagUid = (0, type_2.makeTagUid)(tagUid);
+        tagUid = (0, type_1.makeTagUid)(tagUid);
         return tag.deleteTag(this.getRequestOptionsForCall(options), tagUid);
     }
     /**
@@ -455,9 +461,8 @@ 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) {
-        (0, type_2.assertReference)(reference);
-        (0, type_2.assertRequestOptions)(options);
-        tagUid = (0, type_2.makeTagUid)(tagUid);
+        reference = new typed_bytes_1.Reference(reference);
+        tagUid = (0, type_1.makeTagUid)(tagUid);
         return tag.updateTag(this.getRequestOptionsForCall(options), tagUid, reference);
     }
     /**
@@ -470,8 +475,7 @@ class Bee {
      * @see [Bee docs - Pinning](https://docs.ethswarm.org/docs/develop/access-the-swarm/pinning)
      */
     async pin(reference, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertReference)(reference);
+        reference = new typed_bytes_1.Reference(reference);
         return pinning.pin(this.getRequestOptionsForCall(options), reference);
     }
     /**
@@ -484,8 +488,7 @@ class Bee {
      * @see [Bee docs - Pinning](https://docs.ethswarm.org/docs/develop/access-the-swarm/pinning)
      */
     async unpin(reference, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertReference)(reference);
+        reference = new typed_bytes_1.Reference(reference);
         return pinning.unpin(this.getRequestOptionsForCall(options), reference);
     }
     /**
@@ -495,7 +498,6 @@ class Bee {
      * @see [Bee docs - Pinning](https://docs.ethswarm.org/docs/develop/access-the-swarm/pinning)
      */
     async getAllPins(options) {
-        (0, type_2.assertRequestOptions)(options);
         return pinning.getAllPins(this.getRequestOptionsForCall(options));
     }
     /**
@@ -509,8 +511,7 @@ class Bee {
      * @see [Bee docs - Pinning](https://docs.ethswarm.org/docs/develop/access-the-swarm/pinning)
      */
     async getPin(reference, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertReference)(reference);
+        reference = new typed_bytes_1.Reference(reference);
         return pinning.getPin(this.getRequestOptionsForCall(options), reference);
     }
     /**
@@ -524,10 +525,10 @@ class Bee {
      *
      * @see [Bee API reference - `PUT /stewardship`](https://docs.ethswarm.org/api/#tag/Stewardship/paths/~1stewardship~1{reference}/put)
      */
-    async reuploadPinnedData(reference, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertReferenceOrEns)(reference);
-        await stewardship.reupload(this.getRequestOptionsForCall(options), reference);
+    async reuploadPinnedData(postageBatchId, reference, options) {
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
+        reference = new typed_bytes_1.Reference(reference);
+        await stewardship.reupload(this.getRequestOptionsForCall(options), postageBatchId, reference);
     }
     /**
      * Checks if content specified by reference is retrievable from the network.
@@ -540,8 +541,7 @@ class Bee {
      * @see [Bee API reference - `GET /stewardship`](https://docs.ethswarm.org/api/#tag/Stewardship/paths/~1stewardship~1{reference}/get)
      */
     async isReferenceRetrievable(reference, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertReferenceOrEns)(reference);
+        reference = new typed_bytes_1.Reference(reference);
         return stewardship.isRetrievable(this.getRequestOptionsForCall(options), reference);
     }
     /**
@@ -559,25 +559,26 @@ class Bee {
      * @param index
      * @param options
      */
-    async isFeedRetrievable(type, owner, topic, index, options) {
-        const canonicalOwner = (0, eth_1.makeEthAddress)(owner);
-        const canonicalTopic = (0, topic_1.makeTopic)(topic);
+    async isFeedRetrievable(owner, topic, index, options, requestOptions) {
+        owner = new typed_bytes_1.EthAddress(owner);
+        topic = new typed_bytes_1.Topic(topic);
+        if (options) {
+            options = (0, type_1.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 = cafe_utility_1.Objects.getDeep(e, 'status');
+                if (status === 404 || status === 500) {
                     return false;
                 }
                 throw e;
             }
         }
-        if (type !== 'sequence') {
-            throw new error_1.BeeError('Only Sequence type of Feeds is supported at the moment');
-        }
-        return (0, retrievable_1.areAllSequentialFeedsUpdateRetrievable)(this, canonicalOwner, canonicalTopic, index, this.getRequestOptionsForCall(options));
+        return (0, retrievable_1.areAllSequentialFeedsUpdateRetrievable)(this, owner, topic, index, options, this.getRequestOptionsForCall(requestOptions));
     }
     /**
      * Send data to recipient or target with Postal Service for Swarm.
@@ -602,15 +603,10 @@ 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) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertData)(data);
-        (0, type_2.assertBatchId)(postageBatchId);
-        (0, type_2.assertAddressPrefix)(target);
-        if (typeof topic !== 'string') {
-            throw new TypeError('topic has to be an string!');
-        }
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
+        (0, type_1.assertData)(data);
         if (recipient) {
-            (0, type_2.assertPublicKey)(recipient);
+            recipient = new typed_bytes_1.PublicKey(recipient);
             return pss.send(this.getRequestOptionsForCall(options), topic, target, data, postageBatchId, recipient);
         }
         else {
@@ -632,11 +628,8 @@ 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) {
-        (0, type_2.assertPssMessageHandler)(handler);
-        if (typeof topic !== 'string') {
-            throw new TypeError('topic has to be an string!');
-        }
-        const ws = pss.subscribe(this.url, topic);
+        handler = (0, type_1.preparePssMessageHandler)(handler);
+        const ws = pss.subscribe(this.url, topic, this.requestOptions.headers);
         let cancelled = false;
         const cancel = () => {
             if (cancelled === false) {
@@ -644,27 +637,28 @@ 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)
+                if (ws.terminate) {
                     ws.terminate();
-                else
-                    ws.close(); // standard Websocket in browser does not have terminate function
+                }
+                else {
+                    ws.close();
+                } // standard Websocket in browser does not have terminate function
             }
         };
         const subscription = {
             topic,
             cancel,
         };
-        ws.onmessage = async (ev) => {
-            const data = await (0, data_1.prepareWebsocketData)(ev.data);
-            // ignore empty messages
-            if (data.length > 0) {
-                handler.onMessage((0, bytes_1.wrapBytesWithHelpers)(data), subscription);
+        ws.onmessage = async (event) => {
+            const data = await (0, data_1.prepareWebsocketData)(event.data);
+            if (data.length) {
+                handler.onMessage(new bytes_1.Bytes(data), subscription);
             }
         };
-        ws.onerror = ev => {
+        ws.onerror = event => {
             // ignore errors after subscription was cancelled
             if (!cancelled) {
-                handler.onError(new error_1.BeeError(ev.message), subscription);
+                handler.onError(new error_1.BeeError(event.message), subscription);
             }
         };
         return subscription;
@@ -694,9 +688,6 @@ 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!');
         }
@@ -715,8 +706,6 @@ 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 error_1.BeeError('pssReceive timeout'));
@@ -724,13 +713,69 @@ class Bee {
             }
         });
     }
+    gsocMine(targetOverlay, identifier, proximity = 12) {
+        targetOverlay = new typed_bytes_1.PeerAddress(targetOverlay);
+        identifier = new typed_bytes_1.Identifier(identifier);
+        const start = 0xb33n;
+        for (let i = 0n; i < 0xffffn; i++) {
+            const signer = new typed_bytes_1.PrivateKey(cafe_utility_1.Binary.numberToUint256(start + i, 'BE'));
+            const socAddress = (0, soc_1.makeSOCAddress)(identifier, signer.publicKey().address());
+            const actualProximity = 256 - cafe_utility_1.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 typed_bytes_1.BatchId(postageBatchId);
+        signer = new typed_bytes_1.PrivateKey(signer);
+        identifier = new typed_bytes_1.Identifier(identifier);
+        const cac = (0, cac_1.makeContentAddressedChunk)(data);
+        const soc = (0, soc_1.makeSingleOwnerChunk)(cac, identifier, signer);
+        return gsoc.send(this.getRequestOptionsForCall(requestOptions), soc, postageBatchId, options);
+    }
+    gsocSubscribe(address, identifier, handler) {
+        address = new typed_bytes_1.EthAddress(address);
+        identifier = new typed_bytes_1.Identifier(identifier);
+        handler = (0, type_1.prepareGsocMessageHandler)(handler);
+        const socAddress = (0, soc_1.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 (0, data_1.prepareWebsocketData)(event.data);
+            if (data.length) {
+                handler.onMessage(new bytes_1.Bytes(data), subscription);
+            }
+        };
+        ws.onerror = event => {
+            if (!cancelled) {
+                handler.onError(new error_1.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
@@ -738,130 +783,50 @@ 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) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_1.assertFeedType)(type);
-        const canonicalTopic = (0, topic_1.makeTopic)(topic);
-        const canonicalOwner = (0, eth_1.makeHexEthAddress)(owner);
-        const reference = await (0, feed_2.createFeedManifest)(this.getRequestOptionsForCall(options), canonicalOwner, canonicalTopic, stamp);
-        return (0, type_2.addCidConversionFunction)({ reference }, 'feed');
+    async createFeedManifest(postageBatchId, topic, owner, options, requestOptions) {
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
+        topic = new typed_bytes_1.Topic(topic);
+        owner = new typed_bytes_1.EthAddress(owner);
+        if (options) {
+            options = (0, type_1.prepareUploadOptions)(options);
+        }
+        return (0, feed_2.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) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_1.assertFeedType)(type);
-        const canonicalTopic = (0, topic_1.makeTopic)(topic);
-        const canonicalOwner = (0, eth_1.makeHexEthAddress)(owner);
-        return (0, feed_1.makeFeedReader)(this.getRequestOptionsForCall(options), type, canonicalTopic, canonicalOwner);
+    makeFeedReader(topic, owner, options) {
+        topic = new typed_bytes_1.Topic(topic);
+        owner = new typed_bytes_1.EthAddress(owner);
+        return (0, feed_1.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) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_1.assertFeedType)(type);
-        const canonicalTopic = (0, topic_1.makeTopic)(topic);
-        const canonicalSigner = this.resolveSigner(signer);
-        return (0, feed_1.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) {
-        (0, type_2.assertRequestOptions)(requestOptions, 'JsonFeedOptions');
-        (0, type_2.assertBatchId)(postageBatchId);
-        const hashedTopic = this.makeFeedTopic(topic);
-        const feedType = options?.type ?? type_1.DEFAULT_FEED_TYPE;
-        const writer = this.makeFeedWriter(feedType, hashedTopic, options?.signer, requestOptions);
-        return (0, json_1.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) {
-        (0, type_2.assertRequestOptions)(requestOptions);
-        const hashedTopic = this.makeFeedTopic(topic);
-        const feedType = options?.type ?? type_1.DEFAULT_FEED_TYPE;
-        if (options?.signer && options?.address) {
-            throw new error_1.BeeError('Both options "signer" and "address" can not be specified at one time!');
-        }
-        let address;
-        if (options?.address) {
-            address = (0, eth_1.makeEthAddress)(options?.address);
-        }
-        else {
-            try {
-                address = this.resolveSigner(options?.signer).address;
-            }
-            catch (e) {
-                if (e instanceof error_1.BeeError) {
-                    throw new error_1.BeeError('Either address, signer or default signer has to be specified!');
-                }
-                else {
-                    throw e;
-                }
-            }
+    makeFeedWriter(topic, signer, options) {
+        topic = new typed_bytes_1.Topic(topic);
+        signer = signer ? new typed_bytes_1.PrivateKey(signer) : this.signer;
+        if (!signer) {
+            throw Error('No signer provided');
         }
-        const reader = this.makeFeedReader(feedType, hashedTopic, address, requestOptions);
-        return (0, json_1.getJsonData)(this, reader);
+        return (0, feed_1.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 (0, topic_1.makeTopicFromString)(topic);
+    async fetchLatestFeedUpdate(topic, owner, requestOptions) {
+        topic = new typed_bytes_1.Topic(topic);
+        owner = new typed_bytes_1.EthAddress(owner);
+        return (0, feed_2.fetchLatestFeedUpdate)(this.getRequestOptionsForCall(requestOptions), owner, topic);
     }
     /**
      * Returns an object for reading single owner chunks
@@ -871,11 +836,10 @@ class Bee {
      * @see [Bee docs - Chunk Types](https://docs.ethswarm.org/docs/develop/tools-and-features/chunk-types#single-owner-chunks)
      */
     makeSOCReader(ownerAddress, options) {
-        (0, type_2.assertRequestOptions)(options);
-        const canonicalOwner = (0, eth_1.makeEthAddress)(ownerAddress);
+        ownerAddress = new typed_bytes_1.EthAddress(ownerAddress);
         return {
-            owner: (0, eth_1.makeHexEthAddress)(canonicalOwner),
-            download: soc_1.downloadSingleOwnerChunk.bind(null, this.getRequestOptionsForCall(options), canonicalOwner),
+            owner: ownerAddress,
+            download: soc_1.downloadSingleOwnerChunk.bind(null, this.getRequestOptionsForCall(options), ownerAddress),
         };
     }
     /**
@@ -886,15 +850,18 @@ class Bee {
      * @see [Bee docs - Chunk Types](https://docs.ethswarm.org/docs/develop/tools-and-features/chunk-types#single-owner-chunks)
      */
     makeSOCWriter(signer, options) {
-        (0, type_2.assertRequestOptions)(options);
-        const canonicalSigner = this.resolveSigner(signer);
+        signer = signer ? new typed_bytes_1.PrivateKey(signer) : this.signer;
+        if (!signer) {
+            throw Error('No signer provided');
+        }
         return {
-            ...this.makeSOCReader(canonicalSigner.address, options),
-            upload: soc_1.uploadSingleOwnerChunkData.bind(null, this.getRequestOptionsForCall(options), canonicalSigner),
+            ...this.makeSOCReader(signer.publicKey().address(), options),
+            upload: soc_1.uploadSingleOwnerChunkData.bind(null, this.getRequestOptionsForCall(options), signer),
         };
     }
     async createEnvelope(postageBatchId, reference, options) {
-        (0, type_2.assertRequestOptions)(options);
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
+        reference = new typed_bytes_1.Reference(reference);
         return (0, envelope_1.postEnvelope)(this.getRequestOptionsForCall(options), postageBatchId, reference);
     }
     /**
@@ -904,7 +871,6 @@ class Bee {
      * @throws If connection was not successful throw error
      */
     async checkConnection(options) {
-        (0, type_2.assertRequestOptions)(options, 'PostageBatchOptions');
         return status.checkConnection(this.getRequestOptionsForCall(options));
     }
     /**
@@ -914,7 +880,6 @@ class Bee {
      * @returns true if successful, false on error
      */
     async isConnected(options) {
-        (0, type_2.assertRequestOptions)(options, 'PostageBatchOptions');
         try {
             await status.checkConnection(this.getRequestOptionsForCall(options));
         }
@@ -925,55 +890,26 @@ class Bee {
     }
     // Legacy debug API
     async getNodeAddresses(options) {
-        (0, type_2.assertRequestOptions)(options);
         return connectivity.getNodeAddresses(this.getRequestOptionsForCall(options));
     }
     async getBlocklist(options) {
-        (0, type_2.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) {
-        (0, type_2.assertRequestOptions)(options);
-        if ((0, type_2.isTag)(tagUid)) {
-            tagUid = tagUid.uid;
-        }
-        else if (typeof tagUid === 'number') {
-            (0, type_2.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) {
-        (0, type_2.assertRequestOptions)(options);
         return connectivity.getPeers(this.getRequestOptionsForCall(options));
     }
     async removePeer(peer, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertAddress)(peer);
+        peer = new typed_bytes_1.PeerAddress(peer);
         return connectivity.removePeer(this.getRequestOptionsForCall(options), peer);
     }
     async getTopology(options) {
-        (0, type_2.assertRequestOptions)(options);
         return connectivity.getTopology(this.getRequestOptionsForCall(options));
     }
     async pingPeer(peer, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertAddress)(peer);
+        peer = new typed_bytes_1.PeerAddress(peer);
         return connectivity.pingPeer(this.getRequestOptionsForCall(options), peer);
     }
     /*
@@ -983,7 +919,6 @@ class Bee {
      * Get the balances with all known peers including prepaid services
      */
     async getAllBalances(options) {
-        (0, type_2.assertRequestOptions)(options);
         return balance.getAllBalances(this.getRequestOptionsForCall(options));
     }
     /**
@@ -992,15 +927,13 @@ class Bee {
      * @param address Swarm address of peer
      */
     async getPeerBalance(address, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertAddress)(address);
+        address = new typed_bytes_1.PeerAddress(address);
         return balance.getPeerBalance(this.getRequestOptionsForCall(options), address);
     }
     /**
      * Get the past due consumption balances with all known peers
      */
     async getPastDueConsumptionBalances(options) {
-        (0, type_2.assertRequestOptions)(options);
         return balance.getPastDueConsumptionBalances(this.getRequestOptionsForCall(options));
     }
     /**
@@ -1009,8 +942,7 @@ class Bee {
      * @param address Swarm address of peer
      */
     async getPastDueConsumptionPeerBalance(address, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertAddress)(address);
+        address = new typed_bytes_1.PeerAddress(address);
         return balance.getPastDueConsumptionPeerBalance(this.getRequestOptionsForCall(options), address);
     }
     /*
@@ -1023,21 +955,18 @@ class Bee {
      * https://github.com/ethersphere/bee/issues/1443
      */
     async getChequebookAddress(options) {
-        (0, type_2.assertRequestOptions)(options);
         return chequebook.getChequebookAddress(this.getRequestOptionsForCall(options));
     }
     /**
      * Get the balance of the chequebook
      */
     async getChequebookBalance(options) {
-        (0, type_2.assertRequestOptions)(options);
         return chequebook.getChequebookBalance(this.getRequestOptionsForCall(options));
     }
     /**
      * Get last cheques for all peers
      */
     async getLastCheques(options) {
-        (0, type_2.assertRequestOptions)(options);
         return chequebook.getLastCheques(this.getRequestOptionsForCall(options));
     }
     /**
@@ -1046,8 +975,7 @@ class Bee {
      * @param address  Swarm address of peer
      */
     async getLastChequesForPeer(address, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertAddress)(address);
+        address = new typed_bytes_1.PeerAddress(address);
         return chequebook.getLastChequesForPeer(this.getRequestOptionsForCall(options), address);
     }
     /**
@@ -1056,8 +984,7 @@ class Bee {
      * @param address  Swarm address of peer
      */
     async getLastCashoutAction(address, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertAddress)(address);
+        address = new typed_bytes_1.PeerAddress(address);
         return chequebook.getLastCashoutAction(this.getRequestOptionsForCall(options), address);
     }
     /**
@@ -1069,9 +996,10 @@ class Bee {
      * @param options.gasLimit Gas limit for the cashout transaction in WEI
      */
     async cashoutLastCheque(address, options, requestOptions) {
-        (0, type_2.assertCashoutOptions)(options);
-        (0, type_2.assertAddress)(address);
-        (0, type_2.assertRequestOptions)(requestOptions);
+        address = new typed_bytes_1.PeerAddress(address);
+        if (options) {
+            (0, type_1.prepareTransactionOptions)(options);
+        }
         return chequebook.cashoutLastCheque(this.getRequestOptionsForCall(requestOptions), address, options);
     }
     /**
@@ -1082,12 +1010,12 @@ class Bee {
      * @return string  Hash of the transaction
      */
     async depositTokens(amount, gasPrice, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertNonNegativeInteger)(amount);
+        const amountString = amount instanceof tokens_1.BZZ ? amount.toPLURString() : (0, type_1.asNumberString)(amount, { min: 1n, name: 'amount' });
+        let gasPriceString;
         if (gasPrice) {
-            (0, type_2.assertNonNegativeInteger)(gasPrice);
+            gasPriceString = (0, type_1.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
@@ -1097,12 +1025,13 @@ class Bee {
      * @return string  Hash of the transaction
      */
     async withdrawTokens(amount, gasPrice, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertNonNegativeInteger)(amount);
+        // TODO: check BZZ in tests
+        const amountString = amount instanceof tokens_1.BZZ ? amount.toPLURString() : (0, type_1.asNumberString)(amount, { min: 1n, name: 'amount' });
+        let gasPriceString;
         if (gasPrice) {
-            (0, type_2.assertNonNegativeInteger)(gasPrice);
+            gasPriceString = (0, type_1.asNumberString)(amount, { min: 0n, name: 'gasPrice' });
         }
-        return chequebook.withdrawTokens(this.getRequestOptionsForCall(options), amount, gasPrice);
+        return chequebook.withdrawTokens(this.getRequestOptionsForCall(options), amountString, gasPriceString);
     }
     /*
      * Settlements endpoint
@@ -1113,81 +1042,47 @@ class Bee {
      * @param address  Swarm address of peer
      */
     async getSettlements(address, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertAddress)(address);
+        address = new typed_bytes_1.PeerAddress(address);
         return settlements.getSettlements(this.getRequestOptionsForCall(options), address);
     }
     /**
      * Get settlements with all known peers and total amount sent or received
      */
     async getAllSettlements(options) {
-        (0, type_2.assertRequestOptions)(options);
         return settlements.getAllSettlements(this.getRequestOptionsForCall(options));
     }
     /**
      * Get status of node
      */
     async getStatus(options) {
-        (0, type_2.assertRequestOptions)(options);
         return debugStatus.getDebugStatus(this.getRequestOptionsForCall(options));
     }
     /**
      * Get health of node
      */
     async getHealth(options) {
-        (0, type_2.assertRequestOptions)(options);
         return debugStatus.getHealth(this.getRequestOptionsForCall(options));
     }
     /**
      * Get readiness of node
      */
     async getReadiness(options) {
-        (0, type_2.assertRequestOptions)(options);
         return debugStatus.getReadiness(this.getRequestOptionsForCall(options));
     }
     /**
      * Get mode information of node
      */
     async getNodeInfo(options) {
-        (0, type_2.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) {
-        (0, type_2.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) {
-        (0, type_2.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) {
-        (0, type_2.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.
@@ -1197,7 +1092,6 @@ class Bee {
      * @param options
      */
     async isSupportedApiVersion(options) {
-        (0, type_2.assertRequestOptions)(options);
         return debugStatus.isSupportedApiVersion(this.getRequestOptionsForCall(options));
     }
     /**
@@ -1207,21 +1101,18 @@ class Bee {
      * @param options
      */
     async getVersions(options) {
-        (0, type_2.assertRequestOptions)(options);
         return debugStatus.getVersions(this.getRequestOptionsForCall(options));
     }
     /**
      * Get reserve state
      */
     async getReserveState(options) {
-        (0, type_2.assertRequestOptions)(options);
         return states.getReserveState(this.getRequestOptionsForCall(options));
     }
     /**
      * Get chain state
      */
     async getChainState(options) {
-        (0, type_2.assertRequestOptions)(options);
         return states.getChainState(this.getRequestOptionsForCall(options));
     }
     /**
@@ -1230,7 +1121,6 @@ class Bee {
      * @param options
      */
     async getWalletBalance(options) {
-        (0, type_2.assertRequestOptions)(options);
         return states.getWalletBalance(this.getRequestOptionsForCall(options));
     }
     /**
@@ -1248,48 +1138,101 @@ 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) {
-        (0, type_2.assertPostageBatchOptions)(options);
-        (0, type_2.assertPositiveInteger)(amount);
-        (0, type_2.assertNonNegativeInteger)(depth);
-        (0, type_2.assertRequestOptions)(requestOptions);
-        if (depth < types_1.STAMPS_DEPTH_MIN) {
-            throw new error_1.BeeArgumentError(`Depth has to be at least ${types_1.STAMPS_DEPTH_MIN}`, depth);
+        const amountString = (0, type_1.asNumberString)(amount, { min: 0n, name: 'amount' });
+        if (options) {
+            options = (0, type_1.preparePostageBatchOptions)(options);
         }
-        if (depth > types_1.STAMPS_DEPTH_MAX) {
-            throw new error_1.BeeArgumentError(`Depth has to be at most ${types_1.STAMPS_DEPTH_MAX}`, depth);
+        if (depth < types_1.STAMPS_DEPTH_MIN || depth > types_1.STAMPS_DEPTH_MAX) {
+            throw new error_1.BeeArgumentError(`Depth has to be between ${types_1.STAMPS_DEPTH_MIN}..${types_1.STAMPS_DEPTH_MAX}`, depth);
         }
-        if (parseInt(amount, 10) < types_1.STAMPS_AMOUNT_MIN) {
-            throw new error_1.BeeArgumentError(`Amount has to be at least ${types_1.STAMPS_AMOUNT_MIN} (1 day)`, amount);
+        const chainState = await this.getChainState();
+        const minimumAmount = BigInt(chainState.currentPrice) * 17280n;
+        if (BigInt(amountString) < minimumAmount) {
+            throw new error_1.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 = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice);
+        const depth = (0, stamps_1.getDepthForSize)(size);
+        if (options) {
+            options = (0, type_1.preparePostageBatchOptions)(options);
+        }
+        return this.createPostageBatch(amount, depth, options, requestOptions);
+    }
+    async getStorageCost(size, duration, options) {
+        const chainState = await this.getChainState(options);
+        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice);
+        const depth = (0, stamps_1.getDepthForSize)(size);
+        return (0, stamps_1.getStampCost)(depth, amount);
+    }
+    async extendStorageSize(postageBatchId, size, options) {
+        const batch = await this.getPostageBatch(postageBatchId, options);
+        const depth = (0, stamps_1.getDepthForSize)(size);
+        const delta = depth - batch.depth;
+        if (delta <= 0) {
+            throw new error_1.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 = (0, stamps_1.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 = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice);
+        const depth = (0, stamps_1.getDepthForSize)(size);
+        const currentValue = (0, stamps_1.getStampCost)(batch.depth, batch.amount);
+        const newValue = (0, stamps_1.getStampCost)(depth, amount);
+        return newValue.minus(currentValue);
+    }
+    async getSizeExtensionCost(postageBatchId, size, options) {
+        const batch = await this.getPostageBatch(postageBatchId, options);
+        const depth = (0, stamps_1.getDepthForSize)(size);
+        const delta = depth - batch.depth;
+        if (delta <= 0) {
+            throw new error_1.BeeArgumentError('New depth has to be greater than the original depth', depth);
+        }
+        const currentPaid = (0, stamps_1.getStampCost)(batch.depth, batch.amount);
+        const newPaid = (0, stamps_1.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 = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice);
+        return (0, stamps_1.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) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertNonNegativeInteger)(amount, 'Amount');
-        (0, type_2.assertBatchId)(postageBatchId);
-        await stamps.topUpBatch(this.getRequestOptionsForCall(options), postageBatchId, amount);
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
+        const amountString = (0, type_1.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
@@ -1298,20 +1241,17 @@ 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) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertNonNegativeInteger)(depth, 'Depth');
-        (0, type_2.assertBatchId)(postageBatchId);
-        await stamps.diluteBatch(this.getRequestOptionsForCall(options), postageBatchId, depth);
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
+        depth = cafe_utility_1.Types.asNumber(depth, { name: 'depth', min: 18, max: 255 });
+        return stamps.diluteBatch(this.getRequestOptionsForCall(options), postageBatchId, depth);
     }
     /**
      * Return details for specific postage batch.
@@ -1319,11 +1259,10 @@ 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) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertBatchId)(postageBatchId);
+        postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
         return stamps.getPostageBatch(this.getRequestOptionsForCall(options), postageBatchId);
     }
     /**
@@ -1332,35 +1271,31 @@ 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) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertBatchId)(postageBatchId);
+        postageBatchId = new typed_bytes_1.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) {
-        (0, type_2.assertRequestOptions)(options);
         return stamps.getAllPostageBatches(this.getRequestOptionsForCall(options));
     }
     /**
      * Return all globally available postage batches.
      */
     async getAllGlobalPostageBatch(options) {
-        (0, type_2.assertRequestOptions)(options);
         return stamps.getGlobalPostageBatches(this.getRequestOptionsForCall(options));
     }
     /**
      * Return lists of all current pending transactions that the Bee made
      */
     async getAllPendingTransactions(options) {
-        (0, type_2.assertRequestOptions)(options);
         return transactions.getAllTransactions(this.getRequestOptionsForCall(options));
     }
     /**
@@ -1368,8 +1303,7 @@ class Bee {
      * @param transactionHash
      */
     async getPendingTransaction(transactionHash, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertTransactionHash)(transactionHash);
+        transactionHash = new typed_bytes_1.TransactionId(transactionHash);
         return transactions.getTransaction(this.getRequestOptionsForCall(options), transactionHash);
     }
     /**
@@ -1379,8 +1313,7 @@ class Bee {
      * @param transactionHash
      */
     async rebroadcastPendingTransaction(transactionHash, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertTransactionHash)(transactionHash);
+        transactionHash = new typed_bytes_1.TransactionId(transactionHash);
         return transactions.rebroadcastTransaction(this.getRequestOptionsForCall(options), transactionHash);
     }
     /**
@@ -1389,12 +1322,12 @@ class Bee {
      * @param gasPrice
      */
     async cancelPendingTransaction(transactionHash, gasPrice, options) {
-        (0, type_2.assertRequestOptions)(options);
-        (0, type_2.assertTransactionHash)(transactionHash);
+        transactionHash = new typed_bytes_1.TransactionId(transactionHash);
+        let gasPriceString;
         if (gasPrice) {
-            (0, type_2.assertNonNegativeInteger)(gasPrice);
+            gasPriceString = (0, type_1.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.
@@ -1402,7 +1335,6 @@ class Bee {
      * @param options
      */
     async getStake(options) {
-        (0, type_2.assertRequestOptions)(options);
         return stake.getStake(this.getRequestOptionsForCall(options));
     }
     /**
@@ -1414,9 +1346,11 @@ class Bee {
      * @param options
      */
     async depositStake(amount, options, requestOptions) {
-        (0, type_2.assertTransactionOptions)(options);
-        (0, type_2.assertRequestOptions)(requestOptions);
-        await stake.stake(this.getRequestOptionsForCall(requestOptions), amount, options);
+        const amountString = amount instanceof tokens_1.BZZ ? amount.toPLURString() : (0, type_1.asNumberString)(amount, { min: 1n, name: 'amount' });
+        if (options) {
+            options = (0, type_1.prepareTransactionOptions)(options);
+        }
+        return stake.stake(this.getRequestOptionsForCall(requestOptions), amountString, options);
     }
     /**
      * Get current status of node in redistribution game
@@ -1424,7 +1358,6 @@ class Bee {
      * @param options
      */
     async getRedistributionState(options) {
-        (0, type_2.assertRequestOptions)(options);
         return stake.getRedistributionState(this.getRequestOptionsForCall(options));
     }
     async waitForUsablePostageStamp(id, timeout = 240000) {
@@ -1436,26 +1369,17 @@ class Bee {
                     return;
                 }
             }
-            catch (error) { }
+            catch (error) {
+                // ignore error
+            }
             await cafe_utility_1.System.sleepMillis(TIME_STEP);
         }
         throw new error_1.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 (0, signer_1.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 = (0, type_1.prepareBeeRequestOptions)(options);
+        }
         return options ? cafe_utility_1.Objects.deepMerge2(this.requestOptions, options) : this.requestOptions;
     }
 }