@agoric/fast-usdc 0.1.1-dev-a2e9363.0 → 0.1.1-dev-1d5cb99.0

package/package.json

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

package/src/exos/settler.js

@@ -221,7 +221,7 @@ export const prepareSettler = (
           repayer.repay(settlingSeat, split);
 
           // update status manager, marking tx `SETTLED`
-          statusManager.disbursed(txHash, sender, amount);
+          statusManager.disbursed(txHash);
         },
         /**
          * @param {EvmHash | undefined} txHash
@@ -248,7 +248,7 @@ export const prepareSettler = (
       },
       transferHandler: {
         /**
-         * @param {unknown} result
+         * @param {unknown} _result
          * @param {SettlerTransferCtx} ctx
          *
          * @typedef {{
@@ -257,7 +257,7 @@ export const prepareSettler = (
          *   amount: NatValue;
          * }} SettlerTransferCtx
          */
-        onFulfilled(result, ctx) {
+        onFulfilled(_result, ctx) {
           const { txHash, sender, amount } = ctx;
           statusManager.forwarded(txHash, sender, amount);
         },

package/src/exos/status-manager.js

@@ -1,18 +1,19 @@
 import { M } from '@endo/patterns';
 import { Fail, makeError, q } from '@endo/errors';
-
 import { appendToStoredArray } from '@agoric/store/src/stores/store-utils.js';
+import { E } from '@endo/eventual-send';
+import { makeTracer } from '@agoric/internal';
 import {
   CctpTxEvidenceShape,
   EvmHashShape,
   PendingTxShape,
 } from '../type-guards.js';
-import { PendingTxStatus } from '../constants.js';
+import { PendingTxStatus, TxStatus } from '../constants.js';
 
 /**
  * @import {MapStore, SetStore} from '@agoric/store';
  * @import {Zone} from '@agoric/zone';
- * @import {CctpTxEvidence, NobleAddress, SeenTxKey, PendingTxKey, PendingTx, EvmHash} from '../types.js';
+ * @import {CctpTxEvidence, NobleAddress, SeenTxKey, PendingTxKey, PendingTx, EvmHash, LogFn} from '../types.js';
  */
 
 /**
@@ -53,6 +54,12 @@ const seenTxKeyOf = evidence => {
   return `seenTx:${JSON.stringify([txHash, chainId])}`;
 };
 
+/**
+ * @typedef {{
+ *  log?: LogFn;
+ * }} StatusManagerPowers
+ */
+
 /**
  * The `StatusManager` keeps track of Pending and Seen Transactions
  * via {@link PendingTxStatus} states, aiding in coordination between the `Advancer`
@@ -61,8 +68,16 @@ const seenTxKeyOf = evidence => {
  * XXX consider separate facets for `Advancing` and `Settling` capabilities.
  *
  * @param {Zone} zone
+ * @param {() => Promise<StorageNode>} makeStatusNode
+ * @param {StatusManagerPowers} caps
  */
-export const prepareStatusManager = zone => {
+export const prepareStatusManager = (
+  zone,
+  makeStatusNode,
+  {
+    log = makeTracer('Advancer', true),
+  } = /** @type {StatusManagerPowers} */ ({}),
+) => {
   /** @type {MapStore<PendingTxKey, PendingTx[]>} */
   const pendingTxs = zone.mapStore('PendingTxs', {
     keyShape: M.string(),
@@ -74,6 +89,17 @@ export const prepareStatusManager = zone => {
     keyShape: M.string(),
   });
 
+  /**
+   * @param {CctpTxEvidence['txHash']} hash
+   * @param {TxStatus} status
+   */
+  const recordStatus = (hash, status) => {
+    const statusNodeP = makeStatusNode();
+    const txnNodeP = E(statusNodeP).makeChildNode(hash);
+    // Don't await, just writing to vstorage.
+    void E(txnNodeP).setValue(status);
+  };
+
   /**
    * Ensures that `txHash+chainId` has not been processed
    * and adds entry to `seenTxs` set.
@@ -95,6 +121,7 @@ export const prepareStatusManager = zone => {
       pendingTxKeyOf(evidence),
       harden({ ...evidence, status }),
     );
+    recordStatus(evidence.txHash, status);
   };
 
   return zone.exo(
@@ -118,9 +145,7 @@ export const prepareStatusManager = zone => {
           M.undefined(),
         ),
       ),
-      disbursed: M.call(EvmHashShape, M.string(), M.nat()).returns(
-        M.undefined(),
-      ),
+      disbursed: M.call(EvmHashShape).returns(M.undefined()),
       forwarded: M.call(M.opt(EvmHashShape), M.string(), M.nat()).returns(
         M.undefined(),
       ),
@@ -163,6 +188,7 @@ export const prepareStatusManager = zone => {
           : PendingTxStatus.AdvanceFailed;
         const txpost = { ...tx, status };
         pendingTxs.set(key, harden([...prefix, txpost, ...suffix]));
+        recordStatus(tx.txHash, status);
       },
 
       /**
@@ -219,12 +245,9 @@ export const prepareStatusManager = zone => {
        * Mark a transaction as `DISBURSED`
        *
        * @param {EvmHash} txHash
-       * @param {NobleAddress} address
-       * @param {bigint} amount
        */
-      disbursed(txHash, address, amount) {
-        // TODO: store txHash -> evidence for txs pending settlement?
-        console.log('TODO: vstorage update', { txHash, address, amount });
+      disbursed(txHash) {
+        recordStatus(txHash, TxStatus.Disbursed);
       },
 
       /**
@@ -235,8 +258,14 @@ export const prepareStatusManager = zone => {
        * @param {bigint} amount
        */
       forwarded(txHash, address, amount) {
-        // TODO: store txHash -> evidence for txs pending settlement?
-        console.log('TODO: vstorage update', { txHash, address, amount });
+        if (txHash) {
+          recordStatus(txHash, TxStatus.Forwarded);
+        } else {
+          // TODO store (early) `Minted` transactions to check against incoming evidence
+          log(
+            `⚠️ Forwarded minted amount ${amount} from account ${address} before it was observed.`,
+          );
+        }
       },
 
       /**

package/src/fast-usdc.contract.js

@@ -29,6 +29,8 @@ import * as flows from './fast-usdc.flows.js';
 
 const trace = makeTracer('FastUsdc');
 
+const STATUS_NODE = 'status';
+
 /**
  * @import {HostInterface} from '@agoric/async-flow';
  * @import {CosmosChainInfo, Denom, DenomDetail, OrchestrationAccount} from '@agoric/orchestration';
@@ -84,7 +86,9 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
     marshaller,
   );
 
-  const statusManager = prepareStatusManager(zone);
+  const makeStatusNode = () =>
+    E(privateArgs.storageNode).makeChildNode(STATUS_NODE);
+  const statusManager = prepareStatusManager(zone, makeStatusNode);
 
   const { USDC } = terms.brands;
   const { withdrawToSeat } = tools.zoeTools;