@agoric/smart-wallet 0.5.4-u12.0 → 0.5.4-u14.0

package/src/proposals/upgrade-wallet-factory2-proposal.d.ts

@@ -0,0 +1,23 @@
+export function upgradeWalletFactory({ consume: { walletFactoryStartResult, provisionPoolStartResult, chainStorage, walletBridgeManager: walletBridgeManagerP, }, }: BootstrapPowers & ChainBootstrapSpace, options: {
+    options: {
+        walletRef: VatSourceRef;
+    };
+}): Promise<void>;
+export function getManifestForUpgradeWallet(_powers: any, { walletRef }: {
+    walletRef: any;
+}): {
+    manifest: {
+        [x: string]: {
+            consume: {
+                walletFactoryStartResult: string;
+                provisionPoolStartResult: string;
+                chainStorage: string;
+                walletBridgeManager: string;
+            };
+        };
+    };
+    options: {
+        walletRef: any;
+    };
+};
+//# sourceMappingURL=upgrade-wallet-factory2-proposal.d.ts.map

package/src/proposals/upgrade-wallet-factory2-proposal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrade-wallet-factory2-proposal.d.ts","sourceRoot":"","sources":["upgrade-wallet-factory2-proposal.js"],"names":[],"mappings":"AASO,qKAJI,eAAe,GAAG,mBAAmB;;mBAExB,YAAY;;kBAqCnC;AAEM;;;;;;;;;;;;;;;;EAYL"}

package/src/proposals/upgrade-wallet-factory2-proposal.js

@@ -0,0 +1,59 @@
+// @ts-check
+import { E } from '@endo/far';
+import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
+
+/**
+ * @param {BootstrapPowers & ChainBootstrapSpace} powers
+ * @param {object} options
+ * @param {{ walletRef: VatSourceRef }} options.options
+ */
+export const upgradeWalletFactory = async (
+  {
+    consume: {
+      walletFactoryStartResult,
+      provisionPoolStartResult,
+      chainStorage,
+      walletBridgeManager: walletBridgeManagerP,
+    },
+  },
+  options,
+) => {
+  const WALLET_STORAGE_PATH_SEGMENT = 'wallet';
+
+  const { walletRef } = options.options;
+
+  const [walletBridgeManager, walletStorageNode, ppFacets] = await Promise.all([
+    walletBridgeManagerP,
+    makeStorageNodeChild(chainStorage, WALLET_STORAGE_PATH_SEGMENT),
+    provisionPoolStartResult,
+  ]);
+  // @ts-expect-error missing type declaration?
+  const walletReviver = await E(ppFacets.creatorFacet).getWalletReviver();
+
+  const privateArgs = {
+    storageNode: walletStorageNode,
+    walletBridgeManager,
+    walletReviver,
+  };
+
+  const { adminFacet } = await walletFactoryStartResult;
+
+  assert(walletRef.bundleID);
+  await E(adminFacet).upgradeContract(walletRef.bundleID, privateArgs);
+
+  console.log(`Successfully upgraded WalletFactory`);
+};
+
+export const getManifestForUpgradeWallet = (_powers, { walletRef }) => ({
+  manifest: {
+    [upgradeWalletFactory.name]: {
+      consume: {
+        walletFactoryStartResult: 'walletFactoryStartResult',
+        provisionPoolStartResult: 'provisionPoolStartResult',
+        chainStorage: 'chainStorage',
+        walletBridgeManager: 'walletBridgeManager',
+      },
+    },
+  },
+  options: { walletRef },
+});

package/src/smartWallet.d.ts

@@ -26,19 +26,19 @@ export function prepareSmartWallet(baggage: MapStore<string, unknown>, shared: S
         /**
          * Take an offer description provided in capData, augment it with payments and call zoe.offer()
          *
-         * @param {import('./offers.js').OfferSpec} offerSpec
+         * @param {OfferSpec} offerSpec
          * @returns {Promise<void>} after the offer has been both seated and exited by Zoe.
          * @throws if any parts of the offer can be determined synchronously to be invalid
          */
-        executeOffer(offerSpec: import('./offers.js').OfferSpec): Promise<void>;
+        executeOffer(offerSpec: OfferSpec): Promise<void>;
         /**
          * Take an offer's id, look up its seat, try to exit.
          *
-         * @param {import('./offers.js').OfferId} offerId
+         * @param {OfferId} offerId
          * @returns {Promise<void>}
          * @throws if the seat can't be found or E(seatRef).tryExit() fails.
          */
-        tryExitOffer(offerId: import('./offers.js').OfferId): Promise<void>;
+        tryExitOffer(offerId: OfferId): Promise<void>;
     };
     /** @deprecated use getPublicTopics */
     getCurrentSubscriber(): Subscriber<CurrentWalletRecord>;
