fix: track upon vault events correctly (#225)

* fix: track upon vault events correctly

* feat: initialize holdings per user of old tokens

Author: mustermeiszer

.gitignore

@@ -26,4 +26,5 @@ src/registry.generated.ts
 **/*.log
 tsconfig.tsbuildinfo
 
-/.vscode/
+/.vscode/
+/.idea/

ponder.schema.ts

@@ -172,6 +172,7 @@ export const TokenRelations = relations(Token, ({ one, many }) => ({
   offRampAddresses: many(OffRampAddress, { relationName: "offRampAddresses" }),
 }));
 
+// NOTE: Sync is not supported in the protocol atm, but it is in the enum
 export const VaultKinds = ["Async", "Sync", "SyncDepositAsyncRedeem"] as const;
 export const VaultKind = onchainEnum("vault_kind", VaultKinds);
 export const VaultStatuses = ["LinkInProgress", "UnlinkInProgress", "Linked", "Unlinked"] as const;

src/config.ts

@@ -22,3 +22,33 @@ export const V2_POOLS = {
     ],
   },
 } as const;
+
+export const INITIAL_HOLDERS: Record<string, string[]> = {
+  "281474976710662-0x00010000000000060000000000000001-1": [
+    "0x491EDFB0B8b608044e227225C715981a30F3A44E",
+    "0x2923c1B5313F7375fdaeE80b7745106deBC1b53E",
+    "0x523DC886302932a469Cd804Cb18292d7D5C30512",
+    "0x2033B1D0714b5DDd66f78d8B75317F1a0d4440De",
+    "0xb3DacC732509Ba6B7F25Ad149e56cA44fE901AB9",
+    "0xB19Cdd566E5ee580E068ED099136d52906e2ca09",
+     "0x0000000005F458Fd6ba9EEb5f365D83b7dA913dD"
+    ],
+  "281474976710663-0x00010000000000070000000000000001-1": [
+    "0x491EDFB0B8b608044e227225C715981a30F3A44E",
+    "0x227942bD9C3e4ECA1b76E8199e407e6c52fdacd6",
+    "0xB0EC6c4482Ac1Ef77bE239C0AC833CF37A27c876",
+    "0xb3DacC732509Ba6B7F25Ad149e56cA44fE901AB9",
+    "0xcf5C83A12E0bd55a8c02fc7802203BC23e3efB30",
+    "0xb5E93B4434e63B86A2e16e3C37732E24a6af68D6",
+    "0x0000000005F458Fd6ba9EEb5f365D83b7dA913dD"
+  ],
+};
+
+export const getInitialHolders = (
+    poolId: bigint,
+    tokenId: string,
+    centrifugeId: string
+): string[] => {
+    const key = `${poolId}-${tokenId.toLowerCase()}-${centrifugeId.toLowerCase()}`;
+    return INITIAL_HOLDERS[key] || [];
+};

src/handlers/spokeHandlers.ts

@@ -8,13 +8,16 @@ import {
   TokenService,
   InvestorTransactionService,
   AccountService,
+  TokenInstancePositionService,
 } from "../services";
 import { ERC20Abi } from "../../abis/ERC20";
 import { Abis } from "../contracts";
 import { RegistryChains } from "../chains";
 import { snapshotter } from "../helpers/snapshotter";
 import { HoldingEscrowSnapshot } from "ponder:schema";
 import { deployVault, linkVault, unlinkVault } from "./vaultRegistryHandlers";
+import { getInitialHolders } from "../config";
+import { initialisePosition } from "../services/TokenInstancePositionService";
 
 multiMapper("spoke:DeployVault", deployVault);
 
@@ -91,6 +94,26 @@ multiMapper("spoke:AddShareClass", async ({ event, context }) => {
   // Only increase token total issuance if this is a new token instance
   if (prevInstanceIssuance === 0n) {
     token.increaseTotalIssuance(totalSupply);
+
+    // Fetch initial holders from hardcoded list
+    const initialHolders: string[] = getInitialHolders(poolId, tokenId, centrifugeId);
+    if (initialHolders.length > 0) {
+      await Promise.all(
+        initialHolders.map(async (holder: string) => {
+          (await TokenInstancePositionService.getOrInit(
+            context,
+            {
+              tokenId,
+              centrifugeId,
+              accountAddress: holder.toLowerCase() as `0x${string}`,
+            },
+            event,
+            async (tokenInstancePosition) =>
+              await initialisePosition(context, tokenAddress, tokenInstancePosition)
+          )) as TokenInstancePositionService;
+        })
+      );
+    }
   }
 
   await token.save(event);

src/handlers/vaultHandlers.ts

@@ -5,9 +5,7 @@ import {
   AssetService,
   BlockchainService,
   EpochInvestOrderService,
-  EpochRedeemOrderService,
   InvestOrderService,
-  RedeemOrderService,
   TokenInstancePositionService,
   TokenInstanceService,
   TokenService,
@@ -300,9 +298,8 @@ multiMapper("vault:RedeemClaimable", async ({ event, context }) => {
     centrifugeId,
   })) as VaultService;
   if (!vault) return serviceError(`Vault not found. Cannot retrieve vault configuration`);
-  const { poolId, tokenId, kind, assetAddress } = vault.read();
+  const { poolId, tokenId, assetAddress } = vault.read();
 
-  if (kind === "Sync") return;
 
   const asset = (await AssetService.get(context, {
     address: assetAddress,
@@ -411,8 +408,23 @@ multiMapper("vault:Deposit", async ({ event, context }) => {
   switch (kind) {
     case "Async":
       await InvestorTransactionService.claimDeposit(context, itData, event);
+      const vaultInvestOrder = (await VaultInvestOrderService.getOrInit(
+        context,
+        {
+          centrifugeId,
+          poolId,
+          tokenId,
+          assetId,
+          accountAddress: investorAddress,
+        },
+        event,
+        undefined,
+        true
+      )) as VaultInvestOrderService;
+      await vaultInvestOrder.deposit(assets).saveOrClear(event);
       break;
-    default:
+    case "SyncDepositAsyncRedeem":
+    case "Sync":
       await InvestorTransactionService.syncDeposit(context, itData, event);
       const investOrderIndex =
         (await InvestOrderService.count(context, {
@@ -435,6 +447,7 @@ multiMapper("vault:Deposit", async ({ event, context }) => {
           issuedSharesAmount: shares,
           issuedWithNavAssetPerShare: getSharePrice(assets, shares, assetDecimals, shareDecimals),
           ...timestamper("claimed", event),
+          claimedSharesAmount: shares,
         },
         event
       );
@@ -464,22 +477,9 @@ multiMapper("vault:Deposit", async ({ event, context }) => {
         event
       )) as EpochInvestOrderService;
       break;
+    default:
+      return serviceError("Unknown vault kind");
   }
-
-  const vaultInvestOrder = (await VaultInvestOrderService.getOrInit(
-    context,
-    {
-      centrifugeId,
-      poolId,
-      tokenId,
-      assetId,
-      accountAddress: investorAddress,
-    },
-    event,
-    undefined,
-    true
-  )) as VaultInvestOrderService;
-  await vaultInvestOrder.deposit(assets).saveOrClear(event);
 });
 
 multiMapper("vault:Withdraw", async ({ event, context }) => {
@@ -530,79 +530,32 @@ multiMapper("vault:Withdraw", async ({ event, context }) => {
     currencyAssetId: assetId,
   };
 
+
   switch (kind) {
     case "Sync":
-      await InvestorTransactionService.syncRedeem(context, itData, event);
-      const redeemOrderIndex =
-        (await RedeemOrderService.count(context, {
-          poolId,
-          tokenId,
-          account: investorAddress,
-          index_lte: 0,
-        })) * -1;
-      await RedeemOrderService.insert(
-        context,
-        {
-          poolId,
-          tokenId,
-          assetId,
-          account: investorAddress,
-          index: redeemOrderIndex,
-          ...timestamper("approved", event),
-          approvedSharesAmount: shares,
-          ...timestamper("revoked", event),
-          revokedAssetsAmount: assets,
-          revokedPoolAmount: assets,
-          revokedWithNavAssetPerShare: getSharePrice(assets, shares, assetDecimals, shareDecimals),
-          ...timestamper("claimed", event),
-        },
-        event
-      );
-
-      const epochRedeemIndex =
-        (await EpochRedeemOrderService.count(context, {
-          poolId,
-          tokenId,
-          assetId,
-          index_lte: 0,
-        })) * -1;
-      (await EpochRedeemOrderService.insert(
+      return serviceError("Sync vaults are not supported yet");
+    case "SyncDepositAsyncRedeem":
+    case "Async":
+      const vaultRedeemOrder = (await VaultRedeemOrderService.getOrInit(
         context,
         {
+          centrifugeId,
           poolId,
           tokenId,
           assetId,
-          index: epochRedeemIndex,
-          ...timestamper("approved", event),
-          approvedSharesAmount: shares,
-          approvedPercentageOfTotalPending: 100n * 10n ** BigInt(shareDecimals),
-          ...timestamper("revoked", event),
-          revokedAssetsAmount: assets,
-          revokedWithNavAssetPerShare: getSharePrice(assets, shares, assetDecimals, shareDecimals),
+          accountAddress: investorAddress,
         },
-        event
-      )) as EpochRedeemOrderService;
+        event,
+        undefined,
+        true
+      )) as VaultRedeemOrderService;
+      await vaultRedeemOrder.redeem(shares).saveOrClear(event);
 
-      break;
-    default:
       await InvestorTransactionService.claimRedeem(context, itData, event);
       break;
+    default:
+      return serviceError("Unknown vault kind");
   }
-
-  const vaultRedeemOrder = (await VaultRedeemOrderService.getOrInit(
-    context,
-    {
-      centrifugeId,
-      poolId,
-      tokenId,
-      assetId,
-      accountAddress: investorAddress,
-    },
-    event,
-    undefined,
-    true
-  )) as VaultRedeemOrderService;
-  await vaultRedeemOrder.redeem(shares).saveOrClear(event);
 });
 
 /**