fixup! chore: fixed new lint errors

Author: Jovonni

.github/workflows/pr.yml

@@ -20,6 +20,8 @@ jobs:
       - run: corepack enable
       - run: yarn install
       - run: yarn build
+      - run: ls ./
+      - run: ls ./contract
       - run: yarn test
   integration:
     runs-on: ubuntu-latest

contract/package.json

@@ -131,7 +131,6 @@
     "src"
   ],
   "resolutions": {
-    "node-fetch": "2.6.12",
     "axios": "1.6.7",
     "@noble/hashes": "https://github.com/paulmillr/noble-hashes.git#ae060daa6252f3ff2aa2f84e887de0aab491281d"
   },

contract/src/orca.contract.js

@@ -29,7 +29,7 @@ import * as flows from './orca.flows.js';
  * @import {CosmosInterchainService} from '@agoric/orchestration';
  * @import {TimerService} from '@agoric/time';
  * @import {NameHub} from '@agoric/vats';
- * 
+ *
  */
 
 // /**
@@ -45,7 +45,6 @@ import * as flows from './orca.flows.js';
 //  * @typedef {import('@agoric/zoe/src/contractFacet/types-ambient.js').ZCF} ZCF
 //  */
 
-
 // /**
 //  * @typedef {import('@agoric/zoe/src/contractFacet/types-ambient.js').ContractStartFn} ContractStartFunction
 //  */
@@ -54,9 +53,7 @@ import * as flows from './orca.flows.js';
 /// <reference types="@agoric/zoe/src/contractFacet/types-ambient"/>
 
 /**
-*/
-
-
+ */
 
 const trace = makeTracer('OrchDev1');
 
@@ -98,16 +95,15 @@ export const meta = {
 };
 harden(meta);
 
-
 /**
  * @typedef {{
-*   localchain: Remote<LocalChain>;
-*   orchestrationService: Remote<CosmosInterchainService>;
-*   storageNode: Remote<StorageNode>;
-*   timerService: Remote<TimerService>;
-*   agoricNames: Remote<NameHub>;
-* }} OrchestrationPowers
-*/
+ *   localchain: Remote<LocalChain>;
+ *   orchestrationService: Remote<CosmosInterchainService>;
+ *   storageNode: Remote<StorageNode>;
+ *   timerService: Remote<TimerService>;
+ *   agoricNames: Remote<NameHub>;
+ * }} OrchestrationPowers
+ */
 
 /**
  * @param {ZCF<Record<string, unknown>> | undefined} zcf
@@ -126,7 +122,6 @@ const contract = async (
 ) => {
   trace('inside start function: v1.1.96');
   trace('privateArgs', privateArgs);
-  
 
   // @ts-expect-error XXX ZCFSeat not Passable
   const { makeAccount, makeCreateAndFund } = orchestrateAll(flows, {
@@ -158,7 +153,9 @@ const contract = async (
 };
 
 /** @type {ContractStartFunction} */
-export const start = /** @type {ContractStartFunction} */ (withOrchestration(contract));
+export const start = /** @type {ContractStartFunction} */ (
+  withOrchestration(contract)
+);
 harden(start);
 
 // /** @typedef {typeof start} OrcaSF */

contract/src/orca.flows.js

