@ethersphere/bee-js 9.0.3 → 9.1.1

package/dist/cjs/bee.js

@@ -84,6 +84,7 @@ class Bee {
         if (options?.signer) {
             this.signer = new typed_bytes_1.PrivateKey(options.signer);
         }
+        this.network = options?.network ?? 'gnosis';
         this.requestOptions = {
             baseURL: this.url,
             timeout: options?.timeout ?? 0,
@@ -1161,7 +1162,7 @@ class Bee {
     }
     async buyStorage(size, duration, options, requestOptions) {
         const chainState = await this.getChainState(requestOptions);
-        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice);
+        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
         const depth = (0, stamps_1.getDepthForSize)(size);
         if (options) {
             options = (0, type_1.preparePostageBatchOptions)(options);
@@ -1170,7 +1171,7 @@ class Bee {
     }
     async getStorageCost(size, duration, options) {
         const chainState = await this.getChainState(options);
-        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice);
+        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
         const depth = (0, stamps_1.getDepthForSize)(size);
         return (0, stamps_1.getStampCost)(depth, amount);
     }
@@ -1187,13 +1188,13 @@ class Bee {
     async extendStorageDuration(postageBatchId, duration, options) {
         const batch = await this.getPostageBatch(postageBatchId, options);
         const chainState = await this.getChainState(options);
-        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice);
+        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
         return this.topUpBatch(batch.batchID, amount, options);
     }
     async getExtensionCost(postageBatchId, size, duration, options) {
         const batch = await this.getPostageBatch(postageBatchId, options);
         const chainState = await this.getChainState(options);
-        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice);
+        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
         const depth = (0, stamps_1.getDepthForSize)(size);
         const currentValue = (0, stamps_1.getStampCost)(batch.depth, batch.amount);
         const newValue = (0, stamps_1.getStampCost)(depth, amount);
@@ -1213,7 +1214,7 @@ class Bee {
     async getDurationExtensionCost(postageBatchId, duration, options) {
         const batch = await this.getPostageBatch(postageBatchId, options);
         const chainState = await this.getChainState(options);
-        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice);
+        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
         return (0, stamps_1.getStampCost)(batch.depth, amount);
     }
     /**

package/dist/cjs/manifest/manifest.js

@@ -20,6 +20,22 @@ class Fork {
     }
     static split(a, b) {
         const commonPart = cafe_utility_1.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 });
         const newAFork = new Fork(a.prefix.slice(commonPart.length), a.node);
         const newBFork = new Fork(b.prefix.slice(commonPart.length), b.node);
@@ -58,13 +74,13 @@ class Fork {
         const prefixLength = cafe_utility_1.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 = cafe_utility_1.Binary.uint16ToNumber(reader.read(2), 'BE');
             metadata = JSON.parse(DECODER.decode(reader.read(metadataLength)));
         }
-        return new Fork(prefix, new MantarayNode({ targetAddress, metadata, path: prefix }));
+        return new Fork(prefix, new MantarayNode({ selfAddress, metadata, path: prefix }));
     }
 }
 exports.Fork = Fork;
@@ -175,15 +191,16 @@ 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 typed_bytes_1.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 = cafe_utility_1.Binary.xorCypher(data.subarray(32), obfuscationKey);
         const reader = new cafe_utility_1.Uint8ArrayReader(decrypted);
@@ -193,7 +210,7 @@ class MantarayNode {
         }
         const targetAddressLength = cafe_utility_1.Binary.uint8ToNumber(reader.read(1));
         const targetAddress = targetAddressLength === 0 ? __1.NULL_ADDRESS : reader.read(targetAddressLength);
-        const node = new MantarayNode({ targetAddress, obfuscationKey });
+        const node = new MantarayNode({ selfAddress, targetAddress, obfuscationKey });
         const forkBitmap = reader.read(32);
         for (let i = 0; i < 256; i++) {
             if (cafe_utility_1.Binary.getBit(forkBitmap, i, 'LE')) {
@@ -290,7 +307,10 @@ 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/cjs/utils/stamps.js

@@ -98,7 +98,7 @@ exports.getStampCost = getStampCost;
  *
  * @returns {number} The TTL of the postage batch.
  */
-function getStampDuration(amount, pricePerBlock, blockTime = 5) {
+function getStampDuration(amount, pricePerBlock, blockTime) {
     const amountBigInt = BigInt((0, type_1.asNumberString)(amount));
     return duration_1.Duration.fromSeconds(Number((amountBigInt * BigInt(blockTime)) / BigInt(pricePerBlock)));
 }
@@ -110,7 +110,7 @@ exports.getStampDuration = getStampDuration;
  * @param pricePerBlock The price per block in PLUR.
  * @param blockTime The block time in seconds.
  */
-function getAmountForDuration(duration, pricePerBlock, blockTime = 5) {
+function getAmountForDuration(duration, pricePerBlock, blockTime) {
     return (BigInt(duration.toSeconds()) / BigInt(blockTime)) * BigInt(pricePerBlock);
 }
 exports.getAmountForDuration = getAmountForDuration;