@agoric/smart-wallet 0.5.4-dev-7cc5def.0 → 0.5.4-dev-3ce0599.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/smart-wallet",
-  "version": "0.5.4-dev-7cc5def.0+7cc5def",
+  "version": "0.5.4-dev-3ce0599.0+3ce0599",
   "description": "Wallet contract",
   "type": "module",
   "scripts": {
@@ -16,7 +16,7 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-proto": "0.3.1-dev-7cc5def.0+7cc5def",
+    "@agoric/cosmic-proto": "0.3.1-dev-3ce0599.0+3ce0599",
     "@endo/bundle-source": "^2.5.2",
     "@endo/captp": "^3.1.2",
     "@endo/init": "^0.5.57",
@@ -24,16 +24,16 @@
     "import-meta-resolve": "^2.2.1"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-7cc5def.0+7cc5def",
-    "@agoric/casting": "0.4.3-dev-7cc5def.0+7cc5def",
-    "@agoric/ertp": "0.16.3-dev-7cc5def.0+7cc5def",
-    "@agoric/internal": "0.3.3-dev-7cc5def.0+7cc5def",
-    "@agoric/notifier": "0.6.3-dev-7cc5def.0+7cc5def",
-    "@agoric/store": "0.9.3-dev-7cc5def.0+7cc5def",
-    "@agoric/swingset-vat": "0.32.3-dev-7cc5def.0+7cc5def",
-    "@agoric/vat-data": "0.5.3-dev-7cc5def.0+7cc5def",
-    "@agoric/vats": "0.15.2-dev-7cc5def.0+7cc5def",
-    "@agoric/zoe": "0.26.3-dev-7cc5def.0+7cc5def",
+    "@agoric/assert": "0.6.1-dev-3ce0599.0+3ce0599",
+    "@agoric/casting": "0.4.3-dev-3ce0599.0+3ce0599",
+    "@agoric/ertp": "0.16.3-dev-3ce0599.0+3ce0599",
+    "@agoric/internal": "0.3.3-dev-3ce0599.0+3ce0599",
+    "@agoric/notifier": "0.6.3-dev-3ce0599.0+3ce0599",
+    "@agoric/store": "0.9.3-dev-3ce0599.0+3ce0599",
+    "@agoric/swingset-vat": "0.32.3-dev-3ce0599.0+3ce0599",
+    "@agoric/vat-data": "0.5.3-dev-3ce0599.0+3ce0599",
+    "@agoric/vats": "0.15.2-dev-3ce0599.0+3ce0599",
+    "@agoric/zoe": "0.26.3-dev-3ce0599.0+3ce0599",
     "@endo/eventual-send": "^0.17.3",
     "@endo/far": "^0.2.19",
     "@endo/marshal": "^0.8.6",
@@ -58,10 +58,13 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7cc5defcf5c6d126fe39c94be4953afd11105a5c"
+  "gitHead": "3ce0599d5173b802598b5bedf57d3c30f016f789"
 }

package/src/proposals/upgrade-walletFactory-proposal.d.ts

@@ -0,0 +1,17 @@
+export function upgradeWalletFactory({ consume: { contractKits, governedContractKits, chainStorage, walletBridgeManager: walletBridgeManagerP, }, instance: { consume: { walletFactory: wfInstanceP, provisionPool: ppInstanceP }, }, }: BootstrapPowers, config: {
+    options: {
+        walletFactoryRef: VatSourceRef & {
+            bundleID: string;
+        };
+    };
+}): Promise<void>;
+export function publishAgoricBrandsDisplayInfo({ consume: { agoricNames, board, chainStorage }, }: BootstrapPowers): Promise<void>;
+export function getManifestForUpgrade(_powers: any, { walletFactoryRef }: {
+    walletFactoryRef: any;
+}): {
+    manifest: import("@agoric/vats/src/core/lib-boot").BootstrapManifest;
+    options: {
+        walletFactoryRef: any;
+    };
+};
+//# sourceMappingURL=upgrade-walletFactory-proposal.d.ts.map

package/src/proposals/upgrade-walletFactory-proposal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrade-walletFactory-proposal.d.ts","sourceRoot":"","sources":["upgrade-walletFactory-proposal.js"],"names":[],"mappings":"AAqBO,yOALK,eAAe;;0BAGI,YAAY,GAAG;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE;;kBAkDjE;AAMM,mGAFK,eAAe,iBAwB1B;AAyBM;;;;;;;EAKN"}

