@agoric/orchestration 0.2.0-upgrade-17-dev-a61cdab.0 → 0.2.0-upgrade-17-dev-ec448b0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.2.0-upgrade-17-dev-a61cdab.0+a61cdab",
+  "version": "0.2.0-upgrade-17-dev-ec448b0.0+ec448b0",
   "description": "Chain abstraction for Agoric's orchestration clients",
   "type": "module",
   "main": "index.js",
@@ -33,19 +33,19 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/async-flow": "0.1.1-upgrade-17-dev-a61cdab.0+a61cdab",
-    "@agoric/cosmic-proto": "0.5.0-upgrade-17-dev-a61cdab.0+a61cdab",
-    "@agoric/ertp": "0.16.3-upgrade-17-dev-a61cdab.0+a61cdab",
-    "@agoric/internal": "0.4.0-upgrade-17-dev-a61cdab.0+a61cdab",
-    "@agoric/network": "0.2.0-upgrade-17-dev-a61cdab.0+a61cdab",
-    "@agoric/notifier": "0.7.0-upgrade-17-dev-a61cdab.0+a61cdab",
-    "@agoric/store": "0.9.3-upgrade-17-dev-a61cdab.0+a61cdab",
-    "@agoric/time": "0.3.3-upgrade-17-dev-a61cdab.0+a61cdab",
-    "@agoric/vat-data": "0.5.3-upgrade-17-dev-a61cdab.0+a61cdab",
-    "@agoric/vats": "0.16.0-upgrade-17-dev-a61cdab.0+a61cdab",
-    "@agoric/vow": "0.2.0-upgrade-17-dev-a61cdab.0+a61cdab",
-    "@agoric/zoe": "0.26.3-upgrade-17-dev-a61cdab.0+a61cdab",
-    "@agoric/zone": "0.3.0-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/async-flow": "0.1.1-upgrade-17-dev-ec448b0.0+ec448b0",
+    "@agoric/cosmic-proto": "0.5.0-upgrade-17-dev-ec448b0.0+ec448b0",
+    "@agoric/ertp": "0.16.3-upgrade-17-dev-ec448b0.0+ec448b0",
+    "@agoric/internal": "0.4.0-upgrade-17-dev-ec448b0.0+ec448b0",
+    "@agoric/network": "0.2.0-upgrade-17-dev-ec448b0.0+ec448b0",
+    "@agoric/notifier": "0.7.0-upgrade-17-dev-ec448b0.0+ec448b0",
+    "@agoric/store": "0.9.3-upgrade-17-dev-ec448b0.0+ec448b0",
+    "@agoric/time": "0.3.3-upgrade-17-dev-ec448b0.0+ec448b0",
+    "@agoric/vat-data": "0.5.3-upgrade-17-dev-ec448b0.0+ec448b0",
+    "@agoric/vats": "0.16.0-upgrade-17-dev-ec448b0.0+ec448b0",
+    "@agoric/vow": "0.2.0-upgrade-17-dev-ec448b0.0+ec448b0",
+    "@agoric/zoe": "0.26.3-upgrade-17-dev-ec448b0.0+ec448b0",
+    "@agoric/zone": "0.3.0-upgrade-17-dev-ec448b0.0+ec448b0",
     "@endo/base64": "^1.0.7",
     "@endo/errors": "^1.2.5",
     "@endo/far": "^1.1.5",
@@ -54,7 +54,7 @@
     "@noble/hashes": "^1.5.0"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/swingset-liveslots": "0.10.3-upgrade-17-dev-ec448b0.0+ec448b0",
     "@chain-registry/client": "^1.47.4",
     "@cosmjs/amino": "^0.32.3",
     "@cosmjs/proto-signing": "^0.32.3",
@@ -94,5 +94,5 @@
   "typeCoverage": {
     "atLeast": 97.57
   },
-  "gitHead": "a61cdabb23bd2c846e003dee7326018a7462a929"
+  "gitHead": "ec448b081ac21cbe217f210e06f0b8f7989e73d6"
 }

