@agoric/inter-protocol 0.13.2-dev-eb9fb38.0 → 0.13.2-dev-a9d6a3b.0

package/exported.js

@@ -1,3 +1,2 @@
-import './src/stakeFactory/types.js';
 import './src/psm/types.js';
 import './src/vaultFactory/types.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.13.2-dev-eb9fb38.0+eb9fb38",
+  "version": "0.13.2-dev-a9d6a3b.0+a9d6a3b",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -29,29 +29,29 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.5.2-dev-eb9fb38.0+eb9fb38",
-    "@agoric/ertp": "0.15.4-dev-eb9fb38.0+eb9fb38",
-    "@agoric/governance": "0.9.2-dev-eb9fb38.0+eb9fb38",
-    "@agoric/internal": "0.2.2-dev-eb9fb38.0+eb9fb38",
-    "@agoric/notifier": "0.5.2-dev-eb9fb38.0+eb9fb38",
-    "@agoric/store": "0.8.4-dev-eb9fb38.0+eb9fb38",
-    "@agoric/time": "0.2.2-dev-eb9fb38.0+eb9fb38",
-    "@agoric/vat-data": "0.4.4-dev-eb9fb38.0+eb9fb38",
-    "@agoric/vats": "0.13.1-dev-eb9fb38.0+eb9fb38",
-    "@agoric/zoe": "0.25.4-dev-eb9fb38.0+eb9fb38",
+    "@agoric/assert": "0.5.2-dev-a9d6a3b.0+a9d6a3b",
+    "@agoric/ertp": "0.15.4-dev-a9d6a3b.0+a9d6a3b",
+    "@agoric/governance": "0.9.2-dev-a9d6a3b.0+a9d6a3b",
+    "@agoric/internal": "0.2.2-dev-a9d6a3b.0+a9d6a3b",
+    "@agoric/notifier": "0.5.2-dev-a9d6a3b.0+a9d6a3b",
+    "@agoric/store": "0.8.4-dev-a9d6a3b.0+a9d6a3b",
+    "@agoric/time": "0.2.2-dev-a9d6a3b.0+a9d6a3b",
+    "@agoric/vat-data": "0.4.4-dev-a9d6a3b.0+a9d6a3b",
+    "@agoric/vats": "0.13.1-dev-a9d6a3b.0+a9d6a3b",
+    "@agoric/zoe": "0.25.4-dev-a9d6a3b.0+a9d6a3b",
     "@endo/captp": "^3.1.1",
     "@endo/eventual-send": "^0.17.2",
     "@endo/far": "^0.2.18",
     "@endo/marshal": "^0.8.5",
     "@endo/nat": "^4.1.27",
-    "agoric": "0.18.3-dev-eb9fb38.0+eb9fb38",
+    "agoric": "0.18.3-dev-a9d6a3b.0+a9d6a3b",
     "jessie.js": "^0.3.2"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.9.5-dev-eb9fb38.0+eb9fb38",
-    "@agoric/smart-wallet": "0.4.3-dev-eb9fb38.0+eb9fb38",
-    "@agoric/swingset-liveslots": "0.9.1-dev-eb9fb38.0+eb9fb38",
-    "@agoric/swingset-vat": "0.30.3-dev-eb9fb38.0+eb9fb38",
+    "@agoric/deploy-script-support": "0.9.5-dev-a9d6a3b.0+a9d6a3b",
+    "@agoric/smart-wallet": "0.4.3-dev-a9d6a3b.0+a9d6a3b",
+    "@agoric/swingset-liveslots": "0.9.1-dev-a9d6a3b.0+a9d6a3b",
+    "@agoric/swingset-vat": "0.30.3-dev-a9d6a3b.0+a9d6a3b",
     "@endo/bundle-source": "^2.5.1",
     "@endo/init": "^0.5.56",
     "@endo/promise-kit": "^0.2.56",
@@ -77,5 +77,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eb9fb387ccaf9e2a1c5187c3926601824522b2a3"
+  "gitHead": "a9d6a3b0a98c68817b1a4a6a2dea6e5684a7cf91"
 }

package/scripts/deploy-contracts.js

@@ -9,7 +9,6 @@ const contractRefs = [
   '../../governance/bundles/bundle-contractGovernor.js',
   '../../governance/bundles/bundle-committee.js',
   '../../governance/bundles/bundle-binaryVoteCounter.js',
-  '../bundles/bundle-stakeFactory.js',
   '../bundles/bundle-vaultFactory.js',
   '../bundles/bundle-reserve.js',
   '../bundles/bundle-psm.js',

package/scripts/init-core.js

@@ -29,12 +29,6 @@ const installKeyGroups = {
       '../../governance/bundles/bundle-binaryVoteCounter.js',
     ],
   },
