@agoric/fast-usdc 0.1.1-dev-34f026b.0 → 0.1.1-dev-945fef1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/fast-usdc",
-  "version": "0.1.1-dev-34f026b.0+34f026b",
+  "version": "0.1.1-dev-945fef1.0+945fef1",
   "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-34f026b.0+34f026b",
-    "@agoric/vats": "0.15.2-dev-34f026b.0+34f026b",
-    "@agoric/zone": "0.2.3-dev-34f026b.0+34f026b",
+    "@agoric/swingset-liveslots": "0.10.3-dev-945fef1.0+945fef1",
+    "@agoric/vats": "0.15.2-dev-945fef1.0+945fef1",
+    "@agoric/zone": "0.2.3-dev-945fef1.0+945fef1",
     "@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-34f026b.0+34f026b",
-    "@agoric/ertp": "0.16.3-dev-34f026b.0+34f026b",
-    "@agoric/internal": "0.3.3-dev-34f026b.0+34f026b",
-    "@agoric/notifier": "0.6.3-dev-34f026b.0+34f026b",
-    "@agoric/orchestration": "0.1.1-dev-34f026b.0+34f026b",
-    "@agoric/store": "0.9.3-dev-34f026b.0+34f026b",
-    "@agoric/vat-data": "0.5.3-dev-34f026b.0+34f026b",
-    "@agoric/vow": "0.1.1-dev-34f026b.0+34f026b",
-    "@agoric/zoe": "0.26.3-dev-34f026b.0+34f026b",
+    "@agoric/client-utils": "0.1.1-dev-945fef1.0+945fef1",
+    "@agoric/ertp": "0.16.3-dev-945fef1.0+945fef1",
+    "@agoric/internal": "0.3.3-dev-945fef1.0+945fef1",
+    "@agoric/notifier": "0.6.3-dev-945fef1.0+945fef1",
+    "@agoric/orchestration": "0.1.1-dev-945fef1.0+945fef1",
+    "@agoric/store": "0.9.3-dev-945fef1.0+945fef1",
+    "@agoric/vat-data": "0.5.3-dev-945fef1.0+945fef1",
+    "@agoric/vow": "0.1.1-dev-945fef1.0+945fef1",
+    "@agoric/zoe": "0.26.3-dev-945fef1.0+945fef1",
     "@cosmjs/proto-signing": "^0.32.4",
     "@cosmjs/stargate": "^0.32.4",
     "@endo/base64": "^1.0.9",
@@ -80,5 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "34f026b7be9ace7022458d7f7b890828cfa4e951"
+  "gitHead": "945fef126631adbf6d14d861a2ceb2fa51f9da5c"
 }

package/src/fast-usdc.contract.js

