Merge pull request #6208 from Agoric/ta/remove-legacy-package

clean up smart wallet

.github/workflows/test-all-packages.yml

@@ -93,8 +93,6 @@ jobs:
         run: cd packages/assert && yarn ${{ steps.vars.outputs.test }}
       - name: yarn test (wallet/api)
         run: cd packages/wallet/api && yarn ${{ steps.vars.outputs.test }}
-      - name: yarn test (wallet/contract)
-        run: cd packages/wallet/contract && yarn ${{ steps.vars.outputs.test }}
       - name: yarn test (deployment)
         run: cd packages/deployment && yarn ${{ steps.vars.outputs.test }}
       - name: yarn test (ERTP)

package.json

@@ -6,7 +6,6 @@
     "golang/cosmos",
     "packages/*",
     "packages/wallet/api",
-    "packages/wallet/contract",
     "packages/wallet/ui"
   ],
   "type": "module",

packages/agoric-cli/src/sdk-package-names.js

@@ -17,7 +17,6 @@ export default [
   "@agoric/import-manager",
   "@agoric/inter-protocol",
   "@agoric/internal",
-  "@agoric/legacy-smart-wallet",
   "@agoric/notifier",
   "@agoric/pegasus",
   "@agoric/same-structure",

packages/smart-wallet/test/devices.js

@@ -1,8 +1,9 @@
 import bundleCentralSupply from '@agoric/vats/bundles/bundle-centralSupply.js';
 import bundleMintHolder from '@agoric/vats/bundles/bundle-mintHolder.js';
-import bundleWalletFactory from '@agoric/vats/bundles/bundle-walletFactory.js';
 import bundleProvisionPool from '@agoric/vats/bundles/bundle-provisionPool.js';
 
+import bundleWalletFactory from '../bundles/bundle-walletFactory.js';
+
 export const devices = {
   vatAdmin: {
     getNamedBundleCap: name => ({

packages/vats/decentral-core-config.json

@@ -49,9 +49,6 @@
     "sharing": {
       "sourceSpec": "@agoric/vats/src/vat-sharing.js"
     },
-    "singleWallet": {
-      "sourceSpec": "@agoric/wallet/contract/src/singleWallet.js"
-    },
     "walletFactory": {
       "sourceSpec": "@agoric/smart-wallet/src/walletFactory.js"
     },

packages/vats/decentral-demo-config.json

@@ -10,7 +10,9 @@
       "sourceSpec": "@agoric/vats/src/core/boot.js",
       "parameters": {
         "governanceActions": true,
-        "economicCommitteeAddresses": { "voter":  "agoric1Ersatz" }
+        "economicCommitteeAddresses": {
+          "voter": "agoric1Ersatz"
+        }
       },
       "creationOptions": {
         "critical": true
@@ -57,9 +59,6 @@
     "sharing": {
       "sourceSpec": "@agoric/vats/src/vat-sharing.js"
     },
-    "singleWallet": {
-      "sourceSpec": "@agoric/wallet/contract/src/singleWallet.js"
-    },
     "walletFactory": {
       "sourceSpec": "@agoric/smart-wallet/src/walletFactory.js"
     },

packages/vats/decentral-psm-config.json

@@ -11,7 +11,9 @@
             "denom": "ibc/usdc1234"
           }
         ],
-        "economicCommitteeAddresses": { "voter":  "agoric1ersatz"}
+        "economicCommitteeAddresses": {
+          "voter": "agoric1ersatz"
+        }
       },
       "creationOptions": {
         "critical": true

packages/vats/demo-proposals.json

@@ -1,4 +1,4 @@
 [
   "@agoric/inter-protocol/scripts/init-core.js",
   "@agoric/pegasus/scripts/init-core.js"
-]
+]

packages/vats/scripts/build-bundles.js

@@ -9,14 +9,6 @@ const sourceToBundle = [
   [`../src/centralSupply.js`, `../bundles/bundle-centralSupply.js`],
   [`../src/mintHolder.js`, `../bundles/bundle-mintHolder.js`],
   [`../src/provisionPool.js`, `../bundles/bundle-provisionPool.js`],
-  [
-    `@agoric/wallet/contract/src/singleWallet.js`,
-    `../bundles/bundle-singleWallet.js`,
-  ],
-  [
-    `@agoric/smart-wallet/src/walletFactory.js`,
-    `../bundles/bundle-walletFactory.js`,
-  ],
 ];
 
 await createBundles(sourceToBundle, dirname);

packages/vats/src/core/types.js

@@ -139,7 +139,7 @@
  *     TokenKeyword | 'Attestation' | 'AUSD',
  *   installation: |
  *     'centralSupply' | 'mintHolder' |
- *     'singleWallet' | 'walletFactory' | 'provisionPool' |
+ *     'walletFactory' | 'provisionPool' |
  *     'feeDistributor' |
  *     'contractGovernor' | 'committee' | 'noActionElectorate' | 'binaryVoteCounter' |
  *     'amm' | 'VaultFactory' | 'liquidate' | 'stakeFactory' |
@@ -176,7 +176,6 @@
  *     consume: Record<WellKnownName['installation'], Promise<Installation<unknown>>> & {
  *       interchainPool: Promise<Installation<import('@agoric/inter-protocol/src/interchainPool.js').start>>,
  *       mintHolder: Promise<Installation<import('@agoric/vats/src/mintHolder.js').start>>,
- *       singleWallet: Promise<Installation<import('@agoric/legacy-smart-wallet/src/singleWallet.js').start>>,
  *       walletFactory: Promise<Installation<import('@agoric/smart-wallet/src/walletFactory.js').start>>,
  *     },
  *   },

packages/vats/src/core/utils.js

@@ -34,7 +34,6 @@ export const agoricNamesReserved = harden({
   installation: {
     centralSupply: 'central supply',
     mintHolder: 'mint holder',
-    singleWallet: 'single smart wallet',
     walletFactory: 'multitenant smart wallet',
     provisionPool: 'provision accounts with initial IST',
     contractGovernor: 'contract governor',

packages/vats/test/devices.js

@@ -3,17 +3,15 @@ import bundleContractGovernor from '@agoric/governance/bundles/bundle-contractGo
 import bundleBinaryVoteCounter from '@agoric/governance/bundles/bundle-binaryVoteCounter.js';
 import bundlePSM from '@agoric/inter-protocol/bundles/bundle-psm.js';
 import bundlePSMCharter from '@agoric/inter-protocol/bundles/bundle-psmCharter.js';
+import bundleWalletFactory from '@agoric/smart-wallet/bundles/bundle-walletFactory.js';
 
 import bundleCentralSupply from '../bundles/bundle-centralSupply.js';
 import bundleMintHolder from '../bundles/bundle-mintHolder.js';
-import bundleSingleWallet from '../bundles/bundle-singleWallet.js';
-import bundleWalletFactory from '../bundles/bundle-walletFactory.js';
 import bundleProvisionPool from '../bundles/bundle-provisionPool.js';
 
 const bundles = {
   centralSupply: bundleCentralSupply,
   mintHolder: bundleMintHolder,
-  singleWallet: bundleSingleWallet,
   walletFactory: bundleWalletFactory,
   committee: bundleCommittee,
   contractGovernor: bundleContractGovernor,