fix(walletFactory): move upgrading check before baggage is populated (#…

…8322)

* fix(walletFactory): move upgrading check before baggage is populated

The `baggage.has('walletsByAddress')` check has to come before the
`provideDurableMapStore(baggage, 'walletsByAddress')` call.

* test(smart-wallet): fake bridge manager detects handler not set

... and handler already set

* fixup! test(smart-wallet): fake bridge manager detects handler not set

packages/smart-wallet/src/walletFactory.js

@@ -142,6 +142,7 @@ export const makeAssetRegistry = assetPublisher => {
  * @param {import('@agoric/vat-data').Baggage} baggage
  */
 export const prepare = async (zcf, privateArgs, baggage) => {
+  const upgrading = baggage.has('walletsByAddress');
   const { agoricNames, board, assetPublisher } = zcf.getTerms();
 
   const zoe = zcf.getZoeService();
@@ -292,7 +293,6 @@ 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 {

packages/smart-wallet/test/supports.js

@@ -76,9 +76,11 @@ const makeFakeBridgeManager = () =>
           return E(handler).fromBridge(obj);
         },
         initHandler(newHandler) {
+          !handler || Fail`Handler already set`;
           handler = newHandler;
         },
         setHandler(newHandler) {
+          !!handler || Fail`Handler not set`;
           handler = newHandler;
         },
       });