@agoric/deploy-script-support 0.11.0 → 0.11.1-upgrade-23-dev-bd79330.0.bd79330

package/README.md

@@ -21,18 +21,18 @@ Here's a simple example:
 
 ```js
 import { makeHelpers } from '@agoric/deploy-script-support';
-import { getManifestForGame1 } from '@agoric/smart-wallet/test/start-game1-proposal.js';
+import { getManifestForGame1 } from '@agoric/smart-wallet/tools/fixtures/start-game1-proposal.js';
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 const game1ProposalBuilder = async ({ publishRef, install }) => {
   return harden({
-    sourceSpec: '@agoric/smart-wallet/test/start-game1-proposal.js',
+    sourceSpec: '@agoric/smart-wallet/tools/fixtures/start-game1-proposal.js',
     getManifestCall: [
       getManifestForGame1.name,
       {
         game1Ref: publishRef(
           install(
-            '@agoric/smart-wallet/test/gameAssetContract.js',
+            '@agoric/smart-wallet/tools/fixtures/gameAssetContract.js',
             '../bundles/bundle-game1.js',
             { persist: true },
           ),
@@ -49,7 +49,7 @@ export default async (homeP, endowments) => {
 ```
 
 This CoreEvalBuilder returns an object whose "sourceSpec" indicates that the
-proposal to run is "@agoric/smart-wallet/test/start-game1-proposal.js" and whose
+proposal to run is "@agoric/smart-wallet/tools/fixtures/start-game1-proposal.js" and whose
 "getManifestCall" is a [functionName, ...args] array describing an invocation of
 `getManifestForGame1` exported from that file which is expected to return an
 object including a "manifest" as described below (but the actual invocation will

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/deploy-script-support",
-  "version": "0.11.0",
+  "version": "0.11.1-upgrade-23-dev-bd79330.0.bd79330",
   "description": "Helpers and other support for writing deploy scripts",
   "type": "module",
   "main": "src/helpers.js",
@@ -12,7 +12,7 @@
     "test": "ava",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint:eslint": "yarn run -T eslint .",
+    "lint:eslint": "node ../../scripts/eslint-repo.mjs .",
     "lint:types": "yarn run -T tsc",
     "lint": "yarn run -T run-s --continue-on-error 'lint:*'"
   },
@@ -34,27 +34,35 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/ertp": "0.17.0",
-    "@agoric/import-manager": "0.3.12",
-    "@agoric/internal": "0.4.0",
-    "@agoric/notifier": "0.7.0",
-    "@agoric/pola-io": "0.2.0",
-    "@agoric/store": "0.10.0",
-    "@agoric/time": "0.4.0",
-    "@agoric/zoe": "0.27.0",
+    "@agoric/client-utils": "0.2.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/ertp": "0.17.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/import-manager": "0.3.13-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/internal": "0.4.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/notifier": "0.7.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/orchestration": "0.2.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/pola-io": "0.2.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/portfolio-api": "0.2.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/smart-wallet": "0.6.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/store": "0.10.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/time": "0.4.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/zoe": "0.27.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/zone": "0.3.1-upgrade-23-dev-bd79330.0.bd79330",
     "@endo/base64": "^1.0.12",
     "@endo/bundle-source": "^4.1.2",
     "@endo/errors": "^1.2.13",
+    "@endo/eventual-send": "^1.3.4",
     "@endo/far": "^1.1.14",
     "@endo/marshal": "^1.8.0",
     "@endo/nat": "^5.1.3",
+    "@endo/pass-style": "^1.6.3",
+    "@endo/patterns": "^1.7.0",
     "@endo/promise-kit": "^1.1.13",
     "@endo/zip": "^1.0.11"
   },
   "devDependencies": {
-    "@agoric/vats": "0.16.0",
+    "@agoric/vats": "0.16.1-upgrade-23-dev-bd79330.0.bd79330",
     "@endo/init": "^1.1.12",
-    "ava": "^5.3.0",
+    "ava": "^6.4.1",
     "import-meta-resolve": "^4.1.0"
   },
   "files": [
@@ -73,7 +81,7 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 83.26
+    "atLeast": 84.46
   },
-  "gitHead": "0922d0447ab8fae9d2d87415964403330b5ca313"
+  "gitHead": "bd79330f78dae2faf9cc3d8b10063567700da07b"
 }

package/src/assertOfferResult.js

@@ -4,6 +4,7 @@ import { E } from '@endo/far';
 
 /**
  * @import {InvitationDetails, PaymentPKeywordRecord, Proposal, UserSeat} from '@agoric/zoe';
+ * @import {ERef} from '@agoric/vow';
  */
 
 /**

package/src/cachedBundleSpec.js

@@ -1,13 +1,20 @@
 import { Fail } from '@endo/errors';
+import { writeFileAtomic } from '@agoric/internal/src/build-cache.js';
+
+/**
+ * @import {promises} from 'fs';
+ * @import {resolve} from 'path';
+ * @import {BundleSourceResult} from '@endo/bundle-source';
+ */
 
 /**
  * @param {string} cacheDir
- * @param {{ now: typeof Date.now, fs: import('fs').promises, pathResolve: typeof import('path').resolve }} param1
+ * @param {{ now: typeof Date.now, fs: promises, pathResolve: typeof resolve, pid?: number }} param1
  */
 export const makeCacheAndGetBundleSpec =
