chore: update core, use Bytes.concat (#1242)

* chore: update core, use Bytes.concat

* chore: update rc wf bee version

---------

Co-authored-by: Gergely Békési <gergely.bekesi@ethswarm.org>

Author: slapec93

.github/workflows/tests-rc.yaml

@@ -34,7 +34,7 @@ jobs:
         run: bee-dev --port 16337 &
 
       - name: Start bee-factory
-        run: bee-factory start
+        run: bee-factory start --tag v2.8.2-rc1
 
       - name: Create managed postage batch
         run: echo "JEST_MANAGED_BATCH_ID=$(swarm-cli stamp buy --depth 20 --amount 1b --quiet)" >> $GITHUB_ENV

package-lock.json

@@ -71,7 +71,7 @@
     "debug": "^4.4.3",
     "isomorphic-ws": "^5.0.0",
     "semver": "^7.3.5",
-    "swarm-core": "npm:@upcoming/swarm-core@0.0.8",
+    "swarm-core": "npm:@upcoming/swarm-core@0.0.9",
     "ws": "^8.21.0",
     "zod": "^4.4.3"
   },

package.json

@@ -8,7 +8,6 @@ import {
   Reference,
   SingleOwnerChunk,
   Span,
-  concatBytes,
   makeContentAddressedChunk,
   makeSOCAddress,
   makeSingleOwnerChunk as coreMakeSingleOwnerChunk,
@@ -58,7 +57,7 @@ export function makeSingleOwnerChunk(
 ): SingleOwnerChunk {
   identifier = new Identifier(identifier)
   signer = new PrivateKey(signer)
-  const wrappedChunk = { data: concatBytes(span.toUint8Array(), payload.toUint8Array()), span, payload, address }
+  const wrappedChunk = { data: Bytes.concat(span.toUint8Array(), payload.toUint8Array()), span, payload, address }
 
   return coreMakeSingleOwnerChunk(wrappedChunk, identifier, signer.toBigInt())
 }
@@ -79,7 +78,7 @@ export async function uploadSingleOwnerChunk(
   stamp: BatchId | Uint8Array | string,
   options?: UploadOptions,
 ): Promise<UploadResult> {
-  const data = 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)
 }

src/chunk/soc.ts

@@ -1,7 +1,7 @@
-import { FeedIndex, Identifier, Topic, concatBytes, keccak256 } from 'swarm-core'
+import { Bytes, FeedIndex, Identifier, Topic, keccak256 } from 'swarm-core'
 
 export function makeFeedIdentifier(topic: Topic, index: FeedIndex | number): Identifier {
   index = typeof index === 'number' ? FeedIndex.fromBigInt(BigInt(index)) : index
 
-  return new Identifier(keccak256(concatBytes(topic.toUint8Array(), index.toUint8Array())))
+  return new Identifier(keccak256(Bytes.concat(topic.toUint8Array(), index.toUint8Array())))
 }

src/feed/identifier.ts

@@ -9,7 +9,6 @@ import {
   PrivateKey,
   Reference,
   Topic,
-  concatBytes,
   keccak256,
   makeContentAddressedChunk,
   numberToUint64,
@@ -86,7 +85,7 @@ export async function updateFeedWithReference(
   const identifier = makeFeedIdentifier(topic, nextIndex)
   const at = options?.at ?? Date.now() / 1000.0
   const timestamp = numberToUint64(BigInt(Math.floor(at)), 'BE')
-  const payloadBytes = concatBytes(timestamp, reference.toUint8Array())
+  const payloadBytes = Bytes.concat(timestamp, reference.toUint8Array())
 
   return uploadSingleOwnerChunkData(requestOptions, signer, postageBatchId, identifier, payloadBytes, options)
 }
@@ -132,7 +131,7 @@ export async function updateFeedWithPayload(
 export function getFeedUpdateChunkReference(owner: EthAddress, topic: Topic, index: FeedIndex): Reference {
   const identifier = makeFeedIdentifier(topic, index)
 
-  return new Reference(keccak256(concatBytes(identifier.toUint8Array(), owner.toUint8Array())))
+  return new Reference(keccak256(Bytes.concat(identifier.toUint8Array(), owner.toUint8Array())))
 }
 
 export async function downloadFeedUpdate(

src/feed/index.ts

@@ -1,5 +1,5 @@
 import { ReadStream } from 'fs'
-import { concatBytes } from 'swarm-core'
+import { Bytes } from 'swarm-core'
 import { MantarayNode, NULL_ADDRESS } from '../../src'
 import { makeBee } from '../utils'
 
@@ -36,7 +36,7 @@ test.skip('GET readable bytes (ENS)', async () => {
     parts.push(part)
   }
 
-  const data = concatBytes(...parts)
+  const data = Bytes.concat(...parts)
 
   const manifest = MantarayNode.unmarshalFromData(data, NULL_ADDRESS)
   await manifest.loadRecursively(bee)

test/integration/download-ens.spec.ts

@@ -1,6 +1,6 @@
 import { Types } from 'cafe-utility'
 import { ReadStream } from 'fs'
-import { ChunkSplitter, PrivateKey, Span, concatBytes, makeContentAddressedChunk } from 'swarm-core'
+import { Bytes, ChunkSplitter, PrivateKey, Span, makeContentAddressedChunk } from 'swarm-core'
 import { BeeRequest, BeeRequestOptions, MantarayNode, NULL_ADDRESS } from '../../src'
 import { makeCollectionFromFileList } from '../../src/utils/collection'
 import { batch, makeBee } from '../utils'
@@ -21,7 +21,7 @@ test('POST encrypted data', async () => {
   for await (const chunk of stream) {
     chunks.push(chunk)
   }
-  const concatenated = concatBytes(...chunks)
+  const concatenated = Bytes.concat(...chunks)
   expect(decoder.decode(concatenated)).toBe(data)
 })
 
@@ -37,7 +37,7 @@ test('POST encrypted file', async () => {
   for await (const chunk of stream) {
     chunks.push(chunk)
   }
-  const concatenated = concatBytes(...chunks)
+  const concatenated = Bytes.concat(...chunks)
   expect(decoder.decode(concatenated)).toBe(await file.text())
 })