refactor: pull offers.js and payments.js into smartWallets

Fix imports in quite a few places
Agoric · Nov 1, 2023 · 2096070 · 2096070
1 parent b58f004
commit 2096070
Show file tree

Hide file tree

Showing 20 changed files with 123 additions and 562 deletions.
diff --git a/packages/agoric-cli/src/commands/auction.js b/packages/agoric-cli/src/commands/auction.js
@@ -150,7 +150,7 @@ export const makeAuctionCommand = (
           path: { paramPath: { key: 'governedParams' } },
         };
 
-        /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
+        /** @type {import('@agoric/smart-wallet/src/smartWallet.js').OfferSpec} */
         const offer = {
           id: opts.offerId,
           invitationSpec: {

diff --git a/packages/agoric-cli/src/commands/gov.js b/packages/agoric-cli/src/commands/gov.js
@@ -13,7 +13,7 @@ import {
   sendAction,
 } from '../lib/wallet.js';
 
-/** @typedef {import('@agoric/smart-wallet/src/offers.js').OfferSpec} OfferSpec */
+/** @typedef {import('@agoric/smart-wallet/src/smartWallet.js').OfferSpec} OfferSpec */
 
 const collectValues = (val, memo) => {
   memo.push(val);

diff --git a/packages/agoric-cli/src/commands/inter.js b/packages/agoric-cli/src/commands/inter.js
@@ -101,7 +101,7 @@ const makeFormatters = assets => {
 /**
  * Dynamic check that an OfferStatus is also a BidSpec.
  *
- * @param {import('@agoric/smart-wallet/src/offers.js').OfferStatus} offerStatus
+ * @param {import('@agoric/smart-wallet/src/smartWallet.js').OfferStatus} offerStatus
  * @param {import('../lib/wallet.js').AgoricNamesRemotes} agoricNames
  * @param {typeof console.warn} warn
  * returns null if offerStatus is not a BidSpec
@@ -125,7 +125,7 @@ const coerceBid = (offerStatus, agoricNames, warn) => {
   }
 
   /**
-   * @type {import('@agoric/smart-wallet/src/offers.js').OfferStatus &
+   * @type {import('@agoric/smart-wallet/src/smartWallet.js').OfferStatus &
    *        { offerArgs: BidSpec}}
    */
   // @ts-expect-error dynamic cast
@@ -136,7 +136,7 @@ const coerceBid = (offerStatus, agoricNames, warn) => {
 /**
  * Format amounts etc. in a BidSpec OfferStatus
  *
- * @param {import('@agoric/smart-wallet/src/offers.js').OfferStatus &
+ * @param {import('@agoric/smart-wallet/src/smartWallet.js').OfferStatus &
  *         { offerArgs: BidSpec}} bid
  * @param {import('agoric/src/lib/format.js').AssetDescriptor[]} assets
  */
@@ -328,7 +328,7 @@ inter auction status
 
   /**
    * @param {string} from
-   * @param {import('@agoric/smart-wallet/src/offers.js').OfferSpec} offer
+   * @param {import('@agoric/smart-wallet/src/smartWallet.js').OfferSpec} offer
    * @param {Awaited<ReturnType<tryMakeUtils>>} tools
    * @param {boolean?} dryRun
    */

diff --git a/packages/agoric-cli/src/commands/oracle.js b/packages/agoric-cli/src/commands/oracle.js
@@ -107,7 +107,7 @@ export const makeOracleCommand = (logger, io = {}) => {
       const { lookupPriceAggregatorInstance } = await rpcTools();
       const instance = lookupPriceAggregatorInstance(opts.pair);
 
-      /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
+      /** @type {import('@agoric/smart-wallet/src/smartWallet.js').OfferSpec} */
       const offer = {
         id: opts.offerId,
         invitationSpec: {

diff --git a/packages/agoric-cli/src/commands/psm.js b/packages/agoric-cli/src/commands/psm.js
@@ -198,7 +198,7 @@ export const makePsmCommand = logger => {
       const { lookupPsmInstance } = await rpcTools();
       const psmInstance = lookupPsmInstance(opts.pair);
 
-      /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
+      /** @type {import('@agoric/smart-wallet/src/smartWallet.js').OfferSpec} */
       const offer = {
         id: opts.offerId,
         invitationSpec: {
@@ -255,7 +255,7 @@ export const makePsmCommand = logger => {
         brand: istBrand,
         value: BigInt(opts.limit * 1_000_000),
       });
-      /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
+      /** @type {import('@agoric/smart-wallet/src/smartWallet.js').OfferSpec} */
       const offer = {
         id: opts.offerId,
         invitationSpec: {

diff --git a/packages/agoric-cli/src/commands/reserve.js b/packages/agoric-cli/src/commands/reserve.js
@@ -70,7 +70,7 @@ export const makeReserveCommand = (_logger, io = {}) => {
 
       const feesToBurn = { brand: agoricNames.brand.IST, value: opts.value };
 
-      /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
+      /** @type {import('@agoric/smart-wallet/src/smartWallet.js').OfferSpec} */
       const offer = {
         id: opts.offerId,
         invitationSpec: {

diff --git a/packages/agoric-cli/src/commands/test-upgrade.js b/packages/agoric-cli/src/commands/test-upgrade.js
@@ -73,7 +73,7 @@ export const makeTestCommand = (
       const { home, keyringBackend: backend } = testCmd.opts();
 
       const io = { ...networkConfig, execFileSync, delay, stdout };
-      /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
+      /** @type {import('@agoric/smart-wallet/src/smartWallet.js').OfferSpec} */
       const offer = {
         id: opts.offerId,
         invitationSpec: {

diff --git a/packages/agoric-cli/src/lib/wallet.js b/packages/agoric-cli/src/lib/wallet.js
@@ -91,7 +91,7 @@ export const outputActionAndHint = (bridgeAction, { stdout, stderr }) => {
 };
 
 /**
- * @param {import('@agoric/smart-wallet/src/offers.js').OfferSpec} offer
+ * @param {import('@agoric/smart-wallet/src/smartWallet.js').OfferSpec} offer
  * @param {Pick<import('stream').Writable,'write'>} [stdout]
  */
 export const outputExecuteOfferAction = (offer, stdout = process.stdout) => {

diff --git a/packages/agoric-cli/test/test-inter-cli.js b/packages/agoric-cli/test/test-inter-cli.js
@@ -188,7 +188,7 @@ const makeProcess = (t, keyring, out) => {
 };
 
 /**
- * @type {import('@agoric/smart-wallet/src/offers.js').OfferStatus &
+ * @type {import('@agoric/smart-wallet/src/smartWallet.js').OfferStatus &
  *         { offerArgs: import('@agoric/inter-protocol/src/auction/auctionBook.js').OfferSpec}}
  */
 const offerStatus2 = harden({
@@ -253,7 +253,7 @@ test('amount parsing', t => {
 test.todo('want as max collateral wanted');
 
 /**
- * @type {import('@agoric/smart-wallet/src/offers.js').OfferStatus &
+ * @type {import('@agoric/smart-wallet/src/smartWallet.js').OfferStatus &
  *         { offerArgs: import('@agoric/inter-protocol/src/auction/auctionBook.js').OfferSpec}}
  */
 const offerStatus1 = harden({

diff --git a/packages/boot/test/bootstrapTests/liquidation.ts b/packages/boot/test/bootstrapTests/liquidation.ts
@@ -63,10 +63,9 @@ export const likePayouts = ({ Bid, Collateral }) => ({
   },
 });
 
-export const makeLiquidationTestContext = async t => {
-  console.time('DefaultTestContext');
+export const makeWalletFactoryContext = async t => {
   const swingsetTestKit = await makeSwingsetTestKit(t.log, 'bundles/vaults', {
-    configSpecifier: '@agoric/vm-config/decentral-main-vaults-config.json',
+    configSpecifier: '@agoric/vm-config/decentral-main-vaults-config.json'
   });
 
   const { runUtils, storage } = swingsetTestKit;
@@ -83,7 +82,7 @@ export const makeLiquidationTestContext = async t => {
   const refreshAgoricNamesRemotes = () => {
     Object.assign(
       agoricNamesRemotes,
-      makeAgoricNamesRemotesFromFakeStorage(swingsetTestKit.storage),
+      makeAgoricNamesRemotesFromFakeStorage(swingsetTestKit.storage)
     );
   };
   agoricNamesRemotes.brand.ATOM || Fail`ATOM missing from agoricNames`;
@@ -92,8 +91,30 @@ export const makeLiquidationTestContext = async t => {
   const walletFactoryDriver = await makeWalletFactoryDriver(
     runUtils,
     storage,
-    agoricNamesRemotes,
+    agoricNamesRemotes
   );
+  return {
+    ...swingsetTestKit,
+    swingsetTestKit,
+    agoricNamesRemotes,
+    refreshAgoricNamesRemotes,
+    walletFactoryDriver,
+  };
+};
+
+export type WalletFactoryTestContext = Awaited<
+  ReturnType<typeof makeWalletFactoryContext>
+>;
+
+export const makeLiquidationTestContext = async t => {
+  console.time('DefaultTestContext');
+  const {
+    swingsetTestKit,
+    agoricNamesRemotes,
+    refreshAgoricNamesRemotes,
+    walletFactoryDriver
+  }  = await makeWalletFactoryContext(t);
+
   console.timeLog('DefaultTestContext', 'walletFactoryDriver');
 
   const governanceDriver = await makeGovernanceDriver(