Merge pull request #491 from HausDAO/develop

deploy
HausDAO · Apr 3, 2024 · 186d148 · 186d148
2 parents ae80c8a + d7a5f63
commit 186d148
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 22 deletions.
diff --git a/libs/moloch-v3-macro-ui/src/components/ProposalActionData/ProposalActionData.tsx b/libs/moloch-v3-macro-ui/src/components/ProposalActionData/ProposalActionData.tsx
@@ -1,5 +1,5 @@
 import { ReactNode, useState } from 'react';
-import { isValidNetwork } from '@daohaus/keychain-utils';
+import { ValidNetwork, isValidNetwork } from '@daohaus/keychain-utils';
 import { MolochV3Proposal } from '@daohaus/moloch-v3-data';
 import {
   ActionError,
@@ -18,6 +18,7 @@ import {
   useBreakpoint,
   widthQuery,
   ParLg,
+  DataMd,
 } from '@daohaus/ui';
 import {
   DAO_METHOD_TO_PROPOSAL_TYPE,
@@ -210,20 +211,52 @@ const ActionToggle = ({
 
 const ActionSectionError = ({
   action,
+  actionHeader,
+  daoChain,
   index,
+  isMobile,
 }: {
   action: ActionError;
+  actionHeader: string;
+  daoChain?: ValidNetwork;
   index: number;
+  isMobile?: boolean;
 }) => {
   return (
     <div className="display-segment data" key={`${action.message}-${index}`}>
-      <H4 className="space">Action {index + 1}: Error</H4>
-      <DataSm className="space">{action.message}</DataSm>
-      <Divider className="space" />
-      <DataSm className="space">
-        <Bold>HEX DATA:</Bold>
-      </DataSm>
-      <DataSm className="space">{action.data}</DataSm>
+      <ActionToggle actionHeader={actionHeader} action={action}>
+        <>
+          <DataMd className="space">Action {index + 1}</DataMd>
+          <DataSm className="space">Error: {action.message}</DataSm>
+          <Divider className="space" />
+          {action.contractAddress && (
+            <>
+              <DataSm className="space">
+                <Bold>TARGET</Bold>
+              </DataSm>
+              <AddressDisplay
+                className="space"
+                address={action.contractAddress}
+                copy
+                explorerNetworkId={daoChain}
+                truncate={isMobile}
+              />
+            </>
+          )}
+          <DataSm className="space">
+            <Bold>HEX DATA:</Bold>
+          </DataSm>
+          <DataSm className="space">{action.data}</DataSm>
+          {action.value && (
+            <>
+              <DataSm className="space">
+                <Bold>VALUE</Bold>
+              </DataSm>
+              <DataSm className="space">{action.value}</DataSm>
+            </>
+          )}
+        </>
+      </ActionToggle>
     </div>
   );
 };
@@ -249,7 +282,15 @@ const ActionSection = ({
   const isMobile = useBreakpoint(widthQuery.sm);
 
   if (isActionError(action)) {
-    return <ActionSectionError index={index} action={action} />;
+    return (
+      <ActionSectionError
+        index={index}
+        action={action}
+        actionHeader={actionHeader}
+        daoChain={network}
+        isMobile={isMobile}
+      />
+    );
   }
 
   return (

diff --git a/libs/tx-builder/src/utils/decoding.ts b/libs/tx-builder/src/utils/decoding.ts
@@ -16,6 +16,8 @@ export type ActionError = {
   error: boolean;
   message: string;
   data: string;
+  contractAddress?: string;
+  value?: string;
 };
 
 export type DecodedMultiTX = (DecodedAction | ActionError)[];

diff --git a/libs/tx-builder/src/utils/deepDecoding.ts b/libs/tx-builder/src/utils/deepDecoding.ts
@@ -88,10 +88,17 @@ export const deepDecodeProposalActions = async ({
   return decodeMultiCall(options, actionData as `0x${string}`);
 };
 
-const createActionError = (data: string, message: string): ActionError => ({
+const createActionError = (
+  data: string,
+  message: string,
+  contractAddress?: string,
+  value?: string
+): ActionError => ({
   error: true,
   message,
   data,
+  contractAddress,
+  value,
 });
 
 const decodeMultiCall = async (
@@ -192,15 +199,17 @@ const actionDecoders: Record<
     ) {
       return createActionError(
         action.data,
-        'Could not decode action: multiSend'
+        'Could not decode action: multiSend',
+        action.to
       );
     }
     const input = decodedMethod.inputs[0];
 
     if (input.type !== 'bytes') {
       return createActionError(
         action.data,
-        'Could not decode action: multiSend'
+        'Could not decode action: multiSend',
+        action.to
       );
     }
 
@@ -227,7 +236,8 @@ const actionDecoders: Record<
     ) {
       return createActionError(
         action.data,
-        'Could not decode action: execTransactionFromModule'
+        'Could not decode action: execTransactionFromModule',
+        action.to
       );
     }
     const inputTo = decodedMethod.inputs[0];
@@ -243,7 +253,8 @@ const actionDecoders: Record<
     ) {
       return createActionError(
         action.data,
-        'Could not decode action: execTransactionFromModule'
+        'Could not decode action: execTransactionFromModule',
+        action.to
       );
     }
 
@@ -274,7 +285,8 @@ const actionDecoders: Record<
     ) {
       return createActionError(
         action.data,
-        'Could not decode action: executeAsBaal'
+        'Could not decode action: executeAsBaal',
+        action.to
       );
     }
     const inputTo = decodedMethod.inputs[0];
@@ -288,7 +300,8 @@ const actionDecoders: Record<
     ) {
       return createActionError(
         action.data,
-        'Could not decode action: executeAsBaal'
+        'Could not decode action: executeAsBaal',
+        action.to
       );
     }
 
@@ -349,15 +362,17 @@ const actionDecoders: Record<
     ) {
       return createActionError(
         action.data,
-        'Could not decode action: multiSend'
+        'Could not decode action: multiSend',
+        action.to
       );
     }
     const input = decodedMethod.inputs[0];
 
     if (input.type !== 'bytes[]') {
       return createActionError(
         action.data,
-        'Could not decode action: multicall'
+        'Could not decode action: multicall',
+        action.to
       );
     }
 
@@ -420,7 +435,12 @@ const decodeAction = async (
   });
 
   if (!abi || !abi?.length) {
-    return createActionError(data, 'Could not decode action: abi not found');
+    return createActionError(
+      data,
+      'Could not decode action: abi not found',
+      to,
+      decodeValue(value)
+    );
   }
 
   const decodedMethod = decodeMethod({
@@ -429,7 +449,12 @@ const decodeAction = async (
   });
 
   if (!decodedMethod) {
-    return createActionError(data, 'Could not decode action: method not found');
+    return createActionError(
+      data,
+      'Could not decode action: method not found',
+      to,
+      decodeValue(value)
+    );
   }
 
   const methodSignature = data.slice(0, 10);

diff --git a/libs/tx-builder/src/utils/multicall.ts b/libs/tx-builder/src/utils/multicall.ts
@@ -169,8 +169,13 @@ const handleMulticallFormActions = ({
   if (!validTxs.length) {
     throw new Error('No actions found');
   }
-  // TODO: sort by tx.actionId.index
-  return validTxs.map((actionId: string) => {
+  const sortedTxs = validTxs.sort((actionA: string, actionB: string) =>
+    Number(appState.formValues.tx[actionA].index) >
+    Number(appState.formValues.tx[actionB].index)
+      ? 1
+      : -1
+  );
+  return sortedTxs.map((actionId: string) => {
     const action = appState.formValues.tx[actionId];
     const { to, data, value, operation } = action;
     return {