feat: CAIP-10 destinations

turadg · Chris-Hibbert · turadg · commit 3c16d474a9d1 · 2025-04-03T15:57:46.000-07:00
Co-Authored-By: Chris Hibbert &lt;Chris-Hibbert@users.noreply.github.com&gt;
diff --git a/packages/fast-usdc-contract/src/exos/advancer.ts b/packages/fast-usdc-contract/src/exos/advancer.ts
@@ -35,6 +35,8 @@ import {
   AnyNatAmountShape,
   CosmosChainAddressShape,
 } from '@agoric/orchestration';
+import type { AccountId } from '@agoric/orchestration/src/orchestration-api.js';
+import { parseAccountIdArg } from '@agoric/orchestration/src/utils/address.js';
 import type { ZoeTools } from '@agoric/orchestration/src/utils/zoe-tools.js';
 import { pickFacet } from '@agoric/vat-data';
 import type { VowTools } from '@agoric/vow';
@@ -63,7 +65,7 @@ interface AdvancerKitPowers {
 interface AdvancerVowCtx {
   fullAmount: NatAmount;
   advanceAmount: NatAmount;
-  destination: CosmosChainAddress;
+  destination: AccountId;
   forwardingAddress: NobleAddress;
   txHash: EvmHash;
 }
@@ -72,7 +74,7 @@ const AdvancerVowCtxShape: TypedPattern<AdvancerVowCtx> = M.splitRecord(
   {
     fullAmount: AnyNatAmountShape,
     advanceAmount: AnyNatAmountShape,
-    destination: CosmosChainAddressShape,
+    destination: M.string(), // AccountId
     forwardingAddress: M.string(),
     txHash: EvmHashShape,
   },
@@ -200,7 +202,7 @@ export const prepareAdvancerKit = (
             log(`decoded EUD: ${EUD}`);
             assert.typeof(EUD, 'string');
             // throws if the bech32 prefix is not found
-            const destination = chainHub.makeChainAddress(EUD);
+            const destination = chainHub.resolveAccountId(EUD);
 
             const fullAmount = toAmount(evidence.tx.amount);
             const { borrower, notifier, poolAccount } = this.state;
@@ -262,8 +264,12 @@ export const prepareAdvancerKit = (
             value: advanceAmount.value,
           });
           const intermediateRecipient = getNobleICA().getAddress();
+          const accountId = parseAccountIdArg(destination);
+
+          assert.equal(accountId.namespace, 'cosmos');
+
           const transferOrSendV =
-            destination.chainId === settlementAddress.chainId
+            accountId.reference === settlementAddress.chainId
               ? E(poolAccount).send(destination, amount)
               : E(poolAccount).transfer(destination, amount, {
                   forwardOpts: { intermediateRecipient },
diff --git a/packages/fast-usdc-contract/src/exos/settler.ts b/packages/fast-usdc-contract/src/exos/settler.ts
@@ -37,7 +37,6 @@ import type {
 import type {
   AccountId,
   ChainHub,
-  CosmosChainAddress,
   Denom,
   OrchestrationAccount,
 } from '@agoric/orchestration';
@@ -112,7 +111,7 @@ const makeMintedEarlyKey = (addr: NobleAddress, amount: bigint): string =>
 /** @param {Brand<'nat'>} USDC */
 export const makeAdvanceDetailsShape = (USDC: Brand<'nat'>) =>
   harden({
-    destination: CosmosChainAddressShape,
+    destination: M.string(),
     forwardingAddress: M.string(),
     fullAmount: makeNatAmountShape(USDC),
     txHash: EvmHashShape,
@@ -184,10 +183,9 @@ export const prepareSettler = (
           makeAdvanceDetailsShape(USDC),
           M.boolean(),
         ).returns(),
-        checkMintedEarly: M.call(
-          CctpTxEvidenceShape,
-          CosmosChainAddressShape,
-        ).returns(M.boolean()),
+        checkMintedEarly: M.call(CctpTxEvidenceShape, M.string()).returns(
+          M.boolean(),
+        ),
       }),
       self: M.interface('SettlerSelfI', {
         addMintedEarly: M.call(M.string(), M.nat()).returns(),
@@ -295,24 +293,21 @@ export const prepareSettler = (
             txHash: EvmHash;
             forwardingAddress: NobleAddress;
             fullAmount: Amount<'nat'>;
-            destination: CosmosChainAddress;
+            destination: AccountId;
           },
           success: boolean,
         ): void {
           const { mintedEarly } = this.state;
           const { value: fullValue } = fullAmount;
           const key = makeMintedEarlyKey(forwardingAddress, fullValue);
+
           if (mintedEarly.has(key)) {
             asMultiset(mintedEarly).remove(key);
             statusManager.advanceOutcomeForMintedEarly(txHash, success);
             if (success) {
               void this.facets.self.disburse(txHash, fullValue);
             } else {
-              void this.facets.self.forward(
-                txHash,
-                fullValue,
-                destination.value,
-              );
+              void this.facets.self.forward(txHash, fullValue, destination);
             }
           } else {
             statusManager.advanceOutcome(forwardingAddress, fullValue, success);
@@ -323,12 +318,12 @@ export const prepareSettler = (
          * funds to the pool.
          *
          * @param {CctpTxEvidence} evidence
-         * @param {CosmosChainAddress} destination
+         * @param {AccountId} destination
          * @returns {boolean} whether the EUD received funds without an advance
          */
         checkMintedEarly(
           evidence: CctpTxEvidence,
-          destination: CosmosChainAddress,
+          destination: AccountId,
         ): boolean {
           const {
             tx: { forwardingAddress, amount },
@@ -344,7 +339,7 @@ export const prepareSettler = (
             );
             asMultiset(mintedEarly).remove(key);
             statusManager.advanceOutcomeForUnknownMint(evidence);
-            void this.facets.self.forward(txHash, amount, destination.value);
+            void this.facets.self.forward(txHash, amount, destination);
             return true;
           }
           return false;
diff --git a/packages/fast-usdc-contract/test/exos/advancer.test.ts b/packages/fast-usdc-contract/test/exos/advancer.test.ts
@@ -139,7 +139,7 @@ const createTestExtensions = (t, common: CommonSetup) => {
     // assume this never returns true for most tests
     checkMintedEarly: (evidence, destination) => {
       mustMatch(harden(evidence), CctpTxEvidenceShape);
-      mustMatch(destination, CosmosChainAddressShape);
+      mustMatch(destination, M.string());
       return false;
     },
   });
@@ -251,11 +251,8 @@ test('updates status to ADVANCING in happy path', async t => {
           brand: usdc.brand,
           value: 146999999n,
         },
-        destination: {
-          chainId: 'osmosis-1',
-          encoding: 'bech32',
-          value: 'osmo183dejcnmkka5dzcu9xw6mywq0p2m5peks28men',
-        },
+        destination:
+          'cosmos:osmosis-1:osmo183dejcnmkka5dzcu9xw6mywq0p2m5peks28men',
       },
     ],
   ]);
@@ -268,9 +265,7 @@ test('updates status to ADVANCING in happy path', async t => {
         txHash: evidence.txHash,
         forwardingAddress: evidence.tx.forwardingAddress,
         fullAmount: usdc.make(evidence.tx.amount),
-        destination: {
-          value: decodeAddressHook(evidence.aux.recipientAddress).query.EUD,
-        },
+        destination: `cosmos:osmosis-1:${decodeAddressHook(evidence.aux.recipientAddress).query.EUD}`,
       },
       true, // indicates transfer succeeded
     ],
@@ -412,9 +407,7 @@ test('recovery behavior if Advance Fails (ADVANCE_FAILED)', async t => {
         txHash: evidence.txHash,
         forwardingAddress: evidence.tx.forwardingAddress,
         fullAmount: usdc.make(evidence.tx.amount),
-        destination: {
-          value: decodeAddressHook(evidence.aux.recipientAddress).query.EUD,
-        },
+        destination: `cosmos:dydx-mainnet-1:${decodeAddressHook(evidence.aux.recipientAddress).query.EUD}`,
       },
       false, // this indicates transfer failed
     ],
@@ -660,11 +653,8 @@ test('will not advance same txHash:chainId evidence twice', async t => {
       'Advance succeeded',
       {
         advanceAmount: { brand: usdc.brand, value: 146999999n },
-        destination: {
-          chainId: 'osmosis-1',
-          encoding: 'bech32',
-          value: 'osmo183dejcnmkka5dzcu9xw6mywq0p2m5peks28men',
-        },
+        destination:
+          'cosmos:osmosis-1:osmo183dejcnmkka5dzcu9xw6mywq0p2m5peks28men',
       },
     ],
   ]);
@@ -913,11 +903,8 @@ test('uses bank send for agoric1 EUD', async t => {
           brand: usdc.brand,
           value: 244999999n,
         },
-        destination: {
-          chainId: 'agoric-3',
-          encoding: 'bech32',
-          value: 'agoric13rj0cc0hm5ac2nt0sdup2l7gvkx4v9tyvgq3h2',
-        },
+        destination:
+          'cosmos:agoric-3:agoric13rj0cc0hm5ac2nt0sdup2l7gvkx4v9tyvgq3h2',
       },
     ],
   ]);
@@ -929,9 +916,7 @@ test('uses bank send for agoric1 EUD', async t => {
         txHash: evidence.txHash,
         forwardingAddress: evidence.tx.forwardingAddress,
         fullAmount: usdc.make(evidence.tx.amount),
-        destination: {
-          value: decodeAddressHook(evidence.aux.recipientAddress).query.EUD,
-        },
+        destination: `cosmos:agoric-3:${decodeAddressHook(evidence.aux.recipientAddress).query.EUD}`,
       },
       true, // indicates send succeeded
     ],
@@ -970,9 +955,7 @@ test('notifies of advance failure if bank send fails', async t => {
         txHash: evidence.txHash,
         forwardingAddress: evidence.tx.forwardingAddress,
         fullAmount: usdc.make(evidence.tx.amount),
-        destination: {
-          value: decodeAddressHook(evidence.aux.recipientAddress).query.EUD,
-        },
+        destination: `cosmos:agoric-3:${decodeAddressHook(evidence.aux.recipientAddress).query.EUD}`,
       },
       false, // indicates send failed
     ],
diff --git a/packages/fast-usdc-contract/test/exos/settler.test.ts b/packages/fast-usdc-contract/test/exos/settler.test.ts
@@ -23,14 +23,14 @@ import type { Baggage } from '@agoric/vat-data';
 import cctpChainInfo from '@agoric/orchestration/src/cctp-chain-info.js';
 import {
   prepareSettler,
-  stateShape,
   type SettlerKit,
+  stateShape,
 } from '../../src/exos/settler.ts';
 import { prepareStatusManager } from '../../src/exos/status-manager.ts';
 import {
+  intermediateRecipient,
   MockCctpTxEvidences,
   MockVTransferEvents,
-  intermediateRecipient,
 } from '../fixtures.js';
 import { makeTestLogger, prepareMockOrchAccounts } from '../mocks.js';
 import { commonSetup } from '../supports.js';
@@ -137,12 +137,11 @@ const makeTestContext = async t => {
       if (typeof EUD !== 'string') {
         throw Error(`EUD not found in ${recipientAddress}`);
       }
-      const destination = chainHub.makeChainAddress(EUD);
       return harden({
         txHash,
         forwardingAddress,
         fullAmount: usdc.make(amount),
-        destination,
+        destination: chainHub.resolveAccountId(EUD),
       });
     };
 
@@ -515,7 +514,7 @@ test('Settlement for unknown transaction (minted early)', async t => {
       'forwarding',
       150000000n,
       'to',
-      'osmo183dejcnmkka5dzcu9xw6mywq0p2m5peks28men',
+      'cosmos:osmosis-1:osmo183dejcnmkka5dzcu9xw6mywq0p2m5peks28men',
       'for',
       '0xc81bc6105b60a234c7c50ac17816ebcd5561d366df8bf3be59ff387552761702',
     ],