-  (cacheDir, { now, fs, pathResolve }) =>
+  (cacheDir, { now, fs, pathResolve, pid = process.pid }) =>
   /**
-   * @param {Promise<import('@endo/bundle-source').BundleSourceResult<'endoZipBase64'>>} bundleP
+   * @param {Promise<BundleSourceResult<'endoZipBase64'>>} bundleP
    */
   async bundleP => {
     const bundle = await bundleP;
@@ -24,12 +31,13 @@ export const makeCacheAndGetBundleSpec =
       if (e.code !== 'ENOENT') {
         throw e;
       }
-      // FIXME: We could take a hard dependency on `tmp` here, but is it worth it?
-      const tmpFile = `${cacheFile}.${now()}`;
-      await fs.writeFile(tmpFile, JSON.stringify(bundle, null, 2), {
-        flag: 'wx',
+      await writeFileAtomic({
+        fs,
+        filePath: cacheFile,
+        data: JSON.stringify(bundle, null, 2),
+        now,
+        pid,
       });
-      await fs.rename(tmpFile, cacheFile);
     }
     return harden({ bundleID, fileName: cacheFile });
   };

package/src/control/attenuated-deposit.core.js

@@ -0,0 +1,55 @@
+/**
+ * @file Get a promise for a deposit facet without
+ * access to all of namesByAddressAdmin.
+ */
+
+import { E } from '@endo/eventual-send';
+
+const trace = (...args) => console.log('---- AttD', ...args);
+
+/**
+ * @import {DepositFacet} from '@agoric/ertp';
+ * @import {BootstrapPowers, PromiseSpaceOf} from '@agoric/vats/src/core/types.js';
+ */
+const depositFacetKey = 'depositFacet';
+
+/**
+ * XXX move this into BootstrapPowers
+ * @typedef {PromiseSpaceOf<{
+ *   getDepositFacet: (addr: string, debugName?: string) => Promise<DepositFacet>
+ * }>} AttenuatedDepositPowers
+ */
+
+/**
+ * @param {BootstrapPowers & AttenuatedDepositPowers} powers
+ */
+export const produceAttenuatedDeposit = powers => {
+  powers.produce.getDepositFacet.reset();
+  const { namesByAddress, namesByAddressAdmin } = powers.consume;
+
+  /**
+   *
+   * @param {string} addr
+   * @param {string} [debugName]
+   */
+  const getDepositFacet = async (addr, debugName = 'party') => {
+    trace('reserve nameHub for', debugName, addr);
+    await E(namesByAddressAdmin).reserve(addr);
+    trace('lookup depositFacet for', debugName, addr);
+    const df = await E(namesByAddress).lookup(addr, depositFacetKey);
+    trace('got depositFacet for', debugName, addr);
+    return df;
+  };
+  harden(getDepositFacet);
+
+  powers.produce.getDepositFacet.resolve(getDepositFacet);
+};
+
+export const getManifestForAttenuatedDeposit = () => ({
+  manifest: {
+    [produceAttenuatedDeposit.name]: {
+      consume: { namesByAddress: true, namesByAddressAdmin: true },
+      produce: { getDepositFacet: true },
+    },
+  },
+});

package/src/control/chain-info.core.js

@@ -0,0 +1,187 @@
+import { makeTracer } from '@agoric/internal';
+import { registerChain } from '@agoric/orchestration/src/chain-info.js';
+import { Fail } from '@endo/errors';
+import { E, Far } from '@endo/far';
+import { makeMarshal } from '@endo/marshal';
+
+// TODO: refactor overlap with init-chain-info.js in orch pkg
+
+/**
+ * @import {Remote, ERemote} from '@agoric/internal';
+ * @import {ChainInfo} from '@agoric/orchestration';
+ * @import {NameHub, NameAdmin} from '@agoric/vats';
+ * @typedef {Record<string, { chainInfo: ChainInfo }>} AxelarChainConfigMap
+ * @import {ERef} from '@endo/eventual-send';
+ * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {PromiseSpaceOf} from '@agoric/vats/src/core/types.js';
+ * @import {BootstrapPowers} from '@agoric/vats/src/core/types.js';
+ */
+
+const trace = makeTracer('ChainInfoCore', true);
+
+// chainInfo has no cap data but we need to marshal bigints
+const marshalData = makeMarshal(_val => Fail`data only`);
+
+// See also: exos/chain-hub. Consistency is enforced by test.
+export const HubName = {
+  Chain: 'chain',
+  ChainConnection: 'chainConnection',
+  ChainAssets: 'chainAssets',
+};
+
+/**
+ * Similar to publishAgoricNamesToChainStorage but publishes a node per chain
+ * instead of one list of entries
+ */
+
+/**
+ * For each HubName, provide a NameHubKit reflected into vstorage unless there's
+ * already an agorcNames key by that name.
+ *
+ * @param {ERef<NameAdmin>} agoricNamesAdmin
+ * @param {ERemote<StorageNode>} agoricNamesNode
+ * @param {ERef<NameHub>} agoricNames
+ */
+const publishChainInfoToChainStorage = async (
+  agoricNamesAdmin,
+  agoricNamesNode,
+  agoricNames,
+) => {
+  /**
+   * @param {string} subpath
+   */
+  const echoNameUpdates = async subpath => {
+    trace('reflecting', subpath, 'from agoricNames to vstorage');
+    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) {
+          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]);
+          }
+        },
+      }),
+    );
+  };
+  const existingKeys = await E(agoricNames).keys();
+  await Promise.all(
+    Object.values(HubName)
+      .filter(k => !existingKeys.includes(k))
+      .map(echoNameUpdates),
+  );
+};
+
+/**
+ * null chainStorage case is vestigial
+ *
+ * @typedef {{ consume: { chainStorage: Promise<Remote<StorageNode>> } }} ChainStoragePresent
+ */
+
+/**
+ * XXX move this into BootstrapPowers
+ * @typedef {PromiseSpaceOf<{
+ *   chainInfoPublished: unknown
+ * }>} ChainInfoPowers
+ */
+
+/**
+ * WARNING: prunes any data that was previously published
+ *
+ * @param {BootstrapPowers & ChainStoragePresent & ChainInfoPowers} powers
+ * @param {{
+ *   options: {
+ *     chainInfo?: Record<string, ChainInfo>;
+ *     axelarConfig: AxelarChainConfigMap;
+ *   };
+ * }} config
+ */
+export const publishChainInfo = async (
+  {
+    consume: { agoricNames, agoricNamesAdmin, chainStorage },
+    produce: { chainInfoPublished },
+  },
+  config,
+) => {
+  const { keys } = Object;
+  const { chainInfo = {} } = config.options;
+  trace('publishChainInfo', keys(chainInfo));
+
+  const agoricNamesNode = E(chainStorage).makeChildNode('agoricNames');
+
+  // Ensure updates go to vstorage
+  await publishChainInfoToChainStorage(
+    agoricNamesAdmin,
+    agoricNamesNode,
+    agoricNames,
+  );
+
+  for (const kind of Object.values(HubName)) {
+    const hub = E(agoricNames).lookup(kind);
+    /** @type {string[]} */
+    const oldKeys = await E(hub).keys();
+    trace('clearing old', kind, oldKeys);
+    if (!oldKeys.length) continue;
+
+    const admin = E(agoricNamesAdmin).lookupAdmin(kind);
+    await Promise.all(oldKeys.map(k => E(admin).delete(k)));
+    const node = E(agoricNamesNode).makeChildNode(kind);
+    // XXX setValue('') deletes a vstorage key (right?)
+    await Promise.all(
+      oldKeys.map(k =>
+        E(E(node).makeChildNode(k, { sequence: false })).setValue(''),
+      ),
+    );
+  }
+
+  const handledConnections = new Set();
+  for await (const [name, info] of Object.entries(chainInfo)) {
+    await registerChain(
+      agoricNamesAdmin,
+      name,
+      info,
+      trace,
+      handledConnections,
+    );
+    trace('@@@registered', name, info);
+  }
+  trace('@@@conn', ...handledConnections);
+
+  chainInfoPublished.resolve(true);
+  trace('publishChainInfo done');
+};
+harden(publishChainInfo);
+
+export const getManifestForChainInfo = (_u, { options }) => ({
+  manifest: {
+    [publishChainInfo.name]: {
+      consume: {
+        agoricNames: true,
+        agoricNamesAdmin: true,
+        chainStorage: true,
+      },
+      produce: { chainInfoPublished: true },
+    },
+  },
+  options,
+});

package/src/control/contract-control.build.js

@@ -0,0 +1,27 @@
+/**
+ * @import { CoreEvalBuilder, DeployScriptFunction } from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+import { makeHelpers } from '../helpers.js';
+import { getManifestForDeliverContractControl } from './contract-control.core.js';
+
+const sourceSpec = './contract-control.core.js';
+
+/**
+ * @satisfies {CoreEvalBuilder}
+ */
+const defaultProposalBuilder = async () => {
+  return harden({
+    sourceSpec,
+    getManifestCall: [getManifestForDeliverContractControl.name],
+  });
+};
+
+/** @type {DeployScriptFunction} */
+const build = async (homeP, endowments) => {
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+
+  await writeCoreEval('eval-contract-control', () => defaultProposalBuilder());
+};
+harden(build);
+export default build;