@ethersphere/bee-js 6.6.0 → 6.7.2

package/dist/mjs/bee-debug.js

@@ -539,9 +539,16 @@ export class BeeDebug {
   async waitForUsablePostageStamp(id, timeout = 120000) {
     const TIME_STEP = 1500;
     for (let time = 0; time < timeout; time += TIME_STEP) {
-      const stamp = await this.getPostageBatch(id);
-      if (stamp.usable) {
-        return;
+      try {
+        const stamp = await this.getPostageBatch(id);
+        if (stamp.usable) {
+          return;
+        }
+      } catch (error) {
+        const message = error?.response?.data?.message || error?.message || '';
+        if (!message.includes('batch not usable')) {
+          throw error;
+        }
       }
       await System.sleepMillis(TIME_STEP);
     }

package/dist/mjs/feed/index.js

@@ -58,7 +58,7 @@ export function makeFeedReader(requestOptions, type, topic, owner) {
     owner,
     topic,
     async download(options) {
-      if (!options?.index) {
+      if (!options?.index && options?.index !== 0) {
         return fetchLatestFeedUpdate(requestOptions, owner, topic, {
           ...options,
           type

package/dist/mjs/utils/expose.js

@@ -6,4 +6,4 @@ export { ethToSwarmAddress, fromLittleEndian, isHexEthAddress, makeEthAddress, m
 export { isNodeReadable, isReadable, isReadableStream, normalizeToReadableStream, readableNodeToWeb, readableWebToNode } from "./stream.js";
 export { keccak256Hash } from "./hash.js";
 export { makeMaxTarget } from "./pss.js";
-export { getAmountForTtl, getDepthForCapacity, getStampCostInBzz, getStampCostInPlur, getStampMaximumCapacityBytes, getStampTtlSeconds, getStampUsage } from "./stamps.js";
+export { getAmountForTtl, getDepthForCapacity, getStampCostInBzz, getStampCostInPlur, getStampMaximumCapacityBytes, getStampEffectiveBytes, getStampTtlSeconds, getStampUsage } from "./stamps.js";

package/dist/mjs/utils/stamps.js

@@ -18,6 +18,39 @@ export function getStampUsage(utilization, depth, bucketDepth) {
 export function getStampMaximumCapacityBytes(depth) {
   return 2 ** depth * 4096;
 }
+/**
+ * Based on https://docs.ethswarm.org/docs/learn/technology/contracts/postage-stamp/#effective-utilisation-table
+ */
+const utilisationRateMap = {
+  22: 0.2867,
+  23: 0.4956,
+  24: 0.6433,
+  25: 0.7478,
+  26: 0.8217,
+  27: 0.8739,
+  28: 0.9108,
+  29: 0.9369,
+  30: 0.9554,
+  31: 0.9685,
+  32: 0.9777,
+  33: 0.9842,
+  34: 0.9889
+};
+/**
+ * Utility function that calculates the effective volume of a postage batch based on its depth.
+ *
+ * Below 22 depth the effective volume is 0
+ * Above 34 it's always > 99%
+ *
+ * @returns {number} The effective volume of the postage batch in bytes.
+ */
+export function getStampEffectiveBytes(depth) {
+  if (depth < 22) {
+    return 0;
+  }
+  const utilRate = utilisationRateMap[depth] ?? 0.99;
+  return getStampMaximumCapacityBytes(depth) * utilRate;
+}
 /**
  * Utility function that calculates the cost of a postage batch based on its depth and amount.
  *

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

@@ -1,5 +1,5 @@
 import { FeedUpdateOptions } from '../modules/feed';
-import { BatchId, BeeRequestOptions, BytesReference, FeedReader, FeedWriter, FEED_INDEX_HEX_LENGTH, PlainBytesReference, Reference, Signer, Topic, UploadOptions } from '../types';
+import { BatchId, BeeRequestOptions, BytesReference, FEED_INDEX_HEX_LENGTH, FeedReader, FeedWriter, PlainBytesReference, Reference, Signer, Topic, UploadOptions } from '../types';
 import { Bytes } from '../utils/bytes';
 import { EthAddress, HexEthAddress } from '../utils/eth';
 import { HexString } from '../utils/hex';

package/dist/types/modules/feed.d.ts

@@ -1,3 +1,4 @@
+import { Index } from '../feed';
 import { FeedType } from '../feed/type';
 import { BatchId, BeeRequestOptions, Reference, ReferenceResponse, Topic } from '../types';
 import { HexEthAddress } from '../utils/eth';
@@ -16,13 +17,13 @@ export interface FeedUpdateOptions {
     /**
      * Fetch specific previous Feed's update (default fetches latest update)
      */
-    index?: string;
+    index?: Index;
 }
 interface FeedUpdateHeaders {
     /**
      * The current feed's index
      */
-    feedIndex: string;
+    feedIndex: Index;
     /**
      * The feed's index for next update.
      * Only set for the latest update. If update is fetched using previous index, then this is an empty string.

package/dist/types/utils/expose.d.ts

@@ -6,4 +6,4 @@ export { EthAddress, ethToSwarmAddress, fromLittleEndian, isHexEthAddress, makeE
 export { isNodeReadable, isReadable, isReadableStream, normalizeToReadableStream, readableNodeToWeb, readableWebToNode, } from './stream';
 export { keccak256Hash } from './hash';
 export { makeMaxTarget } from './pss';
-export { getAmountForTtl, getDepthForCapacity, getStampCostInBzz, getStampCostInPlur, getStampMaximumCapacityBytes, getStampTtlSeconds, getStampUsage, } from './stamps';
+export { getAmountForTtl, getDepthForCapacity, getStampCostInBzz, getStampCostInPlur, getStampMaximumCapacityBytes, getStampEffectiveBytes, getStampTtlSeconds, getStampUsage, } from './stamps';

package/dist/types/utils/stamps.d.ts

@@ -15,6 +15,15 @@ export declare function getStampUsage(utilization: number, depth: number, bucket
  * @returns {number} The maximum capacity of the postage batch in bytes.
  */
 export declare function getStampMaximumCapacityBytes(depth: number): number;
+/**
+ * Utility function that calculates the effective volume of a postage batch based on its depth.
+ *
+ * Below 22 depth the effective volume is 0
+ * Above 34 it's always > 99%
+ *
+ * @returns {number} The effective volume of the postage batch in bytes.
+ */
+export declare function getStampEffectiveBytes(depth: number): number;
 /**
  * Utility function that calculates the cost of a postage batch based on its depth and amount.
  *

package/package.json

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