Add transaction type to accountTransaction (#38)

Author: dguenther

packages/mobile-app/data/facades/wallet/handlers.ts

@@ -5,7 +5,6 @@ import {
   AccountSettings,
   Output,
   Transaction,
-  TransactionType,
   WalletHandlers,
   WalletStatus,
 } from "./types";
@@ -215,8 +214,7 @@ export const walletHandlers = f.facade<WalletHandlers>({
         burns: [],
         mints: [],
         spends: [],
-        // TODO: Implement transaction type
-        type: TransactionType.RECEIVE,
+        type: txn.type,
       };
     },
   ),
@@ -273,8 +271,7 @@ export const walletHandlers = f.facade<WalletHandlers>({
         burns: [],
         mints: [],
         spends: [],
-        // TODO: Implement transaction type when accountName is implemented
-        type: TransactionType.RECEIVE,
+        type: txn.type,
       }));
     },
   ),

packages/mobile-app/data/facades/wallet/types.ts

@@ -24,8 +24,6 @@ export type AccountBalance = {
 export enum TransactionType {
   SEND = "send",
   RECEIVE = "receive",
-  MULTI = "multi",
-  MINER = "miner",
 }
 
 export type AssetBalanceDelta = {

packages/mobile-app/data/wallet/db.ts

@@ -6,6 +6,7 @@ import * as FileSystem from "expo-file-system";
 import { AccountFormat, encodeAccount, Note } from "@ironfish/sdk";
 import { Network } from "../constants";
 import * as Uint8ArrayUtils from "../../utils/uint8Array";
+import { TransactionType } from "../facades/wallet/types";
 interface AccountsTable {
   id: Generated<number>;
   name: string;
@@ -34,8 +35,7 @@ interface AccountTransactionsTable {
   id: Generated<number>;
   accountId: number;
   transactionHash: Uint8Array;
-  // TODO: narrow this further, like Network
-  transactionType: string;
+  type: TransactionType;
 }
 
 interface TransactionBalanceDeltasTable {
@@ -215,8 +215,8 @@ export class WalletDb {
                 .addColumn("accountId", SQLiteType.Integer, (col) =>
                   col.notNull().references("accounts.id"),
                 )
-                .addColumn("transactionType", SQLiteType.String, (col) =>
-                  col.notNull(),
+                .addColumn("type", SQLiteType.String, (col) =>
+                  col.notNull().check(sql`type IN ("receive", "send")`),
                 )
                 .execute();
               console.log("created account transactions");
@@ -575,6 +575,14 @@ export class WalletDb {
       balanceDeltas.add(note.note.assetId(), note.note.value());
     }
 
+    // Intended to match the logic in ironfish sdk's getTransactionType
+    const allNotes = [...values.ownerNotes, ...values.spenderNotes];
+    const transactionType =
+      values.foundNullifiers.length !== 0 ||
+      allNotes[0].note.sender() === address
+        ? TransactionType.SEND
+        : TransactionType.RECEIVE;
+
     await this.db.transaction().execute(async (db) => {
       // One transaction could apply to multiple accounts
       await db
@@ -594,8 +602,7 @@ export class WalletDb {
         .values({
           accountId: values.accountId,
           transactionHash: values.hash,
-          // TODO: implement transaction type
-          transactionType: "receive",
+          type: transactionType,
         })
         .executeTakeFirst();
 
@@ -749,6 +756,7 @@ export class WalletDb {
   }
 
   async getUnspentNotes(accountId: number, network: Network) {
+    // TODO: Consider the confirmation range
     return await this.db
       .selectFrom("notes")
       .leftJoin("nullifiers", "nullifiers.noteId", "notes.id")

packages/mobile-app/data/wallet/wallet.ts

@@ -500,6 +500,8 @@ class Wallet {
               const txn = transactionMap.get(hash);
               if (txn) {
                 // TODO: Only decrypt notes that haven't already been decrypted
+                // If making this change, make sure to update balance delta calculation
+                // in saveTransaction.
                 const ownerSet = new Set(
                   txn.ownerNotes.map((n) =>
                     Uint8ArrayUtils.toHex(n.note.serialize()),