merge fixes

moonbeam-foundation · Dec 12, 2024 · 481bb34 · 481bb34
1 parent 3d2ffe2
commit 481bb34
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 235 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/typescript-api/scripts/scrapeMetadata.ts b/typescript-api/scripts/scrapeMetadata.ts
@@ -1,28 +1,29 @@
 import fs from "node:fs";
-import { ChildProcessWithoutNullStreams, execSync, spawn } from "node:child_process";
+import { execSync, spawn } from "node:child_process";
+import type { ChildProcessWithoutNullStreams } from "node:child_process";
 import path from "node:path";
 
 const CHAINS = ["moonbase", "moonriver", "moonbeam"];
 
-const fetchMetadata = async (port: number = 9933) => {
+const fetchMetadata = async (port = 9933) => {
   const maxRetries = 60;
   const sleepTime = 500;
   const url = `http://localhost:${port}`;
   const payload = {
     id: "1",
     jsonrpc: "2.0",
     method: "state_getMetadata",
-    params: [],
+    params: []
   };
 
   for (let i = 0; i < maxRetries; i++) {
     try {
       const response = await fetch(url, {
         method: "POST",
         headers: {
-          "Content-Type": "application/json",
+          "Content-Type": "application/json"
         },
-        body: JSON.stringify(payload),
+        body: JSON.stringify(payload)
       });
 
       if (!response.ok) {
@@ -40,7 +41,7 @@ const fetchMetadata = async (port: number = 9933) => {
   throw new Error("Error fetching metadata");
 };
 
-let nodes: { [key: string]: ChildProcessWithoutNullStreams } = {};
+const nodes: { [key: string]: ChildProcessWithoutNullStreams } = {};
 
 async function main() {
   const runtimeChainSpec = process.argv[2];
@@ -67,7 +68,7 @@ async function main() {
       "--tmp",
       `--chain=${chain}-dev`,
       "--wasm-execution=interpreted-i-know-what-i-do",
-      "--rpc-port=9933",
+      "--rpc-port=9933"
     ]);
 
     console.log(`Getting ${chain} metadata`);

diff --git a/typescript-api/src/moonbase/interfaces/moon/definitions.ts b/typescript-api/src/moonbase/interfaces/moon/definitions.ts
@@ -3,6 +3,6 @@ import { moonbeamDefinitions } from "moonbeam-types-bundle";
 export default {
   types: {},
   rpc: {
-    ...moonbeamDefinitions.rpc?.moon,
-  },
+    ...moonbeamDefinitions.rpc?.moon
+  }
 };
diff --git a/typescript-api/src/moonbeam/interfaces/moon/definitions.ts b/typescript-api/src/moonbeam/interfaces/moon/definitions.ts
@@ -3,6 +3,6 @@ import { moonbeamDefinitions } from "moonbeam-types-bundle";
 export default {
   types: {},
   rpc: {
-    ...moonbeamDefinitions.rpc?.moon,
-  },
+    ...moonbeamDefinitions.rpc?.moon
+  }
 };
diff --git a/typescript-api/src/moonriver/interfaces/moon/definitions.ts b/typescript-api/src/moonriver/interfaces/moon/definitions.ts
@@ -3,6 +3,6 @@ import { moonbeamDefinitions } from "moonbeam-types-bundle";
 export default {
   types: {},
   rpc: {
-    ...moonbeamDefinitions.rpc?.moon,
-  },
+    ...moonbeamDefinitions.rpc?.moon
+  }
 };
diff --git a/typescript-api/tsup.config.ts b/typescript-api/tsup.config.ts
@@ -1,38 +1,44 @@
-import { defineConfig } from 'tsup'
-import { execSync } from 'child_process'
+import { defineConfig } from "tsup";
+import { execSync } from "node:child_process";
 
 export default defineConfig([
   {
-    entry: ['src/moonbeam'],
-    outDir: 'dist/moonbeam',
-    format: ['esm', 'cjs'],
+    entry: ["src/moonbeam"],
+    outDir: "dist/moonbeam",
+    format: ["esm", "cjs"],
     splitting: false,
     clean: true,
     onSuccess: async () => {
-      console.log('Running tsc for moonbeam...')
-      execSync('pnpm tsc -p src/moonbeam/tsconfig.json --emitDeclarationOnly', { stdio: 'inherit' })
+      console.log("Running tsc for moonbeam...");
+      execSync("pnpm tsc -p src/moonbeam/tsconfig.json --emitDeclarationOnly", {
+        stdio: "inherit"
+      });
     }
   },
   {
-    entry: ['src/moonriver'],
-    outDir: 'dist/moonriver',
-    format: ['esm', 'cjs'],
+    entry: ["src/moonriver"],
+    outDir: "dist/moonriver",
+    format: ["esm", "cjs"],
     splitting: false,
     clean: true,
     onSuccess: async () => {
-      console.log('Running tsc for moonriver...')
-      execSync('pnpm tsc -p src/moonriver/tsconfig.json --emitDeclarationOnly', { stdio: 'inherit' })
+      console.log("Running tsc for moonriver...");
+      execSync("pnpm tsc -p src/moonriver/tsconfig.json --emitDeclarationOnly", {
+        stdio: "inherit"
+      });
     }
   },
   {
-    entry: ['src/moonbase'],
-    outDir: 'dist/moonbase',
-    format: ['esm', 'cjs'],
+    entry: ["src/moonbase"],
+    outDir: "dist/moonbase",
+    format: ["esm", "cjs"],
     splitting: false,
     clean: true,
     onSuccess: async () => {
-      console.log('Running tsc for moonbase...')
-      execSync('pnpm tsc -p src/moonbase/tsconfig.json --emitDeclarationOnly', { stdio: 'inherit' })
+      console.log("Running tsc for moonbase...");
+      execSync("pnpm tsc -p src/moonbase/tsconfig.json --emitDeclarationOnly", {
+        stdio: "inherit"
+      });
     }
   }
-])
+]);