Improve voucher execution error handling

cartesi · Oct 30, 2023 · eab32fd · eab32fd
1 parent 65079ad
commit eab32fd
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 5 deletions.
diff --git a/frontend-console/src/commands/voucher_commands/execute.ts b/frontend-console/src/commands/voucher_commands/execute.ts
@@ -22,6 +22,10 @@ import {
     Args as RollupsArgs,
     builder as rollupsBuilder,
 } from "../../rollups";
+import {
+    LibOutputValidation__factory,
+    History__factory,
+} from "@cartesi/rollups";
 
 interface Args extends ConnectArgs, RollupsArgs {
     url: string;
@@ -107,6 +111,31 @@ export const handler = async (args: Args) => {
             console.log(`resulting events: ${JSON.stringify(receipt.events)}`);
         }
     } catch (e) {
-        console.log(`COULD NOT EXECUTE VOUCHER: ${JSON.stringify(e)}`);
+        let error: any = e;
+        // if error is a custom revert object, we need to parse it given its "data" field
+        // note: custom revert error declaration may be in one of several contracts
+        const errorData = error?.error?.error?.error?.data;
+        try {
+            error = outputContract.interface.parseError(errorData).name;
+        } catch (e) {
+            try {
+                const libOutputValidation =
+                    LibOutputValidation__factory.connect(
+                        outputContract.address,
+                        outputContract.signer
+                    );
+                error =
+                    libOutputValidation.interface.parseError(errorData).name;
+            } catch (e) {
+                try {
+                    const history = History__factory.connect(
+                        outputContract.address,
+                        outputContract.signer
+                    );
+                    error = history.interface.parseError(errorData).name;
+                } catch (e) {}
+            }
+        }
+        console.log(`COULD NOT EXECUTE VOUCHER: ${JSON.stringify(error)}`);
     }
 };
diff --git a/frontend-console/src/rollups.ts b/frontend-console/src/rollups.ts
@@ -15,8 +15,8 @@ import { Signer } from "ethers";
 import {
     IInputBox,
     IInputBox__factory,
-    ICartesiDApp,
-    ICartesiDApp__factory,
+    CartesiDApp,
+    CartesiDApp__factory,
     IERC20Portal,
     IERC20Portal__factory,
     IERC721Portal,
@@ -40,7 +40,7 @@ export interface Args {
 interface Contracts {
     dapp: string;
     inputContract: IInputBox;
-    outputContract: ICartesiDApp;
+    outputContract: CartesiDApp;
     erc20Portal: IERC20Portal;
     erc721Portal: IERC721Portal;
     deployment: Deployment
@@ -155,7 +155,7 @@ export const rollups = async (
         InputBox.address,
         provider
     );
-    const outputContract = ICartesiDApp__factory.connect(address, provider);
+    const outputContract = CartesiDApp__factory.connect(address, provider);
     const erc20Portal = IERC20Portal__factory.connect(
         ERC20Portal.address,
         provider