fix: onchain sync vault bug (#228)

* fix: onchain sync vault bug

* fix: use owner again on withdraw

* chore: typos

---------

Co-authored-by: Filippo Fontana <filippo@embrio.tech>

Author: mustermeiszer

src/handlers/merkleProofManagerHandlers.ts

@@ -1,7 +1,7 @@
 import { multiMapper } from "../helpers/multiMapper";
 import { logEvent, serviceError } from "../helpers/logger";
 import { BlockchainService, MerkleProofManagerService, PolicyService } from "../services";
-import { Abis, getVersionForContract, REGISTRY_VERSION_ORDER } from "../contracts";
+import { Abis, REGISTRY_VERSION_ORDER } from "../contracts";
 
 multiMapper("merkleProofManagerFactory:DeployMerkleProofManager", async ({ event, context }) => {
   logEvent(event, context, "merkleProofManagerFactory:DeployMerkleProofManager");

src/handlers/vaultHandlers.ts

@@ -244,14 +244,14 @@ multiMapper("vault:DepositClaimable", async ({ event, context }) => {
   const { decimals: shareDecimals } = token.read();
   if (typeof shareDecimals !== "number") return serviceError("Share decimals is required");
 
-  const invstorAccount = (await AccountService.getOrInit(
+  const investorAccount = (await AccountService.getOrInit(
     context,
     {
       address: controller,
     },
     event
   )) as AccountService;
-  const { address: investorAddress } = invstorAccount.read();
+  const { address: investorAddress } = investorAccount.read();
 
   const _it = await InvestorTransactionService.depositClaimable(
     context,
@@ -300,7 +300,6 @@ multiMapper("vault:RedeemClaimable", async ({ event, context }) => {
   if (!vault) return serviceError(`Vault not found. Cannot retrieve vault configuration`);
   const { poolId, tokenId, assetAddress } = vault.read();
 
-
   const asset = (await AssetService.get(context, {
     address: assetAddress,
     centrifugeId,
@@ -314,14 +313,14 @@ multiMapper("vault:RedeemClaimable", async ({ event, context }) => {
   const { decimals: shareDecimals } = token.read();
   if (typeof shareDecimals !== "number") return serviceError("Share decimals is required");
 
-  const invstorAccount = (await AccountService.getOrInit(
+  const investorAccount = (await AccountService.getOrInit(
     context,
     {
       address: controller,
     },
     event
   )) as AccountService;
-  const { address: investorAddress } = invstorAccount.read();
+  const { address: investorAddress } = investorAccount.read();
 
   const _it = await InvestorTransactionService.redeemClaimable(
     context,
@@ -357,7 +356,7 @@ multiMapper("vault:RedeemClaimable", async ({ event, context }) => {
 
 multiMapper("vault:Deposit", async ({ event, context }) => {
   logEvent(event, context, "vault:Deposit");
-  const { owner, assets, shares } = event.args;
+  const { sender, owner, assets, shares } = event.args;
   const vaultId = event.log.address;
   if (!vaultId) return serviceError(`Vault id not found in event. Cannot identify vault`);
 
@@ -383,15 +382,31 @@ multiMapper("vault:Deposit", async ({ event, context }) => {
   if (typeof assetDecimals !== "number")
     return serviceError("Asset decimals is required to compute share price");
 
-  const invstorAccount = (await AccountService.getOrInit(
+  // NOTE: In our current implementation v3.1 there is a bug in the SyncDepositVault where `sender` and `receiver` are swapped
+  //       in the event data.
+  //       -> Use sender as our investor in this case.
+  let investor: `0x${string}`;
+  switch (kind) {
+    case "Async":
+      investor = owner;
+      break;
+    case "SyncDepositAsyncRedeem":
+    case "Sync":
+      investor = sender;
+      break;
+    default:
+      return serviceError("Unknown vault kind");
+  }
+
+  const investorAccount = (await AccountService.getOrInit(
     context,
     {
-      address: owner,
+      address: investor,
     },
     event
   )) as AccountService;
 
-  const { address: investorAddress } = invstorAccount.read();
+  const { address: investorAddress } = investorAccount.read();
 
   const itData = {
     poolId,
@@ -509,14 +524,14 @@ multiMapper("vault:Withdraw", async ({ event, context }) => {
   if (!token) return serviceError(`Token not found. Cannot retrieve token configuration`);
   const { decimals: shareDecimals } = token.read();
   if (typeof shareDecimals !== "number") return serviceError("Share decimals is required");
-  const invstorAccount = (await AccountService.getOrInit(
+  const investorAccount = (await AccountService.getOrInit(
     context,
     {
       address: owner,
     },
     event
   )) as AccountService;
-  const { address: investorAddress } = invstorAccount.read();
+  const { address: investorAddress } = investorAccount.read();
 
   const itData = {
     poolId,
@@ -530,7 +545,6 @@ multiMapper("vault:Withdraw", async ({ event, context }) => {
     currencyAssetId: assetId,
   };
 
-
   switch (kind) {
     case "Sync":
       return serviceError("Sync vaults are not supported yet");