package/src/proposals/init-chain-info.d.ts

@@ -0,0 +1,12 @@
+export function initChainInfo({ consume: { agoricNamesAdmin, chainStorage: chainStorageP }, }: BootstrapPowers): Promise<void>;
+export function getManifestForChainInfo(): {
+    manifest: {
+        [x: string]: {
+            consume: {
+                agoricNamesAdmin: boolean;
+                chainStorage: boolean;
+            };
+        };
+    };
+};
+//# sourceMappingURL=init-chain-info.d.ts.map

package/src/proposals/init-chain-info.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"init-chain-info.d.ts","sourceRoot":"","sources":["init-chain-info.js"],"names":[],"mappings":"AA2EO,+FAFI,eAAe,iBAYzB;AAGM;;;;;;;;;EASL"}

package/src/proposals/init-chain-info.js

@@ -0,0 +1,98 @@
+import { Fail } from '@endo/errors';
+import { E, Far } from '@endo/far';
+import { makeMarshal } from '@endo/marshal';
+import { makeTracer } from '@agoric/internal';
+import { registerKnownChains } from '../chain-info.js';
+import { CHAIN_KEY, CONNECTIONS_KEY } from '../exos/chain-hub.js';
+
+const trace = makeTracer('InitChainInfo', true);
+
+/**
+ * Similar to publishAgoricNamesToChainStorage but publishes a node per chain
+ * instead of one list of entries
+ */
+
+/**
+ * @param {ERef<import('@agoric/vats').NameHubKit['nameAdmin']>} agoricNamesAdmin
+ * @param {ERef<StorageNode | null>} chainStorageP
+ */
+const publishChainInfoToChainStorage = async (
+  agoricNamesAdmin,
+  chainStorageP,
+) => {
+  const chainStorage = await chainStorageP;
+  if (!chainStorage) {
+    console.warn('no chain storage, not registering chain info');
+    return;
+  }
+
+  const agoricNamesNode = await E(chainStorage).makeChildNode('agoricNames');
+
+  /**
+   * @param {string} subpath
+   */
+  const echoNameUpdates = async subpath => {
+    const chainNamesNode = E(agoricNamesNode).makeChildNode(subpath);
+    const { nameAdmin } = await E(agoricNamesAdmin).provideChild(subpath);
+
+    /**
+     * Previous entries, to prevent redundant updates
+     *
+     * @type {Record<string, string>} chainName => stringified chainInfo
+     */
+    const prev = {};
+
+    // XXX cannot be changed until we upgrade vat-agoricNames to allow it
+    await E(nameAdmin).onUpdate(
+      // XXX will live on the heap in the bootstrap vat. When we upgrade or kill
+      // that this handler will sever and vat-agoricNames will need to be upgraded
+      // to allow changing the handler, or to use pubsub mechanics instead.
+      Far('chain info writer', {
+        write(entries) {
+          // chainInfo has no cap data but we need to marshal bigints
+          const marshalData = makeMarshal(_val => Fail`data only`);
+          for (const [chainName, info] of entries) {
+            const value = JSON.stringify(marshalData.toCapData(info));
+            if (prev[chainName] === value) {
+              continue;
+            }
+            const chainNode = E(chainNamesNode).makeChildNode(chainName);
+            prev[chainName] = value;
+            void E(chainNode)
+              .setValue(value)
+              .catch(() => delete prev[chainName]);
+          }
+        },
+      }),
+    );
+  };
+  await echoNameUpdates(CHAIN_KEY);
+  await echoNameUpdates(CONNECTIONS_KEY);
+};
+
+/**
+ * @param {BootstrapPowers} powers
+ */
+export const initChainInfo = async ({
+  consume: { agoricNamesAdmin, chainStorage: chainStorageP },
+}) => {
+  trace('init-chainInfo');
+
+  // First set up callback to write updates to vstorage
+  await publishChainInfoToChainStorage(agoricNamesAdmin, chainStorageP);
+
+  // Now register the names
+  await registerKnownChains(agoricNamesAdmin, trace);
+};
+harden(initChainInfo);
+
+export const getManifestForChainInfo = () => ({
+  manifest: {
+    [initChainInfo.name]: {
+      consume: {
+        agoricNamesAdmin: true,
+        chainStorage: true,
+      },
+    },
+  },
+});

