@agoric/wallet-backend 0.13.4-dev-eb9fb38.0 → 0.13.4-dev-0a2843b.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/wallet-backend",
-  "version": "0.13.4-dev-eb9fb38.0+eb9fb38",
+  "version": "0.13.4-dev-0a2843b.0+0a2843b",
   "description": "Wallet backend",
   "type": "module",
   "scripts": {
@@ -14,23 +14,22 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/vats": "0.13.1-dev-eb9fb38.0+eb9fb38",
+    "@agoric/vats": "0.13.1-dev-0a2843b.0+0a2843b",
     "@endo/bundle-source": "^2.5.1",
     "@endo/init": "^0.5.56",
     "ava": "^5.2.0"
   },
   "dependencies": {
-    "@agoric/assert": "0.5.2-dev-eb9fb38.0+eb9fb38",
-    "@agoric/cache": "0.2.4-dev-eb9fb38.0+eb9fb38",
-    "@agoric/ertp": "0.15.4-dev-eb9fb38.0+eb9fb38",
-    "@agoric/inter-protocol": "0.13.2-dev-eb9fb38.0+eb9fb38",
-    "@agoric/internal": "0.2.2-dev-eb9fb38.0+eb9fb38",
-    "@agoric/notifier": "0.5.2-dev-eb9fb38.0+eb9fb38",
-    "@agoric/smart-wallet": "0.4.3-dev-eb9fb38.0+eb9fb38",
-    "@agoric/store": "0.8.4-dev-eb9fb38.0+eb9fb38",
-    "@agoric/time": "0.2.2-dev-eb9fb38.0+eb9fb38",
-    "@agoric/vat-data": "0.4.4-dev-eb9fb38.0+eb9fb38",
-    "@agoric/zoe": "0.25.4-dev-eb9fb38.0+eb9fb38",
+    "@agoric/assert": "0.5.2-dev-0a2843b.0+0a2843b",
+    "@agoric/cache": "0.2.4-dev-0a2843b.0+0a2843b",
+    "@agoric/ertp": "0.15.4-dev-0a2843b.0+0a2843b",
+    "@agoric/internal": "0.2.2-dev-0a2843b.0+0a2843b",
+    "@agoric/notifier": "0.5.2-dev-0a2843b.0+0a2843b",
+    "@agoric/smart-wallet": "0.4.3-dev-0a2843b.0+0a2843b",
+    "@agoric/store": "0.8.4-dev-0a2843b.0+0a2843b",
+    "@agoric/time": "0.2.2-dev-0a2843b.0+0a2843b",
+    "@agoric/vat-data": "0.4.4-dev-0a2843b.0+0a2843b",
+    "@agoric/zoe": "0.25.4-dev-0a2843b.0+0a2843b",
     "@endo/eventual-send": "^0.17.2",
     "@endo/marshal": "^0.8.5",
     "@endo/nat": "^4.1.27",
@@ -58,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eb9fb387ccaf9e2a1c5187c3926601824522b2a3"
+  "gitHead": "0a2843b787b998a57ca5977b00f9432bb7201607"
 }

package/src/lib-wallet.js

@@ -43,7 +43,6 @@ import { makePaymentActions } from './actions.js';
 
 import '@agoric/store/exported.js';
 import '@agoric/zoe/exported.js';
-import '@agoric/inter-protocol/exported.js';
 
 import './internal-types.js';
 import './types.js';
