fix: handleDeposit fixes and test

samsiegart · samsiegart · commit 718453ded65f · 2025-08-06T11:27:04.000-07:00
diff --git a/packages/portfolio-contract/test/deposit-tools.test.ts b/packages/portfolio-contract/test/deposit-tools.test.ts
@@ -5,6 +5,10 @@ import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
 import { planDepositTransfers } from '../tools/portfolio-actors.js';
 import { makeIssuerKit } from '@agoric/ertp';
 import type { TargetAllocation } from '../src/type-guards.js';
+import { handleDeposit } from '@aglocal/portfolio-planner/src/plan-deposit.ts';
+import type { VstorageKit } from '@agoric/client-utils';
+import { SpectrumClient } from '@aglocal/portfolio-planner/src/spectrum-client.ts';
+import { CosmosRestClient } from '@aglocal/portfolio-planner/src/cosmos-rest-client.ts';
 
 const { brand } = makeIssuerKit('USDC');
 
@@ -39,7 +43,11 @@ test('planDepositTransfers works in a handful of cases', t => {
     Aave_Arbitrum: make(100n),
     Compound_Arbitrum: make(0n),
   };
-  const targetAllocation2 = { USDN: 40, Aave_Arbitrum: 40, Compound_Arbitrum: 20 };
+  const targetAllocation2: TargetAllocation = {
+    USDN: 40n,
+    Aave_Arbitrum: 40n,
+    Compound_Arbitrum: 20n,
+  };
 
   const result2 = planDepositTransfers(
     deposit2,
@@ -63,7 +71,11 @@ test('planDepositTransfers works in a handful of cases', t => {
     Aave_Arbitrum: make(100n),
     Compound_Arbitrum: make(50n),
   };
-  const targetAllocation3 = { USDN: 50, Aave_Arbitrum: 30, Compound_Arbitrum: 20 };
+  const targetAllocation3: TargetAllocation = {
+    USDN: 50n,
+    Aave_Arbitrum: 30n,
+    Compound_Arbitrum: 20n,
+  };
 
   const result3 = planDepositTransfers(
     deposit3,
@@ -89,7 +101,11 @@ test('planDepositTransfers works in a handful of cases', t => {
     Aave_Arbitrum: make(0n),
     Compound_Arbitrum: make(0n),
   };
-  const targetAllocation4 = { USDN: 60, Aave_Arbitrum: 30, Compound_Arbitrum: 10 };
+  const targetAllocation4: TargetAllocation = {
+    USDN: 60n,
+    Aave_Arbitrum: 30n,
+    Compound_Arbitrum: 10n,
+  };
 
   const result4 = planDepositTransfers(
     deposit4,
@@ -107,7 +123,7 @@ test('planDepositTransfers works in a handful of cases', t => {
   // Test case 5: Single position target
   const deposit5 = make(1000n);
   const currentBalances5 = { USDN: make(500n) };
-  const targetAllocation5 = { USDN: 100 };
+  const targetAllocation5: TargetAllocation = { USDN: 100n };
 
   const result5 = planDepositTransfers(
     deposit5,
@@ -120,3 +136,237 @@ test('planDepositTransfers works in a handful of cases', t => {
     USDN: make(1000n),
   });
 });
+
+test('handleDeposit works with mocked dependencies', async t => {
+  const make = value => AmountMath.make(brand, value);
+  const deposit = make(1000n);
+  const portfolioKey = 'test.portfolios.portfolio1' as const;
+
+  // Mock VstorageKit readPublished
+  const mockReadPublished = async (path: string) => {
+    if (path === portfolioKey) {
+      return {
+        positionKeys: ['USDN', 'Aave_Arbitrum', 'Compound_Arbitrum'],
+        flowCount: 0,
+        accountIdByChain: {
+          noble: 'noble:test:addr1',
+          Arbitrum: 'arbitrum:test:addr2',
+        },
+        targetAllocation: {
+          USDN: 50n,
+          Aave_Arbitrum: 30n,
+          Compound_Arbitrum: 20n,
+        },
+      };
+    }
+    throw new Error(`Unexpected path: ${path}`);
+  };
+
+  // Mock SpectrumClient
+  class MockSpectrumClient extends SpectrumClient {
+    async getPoolBalance(chain: any, pool: any, addr: any) {
+      // Return different balances for different pools
+      if (pool === 'aave' && chain === 'arbitrum') {
+        return {
+          pool,
+          chain,
+          address: addr,
+          balance: { supplyBalance: 100, borrowAmount: 0 },
+        };
+      }
+      if (pool === 'compound' && chain === 'arbitrum') {
+        return {
+          pool,
+          chain,
+          address: addr,
+          balance: { supplyBalance: 50, borrowAmount: 0 },
+        };
+      }
+      return {
+        pool,
+        chain,
+        address: addr,
+        balance: { supplyBalance: 0, borrowAmount: 0 },
+      };
+    }
+  }
+  const mockSpectrumClient = new MockSpectrumClient();
+
+  // Mock CosmosRestClient
+  class MockCosmosRestClient extends CosmosRestClient {
+    async getAccountBalance(chainName: string, addr: string, denom: string) {
+      if (chainName === 'noble' && denom === 'usdn') {
+        return { denom, amount: '200' };
+      }
+      return { denom, amount: '0' };
+    }
+  }
+  const mockCosmosRestClient = new MockCosmosRestClient();
+
+  // Mock VstorageKit
+  const mockVstorageKit: VstorageKit = {
+    readPublished: mockReadPublished,
+  } as VstorageKit;
+
+  try {
+    await handleDeposit(
+      deposit,
+      portfolioKey,
+      mockVstorageKit.readPublished,
+      mockSpectrumClient,
+      mockCosmosRestClient,
+    );
+    t.fail('Expected handleDeposit to throw Error with "moar TODO"');
+  } catch (error) {
+    t.is(error.message, 'moar TODO');
+  }
+});
+
+test('handleDeposit handles missing targetAllocation gracefully', async t => {
+  const make = value => AmountMath.make(brand, value);
+  const deposit = make(1000n);
+  const portfolioKey = 'test.portfolios.portfolio1' as const;
+
+  // Mock VstorageKit readPublished with no targetAllocation
+  const mockReadPublished = async (path: string) => {
+    if (path === portfolioKey) {
+      return {
+        positionKeys: ['USDN', 'Aave_Arbitrum'],
+        flowCount: 0,
+        accountIdByChain: {
+          noble: 'noble:test:addr1',
+          Arbitrum: 'arbitrum:test:addr2',
+        },
+        // No targetAllocation
+      };
+    }
+    throw new Error(`Unexpected path: ${path}`);
+  };
+
+  // Mock SpectrumClient
+  class MockSpectrumClient2 extends SpectrumClient {
+    async getPoolBalance(chain: any, pool: any, addr: any) {
+      return {
+        pool,
+        chain,
+        address: addr,
+        balance: { supplyBalance: 0, borrowAmount: 0 },
+      };
+    }
+  }
+  const mockSpectrumClient = new MockSpectrumClient2();
+
+  // Mock CosmosRestClient
+  class MockCosmosRestClient2 extends CosmosRestClient {
+    async getAccountBalance(chainName: string, addr: string, denom: string) {
+      return { denom, amount: '0' };
+    }
+  }
+  const mockCosmosRestClient = new MockCosmosRestClient2();
+
+  // Mock VstorageKit
+  const mockVstorageKit: VstorageKit = {
+    readPublished: mockReadPublished,
+  } as VstorageKit;
+
+  const result = await handleDeposit(
+    deposit,
+    portfolioKey,
+    mockVstorageKit.readPublished,
+    mockSpectrumClient,
+    mockCosmosRestClient,
+  );
+
+  t.is(result, undefined);
+});
+
+test('handleDeposit handles different position types correctly', async t => {
+  const make = value => AmountMath.make(brand, value);
+  const deposit = make(1000n);
+  const portfolioKey = 'test.portfolios.portfolio1' as const;
+
+  // Mock VstorageKit readPublished with various position types
+  const mockReadPublished = async (path: string) => {
+    if (path === portfolioKey) {
+      return {
+        positionKeys: [
+          'USDN',
+          'USDNVault',
+          'Aave_Avalanche',
+          'Compound_Polygon',
+        ],
+        flowCount: 0,
+        accountIdByChain: {
+          noble: 'noble:test:addr1',
+          Avalanche: 'avalanche:test:addr2',
+          Polygon: 'polygon:test:addr3',
+        },
+        targetAllocation: {
+          USDN: 40n,
+          USDNVault: 20n,
+          Aave_Avalanche: 25n,
+          Compound_Polygon: 15n,
+        },
+      };
+    }
+    throw new Error(`Unexpected path: ${path}`);
+  };
+
+  // Mock SpectrumClient with different chain responses
+  class MockSpectrumClient3 extends SpectrumClient {
+    async getPoolBalance(chain: any, pool: any, addr: any) {
+      if (chain === 'avalanche' && pool === 'aave') {
+        return {
+          pool,
+          chain,
+          address: addr,
+          balance: { supplyBalance: 150, borrowAmount: 0 },
+        };
+      }
+      if (chain === 'polygon' && pool === 'compound') {
+        return {
+          pool,
+          chain,
+          address: addr,
+          balance: { supplyBalance: 75, borrowAmount: 0 },
+        };
+      }
+      return {
+        pool,
+        chain,
+        address: addr,
+        balance: { supplyBalance: 0, borrowAmount: 0 },
+      };
+    }
+  }
+  const mockSpectrumClient = new MockSpectrumClient3();
+
+  // Mock CosmosRestClient
+  class MockCosmosRestClient3 extends CosmosRestClient {
+    async getAccountBalance(chainName: string, addr: string, denom: string) {
+      if (chainName === 'noble' && denom === 'usdn') {
+        return { denom, amount: '300' };
+      }
+      return { denom, amount: '0' };
+    }
+  }
+  const mockCosmosRestClient = new MockCosmosRestClient3();
+
+  // Mock VstorageKit
+  const mockVstorageKit: VstorageKit = {
+    readPublished: mockReadPublished,
+  } as VstorageKit;
+
+  try {
+    await handleDeposit(
+      deposit,
+      portfolioKey,
+      mockVstorageKit.readPublished,
+      mockSpectrumClient,
+      mockCosmosRestClient,
+    );
+    t.fail('Expected handleDeposit to throw Error with "moar TODO"');
+  } catch (error) {
+    t.is(error.message, 'moar TODO');
+  }
+});
diff --git a/packages/portfolio-planner/src/plan-deposit.ts b/packages/portfolio-planner/src/plan-deposit.ts
@@ -7,11 +7,10 @@ import {
   planDepositTransfers,
   planTransfer,
 } from '@aglocal/portfolio-contract/tools/portfolio-actors.ts';
-import { VstorageKit } from '@agoric/client-utils';
+import type { VstorageKit } from '@agoric/client-utils';
 import { AmountMath } from '@agoric/ertp/src/amountMath.js';
 import type { Brand, NatAmount } from '@agoric/ertp/src/types.ts';
-import { assert } from '@endo/errors';
-import { X, q } from '@endo/errors';
+import { X, q, assert } from '@endo/errors';
 import type { CosmosRestClient } from './cosmos-rest-client.ts';
 import type { Chain, Pool, SpectrumClient } from './spectrum-client.ts';
 
@@ -32,7 +31,7 @@ export const getCurrentBalances = async (
   cosmosRest: CosmosRestClient,
   brand: Brand<'nat'>,
 ) => {
-  const pq = makePortfolioQuery(portfolioKey, readPublished);
+  const pq = makePortfolioQuery(readPublished, portfolioKey);
   const status = await pq.getPortfolioStatus();
   const balances: Partial<Record<PoolKey, NatAmount>> = {};
 
@@ -48,7 +47,7 @@ export const getCurrentBalances = async (
           addr,
           denom,
         );
-        balances[posKey] = make(brand, amount);
+        balances[posKey] = make(brand, BigInt(amount));
         break;
       }
       case 'Aave':
@@ -84,15 +83,14 @@ export const handleDeposit = async (
     cosmosRest,
     amount.brand,
   );
-  const pq = makePortfolioQuery(portfolioKey, readPublished);
+  const pq = makePortfolioQuery(readPublished, portfolioKey);
   const { targetAllocation } = await pq.getPortfolioStatus();
   if (!targetAllocation) {
     // XXX warn?
     return;
   }
   const txfrs = planDepositTransfers(amount, currentBalances, targetAllocation);
   const steps = [
-    { src: '<Deposit>', dest: '@agoric', amount },
     { src: '@agoric', dest: '@noble', amount },
     ...Object.entries(txfrs)
       // XXX Object.entries() type is goofy
