@ethersphere/bee-js 10.1.0 → 10.1.2

package/dist/mjs/bee.js

@@ -1608,7 +1608,7 @@ export class Bee {
     const depth = getDepthForSize(size, encryption, erasureCodeLevel);
     const currentAmount = getAmountForDuration(batch.duration, chainState.currentPrice, blockTime);
     const currentCost = getStampCost(batch.depth, currentAmount);
-    const newCost = getStampCost(depth, currentAmount + amount);
+    const newCost = getStampCost(Math.max(batch.depth, depth), currentAmount + amount);
     return newCost.minus(currentCost);
   }
   /**
@@ -1735,13 +1735,15 @@ export class Bee {
    *
    * @param postageBatchId Batch ID
    * @param requestOptions Options for making requests, such as timeouts, custom HTTP agents, headers, etc.
+   * @param encryption Assume that uploads with this postage batch are encrypted, which skews the capacity.
+   * @param erasureCodeLevel Assume that uploads with this postage batch are erasure coded, which skews the capacity.
    *
    * @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/api/#tag/Postage-Stamps/paths/~1stamps~1%7Bbatch_id%7D/get)
    */
-  async getPostageBatch(postageBatchId, requestOptions) {
+  async getPostageBatch(postageBatchId, requestOptions, encryption, erasureCodeLevel) {
     postageBatchId = new BatchId(postageBatchId);
-    return stamps.getPostageBatch(this.getRequestOptionsForCall(requestOptions), postageBatchId);
+    return stamps.getPostageBatch(this.getRequestOptionsForCall(requestOptions), postageBatchId, encryption, erasureCodeLevel);
   }
   /**
    * Return detailed information related to buckets for specific postage batch.

package/dist/mjs/modules/debug/stamps.js

@@ -78,6 +78,7 @@ export async function getAllPostageBatches(requestOptions) {
       name: 'batchTTL'
     }));
     const duration = Duration.fromSeconds(batchTTL);
+    const effectiveBytes = getStampEffectiveBytes(depth);
     return {
       batchID: new BatchId(Types.asString(x.batchID, {
         name: 'batchID'
@@ -102,14 +103,22 @@ export async function getAllPostageBatches(requestOptions) {
       }),
       usage,
       usageText: `${Math.round(usage * 100)}%`,
-      size: Size.fromBytes(getStampEffectiveBytes(depth)),
-      remainingSize: Size.fromBytes(Math.ceil(getStampEffectiveBytes(depth) * (1 - usage))),
+      size: Size.fromBytes(effectiveBytes),
+      remainingSize: Size.fromBytes(Math.ceil(effectiveBytes * (1 - usage))),
       theoreticalSize: Size.fromBytes(getStampTheoreticalBytes(depth)),
-      duration
+      duration,
+      calculateSize(encryption, redundancyLevel) {
+        const effectiveBytes = getStampEffectiveBytes(this.depth, encryption, redundancyLevel);
+        return Size.fromBytes(effectiveBytes);
+      },
+      calculateRemainingSize(encryption, redundancyLevel) {
+        const effectiveBytes = getStampEffectiveBytes(this.depth, encryption, redundancyLevel);
+        return Size.fromBytes(Math.ceil(effectiveBytes * (1 - this.usage)));
+      }
     };
   });
 }
-export async function getPostageBatch(requestOptions, postageBatchId) {
+export async function getPostageBatch(requestOptions, postageBatchId, encryption, erasureCodeLevel) {
   const response = await http(requestOptions, {
     method: 'get',
     url: `${STAMPS_ENDPOINT}/${postageBatchId}`,
@@ -132,6 +141,7 @@ export async function getPostageBatch(requestOptions, postageBatchId) {
     name: 'batchTTL'
   }));
   const duration = Duration.fromSeconds(batchTTL);
+  const effectiveBytes = getStampEffectiveBytes(depth, encryption, erasureCodeLevel);
   return {
     batchID: new BatchId(Types.asString(body.batchID, {
       name: 'batchID'
@@ -156,10 +166,18 @@ export async function getPostageBatch(requestOptions, postageBatchId) {
     }),
     usage,
     usageText: `${Math.round(usage * 100)}%`,
-    size: Size.fromBytes(getStampEffectiveBytes(depth)),
-    remainingSize: Size.fromBytes(Math.ceil(getStampEffectiveBytes(depth) * (1 - usage))),
+    size: Size.fromBytes(effectiveBytes),
+    remainingSize: Size.fromBytes(Math.ceil(effectiveBytes * (1 - usage))),
     theoreticalSize: Size.fromBytes(getStampTheoreticalBytes(depth)),
-    duration
+    duration,
+    calculateSize(encryption, redundancyLevel) {
+      const effectiveBytes = getStampEffectiveBytes(depth, encryption, redundancyLevel);
+      return Size.fromBytes(effectiveBytes);
+    },
+    calculateRemainingSize(encryption, redundancyLevel) {
+      const effectiveBytes = getStampEffectiveBytes(depth, encryption, redundancyLevel);
+      return Size.fromBytes(Math.ceil(effectiveBytes * (1 - usage)));
+    }
   };
 }
 export async function getPostageBatchBuckets(requestOptions, postageBatchId) {

package/dist/types/bee.d.ts

@@ -1158,11 +1158,13 @@ export declare class Bee {
      *
      * @param postageBatchId Batch ID
      * @param requestOptions Options for making requests, such as timeouts, custom HTTP agents, headers, etc.
+     * @param encryption Assume that uploads with this postage batch are encrypted, which skews the capacity.
+     * @param erasureCodeLevel Assume that uploads with this postage batch are erasure coded, which skews the capacity.
      *
      * @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/api/#tag/Postage-Stamps/paths/~1stamps~1%7Bbatch_id%7D/get)
      */
-    getPostageBatch(postageBatchId: BatchId | Uint8Array | string, requestOptions?: BeeRequestOptions): Promise<PostageBatch>;
+    getPostageBatch(postageBatchId: BatchId | Uint8Array | string, requestOptions?: BeeRequestOptions, encryption?: boolean, erasureCodeLevel?: RedundancyLevel): Promise<PostageBatch>;
     /**
      * Return detailed information related to buckets for specific postage batch.
      *

package/dist/types/modules/debug/stamps.d.ts

@@ -1,8 +1,8 @@
-import type { BeeRequestOptions, GlobalPostageBatch, NumberString, PostageBatch, PostageBatchBuckets, PostageBatchOptions } from '../../types';
+import type { BeeRequestOptions, GlobalPostageBatch, NumberString, PostageBatch, PostageBatchBuckets, PostageBatchOptions, RedundancyLevel } from '../../types';
 import { BatchId } from '../../utils/typed-bytes';
 export declare function getGlobalPostageBatches(requestOptions: BeeRequestOptions): Promise<GlobalPostageBatch[]>;
 export declare function getAllPostageBatches(requestOptions: BeeRequestOptions): Promise<PostageBatch[]>;
-export declare function getPostageBatch(requestOptions: BeeRequestOptions, postageBatchId: BatchId): Promise<PostageBatch>;
+export declare function getPostageBatch(requestOptions: BeeRequestOptions, postageBatchId: BatchId, encryption?: boolean, erasureCodeLevel?: RedundancyLevel): Promise<PostageBatch>;
 export declare function getPostageBatchBuckets(requestOptions: BeeRequestOptions, postageBatchId: BatchId): Promise<PostageBatchBuckets>;
 export declare function createPostageBatch(requestOptions: BeeRequestOptions, amount: NumberString, depth: number, options?: PostageBatchOptions): Promise<BatchId>;
 export declare function topUpBatch(requestOptions: BeeRequestOptions, id: BatchId, amount: NumberString): Promise<BatchId>;

package/dist/types/types/index.d.ts

@@ -450,6 +450,16 @@ export interface PostageBatch {
      * Theoretical size in bytes
      */
     theoreticalSize: Size;
+    /**
+     * Calculates the effective size of data that can be uploaded with this postage batch
+     * based on whether encryption is used and the desired redundancy level.
+     */
+    calculateSize(encryption: boolean, redundancyLevel: RedundancyLevel): Size;
+    /**
+     * Calculates the remaining size of data that can be uploaded with this postage batch
+     * based on whether encryption is used and the desired redundancy level.
+     */
+    calculateRemainingSize(encryption: boolean, redundancyLevel: RedundancyLevel): Size;
 }
 export interface BatchBucket {
     bucketID: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethersphere/bee-js",
-  "version": "10.1.0",
+  "version": "10.1.2",
   "description": "Javascript client for Bee",
   "keywords": [
     "bee",