@ethersphere/bee-js 9.0.2 → 9.1.0

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/feed/index.js

@@ -80,7 +80,8 @@ export function makeFeedReader(requestOptions, topic, owner) {
     const feedIndex = typeof options.index === 'number' ? FeedIndex.fromBigInt(BigInt(options.index)) : options.index;
     return {
       payload: update.payload,
-      feedIndex
+      feedIndex,
+      feedIndexNext: feedIndex.next()
     };
   };
   const downloadPayload = async options => {
@@ -92,7 +93,8 @@ export function makeFeedReader(requestOptions, topic, owner) {
     const feedIndex = typeof options.index === 'number' ? FeedIndex.fromBigInt(BigInt(options.index)) : options.index;
     return {
       payload,
-      feedIndex
+      feedIndex,
+      feedIndexNext: feedIndex.next()
     };
   };
   const downloadReference = async options => {
@@ -106,7 +108,8 @@ export function makeFeedReader(requestOptions, topic, owner) {
     });
     return {
       reference: new Reference(payload.payload.toUint8Array()),
-      feedIndex: payload.feedIndex
+      feedIndex: payload.feedIndex,
+      feedIndexNext: payload.feedIndexNext ?? payload.feedIndex.next()
     };
   };
   return {

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/mjs/utils/typed-bytes.js

@@ -145,6 +145,7 @@ export class Topic extends Bytes {
   }
 }
 Topic.LENGTH = 32;
+const MAX_UINT64 = new Uint8Array(8).fill(0xff, 0, 8);
 export class FeedIndex extends Bytes {
   constructor(bytes) {
     super(bytes, 8);
@@ -155,6 +156,12 @@ export class FeedIndex extends Bytes {
   toBigInt() {
     return Binary.uint64ToNumber(this.bytes, 'BE');
   }
+  next() {
+    if (Binary.equals(this.bytes, MAX_UINT64)) {
+      return FeedIndex.fromBigInt(0n);
+    }
+    return FeedIndex.fromBigInt(this.toBigInt() + 1n);
+  }
 }
 FeedIndex.LENGTH = 8;
-FeedIndex.MINUS_ONE = new FeedIndex(new Uint8Array(8).fill(0xff, 0, 8));
+FeedIndex.MINUS_ONE = new FeedIndex(MAX_UINT64);

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/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/dist/types/utils/typed-bytes.d.ts

@@ -35,7 +35,7 @@ export declare class TransactionId extends Bytes {
 export declare class Span extends Bytes {
     static readonly LENGTH = 8;
     constructor(bytes: Uint8Array | string | Bytes);
-    static fromBigInt(number: bigint): FeedIndex;
+    static fromBigInt(number: bigint): Span;
     toBigInt(): bigint;
     static fromSlice(bytes: Uint8Array, start: number): Span;
 }
@@ -65,4 +65,5 @@ export declare class FeedIndex extends Bytes {
     constructor(bytes: Uint8Array | string | Bytes);
     static fromBigInt(number: bigint): FeedIndex;
     toBigInt(): bigint;
+    next(): FeedIndex;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethersphere/bee-js",
-  "version": "9.0.2",
+  "version": "9.1.0",
   "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",