@agoric/zoe 0.26.3-upgrade-14-dev-c8f9e7b.0 → 0.26.3-upgrade-16-fi-dev-8879538.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.
Files changed (269) hide show
  1. package/README.md +7 -7
  2. package/bundles/bundle-contractFacet-js-meta.json +622 -313
  3. package/bundles/bundle-contractFacet.d.ts +3 -3
  4. package/bundles/bundle-contractFacet.js +1 -1
  5. package/exported.js +1 -12
  6. package/package.json +75 -60
  7. package/src/cleanProposal.d.ts +2 -2
  8. package/src/cleanProposal.d.ts.map +1 -1
  9. package/src/cleanProposal.js +15 -12
  10. package/src/contractFacet/exit.d.ts.map +1 -1
  11. package/src/contractFacet/exit.js +1 -0
  12. package/src/contractFacet/internal-types.d.ts +2 -2
  13. package/src/contractFacet/internal-types.d.ts.map +1 -1
  14. package/src/contractFacet/internal-types.js +1 -1
  15. package/src/contractFacet/offerHandlerStorage.d.ts +4 -1
  16. package/src/contractFacet/offerHandlerStorage.d.ts.map +1 -1
  17. package/src/contractFacet/offerHandlerStorage.js +11 -3
  18. package/src/contractFacet/reallocate.d.ts +3 -0
  19. package/src/contractFacet/reallocate.d.ts.map +1 -0
  20. package/src/contractFacet/reallocate.js +94 -0
  21. package/src/contractFacet/rightsConservation.d.ts.map +1 -1
  22. package/src/contractFacet/rightsConservation.js +3 -0
  23. package/src/contractFacet/types-ambient.d.ts +259 -0
  24. package/src/contractFacet/types-ambient.js +1 -0
  25. package/src/contractFacet/vatRoot.d.ts +4 -4
  26. package/src/contractFacet/vatRoot.d.ts.map +1 -1
  27. package/src/contractFacet/zcfMint.d.ts +5 -3
  28. package/src/contractFacet/zcfMint.d.ts.map +1 -1
  29. package/src/contractFacet/zcfMint.js +4 -4
  30. package/src/contractFacet/zcfSeat.d.ts +4 -2
  31. package/src/contractFacet/zcfSeat.d.ts.map +1 -1
  32. package/src/contractFacet/zcfSeat.js +125 -5
  33. package/src/contractFacet/zcfZygote.d.ts +1 -2
  34. package/src/contractFacet/zcfZygote.d.ts.map +1 -1
  35. package/src/contractFacet/zcfZygote.js +95 -42
  36. package/src/contractSupport/atomicTransfer.d.ts +0 -6
  37. package/src/contractSupport/atomicTransfer.d.ts.map +1 -1
  38. package/src/contractSupport/atomicTransfer.js +5 -90
  39. package/src/contractSupport/bondingCurves.js +2 -2
  40. package/src/contractSupport/durability.d.ts +3 -3
  41. package/src/contractSupport/durability.d.ts.map +1 -1
  42. package/src/contractSupport/durability.js +5 -5
  43. package/src/contractSupport/index.d.ts +1 -0
  44. package/src/contractSupport/index.js +1 -0
  45. package/src/contractSupport/prepare-ownable.d.ts +11 -0
  46. package/src/contractSupport/prepare-ownable.d.ts.map +1 -0
  47. package/src/contractSupport/prepare-ownable.js +100 -0
  48. package/src/contractSupport/priceAuthority.d.ts +23 -15
  49. package/src/contractSupport/priceAuthority.d.ts.map +1 -1
  50. package/src/contractSupport/priceAuthority.js +32 -17
  51. package/src/contractSupport/priceAuthorityInitial.d.ts +3 -2
  52. package/src/contractSupport/priceAuthorityInitial.d.ts.map +1 -1
  53. package/src/contractSupport/priceAuthorityInitial.js +5 -2
  54. package/src/contractSupport/priceAuthorityQuoteMint.d.ts +2 -1
  55. package/src/contractSupport/priceAuthorityQuoteMint.d.ts.map +1 -1
  56. package/src/contractSupport/priceAuthorityQuoteMint.js +23 -27
  57. package/src/contractSupport/priceAuthorityTransform.d.ts +14 -12
  58. package/src/contractSupport/priceAuthorityTransform.d.ts.map +1 -1
  59. package/src/contractSupport/priceAuthorityTransform.js +10 -8
  60. package/src/contractSupport/priceQuote.d.ts +7 -5
  61. package/src/contractSupport/priceQuote.d.ts.map +1 -1
  62. package/src/contractSupport/priceQuote.js +5 -1
  63. package/src/contractSupport/ratio.d.ts +2 -2
  64. package/src/contractSupport/ratio.d.ts.map +1 -1
  65. package/src/contractSupport/ratio.js +19 -15
  66. package/src/contractSupport/recorder.d.ts +31 -117
  67. package/src/contractSupport/recorder.d.ts.map +1 -1
  68. package/src/contractSupport/recorder.js +21 -10
  69. package/src/contractSupport/safeMath.d.ts +7 -7
  70. package/src/contractSupport/safeMath.d.ts.map +1 -1
  71. package/src/contractSupport/statistics.d.ts +1 -1
  72. package/src/contractSupport/statistics.d.ts.map +1 -1
  73. package/src/contractSupport/topics.d.ts +1 -1
  74. package/src/contractSupport/topics.d.ts.map +1 -1
  75. package/src/contractSupport/{types.d.ts → types-ambient.d.ts} +4 -4
  76. package/src/contractSupport/types-ambient.d.ts.map +1 -0
  77. package/src/contractSupport/{types.js → types-ambient.js} +1 -1
  78. package/src/contractSupport/zoeHelpers.d.ts +1 -1
  79. package/src/contractSupport/zoeHelpers.d.ts.map +1 -1
  80. package/src/contractSupport/zoeHelpers.js +5 -11
  81. package/src/contracts/auction/firstPriceLogic.d.ts.map +1 -1
  82. package/src/contracts/auction/firstPriceLogic.js +5 -8
  83. package/src/contracts/auction/index.d.ts +10 -10
  84. package/src/contracts/auction/index.d.ts.map +1 -1
  85. package/src/contracts/auction/index.js +2 -1
  86. package/src/contracts/auction/secondPriceLogic.d.ts.map +1 -1
  87. package/src/contracts/auction/secondPriceLogic.js +1 -4
  88. package/src/contracts/automaticRefund.d.ts +1 -1
  89. package/src/contracts/automaticRefund.d.ts.map +1 -1
  90. package/src/contracts/autoswap.d.ts.map +1 -1
  91. package/src/contracts/autoswap.js +8 -9
  92. package/src/contracts/barterExchange.d.ts +1 -1
  93. package/src/contracts/barterExchange.d.ts.map +1 -1
  94. package/src/contracts/barterExchange.js +2 -3
  95. package/src/contracts/callSpread/calculateShares.d.ts +1 -8
  96. package/src/contracts/callSpread/calculateShares.d.ts.map +1 -1
  97. package/src/contracts/callSpread/calculateShares.js +1 -1
  98. package/src/contracts/callSpread/fundedCallSpread.d.ts +4 -0
  99. package/src/contracts/callSpread/fundedCallSpread.d.ts.map +1 -1
  100. package/src/contracts/callSpread/fundedCallSpread.js +6 -4
  101. package/src/contracts/callSpread/payoffHandler.d.ts.map +1 -1
  102. package/src/contracts/callSpread/payoffHandler.js +2 -1
  103. package/src/contracts/callSpread/percent.d.ts +2 -4
  104. package/src/contracts/callSpread/percent.d.ts.map +1 -1
  105. package/src/contracts/callSpread/position.d.ts +2 -2
  106. package/src/contracts/callSpread/pricedCallSpread.d.ts +6 -5
  107. package/src/contracts/callSpread/pricedCallSpread.d.ts.map +1 -1
  108. package/src/contracts/callSpread/pricedCallSpread.js +8 -4
  109. package/src/contracts/callSpread/{types.d.ts → types-ambient.d.ts} +3 -3
  110. package/src/contracts/callSpread/types-ambient.d.ts.map +1 -0
  111. package/src/contracts/coveredCall-durable.d.ts +2 -4
  112. package/src/contracts/coveredCall-durable.d.ts.map +1 -1
  113. package/src/contracts/exported.js +3 -3
  114. package/src/contracts/loan/borrow.d.ts.map +1 -1
  115. package/src/contracts/loan/borrow.js +7 -4
  116. package/src/contracts/loan/close.d.ts.map +1 -1
  117. package/src/contracts/loan/close.js +3 -7
  118. package/src/contracts/loan/index.d.ts +5 -1
  119. package/src/contracts/loan/index.d.ts.map +1 -1
  120. package/src/contracts/loan/index.js +4 -0
  121. package/src/contracts/loan/liquidate.d.ts +1 -12
  122. package/src/contracts/loan/liquidate.d.ts.map +1 -1
  123. package/src/contracts/loan/liquidate.js +4 -2
  124. package/src/contracts/loan/scheduleLiquidation.d.ts.map +1 -1
  125. package/src/contracts/loan/scheduleLiquidation.js +1 -0
  126. package/src/contracts/loan/{types.d.ts → types-ambient.d.ts} +16 -17
  127. package/src/contracts/loan/types-ambient.d.ts.map +1 -0
  128. package/src/contracts/loan/{types.js → types-ambient.js} +11 -18
  129. package/src/contracts/loan/updateDebt.js +1 -1
  130. package/src/contracts/mintAndSellNFT.d.ts.map +1 -1
  131. package/src/contracts/mintPayments.d.ts +14 -6
  132. package/src/contracts/mintPayments.d.ts.map +1 -1
  133. package/src/contracts/mintPayments.js +1 -1
  134. package/src/contracts/oracle.d.ts +25 -3
  135. package/src/contracts/oracle.d.ts.map +1 -1
  136. package/src/contracts/oracle.js +7 -0
  137. package/src/contracts/otcDesk.d.ts +3 -3
  138. package/src/contracts/otcDesk.d.ts.map +1 -1
  139. package/src/contracts/otcDesk.js +1 -1
  140. package/src/contracts/priceAggregator.d.ts +112 -18
  141. package/src/contracts/priceAggregator.d.ts.map +1 -1
  142. package/src/contracts/priceAggregator.js +16 -18
  143. package/src/contracts/priceAggregatorTypes.d.ts +2 -2
  144. package/src/contracts/priceAggregatorTypes.d.ts.map +1 -1
  145. package/src/contracts/scaledPriceAuthority.d.ts +4 -5
  146. package/src/contracts/scaledPriceAuthority.d.ts.map +1 -1
  147. package/src/contracts/scaledPriceAuthority.js +6 -0
  148. package/src/contracts/sellItems.d.ts +2 -2
  149. package/src/contracts/sellItems.d.ts.map +1 -1
  150. package/src/contracts/sellItems.js +2 -3
  151. package/src/contracts/simpleExchange.d.ts +3 -3
  152. package/src/contracts/{types.d.ts → types-ambient.d.ts} +1 -1
  153. package/src/contracts/types-ambient.d.ts.map +1 -0
  154. package/src/handleWarning.d.ts.map +1 -1
  155. package/src/instanceRecordStorage.d.ts +1 -1
  156. package/src/instanceRecordStorage.d.ts.map +1 -1
  157. package/src/internal-types.d.ts +20 -32
  158. package/src/internal-types.d.ts.map +1 -1
  159. package/src/internal-types.js +18 -58
  160. package/src/issuerRecord.d.ts +2 -2
  161. package/src/issuerRecord.d.ts.map +1 -1
  162. package/src/issuerStorage.d.ts +4 -4
  163. package/src/issuerStorage.d.ts.map +1 -1
  164. package/src/issuerStorage.js +12 -28
  165. package/src/makeHandle.d.ts +2 -2
  166. package/src/makeHandle.d.ts.map +1 -1
  167. package/src/makeHandle.js +1 -1
  168. package/src/typeGuards.d.ts +119 -20
  169. package/src/typeGuards.d.ts.map +1 -1
  170. package/src/typeGuards.js +18 -9
  171. package/src/types-ambient.d.ts +41 -0
  172. package/src/types-ambient.d.ts.map +1 -0
  173. package/src/{types.js → types-ambient.js} +6 -14
  174. package/src/zoeService/escrowStorage.d.ts +1 -1
  175. package/src/zoeService/escrowStorage.d.ts.map +1 -1
  176. package/src/zoeService/escrowStorage.js +20 -27
  177. package/src/zoeService/feeMint.d.ts +9 -16
  178. package/src/zoeService/feeMint.d.ts.map +1 -1
  179. package/src/zoeService/feeMint.js +21 -15
  180. package/src/zoeService/installationStorage.d.ts +5 -20
  181. package/src/zoeService/installationStorage.d.ts.map +1 -1
  182. package/src/zoeService/installationStorage.js +11 -7
  183. package/src/zoeService/instanceAdminStorage.d.ts +22 -42
  184. package/src/zoeService/instanceAdminStorage.d.ts.map +1 -1
  185. package/src/zoeService/instanceAdminStorage.js +1 -0
  186. package/src/zoeService/internal-types.d.ts +16 -16
  187. package/src/zoeService/internal-types.d.ts.map +1 -1
  188. package/src/zoeService/internal-types.js +6 -6
  189. package/src/zoeService/invitationQueries.d.ts.map +1 -1
  190. package/src/zoeService/invitationQueries.js +7 -5
  191. package/src/zoeService/makeInvitation.d.ts +3 -3
  192. package/src/zoeService/makeInvitation.d.ts.map +1 -1
  193. package/src/zoeService/makeInvitation.js +25 -21
  194. package/src/zoeService/offer/burnInvitation.d.ts.map +1 -1
  195. package/src/zoeService/offer/offer.d.ts.map +1 -1
  196. package/src/zoeService/offer/offer.js +2 -5
  197. package/src/zoeService/originalZoeSeat.d.ts +34 -0
  198. package/src/zoeService/originalZoeSeat.d.ts.map +1 -0
  199. package/src/zoeService/originalZoeSeat.js +353 -0
  200. package/src/zoeService/startInstance.d.ts +3 -3
  201. package/src/zoeService/startInstance.d.ts.map +1 -1
  202. package/src/zoeService/startInstance.js +17 -11
  203. package/src/zoeService/{types.d.ts → types-ambient.d.ts} +26 -31
  204. package/src/zoeService/types-ambient.d.ts.map +1 -0
  205. package/src/zoeService/{types.js → types-ambient.js} +19 -32
  206. package/src/zoeService/utils.d.ts +54 -58
  207. package/src/zoeService/utils.test-d.d.ts +2 -0
  208. package/src/zoeService/utils.test-d.d.ts.map +1 -0
  209. package/src/zoeService/utils.test-d.ts +33 -0
  210. package/src/zoeService/zoe.d.ts +9 -13
  211. package/src/zoeService/zoe.d.ts.map +1 -1
  212. package/src/zoeService/zoe.js +7 -7
  213. package/src/zoeService/zoeSeat.d.ts +15 -45
  214. package/src/zoeService/zoeSeat.d.ts.map +1 -1
  215. package/src/zoeService/zoeSeat.js +214 -114
  216. package/src/zoeService/zoeStorageManager.d.ts +9 -43
  217. package/src/zoeService/zoeStorageManager.d.ts.map +1 -1
  218. package/src/zoeService/zoeStorageManager.js +8 -6
  219. package/tools/fakePriceAuthority.d.ts +9 -8
  220. package/tools/fakePriceAuthority.d.ts.map +1 -1
  221. package/tools/fakePriceAuthority.js +21 -17
  222. package/tools/fakeVatAdmin.d.ts +10 -10
  223. package/tools/manualPriceAuthority.d.ts +11 -6
  224. package/tools/manualPriceAuthority.d.ts.map +1 -1
  225. package/tools/manualPriceAuthority.js +15 -2
  226. package/tools/manualTimer.d.ts +21 -40
  227. package/tools/manualTimer.d.ts.map +1 -1
  228. package/tools/manualTimer.js +30 -16
  229. package/tools/prepare-test-env.js +1 -1
  230. package/tools/scriptedOracle.d.ts +3 -3
  231. package/tools/scriptedOracle.d.ts.map +1 -1
  232. package/tools/scriptedOracle.js +1 -1
  233. package/tools/scriptedPriceAuthority.d.ts +4 -0
  234. package/tools/scriptedPriceAuthority.d.ts.map +1 -1
  235. package/tools/scriptedPriceAuthority.js +6 -1
  236. package/tools/setup-zoe.d.ts +8 -9
  237. package/tools/setup-zoe.d.ts.map +1 -1
  238. package/tools/setup-zoe.js +16 -1
  239. package/tools/test-utils.d.ts +20 -0
  240. package/tools/test-utils.d.ts.map +1 -0
  241. package/tools/test-utils.js +26 -0
  242. package/tools/types.d.ts +21 -21
  243. package/tools/types.d.ts.map +1 -1
  244. package/tools/types.js +10 -10
  245. package/CHANGELOG.md +0 -1203
  246. package/src/contractFacet/types.d.ts +0 -191
  247. package/src/contractFacet/types.d.ts.map +0 -1
  248. package/src/contractFacet/types.js +0 -256
  249. package/src/contractSupport/types.d.ts.map +0 -1
  250. package/src/contracts/callSpread/types.d.ts.map +0 -1
  251. package/src/contracts/loan/types.d.ts.map +0 -1
  252. package/src/contracts/types.d.ts.map +0 -1
  253. package/src/objArrayConversion.d.ts +0 -5
  254. package/src/objArrayConversion.d.ts.map +0 -1
  255. package/src/objArrayConversion.js +0 -35
  256. package/src/types.d.ts +0 -45
  257. package/src/types.d.ts.map +0 -1
  258. package/src/zoeService/types.d.ts.map +0 -1
  259. package/tools/internal-types.d.ts +0 -12
  260. package/tools/internal-types.d.ts.map +0 -1
  261. package/tools/internal-types.js +0 -14
  262. package/tools/priceAuthorityRegistry.d.ts +0 -20
  263. package/tools/priceAuthorityRegistry.d.ts.map +0 -1
  264. package/tools/priceAuthorityRegistry.js +0 -209
  265. package/tools/types-ambient.d.ts +0 -142
  266. package/tools/types-ambient.d.ts.map +0 -1
  267. package/tools/types-ambient.js +0 -160
  268. /package/src/contracts/callSpread/{types.js → types-ambient.js} +0 -0
  269. /package/src/contracts/{types.js → types-ambient.js} +0 -0
