fix: fix minimum postage batch amount being off by one (#1021)

* fix: fix minimum postage batch amount being off by one

* test: adjust batch amounts in tests

Author: Cafe137

README.md

@@ -374,6 +374,8 @@ After making changes, link the package to your project by running `npm link` in
 
 ### Test
 
+[Code coverage](https://bah5acgza26tlmya36bdiu5cdfs3hh22hqthkhfv6cvq2ugxqrv5aw267ydlq.bzz.limo/)
+
 Tests are currently run against a mainnet Bee nodes. This is temporary and this section will be revised in the future.
 
 ## License

src/bee.ts

@@ -1615,7 +1615,7 @@ export class Bee {
     }
 
     const chainState = await this.getChainState()
-    const minimumAmount = BigInt(chainState.currentPrice) * 17280n
+    const minimumAmount = BigInt(chainState.currentPrice) * 17280n + 1n
 
     if (BigInt(amountString) < minimumAmount) {
       throw new BeeArgumentError(
@@ -1672,7 +1672,7 @@ export class Bee {
       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), options)
+    await this.topUpBatch(batch.batchID, BigInt(batch.amount) * 2n ** BigInt(delta - 1) + 1n, options)
 
     return this.diluteBatch(batch.batchID, depth, options)
   }

src/utils/stamps.ts

@@ -122,7 +122,7 @@ export function getStampDuration(
  * @param blockTime The block time in seconds.
  */
 export function getAmountForDuration(duration: Duration, pricePerBlock: number, blockTime: number): bigint {
-  return (BigInt(duration.toSeconds()) / BigInt(blockTime)) * BigInt(pricePerBlock)
+  return (BigInt(duration.toSeconds()) / BigInt(blockTime)) * BigInt(pricePerBlock) + 1n
 }
 
 /**

test/integration/stamp.spec.ts

@@ -21,10 +21,10 @@ test('GET batches', async () => {
 })
 
 test('POST stamps', async () => {
-  const response = await bee.createPostageBatch('780000000', 17, { waitForUsable: true })
+  const response = await bee.createPostageBatch('580000000', 17, { waitForUsable: true })
   expect(response.toHex()).toHaveLength(64)
 
-  await bee.topUpBatch(response, '780000000')
+  await bee.topUpBatch(response, '580000000')
 
   await System.waitFor(
     async () => {

test/integration/stamp.ux.spec.ts

@@ -14,10 +14,10 @@ test('Utils.getDepthForSize', () => {
 })
 
 test('Utils.getAmountForDuration', () => {
-  expect(Utils.getAmountForDuration(Duration.fromHours(25), 24000, 5)).toBe((414720000n / 24n) * 25n)
-  expect(Utils.getAmountForDuration(Duration.fromDays(1), 24000, 5)).toBe(414720000n)
-  expect(Utils.getAmountForDuration(Duration.fromWeeks(1), 24000, 5)).toBe(414720000n * 7n)
-  expect(Utils.getAmountForDuration(Duration.fromYears(1), 24000, 5)).toBe(414720000n * 365n)
+  expect(Utils.getAmountForDuration(Duration.fromHours(25), 24000, 5)).toBe((414720000n / 24n) * 25n + 1n)
+  expect(Utils.getAmountForDuration(Duration.fromDays(1), 24000, 5)).toBe(414720000n + 1n)
+  expect(Utils.getAmountForDuration(Duration.fromWeeks(1), 24000, 5)).toBe(414720000n * 7n + 1n)
+  expect(Utils.getAmountForDuration(Duration.fromYears(1), 24000, 5)).toBe(414720000n * 365n + 1n)
 })
 
 test('bee.getStorageCost', async () => {
@@ -61,7 +61,7 @@ test('bee.getExtensionCost', async () => {
       Size.fromGigabytes(18),
       Duration.fromYears(1),
     )
-    expect(cost.toDecimalString()).toBe('209.0182760562950144')
+    expect(cost.toDecimalString()).toBe('209.0182760579727360')
   })
 })
 
@@ -80,23 +80,23 @@ test('bee.buyStorage with extensions', async () => {
     // create stamp
     'GET /chainstate',
     'GET /chainstate',
-    'POST /stamps/458922240/22',
+    'POST /stamps/458922241/22',
     'GET /stamps/b330000000000000000000000000000000000000000000000000000000000000',
     // create stamp, do not wait for usable
     'GET /chainstate',
     'GET /chainstate',
-    'POST /stamps/458922240/22',
+    'POST /stamps/458922241/22',
     // extend duration
     'GET /stamps/b330000000000000000000000000000000000000000000000000000000000000',
     'GET /chainstate',
-    'PATCH /stamps/topup/b330000000000000000000000000000000000000000000000000000000000000/458922240',
+    'PATCH /stamps/topup/b330000000000000000000000000000000000000000000000000000000000000/458922241',
     // extend size +1 depth
     'GET /stamps/b330000000000000000000000000000000000000000000000000000000000000',
-    'PATCH /stamps/topup/b330000000000000000000000000000000000000000000000000000000000000/458922240',
+    'PATCH /stamps/topup/b330000000000000000000000000000000000000000000000000000000000000/458922241',
     'PATCH /stamps/dilute/b330000000000000000000000000000000000000000000000000000000000000/23',
     // extend size +2 depth
     'GET /stamps/b330000000000000000000000000000000000000000000000000000000000000',
-    'PATCH /stamps/topup/b330000000000000000000000000000000000000000000000000000000000000/917844480',
+    'PATCH /stamps/topup/b330000000000000000000000000000000000000000000000000000000000000/917844481',
     'PATCH /stamps/dilute/b330000000000000000000000000000000000000000000000000000000000000/24',
     // error case
     'GET /stamps/b330000000000000000000000000000000000000000000000000000000000000',

test/integration/stamper.spec.ts

@@ -7,7 +7,7 @@ test('Stamper', async () => {
 
   const stamper = Stamper.fromBlank(
     Types.asString(process.env.JEST_BEE_FULL_PK),
-    'ae0b4d8548d17fb70672c5e7a9717de5f855d3f398a3cc2f0e445e2eecca2622',
+    'b24b3f3ac5c7727cb9ad17b15167e75df33708f201c947f3cc6658348c2df31d',
     17,
   )
 

test/mocks.ts

@@ -28,7 +28,7 @@ responses.set(
 )
 
 responses.set(
-  'POST /stamps/458922240/22',
+  'POST /stamps/458922241/22',
   JSON.stringify({ batchID: 'b330000000000000000000000000000000000000000000000000000000000000' }),
 )
 
@@ -50,14 +50,14 @@ responses.set(
 )
 
 responses.set(
-  'PATCH /stamps/topup/b330000000000000000000000000000000000000000000000000000000000000/458922240',
+  'PATCH /stamps/topup/b330000000000000000000000000000000000000000000000000000000000000/458922241',
   JSON.stringify({
     batchID: 'b330000000000000000000000000000000000000000000000000000000000000',
   }),
 )
 
 responses.set(
-  'PATCH /stamps/topup/b330000000000000000000000000000000000000000000000000000000000000/917844480',
+  'PATCH /stamps/topup/b330000000000000000000000000000000000000000000000000000000000000/917844481',
   JSON.stringify({
     batchID: 'b330000000000000000000000000000000000000000000000000000000000000',
   }),