@agoric/fast-usdc 0.1.1-dev-9e5f628.0 → 0.1.1-dev-6fbd20a.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/fast-usdc",
-  "version": "0.1.1-dev-9e5f628.0+9e5f628",
+  "version": "0.1.1-dev-6fbd20a.0+6fbd20a",
   "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-9e5f628.0+9e5f628",
-    "@agoric/vats": "0.15.2-dev-9e5f628.0+9e5f628",
-    "@agoric/zone": "0.2.3-dev-9e5f628.0+9e5f628",
+    "@agoric/swingset-liveslots": "0.10.3-dev-6fbd20a.0+6fbd20a",
+    "@agoric/vats": "0.15.2-dev-6fbd20a.0+6fbd20a",
+    "@agoric/zone": "0.2.3-dev-6fbd20a.0+6fbd20a",
     "@fast-check/ava": "^2.0.1",
     "ava": "^5.3.0",
     "c8": "^10.1.2",
@@ -32,16 +32,16 @@
     "ts-blank-space": "^0.4.4"
   },
   "dependencies": {
-    "@agoric/client-utils": "0.1.1-dev-9e5f628.0+9e5f628",
-    "@agoric/cosmic-proto": "0.4.1-dev-9e5f628.0+9e5f628",
-    "@agoric/ertp": "0.16.3-dev-9e5f628.0+9e5f628",
-    "@agoric/internal": "0.3.3-dev-9e5f628.0+9e5f628",
-    "@agoric/notifier": "0.6.3-dev-9e5f628.0+9e5f628",
-    "@agoric/orchestration": "0.1.1-dev-9e5f628.0+9e5f628",
-    "@agoric/store": "0.9.3-dev-9e5f628.0+9e5f628",
-    "@agoric/vat-data": "0.5.3-dev-9e5f628.0+9e5f628",
-    "@agoric/vow": "0.1.1-dev-9e5f628.0+9e5f628",
-    "@agoric/zoe": "0.26.3-dev-9e5f628.0+9e5f628",
+    "@agoric/client-utils": "0.1.1-dev-6fbd20a.0+6fbd20a",
+    "@agoric/cosmic-proto": "0.4.1-dev-6fbd20a.0+6fbd20a",
+    "@agoric/ertp": "0.16.3-dev-6fbd20a.0+6fbd20a",
+    "@agoric/internal": "0.3.3-dev-6fbd20a.0+6fbd20a",
+    "@agoric/notifier": "0.6.3-dev-6fbd20a.0+6fbd20a",
+    "@agoric/orchestration": "0.1.1-dev-6fbd20a.0+6fbd20a",
+    "@agoric/store": "0.9.3-dev-6fbd20a.0+6fbd20a",
+    "@agoric/vat-data": "0.5.3-dev-6fbd20a.0+6fbd20a",
+    "@agoric/vow": "0.1.1-dev-6fbd20a.0+6fbd20a",
+    "@agoric/zoe": "0.26.3-dev-6fbd20a.0+6fbd20a",
     "@cosmjs/proto-signing": "^0.32.4",
     "@cosmjs/stargate": "^0.32.4",
     "@endo/base64": "^1.0.9",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9e5f628a3d953539bcea5e3ba2365367158ec069"
+  "gitHead": "6fbd20a0d6b8342a0f607960da5b5b6550c29fa8"
 }

package/src/cli/cli.js

@@ -91,7 +91,12 @@ export const initProgram = (
         /** @type {string} */ amount,
         /** @type {string} */ destination,
       ) => {
+        const start = now();
         await transferHelpers.transfer(makeConfigFile(), amount, destination);
+        const duration = now() - start;
+        stdout.write(
+          `Transfer finished in ${(duration / 1000).toFixed(1)} seconds`,
+        );
       },
     );
 

package/src/cli/config.js

@@ -1,6 +1,14 @@
 import * as readline from 'node:readline/promises';
 import { stdin as input, stdout as output } from 'node:process';
 
+/**
+   @typedef {{
+    bech32Prefix: string,
+    api: string,
+    USDCDenom: string
+  }} DestinationChain
+ */
+
 /**
    @typedef {{
     nobleSeed: string,
@@ -11,6 +19,7 @@ import { stdin as input, stdout as output } from 'node:process';
     ethRpc: string,
     tokenMessengerAddress: string,
     tokenAddress: string
+    destinationChains?: DestinationChain[]
   }} ConfigOpts
  */
 

package/src/cli/transfer.js

@@ -14,6 +14,7 @@ import {
   queryForwardingAccount,
   registerFwdAccount,
 } from '../util/noble.js';
+import { queryUSDCBalance } from '../util/bank.js';
 
 /** @import { File } from '../util/file' */
 /** @import { VStorage } from '@agoric/client-utils' */
@@ -30,6 +31,7 @@ const transfer = async (
   /** @type {{signer: SigningStargateClient, address: string} | undefined} */ nobleSigner,
   /** @type {ethProvider | undefined} */ ethProvider,
   env = process.env,
+  setTimeout = globalThis.setTimeout,
 ) => {
   const execute = async (
     /** @type {import('./config').ConfigOpts} */ config,
@@ -71,6 +73,18 @@ const transfer = async (
       }
     }
 
+    const destChain = config.destinationChains?.find(chain =>
+      EUD.startsWith(chain.bech32Prefix),
+    );
+    if (!destChain) {
+      out.error(
+        `No destination chain found in config with matching bech32 prefix for ${EUD}, cannot query destination address`,
+      );
+      throw new Error();
+    }
+    const { api, USDCDenom } = destChain;
+    const startingBalance = await queryUSDCBalance(EUD, api, USDCDenom, fetch);
+
     ethProvider ||= makeProvider(config.ethRpc);
     await depositForBurn(
       ethProvider,
@@ -81,6 +95,34 @@ const transfer = async (
       amount,
       out,
     );
+
+    const refreshDelayMS = 1200;
+    const completeP = /** @type {Promise<void>} */ (
+      new Promise((res, rej) => {
+        const refreshUSDCBalance = async () => {
+          out.log('polling usdc balance');
+          const currentBalance = await queryUSDCBalance(
+            EUD,
+            api,
+            USDCDenom,
+            fetch,
+          );
+          if (currentBalance !== startingBalance) {
+            res();
+          } else {
+            setTimeout(() => refreshUSDCBalance().catch(rej), refreshDelayMS);
+          }
+        };
+        refreshUSDCBalance().catch(rej);
+      })
+    ).catch(e => {
+      out.error(
+        'Error checking destination address balance, could not detect completion of transfer.',
+      );
+      out.error(e.message);
+    });
+
+    await completeP;
   };
 
   let config;

package/src/util/bank.js

@@ -0,0 +1,12 @@
+export const queryUSDCBalance = async (
+  /** @type {string} */ address,
+  /** @type {string} */ api,
+  /** @type {string} */ denom,
+  /** @type {typeof globalThis.fetch} */ fetch,
+) => {
+  const query = `${api}/cosmos/bank/v1beta1/balances/${address}`;
+  const json = await fetch(query).then(res => res.json());
+  const amount = json.balances?.find(b => b.denom === denom)?.amount ?? '0';
+
+  return BigInt(amount);
+};

package/src/util/cctp.js

@@ -67,5 +67,5 @@ export const depositForBurn = async (
 
   out.log('Transaction confirmed in block', receipt.blockNumber);
   out.log('Transaction hash:', receipt.hash);
-  out.log('USDC transfer initiated successfully, our work here is done.');
+  out.log('USDC transfer initiated successfully');
 };