@agoric/builders 0.1.1-upgrade-16-dev-d45b478.0 → 0.1.1-upgrade-16-dev-0549112.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/builders",
-  "version": "0.1.1-upgrade-16-dev-d45b478.0+d45b478",
+  "version": "0.1.1-upgrade-16-dev-0549112.0+0549112",
   "description": "Build scripts for proposals to an Agoric chain",
   "type": "module",
   "main": "./index.js",
@@ -23,13 +23,13 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-upgrade-16-dev-d45b478.0+d45b478",
-    "@agoric/internal": "0.3.3-upgrade-16-dev-d45b478.0+d45b478",
-    "@agoric/notifier": "0.6.3-upgrade-16-dev-d45b478.0+d45b478",
-    "@agoric/smart-wallet": "0.5.4-upgrade-16-dev-d45b478.0+d45b478",
-    "@agoric/vat-data": "0.5.3-upgrade-16-dev-d45b478.0+d45b478",
-    "@agoric/vats": "0.15.2-upgrade-16-dev-d45b478.0+d45b478",
-    "@agoric/zoe": "0.26.3-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/ertp": "0.16.3-upgrade-16-dev-0549112.0+0549112",
+    "@agoric/internal": "0.3.3-upgrade-16-dev-0549112.0+0549112",
+    "@agoric/notifier": "0.6.3-upgrade-16-dev-0549112.0+0549112",
+    "@agoric/smart-wallet": "0.5.4-upgrade-16-dev-0549112.0+0549112",
+    "@agoric/vat-data": "0.5.3-upgrade-16-dev-0549112.0+0549112",
+    "@agoric/vats": "0.15.2-upgrade-16-dev-0549112.0+0549112",
+    "@agoric/zoe": "0.26.3-upgrade-16-dev-0549112.0+0549112",
     "@endo/bundle-source": "^3.2.3",
     "@endo/captp": "^4.2.0",
     "@endo/eventual-send": "^1.2.2",
@@ -41,14 +41,14 @@
     "import-meta-resolve": "^2.2.1"
   },
   "devDependencies": {
-    "@agoric/assert": "0.6.1-upgrade-16-dev-d45b478.0+d45b478",
-    "@agoric/deploy-script-support": "0.10.4-upgrade-16-dev-d45b478.0+d45b478",
-    "@agoric/governance": "0.10.4-upgrade-16-dev-d45b478.0+d45b478",
-    "@agoric/inter-protocol": "0.16.2-upgrade-16-dev-d45b478.0+d45b478",
-    "@agoric/store": "0.9.3-upgrade-16-dev-d45b478.0+d45b478",
-    "@agoric/swing-store": "0.9.2-upgrade-16-dev-d45b478.0+d45b478",
-    "@agoric/swingset-liveslots": "0.10.3-upgrade-16-dev-d45b478.0+d45b478",
-    "@agoric/time": "0.3.3-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/assert": "0.6.1-upgrade-16-dev-0549112.0+0549112",
+    "@agoric/deploy-script-support": "0.10.4-upgrade-16-dev-0549112.0+0549112",
+    "@agoric/governance": "0.10.4-upgrade-16-dev-0549112.0+0549112",
+    "@agoric/inter-protocol": "0.16.2-upgrade-16-dev-0549112.0+0549112",
+    "@agoric/store": "0.9.3-upgrade-16-dev-0549112.0+0549112",
+    "@agoric/swing-store": "0.9.2-upgrade-16-dev-0549112.0+0549112",
+    "@agoric/swingset-liveslots": "0.10.3-upgrade-16-dev-0549112.0+0549112",
+    "@agoric/time": "0.3.3-upgrade-16-dev-0549112.0+0549112",
     "ava": "^5.3.0",
     "c8": "^9.1.0"
   },
@@ -80,5 +80,5 @@
   "typeCoverage": {
     "atLeast": 74.36
   },
-  "gitHead": "d45b478fe2dd21ff463660522e1998ab3e8bbe65"
+  "gitHead": "05491122ee61362c8310a7924ac67f033b02e38f"
 }

package/scripts/vats/priceFeedSupport.js

@@ -2,41 +2,33 @@
 
 import { DEFAULT_CONTRACT_TERMS } from '../inter-protocol/price-feed-core.js';
 
-const ORACLE_ADDRESSES = [
-  // XXX These are the oracle addresses. They must be provided before the chain
-  // is running, which means they must be known ahead of time.
-  // see https://github.com/Agoric/agoric-3-proposals/issues/5
-  'agoric1lu9hh5vgx05hmlpfu47hukershgdxctk6l5s05',
-  'agoric15lpnq2mjsdhtztf6khp7mrsq66hyrssspy92pd',
-  'agoric1mwm224epc4l3pjcz7qsxnudcuktpynwkmnfqfp',
-];
+const { Fail } = assert;
 
 /**
  * modified copy of ../inter-protocol/price-feed-core.js
  *
  * @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder}
  */
