fixup! feat: integrate advancer in StartFn

Author: 0xpatrickdev

packages/fast-usdc/src/exos/advancer.js

@@ -43,7 +43,7 @@ const AdvancerKitI = harden({
     handleTransactionEvent: M.callWhen(CctpTxEvidenceShape).returns(),
   }),
   depositHandler: M.interface('DepositHandlerI', {
-    onFulfilled: M.call(AmountShape, {
+    onFulfilled: M.call(M.undefined(), {
       amount: AmountShape,
       destination: ChainAddressShape,
       tmpSeat: M.remotable(),

packages/fast-usdc/src/fast-usdc.contract.js

@@ -123,7 +123,7 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
      *
      * @param {{ Principal: Amount<'nat'>; PoolFee: Amount<'nat'>; ContractFee: Amount<'nat'> }} amounts
      * @param {{ Principal: Payment<'nat'>; PoolFee: Payment<'nat'>; ContractFee: Payment<'nat'> }} payments
-     * @returns
+     * @returns {Promise<AmountKeywordRecord>}
      */
     async testRepay(amounts, payments) {
       console.log('🚧🚧 UNTIL: repay is integrated 🚧🚧', amounts);

packages/fast-usdc/test/exos/advancer.test.ts

@@ -56,6 +56,10 @@ const createTestExtensions = (t, common: CommonSetup) => {
   });
 
   const localTransferVK = vowTools.makeVowKit<void>();
+  const resolveLocalTransferV = () => {
+    // pretend funds move from tmpSeat to poolAccount
+    localTransferVK.resolver.resolve();
+  };
   const mockZoeTools = Far('MockZoeTools', {
     localTransfer(...args: Parameters<ZoeTools['localTransfer']>) {
       console.log('ZoeTools.localTransfer called with', args);
@@ -91,7 +95,7 @@ const createTestExtensions = (t, common: CommonSetup) => {
   };
 
   const borrowUnderlyingPK = makePromiseKit<void>();
-  const resolveBorrowUnderlyingP = async () => {
+  const resolveBorrowUnderlyingP = () => {
     // pretend funds are allocated to tmpSeat provided to borrow
     return borrowUnderlyingPK.resolve();
   };
@@ -123,6 +127,7 @@ const createTestExtensions = (t, common: CommonSetup) => {
       setMockPoolBalance,
       resolveBorrowUnderlyingP,
       rejectBorrowUnderlyingP,
+      resolveLocalTransferV,
     },
     services: {
       advancer,
@@ -151,15 +156,20 @@ test('updates status to ADVANCED in happy path', async t => {
     extensions: {
       services: { advancer, statusManager },
       helpers: { inspectLogs },
-      mocks: { mockPoolAccount, resolveBorrowUnderlyingP },
+      mocks: {
+        mockPoolAccount,
+        resolveBorrowUnderlyingP,
+        resolveLocalTransferV,
+      },
     },
     brands: { usdc },
   } = t.context;
 
   const mockEvidence = MockCctpTxEvidences.AGORIC_PLUS_OSMO();
   const handleTxP = advancer.handleTransactionEvent(mockEvidence);
 
-  await resolveBorrowUnderlyingP(usdc.make(mockEvidence.tx.amount));
+  resolveBorrowUnderlyingP();
+  resolveLocalTransferV();
   await eventLoopIteration();
   mockPoolAccount.transferVResolver.resolve();
 
@@ -179,7 +189,7 @@ test('updates status to ADVANCED in happy path', async t => {
 
   t.deepEqual(inspectLogs(0), [
     'Advance transfer fulfilled',
-    '{"amount":{"brand":"[Alleged: USDC brand]","value":"[150000000n]"},"destination":{"chainId":"osmosis-1","encoding":"bech32","value":"osmo183dejcnmkka5dzcu9xw6mywq0p2m5peks28men"},"result":"[undefined]"}',
+    '{"amount":{"brand":"[Alleged: USDC brand]","value":"[149999899n]"},"destination":{"chainId":"osmosis-1","encoding":"bech32","value":"osmo183dejcnmkka5dzcu9xw6mywq0p2m5peks28men"},"result":"[undefined]"}',
   ]);
 });
 
@@ -211,7 +221,7 @@ test('updates status to OBSERVED on insufficient pool funds', async t => {
 
   t.deepEqual(inspectLogs(0), [
     'Insufficient pool funds',
-    'Requested {"brand":"[Alleged: USDC brand]","value":"[195000000n]"} but only have {"brand":"[Alleged: USDC brand]","value":"[1n]"}',
+    'Requested {"brand":"[Alleged: USDC brand]","value":"[199999899n]"} but only have {"brand":"[Alleged: USDC brand]","value":"[1n]"}',
   ]);
 });
 
@@ -290,15 +300,20 @@ test('does not update status on failed transfer', async t => {
     extensions: {
       services: { advancer, statusManager },
       helpers: { inspectLogs },
-      mocks: { mockPoolAccount, resolveBorrowUnderlyingP },
+      mocks: {
+        mockPoolAccount,
+        resolveBorrowUnderlyingP,
+        resolveLocalTransferV,
+      },
     },
     brands: { usdc },
   } = t.context;
 
   const mockEvidence = MockCctpTxEvidences.AGORIC_PLUS_DYDX();
   const handleTxP = advancer.handleTransactionEvent(mockEvidence);
 
-  await resolveBorrowUnderlyingP(usdc.make(mockEvidence.tx.amount));
+  resolveBorrowUnderlyingP();
+  resolveLocalTransferV();
   mockPoolAccount.transferVResolver.reject(new Error('simulated error'));
 
   await handleTxP;
@@ -357,23 +372,27 @@ test('will not advance same txHash:chainId evidence twice', async t => {
     extensions: {
       services: { advancer },
       helpers: { inspectLogs },
-      mocks: { mockPoolAccount, resolveBorrowUnderlyingP },
+      mocks: {
+        mockPoolAccount,
+        resolveBorrowUnderlyingP,
+        resolveLocalTransferV,
+      },
     },
-    brands: { usdc },
   } = t.context;
 
   const mockEvidence = MockCctpTxEvidences.AGORIC_PLUS_OSMO();
 
   // First attempt
   const handleTxP = advancer.handleTransactionEvent(mockEvidence);
-  await resolveBorrowUnderlyingP(usdc.make(mockEvidence.tx.amount));
+  resolveBorrowUnderlyingP();
+  resolveLocalTransferV();
   mockPoolAccount.transferVResolver.resolve();
   await handleTxP;
   await eventLoopIteration();
 
   t.deepEqual(inspectLogs(0), [
     'Advance transfer fulfilled',
-    '{"amount":{"brand":"[Alleged: USDC brand]","value":"[150000000n]"},"destination":{"chainId":"osmosis-1","encoding":"bech32","value":"osmo183dejcnmkka5dzcu9xw6mywq0p2m5peks28men"},"result":"[undefined]"}',
+    '{"amount":{"brand":"[Alleged: USDC brand]","value":"[149999899n]"},"destination":{"chainId":"osmosis-1","encoding":"bech32","value":"osmo183dejcnmkka5dzcu9xw6mywq0p2m5peks28men"},"result":"[undefined]"}',
   ]);
 
   // Second attempt
@@ -384,3 +403,5 @@ test('will not advance same txHash:chainId evidence twice', async t => {
     '"[Error: Transaction already seen: \\"seenTx:[\\\\\\"0xc81bc6105b60a234c7c50ac17816ebcd5561d366df8bf3be59ff387552761702\\\\\\",1]\\"]"',
   ]);
 });
+
+test.todo('zoeTools.localTransfer fails to deposit borrowed USDC to LOA');