chore: Merge pull request #127

hindley-milner-systems · Nov 19, 2024 · 02f32be · 02f32be
2 parents f86027a + b7de87e
commit 02f32be
Show file tree

Hide file tree

Showing 73 changed files with 24,120 additions and 3,666 deletions.
diff --git a/contract/builder/start-tribbles-airdrop.js b/contract/builder/start-tribbles-airdrop.js
@@ -5,8 +5,6 @@ import { Fail } from '@endo/errors';
 import { makeTracer, deeplyFulfilledObject } from '@agoric/internal';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 
-const ONE_DAY = 86_000n;
-
 const AIRDROP_TIERS_STATIC = [9000n, 6500n, 3500n, 1500n, 750n].map(
   x => x * 1_000_000n,
 );
@@ -181,15 +179,12 @@ export const startAirdrop = async (powers, config) => {
       value: 5n,
     }),
   };
-  trace('BEFORE assert(config?.options?.merkleRoot');
   assert(
     customTerms?.merkleRoot,
     'can not start contract without merkleRoot???',
   );
-  trace('AFTER assert(config?.options?.merkleRoot');
   const marshaller = await E(board).getReadonlyMarshaller();
 
-  console.log('------------------------');
   const startOpts = {
     installation: await airdropInstallationP,
     label: contractName,
@@ -321,9 +316,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
       'getManifestForAirdrop',
       {
         installKeys: {
-          tribblesAirdrop: publishRef(
-            install('./src/tribbles/airdrop.contract.js'),
-          ),
+          tribblesAirdrop: publishRef(install('./src/airdrop.contract.js')),
         },
       },
     ],

diff --git a/contract/bundle-airdrop-js-meta.json b/contract/bundle-airdrop-js-meta.json
@@ -35,35 +35,35 @@
       "mtime": "2024-09-09T22:44:50.209Z"
     },
     {
-      "relativePath": "../airdrop/helpers/time.js",
+      "relativePath": "../src/helpers/time.js",
       "mtime": "2024-08-21T14:40:19.525Z"
     },
     {
       "relativePath": "../../node_modules/@agoric/ertp/src/index.js",
       "mtime": "2024-09-09T22:44:50.102Z"
     },
     {
-      "relativePath": "../airdrop/helpers/validation.js",
+      "relativePath": "../src/helpers/validation.js",
       "mtime": "2024-08-20T14:25:40.905Z"
     },
     {
       "relativePath": "../../node_modules/@agoric/zoe/src/contractSupport/index.js",
       "mtime": "2024-09-09T22:44:50.209Z"
     },
     {
-      "relativePath": "../airdrop/helpers/stateMachine.js",
+      "relativePath": "../src/helpers/stateMachine.js",
       "mtime": "2024-09-11T15:45:13.443Z"
     },
     {
       "relativePath": "../../node_modules/@agoric/zoe/src/contractSupport/ratio.js",
       "mtime": "2024-09-09T22:44:50.209Z"
     },
     {
-      "relativePath": "../airdrop/helpers/messages.js",
+      "relativePath": "../src/helpers/messages.js",
       "mtime": "2024-08-20T14:25:40.904Z"
     },
     {
-      "relativePath": "../airdrop/helpers/objectTools.js",
+      "relativePath": "../src/helpers/objectTools.js",
       "mtime": "2024-08-29T16:33:56.879Z"
     },
     {
@@ -123,7 +123,7 @@
       "mtime": "2024-09-09T22:44:38.133Z"
     },
     {
-      "relativePath": "../airdrop/helpers/lenses.js",
+      "relativePath": "../src/helpers/lenses.js",
       "mtime": "2024-09-09T16:53:44.572Z"
     },
     {

diff --git a/contract/jsconfig.json b/contract/jsconfig.json
@@ -15,5 +15,11 @@
     "strictNullChecks": true,
     "moduleResolution": "node"
   },
-  "include": ["src/**/*.js", "test/**/*.js", "exported.js", "globals.d.ts"]
+  "include": [
+    "src/**/*.js",
+    "test/**/*.js",
+    "src/types.js",
+    "exported.js",
+    "globals.d.ts"
+  ]
 }
diff --git a/contract/package.json b/contract/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "@agoric/eslint-config": "dev",
     "@endo/bundle-source": "^2.8.0",
-    "@endo/eslint-plugin": "^0.5.2",
+    "@endo/eslint-plugin": "^2.2.3",
     "@endo/init": "^0.5.60",
     "@endo/ses-ava": "^1.2.7",
     "@jessie.js/eslint-plugin": "^0.4.0",
@@ -71,6 +71,7 @@
     "@endo/promise-kit": "^1.1.7",
     "@noble/hashes": "1.5.0",
     "@noble/secp256k1": "^2.1.0",
+    "@paralleldrive/cuid2": "^2.2.2",
     "bech32": "^2.0.0"
   },
   "ava": {
@@ -108,6 +109,7 @@
     },
     "extends": [
       "@agoric",
+      "plugin:@endo/recommended",
       "prettier"
     ],
     "ignorePatterns": [