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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/fast-usdc",
-  "version": "0.1.1-dev-adb17dd.0+adb17dd",
+  "version": "0.1.1-dev-9e5f628.0+9e5f628",
   "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-adb17dd.0+adb17dd",
-    "@agoric/vats": "0.15.2-dev-adb17dd.0+adb17dd",
-    "@agoric/zone": "0.2.3-dev-adb17dd.0+adb17dd",
+    "@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",
     "@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-adb17dd.0+adb17dd",
-    "@agoric/cosmic-proto": "0.4.1-dev-adb17dd.0+adb17dd",
-    "@agoric/ertp": "0.16.3-dev-adb17dd.0+adb17dd",
-    "@agoric/internal": "0.3.3-dev-adb17dd.0+adb17dd",
-    "@agoric/notifier": "0.6.3-dev-adb17dd.0+adb17dd",
-    "@agoric/orchestration": "0.1.1-dev-adb17dd.0+adb17dd",
-    "@agoric/store": "0.9.3-dev-adb17dd.0+adb17dd",
-    "@agoric/vat-data": "0.5.3-dev-adb17dd.0+adb17dd",
-    "@agoric/vow": "0.1.1-dev-adb17dd.0+adb17dd",
-    "@agoric/zoe": "0.26.3-dev-adb17dd.0+adb17dd",
+    "@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",
     "@cosmjs/proto-signing": "^0.32.4",
     "@cosmjs/stargate": "^0.32.4",
     "@endo/base64": "^1.0.9",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "adb17dd2f16dad4a895854dae0bbe3298aa5dd2e"
+  "gitHead": "9e5f628a3d953539bcea5e3ba2365367158ec069"
 }

package/src/exos/operator-kit.js

@@ -12,7 +12,7 @@ const trace = makeTracer('TxOperator');
 
 /**
  * @typedef {object} OperatorPowers
- * @property {(evidence: CctpTxEvidence, operatorKit: OperatorKit) => void} submitEvidence
+ * @property {(evidence: CctpTxEvidence, operatorId: string) => void} attest
  */
 
 /**
@@ -35,7 +35,7 @@ const OperatorKitI = {
   }),
 
   operator: M.interface('Operator', {
-    submitEvidence: M.call(CctpTxEvidenceShape).returns(M.promise()),
+    submitEvidence: M.call(CctpTxEvidenceShape).returns(),
     getStatus: M.call().returns(M.record()),
   }),
 };
@@ -87,7 +87,7 @@ export const prepareOperatorKit = (zone, staticPowers) =>
           const { operator } = this.facets;
           // TODO(bootstrap integration): cause this call to throw and confirm that it
           // shows up in the the smart-wallet UpdateRecord `error` property
-          await operator.submitEvidence(evidence);
+          operator.submitEvidence(evidence);
           return staticPowers.makeInertInvitation(
             'evidence was pushed in the invitation maker call',
           );
@@ -98,12 +98,12 @@ export const prepareOperatorKit = (zone, staticPowers) =>
          * submit evidence from this operator
          *
          * @param {CctpTxEvidence} evidence
+         * @returns {void}
          */
