checkpoint for migration

app/api/ada/lib/storage/adaMigration.js

@@ -4,6 +4,7 @@
 
 import type { lf$Database } from 'lovefield';
 import {
+  resetLegacy,
   getLegacyAddressesList,
 } from './database/legacy';
 import LocalStorageApi from '../../../localStorage/index';
@@ -21,7 +22,6 @@ export async function migrateToLatest(
   localStorageApi: LocalStorageApi,
   persistentDb: lf$Database,
 ): Promise<boolean> {
-  return; // TODO: add migration for storagev2
   let lastLaunchVersion = await localStorageApi.getLastLaunchVersion();
   Logger.info(`Starting migration for ${lastLaunchVersion}`);
   /**
@@ -54,7 +54,7 @@ export async function migrateToLatest(
       }
       return applied;
     }],
-    ['<1.4.0', async () => await bip44Migration(persistentDb)],
+    ['<1.4.0', async () => await bip44Migration()],
     ['<1.10.0', async () => await storagev2Migation(persistentDb)],
   ];
 
@@ -116,10 +116,9 @@ async function moveStorage(localStorageApi: LocalStorageApi): Promise<boolean> {
  * or you use the same wallet on Chrome + mobile.
  */
 async function bip44Migration(
-  persistentDb: lf$Database,
 ): Promise<boolean> {
   Logger.info(`Starting bip44Migration`);
-  const addresses = await getLegacyAddressesList(persistentDb);
+  const addresses = await getLegacyAddressesList();
 
   /**
    * We used to consider all addresses in the DB as explicitly generated by the user
@@ -145,7 +144,7 @@ async function bip44Migration(
    * We need to do this since old wallets may have incorrect history
    * Due to desync issue caused by the incorrect bip44 implementation
    */
-  await reset(persistentDb);
+  await resetLegacy();
 
   return true;
 }

app/api/ada/lib/storage/database/index.js

@@ -62,7 +62,7 @@ export const loadLovefieldDB = async (
 const populateAndCreate = async (
   storeType: $Values<typeof schema.DataStoreType>
 ): Promise<lf$Database> => {
-  const schemaBuilder = schema.create('yoroi-schema', 2);
+  const schemaBuilder = schema.create('yoroi-schema', 7);
 
   populateUncategorizedDb(schemaBuilder);
   populateBip44Db(schemaBuilder);
@@ -87,6 +87,13 @@ export async function clear(
   await tx.commit();
 }
 
+/**
+ * expose dump of previous DB version so we can use it for migration
+ * Note: all connection types reuse this variable unfortunately
+ * since there is no way to detect the database type given just the raw back store
+ */
+export const dumpByVersion: { [tableName: string]: Array<any> } = {};
+
 async function onUpgrade(
   rawDb: lf$raw$BackStore,
 ): Promise<void> {
@@ -95,10 +102,9 @@ async function onUpgrade(
     // defaults to 0 when first time launching ever
     return;
   }
+  const dump = await rawDb.dump();
   if (version === 1) {
-    // TODO: expose dump for migration
-    const dump = rawDb.dump();
-
+    Object.assign(dumpByVersion, dump);
     rawDb.dropTable('TxAddresses');
     rawDb.dropTable('Txs');
     rawDb.dropTable('Addresses');

app/api/ada/lib/storage/database/legacy.js

@@ -1,9 +1,6 @@
 // @flow
 
-import type {
-  AdaAddress,
-} from '../../../adaTypes';
-import type { lf$Database } from 'lovefield';
+import { dumpByVersion } from './index';
 
 /**
  * This file contains methods used to extract information
@@ -12,12 +9,29 @@ import type { lf$Database } from 'lovefield';
  * to migrate to a new format
  */
 
-export const getLegacyAddressesList = (
-  db: lf$Database
-): Promise<Array<AdaAddress>> => {
-  const addressesTable = db.getSchema().table('Addresses');
-  return db.select()
-    .from(addressesTable)
-    .exec()
-    .then(rows => rows.map(row => row.value));
+export type LegacyAddressingInfo = {
+  account: number,
+  change: number,
+  index: number,
+};
+export type LegacyAdaAmount = {
+  getCCoin: string,
+};
+export type LegacyAdaAddress = {
+  cadAmount: LegacyAdaAmount,
+  cadId: string,
+  cadIsUsed: boolean,
+} & LegacyAddressingInfo;
+
+export const getLegacyAddressesList = (): Array<LegacyAdaAddress> => {
+  if (dumpByVersion.Addresses) {
+    return dumpByVersion.Addresses;
+  }
+  return [];
+};
+
+export const resetLegacy = (): void => {
+  for (const prop of Object.keys(dumpByVersion)) {
+    delete dumpByVersion[prop];
+  }
 };

app/api/ada/lib/storage/tests/adaMigration.test.js

@@ -0,0 +1,3 @@
+// @flow
+
+import { migrateToLatest } from '../adaMigration';

flow-typed/npm/lovefield_v2.x.x.js

@@ -178,7 +178,7 @@ declare module 'lovefield' {
     ): Promise<void>;
     createRow(payload: Object): lf$Row;
     getVersion(): number;
-    dump(): $ReadOnlyArray<$ReadOnly<Object>>;
+    dump(): Promise<{ [tableName: string]: Array<any> }>;
   }
 
   declare var npm$namespace$lf$schema: {