@ethersphere/bee-js 9.1.1 → 9.2.0

package/README.md

@@ -374,6 +374,8 @@ After making changes, link the package to your project by running `npm link` in
 
 ### Test
 
+[Code coverage](https://bah5acgza26tlmya36bdiu5cdfs3hh22hqthkhfv6cvq2ugxqrv5aw267ydlq.bzz.limo/)
+
 Tests are currently run against a mainnet Bee nodes. This is temporary and this section will be revised in the future.
 
 ## License

package/dist/cjs/bee.js

@@ -1150,7 +1150,7 @@ class Bee {
             throw new error_1.BeeArgumentError(`Depth has to be between ${types_1.STAMPS_DEPTH_MIN}..${types_1.STAMPS_DEPTH_MAX}`, depth);
         }
         const chainState = await this.getChainState();
-        const minimumAmount = BigInt(chainState.currentPrice) * 17280n;
+        const minimumAmount = BigInt(chainState.currentPrice) * 17280n + 1n;
         if (BigInt(amountString) < minimumAmount) {
             throw new error_1.BeeArgumentError(`Amount has to be at least ${minimumAmount} (1 day at current price ${chainState.currentPrice})`, amountString);
         }
@@ -1182,7 +1182,7 @@ class Bee {
         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);
+        await this.topUpBatch(batch.batchID, BigInt(batch.amount) * 2n ** BigInt(delta - 1) + 1n, options);
         return this.diluteBatch(batch.batchID, depth, options);
     }
     async extendStorageDuration(postageBatchId, duration, options) {

package/dist/cjs/utils/size.js

@@ -19,6 +19,12 @@ class Size {
     static fromBytes(bytes) {
         return new Size(bytes);
     }
+    static fromKilobytes(kilobytes) {
+        return new Size(kilobytes * 1000);
+    }
+    static fromMegabytes(megabytes) {
+        return new Size(megabytes * 1000 * 1000);
+    }
     static fromGigabytes(gigabytes) {
         return new Size(gigabytes * 1000 * 1000 * 1000);
     }

package/dist/cjs/utils/stamps.js

@@ -6,6 +6,7 @@ const bytes_1 = require("./bytes");
 const duration_1 = require("./duration");
 const tokens_1 = require("./tokens");
 const type_1 = require("./type");
+const MAX_UTILIZATION = 0.9;
 /**
  * Utility function that calculates usage of postage batch based on its utilization, depth and bucket depth.
  *
@@ -30,35 +31,27 @@ function getStampTheoreticalBytes(depth) {
 exports.getStampTheoreticalBytes = getStampTheoreticalBytes;
 /**
  * Based on https://docs.ethswarm.org/docs/learn/technology/contracts/postage-stamp/#effective-utilisation-table
+ * Optimised for encrypted, medium erasure coding
  */
-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,
-};
 const effectiveSizeBreakpoints = [
-    [22, 4.93],
-    [23, 17.03],
-    [24, 44.21],
-    [25, 102.78],
-    [26, 225.87],
-    [27, 480.44],
-    [28, 1001.44],
-    [29, 2060.27],
-    [30, 4201.9],
-    [31, 8519.02],
-    [32, 17199.89],
-    [33, 34628.46],
+    [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.
@@ -69,16 +62,23 @@ const effectiveSizeBreakpoints = [
  * @returns {number} The effective size of the postage batch in bytes.
  */
 function getStampEffectiveBytes(depth) {
-    if (depth < 22) {
+    if (depth < 17) {
         return 0;
     }
-    const utilRate = utilisationRateMap[depth] ?? 0.99;
-    return Math.ceil(getStampTheoreticalBytes(depth) * utilRate);
+    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);
 }
 exports.getStampEffectiveBytes = getStampEffectiveBytes;
 function getStampEffectiveBytesBreakpoints() {
     const map = new Map();
-    for (let i = 22; i < 35; i++) {
+    for (let i = 17; i < 35; i++) {
         map.set(i, getStampEffectiveBytes(i));
     }
     return map;
@@ -111,7 +111,7 @@ exports.getStampDuration = getStampDuration;
  * @param blockTime The block time in seconds.
  */
 function getAmountForDuration(duration, pricePerBlock, blockTime) {
-    return (BigInt(duration.toSeconds()) / BigInt(blockTime)) * BigInt(pricePerBlock);
+    return (BigInt(duration.toSeconds()) / BigInt(blockTime)) * BigInt(pricePerBlock) + 1n;
 }
 exports.getAmountForDuration = getAmountForDuration;
 /**
@@ -122,11 +122,11 @@ exports.getAmountForDuration = getAmountForDuration;
  */
 function getDepthForSize(size) {
     for (const [depth, sizeBreakpoint] of effectiveSizeBreakpoints) {
-        if (size.toGigabytes() <= sizeBreakpoint) {
+        if (size.toBytes() <= sizeBreakpoint * 1000 * 1000 * 1000) {
             return depth;
         }
     }
-    return 34;
+    return 35;
 }
 exports.getDepthForSize = getDepthForSize;
 function convertEnvelopeToMarshaledStamp(envelope) {