@upcoming/bee-js 0.17.0 → 9.4.0

package/README.md

@@ -13,7 +13,7 @@
 
 > Write your code in CJS, MJS or TypeScript.
 
-> Intended to be used with Bee version 2.4.0.
+> Intended to be used with Bee version 2.5.0.
 
 ## Quick start
 
@@ -250,7 +250,7 @@ main()
 async function main() {
   const bee = new Bee(SWARM_GATEWAY_URL)
   const { reference } = await bee.uploadData(NULL_STAMP, 'Hello, World!')
-  console.log(reference)
+  console.log(reference.toHex())
 }
 ```
 
@@ -272,7 +272,7 @@ async function getOrCreatePostageBatch() {
   if (usable) {
     batchId = usable.batchID
   } else {
-    batchId = await bee.createPostageBatch('500000000', 20)
+    batchId = await bee.buyStorage(Size.fromGigabytes(1), Duration.fromDays(7))
   }
 }
 ```
@@ -348,6 +348,9 @@ const bee = new Bee('http://localhost:1633', {
 Stay up to date by joining the [official Discord](https://discord.gg/GU22h2utj6) and by keeping an eye on the
 [releases tab](https://github.com/ethersphere/bee-js/releases).
 
+We are using [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) for our commit messages and pull
+requests, following the [Semantic Versioning](https://semver.org/) rules.
+
 There are some ways you can make this module better:
 
 - Consult our [open issues](https://github.com/ethersphere/bee-js/issues) and take on one of them
@@ -374,6 +377,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

package/dist/cjs/bee.js

@@ -47,6 +47,7 @@ const grantee = __importStar(require("./modules/grantee"));
 const gsoc = __importStar(require("./modules/gsoc"));
 const pinning = __importStar(require("./modules/pinning"));
 const pss = __importStar(require("./modules/pss"));
+const rchash_1 = require("./modules/rchash");
 const status = __importStar(require("./modules/status"));
 const stewardship = __importStar(require("./modules/stewardship"));
 const tag = __importStar(require("./modules/tag"));
@@ -84,6 +85,7 @@ class Bee {
         if (options?.signer) {
             this.signer = new typed_bytes_1.PrivateKey(options.signer);
         }
+        this.network = options?.network ?? 'gnosis';
         this.requestOptions = {
             baseURL: this.url,
             timeout: options?.timeout ?? 0,
@@ -864,6 +866,12 @@ class Bee {
         reference = new typed_bytes_1.Reference(reference);
         return (0, envelope_1.postEnvelope)(this.getRequestOptionsForCall(options), postageBatchId, reference);
     }
+    /**
+     * Get reserve commitment hash duration seconds
+     */
+    async rchash(depth, anchor1, anchor2, options) {
+        return (0, rchash_1.rchash)(this.getRequestOptionsForCall(options), depth, anchor1, anchor2);
+    }
     /**
      * Ping the Bee node to see if there is a live Bee node on the given URL.
      *
@@ -1138,7 +1146,7 @@ class Bee {
      * @throws TypeError if non-integer value is passed to amount or depth
      *
      * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/develop/access-the-swarm/introduction/#keep-your-data-alive)
-     * @see [Bee Debug API reference - `POST /stamps`](https://docs.ethswarm.org/debug-api/#tag/Postage-Stamps/paths/~1stamps~1{amount}~1{depth}/post)
+     * @see [Bee Debug API reference - `POST /stamps`](https://docs.ethswarm.org/api/#tag/Postage-Stamps/paths/~1stamps~1{amount}~1{depth}/post)
      */
     async createPostageBatch(amount, depth, options, requestOptions) {
         const amountString = (0, type_1.asNumberString)(amount, { min: 0n, name: 'amount' });
@@ -1149,7 +1157,7 @@ class Bee {
             throw new error_1.BeeArgumentError(`Depth has to be between ${types_1.STAMPS_DEPTH_MIN}..${types_1.STAMPS_DEPTH_MAX}`, depth);
         }
         const chainState = await this.getChainState();
-        const minimumAmount = BigInt(chainState.currentPrice) * 17280n;
+        const minimumAmount = BigInt(chainState.currentPrice) * 17280n + 1n;
         if (BigInt(amountString) < minimumAmount) {
             throw new error_1.BeeArgumentError(`Amount has to be at least ${minimumAmount} (1 day at current price ${chainState.currentPrice})`, amountString);
         }
@@ -1161,7 +1169,7 @@ class Bee {
     }
     async buyStorage(size, duration, options, requestOptions) {
         const chainState = await this.getChainState(requestOptions);
-        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice);
+        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
         const depth = (0, stamps_1.getDepthForSize)(size);
         if (options) {
             options = (0, type_1.preparePostageBatchOptions)(options);
@@ -1170,7 +1178,7 @@ class Bee {
     }
     async getStorageCost(size, duration, options) {
         const chainState = await this.getChainState(options);
-        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice);
+        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
         const depth = (0, stamps_1.getDepthForSize)(size);
         return (0, stamps_1.getStampCost)(depth, amount);
     }
@@ -1181,19 +1189,19 @@ class Bee {
         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), options);
+        await this.topUpBatch(batch.batchID, BigInt(batch.amount) * 2n ** BigInt(delta - 1) + 1n, options);
         return this.diluteBatch(batch.batchID, depth, options);
     }
     async extendStorageDuration(postageBatchId, duration, options) {
         const batch = await this.getPostageBatch(postageBatchId, options);
         const chainState = await this.getChainState(options);
-        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice);
+        const amount = (0, stamps_1.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 = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice);
+        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
         const depth = (0, stamps_1.getDepthForSize)(size);
         const currentValue = (0, stamps_1.getStampCost)(batch.depth, batch.amount);
         const newValue = (0, stamps_1.getStampCost)(depth, amount);
@@ -1213,7 +1221,7 @@ class Bee {
     async getDurationExtensionCost(postageBatchId, duration, options) {
         const batch = await this.getPostageBatch(postageBatchId, options);
         const chainState = await this.getChainState(options);
-        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice);
+        const amount = (0, stamps_1.getAmountForDuration)(duration, chainState.currentPrice, this.network === 'gnosis' ? 5 : 15);
         return (0, stamps_1.getStampCost)(batch.depth, amount);
     }
     /**
@@ -1227,7 +1235,7 @@ class Bee {
      * @param options Request options
      *
      * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/develop/access-the-swarm/introduction/#keep-your-data-alive)
-     * @see [Bee Debug API reference - `PATCH /stamps/topup/${id}/${amount}`](https://docs.ethswarm.org/debug-api/#tag/Postage-Stamps/paths/~1stamps~1topup~1{id}~1{amount}/patch)
+     * @see [Bee Debug API reference - `PATCH /stamps/topup/${id}/${amount}`](https://docs.ethswarm.org/api/#tag/Postage-Stamps/paths/~1stamps~1topup~1{batch_id}~1{amount}/patch)
      */
     async topUpBatch(postageBatchId, amount, options) {
         postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
@@ -1246,7 +1254,7 @@ class Bee {
      * @param options Request options
      *
      * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/develop/access-the-swarm/introduction/#keep-your-data-alive)
-     * @see [Bee Debug API reference - `PATCH /stamps/topup/${id}/${amount}`](https://docs.ethswarm.org/debug-api/#tag/Postage-Stamps/paths/~1stamps~1topup~1{id}~1{amount}/patch)
+     * @see [Bee Debug API reference - `PATCH /stamps/topup/${id}/${amount}`](https://docs.ethswarm.org/api/#tag/Postage-Stamps/paths/~1stamps~1dilute~1%7Bbatch_id%7D~1%7Bdepth%7D/patch)
      */
     async diluteBatch(postageBatchId, depth, options) {
         postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
@@ -1259,7 +1267,7 @@ class Bee {
      * @param postageBatchId Batch ID
      *
      * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/develop/access-the-swarm/introduction/#keep-your-data-alive)
-     * @see [Bee Debug API reference - `GET /stamps/${id}`](https://docs.ethswarm.org/debug-api/#tag/Postage-Stamps/paths/~1stamps~1{id}/get)
+     * @see [Bee Debug API reference - `GET /stamps/${id}`](https://docs.ethswarm.org/api/#tag/Postage-Stamps/paths/~1stamps~1%7Bbatch_id%7D/get)
      */
     async getPostageBatch(postageBatchId, options) {
         postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
@@ -1271,7 +1279,7 @@ class Bee {
      * @param postageBatchId Batch ID
      *
      * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/develop/access-the-swarm/introduction/#keep-your-data-alive)
-     * @see [Bee Debug API reference - `GET /stamps/${id}/buckets`](https://docs.ethswarm.org/debug-api/#tag/Postage-Stamps/paths/~1stamps~1{id}~1buckets/get)
+     * @see [Bee Debug API reference - `GET /stamps/${id}/buckets`](https://docs.ethswarm.org/api/#tag/Postage-Stamps/paths/~1stamps~1%7Bbatch_id%7D~1buckets/get)
      */
     async getPostageBatchBuckets(postageBatchId, options) {
         postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
@@ -1281,15 +1289,32 @@ class Bee {
      * Return all postage batches that has the node available.
      *
      * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/develop/access-the-swarm/introduction/#keep-your-data-alive)
-     * @see [Bee Debug API reference - `GET /stamps`](https://docs.ethswarm.org/debug-api/#tag/Postage-Stamps/paths/~1stamps/get)
+     * @see [Bee Debug API reference - `GET /stamps`](https://docs.ethswarm.org/api/#tag/Postage-Stamps/paths/~1stamps/get)
+     * @deprecated Use `getPostageBatches` instead
      */
     async getAllPostageBatch(options) {
-        return stamps.getAllPostageBatches(this.getRequestOptionsForCall(options));
+        return stamps.getAllPostageBatches(this.getRequestOptionsForCall(options)); // TODO: remove in June 2025
     }
     /**
      * Return all globally available postage batches.
+     * @deprecated Use `getGlobalPostageBatches` instead
      */
     async getAllGlobalPostageBatch(options) {
+        return stamps.getGlobalPostageBatches(this.getRequestOptionsForCall(options)); // TODO: remove in June 2025
+    }
+    /**
+     * Return all postage batches that belong to the node.
+     *
+     * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/develop/access-the-swarm/introduction/#keep-your-data-alive)
+     * @see [Bee Debug API reference - `GET /stamps`](https://docs.ethswarm.org/api/#tag/Postage-Stamps/paths/~1stamps/get)
+     */
+    async getPostageBatches(options) {
+        return stamps.getAllPostageBatches(this.getRequestOptionsForCall(options));
+    }
+    /**
+     * Return all globally available postage batches.
+     */
+    async getGlobalPostageBatches(options) {
         return stamps.getGlobalPostageBatches(this.getRequestOptionsForCall(options));
     }
     /**

package/dist/cjs/feed/index.js

@@ -114,6 +114,7 @@ function makeFeedReader(requestOptions, topic, owner) {
         return {
             payload: update.payload,
             feedIndex,
+            feedIndexNext: feedIndex.next(),
         };
     };
     const downloadPayload = async (options) => {
@@ -128,6 +129,7 @@ function makeFeedReader(requestOptions, topic, owner) {
         return {
             payload,
             feedIndex,
+            feedIndexNext: feedIndex.next(),
         };
     };
     const downloadReference = async (options) => {
@@ -139,6 +141,7 @@ function makeFeedReader(requestOptions, topic, owner) {
         return {
             reference: new typed_bytes_1.Reference(payload.payload.toUint8Array()),
             feedIndex: payload.feedIndex,
+            feedIndexNext: payload.feedIndexNext ?? payload.feedIndex.next(),
         };
     };
     return {

package/dist/cjs/manifest/manifest.js

@@ -20,6 +20,22 @@ class Fork {
     }
     static split(a, b) {
         const commonPart = cafe_utility_1.Binary.commonPrefix(a.prefix, b.prefix);
+        if (commonPart.length === a.prefix.length) {
+            const remainingB = b.prefix.slice(commonPart.length);
+            b.node.path = b.prefix.slice(commonPart.length);
+            b.prefix = b.prefix.slice(commonPart.length);
+            b.node.parent = a.node;
+            a.node.forks.set(remainingB[0], b);
+            return a;
+        }
+        if (commonPart.length === b.prefix.length) {
+            const remainingA = a.prefix.slice(commonPart.length);
+            a.node.path = a.prefix.slice(commonPart.length);
+            a.prefix = a.prefix.slice(commonPart.length);
+            a.node.parent = b.node;
+            b.node.forks.set(remainingA[0], a);
+            return b;
+        }
         const node = new MantarayNode({ path: commonPart });
         const newAFork = new Fork(a.prefix.slice(commonPart.length), a.node);
         const newBFork = new Fork(b.prefix.slice(commonPart.length), b.node);
@@ -58,13 +74,13 @@ class Fork {
         const prefixLength = cafe_utility_1.Binary.uint8ToNumber(reader.read(1));
         const prefix = reader.read(prefixLength);
         reader.read(30 - prefixLength);
-        const targetAddress = reader.read(32);
+        const selfAddress = reader.read(32);
         let metadata = undefined;
         if (isType(type, TYPE_WITH_METADATA)) {
             const metadataLength = cafe_utility_1.Binary.uint16ToNumber(reader.read(2), 'BE');
             metadata = JSON.parse(DECODER.decode(reader.read(metadataLength)));
         }
-        return new Fork(prefix, new MantarayNode({ targetAddress, metadata, path: prefix }));
+        return new Fork(prefix, new MantarayNode({ selfAddress, metadata, path: prefix }));
     }
 }
 exports.Fork = Fork;
@@ -175,15 +191,16 @@ class MantarayNode {
      * Do not forget calling `loadRecursively` on the returned node to load the entire tree.
      */
     static async unmarshal(bee, reference, options, requestOptions) {
+        reference = new typed_bytes_1.Reference(reference);
         const data = (await bee.downloadData(reference, options, requestOptions)).toUint8Array();
-        return this.unmarshalFromData(data);
+        return this.unmarshalFromData(data, reference.toUint8Array());
     }
     /**
      * Unmarshals a MantarayNode from the given data.
      *
      * Do not forget calling `loadRecursively` on the returned node to load the entire tree.
      */
-    static unmarshalFromData(data) {
+    static unmarshalFromData(data, selfAddress) {
         const obfuscationKey = data.subarray(0, 32);
         const decrypted = cafe_utility_1.Binary.xorCypher(data.subarray(32), obfuscationKey);
         const reader = new cafe_utility_1.Uint8ArrayReader(decrypted);
@@ -193,7 +210,7 @@ class MantarayNode {
         }
         const targetAddressLength = cafe_utility_1.Binary.uint8ToNumber(reader.read(1));
         const targetAddress = targetAddressLength === 0 ? __1.NULL_ADDRESS : reader.read(targetAddressLength);
-        const node = new MantarayNode({ targetAddress, obfuscationKey });
+        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')) {
@@ -290,7 +307,10 @@ class MantarayNode {
      */
     async loadRecursively(bee, options, requestOptions) {
         for (const fork of this.forks.values()) {
-            const node = await MantarayNode.unmarshal(bee, fork.node.targetAddress, options, requestOptions);
+            if (!fork.node.selfAddress) {
+                throw Error('MantarayNode#loadRecursively fork.node.selfAddress is not set');
+            }
+            const node = await MantarayNode.unmarshal(bee, fork.node.selfAddress, options, requestOptions);
             fork.node.targetAddress = node.targetAddress;
             fork.node.forks = node.forks;
             fork.node.path = fork.prefix;

package/dist/cjs/modules/rchash.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rchash = void 0;
+const cafe_utility_1 = require("cafe-utility");
+const http_1 = require("../utils/http");
+const RCHASH_ENDPOINT = 'rchash';
+async function rchash(requestOptions, depth, anchor1, anchor2) {
+    const response = await (0, http_1.http)(requestOptions, {
+        responseType: 'json',
+        url: `${RCHASH_ENDPOINT}/${depth}/${anchor1}/${anchor2}`,
+    });
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    return cafe_utility_1.Types.asNumber(body.durationSeconds, { name: 'durationSeconds' });
+}
+exports.rchash = rchash;

package/dist/cjs/utils/bytes.js

@@ -69,5 +69,8 @@ class Bytes {
     equals(other) {
         return this.toHex() === new Bytes(other).toHex();
     }
+    represent() {
+        return this.toHex();
+    }
 }
 exports.Bytes = Bytes;

package/dist/cjs/utils/duration.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Duration = void 0;
+const cafe_utility_1 = require("cafe-utility");
 class Duration {
     constructor(seconds) {
         this.seconds = Math.ceil(seconds);
@@ -47,5 +48,8 @@ class Duration {
     toEndDate(startDate) {
         return new Date((startDate ?? new Date()).getTime() + this.seconds * 1000);
     }
+    represent() {
+        return cafe_utility_1.Dates.secondsToHumanTime(this.seconds);
+    }
 }
 exports.Duration = Duration;

package/dist/cjs/utils/http.js

@@ -8,6 +8,13 @@ const axios_1 = __importDefault(require("axios"));
 const cafe_utility_1 = require("cafe-utility");
 const index_1 = require("../index");
 const { AxiosError } = axios_1.default;
+const originalObjectKeys = Object.keys;
+Object.keys = function (o) {
+    if (typeof Buffer !== 'undefined' && Buffer.isBuffer(o)) {
+        return ['axios_workaround_for_buffer'];
+    }
+    return originalObjectKeys(o);
+};
 const MAX_FAILED_ATTEMPTS = 100000;
 const DELAY_FAST = 200;
 const DELAY_SLOW = 1000;

package/dist/cjs/utils/size.js

@@ -19,6 +19,12 @@ class Size {
     static fromBytes(bytes) {
         return new Size(bytes);
     }
+    static fromKilobytes(kilobytes) {
+        return new Size(kilobytes * 1000);
+    }
+    static fromMegabytes(megabytes) {
+        return new Size(megabytes * 1000 * 1000);
+    }
     static fromGigabytes(gigabytes) {
         return new Size(gigabytes * 1000 * 1000 * 1000);
     }
@@ -31,5 +37,8 @@ class Size {
     toFormattedString() {
         return cafe_utility_1.Numbers.convertBytes(this.bytes, 1000);
     }
+    represent() {
+        return this.toFormattedString();
+    }
 }
 exports.Size = Size;

package/dist/cjs/utils/stamps.js

@@ -6,6 +6,7 @@ const bytes_1 = require("./bytes");
 const duration_1 = require("./duration");
 const tokens_1 = require("./tokens");
 const type_1 = require("./type");
+const MAX_UTILIZATION = 0.9;
 /**
  * Utility function that calculates usage of postage batch based on its utilization, depth and bucket depth.
  *
@@ -30,35 +31,27 @@ function getStampTheoreticalBytes(depth) {
 exports.getStampTheoreticalBytes = getStampTheoreticalBytes;
 /**
  * Based on https://docs.ethswarm.org/docs/learn/technology/contracts/postage-stamp/#effective-utilisation-table
+ * Optimised for encrypted, medium erasure coding
  */
-const utilisationRateMap = {
-    22: 0.2867,
-    23: 0.4956,
-    24: 0.6433,
-    25: 0.7478,
-    26: 0.8217,
-    27: 0.8739,
-    28: 0.9108,
-    29: 0.9369,
-    30: 0.9554,
-    31: 0.9685,
-    32: 0.9777,
-    33: 0.9842,
-    34: 0.9889,
-};
 const effectiveSizeBreakpoints = [
-    [22, 4.93],
-    [23, 17.03],
-    [24, 44.21],
-    [25, 102.78],
-    [26, 225.87],
-    [27, 480.44],
-    [28, 1001.44],
-    [29, 2060.27],
-    [30, 4201.9],
-    [31, 8519.02],
-    [32, 17199.89],
-    [33, 34628.46],
+    [17, 0.00004089],
+    [18, 0.00609],
+    [19, 0.10249],
+    [20, 0.62891],
+    [21, 2.38],
+    [22, 7.07],
+    [23, 18.24],
+    [24, 43.04],
+    [25, 96.5],
+    [26, 208.52],
+    [27, 435.98],
+    [28, 908.81],
+    [29, 1870],
+    [30, 3810],
+    [31, 7730],
+    [32, 15610],
+    [33, 31430],
+    [34, 63150],
 ];
 /**
  * Utility function that calculates the effective size of a postage batch based on its depth.
@@ -69,16 +62,23 @@ const effectiveSizeBreakpoints = [
  * @returns {number} The effective size of the postage batch in bytes.
  */
 function getStampEffectiveBytes(depth) {
-    if (depth < 22) {
+    if (depth < 17) {
         return 0;
     }
-    const utilRate = utilisationRateMap[depth] ?? 0.99;
-    return Math.ceil(getStampTheoreticalBytes(depth) * utilRate);
+    const breakpoint = effectiveSizeBreakpoints.find(([d, size]) => {
+        if (depth === d) {
+            return size;
+        }
+    });
+    if (breakpoint) {
+        return breakpoint[1] * 1000 * 1000 * 1000;
+    }
+    return Math.ceil(getStampTheoreticalBytes(depth) * MAX_UTILIZATION);
 }
 exports.getStampEffectiveBytes = getStampEffectiveBytes;
 function getStampEffectiveBytesBreakpoints() {
     const map = new Map();
-    for (let i = 22; i < 35; i++) {
+    for (let i = 17; i < 35; i++) {
         map.set(i, getStampEffectiveBytes(i));
     }
     return map;
@@ -98,7 +98,7 @@ exports.getStampCost = getStampCost;
  *
  * @returns {number} The TTL of the postage batch.
  */
-function getStampDuration(amount, pricePerBlock, blockTime = 5) {
+function getStampDuration(amount, pricePerBlock, blockTime) {
     const amountBigInt = BigInt((0, type_1.asNumberString)(amount));
     return duration_1.Duration.fromSeconds(Number((amountBigInt * BigInt(blockTime)) / BigInt(pricePerBlock)));
 }
@@ -110,8 +110,8 @@ exports.getStampDuration = getStampDuration;
  * @param pricePerBlock The price per block in PLUR.
  * @param blockTime The block time in seconds.
  */
-function getAmountForDuration(duration, pricePerBlock, blockTime = 5) {
-    return (BigInt(duration.toSeconds()) / BigInt(blockTime)) * BigInt(pricePerBlock);
+function getAmountForDuration(duration, pricePerBlock, blockTime) {
+    return (BigInt(duration.toSeconds()) / BigInt(blockTime)) * BigInt(pricePerBlock) + 1n;
 }
 exports.getAmountForDuration = getAmountForDuration;
 /**
@@ -122,11 +122,11 @@ exports.getAmountForDuration = getAmountForDuration;
  */
 function getDepthForSize(size) {
     for (const [depth, sizeBreakpoint] of effectiveSizeBreakpoints) {
-        if (size.toGigabytes() <= sizeBreakpoint) {
+        if (size.toBytes() <= sizeBreakpoint * 1000 * 1000 * 1000) {
             return depth;
         }
     }
-    return 34;
+    return 35;
 }
 exports.getDepthForSize = getDepthForSize;
 function convertEnvelopeToMarshaledStamp(envelope) {

package/dist/cjs/utils/type.js

@@ -69,6 +69,7 @@ function prepareUploadOptions(value, name = 'UploadOptions') {
     const object = cafe_utility_1.Types.asObject(value, { name });
     return {
         act: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asBoolean(x, { name: 'act' }), object.act),
+        actHistoryAddress: cafe_utility_1.Types.asOptional(x => new typed_bytes_1.Reference(x), object.actHistoryAddress),
         deferred: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asBoolean(x, { name: 'deferred' }), object.deferred),
         encrypt: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asBoolean(x, { name: 'encrypt' }), object.encrypt),
         pin: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asBoolean(x, { name: 'pin' }), object.pin),

package/dist/cjs/utils/typed-bytes.js

@@ -163,6 +163,7 @@ class Topic extends bytes_1.Bytes {
 }
 exports.Topic = Topic;
 Topic.LENGTH = 32;
+const MAX_UINT64 = new Uint8Array(8).fill(0xff, 0, 8);
 class FeedIndex extends bytes_1.Bytes {
     constructor(bytes) {
         super(bytes, 8);
@@ -173,7 +174,13 @@ class FeedIndex extends bytes_1.Bytes {
     toBigInt() {
         return cafe_utility_1.Binary.uint64ToNumber(this.bytes, 'BE');
     }
+    next() {
+        if (cafe_utility_1.Binary.equals(this.bytes, MAX_UINT64)) {
+            return FeedIndex.fromBigInt(0n);
+        }
+        return FeedIndex.fromBigInt(this.toBigInt() + 1n);
+    }
 }
 exports.FeedIndex = FeedIndex;
 FeedIndex.LENGTH = 8;
-FeedIndex.MINUS_ONE = new FeedIndex(new Uint8Array(8).fill(0xff, 0, 8));
+FeedIndex.MINUS_ONE = new FeedIndex(MAX_UINT64);