package/src/proposals/orchestration-proposal.d.ts

@@ -5,12 +5,11 @@ export function setupOrchestrationVat({ consume: { loadCriticalVat, portAllocato
     produce: {
         orchestrationVat: Producer<any>;
     };
-}, options: {
+}, { options }: {
     options: {
         orchestrationRef: VatSourceRef;
     };
 }): Promise<void>;
-export function initChainInfo({ consume: { agoricNamesAdmin, chainStorage: chainStorageP }, }: BootstrapPowers): Promise<void>;
 export function getManifestForOrchestration(_powers: any, { orchestrationRef }: {
     orchestrationRef: any;
 }): {
@@ -19,21 +18,11 @@ export function getManifestForOrchestration(_powers: any, { orchestrationRef }:
             consume: {
                 loadCriticalVat: boolean;
                 portAllocator: string;
-                agoricNamesAdmin?: undefined;
-                chainStorage?: undefined;
             };
             produce: {
                 cosmosInterchainService: string;
                 orchestrationVat: string;
             };
-        } | {
-            consume: {
-                agoricNamesAdmin: boolean;
-                chainStorage: boolean;
-                loadCriticalVat?: undefined;
-                portAllocator?: undefined;
-            };
-            produce?: undefined;
         };
     };
     options: {

package/src/proposals/orchestration-proposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestration-proposal.d.ts","sourceRoot":"","sources":["orchestration-proposal.js"],"names":[],"mappings":"AAwBO,mJAVI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,aAAmB,EAAE,aAAa,CAAC;KAC9B,CAAC;IACN,OAAW,EAAE;QACb,gBAAsB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;KACjC,CAAC;CACH,WACO;IAAE,OAAO,EAAE;QAAE,gBAAgB,EAAE,YAAY,CAAA;KAAE,CAAA;CAAE,iBA6BzD;AAoEM,+FAFI,eAAe,iBAYzB;AAGM;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsBL;mCAhJ8B,iBAAiB"}
+{"version":3,"file":"orchestration-proposal.d.ts","sourceRoot":"","sources":["orchestration-proposal.js"],"names":[],"mappings":"AAoBO,mJAVI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,aAAmB,EAAE,aAAa,CAAC;KAC9B,CAAC;IACN,OAAW,EAAE;QACb,gBAAsB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;KACjC,CAAC;CACH,eACO;IAAE,OAAO,EAAE;QAAE,gBAAgB,EAAE,YAAY,CAAA;KAAE,CAAA;CAAE,iBAgCzD;AAEM;;;;;;;;;;;;;;;;;;EAgBL;mCA9D8B,iBAAiB"}

package/src/proposals/orchestration-proposal.js

@@ -1,9 +1,5 @@
-import { Fail } from '@endo/errors';
-import { E, Far } from '@endo/far';
-import { makeMarshal } from '@endo/marshal';
 import { makeTracer } from '@agoric/internal';
-import { registerKnownChains } from '../chain-info.js';
-import { CHAIN_KEY, CONNECTIONS_KEY } from '../exos/chain-hub.js';
+import { E } from '@endo/far';
 
 const trace = makeTracer('CoreEvalOrchestration', true);
 
@@ -27,14 +23,16 @@ export const setupOrchestrationVat = async (
     consume: { loadCriticalVat, portAllocator: portAllocatorP },
     produce: { orchestrationVat, ...produce },
   },
-  options,
+  { options },
 ) => {
-  const { orchestrationRef } = options.options;
+  trace('setupOrchestrationVat', options);
+  const { orchestrationRef } = options;
   const vats = {
     orchestration: E(loadCriticalVat)('orchestration', orchestrationRef),
   };
   // don't proceed if loadCriticalVat fails
   await Promise.all(Object.values(vats));
+  trace('setupOrchestrationVat got vats');
 
   orchestrationVat.reset();
   orchestrationVat.resolve(vats.orchestration);
@@ -49,87 +47,9 @@ export const setupOrchestrationVat = async (
 
   produce.cosmosInterchainService.reset();
   produce.cosmosInterchainService.resolve(cosmosInterchainService);
+  trace('setupOrchestrationVat complete');
 };
 
-/**
- * Similar to publishAgoricNamesToChainStorage but publishes a node per chain
- * instead of one list of entries
- */
-
-/**
- * @param {ERef<import('@agoric/vats').NameHubKit['nameAdmin']>} agoricNamesAdmin
- * @param {ERef<StorageNode | null>} chainStorageP
- */
-const publishChainInfoToChainStorage = async (
-  agoricNamesAdmin,
-  chainStorageP,
-) => {
-  const chainStorage = await chainStorageP;
-  if (!chainStorage) {
-    console.warn('no chain storage, not registering chain info');
-    return;
-  }
-
-  const agoricNamesNode = await E(chainStorage).makeChildNode('agoricNames');
-
-  /**
-   * @param {string} subpath
-   */
-  const echoNameUpdates = async subpath => {
-    const chainNamesNode = E(agoricNamesNode).makeChildNode(subpath);
-    const { nameAdmin } = await E(agoricNamesAdmin).provideChild(subpath);
-
-    /**
-     * Previous entries, to prevent redundant updates
-     *
-     * @type {Record<string, string>} chainName => stringified chainInfo
-     */
-    const prev = {};
-
-    // XXX cannot be changed until we upgrade vat-agoricNames to allow it
-    await E(nameAdmin).onUpdate(
-      // XXX will live on the heap in the bootstrap vat. When we upgrade or kill
-      // that this handler will sever and vat-agoricNames will need to be upgraded
-      // to allow changing the handler, or to use pubsub mechanics instead.
-      Far('chain info writer', {
-        write(entries) {
-          // chainInfo has no cap data but we need to marshal bigints
-          const marshalData = makeMarshal(_val => Fail`data only`);
-          for (const [chainName, info] of entries) {
-            const value = JSON.stringify(marshalData.toCapData(info));
-            if (prev[chainName] === value) {
-              continue;
-            }
-            const chainNode = E(chainNamesNode).makeChildNode(chainName);
-            prev[chainName] = value;
-            void E(chainNode)
-              .setValue(value)
-              .catch(() => delete prev[chainName]);
-          }
-        },
-      }),
-    );
-  };
-  await echoNameUpdates(CHAIN_KEY);
-  await echoNameUpdates(CONNECTIONS_KEY);
-};
-
-/**
- * @param {BootstrapPowers} powers
- */
-export const initChainInfo = async ({
-  consume: { agoricNamesAdmin, chainStorage: chainStorageP },
-}) => {
-  trace('init-chainInfo');
-
-  // First set up callback to write updates to vstorage
-  await publishChainInfoToChainStorage(agoricNamesAdmin, chainStorageP);
-
-  // Now register the names
-  await registerKnownChains(agoricNamesAdmin, trace);
-};
-harden(initChainInfo);
-
 export const getManifestForOrchestration = (_powers, { orchestrationRef }) => ({
   manifest: {
     [setupOrchestrationVat.name]: {
@@ -142,12 +62,6 @@ export const getManifestForOrchestration = (_powers, { orchestrationRef }) => ({
         orchestrationVat: 'orchestrationVat',
       },
     },
-    [initChainInfo.name]: {
-      consume: {
-        agoricNamesAdmin: true,
-        chainStorage: true,
-      },
-    },
   },
   options: {
     orchestrationRef,