@agoric/fast-usdc 0.1.1-dev-fbae24c.0 → 0.1.1-dev-bdf5c17.0

package/package.json

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

package/src/cli/lp-commands.js

@@ -1,3 +1,4 @@
+/* eslint-env node */
 /**
  * @import {Command} from 'commander';
  * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
@@ -5,17 +6,22 @@
  * @import {USDCProposalShapes} from '../pool-share-math.js';
  */
 
-import { fetchEnvNetworkConfig, makeVstorageKit } from '@agoric/client-utils';
-import { InvalidArgumentError } from 'commander';
+import {
+  fetchEnvNetworkConfig,
+  makeSmartWalletKit,
+} from '@agoric/client-utils';
+import { AmountMath } from '@agoric/ertp';
 import {
   assertParsableNumber,
   ceilDivideBy,
   multiplyBy,
   parseRatio,
 } from '@agoric/zoe/src/contractSupport/ratio.js';
-import { AmountMath } from '@agoric/ertp';
+import { InvalidArgumentError } from 'commander';
 import { outputActionAndHint } from './bridge-action.js';
 
+export const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
+
 /** @param {string} arg */
 const parseDecimal = arg => {
   try {
@@ -41,7 +47,7 @@ const parseUSDCAmount = (amountString, usdc) => {
  * @param {Command} program
  * @param {{
  *   fetch?: Window['fetch'];
- *   vstorageKit?: Awaited<ReturnType<typeof makeVstorageKit>>;
+ *    smartWalletKit?: import('@agoric/client-utils').SmartWalletKit;
  *   stdout: typeof process.stdout;
  *   stderr: typeof process.stderr;
  *   env: typeof process.env;
@@ -50,18 +56,18 @@ const parseUSDCAmount = (amountString, usdc) => {
  */
 export const addLPCommands = (
   program,
-  { fetch, vstorageKit, stderr, stdout, env, now },
+  { fetch, smartWalletKit, stderr, stdout, env, now },
 ) => {
-  const loadVsk = async () => {
-    if (vstorageKit) {
-      return vstorageKit;
+  const loadSwk = async () => {
+    if (smartWalletKit) {
+      return smartWalletKit;
     }
     assert(fetch);
     const networkConfig = await fetchEnvNetworkConfig({ env, fetch });
-    return makeVstorageKit({ fetch }, networkConfig);
+    return makeSmartWalletKit({ delay, fetch }, networkConfig);
   };
-  /** @type {undefined | ReturnType<typeof loadVsk>} */
-  let vskP;
+  /** @type {undefined | ReturnType<typeof loadSwk>} */
+  let swkP;
 
   program
     .command('deposit')
@@ -73,11 +79,11 @@ export const addLPCommands = (
     .requiredOption('--amount <number>', 'USDC amount', parseDecimal)
     .option('--offerId <string>', 'Offer id', String, `lpDeposit-${now()}`)
     .action(async opts => {
-      vskP ||= loadVsk();
-      const vsk = await vskP;
+      swkP ||= loadSwk();
+      const swk = await swkP;
       /** @type {Brand<'nat'>} */
       // @ts-expect-error it doesnt recognize usdc as a Brand type
-      const usdc = vsk.agoricNames.brand.USDC;
+      const usdc = swk.agoricNames.brand.USDC;
       assert(usdc, 'USDC brand not in agoricNames');
 
       const usdcAmount = parseUSDCAmount(opts.amount, usdc);
@@ -106,7 +112,7 @@ export const addLPCommands = (
         offer,
       };
 
-      outputActionAndHint(bridgeAction, { stderr, stdout }, vsk.marshaller);
+      outputActionAndHint(bridgeAction, { stderr, stdout }, swk.marshaller);
     });
 
   program
@@ -119,24 +125,25 @@ export const addLPCommands = (
     .requiredOption('--amount <number>', 'USDC amount', parseDecimal)
     .option('--offerId <string>', 'Offer id', String, `lpWithdraw-${now()}`)
     .action(async opts => {
-      vskP ||= loadVsk();
-      const vsk = await vskP;
+      swkP ||= loadSwk();
+      swkP ||= loadSwk();
+      const swk = await swkP;
 
       /** @type {Brand<'nat'>} */
       // @ts-expect-error it doesnt recognize FastLP as a Brand type
-      const poolShare = vsk.agoricNames.brand.FastLP;
+      const poolShare = swk.agoricNames.brand.FastLP;
       assert(poolShare, 'FastLP brand not in agoricNames');
 
       /** @type {Brand<'nat'>} */
       // @ts-expect-error it doesnt recognize usdc as a Brand type
-      const usdc = vsk.agoricNames.brand.USDC;
+      const usdc = swk.agoricNames.brand.USDC;
       assert(usdc, 'USDC brand not in agoricNames');
 
       const usdcAmount = parseUSDCAmount(opts.amount, usdc);
 
       /** @type {import('../types.js').PoolMetrics} */
       // @ts-expect-error it treats this as "unknown"
-      const metrics = await vsk.readPublished('fastUsdc.poolMetrics');
+      const metrics = await swk.readPublished('fastUsdc.poolMetrics');
       const fastLPAmount = ceilDivideBy(usdcAmount, metrics.shareWorth);
 
       /** @type {USDCProposalShapes['withdraw']} */
@@ -163,7 +170,7 @@ export const addLPCommands = (
       outputActionAndHint(
         { method: 'executeOffer', offer },
         { stderr, stdout },
-        vsk.marshaller,
+        swk.marshaller,
       );
     });
 

package/src/cli/operator-commands.js

@@ -1,3 +1,4 @@
+/* eslint-env node */
 /**
  * @import {Command} from 'commander';
  * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
@@ -5,7 +6,10 @@
  * @import {OperatorKit} from '../exos/operator-kit.js';
  */
 
-import { fetchEnvNetworkConfig, makeVstorageKit } from '@agoric/client-utils';
+import {
+  fetchEnvNetworkConfig,
+  makeSmartWalletKit,
+} from '@agoric/client-utils';
 import { mustMatch } from '@agoric/internal';
 import { Nat } from '@endo/nat';
 import { InvalidArgumentError } from 'commander';
@@ -13,6 +17,8 @@ import { INVITATION_MAKERS_DESC } from '../exos/transaction-feed.js';
 import { CctpTxEvidenceShape } from '../type-guards.js';
 import { outputActionAndHint } from './bridge-action.js';
 
+export const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
+
 /** @param {string} arg */
 const parseNat = arg => {
   const n = Nat(BigInt(arg));
@@ -53,8 +59,9 @@ export const addOperatorCommands = (
     .option('--offerId <string>', 'Offer id', String, `operatorAccept-${now()}`)
     .action(async opts => {
       const networkConfig = await fetchEnvNetworkConfig({ env, fetch });
-      const vsk = await makeVstorageKit({ fetch }, networkConfig);
-      const instance = vsk.agoricNames.instance.fastUsdc;
+
+      const swk = await makeSmartWalletKit({ delay, fetch }, networkConfig);
+      const instance = swk.agoricNames.instance.fastUsdc;
       assert(instance, 'fastUsdc instance not in agoricNames');
 
       /** @type {OfferSpec} */

package/src/type-guards.js

@@ -94,16 +94,13 @@ export const PoolMetricsShape = {
 harden(PoolMetricsShape);
 
 /** @type {TypedPattern<ChainPolicy>} */
-export const ChainPoliciesShape = M.splitRecord(
-  {
-    nobleContractAddress: EvmHashShape,
-    cctpTokenMessengerAddress: EvmHashShape,
-    confirmations: M.number(),
-    chainId: M.number(),
-  },
-  { chainType: M.number() },
-);
-harden(ChainPoliciesShape);
+export const ChainPolicyShape = {
+  attenuatedCttpBridgeAddress: EvmHashShape,
+  cctpTokenMessengerAddress: EvmHashShape,
+  confirmations: M.number(),
+  chainId: M.number(),
+};
+harden(ChainPolicyShape);
 
 /**
  * @type {TypedPattern<FeedPolicy>}
@@ -115,7 +112,7 @@ export const FeedPolicyShape = M.splitRecord(
   {
     nobleDomainId: M.number(),
     nobleAgoricChannelId: M.string(),
-    chainPolicies: M.recordOf(M.string(), ChainPoliciesShape),
+    chainPolicies: M.recordOf(M.string(), ChainPolicyShape),
   },
   { eventFilter: M.string() },
 );

package/src/types.ts

@@ -58,11 +58,14 @@ export interface PoolMetrics extends PoolStats {
 }
 
 export interface ChainPolicy {
-  nobleContractAddress: EvmHash;
+  /** `msg.sender` of DepositAndBurn to TokenMessenger must be an attenuated wrapper contract that does not contain `replaceDepositForBurn` */
+  attenuatedCttpBridgeAddress: EvmHash;
+  /** @see {@link https://developers.circle.com/stablecoins/evm-smart-contracts} */
   cctpTokenMessengerAddress: EvmHash;
-  confirmations: number;
+  /** e.g., `1` for ETH mainnet 42161 for Arbitrum One. @see {@link https://chainlist.org/} */
   chainId: EvmChainID;
-  chainType?: number;
+  /** the number of block confirmations to observe before reporting */
+  confirmations: number;
 }
 
 export interface FeedPolicy {

package/src/utils/deploy-config.js

@@ -64,11 +64,12 @@ export const configurations = {
       nobleDomainId: 4,
       chainPolicies: {
         Arbitrum: {
+          attenuatedCttpBridgeAddress:
+            '0xe298b93ffB5eA1FB628e0C0D55A43aeaC268e347',
           cctpTokenMessengerAddress:
             '0x19330d10D9Cc8751218eaf51E8885D058642E08A',
           chainId: 42161,
           confirmations: 2,
-          nobleContractAddress: '0x19330d10D9Cc8751218eaf51E8885D058642E08A',
         },
       },
     },
@@ -92,11 +93,12 @@ export const configurations = {
       nobleDomainId: 4,
       chainPolicies: {
         Arbitrum: {
+          attenuatedCttpBridgeAddress:
+            '0xe298b93ffB5eA1FB628e0C0D55A43aeaC268e347',
           cctpTokenMessengerAddress:
             '0x19330d10D9Cc8751218eaf51E8885D058642E08A',
           chainId: 42161,
           confirmations: 2,
-          nobleContractAddress: '0x19330d10D9Cc8751218eaf51E8885D058642E08A',
         },
       },
     },
@@ -118,10 +120,10 @@ export const configurations = {
       nobleDomainId: 4,
       chainPolicies: {
         Arbitrum: {
+          attenuatedCttpBridgeAddress: '0xTODO',
           cctpTokenMessengerAddress: '0xTODO',
           chainId: 421614,
           confirmations: 2,
-          nobleContractAddress: '0xTODO',
         },
       },
     },
@@ -140,10 +142,10 @@ export const configurations = {
       nobleDomainId: 4,
       chainPolicies: {
         Arbitrum: {
+          attenuatedCttpBridgeAddress: '0xTODO',
           cctpTokenMessengerAddress: '0xTODO',
           chainId: 421614,
           confirmations: 2,
-          nobleContractAddress: '0xTODO',
         },
       },
     },