@upcoming/bee-js 9.9.0 → 9.9.1

package/dist/cjs/bee.js

@@ -1231,26 +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 additionalAmount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
-        const targetAmount = duration.isZero()
-            ? BigInt(batch.amount) * multiplier
-            : (BigInt(batch.amount) + additionalAmount) * 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) - 1n) + 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) {
@@ -1262,23 +1264,25 @@ 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 = duration.isZero()
-            ? 0n
-            : (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 currentCost = (0, stamps_1.getStampCost)(batch.depth, batch.amount);
-        const newCost = (0, stamps_1.getStampCost)(depth, BigInt(batch.amount) + amount);
+        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 currentCost = (0, stamps_1.getStampCost)(batch.depth, batch.amount);
-        const newCost = (0, stamps_1.getStampCost)(depth, batch.amount);
+        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) {