@ethersphere/bee-js 6.6.0 → 6.7.2

package/dist/cjs/bee-debug.js

@@ -567,9 +567,17 @@ 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 cafe_utility_1.System.sleepMillis(TIME_STEP);
         }

package/dist/cjs/feed/index.js

@@ -89,7 +89,7 @@ function makeFeedReader(requestOptions, type, topic, owner) {
         owner,
         topic,
         async download(options) {
-            if (!options?.index) {
+            if (!options?.index && options?.index !== 0) {
                 return (0, feed_1.fetchLatestFeedUpdate)(requestOptions, owner, topic, { ...options, type });
             }
             const update = await downloadFeedUpdate(requestOptions, (0, hex_1.hexToBytes)(owner), topic, options.index);

package/dist/cjs/utils/expose.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStampUsage = exports.getStampTtlSeconds = exports.getStampMaximumCapacityBytes = exports.getStampCostInPlur = exports.getStampCostInBzz = exports.getDepthForCapacity = exports.getAmountForTtl = exports.makeMaxTarget = exports.keccak256Hash = exports.readableWebToNode = exports.readableNodeToWeb = exports.normalizeToReadableStream = exports.isReadableStream = exports.isReadable = exports.isNodeReadable = exports.toLittleEndian = exports.makeHexEthAddress = exports.makeEthereumWalletSigner = exports.makeEthAddress = exports.isHexEthAddress = exports.fromLittleEndian = exports.ethToSwarmAddress = exports.makeHexString = exports.isHexString = exports.intToHex = exports.hexToBytes = exports.bytesToHex = exports.assertPrefixedHexString = exports.assertHexString = exports.isFlexBytes = exports.isBytes = exports.flexBytesAtOffset = exports.bytesEqual = exports.bytesAtOffset = exports.assertFlexBytes = exports.assertBytes = exports.getFolderSize = exports.getCollectionSize = void 0;
+exports.getStampUsage = exports.getStampTtlSeconds = exports.getStampEffectiveBytes = exports.getStampMaximumCapacityBytes = exports.getStampCostInPlur = exports.getStampCostInBzz = exports.getDepthForCapacity = exports.getAmountForTtl = exports.makeMaxTarget = exports.keccak256Hash = exports.readableWebToNode = exports.readableNodeToWeb = exports.normalizeToReadableStream = exports.isReadableStream = exports.isReadable = exports.isNodeReadable = exports.toLittleEndian = exports.makeHexEthAddress = exports.makeEthereumWalletSigner = exports.makeEthAddress = exports.isHexEthAddress = exports.fromLittleEndian = exports.ethToSwarmAddress = exports.makeHexString = exports.isHexString = exports.intToHex = exports.hexToBytes = exports.bytesToHex = exports.assertPrefixedHexString = exports.assertHexString = exports.isFlexBytes = exports.isBytes = exports.flexBytesAtOffset = exports.bytesEqual = exports.bytesAtOffset = exports.assertFlexBytes = exports.assertBytes = exports.getFolderSize = exports.getCollectionSize = void 0;
 var collection_1 = require("./collection");
 Object.defineProperty(exports, "getCollectionSize", { enumerable: true, get: function () { return collection_1.getCollectionSize; } });
 var collection_node_1 = require("./collection.node");
@@ -46,5 +46,6 @@ Object.defineProperty(exports, "getDepthForCapacity", { enumerable: true, get: f
 Object.defineProperty(exports, "getStampCostInBzz", { enumerable: true, get: function () { return stamps_1.getStampCostInBzz; } });
 Object.defineProperty(exports, "getStampCostInPlur", { enumerable: true, get: function () { return stamps_1.getStampCostInPlur; } });
 Object.defineProperty(exports, "getStampMaximumCapacityBytes", { enumerable: true, get: function () { return stamps_1.getStampMaximumCapacityBytes; } });
+Object.defineProperty(exports, "getStampEffectiveBytes", { enumerable: true, get: function () { return stamps_1.getStampEffectiveBytes; } });
 Object.defineProperty(exports, "getStampTtlSeconds", { enumerable: true, get: function () { return stamps_1.getStampTtlSeconds; } });
 Object.defineProperty(exports, "getStampUsage", { enumerable: true, get: function () { return stamps_1.getStampUsage; } });

package/dist/cjs/utils/stamps.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDepthForCapacity = exports.getAmountForTtl = exports.getStampTtlSeconds = exports.getStampCostInBzz = exports.getStampCostInPlur = exports.getStampMaximumCapacityBytes = exports.getStampUsage = void 0;
+exports.getDepthForCapacity = exports.getAmountForTtl = exports.getStampTtlSeconds = exports.getStampCostInBzz = exports.getStampCostInPlur = exports.getStampEffectiveBytes = exports.getStampMaximumCapacityBytes = exports.getStampUsage = void 0;
 /**
  * Utility function that calculates usage of postage batch based on its utilization, depth and bucket depth.
  *
@@ -23,6 +23,40 @@ function getStampMaximumCapacityBytes(depth) {
     return 2 ** depth * 4096;
 }
 exports.getStampMaximumCapacityBytes = getStampMaximumCapacityBytes;
+/**
+ * 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.
+ */
+function getStampEffectiveBytes(depth) {
+    if (depth < 22) {
+        return 0;
+    }
+    const utilRate = utilisationRateMap[depth] ?? 0.99;
+    return getStampMaximumCapacityBytes(depth) * utilRate;
+}
+exports.getStampEffectiveBytes = getStampEffectiveBytes;
 /**
  * Utility function that calculates the cost of a postage batch based on its depth and amount.
  *