refactor(app): simulation results

zallo-labs · Aug 6, 2024 · f154d7b · f154d7b
1 parent 9d4ba4e
commit f154d7b
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 65 deletions.
diff --git a/app/src/components/transaction/OperationsSection.tsx b/app/src/components/transaction/OperationsSection.tsx
@@ -19,10 +19,13 @@ const Transaction = graphql`
  operations {
  ...OperationSection_operation
  }
- simulation {
+ result {
+ __typename
  id
- success
- responses
+ response
+ ... on Failure {
+ reason
+ }
  }
  ...OperationSection_transaction
  }
@@ -36,23 +39,10 @@ export function OperationsSection(props: OperationsSectionProps) {
  const { styles } = useStyles(stylesheet);
  const p = useFragment(Transaction, props.transaction);
 
- const simulatedErrorSelector =
- p.simulation?.responses.length &&
- bytesize(p.simulation.responses[0]) >= 4 &&
- slice(p.simulation.responses[0], 0, 4);
-
- const expectedFailureItem = p.simulation?.success === false && (
- <ListItem
- leading={<AlertIcon size={ICON_SIZE.medium} color={styles.error.color} />}
- headline={({ Text }) => <Text style={styles.error}>Expected to fail</Text>}
- supporting={
- simulatedErrorSelector
- ? `Error: ${simulatedErrorSelector}`
- : 'No error message was provided'
- }
- trailing={simulatedErrorSelector ? SearchIcon : undefined}
- />
- );
+ const errorSelector =
+ p.result?.__typename === 'SimulatedFailure' &&
+ bytesize(p.result.response) >= 4 &&
+ slice(p.result.response, 0, 4);
 
  return (
  <>
@@ -62,18 +52,45 @@ export function OperationsSection(props: OperationsSectionProps) {
  <OperationSection key={i} transaction={p} operation={operation} />
  ))}
 
- {expectedFailureItem &&
- (simulatedErrorSelector ? (
- <Link
- asChild
- href={`https://openchain.xyz/signatures?query=${simulatedErrorSelector}`}
- target="_blank"
- >
- {expectedFailureItem}
- </Link>
- ) : (
- expectedFailureItem
- ))}
+ {p.result?.__typename.includes('Failure') && (
+ <>
+ {p.result?.reason && (
+ <ListItem
+ leading={<AlertIcon size={ICON_SIZE.medium} color={styles.error.color} />}
+ headline={({ Text }) => <Text style={styles.error}>Expected to fail</Text>}
+ supporting={p.result.reason}
+ />
+ )}
+
+ {errorSelector ? (
+ <Link
+ asChild
+ href={`https://openchain.xyz/signatures?query=${errorSelector}`}
+ target="_blank"
+ >
+ <ListItem
+ leading={<AlertIcon size={ICON_SIZE.medium} color={styles.error.color} />}
+ headline={({ Text }) => <Text style={styles.error}>Expected to fail</Text>}
+ supporting={`Error: ${errorSelector}`}
+ trailing={SearchIcon}
+ />
+ </Link>
+ ) : (
+ <ListItem
+ leading={<AlertIcon size={ICON_SIZE.medium} color={styles.error.color} />}
+ headline={({ Text }) => <Text style={styles.error}>Expected to fail</Text>}
+ supporting="No error message was provided"
+ />
+ )}
+
+ <ListItem
+ leading={<AlertIcon size={ICON_SIZE.medium} color={styles.error.color} />}
+ headline={({ Text }) => <Text style={styles.error}>Expected to fail</Text>}
+ supporting={errorSelector ? `Error: ${errorSelector}` : 'No error message was provided'}
+ trailing={errorSelector ? SearchIcon : undefined}
+ />
+ </>
+ )}
  </>
  );
 }

diff --git a/app/src/components/transaction/TransactionActions.tsx b/app/src/components/transaction/TransactionActions.tsx
@@ -28,9 +28,9 @@ const Transaction = graphql`
  validationErrors {
  reason
  }
- simulation {
+ result {
+ __typename
  id
- success
  }
  systx {
  id
@@ -77,7 +77,8 @@ export const TransactionActions = (props: TransactionActionsProps) => {
  });
 
  const blockExplorer = CHAINS[p.account.chain].blockExplorers?.default;
- const showForceExecute = p.status === 'Pending' && p.executable && !p.simulation?.success;
+ const showForceExecute =
+ p.status === 'Pending' && p.executable && p.result?.__typename === 'SimulatedFailure';
 
  return (
  <Actions>

diff --git a/app/src/components/transaction/TransactionValue.tsx b/app/src/components/transaction/TransactionValue.tsx
@@ -15,14 +15,6 @@ const Transaction = graphql`
  isFeeTransfer
  }
  }
- simulation {
- id
- transfers {
- id
- value
- isFeeTransfer
- }
- }
  }
 `;
 
@@ -34,9 +26,7 @@ export interface TransactionValueProps {
 export function TransactionValue(props: TransactionValueProps) {
  const p = useFragment(Transaction, props.transaction);
 
- const transfers = [...(p.result?.transfers ?? p.simulation?.transfers ?? [])].filter(
- (t) => !t.isFeeTransfer,
- );
+ const transfers = (p.result?.transfers ?? []).filter((t) => !t.isFeeTransfer);
 
  const value = Decimal.sum(0, ...transfers.map((t) => t.value ?? 0));
 

diff --git a/app/src/components/transaction/TransfersSection.tsx b/app/src/components/transaction/TransfersSection.tsx
@@ -33,24 +33,6 @@ const Transaction = graphql`
  isFeeTransfer
  }
  }
- simulation {
- id
- transfers {
- __typename
- id
- tokenAddress
- token {
- id
- balance(input: { transaction: $transaction })
- ...TokenItem_token
- ...TokenAmount_token
- }
- amount
- from
- to
- isFeeTransfer
- }
- }
  ...TransactionValue_transaction
  }
 `;
@@ -64,7 +46,7 @@ export function TransfersSection(props: TransfersSectionProps) {
  const { styles } = useStyles(stylesheet);
  const p = useFragment(Transaction, props.transaction);
 
- const transfers = (p.result ?? p.simulation)?.transfers.filter((t) => !t.isFeeTransfer); // Ignore fee transfers, this is shown by FeeToken
+ const transfers = p.result?.transfers.filter((t) => !t.isFeeTransfer); // Ignore fee transfers, this is shown by FeeToken
 
  if (!transfers?.length) return null;