@agoric/builders 0.1.1-upgrade-16-dev-91eb8f4.0 → 0.1.1-upgrade-17-dev-e67cd91.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/builders",
-  "version": "0.1.1-upgrade-16-dev-91eb8f4.0+91eb8f4",
+  "version": "0.1.1-upgrade-17-dev-e67cd91.0+e67cd91",
   "description": "Build scripts for proposals to an Agoric chain",
   "type": "module",
   "main": "./index.js",
@@ -23,32 +23,33 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-upgrade-16-dev-91eb8f4.0+91eb8f4",
-    "@agoric/internal": "0.3.3-upgrade-16-dev-91eb8f4.0+91eb8f4",
-    "@agoric/notifier": "0.6.3-upgrade-16-dev-91eb8f4.0+91eb8f4",
-    "@agoric/smart-wallet": "0.5.4-upgrade-16-dev-91eb8f4.0+91eb8f4",
-    "@agoric/vat-data": "0.5.3-upgrade-16-dev-91eb8f4.0+91eb8f4",
-    "@agoric/vats": "0.15.2-upgrade-16-dev-91eb8f4.0+91eb8f4",
-    "@agoric/zoe": "0.26.3-upgrade-16-dev-91eb8f4.0+91eb8f4",
-    "@endo/bundle-source": "^3.2.3",
-    "@endo/captp": "^4.2.0",
-    "@endo/eventual-send": "^1.2.2",
-    "@endo/far": "^1.1.2",
-    "@endo/init": "^1.1.2",
-    "@endo/marshal": "^1.5.0",
-    "@endo/promise-kit": "^1.1.2",
-    "@endo/stream": "^1.2.2",
+    "@agoric/ertp": "0.16.3-upgrade-17-dev-e67cd91.0+e67cd91",
+    "@agoric/internal": "0.3.3-upgrade-17-dev-e67cd91.0+e67cd91",
+    "@agoric/notifier": "0.6.3-upgrade-17-dev-e67cd91.0+e67cd91",
+    "@agoric/smart-wallet": "0.5.4-upgrade-17-dev-e67cd91.0+e67cd91",
+    "@agoric/vat-data": "0.5.3-upgrade-17-dev-e67cd91.0+e67cd91",
+    "@agoric/vats": "0.15.2-upgrade-17-dev-e67cd91.0+e67cd91",
+    "@agoric/zoe": "0.26.3-upgrade-17-dev-e67cd91.0+e67cd91",
+    "@endo/bundle-source": "^3.4.0",
+    "@endo/captp": "^4.3.0",
+    "@endo/eventual-send": "^1.2.5",
+    "@endo/far": "^1.1.5",
+    "@endo/init": "^1.1.4",
+    "@endo/marshal": "^1.5.3",
+    "@endo/promise-kit": "^1.1.5",
+    "@endo/stream": "^1.2.5",
     "import-meta-resolve": "^2.2.1"
   },
   "devDependencies": {
-    "@agoric/assert": "0.6.1-upgrade-16-dev-91eb8f4.0+91eb8f4",
-    "@agoric/deploy-script-support": "0.10.4-upgrade-16-dev-91eb8f4.0+91eb8f4",
-    "@agoric/governance": "0.10.4-upgrade-16-dev-91eb8f4.0+91eb8f4",
-    "@agoric/inter-protocol": "0.16.2-upgrade-16-dev-91eb8f4.0+91eb8f4",
-    "@agoric/store": "0.9.3-upgrade-16-dev-91eb8f4.0+91eb8f4",
-    "@agoric/swing-store": "0.9.2-upgrade-16-dev-91eb8f4.0+91eb8f4",
-    "@agoric/swingset-liveslots": "0.10.3-upgrade-16-dev-91eb8f4.0+91eb8f4",
-    "@agoric/time": "0.3.3-upgrade-16-dev-91eb8f4.0+91eb8f4",
+    "@agoric/deploy-script-support": "0.10.4-upgrade-17-dev-e67cd91.0+e67cd91",
+    "@agoric/governance": "0.10.4-upgrade-17-dev-e67cd91.0+e67cd91",
+    "@agoric/inter-protocol": "0.16.2-upgrade-17-dev-e67cd91.0+e67cd91",
+    "@agoric/orchestration": "0.1.1-upgrade-17-dev-e67cd91.0+e67cd91",
+    "@agoric/store": "0.9.3-upgrade-17-dev-e67cd91.0+e67cd91",
+    "@agoric/swing-store": "0.9.2-upgrade-17-dev-e67cd91.0+e67cd91",
+    "@agoric/swingset-liveslots": "0.10.3-upgrade-17-dev-e67cd91.0+e67cd91",
+    "@agoric/time": "0.3.3-upgrade-17-dev-e67cd91.0+e67cd91",
+    "@endo/errors": "^1.2.5",
     "ava": "^5.3.0",
     "c8": "^9.1.0"
   },
