SQUASH: misc

- copy-pasta in game1 script doc - overridable $SDK docs - chainStorage type doc: cite 8247 - move upgrading closer to use - no need to avoid AmountMath
Agoric · Aug 24, 2023 · ff26fa1 · ff26fa1
1 parent d1eecdd
commit ff26fa1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/packages/builders/scripts/smart-wallet/build-game1-start.js b/packages/builders/scripts/smart-wallet/build-game1-start.js
@@ -1,5 +1,5 @@
 /**
- * @file Proposal Builder: Upgrade walletFactory
+ * @file Proposal Builder: Start Game with non-vbank Place NFT asset
  *
  * Usage:
  *   agoric run build-game1-start.js

diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/actions.sh b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/actions.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Dockerfile in upgrade-test sets:
+# WORKDIR /usr/src/agoric-sdk/
+# Overriding it during development has occasionally been useful.
 SDK=${SDK:-/usr/src/agoric-sdk}
 . $SDK/upgrade-test-scripts/env_setup.sh
 

diff --git a/packages/smart-wallet/src/proposals/upgrade-walletFactory-proposal.js b/packages/smart-wallet/src/proposals/upgrade-walletFactory-proposal.js
@@ -76,7 +76,8 @@ harden(upgradeWalletFactory);
 export const publishAgoricBrandsDisplayInfo = async ({
   consume: { agoricNames, board, chainStorage },
 }) => {
-  // @ts-expect-error chainStorage is only falsy in testing
+  // chainStorage type includes undefined, which doesn't apply here.
+  // @ts-expect-error UNTIL https://github.com/Agoric/agoric-sdk/issues/8247
   const boardAux = E(chainStorage).makeChildNode(BOARD_AUX);
   const publishBrandInfo = async brand => {
     const [id, displayInfo, allegedName] = await Promise.all([

diff --git a/packages/smart-wallet/src/walletFactory.js b/packages/smart-wallet/src/walletFactory.js
@@ -143,7 +143,6 @@ export const makeAssetRegistry = assetPublisher => {
  */
 export const prepare = async (zcf, privateArgs, baggage) => {
   const { agoricNames, board, assetPublisher } = zcf.getTerms();
-  const upgrading = baggage.has('walletsByAddress');
 
   const zoe = zcf.getZoeService();
   const { storageNode, walletBridgeManager, walletReviver } = privateArgs;
@@ -293,6 +292,7 @@ export const prepare = async (zcf, privateArgs, baggage) => {
   if (walletBridgeManager) {
     // NB: may not be in service when creatorFacet is used, or ever
     // It can't be awaited because that fails vat restart
+    const upgrading = baggage.has('walletsByAddress');
     if (upgrading) {
       void E(walletBridgeManager).setHandler(handleWalletAction);
     } else {

diff --git a/packages/smart-wallet/test/start-game1-proposal.js b/packages/smart-wallet/test/start-game1-proposal.js
@@ -1,6 +1,7 @@
 // @ts-check
 import { E } from '@endo/far';
 import { makeMarshal } from '@endo/marshal';
+import { AmountMath } from '@agoric/ertp/src/amountMath.js';
 
 console.warn('start-game1-proposal.js module evaluating');
 
@@ -11,9 +12,6 @@ const BOARD_AUX = 'boardAux';
 
 const marshalData = makeMarshal(_val => Fail`data only`);
 
-// avoid importing all of ERTP
-const makeAmount = (brand, value) => harden({ brand, value });
-
 const IST_UNIT = 1_000_000n;
 const CENT = IST_UNIT / 100n;
 
@@ -66,7 +64,7 @@ export const startGameContract = async permittedPowers => {
     brand: istBrand,
   };
   // NOTE: joinPrice could be configurable
-  const terms = { joinPrice: makeAmount(ist.brand, 25n * CENT) };
+  const terms = { joinPrice: AmountMath.make(ist.brand, 25n * CENT) };
 
   // agoricNames gets updated each time; the promise space only once XXXXXXX
   const installation = await E(agoricNames).lookup('installation', 'game1');