fix: avoid build path import introduced by prior commit

scripts/archiver_data_patcher.ts

@@ -15,7 +15,7 @@ import * as Crypto from '../src/Crypto'
 import { join } from 'path'
 import * as Logger from '../src/Logger'
 import { startSaving } from '../src/saveConsoleOutput'
-import { safeStringify } from '@shardus/types/build/src/utils/functions/stringify'
+import { Utils as StringUtils } from '@shardus/types'
 const {
   MAX_RECEIPTS_PER_REQUEST,
   MAX_BETWEEN_CYCLES_PER_REQUEST,
@@ -94,7 +94,7 @@ const runProgram = async (): Promise<void> => {
         const downloadedReceipts = downloadedReceiptCountByCycles.receipts.filter((d) => d.cycle === j)
         const existingReceipts = receiptsCountByCycles.filter((d) => d.cycle === j)
         // console.log(j, downloadedReceipts, existingReceipts)
-        if (safeStringify(downloadedReceipts) !== safeStringify(existingReceipts)) {
+        if (StringUtils.safeStringify(downloadedReceipts) !== StringUtils.safeStringify(existingReceipts)) {
           console.log('Unmatched', j, downloadedReceipts, existingReceipts)
           const receipts = await fetchDataForCycle(archiver, DataType.RECEIPT, j)
           console.log('Downloaded receipts for cycle', j, ' -> ', receipts.length)
@@ -130,7 +130,7 @@ const runProgram = async (): Promise<void> => {
         )
         const existingOriginalTxsData = originalTxsDataCountByCycles.filter((d) => d.cycle === j)
         // console.log(j, downloadedOriginalTxsData, existingOriginalTxsData)
-        if (safeStringify(downloadedOriginalTxsData) !== safeStringify(existingOriginalTxsData)) {
+        if (StringUtils.safeStringify(downloadedOriginalTxsData) !== StringUtils.safeStringify(existingOriginalTxsData)) {
           console.log('Unmatched', j, downloadedOriginalTxsData, existingOriginalTxsData)
           const originalTxsData = await fetchDataForCycle(archiver, DataType.ORIGINAL_TX_DATA, j)
           if (originalTxsData) {

src/API.ts

@@ -27,7 +27,7 @@ import * as AccountDataProvider from './Data/AccountDataProvider'
 import { getGlobalNetworkAccount } from './GlobalAccount'
 import { cycleRecordWithShutDownMode } from './Data/Cycles'
 import { isDebugMiddleware } from './DebugMode'
-import { safeStringify } from '@shardus/types/build/src/utils/functions/stringify'
+import { Utils as StringUtils } from '@shardus/types'
 const { version } = require('../package.json') // eslint-disable-line @typescript-eslint/no-var-requires
 
 const TXID_LENGTH = 64
@@ -300,7 +300,7 @@ export function registerRoutes(server: FastifyInstance<Server, IncomingMessage,
       }
       cycleInfo = await CycleDB.queryCycleRecordsBetween(from, to)
       if (isDownload) {
-        const dataInBuffer = Buffer.from(safeStringify(cycleInfo), 'utf-8')
+        const dataInBuffer = Buffer.from(StringUtils.safeStringify(cycleInfo), 'utf-8')
         const dataInStream = Readable.from(dataInBuffer)
         const filename = `cycle_records_from_${from}_to_${to}`
 

src/Crypto.ts

@@ -1,14 +1,14 @@
 import * as core from '@shardus/crypto-utils'
 import { SignedObject, TaggedObject, publicKey, curvePublicKey, sharedKey } from '@shardus/crypto-utils'
-import { safeJsonParse, safeStringify } from '@shardus/types/build/src/utils/functions/stringify'
+import { Utils as StringUtils } from '@shardus/types'
 import * as State from './State'
 import { cryptoStringify } from './utils/stringify'
 
 // Crypto initialization fns
 
 export function setCryptoHashKey(hashkey: string): void {
   core.init(hashkey)
-  core.setCustomStringifier(safeStringify, 'shardus_types_safeStringify')
+  core.setCustomStringifier(StringUtils.safeStringify, 'shardus_types_StringUtils.safeStringify')
 }
 
 export const hashObj = core.hashObj
@@ -17,7 +17,7 @@ export const hashObj = core.hashObj
 export type SignedMessage = SignedObject
 
 export function sign<T>(obj: T): T & SignedObject {
-  const objCopy = safeJsonParse(core.stringify(obj))
+  const objCopy = StringUtils.safeJsonParse(core.stringify(obj))
   core.signObj(objCopy, State.getSecretKey(), State.getNodeInfo().publicKey)
   return objCopy
 }
@@ -56,7 +56,7 @@ export function getOrCreateSharedKey(pk: publicKey): sharedKey {
 
 export function tag<T>(obj: T, recipientPk: publicKey): T & TaggedMessage {
   const sharedKey = getOrCreateSharedKey(recipientPk)
-  const objCopy = safeJsonParse(core.stringify(obj))
+  const objCopy = StringUtils.safeJsonParse(core.stringify(obj))
   objCopy.publicKey = State.getNodeInfo().publicKey
   core.tagObj(objCopy, sharedKey)
   return objCopy

src/Data/Collector.ts

@@ -29,7 +29,7 @@ import { ConsensusNodeInfo } from '../NodeList'
 import { verifyAccountHash } from '../shardeum/calculateAccountHash'
 import { verifyAppReceiptData } from '../shardeum/verifyAppReceiptData'
 import { Cycle as DbCycle } from '../dbstore/types'
-import { safeStringify } from '@shardus/types/build/src/utils/functions/stringify'
+import { Utils as StringUtils } from '@shardus/types'
 
 export let storingAccountData = false
 const processedReceiptsMap: Map<string, number> = new Map()
@@ -228,7 +228,7 @@ const isReceiptRobust = async (
         Logger.mainLogger.error(
           `The receipt validation failed from robustQuery nodes ${receipt.tx.txId} , ${receipt.cycle}, ${receipt.tx.timestamp}`
         )
-        Logger.mainLogger.error(safeStringify(robustQueryReceipt), safeStringify(fullReceipt))
+        Logger.mainLogger.error(StringUtils.safeStringify(robustQueryReceipt), StringUtils.safeStringify(fullReceipt))
       }
     }
     Logger.mainLogger.error(
@@ -612,7 +612,7 @@ export const storeReceiptData = async (
     })
     if (config.dataLogWrite && ReceiptLogWriter)
       ReceiptLogWriter.writeToLog(
-        `${safeStringify({
+        `${StringUtils.safeStringify({
           ...receipt,
           receiptId: tx.txId,
           timestamp: tx.timestamp,
@@ -776,10 +776,10 @@ export const storeCycleData = async (cycles: P2PTypes.CycleCreatorTypes.CycleDat
       cycleMarker: cycleRecord.marker,
       cycleRecord,
     }
-    if (config.dataLogWrite && CycleLogWriter) CycleLogWriter.writeToLog(`${safeStringify(cycleObj)}\n`)
+    if (config.dataLogWrite && CycleLogWriter) CycleLogWriter.writeToLog(`${StringUtils.safeStringify(cycleObj)}\n`)
     const cycleExist = await queryCycleByMarker(cycleObj.cycleMarker)
     if (cycleExist) {
-      if (safeStringify(cycleObj) !== safeStringify(cycleExist))
+      if (StringUtils.safeStringify(cycleObj) !== StringUtils.safeStringify(cycleExist))
         await updateCycle(cycleObj.cycleMarker, cycleObj)
     } else {
       // await Cycle.insertCycle(cycleObj)
@@ -886,7 +886,7 @@ export const storeOriginalTxData = async (
     if (missingOriginalTxsMap.has(txId)) missingOriginalTxsMap.delete(txId)
 
     if (config.dataLogWrite && OriginalTxDataLogWriter)
-      OriginalTxDataLogWriter.writeToLog(`${safeStringify(originalTxData)}\n`)
+      OriginalTxDataLogWriter.writeToLog(`${StringUtils.safeStringify(originalTxData)}\n`)
     combineOriginalTxsData.push(originalTxData)
     txDataList.push({ txId, timestamp })
     if (combineOriginalTxsData.length >= bucketSize) {

src/Data/Data.ts

@@ -41,7 +41,7 @@ import { Transaction } from '../dbstore/transactions'
 import { AccountCopy } from '../dbstore/accounts'
 import { getJson } from '../P2P'
 import { robustQuery } from '../Utils'
-import { safeStringify } from '@shardus/types/build/src/utils/functions/stringify'
+import { Utils as StringUtils } from '@shardus/types'
 
 export const socketClients: Map<string, SocketIOClientStatic['Socket']> = new Map()
 export let combineAccountsData = {
@@ -414,7 +414,7 @@ export function collectCycleData(
             key, // marker
             /* eslint-disable security/detect-object-injection */
             receivedCycleTracker[counter][key]['receivedTimes'],
-            logCycle ? safeStringify(receivedCycleTracker[counter][key]['senderNodes']) : '',
+            logCycle ? StringUtils.safeStringify(receivedCycleTracker[counter][key]['senderNodes']) : '',
             logCycle ? receivedCycleTracker[counter][key] : ''
             /* eslint-enable security/detect-object-injection */
           )
@@ -811,7 +811,7 @@ export async function sendLeaveRequest(nodes: NodeList.ConsensusNodeInfo[]): Pro
   const promises = nodes.map((node) =>
     fetch(`http://${node.ip}:${node.port}/leavingarchivers`, {
       method: 'post',
-      body: safeStringify(leaveRequest),
+      body: StringUtils.safeStringify(leaveRequest),
       headers: { 'Content-Type': 'application/json' },
       timeout: 2 * 1000, // 2s timeout
     }).then((res) => res.json())
@@ -863,7 +863,7 @@ export async function sendActiveRequest(): Promise<void> {
   const promises = nodes.map((node) =>
     fetch(`http://${node.ip}:${node.port}/activearchiver`, {
       method: 'post',
-      body: safeStringify(activeRequest),
+      body: StringUtils.safeStringify(activeRequest),
       headers: { 'Content-Type': 'application/json' },
       timeout: 2 * 1000, // 2s timeout
     }).then((res) => res.json())
@@ -2068,7 +2068,7 @@ export async function compareWithOldCyclesData(lastCycleCounter = 0): Promise<Co
     const downloadedCycle = downloadedCycles[i]
     // eslint-disable-next-line security/detect-object-injection
     const oldCycle = oldCycles[i]
-    if (!downloadedCycle || !oldCycle || safeStringify(downloadedCycle) !== safeStringify(oldCycle)) {
+    if (!downloadedCycle || !oldCycle || StringUtils.safeStringify(downloadedCycle) !== StringUtils.safeStringify(oldCycle)) {
       console.log('Mismatched cycle Number', downloadedCycle.counter, oldCycle.counter)
       return {
         success,

src/P2P.ts

@@ -7,7 +7,7 @@ import fetch from 'node-fetch'
 import { P2P as P2PTypes } from '@shardus/types'
 import { RequestInit, Response } from 'node-fetch'
 import { SignedObject } from '@shardus/crypto-utils'
-import { safeStringify } from '@shardus/types/build/src/utils/functions/stringify'
+import { Utils as StringUtils } from '@shardus/types'
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { version } = require('../package.json')
 
@@ -83,7 +83,7 @@ export async function postJson(
   try {
     const res = await fetch(url, {
       method: 'post',
-      body: safeStringify(body),
+      body: StringUtils.safeStringify(body),
       headers: { 'Content-Type': 'application/json' },
       timeout: timeoutInSecond * 1000,
     })

src/Utils.ts

@@ -1,4 +1,4 @@
-import { safeJsonParse, safeStringify } from '@shardus/types/build/src/utils/functions/stringify'
+import { Utils as StringUtils } from '@shardus/types'
 import * as util from 'util'
 import * as Logger from './Logger'
 
@@ -334,7 +334,7 @@ export const deepCopy = <T>(obj: T): T => {
   if (typeof obj !== 'object') {
     throw Error('Given element is not of type object.')
   }
-  return safeJsonParse(safeStringify(obj))
+  return StringUtils.safeJsonParse(StringUtils.safeStringify(obj))
 }
 
 export const insertSorted = function <T>(arr: T[], item: T, comparator?: (a: T, b: T) => number): void {

src/archivedCycle/StateMetaData.ts

@@ -35,7 +35,7 @@ import { profilerInstance } from '../profiler/profiler'
 // Socket modules
 export let socketServer: SocketIO.Server
 import * as ioclient from 'socket.io-client'
-import { safeStringify } from '@shardus/types/build/src/utils/functions/stringify'
+import { Utils as StringUtils } from '@shardus/types'
 let socketClient: SocketIOClientStatic['Socket']
 export const socketClients: Map<string, SocketIOClientStatic['Socket']> = new Map()
 const socketConnectionsTracker: Map<string, string> = new Map()
@@ -1190,7 +1190,7 @@ export async function compareWithOldCyclesData(
     // eslint-disable-next-line security/detect-object-injection
     const oldCycle = oldCycles[i]
     console.log(downloadedCycle, oldCycle)
-    if (safeStringify(downloadedCycle) !== safeStringify(oldCycle)) {
+    if (StringUtils.safeStringify(downloadedCycle) !== StringUtils.safeStringify(oldCycle)) {
       return {
         success,
         cycle,

src/profiler/StringifyReduce.ts

@@ -1,4 +1,4 @@
-import { safeStringify } from "@shardus/types/build/src/utils/functions/stringify"
+import { Utils as StringUtils } from "@shardus/types"
 
 export const makeShortHash = (x: string, n = 4): string => {
   if (!x) {
@@ -87,21 +87,21 @@ export const stringifyReduce = (val: unknown, isArrayProp?: boolean): string =>
               if (str) {
                 str += ','
               }
-              str += safeStringify(key) + ':' + propVal
+              str += StringUtils.safeStringify(key) + ':' + propVal
             }
             i++
           }
           return '{' + str + '}'
         } else {
-          return safeStringify(val)
+          return StringUtils.safeStringify(val)
         }
       }
     case 'function':
     case 'undefined':
       return isArrayProp ? null : undefined
     case 'string': {
       const reduced = makeShortHash(val)
-      return safeStringify(reduced)
+      return StringUtils.safeStringify(reduced)
     }
     default: {
       const n = Number(val)

src/utils/serialization.ts

@@ -1,10 +1,10 @@
 import { stringify } from './stringify'
 import { config } from '../Config'
-import { safeJsonParse, safeStringify } from '@shardus/types/build/src/utils/functions/stringify'
+import { Utils as StringUtils } from '@shardus/types'
 
 export function SerializeToJsonString(obj: object): string {
   try {
-    if (config.useSerialization) return safeStringify(obj, { bufferEncoding: 'base64' })
+    if (config.useSerialization) return StringUtils.safeStringify(obj, { bufferEncoding: 'base64' })
     else return JSON.stringify(obj)
   } catch (e) {
     console.log('Error serializing object', e)
@@ -15,7 +15,7 @@ export function SerializeToJsonString(obj: object): string {
 
 export function DeSerializeFromJsonString<T>(jsonString: string): T {
   try {
-    if (config.useSerialization) return <T>safeJsonParse(jsonString)
+    if (config.useSerialization) return <T>StringUtils.safeJsonParse(jsonString)
     else return JSON.parse(jsonString)
   } catch (e) {
     console.log('Error deserializing object', e)