@ethersphere/bee-js 13.0.0-upcoming.gcfb9756 → 13.0.0

package/dist/cjs/manifest/manifest.js

@@ -1,152 +1,101 @@
 "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;
+exports.MantarayNode = 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;
-const TYPE_EDGE = 4;
-const TYPE_WITH_PATH_SEPARATOR = 8;
-const TYPE_WITH_METADATA = 16;
-const PATH_SEPARATOR = new Uint8Array([47]);
-const VERSION_02_HASH_HEX = '5768b3b6a7db56d21d1abff40d41cebfc83448fed8d7e9b06ec0d3b073f28f7b';
-const VERSION_02_HASH = cafe_utility_1.Binary.hexToUint8Array(VERSION_02_HASH_HEX);
-class Fork {
-    constructor(prefix, node) {
-        this.prefix = prefix;
-        this.node = node;
-    }
-    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);
-        a.node.path = a.prefix.slice(commonPart.length);
-        b.node.path = b.prefix.slice(commonPart.length);
-        a.prefix = a.prefix.slice(commonPart.length);
-        b.prefix = b.prefix.slice(commonPart.length);
-        node.forks.set(newAFork.prefix[0], newAFork);
-        node.forks.set(newBFork.prefix[0], newBFork);
-        newAFork.node.parent = node;
-        newBFork.node.parent = node;
-        return new Fork(commonPart, node);
-    }
-    marshal() {
-        if (!this.node.selfAddress) {
-            throw Error('Fork#marshal node.selfAddress is not set');
-        }
-        const data = [];
-        // Re-emit the type byte read from the chunk when the node is untouched, so an
-        // unmarshal → marshal round-trip is byte-identical. determineType() can only
-        // recompute it correctly once the node's children are loaded/built in memory.
-        data.push(new Uint8Array([this.node.type ?? this.node.determineType()]));
-        data.push(cafe_utility_1.Binary.numberToUint8(this.prefix.length));
-        data.push(this.prefix);
-        if (this.prefix.length < 30) {
-            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');
-            metadataBytes.set(metadataLengthBytes, 0);
-            data.push(metadataBytes);
+const core_sdk_1 = require("@ethersphere/core-sdk");
+/**
+ * Uploads `node` and every node beneath it, updating each `selfAddress` in
+ * place. Only the network/ACT-history side is bee-js specific - the trie
+ * structure and marshaling live entirely in core-sdk's MantarayNode.
+ */
+async function saveRecursively(node, bee, postageBatchId, options, requestOptions) {
+    for (const fork of node.forks.values()) {
+        const uploadResult = await saveRecursively(fork.node, bee, postageBatchId, options, requestOptions);
+        if (options?.act) {
+            let historyAddress;
+            uploadResult.historyAddress.ifPresent(ref => (historyAddress = ref));
+            if (historyAddress) {
+                if (!fork.node.metadata) {
+                    fork.node.metadata = {};
+                }
+                fork.node.metadata['swarm-act-history-address'] = historyAddress.toHex();
+            }
         }
-        return cafe_utility_1.Binary.concatBytes(...data);
     }
-    static unmarshal(reader, addressLength) {
-        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);
-        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');
-            metadata = JSON.parse(DECODER.decode(reader.read(metadataLength)));
-        }
-        return new Fork(prefix, new MantarayNode({ selfAddress, metadata, path: prefix, type }));
+    const result = await bee.data.upload(postageBatchId, await node.marshal(), options, requestOptions);
+    node.selfAddress = result.reference.toUint8Array();
+    return result;
+}
+/**
+ * Downloads and unmarshals every node beneath `node`, following ACT history
+ * metadata left by {@link saveRecursively} where present.
+ */
+async function loadRecursively(node, bee, options, requestOptions) {
+    for (const fork of node.forks.values()) {
+        if (!fork.node.selfAddress) {
+            throw Error('MantarayNode#loadRecursively fork.node.selfAddress is not set');
+        }
+        let downloadOptions = options;
+        if (fork.node.metadata && fork.node.metadata['swarm-act-history-address']) {
+            downloadOptions = {
+                ...options,
+                actHistoryAddress: fork.node.metadata['swarm-act-history-address'],
+            };
+        }
+        const data = (await bee.data.download(fork.node.selfAddress, downloadOptions, requestOptions)).toUint8Array();
+        const loaded = core_sdk_1.MantarayNode.unmarshalFromData(data, fork.node.selfAddress);
+        fork.node.targetAddress = loaded.targetAddress;
+        fork.node.forks = loaded.forks;
+        fork.node.path = fork.prefix;
+        fork.node.parent = node;
+        await loadRecursively(fork.node, bee, options, requestOptions);
     }
 }
-exports.Fork = Fork;
+/**
+ * bee-js's Bee-client-coupled view of a Mantaray node: the trie structure,
+ * marshaling, and byte-level operations all delegate to core-sdk's
+ * `MantarayNode`; this class only adds what needs a live `Bee` instance
+ * (uploading/downloading, ACT history, feed resolution).
+ */
 class MantarayNode {
-    constructor(options) {
-        this.obfuscationKey = new Uint8Array(32);
-        this.selfAddress = null;
-        this.targetAddress = new Uint8Array(32);
-        this.metadata = null;
-        this.path = new Uint8Array(0);
-        this.forks = new Map();
-        this.parent = null;
-        this.type = null;
-        if (options?.targetAddress) {
-            this.targetAddress = options.targetAddress;
-        }
-        if (options?.selfAddress) {
-            this.selfAddress = options.selfAddress;
-        }
-        if (options?.metadata) {
-            this.metadata = options.metadata;
-        }
-        if (options?.obfuscationKey) {
-            this.obfuscationKey = options.obfuscationKey;
-        }
-        if (options?.path) {
-            this.path = options.path;
-        }
-        if (options?.parent) {
-            this.parent = options.parent;
-        }
-        this.type = options?.type ?? null;
+    constructor(core = new core_sdk_1.MantarayNode()) {
+        this.core = core;
+    }
+    get obfuscationKey() {
+        return this.core.obfuscationKey;
+    }
+    get selfAddress() {
+        return this.core.selfAddress;
+    }
+    get targetAddress() {
+        return this.core.targetAddress;
+    }
+    get metadata() {
+        return this.core.metadata;
+    }
+    get path() {
+        return this.core.path;
+    }
+    get forks() {
+        return this.core.forks;
+    }
+    get parent() {
+        return this.core.parent;
+    }
+    get type() {
+        return this.core.type;
     }
     get fullPath() {
-        return cafe_utility_1.Binary.concatBytes(this.parent?.fullPath ?? new Uint8Array(0), this.path);
+        return this.core.fullPath;
     }
     get fullPathString() {
-        return DECODER.decode(this.fullPath);
+        return this.core.fullPathString;
     }
     /**
      * Returns the metadata at the `/` path to access idiomatic properties.
      */
     getRootMetadata() {
-        const node = this.find('/');
+        const node = this.core.find('/');
         if (node && node.metadata) {
             return cafe_utility_1.Optional.of(node.metadata);
         }
@@ -156,7 +105,7 @@ class MantarayNode {
      * Returns the `swarm-index-document` and `swarm-error-document` metadata values.
      */
     getDocsMetadata() {
-        const node = this.find('/');
+        const node = this.core.find('/');
         if (!node || !node.metadata) {
             return { indexDocument: null, errorDocument: null };
         }
@@ -169,7 +118,7 @@ class MantarayNode {
      * Attempts to resolve the manifest as a feed, returning the latest update.
      */
     async resolveFeed(bee, requestOptions) {
-        const node = this.find('/');
+        const node = this.core.find('/');
         if (!node || !node.metadata) {
             return cafe_utility_1.Optional.empty();
         }
@@ -184,40 +133,7 @@ class MantarayNode {
      * Gets the binary representation of the node.
      */
     async marshal() {
-        for (const fork of this.forks.values()) {
-            if (!fork.node.selfAddress) {
-                fork.node.selfAddress = (await fork.node.calculateSelfAddress()).toUint8Array();
-            }
-        }
-        const hasEntry = !cafe_utility_1.Binary.equals(this.targetAddress, __1.NULL_ADDRESS);
-        let refBytesSize = 0;
-        if (hasEntry) {
-            refBytesSize = this.targetAddress.length;
-        }
-        else {
-            for (const fork of this.forks.values()) {
-                if (fork.node.selfAddress) {
-                    refBytesSize = fork.node.selfAddress.length;
-                    break;
-                }
-            }
-        }
-        const header = new Uint8Array(32);
-        header.set(VERSION_02_HASH, 0);
-        header.set(cafe_utility_1.Binary.numberToUint8(refBytesSize), 31);
-        const entry = hasEntry ? this.targetAddress : new Uint8Array(refBytesSize);
-        const forkBitmap = new Uint8Array(32);
-        for (const fork of this.forks.keys()) {
-            cafe_utility_1.Binary.setBit(forkBitmap, fork, 1, 'LE');
-        }
-        const forks = [];
-        for (let i = 0; i < 256; i++) {
-            if (cafe_utility_1.Binary.getBit(forkBitmap, i, 'LE')) {
-                forks.push(this.forks.get(i).marshal());
-            }
-        }
-        const data = cafe_utility_1.Binary.xorCypher(cafe_utility_1.Binary.concatBytes(header, entry, forkBitmap, ...forks), this.obfuscationKey);
-        return cafe_utility_1.Binary.concatBytes(this.obfuscationKey, data);
+        return this.core.marshal();
     }
     /**
      * Downloads and unmarshals a MantarayNode from the given reference.
@@ -225,7 +141,7 @@ 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);
+        reference = new core_sdk_1.Reference(reference);
         const data = (await bee.data.download(reference, options, requestOptions)).toUint8Array();
         return this.unmarshalFromData(data, reference.toUint8Array());
     }
@@ -235,167 +151,49 @@ class MantarayNode {
      * Do not forget calling `loadRecursively` on the returned node to load the entire tree.
      */
     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);
-        const versionHash = reader.read(31);
-        if (!cafe_utility_1.Binary.equals(versionHash, VERSION_02_HASH.slice(0, 31))) {
-            throw new Error('MantarayNode#unmarshal invalid version hash');
-        }
-        const targetAddressLength = cafe_utility_1.Binary.uint8ToNumber(reader.read(1));
-        const targetAddress = targetAddressLength ? reader.read(targetAddressLength) : __1.NULL_ADDRESS;
-        const node = new MantarayNode({ selfAddress, targetAddress, obfuscationKey });
-        const forkBitmap = reader.read(32);
-        if (targetAddressLength > 0) {
-            for (let i = 0; i < 256; i++) {
-                if (cafe_utility_1.Binary.getBit(forkBitmap, i, 'LE')) {
-                    const newFork = Fork.unmarshal(reader, selfAddress.length);
-                    node.forks.set(i, newFork);
-                    newFork.node.parent = node;
-                }
-            }
-        }
-        return node;
+        return new MantarayNode(core_sdk_1.MantarayNode.unmarshalFromData(data, selfAddress));
     }
     /**
      * Adds a fork to the node.
      */
     addFork(path, reference, metadata) {
-        this.selfAddress = null;
-        this.type = 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;
-        while (path.length) {
-            const prefix = path.slice(0, 30);
-            path = path.slice(30);
-            const isLast = path.length === 0;
-            const [bestMatch, matchedPath] = tip.findClosest(prefix);
-            const remainingPath = prefix.slice(matchedPath.length);
-            if (matchedPath.length) {
-                tip = bestMatch;
-            }
-            if (!remainingPath.length) {
-                continue;
-            }
-            const newFork = new Fork(remainingPath, new MantarayNode({
-                targetAddress: isLast ? new typed_bytes_1.Reference(reference).toUint8Array() : undefined,
-                metadata: isLast ? metadata : undefined,
-                path: remainingPath,
-            }));
-            const existing = bestMatch.forks.get(remainingPath[0]);
-            if (existing) {
-                const fork = Fork.split(newFork, existing);
-                tip.forks.set(remainingPath[0], fork);
-                fork.node.parent = tip;
-                tip.selfAddress = null;
-                tip.type = null;
-                tip = newFork.node;
-            }
-            else {
-                tip.forks.set(remainingPath[0], newFork);
-                newFork.node.parent = tip;
-                tip.selfAddress = null;
-                tip.type = null;
-                tip = newFork.node;
-            }
-        }
+        this.core.addFork(path, reference instanceof core_sdk_1.Bytes ? reference.toUint8Array() : reference, metadata);
     }
     /**
      * Removes a fork from the node.
      */
     removeFork(path) {
-        this.selfAddress = null;
-        this.type = null;
-        path = path instanceof Uint8Array ? path : ENCODER.encode(path);
-        if (path.length === 0) {
-            throw Error('MantarayNode#removeFork [path] parameter cannot be empty');
-        }
-        const match = this.find(path);
-        if (!match) {
-            throw Error('MantarayNode#removeFork fork not found');
-        }
-        const [parent, matchedPath] = this.findClosest(path.slice(0, path.length - 1));
-        parent.forks.delete(path.slice(matchedPath.length)[0]);
-        for (const fork of match.forks.values()) {
-            parent.addFork(cafe_utility_1.Binary.concatBytes(match.path, fork.prefix), fork.node.targetAddress, fork.node.metadata);
-        }
+        this.core.removeFork(path);
     }
     /**
      * Calculates the self address of the node.
      */
     async calculateSelfAddress() {
-        if (this.selfAddress) {
-            return new typed_bytes_1.Reference(this.selfAddress);
-        }
-        return new typed_bytes_1.Reference((await cafe_utility_1.MerkleTree.root(await this.marshal())).hash());
+        return this.core.calculateSelfAddress();
     }
     /**
      * Saves the node and its children recursively.
      */
     async saveRecursively(bee, postageBatchId, options, requestOptions) {
-        for (const fork of this.forks.values()) {
-            const uploadResult = await fork.node.saveRecursively(bee, postageBatchId, options, requestOptions);
-            if (options?.act) {
-                let historyAddress;
-                uploadResult.historyAddress.ifPresent(ref => (historyAddress = ref));
-                if (historyAddress) {
-                    if (!fork.node.metadata) {
-                        fork.node.metadata = {};
-                    }
-                    fork.node.metadata['swarm-act-history-address'] = historyAddress.toHex();
-                }
-            }
-        }
-        const result = await bee.data.upload(postageBatchId, await this.marshal(), options, requestOptions);
-        this.selfAddress = result.reference.toUint8Array();
-        return result;
+        return saveRecursively(this.core, bee, postageBatchId, options, requestOptions);
     }
     /**
      * Loads the node and its children recursively.
      */
     async loadRecursively(bee, options, requestOptions) {
-        for (const fork of this.forks.values()) {
-            if (!fork.node.selfAddress) {
-                throw Error('MantarayNode#loadRecursively fork.node.selfAddress is not set');
-            }
-            let downloadOptions = options;
-            if (fork.node.metadata && fork.node.metadata['swarm-act-history-address']) {
-                downloadOptions = {
-                    ...options,
-                    actHistoryAddress: fork.node.metadata['swarm-act-history-address'],
-                };
-            }
-            const node = await MantarayNode.unmarshal(bee, fork.node.selfAddress, downloadOptions, requestOptions);
-            fork.node.targetAddress = node.targetAddress;
-            fork.node.forks = node.forks;
-            fork.node.path = fork.prefix;
-            fork.node.parent = this;
-            await fork.node.loadRecursively(bee, options, requestOptions);
-        }
+        return loadRecursively(this.core, bee, options, requestOptions);
     }
     /**
      * Finds a node in the tree by its path.
      */
     find(path) {
-        const [closest, match] = this.findClosest(path);
-        return match.length === path.length ? closest : null;
+        return this.core.find(path);
     }
     /**
      * Finds the closest node in the tree to the given path.
      */
-    findClosest(path, current = new Uint8Array()) {
-        path = path instanceof Uint8Array ? path : ENCODER.encode(path);
-        if (path.length === 0) {
-            return [this, current];
-        }
-        const fork = this.forks.get(path[0]);
-        if (fork && cafe_utility_1.Binary.commonPrefix(fork.prefix, path).length === fork.prefix.length) {
-            return fork.node.findClosest(path.slice(fork.prefix.length), cafe_utility_1.Binary.concatBytes(current, fork.prefix));
-        }
-        return [this, current];
+    findClosest(path, current) {
+        return this.core.findClosest(path, current);
     }
     /**
      * Returns an array of all nodes in the tree which have a target address set.
@@ -403,13 +201,7 @@ class MantarayNode {
      * Must be called after `loadRecursively`.
      */
     collect(nodes = []) {
-        for (const fork of this.forks.values()) {
-            if (!cafe_utility_1.Binary.equals(fork.node.targetAddress, __1.NULL_ADDRESS)) {
-                nodes.push(fork.node);
-            }
-            fork.node.collect(nodes);
-        }
-        return nodes;
+        return this.core.collect(nodes);
     }
     /**
      * Returns a path:reference map of all nodes in the tree which have a target address set.
@@ -417,38 +209,10 @@ class MantarayNode {
      * Must be called after `loadRecursively`.
      */
     collectAndMap() {
-        const nodes = this.collect();
-        const result = {};
-        for (const node of nodes) {
-            result[node.fullPathString] = new typed_bytes_1.Reference(node.targetAddress).toHex();
-        }
-        return result;
+        return this.core.collectAndMap();
     }
     determineType() {
-        let type = 0;
-        // Mirror Bee (pkg/manifest/mantaray/node.go): Add() marks every explicitly
-        // added leaf as a value (makeValue), even one with a null entry such as a
-        // metadata-only "/" node. In final-state terms a leaf (no forks) is always an
-        // added entry, so it is a value; a node with forks is a value only when it also
-        // carries an entry. The path-separator flag is set only when a separator occurs
-        // past the first byte (IndexRune > 0), so a prefix that merely starts with '/'
-        // does not qualify.
-        if (!cafe_utility_1.Binary.equals(this.targetAddress, __1.NULL_ADDRESS) || this.forks.size === 0) {
-            type |= TYPE_VALUE;
-        }
-        if (this.forks.size > 0) {
-            type |= TYPE_EDGE;
-        }
-        if (cafe_utility_1.Binary.indexOf(this.path, PATH_SEPARATOR) > 0) {
-            type |= TYPE_WITH_PATH_SEPARATOR;
-        }
-        if (this.metadata) {
-            type |= TYPE_WITH_METADATA;
-        }
-        return type;
+        return this.core.determineType();
     }
 }
 exports.MantarayNode = MantarayNode;
-function isType(value, type) {
-    return (value & type) === type;
-}

package/dist/cjs/modules/balance.js

@@ -34,9 +34,9 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Balance = void 0;
+const core_sdk_1 = require("@ethersphere/core-sdk");
 const balanceApi = __importStar(require("../api/balance"));
 const consumedApi = __importStar(require("../api/consumed"));
-const typed_bytes_1 = require("../utils/typed-bytes");
 /**
  * SWAP balance operations. Related to the bandwidth incentives and the chequebook.
  *
@@ -61,7 +61,7 @@ class Balance {
      * @param requestOptions Options for making requests, such as timeouts, custom HTTP agents, headers, etc.
      */
     async getPeer(address, requestOptions) {
-        const peer = new typed_bytes_1.PeerAddress(address);
+        const peer = new core_sdk_1.PeerAddress(address);
         return balanceApi.getPeerBalance(this.context.getRequestOptionsForCall(requestOptions), peer);
     }
     /**
@@ -79,7 +79,7 @@ class Balance {
      * @param requestOptions Options for making requests, such as timeouts, custom HTTP agents, headers, etc.
      */
     async getAllPastDueConsumptionForPeer(address, requestOptions) {
-        const peer = new typed_bytes_1.PeerAddress(address);
+        const peer = new core_sdk_1.PeerAddress(address);
         return consumedApi.getPastDueConsumptionPeerBalance(this.context.getRequestOptionsForCall(requestOptions), peer);
     }
 }

package/dist/cjs/modules/cheque.js

@@ -34,8 +34,8 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cheque = void 0;
+const core_sdk_1 = require("@ethersphere/core-sdk");
 const schema_1 = require("../utils/schema");
-const typed_bytes_1 = require("../utils/typed-bytes");
 const api = __importStar(require("../api/chequebook"));
 /**
  * Cheque operations (last cheques and cashouts).
@@ -61,7 +61,7 @@ class Cheque {
      * @param requestOptions Options for making requests, such as timeouts, custom HTTP agents, headers, etc.
      */
     async getAllLatestForPeer(address, requestOptions) {
-        const peer = new typed_bytes_1.PeerAddress(address);
+        const peer = new core_sdk_1.PeerAddress(address);
         return api.getLastChequesForPeer(this.context.getRequestOptionsForCall(requestOptions), peer);
     }
     /**
@@ -71,7 +71,7 @@ class Cheque {
      * @param requestOptions Options for making requests, such as timeouts, custom HTTP agents, headers, etc.
      */
     async getLastCashoutAction(address, requestOptions) {
-        const peer = new typed_bytes_1.PeerAddress(address);
+        const peer = new core_sdk_1.PeerAddress(address);
         return api.getLastCashoutAction(this.context.getRequestOptionsForCall(requestOptions), peer);
     }
     /**
@@ -82,7 +82,7 @@ class Cheque {
      * @param requestOptions Options for making requests, such as timeouts, custom HTTP agents, headers, etc.
      */
     async cashoutLast(address, options, requestOptions) {
-        const peer = new typed_bytes_1.PeerAddress(address);
+        const peer = new core_sdk_1.PeerAddress(address);
         if (options) {
             options = schema_1.TransactionOptionsSchema.parse(options);
         }

package/dist/cjs/modules/chunk.js

@@ -34,10 +34,10 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Chunk = void 0;
+const core_sdk_1 = require("@ethersphere/core-sdk");
 const types_1 = require("../types");
 const error_1 = require("../utils/error");
 const schema_1 = require("../utils/schema");
-const typed_bytes_1 = require("../utils/typed-bytes");
 const api = __importStar(require("../api/chunk"));
 /**
  * Chunk operations backed by the `/chunks` endpoint.
@@ -64,14 +64,14 @@ class Chunk {
         if (options) {
             options = schema_1.UploadOptionsSchema.parse(options);
         }
-        if (data.length < typed_bytes_1.Span.LENGTH) {
-            throw new error_1.BeeArgumentError(`Chunk has to have size of at least ${typed_bytes_1.Span.LENGTH}.`, data);
+        if (data.length < core_sdk_1.Span.LENGTH) {
+            throw new error_1.BeeArgumentError(`Chunk has to have size of at least ${core_sdk_1.Span.LENGTH}.`, data);
         }
-        if (!isSOC && data.length > types_1.CHUNK_SIZE + typed_bytes_1.Span.LENGTH) {
-            throw new error_1.BeeArgumentError(`Content Addressed Chunk must not exceed ${types_1.CHUNK_SIZE + typed_bytes_1.Span.LENGTH} bytes.`, data);
+        if (!isSOC && data.length > types_1.CHUNK_SIZE + core_sdk_1.Span.LENGTH) {
+            throw new error_1.BeeArgumentError(`Content Addressed Chunk must not exceed ${types_1.CHUNK_SIZE + core_sdk_1.Span.LENGTH} bytes.`, data);
         }
-        if (isSOC && data.length > types_1.CHUNK_SIZE + typed_bytes_1.Span.LENGTH + typed_bytes_1.Signature.LENGTH + typed_bytes_1.Identifier.LENGTH) {
-            throw new error_1.BeeArgumentError(`Single Owner Chunk must not exceed ${types_1.CHUNK_SIZE + typed_bytes_1.Span.LENGTH + typed_bytes_1.Signature.LENGTH + typed_bytes_1.Identifier.LENGTH} bytes.`, data);
+        if (isSOC && data.length > types_1.CHUNK_SIZE + core_sdk_1.Span.LENGTH + core_sdk_1.Signature.LENGTH + core_sdk_1.Identifier.LENGTH) {
+            throw new error_1.BeeArgumentError(`Single Owner Chunk must not exceed ${types_1.CHUNK_SIZE + core_sdk_1.Span.LENGTH + core_sdk_1.Signature.LENGTH + core_sdk_1.Identifier.LENGTH} bytes.`, data);
         }
         return api.upload(this.context.getRequestOptionsForCall(requestOptions), data, stamp, options);
     }
@@ -83,7 +83,7 @@ class Chunk {
      * @param requestOptions Options for making requests, such as timeouts, custom HTTP agents, headers, etc.
      */
     async download(reference, options, requestOptions) {
-        const ref = new typed_bytes_1.Reference(reference);
+        const ref = new core_sdk_1.Reference(reference);
         if (options) {
             options = schema_1.DownloadOptionsSchema.parse(options);
         }