@ethersphere/bee-js 9.1.1 → 9.2.0

package/dist/mjs/bee.js

@@ -1136,7 +1136,7 @@ export class Bee {
       throw new BeeArgumentError(`Depth has to be between ${STAMPS_DEPTH_MIN}..${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 BeeArgumentError(`Amount has to be at least ${minimumAmount} (1 day at current price ${chainState.currentPrice})`, amountString);
     }
@@ -1168,7 +1168,7 @@ export class Bee {
     if (delta <= 0) {
       throw new 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/mjs/utils/size.js

@@ -16,6 +16,12 @@ export 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/mjs/utils/stamps.js

@@ -3,6 +3,7 @@ import { Bytes } from "./bytes.js";
 import { Duration } from "./duration.js";
 import { BZZ } from "./tokens.js";
 import { asNumberString } from "./type.js";
+const MAX_UTILIZATION = 0.9;
 /**
  * Utility function that calculates usage of postage batch based on its utilization, depth and bucket depth.
  *
@@ -25,23 +26,9 @@ export function getStampTheoreticalBytes(depth) {
 }
 /**
  * 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]];
+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.
  *
@@ -51,15 +38,22 @@ const effectiveSizeBreakpoints = [[22, 4.93], [23, 17.03], [24, 44.21], [25, 102
  * @returns {number} The effective size of the postage batch in bytes.
  */
 export 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);
 }
 export 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;
@@ -89,7 +83,7 @@ export function getStampDuration(amount, pricePerBlock, blockTime) {
  * @param blockTime The block time in seconds.
  */
 export function getAmountForDuration(duration, pricePerBlock, blockTime) {
-  return BigInt(duration.toSeconds()) / BigInt(blockTime) * BigInt(pricePerBlock);
+  return BigInt(duration.toSeconds()) / BigInt(blockTime) * BigInt(pricePerBlock) + 1n;
 }
 /**
  * Utility function that calculates the depth required for a postage batch to achieve the specified effective size
@@ -99,11 +93,11 @@ export function getAmountForDuration(duration, pricePerBlock, blockTime) {
  */
 export 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;
 }
 export function convertEnvelopeToMarshaledStamp(envelope) {
   return marshalStamp(envelope.signature, envelope.batchId.toUint8Array(), envelope.timestamp, envelope.index);

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

@@ -9,6 +9,8 @@ export declare class Size {
     private bytes;
     private constructor();
     static fromBytes(bytes: number): Size;
+    static fromKilobytes(kilobytes: number): Size;
+    static fromMegabytes(megabytes: number): Size;
     static fromGigabytes(gigabytes: number): Size;
     toBytes(): number;
     toGigabytes(): number;

package/package.json

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