@@ -56,14 +56,35 @@ export function prepareSmartWallet(baggage: MapStore<string, unknown>, shared: S
             storagePath: Promise<string>;
         };
     };
+    /**
+     * To be called once ever per wallet.
+     *
+     * @param {object} key
+     */
+    repairWalletForIncarnation2(key: object): void;
 }>;
+export type OfferId = number | string;
+export type OfferSpec = {
+    id: OfferId;
+    invitationSpec: import('./invitations').InvitationSpec;
+    proposal: Proposal;
+    offerArgs?: unknown;
+};
+export type ExecutorPowers = {
+    logger: {
+        info: (...args: any[]) => void;
+        error: (...args: any[]) => void;
+    };
+    makeOfferWatcher: import('./offerWatcher.js').MakeOfferWatcher;
+    invitationFromSpec: ERef<Invitation>;
+};
 export type ExecuteOfferAction = {
     method: 'executeOffer';
-    offer: import('./offers.js').OfferSpec;
+    offer: OfferSpec;
 };
 export type TryExitOfferAction = {
     method: 'tryExitOffer';
-    offerId: import('./offers.js').OfferId;
+    offerId: OfferId;
 };
 export type BridgeAction = ExecuteOfferAction | TryExitOfferAction;
 /**
@@ -91,7 +112,7 @@ export type CurrentWalletRecord = {
     offerToPublicSubscriberPaths: [offerId: string, publicTopics: {
         [subscriberName: string]: string;
     }][];
-    liveOffers: Array<[import('./offers.js').OfferId, import('./offers.js').OfferStatus]>;
+    liveOffers: Array<[OfferId, import('./offers.js').OfferStatus]>;
 };
 /**
  * Record of an update to the state of this wallet.
@@ -124,12 +145,11 @@ export type BrandDescriptor = {
     brand: Brand;
     displayInfo: DisplayInfo;
     issuer: Issuer;
-    petname: import('./types').Petname;
+    petname: import('./types.js').Petname;
 };
-export type RemotePurse = import('./types').RemotePurse;
 export type UniqueParams = {
     address: string;
-    bank: ERef<import('@agoric/vats/src/vat-bank').Bank>;
+    bank: ERef<import('@agoric/vats/src/vat-bank.js').Bank>;
     currentStorageNode: StorageNode;
     invitationPurse: Purse<'set'>;
     walletStorageNode: StorageNode;
@@ -143,6 +163,7 @@ export type SharedParams = {
     invitationDisplayInfo: DisplayInfo;
     publicMarshaller: Marshaller;
     zoe: ERef<ZoeService>;
+    secretWalletFactoryKey: any;
 };
 /**
  * - `brandPurses` is precious and closely held. defined as late as possible to reduce its scope.
@@ -153,14 +174,15 @@ export type SharedParams = {
 export type State = ImmutableState & MutableState;
 export type ImmutableState = Readonly<UniqueParams & {
     paymentQueues: MapStore<Brand, Array<Payment>>;
-    offerToInvitationMakers: MapStore<string, import('./types').InvitationMakers>;
+    offerToInvitationMakers: MapStore<string, import('./types').RemoteInvitationMakers>;
     offerToPublicSubscriberPaths: MapStore<string, Record<string, string>>;
-    offerToUsedInvitation: MapStore<string, Amount>;
-    purseBalances: MapStore<RemotePurse, Amount>;
+    offerToUsedInvitation: MapStore<string, Amount<'set'>>;
+    purseBalances: MapStore<Purse, Amount>;
     updateRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<UpdateRecord>;
     currentRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<CurrentWalletRecord>;
-    liveOffers: MapStore<import('./offers.js').OfferId, import('./offers.js').OfferStatus>;
-    liveOfferSeats: WeakMapStore<import('./offers.js').OfferId, UserSeat<unknown>>;
+    liveOffers: MapStore<OfferId, import('./offers.js').OfferStatus>;
+    liveOfferSeats: MapStore<OfferId, UserSeat<unknown>>;
+    liveOfferPayments: MapStore<OfferId, MapStore<Brand, Payment>>;
 }>;
 export type PurseRecord = BrandDescriptor & {
     purse: Purse;

package/src/smartWallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"smartWallet.d.ts","sourceRoot":"","sources":["smartWallet.js"],"names":[],"mappings":"AAqMA,kDAAmD;AAiB5C,+EAFI,YAAY;uBAqiB2E,KAAK,WAAW,CAAC;;IA/F3G;;;;;;OAMG;sCAHQ,OAAO,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,mCAErC,QAAQ,IAAI,CAAC;;QArK1B;;;;;;;;WAQG;yBAHQ,OAAO,GACL,QAAQ,MAAM,CAAC;;;QAiC5B;;;;;;WAMG;gCAHQ,OAAO,aAAa,EAAE,SAAS,GAC7B,QAAQ,IAAI,CAAC;QAwG1B;;;;;;WAMG;8BAHQ,OAAO,aAAa,EAAE,OAAO,GAC3B,QAAQ,IAAI,CAAC;;IAmE1B,sCAAsC;;IAItC,sCAAsC;;;;;;;;;;;;;;GAkD7C;iCA7tBY;IACZ,MAAU,EAAE,cAAc,CAAA;IAC1B,KAAS,EAAE,OAAO,aAAa,EAAE,SAAS,CAAC;CACxC;iCAIS;IACZ,MAAU,EAAE,cAAc,CAAA;IAC1B,OAAW,EAAE,OAAO,aAAa,EAAE,OAAO,CAAC;CACxC;2BAOU,kBAAkB,GAAG,kBAAkB;;;;;;;;;;;;;;;;;;YAoBxC,MAAM;QAAC,KAAK,EAAE,KAAK,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAAC;2BACvB,MAAM,CAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,CAAE,CAAC;;;;gBAE7D,MAAM,CAAC,OAAO,aAAa,EAAE,OAAO,EAAE,OAAO,aAAa,EAAE,WAAW,CAAC,CAAC;;;;;;;;;;;;;;2BAK7E;IAAE,OAAO,EAAE,aAAa,CAAC;IAAC,QAAQ,OAAO,aAAa,EAAE,WAAW,CAAA;CAAE,GAC3E;IAAE,OAAO,EAAE,SAAS,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,OAAO,EAAE,cAAc,CAAC;IAAC,QAAQ;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE;;;;8BAchD;IACZ,KAAS,EAAE,KAAK,CAAC;IACjB,WAAe,EAAE,WAAW,CAAC;IAC7B,MAAU,EAAE,MAAM,CAAC;IACnB,OAAW,EAAE,OAAO,SAAS,EAAE,OAAO,CAAA;CACnC;0BAKU,OAAO,SAAS,EAAE,WAAW;2BAG9B;IACZ,OAAW,EAAE,MAAM,CAAC;IACpB,IAAQ,EAAE,KAAK,OAAO,2BAA2B,EAAE,IAAI,CAAC,CAAC;IACzD,kBAAsB,EAAE,WAAW,CAAC;IACpC,eAAmB,EAAE,MAAM,KAAK,CAAC,CAAC;IAClC,iBAAqB,EAAE,WAAW,CAAC;CAChC;sCAES,KAAK,SAAS,KAAK,EAAE,eAAe,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,QAAQ,CAAC;2BAChE;IACZ,WAAe,EAAE,KAAK,OAAO,cAAc,EAAE,OAAO,CAAC,CAAC;IACtD,QAAY,EAAE,uBAAuB,CAAC;IACtC,gBAAoB,EAAE,OAAO,KAAK,CAAC,CAAC;IACpC,eAAmB,EAAE,MAAM,KAAK,CAAC,CAAC;IAClC,qBAAyB,EAAE,WAAW,CAAC;IACvC,gBAAoB,EAAE,UAAU,CAAC;IACjC,GAAO,EAAE,KAAK,UAAU,CAAC,CAAC;CACvB;;;;;;;oBAES,cAAc,GAAG,YAAY;6BAM7B,SAAS,YAAY,GAAG;IACpC,aAAiB,EAAE,SAAS,KAAK,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC;IACnD,uBAA2B,EAAE,SAAS,MAAM,EAAE,OAAO,SAAS,EAAE,gBAAgB,CAAC,CAAC;IAClF,4BAAgC,EAAE,SAAS,MAAM,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3E,qBAAyB,EAAE,SAAS,MAAM,EAAE,MAAM,CAAC,CAAC;IACpD,aAAiB,EAAE,SAAS,WAAW,EAAE,MAAM,CAAC,CAAC;IACjD,iBAAqB,EAAE,OAAO,6CAA6C,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;IACvG,kBAAsB,EAAE,OAAO,6CAA6C,EAAE,WAAW,CAAC,mBAAmB,CAAC,CAAC;IAC/G,UAAc,EAAE,SAAS,OAAO,aAAa,EAAE,OAAO,EAAE,OAAO,aAAa,EAAE,WAAW,CAAC,CAAC;IAC3F,cAAkB,EAAE,aAAa,OAAO,aAAa,EAAE,OAAO,EAAE,SAAS,OAAO,CAAC,CAAC,CAAC;CAChF,CAAC;0BAEQ,eAAe,GAAG;IAAE,KAAK,EAAE,KAAK,CAAA;CAAE;2BAClC,EACT;0BA+mBU,QAAQ,WAAW,WAAW,yBAAyB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"smartWallet.d.ts","sourceRoot":"","sources":["smartWallet.js"],"names":[],"mappings":"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"}