fix: vaultInvestOrder claimable in asset denomination (#218)

Fixes #217

Author: filo87

ponder.schema.ts

@@ -391,7 +391,7 @@ const VaultInvestOrderColumns = (t: PgColumnsBuilders) => ({
   assetId: t.bigint().notNull(),
 
   requestedAssetsAmount: t.bigint().default(0n),
-  claimableSharesAmount: t.bigint().default(0n),
+  claimableAssetsAmount: t.bigint().default(0n),
 
   ...defaultColumns(t),
 
@@ -487,7 +487,7 @@ const VaultRedeemOrderColumns = (t: PgColumnsBuilders) => ({
   assetId: t.bigint().notNull(),
 
   requestedSharesAmount: t.bigint().default(0n),
-  claimableAssetsAmount: t.bigint().default(0n),
+  claimableSharesAmount: t.bigint().default(0n),
 
   ...defaultColumns(t),
 });
@@ -925,6 +925,7 @@ const PoolManagerColumns = (t: PgColumnsBuilders) => ({
   poolId: t.bigint().notNull(),
   isHubManager: t.boolean().notNull().default(false),
   isBalancesheetManager: t.boolean().notNull().default(false),
+  ...defaultColumns(t),
 });
 
 export const PoolManager = onchainTable("pool_manager", PoolManagerColumns, (t) => ({
@@ -944,6 +945,7 @@ const OnOffRampManagerColumns = (t: PgColumnsBuilders) => ({
   address: t.hex().notNull(),
   poolId: t.bigint().notNull(),
   tokenId: t.hex().notNull(),
+  ...defaultColumns(t),
 });
 
 export const OnOffRampManager = onchainTable(
@@ -974,6 +976,7 @@ const OfframpRelayerColumns = (t: PgColumnsBuilders) => ({
   poolId: t.bigint().notNull(),
   address: t.hex().notNull(),
   isEnabled: t.boolean().notNull().default(false),
+  ...defaultColumns(t),
 });
 
 export const OfframpRelayer = onchainTable("offramp_relayer", OfframpRelayerColumns, (t) => ({
@@ -989,6 +992,7 @@ const OnRampAssetColumns = (t: PgColumnsBuilders) => ({
   centrifugeId: t.text().notNull(),
   assetAddress: t.hex().notNull(),
   isEnabled: t.boolean().notNull().default(false),
+  ...defaultColumns(t),
 });
 
 export const OnRampAsset = onchainTable("on_ramp_asset", OnRampAssetColumns, (t) => ({
@@ -1015,6 +1019,7 @@ const OffRampAddressColumns = (t: PgColumnsBuilders) => ({
   centrifugeId: t.text().notNull(),
   assetAddress: t.hex().notNull(),
   receiverAddress: t.hex().notNull(),
+  ...defaultColumns(t),
 });
 export const OffRampAddress = onchainTable("off_ramp_address", OffRampAddressColumns, (t) => ({
   id: primaryKey({ columns: [t.tokenId, t.assetAddress, t.receiverAddress] }),
@@ -1040,6 +1045,7 @@ const PolicyColumns = (t: PgColumnsBuilders) => ({
   centrifugeId: t.text().notNull(),
   strategistAddress: t.hex().notNull(),
   root: t.hex().notNull(),
+  ...defaultColumns(t),
 });
 
 export const Policy = onchainTable("policy", PolicyColumns, (t) => ({
@@ -1395,6 +1401,7 @@ const MerkleProofManagerColumns = (t: PgColumnsBuilders) => ({
   address: t.hex().notNull(),
   centrifugeId: t.text().notNull(),
   poolId: t.bigint().notNull(),
+  ...defaultColumns(t),
 });
 export const MerkleProofManager = onchainTable(
   "merkle_proof_manager",

src/handlers/vaultHandlers.ts

@@ -284,7 +284,7 @@ multiMapper("vault:DepositClaimable", async ({ event, context }) => {
     undefined,
     true
   )) as VaultInvestOrderService;
-  await vaultInvestOrder.claimableDeposit(shares).save(event);
+  await vaultInvestOrder.claimableDeposit(assets).save(event);
 });
 
 multiMapper("vault:RedeemClaimable", async ({ event, context }) => {
@@ -355,7 +355,7 @@ multiMapper("vault:RedeemClaimable", async ({ event, context }) => {
     undefined,
     true
   )) as VaultRedeemOrderService;
-  await vaultRedeemOrder.claimableRedeem(assets).save(event);
+  await vaultRedeemOrder.claimableRedeem(shares).save(event);
 });
 
 multiMapper("vault:Deposit", async ({ event, context }) => {
@@ -602,7 +602,7 @@ multiMapper("vault:Withdraw", async ({ event, context }) => {
     undefined,
     true
   )) as VaultRedeemOrderService;
-  await vaultRedeemOrder.redeem(assets).saveOrClear(event);
+  await vaultRedeemOrder.redeem(shares).saveOrClear(event);
 });
 
 /**

src/services/VaultInvestOrderService.ts

@@ -33,10 +33,10 @@ export class VaultInvestOrderService extends mixinCommonStatics(
    * @param claimableSharesAmount - The amount of shares claimable
    * @returns The service instance for method chaining
    */
-  public claimableDeposit(claimableSharesAmount: bigint) {
-    serviceLog(`Adding claimable shares amount ${claimableSharesAmount} to vault invest order`);
-    this.data.claimableSharesAmount =
-      (this.data.claimableSharesAmount ?? 0n) + claimableSharesAmount;
+  public claimableDeposit(claimableAssetsAmount: bigint) {
+    serviceLog(`Adding claimable assets amount ${claimableAssetsAmount} to vault invest order`);
+    this.data.claimableAssetsAmount =
+      (this.data.claimableAssetsAmount ?? 0n) + claimableAssetsAmount;
     return this;
   }
 
@@ -48,7 +48,7 @@ export class VaultInvestOrderService extends mixinCommonStatics(
   public deposit(assetsAmount: bigint) {
     serviceLog(`Depositing assets amount ${assetsAmount} into vault invest order`);
     this.data.requestedAssetsAmount = (this.data.requestedAssetsAmount ?? 0n) - assetsAmount;
-    this.data.claimableSharesAmount = (this.data.claimableSharesAmount ?? 0n) - assetsAmount;
+    this.data.claimableAssetsAmount = (this.data.claimableAssetsAmount ?? 0n) - assetsAmount;
     return this;
   }
 
@@ -58,7 +58,7 @@ export class VaultInvestOrderService extends mixinCommonStatics(
    * @returns The service instance for method chaining
    */
   public saveOrClear(event: Event) {
-    if (this.data.requestedAssetsAmount === 0n && this.data.claimableSharesAmount === 0n) {
+    if (this.data.requestedAssetsAmount === 0n && this.data.claimableAssetsAmount === 0n) {
       return this.delete();
     }
     return this.save(event);

src/services/VaultRedeemOrderService.ts

@@ -33,10 +33,10 @@ export class VaultRedeemOrderService extends mixinCommonStatics(
    * @param claimableAssetsAmount - The amount of assets claimable
    * @returns The service instance for method chaining
    */
-  public claimableRedeem(claimableAssetsAmount: bigint) {
-    serviceLog(`Adding claimable assets amount ${claimableAssetsAmount} to vault redeem order`);
-    this.data.claimableAssetsAmount =
-      (this.data.claimableAssetsAmount ?? 0n) + claimableAssetsAmount;
+  public claimableRedeem(claimableSharesAmount: bigint) {
+    serviceLog(`Adding claimable shares amount ${claimableSharesAmount} to vault redeem order`);
+    this.data.claimableSharesAmount =
+      (this.data.claimableSharesAmount ?? 0n) + claimableSharesAmount;
     return this;
   }
 
@@ -45,10 +45,10 @@ export class VaultRedeemOrderService extends mixinCommonStatics(
    * @param assetsAmount - The amount of assets to redeem
    * @returns The service instance for method chaining
    */
-  public redeem(assetsAmount: bigint) {
-    serviceLog(`Redeeming assets amount ${assetsAmount} from vault redeem order`);
-    this.data.requestedSharesAmount = (this.data.requestedSharesAmount ?? 0n) - assetsAmount;
-    this.data.claimableAssetsAmount = (this.data.claimableAssetsAmount ?? 0n) - assetsAmount;
+  public redeem(sharesAmount: bigint) {
+    serviceLog(`Redeeming shares amount ${sharesAmount} from vault redeem order`);
+    this.data.requestedSharesAmount = (this.data.requestedSharesAmount ?? 0n) - sharesAmount;
+    this.data.claimableSharesAmount = (this.data.claimableSharesAmount ?? 0n) - sharesAmount;
     return this;
   }
 
@@ -58,7 +58,7 @@ export class VaultRedeemOrderService extends mixinCommonStatics(
    * @returns The service instance for method chaining
    */
   public saveOrClear(event: Event) {
-    if (this.data.requestedSharesAmount === 0n && this.data.claimableAssetsAmount === 0n) {
+    if (this.data.requestedSharesAmount === 0n && this.data.claimableSharesAmount === 0n) {
       return this.delete();
     }
     return this.save(event);