fix(zoe): add terms to invite details

Agoric · Mar 14, 2023 · 1111e6c · 1111e6c
1 parent 185d264
commit 1111e6c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/packages/zoe/src/typeGuards.js b/packages/zoe/src/typeGuards.js
@@ -111,11 +111,17 @@ export const isAfterDeadlineExitRule = exit => {
   return exitKey === 'afterDeadline';
 };
 
+export const AnyTermsShape = M.splitRecord({
+  issuers: M.recordOf(KeywordShape, IssuerShape),
+  brands: M.recordOf(KeywordShape, BrandShape),
+});
+
 export const InvitationElementShape = M.splitRecord({
   description: M.string(),
   handle: InvitationHandleShape,
   instance: InstanceHandleShape,
   installation: InstallationShape,
+  terms: AnyTermsShape,
 });
 
 export const OfferHandlerI = M.interface('OfferHandler', {
@@ -312,7 +318,7 @@ export const ZoeServiceI = M.interface('ZoeService', {
   install: M.call(M.any()).returns(M.promise()),
   installBundleID: M.call(M.string()).returns(M.promise()),
   startInstance: M.call(M.eref(InstallationShape))
-    .optional(IssuerPKeywordRecordShape, M.any(), M.any())
+    .optional(IssuerPKeywordRecordShape, M.key(), M.opt(M.record()))
     .returns(M.promise()),
   offer: M.call(M.eref(InvitationShape))
     .optional(ProposalShape, PaymentPKeywordRecordShape, M.any())

diff --git a/packages/zoe/src/zoeService/types.js b/packages/zoe/src/zoeService/types.js
@@ -302,6 +302,7 @@
  * @typedef {object} InvitationDetails
  * @property {Installation} installation
  * @property {import('./utils').Instance<any>} instance
+ * @property {AnyTerms} terms
  * @property {InvitationHandle} handle
  * @property {string} description
  * @property {Record<string, any>} [customDetails]

diff --git a/packages/zoe/src/zoeService/zoeStorageManager.js b/packages/zoe/src/zoeService/zoeStorageManager.js
@@ -269,16 +269,17 @@ export const makeZoeStorageManager = (
             ownKeys(customDetails).length >= 1
               ? harden({ customDetails })
               : harden({});
+          const instanceRecord = state.instanceState.getInstanceRecord();
           const invitationAmount = AmountMath.make(
             invitationKit.brand,
             harden([
               {
                 ...extraProperties,
                 description: desc,
                 handle,
-                instance: state.instanceState.getInstanceRecord().instance,
-                installation:
-                  state.instanceState.getInstanceRecord().installation,
+                instance: instanceRecord.instance,
+                installation: instanceRecord.installation,
+                terms: instanceRecord.terms,
               },
             ]),
           );