@agoric/vats 0.16.0-upgrade-19-dev-0754752.0 → 0.16.0-upgrade-18a-dev-4ee0508.0

package/src/vat-bank.js

@@ -3,7 +3,7 @@ import { E, Far } from '@endo/far';
 import { M, getInterfaceGuardPayload } from '@endo/patterns';
 
 import { AmountMath, AssetKind, BrandShape } from '@agoric/ertp';
-import { deeplyFulfilledObject, BridgeBigIntShape } from '@agoric/internal';
+import { deeplyFulfilledObject } from '@agoric/internal';
 import { prepareGuardedAttenuator } from '@agoric/internal/src/callback.js';
 import {
   IterableEachTopicI,
@@ -23,8 +23,8 @@ import {
 
 /**
  * @import {Guarded} from '@endo/exo';
- * @import {RemotableObject} from '@endo/pass-style';
- * @import {BridgeMessage, BridgeBigInt} from '@agoric/cosmic-swingset/src/types.js';
+ * @import {Passable, RemotableObject} from '@endo/pass-style';
+ * @import {VirtualPurseController} from './virtual-purse.js';
  */
 
 const { VirtualPurseControllerI } = makeVirtualPurseKitIKit();
@@ -42,12 +42,12 @@ const BridgeChannelI = M.interface('BridgeChannel', {
 
 /**
  * @typedef {Guarded<{
- *   update: (value: string, nonce?: BridgeBigInt) => void;
+ *   update: (value: string, nonce?: string) => void;
  * }>} BalanceUpdater
  */
 
 const BalanceUpdaterI = M.interface('BalanceUpdater', {
-  update: M.call(M.string()).optional(BridgeBigIntShape).returns(),
+  update: M.call(M.string()).optional(M.string()).returns(),
 });
 
 /**
@@ -71,10 +71,6 @@ const prepareBalanceUpdater = zone =>
       lastBalanceUpdate: -1n,
     }),
     {
-      /**
-       * @param {string} value
-       * @param {BridgeBigInt} [nonce]
-       */
       update(value, nonce = undefined) {
         if (nonce !== undefined) {
           const thisBalanceUpdate = BigInt(nonce);
@@ -190,13 +186,12 @@ const prepareBankChannelHandler = zone =>
     /** @param {MapStore<string, MapStore<string, BalanceUpdater>>} denomToAddressUpdater */
     denomToAddressUpdater => ({ denomToAddressUpdater }),
     {
-      /** @param {BridgeMessage} obj */
       async fromBridge(obj) {
-        switch (obj?.type) {
+        switch (obj && obj.type) {
           case 'VBANK_BALANCE_UPDATE': {
             const { denomToAddressUpdater } = this.state;
             for (const update of obj.updated) {
-              const { address, denom, amount } = update;
+              const { address, denom, amount: value, nonce } = update;
               /** @type {BalanceUpdater | undefined} */
               let updater;
               try {
@@ -209,7 +204,7 @@ const prepareBankChannelHandler = zone =>
               }
               if (updater) {
                 try {
-                  updater.update(amount, obj.nonce);
+                  updater.update(value, nonce);
                 } catch (e) {
                   // ??? Is this an invariant that should complain louder?
 

package/src/vat-mints.d.ts

@@ -17,10 +17,10 @@ export function buildRootObject(): {
      * @param {any} issuerNameSingular For example, 'moola', or 'simolean'
      * @param {[AssetKind?, DisplayInfo?]} issuerArgs
      */
-    makeMintAndIssuer: (issuerNameSingular: any, issuerArgs_0?: globalThis.AssetKind | undefined, issuerArgs_1?: globalThis.DisplayInfo | undefined) => globalThis.Issuer<"copySet" | "set" | "nat" | "copyBag", import("@endo/patterns").Key>;
+    makeMintAndIssuer: (issuerNameSingular: any, issuerArgs_0?: globalThis.AssetKind | undefined, issuerArgs_1?: globalThis.DisplayInfo | undefined) => globalThis.Issuer<"copySet" | "set" | "nat" | "copyBag", any>;
     provideIssuerKit: (issuerName: any, ...issuerArgs: any[]) => {
-        mint: globalThis.Mint<any, import("@endo/patterns").Key>;
-        issuer: globalThis.Issuer<any, import("@endo/patterns").Key>;
+        mint: globalThis.Mint<any, any>;
+        issuer: globalThis.Issuer<any, any>;
         brand: globalThis.Brand<any>;
     };
     /**
@@ -52,10 +52,10 @@ export function buildRootObject(): {
      * @param {any} issuerNameSingular For example, 'moola', or 'simolean'
      * @param {[AssetKind?, DisplayInfo?]} issuerArgs
      */
-    makeMintAndIssuer: (issuerNameSingular: any, issuerArgs_0?: globalThis.AssetKind | undefined, issuerArgs_1?: globalThis.DisplayInfo | undefined) => globalThis.Issuer<"copySet" | "set" | "nat" | "copyBag", import("@endo/patterns").Key>;
+    makeMintAndIssuer: (issuerNameSingular: any, issuerArgs_0?: globalThis.AssetKind | undefined, issuerArgs_1?: globalThis.DisplayInfo | undefined) => globalThis.Issuer<"copySet" | "set" | "nat" | "copyBag", any>;
     provideIssuerKit: (issuerName: any, ...issuerArgs: any[]) => {
-        mint: globalThis.Mint<any, import("@endo/patterns").Key>;
-        issuer: globalThis.Issuer<any, import("@endo/patterns").Key>;
+        mint: globalThis.Mint<any, any>;
+        issuer: globalThis.Issuer<any, any>;
         brand: globalThis.Brand<any>;
     };
     /**

package/tools/bank-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bank-utils.d.ts","sourceRoot":"","sources":["bank-utils.js"],"names":[],"mappings":"AAYO,4CAFI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC,EAAE;sBA4B1C,MAAM,cACN,MAAM,gBACN,MAAM,OACN,OAAO,oBAAoB,EAAE,cAAc;;;EAqBvD;AAOM,8CAHJ;IAAmD,QAAQ;IAC3B,UAAU,kBAAzB,OAAO;CAC1B;;;6FAyB8lhB,WAAW,eAA6B,cAA2B;;;mBAAo8C,CAAC;;;;0BAX1lkB,MAAM,CAAC,KAAK,CAAC,KACX,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;GASrC"}
+{"version":3,"file":"bank-utils.d.ts","sourceRoot":"","sources":["bank-utils.js"],"names":[],"mappings":"AAYO,4CAFI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC,EAAE;sBA4B1C,MAAM,cACN,MAAM,gBACN,MAAM,OACN,OAAO,oBAAoB,EAAE,cAAc;;;EAqBvD;AAOM,8CAHJ;IAAmD,QAAQ;IAC3B,UAAU,kBAAzB,OAAO;CAC1B;;;6FAyB87gB,WAAW,eAA6B,cAA2B;;;mBAAo8C,CAAC;;;;0BAX17jB,MAAM,CAAC,KAAK,CAAC,KACX,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;GASrC"}

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

@@ -1,33 +0,0 @@
-export function upgradePSMProposal({ consume: { psmKit: psmKitP, economicCommitteeCreatorFacet: electorateCreatorFacet, instancePrivateArgs: instancePrivateArgsP, }, }: BootstrapPowers & {
-    consume: {
-        economicCommitteeCreatorFacet: any;
-        psmKit: any;
-    };
-}, options: {
-    options: {
-        psmRef: VatSourceRef;
-    };
-}): Promise<void>;
-export function getManifestForUpgradingPSM({ restoreRef }: {
-    restoreRef: any;
-}, { psmRef }: {
-    psmRef: any;
-}): {
-    manifest: {
-        [upgradePSMProposal.name]: {
-            consume: {
-                psmKit: boolean;
-                economicCommitteeCreatorFacet: boolean;
-                instancePrivateArgs: boolean;
-            };
-            produce: {};
-        };
-    };
-    options: {
-        psmRef: any;
-    };
-    installations: {
-        psm: any;
-    };
-};
-//# sourceMappingURL=upgrade-psm-proposal.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"upgrade-psm-proposal.d.ts","sourceRoot":"","sources":["upgrade-psm-proposal.js"],"names":[],"mappings":"AAkBO,yKAXI,eAAe,GAAG;IACxB,OAAO,EAAE;QACP,6BAA6B,EAAE,GAAG,CAAC;QACnC,MAAM,EAAE,GAAG,CAAC;KACb,CAAC;CACH,WAED;IAEW,OAAO,EAFV;QACN,MAAM,EAAE,YAAY,CAAC;KACtB;CACH,iBA0CA;AAEM;;;;;;QAEH,CAAC,kBAAkB,CAAC,IAAI,CAAC;;;;;;;UAOxB;;;;;;;;EAIH"}

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

@@ -1,75 +0,0 @@
-import { E } from '@endo/far';
-import { deeplyFulfilled } from '@endo/marshal';
-import { makeTracer } from '@agoric/internal';
-
-const trace = makeTracer('UpgradePSM');
-
-/**
- * @param {BootstrapPowers & {
- *   consume: {
- *     economicCommitteeCreatorFacet: any;
- *     psmKit: any;
- *   };
- * }} powers
- * @param {object} options
- * @param {{
- *   psmRef: VatSourceRef;
- * }} options.options
- */
-export const upgradePSMProposal = async (
-  {
-    consume: {
-      psmKit: psmKitP,
-      economicCommitteeCreatorFacet: electorateCreatorFacet,
-      instancePrivateArgs: instancePrivateArgsP,
-    },
-  },
-  options,
-) => {
-  const { psmRef } = options.options;
-
-  trace(`PSM BUNDLE ID: `, psmRef);
-
-  const [psmKitMap, instancePrivateArgs] = await Promise.all([
-    psmKitP,
-    instancePrivateArgsP,
-  ]);
-
-  for (const { psm, psmAdminFacet, label } of psmKitMap.values()) {
-    const [originalPrivateArgs, poserInvitation] = await Promise.all([
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore Local tsc sees this as an error but typedoc does not
-      deeplyFulfilled(instancePrivateArgs.get(psm)),
-      E(electorateCreatorFacet).getPoserInvitation(),
-    ]);
-
-    const newPrivateArgs = harden({
-      ...originalPrivateArgs,
-      initialPoserInvitation: poserInvitation,
-    });
-
-    const upgradeResult = await E(psmAdminFacet).upgradeContract(
-      psmRef.bundleID,
-      newPrivateArgs,
-    );
-
-    trace(`PSM ${label} upgraded: `, upgradeResult);
-  }
-
-  trace('Done.');
-};
-
-export const getManifestForUpgradingPSM = ({ restoreRef }, { psmRef }) => ({
-  manifest: {
-    [upgradePSMProposal.name]: {
-      consume: {
-        psmKit: true,
-        economicCommitteeCreatorFacet: true,
-        instancePrivateArgs: true,
-      },
-      produce: {},
-    },
-  },
-  options: { psmRef },
-  installations: { psm: restoreRef(psmRef) },
-});