-  stakeFactory: {
-    stakeFactory: [
-      '../src/stakeFactory/stakeFactory.js',
-      '../bundles/bundle-stakeFactory.js',
-    ],
-  },
   main: {
     auctioneer: [
       '../src/auction/auctioneer.js',
@@ -120,7 +114,6 @@ export const mainProposalBuilder = async ({
         vaultFactoryControllerAddress: VAULT_FACTORY_CONTROLLER_ADDR,
         installKeys: {
           ...publishGroup(installKeyGroups.main),
-          ...publishGroup(installKeyGroups.stakeFactory),
         },
       },
     ],
@@ -179,7 +172,6 @@ export const defaultProposalBuilder = async (
         econCommitteeOptions,
         installKeys: {
           ...publishGroup(installKeyGroups.econCommittee),
-          ...publishGroup(installKeyGroups.stakeFactory),
           ...publishGroup(installKeyGroups.main),
         },
       },

package/src/proposals/core-proposal.js

@@ -107,7 +107,6 @@ const REWARD_MANIFEST = harden({
       bankManager: true,
       vaultFactoryKit: true,
       periodicFeeCollectors: true,
-      stakeFactoryKit: true,
       reserveKit: true,
       zoe: true,
     },
@@ -119,45 +118,6 @@ const REWARD_MANIFEST = harden({
   },
 });
 
-const STAKE_FACTORY_MANIFEST = harden({
-  [econBehaviors.startLienBridge.name]: {
-    consume: { bridgeManager: true },
-    produce: { lienBridge: true },
-    brand: {
-      consume: { BLD: 'BLD' },
-    },
-  },
-  [econBehaviors.startStakeFactory.name]: {
-    consume: {
-      board: 'board',
-      chainStorage: true,
-      zoe: 'zoe',
-      feeMintAccess: 'zoe',
-      lienBridge: true,
-      client: 'provisioning',
-      chainTimerService: 'timer',
-      economicCommitteeCreatorFacet: 'economicCommittee',
-    },
-    produce: {
-      stakeFactoryKit: 'stakeFactory',
-    },
-    installation: {
-      consume: { contractGovernor: 'zoe', stakeFactory: 'zoe' },
-    },
-    instance: {
-      produce: { stakeFactory: 'stakeFactory' },
-    },
-    brand: {
-      consume: { BLD: 'BLD', [Stable.symbol]: 'zoe' },
-      produce: { Attestation: 'stakeFactory' },
-    },
-    issuer: {
-      consume: { BLD: 'BLD' },
-      produce: { Attestation: 'stakeFactory' },
-    },
-  },
-});
-
 export const SIM_CHAIN_MANIFEST = harden({});
 
 export const getManifestForEconCommittee = (
@@ -230,12 +190,10 @@ export const getManifestForInterProtocol = (
       ...econCommitteeManifest.manifest,
       ...mainManifest.manifest,
       ...REWARD_MANIFEST,
-      ...STAKE_FACTORY_MANIFEST,
     },
     installations: {
       ...econCommitteeManifest.installations,
       ...mainManifest.installations,
-      stakeFactory: restoreRef(installKeys.stakeFactory),
     },
     options: {
       ...econCommitteeManifest.options,

package/src/proposals/econ-behaviors.js

@@ -5,28 +5,21 @@ import '../../exported.js';
 import { AmountMath } from '@agoric/ertp';
 import '@agoric/governance/exported.js';
 import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
+import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 import '@agoric/vats/exported.js';
 import '@agoric/vats/src/core/types.js';
-import { Stable, Stake } from '@agoric/vats/src/tokens.js';
-import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
-import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
+import { Stable } from '@agoric/vats/src/tokens.js';
 import { E } from '@endo/far';
-import { LienBridgeId, makeStakeReporter } from '../my-lien.js';
+import { makeGovernedTerms as makeGovernedATerms } from '../auction/params.js';
 import { makeReserveTerms } from '../reserve/params.js';
-import { makeStakeFactoryTerms } from '../stakeFactory/params.js';
 import { makeGovernedTerms as makeGovernedVFTerms } from '../vaultFactory/params.js';
-import { makeGovernedTerms as makeGovernedATerms } from '../auction/params.js';
 
 const trace = makeTracer('RunEconBehaviors', false);
 
 const SECONDS_PER_HOUR = 60n * 60n;
 const SECONDS_PER_DAY = 24n * SECONDS_PER_HOUR;
 
-const BASIS_POINTS = 10_000n;
-
 /**
- * @typedef {GovernedCreatorFacet<import('../stakeFactory/stakeFactory.js').StakeFactoryCreator>} StakeFactoryCreator
- * @typedef {import('../stakeFactory/stakeFactory.js').StakeFactoryPublic} StakeFactoryPublic
  * @typedef {import('../vaultFactory/vaultFactory.js').VaultFactoryContract['publicFacet']} VaultFactoryPublicFacet
  * @typedef {import('../auction/auctioneer.js').AuctioneerPublicFacet} AuctioneerPublicFacet
  * @typedef {import('../auction/auctioneer.js').AuctioneerCreatorFacet} AuctioneerCreatorFacet
@@ -63,7 +56,6 @@ const BASIS_POINTS = 10_000n;
  *   anchorBalancePayments: MapStore<Brand, Payment<'nat'>>,
  *   econCharterKit: EconCharterStartResult,
  *   reserveKit: GovernanceFacetKit<import('../reserve/assetReserve.js')['prepare']>,
- *   stakeFactoryKit: GovernanceFacetKit<import('../stakeFactory/stakeFactory.js')['start']>,
  *   vaultFactoryKit: GovernanceFacetKit<import('../vaultFactory/vaultFactory.js')['prepare']>,
  *   auctioneerKit: AuctioneerKit,
  *   minInitialDebt: NatValue,
@@ -386,7 +378,6 @@ export const startRewardDistributor = async ({
     bankManager,
     vaultFactoryKit,
     periodicFeeCollectors,
-    stakeFactoryKit,
     reserveKit,
     zoe,
   },
@@ -475,7 +466,6 @@ export const startRewardDistributor = async ({
 
   const collectorKit = {
     vaultFactory: E.get(vaultFactoryKit).creatorFacet,
-    runStake: E.get(stakeFactoryKit).creatorFacet,
   };
   await Promise.all(
     Object.entries(collectorKit).map(async ([debugName, collectorFacet]) => {
@@ -492,30 +482,6 @@ export const startRewardDistributor = async ({
 };
 harden(startRewardDistributor);
 
-/**
- * @param {BootstrapPowers & PromiseSpaceOf<{
- *   lienBridge: StakingAuthority,
- * }>} powers
- */
-export const startLienBridge = async ({
-  consume: { bridgeManager: bridgeOptP },
-  produce: { lienBridge },
-  brand: {
-    consume: { [Stake.symbol]: bldP },
-  },
-}) => {
-  trace('lienBridge');
-
-  const bridgeManager = await bridgeOptP;
-  if (!bridgeManager) {
-    return;
-  }
-  const lienBridgeManager = E(bridgeManager).register(LienBridgeId);
-  const bldBrand = await bldP;
-  const reporter = makeStakeReporter(lienBridgeManager, bldBrand);
-  lienBridge.resolve(reporter);
-};
-
 /**
  * @param {EconomyBootstrapPowers} powers
  * @param {object} config
@@ -639,164 +605,3 @@ export const startAuctioneer = async (
 
   auctionInstance.resolve(governedInstance);
 };
-
-/**
- * @typedef {EconomyBootstrapPowers & PromiseSpaceOf<{
- *   client: ClientManager,
- *   lienBridge: StakingAuthority,
- * }>} StakeFactoryBootstrapPowers
- */
-
-/**
- * @param {StakeFactoryBootstrapPowers } powers
- * @param {object} config
- * @param {bigint} [config.debtLimit] count of Minted
- * @param {Rational} [config.mintingRatio] ratio of Minted to BLD
- * @param {bigint} [config.interestRateBP]
- * @param {bigint} [config.mintFeeBP]
- * @param {bigint} [config.chargingPeriod]
- * @param {bigint} [config.recordingPeriod]
- * @typedef {[bigint, bigint]} Rational
- * @typedef {Awaited<ReturnType<typeof import('../stakeFactory/stakeFactory.js').start>>} StartStakeFactory
- */
-export const startStakeFactory = async (
-  {
-    consume: {
-      board,
-      zoe,
-      feeMintAccess: feeMintAccessP,
-      lienBridge,
-      client,
-      chainTimerService,
-      chainStorage,
-      economicCommitteeCreatorFacet,
-    },
-    produce: { stakeFactoryKit },
-    installation: {
-      consume: {
-        contractGovernor: contractGovernorInstallation,
-        stakeFactory: stakeFactoryInstallation,
-      },
-    },
-    instance: {
-      produce: { stakeFactory: stakeFactoryInstanceR },
-    },
-    brand: {
-      consume: { [Stake.symbol]: bldBrandP, [Stable.symbol]: runBrandP },
-      produce: { Attestation: attestationBrandR },
-    },
-    issuer: {
-      consume: { [Stake.symbol]: bldIssuer },
-      produce: { Attestation: attestationIssuerR },
-    },
-  },
-  {
-    debtLimit = 1_000_000_000_000n,
-    mintingRatio = [1n, 4n],
-    interestRateBP = 250n,
-    mintFeeBP = 200n,
-    chargingPeriod = SECONDS_PER_HOUR,
-    recordingPeriod = SECONDS_PER_DAY,
-  } = {},
-) => {
-  const STORAGE_PATH = 'stakeFactory';
-
-  const [bldBrand, runBrand] = await Promise.all([bldBrandP, runBrandP]);
-
-  const poserInvitationP = E(
-    economicCommitteeCreatorFacet,
-  ).getPoserInvitation();
-  const [initialPoserInvitation, electorateInvitationAmount, feeMintAccess] =
-    await Promise.all([
-      poserInvitationP,
-      E(E(zoe).getInvitationIssuer()).getAmountOf(poserInvitationP),
-      feeMintAccessP,
-    ]);
-
-  const stakeFactoryTerms = makeStakeFactoryTerms(
-    {
-      timerService: chainTimerService,
-      chargingPeriod,
-      recordingPeriod,
-    },
-    {
-      debtLimit: AmountMath.make(runBrand, debtLimit),
-      mintingRatio: makeRatio(
-        mintingRatio[0],
-        runBrand,
-        mintingRatio[1],
-        bldBrand,
-      ),
-      interestRate: makeRatio(interestRateBP, runBrand, BASIS_POINTS),
-      mintFee: makeRatio(mintFeeBP, runBrand, BASIS_POINTS),
-      electorateInvitationAmount,
-    },
-  );
-
-  const storageNode = await makeStorageNodeChild(chainStorage, STORAGE_PATH);
-  const marshaller = await E(board).getReadonlyMarshaller();
-
-  const stakeTerms = await deeplyFulfilledObject(
-    harden({
-      timer: chainTimerService,
-      governedContractInstallation: stakeFactoryInstallation,
-      governed: {
-        terms: stakeFactoryTerms,
-        issuerKeywordRecord: { Stake: bldIssuer },
-        label: 'stakeFactory',
-      },
-    }),
-  );
-
-  /** @type {GovernorStartedInstallationKit<typeof stakeFactoryInstallation>} */
-  const governorStartResult = await E(zoe).startInstance(
-    contractGovernorInstallation,
-    {},
-    stakeTerms,
-    {
-      governed: {
-        feeMintAccess,
-        initialPoserInvitation,
-        lienBridge,
-        storageNode,
-        marshaller,
-      },
-    },
-    'stakeFactory.governor',
-  );
-
-  const [governedInstance, governedCreatorFacet, governedPublicFacet] =
-    await Promise.all([
-      E(governorStartResult.creatorFacet).getInstance(),
-      E(governorStartResult.creatorFacet).getCreatorFacet(),
-      E(governorStartResult.creatorFacet).getPublicFacet(),
-    ]);
-
-  const {
-    issuers: { Attestation: attIssuer },
-    brands: { Attestation: attBrand },
-  } = await E(zoe).getTerms(governedInstance);
-
-  stakeFactoryKit.resolve(
-    harden({
-      creatorFacet: governedCreatorFacet,
-      governorCreatorFacet: governorStartResult.creatorFacet,
-      adminFacet: governorStartResult.adminFacet,
-      publicFacet: governedPublicFacet,
-      governor: governorStartResult.instance,
-      instance: governedInstance,
-    }),
-  );
-
-  stakeFactoryInstanceR.resolve(governedInstance);
-  attestationBrandR.resolve(attBrand);
-  attestationIssuerR.resolve(attIssuer);
-  return Promise.all([
-    E(client).assignBundle([
-      address => ({
-        attMaker: E(governedCreatorFacet).provideAttestationMaker(address),
-      }),
-    ]),
-  ]);
-};
-harden(startStakeFactory);

package/src/vaultFactory/types.js

@@ -11,6 +11,7 @@
  * @typedef {import('../auction/auctioneer.js').AuctioneerPublicFacet} AuctioneerPublicFacet
  * @typedef {import('./vaultFactory.js').VaultFactoryContract['publicFacet']} VaultFactoryPublicFacet
  *
+ * @typedef {import('@agoric/time/src/types').Timestamp} Timestamp
  * @typedef {import('@agoric/time/src/types').RelativeTime} RelativeTime
  */