Enter TypeORM, filter accounts by data

package.json

@@ -38,6 +38,7 @@
     "squel": "^5.12.2",
     "stellar-base": "^0.11.0",
     "stellar-sdk": "^0.13.0",
+    "typeorm": "^0.2.17",
     "typescript-memoize": "^1.0.0-alpha.3",
     "winston": "^3.0.0"
   },

src/database.ts

@@ -7,9 +7,7 @@ import pgPromise = require("pg-promise");
 
 import * as secrets from "./util/secrets";
 
-import AccountsRepo from "./repo/accounts";
 import AssetsRepo from "./repo/assets";
-import DataEntriesRepo from "./repo/data_entries";
 import LedgerHeadersRepo from "./repo/ledger_headers";
 import OffersRepo from "./repo/offers";
 import StoreStateRepo from "./repo/store_state";
@@ -18,9 +16,7 @@ import TrustLinesRepo from "./repo/trust_lines";
 
 // Database Interface Extensions:
 interface IExtensions {
-  accounts: AccountsRepo;
   assets: AssetsRepo;
-  dataEntries: DataEntriesRepo;
   ledgerHeaders: LedgerHeadersRepo;
   offers: OffersRepo;
   transactions: TransactionsRepo;
@@ -35,9 +31,7 @@ const initOptions: IOptions<IExtensions> = {
   extend(obj: IExtensions) {
     // Do not use 'require()' here, because this event occurs for every task
     // and transaction being executed, which should be as fast as possible.
-    obj.accounts = new AccountsRepo(obj);
     obj.assets = new AssetsRepo(obj);
-    obj.dataEntries = new DataEntriesRepo(obj);
     obj.ledgerHeaders = new LedgerHeadersRepo(obj);
     obj.offers = new OffersRepo(obj);
     obj.transactions = new TransactionsRepo(obj);

src/init.ts

@@ -1,14 +1,17 @@
 import * as Sentry from "@sentry/node";
+import { createConnection } from "typeorm";
+import { Account } from "./orm/entities/account";
+import { AccountData } from "./orm/entities/account_data";
 import "./util/asset";
 import logger from "./util/logger";
 import "./util/memo";
-import { SENTRY_DSN } from "./util/secrets";
+import * as secrets from "./util/secrets";
 import { setNetwork as setStellarNetwork, updateBaseReserve } from "./util/stellar";
 
 export default async function init(): Promise<void> {
-  if (SENTRY_DSN) {
+  if (secrets.SENTRY_DSN) {
     Sentry.init({
-      dsn: SENTRY_DSN,
+      dsn: secrets.SENTRY_DSN,
       integrations: [new Sentry.Integrations.RewriteFrames({ root: __dirname || process.cwd() })]
     });
   }
@@ -17,4 +20,15 @@ export default async function init(): Promise<void> {
   logger.info(`Using ${network}`);
 
   await updateBaseReserve();
+  await createConnection({
+    type: "postgres",
+    host: secrets.DBHOST,
+    port: secrets.DBPORT,
+    username: secrets.DBUSER,
+    password: secrets.DBPASSWORD,
+    database: secrets.DB,
+    entities: [Account, AccountData],
+    synchronize: false,
+    logging: process.env.DEBUG_SQL !== undefined
+  });
 }

src/model/account_values.ts

@@ -1,8 +1,14 @@
-import { IAccountBase } from "./account";
-import { AccountThresholds } from "./account_thresholds";
+import { AccountID, AccountThresholds } from "./";
 import { Signer } from "./signer";
 
-export interface IAccountValues extends IAccountBase {
+export interface IAccountValues {
+  id: AccountID;
+  balance: string;
+  sequenceNumber: string;
+  numSubentries: number;
+  inflationDestination: AccountID;
+  homeDomain: string;
+  thresholds: AccountThresholds;
   signers: Signer[];
 }
 

src/model/data_entry_values.ts

@@ -1,8 +1,10 @@
-import { IDataEntryBase } from "./data_entry";
-
-export type IDataEntryValues = IDataEntryBase;
+export interface IDataEntryValues {
+  accountID: string;
+  name: string;
+  value: string;
+}
 
-export class DataEntryValues implements IDataEntryBase {
+export class DataEntryValues implements IDataEntryValues {
   public accountID: string;
   public name: string;
   public value: string;

src/model/factories/account_values_factory.ts

@@ -7,7 +7,7 @@ import { publicKeyFromXDR } from "../../util/xdr";
 export class AccountValuesFactory {
   public static fromXDR(xdr: any): AccountValues {
     const id = publicKeyFromXDR(xdr);
-    const signers = xdr.signers().map((s: any) => SignerFactory.fromXDR(s, id));
+    const signers = xdr.signers().map((s: any) => SignerFactory.fromXDR(s));
     const thresholds = AccountThresholdsFactory.fromValue(xdr.thresholds());
 
     signers.unshift(SignerFactory.self(id, thresholds.masterWeight));

src/model/factories/balance_factory.ts

@@ -1,6 +1,7 @@
 import BigNumber from "bignumber.js";
 import { xdr as XDR } from "stellar-base";
-import { Account, Balance, IBalance } from "../";
+import { Balance, IBalance } from "../";
+import { Account } from "../../orm/entities";
 import { MAX_INT64 } from "../../util";
 import { getReservedBalance } from "../../util/base_reserve";
 

src/model/factories/index.ts

@@ -1,11 +1,9 @@
-export * from "./account_factory";
 export * from "./account_flags_factory";
 export * from "./account_thresholds_factory";
 export * from "./account_values_factory";
 export * from "./asset_factory";
 export * from "./balance_factory";
 export * from "./balance_values_factory";
-export * from "./data_entry_factory";
 export * from "./data_entry_values_factory";
 export * from "./effect_factory";
 export * from "./ledger_header_factory";

src/model/factories/signer_factory.ts

@@ -8,28 +8,17 @@ export interface ISignerTableRow {
 }
 
 export class SignerFactory {
-  public static fromXDR(xdr: any, accountID: string) {
+  public static fromXDR(xdr: any) {
     const data: ISigner = {
-      accountID,
       signer: SignerFactory.keyFromXDR(xdr.key()),
       weight: xdr.weight()
     };
 
     return new Signer(data);
   }
 
-  public static fromDb(row: ISignerTableRow): Signer {
-    const data: ISigner = {
-      accountID: row.accountid,
-      signer: row.publickey,
-      weight: row.weight
-    };
-
-    return new Signer(data);
-  }
-
   public static self(id: string, weight: number): Signer {
-    return new Signer({ accountID: id, signer: id, weight });
+    return new Signer({ signer: id, weight });
   }
 
   public static keyFromXDR(xdr: any): string {

src/model/index.ts

@@ -1,4 +1,3 @@
-export * from "./account";
 export * from "./account_id";
 export * from "./account_thresholds";
 export * from "./account_flags";
@@ -8,7 +7,6 @@ export * from "./asset";
 export * from "./asset_code";
 export * from "./asset_id";
 export * from "./asset_input";
-export * from "./data_entry";
 export * from "./data_entry_subscription_payload";
 export * from "./data_entry_values";
 export * from "./effect";

src/model/signer.ts

@@ -1,5 +1,4 @@
 export interface ISigner {
-  accountID: string;
   signer: string;
   weight: number;
 }
@@ -17,12 +16,10 @@ export class Signer implements ISigner {
     });
   }
 
-  public accountID: string;
   public signer: string;
   public weight: number;
 
   constructor(data: ISigner) {
-    this.accountID = data.accountID;
     this.signer = data.signer;
     this.weight = data.weight;
   }