feat(AMM)!: remove the AMM and cleanup bootstrap etc. dependencies (#…

…7074)

* feat(AMM)!:  remove the AMM and cleanup bootstrap etc. dependencies

The most visible consequence is to vault liquidation. Some pieces are
left hanging, and will be repaired by #7047.

* chore: first follow-ups to initial comments

Remove a few more things, mostly doc comments.

* chore: clean-ups and todos to mark unfinished transition steps

* chore: use unknown rather than any in interim liquidation contracts

* chore: remove more stuff related to AMM

remove interchainPool and other bootstrap stuff connected to AMM
Simplify liquidation contracts so they don't refer to dead code.

other clean ups

* chore: lint cleanups and revert retainedCollateral

* test: update integration test to use faucet instead of amm & vault

docs/threat_models/README.md

@@ -7,26 +7,6 @@
 
 [![./pegasus/pegasus_sequence.svg](./pegasus/pegasus_sequence.svg)](./pegasus/pegasus_sequence.svg)
 
-## ./smart_contracts/amm/amm_component.svg
-
-[![./smart_contracts/amm/amm_component.svg](./smart_contracts/amm/amm_component.svg)](./smart_contracts/amm/amm_component.svg)
-
-## ./smart_contracts/amm/amm_sequence.svg
-
-[![./smart_contracts/amm/amm_sequence.svg](./smart_contracts/amm/amm_sequence.svg)](./smart_contracts/amm/amm_sequence.svg)
-
-## ./smart_contracts/amm/amm_sequence_001.svg
-
-[![./smart_contracts/amm/amm_sequence_001.svg](./smart_contracts/amm/amm_sequence_001.svg)](./smart_contracts/amm/amm_sequence_001.svg)
-
-## ./smart_contracts/amm/amm_sequence_002.svg
-
-[![./smart_contracts/amm/amm_sequence_002.svg](./smart_contracts/amm/amm_sequence_002.svg)](./smart_contracts/amm/amm_sequence_002.svg)
-
-## ./smart_contracts/amm/amm_sequence_003.svg
-
-[![./smart_contracts/amm/amm_sequence_003.svg](./smart_contracts/amm/amm_sequence_003.svg)](./smart_contracts/amm/amm_sequence_003.svg)
-
 ## ./vaultFactory/VaultFactory.svg
 
 [![./vaultFactory/VaultFactory.svg](./vaultFactory/VaultFactory.svg)](./vaultFactory/VaultFactory.svg)

docs/threat_models/vaultFactory/vaultFactory.puml

