Save new event props to a newly created smart transaction, use both properties and sensitiveProperties for events

src/SmartTransactionsController.test.ts

@@ -413,6 +413,13 @@
             throw new Error('Invalid network client id');
         }
       }),
+      getMetaMetricsProps: jest.fn(async () => {
+        return Promise.resolve({
+          accountHardwareType: 'Ledger Hardware',
+          accountType: 'hardware',
+          deviceModel: 'ledger',
+        });
+      }),
     });
     // eslint-disable-next-line jest/prefer-spy-on
     smartTransactionsController.subscribe = jest.fn();
@@ -761,17 +768,22 @@
           `/networks/${ethereumChainIdDec}/submitTransactions?stxControllerVersion=${packageJson.version}`,
         )
         .reply(200, submitTransactionsApiResponse);
-
       await smartTransactionsController.submitSignedTransactions({
         signedTransactions: [signedTransaction],
         signedCanceledTransactions: [signedCanceledTransaction],
         txParams: createTxParams(),
       });
-
-      expect(
+      const submittedSmartTransaction =
         smartTransactionsController.state.smartTransactionsState
-          .smartTransactions[ChainId.mainnet][0].uuid,
-      ).toBe('dP23W7c2kt4FK9TmXOkz1UM2F20');
+          .smartTransactions[ChainId.mainnet][0];
+      expect(submittedSmartTransaction.uuid).toBe(
+        'dP23W7c2kt4FK9TmXOkz1UM2F20',
+      );
+      expect(submittedSmartTransaction.accountHardwareType).toBe(
+        'Ledger Hardware',
+      );
+      expect(submittedSmartTransaction.accountType).toBe('hardware');
+      expect(submittedSmartTransaction.deviceModel).toBe('ledger');
     });
   });
 
@@ -1215,13 +1227,13 @@
 
   describe('setStatusRefreshInterval', () => {
     it('sets refresh interval if different', () => {
       smartTransactionsController.setStatusRefreshInterval(100);
       expect(smartTransactionsController.config.interval).toBe(100);
     });
 
     it('does not set refresh interval if they are the same', () => {
       const configureSpy = jest.spyOn(smartTransactionsController, 'configure');
       smartTransactionsController.setStatusRefreshInterval(DEFAULT_INTERVAL);
       expect(configureSpy).toHaveBeenCalledTimes(0);
     });
   });

src/SmartTransactionsController.ts

@@ -28,6 +28,7 @@
   SmartTransactionsStatus,
   UnsignedTransaction,
   GetTransactionsOptions,
+  MetaMetricsProps,
 } from './types';
 import { APIType, SmartTransactionStatuses } from './types';
 import {
@@ -42,6 +43,7 @@
   snapshotFromTxMeta,
   getTxHash,
   getSmartTransactionMetricsProperties,
+  getSmartTransactionMetricsSensitiveProperties,
 } from './utils';
 
 const SECOND = 1000;
@@ -100,6 +102,8 @@
 
   private readonly getNetworkClientById: NetworkController['getNetworkClientById'];
 
+  private readonly getMetaMetricsProps: () => Promise<MetaMetricsProps>;
+
   /* istanbul ignore next */
   private async fetch(request: string, options?: RequestInit) {
     const { clientId } = this.config;
@@ -123,6 +127,7 @@
       getTransactions,
       trackMetaMetricsEvent,
       getNetworkClientById,
+      getMetaMetricsProps,
     }: {
       onNetworkStateChange: (
         listener: (networkState: NetworkState) => void,
@@ -133,6 +138,7 @@
       getTransactions: (options?: GetTransactionsOptions) => TransactionMeta[];
       trackMetaMetricsEvent: any;
       getNetworkClientById: NetworkController['getNetworkClientById'];
+      getMetaMetricsProps: () => Promise<MetaMetricsProps>;
     },
     config?: Partial<SmartTransactionsControllerConfig>,
     state?: Partial<SmartTransactionsControllerState>,
@@ -181,6 +187,7 @@
     this.getRegularTransactions = getTransactions;
     this.trackMetaMetricsEvent = trackMetaMetricsEvent;
     this.getNetworkClientById = getNetworkClientById;
+    this.getMetaMetricsProps = getMetaMetricsProps;
 
     this.initializeSmartTransactionsForChainId();
     this.#ensureUniqueSmartTransactions();
@@ -220,9 +227,9 @@
       isSmartTransactionPending,
     );
     if (!this.timeoutHandle && pendingTransactions?.length > 0) {
       this.poll();
     } else if (this.timeoutHandle && pendingTransactions?.length === 0) {
       this.stop();
     }
   }
 
@@ -280,7 +287,7 @@
       return;
     }
     this.timeoutHandle = setInterval(() => {
       safelyExecute(async () => this.updateSmartTransactions());
     }, this.config.interval);
     await safelyExecute(async () => this.updateSmartTransactions());
   }
@@ -316,7 +323,9 @@
     this.trackMetaMetricsEvent({
       event: MetaMetricsEventName.StxStatusUpdated,
       category: MetaMetricsEventCategory.Transactions,
-      properties: getSmartTransactionMetricsProperties(updatedSmartTransaction),
+      properties: getSmartTransactionMetricsProperties(smartTransaction),
+      sensitiveProperties:
+        getSmartTransactionMetricsSensitiveProperties(smartTransaction),
     });
   }
 