@@ -12,6 +12,7 @@ import {
 import { makeZoeTools } from '@agoric/orchestration/src/utils/zoe-tools.js';
 import { provideSingleton } from '@agoric/zoe/src/contractSupport/durability.js';
 import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
+import { Fail } from '@endo/errors';
 import { E } from '@endo/far';
 import { M } from '@endo/patterns';
 import { prepareAdvancer } from './exos/advancer.js';
@@ -27,10 +28,11 @@ const trace = makeTracer('FastUsdc');
 
 const STATUS_NODE = 'status';
 const FEE_NODE = 'feeConfig';
+const ADDRESSES_BAGGAGE_KEY = 'addresses';
 
 /**
  * @import {HostInterface} from '@agoric/async-flow';
- * @import {CosmosChainInfo, Denom, DenomDetail, OrchestrationAccount} from '@agoric/orchestration';
+ * @import {ChainAddress, 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'
@@ -53,10 +55,11 @@ export const meta = {
   privateArgsShape: {
     // @ts-expect-error TypedPattern not recognized as record
     ...OrchestrationPowersShape,
+    assetInfo: M.arrayOf([DenomShape, DenomDetailShape]),
+    chainInfo: M.recordOf(M.string(), CosmosChainInfoShape),
     feeConfig: FeeConfigShape,
     marshaller: M.remotable(),
-    chainInfo: M.recordOf(M.string(), CosmosChainInfoShape),
-    assetInfo: M.arrayOf([DenomShape, DenomDetailShape]),
+    poolMetricsNode: M.remotable(),
   },
 };
 harden(meta);
@@ -72,13 +75,25 @@ const publishFeeConfig = async (node, marshaller, feeConfig) => {
   return E(feeNode).setValue(JSON.stringify(value));
 };
 
+/**
+ * @param {Remote<StorageNode>} contractNode
+ * @param {{
+ *  poolAccount: ChainAddress['value'];
+ *  settlementAccount: ChainAddress['value'];
+ * }} addresses
+ */
+const publishAddresses = (contractNode, addresses) => {
+  return E(contractNode).setValue(JSON.stringify(addresses));
+};
+
 /**
  * @param {ZCF<FastUsdcTerms>} zcf
  * @param {OrchestrationPowers & {
- *   marshaller: Marshaller;
- *   feeConfig: FeeConfig;
- *   chainInfo: Record<string, CosmosChainInfo>;
  *   assetInfo: [Denom, DenomDetail & { brandKey?: string}][];
+ *   chainInfo: Record<string, CosmosChainInfo>;
+ *   feeConfig: FeeConfig;
+ *   marshaller: Marshaller;
+ *   poolMetricsNode: Remote<StorageNode>;
  * }} privateArgs
  * @param {Zone} zone
  * @param {OrchestrationTools} tools
@@ -160,6 +175,23 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
         );
       });
     },
+    async publishAddresses() {
+      !baggage.has(ADDRESSES_BAGGAGE_KEY) || Fail`Addresses already published`;
+      const [poolAccountAddress, settlementAccountAddress] =
+        await vowTools.when(
+          vowTools.all([
+            E(poolAccount).getAddress(),
+            E(settlementAccount).getAddress(),
+          ]),
+        );
+      const addresses = harden({
+        poolAccount: poolAccountAddress.value,
+        settlementAccount: settlementAccountAddress.value,
+      });
+      baggage.init(ADDRESSES_BAGGAGE_KEY, addresses);
+      await publishAddresses(storageNode, addresses);
+      return addresses;
+    },
   });
 
   const publicFacet = zone.exo('Fast USDC Public', undefined, {
@@ -186,6 +218,13 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
     getPublicTopics() {
       return poolKit.public.getPublicTopics();
     },
+    getStaticInfo() {
+      baggage.has(ADDRESSES_BAGGAGE_KEY) ||
+        Fail`no addresses. creator must 'publishAddresses' first`;
+      return harden({
+        [ADDRESSES_BAGGAGE_KEY]: baggage.get(ADDRESSES_BAGGAGE_KEY),
+      });
+    },
   });
 
   // ^^^ Define all kinds above this line. Keep remote calls below. vvv
@@ -213,7 +252,7 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
   );
 
   const poolKit = zone.makeOnce('Liquidity Pool kit', () =>
-    makeLiquidityPoolKit(shareMint, privateArgs.storageNode),
+    makeLiquidityPoolKit(shareMint, privateArgs.poolMetricsNode),
   );
 
   /** Chain, connection, and asset info can only be registered once */

package/src/fast-usdc.start.js

@@ -78,6 +78,7 @@ const publishDisplayInfo = async (brand, { board, chainStorage }) => {
 };
 
 const FEED_POLICY = 'feedPolicy';
+const POOL_METRICS = 'poolMetrics';
 
 /**
  * @param {ERef<StorageNode>} node
@@ -175,6 +176,7 @@ export const startFastUSDC = async (
       chainStorage,
     },
   );
+  const poolMetricsNode = await E(storageNode).makeChildNode(POOL_METRICS);
 
   const privateArgs = await deeplyFulfilledObject(
     harden({
@@ -182,6 +184,7 @@ export const startFastUSDC = async (
       feeConfig,
       localchain,
       orchestrationService: cosmosInterchainService,
+      poolMetricsNode,
       storageNode,
       timerService,
       marshaller,
@@ -224,6 +227,8 @@ export const startFastUSDC = async (
   produceInstance.reset();
   produceInstance.resolve(instance);
 
+  const addresses = await E(kit.creatorFacet).publishAddresses();
+  trace('contract orch account addresses', addresses);
   if (!net.noNoble) {
     const addr = await E(kit.creatorFacet).connectToNoble();
     trace('noble intermediate recipient', addr);