@ethersphere/bee-js 9.1.0 → 9.1.2

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/manifest/manifest.js

@@ -17,6 +17,22 @@ export class Fork {
   }
   static split(a, b) {
     const commonPart = Binary.commonPrefix(a.prefix, b.prefix);
+    if (commonPart.length === a.prefix.length) {
+      const remainingB = b.prefix.slice(commonPart.length);
+      b.node.path = b.prefix.slice(commonPart.length);
+      b.prefix = b.prefix.slice(commonPart.length);
+      b.node.parent = a.node;
+      a.node.forks.set(remainingB[0], b);
+      return a;
+    }
+    if (commonPart.length === b.prefix.length) {
+      const remainingA = a.prefix.slice(commonPart.length);
+      a.node.path = a.prefix.slice(commonPart.length);
+      a.prefix = a.prefix.slice(commonPart.length);
+      a.node.parent = b.node;
+      b.node.forks.set(remainingA[0], a);
+      return b;
+    }
     const node = new MantarayNode({
       path: commonPart
     });
@@ -57,14 +73,14 @@ export class Fork {
     const prefixLength = Binary.uint8ToNumber(reader.read(1));
     const prefix = reader.read(prefixLength);
     reader.read(30 - prefixLength);
-    const targetAddress = reader.read(32);
+    const selfAddress = reader.read(32);
     let metadata = undefined;
     if (isType(type, TYPE_WITH_METADATA)) {
       const metadataLength = Binary.uint16ToNumber(reader.read(2), 'BE');
       metadata = JSON.parse(DECODER.decode(reader.read(metadataLength)));
     }
     return new Fork(prefix, new MantarayNode({
-      targetAddress,
+      selfAddress,
       metadata,
       path: prefix
     }));
@@ -176,15 +192,16 @@ export class MantarayNode {
    * Do not forget calling `loadRecursively` on the returned node to load the entire tree.
    */
   static async unmarshal(bee, reference, options, requestOptions) {
+    reference = new Reference(reference);
     const data = (await bee.downloadData(reference, options, requestOptions)).toUint8Array();
-    return this.unmarshalFromData(data);
+    return this.unmarshalFromData(data, reference.toUint8Array());
   }
   /**
    * Unmarshals a MantarayNode from the given data.
    *
    * Do not forget calling `loadRecursively` on the returned node to load the entire tree.
    */
-  static unmarshalFromData(data) {
+  static unmarshalFromData(data, selfAddress) {
     const obfuscationKey = data.subarray(0, 32);
     const decrypted = Binary.xorCypher(data.subarray(32), obfuscationKey);
     const reader = new Uint8ArrayReader(decrypted);
@@ -195,6 +212,7 @@ export class MantarayNode {
     const targetAddressLength = Binary.uint8ToNumber(reader.read(1));
     const targetAddress = targetAddressLength === 0 ? NULL_ADDRESS : reader.read(targetAddressLength);
     const node = new MantarayNode({
+      selfAddress,
       targetAddress,
       obfuscationKey
     });
@@ -293,7 +311,10 @@ export class MantarayNode {
    */
   async loadRecursively(bee, options, requestOptions) {
     for (const fork of this.forks.values()) {
-      const node = await MantarayNode.unmarshal(bee, fork.node.targetAddress, options, requestOptions);
+      if (!fork.node.selfAddress) {
+        throw Error('MantarayNode#loadRecursively fork.node.selfAddress is not set');
+      }
+      const node = await MantarayNode.unmarshal(bee, fork.node.selfAddress, options, requestOptions);
       fork.node.targetAddress = node.targetAddress;
       fork.node.forks = node.forks;
       fork.node.path = fork.prefix;

package/dist/mjs/utils/stamps.js

@@ -89,7 +89,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

package/dist/types/manifest/manifest.d.ts

@@ -60,7 +60,7 @@ export declare class MantarayNode {
      *
      * Do not forget calling `loadRecursively` on the returned node to load the entire tree.
      */
-    static unmarshalFromData(data: Uint8Array): MantarayNode;
+    static unmarshalFromData(data: Uint8Array, selfAddress: Uint8Array): MantarayNode;
     /**
      * Adds a fork to the node.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethersphere/bee-js",
-  "version": "9.1.0",
+  "version": "9.1.2",
   "description": "Javascript client for Bee",
   "keywords": [
     "bee",
@@ -94,7 +94,6 @@
     "eslint-plugin-unused-imports": "^2.0.0",
     "husky": "^8.0.1",
     "jest": "^29.7.0",
-    "jest-puppeteer": "^11.0.0",
     "prettier": "^2.6.2",
     "rimraf": "^3.0.2",
     "terser-webpack-plugin": "^5.3.1",