@eulerxyz/euler-v2-sdk 0.1.3-beta → 0.2.1-beta

package/dist/src/services/vaults/eVaultService/adapters/eVaultV3Adapter/eVaultV3AdapterConversions.js

@@ -1,4 +1,5 @@
 import { getAddress } from "viem";
+import { dataIssueLocation, vaultCollateralDiagnosticOwner, vaultDiagnosticOwner, } from "../../../../../utils/entityDiagnostics.js";
 import { parseAddressField, parseBigIntField, parseBooleanField, parseNumberField, parseRatio1e4, parseStringField, parseTimestampField, ZERO_ADDRESS, } from "../../../../../utils/parsing.js";
 import { hasActiveBorrowableLtv, } from "../../../../../entities/EVault.js";
 import { VaultType } from "../../../../../utils/types.js";
@@ -47,6 +48,10 @@ const DEFAULT_INTEREST_RATES_BLOCK = {
     borrowAPY: "0",
     supplyAPY: "0",
 };
+function parseRate(value) {
+    const parsed = Number.parseFloat(value);
+    return Number.isFinite(parsed) ? parsed * 100 : 0;
+}
 const DEFAULT_INTEREST_RATE_MODEL_BLOCK = {
     address: ZERO_ADDRESS,
     type: "unknown",
@@ -86,77 +91,77 @@ function mapInterestRateModelType(type) {
             return InterestRateModelType.UNKNOWN;
     }
 }
