@agoric/inter-protocol 0.16.2-dev-c4520c5.0 → 0.16.2-dev-a18dbbf.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/interest.js +1 -1
- package/src/proposals/add-auction.d.ts +6 -1
- package/src/proposals/add-auction.d.ts.map +1 -1
- package/src/proposals/add-auction.js +14 -2
- package/src/proposals/upgrade-vaults.d.ts +6 -1
- package/src/proposals/upgrade-vaults.d.ts.map +1 -1
- package/src/proposals/upgrade-vaults.js +20 -3
- package/src/vaultFactory/vaultManager.d.ts.map +1 -1
- package/src/vaultFactory/vaultManager.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-a18dbbf.0+a18dbbf",
|
|
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-a18dbbf.0+a18dbbf",
|
|
35
|
+
"@agoric/governance": "0.10.4-dev-a18dbbf.0+a18dbbf",
|
|
36
|
+
"@agoric/internal": "0.3.3-dev-a18dbbf.0+a18dbbf",
|
|
37
|
+
"@agoric/notifier": "0.6.3-dev-a18dbbf.0+a18dbbf",
|
|
38
|
+
"@agoric/store": "0.9.3-dev-a18dbbf.0+a18dbbf",
|
|
39
|
+
"@agoric/time": "0.3.3-dev-a18dbbf.0+a18dbbf",
|
|
40
|
+
"@agoric/vat-data": "0.5.3-dev-a18dbbf.0+a18dbbf",
|
|
41
|
+
"@agoric/vats": "0.15.2-dev-a18dbbf.0+a18dbbf",
|
|
42
|
+
"@agoric/zoe": "0.26.3-dev-a18dbbf.0+a18dbbf",
|
|
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-a18dbbf.0+a18dbbf",
|
|
54
|
+
"@agoric/swingset-liveslots": "0.10.3-dev-a18dbbf.0+a18dbbf",
|
|
55
|
+
"@agoric/swingset-vat": "0.32.3-dev-a18dbbf.0+a18dbbf",
|
|
56
|
+
"@agoric/zone": "0.2.3-dev-a18dbbf.0+a18dbbf",
|
|
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": "a18dbbf81d0117ac39cde89e91e10ce837d0faca"
|
|
88
88
|
}
|
package/src/interest.js
CHANGED
|
@@ -197,7 +197,7 @@ export const chargeInterest = (powers, params, prior, accruedUntil) => {
|
|
|
197
197
|
}
|
|
198
198
|
|
|
199
199
|
// NB: This method of inferring the compounded rate from the ratio of debts
|
|
200
|
-
//
|
|
200
|
+
// accrued suffers slightly from the integer nature of debts. However in
|
|
201
201
|
// testing with small numbers there's 5 digits of precision, and with large
|
|
202
202
|
// numbers the ratios tend towards ample precision.
|
|
203
203
|
// TODO adopt banker's rounding https://github.com/Agoric/agoric-sdk/issues/4573
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export function addAuction({ consume: { zoe, board, chainTimerService, priceAuthority, chainStorage, economicCommitteeCreatorFacet: electorateCreatorFacet, auctioneerKit: legacyKitP, }, produce: { newAuctioneerKit }, instance: { consume: { reserve: reserveInstance }, }, installation: { consume: { auctioneer: auctionInstallation, contractGovernor: contractGovernorInstallation, }, }, issuer: { consume: { [Stable.symbol]: stableIssuerP }, }, }: import("./econ-behaviors.js").EconomyBootstrapPowers): Promise<void>;
|
|
1
|
+
export function addAuction({ consume: { zoe, board, chainTimerService, priceAuthority, chainStorage, economicCommitteeCreatorFacet: electorateCreatorFacet, auctioneerKit: legacyKitP, }, produce: { newAuctioneerKit, auctionsUpgradeComplete }, instance: { consume: { reserve: reserveInstance }, }, installation: { consume: { auctioneer: auctionInstallation, contractGovernor: contractGovernorInstallation, }, }, issuer: { consume: { [Stable.symbol]: stableIssuerP }, }, }: import("./econ-behaviors.js").EconomyBootstrapPowers & interlockPowers): Promise<void>;
|
|
2
2
|
export const ADD_AUCTION_MANIFEST: {
|
|
3
3
|
[x: string]: {
|
|
4
4
|
consume: {
|
|
@@ -12,6 +12,7 @@ export const ADD_AUCTION_MANIFEST: {
|
|
|
12
12
|
};
|
|
13
13
|
produce: {
|
|
14
14
|
newAuctioneerKit: boolean;
|
|
15
|
+
auctionsUpgradeComplete: boolean;
|
|
15
16
|
};
|
|
16
17
|
instance: {
|
|
17
18
|
consume: {
|
|
@@ -45,6 +46,7 @@ export function getManifestForAddAuction(): Promise<{
|
|
|
45
46
|
};
|
|
46
47
|
produce: {
|
|
47
48
|
newAuctioneerKit: boolean;
|
|
49
|
+
auctionsUpgradeComplete: boolean;
|
|
48
50
|
};
|
|
49
51
|
instance: {
|
|
50
52
|
consume: {
|
|
@@ -65,5 +67,8 @@ export function getManifestForAddAuction(): Promise<{
|
|
|
65
67
|
};
|
|
66
68
|
};
|
|
67
69
|
}>;
|
|
70
|
+
export type interlockPowers = PromiseSpaceOf<{
|
|
71
|
+
auctionsUpgradeComplete: boolean;
|
|
72
|
+
}>;
|
|
68
73
|
import { Stable } from '@agoric/internal/src/tokens.js';
|
|
69
74
|
//# sourceMappingURL=add-auction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-auction.d.ts","sourceRoot":"","sources":["add-auction.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-auction.d.ts","sourceRoot":"","sources":["add-auction.js"],"names":[],"mappings":"AAkBO,udAHI,OAAO,qBAAqB,EAAE,sBAAsB,GAC9D,eAAmB,iBA4InB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BG;AAGI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAEN;8BAtLY,cAAc,CAAC;IAC3B,uBAA2B,EAAE,OAAO,CAAC;CAClC,CAAC;uBARkB,gCAAgC"}
|
|
@@ -6,7 +6,16 @@ import { makeGovernedTerms as makeGovernedATerms } from '../auction/params.js';
|
|
|
6
6
|
|
|
7
7
|
const trace = makeTracer('NewAuction', true);
|
|
8
8
|
|
|
9
|
-
/**
|
|
9
|
+
/**
|
|
10
|
+
* @typedef {PromiseSpaceOf<{
|
|
11
|
+
* auctionsUpgradeComplete: boolean;
|
|
12
|
+
* }>} interlockPowers
|
|
13
|
+
*/
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* @param {import('./econ-behaviors.js').EconomyBootstrapPowers &
|
|
17
|
+
* interlockPowers} powers
|
|
18
|
+
*/
|
|
10
19
|
export const addAuction = async ({
|
|
11
20
|
consume: {
|
|
12
21
|
zoe,
|
|
@@ -17,7 +26,7 @@ export const addAuction = async ({
|
|
|
17
26
|
economicCommitteeCreatorFacet: electorateCreatorFacet,
|
|
18
27
|
auctioneerKit: legacyKitP,
|
|
19
28
|
},
|
|
20
|
-
produce: { newAuctioneerKit },
|
|
29
|
+
produce: { newAuctioneerKit, auctionsUpgradeComplete },
|
|
21
30
|
instance: {
|
|
22
31
|
consume: { reserve: reserveInstance },
|
|
23
32
|
},
|
|
@@ -143,6 +152,8 @@ export const addAuction = async ({
|
|
|
143
152
|
);
|
|
144
153
|
// don't overwrite auctioneerKit or auction instance yet. Wait until
|
|
145
154
|
// upgrade-vault.js
|
|
155
|
+
|
|
156
|
+
auctionsUpgradeComplete.resolve(true);
|
|
146
157
|
};
|
|
147
158
|
|
|
148
159
|
export const ADD_AUCTION_MANIFEST = harden({
|
|
@@ -158,6 +169,7 @@ export const ADD_AUCTION_MANIFEST = harden({
|
|
|
158
169
|
},
|
|
159
170
|
produce: {
|
|
160
171
|
newAuctioneerKit: true,
|
|
172
|
+
auctionsUpgradeComplete: true,
|
|
161
173
|
},
|
|
162
174
|
instance: {
|
|
163
175
|
consume: { reserve: true },
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export function upgradeVaults(powers: import("../../src/proposals/econ-behaviors").EconomyBootstrapPowers, { options }: {
|
|
1
|
+
export function upgradeVaults(powers: import("../../src/proposals/econ-behaviors").EconomyBootstrapPowers & interlockPowers, { options }: {
|
|
2
2
|
options: {
|
|
3
3
|
vaultsRef: {
|
|
4
4
|
bundleID: string;
|
|
@@ -17,10 +17,12 @@ export function getManifestForUpgradeVaults(_ign: object, vaultUpgradeOptions: a
|
|
|
17
17
|
vaultFactoryKit: string;
|
|
18
18
|
board: string;
|
|
19
19
|
zoe: string;
|
|
20
|
+
auctionsUpgradeComplete: string;
|
|
20
21
|
};
|
|
21
22
|
produce: {
|
|
22
23
|
auctioneerKit: string;
|
|
23
24
|
newAuctioneerKit: string;
|
|
25
|
+
auctionsUpgradeComplete: string;
|
|
24
26
|
};
|
|
25
27
|
instance: {
|
|
26
28
|
produce: {
|
|
@@ -32,4 +34,7 @@ export function getManifestForUpgradeVaults(_ign: object, vaultUpgradeOptions: a
|
|
|
32
34
|
};
|
|
33
35
|
options: any;
|
|
34
36
|
}>;
|
|
37
|
+
export type interlockPowers = PromiseSpaceOf<{
|
|
38
|
+
auctionsUpgradeComplete: boolean;
|
|
39
|
+
}>;
|
|
35
40
|
//# sourceMappingURL=upgrade-vaults.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-vaults.d.ts","sourceRoot":"","sources":["upgrade-vaults.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"upgrade-vaults.d.ts","sourceRoot":"","sources":["upgrade-vaults.js"],"names":[],"mappings":"AA2CO,sCAJI,OAAO,oCAAoC,EAAE,sBAAsB,GAC7E,eAAqB,eACX;IAAE,OAAO,EAAE;QAAE,SAAS,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,iBAkN1D;AASM,kDAHI,MAAM,uBACN,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BZ;8BA7PW,cAAc,CAAC;IAC3B,uBAA2B,EAAE,OAAO,CAAC;CAClC,CAAC"}
|
|
@@ -31,7 +31,14 @@ const any = promises =>
|
|
|
31
31
|
});
|
|
32
32
|
|
|
33
33
|
/**
|
|
34
|
-
* @
|
|
34
|
+
* @typedef {PromiseSpaceOf<{
|
|
35
|
+
* auctionsUpgradeComplete: boolean;
|
|
36
|
+
* }>} interlockPowers
|
|
37
|
+
*/
|
|
38
|
+
|
|
39
|
+
/**
|
|
40
|
+
* @param {import('../../src/proposals/econ-behaviors').EconomyBootstrapPowers &
|
|
41
|
+
* interlockPowers} powers
|
|
35
42
|
* @param {{ options: { vaultsRef: { bundleID: string } } }} options
|
|
36
43
|
*/
|
|
37
44
|
export const upgradeVaults = async (powers, { options }) => {
|
|
@@ -44,10 +51,12 @@ export const upgradeVaults = async (powers, { options }) => {
|
|
|
44
51
|
zoe,
|
|
45
52
|
economicCommitteeCreatorFacet: electorateCreatorFacet,
|
|
46
53
|
reserveKit,
|
|
54
|
+
auctionsUpgradeComplete,
|
|
47
55
|
},
|
|
48
56
|
produce: {
|
|
49
57
|
auctioneerKit: auctioneerKitProducer,
|
|
50
58
|
newAuctioneerKit: tempAuctioneerKit,
|
|
59
|
+
auctionsUpgradeComplete: auctionsUpgradeCompleteProducer,
|
|
51
60
|
},
|
|
52
61
|
instance: {
|
|
53
62
|
produce: { auctioneer: auctioneerProducer },
|
|
@@ -68,7 +77,10 @@ export const upgradeVaults = async (powers, { options }) => {
|
|
|
68
77
|
* >}
|
|
69
78
|
*/
|
|
70
79
|
let installationP;
|
|
71
|
-
|
|
80
|
+
|
|
81
|
+
await auctionsUpgradeComplete;
|
|
82
|
+
auctionsUpgradeCompleteProducer.reset();
|
|
83
|
+
|
|
72
84
|
if (vaultsRef) {
|
|
73
85
|
if (bundleID) {
|
|
74
86
|
installationP = E(zoe).installBundleID(bundleID);
|
|
@@ -261,8 +273,13 @@ export const getManifestForUpgradeVaults = async (
|
|
|
261
273
|
vaultFactoryKit: uV,
|
|
262
274
|
board: uV,
|
|
263
275
|
zoe: uV,
|
|
276
|
+
auctionsUpgradeComplete: uV,
|
|
277
|
+
},
|
|
278
|
+
produce: {
|
|
279
|
+
auctioneerKit: uV,
|
|
280
|
+
newAuctioneerKit: uV,
|
|
281
|
+
auctionsUpgradeComplete: uV,
|
|
264
282
|
},
|
|
265
|
-
produce: { auctioneerKit: uV, newAuctioneerKit: uV },
|
|
266
283
|
instance: { produce: { auctioneer: uV, newAuctioneerKit: uV } },
|
|
267
284
|
},
|
|
268
285
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vaultManager.d.ts","sourceRoot":"","sources":["vaultManager.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"vaultManager.d.ts","sourceRoot":"","sources":["vaultManager.js"],"names":[],"mappings":"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"}
|
|
@@ -52,6 +52,7 @@ import {
|
|
|
52
52
|
TopicsRecordShape,
|
|
53
53
|
} from '@agoric/zoe/src/contractSupport/index.js';
|
|
54
54
|
import { PriceQuoteShape, SeatShape } from '@agoric/zoe/src/typeGuards.js';
|
|
55
|
+
import { multiplyBy } from '@agoric/zoe/src/contractSupport/ratio.js';
|
|
55
56
|
import {
|
|
56
57
|
checkDebtLimit,
|
|
57
58
|
makeNatAmountShape,
|
|
@@ -993,8 +994,9 @@ export const prepareVaultManagerKit = (
|
|
|
993
994
|
);
|
|
994
995
|
state.totalDebt = AmountMath.subtract(
|
|
995
996
|
AmountMath.add(state.totalDebt, vault.getCurrentDebt()),
|
|
996
|
-
oldDebtNormalized,
|
|
997
|
+
multiplyBy(oldDebtNormalized, state.compoundedInterest),
|
|
997
998
|
);
|
|
999
|
+
|
|
998
1000
|
void facets.helper.writeMetrics();
|
|
999
1001
|
},
|
|
1000
1002
|
},
|