@@ -1,5 +1,4 @@
1
- /// <reference path="../../../time/src/types.d.ts" />
2
-
1
+ /* eslint @typescript-eslint/no-floating-promises: "warn" */
3
2
  import { Fail, q } from '@agoric/assert';
4
3
  import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
5
4
  import { assertAllDefined } from '@agoric/internal';
@@ -14,7 +13,6 @@ import { E } from '@endo/eventual-send';
14
13
  import { Far } from '@endo/marshal';
15
14
  import { notForProductionUse } from '@agoric/internal/src/magic-cookie-test-only.js';
16
15
 
17
- import '../../tools/types-ambient.js';
18
16
  import {
19
17
  calculateMedian,
20
18
  makeOnewayPriceAuthorityKit,
@@ -32,8 +30,11 @@ import {
32
30
  ratiosSame,
33
31
  } from '../contractSupport/ratio.js';
34
32
 
35
- import '@agoric/ertp/src/types-ambient.js';
36
-
33
+ /**
34
+ * @import {LegacyMap} from '@agoric/store'
35
+ * @import {ContractOf} from '../zoeService/utils.js';
36
+ * @import {PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
37
+ */
37
38
  /** @typedef {bigint | number | string} ParsableNumber */
38
39
  /**
39
40
  * @typedef {Readonly<ParsableNumber | { data: ParsableNumber }>} OraclePriceSubmission
@@ -52,7 +53,7 @@ const priceDescriptionFromQuote = quote => quote.quoteAmount.value[0];
52
53
  * is a stub until we complete what is now in `fluxAggregatorKit.js`.
53
54
  *
54
55
  * @param {ZCF<{
55
- * timer: import('@agoric/time/src/types').TimerService,
56
+ * timer: import('@agoric/time').TimerService,
56
57
  * POLL_INTERVAL: bigint,
57
58
  * brandIn: Brand<'nat'>,
58
59
  * brandOut: Brand<'nat'>,
@@ -60,7 +61,7 @@ const priceDescriptionFromQuote = quote => quote.quoteAmount.value[0];
60
61
  * }>} zcf
61
62
  * @param {{
62
63
  * marshaller: Marshaller,
63
- * quoteMint?: ERef<Mint<'set'>>,
64
+ * quoteMint?: ERef<Mint<'set', PriceDescription>>,
64
65
  * storageNode: ERef<StorageNode>,
65
66
  * }} privateArgs
66
67
  */
@@ -78,12 +79,11 @@ const start = async (zcf, privateArgs) => {
78
79
  const { marshaller, storageNode } = privateArgs;
79
80
  assertAllDefined({ marshaller, storageNode });
80
81
 
82
+ /** @type {ERef<Mint<'set', PriceDescription>>} */
81
83
  const quoteMint =
82
84
  privateArgs.quoteMint ||
83
85
  // makeIssuerKit fails upgrade, this contract is for demo only
84
86
  makeIssuerKit('quote', AssetKind.SET).mint;
85
- /** @type {IssuerRecord<'set'>} */
86
- // xxx saveIssuer not generic
87
87
  const quoteIssuerRecord = await zcf.saveIssuer(
88
88
  E(quoteMint).getIssuer(),
89
89
  'Quote',
@@ -101,8 +101,6 @@ const start = async (zcf, privateArgs) => {
101
101
  * @param {PriceQuoteValue} quote
102
102
  */
103
103
  const authenticateQuote = async quote => {
104
- /** @type {Amount<'set'>} */
105
- // xxx type should be inferred from brand and value
106
104
  const quoteAmount = AmountMath.make(quoteKit.brand, harden(quote));
107
105
  const quotePayment = await E(quoteKit.mint).mintPayment(quoteAmount);
108
106
  return harden({ quoteAmount, quotePayment });
@@ -126,7 +124,7 @@ const start = async (zcf, privateArgs) => {
126
124
 
127
125
  /**
128
126
  * @typedef {object} OracleRecord
129
- * @property {(timestamp: import('@agoric/time/src/types').Timestamp) => Promise<void>} [querier]
127
+ * @property {(timestamp: import('@agoric/time').Timestamp) => Promise<void>} [querier]
130
128
  * @property {Ratio} lastSample
131
129
  * @property {OracleKey} oracleKey
132
130
  */
@@ -143,7 +141,7 @@ const start = async (zcf, privateArgs) => {
143
141
 
144
142
  // Wake every POLL_INTERVAL and run the queriers.
145
143
  const repeaterP = E(timer).makeRepeater(0n, POLL_INTERVAL);
146
- /** @type {import('@agoric/time/src/types').TimerWaker} */
144
+ /** @type {import('@agoric/time').TimerWaker} */
147
145
  const waker = Far('waker', {
148
146
  async wake(timestamp) {
149
147
  // Run all the queriers.
@@ -166,7 +164,7 @@ const start = async (zcf, privateArgs) => {
166
164
  /**
167
165
  * @param {object} param0
168
166
  * @param {Ratio} [param0.overridePrice]
169
- * @param {import('@agoric/time/src/types').TimestampRecord} [param0.timestamp]
167
+ * @param {import('@agoric/time').TimestampRecord} [param0.timestamp]
170
168
  */
171
169
  const makeCreateQuote = ({ overridePrice, timestamp } = {}) =>
172
170
  /**
@@ -258,7 +256,7 @@ const start = async (zcf, privateArgs) => {
258
256
  );
259
257
 
260
258
  /**
261
- * @param {import('@agoric/time/src/types').Timestamp} timestamp
259
+ * @param {import('@agoric/time').Timestamp} timestamp
262
260
  */
263
261
  const updateQuote = async timestamp => {
264
262
  timestamp = TimeMath.coerceTimestampRecord(timestamp, timerBrand);
@@ -457,6 +455,7 @@ const start = async (zcf, privateArgs) => {
457
455
  seat,
458
456
  { notifier: oracleNotifier, scaleValueOut = 1 } = {},
459
457
  ) => {
458
+ seat.exit();
460
459
  const admin = await creatorFacet.initOracle(oracleKey);
461
460
  const invitationMakers = Far('invitation makers', {
462
461
  /** @param {ParsableNumber} price */
@@ -468,7 +467,6 @@ const start = async (zcf, privateArgs) => {
468
467
  }, 'PushPrice');
469
468
  },
470
469
  });
471
- seat.exit();
472
470
 
473
471
  if (oracleNotifier) {
474
472
  pushFromOracle(oracleNotifier, scaleValueOut, r =>
@@ -592,11 +590,11 @@ const start = async (zcf, privateArgs) => {
592
590
  const oracle = await E(zoe).getPublicFacet(oracleInstance);
593
591
  assert(records.has(record), 'Oracle record is already deleted');
594
592
 
595
- /** @type {import('@agoric/time/src/types').Timestamp} */
593
+ /** @type {import('@agoric/time').Timestamp} */
596
594
  let lastWakeTimestamp = 0n;
597
595
 
598
596
  /**
599
- * @param {import('@agoric/time/src/types').Timestamp} timestamp
597
+ * @param {import('@agoric/time').Timestamp} timestamp
600
598
  */
601
599
  record.querier = async timestamp => {
602
600
  // Submit the query.
@@ -9,7 +9,7 @@ type OracleAdmin<R extends unknown> = {
9
9
  pushResult: (result: R) => Promise<void>;
10
10
  };
11
11
  type OracleKey = {} | string;
12
- type PriceAggregatorKit = Pick<import("./priceAggregator").PriceAggregatorContract, 'creatorFacet' | 'publicFacet'>;
12
+ type PriceAggregatorKit = Pick<import("./priceAggregator").PriceAggregatorContract, "creatorFacet" | "publicFacet">;
13
13
  type OracleQuery = Record<string, unknown> & {
14
14
  kind?: string;
15
15
  increment?: bigint;
@@ -58,7 +58,7 @@ type OracleKit = {
58
58
  };
59
59
  type OracleReply = {
60
60
  reply: unknown;
61
- requiredFee?: Amount<AssetKind> | undefined;
61
+ requiredFee?: globalThis.Amount | undefined;
62
62
  };
63
63
  type OracleHandler = {
64
64
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"priceAggregatorTypes.d.ts","sourceRoot":"","sources":["priceAggregatorTypes.js"],"names":[],"mappings":";;;;YAGc,MAAM,QAAQ,IAAI,CAAC;;;;yBAEV,CAAC,KAAK,QAAQ,IAAI,CAAC;;iBAK7B,EAAE,GAAG,MAAM;0BAIX,KAAK,OAAO,mBAAmB,EAAE,uBAAuB,EAAE,cAAc,GAAG,aAAa,CAAC;mBAIzF,OAAO,MAAM,EAAE,OAAO,CAAC,GAAG;IACtC,IAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAW,CAAC,EAAE,MAAM,CAAC;CAClB;;;;;;;;iCAMkB,WAAW,KAAK,KAAK,UAAU,CAAC;;;;mBAEhC,WAAW,KAAK,KAAK,OAAO,CAAC;;iFAOtC,KAAK,UAAU,CAAC;;;;;;;;oBAMf,MAAM,mBAAmB;;;;4BAEzB,wCAAwC;;;;4BAExC,MAAM,QAAQ,UAAU,CAAC;;;mBAMzB,aAAa;;;gCAKG,uBAAuB,KAC7C,kBAAkB;;;kBAKZ,kBAAkB;iBAClB,iBAAiB;cACjB,QAAQ;;;WAKR,OAAO;;;;;;;qBAMC,WAAW,OAAO,MAAM,KAAK,QAAQ,WAAW,CAAC;;;;qBAEjD,WAAW,UAAU,OAAO,KAAK,IAAI;;;;qBAErC,WAAW,SACX,OAAO,eACD,MAAM,GAAG,SAAS,KACtC,IAAI"}
1
+ {"version":3,"file":"priceAggregatorTypes.d.ts","sourceRoot":"","sources":["priceAggregatorTypes.js"],"names":[],"mappings":"iBAKuB,CAAC;;;;YAFV,MAAM,OAAO,CAAC,IAAI,CAAC;;;;gBAEnB,CAAC,MAAM,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;;iBAK7B,EAAE,GAAG,MAAM;0BAIX,IAAI,CAAC,OAAO,mBAAmB,EAAE,uBAAuB,EAAE,cAAc,GAAG,aAAa,CAAC;mBAIzF,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IACtC,IAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAW,CAAC,EAAE,MAAM,CAAC;CAClB;;;;;;;;yBAMU,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC,UAAU,CAAC;;;;WAExC,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC,OAAO,CAAC;;iFAOtC,IAAI,CAAC,UAAU,CAAC;;;;;;;;oBAMf,MAAM,mBAAmB;;;;4BAEzB,wCAAwC;;;;4BAExC,MAAM,OAAO,CAAC,UAAU,CAAC;;;mBAMzB,aAAa;;;gBAKb,CAAC,aAAa,EAAE,uBAAuB,KAC7C,kBAAkB;;;kBAKZ,kBAAkB;iBAClB,iBAAiB;cACjB,QAAQ;;;WAKR,OAAO;;;;;;;aAMP,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC;;;;aAEzD,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI;;;;aAE7C,CAAC,KAAK,EAAE,WAAW,EAChC,KAAmB,EAAE,OAAO,EAC5B,WAAyB,EAAE,MAAM,GAAG,SAAS,KACtC,IAAI"}
@@ -1,12 +1,10 @@
1
- export function prepare(zcf: ZCF<ScaledPriceAuthorityOpts>, privateArgs: object, baggage: MapStore<string, unknown>): Promise<{
2
- publicFacet: {
3
- getPriceAuthority: () => Promise<PriceAuthority>;
4
- } & import("@endo/eventual-send").RemotableBrand<{}, {
1
+ export function prepare(zcf: ZCF<ScaledPriceAuthorityOpts>, privateArgs: object, baggage: import("@agoric/vat-data").Baggage): Promise<{
2
+ publicFacet: import("@endo/exo").Guarded<{
5
3
  getPriceAuthority: () => Promise<PriceAuthority>;
6
4
  }>;
7
5
  }>;
8
6
  export type ScaledPriceAuthorityOpts = {
9
- sourcePriceAuthority: ERef<PriceAuthority>;
7
+ sourcePriceAuthority: globalThis.ERef<PriceAuthority>;
10
8
  /**
11
9
  * - sourceAmountIn:targetAmountIn
12
10
  */
@@ -20,4 +18,5 @@ export type ScaledPriceAuthorityOpts = {
20
18
  */
21
19
  initialPrice?: Ratio | undefined;
22
20
  };
21
+ import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
23
22
  //# sourceMappingURL=scaledPriceAuthority.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"scaledPriceAuthority.d.ts","sourceRoot":"","sources":["scaledPriceAuthority.js"],"names":[],"mappings":"AAgCO,6BAJI,IAAI,wBAAwB,CAAC,eAC7B,MAAM;;;;;;GAyDhB;;0BAzEa,KAAK,cAAc,CAAC;;;;aACpB,KAAK;;;;cACL,KAAK"}
1
+ {"version":3,"file":"scaledPriceAuthority.d.ts","sourceRoot":"","sources":["scaledPriceAuthority.js"],"names":[],"mappings":"AAqCO,6BALI,GAAG,CAAC,wBAAwB,CAAC,eAC7B,MAAM,WACN,OAAO,kBAAkB,EAAE,OAAO;;;;GAyD5C;;;;;;aAzEa,KAAK;;;;cACL,KAAK;;;;;;oCAP0E,4BAA4B"}
@@ -9,6 +9,10 @@ import { makeInitialTransform } from '../contractSupport/priceAuthorityInitial.j
9
9
  import { makePriceAuthorityTransform } from '../contractSupport/priceAuthorityTransform.js';
10
10
  import { provideQuoteMint } from '../contractSupport/priceAuthorityQuoteMint.js';
11
11
 
12
+ /**
13
+ * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
14
+ */
15
+
12
16
  /**
13
17
  * @typedef {object} ScaledPriceAuthorityOpts
14
18
  * @property {ERef<PriceAuthority>} sourcePriceAuthority
@@ -30,6 +34,7 @@ import { provideQuoteMint } from '../contractSupport/priceAuthorityQuoteMint.js'
30
34
  * @param {object} privateArgs
31
35
  * @param {import('@agoric/vat-data').Baggage} baggage
32
36
  */
37
+ // 'prepare' is deprecated but still supported
33
38
  export const prepare = async (zcf, privateArgs, baggage) => {
34
39
  const quoteMint = provideQuoteMint(baggage);
35
40
 
@@ -85,3 +90,4 @@ export const prepare = async (zcf, privateArgs, baggage) => {
85
90
  );
86
91
  return harden({ publicFacet });
87
92
  };
93
+ harden(prepare);
@@ -21,10 +21,10 @@
21
21
  * @param {ZCF<{pricePerItem: Amount<'nat'>}>} zcf
22
22
  */
23
23
  export function start(zcf: ZCF<{
24
- pricePerItem: Amount<'nat'>;
24
+ pricePerItem: Amount<"nat">;
25
25
  }>): {
26
26
  creatorFacet: SellItemsCreatorFacet;
27
- creatorInvitation: Promise<Invitation<string, never>>;
27
+ creatorInvitation: Promise<Invitation<string, undefined>>;
28
28
  publicFacet: SellItemsPublicFacet;
29
29
  };
30
30
  //# sourceMappingURL=sellItems.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"sellItems.d.ts","sourceRoot":"","sources":["sellItems.js"],"names":[],"mappings":"AAkBA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH;kBAF8B,OAAO,KAAK,CAAC;;;;;EAwH1C"}
1
+ {"version":3,"file":"sellItems.d.ts","sourceRoot":"","sources":["sellItems.js"],"names":[],"mappings":"AAkBA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,2BAFW,GAAG,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;CAAC,CAAC;;;;EAuH5C"}
@@ -1,3 +1,4 @@
1
+ /* eslint @typescript-eslint/no-floating-promises: "warn" */
1
2
  import { Far } from '@endo/marshal';
2
3
  import { Nat } from '@endo/nat';
3
4
  import { AmountMath } from '@agoric/ertp';
@@ -11,7 +12,6 @@ import {
11
12
  defaultAcceptanceMsg,
12
13
  assertProposalShape,
13
14
  assertNatAssetKind,
14
- atomicRearrange,
15
15
  } from '../contractSupport/index.js';
16
16
 
17
17
  const { Fail } = assert;
@@ -107,8 +107,7 @@ const start = zcf => {
107
107
  Fail`More money (${totalCost}) is required to buy these items`;
108
108
 
109
109
  // Reallocate.
110
- atomicRearrange(
111
- zcf,
110
+ zcf.atomicRearrange(
112
111
  harden([
113
112
  [buyerSeat, sellerSeat, { Money: providedMoney }],
114
113
  [sellerSeat, buyerSeat, { Items: wantedItems }],
@@ -22,13 +22,13 @@
22
22
  export function start(zcf: ZCF): {
23
23
  publicFacet: {
24
24
  makeInvitation: () => Promise<Invitation<unknown, never>>;
25
- getNotifier: () => Notifier<{
25
+ getNotifier: () => globalThis.Notifier<{
26
26
  buys: any;
27
27
  sells: any;
28
28
  }>;
29
- } & import("@endo/eventual-send").RemotableBrand<{}, {
29
+ } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
30
30
  makeInvitation: () => Promise<Invitation<unknown, never>>;
31
- getNotifier: () => Notifier<{
31
+ getNotifier: () => globalThis.Notifier<{
32
32
  buys: any;
33
33
  sells: any;
34
34
  }>;
@@ -77,4 +77,4 @@ type AutoswapPublicFacet = {
77
77
  */
78
78
  getPoolAllocation: () => Record<string, Amount>;
79
79
  };
80
- //# sourceMappingURL=types.d.ts.map
80
+ //# sourceMappingURL=types-ambient.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"types-ambient.d.ts","sourceRoot":"","sources":["types-ambient.js"],"names":[],"mappings":";oBAEc,MAAM,MAAM;uBACZ,MAAM,MAAM;;;yBAGZ,MAAM,OAAO,CAAC,UAAU,CAAC;;6BAE1B,oBAAoB,GAAG,oBAAoB;;2BAK1C,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;WACnB,MAAM;iBACN,MAAM;2BACN,YAAY;kBACZ,MAAM;;;0BAGN,QAAQ;2BACR,qBAAqB;uBACrB,QAAQ;0BACR,oBAAoB;;;gBAGpB,CAAC,UAAU,EAAE,mBAAmB,KAAK,OAAO,CAAC,eAAe,CAAC;eAC7D,MAAM,MAAM;;;oBAKZ,MAAM,MAAM;oBACZ,MAAM,OAAO,CAAC,UAAU,CAAC;;;;;;;wBAKzB,MAAM,OAAO,CAAC,UAAU,CAAC;;;;;;0BAEzB,MAAM,OAAO,CAAC,UAAU,CAAC;;;;;;2BAGzB,MAAM,OAAO,CAAC,UAAU,CAAC;;;;;gCAGzB,MAAM,OAAO,CAAC,UAAU,CAAC;;;;;mCAEzB,MAAM,OAAO,CAAC,UAAU,CAAC;wBAEzB,MAAM,MAAM;;;;;wBACZ,MAAM,MAAM;;;;;mBAEZ,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,KAAK,MAAM;;;;;oBAG7C,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,KAAK,MAAM;;;;;uBAG7C,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"handleWarning.d.ts","sourceRoot":"","sources":["handleWarning.js"],"names":[],"mappings":"AASO,wCAHI,QAAQ,GAAG,CAAC,GACV,IAAI,CAIhB;AASM,8CAHI,cAAc,GAAG,CAAC,GAChB,IAAI,CAIhB"}
1
+ {"version":3,"file":"handleWarning.d.ts","sourceRoot":"","sources":["handleWarning.js"],"names":[],"mappings":"AASO,wCAHI,OAAO,CAAC,GAAG,CAAC,GACV,IAAI,CAIhB;AASM,8CAHI,aAAa,CAAC,GAAG,CAAC,GAChB,IAAI,CAIhB"}
@@ -1,2 +1,2 @@
1
- export function makeInstanceRecordStorage(baggage: MapStore<string, unknown>): (ir: InstanceRecord) => InstanceState;
1
+ export function makeInstanceRecordStorage(baggage: import("@agoric/vat-data").Baggage): (ir: InstanceRecord) => InstanceState;
2
2
  //# sourceMappingURL=instanceRecordStorage.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"instanceRecordStorage.d.ts","sourceRoot":"","sources":["instanceRecordStorage.js"],"names":[],"mappings":"AA8BO,oFAFW,cAAc,KAAK,aAAa,CAqFjD"}
1
+ {"version":3,"file":"instanceRecordStorage.d.ts","sourceRoot":"","sources":["instanceRecordStorage.js"],"names":[],"mappings":"AA8BO,mDAHI,OAAO,kBAAkB,EAAE,OAAO,GAChC,CAAC,EAAE,EAAE,cAAc,KAAK,aAAa,CAqFjD"}
@@ -22,20 +22,21 @@ type ZoeSeatAdminKit = {
22
22
  /**
23
23
  * Make the Zoe seat admin, user seat and a notifier
24
24
  */
25
- type MakeZoeSeatAdminKit = (initialAllocation: Allocation, instanceAdminHelper: InstanceAdminHelper, proposal: ProposalRecord, withdrawFacet: WithdrawFacet, exitObj: ERef<ExitObj>, offerResult?: ERef<unknown>, baggage: MapStore<string, unknown>) => ZoeSeatAdminKit;
25
+ type MakeZoeSeatAdminKit = (initialAllocation: Allocation, instanceAdminHelper: InstanceAdminHelper, proposal: ProposalRecord, withdrawFacet: WithdrawFacet, exitObj: ERef<ExitObj>, offerResult?: ERef<unknown>, baggage: import("@agoric/vat-data").Baggage) => ZoeSeatAdminKit;
26
26
  type ZoeSeatAdminExit = (completion?: Completion) => void;
27
- type ZoeSeatAdmin = {
27
+ type ZoeSeatAdminMethods = {
28
28
  replaceAllocation: (allocation: Allocation) => void;
29
29
  exit: ZoeSeatAdminExit;
30
30
  /**
31
31
  * called with the reason
32
32
  * for calling fail on this seat, where reason is normally an instanceof Error.
33
33
  */
34
- fail: ShutdownWithFailure;
34
+ fail: import("@agoric/swingset-vat").ShutdownWithFailure;
35
35
  getExitSubscriber: () => Subscriber<AmountKeywordRecord>;
36
36
  };
37
+ type ZoeSeatAdmin = import("@endo/marshal").RemotableObject & ZoeSeatAdminMethods;
37
38
  type HandleOfferResult = {
38
- offerResultPromise: Promise<unknown>;
39
+ offerResultPromise: Promise<import("@endo/marshal").Passable>;
39
40
  exitObj: ExitObj;
40
41
  };
41
42
  /**
@@ -55,7 +56,7 @@ type InstanceAdmin = {
55
56
  getOfferFilter: () => string[];
56
57
  getInstallation: () => Installation;
57
58
  exitAllSeats: (completion: Completion) => void;
58
- failAllSeats: ShutdownWithFailure;
59
+ failAllSeats: import("@agoric/swingset-vat").ShutdownWithFailure;
59
60
  stopAcceptingOffers: () => void;
60
61
  isBlocked: (string: string) => boolean;
61
62
  initDelayedState: (handleOfferObj: HandleOfferObj, publicFacet: unknown) => void;
@@ -72,13 +73,13 @@ type HandleOfferObj = {
72
73
  type ZoeInstanceAdminMakeInvitation = (invitationHandle: InvitationHandle, description: string, customDetails?: Record<string, any> | undefined, proposalShape?: Pattern) => Invitation;
73
74
  type ZoeInstanceAdmin = {
74
75
  makeInvitation: ZoeInstanceAdminMakeInvitation;
75
- saveIssuer: (issuerP: ERef<Issuer>, keyword: Keyword) => Promise<IssuerRecord>;
76
+ saveIssuer: <I extends Issuer>(issuerP: ERef<I>, keyword: Keyword) => Promise<I extends Issuer<infer K, infer M> ? IssuerRecord<K, M> : never>;
76
77
  makeZoeMint: MakeZoeMint;
77
78
  registerFeeMint: RegisterFeeMint;
78
79
  makeNoEscrowSeat: MakeNoEscrowSeat;
79
80
  replaceAllocations: ReplaceAllocations;
80
81
  exitAllSeats: (completion: Completion) => void;
81
- failAllSeats: ShutdownWithFailure;
82
+ failAllSeats: import("@agoric/swingset-vat").ShutdownWithFailure;
82
83
  exitSeat: (seatHandle: SeatHandle, completion: Completion) => void;
83
84
  failSeat: (seatHandle: SeatHandle, reason: Error) => void;
84
85
  stopAcceptingOffers: () => void;
@@ -87,10 +88,11 @@ type ZoeInstanceAdmin = {
87
88
  getExitSubscriber: (seatHandle: SeatHandle) => Subscriber<AmountKeywordRecord>;
88
89
  repairContractCompletionWatcher: () => void;
89
90
  };
90
- type RegisterFeeMint = (keyword: Keyword, allegedFeeMintAccess: FeeMintAccess) => ZoeMint<'nat'>;
91
+ type RegisterFeeMint = (keyword: Keyword, allegedFeeMintAccess: FeeMintAccess) => ZoeMint<"nat">;
91
92
  type WrapIssuerKitWithZoeMint = (keyword: Keyword, localIssuerKit: IssuerKit) => any;
92
- type MakeZoeMint = (keyword: Keyword, assetKind?: AssetKind | undefined, displayInfo?: AdditionalDisplayInfo | undefined, options?: Partial<{
93
- elementShape: any;
93
+ type MakeZoeMint = (keyword: Keyword, assetKind?: globalThis.AssetKind | undefined, displayInfo?: globalThis.AdditionalDisplayInfo | undefined, options?: Partial<{
94
+ elementShape: globalThis.Pattern;
95
+ recoverySetsOption: import("@agoric/ertp/src/types.js").RecoverySetsOption;
94
96
  }> | undefined) => ZoeMint;
95
97
  type MakeNoEscrowSeat = (initialAllocation: Allocation, proposal: ProposalRecord, exitObj: ExitObj, seatHandle: SeatHandle) => UserSeat;
96
98
  type ReplaceAllocations = (seatHandleAllocations: SeatHandleAllocation[]) => any;
@@ -98,7 +100,7 @@ type SeatHandleAllocation = {
98
100
  seatHandle: SeatHandle;
99
101
  allocation: Allocation;
100
102
  };
101
- type ZoeMint<K extends AssetKind = AssetKind> = {
103
+ type ZoeMint<K extends globalThis.AssetKind = globalThis.AssetKind> = {
102
104
  getIssuerRecord: () => IssuerRecord<K>;
103
105
  mintAndEscrow: (totalToMint: Amount<K>) => void;
104
106
  /**
@@ -115,7 +117,7 @@ type ZCFRoot = {
115
117
  };
116
118
  type ExecuteContractResult = {
117
119
  creatorFacet: object;
118
- creatorInvitation: Promise<Invitation>;
120
+ creatorInvitation?: Promise<Invitation<unknown, undefined>> | undefined;
119
121
  publicFacet: object;
120
122
  handleOfferObj: HandleOfferObj;
121
123
  };
@@ -125,7 +127,7 @@ type MakeExitObj = (proposal: ProposalRecord, zoeSeatAdmin: ZCFSeat) => ExitObj;
125
127
  type ExitObj = {
126
128
  exit: () => void;
127
129
  };
128
- type SeatHandle = Handle<'Seat'>;
130
+ type SeatHandle = Handle<"Seat">;
129
131
  /**
130
132
  * Get the assetKind for a brand known by Zoe
131
133
  *
@@ -147,32 +149,18 @@ type ZcfSeatManager = {
147
149
  type ZcfMintReallocator = {
148
150
  reallocate: (zcfSeat: ZCFSeat, newAllocation: Allocation) => void;
149
151
  };
150
- /**
151
- * The SeatManager holds the active zcfSeats and can reallocate and
152
- * make new zcfSeats.
153
- */
154
- type CreateSeatManager = (zoeInstanceAdmin: ERef<ZoeInstanceAdmin>, getAssetKindByBrand: GetAssetKindByBrand, shutdownWithFailure: ShutdownWithFailure, zcfBaggage: MapStore<string, unknown>) => {
155
- seatManager: ZcfSeatManager;
156
- zcfMintReallocator: ZcfMintReallocator;
157
- };
158
152
  /**
159
153
  * Add an issuer and its keyword to the instanceRecord for the
160
154
  * contract instance
161
155
  */
162
156
  type InstanceStateAddIssuer = (keyword: Keyword, issuerRecord: IssuerRecord) => void;
163
- type InstanceStateGetTerms = () => AnyTerms;
164
- type InstanceStateGetInstallation = () => Installation;
165
- type InstanceRecordGetIssuers = () => IssuerKeywordRecord;
166
- type InstanceRecordGetBrands = () => BrandKeywordRecord;
167
157
  type InstanceState = {
168
158
  addIssuer: InstanceStateAddIssuer;
169
- getInstanceRecord: GetInstanceRecord;
170
- getTerms: InstanceStateGetTerms;
171
- getInstallation: InstanceStateGetInstallation;
172
- getIssuers: InstanceRecordGetIssuers;
173
- getBrands: InstanceRecordGetBrands;
159
+ getInstanceRecord: () => InstanceRecord;
160
+ getTerms: () => AnyTerms;
161
+ getInstallation: () => Installation;
162
+ getIssuers: () => IssuerKeywordRecord;
163
+ getBrands: () => BrandKeywordRecord;
174
164
  assertUniqueKeyword: (keyword: Keyword) => void;
175
165
  };
176
- type GetInstanceRecord = () => InstanceRecord;
177
- type IssuerStorageGetIssuerRecords = (issuers: Issuer[]) => IssuerRecords;
178
166
  //# sourceMappingURL=internal-types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"internal-types.d.ts","sourceRoot":"","sources":["internal-types.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"internal-types.d.ts","sourceRoot":"","sources":["internal-types.js"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  // @jessie-check
2
+ /// <reference types="@agoric/ertp/exported" />
2
3
 
3
4
  /**
4
5
  * @typedef {object} SeatData
@@ -53,13 +54,16 @@
53
54
  */
54
55
 
55
56
  /**
56
- * @typedef {object} ZoeSeatAdmin
57
+ * @typedef ZoeSeatAdminMethods
57
58
  * @property {(allocation: Allocation) => void} replaceAllocation
58
59
  * @property {ZoeSeatAdminExit} exit
59
- * @property {ShutdownWithFailure} fail called with the reason
60
+ * @property {import('@agoric/swingset-vat').ShutdownWithFailure} fail called with the reason
60
61
  * for calling fail on this seat, where reason is normally an instanceof Error.
61
62
  * @property {() => Subscriber<AmountKeywordRecord>} getExitSubscriber
62
63
  */
64
+ /**
65
+ * @typedef {import('@endo/marshal').RemotableObject & ZoeSeatAdminMethods} ZoeSeatAdmin
66
+ */
63
67
 
64
68
  /**
65
69
  * @callback {(brand: Brand) => AssetKind} GetAssetKind
@@ -67,7 +71,7 @@
67
71
 
68
72
  /**
69
73
  * @typedef {object} HandleOfferResult
70
- * @property {Promise<unknown>} offerResultPromise
74
+ * @property {Promise<import('@endo/marshal').Passable>} offerResultPromise
71
75
  * @property {ExitObj} exitObj
72
76
  */
73
77
 
@@ -92,7 +96,7 @@
92
96
  * @property {() => string[]} getOfferFilter
93
97
  * @property {() => Installation} getInstallation
94
98
  * @property {(completion: Completion) => void} exitAllSeats
95
- * @property {ShutdownWithFailure} failAllSeats
99
+ * @property {import('@agoric/swingset-vat').ShutdownWithFailure} failAllSeats
96
100
  * @property {() => void} stopAcceptingOffers
97
101
  * @property {(string: string) => boolean} isBlocked
98
102
  * @property {(handleOfferObj: HandleOfferObj, publicFacet: unknown) => void} initDelayedState
@@ -122,15 +126,15 @@
122
126
  /**
123
127
  * @typedef {object} ZoeInstanceAdmin
124
128
  * @property {ZoeInstanceAdminMakeInvitation} makeInvitation
125
- * @property {(issuerP: ERef<Issuer>,
129
+ * @property {<I extends Issuer>(issuerP: ERef<I>,
126
130
  * keyword: Keyword
127
- * ) => Promise<IssuerRecord>} saveIssuer
131
+ * ) => Promise<I extends Issuer<infer K, infer M> ? IssuerRecord<K, M> : never>} saveIssuer
128
132
  * @property {MakeZoeMint} makeZoeMint
129
133
  * @property {RegisterFeeMint} registerFeeMint
130
134
  * @property {MakeNoEscrowSeat} makeNoEscrowSeat
131
135
  * @property {ReplaceAllocations} replaceAllocations
132
136
  * @property {(completion: Completion) => void} exitAllSeats
133
- * @property {ShutdownWithFailure} failAllSeats
137
+ * @property {import('@agoric/swingset-vat').ShutdownWithFailure} failAllSeats
134
138
  * @property {(seatHandle: SeatHandle, completion: Completion) => void} exitSeat
135
139
  * @property {(seatHandle: SeatHandle, reason: Error) => void} failSeat
136
140
  * @property {() => void} stopAcceptingOffers
@@ -160,7 +164,7 @@
160
164
  * @param {Keyword} keyword
161
165
  * @param {AssetKind} [assetKind]
162
166
  * @param {AdditionalDisplayInfo} [displayInfo]
163
- * @param {IssuerOptionsRecord} [options]
167
+ * @param {import('@agoric/ertp').IssuerOptionsRecord} [options]
164
168
  * @returns {ZoeMint}
165
169
  */
166
170
 
@@ -205,7 +209,7 @@
205
209
  /**
206
210
  * @typedef {object} ExecuteContractResult
207
211
  * @property {object} creatorFacet
208
- * @property {Promise<Invitation>} creatorInvitation
212
+ * @property {Promise<Invitation>} [creatorInvitation]
209
213
  * @property {object} publicFacet
210
214
  * @property {HandleOfferObj} handleOfferObj
211
215
  */
@@ -281,19 +285,6 @@
281
285
  * @property {(zcfSeat: ZCFSeat, newAllocation: Allocation) => void} reallocate
282
286
  */
283
287
 
284
- /**
285
- * @callback CreateSeatManager
286
- *
287
- * The SeatManager holds the active zcfSeats and can reallocate and
288
- * make new zcfSeats.
289
- *
290
- * @param {ERef<ZoeInstanceAdmin>} zoeInstanceAdmin
291
- * @param {GetAssetKindByBrand} getAssetKindByBrand
292
- * @param {ShutdownWithFailure} shutdownWithFailure
293
- * @param {import('@agoric/vat-data').Baggage} zcfBaggage
294
- * @returns {{ seatManager: ZcfSeatManager, zcfMintReallocator: ZcfMintReallocator }}
295
- */
296
-
297
288
  /**
298
289
  * @callback InstanceStateAddIssuer
299
290
  *
@@ -305,44 +296,13 @@
305
296
  * @returns {void}
306
297
  */
307
298
 
308
- /**
309
- * @callback InstanceStateGetTerms
310
- * @returns {AnyTerms}
311
- */
312
-
313
- /**
314
- * @callback InstanceStateGetInstallation
315
- * @returns {Installation}
316
- */
317
-
318
- /**
319
- * @callback InstanceRecordGetIssuers
320
- * @returns {IssuerKeywordRecord}
321
- */
322
-
323
- /**
324
- * @callback InstanceRecordGetBrands
325
- * @returns {BrandKeywordRecord}
326
- */
327
-
328
299
  /**
329
300
  * @typedef {object} InstanceState
330
301
  * @property {InstanceStateAddIssuer} addIssuer
331
- * @property {GetInstanceRecord} getInstanceRecord
332
- * @property {InstanceStateGetTerms} getTerms
333
- * @property {InstanceStateGetInstallation} getInstallation
334
- * @property {InstanceRecordGetIssuers} getIssuers
335
- * @property {InstanceRecordGetBrands} getBrands
302
+ * @property {() => InstanceRecord} getInstanceRecord
303
+ * @property {() => AnyTerms} getTerms
304
+ * @property {() => Installation} getInstallation
305
+ * @property {() => IssuerKeywordRecord} getIssuers
306
+ * @property {() => BrandKeywordRecord} getBrands
336
307
  * @property {(keyword: Keyword) => void} assertUniqueKeyword
337
308
  */
338
-
339
- /**
340
- * @callback GetInstanceRecord
341
- * @returns {InstanceRecord}
342
- */
343
-
344
- /**
345
- * @callback IssuerStorageGetIssuerRecords
346
- * @param {Issuer[]} issuers
347
- * @returns {IssuerRecords}
348
- */
@@ -1,3 +1,3 @@
1
- export function makeIssuerRecord<K extends AssetKind>(brand: Brand<K>, issuer: Issuer<K>, displayInfo: DisplayInfo<K>): IssuerRecord<K>;
2
- export function assertFullIssuerRecord(issuerRecord: IssuerRecord): asserts issuerRecord is Required<IssuerRecord<AssetKind>>;
1
+ export function makeIssuerRecord<K extends globalThis.AssetKind>(brand: Brand<K>, issuer: Issuer<K>, displayInfo: DisplayInfo<K>): IssuerRecord<K>;
2
+ export function assertFullIssuerRecord(issuerRecord: IssuerRecord): asserts issuerRecord is Required<IssuerRecord>;
3
3
  //# sourceMappingURL=issuerRecord.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"issuerRecord.d.ts","sourceRoot":"","sources":["issuerRecord.js"],"names":[],"mappings":"AAaO,wIAMH;AAMG,qDAHI,YAAY,6DAOtB"}
1
+ {"version":3,"file":"issuerRecord.d.ts","sourceRoot":"","sources":["issuerRecord.js"],"names":[],"mappings":"AAaO,iCAFmB,CAAC,sCAHhB,KAAK,CAGU,CAAC,AAHT,CAAC,UACR,MAAM,CAES,CAAC,AAFR,CAAC,eACT,WAAW,CACI,CAAC,AADH,CAAC,GACZ,YAAY,CAAC,CAAC,CAAC,CAQxB;AAMG,qDAHI,YAAY,GACV,OAAO,CAAC,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAC,CAM1D"}
@@ -1,4 +1,4 @@
1
- export function provideIssuerStorage(zcfBaggage: MapStore<string, unknown>): {
1
+ export function provideIssuerStorage(zcfBaggage: import("@agoric/vat-data").Baggage): {
2
2
  storeIssuerKeywordRecord: (uncleanIssuerKeywordRecord: IssuerKeywordRecord) => Promise<{
3
3
  issuers: IssuerKeywordRecord;
4
4
  brands: BrandKeywordRecord;
@@ -6,9 +6,9 @@ export function provideIssuerStorage(zcfBaggage: MapStore<string, unknown>): {
6
6
  storeIssuer: (issuerP: ERef<Issuer>) => Promise<IssuerRecord>;
7
7
  storeIssuerRecord: (issuerRecord: IssuerRecord) => IssuerRecord;
8
8
  getAssetKindByBrand: GetAssetKindByBrand;
9
- getBrandForIssuer: <K extends AssetKind>(issuer: Issuer<K>) => Brand<K>;
10
- getIssuerForBrand: <K_1 extends AssetKind>(brand: Brand<K_1>) => Issuer<K_1>;
11
- getIssuerRecords: IssuerStorageGetIssuerRecords;
9
+ getBrandForIssuer: <K extends globalThis.AssetKind>(issuer: Issuer<K>) => Brand<K>;
10
+ getIssuerForBrand: <K_1 extends globalThis.AssetKind>(brand: Brand<K_1>) => Issuer<K_1>;
11
+ getIssuerRecords: (issuers: Issuer[]) => IssuerRecords;
12
12
  instantiate: (issuerRecords?: any[]) => void;
13
13
  };
14
14
  //# sourceMappingURL=issuerStorage.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"issuerStorage.d.ts","sourceRoot":"","sources":["issuerStorage.js"],"names":[],"mappings":"AAgBO;2DA2HM,mBAAmB;iBACE,mBAAmB;gBACpB,kBAAkB;;2BAxDtC,KAAK,MAAM,CAAC,KACV,QAAQ,YAAY,CAAC;sCAzBvB,YAAY,KACV,YAAY;;;;;;EAyJ1B"}
1
+ {"version":3,"file":"issuerStorage.d.ts","sourceRoot":"","sources":["issuerStorage.js"],"names":[],"mappings":"AAgBO,iDAFI,OAAO,kBAAkB,EAAE,OAAO;2DAwHhC,mBAAmB,KACjB,OAAO,CAAC;QAAE,OAAO,EAAE,mBAAmB,CAAC;QACnD,MAA4B,EAAE,kBAAkB,CAAA;KAAE,CAAC;2BAnDzC,IAAI,CAAC,MAAM,CAAC,KACV,OAAO,CAAC,YAAY,CAAC;sCAzBvB,YAAY,KACV,YAAY;;wBA2FN,CAAC,uCADT,MAAM,CACE,CAAC,AADD,CAAC,KACP,KAAK,CAAC,CAAC,CAAC;wBAWD,GAAC,sCADV,KAAK,CACI,GAAC,AADH,CAAC,KACN,MAAM,CAAC,GAAC,CAAC;gCASX,MAAM,EAAE,KACN,aAAa;;EAyB3B"}