@upcoming/bee-js 9.8.0 → 9.9.1

package/dist/cjs/bee.js

@@ -1231,25 +1231,28 @@ class Bee {
         const depth = (0, stamps_1.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) +
-            (0, stamps_1.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 = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice, blockTime);
+        const currentAmount = (0, stamps_1.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 = (0, stamps_1.getDepthForSize)(size, encryption, erasureCodeLevel);
         const delta = depth - batch.depth;
         if (delta <= 0) {
             throw new error_1.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 = (0, stamps_1.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) {
@@ -1261,22 +1264,26 @@ 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 = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
+        const blockTime = this.network === 'gnosis' ? 5 : 15;
+        const amount = duration.isZero() ? 0n : (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice, blockTime);
         const depth = (0, stamps_1.getDepthForSize)(size, encryption, erasureCodeLevel);
-        const currentValue = (0, stamps_1.getStampCost)(batch.depth, batch.amount);
-        const newValue = (0, stamps_1.getStampCost)(depth, amount);
-        return newValue.minus(currentValue);
+        const currentAmount = (0, stamps_1.getAmountForDuration)(batch.duration, chainState.currentPrice, blockTime);
+        const currentCost = (0, stamps_1.getStampCost)(batch.depth, currentAmount);
+        const newCost = (0, stamps_1.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 = (0, stamps_1.getDepthForSize)(size, encryption, erasureCodeLevel);
         const delta = depth - batch.depth;
         if (delta <= 0) {
             throw new error_1.BeeArgumentError('New depth has to be greater than the original depth', depth);
         }
-        const currentPaid = (0, stamps_1.getStampCost)(batch.depth, batch.amount);
-        const newPaid = (0, stamps_1.getStampCost)(depth, batch.amount);
-        return newPaid.minus(currentPaid);
+        const currentAmount = (0, stamps_1.getAmountForDuration)(batch.duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
+        const currentCost = (0, stamps_1.getStampCost)(batch.depth, currentAmount);
+        const newCost = (0, stamps_1.getStampCost)(depth, currentAmount);
+        return newCost.minus(currentCost);
     }
     async getDurationExtensionCost(postageBatchId, duration, options) {
         const batch = await this.getPostageBatch(postageBatchId, options);

package/dist/cjs/manifest/manifest.js

@@ -1,9 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MantarayNode = exports.Fork = void 0;
 const cafe_utility_1 = require("cafe-utility");
+const debug_1 = __importDefault(require("debug"));
 const __1 = require("..");
 const typed_bytes_1 = require("../utils/typed-bytes");
+const debug = (0, debug_1.default)('bee-js:manifest');
 const ENCODER = new TextEncoder();
 const DECODER = new TextDecoder();
 const TYPE_VALUE = 2;
@@ -61,6 +66,11 @@ 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: cafe_utility_1.Binary.uint8ArrayToHex(this.node.selfAddress),
+        });
         if (this.node.metadata) {
             const metadataBytes = cafe_utility_1.Binary.padEndToMultiple(new Uint8Array([0x00, 0x00, ...ENCODER.encode(JSON.stringify(this.node.metadata))]), 32, 0x0a);
             const metadataLengthBytes = cafe_utility_1.Binary.numberToUint16(metadataBytes.length - 2, 'BE');
@@ -73,8 +83,17 @@ class Fork {
         const type = cafe_utility_1.Binary.uint8ToNumber(reader.read(1));
         const prefixLength = cafe_utility_1.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: cafe_utility_1.Binary.uint8ArrayToHex(selfAddress),
+        });
         let metadata = undefined;
         if (isType(type, TYPE_WITH_METADATA)) {
             const metadataLength = cafe_utility_1.Binary.uint16ToNumber(reader.read(2), 'BE');
@@ -209,12 +228,12 @@ class MantarayNode {
             throw new Error('MantarayNode#unmarshal invalid version hash');
         }
         const targetAddressLength = cafe_utility_1.Binary.uint8ToNumber(reader.read(1));
-        const targetAddress = targetAddressLength === 0 ? __1.NULL_ADDRESS : reader.read(targetAddressLength);
+        const targetAddress = targetAddressLength ? reader.read(targetAddressLength) : __1.NULL_ADDRESS;
         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')) {
-                const newFork = Fork.unmarshal(reader, targetAddressLength);
+                const newFork = Fork.unmarshal(reader, selfAddress.length);
                 node.forks.set(i, newFork);
                 newFork.node.parent = node;
             }
@@ -227,6 +246,7 @@ 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 typed_bytes_1.Reference(reference).represent() });
         // TODO: this should not be ignored
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         let tip = this;

package/dist/cjs/utils/duration.js

@@ -5,8 +5,8 @@ const cafe_utility_1 = require("cafe-utility");
 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) {
@@ -51,5 +51,9 @@ class Duration {
     represent() {
         return cafe_utility_1.Dates.secondsToHumanTime(this.seconds);
     }
+    isZero() {
+        return this.seconds === 0;
+    }
 }
 exports.Duration = Duration;
+Duration.ZERO = new Duration(0);

package/dist/cjs/utils/http.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.http = exports.DEFAULT_HTTP_CONFIG = void 0;
 const axios_1 = __importDefault(require("axios"));
 const cafe_utility_1 = require("cafe-utility");
+const debug_1 = __importDefault(require("debug"));
 const index_1 = require("../index");
+const debug = (0, debug_1.default)('bee-js:http');
 const { AxiosError } = axios_1.default;
 const MAX_FAILED_ATTEMPTS = 100000;
 const DELAY_FAST = 200;
@@ -41,6 +43,10 @@ async function http(options, config) {
     let failedAttempts = 0;
     while (failedAttempts < MAX_FAILED_ATTEMPTS) {
         try {
+            debug(`${requestConfig.method || 'get'} ${cafe_utility_1.Strings.joinUrl([
+                requestConfig.baseURL,
+                requestConfig.url,
+            ])}`, { headers: { ...requestConfig.headers }, params: requestConfig.params });
             maybeRunOnRequestHook(options, requestConfig);
             const response = await (0, axios_1.default)(requestConfig);
             return response;