@@ -65,7 +65,6 @@ export const makeCreateAndFund = async (
   trace('amt', amt);
   trace('give:', give);
 
-
   const [agoric, chain] = await Promise.all([
     orch.getChain('agoric'),
     orch.getChain(chainName),

contract/src/orca.proposal.js

@@ -10,7 +10,6 @@ import { makeTracer } from './tools/debug.js';
 // import { atomicTransfer } from '@agoric/zoe/src/contractSupport/index.js';
 /// <reference types="@agoric/zoe/src/contractFacet/types-ambient"/>
 
-
 /**
  * @import {ERef} from '@endo/far';
  * @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js';
@@ -19,16 +18,14 @@ import { makeTracer } from './tools/debug.js';
  * @import {OrcaSF} from './orca.contract.js';
  */
 
-  /**
-  * * @typedef {import('./orca.contract.js').OrcaSF} OrcaSF
-  */
-
+/**
+ * * @typedef {import('./orca.contract.js').OrcaSF} OrcaSF
+ */
 
 /**
  * @typedef {import('@agoric/vow').Remote<import('@agoric/vats/src/localchain.js').LocalChain>} LocalChain
  */
 
-
 const trace = makeTracer('OrCE');
 const { entries, fromEntries } = Object;
 
@@ -114,16 +111,12 @@ export const startOrcaContract = async (permittedPowers, config) => {
   const marshaller = await E(board).getPublishingMarshaller();
   console.log(marshaller);
 
-
-
-
-  
   /** @type {StartUpgradableOpts<OrcaSF>} **/
   const startOpts = {
     label: 'orca',
     installation,
     terms: undefined,
-    privateArgs: {      
+    privateArgs: {
       localchain: await localchain,
       // localchain: await E(localchain),
       orchestrationService: await cosmosInterchainService,

contract/test/boot-tools.js

@@ -19,8 +19,6 @@ import '@agoric/vats/src/core/types-ambient.js';
 import '@agoric/zoe/src/zoeService/types-ambient.js';
 const { entries } = Object;
 
-
-
 /**
  * Make powers (zoe, timer and name services, etc.) sufficient to test
  * deploying and using contracts. priceAuthority is a dummy.
@@ -66,7 +64,7 @@ export const mockBootstrapPowers = async (
 
   /**
    * @typedef {Record<Keyword, Issuer<any, any>>} IssuerKeywordRecord
-  */
+   */
   const startUpgradable = ({
     installation,
     issuerKeywordRecord,

contract/test/mintStable.js

@@ -59,7 +59,7 @@ export const makeStableFaucet = ({
     const { creatorFacet: bootstrapSupplier } = await E(zoe).startInstance(
       centralSupply,
       {},
-      /** @type {any} */ ({ bootstrapPaymentValue: value }),      
+      /** @type {any} */ ({ bootstrapPaymentValue: value }),
       { feeMintAccess },
     );
     return E(bootstrapSupplier).getBootstrapPayment();

contract/test/orca-contract.test.js

@@ -221,7 +221,7 @@ const makeTestContext = async t => {
         registerChain: async (name, details) => {
           console.log(`chain registered: ${name}`, details);
         },
-        getChain: async (chainName) => {
+        getChain: async chainName => {
           const state = harden({
             name: 'agoric',
             chainId: `agoriclocal`,

contract/test/support.js

@@ -1,4 +1,4 @@
-import { dirname, join } from 'path';
+import path from 'path';
 import { execa } from 'execa';
 import fse from 'fs-extra';
 import childProcess from 'child_process';
@@ -8,8 +8,7 @@ import { generateMnemonic } from '../tools/wallet.js';
 import { makeRetryUntilCondition } from '../tools/sleep.js';
 import { makeDeployBuilder } from '../tools/deploy.js';
 
-// const setupRegistry = makeSetupRegistry(makeGetFile({ dirname, join }));
-const setupRegistry = makeSetupRegistry(makeGetFile());
+const setupRegistry = makeSetupRegistry(makeGetFile({ dirname: path.dirname(new URL(import.meta.url).pathname), join: path.join }));
 
 const chainConfig = {
   cosmoshub: { expectedAddressPrefix: 'cosmos' },

contract/test/wallet-tools.js

@@ -52,7 +52,7 @@ export const mockWalletFactory = (
         const brand = await E(issuer).getBrand();
         //         /** @type {[Brand, Purse]} */
         /** @type {[Brand<any>, Purse<any, any>]} */
-       const entry = [brand, purse];
+        const entry = [brand, purse];
         return entry;
       }),
     );
@@ -65,7 +65,7 @@ export const mockWalletFactory = (
 
     const depositFacet = Far('DepositFacet', {
       // /** @param {Payment} pmt */
-        /** @param {Payment<any, any>} pmt */
+      /** @param {Payment<any, any>} pmt */
 
       receive: async pmt => {
         const pBrand = await E(pmt).getAllegedBrand();

contract/tools/e2e-tools.js

@@ -112,9 +112,6 @@ const installBundle = async (fullPath, opts) => {
   return { tx, confirm: true };
 };
 
-
-
-
 /**
  * @param {string} address
  * @param {Record<string, number | bigint>} balances
@@ -142,7 +139,6 @@ export const provisionSmartWallet = async (
     // q = makeQueryKit(makeVStorage(lcd)).query,
   },
 ) => {
-
   const q = makeQueryKit(makeVStorage(lcd)).query;
 
   // TODO: skip this query if balances is {}

contract/tools/queryKit.js

@@ -103,8 +103,13 @@ export const makeWalletView = (addr, { query, vstorage }) => {
  * @param {import('@endo/marshal').Marshal<string | null>} [m]
  */
 // export const makeQueryKit = (vstorage, m = makeClientMarshaller()) => {
-export const makeQueryKit = (vstorage, m = /** @type {import('@endo/marshal').Marshal<string | null>} */ (makeClientMarshaller())) => {
-/** @param {['children' | 'data', string][]} paths */
+export const makeQueryKit = (
+  vstorage,
+  m = /** @type {import('@endo/marshal').Marshal<string | null>} */ (
+    makeClientMarshaller()
+  ),
+) => {
+  /** @param {['children' | 'data', string][]} paths */
   const batchQuery = async paths =>
     batchVstorageQuery(vstorage, m.fromCapData, paths);
 

contract/tools/registry.js

@@ -1,10 +1,26 @@
 import { useRegistry, useChain, ConfigContext } from 'starshipjs';
 import path from 'path';
 
-export const makeGetFile = () => filePath => {
-  return path.join(path.dirname(new URL(import.meta.url).pathname), filePath);
+// export const makeGetFile = () => filePath => {
+//   return path.join(path.dirname(new URL(import.meta.url).pathname), filePath);
+// };
+
+/**
+ * @param {Object} [options]
+ * @param {string} [options.dirname]
+ * @param {Function} [options.join]
+ * @returns {(filePath: string) => string} 
+ */
+export const makeGetFile = ({ dirname = path.dirname(new URL(import.meta.url).pathname), join = path.join } = {}) => {
+  return (filePath) => {
+    return join(dirname, filePath);
+  };
 };
 
+/**
+ * @param {(path: string) => string} getFile
+ * @returns { (options?: { config?: string }) => Promise<{ useChain: any }> }
+ */
 export const makeSetupRegistry = getFile => {
   let initialized = false;
 
@@ -14,7 +30,7 @@ export const makeSetupRegistry = getFile => {
     console.log('configFile', configFile);
     const fetcher = await useRegistry(configFile);
     await ConfigContext.init(configFile, fetcher);
-    initialized = true;
+    initialized = true; 
     return { useChain };
   };
 

contract/tools/sleep.js

@@ -1,6 +1,6 @@
 const ambientSetTimeout = globalThis.setTimeout;
 
-const sleep = (ms, { log = (msg) => {}, setTimeout = ambientSetTimeout } = {}) =>
+const sleep = (ms, { log = msg => {}, setTimeout = ambientSetTimeout } = {}) =>
   new Promise(resolve => {
     log(`Sleeping for ${ms}ms...`);
     setTimeout(resolve, ms);
@@ -13,7 +13,7 @@ const retryUntilCondition = async (
   {
     maxRetries = 6,
     retryIntervalMs = 3500,
-    log = (msg) => {},
+    log = msg => {},
     setTimeout = ambientSetTimeout,
   } = {},
 ) => {

contract/tsconfig.json

@@ -12,8 +12,8 @@
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "resolveJsonModule": true,
-    "outDir": "./dist",
+    "outDir": "./dist"
   },
   "include": ["tools", "test"],
   "exclude": ["node_modules"]
-}
+}