feat: create feePurse in bootstrap and import to wallet

packages/dapp-svelte-wallet/api/deploy.js

@@ -79,7 +79,7 @@ export default async function deployWallet(
   // Claim the payments.
   const issuerToPetname = new Map();
   const issuerToPursePetnameP = new Map();
-  const wallet = E(walletVat).getWallet(bank);
+  const wallet = E(walletVat).getWallet(bank, E(faucet).getFeePurse());
   const walletAdmin = E(wallet).getAdminFacet();
   await Promise.all(
     paymentInfo.map(async ({ issuerPetname, issuer }) => {

packages/dapp-svelte-wallet/api/src/lib-wallet.js

@@ -591,7 +591,9 @@ export function makeWallet({
     const { brand } = await recP;
     if (!issuerToBoardId.has(issuer)) {
       const issuerBoardId = await E(board).getId(issuer);
-      issuerToBoardId.init(issuer, issuerBoardId);
+      if (!issuerToBoardId.has(issuer)) {
+        issuerToBoardId.init(issuer, issuerBoardId);
+      }
     }
     const addBrandPetname = () => {
       let p;
@@ -603,11 +605,12 @@ export function makeWallet({
       } else {
         p = Promise.resolve();
       }
-      return p.then(
-        _ => `issuer ${q(petnameForBrand)} successfully added to wallet`,
-      );
+      return p.then(_ => petnameForBrand);
     };
-    return addBrandPetname().then(updateAllIssuersState);
+    return addBrandPetname().then(async brandName => {
+      await updateAllIssuersState();
+      return brandName;
+    });
   };
 
   const publishIssuer = async brand => {
@@ -616,7 +619,9 @@ export function makeWallet({
       return issuerToBoardId.get(issuer);
     }
     const issuerBoardId = await E(board).getId(issuer);
-    issuerToBoardId.init(issuer, issuerBoardId);
+    if (!issuerToBoardId.has(issuer)) {
+      issuerToBoardId.init(issuer, issuerBoardId);
+    }
     updateAllIssuersState();
     return issuerBoardId;
   };
@@ -1439,7 +1444,9 @@ export function makeWallet({
       const { brand, issuer } = await brandTable.initIssuer(issuerP);
       if (!issuerToBoardId.has(issuer)) {
         const issuerBoardId = await E(board).getId(issuer);
-        issuerToBoardId.init(issuer, issuerBoardId);
+        if (!issuerToBoardId.has(issuer)) {
+          issuerToBoardId.init(issuer, issuerBoardId);
+        }
       }
       brandMapping.suggestPetname(petname, brand);
       await updateAllIssuersState();
@@ -1613,11 +1620,11 @@ export function makeWallet({
   // We don't want to expose this mechanism to the user, in case they shoot
   // themselves in the foot with it by importing an asset/virtual purse they
   // don't really trust.
-  const importBankAssets = async bank => {
+  const importBankAssets = async (bank, feePurseP) => {
     observeIteration(E(bank).getAssetSubscription(), {
       async updateState({ proposedName, issuerName, issuer, brand }) {
         try {
-          await addIssuer(issuerName, issuer);
+          issuerName = await addIssuer(issuerName, issuer);
           const purse = await E(bank).getPurse(brand);
           // We can import this purse, because we trust the bank.
           await internalUnsafeImportPurse(
@@ -1636,6 +1643,13 @@ export function makeWallet({
         }
       },
     }).finally(() => console.error('/// This is the end of the bank assets'));
+    if (!feePurseP) {
+      return;
+    }
+    const feePurse = await feePurseP;
+    const feeIssuer = await E(zoe).getFeeIssuer();
+    const issuerName = await addIssuer('RUN', feeIssuer);
+    await internalUnsafeImportPurse(issuerName, 'Zoe fees', false, feePurse);
   };
   return { admin: wallet, initialized: initialize(), importBankAssets };
 }

packages/dapp-svelte-wallet/api/src/wallet.js

@@ -269,10 +269,8 @@ export function buildRootObject(_vatPowers) {
   });
   harden(preapprovedBridge);
 
-  async function getWallet(bank) {
-    if (bank) {
-      walletRoot.importBankAssets(bank);
-    }
+  async function getWallet(bank, feePurse) {
+    await walletRoot.importBankAssets(bank, feePurse);
 
     /**
      * This is the complete wallet, including the means to get the

packages/vats/src/bootstrap.js

@@ -118,7 +118,7 @@ export function buildRootObject(vatPowers, vatParameters) {
       E(vats.priceAuthority).makePriceAuthority(),
     ]);
 
-    const zoeWPurse = E(zoe).bindDefaultFeePurse(feeCollectionPurse);
+    const zoeWUnlimitedPurse = E(zoe).bindDefaultFeePurse(feeCollectionPurse);
 
     const {
       nameHub: agoricNames,
@@ -161,7 +161,7 @@ export function buildRootObject(vatPowers, vatParameters) {
           chainTimerService,
           nameAdmins,
           priceAuthority,
-          zoeWPurse,
+          zoeWPurse: zoeWUnlimitedPurse,
           bootstrapPaymentValue,
           feeMintAccess,
         }),
@@ -170,7 +170,7 @@ export function buildRootObject(vatPowers, vatParameters) {
           board,
           nameAdmins,
           namesByAddress,
-          zoeWPurse,
+          zoeWPurse: zoeWUnlimitedPurse,
         }),
       ]);
       return treasuryCreator;
@@ -232,7 +232,7 @@ export function buildRootObject(vatPowers, vatParameters) {
       E(vats.distributeFees)
         .buildDistributor(
           E(vats.distributeFees).makeTreasuryFeeCollector(
-            zoeWPurse,
+            zoeWUnlimitedPurse,
             treasuryCreator,
           ),
           feeCollectorDepositFacet,
@@ -393,7 +393,7 @@ export function buildRootObject(vatPowers, vatParameters) {
           const paymentKeywords = harden({
             Collateral: payment,
           });
-          const seat = E(zoeWPurse).offer(
+          const seat = E(zoeWUnlimitedPurse).offer(
             addTypeInvitation,
             proposal,
             paymentKeywords,
@@ -430,7 +430,7 @@ export function buildRootObject(vatPowers, vatParameters) {
 
     const [ammPublicFacet, pegasus] = await Promise.all(
       [ammInstance, pegasusInstance].map(instance =>
-        E(zoeWPurse).getPublicFacet(instance),
+        E(zoeWUnlimitedPurse).getPublicFacet(instance),
       ),
     );
     await addAllCollateral();
@@ -658,11 +658,17 @@ export function buildRootObject(vatPowers, vatParameters) {
           }),
         );
 
+        const userFeePurse = await E(zoe).makeFeePurse();
+        const zoeWUserFeePurse = await E(zoe).bindDefaultFeePurse(userFeePurse);
+
         const faucet = Far('faucet', {
           // A method to reap the spoils of our on-chain provisioning.
           async tapFaucet() {
             return faucetPaymentInfo;
           },
+          getFeePurse() {
+            return userFeePurse;
+          },
         });
 
         // Create a name hub for this address.
@@ -693,7 +699,7 @@ export function buildRootObject(vatPowers, vatParameters) {
           namesByAddress,
           priceAuthority,
           board,
-          zoe,
+          zoe: zoeWUserFeePurse,
         });
 
         return bundle;