-function convertToken(token, path, entityId, errors) {
+function convertToken(token, path, owner, errors) {
     return {
         address: parseAddressField(token.address, {
             path: `${path}.address`,
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         name: parseStringField(token.name, {
             path: `${path}.name`,
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         symbol: parseStringField(token.symbol, {
             path: `${path}.symbol`,
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         decimals: parseNumberField(token.decimals, {
             path: `${path}.decimals`,
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
     };
 }
-function convertOraclePrice(price, errors, path, entityId) {
+function convertOraclePrice(price, errors, path, owner) {
     const converted = {
         queryFailure: parseBooleanField(price.queryFailure, {
             path: `${path}.queryFailure`,
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
             fallback: true,
         }),
         queryFailureReason: parseStringField(price.queryFailureReason, {
             path: `${path}.queryFailureReason`,
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
             fallback: "0x",
         }),
         amountIn: parseBigIntField(price.amountIn, {
             path: `${path}.amountIn`,
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         amountOutMid: parseBigIntField(price.amountOutMid, {
             path: `${path}.amountOutMid`,
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         amountOutBid: parseBigIntField(price.amountOutBid, {
             path: `${path}.amountOutBid`,
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         amountOutAsk: parseBigIntField(price.amountOutAsk, {
             path: `${path}.amountOutAsk`,
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         timestamp: parseTimestampField(price.timestamp, {
             path: `${path}.timestamp`,
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
@@ -166,8 +171,7 @@ function convertOraclePrice(price, errors, path, entityId) {
             code: "SOURCE_UNAVAILABLE",
             severity: "warning",
             message: "Oracle price query reported failure.",
-            paths: [path],
-            entityId,
+            locations: [dataIssueLocation(owner, path)],
             source: "eVaultV3",
             originalValue: converted.queryFailureReason,
             normalizedValue: "queryFailure:true",
@@ -175,29 +179,29 @@ function convertOraclePrice(price, errors, path, entityId) {
     }
     return converted;
 }
-function convertOracleAdapter(adapter, entityId, errors) {
+function convertOracleAdapter(adapter, owner, errors) {
     const converted = {
         oracle: parseAddressField(adapter.oracle, {
             path: "$.oracle.adapters[].oracle",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         name: parseStringField(adapter.name, {
             path: "$.oracle.adapters[].name",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         base: parseAddressField(adapter.base, {
             path: "$.oracle.adapters[].base",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         quote: parseAddressField(adapter.quote, {
             path: "$.oracle.adapters[].quote",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
@@ -206,38 +210,38 @@ function convertOracleAdapter(adapter, entityId, errors) {
         converted.pythDetail = {
             pyth: parseAddressField(adapter.pythDetail.pyth, {
                 path: "$.oracle.adapters[].pythDetail.pyth",
-                entityId,
+                owner,
                 errors,
                 source: "eVaultV3",
             }),
             base: parseAddressField(adapter.pythDetail.base, {
                 path: "$.oracle.adapters[].pythDetail.base",
-                entityId,
+                owner,
                 errors,
                 source: "eVaultV3",
             }),
             quote: parseAddressField(adapter.pythDetail.quote, {
                 path: "$.oracle.adapters[].pythDetail.quote",
-                entityId,
+                owner,
                 errors,
                 source: "eVaultV3",
             }),
             feedId: parseStringField(adapter.pythDetail.feedId, {
                 path: "$.oracle.adapters[].pythDetail.feedId",
-                entityId,
+                owner,
                 errors,
                 source: "eVaultV3",
                 fallback: "0x",
             }),
             maxStaleness: parseBigIntField(String(adapter.pythDetail.maxStaleness), {
                 path: "$.oracle.adapters[].pythDetail.maxStaleness",
-                entityId,
+                owner,
                 errors,
                 source: "eVaultV3",
             }),
             maxConfWidth: parseBigIntField(String(adapter.pythDetail.maxConfWidth), {
                 path: "$.oracle.adapters[].pythDetail.maxConfWidth",
-                entityId,
+                owner,
                 errors,
                 source: "eVaultV3",
             }),
@@ -247,7 +251,7 @@ function convertOracleAdapter(adapter, entityId, errors) {
         converted.chainlinkDetail = {
             oracle: parseAddressField(adapter.chainlinkDetail.oracle, {
                 path: "$.oracle.adapters[].chainlinkDetail.oracle",
-                entityId,
+                owner,
                 errors,
                 source: "eVaultV3",
             }),
@@ -255,60 +259,62 @@ function convertOracleAdapter(adapter, entityId, errors) {
     }
     return converted;
 }
-function convertOracleResolvedVaults(resolvedVaults, entityId, errors) {
-    return resolvedVaults.map((resolvedVault, index) => ({
+function convertOracleResolvedVaults(resolvedVaults, owner, errors) {
+    return (resolvedVaults ?? []).map((resolvedVault, index) => ({
         vault: parseAddressField(resolvedVault.vault, {
             path: `$.oracle.resolvedVaults[${index}].vault`,
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         quote: parseAddressField(resolvedVault.quote, {
             path: `$.oracle.resolvedVaults[${index}].quote`,
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         asset: parseAddressField(resolvedVault.asset, {
             path: `$.oracle.resolvedVaults[${index}].asset`,
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
-        resolvedAssets: resolvedVault.resolvedAssets.map((asset, assetIndex) => parseAddressField(asset, {
+        resolvedAssets: (resolvedVault.resolvedAssets ?? []).map((asset, assetIndex) => parseAddressField(asset, {
             path: `$.oracle.resolvedVaults[${index}].resolvedAssets[${assetIndex}]`,
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         })),
     }));
 }
-function convertCollaterals(rows, vaultTimestamp, vaultEntityId, errors) {
+function convertCollaterals(rows, vaultTimestamp, vaultEntityId, chainId, errors) {
     const collaterals = [];
+    const vaultOwner = vaultDiagnosticOwner(chainId, vaultEntityId);
     for (const [index, row] of rows.entries()) {
         const collateralAddress = parseAddressField(row.collateral, {
             path: `$.collaterals[${index}].collateral`,
-            entityId: vaultEntityId,
+            owner: vaultOwner,
             errors,
             source: "eVaultV3",
         });
+        const collateralOwner = vaultCollateralDiagnosticOwner(chainId, vaultEntityId, collateralAddress);
         const borrowLTV = parseRatio1e4(row.borrowLTV, {
-            path: `$.collaterals[${index}].borrowLTV`,
-            entityId: collateralAddress,
+            path: "$.borrowLTV",
+            owner: collateralOwner,
             errors,
             source: "eVaultV3",
         });
         const liquidationLTV = parseRatio1e4(row.liquidationLTV, {
-            path: `$.collaterals[${index}].liquidationLTV`,
-            entityId: collateralAddress,
+            path: "$.liquidationLTV",
+            owner: collateralOwner,
             errors,
             source: "eVaultV3",
         });
         const targetTimestamp = parseNumberField(typeof row.targetTimestamp === "number"
             ? row.targetTimestamp
             : Number(row.targetTimestamp), {
-            path: `$.collaterals[${index}].targetTimestamp`,
-            entityId: collateralAddress,
+            path: "$.targetTimestamp",
+            owner: collateralOwner,
             errors,
             source: "eVaultV3",
         });
@@ -322,7 +328,7 @@ function convertCollaterals(rows, vaultTimestamp, vaultEntityId, errors) {
             borrowLTV,
             liquidationLTV,
             oraclePriceRaw: row.oraclePriceRaw
-                ? convertOraclePrice(row.oraclePriceRaw, errors, `$.collaterals[${collaterals.length}].oraclePriceRaw`, collateralAddress)
+                ? convertOraclePrice(row.oraclePriceRaw, errors, "$.oraclePriceRaw", collateralOwner)
                 : {
                     queryFailure: true,
                     queryFailureReason: "0x",
@@ -338,8 +344,7 @@ function convertCollaterals(rows, vaultTimestamp, vaultEntityId, errors) {
                 code: "DEFAULT_APPLIED",
                 severity: "warning",
                 message: "Missing collateral oraclePriceRaw; default zero-price placeholder applied.",
-                paths: [`$.collaterals[${collaterals.length}].oraclePriceRaw`],
-                entityId: collateralAddress,
+                locations: [dataIssueLocation(collateralOwner, "$.oraclePriceRaw")],
                 source: "eVaultV3",
                 normalizedValue: "queryFailure:true",
             });
@@ -347,15 +352,15 @@ function convertCollaterals(rows, vaultTimestamp, vaultEntityId, errors) {
         if (targetTimestamp > vaultTimestamp) {
             const ramping = {
                 initialLiquidationLTV: parseRatio1e4(row.initialLiquidationLTV, {
-                    path: `$.collaterals[${collaterals.length}].ramping.initialLiquidationLTV`,
-                    entityId: collateralAddress,
+                    path: "$.ramping.initialLiquidationLTV",
+                    owner: collateralOwner,
                     errors,
                     source: "eVaultV3",
                 }),
                 targetTimestamp,
                 rampDuration: parseBigIntField(String(row.rampDuration ?? 0), {
-                    path: `$.collaterals[${collaterals.length}].ramping.rampDuration`,
-                    entityId: collateralAddress,
+                    path: "$.ramping.rampDuration",
+                    owner: collateralOwner,
                     errors,
                     source: "eVaultV3",
                 }),
@@ -376,21 +381,21 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
                 return false;
             }
         })();
-    const entityId = parseAddressField(detail.address, {
+    const vaultAddress = parseAddressField(detail.address, {
         path: "$.address",
-        entityId: fallbackAddress,
+        owner: vaultDiagnosticOwner(detail.chainId, fallbackAddress),
         errors,
         source: "eVaultV3",
         fallback: fallbackAddress,
         fallbackLabel: "requested vault address",
     });
+    const owner = vaultDiagnosticOwner(detail.chainId, vaultAddress);
     if (!detail.oracle) {
         errors.push({
             code: "DEFAULT_APPLIED",
             severity: "warning",
             message: "Missing oracle block; defaulted all oracle fields to 0/empty.",
-            paths: ["$.oracle"],
-            entityId,
+            locations: [dataIssueLocation(owner, "$.oracle")],
             source: "eVaultV3",
             normalizedValue: DEFAULT_ORACLE_BLOCK,
         });
@@ -399,18 +404,18 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
     const oracle = {
         oracle: parseAddressField(oracleData.oracle, {
             path: "$.oracle.oracle",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         name: parseStringField(oracleData.name, {
             path: "$.oracle.name",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
-        adapters: oracleData.adapters.map((adapter) => convertOracleAdapter(adapter, entityId, errors)),
-        resolvedVaults: convertOracleResolvedVaults(oracleData.resolvedVaults, entityId, errors),
+        adapters: (oracleData.adapters ?? []).map((adapter) => convertOracleAdapter(adapter, owner, errors)),
+        resolvedVaults: convertOracleResolvedVaults(oracleData.resolvedVaults, owner, errors),
     };
     const suppressUnitOfAccountDiagnostics = hasZeroOracleAddress;
     if (!detail.shares) {
@@ -418,8 +423,7 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
             code: "DEFAULT_APPLIED",
             severity: "warning",
             message: "Missing shares block; defaulted all share token fields to 0/empty.",
-            paths: ["$.shares"],
-            entityId,
+            locations: [dataIssueLocation(owner, "$.shares")],
             source: "eVaultV3",
             normalizedValue: DEFAULT_TOKEN_BLOCK,
         });
@@ -430,8 +434,7 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
             code: "DEFAULT_APPLIED",
             severity: "warning",
             message: "Missing asset block; defaulted all asset token fields to 0/empty.",
-            paths: ["$.asset"],
-            entityId,
+            locations: [dataIssueLocation(owner, "$.asset")],
             source: "eVaultV3",
             normalizedValue: DEFAULT_TOKEN_BLOCK,
         });
@@ -442,8 +445,7 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
             code: "DEFAULT_APPLIED",
             severity: "warning",
             message: "Missing unitOfAccount block; defaulted all unit-of-account fields to 0/empty.",
-            paths: ["$.unitOfAccount"],
-            entityId,
+            locations: [dataIssueLocation(owner, "$.unitOfAccount")],
             source: "eVaultV3",
             normalizedValue: DEFAULT_TOKEN_BLOCK,
         });
@@ -455,8 +457,7 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
             code: "DEFAULT_APPLIED",
             severity: "warning",
             message: "Missing fees object; defaulted all fee fields to 0.",
-            paths: ["$.fees"],
-            entityId,
+            locations: [dataIssueLocation(owner, "$.fees")],
             source: "eVaultV3",
             normalizedValue: {
                 interestFee: 0,
@@ -480,25 +481,25 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
         interestFee: feeData.interestFee ?? 0,
         accumulatedFeesShares: parseBigIntField(feeData.accumulatedFeesShares ?? "0", {
             path: "$.fees.accumulatedFeesShares",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         accumulatedFeesAssets: parseBigIntField(feeData.accumulatedFeesAssets ?? "0", {
             path: "$.fees.accumulatedFeesAssets",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         governorFeeReceiver: parseAddressField(feeData.governorFeeReceiver, {
             path: "$.fees.governorFeeReceiver",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         protocolFeeReceiver: parseAddressField(feeData.protocolFeeReceiver, {
             path: "$.fees.protocolFeeReceiver",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
@@ -511,7 +512,7 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
         },
         hookTarget: parseAddressField(detail.hooks?.hookTarget, {
             path: "$.hooks.hookTarget",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
@@ -521,8 +522,7 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
             code: "DEFAULT_APPLIED",
             severity: "warning",
             message: "Missing hookedOperations; defaulted all operations to false.",
-            paths: ["$.hooks.hookedOperations"],
-            entityId,
+            locations: [dataIssueLocation(owner, "$.hooks.hookedOperations")],
             source: "eVaultV3",
             normalizedValue: DEFAULT_HOOKED_OPERATIONS,
         });
@@ -532,8 +532,7 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
             code: "DEFAULT_APPLIED",
             severity: "warning",
             message: "Missing caps block; defaulted all cap fields to 0.",
-            paths: ["$.caps"],
-            entityId,
+            locations: [dataIssueLocation(owner, "$.caps")],
             source: "eVaultV3",
             normalizedValue: DEFAULT_CAPS_BLOCK,
         });
@@ -542,13 +541,13 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
     const caps = {
         supplyCap: parseBigIntField(capsData.supplyCap ?? "0", {
             path: "$.caps.supplyCap",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         borrowCap: parseBigIntField(capsData.borrowCap ?? "0", {
             path: "$.caps.borrowCap",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
@@ -558,8 +557,7 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
             code: "DEFAULT_APPLIED",
             severity: "warning",
             message: "Missing liquidation block; defaulted all liquidation fields to 0/false.",
-            paths: ["$.liquidation"],
-            entityId,
+            locations: [dataIssueLocation(owner, "$.liquidation")],
             source: "eVaultV3",
             normalizedValue: {
                 maxLiquidationDiscount: 0,
@@ -579,43 +577,41 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
             code: "DEFAULT_APPLIED",
             severity: "warning",
             message: "Missing interestRates block; defaulted all rate fields to 0.",
-            paths: ["$.interestRates"],
-            entityId,
+            locations: [dataIssueLocation(owner, "$.interestRates")],
             source: "eVaultV3",
             normalizedValue: DEFAULT_INTEREST_RATES_BLOCK,
         });
     }
     const interestRatesData = detail.interestRates ?? DEFAULT_INTEREST_RATES_BLOCK;
     const interestRates = {
-        borrowSPY: parseStringField(interestRatesData.borrowSPY, {
+        borrowSPY: parseRate(parseStringField(interestRatesData.borrowSPY, {
             path: "$.interestRates.borrowSPY",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
             fallback: "0",
-        }),
-        borrowAPY: parseStringField(interestRatesData.borrowAPY, {
+        })),
+        borrowAPY: parseRate(parseStringField(interestRatesData.borrowAPY, {
             path: "$.interestRates.borrowAPY",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
             fallback: "0",
-        }),
-        supplyAPY: parseStringField(interestRatesData.supplyAPY, {
+        })),
+        supplyAPY: parseRate(parseStringField(interestRatesData.supplyAPY, {
             path: "$.interestRates.supplyAPY",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
             fallback: "0",
-        }),
+        })),
     };
     if (!detail.interestRateModel) {
         errors.push({
             code: "DEFAULT_APPLIED",
             severity: "warning",
             message: "Missing interestRateModel block; defaulted all model fields to 0/unknown.",
-            paths: ["$.interestRateModel"],
-            entityId,
+            locations: [dataIssueLocation(owner, "$.interestRateModel")],
             source: "eVaultV3",
             normalizedValue: DEFAULT_INTEREST_RATE_MODEL_BLOCK,
         });
@@ -623,7 +619,7 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
     const interestRateModelData = detail.interestRateModel ?? DEFAULT_INTEREST_RATE_MODEL_BLOCK;
     const interestRateModelType = mapInterestRateModelType(parseStringField(interestRateModelData.type, {
         path: "$.interestRateModel.type",
-        entityId,
+        owner,
         errors,
         source: "eVaultV3",
         fallback: "unknown",
@@ -631,7 +627,7 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
     const normalizedIRMData = normalizeIRMParams(interestRateModelType, interestRateModelData.data);
     const interestRateModelAddress = parseAddressField(interestRateModelData.address, {
         path: "$.interestRateModel.address",
-        entityId,
+        owner,
         errors,
         source: "eVaultV3",
     });
@@ -675,8 +671,7 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
             code: "DEFAULT_APPLIED",
             severity: "warning",
             message: "Missing oraclePriceRaw block; defaulted all oracle price fields to 0.",
-            paths: ["$.oraclePriceRaw"],
-            entityId,
+            locations: [dataIssueLocation(owner, "$.oraclePriceRaw")],
             source: "eVaultV3",
             normalizedValue: DEFAULT_ORACLE_PRICE_BLOCK,
         });
@@ -684,64 +679,64 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
     const oraclePriceData = detail.oraclePriceRaw ?? DEFAULT_ORACLE_PRICE_BLOCK;
     const timestamp = parseTimestampField(detail.timestamp, {
         path: "$.timestamp",
-        entityId,
+        owner,
         errors,
         source: "eVaultV3",
     });
-    const collaterals = convertCollaterals(collateralRows, timestamp, entityId, errors);
-    const unitOfAccount = normalizeUnitOfAccountToken(convertToken(unitOfAccountData, "$.unitOfAccount", entityId, unitOfAccountErrors));
+    const collaterals = convertCollaterals(collateralRows, timestamp, vaultAddress, detail.chainId, errors);
+    const unitOfAccount = normalizeUnitOfAccountToken(convertToken(unitOfAccountData, "$.unitOfAccount", owner, unitOfAccountErrors));
     return {
         type: VaultType.EVault,
         chainId: detail.chainId,
-        address: entityId,
-        shares: convertToken(sharesData, "$.shares", entityId, errors),
-        asset: convertToken(assetData, "$.asset", entityId, errors),
+        address: vaultAddress,
+        shares: convertToken(sharesData, "$.shares", owner, errors),
+        asset: convertToken(assetData, "$.asset", owner, errors),
         unitOfAccount,
         totalShares: parseBigIntField(detail.totalShares, {
             path: "$.totalShares",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         totalAssets: parseBigIntField(detail.totalAssets, {
             path: "$.totalAssets",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         totalCash: parseBigIntField(detail.totalCash, {
             path: "$.totalCash",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         totalBorrowed: parseBigIntField(detail.totalBorrowed, {
             path: "$.totalBorrowed",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         creator: parseAddressField(detail.creator, {
             path: "$.creator",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         governorAdmin: parseAddressField(detail.governorAdmin, {
             path: "$.governorAdmin",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         dToken: parseAddressField(detail.dToken, {
             path: "$.dToken",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
         balanceTracker: parseAddressField(detail.balanceTracker, {
             path: "$.balanceTracker",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
@@ -756,11 +751,11 @@ export function convertVault(detail, collateralRows, errors, fallbackAddress) {
         isBorrowable: hasActiveBorrowableLtv(collaterals, timestamp),
         evcCompatibleAsset: parseBooleanField(detail.evcCompatibleAsset, {
             path: "$.evcCompatibleAsset",
-            entityId,
+            owner,
             errors,
             source: "eVaultV3",
         }),
-        oraclePriceRaw: convertOraclePrice(oraclePriceData, errors, "$.oraclePriceRaw", entityId),
+        oraclePriceRaw: convertOraclePrice(oraclePriceData, errors, "$.oraclePriceRaw", owner),
         timestamp,
     };
 }