@ethersphere/bee-js 13.0.0-upcoming.gcfb9756 → 13.0.0

package/dist/cjs/types/schema/connectivity.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetTopologyResponse = exports.GetBlocklistResponse = exports.GetPeersResponse = exports.GetNodeAddressesResponse = void 0;
+const core_sdk_1 = require("@ethersphere/core-sdk");
 const zod_1 = require("zod");
-const typed_bytes_1 = require("../../utils/typed-bytes");
 const PeerSchema = zod_1.z.object({
     address: zod_1.z.string(),
     fullNode: zod_1.z.boolean(),
@@ -21,11 +21,11 @@ const BinSchema = zod_1.z.object({
 });
 const BinRecord = zod_1.z.record(zod_1.z.string(), BinSchema);
 exports.GetNodeAddressesResponse = zod_1.z.object({
-    overlay: zod_1.z.string().transform(s => new typed_bytes_1.PeerAddress(s)),
+    overlay: zod_1.z.string().transform(s => new core_sdk_1.PeerAddress(s)),
     underlay: zod_1.z.array(zod_1.z.string()),
-    ethereum: zod_1.z.string().transform(s => new typed_bytes_1.EthAddress(s)),
-    publicKey: zod_1.z.string().transform(s => new typed_bytes_1.PublicKey(s)),
-    pssPublicKey: zod_1.z.string().transform(s => new typed_bytes_1.PublicKey(s)),
+    ethereum: zod_1.z.string().transform(s => new core_sdk_1.EthAddress(s)),
+    publicKey: zod_1.z.string().transform(s => new core_sdk_1.PublicKey(s)),
+    pssPublicKey: zod_1.z.string().transform(s => new core_sdk_1.PublicKey(s)),
 });
 exports.GetPeersResponse = zod_1.z.object({
     peers: zod_1.z.array(PeerSchema),

package/dist/cjs/types/schema/envelope.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostEnvelopeBodyResponse = void 0;
-const cafe_utility_1 = require("cafe-utility");
 const zod_1 = require("zod");
+const core_sdk_1 = require("@ethersphere/core-sdk");
 exports.PostEnvelopeBodyResponse = zod_1.z.object({
-    issuer: zod_1.z.string().transform(s => cafe_utility_1.Binary.hexToUint8Array(s)),
-    index: zod_1.z.string().transform(s => cafe_utility_1.Binary.hexToUint8Array(s)),
-    timestamp: zod_1.z.string().transform(s => cafe_utility_1.Binary.hexToUint8Array(s)),
-    signature: zod_1.z.string().transform(s => cafe_utility_1.Binary.hexToUint8Array(s)),
+    issuer: zod_1.z.string().transform(s => (0, core_sdk_1.hexToUint8Array)(s)),
+    index: zod_1.z.string().transform(s => (0, core_sdk_1.hexToUint8Array)(s)),
+    timestamp: zod_1.z.string().transform(s => (0, core_sdk_1.hexToUint8Array)(s)),
+    signature: zod_1.z.string().transform(s => (0, core_sdk_1.hexToUint8Array)(s)),
 });

package/dist/cjs/types/schema/grantee.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GranteesResultBodyResponse = exports.GetGranteesBodyResponse = void 0;
+const core_sdk_1 = require("@ethersphere/core-sdk");
 const zod_1 = require("zod");
-const typed_bytes_1 = require("../../utils/typed-bytes");
-exports.GetGranteesBodyResponse = zod_1.z.array(zod_1.z.string().transform(s => new typed_bytes_1.PublicKey(s)));
+exports.GetGranteesBodyResponse = zod_1.z.array(zod_1.z.string().transform(s => new core_sdk_1.PublicKey(s)));
 exports.GranteesResultBodyResponse = zod_1.z.object({
-    ref: zod_1.z.string().transform(s => new typed_bytes_1.Reference(s)),
-    historyref: zod_1.z.string().transform(s => new typed_bytes_1.Reference(s)),
+    ref: zod_1.z.string().transform(s => new core_sdk_1.Reference(s)),
+    historyref: zod_1.z.string().transform(s => new core_sdk_1.Reference(s)),
 });

package/dist/cjs/types/schema/stake.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetRedistributionStateResponse = exports.TxHashResponse = exports.GetWithdrawableStakeResponse = exports.GetStakeResponse = void 0;
+const core_sdk_1 = require("@ethersphere/core-sdk");
 const zod_1 = require("zod");
 const tokens_1 = require("../../utils/tokens");
 const type_1 = require("../../utils/type");
-const typed_bytes_1 = require("../../utils/typed-bytes");
 exports.GetStakeResponse = zod_1.z.object({
     stakedAmount: zod_1.z.string().transform(s => tokens_1.BZZ.fromPLUR((0, type_1.asNumberString)(s, { name: 'stakedAmount' }))),
 });
@@ -12,7 +12,7 @@ exports.GetWithdrawableStakeResponse = zod_1.z.object({
     withdrawableAmount: zod_1.z.string().transform(s => tokens_1.BZZ.fromPLUR((0, type_1.asNumberString)(s, { name: 'withdrawableAmount' }))),
 });
 exports.TxHashResponse = zod_1.z.object({
-    txHash: zod_1.z.string().transform(s => new typed_bytes_1.TransactionId(s)),
+    txHash: zod_1.z.string().transform(s => new core_sdk_1.TransactionId(s)),
 });
 exports.GetRedistributionStateResponse = zod_1.z.object({
     minimumGasFunds: zod_1.z.string().transform(s => tokens_1.DAI.fromWei((0, type_1.asNumberString)(s, { name: 'minimumGasFunds' }))),

package/dist/cjs/types/schema/stamps.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BatchIdResponse = exports.GetPostageBatchBucketsResponse = exports.GetPostageBatchResponse = exports.GetAllPostageBatchesResponse = exports.GetGlobalPostageBatchesResponse = exports.GetGlobalPostageBatchResponse = exports.RawPostageBatchSchema = void 0;
+const core_sdk_1 = require("@ethersphere/core-sdk");
 const zod_1 = require("zod");
 const type_1 = require("../../utils/type");
-const typed_bytes_1 = require("../../utils/typed-bytes");
 exports.RawPostageBatchSchema = zod_1.z.object({
     batchID: zod_1.z.string(),
     utilization: zod_1.z.number(),
@@ -18,12 +18,12 @@ exports.RawPostageBatchSchema = zod_1.z.object({
     batchTTL: zod_1.z.number(),
 });
 exports.GetGlobalPostageBatchResponse = zod_1.z.object({
-    batchID: zod_1.z.string().transform(s => new typed_bytes_1.BatchId(s)),
+    batchID: zod_1.z.string().transform(s => new core_sdk_1.BatchId(s)),
     batchTTL: zod_1.z.number(),
     bucketDepth: zod_1.z.number(),
     depth: zod_1.z.number(),
     immutable: zod_1.z.boolean(),
-    owner: zod_1.z.string().transform(s => new typed_bytes_1.EthAddress(s)),
+    owner: zod_1.z.string().transform(s => new core_sdk_1.EthAddress(s)),
     start: zod_1.z.number(),
     value: zod_1.z.string().transform(s => (0, type_1.asNumberString)(s, { name: 'value' })),
 });
@@ -44,5 +44,5 @@ exports.GetPostageBatchBucketsResponse = zod_1.z.object({
     })),
 });
 exports.BatchIdResponse = zod_1.z.object({
-    batchID: zod_1.z.string().transform(s => new typed_bytes_1.BatchId(s)),
+    batchID: zod_1.z.string().transform(s => new core_sdk_1.BatchId(s)),
 });

package/dist/cjs/types/schema/states.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WithdrawResponse = exports.GetWalletBalanceResponse = exports.GetChainStateResponse = exports.GetReserveStateResponse = void 0;
+const core_sdk_1 = require("@ethersphere/core-sdk");
 const zod_1 = require("zod");
 const tokens_1 = require("../../utils/tokens");
 const type_1 = require("../../utils/type");
-const typed_bytes_1 = require("../../utils/typed-bytes");
 const workaround_1 = require("../../utils/workaround");
 exports.GetReserveStateResponse = zod_1.z.object({
     commitment: zod_1.z.number(),
@@ -30,5 +30,5 @@ exports.GetWalletBalanceResponse = zod_1.z.object({
     walletAddress: zod_1.z.string(),
 });
 exports.WithdrawResponse = zod_1.z.object({
-    transactionHash: zod_1.z.string().transform(s => new typed_bytes_1.TransactionId(s)),
+    transactionHash: zod_1.z.string().transform(s => new core_sdk_1.TransactionId(s)),
 });

package/dist/cjs/types/schema/transactions.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionHashResponse = exports.GetTransactionResponse = exports.GetAllTransactionsResponse = void 0;
+const core_sdk_1 = require("@ethersphere/core-sdk");
 const zod_1 = require("zod");
 const type_1 = require("../../utils/type");
-const typed_bytes_1 = require("../../utils/typed-bytes");
 const TransactionInfoSchema = zod_1.z.object({
-    transactionHash: zod_1.z.string().transform(s => new typed_bytes_1.TransactionId(s)),
+    transactionHash: zod_1.z.string().transform(s => new core_sdk_1.TransactionId(s)),
     to: zod_1.z.string(),
     nonce: zod_1.z.number(),
     gasPrice: zod_1.z.string().transform(s => (0, type_1.asNumberString)(s, { name: 'gasPrice' })),
@@ -20,5 +20,5 @@ exports.GetAllTransactionsResponse = zod_1.z.object({
 });
 exports.GetTransactionResponse = TransactionInfoSchema;
 exports.TransactionHashResponse = zod_1.z.object({
-    transactionHash: zod_1.z.string().transform(s => new typed_bytes_1.TransactionId(s)),
+    transactionHash: zod_1.z.string().transform(s => new core_sdk_1.TransactionId(s)),
 });

package/dist/cjs/types/schema/upload.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UploadResultBody = void 0;
+const core_sdk_1 = require("@ethersphere/core-sdk");
 const zod_1 = require("zod");
-const typed_bytes_1 = require("../../utils/typed-bytes");
 exports.UploadResultBody = zod_1.z.object({
-    reference: zod_1.z.string().transform(s => new typed_bytes_1.Reference(s)),
+    reference: zod_1.z.string().transform(s => new core_sdk_1.Reference(s)),
 });

package/dist/cjs/utils/chunk-stream.browser.js

@@ -9,7 +9,7 @@ const manifest_1 = require("../manifest/manifest");
 const chunk_size_1 = require("./chunk-size");
 const collection_1 = require("./collection");
 const mime_1 = require("./mime");
-const typed_bytes_1 = require("./typed-bytes");
+const core_sdk_1 = require("@ethersphere/core-sdk");
 async function hashDirectory(_dir) {
     throw new Error('Hashing directories is not supported in browsers!');
 }
@@ -27,23 +27,27 @@ async function streamFiles(bee, files, postageBatchId, onUploadProgress, options
     for (const file of files) {
         total += (0, chunk_size_1.totalChunks)(file.size);
     }
-    postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
-    async function onChunk(chunk) {
-        await queue.enqueue(async () => {
+    postageBatchId = new core_sdk_1.BatchId(postageBatchId);
+    async function uploadAndTrack(chunk) {
+        if (signal?.aborted) {
+            return;
+        }
+        try {
+            await bee.chunk.upload(postageBatchId, chunk.build(), options, requestOptions);
+            onUploadProgress?.({ total, processed: ++processed });
+        }
+        catch (err) {
             if (signal?.aborted) {
                 return;
             }
-            try {
-                await bee.chunk.upload(postageBatchId, chunk.build(), options, requestOptions);
-                onUploadProgress?.({ total, processed: ++processed });
-            }
-            catch (err) {
-                if (signal?.aborted) {
-                    return;
-                }
-                throw err;
-            }
-        });
+            throw err;
+        }
+    }
+    async function onBatch(batch) {
+        for (const { chunk } of batch) {
+            await queue.enqueue(async () => uploadAndTrack(chunk));
+        }
+        return [];
     }
     const mantaray = new manifest_1.MantarayNode();
     for (const file of files) {
@@ -51,7 +55,7 @@ async function streamFiles(bee, files, postageBatchId, onUploadProgress, options
             throw new Error('Request aborted');
         }
         const rootChunk = await new Promise((resolve, reject) => {
-            const tree = new cafe_utility_1.MerkleTree(onChunk);
+            const tree = new core_sdk_1.ChunkSplitter(onBatch);
             let offset = 0;
             const reader = new FileReader();
             reader.onerror = () => {
@@ -63,7 +67,11 @@ async function streamFiles(bee, files, postageBatchId, onUploadProgress, options
                     return;
                 }
                 if (offset >= file.size) {
+                    // ChunkSplitter's onBatch only sees chunks once they're referenced
+                    // by a parent - the root chunk returned by finalize() is never
+                    // passed to it, so it has to be uploaded here explicitly.
                     const rootChunk = await tree.finalize();
+                    await queue.enqueue(async () => uploadAndTrack(rootChunk));
                     resolve(rootChunk);
                     return;
                 }

package/dist/cjs/utils/chunk-stream.js

@@ -10,12 +10,12 @@ const manifest_1 = require("../manifest/manifest");
 const chunk_size_1 = require("./chunk-size");
 const collection_node_1 = require("./collection.node");
 const mime_1 = require("./mime");
-const typed_bytes_1 = require("./typed-bytes");
+const core_sdk_1 = require("@ethersphere/core-sdk");
 async function hashDirectory(dir) {
     const files = await (0, collection_node_1.makeCollectionFromFS)(dir);
     const mantaray = new manifest_1.MantarayNode();
     for (const file of files) {
-        const tree = new cafe_utility_1.MerkleTree(cafe_utility_1.MerkleTree.NOOP);
+        const tree = new core_sdk_1.ChunkSplitter(core_sdk_1.ChunkSplitter.NOOP);
         if (!file.fsPath) {
             throw Error('File does not have fsPath, which should never happen in node. Please report this issue.');
         }
@@ -36,17 +36,21 @@ async function streamDirectory(bee, dir, postageBatchId, onUploadProgress, optio
     const queue = new cafe_utility_1.AsyncQueue(64, 64);
     let total = 0;
     let processed = 0;
-    postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
+    postageBatchId = new core_sdk_1.BatchId(postageBatchId);
     const files = await (0, collection_node_1.makeCollectionFromFS)(dir);
     for (const file of files) {
         total += (0, chunk_size_1.totalChunks)(file.size);
     }
     let hasIndexHtml = false;
-    async function onChunk(chunk) {
-        await queue.enqueue(async () => {
-            await bee.chunk.upload(postageBatchId, chunk.build(), options, requestOptions);
-            onUploadProgress?.({ total, processed: ++processed });
-        });
+    async function uploadAndTrack(chunk) {
+        await bee.chunk.upload(postageBatchId, chunk.build(), options, requestOptions);
+        onUploadProgress?.({ total, processed: ++processed });
+    }
+    async function onBatch(batch) {
+        for (const { chunk } of batch) {
+            await queue.enqueue(async () => uploadAndTrack(chunk));
+        }
+        return [];
     }
     const mantaray = new manifest_1.MantarayNode();
     for (const file of files) {
@@ -54,11 +58,15 @@ async function streamDirectory(bee, dir, postageBatchId, onUploadProgress, optio
             throw Error('File does not have fsPath, which should never happen in node. Please report this issue.');
         }
         const readStream = (0, fs_1.createReadStream)(file.fsPath);
-        const tree = new cafe_utility_1.MerkleTree(onChunk);
+        const tree = new core_sdk_1.ChunkSplitter(onBatch);
         for await (const data of readStream) {
             await tree.append(data);
         }
+        // ChunkSplitter's onBatch only sees chunks once they're referenced by a
+        // parent - the root chunk returned by finalize() is never passed to it,
+        // so it has to be uploaded here explicitly.
         const rootChunk = await tree.finalize();
+        await queue.enqueue(async () => uploadAndTrack(rootChunk));
         await queue.drain();
         const { filename, extension } = cafe_utility_1.Strings.parseFilename(file.path);
         mantaray.addFork(file.path, rootChunk.hash(), {

package/dist/cjs/utils/constants.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NULL_OWNER = exports.NULL_IDENTIFIER = exports.NULL_ADDRESS = exports.NULL_TOPIC = exports.NULL_STAMP = exports.SWARM_GATEWAY_URL = void 0;
-const typed_bytes_1 = require("./typed-bytes");
+const core_sdk_1 = require("@ethersphere/core-sdk");
 exports.SWARM_GATEWAY_URL = 'https://api.gateway.ethswarm.org';
-exports.NULL_STAMP = new typed_bytes_1.BatchId('0000000000000000000000000000000000000000000000000000000000000000');
-exports.NULL_TOPIC = new typed_bytes_1.Topic('0000000000000000000000000000000000000000000000000000000000000000');
+exports.NULL_STAMP = new core_sdk_1.BatchId('0000000000000000000000000000000000000000000000000000000000000000');
+exports.NULL_TOPIC = new core_sdk_1.Topic('0000000000000000000000000000000000000000000000000000000000000000');
 exports.NULL_ADDRESS = new Uint8Array(32);
 exports.NULL_IDENTIFIER = new Uint8Array(32);
 exports.NULL_OWNER = new Uint8Array(20);

package/dist/cjs/utils/expose.js

@@ -8,10 +8,10 @@ var collection_node_1 = require("./collection.node");
 Object.defineProperty(exports, "getFolderSize", { enumerable: true, get: function () { return collection_node_1.getFolderSize; } });
 var pss_1 = require("./pss");
 Object.defineProperty(exports, "makeMaxTarget", { enumerable: true, get: function () { return pss_1.makeMaxTarget; } });
-var redundancy_1 = require("./redundancy");
-Object.defineProperty(exports, "approximateOverheadForRedundancyLevel", { enumerable: true, get: function () { return redundancy_1.approximateOverheadForRedundancyLevel; } });
-Object.defineProperty(exports, "getRedundancyStat", { enumerable: true, get: function () { return redundancy_1.getRedundancyStat; } });
-Object.defineProperty(exports, "getRedundancyStats", { enumerable: true, get: function () { return redundancy_1.getRedundancyStats; } });
+var core_sdk_1 = require("@ethersphere/core-sdk");
+Object.defineProperty(exports, "approximateOverheadForRedundancyLevel", { enumerable: true, get: function () { return core_sdk_1.approximateOverheadForRedundancyLevel; } });
+Object.defineProperty(exports, "getRedundancyStat", { enumerable: true, get: function () { return core_sdk_1.getRedundancyStat; } });
+Object.defineProperty(exports, "getRedundancyStats", { enumerable: true, get: function () { return core_sdk_1.getRedundancyStats; } });
 var stamps_1 = require("./stamps");
 Object.defineProperty(exports, "convertEnvelopeToMarshaledStamp", { enumerable: true, get: function () { return stamps_1.convertEnvelopeToMarshaledStamp; } });
 Object.defineProperty(exports, "getAmountForDuration", { enumerable: true, get: function () { return stamps_1.getAmountForDuration; } });

package/dist/cjs/utils/headers.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readFileHeaders = readFileHeaders;
 exports.prepareRequestHeaders = prepareRequestHeaders;
+const core_sdk_1 = require("@ethersphere/core-sdk");
 const zod_1 = require("zod");
 const error_1 = require("./error");
 const stamps_1 = require("./stamps");
-const typed_bytes_1 = require("./typed-bytes");
 function readFileHeaders(headers) {
     const name = readContentDispositionFilename(headers['content-disposition']);
     const tagUid = readTagUid(headers['swarm-tag-uid']);
@@ -40,7 +40,7 @@ function prepareRequestHeaders(stamp, nullableOptions) {
         headers['swarm-postage-stamp'] = (0, stamps_1.convertEnvelopeToMarshaledStamp)(stamp).toHex();
     }
     else if (stamp) {
-        stamp = new typed_bytes_1.BatchId(stamp);
+        stamp = new core_sdk_1.BatchId(stamp);
         headers['swarm-postage-batch-id'] = stamp.toHex();
     }
     if (!nullableOptions) {
@@ -92,10 +92,10 @@ function prepareRequestHeaders(stamp, nullableOptions) {
         headers['swarm-error-document'] = String(options.errorDocument);
     }
     if (options.actPublisher) {
-        headers['swarm-act-publisher'] = new typed_bytes_1.PublicKey(options.actPublisher).toCompressedHex();
+        headers['swarm-act-publisher'] = new core_sdk_1.PublicKey(options.actPublisher).toCompressedHex();
     }
     if (options.actHistoryAddress) {
-        headers['swarm-act-history-address'] = new typed_bytes_1.Reference(options.actHistoryAddress).toHex();
+        headers['swarm-act-history-address'] = new core_sdk_1.Reference(options.actHistoryAddress).toHex();
     }
     if (options.actTimestamp) {
         headers['swarm-act-timestamp'] = String(options.actTimestamp);

package/dist/cjs/utils/http.js

@@ -25,7 +25,9 @@ exports.DEFAULT_HTTP_CONFIG = {
  * @param config Internal settings and/or Bee settings
  */
 async function http(options, config) {
-    const requestConfig = cafe_utility_1.Objects.deepMerge3(exports.DEFAULT_HTTP_CONFIG, config, options);
+    const rawData = config.data;
+    const requestConfig = cafe_utility_1.Objects.deepMerge3(exports.DEFAULT_HTTP_CONFIG, { ...config, data: undefined }, options);
+    requestConfig.data = rawData;
     if (options.signal) {
         requestConfig.signal = options.signal;
     }

package/dist/cjs/utils/pss.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMaxTarget = makeMaxTarget;
+const core_sdk_1 = require("@ethersphere/core-sdk");
 const types_1 = require("../types");
-const typed_bytes_1 = require("./typed-bytes");
 /**
  * Utility function that for given strings/reference takes the most specific
  * target that Bee node will except.
@@ -11,6 +11,6 @@ const typed_bytes_1 = require("./typed-bytes");
  * @see [Bee docs - PSS](https://docs.ethswarm.org/docs/develop/tools-and-features/pss)
  */
 function makeMaxTarget(target) {
-    target = new typed_bytes_1.PeerAddress(target);
+    target = new core_sdk_1.PeerAddress(target);
     return target.toHex().slice(0, types_1.PSS_TARGET_HEX_LENGTH_MAX);
 }

package/dist/cjs/utils/resource-locator.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResourceLocator = void 0;
+const core_sdk_1 = require("@ethersphere/core-sdk");
 const zod_1 = require("zod");
-const typed_bytes_1 = require("./typed-bytes");
 class ResourceLocator {
     constructor(raw) {
         this.raw = raw;
@@ -12,7 +12,7 @@ class ResourceLocator {
         if (asString.success && asString.data.includes('.eth')) {
             return asString.data;
         }
-        return new typed_bytes_1.Reference(this.raw).toHex();
+        return new core_sdk_1.Reference(this.raw).toHex();
     }
 }
 exports.ResourceLocator = ResourceLocator;

package/dist/cjs/utils/schema.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AllTagsOptionsSchema = exports.TransactionOptionsSchema = exports.PostageBatchOptionsSchema = exports.GsocMessageHandlerSchema = exports.PssMessageHandlerSchema = exports.TagUidSchema = exports.TagInputSchema = exports.CollectionUploadOptionsSchema = exports.FileUploadOptionsSchema = exports.RedundantUploadOptionsSchema = exports.UploadOptionsSchema = exports.DownloadOptionsSchema = exports.BeeRequestOptionsSchema = exports.HexStringSchema = void 0;
+const core_sdk_1 = require("@ethersphere/core-sdk");
 const zod_1 = require("zod");
 const types_1 = require("../types");
-const typed_bytes_1 = require("./typed-bytes");
 var hex_schema_1 = require("./hex-schema");
 Object.defineProperty(exports, "HexStringSchema", { enumerable: true, get: function () { return hex_schema_1.HexStringSchema; } });
 const fnField = zod_1.z.any().refine(v => zod_1.z.function().safeParse(v).success, 'expected a function');
@@ -34,13 +34,13 @@ exports.DownloadOptionsSchema = zod_1.z.object({
     redundancyStrategy: zod_1.z.number().int().optional(),
     fallback: zod_1.z.boolean().optional(),
     timeoutMs: zod_1.z.number().int().min(0).optional(),
-    actPublisher: zod_1.z.optional(zod_1.z.any().transform((v) => new typed_bytes_1.PublicKey(v))),
-    actHistoryAddress: zod_1.z.optional(zod_1.z.any().transform((v) => new typed_bytes_1.Reference(v))),
+    actPublisher: zod_1.z.optional(zod_1.z.any().transform((v) => new core_sdk_1.PublicKey(v))),
+    actHistoryAddress: zod_1.z.optional(zod_1.z.any().transform((v) => new core_sdk_1.Reference(v))),
     actTimestamp: zod_1.z.coerce.number().optional(),
 });
 exports.UploadOptionsSchema = zod_1.z.object({
     act: zod_1.z.boolean().optional(),
-    actHistoryAddress: zod_1.z.optional(zod_1.z.any().transform((v) => new typed_bytes_1.Reference(v))),
+    actHistoryAddress: zod_1.z.optional(zod_1.z.any().transform((v) => new core_sdk_1.Reference(v))),
     deferred: zod_1.z.boolean().optional(),
     encrypt: zod_1.z.boolean().optional(),
     pin: zod_1.z.boolean().optional(),

package/dist/cjs/utils/stamps.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStampUsage = getStampUsage;
-exports.getStampTheoreticalBytes = getStampTheoreticalBytes;
-exports.getStampEffectiveBytes = getStampEffectiveBytes;
-exports.getStampEffectiveBytesBreakpoints = getStampEffectiveBytesBreakpoints;
+exports.getStampUsage = exports.getStampTheoreticalBytes = exports.getStampEffectiveBytesBreakpoints = exports.getStampEffectiveBytes = void 0;
 exports.getStampCost = getStampCost;
 exports.getStampDuration = getStampDuration;
 exports.getAmountForDuration = getAmountForDuration;
@@ -12,99 +9,16 @@ exports.convertEnvelopeToMarshaledStamp = convertEnvelopeToMarshaledStamp;
 exports.marshalStamp = marshalStamp;
 exports.mapPostageBatch = mapPostageBatch;
 exports.unmapPostageBatch = unmapPostageBatch;
-const cafe_utility_1 = require("cafe-utility");
-const types_1 = require("../types");
-const bytes_1 = require("./bytes");
 const duration_1 = require("./duration");
 const size_1 = require("./size");
 const tokens_1 = require("./tokens");
 const type_1 = require("./type");
-const typed_bytes_1 = require("./typed-bytes");
 const workaround_1 = require("./workaround");
-const MAX_UTILIZATION = 0.9;
-/**
- * Utility function that calculates usage of postage batch based on its utilization, depth and bucket depth.
- *
- * For smaller depths (up to 20), this may provide less accurate results.
- *
- * @returns {number} A number between 0 and 1 representing the usage of the postage batch.
- */
-function getStampUsage(utilization, depth, bucketDepth) {
-    return utilization / Math.pow(2, depth - bucketDepth);
-}
-/**
- * Utility function that calculates the theoritical maximum size of a postage batch based on its depth.
- *
- * For smaller depths (up to 22), this may provide less accurate results.
- *
- * @returns {number} The maximum theoretical size of the postage batch in bytes.
- */
-function getStampTheoreticalBytes(depth) {
-    return 4096 * 2 ** depth;
-}
-/**
- * Based on https://docs.ethswarm.org/docs/learn/technology/contracts/postage-stamp/#effective-utilisation-table
- * Optimised for encrypted, medium erasure coding
- */
-const effectiveSizeBreakpoints = [
-    [17, 0.00004089],
-    [18, 0.00609],
-    [19, 0.10249],
-    [20, 0.62891],
-    [21, 2.38],
-    [22, 7.07],
-    [23, 18.24],
-    [24, 43.04],
-    [25, 96.5],
-    [26, 208.52],
-    [27, 435.98],
-    [28, 908.81],
-    [29, 1870],
-    [30, 3810],
-    [31, 7730],
-    [32, 15610],
-    [33, 31430],
-    [34, 63150],
-];
-/**
- * Utility function that calculates the effective size of a postage batch based on its depth.
- *
- * Below 22 depth the effective size is 0
- * Above 34 it's always > 99%
- *
- * @returns {number} The effective size of the postage batch in bytes.
- */
-function getStampEffectiveBytes(depth, encryption, erasureCodeLevel) {
-    if (depth < 17) {
-        return 0;
-    }
-    if (encryption !== undefined && erasureCodeLevel !== undefined) {
-        const encryptionKey = encryption ? 'ENCRYPTION_ON' : 'ENCRYPTION_OFF';
-        const breakpoints = types_1.capacityBreakpoints[encryptionKey][erasureCodeLevel];
-        const entry = breakpoints.find(item => item.batchDepth === depth);
-        if (entry?.effectiveVolume) {
-            return (0, bytes_1.parseSizeToBytes)(entry.effectiveVolume);
-        }
-    }
-    else {
-        const breakpoint = effectiveSizeBreakpoints.find(([d, size]) => {
-            if (depth === d) {
-                return size;
-            }
-        });
-        if (breakpoint) {
-            return breakpoint[1] * 1000 * 1000 * 1000;
-        }
-    }
-    return Math.ceil(getStampTheoreticalBytes(depth) * MAX_UTILIZATION);
-}
-function getStampEffectiveBytesBreakpoints(encryption, erasureCodeLevel) {
-    const map = new Map();
-    for (let i = 17; i < 35; i++) {
-        map.set(i, getStampEffectiveBytes(i, encryption, erasureCodeLevel));
-    }
-    return map;
-}
+const core_sdk_1 = require("@ethersphere/core-sdk");
+Object.defineProperty(exports, "getStampEffectiveBytes", { enumerable: true, get: function () { return core_sdk_1.getStampEffectiveBytes; } });
+Object.defineProperty(exports, "getStampEffectiveBytesBreakpoints", { enumerable: true, get: function () { return core_sdk_1.getStampEffectiveBytesBreakpoints; } });
+Object.defineProperty(exports, "getStampTheoreticalBytes", { enumerable: true, get: function () { return core_sdk_1.getStampTheoreticalBytes; } });
+Object.defineProperty(exports, "getStampUsage", { enumerable: true, get: function () { return core_sdk_1.getStampUsage; } });
 /**
  * Utility function that calculates the cost of a postage batch based on its depth and amount.
  */
@@ -139,50 +53,21 @@ function getAmountForDuration(duration, pricePerBlock, blockTime) {
  * @returns
  */
 function getDepthForSize(size, encryption, erasureCodeLevel) {
-    if (encryption !== undefined && erasureCodeLevel !== undefined) {
-        const encryptionKey = encryption ? 'ENCRYPTION_ON' : 'ENCRYPTION_OFF';
-        const breakpoints = types_1.capacityBreakpoints[encryptionKey][erasureCodeLevel];
-        const entry = breakpoints.find(item => {
-            return size.toBytes() <= (0, bytes_1.parseSizeToBytes)(item.effectiveVolume);
-        });
-        if (entry?.effectiveVolume) {
-            return entry.batchDepth;
-        }
-    }
-    else {
-        for (const [depth, sizeBreakpoint] of effectiveSizeBreakpoints) {
-            if (size.toBytes() <= sizeBreakpoint * 1000 * 1000 * 1000) {
-                return depth;
-            }
-        }
-    }
-    return 35;
+    return (0, core_sdk_1.getDepthForSize)(size.toBytes(), encryption, erasureCodeLevel);
 }
 function convertEnvelopeToMarshaledStamp(envelope) {
-    return marshalStamp(envelope.signature, envelope.batchId.toUint8Array(), envelope.timestamp, envelope.index);
+    return (0, core_sdk_1.convertEnvelopeToMarshaledStamp)(envelope);
 }
 function marshalStamp(signature, batchId, timestamp, index) {
-    if (signature.length !== 65) {
-        throw Error('invalid signature length');
-    }
-    if (batchId.length !== 32) {
-        throw Error('invalid batch ID length');
-    }
-    if (timestamp.length !== 8) {
-        throw Error('invalid timestamp length');
-    }
-    if (index.length !== 8) {
-        throw Error('invalid index length');
-    }
-    return new bytes_1.Bytes(cafe_utility_1.Binary.concatBytes(batchId, index, timestamp, signature));
+    return (0, core_sdk_1.marshalStamp)(signature, batchId, timestamp, index);
 }
 function mapPostageBatch(raw, encryption, erasureCodeLevel) {
     const batchTTL = (0, workaround_1.normalizeBatchTTL)(raw.batchTTL);
     const duration = duration_1.Duration.fromSeconds(batchTTL);
-    const effectiveBytes = getStampEffectiveBytes(raw.depth, encryption, erasureCodeLevel);
-    const usage = raw.utilizationRatio ?? getStampUsage(raw.utilization, raw.depth, raw.bucketDepth);
+    const effectiveBytes = (0, core_sdk_1.getStampEffectiveBytes)(raw.depth, encryption, erasureCodeLevel);
+    const usage = raw.utilizationRatio ?? (0, core_sdk_1.getStampUsage)(raw.utilization, raw.depth, raw.bucketDepth);
     return {
-        batchID: new typed_bytes_1.BatchId(raw.batchID),
+        batchID: new core_sdk_1.BatchId(raw.batchID),
         utilization: raw.utilization,
         usable: raw.usable,
         label: raw.label,
@@ -195,14 +80,14 @@ function mapPostageBatch(raw, encryption, erasureCodeLevel) {
         usageText: `${Math.round(usage * 100)}%`,
         size: size_1.Size.fromBytes(effectiveBytes),
         remainingSize: size_1.Size.fromBytes(Math.ceil(effectiveBytes * (1 - usage))),
-        theoreticalSize: size_1.Size.fromBytes(getStampTheoreticalBytes(raw.depth)),
+        theoreticalSize: size_1.Size.fromBytes((0, core_sdk_1.getStampTheoreticalBytes)(raw.depth)),
         duration,
         calculateSize(encryption, redundancyLevel) {
-            const effectiveBytes = getStampEffectiveBytes(raw.depth, encryption, redundancyLevel);
+            const effectiveBytes = (0, core_sdk_1.getStampEffectiveBytes)(raw.depth, encryption, redundancyLevel);
             return size_1.Size.fromBytes(effectiveBytes);
         },
         calculateRemainingSize(encryption, redundancyLevel) {
-            const effectiveBytes = getStampEffectiveBytes(raw.depth, encryption, redundancyLevel);
+            const effectiveBytes = (0, core_sdk_1.getStampEffectiveBytes)(raw.depth, encryption, redundancyLevel);
             return size_1.Size.fromBytes(Math.ceil(effectiveBytes * (1 - this.usage)));
         },
     };