Merge pull request #282 from zallo-labs:fix-tx-schema

Fix-tx-schema

Author: hbriese

api/schema.graphql

@@ -172,6 +172,8 @@ interface Confirmed implements Node & Result {
   gasUsed: BigInt!
   id: ID!
   networkEthFee: Decimal!
+  response: Bytes!
+  systemTx: SystemTx
   timestamp: DateTime!
   transaction: Transaction!
   transfers: [Transfer!]!
@@ -185,6 +187,8 @@ type ConfirmedFailure implements Confirmed & Failure & Node & Result {
   id: ID!
   networkEthFee: Decimal!
   reason: String!
+  response: Bytes!
+  systemTx: SystemTx
   timestamp: DateTime!
   transaction: Transaction!
   transfers: [Transfer!]!
@@ -198,6 +202,7 @@ type ConfirmedSuccess implements Confirmed & Node & Result & Success {
   id: ID!
   networkEthFee: Decimal!
   response: Bytes!
+  systemTx: SystemTx
   timestamp: DateTime!
   transaction: Transaction!
   transfers: [Transfer!]!
@@ -302,8 +307,11 @@ input ExecuteTransactionInput {
 
 interface Failure implements Node & Result {
   events: [Event!]!
+  gasUsed: BigInt!
   id: ID!
   reason: String!
+  response: Bytes!
+  systemTx: SystemTx
   timestamp: DateTime!
   transaction: Transaction!
   transfers: [Transfer!]!
@@ -412,8 +420,10 @@ input OperationInput {
 
 type OptimisticSuccess implements Node & Result & Success {
   events: [Event!]!
+  gasUsed: BigInt!
   id: ID!
   response: Bytes!
+  systemTx: SystemTx
   timestamp: DateTime!
   transaction: Transaction!
   transfers: [Transfer!]!
@@ -692,7 +702,10 @@ input RequestTokensInput {
 
 interface Result implements Node {
   events: [Event!]!
+  gasUsed: BigInt!
   id: ID!
+  response: Bytes!
+  systemTx: SystemTx
   timestamp: DateTime!
   transaction: Transaction!
   transfers: [Transfer!]!
@@ -701,8 +714,11 @@ interface Result implements Node {
 type Scheduled implements Node & Result {
   cancelled: Boolean!
   events: [Event!]!
+  gasUsed: BigInt!
   id: ID!
+  response: Bytes!
   scheduledFor: DateTime!
+  systemTx: SystemTx
   timestamp: DateTime!
   transaction: Transaction!
   transfers: [Transfer!]!
@@ -711,11 +727,27 @@ type Scheduled implements Node & Result {
 """function selector (4-byte hex string)"""
 scalar Selector
 
-type Simulation implements Node {
+type SimulatedFailure implements Failure & Node & Result {
+  events: [Event!]!
+  gasUsed: BigInt!
   id: ID!
-  responses: [Bytes!]!
-  success: Boolean!
+  reason: String!
+  response: Bytes!
+  systemTx: SystemTx
   timestamp: DateTime!
+  transaction: Transaction!
+  transfers: [Transfer!]!
+}
+
+type SimulatedSuccess implements Node & Result & Success {
+  events: [Event!]!
+  gasUsed: BigInt!
+  id: ID!
+  reason: String!
+  response: Bytes!
+  systemTx: SystemTx
+  timestamp: DateTime!
+  transaction: Transaction!
   transfers: [Transfer!]!
 }
 
@@ -735,8 +767,10 @@ type Subscription {
 
 interface Success implements Node & Result {
   events: [Event!]!
+  gasUsed: BigInt!
   id: ID!
   response: Bytes!
+  systemTx: SystemTx
   timestamp: DateTime!
   transaction: Transaction!
   transfers: [Transfer!]!
@@ -841,7 +875,6 @@ type Transaction implements Node & Proposal {
   rejections: [Rejection!]!
   result: Result
   results: [Result!]!
-  simulation: Simulation
   status: TransactionStatus!
   systx: SystemTx
   systxs: [SystemTx!]!

api/src/feat/faucet/faucet.service.ts

@@ -42,7 +42,7 @@ export class FaucetService implements OnModuleInit {
 
     this.tokens = tokens.map((t) => ({
       address: asUAddress(t.address),
-      amount: parseUnits(isEthToken(asAddress(t.address)) ? '0.01' : '1', t.decimals),
+      amount: parseUnits(isEthToken(asAddress(t.address)) ? '0.005' : '1', t.decimals),
     }));
   }
 

api/src/feat/simulations/simulations.model.ts

@@ -8,12 +8,22 @@ import { Node, NodeInterface, NodeType } from '~/common/decorators/interface.dec
 import { Hex } from 'lib';
 import { BytesField } from '~/common/scalars';
 import { Transaction } from '../transactions/transactions.model';
+import { SystemTx } from './system-tx.model';
 
 @NodeInterface()
 export class Result extends Node {
   @Field(() => Transaction)
   transaction: Transaction;
 
+  @Field(() => SystemTx, { nullable: true })
+  systemTx?: SystemTx;
+
+  @BytesField()
+  response: Hex;
+
+  @Field(() => GraphQLBigInt)
+  gasUsed: bigint;
+
   @Field(() => Date)
   timestamp: Date;
 
@@ -25,28 +35,28 @@ export class Result extends Node {
 }
 
 @NodeInterface({ implements: [Result] })
-export class Success extends Result {
-  @BytesField()
-  response: Hex;
-}
+export class Success extends Result {}
 
 @NodeInterface({ implements: [Result] })
 export class Failure extends Result {
   @Field(() => String)
   reason: string;
 }
 
-@NodeType({ implements: [Success] })
+@NodeType({ implements: [Result, Success] })
+export class SimulatedSuccess extends Failure {}
+
+@NodeType({ implements: [Result, Failure] })
+export class SimulatedFailure extends Failure {}
+
+@NodeType({ implements: [Result, Success] })
 export class OptimisticSuccess extends Success {}
 
 @NodeInterface({ implements: [Result] })
 export class Confirmed extends Result {
   @Field(() => GraphQLBigInt)
   block: bigint;
 
-  @Field(() => GraphQLBigInt)
-  gasUsed: bigint;
-
   @DecimalField()
   ethFeePerGas: Decimal;
 

api/src/feat/system-txs/results.model.ts

@@ -3,7 +3,6 @@ import { GraphQLBigInt } from 'graphql-scalars';
 import { SystemTx } from '../system-txs/system-tx.model';
 import { Operation } from '../operations/operations.model';
 import { Token } from '../tokens/tokens.model';
-import { Simulation } from '../simulations/simulations.model';
 import { Proposal } from '../proposals/proposals.model';
 import { AddressField } from '~/common/scalars/Address.scalar';
 import { Address, PolicyKey, UAddress } from 'lib';
@@ -34,9 +33,6 @@ export class Transaction extends Proposal {
   @Field(() => PaymasterFees)
   paymasterEthFees: PaymasterFees;
 
-  @Field(() => Simulation, { nullable: true })
-  simulation?: Simulation;
-
   @Field(() => Boolean)
   executable: boolean;
 

api/src/feat/transactions/transactions.model.ts

@@ -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}
+          />
+        </>
+      )}
     </>
   );
 }

app/src/components/transaction/OperationsSection.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>

app/src/components/transaction/TransactionActions.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));