@magicblock-labs/ephemeral-validator 0.2.1 → 0.2.2

package/ephemeralValidator.js

@@ -32,10 +32,8 @@ function getExePath() {
         throw new Error(`Couldn't find application binary inside node_modules for ${os}-${(0, os_1.arch)()}, expected location: ${binaryName}`);
     }
 }
-function runEphemeralValidator(location) {
-    const args = process.argv.slice(2);
-    const ephemeralValidator = (0, child_process_1.spawn)(location, args, { stdio: "inherit" });
-    ephemeralValidator.on("exit", (code, signal) => {
+function runWithForwardedExit(child) {
+    child.on("exit", (code, signal) => {
         process.on("exit", () => {
             if (signal) {
                 process.kill(process.pid, signal);
@@ -46,10 +44,15 @@ function runEphemeralValidator(location) {
         });
     });
     process.on("SIGINT", () => {
-        ephemeralValidator.kill("SIGINT");
-        ephemeralValidator.kill("SIGTERM");
+        child.kill("SIGINT");
+        child.kill("SIGTERM");
     });
 }
+function runEphemeralValidator(location) {
+    const args = process.argv.slice(2);
+    const ephemeralValidator = (0, child_process_1.spawn)(location, args, { stdio: "inherit" });
+    runWithForwardedExit(ephemeralValidator);
+}
 function tryPackageEphemeralValidator() {
     try {
         const path = getExePath();
@@ -88,4 +91,5 @@ function trySystemEphemeralValidator() {
     }
     runEphemeralValidator(absoluteBinaryPath);
 }
+// If the first argument is our special command, run the test validator and exit.
 tryPackageEphemeralValidator() || trySystemEphemeralValidator();

package/mbTestValidator.js

@@ -0,0 +1,111 @@
+#!/usr/bin/env node
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const child_process_1 = require("child_process");
+const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
+function runWithForwardedExit(child) {
+    child.on("exit", (code, signal) => {
+        process.on("exit", () => {
+            if (signal) {
+                process.kill(process.pid, signal);
+            }
+            else if (code !== null) {
+                process.exit(code);
+            }
+        });
+    });
+    process.on("SIGINT", () => {
+        child.kill("SIGINT");
+        child.kill("SIGTERM");
+    });
+}
+function dumpsDir() {
+    // Compiled js lives in lib/, source in package root. We want <package-root>/bin/local-dumps
+    const libDir = __dirname;
+    const root = path.resolve(libDir, "..");
+    return path.join(root, "ephemeral-validator", "bin", "local-dumps");
+}
+function runMbTestValidator() {
+    const exe = "solana-test-validator";
+    const dumps = dumpsDir();
+    const p = (name) => path.join(dumps, name);
+    const args = [
+        // programs
+        "--bpf-program",
+        "DELeGGvXpWV2fqJUhqcF5ZSYMS4JTLjteaAMARRSaeSh",
+        p("DELeGGvXpWV2fqJUhqcF5ZSYMS4JTLjteaAMARRSaeSh.so"),
+        "--bpf-program",
+        "noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV",
+        p("noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV.so"),
+        "--bpf-program",
+        "Vrf1RNUjXmQGjmQrQLvJHs9SNkvDJEsRVFPkfSQUwGz",
+        p("Vrf1RNUjXmQGjmQrQLvJHs9SNkvDJEsRVFPkfSQUwGz.so"),
+        "--bpf-program",
+        "noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV",
+        p("noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV.so"),
+        // accounts
+        "--account",
+        "mAGicPQYBMvcYveUZA5F5UNNwyHvfYh5xkLS2Fr1mev",
+        p("mAGicPQYBMvcYveUZA5F5UNNwyHvfYh5xkLS2Fr1mev.json"),
+        "--account",
+        "EpJnX7ueXk7fKojBymqmVuCuwyhDQsYcLVL1XMsBbvDX",
+        p("EpJnX7ueXk7fKojBymqmVuCuwyhDQsYcLVL1XMsBbvDX.json"),
+        "--account",
+        "7JrkjmZPprHwtuvtuGTXp9hwfGYFAQLnLeFM52kqAgXg",
+        p("7JrkjmZPprHwtuvtuGTXp9hwfGYFAQLnLeFM52kqAgXg.json"),
+        "--account",
+        "Cuj97ggrhhidhbu39TijNVqE74xvKJ69gDervRUXAxGh",
+        p("Cuj97ggrhhidhbu39TijNVqE74xvKJ69gDervRUXAxGh.json"),
+        "--account",
+        "5hBR571xnXppuCPveTrctfTU7tJLSN94nq7kv7FRK5Tc",
+        p("5hBR571xnXppuCPveTrctfTU7tJLSN94nq7kv7FRK5Tc.json"),
+        "--account",
+        "F72HqCR8nwYsVyeVd38pgKkjXmXFzVAM8rjZZsXWbdE",
+        p("F72HqCR8nwYsVyeVd38pgKkjXmXFzVAM8rjZZsXWbdE.json"),
+    ];
+    const expectedFiles = [
+        "DELeGGvXpWV2fqJUhqcF5ZSYMS4JTLjteaAMARRSaeSh.so",
+        "noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV.so",
+        "Vrf1RNUjXmQGjmQrQLvJHs9SNkvDJEsRVFPkfSQUwGz.so",
+        "mAGicPQYBMvcYveUZA5F5UNNwyHvfYh5xkLS2Fr1mev.json",
+        "EpJnX7ueXk7fKojBymqmVuCuwyhDQsYcLVL1XMsBbvDX.json",
+        "7JrkjmZPprHwtuvtuGTXp9hwfGYFAQLnLeFM52kqAgXg.json",
+        "Cuj97ggrhhidhbu39TijNVqE74xvKJ69gDervRUXAxGh.json",
+        "5hBR571xnXppuCPveTrctfTU7tJLSN94nq7kv7FRK5Tc.json",
+        "F72HqCR8nwYsVyeVd38pgKkjXmXFzVAM8rjZZsXWbdE.json",
+    ];
+    const missingFiles = expectedFiles
+        .map((f) => p(f))
+        .filter((full) => !fs.existsSync(full));
+    if (missingFiles.length > 0) {
+        console.warn("Warning: missing local dumps files:\n" + missingFiles.join("\n"));
+    }
+    const extraArgs = process.argv.slice(2);
+    const child = (0, child_process_1.spawn)(exe, [...args, ...extraArgs], { stdio: "inherit" });
+    runWithForwardedExit(child);
+}
+runMbTestValidator();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@magicblock-labs/ephemeral-validator",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "description": "MagicBlock Ephemeral Validator",
     "homepage": "https://github.com/magicblock-labs/ephemeral-validator#readme",
     "bugs": {
@@ -12,13 +12,14 @@
     },
     "license": "Business Source License 1.1",
     "bin": {
-        "ephemeral-validator": "ephemeralValidator.js"
+        "ephemeral-validator": "ephemeralValidator.js",
+        "mb-test-validator": "mbTestValidator.js"
     },
     "scripts": {
         "typecheck": "tsc --noEmit",
         "lint": "prettier */*.js \"*/**/*{.js,.ts}\" --check ",
         "lint:fix": "node_modules/.bin/prettier */*.js \"*/**/*{.js,.ts}\" -w",
-        "build": "tsc",
+        "build": "tsc && bash scripts/fetch-local-dumps.sh",
         "dev": "yarn build && node lib/index.js"
     },
     "devDependencies": {
@@ -27,11 +28,11 @@
         "typescript": "^4.9.4"
     },
     "optionalDependencies": {
-        "@magicblock-labs/ephemeral-validator-darwin-arm64": "0.2.1",
-        "@magicblock-labs/ephemeral-validator-darwin-x64": "0.2.1",
-        "@magicblock-labs/ephemeral-validator-linux-arm64": "0.2.1",
-        "@magicblock-labs/ephemeral-validator-linux-x64": "0.2.1",
-        "@magicblock-labs/ephemeral-validator-windows-x64": "0.2.1"
+        "@magicblock-labs/ephemeral-validator-darwin-arm64": "0.2.2",
+        "@magicblock-labs/ephemeral-validator-darwin-x64": "0.2.2",
+        "@magicblock-labs/ephemeral-validator-linux-arm64": "0.2.2",
+        "@magicblock-labs/ephemeral-validator-linux-x64": "0.2.2",
+        "@magicblock-labs/ephemeral-validator-windows-x64": "0.2.2"
     },
     "publishConfig": {
         "access": "public"