@agoric/inter-protocol 0.16.2-dev-1f816f9.0 → 0.16.2-dev-b9f5667.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +15 -15
- package/src/proposals/econ-behaviors.d.ts +2 -0
- package/src/proposals/econ-behaviors.d.ts.map +1 -1
- package/src/proposals/upgrade-vaults.d.ts.map +1 -1
- package/src/proposals/upgrade-vaults.js +37 -2
- package/src/vaultFactory/vaultFactory.d.ts +1 -0
- package/src/vaultFactory/vaultFactory.d.ts.map +1 -1
- package/src/vaultFactory/vaultFactory.js +3 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agoric/inter-protocol",
|
|
3
|
-
"version": "0.16.2-dev-
|
|
3
|
+
"version": "0.16.2-dev-b9f5667.0+b9f5667",
|
|
4
4
|
"description": "Core cryptoeconomy contracts",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "src/index.js",
|
|
@@ -31,15 +31,15 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://github.com/Agoric/agoric-sdk#readme",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@agoric/ertp": "0.16.3-dev-
|
|
35
|
-
"@agoric/governance": "0.10.4-dev-
|
|
36
|
-
"@agoric/internal": "0.3.3-dev-
|
|
37
|
-
"@agoric/notifier": "0.6.3-dev-
|
|
38
|
-
"@agoric/store": "0.9.3-dev-
|
|
39
|
-
"@agoric/time": "0.3.3-dev-
|
|
40
|
-
"@agoric/vat-data": "0.5.3-dev-
|
|
41
|
-
"@agoric/vats": "0.15.2-dev-
|
|
42
|
-
"@agoric/zoe": "0.26.3-dev-
|
|
34
|
+
"@agoric/ertp": "0.16.3-dev-b9f5667.0+b9f5667",
|
|
35
|
+
"@agoric/governance": "0.10.4-dev-b9f5667.0+b9f5667",
|
|
36
|
+
"@agoric/internal": "0.3.3-dev-b9f5667.0+b9f5667",
|
|
37
|
+
"@agoric/notifier": "0.6.3-dev-b9f5667.0+b9f5667",
|
|
38
|
+
"@agoric/store": "0.9.3-dev-b9f5667.0+b9f5667",
|
|
39
|
+
"@agoric/time": "0.3.3-dev-b9f5667.0+b9f5667",
|
|
40
|
+
"@agoric/vat-data": "0.5.3-dev-b9f5667.0+b9f5667",
|
|
41
|
+
"@agoric/vats": "0.15.2-dev-b9f5667.0+b9f5667",
|
|
42
|
+
"@agoric/zoe": "0.26.3-dev-b9f5667.0+b9f5667",
|
|
43
43
|
"@endo/captp": "^4.2.2",
|
|
44
44
|
"@endo/errors": "^1.2.4",
|
|
45
45
|
"@endo/eventual-send": "^1.2.4",
|
|
@@ -50,10 +50,10 @@
|
|
|
50
50
|
"jessie.js": "^0.3.4"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
|
-
"@agoric/smart-wallet": "0.5.4-dev-
|
|
54
|
-
"@agoric/swingset-liveslots": "0.10.3-dev-
|
|
55
|
-
"@agoric/swingset-vat": "0.32.3-dev-
|
|
56
|
-
"@agoric/zone": "0.2.3-dev-
|
|
53
|
+
"@agoric/smart-wallet": "0.5.4-dev-b9f5667.0+b9f5667",
|
|
54
|
+
"@agoric/swingset-liveslots": "0.10.3-dev-b9f5667.0+b9f5667",
|
|
55
|
+
"@agoric/swingset-vat": "0.32.3-dev-b9f5667.0+b9f5667",
|
|
56
|
+
"@agoric/zone": "0.2.3-dev-b9f5667.0+b9f5667",
|
|
57
57
|
"@endo/bundle-source": "^3.3.0",
|
|
58
58
|
"@endo/init": "^1.1.3",
|
|
59
59
|
"@endo/promise-kit": "^1.1.4",
|
|
@@ -84,5 +84,5 @@
|
|
|
84
84
|
"typeCoverage": {
|
|
85
85
|
"atLeast": 95.81
|
|
86
86
|
},
|
|
87
|
-
"gitHead": "
|
|
87
|
+
"gitHead": "b9f5667ddb39267445c232e24e62cde12685a42a"
|
|
88
88
|
}
|
|
@@ -114,6 +114,7 @@ export type VaultFactoryPublicFacet = Awaited<ReturnType<(zcf: VaultFactoryZCF,
|
|
|
114
114
|
marshaller: ERef<Marshaller>;
|
|
115
115
|
auctioneerInstance: Instance;
|
|
116
116
|
managerParams: Record<string, import("../vaultFactory/params.js").VaultManagerParamOverrides>;
|
|
117
|
+
directorParamOverrides: [object];
|
|
117
118
|
}, baggage: import("@agoric/swingset-liveslots").Baggage) => Promise<{
|
|
118
119
|
creatorFacet: import("@endo/exo").Guarded<{
|
|
119
120
|
getParamMgrRetriever: () => {
|
|
@@ -355,6 +356,7 @@ export type EconomyBootstrapSpace = PromiseSpaceOf<{
|
|
|
355
356
|
marshaller: ERef<Marshaller>;
|
|
356
357
|
auctioneerInstance: Instance;
|
|
357
358
|
managerParams: Record<string, import("../vaultFactory/params.js").VaultManagerParamOverrides>;
|
|
359
|
+
directorParamOverrides: [object];
|
|
358
360
|
}, baggage: import("@agoric/swingset-liveslots").Baggage) => Promise<{
|
|
359
361
|
creatorFacet: import("@endo/exo").Guarded<{
|
|
360
362
|
getParamMgrRetriever: () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"econ-behaviors.d.ts","sourceRoot":"","sources":["econ-behaviors.js"],"names":[],"mappings":"AAgBA,qCAAsC;AACtC,sCAA0C;AAC1C,qCAAsD;AACtD,sCAAqD;AAwE9C,mcADK,sBAAsB;;;;;;;;;;;;;;;;;;;;;;KA+FjC;AAUM,oDAPI,sBAAsB,CAAC,SAAS,CAAC,kDAEzC;IAAgC,cAAc;IACtB,OAAO;;;CAE/B,8BAAQ,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2EvB;AAUM,wSAPI,sBAAsB,UAE9B;IAAgC,cAAc;IACtB,OAAO;;;CAE/B,mBAAQ,MAAM,iBA6FhB;AAWM,wGALI,sBAAsB;;;;8BAuBhC;AAQM,mcAFI,sBAAsB,iBA0GhC;AAQM,+cAJI,sBAAsB,uBAE9B;IAAqB,aAAa,GAA1B,GAAG;CAAwB,iBA0HrC;sCAxmBa,OAAO,CAAC,UAAU;;;;;;;yCA2D2C,2BACpE
|
|
1
|
+
{"version":3,"file":"econ-behaviors.d.ts","sourceRoot":"","sources":["econ-behaviors.js"],"names":[],"mappings":"AAgBA,qCAAsC;AACtC,sCAA0C;AAC1C,qCAAsD;AACtD,sCAAqD;AAwE9C,mcADK,sBAAsB;;;;;;;;;;;;;;;;;;;;;;KA+FjC;AAUM,oDAPI,sBAAsB,CAAC,SAAS,CAAC,kDAEzC;IAAgC,cAAc;IACtB,OAAO;;;CAE/B,8BAAQ,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2EvB;AAUM,wSAPI,sBAAsB,UAE9B;IAAgC,cAAc;IACtB,OAAO;;;CAE/B,mBAAQ,MAAM,iBA6FhB;AAWM,wGALI,sBAAsB;;;;8BAuBhC;AAQM,mcAFI,sBAAsB,iBA0GhC;AAQM,+cAJI,sBAAsB,uBAE9B;IAAqB,aAAa,GAA1B,GAAG;CAAwB,iBA0HrC;sCAxmBa,OAAO,CAAC,UAAU;;;;;;;yCA2D2C,2BACpE;;mBAGW,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA/DL,CAAC,CAAC,aAAa,CAAC;;WAI3C,MAAM;SACN,QAAQ;iBACR,QAAQ;qBACR,OAAO,CACpB,UAAc,CACd,OAAa,CACb,UAAkB,CAAC,8BAAuB,CAAC,OAAO,CAAC,CAAC,CAC7C,CAAC,cAAc,CAAC,CAAC,wBAAwB,CAAC,CAC5C,CACF;6BACU,oBAAoB,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAC;mBAC7D,UAAU;;4BAGV,kBAAkB,CAAC;yBA8f3B,cAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sCAyFy/N,yBAAgB;;;;;EAvlB/8N,CAAC;qCAG7D,eAAe,GAAG,mBAAmB,GAAG,qBAAqB;oCAG7D,cAAc,CAAC;IAC3B,oBAAwB,EAAE,oBAAoB,CAAC;IAC/C,6BAAiC,EAAE,OAAO,qCAAqC,EAAE,+BAA+B,CAAC;IACjH,iBAAqB,EAAE,mBACvB,cAAoB,sBAAsB,EAAE,KAAK,CAC5C,CAAC;IACN,qBAAyB,EAAE,QAAQ,CACnC,MAAY,EACZ,OAAa,sBAAsB,EAAE,oBAAoB,CACpD,CAAC;IACN,MAAU,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACpC,qBAAyB,EAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,cAAkB,EAAE,sBAAsB,CAAC;IAC3C,UAAc,EAAE,kBAAkB,CAClC,2CAA0C,CAAC,OAAO,CAAC,CAC9C,CAAC;IACN,eAAmB,EAAE,kBAAkB;;;;;;;6CAmBmC,2BACpE;;uBAGW,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAvBG,CAAC;IACjD,aAAiB,EAAE,aAAa,CAAC;IACjC,gBAAoB,EAAE,aAAa,GAAG,SAAS,CAAC;IAChD,cAAkB,EAAE,QAAQ,CAAC;CAC1B,CAAC;qCAIQ,mBACZ,2CAAwC,CAAC,OAAO,CAAC,CAC9C;mCAGS,mBACZ,oDAAiD,CAAC,OAAO,CAAC,CACvD;uBAtEmB,gCAAgC;wCAKjB,qCAAqC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-vaults.d.ts","sourceRoot":"","sources":["upgrade-vaults.js"],"names":[],"mappings":"AAoCO,sCAHI,OAAO,oCAAoC,EAAE,sBAAsB,eACnE;IAAE,OAAO,EAAE;QAAE,SAAS,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"upgrade-vaults.d.ts","sourceRoot":"","sources":["upgrade-vaults.js"],"names":[],"mappings":"AAoCO,sCAHI,OAAO,oCAAoC,EAAE,sBAAsB,eACnE;IAAE,OAAO,EAAE;QAAE,SAAS,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,iBA6M1D;AASM,kDAHI,MAAM,uBACN,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;GAuBZ"}
|
|
@@ -85,6 +85,32 @@ export const upgradeVaults = async (powers, { options }) => {
|
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
+
const readCurrentDirectorParams = async () => {
|
|
89
|
+
const { publicFacet: directorPF } = kit;
|
|
90
|
+
|
|
91
|
+
await null;
|
|
92
|
+
|
|
93
|
+
const subscription = E(directorPF).getElectorateSubscription();
|
|
94
|
+
const notifier = makeNotifierFromAsyncIterable(subscription);
|
|
95
|
+
let { value, updateCount } = await notifier.getUpdateSince(0n);
|
|
96
|
+
// @ts-expect-error It's an amount.
|
|
97
|
+
while (AmountMath.isEmpty(value.current.MinInitialDebt.value)) {
|
|
98
|
+
({ value, updateCount } = await notifier.getUpdateSince(updateCount));
|
|
99
|
+
trace(
|
|
100
|
+
`minInitialDebt was empty, retried`,
|
|
101
|
+
value.current.MinInitialDebt.value,
|
|
102
|
+
);
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
return harden({
|
|
106
|
+
MinInitialDebt: value.current.MinInitialDebt.value,
|
|
107
|
+
ReferencedUI: value.current.ReferencedUI.value,
|
|
108
|
+
RecordingPeriod: value.current.RecordingPeriod.value,
|
|
109
|
+
ChargingPeriod: value.current.ChargingPeriod.value,
|
|
110
|
+
});
|
|
111
|
+
};
|
|
112
|
+
const directorParamOverrides = await readCurrentDirectorParams();
|
|
113
|
+
|
|
88
114
|
const readManagerParams = async () => {
|
|
89
115
|
const { publicFacet: directorPF } = kit;
|
|
90
116
|
|
|
@@ -99,9 +125,17 @@ export const upgradeVaults = async (powers, { options }) => {
|
|
|
99
125
|
const notifier = makeNotifierFromAsyncIterable(subscription);
|
|
100
126
|
let { value, updateCount } = await notifier.getUpdateSince(0n);
|
|
101
127
|
// @ts-expect-error It's an amount.
|
|
102
|
-
|
|
128
|
+
if (AmountMath.isEmpty(value.current.DebtLimit.value)) {
|
|
129
|
+
// The parameters might have been empty at start, and the notifier might
|
|
130
|
+
// give the first state before the current state.
|
|
131
|
+
trace(`debtLimit was empty, retrying`, value.current.DebtLimit.value);
|
|
103
132
|
({ value, updateCount } = await notifier.getUpdateSince(updateCount));
|
|
104
|
-
|
|
133
|
+
|
|
134
|
+
// @ts-expect-error It's an amount.
|
|
135
|
+
if (AmountMath.isEmpty(value.current.DebtLimit.value)) {
|
|
136
|
+
trace('debtLimit was empty after retrying');
|
|
137
|
+
throw Error('🚨Governed parameters empty after retry, Giving up');
|
|
138
|
+
}
|
|
105
139
|
}
|
|
106
140
|
trace(kwd, 'params at', updateCount, 'are', value.current);
|
|
107
141
|
params[kwd] = harden({
|
|
@@ -138,6 +172,7 @@ export const upgradeVaults = async (powers, { options }) => {
|
|
|
138
172
|
initialPoserInvitation: poserInvitation,
|
|
139
173
|
initialShortfallInvitation: shortfallInvitation,
|
|
140
174
|
managerParams: managerParamValues,
|
|
175
|
+
directorParamOverrides,
|
|
141
176
|
});
|
|
142
177
|
|
|
143
178
|
const upgradeResult = await E(kit.adminFacet).upgradeContract(
|
|
@@ -17,6 +17,7 @@ export function start(zcf: VaultFactoryZCF, privateArgs: {
|
|
|
17
17
|
marshaller: ERef<Marshaller>;
|
|
18
18
|
auctioneerInstance: Instance;
|
|
19
19
|
managerParams: Record<string, import("./params.js").VaultManagerParamOverrides>;
|
|
20
|
+
directorParamOverrides: [object];
|
|
20
21
|
}, baggage: import("@agoric/swingset-liveslots").Baggage): Promise<{
|
|
21
22
|
creatorFacet: import("@endo/exo").Guarded<{
|
|
22
23
|
getParamMgrRetriever: () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vaultFactory.d.ts","sourceRoot":"","sources":["vaultFactory.js"],"names":[],"mappings":"AAmCA;;;;;;;;GAQG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAerB;
|
|
1
|
+
{"version":3,"file":"vaultFactory.d.ts","sourceRoot":"","sources":["vaultFactory.js"],"names":[],"mappings":"AAmCA;;;;;;;;GAQG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAerB;AAoBK,2BAhBI,eAAe,eACf;IACV,aAAiB,EAAE,aAAa,CAAC;IACjC,sBAA0B,EAAE,UAAU,CAAC;IACvC,0BAA8B,EAAE,UAAU,CAAC;IAC3C,WAAe,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACnC,UAAc,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACjC,kBAAsB,EAAE,QAAQ,CAAC;IACjC,aAAiB,EAAE,MAAM,CACzB,MAAY,EACZ,OAAa,aAAa,EAAE,0BAA0B,CACjD,CAAC;IACN,sBAA0B,EAAE,CAAC,MAAM,CAAC,CAAC;CAClC,WACO,OAAO,4BAA4B,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsFtD;8BAhIY,GAAG,CACf,eAAmB,CAAC,OAAO,UAAU,EAAE,mBAAmB,CAAC,GAAG;IAC9D,cAAoB,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC3C,kBAAwB,EAAE,uBAAuB,CAAC;IAClD,YAAkB,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;CACnD,CACF;mCA6HU,UAAU,CAAC,OAAO,KAAK,CAAC;gCAxIwD,4BAA4B;oCAA5B,4BAA4B"}
|
|
@@ -74,6 +74,7 @@ harden(meta);
|
|
|
74
74
|
* string,
|
|
75
75
|
* import('./params.js').VaultManagerParamOverrides
|
|
76
76
|
* >;
|
|
77
|
+
* directorParamOverrides: [object];
|
|
77
78
|
* }} privateArgs
|
|
78
79
|
* @param {import('@agoric/swingset-liveslots').Baggage} baggage
|
|
79
80
|
*/
|
|
@@ -86,6 +87,7 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
86
87
|
storageNode,
|
|
87
88
|
auctioneerInstance,
|
|
88
89
|
managerParams,
|
|
90
|
+
directorParamOverrides,
|
|
89
91
|
} = privateArgs;
|
|
90
92
|
|
|
91
93
|
trace('awaiting debtMint');
|
|
@@ -117,7 +119,6 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
117
119
|
marshaller,
|
|
118
120
|
);
|
|
119
121
|
/** a powerful object; can modify the invitation */
|
|
120
|
-
trace('awaiting makeParamManagerFromTerms');
|
|
121
122
|
const vaultDirectorParamManager = await makeParamManagerFromTerms(
|
|
122
123
|
{
|
|
123
124
|
publisher: governanceSubscriptionKit.publication,
|
|
@@ -129,6 +130,7 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
129
130
|
[SHORTFALL_INVITATION_KEY]: initialShortfallInvitation,
|
|
130
131
|
},
|
|
131
132
|
vaultDirectorParamTypes,
|
|
133
|
+
directorParamOverrides,
|
|
132
134
|
);
|
|
133
135
|
|
|
134
136
|
const director = provideDirector(
|