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

package/dist/mjs/api/bytes.js

@@ -1,11 +1,10 @@
+import { Bytes, Reference } from '@ethersphere/core-sdk';
 import { Optional } from 'cafe-utility';
 import { UploadResultBody } from "../types/schema/upload.js";
-import { Bytes } from "../utils/bytes.js";
 import { prepareRequestHeaders } from "../utils/headers.js";
 import { http } from "../utils/http.js";
 import { DownloadOptionsSchema } from "../utils/schema.js";
 import { makeTagUid } from "../utils/type.js";
-import { Reference } from "../utils/typed-bytes.js";
 const endpoint = 'bytes';
 /**
  * Raw HTTP calls for the `/bytes` endpoint.

package/dist/mjs/api/bzz.js

@@ -1,12 +1,11 @@
+import { Bytes, Reference } from '@ethersphere/core-sdk';
 import { Optional } from 'cafe-utility';
 import { UploadResultBody } from "../types/schema/upload.js";
-import { Bytes } from "../utils/bytes.js";
 import { assertCollection } from "../utils/collection.js";
 import { prepareRequestHeaders, readFileHeaders } from "../utils/headers.js";
 import { http } from "../utils/http.js";
 import { uploadTar } from "../utils/tar-uploader.js";
 import { isReadable, makeTagUid } from "../utils/type.js";
-import { Reference } from "../utils/typed-bytes.js";
 const bzzEndpoint = 'bzz';
 /**
  * Raw HTTP calls for the `/bzz` endpoint.

package/dist/mjs/api/chunk.js

@@ -1,9 +1,9 @@
+import { Reference } from '@ethersphere/core-sdk';
 import { Optional } from 'cafe-utility';
 import { UploadResultBody } from "../types/schema/upload.js";
 import { prepareRequestHeaders } from "../utils/headers.js";
 import { http } from "../utils/http.js";
 import { makeTagUid } from "../utils/type.js";
-import { Reference } from "../utils/typed-bytes.js";
 const endpoint = 'chunks';
 /**
  * Raw HTTP calls for the `/chunks` endpoint.

package/dist/mjs/api/envelope.js

@@ -1,3 +1,4 @@
+import { EthAddress, Signature } from '@ethersphere/core-sdk';
 import { PostEnvelopeBodyResponse } from "../types/schema/envelope.js";
 import { http } from "../utils/http.js";
 const ENVELOPE_ENDPOINT = 'envelope';
@@ -12,10 +13,10 @@ export async function postEnvelope(requestOptions, postageBatchId, reference) {
   });
   const body = PostEnvelopeBodyResponse.parse(response.data);
   return {
-    issuer: body.issuer,
+    issuer: new EthAddress(body.issuer),
     index: body.index,
     timestamp: body.timestamp,
-    signature: body.signature,
+    signature: new Signature(body.signature),
     batchId: postageBatchId
   };
 }

package/dist/mjs/api/feed.js

@@ -1,9 +1,8 @@
+import { Bytes, FeedIndex } from '@ethersphere/core-sdk';
 import { UploadResultBody } from "../types/schema/upload.js";
-import { Bytes } from "../utils/bytes.js";
 import { BeeError } from "../utils/error.js";
 import { prepareRequestHeaders } from "../utils/headers.js";
 import { http } from "../utils/http.js";
-import { FeedIndex } from "../utils/typed-bytes.js";
 const feedEndpoint = 'feeds';
 export async function createFeedManifest(requestOptions, owner, topic, stamp, options) {
   const response = await http(requestOptions, {

package/dist/mjs/api/pin.js

@@ -1,7 +1,7 @@
+import { Reference } from '@ethersphere/core-sdk';
 import { GetAllPinsResponse } from "../types/schema/pinning.js";
 import { UploadResultBody } from "../types/schema/upload.js";
 import { http } from "../utils/http.js";
-import { Reference } from "../utils/typed-bytes.js";
 const PINNING_ENDPOINT = 'pins';
 /** Pins local data with the given reference. */
 export async function pin(requestOptions, reference) {

package/dist/mjs/api/soc.js

@@ -1,9 +1,9 @@
+import { Reference } from '@ethersphere/core-sdk';
 import { Optional } from 'cafe-utility';
 import { UploadResultBody } from "../types/schema/upload.js";
 import { prepareRequestHeaders } from "../utils/headers.js";
 import { http } from "../utils/http.js";
 import { makeTagUid } from "../utils/type.js";
-import { Reference } from "../utils/typed-bytes.js";
 const socEndpoint = 'soc';
 /**
  * Raw HTTP calls for the `/soc` endpoint.

package/dist/mjs/bee.js

@@ -1,31 +1,30 @@
 import { Objects } from 'cafe-utility';
-import { makeContentAddressedChunk, unmarshalContentAddressedChunk } from "./chunk/cac.js";
+import { BatchId, PrivateKey, Reference, makeContentAddressedChunk, unmarshalContentAddressedChunk } from '@ethersphere/core-sdk';
+import { postEnvelope } from "./api/envelope.js";
+import { rchash } from "./api/rchash.js";
 import { makeSOCAddress, makeSingleOwnerChunk, unmarshalSingleOwnerChunk } from "./chunk/soc.js";
 import { Balance } from "./modules/balance.js";
 import { Cheque } from "./modules/cheque.js";
 import { Chequebook } from "./modules/chequebook.js";
-import { Connectivity } from "./modules/connectivity.js";
-import { Settlement } from "./modules/settlement.js";
-import { Stake } from "./modules/stake.js";
-import { Stamp } from "./modules/stamp.js";
-import { Storage } from "./modules/storage.js";
-import { Status } from "./modules/status.js";
-import { Wallet } from "./modules/wallet.js";
-import { Transaction } from "./modules/transaction.js";
-import { postEnvelope } from "./api/envelope.js";
 import { Chunk as ChunkNamespace } from "./modules/chunk.js";
 import { Collection } from "./modules/collection.js";
+import { Connectivity } from "./modules/connectivity.js";
 import { Data } from "./modules/data.js";
-import { File as FileNamespace } from "./modules/file.js";
 import { Feed } from "./modules/feed.js";
-import { Soc } from "./modules/soc.js";
+import { File as FileNamespace } from "./modules/file.js";
 import { Grantee } from "./modules/grantee.js";
 import { Messaging } from "./modules/messaging.js";
 import { Pin } from "./modules/pin.js";
-import { rchash } from "./api/rchash.js";
+import { Settlement } from "./modules/settlement.js";
+import { Soc } from "./modules/soc.js";
+import { Stake } from "./modules/stake.js";
+import { Stamp } from "./modules/stamp.js";
+import { Status } from "./modules/status.js";
+import { Storage } from "./modules/storage.js";
 import { Tag } from "./modules/tag.js";
+import { Transaction } from "./modules/transaction.js";
+import { Wallet } from "./modules/wallet.js";
 import { BeeRequestOptionsSchema } from "./utils/schema.js";
-import { BatchId, PrivateKey, Reference } from "./utils/typed-bytes.js";
 import { assertBeeUrl, stripLastSlash } from "./utils/url.js";
 /**
  * The main component that abstracts operations available on the Bee API.

package/dist/mjs/chunk/soc.js

@@ -1,23 +1,8 @@
-import { Binary } from 'cafe-utility';
+import { Bytes, EthAddress, Identifier, PrivateKey, makeContentAddressedChunk, makeSOCAddress, makeSingleOwnerChunk as coreMakeSingleOwnerChunk, unmarshalSingleOwnerChunk as coreUnmarshalSingleOwnerChunk } from '@ethersphere/core-sdk';
 import * as chunkAPI from "../api/chunk.js";
 import * as socAPI from "../api/soc.js";
-import { Bytes } from "../utils/bytes.js";
 import { BeeError } from "../utils/error.js";
-import { EthAddress, Identifier, PrivateKey, Reference, Signature, Span } from "../utils/typed-bytes.js";
-import { calculateChunkAddress } from "./bmt.js";
-import { makeContentAddressedChunk } from "./cac.js";
-const SOC_SIGNATURE_OFFSET = Identifier.LENGTH;
-const SOC_SPAN_OFFSET = Identifier.LENGTH + Signature.LENGTH;
-const SOC_PAYLOAD_OFFSET = Identifier.LENGTH + Signature.LENGTH + Span.LENGTH;
-function recoverChunkOwner(data) {
-  const cacData = data.slice(SOC_SPAN_OFFSET);
-  const chunkAddress = calculateChunkAddress(cacData);
-  const signature = Signature.fromSlice(data, SOC_SIGNATURE_OFFSET);
-  const identifier = Bytes.fromSlice(data, 0, Identifier.LENGTH);
-  const digest = Binary.concatBytes(identifier.toUint8Array(), chunkAddress.toUint8Array());
-  const ownerAddress = signature.recoverPublicKey(digest).address();
-  return ownerAddress;
-}
+export { makeSOCAddress };
 /**
  * Unmarshals arbitrary data into a Single Owner Chunk.
  * Throws an error if the data is not a valid SOC.
@@ -28,29 +13,11 @@ function recoverChunkOwner(data) {
  * @returns a single owner chunk or throws error
  */
 export function unmarshalSingleOwnerChunk(data, address) {
-  data = data instanceof Bytes ? data.toUint8Array() : data;
-  address = new Reference(address);
-  const ownerAddress = recoverChunkOwner(data);
-  const identifier = Bytes.fromSlice(data, 0, Identifier.LENGTH);
-  const socAddress = new Reference(Binary.keccak256(Binary.concatBytes(identifier.toUint8Array(), ownerAddress.toUint8Array())));
-  if (!Binary.equals(address.toUint8Array(), socAddress.toUint8Array())) {
-    throw new BeeError('SOC data does not match given address!');
+  try {
+    return coreUnmarshalSingleOwnerChunk(data, address);
+  } catch (e) {
+    throw new BeeError(e.message);
   }
-  const signature = Signature.fromSlice(data, SOC_SIGNATURE_OFFSET);
-  const span = Span.fromSlice(data, SOC_SPAN_OFFSET);
-  const payload = Bytes.fromSlice(data, SOC_PAYLOAD_OFFSET);
-  return {
-    data,
-    identifier,
-    signature,
-    span,
-    payload,
-    address: socAddress,
-    owner: ownerAddress
-  };
-}
-export function makeSOCAddress(identifier, address) {
-  return new Reference(Binary.keccak256(Binary.concatBytes(identifier.toUint8Array(), address.toUint8Array())));
 }
 /**
  * Creates a single owner chunk object
@@ -62,18 +29,13 @@ export function makeSOCAddress(identifier, address) {
 export function makeSingleOwnerChunk(address, span, payload, identifier, signer) {
   identifier = new Identifier(identifier);
   signer = new PrivateKey(signer);
-  const socAddress = makeSOCAddress(identifier, signer.publicKey().address());
-  const signature = signer.sign(Binary.concatBytes(identifier.toUint8Array(), address.toUint8Array()));
-  const data = Binary.concatBytes(identifier.toUint8Array(), signature.toUint8Array(), span.toUint8Array(), payload.toUint8Array());
-  return {
-    data,
-    identifier,
-    signature,
+  const wrappedChunk = {
+    data: Bytes.concat(span.toUint8Array(), payload.toUint8Array()),
     span,
     payload,
-    address: socAddress,
-    owner: signer.publicKey().address()
+    address
   };
+  return coreMakeSingleOwnerChunk(wrappedChunk, identifier, signer.toBigInt());
 }
 /**
  * Helper function to upload a chunk.
@@ -86,7 +48,7 @@ export function makeSingleOwnerChunk(address, span, payload, identifier, signer)
  * @param options         Upload options
  */
 export async function uploadSingleOwnerChunk(requestOptions, chunk, stamp, options) {
-  const data = Binary.concatBytes(chunk.span.toUint8Array(), chunk.payload.toUint8Array());
+  const data = Bytes.concat(chunk.span.toUint8Array(), chunk.payload.toUint8Array());
   return socAPI.upload(requestOptions, chunk.owner, chunk.identifier, chunk.signature, data, stamp, options);
 }
 /**

package/dist/mjs/feed/identifier.js

@@ -1,6 +1,5 @@
-import { Binary } from 'cafe-utility';
-import { FeedIndex, Identifier } from "../utils/typed-bytes.js";
+import { Bytes, FeedIndex, Identifier, keccak256 } from '@ethersphere/core-sdk';
 export function makeFeedIdentifier(topic, index) {
   index = typeof index === 'number' ? FeedIndex.fromBigInt(BigInt(index)) : index;
-  return new Identifier(Binary.keccak256(Binary.concatBytes(topic.toUint8Array(), index.toUint8Array())));
+  return new Identifier(keccak256(Bytes.concat(topic.toUint8Array(), index.toUint8Array())));
 }

package/dist/mjs/feed/index.js

@@ -1,14 +1,12 @@
-import { Binary, Optional } from 'cafe-utility';
+import { Optional } from 'cafe-utility';
 import { z } from 'zod';
-import { makeContentAddressedChunk, unmarshalContentAddressedChunk } from "../chunk/cac.js";
+import { Bytes, FeedIndex, Reference, keccak256, makeContentAddressedChunk, numberToUint64, uint64ToNumber, unmarshalContentAddressedChunk } from '@ethersphere/core-sdk';
 import { unmarshalSingleOwnerChunk, uploadSingleOwnerChunkData, uploadSingleOwnerChunkWithWrappedChunk } from "../chunk/soc.js";
 import * as bytes from "../api/bytes.js";
 import * as chunkAPI from "../api/chunk.js";
 import { fetchLatestFeedUpdate, probeFeed } from "../api/feed.js";
-import { Bytes } from "../utils/bytes.js";
 import { BeeResponseError } from "../utils/error.js";
 import { ResourceLocator } from "../utils/resource-locator.js";
-import { FeedIndex, Reference } from "../utils/typed-bytes.js";
 import { makeFeedIdentifier } from "./identifier.js";
 const TIMESTAMP_PAYLOAD_OFFSET = 0;
 const TIMESTAMP_PAYLOAD_SIZE = 8;
@@ -32,8 +30,8 @@ export async function updateFeedWithReference(requestOptions, signer, topic, ref
   const nextIndex = options?.index ?? (await findNextIndex(requestOptions, signer.publicKey().address(), topic));
   const identifier = makeFeedIdentifier(topic, nextIndex);
   const at = options?.at ?? Date.now() / 1000.0;
-  const timestamp = Binary.numberToUint64(BigInt(Math.floor(at)), 'BE');
-  const payloadBytes = Binary.concatBytes(timestamp, reference.toUint8Array());
+  const timestamp = numberToUint64(BigInt(Math.floor(at)), 'BE');
+  const payloadBytes = Bytes.concat(timestamp, reference.toUint8Array());
   return uploadSingleOwnerChunkData(requestOptions, signer, postageBatchId, identifier, payloadBytes, options);
 }
 export async function updateFeedWithPayload(requestOptions, signer, topic, data, postageBatchId, options) {
@@ -49,7 +47,7 @@ export async function updateFeedWithPayload(requestOptions, signer, topic, data,
 }
 export function getFeedUpdateChunkReference(owner, topic, index) {
   const identifier = makeFeedIdentifier(topic, index);
-  return new Reference(Binary.keccak256(Binary.concatBytes(identifier.toUint8Array(), owner.toUint8Array())));
+  return new Reference(keccak256(Bytes.concat(identifier.toUint8Array(), owner.toUint8Array())));
 }
 export async function downloadFeedUpdate(requestOptions, owner, topic, index, hasTimestamp = false) {
   index = typeof index === 'number' ? FeedIndex.fromBigInt(BigInt(index)) : index;
@@ -59,7 +57,7 @@ export async function downloadFeedUpdate(requestOptions, owner, topic, index, ha
   let timestamp = Optional.empty();
   if (hasTimestamp) {
     const timestampBytes = Bytes.fromSlice(soc.payload.toUint8Array(), TIMESTAMP_PAYLOAD_OFFSET, TIMESTAMP_PAYLOAD_SIZE);
-    timestamp = Optional.of(Number(Binary.uint64ToNumber(timestampBytes.toUint8Array(), 'BE')));
+    timestamp = Optional.of(Number(uint64ToNumber(timestampBytes.toUint8Array(), 'BE')));
   }
   return {
     timestamp,

package/dist/mjs/feed/retrievable.js

@@ -1,5 +1,5 @@
+import { FeedIndex } from '@ethersphere/core-sdk';
 import { Objects } from 'cafe-utility';
-import { FeedIndex } from "../utils/typed-bytes.js";
 import { getFeedUpdateChunkReference } from "./index.js";
 /**
  * Function that checks if a chunk is retrievable by actually downloading it.

package/dist/mjs/index.js

@@ -1,15 +1,12 @@
 import { Bee } from "./bee.js";
-import { Stamper } from "./stamper/stamper.js";
-export { MerkleTree } from 'cafe-utility';
+export { BatchId, Bytes, ChunkBuilder, ChunkSplitter, EthAddress, FeedIndex, Identifier, PeerAddress, PrivateKey, PublicKey, Reference, Signature, Span, Stamper, Topic, TransactionId } from '@ethersphere/core-sdk';
 export { MantarayNode } from "./manifest/manifest.js";
 export { SUPPORTED_BEE_VERSION, SUPPORTED_BEE_VERSION_EXACT } from "./version.js";
 export * from "./types/index.js";
-export { Bytes } from "./utils/bytes.js";
 export * from "./utils/constants.js";
 export { Duration } from "./utils/duration.js";
 export * from "./utils/error.js";
 export * as Utils from "./utils/expose.js";
 export { Size } from "./utils/size.js";
 export * from "./utils/tokens.js";
-export * from "./utils/typed-bytes.js";
-export { Bee, Stamper };
+export { Bee };