@ethersphere/bee-js 9.0.3 → 9.1.1

package/dist/mjs/bee.js

@@ -58,6 +58,7 @@ export class Bee {
     if (options?.signer) {
       this.signer = new PrivateKey(options.signer);
     }
+    this.network = options?.network ?? 'gnosis';
     this.requestOptions = {
       baseURL: this.url,
       timeout: options?.timeout ?? 0,
@@ -1147,7 +1148,7 @@ export class Bee {
   }
   async buyStorage(size, duration, options, requestOptions) {
     const chainState = await this.getChainState(requestOptions);
-    const amount = getAmountForDuration(duration, chainState.currentPrice);
+    const amount = getAmountForDuration(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
     const depth = getDepthForSize(size);
     if (options) {
       options = preparePostageBatchOptions(options);
@@ -1156,7 +1157,7 @@ export class Bee {
   }
   async getStorageCost(size, duration, options) {
     const chainState = await this.getChainState(options);
-    const amount = getAmountForDuration(duration, chainState.currentPrice);
+    const amount = getAmountForDuration(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
     const depth = getDepthForSize(size);
     return getStampCost(depth, amount);
   }
@@ -1173,13 +1174,13 @@ export class Bee {
   async extendStorageDuration(postageBatchId, duration, options) {
     const batch = await this.getPostageBatch(postageBatchId, options);
     const chainState = await this.getChainState(options);
-    const amount = getAmountForDuration(duration, chainState.currentPrice);
+    const amount = 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 = getAmountForDuration(duration, chainState.currentPrice);
+    const amount = getAmountForDuration(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
     const depth = getDepthForSize(size);
     const currentValue = getStampCost(batch.depth, batch.amount);
     const newValue = getStampCost(depth, amount);
@@ -1199,7 +1200,7 @@ export class Bee {
   async getDurationExtensionCost(postageBatchId, duration, options) {
     const batch = await this.getPostageBatch(postageBatchId, options);
     const chainState = await this.getChainState(options);
-    const amount = getAmountForDuration(duration, chainState.currentPrice);
+    const amount = getAmountForDuration(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
     return getStampCost(batch.depth, amount);
   }
   /**

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

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

package/dist/types/bee.d.ts

@@ -25,6 +25,10 @@ export declare class Bee {
      * Default Signer object used for signing operations, mainly Feeds.
      */
     readonly signer?: PrivateKey;
+    /**
+     * Network on which the Bee node is running
+     */
+    readonly network: 'gnosis' | 'sepolia';
     /**
      * Options for making requests
      * @private

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/dist/types/types/index.d.ts

@@ -37,6 +37,10 @@ export interface BeeOptions extends BeeRequestOptions {
      * Signer object or private key of the Signer in form of either hex string or Uint8Array that will be default signer for the instance.
      */
     signer?: PrivateKey | Uint8Array | string;
+    /**
+     * Default gnosis when unspecified.
+     */
+    network?: 'gnosis' | 'sepolia';
 }
 export interface GranteesResult {
     status: number;

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

@@ -40,7 +40,7 @@ export declare function getStampCost(depth: number, amount: NumberString | strin
  *
  * @returns {number} The TTL of the postage batch.
  */
-export declare function getStampDuration(amount: NumberString | string | bigint, pricePerBlock: number, blockTime?: number): Duration;
+export declare function getStampDuration(amount: NumberString | string | bigint, pricePerBlock: number, blockTime: number): Duration;
 /**
  * Get the postage batch `amount` required for a given `duration`.
  *
@@ -48,7 +48,7 @@ export declare function getStampDuration(amount: NumberString | string | bigint,
  * @param pricePerBlock The price per block in PLUR.
  * @param blockTime The block time in seconds.
  */
-export declare function getAmountForDuration(duration: Duration, pricePerBlock: number, blockTime?: number): bigint;
+export declare function getAmountForDuration(duration: Duration, pricePerBlock: number, blockTime: number): bigint;
 /**
  * Utility function that calculates the depth required for a postage batch to achieve the specified effective size
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethersphere/bee-js",
-  "version": "9.0.3",
+  "version": "9.1.1",
   "description": "Javascript client for Bee",
   "keywords": [
     "bee",
@@ -56,13 +56,12 @@
     "build:types": "tsc --emitDeclarationOnly --declaration --outDir dist/types",
     "build:browser": "webpack --progress",
     "test": "jest --config=jest.config.ts --runInBand --verbose",
-    "check:types": "tsc --project tsconfig.test.json",
-    "lint": "eslint --fix \"src/**/*.ts\" \"test/**/*.ts\" && prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "lint:check": "eslint \"src/**/*.ts\" \"test/**/*.ts\" && prettier --check \"src/**/*.ts\" \"test/**/*.ts\"",
+    "check": "tsc --project tsconfig.test.json",
+    "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\" && prettier --check \"src/**/*.ts\" \"test/**/*.ts\"",
     "depcheck": "depcheck ."
   },
   "dependencies": {
-    "axios": "^0.28.1",
+    "axios": "^0.30.0",
     "cafe-utility": "^27.14.2",
     "isomorphic-ws": "^4.0.1",
     "semver": "^7.3.5",
@@ -95,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",