Remove fixAccountUint8Arrays from the scripts

shardeum · Jul 22, 2024 · bb5d992 · bb5d992
1 parent 30ee7bc
commit bb5d992
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 24 deletions.
diff --git a/scripts/validate_archiver_receipt.ts b/scripts/validate_archiver_receipt.ts
@@ -3,7 +3,7 @@ import { overrideDefaultConfig, config } from '../src/Config'
 import * as Crypto from '../src/Crypto'
 import * as Utils from '../src/Utils'
 import * as Receipt from '../src/dbstore/receipts'
-import { AccountType, accountSpecificHash, fixAccountUint8Arrays } from '../src/shardeum/calculateAccountHash'
+import { AccountType, accountSpecificHash } from '../src/shardeum/calculateAccountHash'
 import { ShardeumReceipt } from '../src/shardeum/verifyAppReceiptData'
 
 // Add the full receipt data here
@@ -243,16 +243,6 @@ export const verifyAccountHash = (receipt: Receipt.ArchiverReceipt): boolean =>
   try {
     if (receipt.globalModification && config.skipGlobalTxReceiptVerification) return true // return true if global modification
     for (const account of receipt.accounts) {
-      if (account.data.accountType === AccountType.Account) {
-        fixAccountUint8Arrays(account.data.account)
-        // console.dir(acc, { depth: null })
-      } else if (
-        account.data.accountType === AccountType.ContractCode ||
-        account.data.accountType === AccountType.ContractStorage
-      ) {
-        fixAccountUint8Arrays(account.data)
-        // console.dir(acc, { depth: null })
-      }
       const calculatedAccountHash = accountSpecificHash(account.data)
       const indexOfAccount = receipt.appliedReceipt.appliedVote.account_id.indexOf(account.accountId)
       if (indexOfAccount === -1) {

diff --git a/scripts/verify_account_hash.ts b/scripts/verify_account_hash.ts
@@ -7,7 +7,7 @@ import * as dbstore from '../src/dbstore'
 import * as AccountDB from '../src/dbstore/accounts'
 import { startSaving } from '../src/saveConsoleOutput'
 import * as Logger from '../src/Logger'
-import { AccountType, fixAccountUint8Arrays, accountSpecificHash } from '../src/shardeum/calculateAccountHash'
+import { AccountType, accountSpecificHash } from '../src/shardeum/calculateAccountHash'
 import { addSigListeners } from '../src/State'
 import { Utils as StringUtils } from '@shardus/types'
 
@@ -48,16 +48,6 @@ const runProgram = async (): Promise<void> => {
       if (accountHash1 !== accountHash2) {
         console.log(account.accountId, 'accountHash', accountHash1, 'accountHash2', accountHash2)
       }
-      if (account.data.accountType === AccountType.Account) {
-        fixAccountUint8Arrays(account.data.account)
-        // console.dir(acc, { depth: null })
-      } else if (
-        account.data.accountType === AccountType.ContractCode ||
-        account.data.accountType === AccountType.ContractStorage
-      ) {
-        fixAccountUint8Arrays(account.data)
-        // console.dir(acc, { depth: null })
-      }
       const calculatedAccountHash = accountSpecificHash(account.data)
 
       if (accountHash1 !== calculatedAccountHash) {

diff --git a/src/Data/Data.ts b/src/Data/Data.ts
@@ -287,13 +287,17 @@ export function initSocketClient(node: NodeList.ConsensusNodeInfo): void {
       if (newData.responses && newData.responses.ACCOUNT) {
         if (getCurrentCycleCounter() > GENESIS_ACCOUNTS_CYCLE_RANGE.endCycle) {
           Logger.mainLogger.error(
-            'Account data is not meant to be received after the genesis cycle',
+            'Account data is not meant to be received after the genesis accounts cycle range',
             getCurrentCycleCounter()
           )
           unsubscribeDataSender(sender.nodeInfo.publicKey)
           return
         }
-        if (NodeList.byPublicKey.size > 1 || !NodeList.byPublicKey.has(sender.nodeInfo.publicKey)) {
+        if (
+          Cycles.currentNetworkMode !== 'forming' ||
+          NodeList.byPublicKey.size > 1 ||
+          !NodeList.byPublicKey.has(sender.nodeInfo.publicKey)
+        ) {
           Logger.mainLogger.error(
             'Account data is not meant to be received by the first validator',
             `Number of nodes in the network ${NodeList.byPublicKey.size}`