Update the index logic to create AssetAddressLog records

Author: joojis

src/models/logic/block.ts

@@ -6,6 +6,7 @@ import * as Exception from "../../exception";
 import { BlockInstance } from "../block";
 import models from "../index";
 import * as AddressLogModel from "./addressLog";
+import * as AssetAddressLogModel from "./assetAddressLog";
 import * as AssetTypeLogModel from "./assetTypeLog";
 import * as TxModel from "./transaction";
 import { strip0xPrefix } from "./utils/format";
@@ -65,6 +66,7 @@ export async function createBlock(
             } else {
                 await AddressLogModel.updateAddressLog(tx, options);
                 await AssetTypeLogModel.updateAssetTypeLog(tx, options);
+                await AssetAddressLogModel.updateAssetAddressLog(tx, options);
             }
         }
         await TxModel.createTransactions(

src/models/logic/increaseassetsupply.ts

@@ -11,7 +11,7 @@ import {
 import { Transaction } from "sequelize";
 import { IncreaseAssetSupplyInstance } from "../increaseAssetSupply";
 import models from "../index";
-import { createAddressLog } from "./addressLog";
+import { createAssetAddressLog } from "./assetAddressLog";
 import { createAssetTransferOutput } from "./assettransferoutput";
 import { createAssetTypeLog } from "./assetTypeLog";
 import { getOwner } from "./utils/address";
@@ -66,7 +66,7 @@ export async function createIncreaseAssetSupply(
         options
     );
     if (recipient) {
-        await createAddressLog(transaction, recipient, "AssetOwner", options);
+        await createAssetAddressLog(transaction, recipient, assetType, options);
     }
     await createAssetTypeLog(transaction, assetType, options);
     return inst;

src/models/logic/mintAsset.ts

@@ -9,6 +9,7 @@ import { Transaction } from "sequelize";
 import models from "../index";
 import { MintAssetInstance } from "../mintAsset";
 import { createAddressLog } from "./addressLog";
+import { createAssetAddressLog } from "./assetAddressLog";
 import { createAssetScheme } from "./assetscheme";
 import { createAssetTransferOutput } from "./assettransferoutput";
 import { createAssetTypeLog } from "./assetTypeLog";
@@ -102,15 +103,15 @@ export async function createMintAsset(
         { networkId },
         options
     );
-    await Promise.all([
+    await Promise.all<any>([
         approver != null
             ? createAddressLog(transaction, approver, "Approver", options)
             : Promise.resolve(null),
         registrar != null
             ? createAddressLog(transaction, registrar, "Registrar", options)
             : Promise.resolve(null),
         recipient != null
-            ? createAddressLog(transaction, recipient, "AssetOwner", options)
+            ? createAssetAddressLog(transaction, recipient, assetType, options)
             : Promise.resolve(null),
         createAssetTypeLog(transaction, assetType, options)
     ]);

src/models/logic/transferAsset.ts

@@ -13,7 +13,7 @@ import * as _ from "lodash";
 import { Transaction } from "sequelize";
 import models from "../index";
 import { TransferAssetInstance } from "../transferAsset";
-import { createAddressLog } from "./addressLog";
+import { createAssetAddressLog } from "./assetAddressLog";
 import {
     createAssetTransferOutput,
     getOutputOwner
@@ -237,12 +237,6 @@ export async function createTransferAsset(
         ),
         ..._.uniq(resultOutputs.filter(o => o.owner).map(o => o.owner!))
     ]);
-    await Promise.all(
-        addresses.map(address =>
-            createAddressLog(transaction, address, "AssetOwner", options)
-        )
-    );
-    // FIXME: Log the addresses in orders.
     const assetTypes: string[] = _.uniq([
         ..._.uniq(resultInputs.map(i => i.assetType)),
         ..._.uniq(resultBurns.map(b => b.assetType)),
@@ -253,5 +247,25 @@ export async function createTransferAsset(
             createAssetTypeLog(transaction, assetType, options)
         )
     );
+    // NOTE: TransferAsset can have many inputs and outputs, and some addresses
+    // may not be related to a specific asset type if it's a
+    // CoinJoin(https://en.bitcoin.it/wiki/CoinJoin) transaction. However, it
+    // creates combinations of all the asset addresses and the asset types
+    // because there is no clear way to tell which addresses are not related to
+    // which asset types.
+    await Promise.all(
+        addresses.map(address =>
+            Promise.all(
+                assetTypes.map(assetType =>
+                    createAssetAddressLog(
+                        transaction,
+                        address,
+                        assetType,
+                        options
+                    )
+                )
+            )
+        )
+    );
     return result;
 }

src/models/logic/unwrapCCC.ts

@@ -7,6 +7,7 @@ import { Transaction } from "sequelize";
 import models from "../index";
 import { UnwrapCCCInstance } from "../unwrapCCC";
 import { createAddressLog } from "./addressLog";
+import { createAssetAddressLog } from "./assetAddressLog";
 import { getOutputOwner } from "./assettransferoutput";
 import { createAssetTypeLog } from "./assetTypeLog";
 import { strip0xPrefix } from "./utils/format";
@@ -49,14 +50,11 @@ export async function createUnwrapCCC(
         },
         { transaction: options.transaction }
     );
+    const assetType = "0000000000000000000000000000000000000000";
     if (owner) {
-        await createAddressLog(transaction, owner, "AssetOwner", options);
+        await createAssetAddressLog(transaction, owner, assetType, options);
     }
     await createAddressLog(transaction, receiver, "AssetOwner", options);
-    await createAssetTypeLog(
-        transaction,
-        "0000000000000000000000000000000000000000",
-        options
-    );
+    await createAssetTypeLog(transaction, assetType, options);
     return instance;
 }

src/models/logic/wrapCCC.ts

@@ -12,6 +12,7 @@ import { Transaction } from "sequelize";
 import models from "../index";
 import { WrapCCCInstance } from "../wrapCCC";
 import { createAddressLog } from "./addressLog";
+import { createAssetAddressLog } from "./assetAddressLog";
 import { createAssetSchemeOfWCCC } from "./assetscheme";
 import { createAssetTransferOutput } from "./assettransferoutput";
 import { createAssetTypeLog } from "./assetTypeLog";
@@ -74,13 +75,10 @@ export async function createWrapCCC(
         options
     );
     await createAddressLog(transaction, payer, "AssetOwner", options);
+    const assetType = "0000000000000000000000000000000000000000";
     if (recipient) {
-        await createAddressLog(transaction, recipient, "AssetOwner", options);
+        await createAssetAddressLog(transaction, recipient, assetType, options);
     }
-    await createAssetTypeLog(
-        transaction,
-        "0000000000000000000000000000000000000000",
-        options
-    );
+    await createAssetTypeLog(transaction, assetType, options);
     return result;
 }