feat(contract): linting and typedefs

.gitignore

@@ -22,3 +22,5 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+_agstate/yarn-links

contract/package.json

@@ -11,26 +11,32 @@
     "docker:make": "docker compose exec agd make -C /workspace/contract",
     "make:help": "make list",
     "start": "yarn docker:make clean start-contract print-key",
-    "build": "exit 0",
+    "build": "node_modules/agoric/bin/agoric run scripts/build-game1-start.js",
     "test": "ava --verbose",
-    "lint": "eslint '**/*.{js,ts}'",
-    "lint-fix": "eslint --fix '**/*.{js,ts}'",
-    "lint-fix-jessie": "eslint -c '.eslintrc-jessie.js' --fix '**/*.js'",
-    "lint-jessie": "eslint -c '.eslintrc-jessie.js' '**/*.js'",
-    "typecheck": "tsc"
+    "lint": "yarn lint:eslint # && yarn lint:types",
+    "lint:eslint": "eslint '**/*.{js,ts}'",
+    "lint:fix": "eslint --fix '**/*.{js,ts}'",
+    "lint:types": "tsc"
+  },
+  "dependencies": {
+    "@agoric/ertp": "0.16.3-u13.0",
+    "@agoric/zoe": "0.26.3-u13.0",
+    "@endo/far": "0.2.18",
+    "@endo/marshal": "0.8.5",
+    "@endo/patterns": "0.2.2"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "^0.10.4-u12.0",
+    "@agoric/deploy-script-support": "^0.10.4-u13.0",
     "@agoric/eslint-config": "dev",
-    "@endo/bundle-source": "^2.8.0",
+    "@endo/bundle-source": "2.5.2-upstream-rollup",
     "@endo/eslint-plugin": "^0.5.2",
     "@endo/init": "^0.5.60",
-    "@endo/promise-kit": "^1.0.1",
+    "@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": "^0.22.0-u13.0",
     "ava": "^5.3.0",
     "eslint": "^8.47.0",
     "eslint-config-airbnb-base": "^15.0.0",
@@ -44,20 +50,8 @@
     "import-meta-resolve": "^2.2.1",
     "prettier": "^3.0.3",
     "prettier-plugin-jsdoc": "^1.0.0",
-    "type-coverage": "^2.26.3",
     "typescript": "~5.2.2"
   },
-  "resolutions": {
-    "@babel/code-frame": "7.18.6",
-    "@babel/highlight": "7.22.5"
-  },
-  "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"
-  },
   "ava": {
     "files": [
       "test/**/test-*.js"
@@ -112,11 +106,14 @@
           "varsIgnorePattern": "^_"
         }
       ]
-    }
+    },
+    "ignorePatterns": [
+      "bundles"
+    ]
   },
   "prettier": {
     "trailingComma": "all",
     "arrowParens": "avoid",
     "singleQuote": true
   }
-}
+}

contract/src/gameAssetContract.js

@@ -23,7 +23,7 @@ const bagValueSize = amt => {
   return total;
 };
 
-/** @typedef {StandardTerms & { joinPrice: Amount<'nat'> }} GamePlacesTerms */
+/** @typedef {{joinPrice: Amount<'nat'>}} GamePlacesTerms */
 /**
  * @param {ZCF<GamePlacesTerms>} zcf
  */

contract/src/start-game1-proposal.js

@@ -1,5 +1,5 @@
 // @ts-check
-import { E } from '@endo/eventual-send';
+import { E } from '@endo/far';
 import { makeMarshal } from '@endo/marshal';
 import { AmountMath } from '@agoric/ertp/src/amountMath.js';
 import '@agoric/zoe/exported.js';
@@ -122,7 +122,8 @@ harden(gameManifest);
 
 /**
  * @param {{restoreRef: (ref: unknown) => Promise<unknown> }} r
- * @param {{ game1Ref: unknown }} g */
+ * @param {{ game1Ref: unknown }} g
+ */
 export const getManifestForGame1 = ({ restoreRef }, { game1Ref }) => {
   return harden({
     manifest: gameManifest,

contract/test/mintStable.js

@@ -4,7 +4,7 @@
  */
 
 // @ts-check
-import { E } from '@endo/eventual-send';
+import { E } from '@endo/far';
 import { createRequire } from 'module';
 
 const myRequire = createRequire(import.meta.url);

contract/test/test-bundle-source.js

@@ -8,8 +8,7 @@ import { test } from './prepare-test-env-ava.js';
 
 import { createRequire } from 'module';
 import bundleSource from '@endo/bundle-source';
-import { E } from '@endo/eventual-send';
-import { passStyleOf } from '@endo/far';
+import { E, passStyleOf } from '@endo/far';
 import { makeZoeKitForTest } from '@agoric/zoe/tools/setup-zoe.js';
 
 const myRequire = createRequire(import.meta.url);

contract/test/test-contract.js

@@ -7,8 +7,7 @@
 import { test as anyTest } from './prepare-test-env-ava.js';
 
 import { createRequire } from 'module';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/far';
+import { E, Far } from '@endo/far';
 import { makePromiseKit } from '@endo/promise-kit';
 import { makeCopyBag } from '@endo/patterns';
 import { makeNodeBundleCache } from '@endo/bundle-source/cache.js';

contract/tsconfig.json

@@ -13,5 +13,6 @@
     "maxNodeModuleJsDepth": 2,
     "strict": true
   },
-  "include": ["**/*.js", "**/*.ts"]
+  "include": ["**/*.js", "**/*.ts"],
+  "exclude": ["bundles"]
 }

package.json

@@ -8,10 +8,6 @@
     "contract",
     "ui"
   ],
-  "resolutions": {
-    "@babel/code-frame": "7.18.6",
-    "@babel/highlight": "7.22.5"
-  },
   "scripts": {
     "start:docker": "cd contract && docker compose up -d",
     "docker:logs": "cd contract; docker compose logs --tail 200 -f",

ui/package.json

@@ -36,6 +36,8 @@
   },
   "resolutions": {
     "**/ses": "^0.18.8",
-    "**/@agoric/xsnap": "0.14.3-dev-9f085d3.0"
+    "**/@agoric/xsnap": "0.14.3-dev-9f085d3.0",
+    "@babel/code-frame": "7.18.6",
+    "@babel/highlight": "7.22.5"
   }
 }