From 21e5e41b0a9513711c612c0fd9297ec243c4f2e3 Mon Sep 17 00:00:00 2001
From: "fryorcraken.eth" <git@fryorcraken.xyz>
Date: Thu, 3 Nov 2022 14:17:51 +1100
Subject: [PATCH] chore: build core package

---
 packages/core/package.json                      | 5 +----
 packages/core/rollup.config.js                  | 1 -
 packages/core/src/index.ts                      | 4 ----
 packages/core/src/lib/crypto.ts                 | 2 +-
 packages/core/src/lib/waku_message/ecies.ts     | 2 +-
 packages/core/src/lib/waku_message/version_1.ts | 2 +-
 6 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 4031a118ef..edac1035b0 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -17,10 +17,6 @@
       "types": "./dist/lib/predefined_bootstrap_nodes.d.ts",
       "import": "./dist/lib/predefined_bootstrap_nodes.js"
     },
-    "./lib/utils": {
-      "types": "./dist/lib/utils.d.ts",
-      "import": "./dist/lib/utils.js"
-    },
     "./lib/wait_for_remote_peer": {
       "types": "./dist/lib/wait_for_remote_peer.d.ts",
       "import": "./dist/lib/wait_for_remote_peer.js"
@@ -98,6 +94,7 @@
     "node": ">=16"
   },
   "dependencies": {
+    "@waku/byte-utils": "*",
     "@chainsafe/libp2p-gossipsub": "^4.1.1",
     "@chainsafe/libp2p-noise": "^8.0.1",
     "@ethersproject/rlp": "^5.5.0",
diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js
index 75fca0e86e..ce780d1a01 100644
--- a/packages/core/rollup.config.js
+++ b/packages/core/rollup.config.js
@@ -7,7 +7,6 @@ export default {
     index: "dist/index.js",
     "lib/peer_discovery_static_list": "dist/lib/peer_discovery_static_list.js",
     "lib/predefined_bootstrap_nodes": "dist/lib/predefined_bootstrap_nodes.js",
-    "lib/utils": "dist/lib/utils.js",
     "lib/wait_for_remote_peer": "dist/lib/wait_for_remote_peer.js",
     "lib/waku_message/version_0": "dist/lib/waku_message/version_0.js",
     "lib/waku_message/version_1": "dist/lib/waku_message/version_1.js",
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index cef0c3a427..d115a25ce1 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -6,10 +6,6 @@ export {
   getPublicKey,
 } from "./lib/crypto";
 
-export * as enr from "./lib/enr";
-
-export * as utils from "./lib/utils";
-
 export * as proto_message from "./proto/message";
 export * as proto_topic_only_message from "./proto/topic_only_message";
 
diff --git a/packages/core/src/lib/crypto.ts b/packages/core/src/lib/crypto.ts
index 095b41e9a7..70507bc777 100644
--- a/packages/core/src/lib/crypto.ts
+++ b/packages/core/src/lib/crypto.ts
@@ -1,9 +1,9 @@
 import nodeCrypto from "crypto";
 
 import * as secp from "@noble/secp256k1";
+import { concat } from "@waku/byte-utils";
 import sha3 from "js-sha3";
 
-import { concat } from "./utils";
 import { Asymmetric, Symmetric } from "./waku_message/constants";
 
 declare const self: Record<string, any> | undefined;
diff --git a/packages/core/src/lib/waku_message/ecies.ts b/packages/core/src/lib/waku_message/ecies.ts
index eed121cc31..8b783f66b2 100644
--- a/packages/core/src/lib/waku_message/ecies.ts
+++ b/packages/core/src/lib/waku_message/ecies.ts
@@ -1,7 +1,7 @@
 import * as secp from "@noble/secp256k1";
+import { concat, hexToBytes } from "@waku/byte-utils";
 
 import { getSubtle, randomBytes, sha256 } from "../crypto";
-import { concat, hexToBytes } from "../utils";
 /**
  * HKDF as implemented in go-ethereum.
  */
diff --git a/packages/core/src/lib/waku_message/version_1.ts b/packages/core/src/lib/waku_message/version_1.ts
index 3b6d46a8e3..4dc426d157 100644
--- a/packages/core/src/lib/waku_message/version_1.ts
+++ b/packages/core/src/lib/waku_message/version_1.ts
@@ -1,10 +1,10 @@
 import * as secp from "@noble/secp256k1";
+import { concat, hexToBytes } from "@waku/byte-utils";
 import type { Decoder, Encoder, Message, ProtoMessage } from "@waku/interfaces";
 import debug from "debug";
 
 import * as proto from "../../proto/message";
 import { keccak256, randomBytes, sign } from "../crypto";
-import { concat, hexToBytes } from "../utils";
 
 import { Symmetric } from "./constants";
 import * as ecies from "./ecies";