@agoric/inter-protocol 0.16.2-dev-61d4577.0.61d4577 → 0.16.2-dev-8b1bc2c.0.8b1bc2c
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 +16 -16
- package/src/auction/auctioneer.d.ts.map +1 -1
- package/src/auction/auctioneer.js +8 -4
- package/src/price/fluxAggregatorContract.d.ts.map +1 -1
- package/src/price/fluxAggregatorContract.js +6 -3
- package/src/provisionPool.d.ts.map +1 -1
- package/src/provisionPool.js +5 -1
- package/src/psm/psm.d.ts +2 -4
- package/src/psm/psm.d.ts.map +1 -1
- package/src/psm/psm.js +8 -7
- package/src/reserve/assetReserve.d.ts.map +1 -1
- package/src/reserve/assetReserve.js +7 -4
- package/src/vaultFactory/params.d.ts +3 -1
- package/src/vaultFactory/params.d.ts.map +1 -1
- package/src/vaultFactory/params.js +2 -1
- package/src/vaultFactory/vaultDirector.d.ts +3 -2
- package/src/vaultFactory/vaultDirector.d.ts.map +1 -1
- package/src/vaultFactory/vaultDirector.js +2 -1
- package/src/vaultFactory/vaultFactory.d.ts.map +1 -1
- package/src/vaultFactory/vaultFactory.js +7 -4
- package/src/vaultFactory/vaultManager.d.ts +2 -1
- package/src/vaultFactory/vaultManager.d.ts.map +1 -1
- package/src/vaultFactory/vaultManager.js +2 -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-8b1bc2c.0.8b1bc2c",
|
|
4
4
|
"description": "Core cryptoeconomy contracts",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "src/index.js",
|
|
@@ -31,17 +31,17 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://github.com/Agoric/agoric-sdk#readme",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@agoric/base-zone": "0.1.1-dev-
|
|
35
|
-
"@agoric/ertp": "0.16.3-dev-
|
|
36
|
-
"@agoric/governance": "0.10.4-dev-
|
|
37
|
-
"@agoric/internal": "0.3.3-dev-
|
|
38
|
-
"@agoric/notifier": "0.6.3-dev-
|
|
39
|
-
"@agoric/store": "0.9.3-dev-
|
|
40
|
-
"@agoric/time": "0.3.3-dev-
|
|
41
|
-
"@agoric/vat-data": "0.5.3-dev-
|
|
42
|
-
"@agoric/vats": "0.15.2-dev-
|
|
43
|
-
"@agoric/zoe": "0.26.3-dev-
|
|
44
|
-
"@agoric/zone": "0.2.3-dev-
|
|
34
|
+
"@agoric/base-zone": "0.1.1-dev-8b1bc2c.0.8b1bc2c",
|
|
35
|
+
"@agoric/ertp": "0.16.3-dev-8b1bc2c.0.8b1bc2c",
|
|
36
|
+
"@agoric/governance": "0.10.4-dev-8b1bc2c.0.8b1bc2c",
|
|
37
|
+
"@agoric/internal": "0.3.3-dev-8b1bc2c.0.8b1bc2c",
|
|
38
|
+
"@agoric/notifier": "0.6.3-dev-8b1bc2c.0.8b1bc2c",
|
|
39
|
+
"@agoric/store": "0.9.3-dev-8b1bc2c.0.8b1bc2c",
|
|
40
|
+
"@agoric/time": "0.3.3-dev-8b1bc2c.0.8b1bc2c",
|
|
41
|
+
"@agoric/vat-data": "0.5.3-dev-8b1bc2c.0.8b1bc2c",
|
|
42
|
+
"@agoric/vats": "0.15.2-dev-8b1bc2c.0.8b1bc2c",
|
|
43
|
+
"@agoric/zoe": "0.26.3-dev-8b1bc2c.0.8b1bc2c",
|
|
44
|
+
"@agoric/zone": "0.2.3-dev-8b1bc2c.0.8b1bc2c",
|
|
45
45
|
"@endo/captp": "^4.4.8",
|
|
46
46
|
"@endo/errors": "^1.2.13",
|
|
47
47
|
"@endo/eventual-send": "^1.3.4",
|
|
@@ -52,9 +52,9 @@
|
|
|
52
52
|
"jessie.js": "^0.3.4"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
|
-
"@agoric/smart-wallet": "0.5.4-dev-
|
|
56
|
-
"@agoric/swingset-liveslots": "0.10.3-dev-
|
|
57
|
-
"@agoric/swingset-vat": "0.32.3-dev-
|
|
55
|
+
"@agoric/smart-wallet": "0.5.4-dev-8b1bc2c.0.8b1bc2c",
|
|
56
|
+
"@agoric/swingset-liveslots": "0.10.3-dev-8b1bc2c.0.8b1bc2c",
|
|
57
|
+
"@agoric/swingset-vat": "0.32.3-dev-8b1bc2c.0.8b1bc2c",
|
|
58
58
|
"@endo/bundle-source": "^4.1.2",
|
|
59
59
|
"@endo/init": "^1.1.12",
|
|
60
60
|
"@endo/promise-kit": "^1.1.13",
|
|
@@ -85,5 +85,5 @@
|
|
|
85
85
|
"typeCoverage": {
|
|
86
86
|
"atLeast": 95.65
|
|
87
87
|
},
|
|
88
|
-
"gitHead": "
|
|
88
|
+
"gitHead": "8b1bc2cccf9f80a09b177b0aeca74934c258a613"
|
|
89
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auctioneer.d.ts","sourceRoot":"","sources":["auctioneer.js"],"names":[],"mappings":"AAqLO,yEAXI,MAAM,CAAC,KAAK,CAAC,YACb,MAAM,CAAC,KAAK,CAAC,YACb;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;CAAE,EAAE,kBAC/D,OAAO,kBACP,OAAO,qBAEP,MAAM,eAEN,OAAO,SACP,KAAK,6BAgNf;AAiBM,2BAdI,GAAG,CACT,eAAe,CAAC,OAAO,oBAAoB,CAAC,GAAG;IAC7C,YAAY,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IAClD,kBAAkB,EAAE,uBAAuB,CAAC;IAC5C,cAAc,EAAE,cAAc,CAAC;CAChC,CACF,eACO;IACN,sBAAsB,EAAE,UAAU,CAAC;IACnC,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;CAChC,WACO,OAAO;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"auctioneer.d.ts","sourceRoot":"","sources":["auctioneer.js"],"names":[],"mappings":"AAqLO,yEAXI,MAAM,CAAC,KAAK,CAAC,YACb,MAAM,CAAC,KAAK,CAAC,YACb;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;CAAE,EAAE,kBAC/D,OAAO,kBACP,OAAO,qBAEP,MAAM,eAEN,OAAO,SACP,KAAK,6BAgNf;AAiBM,2BAdI,GAAG,CACT,eAAe,CAAC,OAAO,oBAAoB,CAAC,GAAG;IAC7C,YAAY,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IAClD,kBAAkB,EAAE,uBAAuB,CAAC;IAC5C,cAAc,EAAE,cAAc,CAAC;CAChC,CACF,eACO;IACN,sBAAsB,EAAE,UAAU,CAAC;IACnC,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;CAChC,WACO,OAAO;;;;;;;;;;QAyOZ,4CAA4C;2CAAhC,KAAK,CAAC,KAAK,CAAC;;;;;;;;;;;;;kBApCT,MAAM,CAAC,KAAK,CAAC;;;;QAkG5B;;;WAGG;yBAFQ,MAAM,CAAC,KAAK,CAAC,OACb,OAAO;QAyBlB,gEAAgE;uBAAlD,OAAO,CAAC,OAAO,gBAAgB,EAAE,YAAY,CAAC;;QA3B5D;;;WAGG;yBAFQ,MAAM,CAAC,KAAK,CAAC,OACb,OAAO;QAyBlB,gEAAgE;uBAAlD,OAAO,CAAC,OAAO,gBAAgB,EAAE,YAAY,CAAC;;GAQjE;AAED,6DAA6D;AAC7D,yEAAyE;AACzE,2EAA2E;AAE3E,8DAAkE;iCAJpD,WAAW,OAAO,KAAK,CAAC;oCACxB,kBAAkB,CAAC,aAAa,CAAC;qCACjC,kBAAkB,CAAC,cAAc,CAAC;qCA/rBX,aAAa;oCAS2C,4BAA4B;4BAJlF,kBAAkB;6BAE/B,kBAAkB;gCACf,qCAAqC"}
|
|
@@ -7,6 +7,7 @@ import { Far } from '@endo/marshal';
|
|
|
7
7
|
import { AmountMath, AmountShape, BrandShape } from '@agoric/ertp';
|
|
8
8
|
import { handleParamGovernance } from '@agoric/governance';
|
|
9
9
|
import { makeTracer } from '@agoric/internal';
|
|
10
|
+
import { wrapRemoteMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
|
|
10
11
|
import { prepareDurablePublishKit } from '@agoric/notifier';
|
|
11
12
|
import { mustMatch } from '@agoric/store';
|
|
12
13
|
import { appendToStoredArray } from '@agoric/store/src/stores/store-utils.js';
|
|
@@ -35,8 +36,7 @@ import { makeScheduler } from './scheduler.js';
|
|
|
35
36
|
import { AuctionState } from './util.js';
|
|
36
37
|
|
|
37
38
|
/**
|
|
38
|
-
* @import {Remote} from '@agoric/internal';
|
|
39
|
-
* @import {TypedPattern} from '@agoric/internal';
|
|
39
|
+
* @import {Remote, TypedPattern} from '@agoric/internal';
|
|
40
40
|
* @import {MapStore} from '@agoric/store';
|
|
41
41
|
* @import {Baggage} from '@agoric/vat-data';
|
|
42
42
|
* @import {ContractOf} from '@agoric/zoe/src/zoeService/utils.js';
|
|
@@ -425,11 +425,15 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
425
425
|
|
|
426
426
|
let bookCounter = 0;
|
|
427
427
|
|
|
428
|
+
const { marshaller: remoteMarshaller } = privateArgs;
|
|
429
|
+
|
|
430
|
+
const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
|
|
431
|
+
|
|
428
432
|
const makeDurablePublishKit = prepareDurablePublishKit(
|
|
429
433
|
baggage,
|
|
430
434
|
'Auction publish kit',
|
|
431
435
|
);
|
|
432
|
-
const makeRecorder = prepareRecorder(baggage,
|
|
436
|
+
const makeRecorder = prepareRecorder(baggage, cachingMarshaller);
|
|
433
437
|
|
|
434
438
|
const makeRecorderKit = defineRecorderKit({
|
|
435
439
|
makeRecorder,
|
|
@@ -535,7 +539,7 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
535
539
|
privateArgs.initialPoserInvitation,
|
|
536
540
|
auctioneerParamTypes,
|
|
537
541
|
privateArgs.storageNode,
|
|
538
|
-
|
|
542
|
+
cachingMarshaller,
|
|
539
543
|
);
|
|
540
544
|
|
|
541
545
|
const tradeEveryBook = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fluxAggregatorContract.d.ts","sourceRoot":"","sources":["fluxAggregatorContract.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fluxAggregatorContract.d.ts","sourceRoot":"","sources":["fluxAggregatorContract.js"],"names":[],"mappings":"AAeA;;;;GAIG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAmBrB;AA0BK,2BAlBI,GAAG,CACb,OAAW,wBAAwB,EAAE,eAAe,GAAG;IACjD,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACtB,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAC9B,CACF,eACO;IACN,0BAA0B,CAAC,EAAE,OAAO,0CAA0C,EAAE,sBAAsB,CAAC;IACvG,sBAAsB,EAAE,UAAU,CAAC;IACnC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,mBAAmB,EAAE,IAAI,CAAC,OAAO,cAAc,EAAE,SAAS,CAAC,CAAC;IAC5D,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;CAClC,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuIjB;0BAGa,OAAO,KAAK;kCAzLK,cAAc;4BACpB,kBAAkB;6BAFjB,kBAAkB"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
import { prepareIssuerKit } from '@agoric/ertp';
|
|
4
4
|
import { handleParamGovernance } from '@agoric/governance';
|
|
5
5
|
import { makeTracer, StorageNodeShape } from '@agoric/internal';
|
|
6
|
+
import { wrapRemoteMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
|
|
6
7
|
import { prepareDurablePublishKit } from '@agoric/notifier';
|
|
7
8
|
import { M } from '@agoric/store';
|
|
8
9
|
import { provideAll } from '@agoric/zoe/src/contractSupport/durability.js';
|
|
@@ -81,7 +82,7 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
81
82
|
const {
|
|
82
83
|
highPrioritySendersManager,
|
|
83
84
|
initialPoserInvitation,
|
|
84
|
-
marshaller,
|
|
85
|
+
marshaller: remoteMarshaller,
|
|
85
86
|
namesByAddressAdmin,
|
|
86
87
|
storageNode,
|
|
87
88
|
} = privateArgs;
|
|
@@ -90,11 +91,13 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
90
91
|
|
|
91
92
|
trace('awaited args');
|
|
92
93
|
|
|
94
|
+
const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
|
|
95
|
+
|
|
93
96
|
const makeDurablePublishKit = prepareDurablePublishKit(
|
|
94
97
|
baggage,
|
|
95
98
|
'Price Aggregator publish kit',
|
|
96
99
|
);
|
|
97
|
-
const makeRecorder = prepareRecorder(baggage,
|
|
100
|
+
const makeRecorder = prepareRecorder(baggage, cachingMarshaller);
|
|
98
101
|
|
|
99
102
|
const makeFluxAggregatorKit = await prepareFluxAggregatorKit(
|
|
100
103
|
baggage,
|
|
@@ -121,7 +124,7 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
121
124
|
// No governed parameters. Governance just for API methods.
|
|
122
125
|
},
|
|
123
126
|
storageNode,
|
|
124
|
-
|
|
127
|
+
cachingMarshaller,
|
|
125
128
|
);
|
|
126
129
|
|
|
127
130
|
trace('got makeDurableGovernorFacet', makeDurableGovernorFacet);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionPool.d.ts","sourceRoot":"","sources":["provisionPool.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"provisionPool.d.ts","sourceRoot":"","sources":["provisionPool.js"],"names":[],"mappings":"AAoBA;;;;;GAKG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAerB;AAsBK,2BAbI,IAAI,cAAc,CAAC,eACnB;IACN,QAAQ,EAAE,OAAO,WAAW,EAAE,IAAI,CACtC,OAAa,8BAA8B,EAAE,IAAI,CAC5C,CAAC;IACF,sBAAsB,EAAE,UAAU,CAAC;IACnC,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,uBAAuB,EAAE,mBAAmB,CAAC;IACtE,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAC7D,WACO,OAAO,kBAAkB,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6E5C;;;;6BA7FY,aAAa,GACzB,gBAAoB;IACd,uBAAuB,EAAE,QAAQ,CAAC;CACnC,CAAC;kCA1BwD,aAAa;yBAAb,aAAa;gCAAb,aAAa;4BAFnD,kBAAkB;4BACK,cAAc;2BAAd,cAAc;mCACC,aAAa;qCAC1C,iCAAiC"}
|
package/src/provisionPool.js
CHANGED
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
publicMixinAPI,
|
|
7
7
|
} from '@agoric/governance';
|
|
8
8
|
import { InvitationShape } from '@agoric/governance/src/typeGuards.js';
|
|
9
|
+
import { wrapRemoteMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
|
|
9
10
|
import { M } from '@agoric/store';
|
|
10
11
|
import { prepareExo } from '@agoric/vat-data';
|
|
11
12
|
import { provideSingleton } from '@agoric/zoe/src/contractSupport/durability.js';
|
|
@@ -64,9 +65,12 @@ harden(meta);
|
|
|
64
65
|
export const start = async (zcf, privateArgs, baggage) => {
|
|
65
66
|
const { poolBank, metricsOverride } = privateArgs;
|
|
66
67
|
|
|
68
|
+
const { marshaller: remoteMarshaller } = privateArgs;
|
|
69
|
+
const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
|
|
70
|
+
|
|
67
71
|
const { makeRecorderKit } = prepareRecorderKitMakers(
|
|
68
72
|
baggage,
|
|
69
|
-
|
|
73
|
+
cachingMarshaller,
|
|
70
74
|
);
|
|
71
75
|
|
|
72
76
|
// Governance
|
package/src/psm/psm.d.ts
CHANGED
|
@@ -7,6 +7,8 @@
|
|
|
7
7
|
*/
|
|
8
8
|
/**
|
|
9
9
|
* @import {EReturn} from '@endo/far';
|
|
10
|
+
* @import {TypedPattern, Remote} from '@agoric/internal';
|
|
11
|
+
* @import {Baggage} from '@agoric/vat-data'
|
|
10
12
|
* @import {ContractMeta, FeeMintAccess, Installation} from '@agoric/zoe';
|
|
11
13
|
*/
|
|
12
14
|
/**
|
|
@@ -23,10 +25,6 @@
|
|
|
23
25
|
* @property {Amount<'nat'>} totalMintedProvided running sum of Minted ever
|
|
24
26
|
* given by this contract
|
|
25
27
|
*/
|
|
26
|
-
/**
|
|
27
|
-
* @import {TypedPattern, Remote} from '@agoric/internal';
|
|
28
|
-
* @import {Baggage} from '@agoric/vat-data'
|
|
29
|
-
*/
|
|
30
28
|
/** @type {ContractMeta} */
|
|
31
29
|
export const meta: ContractMeta;
|
|
32
30
|
export function start(zcf: ZCF<GovernanceTerms<{
|
package/src/psm/psm.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"psm.d.ts","sourceRoot":"","sources":["psm.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"psm.d.ts","sourceRoot":"","sources":["psm.js"],"names":[],"mappings":"AAsCA;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;;;;;;;;;;;;GAaG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAkCrB;AAsBK,2BAlBI,GAAG,CACT,eAAe,CAAC;IACd,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,QAAQ,CAAC;CACrB,CAAC,GAAG;IACH,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC1B,eAAe,EAAE,KAAK,CAAC;CACxB,CACF,eACO;IACN,aAAa,EAAE,aAAa,CAAC;IAC7B,sBAAsB,EAAE,UAAU,CAAC;IACnC,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;CAChC,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqUjB;;;;;;;;;;uBAvYa,MAAM,CAAC,KAAK,CAAC;;;;;uBAEb,MAAM,CAAC,KAAK,CAAC;;;;;oBAEb,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC;;6BAkYb,QAAQ,OAAO,KAAK,CAAb,CAAe,aAAa,CAAC;kCAhZU,aAAa;mCAAb,aAAa;4BAFlC,kBAAkB;6BAC/B,kBAAkB;kCACgB,aAAa;6BAH/C,WAAW"}
|
package/src/psm/psm.js
CHANGED
|
@@ -12,6 +12,7 @@ import {
|
|
|
12
12
|
publicMixinAPI,
|
|
13
13
|
} from '@agoric/governance';
|
|
14
14
|
import { StorageNodeShape } from '@agoric/internal';
|
|
15
|
+
import { wrapRemoteMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
|
|
15
16
|
import { M, prepareExo, provide } from '@agoric/vat-data';
|
|
16
17
|
import {
|
|
17
18
|
atomicTransfer,
|
|
@@ -45,6 +46,8 @@ import { makeNatAmountShape } from '../contractSupport.js';
|
|
|
45
46
|
|
|
46
47
|
/**
|
|
47
48
|
* @import {EReturn} from '@endo/far';
|
|
49
|
+
* @import {TypedPattern, Remote} from '@agoric/internal';
|
|
50
|
+
* @import {Baggage} from '@agoric/vat-data'
|
|
48
51
|
* @import {ContractMeta, FeeMintAccess, Installation} from '@agoric/zoe';
|
|
49
52
|
*/
|
|
50
53
|
|
|
@@ -63,11 +66,6 @@ import { makeNatAmountShape } from '../contractSupport.js';
|
|
|
63
66
|
* given by this contract
|
|
64
67
|
*/
|
|
65
68
|
|
|
66
|
-
/**
|
|
67
|
-
* @import {TypedPattern, Remote} from '@agoric/internal';
|
|
68
|
-
* @import {Baggage} from '@agoric/vat-data'
|
|
69
|
-
*/
|
|
70
|
-
|
|
71
69
|
/** @type {ContractMeta} */
|
|
72
70
|
export const meta = {
|
|
73
71
|
upgradability: 'canUpgrade',
|
|
@@ -128,9 +126,12 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
128
126
|
const { anchorBrand, anchorPerMinted } = zcf.getTerms();
|
|
129
127
|
console.log('PSM Starting', anchorBrand, anchorPerMinted);
|
|
130
128
|
|
|
129
|
+
const { marshaller: remoteMarshaller } = privateArgs;
|
|
130
|
+
const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
|
|
131
|
+
|
|
131
132
|
const { makeRecorderKit } = prepareRecorderKitMakers(
|
|
132
133
|
baggage,
|
|
133
|
-
|
|
134
|
+
cachingMarshaller,
|
|
134
135
|
);
|
|
135
136
|
|
|
136
137
|
const { stableMint } = await provideAll(baggage, {
|
|
@@ -157,7 +158,7 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
157
158
|
WantMintedFee: ParamTypes.RATIO,
|
|
158
159
|
},
|
|
159
160
|
privateArgs.storageNode,
|
|
160
|
-
|
|
161
|
+
cachingMarshaller,
|
|
161
162
|
);
|
|
162
163
|
|
|
163
164
|
const anchorPool = provideEmptySeat(zcf, baggage, 'anchorPoolSeat');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assetReserve.d.ts","sourceRoot":"","sources":["assetReserve.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"assetReserve.d.ts","sourceRoot":"","sources":["assetReserve.js"],"names":[],"mappings":"AAqBA,yCAAyC;AACzC,mBADW,aAAa,OAAO,KAAK,CAAC,CAGnC;AA8BK,2BAbI,GAAG,CACT,eAAe,CAAC,EAAE,CAAC,GAAG;IACpB,YAAY,EAAE,CAAC,2BAA2B,CAAC,CAAC;CAC7C,CACF,eACO;IACN,aAAa,EAAE,aAAa,CAAC;IAC7B,sBAAsB,EAAE,UAAU,CAAC;IACnC,UAAU,EAAE,QAAQ,UAAU,CAAC,CAAC;IAChC,WAAW,EAAE,QAAQ,WAAW,CAAC,CAAC;CACnC,WACO,OAAO;IAuDd,mEAAmE;kBAAxD,oBAAoB;;;;;;;;;;;;OAAgC;IAE/D,iEAAiE;iBAAtD,mBAAmB;;;;;OAA+B;GAKhE;sCAtFY;IACR,4BAA4B,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACzD,0BAA0B,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CACzD;;kCAwFU,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI;gCAC3B,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI;;;eAK3B,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI;oBACrC,MAAM,UAAU;sCAChB,MAAM,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;;sCAG5C,QAAQ,OAAO,KAAK,CAAb,CAAe,aAAa,CAAC;;;;uCAErC,QAAQ,OAAO,KAAK,CAAb,CAAe,cAAc,CAAC;8BAIpC,WAAW,OAAO,KAAK,CAAC;kCAxHkC,aAAa;mCAAb,aAAa;6BAJ3D,kBAAkB;6BAClB,kBAAkB;gCAG4B,aAAa;6BAF3D,WAAW;gCACR,qCAAqC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import { handleParamGovernance } from '@agoric/governance';
|
|
4
4
|
import { makeTracer } from '@agoric/internal';
|
|
5
|
+
import { wrapRemoteMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
|
|
5
6
|
import {
|
|
6
7
|
prepareRecorderKitMakers,
|
|
7
8
|
provideAll,
|
|
@@ -10,6 +11,7 @@ import { prepareAssetReserveKit } from './assetReserveKit.js';
|
|
|
10
11
|
|
|
11
12
|
/**
|
|
12
13
|
* @import {ERemote} from '@agoric/internal';
|
|
14
|
+
* @import {Baggage} from '@agoric/vat-data'
|
|
13
15
|
* @import {EReturn} from '@endo/far';
|
|
14
16
|
* @import {ContractOf} from '@agoric/zoe/src/zoeService/utils.js';
|
|
15
17
|
* @import {Allocation, ContractMeta, FeeMintAccess, Installation} from '@agoric/zoe';
|
|
@@ -30,8 +32,6 @@ harden(meta);
|
|
|
30
32
|
* }} ShortfallReportingFacet
|
|
31
33
|
*/
|
|
32
34
|
|
|
33
|
-
/** @import {Baggage} from '@agoric/vat-data' */
|
|
34
|
-
|
|
35
35
|
/**
|
|
36
36
|
* Asset Reserve holds onto assets for the Inter Protocol, and can dispense it
|
|
37
37
|
* for various purposes under governance control.
|
|
@@ -59,9 +59,12 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
59
59
|
// accessed via the `state` object. The latter means updates are made directly
|
|
60
60
|
// to state and don't require reference to baggage.
|
|
61
61
|
|
|
62
|
+
const { marshaller: remoteMarshaller } = privateArgs;
|
|
63
|
+
const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
|
|
64
|
+
|
|
62
65
|
const { makeRecorderKit } = prepareRecorderKitMakers(
|
|
63
66
|
baggage,
|
|
64
|
-
|
|
67
|
+
cachingMarshaller,
|
|
65
68
|
);
|
|
66
69
|
|
|
67
70
|
const storageNode = await privateArgs.storageNode;
|
|
@@ -88,7 +91,7 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
88
91
|
privateArgs.initialPoserInvitation,
|
|
89
92
|
{},
|
|
90
93
|
privateArgs.storageNode,
|
|
91
|
-
|
|
94
|
+
cachingMarshaller,
|
|
92
95
|
);
|
|
93
96
|
|
|
94
97
|
const { governorFacet } = makeDurableGovernorFacet(
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @import {ERemote, Remote} from '@agoric/internal';
|
|
3
|
+
* @import {EMarshaller} from '@agoric/internal/src/marshal/wrap-marshaller.js';
|
|
3
4
|
* @import {MapStore} from '@agoric/store';
|
|
4
5
|
* @import {PriceAuthority} from '@agoric/zoe/tools/types.js';
|
|
5
6
|
*/
|
|
@@ -77,7 +78,7 @@ export function makeGovernedTerms({ bootstrapPaymentValue, electorateInvitationA
|
|
|
77
78
|
};
|
|
78
79
|
bootstrapPaymentValue: bigint;
|
|
79
80
|
};
|
|
80
|
-
export function provideVaultParamManagers(baggage: import("@agoric/vat-data").Baggage, marshaller: ERemote<
|
|
81
|
+
export function provideVaultParamManagers(baggage: import("@agoric/vat-data").Baggage, marshaller: ERemote<EMarshaller>, managerParamOverrides: Record<string, VaultManagerParamOverrides>): {
|
|
81
82
|
/**
|
|
82
83
|
* @param {Brand} brand
|
|
83
84
|
* @param {Remote<StorageNode>} storageNode
|
|
@@ -107,6 +108,7 @@ export type VaultManagerParamOverrides = VaultManagerParamValues & {
|
|
|
107
108
|
brand: Brand;
|
|
108
109
|
};
|
|
109
110
|
import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
|
|
111
|
+
import type { EMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
|
|
110
112
|
import type { ERemote } from '@agoric/internal';
|
|
111
113
|
import type { Remote } from '@agoric/internal';
|
|
112
114
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["params.js"],"names":[],"mappings":"AAiBA
|
|
1
|
+
{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["params.js"],"names":[],"mappings":"AAiBA;;;;;GAKG;AAEH,kCAAmC,gBAAgB,CAAC;AACpD,mCAAoC,iBAAiB,CAAC;AAEtD,6BAA8B,WAAW,CAAC;AAC1C,qCAAsC,mBAAmB,CAAC;AAC1D,sCAAuC,oBAAoB,CAAC;AAC5D,sCAAuC,oBAAoB,CAAC;AAC5D,gCAAiC,cAAc,CAAC;AAChD,2BAA4B,SAAS,CAAC;AACtC,mCAAoC,gBAAgB,CAAC;AACrD,uCAAwC,qBAAqB,CAAC;AAC9D,gCAAiC,cAAc,CAAC;;;;;;;AAkEzC,oDAHI,OAAO,kBAAkB,EAAE,kBAAkB,CAAC,2BAA2B,CAAC,oGAC1E,uBAAuB;;;;;;;GAoB9B;AACJ,4EAA4E;AAE5E,iEAYE;AAeK,8MAZI;IACN,0BAA0B,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1C,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACrC,KAAK,EAAE,IAAI,CAAC,OAAO,cAAc,EAAE,YAAY,CAAC,CAAC;IACjD,kBAAkB,EAAE,uBAAuB,CAAC;IAC5C,cAAc,EAAE,cAAc,CAAC;IAC/B,yBAAyB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0BH;AAeM,mDAJI,OAAO,kBAAkB,EAAE,OAAO,cAClC,QAAQ,WAAW,CAAC,yBACpB,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC;IAwDjD;;;;OAIG;2BAHQ,KAAK,eACL,OAAO,WAAW,CAAC,sBACnB,uBAAuB;;;;;;;;IAOlC,2BAA2B;eAAf,KAAK;;;;;;;;EAKpB;kCAzKY,OAAO,gEAAgE,EAAE,uBAAuB,CACtG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAC3C;gCA8BQ,UAAU,CAAC,OAAO,qBAAqB,CAAC;yCAwDxC,uBAAuB,GAAG;IAAE,KAAK,EAAE,KAAK,CAAA;CAAE;oCA3JvB,4BAA4B;iCAF/B,iDAAiD;6BAD7C,kBAAkB;4BAAlB,kBAAkB;AA6BpD;;;;;;GAMG;AACH,qEANW,MAAM,CAAC,KAAK,CAAC,kBACb,MAAM,CAAC,KAAK,CAAC,6BACb,MAAM,CAAC,KAAK,CAAC,gBACb,MAAM,kBACN,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;EAgCxB"}
|
|
@@ -17,6 +17,7 @@ import { amountPattern, ratioPattern } from '../contractSupport.js';
|
|
|
17
17
|
|
|
18
18
|
/**
|
|
19
19
|
* @import {ERemote, Remote} from '@agoric/internal';
|
|
20
|
+
* @import {EMarshaller} from '@agoric/internal/src/marshal/wrap-marshaller.js';
|
|
20
21
|
* @import {MapStore} from '@agoric/store';
|
|
21
22
|
* @import {PriceAuthority} from '@agoric/zoe/tools/types.js';
|
|
22
23
|
*/
|
|
@@ -182,7 +183,7 @@ harden(makeGovernedTerms);
|
|
|
182
183
|
* NB: changes from initial values will be lost upon restart
|
|
183
184
|
*
|
|
184
185
|
* @param {import('@agoric/vat-data').Baggage} baggage
|
|
185
|
-
* @param {ERemote<
|
|
186
|
+
* @param {ERemote<EMarshaller>} marshaller
|
|
186
187
|
* @param {Record<string, VaultManagerParamOverrides>} managerParamOverrides
|
|
187
188
|
*/
|
|
188
189
|
export const provideVaultParamManagers = (
|
|
@@ -34,12 +34,12 @@ export type VaultDirector = EReturn<EReturn<typeof prepareVaultDirector>>;
|
|
|
34
34
|
* @param {ERef<import('@agoric/time').TimerService>} timer
|
|
35
35
|
* @param {ERef<import('../auction/auctioneer.js').AuctioneerPublicFacet>} auctioneer
|
|
36
36
|
* @param {ERemote<StorageNode>} storageNode
|
|
37
|
-
* @param {ERemote<
|
|
37
|
+
* @param {ERemote<EMarshaller>} marshaller
|
|
38
38
|
* @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit} makeRecorderKit
|
|
39
39
|
* @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeERecorderKit} makeERecorderKit
|
|
40
40
|
* @param {Record<string, import('./params.js').VaultManagerParamOverrides>} managerParams
|
|
41
41
|
*/
|
|
42
|
-
declare function prepareVaultDirector(baggage: import("@agoric/swingset-liveslots").Baggage, zcf: import("./vaultFactory.js").VaultFactoryZCF, directorParamManager: VaultDirectorParamManager, debtMint: ZCFMint<"nat">, timer: ERef<import("@agoric/time").TimerService>, auctioneer: ERef<import("../auction/auctioneer.js").AuctioneerPublicFacet>, storageNode: ERemote<StorageNode>, marshaller: ERemote<
|
|
42
|
+
declare function prepareVaultDirector(baggage: import("@agoric/swingset-liveslots").Baggage, zcf: import("./vaultFactory.js").VaultFactoryZCF, directorParamManager: VaultDirectorParamManager, debtMint: ZCFMint<"nat">, timer: ERef<import("@agoric/time").TimerService>, auctioneer: ERef<import("../auction/auctioneer.js").AuctioneerPublicFacet>, storageNode: ERemote<StorageNode>, marshaller: ERemote<EMarshaller>, makeRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorderKit, makeERecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeERecorderKit, managerParams: Record<string, import("./params.js").VaultManagerParamOverrides>): () => import("@endo/exo").GuardedKit<{
|
|
43
43
|
creator: {
|
|
44
44
|
getParamMgrRetriever: () => {
|
|
45
45
|
/** @param {VaultFactoryParamPath} paramPath */
|
|
@@ -343,6 +343,7 @@ declare function prepareVaultDirector(baggage: import("@agoric/swingset-liveslot
|
|
|
343
343
|
import type { EReturn } from '@endo/far';
|
|
344
344
|
import type { ZCFMint } from '@agoric/zoe';
|
|
345
345
|
import type { ERemote } from '@agoric/internal';
|
|
346
|
+
import type { EMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
|
|
346
347
|
import type { ZCFSeat } from '@agoric/zoe';
|
|
347
348
|
export {};
|
|
348
349
|
//# sourceMappingURL=vaultDirector.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vaultDirector.d.ts","sourceRoot":"","sources":["vaultDirector.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"vaultDirector.d.ts","sourceRoot":"","sources":["vaultDirector.js"],"names":[],"mappings":"AA2FO,iFAEE,IADK,CAAC,EAAE,EAAE,YAAY,KAAK,IACzB,UAOV;AAocD,6EAA6E;AAE7E;;;;;;GAMG;AACH,8BAJU,CACT,GAAO,OAAO,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,KAChD,aAAa,CAQnB;kCAngBW;IACR,WAAW,EAAE,KAAK,EAAE,CAAC;IACrB,oBAAoB,EAAE,mBAAmB,CAAC;CAC3C;6BAGS,QAAQ,CAAC,EAAE,CAAC;2BAEZ,EAAE;oBAEF,cAAc,GAAG,YAAY;iCAE7B;IACR,QAAQ,EAAE,QAAQ,CAAC;IACnB,iBAAiB,EAAE,CACjB,eAAe,EAAE,KAAK,KACnB,OAAO,mBAAmB,EAAE,oBAAoB,CAAC;IACtD,eAAe,EAAE,eAAe,CAAC;IACjC,oBAAoB,EAAE,MAAM,OAAO,CACvC,OAAa,4BAA4B,EAAE,iBAAiB,CACvD,CAAC;CACH;4BAGS,QAAQ,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;wCAEQ,OAAO,gEAAgE,EAAE,iBAAiB,CACtG,OAAa,aAAa,EAAE,mBAAmB,CAC1C;4BAsdQ,QAAQ,QAAQ,OAAO,oBAAoB,CAAC,CAAC;AAlc3D;;;;;;;;;;;;GAYG;AACH,+CAZW,OAAO,4BAA4B,EAAE,OAAO,OAC5C,OAAO,mBAAmB,EAAE,eAAe,wBAC3C,yBAAyB,YACzB,QAAQ,KAAK,CAAC,SACd,IAAI,CAAC,OAAO,cAAc,EAAE,YAAY,CAAC,cACzC,IAAI,CAAC,OAAO,0BAA0B,EAAE,qBAAqB,CAAC,eAC9D,QAAQ,WAAW,CAAC,cACpB,QAAQ,WAAW,CAAC,mBACpB,OAAO,6CAA6C,EAAE,eAAe,oBACrE,OAAO,6CAA6C,EAAE,gBAAgB,iBACtE,MAAM,CAAC,MAAM,EAAE,OAAO,aAAa,EAAE,0BAA0B,CAAC;;;YAwO/D,+CAA+C;8BAAnC,qBAAqB;;;;;;;;;YAAjC,+CAA+C;8BAAnC,qBAAqB;;;;;;;;;QAarC,2BAA2B;4BAAf,MAAM;;YAmBlB;;;;eAIG;2CAHQ,MAAM,CAAC,KAAK,CAAC,qBACb,OAAO,sBACP,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAflC,oCAAoC;2BAAtB,IAAI,CAAC,YAAY,CAAC;;;;;QAYhC;;;;WAIG;uCAHQ,MAAM,CAAC,KAAK,CAAC,qBACb,OAAO,sBACP,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA6FlC,6BAA6B;sCAAjB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAUjB;;;;WAIG;6CADQ;YAAE,eAAe,EAAE,KAAK,CAAA;SAAE;;;;QAQrC,0EAA0E;;QAI1E;;;;;WAKG;+CADQ;YAAE,eAAe,EAAE,KAAK,CAAA;SAAE;;QASrC,2BAA2B;kCAAf,MAAM;;;;QAoBlB,2EAA2E;;;GAmBlF;6BA1fyB,WAAW;6BADiB,aAAa;6BAEnB,kBAAkB;iCACpC,iDAAiD;6BAHzB,aAAa"}
|
|
@@ -44,6 +44,7 @@ import {
|
|
|
44
44
|
* @import {TransferPart, ZCF, ZCFMint, ZCFSeat} from '@agoric/zoe';
|
|
45
45
|
* @import {EReturn} from '@endo/far';
|
|
46
46
|
* @import {TypedPattern, ERemote, Remote} from '@agoric/internal';
|
|
47
|
+
* @import {EMarshaller} from '@agoric/internal/src/marshal/wrap-marshaller.js';
|
|
47
48
|
*/
|
|
48
49
|
|
|
49
50
|
const trace = makeTracer('VD', true);
|
|
@@ -107,7 +108,7 @@ export const makeAllManagersDo = (collateralManagers, vaultManagers) => {
|
|
|
107
108
|
* @param {ERef<import('@agoric/time').TimerService>} timer
|
|
108
109
|
* @param {ERef<import('../auction/auctioneer.js').AuctioneerPublicFacet>} auctioneer
|
|
109
110
|
* @param {ERemote<StorageNode>} storageNode
|
|
110
|
-
* @param {ERemote<
|
|
111
|
+
* @param {ERemote<EMarshaller>} marshaller
|
|
111
112
|
* @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit} makeRecorderKit
|
|
112
113
|
* @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeERecorderKit} makeERecorderKit
|
|
113
114
|
* @param {Record<string, import('./params.js').VaultManagerParamOverrides>} managerParams
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vaultFactory.d.ts","sourceRoot":"","sources":["vaultFactory.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"vaultFactory.d.ts","sourceRoot":"","sources":["vaultFactory.js"],"names":[],"mappings":"AAyCA;;;;;;;;GAQG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAerB;AAoBK,2BAhBI,eAAe,eACf;IACN,aAAa,EAAE,aAAa,CAAC;IAC7B,sBAAsB,EAAE,UAAU,CAAC;IACnC,0BAA0B,EAAE,UAAU,CAAC;IACvC,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,kBAAkB,EAAE,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAwC,CAAC,CAAC;IACvE,aAAa,EAAE,MAAM,CACzB,MAAY,EACZ,OAAa,aAAa,EAAE,0BAA0B,CACjD,CAAC;IACF,sBAAsB,EAAE,CAAC,MAAM,CAAC,CAAC;CAClC,WACO,OAAO,4BAA4B,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwFtD;8BAlIY,IACR,eAAe,CAAC,OAAO,UAAU,EAAE,mBAAmB,CAAC,GAAG;IACxD,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACrC,kBAAkB,EAAE,uBAAuB,CAAC;IAC5C,YAAY,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;CACnD,CACF;mCA+HU,WAAW,OAAO,KAAK,CAAC;kCA7IoF,aAAa;mCAAb,aAAa;gCAAb,aAAa;4BAD9G,kBAAkB;oCAGkD,4BAA4B;yBAFC,aAAa;6BAAb,aAAa;gCAE1C,4BAA4B;gCAD5F,qCAAqC"}
|
|
@@ -19,6 +19,7 @@ import { CONTRACT_ELECTORATE } from '@agoric/governance';
|
|
|
19
19
|
import { makeParamManagerFromTerms } from '@agoric/governance/src/contractGovernance/typedParamManager.js';
|
|
20
20
|
import { validateElectorate } from '@agoric/governance/src/contractHelper.js';
|
|
21
21
|
import { makeTracer, StorageNodeShape } from '@agoric/internal';
|
|
22
|
+
import { wrapRemoteMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
|
|
22
23
|
import { makeStoredSubscription, makeSubscriptionKit } from '@agoric/notifier';
|
|
23
24
|
import { M } from '@agoric/store';
|
|
24
25
|
import { provideAll } from '@agoric/zoe/src/contractSupport/durability.js';
|
|
@@ -88,13 +89,15 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
88
89
|
const {
|
|
89
90
|
initialPoserInvitation,
|
|
90
91
|
initialShortfallInvitation,
|
|
91
|
-
marshaller,
|
|
92
|
+
marshaller: remoteMarshaller,
|
|
92
93
|
storageNode,
|
|
93
94
|
auctioneerInstance,
|
|
94
95
|
managerParams,
|
|
95
96
|
directorParamOverrides,
|
|
96
97
|
} = privateArgs;
|
|
97
98
|
|
|
99
|
+
const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
|
|
100
|
+
|
|
98
101
|
trace('awaiting debtMint');
|
|
99
102
|
const { debtMint } = await provideAll(baggage, {
|
|
100
103
|
debtMint: () => zcf.registerFeeMint('Minted', privateArgs.feeMintAccess),
|
|
@@ -111,7 +114,7 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
111
114
|
|
|
112
115
|
const { makeRecorderKit, makeERecorderKit } = prepareRecorderKitMakers(
|
|
113
116
|
baggage,
|
|
114
|
-
|
|
117
|
+
cachingMarshaller,
|
|
115
118
|
);
|
|
116
119
|
|
|
117
120
|
trace('making non-durable publishers');
|
|
@@ -121,7 +124,7 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
121
124
|
const governanceSubscriber = makeStoredSubscription(
|
|
122
125
|
governanceSubscriptionKit.subscription,
|
|
123
126
|
governanceNode,
|
|
124
|
-
|
|
127
|
+
cachingMarshaller,
|
|
125
128
|
);
|
|
126
129
|
/** a powerful object; can modify the invitation */
|
|
127
130
|
const vaultDirectorParamManager = await makeParamManagerFromTerms(
|
|
@@ -147,7 +150,7 @@ export const start = async (zcf, privateArgs, baggage) => {
|
|
|
147
150
|
auctioneerPublicFacet,
|
|
148
151
|
storageNode,
|
|
149
152
|
// XXX remove Recorder makers; remove once we excise deprecated kits for governance
|
|
150
|
-
|
|
153
|
+
cachingMarshaller,
|
|
151
154
|
makeRecorderKit,
|
|
152
155
|
makeERecorderKit,
|
|
153
156
|
managerParams,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export function watchQuoteNotifier<T, A extends any[] = unknown[]>(notifierP: ERef<LatestTopic<T>>, watcher: import("@agoric/swingset-liveslots").PromiseWatcher<T, A>, ...args: A): Promise<void>;
|
|
2
2
|
export function prepareVaultManagerKit(baggage: import("@agoric/swingset-liveslots").Baggage, { zcf, marshaller, makeRecorderKit, factoryPowers }: {
|
|
3
3
|
zcf: import("./vaultFactory.js").VaultFactoryZCF;
|
|
4
|
-
marshaller: ERemote<
|
|
4
|
+
marshaller: ERemote<EMarshaller>;
|
|
5
5
|
makeRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorderKit;
|
|
6
6
|
makeERecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeERecorderKit;
|
|
7
7
|
factoryPowers: import("./vaultDirector.js").FactoryPowersFacet;
|
|
@@ -666,6 +666,7 @@ export type VaultManagerKit = EReturn<EReturn<typeof prepareVaultManagerKit>>;
|
|
|
666
666
|
*/
|
|
667
667
|
export type VaultManager = VaultManagerKit["self"];
|
|
668
668
|
export type CollateralManager = VaultManagerKit["collateral"];
|
|
669
|
+
import type { EMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
|
|
669
670
|
import type { ERemote } from '@agoric/internal';
|
|
670
671
|
import type { ZCFMint } from '@agoric/zoe';
|
|
671
672
|
import type { Remote } from '@agoric/internal';
|
|
@@ -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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"}
|
|
@@ -67,6 +67,7 @@ import { AuctionPFShape } from '../auction/auctioneer.js';
|
|
|
67
67
|
|
|
68
68
|
/**
|
|
69
69
|
* @import {ERemote, Remote} from '@agoric/internal';
|
|
70
|
+
* @import {EMarshaller} from '@agoric/internal/src/marshal/wrap-marshaller.js';
|
|
70
71
|
* @import {MapStore, SetStore} from '@agoric/store';
|
|
71
72
|
* @import {EReturn} from '@endo/far';
|
|
72
73
|
* @import {ZCFMint} from '@agoric/zoe';
|
|
@@ -219,7 +220,7 @@ const collateralEphemera = makeEphemeraProvider(() => /** @type {any} */ ({}));
|
|
|
219
220
|
* @param {import('@agoric/swingset-liveslots').Baggage} baggage
|
|
220
221
|
* @param {{
|
|
221
222
|
* zcf: import('./vaultFactory.js').VaultFactoryZCF;
|
|
222
|
-
* marshaller: ERemote<
|
|
223
|
+
* marshaller: ERemote<EMarshaller>;
|
|
223
224
|
* makeRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit;
|
|
224
225
|
* makeERecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').MakeERecorderKit;
|
|
225
226
|
* factoryPowers: import('./vaultDirector.js').FactoryPowersFacet;
|