@@ -16,7 +16,6 @@ node "CloseVaultInvitation"
 
 node "Vat" {
     node VaultFactory {
-        node AMM
         node "publicAPI" {
             circle getCollaterals
             circle makeVaultInvitation

packages/SwingSet/misc-tools/measure-metering/measure.js

@@ -3,8 +3,6 @@
 // eslint-disable-next-line import/order
 import '../../tools/prepare-test-env.js';
 
-// eslint-disable-next-line import/order
-import bundleSource from '@endo/bundle-source';
 import { xsnap } from '@agoric/xsnap';
 import * as proc from 'child_process';
 import * as os from 'os';
@@ -50,11 +48,6 @@ async function run() {
   const bootFn = new URL('measurement-bootstrap.js', import.meta.url).pathname;
   const targetFn = new URL('measurement-target.js', import.meta.url).pathname;
   const zoeFn = new URL('measurement-zoe.js', import.meta.url).pathname;
-  const autoswapFn = new URL(
-    '../../../inter-protocol/src/vpool-xyk-amm/multipoolMarketMaker.js',
-    import.meta.url,
-  ).pathname;
-  const autoswapBundle = await bundleSource(autoswapFn);
   const config = {
     defaultManagerType: 'xs-worker',
     bootstrap: 'bootstrap',
@@ -139,8 +132,6 @@ async function run() {
   const zoeInstallVaultFactory = await doCounted('zoeInstallVaultFactory');
   console.log(`zoe install (vaultFactory): ${zoeInstallVaultFactory}`);
 
-  const zoeInstallAMM = await doCounted('zoeInstallBundle', [autoswapBundle]);
-  console.log(`zoe install (AMM): ${zoeInstallAMM}`);
   const zoeInstantiate = await doCounted('zoeInstantiate');
   console.log(`zoe instantiate (AMM): ${zoeInstantiate}`);
 

packages/casting/test/deploy.js

@@ -24,7 +24,6 @@ const getVaultManagerMetrics = async (homeP, { cache, lookup }) => {
 export default async (homeP, { cache, lookup, makeDefaultLeader }) => {
   // const storeKey = getStoreKeyFromCache(homeP, { cache, lookup });
   const storeKey = getVaultManagerMetrics(homeP, { cache, lookup });
-  // const storeKey = ':published.amm.metrics';
 
   console.log('storeKey', await storeKey);
 

packages/deployment/scripts/integration-test.sh

@@ -59,8 +59,7 @@ then
   SDK_BUILD=0 MUST_USE_PUBLISH_BUNDLE=1 SDK_SRC=/usr/src/agoric-sdk OUTPUT_DIR="$RESULTSDIR" ./start.sh \
     --stage.save-storage --trace kvstore swingstore xsnap \
     --stages=3 --stage.duration=10 --stage.loadgen.cycles=4 \
-    --stage.loadgen.vault.interval=12 --stage.loadgen.vault.limit=2 \
-    --stage.loadgen.amm.interval=12 --stage.loadgen.amm.wait=6 --stage.loadgen.amm.limit=2 \
+    --stage.loadgen.faucet.interval=6 --stage.loadgen.faucet.limit=4 \
     --profile=testnet "--testnet-origin=file://$RESULTSDIR" \
     --no-reset --custom-bootstrap
 fi

packages/inter-protocol/docs/governance-params.md

@@ -25,18 +25,6 @@ From Inter Protocol Whitepaper, v0.8:
 
 Note that the "stability fee" described in the Whitepaper comprises both InterestRate and LoanFee.
 
-### Automated Market Maker (AMM)
-
-In `packages/inter-protocol/src/vpool-xyk-amm/multipoolMarketMaker.js`:
-
-| Governance Key     | Type              | WP? |
-| ------------------ | :---------------- | --- |
-| PoolFee            | ParamTypes.NAT    | N/A |
-| ProtocolFee        | ParamTypes.NAT    | N/A |
-
-The Inter Protocol Whitepaper v0.8 does not describe the governance parameters
-for this contract.  
-
 ### Collateral Reserve
 
 In `packages/inter-protocol/src/reserve/collateralReserve.js`:

packages/inter-protocol/docs/inter-protocol-preview.md

@@ -4,7 +4,6 @@ We propose to launch a preview of the Inter Protocol on Devnet,
 comprising the following contracts:
 
   - stakeFactory - borrow Minted against staked BLD
-  - AMM - Automated Market Maker
   - VaultFactory - collateralized debt positions
     - liquidateMinimum
   - PSM - Parity Stability Module

packages/inter-protocol/exported.js

@@ -1,4 +1,3 @@
 import './src/stakeFactory/types.js';
 import './src/psm/types.js';
 import './src/vaultFactory/types.js';
-import './src/vpool-xyk-amm/types.js';

packages/inter-protocol/scripts/deploy-contracts.js

@@ -10,9 +10,7 @@ const contractRefs = [
   '../../governance/bundles/bundle-committee.js',
   '../../governance/bundles/bundle-binaryVoteCounter.js',
   '../bundles/bundle-stakeFactory.js',
-  '../bundles/bundle-amm.js',
   '../bundles/bundle-vaultFactory.js',
-  '../bundles/bundle-liquidateMinimum.js',
   '../bundles/bundle-reserve.js',
   '../bundles/bundle-psm.js',
   '../../vats/bundles/bundle-mintHolder.js',

packages/inter-protocol/scripts/init-core.js

@@ -36,14 +36,6 @@ const installKeyGroups = {
     ],
   },
   main: {
-    amm: [
-      '../src/vpool-xyk-amm/multipoolMarketMaker.js',
-      '../bundles/bundle-amm.js',
-    ],
-    interchainPool: [
-      '../src/interchainPool.js',
-      '../bundles/bundle-interchainPool.js',
-    ],
     vaultFactory: [
       '../src/vaultFactory/vaultFactory.js',
       '../bundles/bundle-vaultFactory.js',
@@ -52,14 +44,6 @@ const installKeyGroups = {
       '../src/feeDistributor.js',
       '../bundles/bundle-feeDistributor.js',
     ],
-    liquidateMinimum: [
-      '../src/vaultFactory/liquidateMinimum.js',
-      '../bundles/bundle-liquidateMinimum.js',
-    ],
-    liquidate: [
-      '../src/vaultFactory/liquidateIncrementally.js',
-      '../bundles/bundle-liquidateIncrementally.js',
-    ],
     reserve: ['../src/reserve/assetReserve.js', '../bundles/bundle-reserve.js'],
   },
 };

packages/inter-protocol/src/feeDistributor.js

@@ -41,7 +41,7 @@ export const customTermsShape = harden({
  */
 
 /**
- * wrapper to take the vaultFactory or AMM's creatorFacet, and make a call that
+ * wrapper to take the a creatorFacet (e.g. vaultFactory) and make a call that
  * will request an invitation and return a promise for a payment.
  *
  * @param {ERef<ZoeService>} zoe