agoric rebase fix

Kryha · Oct 10, 2023 · 0b32356 · 0b32356
1 parent 1594a32
commit 0b32356
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/agoric/contract/src/index.js b/agoric/contract/src/index.js
@@ -66,14 +66,6 @@ harden(meta);
  * @param {{
  *   seed: number
  *   powers: { storageNode: StorageNode, marshaller: Marshaller },
- *   mintFee: bigint,
- *   royaltyRate: RatioObject,
- *   platformFeeRate: RatioObject,
- *   mintRoyaltyRate: RatioObject,
- *   mintPlatformFeeRate: RatioObject,
- *   royaltyDepositFacet: DepositFacet,
- *   platformFeeDepositFacet: DepositFacet,
- *   paymentBrand: Brand
  *   clock: Clock
  *   defaultCharacters: object[],
  *   defaultItems: object[],
@@ -86,10 +78,7 @@ export const start = async (zcf, privateArgs, baggage) => {
   const terms = zcf.getTerms();
 
   // TODO: move to proposal
-  const assetNames = {
-    character: 'KREAdCHARACTER',
-    item: 'KREAdITEM',
-  };
+  const assetNames = terms.assetNames;
 
   // Setting up the mint capabilities here in the prepare function, as discussed with Turadg
   // durability is not a concern with these, and defining them here, passing on what's needed

diff --git a/agoric/contract/src/type-guards.js b/agoric/contract/src/type-guards.js
@@ -189,6 +189,10 @@ export const MarketEntryGuard = M.splitRecord({
     brand: BrandShape,
     value: M.nat(),
   }),
+  royalty: M.splitRecord({
+    brand: BrandShape,
+    value: M.nat(),
+  }),
   platformFee: M.splitRecord({
     brand: BrandShape,
     value: M.nat(),

diff --git a/agoric/contract/test/test-market.js b/agoric/contract/test/test-market.js
@@ -9,6 +9,7 @@ import { addCharacterToBootstrap, addItemToBootstrap } from './setup.js';
 import { makeCopyBag } from '@agoric/store';
 import { errors } from '../src/errors.js';
 import { defaultItems } from './items.js';
+import { multiplyBy } from '@agoric/zoe/src/contractSupport/ratio.js';
 
 test.before(async (t) => {
   const bootstrap = await bootstrapContext();
@@ -76,7 +77,7 @@ test.before(async (t) => {
     assets,
     purses,
     zoe,
-    users: { bob, alice },
+    users: { bob, alice, admin },
     paymentAsset,
     royaltyPurse,
     platformFeePurse,