@@ -78,7 +79,7 @@
     "workerThreads": false
   },
   "typeCoverage": {
-    "atLeast": 74.36
+    "atLeast": 81.8
   },
-  "gitHead": "91eb8f468c6ac5e9c4892633855eac3db365001d"
+  "gitHead": "e67cd918f33dafb1708bd4341f2a737b79fa574f"
 }

package/scripts/inter-protocol/add-STARS.js

@@ -3,7 +3,7 @@ import { defaultProposalBuilder as vaultProposalBuilder } from './add-collateral
 import { defaultProposalBuilder as oraclesProposalBuilder } from './price-feed-core.js';
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
-export const starsVaultProposalBuilder = async powers => {
+const starsVaultProposalBuilder = async powers => {
   return vaultProposalBuilder(powers, {
     interchainAssetOptions: {
       // Values for the Stargaze token on Osmosis
@@ -18,7 +18,7 @@ export const starsVaultProposalBuilder = async powers => {
 };
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
-export const starsOraclesProposalBuilder = async powers => {
+const starsOraclesProposalBuilder = async powers => {
   return oraclesProposalBuilder(powers, {
     AGORIC_INSTANCE_NAME: `STARS-USD price feed`,
     IN_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'STARS'],

package/scripts/inter-protocol/manual-price-feed.js

@@ -48,6 +48,7 @@ export default async function priceAuthorityFromNotifier(
 
   if (!aggregatorInstance) {
     console.log('Autodetecting aggregator instance...');
+    // @ts-expect-error inspecific Home type
     const purse = E(home.wallet).getPurse('Default Zoe invite purse');
     const { value } = await E(purse).getCurrentAmount();
     const invitations = value.filter(
@@ -81,6 +82,7 @@ export default async function priceAuthorityFromNotifier(
   };
 
   console.log('Getting wallet bridge...');
+  // @ts-expect-error inspecific Home type
   const bridge = await E(home.wallet).getBridge();
 
   // Consume an aggregator invitation for this instance.
@@ -94,6 +96,7 @@ export default async function priceAuthorityFromNotifier(
       () => {},
     );
 
+  // @ts-expect-error inspecific Home type
   const walletAdmin = E(home.wallet).getAdminFacet();
 
   console.log('=====================================================');
@@ -111,6 +114,7 @@ export default async function priceAuthorityFromNotifier(
         const orKey = `offerResult ${id}`;
         await E(home.scratch).set(
           orKey,
+          // @ts-expect-error inspecific Home type
           E(home.wallet).lookup('offerResult', id),
         );
         console.log(

package/scripts/orchestration/init-basic-flows.js

@@ -0,0 +1,26 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+import { startBasicFlows } from '@agoric/orchestration/src/proposals/start-basic-flows.js';
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async ({ publishRef, install }) => {
+  return harden({
+    sourceSpec: '@agoric/orchestration/src/proposals/start-basic-flows.js',
+    getManifestCall: [
+      'getManifestForContract',
+      {
+        installKeys: {
+          basicFlows: publishRef(
+            install(
+              '@agoric/orchestration/src/examples/basic-flows.contract.js',
+            ),
+          ),
+        },
+      },
+    ],
+  });
+};
+
+export default async (homeP, endowments) => {
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval(startBasicFlows.name, defaultProposalBuilder);
+};

package/scripts/orchestration/init-stakeAtom.js

@@ -0,0 +1,23 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async ({ publishRef, install }) => {
+  return harden({
+    sourceSpec: '@agoric/orchestration/src/proposals/start-stakeAtom.js',
+    getManifestCall: [
+      'getManifestForStakeAtom',
+      {
+        installKeys: {
+          stakeIca: publishRef(
+            install('@agoric/orchestration/src/examples/stakeIca.contract.js'),
+          ),
+        },
+      },
+    ],
+  });
+};
+
+export default async (homeP, endowments) => {
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('start-stakeAtom', defaultProposalBuilder);
+};

package/scripts/orchestration/init-stakeBld.js

@@ -0,0 +1,23 @@
+// @ts-check
+import { makeHelpers } from '@agoric/deploy-script-support';
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async ({ publishRef, install }) =>
+  harden({
+    sourceSpec: '@agoric/orchestration/src/proposals/start-stakeBld.js',
+    getManifestCall: [
+      'getManifestForStakeBld',
+      {
+        installKeys: {
+          stakeBld: publishRef(
+            install('@agoric/orchestration/src/examples/stakeBld.contract.js'),
+          ),
+        },
+      },
+    ],
+  });
+
+export default async (homeP, endowments) => {
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('start-stakeBld', defaultProposalBuilder);
+};

package/scripts/orchestration/init-stakeOsmo.js

@@ -0,0 +1,23 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async ({ publishRef, install }) => {
+  return harden({
+    sourceSpec: '@agoric/orchestration/src/proposals/start-stakeOsmo.js',
+    getManifestCall: [
+      'getManifestForStakeOsmo',
+      {
+        installKeys: {
+          stakeIca: publishRef(
+            install('@agoric/orchestration/src/examples/stakeIca.contract.js'),
+          ),
+        },
+      },
+    ],
+  });
+};
+
+export default async (homeP, endowments) => {
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('start-stakeOsmo', defaultProposalBuilder);
+};

package/scripts/smart-wallet/build-game1-start.js

@@ -9,7 +9,7 @@ import { makeHelpers } from '@agoric/deploy-script-support';
 import { getManifestForGame1 } from '@agoric/smart-wallet/test/start-game1-proposal.js';
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
-export const game1ProposalBuilder = async ({ publishRef, install }) => {
+const game1ProposalBuilder = async ({ publishRef, install }) => {
   return harden({
     sourceSpec: '@agoric/smart-wallet/test/start-game1-proposal.js',
     getManifestCall: [

package/scripts/testing/add-LEMONS.js

@@ -0,0 +1,23 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+import { defaultProposalBuilder as vaultProposalBuilder } from '../inter-protocol/add-collateral-core.js';
+
+/** @file This is for use in tests in a3p-integration */
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+const starsVaultProposalBuilder = async powers => {
+  return vaultProposalBuilder(powers, {
+    interchainAssetOptions: {
+      denom: 'ibc/000C0FFEECAFE000',
+      decimalPlaces: 6,
+      keyword: 'LEMONS',
+
+      oracleBrand: 'LEMONS',
+      proposedName: 'LEMONS',
+    },
+  });
+};
+
+export default async (homeP, endowments) => {
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('add-STARS-collateral', starsVaultProposalBuilder);
+};

package/scripts/testing/add-OLIVES.js

@@ -0,0 +1,22 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+import { defaultProposalBuilder as vaultProposalBuilder } from '../inter-protocol/add-collateral-core.js';
+
+/** @file This is for use in tests in a3p-integration */
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+const stars2VaultProposalBuilder = async powers => {
+  return vaultProposalBuilder(powers, {
+    interchainAssetOptions: {
+      denom: 'ibc/111C0FFEECAFE111',
+      decimalPlaces: 6,
+      keyword: 'OLIVES',
+      oracleBrand: 'OLIVES',
+      proposedName: 'OLIVES',
+    },
+  });
+};
+
+export default async (homeP, endowments) => {
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('add-STARS2-collateral', stars2VaultProposalBuilder);
+};

package/scripts/testing/append-chain-info.js

@@ -0,0 +1,50 @@
+/// <reference types="ses" />
+import { makeHelpers } from '@agoric/deploy-script-support';
+
+/** @type {Record<string, import('@agoric/orchestration/src/chain-info.js').ChainInfo>} */
+const chainInfo = {
+  hot: {
+    allegedName: 'Hot New Chain',
+    chainId: 'hot-1',
+    connections: {
+      'cosmoshub-4': {
+        id: 'connection-99',
+        client_id: '07-tendermint-3',
+        counterparty: {
+          client_id: '07-tendermint-2',
+          connection_id: 'connection-1',
+          prefix: {
+            key_prefix: '',
+          },
+        },
+        state: 3 /* IBCConnectionState.STATE_OPEN */,
+        transferChannel: {
+          portId: 'transfer',
+          channelId: 'channel-1',
+          counterPartyChannelId: 'channel-1',
+          counterPartyPortId: 'transfer',
+          ordering: 1 /* Order.ORDER_UNORDERED */,
+          state: 3 /* IBCConnectionState.STATE_OPEN */,
+          version: 'ics20-1',
+        },
+      },
+    },
+  },
+};
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async () =>
+  harden({
+    sourceSpec: '@agoric/orchestration/src/proposals/revise-chain-info.js',
+    getManifestCall: [
+      'getManifestForReviseChains',
+      {
+        chainInfo,
+      },
+    ],
+  });
+
+export default async (homeP, endowments) => {
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('revise-chain-info', defaultProposalBuilder);
+};

package/scripts/testing/restart-basic-flows.js

@@ -0,0 +1,100 @@
+/**
+ * @file This is for use in tests.
+ * Unlike most builder scripts, this one includes the proposal exports as well.
+ */
+import {
+  deeplyFulfilledObject,
+  makeTracer,
+  NonNullish,
+} from '@agoric/internal';
+import { E } from '@endo/far';
+
+/// <reference types="@agoric/vats/src/core/types-ambient"/>
+
+const trace = makeTracer('RestartBasicFlows', true);
+
+/**
+ * @import {start as StartFn} from '@agoric/orchestration/src/examples/basic-flows.contract.js';
+ */
+
+/**
+ * @param {BootstrapPowers} powers
+ */
+export const restartBasicFlows = async ({
+  consume: {
+    agoricNames,
+    board,
+    chainStorage,
+    chainTimerService,
+    cosmosInterchainService,
+    localchain,
+
+    contractKits,
+  },
+  instance: instances,
+}) => {
+  trace(restartBasicFlows.name);
+
+  // @ts-expect-error unknown instance
+  const instance = await instances.consume.basicFlows;
+  trace('instance', instance);
+  /** @type {StartedInstanceKit<StartFn>} */
+  const kit = /** @type {any} */ (await E(contractKits).get(instance));
+
+  const marshaller = await E(board).getReadonlyMarshaller();
+
+  const privateArgs = await deeplyFulfilledObject(
+    harden({
+      agoricNames,
+      localchain,
+      marshaller,
+      orchestrationService: cosmosInterchainService,
+      storageNode: E(NonNullish(await chainStorage)).makeChildNode(
+        'basicFlows',
+      ),
+      timerService: chainTimerService,
+    }),
+  );
+
+  await E(kit.adminFacet).restartContract(privateArgs);
+  trace('done');
+};
+harden(restartBasicFlows);
+
+export const getManifest = () => {
+  return {
+    manifest: {
+      [restartBasicFlows.name]: {
+        consume: {
+          agoricNames: true,
+          board: true,
+          chainStorage: true,
+          chainTimerService: true,
+          cosmosInterchainService: true,
+          localchain: true,
+
+          contractKits: true,
+        },
+        instance: {
+          consume: { basicFlows: true },
+        },
+      },
+    },
+  };
+};
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async () =>
+  harden({
+    // Somewhat unorthodox, source the exports from this builder module
+    sourceSpec: '@agoric/builders/scripts/testing/restart-basic-flows.js',
+    getManifestCall: [getManifest.name],
+  });
+
+export default async (homeP, endowments) => {
+  // import dynamically so the module can work in CoreEval environment
+  const dspModule = await import('@agoric/deploy-script-support');
+  const { makeHelpers } = dspModule;
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval(restartBasicFlows.name, defaultProposalBuilder);
+};

package/scripts/testing/restart-send-anywhere.js

@@ -0,0 +1,100 @@
+/**
+ * @file This is for use in tests in a3p-integration
+ * Unlike most builder scripts, this one includes the proposal exports as well.
+ */
+import {
+  deeplyFulfilledObject,
+  makeTracer,
+  NonNullish,
+} from '@agoric/internal';
+import { E } from '@endo/far';
+
+/// <reference types="@agoric/vats/src/core/types-ambient"/>
+
+const trace = makeTracer('StartSA', true);
+
+/**
+ * @import {start as StartFn} from '@agoric/orchestration/src/examples/send-anywhere.contract.js';
+ */
+
+/**
+ * @param {BootstrapPowers} powers
+ */
+export const restartSendAnywhere = async ({
+  consume: {
+    agoricNames,
+    board,
+    chainStorage,
+    chainTimerService,
+    cosmosInterchainService,
+    localchain,
+
+    contractKits,
+  },
+  instance: instances,
+}) => {
+  trace(restartSendAnywhere.name);
+
+  // @ts-expect-error unknown instance
+  const instance = await instances.consume.sendAnywhere;
+  trace('instance', instance);
+  /** @type {StartedInstanceKit<StartFn>} */
+  const kit = /** @type {any} */ (await E(contractKits).get(instance));
+
+  const marshaller = await E(board).getReadonlyMarshaller();
+
+  const privateArgs = await deeplyFulfilledObject(
+    harden({
+      agoricNames,
+      localchain,
+      marshaller,
+      orchestrationService: cosmosInterchainService,
+      storageNode: E(NonNullish(await chainStorage)).makeChildNode(
+        'sendAnywhere',
+      ),
+      timerService: chainTimerService,
+    }),
+  );
+
+  await E(kit.adminFacet).restartContract(privateArgs);
+  trace('done');
+};
+harden(restartSendAnywhere);
+
+export const getManifest = () => {
+  return {
+    manifest: {
+      [restartSendAnywhere.name]: {
+        consume: {
+          agoricNames: true,
+          board: true,
+          chainStorage: true,
+          chainTimerService: true,
+          cosmosInterchainService: true,
+          localchain: true,
+
+          contractKits: true,
+        },
+        instance: {
+          consume: { sendAnywhere: true },
+        },
+      },
+    },
+  };
+};
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async () =>
+  harden({
+    // Somewhat unorthodox, source the exports from this builder module
+    sourceSpec: '@agoric/builders/scripts/testing/restart-send-anywhere.js',
+    getManifestCall: [getManifest.name],
+  });
+
+export default async (homeP, endowments) => {
+  // import dynamically so the module can work in CoreEval environment
+  const dspModule = await import('@agoric/deploy-script-support');
+  const { makeHelpers } = dspModule;
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval(restartSendAnywhere.name, defaultProposalBuilder);
+};

package/scripts/testing/restart-stakeAtom.js

@@ -0,0 +1,90 @@
+/**
+ * @file This is for use in tests in a3p-integration
+ * Unlike most builder scripts, this one includes the proposal exports as well.
+ */
+import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
+import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
+import { E } from '@endo/far';
+
+/// <reference types="@agoric/vats/src/core/types-ambient"/>
+
+const trace = makeTracer('RestartSA', true);
+
+/**
+ * @import {start as StartFn} from '@agoric/orchestration/src/examples/stakeIca.contract.js';
+ */
+
+/**
+ * @param {BootstrapPowers} powers
+ */
+export const restartStakeAtom = async ({
+  consume: {
+    agoricNames,
+    board,
+    chainStorage,
+    chainTimerService,
+    cosmosInterchainService,
+    contractKits,
+  },
+  instance: instances,
+}) => {
+  trace(restartStakeAtom.name);
+
+  const instance = await instances.consume.stakeAtom;
+  trace('instance', instance);
+
+  /** @type {StartedInstanceKit<StartFn>} */
+  const kit = /** @type {any} */ (await E(contractKits).get(instance));
+
+  const marshaller = await E(board).getReadonlyMarshaller();
+
+  const privateArgs = await deeplyFulfilledObject(
+    harden({
+      agoricNames,
+      cosmosInterchainService,
+      storageNode: makeStorageNodeChild(chainStorage, 'stakeAtom'),
+      marshaller,
+      timer: chainTimerService,
+    }),
+  );
+
+  await E(kit.adminFacet).restartContract(privateArgs);
+  trace('done');
+};
+harden(restartStakeAtom);
+
+export const getManifest = () => {
+  return {
+    manifest: {
+      [restartStakeAtom.name]: {
+        consume: {
+          agoricNames: true,
+          board: true,
+          chainStorage: true,
+          chainTimerService: true,
+          cosmosInterchainService: true,
+          contractKits: true,
+        },
+        instance: {
+          consume: { stakeAtom: true },
+        },
+      },
+    },
+  };
+};
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async () =>
+  harden({
+    // Somewhat unorthodox, source the exports from this builder module
+    sourceSpec: '@agoric/builders/scripts/testing/restart-stakeAtom.js',
+    getManifestCall: [getManifest.name],
+  });
+
+export default async (homeP, endowments) => {
+  // import dynamically so the module can work in CoreEval environment
+  const dspModule = await import('@agoric/deploy-script-support');
+  const { makeHelpers } = dspModule;
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval(restartStakeAtom.name, defaultProposalBuilder);
+};