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

package/dist/mjs/modules/soc.js

@@ -1,5 +1,5 @@
+import { EthAddress, PrivateKey } from '@ethersphere/core-sdk';
 import { downloadSingleOwnerChunk, uploadSingleOwnerChunkData } from "../chunk/soc.js";
-import { EthAddress, PrivateKey } from "../utils/typed-bytes.js";
 /**
  * Single owner chunk (SOC) reader/writer operations.
  *

package/dist/mjs/modules/stamp.js

@@ -1,3 +1,4 @@
+import { BatchId } from '@ethersphere/core-sdk';
 import { System } from 'cafe-utility';
 import { z } from 'zod';
 import { STAMPS_DEPTH_MAX, STAMPS_DEPTH_MIN } from "../types/index.js";
@@ -5,7 +6,6 @@ import { BeeArgumentError, BeeError } from "../utils/error.js";
 import { PostageBatchOptionsSchema } from "../utils/schema.js";
 import { getStampDuration } from "../utils/stamps.js";
 import { asNumberString } from "../utils/type.js";
-import { BatchId } from "../utils/typed-bytes.js";
 import * as stampApi from "../api/stamp.js";
 import * as batchesApi from "../api/batches.js";
 /**

package/dist/mjs/modules/tag.js

@@ -1,7 +1,7 @@
+import { Reference } from '@ethersphere/core-sdk';
 import * as api from "../api/tag.js";
 import { AllTagsOptionsSchema } from "../utils/schema.js";
 import { makeTagUid } from "../utils/type.js";
-import { Reference } from "../utils/typed-bytes.js";
 /**
  * Tag operations for tracking upload and synchronization progress.
  *

package/dist/mjs/modules/transaction.js

@@ -1,5 +1,5 @@
+import { TransactionId } from '@ethersphere/core-sdk';
 import { asNumberString } from "../utils/type.js";
-import { TransactionId } from "../utils/typed-bytes.js";
 import * as api from "../api/transaction.js";
 /**
  * Pending transaction operations for the Bee node's `/transactions` queue.

package/dist/mjs/modules/wallet.js

@@ -1,5 +1,5 @@
+import { EthAddress } from '@ethersphere/core-sdk';
 import { BZZ, DAI } from "../utils/tokens.js";
-import { EthAddress } from "../utils/typed-bytes.js";
 import * as api from "../api/wallet.js";
 /**
  * Node wallet operations (balances and external withdrawals).

package/dist/mjs/types/schema/chequebook.js

@@ -1,7 +1,7 @@
+import { EthAddress, TransactionId } from '@ethersphere/core-sdk';
 import { z } from 'zod';
 import { BZZ } from "../../utils/tokens.js";
 import { asNumberString } from "../../utils/type.js";
-import { EthAddress, TransactionId } from "../../utils/typed-bytes.js";
 const ChequeSchema = z.object({
   beneficiary: z.string().transform(s => new EthAddress(s)),
   chequebook: z.string().transform(s => new EthAddress(s)),

package/dist/mjs/types/schema/connectivity.js

@@ -1,5 +1,5 @@
+import { EthAddress, PeerAddress, PublicKey } from '@ethersphere/core-sdk';
 import { z } from 'zod';
-import { EthAddress, PeerAddress, PublicKey } from "../../utils/typed-bytes.js";
 const PeerSchema = z.object({
   address: z.string(),
   fullNode: z.boolean()

package/dist/mjs/types/schema/envelope.js

@@ -1,8 +1,8 @@
-import { Binary } from 'cafe-utility';
 import { z } from 'zod';
+import { hexToUint8Array } from '@ethersphere/core-sdk';
 export const PostEnvelopeBodyResponse = z.object({
-  issuer: z.string().transform(s => Binary.hexToUint8Array(s)),
-  index: z.string().transform(s => Binary.hexToUint8Array(s)),
-  timestamp: z.string().transform(s => Binary.hexToUint8Array(s)),
-  signature: z.string().transform(s => Binary.hexToUint8Array(s))
+  issuer: z.string().transform(s => hexToUint8Array(s)),
+  index: z.string().transform(s => hexToUint8Array(s)),
+  timestamp: z.string().transform(s => hexToUint8Array(s)),
+  signature: z.string().transform(s => hexToUint8Array(s))
 });

package/dist/mjs/types/schema/grantee.js

@@ -1,5 +1,5 @@
+import { PublicKey, Reference } from '@ethersphere/core-sdk';
 import { z } from 'zod';
-import { PublicKey, Reference } from "../../utils/typed-bytes.js";
 export const GetGranteesBodyResponse = z.array(z.string().transform(s => new PublicKey(s)));
 export const GranteesResultBodyResponse = z.object({
   ref: z.string().transform(s => new Reference(s)),

package/dist/mjs/types/schema/stake.js

@@ -1,7 +1,7 @@
+import { TransactionId } from '@ethersphere/core-sdk';
 import { z } from 'zod';
 import { BZZ, DAI } from "../../utils/tokens.js";
 import { asNumberString } from "../../utils/type.js";
-import { TransactionId } from "../../utils/typed-bytes.js";
 export const GetStakeResponse = z.object({
   stakedAmount: z.string().transform(s => BZZ.fromPLUR(asNumberString(s, {
     name: 'stakedAmount'

package/dist/mjs/types/schema/stamps.js

@@ -1,6 +1,6 @@
+import { BatchId, EthAddress } from '@ethersphere/core-sdk';
 import { z } from 'zod';
 import { asNumberString } from "../../utils/type.js";
-import { BatchId, EthAddress } from "../../utils/typed-bytes.js";
 export const RawPostageBatchSchema = z.object({
   batchID: z.string(),
   utilization: z.number(),

package/dist/mjs/types/schema/states.js

@@ -1,7 +1,7 @@
+import { TransactionId } from '@ethersphere/core-sdk';
 import { z } from 'zod';
 import { BZZ, DAI } from "../../utils/tokens.js";
 import { asNumberString } from "../../utils/type.js";
-import { TransactionId } from "../../utils/typed-bytes.js";
 import { normalizeCurrentPrice } from "../../utils/workaround.js";
 export const GetReserveStateResponse = z.object({
   commitment: z.number(),

package/dist/mjs/types/schema/transactions.js

@@ -1,6 +1,6 @@
+import { TransactionId } from '@ethersphere/core-sdk';
 import { z } from 'zod';
 import { asNumberString } from "../../utils/type.js";
-import { TransactionId } from "../../utils/typed-bytes.js";
 const TransactionInfoSchema = z.object({
   transactionHash: z.string().transform(s => new TransactionId(s)),
   to: z.string(),

package/dist/mjs/types/schema/upload.js

@@ -1,5 +1,5 @@
+import { Reference } from '@ethersphere/core-sdk';
 import { z } from 'zod';
-import { Reference } from "../../utils/typed-bytes.js";
 export const UploadResultBody = z.object({
   reference: z.string().transform(s => new Reference(s))
 });

package/dist/mjs/utils/chunk-stream.browser.js

@@ -1,10 +1,10 @@
-import { AsyncQueue, MerkleTree, Strings } from 'cafe-utility';
+import { AsyncQueue, Strings } from 'cafe-utility';
 import { NULL_ADDRESS } from "../index.js";
 import { MantarayNode } from "../manifest/manifest.js";
 import { totalChunks } from "./chunk-size.js";
 import { makeFilePath } from "./collection.js";
 import { mimes } from "./mime.js";
-import { BatchId } from "./typed-bytes.js";
+import { BatchId, ChunkSplitter } from '@ethersphere/core-sdk';
 export async function hashDirectory(_dir) {
   throw new Error('Hashing directories is not supported in browsers!');
 }
@@ -23,24 +23,30 @@ export async function streamFiles(bee, files, postageBatchId, onUploadProgress,
     total += totalChunks(file.size);
   }
   postageBatchId = new BatchId(postageBatchId);
-  async function onChunk(chunk) {
-    await queue.enqueue(async () => {
+  async function uploadAndTrack(chunk) {
+    if (signal?.aborted) {
+      return;
+    }
+    try {
+      await bee.chunk.upload(postageBatchId, chunk.build(), options, requestOptions);
+      onUploadProgress?.({
+        total,
+        processed: ++processed
+      });
+    } catch (err) {
       if (signal?.aborted) {
         return;
       }
-      try {
-        await bee.chunk.upload(postageBatchId, chunk.build(), options, requestOptions);
-        onUploadProgress?.({
-          total,
-          processed: ++processed
-        });
-      } catch (err) {
-        if (signal?.aborted) {
-          return;
-        }
-        throw err;
-      }
-    });
+      throw err;
+    }
+  }
+  async function onBatch(batch) {
+    for (const {
+      chunk
+    } of batch) {
+      await queue.enqueue(async () => uploadAndTrack(chunk));
+    }
+    return [];
   }
   const mantaray = new MantarayNode();
   for (const file of files) {
@@ -48,7 +54,7 @@ export async function streamFiles(bee, files, postageBatchId, onUploadProgress,
       throw new Error('Request aborted');
     }
     const rootChunk = await new Promise((resolve, reject) => {
-      const tree = new MerkleTree(onChunk);
+      const tree = new ChunkSplitter(onBatch);
       let offset = 0;
       const reader = new FileReader();
       reader.onerror = () => {
@@ -60,7 +66,11 @@ export async function streamFiles(bee, files, postageBatchId, onUploadProgress,
           return;
         }
         if (offset >= file.size) {
+          // ChunkSplitter's onBatch only sees chunks once they're referenced
+          // by a parent - the root chunk returned by finalize() is never
+          // passed to it, so it has to be uploaded here explicitly.
           const rootChunk = await tree.finalize();
+          await queue.enqueue(async () => uploadAndTrack(rootChunk));
           resolve(rootChunk);
           return;
         }

package/dist/mjs/utils/chunk-stream.js

@@ -1,16 +1,16 @@
-import { AsyncQueue, MerkleTree, Strings } from 'cafe-utility';
+import { AsyncQueue, Strings } from 'cafe-utility';
 import { createReadStream } from 'fs';
 import { NULL_ADDRESS } from "../index.js";
 import { MantarayNode } from "../manifest/manifest.js";
 import { totalChunks } from "./chunk-size.js";
 import { makeCollectionFromFS } from "./collection.node.js";
 import { mimes } from "./mime.js";
-import { BatchId } from "./typed-bytes.js";
+import { BatchId, ChunkSplitter } from '@ethersphere/core-sdk';
 export async function hashDirectory(dir) {
   const files = await makeCollectionFromFS(dir);
   const mantaray = new MantarayNode();
   for (const file of files) {
-    const tree = new MerkleTree(MerkleTree.NOOP);
+    const tree = new ChunkSplitter(ChunkSplitter.NOOP);
     if (!file.fsPath) {
       throw Error('File does not have fsPath, which should never happen in node. Please report this issue.');
     }
@@ -40,26 +40,36 @@ export async function streamDirectory(bee, dir, postageBatchId, onUploadProgress
     total += totalChunks(file.size);
   }
   let hasIndexHtml = false;
-  async function onChunk(chunk) {
-    await queue.enqueue(async () => {
-      await bee.chunk.upload(postageBatchId, chunk.build(), options, requestOptions);
-      onUploadProgress?.({
-        total,
-        processed: ++processed
-      });
+  async function uploadAndTrack(chunk) {
+    await bee.chunk.upload(postageBatchId, chunk.build(), options, requestOptions);
+    onUploadProgress?.({
+      total,
+      processed: ++processed
     });
   }
+  async function onBatch(batch) {
+    for (const {
+      chunk
+    } of batch) {
+      await queue.enqueue(async () => uploadAndTrack(chunk));
+    }
+    return [];
+  }
   const mantaray = new MantarayNode();
   for (const file of files) {
     if (!file.fsPath) {
       throw Error('File does not have fsPath, which should never happen in node. Please report this issue.');
     }
     const readStream = createReadStream(file.fsPath);
-    const tree = new MerkleTree(onChunk);
+    const tree = new ChunkSplitter(onBatch);
     for await (const data of readStream) {
       await tree.append(data);
     }
+    // ChunkSplitter's onBatch only sees chunks once they're referenced by a
+    // parent - the root chunk returned by finalize() is never passed to it,
+    // so it has to be uploaded here explicitly.
     const rootChunk = await tree.finalize();
+    await queue.enqueue(async () => uploadAndTrack(rootChunk));
     await queue.drain();
     const {
       filename,

package/dist/mjs/utils/constants.js

@@ -1,4 +1,4 @@
-import { BatchId, Topic } from "./typed-bytes.js";
+import { BatchId, Topic } from '@ethersphere/core-sdk';
 export const SWARM_GATEWAY_URL = 'https://api.gateway.ethswarm.org';
 export const NULL_STAMP = new BatchId('0000000000000000000000000000000000000000000000000000000000000000');
 export const NULL_TOPIC = new Topic('0000000000000000000000000000000000000000000000000000000000000000');

package/dist/mjs/utils/expose.js

@@ -1,5 +1,5 @@
 export { getCollectionSize, makeCollectionFromFileList } from "./collection.js";
 export { getFolderSize } from "./collection.node.js";
 export { makeMaxTarget } from "./pss.js";
-export { approximateOverheadForRedundancyLevel, getRedundancyStat, getRedundancyStats } from "./redundancy.js";
+export { approximateOverheadForRedundancyLevel, getRedundancyStat, getRedundancyStats } from '@ethersphere/core-sdk';
 export { convertEnvelopeToMarshaledStamp, getAmountForDuration, getDepthForSize, getStampCost, getStampDuration, getStampEffectiveBytes, getStampEffectiveBytesBreakpoints, getStampTheoreticalBytes, getStampUsage, mapPostageBatch, unmapPostageBatch } from "./stamps.js";

package/dist/mjs/utils/headers.js

@@ -1,7 +1,7 @@
+import { BatchId, PublicKey, Reference } from '@ethersphere/core-sdk';
 import { z } from 'zod';
 import { BeeError } from "./error.js";
 import { convertEnvelopeToMarshaledStamp } from "./stamps.js";
-import { BatchId, PublicKey, Reference } from "./typed-bytes.js";
 export function readFileHeaders(headers) {
   const name = readContentDispositionFilename(headers['content-disposition']);
   const tagUid = readTagUid(headers['swarm-tag-uid']);

package/dist/mjs/utils/http.js

@@ -17,7 +17,12 @@ export const DEFAULT_HTTP_CONFIG = {
  * @param config Internal settings and/or Bee settings
  */
 export async function http(options, config) {
-  const requestConfig = Objects.deepMerge3(DEFAULT_HTTP_CONFIG, config, options);
+  const rawData = config.data;
+  const requestConfig = Objects.deepMerge3(DEFAULT_HTTP_CONFIG, {
+    ...config,
+    data: undefined
+  }, options);
+  requestConfig.data = rawData;
   if (options.signal) {
     requestConfig.signal = options.signal;
   }

package/dist/mjs/utils/pss.js

@@ -1,5 +1,5 @@
+import { PeerAddress } from '@ethersphere/core-sdk';
 import { PSS_TARGET_HEX_LENGTH_MAX } from "../types/index.js";
-import { PeerAddress } from "./typed-bytes.js";
 /**
  * Utility function that for given strings/reference takes the most specific
  * target that Bee node will except.

package/dist/mjs/utils/resource-locator.js

@@ -1,5 +1,5 @@
+import { Reference } from '@ethersphere/core-sdk';
 import { z } from 'zod';
-import { Reference } from "./typed-bytes.js";
 export class ResourceLocator {
   constructor(raw) {
     this.raw = raw;

package/dist/mjs/utils/schema.js

@@ -1,6 +1,6 @@
+import { PublicKey, Reference } from '@ethersphere/core-sdk';
 import { z } from 'zod';
 import { TAGS_LIMIT_MAX, TAGS_LIMIT_MIN } from "../types/index.js";
-import { PublicKey, Reference } from "./typed-bytes.js";
 export { HexStringSchema } from "./hex-schema.js";
 const fnField = z.any().refine(v => z.function().safeParse(v).success, 'expected a function');
 const integerStringField = z.any().transform(v => {

package/dist/mjs/utils/stamps.js

@@ -1,76 +1,10 @@
-import { Binary } from 'cafe-utility';
-import { capacityBreakpoints } from "../types/index.js";
-import { Bytes, parseSizeToBytes } from "./bytes.js";
 import { Duration } from "./duration.js";
 import { Size } from "./size.js";
 import { BZZ } from "./tokens.js";
 import { asNumberString } from "./type.js";
-import { BatchId } from "./typed-bytes.js";
 import { normalizeBatchTTL } from "./workaround.js";
-const MAX_UTILIZATION = 0.9;
-/**
- * Utility function that calculates usage of postage batch based on its utilization, depth and bucket depth.
- *
- * For smaller depths (up to 20), this may provide less accurate results.
- *
- * @returns {number} A number between 0 and 1 representing the usage of the postage batch.
- */
-export function getStampUsage(utilization, depth, bucketDepth) {
-  return utilization / Math.pow(2, depth - bucketDepth);
-}
-/**
- * Utility function that calculates the theoritical maximum size of a postage batch based on its depth.
- *
- * For smaller depths (up to 22), this may provide less accurate results.
- *
- * @returns {number} The maximum theoretical size of the postage batch in bytes.
- */
-export function getStampTheoreticalBytes(depth) {
-  return 4096 * 2 ** depth;
-}
-/**
- * Based on https://docs.ethswarm.org/docs/learn/technology/contracts/postage-stamp/#effective-utilisation-table
- * Optimised for encrypted, medium erasure coding
- */
-const effectiveSizeBreakpoints = [[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.
- *
- * Below 22 depth the effective size is 0
- * Above 34 it's always > 99%
- *
- * @returns {number} The effective size of the postage batch in bytes.
- */
-export function getStampEffectiveBytes(depth, encryption, erasureCodeLevel) {
-  if (depth < 17) {
-    return 0;
-  }
-  if (encryption !== undefined && erasureCodeLevel !== undefined) {
-    const encryptionKey = encryption ? 'ENCRYPTION_ON' : 'ENCRYPTION_OFF';
-    const breakpoints = capacityBreakpoints[encryptionKey][erasureCodeLevel];
-    const entry = breakpoints.find(item => item.batchDepth === depth);
-    if (entry?.effectiveVolume) {
-      return parseSizeToBytes(entry.effectiveVolume);
-    }
-  } else {
-    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);
-}
-export function getStampEffectiveBytesBreakpoints(encryption, erasureCodeLevel) {
-  const map = new Map();
-  for (let i = 17; i < 35; i++) {
-    map.set(i, getStampEffectiveBytes(i, encryption, erasureCodeLevel));
-  }
-  return map;
-}
+import { BatchId, convertEnvelopeToMarshaledStamp as coreConvertEnvelopeToMarshaledStamp, getDepthForSize as coreGetDepthForSize, getStampEffectiveBytes, getStampEffectiveBytesBreakpoints, getStampTheoreticalBytes, getStampUsage, marshalStamp as coreMarshalStamp } from '@ethersphere/core-sdk';
+export { getStampEffectiveBytes, getStampEffectiveBytesBreakpoints, getStampTheoreticalBytes, getStampUsage };
 /**
  * Utility function that calculates the cost of a postage batch based on its depth and amount.
  */
@@ -105,41 +39,13 @@ export function getAmountForDuration(duration, pricePerBlock, blockTime) {
  * @returns
  */
 export function getDepthForSize(size, encryption, erasureCodeLevel) {
-  if (encryption !== undefined && erasureCodeLevel !== undefined) {
-    const encryptionKey = encryption ? 'ENCRYPTION_ON' : 'ENCRYPTION_OFF';
-    const breakpoints = capacityBreakpoints[encryptionKey][erasureCodeLevel];
-    const entry = breakpoints.find(item => {
-      return size.toBytes() <= parseSizeToBytes(item.effectiveVolume);
-    });
-    if (entry?.effectiveVolume) {
-      return entry.batchDepth;
-    }
-  } else {
-    for (const [depth, sizeBreakpoint] of effectiveSizeBreakpoints) {
-      if (size.toBytes() <= sizeBreakpoint * 1000 * 1000 * 1000) {
-        return depth;
-      }
-    }
-  }
-  return 35;
+  return coreGetDepthForSize(size.toBytes(), encryption, erasureCodeLevel);
 }
 export function convertEnvelopeToMarshaledStamp(envelope) {
-  return marshalStamp(envelope.signature, envelope.batchId.toUint8Array(), envelope.timestamp, envelope.index);
+  return coreConvertEnvelopeToMarshaledStamp(envelope);
 }
 export function marshalStamp(signature, batchId, timestamp, index) {
-  if (signature.length !== 65) {
-    throw Error('invalid signature length');
-  }
-  if (batchId.length !== 32) {
-    throw Error('invalid batch ID length');
-  }
-  if (timestamp.length !== 8) {
-    throw Error('invalid timestamp length');
-  }
-  if (index.length !== 8) {
-    throw Error('invalid index length');
-  }
-  return new Bytes(Binary.concatBytes(batchId, index, timestamp, signature));
+  return coreMarshalStamp(signature, batchId, timestamp, index);
 }
 export function mapPostageBatch(raw, encryption, erasureCodeLevel) {
   const batchTTL = normalizeBatchTTL(raw.batchTTL);

package/dist/mjs/utils/type.js

@@ -28,8 +28,8 @@ export function isTag(value) {
  * @throws TypeError if not valid
  */
 export function assertData(value) {
-  if (typeof value !== 'string' && !(value instanceof Uint8Array)) {
-    throw new TypeError('Data must be either string or Uint8Array!');
+  if (typeof value !== 'string' && !(value instanceof Uint8Array) && !(value instanceof Blob) && !isReadable(value)) {
+    throw new TypeError('Data must be either string, Uint8Array, Blob or Readable!');
   }
 }
 /**

package/dist/types/api/balance.d.ts

@@ -1,5 +1,5 @@
+import { PeerAddress } from '@ethersphere/core-sdk';
 import type { BalanceResponse, BeeRequestOptions, PeerBalance } from '../types';
-import { PeerAddress } from '../utils/typed-bytes';
 /**
  * Raw HTTP calls for the `/balances` endpoint.
  */

package/dist/types/api/batches.d.ts

@@ -1,5 +1,5 @@
+import { BatchId } from '@ethersphere/core-sdk';
 import type { BeeRequestOptions, GlobalPostageBatch } from '../types';
-import { BatchId } from '../utils/typed-bytes';
 /**
  * Raw HTTP calls for the `/batches` endpoint.
  */

package/dist/types/api/bytes.d.ts

@@ -1,12 +1,12 @@
+import { BatchId, Bytes, Reference } from '@ethersphere/core-sdk';
+import { Readable } from 'stream';
 import type { BeeRequestOptions, DownloadOptions, RedundantUploadOptions, ReferenceInformation } from '../types';
 import { UploadResult } from '../types';
-import { Bytes } from '../utils/bytes';
 import { ResourceLocator } from '../utils/resource-locator';
-import { BatchId, Reference } from '../utils/typed-bytes';
 /**
  * Raw HTTP calls for the `/bytes` endpoint.
  */
-export declare function upload(requestOptions: BeeRequestOptions, data: string | Uint8Array, postageBatchId: BatchId, options?: RedundantUploadOptions): Promise<UploadResult>;
+export declare function upload(requestOptions: BeeRequestOptions, data: string | Uint8Array | Blob | Readable, postageBatchId: BatchId, options?: RedundantUploadOptions): Promise<UploadResult>;
 export declare function head(requestOptions: BeeRequestOptions, reference: Reference): Promise<ReferenceInformation>;
 export declare function download(requestOptions: BeeRequestOptions, resource: ResourceLocator, options?: DownloadOptions): Promise<Bytes>;
 export declare function downloadReadable(requestOptions: BeeRequestOptions, resource: ResourceLocator, options?: DownloadOptions): Promise<ReadableStream<Uint8Array>>;

package/dist/types/api/bzz.d.ts

@@ -1,8 +1,7 @@
+import { BatchId, Bytes, Reference } from '@ethersphere/core-sdk';
 import { Readable } from 'stream';
 import { BeeRequestOptions, Collection, CollectionUploadOptions, DownloadOptions, FileData, FileUploadOptions, UploadResult } from '../types';
-import { Bytes } from '../utils/bytes';
 import { ResourceLocator } from '../utils/resource-locator';
-import { BatchId, Reference } from '../utils/typed-bytes';
 /**
  * Raw HTTP calls for the `/bzz` endpoint.
  */

package/dist/types/api/chequebook.d.ts

@@ -1,5 +1,5 @@
+import { PeerAddress, TransactionId } from '@ethersphere/core-sdk';
 import type { BeeRequestOptions, ChequebookAddressResponse, ChequebookBalanceResponse, LastCashoutActionResponse, LastChequesForPeerResponse, LastChequesResponse, TransactionOptions } from '../types';
-import { PeerAddress, TransactionId } from '../utils/typed-bytes';
 /**
  * Raw HTTP calls for the `/chequebook` endpoint (chequebook + cheque operations).
  */

package/dist/types/api/chunk.d.ts

@@ -1,5 +1,5 @@
+import { BatchId, Reference } from '@ethersphere/core-sdk';
 import type { BeeRequestOptions, DownloadOptions, EnvelopeWithBatchId, UploadOptions, UploadResult } from '../types';
-import { BatchId, Reference } from '../utils/typed-bytes';
 /**
  * Raw HTTP calls for the `/chunks` endpoint.
  */

package/dist/types/api/connectivity.d.ts

@@ -1,6 +1,6 @@
+import { PeerAddress } from '@ethersphere/core-sdk';
 import type { BeeRequestOptions, Peer, PingResponse, RemovePeerResponse, Topology } from '../types';
 import { NodeAddresses } from '../types/debug';
-import { PeerAddress } from '../utils/typed-bytes';
 /**
  * Raw HTTP calls for the connectivity endpoints (`/addresses`, `/peers`, `/topology`, `/blocklist`, `/pingpong`, etc.).
  */

package/dist/types/api/consumed.d.ts

@@ -1,5 +1,5 @@
+import { PeerAddress } from '@ethersphere/core-sdk';
 import type { BalanceResponse, BeeRequestOptions, PeerBalance } from '../types';
-import { PeerAddress } from '../utils/typed-bytes';
 /**
  * Raw HTTP calls for the `/consumed` endpoint.
  */

package/dist/types/api/envelope.d.ts

@@ -1,3 +1,3 @@
+import { BatchId, Reference } from '@ethersphere/core-sdk';
 import type { BeeRequestOptions, EnvelopeWithBatchId } from '../types';
-import { BatchId, Reference } from '../utils/typed-bytes';
 export declare function postEnvelope(requestOptions: BeeRequestOptions, postageBatchId: BatchId, reference: Reference): Promise<EnvelopeWithBatchId>;

package/dist/types/api/feed.d.ts

@@ -1,6 +1,5 @@
+import { BatchId, Bytes, EthAddress, FeedIndex, Reference, Topic } from '@ethersphere/core-sdk';
 import type { BeeRequestOptions, UploadOptions } from '../types';
-import { Bytes } from '../utils/bytes';
-import { BatchId, EthAddress, FeedIndex, Reference, Topic } from '../utils/typed-bytes';
 /**
  * Raw HTTP calls for the `/feeds` endpoint.
  */

package/dist/types/api/grantee.d.ts

@@ -1,5 +1,5 @@
+import { BatchId, PublicKey, Reference } from '@ethersphere/core-sdk';
 import type { BeeRequestOptions, GetGranteesResult, GranteesResult } from '../types';
-import { BatchId, PublicKey, Reference } from '../utils/typed-bytes';
 /** Creates grantees for a postage batch. */
 export declare function createGrantees(requestOptions: BeeRequestOptions, batchId: BatchId, publicKeys: PublicKey[]): Promise<GranteesResult>;
 /** Retrieves the grantees for a given reference. */

package/dist/types/api/pin.d.ts

@@ -1,5 +1,5 @@
+import { Reference } from '@ethersphere/core-sdk';
 import type { BeeRequestOptions, Pin as PinData } from '../types';
-import { Reference } from '../utils/typed-bytes';
 /** Pins local data with the given reference. */
 export declare function pin(requestOptions: BeeRequestOptions, reference: Reference): Promise<void>;
 /** Unpins local data with the given reference. */

package/dist/types/api/pss.d.ts

@@ -1,5 +1,5 @@
+import { BatchId, PublicKey, Topic } from '@ethersphere/core-sdk';
 import type { BeeRequestOptions } from '../types';
-import { BatchId, PublicKey, Topic } from '../utils/typed-bytes';
 /**
  * Sends a message with the Postal Service for Swarm through the `POST /pss/send` endpoint.
  */

package/dist/types/api/settlement.d.ts

@@ -1,5 +1,5 @@
+import { PeerAddress } from '@ethersphere/core-sdk';
 import type { AllSettlements, BeeRequestOptions, Settlements } from '../types';
-import { PeerAddress } from '../utils/typed-bytes';
 /**
  * Raw HTTP calls for the `/settlements` endpoint.
  */

package/dist/types/api/soc.d.ts

@@ -1,5 +1,5 @@
+import { BatchId, EthAddress, Identifier, Signature } from '@ethersphere/core-sdk';
 import type { BeeRequestOptions, UploadOptions, UploadResult } from '../types';
-import { BatchId, EthAddress, Identifier, Signature } from '../utils/typed-bytes';
 /**
  * Raw HTTP calls for the `/soc` endpoint.
  */

package/dist/types/api/stake.d.ts

@@ -1,6 +1,6 @@
+import { TransactionId } from '@ethersphere/core-sdk';
 import type { BeeRequestOptions, TransactionOptions } from '../types';
 import { BZZ } from '../utils/tokens';
-import { TransactionId } from '../utils/typed-bytes';
 /**
  * Raw HTTP calls for the `/stake` endpoint.
  */

package/dist/types/api/stamp.d.ts

@@ -1,5 +1,5 @@
+import { BatchId } from '@ethersphere/core-sdk';
 import type { BeeRequestOptions, NumberString, PostageBatch, PostageBatchBuckets, RedundancyLevel } from '../types';
-import { BatchId } from '../utils/typed-bytes';
 /**
  * Raw HTTP calls for the `/stamps` endpoint.
  */