@agoric/deploy-script-support 0.10.4-dev-68817f5.0.68817f5 → 0.10.4-dev-aa56b38.0.aa56b38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/deploy-script-support",
-  "version": "0.10.4-dev-68817f5.0.68817f5",
+  "version": "0.10.4-dev-aa56b38.0.aa56b38",
   "description": "Helpers and other support for writing deploy scripts",
   "type": "module",
   "main": "src/helpers.js",
@@ -34,14 +34,14 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-dev-68817f5.0.68817f5",
-    "@agoric/import-manager": "0.3.12-dev-68817f5.0.68817f5",
-    "@agoric/internal": "0.3.3-dev-68817f5.0.68817f5",
-    "@agoric/notifier": "0.6.3-dev-68817f5.0.68817f5",
-    "@agoric/pola-io": "0.1.1-dev-68817f5.0.68817f5",
-    "@agoric/store": "0.9.3-dev-68817f5.0.68817f5",
-    "@agoric/time": "0.3.3-dev-68817f5.0.68817f5",
-    "@agoric/zoe": "0.26.3-dev-68817f5.0.68817f5",
+    "@agoric/ertp": "0.16.3-dev-aa56b38.0.aa56b38",
+    "@agoric/import-manager": "0.3.12-dev-aa56b38.0.aa56b38",
+    "@agoric/internal": "0.3.3-dev-aa56b38.0.aa56b38",
+    "@agoric/notifier": "0.6.3-dev-aa56b38.0.aa56b38",
+    "@agoric/pola-io": "0.1.1-dev-aa56b38.0.aa56b38",
+    "@agoric/store": "0.9.3-dev-aa56b38.0.aa56b38",
+    "@agoric/time": "0.3.3-dev-aa56b38.0.aa56b38",
+    "@agoric/zoe": "0.26.3-dev-aa56b38.0.aa56b38",
     "@endo/base64": "^1.0.12",
     "@endo/bundle-source": "^4.1.2",
     "@endo/errors": "^1.2.13",
@@ -52,7 +52,7 @@
     "@endo/zip": "^1.0.11"
   },
   "devDependencies": {
-    "@agoric/vats": "0.15.2-dev-68817f5.0.68817f5",
+    "@agoric/vats": "0.15.2-dev-aa56b38.0.aa56b38",
     "@endo/init": "^1.1.12",
     "ava": "^5.3.0",
     "import-meta-resolve": "^4.1.0"
@@ -75,5 +75,5 @@
   "typeCoverage": {
     "atLeast": 83.14
   },
-  "gitHead": "68817f5dee5a74c1a68552af7787b5ee91f0e647"
+  "gitHead": "aa56b38413f86f364c891fb00bc67a7ca1b64bc0"
 }

package/src/getBundlerMaker.js

@@ -13,7 +13,11 @@
 import { E } from '@endo/far';
 import url from 'url';
 
-/** @typedef {ReturnType<typeof import('./endo-pieces-contract.js').start>['publicFacet']} BundleMaker */
+/**
+ * @import {start} from './endo-pieces-contract.js';
+ */
+
+/** @typedef {ReturnType<typeof start>['publicFacet']} BundleMaker */
 /** @typedef {ReturnType<BundleMaker['makeBundler']>} Bundler */
 
 export const makeGetBundlerMaker =

package/src/offer.js

@@ -3,6 +3,7 @@ import { assert } from '@endo/errors';
 import { E } from '@endo/far';
 // Avoid pulling in too many dependencies like notifiers
 import { AmountMath } from '@agoric/ertp/src/amountMath.js';
+import { objectMap } from '@agoric/internal';
 
 /**
  * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
@@ -53,17 +54,22 @@ export const makeOfferAndFindInvitationAmount = (
     return AmountMath.make(invitationAmount.brand, value);
   };
 
+  /**
+   * @param {Partial<ProposalRecord>} proposal
+   * @param {Record<Keyword, Petname>} paymentsWithPursePetnames
+   * @returns {Record<Keyword, ERef<Payment>>} payments
+   */
   const withdrawPayments = (proposal, paymentsWithPursePetnames) => {
-    return Object.fromEntries(
-      Object.entries(paymentsWithPursePetnames).map(
-        ([keyword, pursePetname]) => {
-          const purse = E(walletAdmin).getPurse(pursePetname);
-          const amountToWithdraw = proposal.give[keyword];
-          const paymentP = E(purse).withdraw(amountToWithdraw);
-          return [keyword, paymentP];
-        },
-      ),
-    );
+    return objectMap(paymentsWithPursePetnames, (pursePetname, keyword) => {
+      const purse = E(walletAdmin).getPurse(pursePetname);
+      assert(
+        'give' in proposal && proposal.give,
+        `proposal.give is required to withdraw`,
+      );
+      const amountToWithdraw = proposal.give[keyword];
+      const paymentP = E(purse).withdraw(amountToWithdraw);
+      return paymentP;
+    });
   };
 
   const withdrawInvitation = async invitationDetails => {

package/src/startInstance.js

@@ -1,4 +1,5 @@
 // @ts-check
+import { objectMap } from '@agoric/internal';
 import { assert } from '@endo/errors';
 import { E, passStyleOf } from '@endo/far';
 
@@ -36,13 +37,8 @@ export const makeStartInstance = (
   zoeInvitationPurse,
 ) => {
   const makeIssuerKeywordRecord = issuerPetnameKeywordRecord => {
-    return Object.fromEntries(
-      Object.entries(issuerPetnameKeywordRecord).map(
-        ([keyword, issuerPetname]) => {
-          const issuerP = E(issuerManager).get(issuerPetname);
-          return [keyword, issuerP];
-        },
-      ),
+    return objectMap(issuerPetnameKeywordRecord, issuerPetname =>
+      E(issuerManager).get(issuerPetname),
     );
   };