@upcoming/bee-js 9.8.0 → 9.9.1

package/dist/mjs/bee.js

@@ -1217,23 +1217,28 @@ export class Bee {
     const depth = getDepthForSize(size, encryption, erasureCodeLevel);
     const chainState = await this.getChainState(options);
     const depthDelta = depth - batch.depth;
-    const multiplier = depthDelta === 0 ? 1n : 2n ** BigInt(depthDelta);
-    const targetAmount = (BigInt(batch.amount) + getAmountForDuration(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15)) * multiplier;
-    const amountDelta = targetAmount - BigInt(batch.amount);
+    const multiplier = depthDelta <= 0 ? 1n : 2n ** BigInt(depthDelta);
+    const blockTime = this.network === 'gnosis' ? 5 : 15;
+    const additionalAmount = getAmountForDuration(duration, chainState.currentPrice, blockTime);
+    const currentAmount = getAmountForDuration(batch.duration, chainState.currentPrice, blockTime);
+    const targetAmount = duration.isZero() ? currentAmount * multiplier : currentAmount + additionalAmount * multiplier;
+    const amountDelta = targetAmount - currentAmount;
     const transactionId = await this.topUpBatch(batch.batchID, amountDelta, options);
-    if (depthDelta) {
+    if (depthDelta > 0) {
       return this.diluteBatch(batch.batchID, depth, options);
     }
     return transactionId;
   }
   async extendStorageSize(postageBatchId, size, options, encryption, erasureCodeLevel) {
+    const chainState = await this.getChainState(options);
     const batch = await this.getPostageBatch(postageBatchId, options);
     const depth = getDepthForSize(size, encryption, erasureCodeLevel);
     const delta = depth - batch.depth;
     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) + 1n, options);
