@agoric/fast-usdc 0.1.1-dev-252b405.0 → 0.1.1-dev-4e588de.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/fast-usdc",
-  "version": "0.1.1-dev-252b405.0+252b405",
+  "version": "0.1.1-dev-4e588de.0+4e588de",
   "description": "CLI and library for Fast USDC product",
   "type": "module",
   "files": [
@@ -23,9 +23,9 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-252b405.0+252b405",
-    "@agoric/vats": "0.15.2-dev-252b405.0+252b405",
-    "@agoric/zone": "0.2.3-dev-252b405.0+252b405",
+    "@agoric/swingset-liveslots": "0.10.3-dev-4e588de.0+4e588de",
+    "@agoric/vats": "0.15.2-dev-4e588de.0+4e588de",
+    "@agoric/zone": "0.2.3-dev-4e588de.0+4e588de",
     "@fast-check/ava": "^2.0.1",
     "ava": "^5.3.0",
     "c8": "^10.1.2",
@@ -33,16 +33,16 @@
     "ts-blank-space": "^0.4.4"
   },
   "dependencies": {
-    "@agoric/client-utils": "0.1.1-dev-252b405.0+252b405",
-    "@agoric/cosmic-proto": "0.4.1-dev-252b405.0+252b405",
-    "@agoric/ertp": "0.16.3-dev-252b405.0+252b405",
-    "@agoric/internal": "0.3.3-dev-252b405.0+252b405",
-    "@agoric/notifier": "0.6.3-dev-252b405.0+252b405",
-    "@agoric/orchestration": "0.1.1-dev-252b405.0+252b405",
-    "@agoric/store": "0.9.3-dev-252b405.0+252b405",
-    "@agoric/vat-data": "0.5.3-dev-252b405.0+252b405",
-    "@agoric/vow": "0.1.1-dev-252b405.0+252b405",
-    "@agoric/zoe": "0.26.3-dev-252b405.0+252b405",
+    "@agoric/client-utils": "0.1.1-dev-4e588de.0+4e588de",
+    "@agoric/cosmic-proto": "0.4.1-dev-4e588de.0+4e588de",
+    "@agoric/ertp": "0.16.3-dev-4e588de.0+4e588de",
+    "@agoric/internal": "0.3.3-dev-4e588de.0+4e588de",
+    "@agoric/notifier": "0.6.3-dev-4e588de.0+4e588de",
+    "@agoric/orchestration": "0.1.1-dev-4e588de.0+4e588de",
+    "@agoric/store": "0.9.3-dev-4e588de.0+4e588de",
+    "@agoric/vat-data": "0.5.3-dev-4e588de.0+4e588de",
+    "@agoric/vow": "0.1.1-dev-4e588de.0+4e588de",
+    "@agoric/zoe": "0.26.3-dev-4e588de.0+4e588de",
     "@cosmjs/proto-signing": "^0.32.4",
     "@cosmjs/stargate": "^0.32.4",
     "@endo/base64": "^1.0.9",
@@ -82,5 +82,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "252b4054be4a8c370de004486ab0159eb28169d1"
+  "gitHead": "4e588deeeee83704a5de69f3914ded0605dc1dc0"
 }

package/src/exos/advancer.js

@@ -1,7 +1,10 @@
 import { decodeAddressHook } from '@agoric/cosmic-proto/address-hooks.js';
 import { AmountMath } from '@agoric/ertp';
 import { assertAllDefined, makeTracer } from '@agoric/internal';
-import { AnyNatAmountShape, ChainAddressShape } from '@agoric/orchestration';
+import {
+  AnyNatAmountShape,
+  CosmosChainAddressShape,
+} from '@agoric/orchestration';
 import { pickFacet } from '@agoric/vat-data';
 import { VowShape } from '@agoric/vow';
 import { E } from '@endo/far';
