subscription service contract II

.github/workflows/pr.yml

@@ -16,8 +16,8 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-      - name: yarn install
-        run: yarn
+      - run: corepack enable
+      - run: yarn install
       - name: yarn lint
         run: yarn lint
       - name: yarn build
@@ -33,15 +33,15 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: "18.18"
-      - name: yarn install
-        run: yarn
+      - run: corepack enable
+      - run: yarn install
       - name: yarn start:docker
         run: yarn start:docker
       - name: yarn build
         run: yarn build
       - name: yarn start:contract
         run: yarn start:contract
-      
+
       - name: Install linux deps
         run: |
           sudo apt-get install --no-install-recommends -y \
@@ -54,13 +54,13 @@ jobs:
           fluxbox &
         env:
           DISPLAY: :0.0
-            
+
       - name: Run e2e tests
         uses: cypress-io/github-action@248bde77443c376edc45906ede03a1aba9da0462
         with:
           start: npx serve ui/dist -p 5173
           command: yarn test:e2e
-          wait-on: 'http://localhost:5173'
+          wait-on: "http://localhost:5173"
           wait-on-timeout: 120
           browser: chrome
         env:
@@ -73,6 +73,6 @@ jobs:
         with:
           name: e2e-artifacts
           path: |
-              ui/test/e2e/videos
-              ui/test/e2e/screenshots
-        continue-on-error: true
+            ui/test/e2e/videos
+            ui/test/e2e/screenshots
+        continue-on-error: true

.gitignore

@@ -28,8 +28,14 @@ dist-ssr
 screenshots
 videos
 
-# Yarn related
-.yarn/install-state.gz
+# Yarn (https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored)
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
 
 # contract tx
-contract/,tx.json
+contract/,tx.json

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

_agstate/agoric-servers/package.json

@@ -14,6 +14,6 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/cosmic-swingset": "^0.41.3"
+    "@agoric/cosmic-swingset": "^0.42.0-u16.2"
   }
 }

contract/package.json

@@ -18,19 +18,17 @@
     "make:waitForBlocks": "make wait-for-blocks"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "^0.10.4-u12.0",
-    "@agoric/eslint-config": "dev",
-    "@endo/bundle-source": "^2.8.0",
-    "@endo/eslint-plugin": "^0.5.2",
-    "@endo/init": "^0.5.60",
-    "@endo/promise-kit": "0.2.56",
-    "@endo/ses-ava": "^0.2.44",
-    "@jessie.js/eslint-plugin": "^0.4.0",
-    "@typescript-eslint/eslint-plugin": "^6.7.0",
-    "@typescript-eslint/parser": "^6.7.0",
-    "agoric": "^0.21.2-u12.0",
+    "@agoric/deploy-script-support": "^0.10.4-u16.2",
+    "@agoric/eslint-config": "^0.4.1-u16.0",
+    "@endo/bundle-source": "^3.4.0",
+    "@endo/eslint-plugin": "^2.2.1",
+    "@endo/init": "^1.1.4",
+    "@endo/promise-kit": "^1.1.5",
+    "@endo/ses-ava": "^1.2.5",
+    "@jessie.js/eslint-plugin": "^0.4.1",
+    "agoric": "^0.22.0-u16.2",
     "ava": "^5.3.0",
-    "eslint": "^8.47.0",
+    "eslint": "^8.57.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-jessie": "^0.0.6",
     "eslint-config-prettier": "^9.0.0",
@@ -43,14 +41,16 @@
     "prettier": "^3.0.3",
     "prettier-plugin-jsdoc": "^1.0.0",
     "type-coverage": "^2.26.3",
-    "typescript": "~5.2.2"
+    "typescript": "~5.2.2",
+    "typescript-eslint": "^7.13.1"
   },
   "dependencies": {
-    "@agoric/ertp": "^0.16.3-u12.0",
-    "@agoric/zoe": "^0.26.3-u12.0",
-    "@endo/far": "^0.2.22",
-    "@endo/marshal": "^0.8.9",
-    "@endo/patterns": "^0.2.5"
+    "@agoric/ertp": "^0.16.3-u16.1",
+    "@agoric/time": "^0.3.3-u16.1",
+    "@agoric/zoe": "^0.26.3-u16.1",
+    "@endo/far": "^1.1.5",
+    "@endo/marshal": "^1.5.3",
+    "@endo/patterns": "^1.4.3"
   },
   "ava": {
     "files": [

contract/src/offer-up-proposal.js

@@ -12,9 +12,6 @@ const BOARD_AUX = 'boardAux';
 
 const marshalData = makeMarshal(_val => Fail`data only`);
 
-const IST_UNIT = 1_000_000n;
-const CENT = IST_UNIT / 100n;
-
 /**
  * Make a storage node for auxilliary data for a value on the board.
  *
@@ -44,7 +41,13 @@ const publishBrandInfo = async (chainStorage, board, brand) => {
 export const startOfferUpContract = async permittedPowers => {
   console.error('startOfferUpContract()...');
   const {
-    consume: { board, chainStorage, startUpgradable, zoe },
+    consume: {
+      board,
+      chainStorage,
+      startUpgradable,
+      zoe,
+      chainTimerService: chainTimerServiceP,
+    },
     brand: {
       consume: { IST: istBrandP },
       // @ts-expect-error dynamic extension to promise space
@@ -66,8 +69,13 @@ export const startOfferUpContract = async permittedPowers => {
 
   const istIssuer = await istIssuerP;
   const istBrand = await istBrandP;
+  const timerService = await chainTimerServiceP;
+  assert(timerService, `timerService missing from bootstrap`);
 
-  const terms = { tradePrice: AmountMath.make(istBrand, 25n * CENT) };
+  const terms = {
+    subscriptionPrice: AmountMath.make(istBrand, 10000000n),
+    timerService,
+  };
 
   // agoricNames gets updated each time; the promise space only once XXXXXXX
   const installation = await offerUpInstallationP;
@@ -107,6 +115,7 @@ const offerUpManifest = {
       chainStorage: true, // to publish boardAux info for NFT brand
       startUpgradable: true, // to start contract and save adminFacet
       zoe: true, // to get contract terms, including issuer/brand
+      chainTimerService: true,
     },
     installation: { consume: { offerUp: true } },
     issuer: { consume: { IST: true }, produce: { Item: true } },