feat(fetchlogs) - ensure that we are deserializing the Command object…

…s correctly and fix bug in curentMessageBatchIndex
privacy-scaling-explorations · Nov 7, 2023 · 1a2a444 · 1a2a444
1 parent 5defa17
commit 1a2a444
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/cli/ts/genProofs.ts b/cli/ts/genProofs.ts
@@ -20,7 +20,7 @@ import {
 } from './utils'
 import {readJSONFile} from 'maci-common'
 import {contractFilepath} from './config'
-import { MaciState } from 'maci-core'
+import { MaciState, Poll } from 'maci-core'
 
 const configureSubparser = (subparsers: any) => {
     const parser = subparsers.addParser(
@@ -366,6 +366,8 @@ const genProofs = async (args: any) => {
         // @todo actually read the file first 
         const content = JSON.parse(fs.readFileSync(args.state_file, 'utf-8').toString())
         maciState = MaciState.fromJSON(content)
+        // ensure we merge all messages
+        maciState.polls.forEach((poll: Poll) => poll.mergeAllMessages()) 
     } else {
         // some rpc endpoint like bsc chain has limitation to retreive history logs
         let fromBlock = args.start_block ? args.start_block : 0

diff --git a/core/ts/MaciState.ts b/core/ts/MaciState.ts
@@ -1345,7 +1345,7 @@ class Poll {
             ballots: this.ballots.map(ballot => ballot.toJSON()),
             encPubKeys: this.encPubKeys.map(encPubKey => encPubKey.serialize()),
             ballotTree: this.ballotTree,
-            currentMessageBatchIndex: this.currentMessageBatchIndex ? this.currentMessageBatchIndex.toString() : "",
+            currentMessageBatchIndex: this.currentMessageBatchIndex,
             stateLeaves: this.stateLeaves.map(leaf => leaf.toJSON()),
             results: this.results.map(result => result.toString()),
             numBatchesProcessed: this.numBatchesProcessed,
@@ -1373,7 +1373,19 @@ class Poll {
         poll.ballots = json.ballots.map((ballot: Ballot) => Ballot.fromJSON(ballot))
         poll.encPubKeys = json.encPubKeys.map((key: string) => PubKey.unserialize(key))
         poll.messages = json.messages.map((message: Message) => Message.fromJSON(message))
-        poll.commands = json.commands.map((command: Command) => Command.fromJSON(command))
+        poll.commands = json.commands.map((command: any) => {
+            switch (command.cmdType) {
+                case "1": {
+                    return PCommand.fromJSON(command) 
+                }
+                case "2": {
+                    return TCommand.fromJSON(command)
+                }
+                default: {
+                    return Command.fromJSON(command)
+                }
+            }
+        })
         poll.results = json.results.map((result: string) => BigInt(result))
         poll.currentMessageBatchIndex = json.currentMessageBatchIndex
         poll.numBatchesProcessed = json.numBatchesProcessed
@@ -1387,6 +1399,7 @@ class Poll {
 
         // copy maci state 
         poll.copyStateFromMaci()
+
         return poll
     }
 }