+    const currentAmount = getAmountForDuration(batch.duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
+    await this.topUpBatch(batch.batchID, currentAmount * (2n ** BigInt(delta) - 1n) + 1n, options);
     return this.diluteBatch(batch.batchID, depth, options);
   }
   async extendStorageDuration(postageBatchId, duration, options) {
@@ -1245,22 +1250,26 @@ export class Bee {
   async getExtensionCost(postageBatchId, size, duration, options, encryption, erasureCodeLevel) {
     const batch = await this.getPostageBatch(postageBatchId, options);
     const chainState = await this.getChainState(options);
-    const amount = getAmountForDuration(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
+    const blockTime = this.network === 'gnosis' ? 5 : 15;
+    const amount = duration.isZero() ? 0n : getAmountForDuration(duration, chainState.currentPrice, blockTime);
     const depth = getDepthForSize(size, encryption, erasureCodeLevel);
-    const currentValue = getStampCost(batch.depth, batch.amount);
-    const newValue = getStampCost(depth, amount);
-    return newValue.minus(currentValue);
+    const currentAmount = getAmountForDuration(batch.duration, chainState.currentPrice, blockTime);
+    const currentCost = getStampCost(batch.depth, currentAmount);
+    const newCost = getStampCost(depth, currentAmount + amount);
+    return newCost.minus(currentCost);
   }
   async getSizeExtensionCost(postageBatchId, size, options, encryption, erasureCodeLevel) {
     const batch = await this.getPostageBatch(postageBatchId, options);
+    const chainState = await this.getChainState(options);
     const depth = getDepthForSize(size, encryption, erasureCodeLevel);
     const delta = depth - batch.depth;
     if (delta <= 0) {
       throw new BeeArgumentError('New depth has to be greater than the original depth', depth);
     }
-    const currentPaid = getStampCost(batch.depth, batch.amount);
-    const newPaid = getStampCost(depth, batch.amount);
-    return newPaid.minus(currentPaid);
+    const currentAmount = getAmountForDuration(batch.duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
+    const currentCost = getStampCost(batch.depth, currentAmount);
+    const newCost = getStampCost(depth, currentAmount);
+    return newCost.minus(currentCost);
   }
   async getDurationExtensionCost(postageBatchId, duration, options) {
     const batch = await this.getPostageBatch(postageBatchId, options);

package/dist/mjs/manifest/manifest.js

@@ -1,6 +1,8 @@
 import { Binary, MerkleTree, Optional, Uint8ArrayReader } from 'cafe-utility';
+import _debug from 'debug';
 import { NULL_ADDRESS } from "../index.js";
 import { Reference } from "../utils/typed-bytes.js";
+const debug = _debug('bee-js:manifest');
 const ENCODER = new TextEncoder();
 const DECODER = new TextDecoder();
 const TYPE_VALUE = 2;
@@ -60,6 +62,11 @@ export class Fork {
       data.push(new Uint8Array(30 - this.prefix.length));
     }
     data.push(this.node.selfAddress);
+    debug('marshalling fork', {
+      prefixLength: this.prefix.length,
+      prefix: DECODER.decode(this.prefix),
+      address: Binary.uint8ArrayToHex(this.node.selfAddress)
+    });
     if (this.node.metadata) {
       const metadataBytes = Binary.padEndToMultiple(new Uint8Array([0x00, 0x00, ...ENCODER.encode(JSON.stringify(this.node.metadata))]), 32, 0x0a);
       const metadataLengthBytes = Binary.numberToUint16(metadataBytes.length - 2, 'BE');
@@ -72,8 +79,17 @@ export class Fork {
     const type = Binary.uint8ToNumber(reader.read(1));
     const prefixLength = Binary.uint8ToNumber(reader.read(1));
     const prefix = reader.read(prefixLength);
-    reader.read(30 - prefixLength);
+    if (prefixLength < 30) {
+      reader.read(30 - prefixLength);
+    }
     const selfAddress = reader.read(addressLength);
+    debug('unmarshalling fork', {
+      type,
+      prefixLength,
+      prefix: DECODER.decode(prefix),
+      addressLength,
+      address: Binary.uint8ArrayToHex(selfAddress)
+    });
     let metadata = undefined;
     if (isType(type, TYPE_WITH_METADATA)) {
       const metadataLength = Binary.uint16ToNumber(reader.read(2), 'BE');
@@ -210,7 +226,7 @@ export class MantarayNode {
       throw new Error('MantarayNode#unmarshal invalid version hash');
     }
     const targetAddressLength = Binary.uint8ToNumber(reader.read(1));
-    const targetAddress = targetAddressLength === 0 ? NULL_ADDRESS : reader.read(targetAddressLength);
+    const targetAddress = targetAddressLength ? reader.read(targetAddressLength) : NULL_ADDRESS;
     const node = new MantarayNode({
       selfAddress,
       targetAddress,
@@ -219,7 +235,7 @@ export class MantarayNode {
     const forkBitmap = reader.read(32);
     for (let i = 0; i < 256; i++) {
       if (Binary.getBit(forkBitmap, i, 'LE')) {
-        const newFork = Fork.unmarshal(reader, targetAddressLength);
+        const newFork = Fork.unmarshal(reader, selfAddress.length);
         node.forks.set(i, newFork);
         newFork.node.parent = node;
       }
@@ -232,6 +248,10 @@ export class MantarayNode {
   addFork(path, reference, metadata) {
     this.selfAddress = null;
     path = path instanceof Uint8Array ? path : ENCODER.encode(path);
+    debug('adding fork', {
+      path: DECODER.decode(path),
+      reference: new Reference(reference).represent()
+    });
     // TODO: this should not be ignored
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     let tip = this;

package/dist/mjs/utils/duration.js

@@ -2,8 +2,8 @@ import { Dates } from 'cafe-utility';
 export class Duration {
   constructor(seconds) {
     this.seconds = Math.ceil(seconds);
-    if (seconds <= 0) {
-      throw Error('Duration must be greater than 0');
+    if (seconds < 0) {
+      throw Error('Duration cannot be negative');
     }
   }
   static fromMilliseconds(milliseconds) {
@@ -48,4 +48,8 @@ export class Duration {
   represent() {
     return Dates.secondsToHumanTime(this.seconds);
   }
-}
+  isZero() {
+    return this.seconds === 0;
+  }
+}
+Duration.ZERO = new Duration(0);

package/dist/mjs/utils/http.js

@@ -1,6 +1,8 @@
 import axios from 'axios';
 import { Dates, Objects, Strings, System } from 'cafe-utility';
+import _debug from 'debug';
 import { BeeResponseError } from "../index.js";
+const debug = _debug('bee-js:http');
 const {
   AxiosError
 } = axios;
@@ -37,6 +39,12 @@ export async function http(options, config) {
   let failedAttempts = 0;
   while (failedAttempts < MAX_FAILED_ATTEMPTS) {
     try {
+      debug(`${requestConfig.method || 'get'} ${Strings.joinUrl([requestConfig.baseURL, requestConfig.url])}`, {
+        headers: {
+          ...requestConfig.headers
+        },
+        params: requestConfig.params
+      });
       maybeRunOnRequestHook(options, requestConfig);
       const response = await axios(requestConfig);
       return response;

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

@@ -1,5 +1,6 @@
 export declare class Duration {
     private seconds;
+    static ZERO: Duration;
     private constructor();
     static fromMilliseconds(milliseconds: number): Duration;
     static fromSeconds(seconds: number): Duration;
@@ -15,4 +16,5 @@ export declare class Duration {
     toYears(): number;
     toEndDate(startDate?: Date): Date;
     represent(): string;
+    isZero(): boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upcoming/bee-js",
-  "version": "9.8.0",
+  "version": "9.9.1",
   "description": "Javascript client for Bee",
   "keywords": [
     "bee",
@@ -63,6 +63,7 @@
   "dependencies": {
     "axios": "^0.30.0",
     "cafe-utility": "^31.0.0",
+    "debug": "^4.4.1",
     "isomorphic-ws": "^4.0.1",
     "semver": "^7.3.5",
     "ws": "^8.7.0"
@@ -78,6 +79,7 @@
     "@commitlint/config-conventional": "^17.4.2",
     "@jest/types": "^29.6.3",
     "@naholyr/cross-env": "^1.0.0",
+    "@types/debug": "^4.1.12",
     "@types/jest": "^29.5.13",
     "@types/node": "^18.11.11",
     "@types/semver": "^7.3.9",