@@ -345,7 +354,7 @@
       ethQuery = new EthQuery(networkClient.provider);
     }
 
     this.#createOrUpdateSmartTransaction(smartTransaction, {
       chainId,
       ethQuery,
     });
@@ -385,6 +394,16 @@
     });
   }
 
+  async #addMetaMetricsPropsToNewSmartTransaction(
+    smartTransaction: SmartTransaction,
+  ) {
+    const metaMetricsProps = await this.getMetaMetricsProps();
+    smartTransaction.accountHardwareType =
+      metaMetricsProps?.accountHardwareType;
+    smartTransaction.accountType = metaMetricsProps?.accountType;
+    smartTransaction.deviceModel = metaMetricsProps?.deviceModel;
+  }
+
   async #createOrUpdateSmartTransaction(
     smartTransaction: SmartTransaction,
     {
@@ -416,6 +435,7 @@
     );
 
     if (isNewSmartTransaction) {
+      await this.#addMetaMetricsPropsToNewSmartTransaction(smartTransaction);
       // add smart transaction
       const cancelledNonceIndex = currentSmartTransactions?.findIndex(
         (stx: SmartTransaction) =>
@@ -487,7 +507,7 @@
       .map((smartTransaction) => smartTransaction.uuid);
 
     if (transactionsToUpdate.length > 0) {
       this.fetchSmartTransactionsStatus(transactionsToUpdate, {
         networkClientId,
       });
     }
@@ -588,6 +608,8 @@
           event: MetaMetricsEventName.StxConfirmed,
           category: MetaMetricsEventCategory.Transactions,
           properties: getSmartTransactionMetricsProperties(smartTransaction),
+          sensitiveProperties:
+            getSmartTransactionMetricsSensitiveProperties(smartTransaction),
         });
         this.#updateSmartTransaction(
           { ...smartTransaction, confirmed: true },
@@ -625,18 +647,18 @@
       SmartTransactionsStatus
     >;
 
-    Object.entries(data).forEach(([uuid, stxStatus]) => {
-      const smartTransaction = {
+    for (const [uuid, stxStatus] of Object.entries(data)) {
+      const smartTransaction: SmartTransaction = {
         statusMetadata: stxStatus,
         status: calculateStatus(stxStatus),
         cancellable: isSmartTransactionCancellable(stxStatus),
         uuid,
       };
-      this.#createOrUpdateSmartTransaction(smartTransaction, {
+      await this.#createOrUpdateSmartTransaction(smartTransaction, {
         chainId,
         ethQuery,
       });
-    });
+    }
 
     return data;
   }
@@ -649,7 +671,7 @@
     nonceLock.releaseLock();
     return {
       ...transaction,
       nonce: `0x${nonce.toString(16)}`,
     };
   }
 
@@ -789,7 +811,7 @@
     };
 
     try {
-      this.#createOrUpdateSmartTransaction(
+      await this.#createOrUpdateSmartTransaction(
         {
           chainId,
           nonceDetails,

src/index.test.ts

@@ -12,6 +12,9 @@ describe('default export', () => {
       getTransactions: jest.fn(),
       trackMetaMetricsEvent: jest.fn(),
       getNetworkClientById: jest.fn(),
+      getMetaMetricsProps: jest.fn(async () => {
+        return Promise.resolve({});
+      }),
     });
     expect(controller).toBeInstanceOf(SmartTransactionsController);
     jest.clearAllTimers();

src/types.ts

@@ -94,6 +94,9 @@ export type SmartTransaction = {
   type?: string;
   confirmed?: boolean;
   cancellable?: boolean;
+  accountHardwareType?: string;
+  accountType?: string;
+  deviceModel?: string;
 };
 
 export type Fee = {
@@ -131,3 +134,9 @@ export type GetTransactionsOptions = {
   filterToCurrentNetwork?: boolean;
   limit?: number;
 };
+
+export type MetaMetricsProps = {
+  accountHardwareType?: string;
+  accountType?: string;
+  deviceModel?: string;
+};

src/utils.ts

@@ -237,8 +237,6 @@ export const getSmartTransactionMetricsProperties = (
   const smartTransactionStatusMetadata = smartTransaction.statusMetadata;
   return {
     stx_status: smartTransaction.status,
-    token_from_symbol: smartTransaction.sourceTokenSymbol,
-    token_to_symbol: smartTransaction.destinationTokenSymbol,
     type: smartTransaction.type,
     processing_time: getStxProcessingTime(smartTransaction.time),
     is_smart_transaction: true,
@@ -250,3 +248,18 @@ export const getSmartTransactionMetricsProperties = (
     stx_proxied: smartTransactionStatusMetadata?.proxied,
   };
 };
+
+export const getSmartTransactionMetricsSensitiveProperties = (
+  smartTransaction: SmartTransaction,
+) => {
+  if (!smartTransaction) {
+    return {};
+  }
+  return {
+    token_from_symbol: smartTransaction.sourceTokenSymbol,
+    token_to_symbol: smartTransaction.destinationTokenSymbol,
+    account_hardware_type: smartTransaction.accountHardwareType,
+    account_type: smartTransaction.accountType,
+    device_model: smartTransaction.deviceModel,
+  };
+};