package/src/proposals/upgrade-walletFactory-proposal.js

@@ -0,0 +1,128 @@
+// @ts-check
+import { E } from '@endo/far';
+import { makeMarshal } from '@endo/marshal';
+import { allValues } from '@agoric/internal';
+
+console.warn('upgrade-walletFactory-proposal.js module evaluating');
+
+const { Fail } = assert;
+
+// vstorage paths under published.*
+const WALLET_STORAGE_PATH_SEGMENT = 'wallet';
+const BOARD_AUX = 'boardAux';
+
+const marshalData = makeMarshal(_val => Fail`data only`);
+
+/**
+ * @param { BootstrapPowers } powers
+ *
+ * @param {object} config
+ * @param {{ walletFactoryRef: VatSourceRef & { bundleID: string } }} config.options
+ */
+export const upgradeWalletFactory = async (
+  {
+    consume: {
+      contractKits,
+      governedContractKits,
+      chainStorage,
+      walletBridgeManager: walletBridgeManagerP,
+    },
+    instance: {
+      consume: { walletFactory: wfInstanceP, provisionPool: ppInstanceP },
+    },
+  },
+  config,
+) => {
+  console.log('upgradeWalletFactory: config', config);
+  const { walletFactoryRef } = config.options;
+
+  // console.log('upgradeWalletFactory: awaiting instances etc.');
+  const { wfInstance, ppInstance, walletBridgeManager, storageNode } =
+    await allValues({
+      wfInstance: wfInstanceP,
+      ppInstance: ppInstanceP,
+      walletBridgeManager: walletBridgeManagerP,
+      // @ts-expect-error chainStorage is only falsy in testing
+      storageNode: E(chainStorage).makeChildNode(WALLET_STORAGE_PATH_SEGMENT),
+    });
+  // console.log('upgradeWalletFactory: awaiting contract kits');
+  const { wfKit, ppKit } = await allValues({
+    wfKit: E(contractKits).get(wfInstance),
+    ppKit: E(governedContractKits).get(ppInstance),
+  });
+  // console.log('upgradeWalletFactory: awaiting walletReviver');
+  const walletReviver = await E(ppKit.creatorFacet).getWalletReviver();
+  const newPrivateArgs = harden({
+    storageNode,
+    walletBridgeManager,
+    walletReviver,
+  });
+
+  console.log(
+    'upgradeWalletFactory: upgrading with newPrivateArgs',
+    newPrivateArgs,
+  );
+  await E(wfKit.adminFacet).upgradeContract(
+    walletFactoryRef.bundleID,
+    newPrivateArgs,
+  );
+  console.log('upgradeWalletFactory: done');
+};
+harden(upgradeWalletFactory);
+
+/**
+ * @param { BootstrapPowers } powers
+ */
+export const publishAgoricBrandsDisplayInfo = async ({
+  consume: { agoricNames, board, chainStorage },
+}) => {
+  // chainStorage type includes undefined, which doesn't apply here.
+  // @ts-expect-error UNTIL https://github.com/Agoric/agoric-sdk/issues/8247
+  const boardAux = E(chainStorage).makeChildNode(BOARD_AUX);
+  const publishBrandInfo = async brand => {
+    const [id, displayInfo, allegedName] = await Promise.all([
+      E(board).getId(brand),
+      E(brand).getDisplayInfo(),
+      E(brand).getAllegedName(),
+    ]);
+    const node = E(boardAux).makeChildNode(id);
+    const aux = marshalData.toCapData(harden({ allegedName, displayInfo }));
+    await E(node).setValue(JSON.stringify(aux));
+  };
+
+  /** @type {ERef<NameHub>} */
+  const brandHub = E(agoricNames).lookup('brand');
+  const brands = await E(brandHub).values();
+  // tolerate failure; in particular, for the timer brand
+  await Promise.allSettled(brands.map(publishBrandInfo));
+};
+harden(publishAgoricBrandsDisplayInfo);
+
+/** @type { import("@agoric/vats/src/core/lib-boot").BootstrapManifest } */
+const manifest = {
+  [upgradeWalletFactory.name]: {
+    // include rationale for closely-held, high authority capabilities
+    consume: {
+      contractKits: `to upgrade walletFactory using its adminFacet`,
+      governedContractKits:
+        'to get walletReviver from provisionPool.creatorFacet',
+      chainStorage: 'to allow walletFactory to (continue) write to vstorage',
+      walletBridgeManager: 'to handle bridged cosmos SpendAction messages',
+    },
+    // widely-shared, low authority instance handles need no rationale
+    instance: {
+      consume: { walletFactory: true, provisionPool: true },
+    },
+  },
+  [publishAgoricBrandsDisplayInfo.name]: {
+    consume: { agoricNames: true, board: true, chainStorage: true },
+  },
+};
+harden(manifest);
+
+export const getManifestForUpgrade = (_powers, { walletFactoryRef }) => {
+  return harden({
+    manifest,
+    options: { walletFactoryRef },
+  });
+};