-        async submitEvidence(evidence) {
+        submitEvidence(evidence) {
           const { state } = this;
           !state.disabled || Fail`submitEvidence for disabled operator`;
-          const result = state.powers.submitEvidence(evidence, this.facets);
-          return result;
+          state.powers.attest(evidence, state.operatorId);
         },
         /** @returns {OperatorStatus} */
         getStatus() {

package/src/exos/settler.js

@@ -260,7 +260,7 @@ export const prepareSettler = (
           repayer.repay(settlingSeat, split);
 
           // update status manager, marking tx `SETTLED`
-          statusManager.disbursed(txHash);
+          statusManager.disbursed(txHash, split);
         },
         /**
          * @param {EvmHash} txHash

package/src/exos/status-manager.js

@@ -1,14 +1,15 @@
-import { M } from '@endo/patterns';
-import { Fail, makeError, q } from '@endo/errors';
+import { makeTracer } from '@agoric/internal';
 import { appendToStoredArray } from '@agoric/store/src/stores/store-utils.js';
+import { AmountKeywordRecordShape } from '@agoric/zoe/src/typeGuards.js';
+import { Fail, makeError, q } from '@endo/errors';
 import { E } from '@endo/eventual-send';
-import { makeTracer, pureDataMarshaller } from '@agoric/internal';
+import { M } from '@endo/patterns';
+import { PendingTxStatus, TerminalTxStatus, TxStatus } from '../constants.js';
 import {
   CctpTxEvidenceShape,
   EvmHashShape,
   PendingTxShape,
 } from '../type-guards.js';
-import { PendingTxStatus, TerminalTxStatus, TxStatus } from '../constants.js';
 
 /**
  * @import {MapStore, SetStore} from '@agoric/store';
@@ -48,6 +49,7 @@ const pendingTxKeyOf = evidence => {
 /**
  * @typedef {{
  *  log?: LogFn;
+ *  marshaller: ERef<Marshaller>;
  * }} StatusManagerPowers
  */
 
@@ -66,6 +68,7 @@ export const prepareStatusManager = (
   zone,
   txnsNode,
   {
+    marshaller,
     log = makeTracer('Advancer', true),
   } = /** @type {StatusManagerPowers} */ ({}),
 ) => {
@@ -102,14 +105,25 @@ export const prepareStatusManager = (
   /**
    * @param {EvmHash} txId
    * @param {TransactionRecord} record
+   * @returns {Promise<void>}
    */
-  const publishTxnRecord = (txId, record) => {
+  const publishTxnRecord = async (txId, record) => {
     const txNode = E(txnsNode).makeChildNode(txId, {
       sequence: true, // avoid overwriting other output in the block
     });
-    void E(txNode).setValue(
-      JSON.stringify(pureDataMarshaller.toCapData(record)),
-    );
+
+    // XXX awkward for publish* to update a store, but it's temporary
+    if (record.status && TerminalTxStatus[record.status]) {
+      // UNTIL https://github.com/Agoric/agoric-sdk/issues/7405
+      // Queue it for deletion later because if we deleted it now the earlier
+      // writes in this block would be wiped. For now we keep track of what to
+      // delete when we know it'll be another block.
+      storedCompletedTxs.add(txId);
+    }
+
+    const capData = await E(marshaller).toCapData(record);
+
+    await E(txNode).setValue(JSON.stringify(capData));
   };
 
   /**
@@ -124,22 +138,6 @@ export const prepareStatusManager = (
     );
   };
 
-  /**
-   * @param {CctpTxEvidence['txHash']} hash
-   * @param {TxStatus} status
-   */
-  const publishStatus = (hash, status) => {
-    // Don't await, just writing to vstorage.
-    void publishTxnRecord(hash, harden({ status }));
-    if (TerminalTxStatus[status]) {
-      // UNTIL https://github.com/Agoric/agoric-sdk/issues/7405
-      // Queue it for deletion later because if we deleted it now the earlier
-      // writes in this block would be wiped. For now we keep track of what to
-      // delete when we know it'll be another block.
-      storedCompletedTxs.add(hash);
-    }
-  };
-
   /**
    * Ensures that `txHash+chainId` has not been processed
    * and adds entry to `seenTxs` set.
@@ -164,7 +162,7 @@ export const prepareStatusManager = (
     publishEvidence(txHash, evidence);
     if (status !== PendingTxStatus.Observed) {
       // publishEvidence publishes Observed
-      publishStatus(txHash, status);
+      void publishTxnRecord(txHash, harden({ status }));
     }
   };
 
@@ -187,7 +185,7 @@ export const prepareStatusManager = (
     ];
     const txpost = { ...tx, status };
     pendingTxs.set(key, harden([...prefix, txpost, ...suffix]));
-    publishStatus(tx.txHash, status);
+    void publishTxnRecord(tx.txHash, harden({ status }));
   }
 
   return zone.exo(
@@ -212,7 +210,9 @@ export const prepareStatusManager = (
           M.undefined(),
         ),
       ),
-      disbursed: M.call(EvmHashShape).returns(M.undefined()),
+      disbursed: M.call(EvmHashShape, AmountKeywordRecordShape).returns(
+        M.undefined(),
+      ),
       forwarded: M.call(M.opt(EvmHashShape), M.string(), M.nat()).returns(
         M.undefined(),
       ),
@@ -313,9 +313,13 @@ export const prepareStatusManager = (
        * Mark a transaction as `DISBURSED`
        *
        * @param {EvmHash} txHash
+       * @param {import('./liquidity-pool.js').RepayAmountKWR} split
        */
-      disbursed(txHash) {
-        publishStatus(txHash, TxStatus.Disbursed);
+      disbursed(txHash, split) {
+        void publishTxnRecord(
+          txHash,
+          harden({ split, status: TxStatus.Disbursed }),
+        );
       },
 
       /**
@@ -327,7 +331,7 @@ export const prepareStatusManager = (
        */
       forwarded(txHash, nfa, amount) {
         if (txHash) {
-          publishStatus(txHash, TxStatus.Forwarded);
+          void publishTxnRecord(txHash, harden({ status: TxStatus.Forwarded }));
         } else {
           // TODO store (early) `Minted` transactions to check against incoming evidence
           log(

package/src/exos/transaction-feed.js

@@ -1,6 +1,7 @@
 import { makeTracer } from '@agoric/internal';
 import { prepareDurablePublishKit } from '@agoric/notifier';
-import { M } from '@endo/patterns';
+import { keyEQ, M } from '@endo/patterns';
+import { Fail } from '@endo/errors';
 import { CctpTxEvidenceShape } from '../type-guards.js';
 import { defineInertInvitation } from '../utils/zoe.js';
 import { prepareOperatorKit } from './operator-kit.js';
@@ -18,7 +19,7 @@ export const INVITATION_MAKERS_DESC = 'oracle operator invitation';
 
 const TransactionFeedKitI = harden({
   operatorPowers: M.interface('Transaction Feed Admin', {
-    submitEvidence: M.call(CctpTxEvidenceShape, M.any()).returns(),
+    attest: M.call(CctpTxEvidenceShape, M.string()).returns(),
   }),
   creator: M.interface('Transaction Feed Creator', {
     // TODO narrow the return shape to OperatorKit
@@ -118,23 +119,16 @@ export const prepareTransactionFeedKit = (zone, zcf) => {
         /**
          * Add evidence from an operator.
          *
+         * NB: the operatorKit is responsible for
+         *
          * @param {CctpTxEvidence} evidence
-         * @param {OperatorKit} operatorKit
+         * @param {string} operatorId
          */
-        submitEvidence(evidence, operatorKit) {
-          const { pending } = this.state;
-          trace(
-            'submitEvidence',
-            operatorKit.operator.getStatus().operatorId,
-            evidence,
-          );
-          const { operatorId } = operatorKit.operator.getStatus();
-
-          // TODO should this verify that the operator is one made by this exo?
-          // This doesn't work...
-          // operatorKit === operators.get(operatorId) ||
-          //   Fail`operatorKit mismatch`;
+        attest(evidence, operatorId) {
+          const { operators, pending } = this.state;
+          trace('submitEvidence', operatorId, evidence);
 
+          // TODO https://github.com/Agoric/agoric-sdk/pull/10720
           // TODO validate that it's a valid for Fast USDC before accepting
           // E.g. that the `recipientAddress` is the FU settlement account and that
           // the EUD is a chain supported by FU.
@@ -154,18 +148,46 @@ export const prepareTransactionFeedKit = (zone, zcf) => {
           const found = [...pending.values()].filter(store =>
             store.has(txHash),
           );
-          // TODO determine the real policy for checking agreement
-          if (found.length < pending.getSize()) {
-            // not all have seen it
+          const minAttestations = Math.ceil(operators.getSize() / 2);
+          trace(
+            'transaction',
+            txHash,
+            'has',
+            found.length,
+            'of',
+            minAttestations,
+            'necessary attestations',
+          );
+          if (found.length < minAttestations) {
             return;
           }
 
-          // TODO verify that all found deep equal
+          let lastEvidence;
+          for (const store of found) {
+            const next = store.get(txHash);
+            if (lastEvidence) {
+              if (keyEQ(lastEvidence, next)) {
+                lastEvidence = next;
+              } else {
+                trace(
+                  '🚨 conflicting evidence for',
+                  txHash,
+                  ':',
+                  lastEvidence,
+                  '!=',
+                  next,
+                );
+                Fail`conflicting evidence for ${txHash}`;
+              }
+            }
+            lastEvidence = next;
+          }
 
-          // all agree, so remove from pending and publish
-          for (const pendingStore of pending.values()) {
-            pendingStore.delete(txHash);
+          // sufficient agreement, so remove from pending and publish
+          for (const store of found) {
+            store.delete(txHash);
           }
+          trace('publishing evidence', evidence);
           publisher.publish(evidence);
         },
       },

package/src/fast-usdc.contract.js

@@ -112,6 +112,7 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
   const statusManager = prepareStatusManager(
     zone,
     E(storageNode).makeChildNode(TXNS_NODE),
+    { marshaller },
   );
 
   const { USDC } = terms.brands;

package/src/types.ts

@@ -9,6 +9,7 @@ import type { Amount } from '@agoric/ertp';
 import type { CopyRecord, Passable } from '@endo/pass-style';
 import type { PendingTxStatus, TxStatus } from './constants.js';
 import type { FastUsdcTerms } from './fast-usdc.contract.js';
+import type { RepayAmountKWR } from './exos/liquidity-pool.js';
 
 export type EvmHash = `0x${string}`;
 export type EvmAddress = `0x${string & { length: 40 }}`;
@@ -40,6 +41,7 @@ export interface CctpTxEvidence {
  */
 export interface TransactionRecord extends CopyRecord {
   evidence?: CctpTxEvidence;
+  split?: RepayAmountKWR;
   status: TxStatus;
 }
 

package/src/utils/deploy-config.js

@@ -156,3 +156,11 @@ export const configurations = {
   },
 };
 harden(configurations);
+
+// Constraints on the configurations
+const MAINNET_EXPECTED_ORACLES = 3;
+assert(
+  new Set(Object.values(configurations.MAINNET.oracles)).size ===
+    MAINNET_EXPECTED_ORACLES,
+  `Mainnet must have exactly ${MAINNET_EXPECTED_ORACLES} oracles`,
+);