@@ -598,35 +597,6 @@ export function makeWalletRoot({
       .then(update => updateOrResubscribe(id, seat, update));
   }
 
-  /**
-   * @param {() => ( Promise | undefined )} get - The function whose return value
-   * to memoize.
-   */
-  const makeMemoizedGetter = get => {
-    let pk;
-    const doGet = () => pk.resolve(get());
-
-    return () => {
-      if (pk === undefined) {
-        pk = makePromiseKit();
-        doGet();
-      }
-      return pk.promise;
-    };
-  };
-
-  const getAttIssuer = makeMemoizedGetter(() =>
-    E(agoricNames)?.lookup('issuer', 'Attestation'),
-  );
-
-  /** @type import('@endo/promise-kit').PromiseKit<AttestationTool> */
-  const attMakerPK = makePromiseKit();
-
-  const { getAccountState } = E(attMakerPK.promise);
-
-  const makeAttestationAmount = async bldAmount =>
-    E(attMakerPK.promise).wrapLienedAmount(bldAmount);
-
   async function executeOffer(compiledOfferP) {
     // =====================
     // === AWAITING TURN ===
@@ -642,60 +612,20 @@ export function makeWalletRoot({
     /** @type {Map<Payment, Purse>} */
     const paymentToPurse = new Map();
 
-    // Track which gives/wants are attestations.
-    const keywordToAttestation = new Map();
-
     // We now have everything we need to provide Zoe, so do the actual withdrawals.
     // Payments are made for the keywords in proposal.give.
     const keywordPaymentPs = Object.entries(proposal.give || harden({})).map(
-      async ([keyword, { type, ...amount }]) => {
+      async ([keyword, amount]) => {
         const purse = purseKeywordRecord[keyword];
         purse !== undefined ||
           Fail`purse was not found for keyword ${q(keyword)}`;
 
-        if (type === 'Attestation') {
-          const payment = await E(attMakerPK.promise).makeAttestation(amount);
-
-          const attestationIssuer = await getAttIssuer();
-
-          keywordToAttestation.set(
-            keyword,
-            await E(attestationIssuer).getAmountOf(payment),
-          );
-
-          return [keyword, payment];
-        }
-
         const payment = await E(purse).withdraw(amount);
         paymentToPurse.set(payment, purse);
         return [keyword, payment];
       },
     );
 
-    // Get Attestation-branded amounts for Attestastation "wants".
-    await Promise.all(
-      Object.entries(proposal.want || harden({})).map(
-        async ([keyword, { type, ...amount }]) => {
-          if (type === 'Attestation') {
-            const attestationAmount = await makeAttestationAmount(amount);
-            keywordToAttestation.set(keyword, attestationAmount);
-          }
-        },
-      ),
-    );
-
-    const depositAttestation = async payoutP => {
-      const [issuer, payout] = await Promise.all([getAttIssuer(), payoutP]);
-
-      const amount = await E(issuer).getAmountOf(payout);
-      const invitation = await E(attMakerPK.promise).makeReturnAttInvitation();
-      const depositProposal = harden({ give: { Attestation: amount } });
-      const payments = harden({ Attestation: payout });
-
-      const userSeat = E(zoe).offer(invitation, depositProposal, payments);
-      await E(userSeat).getOfferResult();
-    };
-
     // Try reclaiming any of our payments that we successfully withdrew, but
     // were left unclaimed.
     const tryReclaimingWithdrawnPayments = () =>
@@ -705,11 +635,7 @@ export function makeWalletRoot({
         keywordPaymentPs.map(async keywordPaymentP => {
           // Wait for the withdrawal to complete.  This protects against a race
           // when updating paymentToPurse.
-          const [keyword, payment] = await keywordPaymentP;
-
-          if (keywordToAttestation.has(keyword)) {
-            return depositAttestation(payment);
-          }
+          const [_keyword, payment] = await keywordPaymentP;
 
           // Find out where it came from.
           const purse = paymentToPurse.get(payment);
@@ -745,27 +671,6 @@ export function makeWalletRoot({
 
     const paymentKeywordRecord = harden(Object.fromEntries(paymentKeywords));
 
-    // Convert gives'/wants' BLD amounts to Attestation amounts for
-    // Attestations.
-    const convertToAttestationAmounts = ([keyword, { type, ...amount }]) => {
-      if (type === 'Attestation') {
-        amount = keywordToAttestation.get(keyword);
-      }
-      return [keyword, amount];
-    };
-
-    if (proposal.give) {
-      proposal.give = Object.fromEntries(
-        Object.entries(proposal.give).map(convertToAttestationAmounts),
-      );
-    }
-
-    if (proposal.want) {
-      proposal.want = Object.fromEntries(
-        Object.entries(proposal.want).map(convertToAttestationAmounts),
-      );
-    }
-
     const seat = E(zoe).offer(
       inviteP,
       harden(proposal),
@@ -783,10 +688,6 @@ export function makeWalletRoot({
       .then(payoutObj => {
         return Promise.all(
           Object.entries(payoutObj).map(([keyword, payoutP]) => {
-            if (keywordToAttestation.has(keyword)) {
-              return depositAttestation(payoutP);
-            }
-
             // We try to find a purse for this keyword, but even if we don't,
             // we still make it a normal incoming payment.
             const purseOrUndefined = purseKeywordRecord[keyword];
@@ -1013,7 +914,7 @@ export function makeWalletRoot({
     const compile = amountKeywordRecord => {
       return Object.fromEntries(
         Object.entries(amountKeywordRecord).map(
-          ([keyword, { pursePetname, value, type }]) => {
+          ([keyword, { pursePetname, value }]) => {
             // Automatically convert numbers to Nats.
             if (typeof value === 'number') {
               value = Nat(value);
@@ -1022,7 +923,7 @@ export function makeWalletRoot({
             purseKeywordRecord[keyword] = purse;
             const brand = purseToBrand.get(purse);
 
-            return [keyword, { brand, value, type }];
+            return [keyword, { brand, value }];
           },
         ),
       );
@@ -1845,15 +1746,11 @@ export function makeWalletRoot({
       return E(firstValue).lookup(...remaining);
     },
     getMarshaller: () => marshaller,
-    resolveAttMaker: attMaker => attMakerPK.resolve(attMaker),
-    getAttMaker: () => attMakerPK.promise,
     getDappCacheCoordinator: dappOrigin =>
       dappOrigins.get(dappOrigin).cacheCoordinator,
     getCacheCoordinator: () => sharedCacheCoordinator,
     saveOfferResult,
     getOfferResult,
-    getAccountState,
-    makeAttestationAmount,
     waitForDappApproval,
     getDappsNotifier() {
       return dappsNotifier;

package/src/wallet.js

@@ -186,10 +186,6 @@ export function buildRootObject(vatPowers) {
         await approve();
         return walletAdmin.addOffer(offer, { ...meta, dappOrigin });
       },
-      async getAccountState() {
-        await approve();
-        return walletAdmin.getAccountState();
-      },
       async getOffersNotifier(status = null) {
         await approve();
         const { notifier, updater } = makeNotifierKit(inboxState);

package/test/test-lib-wallet.js

@@ -43,13 +43,12 @@ const test = anyTest;
  *   zoe: ZoeService,
  *   automaticRefundInstallation: Installation,
  *   autoswapInstallation: Installation,
- *   attestationInstallation: Installation,
  * }} LibWalletTestContext
  */
 
 async function setupTest(
   /** @type {import('ava').ExecutionContext<LibWalletTestContext>} */ t,
-  { autoswap = false, automaticRefund = false, attestation = false } = {},
+  { autoswap = false, automaticRefund = false } = {},
 ) {
   const pursesStateChangeLog = [];
   const inboxStateChangeLog = [];
@@ -97,71 +96,24 @@ async function setupTest(
     instance: null,
   };
 
-  const attestationP = (attestation &&
-    (async () => {
-      const { publicFacet, instance } = await E(t.context.zoe).startInstance(
-        t.context.attestationInstallation,
-      );
-      const {
-        issuers: { Attestation: issuer },
-        brands: { Attestation: brand },
-      } = await E(t.context.zoe).getTerms(instance);
-
-      const names = {
-        lookup: (/** @type {string[]} */ ...namePath) => {
-          if (namePath[0] === 'issuer' && namePath[1] === 'Attestation') {
-            return issuer;
-          }
-          return null;
-        },
-      };
-      return { names, issuer, brand, publicFacet };
-    })()) || {
-    names: null,
-    issuer: null,
-    brand: null,
-    publicFacet: null,
-  };
-
   const [
     {
       creatorInvitation: automaticRefundInvitation,
       instance: automaticRefundInstance,
     },
     { invite: addLiquidityInvite, instance: autoswapInstanceHandle },
-    {
-      names: fakeAgoricNames,
-      issuer: attestationIssuer,
-      brand: attestationBrand,
-      publicFacet: attestationPublicFacet,
-    },
-  ] = await Promise.all([automaticRefundP, autoswapP, attestationP]);
+  ] = await Promise.all([automaticRefundP, autoswapP]);
 
   const { admin: wallet, initialized } = makeWalletRoot({
     zoe: t.context.zoe,
     board,
     myAddressNameAdmin: makeFakeMyAddressNameAdmin(),
-    // @ts-expect-error
-    agoricNames: fakeAgoricNames,
     pursesStateChangeHandler,
     inboxStateChangeHandler,
   });
   await initialized;
 
-  if (attestation) {
-    assert(attestationBrand);
-    wallet.resolveAttMaker({
-      makeReturnAttInvitation: attestationPublicFacet.makeReturnAttInvitation,
-      makeAttestation: (/** @type {any} */ value) =>
-        attestationPublicFacet.mintAttestation(value),
-      wrapLienedAmount: ({ value }) => AmountMath.make(attestationBrand, value),
-    });
-  }
-
   return {
-    attestationIssuer,
-    attestationPublicFacet,
-    attestationBrand,
     moolaBundle,
     simoleanBundle,
     rpgBundle,
@@ -212,20 +164,10 @@ test.before(async t => {
   const autoswapBundle = await bundleSource(autoswapContractRoot);
   const autoswapInstallation = await E(zoe).install(autoswapBundle);
 
-  // Create attestationExample instance
-  const url = await importMetaResolve(
-    './attestationExample.js',
-    import.meta.url,
-  );
-  const path = new URL(url).pathname;
-  const attestationBundle = await bundleSource(path);
-  const attestationInstallation = await E(zoe).install(attestationBundle);
-
   t.context = {
     zoe,
     automaticRefundInstallation,
     autoswapInstallation,
-    attestationInstallation,
   };
 });
 
@@ -1303,157 +1245,6 @@ test('lib-wallet performAction acceptOffer', async t => {
   );
 });
 
-test('lib-wallet can give attestations in offers', async t => {
-  const {
-    wallet,
-    attestationPublicFacet,
-    attestationBrand,
-    attestationIssuer,
-  } = await setupTest(t, { attestation: true });
-
-  assert(attestationIssuer);
-  assert(attestationBrand);
-  const issuerManager = wallet.getIssuerManager();
-  await issuerManager.add('Attestation', attestationIssuer);
-  await wallet.makeEmptyPurse('Attestation', 'staking purse');
-
-  const invitation = await attestationPublicFacet.makeReturnAttInvitation();
-
-  const rawId = '123-arbitrary';
-  const id = `unknown#${rawId}`;
-  const offer = {
-    id: rawId,
-    invitation,
-    proposalTemplate: {
-      give: {
-        Attestation: {
-          pursePetname: 'staking purse',
-          value: 30n,
-          type: 'Attestation',
-        },
-      },
-      exit: {
-        onDemand: null,
-      },
-    },
-  };
-
-  await wallet.addOffer(offer);
-  const accepted = await wallet.acceptOffer(id);
-  assert(accepted);
-  const { depositedP } = accepted;
-  await depositedP;
-
-  // There should be two calls. The first is call to give the attestation
-  // as proposed. The second call is to return the unallocated attestation
-  // back to the attMaker (which in this test uses the same method).
-  const callHistory = await attestationPublicFacet.getCallHistory();
-  t.deepEqual(callHistory.returnProposals, [
-    {
-      exit: {
-        onDemand: null,
-      },
-      give: {
-        Attestation: AmountMath.make(attestationBrand, 30n),
-      },
-      want: {},
-    },
-    {
-      exit: {
-        onDemand: null,
-      },
-      give: {
-        Attestation: AmountMath.make(attestationBrand, 30n),
-      },
-      want: {},
-    },
-  ]);
-  t.deepEqual(callHistory.returnAllocations, [
-    {
-      Attestation: AmountMath.make(attestationBrand, 30n),
-    },
-    {
-      Attestation: AmountMath.make(attestationBrand, 30n),
-    },
-  ]);
-});
-
-test('lib-wallet can want attestations in offers', async t => {
-  const {
-    wallet,
-    attestationPublicFacet,
-    attestationBrand,
-    attestationIssuer,
-  } = await setupTest(t, { attestation: true });
-
-  assert(attestationIssuer);
-  assert(attestationBrand);
-  const issuerManager = wallet.getIssuerManager();
-  await issuerManager.add('Attestation', attestationIssuer);
-  await wallet.makeEmptyPurse('Attestation', 'staking purse');
-
-  const invitation = await attestationPublicFacet.makeWantAttInvitation();
-
-  const rawId = '123-arbitrary';
-  const id = `unknown#${rawId}`;
-  const offer = {
-    id: rawId,
-    invitation,
-    proposalTemplate: {
-      want: {
-        Attestation: {
-          pursePetname: 'staking purse',
-          value: 65n,
-          type: 'Attestation',
-        },
-      },
-      exit: {
-        onDemand: null,
-      },
-    },
-  };
-
-  await wallet.addOffer(offer);
-  const accepted = await wallet.acceptOffer(id);
-  assert(accepted);
-  const { depositedP } = accepted;
-  await depositedP;
-
-  const callHistory = await attestationPublicFacet.getCallHistory();
-  t.deepEqual(callHistory.wantProposals, [
-    {
-      exit: {
-        onDemand: null,
-      },
-      want: {
-        Attestation: AmountMath.make(attestationBrand, 65n),
-      },
-      give: {},
-    },
-  ]);
-  t.deepEqual(callHistory.wantAllocations, [
-    { Attestation: AmountMath.make(attestationBrand, 0n) },
-  ]);
-  // When an attestation payout is recieved, the wallet should return it to the
-  // attMaker:
-  t.deepEqual(callHistory.returnProposals, [
-    {
-      exit: {
-        onDemand: null,
-      },
-      give: {
-        Attestation: AmountMath.make(attestationBrand, 65n),
-      },
-      want: {},
-    },
-  ]);
-  t.deepEqual(callHistory.returnAllocations, [
-    {
-      Attestation: AmountMath.make(attestationBrand, 65n),
-    },
-  ]);
-});
-
 test('addOffer invitationQuery', async t => {
   const {
     moolaBundle,

package/test/attestationExample.js

@@ -1,65 +0,0 @@
-// @ts-check
-import '@agoric/zoe/exported.js';
-import { AmountMath } from '@agoric/ertp';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
-
-/** @param {ZCF} zcf */
-export const start = async zcf => {
-  const mint = await zcf.makeZCFMint('Attestation');
-  const { brand } = await mint.getIssuerRecord();
-  const callHistory = {
-    /** @type Array<string> */
-    wantProposals: [],
-    /** @type Array<string> */
-    wantAllocations: [],
-    /** @type Array<string> */
-    returnProposals: [],
-    /** @type Array<string> */
-    returnAllocations: [],
-  };
-
-  const mintAttestation = ({ value }) => {
-    const { userSeat, zcfSeat } = zcf.makeEmptySeatKit();
-    mint.mintGains({ Attestation: AmountMath.make(brand, value) }, zcfSeat);
-    zcfSeat.exit();
-    return E(userSeat).getPayout('Attestation');
-  };
-
-  const handleWantAtt = seat => {
-    const proposal = seat.getProposal();
-    callHistory.wantProposals.push(proposal);
-    callHistory.wantAllocations.push(seat.getCurrentAllocation());
-    mint.mintGains(
-      { Attestation: AmountMath.make(brand, proposal.want.Attestation.value) },
-      seat,
-    );
-    seat.exit();
-    return 'good job';
-  };
-
-  const handleReturnAtt = seat => {
-    const proposal = seat.getProposal();
-    callHistory.returnProposals.push(proposal);
-    callHistory.returnAllocations.push(seat.getCurrentAllocation());
-    seat.exit();
-    return 'thank you for that';
-  };
-
-  const makeWantAttInvitation = () =>
-    zcf.makeInvitation(handleWantAtt, 'WantAtt');
-
-  const makeReturnAttInvitation = () =>
-    zcf.makeInvitation(handleReturnAtt, 'ReturnAtt');
-
-  const getCallHistory = () => callHistory;
-
-  const publicFacet = Far('attestation public facet', {
-    mintAttestation,
-    makeWantAttInvitation,
-    makeReturnAttInvitation,
-    getCallHistory,
-  });
-
-  return harden({ publicFacet });
-};