Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6791 vaults upgrade #7476

Merged
merged 9 commits into from
May 2, 2023
1 change: 1 addition & 0 deletions packages/SwingSet/src/devices/timer/timer.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export function buildTimer() {
}

// poll() is made available to the host loop so it can provide the time.
/** @type {(time: number | bigint) => boolean} */
function poll(time) {
try {
return Boolean(devicePollFunction(Nat(time)));
Expand Down
4 changes: 3 additions & 1 deletion packages/inter-protocol/src/proposals/econ-behaviors.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const BASIS_POINTS = 10_000n;
* econCharterKit: EconCharterStartResult,
* reserveKit: GovernanceFacetKit<import('../reserve/assetReserve.js')['start']>,
* stakeFactoryKit: GovernanceFacetKit<import('../stakeFactory/stakeFactory.js')['start']>,
* vaultFactoryKit: GovernanceFacetKit<import('../vaultFactory/vaultFactory.js')['start']>,
* vaultFactoryKit: GovernanceFacetKit<import('../vaultFactory/vaultFactory.js')['prepare']>,
* auctioneerKit: AuctioneerKit,
* minInitialDebt: NatValue,
* }>} EconomyBootstrapSpace
Expand Down Expand Up @@ -331,6 +331,8 @@ export const startVaultFactory = async (
governorCreatorFacet,
adminFacet,
publicFacet,
// XXX safe? if this sticks add it to the type
privateArgs: vaultFactoryPrivateArgs,
}),
);

Expand Down
57 changes: 56 additions & 1 deletion packages/inter-protocol/src/vaultFactory/params.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import {
makeParamManagerSync,
ParamTypes,
} from '@agoric/governance';
import { M } from '@agoric/store';
import { makeStoredPublisherKit } from '@agoric/notifier';
import { M, makeScalarMapStore } from '@agoric/store';
import { TimeMath } from '@agoric/time';
import { provideDurableMapStore } from '@agoric/vat-data';
import { subtractRatios } from '@agoric/zoe/src/contractSupport/ratio.js';
import { amountPattern, ratioPattern } from '../contractSupport.js';

Expand Down Expand Up @@ -160,3 +162,56 @@ export const makeGovernedTerms = ({
});
};
harden(makeGovernedTerms);
/**
* Stop-gap which restores initial param values
* UNTIL https://github.com/Agoric/agoric-sdk/issues/5200
*
* NB: changes from initial values will be lost upon restart
*
* @param {import('@agoric/vat-data').Baggage} baggage
* @param {ERef<Marshaller>} marshaller
*/
export const provideVaultParamManagers = (baggage, marshaller) => {
/** @type {MapStore<Brand, VaultParamManager>} */
const managers = makeScalarMapStore();

// the managers aren't durable but their arguments are
/** @type {MapStore<Brand, {storageNode: StorageNode, initialParamValues: VaultManagerParamValues}>} */
const managerArgs = provideDurableMapStore(
baggage,
'vault param manager parts',
);

const makeManager = (brand, { storageNode, initialParamValues }) => {
const manager = makeVaultParamManager(
makeStoredPublisherKit(storageNode, marshaller, 'governance'),
initialParamValues,
);
managers.init(brand, manager);
return manager;
};

// restore from baggage
[...managerArgs.entries()].map(([brand, args]) => makeManager(brand, args));

return {
/**
*
* @param {Brand} brand
* @param {StorageNode} storageNode
* @param {VaultManagerParamValues} initialParamValues
*/
addParamManager(brand, storageNode, initialParamValues) {
const args = harden({ storageNode, initialParamValues });
managerArgs.init(brand, args);
return makeManager(brand, args);
},
/**
* @param {Brand} brand
*/
get(brand) {
return managers.get(brand);
},
};
};
harden(provideVaultParamManagers);
1 change: 0 additions & 1 deletion packages/inter-protocol/src/vaultFactory/types.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
* @property {AddVaultType} addVaultType
* @property {() => Allocation} getRewardAllocation
* @property {() => Promise<Invitation<string, never>>} makeCollectFeesInvitation
* @property {() => void} updateMetrics
* @property {() => import('@agoric/time/src/types').TimerWaker} makeLiquidationWaker
* @property {() => import('@agoric/time/src/types').TimerWaker} makePriceLockWaker
*/
Expand Down
Loading