fix: improve wallet contents migration, but still not great

Author: michaelfig

lerna.json

@@ -8,10 +8,9 @@
   "packages": [
     ".",
     "packages/*", 
-    "packages/agoric-cli/template/.agservers",
-    "packages/agoric-cli/template/api",
-    "packages/agoric-cli/template/contract",
-    "packages/agoric-cli/template/ui"
+    "packages/dapp-*-wallet/api",
+    "packages/dapp-*-wallet/contract",
+    "packages/dapp-*-wallet/ui"
   ],
   "version": "independent"
 }

package.json

@@ -34,6 +34,9 @@
     "packages/sharing-service",
     "packages/zoe",
     "packages/dapp-react-wallet",
+    "packages/dapp-svelte-wallet/ui",
+    "packages/dapp-svelte-wallet/api",
+    "packages/dapp-svelte-wallet",
     "packages/cosmic-swingset",
     "packages/agoric-cli",
     "packages/deployment",

packages/cosmic-swingset/lib/ag-solo/main.js

@@ -70,7 +70,14 @@ start
       const basedir = subArgs[0] || AG_SOLO_BASEDIR;
       const subdir = subArgs[1];
       assert(basedir !== undefined, 'you must provide a BASEDIR');
-      initBasedir(basedir, webport, webhost, subdir, egresses.split(','));
+      initBasedir(
+        basedir,
+        webport,
+        webhost,
+        subdir,
+        egresses.split(','),
+        subOpts,
+      );
       await resetState(basedir);
 
       // TODO: We may want to give some instructions.  This is probably not the

packages/dapp-react-wallet/wallet-deploy.js

@@ -67,7 +67,6 @@ export default async function deployWallet(
       if (issuerToPetname.has(issuer)) {
         return issuerToPetname.get(issuer);
       }
-      console.log('setting petname of', issuer, 'to', issuerPetname);
       issuerToPetname.set(issuer, issuerPetname);
       await E(wallet).addIssuer(issuerPetname, issuer);
       return issuerToPetname.get(issuer);
@@ -78,27 +77,40 @@ export default async function deployWallet(
     paymentInfo.map(async ({ pursePetname, issuer, payment, purse }) => {
       const issuerPetname = issuerToPetname.get(issuer);
 
+      let paymentP;
+
+      if (!payment && purse) {
+        // Withdraw the payment from the purse.
+        paymentP = E(purse)
+          .getCurrentAmount()
+          .then(amount => E(purse).withdraw(amount));
+      } else {
+        paymentP = E(issuer).isLive(payment).then(isLive => isLive && payment);
+      }
+
+      payment = await paymentP;
+      if (!payment) {
+        return;
+      }
+      const amount = await E(issuer).getAmountOf(payment);
+
+      // TODO: Use AmountMath.
+      const isEmpty = amount.value === 0 || (Array.isArray(amount.value) && !amount.value.length);
+      if (isEmpty) {
+        return;
+      }
       if (!issuerToPursePetnameP.has(issuer)) {
         issuerToPursePetnameP.set(
           issuer,
           E(wallet)
             .makeEmptyPurse(issuerPetname, pursePetname)
-            .then(_ => pursePetname),
+            .then(_ => pursePetname, _ => pursePetname),
         );
       }
       pursePetname = await issuerToPursePetnameP.get(issuer);
 
-      let paymentP = payment;
-      if (!paymentP) {
-        // Withdraw the payment from the purse.
-        paymentP = E(purse)
-          .getCurrentAmount()
-          .then(amount => E(purse).withdraw(amount));
-      }
-
       // Deposit payment.
-      const p = await paymentP;
-      await E(wallet).deposit(pursePetname, p);
+      await E(wallet).deposit(pursePetname, payment);
     }),
   );
 
@@ -108,5 +120,5 @@ export default async function deployWallet(
   await E(http).registerWallet(wallet, walletURLHandler, bridgeURLHandler);
   await E(walletVat).setHTTPObject(http);
   await E(walletVat).setPresences();
-  console.log('Deployed @agoric/wallet-frontend!');
+  console.log('Deployed Wallet!');
 }