Show error while having an issue when parsing the arguments

FluffyLabs · Jul 24, 2024 · 3ed6127 · 3ed6127
1 parent 3d3be9c
commit 3ed6127
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/App.tsx b/src/App.tsx
@@ -131,6 +131,7 @@ function App() {
             <TableHead>Instruction Name</TableHead>
             <TableHead>Instruction Gas</TableHead>
             <TableHead>Instruction Args</TableHead>
+            <TableHead>Instruction Errors</TableHead>
           </TableRow>
         </TableHeader>
         <TableBody>
@@ -141,6 +142,7 @@ function App() {
                 <TableCell>{programRow.name}</TableCell>
                 <TableCell>{programRow.gas}</TableCell>
                 <TableCell>{JSON.stringify(programRow.args)}</TableCell>
+                <TableCell>{programRow.error}</TableCell>
               </TableRow>
             ))}
         </TableBody>

diff --git a/src/pvm-packages/pvm/pvm.ts b/src/pvm-packages/pvm/pvm.ts
@@ -98,7 +98,15 @@ export class Pvm {
       if (this.gas < 0) {
         // TODO [MaSi]: to handle
       }
-      const args = this.argsDecoder.getArgs(this.pc);
+
+      let args;
+
+      try {
+        args = this.argsDecoder.getArgs(this.pc);
+      } catch (e) {
+        printableProgram.push({ instructionCode: currentInstruction, ...byteToOpCodeMap[currentInstruction], error: "Cannot get arguments from args decoder" });
+        return printableProgram;
+      }
 
       const currentInstructionDebug = { instructionCode: currentInstruction, ...byteToOpCodeMap[currentInstruction], args };