package/src/walletFactory.d.ts

@@ -1,5 +1,9 @@
-/** @type {ContractMeta} */
-export const meta: ContractMeta;
+export namespace customTermsShape {
+    let agoricNames: any;
+    let board: any;
+    let assetPublisher: any;
+}
+export const privateArgsShape: import("@endo/patterns").Matcher;
 export function publishDepositFacet(address: string, wallet: import('./smartWallet.js').SmartWallet, namesByAddressAdmin: ERef<import('@agoric/vats').NameAdmin>): Promise<unknown>;
 export function makeAssetRegistry(assetPublisher: AssetPublisher): {
     /** @param {Brand} brand */
@@ -18,7 +22,7 @@ export function makeAssetRegistry(assetPublisher: AssetPublisher): {
         petname: import('./types').Petname;
     }>;
 };
-export function start(zcf: ZCF<SmartWalletContractTerms>, privateArgs: {
+export function prepare(zcf: ZCF<SmartWalletContractTerms>, privateArgs: {
     storageNode: ERef<StorageNode>;
     walletBridgeManager?: ERef<import("@agoric/vats").ScopedBridgeManager> | undefined;
     walletReviver?: ERef<WalletReviver> | undefined;
@@ -105,4 +109,5 @@ export type WalletReviver = {
     reviveWallet: (address: string) => Promise<import('./smartWallet').SmartWallet>;
     ackWallet: (address: string) => isRevive;
 };
+export type start = typeof prepare;
 //# sourceMappingURL=walletFactory.d.ts.map

package/src/walletFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"walletFactory.d.ts","sourceRoot":"","sources":["walletFactory.js"],"names":[],"mappings":"AAkBA,2BAA2B;AAC3B,mBADW,YAAY,CAYrB;AAWK,6CAJI,MAAM,UACN,OAAO,kBAAkB,EAAE,WAAW,uBACtC,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC,oBAehD;AAWM,kDAFI,cAAc;IAwCrB,2BAA2B;iBAAf,KAAK;IAEjB,2BAA2B;iBAAf,KAAK;eApCP,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO,SAAS,EAAE,OAAO;;;eAH3B,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO,SAAS,EAAE,OAAO;;EAsCxC;AAmCM,2BARI,IAAI,wBAAwB,CAAC;iBAEtB,KAAK,WAAW,CAAC;;;;;QAgH7B;;;;;;;WAOG;oCANQ,MAAM,QACN,KAAK,OAAO,2BAA2B,EAAE,IAAI,CAAC,uBAC9C,KAAK,OAAO,eAAe,EAAE,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;QAHlD;;;;;;;WAOG;oCANQ,MAAM,QACN,KAAK,OAAO,2BAA2B,EAAE,IAAI,CAAC,uBAC9C,KAAK,OAAO,eAAe,EAAE,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;GAgDvD;uCA7LY;IACZ,WAAe,EAAE,KAAK,OAAO,CAAC,CAAC;IAC/B,KAAS,EAAE,KAAK,OAAO,cAAc,EAAE,KAAK,CAAC,CAAC;IAC9C,cAAkB,EAAE,cAAc,CAAC;CAChC;sBAES,OAAO,cAAc,EAAE,OAAO;6BAE9B;IACZ,oBAAwB,EAAE,MAAM,KAChC,kBAAwB,OAAO,2BAA2B,EAAE,eAAe,CAAC,CAAC,CAAA;CAC1E;uBAES,OAAO;;4BAES,MAAM,KAAK,QAAQ,OAAO,eAAe,EAAE,WAAW,CAAC;yBAC1D,MAAM,KAAK,QAAQ"}
+{"version":3,"file":"walletFactory.d.ts","sourceRoot":"","sources":["walletFactory.js"],"names":[],"mappings":";;;;;AAwBA,gEAKE;AAUK,6CAJI,MAAM,UACN,OAAO,kBAAkB,EAAE,WAAW,uBACtC,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC,oBAehD;AAWM,kDAFI,cAAc;IAwCrB,2BAA2B;iBAAf,KAAK;IAEjB,2BAA2B;iBAAf,KAAK;eApCP,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO,SAAS,EAAE,OAAO;;;eAH3B,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO,SAAS,EAAE,OAAO;;EAsCxC;AAmCM,6BARI,IAAI,wBAAwB,CAAC;iBAEtB,KAAK,WAAW,CAAC;;;;;QAgH7B;;;;;;;WAOG;oCANQ,MAAM,QACN,KAAK,OAAO,2BAA2B,EAAE,IAAI,CAAC,uBAC9C,KAAK,OAAO,eAAe,EAAE,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;QAHlD;;;;;;;WAOG;oCANQ,MAAM,QACN,KAAK,OAAO,2BAA2B,EAAE,IAAI,CAAC,uBAC9C,KAAK,OAAO,eAAe,EAAE,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;GAqDvD;uCAlMY;IACZ,WAAe,EAAE,KAAK,OAAO,CAAC,CAAC;IAC/B,KAAS,EAAE,KAAK,OAAO,cAAc,EAAE,KAAK,CAAC,CAAC;IAC9C,cAAkB,EAAE,cAAc,CAAC;CAChC;sBAES,OAAO,cAAc,EAAE,OAAO;6BAE9B;IACZ,oBAAwB,EAAE,MAAM,KAChC,kBAAwB,OAAO,2BAA2B,EAAE,eAAe,CAAC,CAAC,CAAA;CAC1E;uBAES,OAAO;;4BAES,MAAM,KAAK,QAAQ,OAAO,eAAe,EAAE,WAAW,CAAC;yBAC1D,MAAM,KAAK,QAAQ;;oBAuL/B,cAAc"}

package/src/walletFactory.js

@@ -16,20 +16,18 @@ import { shape } from './typeGuards.js';
 
 const trace = makeTracer('WltFct');
 
-/** @type {ContractMeta} */
-export const meta = {
-  customTermsShape: {
-    agoricNames: M.eref(M.remotable('agoricNames')),
-    board: M.eref(M.remotable('board')),
-    assetPublisher: M.eref(M.remotable('Bank')),
-  },
-  privateArgsShape: M.splitRecord(
+export const customTermsShape = harden({
+  agoricNames: M.eref(M.remotable('agoricNames')),
+  board: M.eref(M.remotable('board')),
+  assetPublisher: M.eref(M.remotable('Bank')),
+});
+
+export const privateArgsShape = harden(
+  M.splitRecord(
     { storageNode: M.eref(M.remotable('StorageNode')) },
     { walletBridgeManager: M.eref(M.remotable('walletBridgeManager')) },
   ),
-  upgradability: 'canUpgrade',
-};
-harden(meta);
+);
 
 /**
  * Provide a NameHub for this address and insert depositFacet only if not
@@ -143,7 +141,7 @@ export const makeAssetRegistry = assetPublisher => {
  * }} privateArgs
  * @param {import('@agoric/vat-data').Baggage} baggage
  */
-export const start = async (zcf, privateArgs, baggage) => {
+export const prepare = async (zcf, privateArgs, baggage) => {
   const { agoricNames, board, assetPublisher } = zcf.getTerms();
 
   const zoe = zcf.getZoeService();
@@ -294,11 +292,20 @@ export const start = 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
-    void E(walletBridgeManager).initHandler(handleWalletAction);
+    const upgrading = baggage.has('walletsByAddress');
+    if (upgrading) {
+      void E(walletBridgeManager).setHandler(handleWalletAction);
+    } else {
+      void E(walletBridgeManager).initHandler(handleWalletAction);
+    }
   }
 
   return {
     creatorFacet,
   };
 };
-harden(start);
+harden(prepare);
+
+// So we can consistently import `start` from contracts.
+// Can't be a value export because Zoe enforces that contracts export one or the other.
+/** @typedef {typeof prepare} start */