@@ -19,7 +22,7 @@ import { makeFeeTools } from '../utils/fees.js';
  * @import {Amount, Brand} from '@agoric/ertp';
  * @import {TypedPattern} from '@agoric/internal'
  * @import {NatAmount} from '@agoric/ertp';
- * @import {ChainAddress, ChainHub, Denom, OrchestrationAccount} from '@agoric/orchestration';
+ * @import {CosmosChainAddress, ChainHub, Denom, OrchestrationAccount} from '@agoric/orchestration';
  * @import {ZoeTools} from '@agoric/orchestration/src/utils/zoe-tools.js';
  * @import {VowTools} from '@agoric/vow';
  * @import {Zone} from '@agoric/zone';
@@ -46,7 +49,7 @@ const AdvancerVowCtxShape = M.splitRecord(
   {
     fullAmount: AnyNatAmountShape,
     advanceAmount: AnyNatAmountShape,
-    destination: ChainAddressShape,
+    destination: CosmosChainAddressShape,
     forwardingAddress: M.string(),
     txHash: EvmHashShape,
   },
@@ -57,7 +60,7 @@ const AdvancerVowCtxShape = M.splitRecord(
 const AdvancerKitI = harden({
   advancer: M.interface('AdvancerI', {
     handleTransactionEvent: M.callWhen(EvidenceWithRiskShape).returns(),
-    setIntermediateRecipient: M.call(ChainAddressShape).returns(),
+    setIntermediateRecipient: M.call(CosmosChainAddressShape).returns(),
   }),
   depositHandler: M.interface('DepositHandlerI', {
     onFulfilled: M.call(M.undefined(), AdvancerVowCtxShape).returns(VowShape),
@@ -85,7 +88,7 @@ const AdvancerKitI = harden({
  * @typedef {{
  *  fullAmount: NatAmount;
  *  advanceAmount: NatAmount;
- *  destination: ChainAddress;
+ *  destination: CosmosChainAddress;
  *  forwardingAddress: NobleAddress;
  *  txHash: EvmHash;
  * }} AdvancerVowCtx
@@ -95,8 +98,8 @@ export const stateShape = harden({
   notifier: M.remotable(),
   borrower: M.remotable(),
   poolAccount: M.remotable(),
-  intermediateRecipient: M.opt(ChainAddressShape),
-  settlementAddress: M.opt(ChainAddressShape),
+  intermediateRecipient: M.opt(CosmosChainAddressShape),
+  settlementAddress: M.opt(CosmosChainAddressShape),
 });
 
 /**
@@ -135,8 +138,8 @@ export const prepareAdvancerKit = (
      *   notifier: import('./settler.js').SettlerKit['notifier'];
      *   borrower: LiquidityPoolKit['borrower'];
      *   poolAccount: HostInterface<OrchestrationAccount<{chainId: 'agoric'}>>;
-     *   settlementAddress: ChainAddress;
-     *   intermediateRecipient?: ChainAddress;
+     *   settlementAddress: CosmosChainAddress;
+     *   intermediateRecipient?: CosmosChainAddress;
      * }} config
      */
     config =>
@@ -177,8 +180,9 @@ export const prepareAdvancerKit = (
             if (decoded.baseAddress !== settlementAddress.value) {
               throw Fail`⚠️ baseAddress of address hook ${q(decoded.baseAddress)} does not match the expected address ${q(settlementAddress.value)}`;
             }
-            const { EUD } = /** @type {AddressHook['query']} */ (decoded.query);
+            const { EUD } = decoded.query;
             log(`decoded EUD: ${EUD}`);
+            assert.typeof(EUD, 'string');
             // throws if the bech32 prefix is not found
             const destination = chainHub.makeChainAddress(EUD);
 
@@ -220,7 +224,7 @@ export const prepareAdvancerKit = (
             statusManager.skipAdvance(evidence, [error.message]);
           }
         },
-        /** @param {ChainAddress} intermediateRecipient */
+        /** @param {CosmosChainAddress} intermediateRecipient */
         setIntermediateRecipient(intermediateRecipient) {
           this.state.intermediateRecipient = intermediateRecipient;
         },

package/src/exos/settler.js

@@ -1,6 +1,6 @@
 import { AmountMath } from '@agoric/ertp';
 import { assertAllDefined, makeTracer } from '@agoric/internal';
-import { ChainAddressShape } from '@agoric/orchestration';
+import { CosmosChainAddressShape } from '@agoric/orchestration';
 import { atob } from '@endo/base64';
 import { E } from '@endo/far';
 import { M } from '@endo/patterns';
@@ -17,7 +17,7 @@ import {
 /**
  * @import {FungibleTokenPacketData} from '@agoric/cosmic-proto/ibc/applications/transfer/v2/packet.js';
  * @import {Amount, Brand, NatValue, Payment} from '@agoric/ertp';
- * @import {Denom, OrchestrationAccount, ChainHub, ChainAddress} from '@agoric/orchestration';
+ * @import {AccountId, Denom, OrchestrationAccount, ChainHub, CosmosChainAddress} from '@agoric/orchestration';
  * @import {WithdrawToSeat} from '@agoric/orchestration/src/utils/zoe-tools'
  * @import {IBCChannelID, IBCPacket, VTransferIBCEvent} from '@agoric/vats';
  * @import {Zone} from '@agoric/zone';
@@ -86,7 +86,7 @@ const makeMintedEarlyKey = (addr, amount) =>
 /** @param {Brand<'nat'>} USDC */
 export const makeAdvanceDetailsShape = USDC =>
   harden({
-    destination: ChainAddressShape,
+    destination: CosmosChainAddressShape,
     forwardingAddress: M.string(),
     fullAmount: makeNatAmountShape(USDC),
     txHash: EvmHashShape,
@@ -99,7 +99,7 @@ export const stateShape = harden({
   sourceChannel: M.string(),
   remoteDenom: M.string(),
   mintedEarly: M.remotable('mintedEarly'),
-  intermediateRecipient: M.opt(ChainAddressShape),
+  intermediateRecipient: M.opt(CosmosChainAddressShape),
 });
 
 /**
@@ -133,7 +133,7 @@ export const prepareSettler = (
     {
       creator: M.interface('SettlerCreatorI', {
         monitorMintingDeposits: M.callWhen().returns(M.any()),
-        setIntermediateRecipient: M.call(ChainAddressShape).returns(),
+        setIntermediateRecipient: M.call(CosmosChainAddressShape).returns(),
       }),
       tap: M.interface('SettlerTapI', {
         receiveUpcall: M.call(M.record()).returns(M.promise()),
@@ -145,7 +145,7 @@ export const prepareSettler = (
         ).returns(),
         checkMintedEarly: M.call(
           CctpTxEvidenceShape,
-          ChainAddressShape,
+          CosmosChainAddressShape,
         ).returns(M.boolean()),
       }),
       self: M.interface('SettlerSelfI', {
@@ -163,7 +163,7 @@ export const prepareSettler = (
      *   remoteDenom: Denom;
      *   repayer: LiquidityPoolKit['repayer'];
      *   settlementAccount: HostInterface<OrchestrationAccount<{ chainId: 'agoric' }>>
-     *   intermediateRecipient?: ChainAddress;
+     *   intermediateRecipient?: CosmosChainAddress;
      * }} config
      */
     config => {
@@ -188,7 +188,7 @@ export const prepareSettler = (
           assert.typeof(registration, 'object');
           this.state.registration = registration;
         },
-        /** @param {ChainAddress} intermediateRecipient */
+        /** @param {CosmosChainAddress} intermediateRecipient */
         setIntermediateRecipient(intermediateRecipient) {
           this.state.intermediateRecipient = intermediateRecipient;
         },
@@ -244,7 +244,7 @@ export const prepareSettler = (
          * @param {EvmHash} ctx.txHash
          * @param {NobleAddress} ctx.forwardingAddress
          * @param {Amount<'nat'>} ctx.fullAmount
-         * @param {ChainAddress} ctx.destination
+         * @param {CosmosChainAddress} ctx.destination
          * @param {boolean} success
          * @returns {void}
          */
@@ -273,7 +273,7 @@ export const prepareSettler = (
         },
         /**
          * @param {CctpTxEvidence} evidence
-         * @param {ChainAddress} destination
+         * @param {CosmosChainAddress} destination
          * @returns {boolean}
          * @throws {Error} if minted early, so advancer doesn't advance
          */
@@ -340,9 +340,10 @@ export const prepareSettler = (
         forward(txHash, fullValue, EUD) {
           const { settlementAccount, intermediateRecipient } = this.state;
 
+          /** @type {AccountId | null} */
           const dest = (() => {
             try {
-              return chainHub.makeChainAddress(EUD);
+              return chainHub.resolveAccountId(EUD);
             } catch (e) {
               log('⚠️ forward transfer failed!', e, txHash);
               statusManager.forwarded(txHash, false);

package/src/fast-usdc.contract.js

@@ -31,7 +31,7 @@ const ADDRESSES_BAGGAGE_KEY = 'addresses';
 
 /**
  * @import {HostInterface} from '@agoric/async-flow';
- * @import {ChainAddress, CosmosChainInfo, Denom, DenomDetail, OrchestrationAccount} from '@agoric/orchestration';
+ * @import {CosmosChainAddress, CosmosChainInfo, Denom, DenomDetail, OrchestrationAccount} from '@agoric/orchestration';
  * @import {OrchestrationPowers, OrchestrationTools} from '@agoric/orchestration/src/utils/start-helper.js';
  * @import {Remote} from '@agoric/internal';
  * @import {Marshaller, StorageNode} from '@agoric/internal/src/lib-chainStorage.js'

package/src/types.ts

@@ -1,5 +1,7 @@
 import type {
-  ChainAddress,
+  AccountId,
+  CosmosChainAddress,
+  Bech32Address,
   CosmosChainInfo,
   Denom,
   DenomDetail,
@@ -11,7 +13,15 @@ import type { PendingTxStatus, TxStatus } from './constants.js';
 import type { FastUsdcTerms } from './fast-usdc.contract.js';
 import type { RepayAmountKWR } from './exos/liquidity-pool.js';
 
+/**
+ * Block hash is calculated using the keccak256 algorithm that always results
+ * in 32 bytes (64 hex characters prepended by 0x) no matter the input length.
+ */
 export type EvmHash = `0x${string}`;
+/**
+ * An address is always the last 20 bytes (40 hex charaters prepended by 0x) of
+ * the public key hash.
+ */
 export type EvmAddress = `0x${string & { length: 40 }}`;
 export type NobleAddress = `noble1${string}`;
 export type EvmChainID = number;
@@ -25,7 +35,7 @@ export interface CctpTxEvidence {
   /** from Noble RPC */
   aux: {
     forwardingChannel: IBCChannelID;
-    recipientAddress: ChainAddress['value'];
+    recipientAddress: CosmosChainAddress['value'];
   };
   /** on the source chain (e.g. L1 Ethereum and L2s Arbitrum, Base) */
   blockHash: EvmHash;
@@ -70,8 +80,8 @@ export interface TransactionRecord extends CopyRecord {
 
 /** the record in vstorage at the path of the contract's node */
 export interface ContractRecord extends CopyRecord {
-  poolAccount: ChainAddress['value'];
-  settlementAccount: ChainAddress['value'];
+  poolAccount: CosmosChainAddress['value'];
+  settlementAccount: CosmosChainAddress['value'];
 }
 
 export type LogFn = (...args: unknown[]) => void;
@@ -142,7 +152,7 @@ export type AddressHook = {
   baseAddress: string;
   query: {
     /** end user destination address */
-    EUD: string;
+    EUD: Bech32Address;
   };
 };