-export const priceFeedProposalBuilder = async (
+export const strictPriceFeedProposalBuilder = async (
   { publishRef, install },
-  options = {},
+  options,
 ) => {
   const {
     AGORIC_INSTANCE_NAME,
     IN_BRAND_LOOKUP,
     IN_BRAND_NAME = IN_BRAND_LOOKUP[IN_BRAND_LOOKUP.length - 1],
+    ORACLE_ADDRESSES,
   } = options;
 
-  const { GOV1ADDR, GOV2ADDR, GOV3ADDR } = process.env;
-  const oracleAddresses =
-    GOV1ADDR || GOV2ADDR || GOV3ADDR
-      ? [GOV1ADDR, GOV2ADDR, GOV3ADDR].filter(x => x)
-      : ORACLE_ADDRESSES;
-  assert(Array.isArray(oracleAddresses), 'oracleAddresses array is required');
+  const oracleAddresses = ORACLE_ADDRESSES;
+  Array.isArray(oracleAddresses) ||
+    Fail`ORACLE_ADDRESSES array is required; got ${oracleAddresses}`;
 
-  assert(AGORIC_INSTANCE_NAME, 'AGORIC_INSTANCE_NAME is required');
+  AGORIC_INSTANCE_NAME ||
+    Fail`AGORIC_INSTANCE_NAME is required; got ${AGORIC_INSTANCE_NAME}`;
 
-  assert.equal(IN_BRAND_LOOKUP[0], 'agoricNames');
-  assert(IN_BRAND_NAME, 'brandIn is required');
+  Array.isArray(IN_BRAND_LOOKUP) ||
+    Fail`IN_BRAND_NAME array is required; got ${IN_BRAND_LOOKUP}`;
 
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/price-feed-proposal.js',
@@ -60,3 +52,39 @@ export const priceFeedProposalBuilder = async (
     ],
   });
 };
+
+/**
+ * @deprecated use `strictPriceFeedProposalBuilder` and specify arguments instead
+ * @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder}
+ */
+export const deprecatedPriceFeedProposalBuilder = async (powers, options) => {
+  console.warn(
+    'deprecated ambient `priceFeedProposalBuilder`; use `strictPriceFeedProposalBuilder` instead',
+  );
+
+  const DEFAULT_ORACLE_ADDRESSES = [
+    // XXX These are the oracle addresses. They must be provided before the chain
+    // is running, which means they must be known ahead of time.
+    // see https://github.com/Agoric/agoric-3-proposals/issues/5
+    'agoric1lu9hh5vgx05hmlpfu47hukershgdxctk6l5s05',
+    'agoric15lpnq2mjsdhtztf6khp7mrsq66hyrssspy92pd',
+    'agoric1mwm224epc4l3pjcz7qsxnudcuktpynwkmnfqfp',
+  ];
+
+  const { GOV1ADDR, GOV2ADDR, GOV3ADDR } = process.env;
+  const governanceAddressEnv = [GOV1ADDR, GOV2ADDR, GOV3ADDR].filter(x => x);
+  const ORACLE_ADDRESSES = governanceAddressEnv.length
+    ? governanceAddressEnv
+    : DEFAULT_ORACLE_ADDRESSES;
+
+  return strictPriceFeedProposalBuilder(powers, {
+    ...options,
+    ORACLE_ADDRESSES,
+  });
+};
+
+/**
+ * @deprecated use `strictPriceFeedProposalBuilder` and specify arguments instead
+ * @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder}
+ */
+export const priceFeedProposalBuilder = deprecatedPriceFeedProposalBuilder;

package/scripts/vats/revive-kread.js

@@ -0,0 +1,13 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async () =>
+  harden({
+    sourceSpec: '@agoric/vats/src/proposals/kread-proposal.js',
+    getManifestCall: ['getManifestForKread'],
+  });
+
+export default async (homeP, endowments) => {
+  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
+  await writeCoreProposal('revive-kread', defaultProposalBuilder);
+};

package/scripts/vats/updateStAtomPriceFeed.js

@@ -3,7 +3,7 @@ import { priceFeedProposalBuilder } from './priceFeedSupport.js';
 
 const OPTIONS = {
   AGORIC_INSTANCE_NAME: 'stATOM-USD price feed',
-  IN_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'stAtom'],
+  IN_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'stATOM'],
   OUT_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'USD'],
 };
 

package/scripts/vats/updateStkAtomPriceFeed.js

@@ -3,7 +3,7 @@ import { priceFeedProposalBuilder } from './priceFeedSupport.js';
 
 const OPTIONS = {
   AGORIC_INSTANCE_NAME: 'stkATOM-USD price feed',
-  IN_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'stkAtom'],
+  IN_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'stkATOM'],
   OUT_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'USD'],
 };
 

package/scripts/orchestration/init-stakeAtom.js

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

package/scripts/orchestration/init-stakeBld.js

@@ -1,23 +0,0 @@
-// @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/vats/init-orchestration.js

@@ -1,20 +0,0 @@
-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/orchestration-proposal.js',
-    getManifestCall: [
-      'getManifestForOrchestration',
-      {
-        orchestrationRef: publishRef(
-          install('@agoric/orchestration/src/vat-orchestration.js'),
-        ),
-      },
-    ],
-  });
-
-export default async (homeP, endowments) => {
-  const { writeCoreEval } = await makeHelpers(homeP, endowments);
-  await writeCoreEval('gov-orchestration', defaultProposalBuilder);
-};