@acala-network/chopsticks 0.8.4 → 0.8.5-1

package/lib/context.d.ts

@@ -1,5 +1,7 @@
 import './utils/tunnel';
+import { GenesisProvider } from '@acala-network/chopsticks-core';
 import { Config } from './schema';
+export declare const genesisFromUrl: (url: string) => Promise<GenesisProvider>;
 export declare const setupContext: (argv: Config, overrideParent?: boolean) => Promise<{
     chain: import("@acala-network/chopsticks-core").Blockchain;
 }>;

package/lib/context.js

@@ -1,18 +1,70 @@
 "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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupContext = void 0;
+exports.setupContext = exports.genesisFromUrl = void 0;
 require("./utils/tunnel");
-const entities_1 = require("@acala-network/chopsticks-core/db/entities");
 const chopsticks_core_1 = require("@acala-network/chopsticks-core");
+const chopsticks_db_1 = require("@acala-network/chopsticks-db");
 const override_1 = require("./utils/override");
+const axios_1 = __importDefault(require("axios"));
 const logger = chopsticks_core_1.defaultLogger.child({ name: 'setup-context' });
+const genesisFromUrl = async (url) => {
+    const getFile = async (url) => {
+        if ((0, chopsticks_core_1.isUrl)(url)) {
+            return axios_1.default.get(url).then((x) => x.data);
+        }
+        else if (typeof process === 'object') {
+            const { lstatSync, readFileSync } = await Promise.resolve().then(() => __importStar(require('node:fs')));
+            if (lstatSync(url).isFile()) {
+                return JSON.parse(String(readFileSync(url)));
+            }
+        }
+        throw Error(`invalid genesis path or url ${url}`);
+    };
+    return new chopsticks_core_1.GenesisProvider(await getFile(url));
+};
+exports.genesisFromUrl = genesisFromUrl;
 const setupContext = async (argv, overrideParent = false) => {
+    let genesis;
+    if (argv.genesis) {
+        if (typeof argv.genesis === 'string') {
+            genesis = await (0, exports.genesisFromUrl)(argv.genesis);
+        }
+        else {
+            genesis = new chopsticks_core_1.GenesisProvider(argv.genesis);
+        }
+    }
     const chain = await (0, chopsticks_core_1.setup)({
         endpoint: argv.endpoint,
         block: argv.block,
-        genesis: argv.genesis,
+        genesis,
         buildBlockMode: argv['build-block-mode'],
-        db: argv.db,
+        db: argv.db ? new chopsticks_db_1.SqliteDatabase(argv.db) : undefined,
         mockSignatureHost: argv['mock-signature-host'],
         allowUnresolvedImports: argv['allow-unresolved-imports'],
         runtimeLogLevel: argv['runtime-log-level'],
@@ -23,20 +75,20 @@ const setupContext = async (argv, overrideParent = false) => {
     // load block from db
     if (chain.db) {
         if (argv.resume) {
-            const where = {};
+            let blockData = null;
             switch (typeof argv.resume) {
                 case 'string':
-                    where.hash = argv.resume;
+                    blockData = await chain.db.queryBlock(argv.resume);
                     break;
                 case 'number':
-                    where.number = argv.resume;
+                    blockData = await chain.db.queryBlockByNumber(argv.resume);
                     break;
                 default:
+                    blockData = await chain.db.queryHighestBlock();
                     break;
             }
-            const blockData = await chain.db.getRepository(entities_1.BlockEntity).findOne({ where, order: { number: 'desc' } });
             if (blockData) {
-                const block = await chain.loadBlockFromDB(blockData?.number);
+                const block = await chain.loadBlockFromDB(blockData.number);
                 block && (await chain.setHead(block));
                 logger.info(`Resume from block ${blockData.number}, hash: ${blockData.hash}`);
             }

package/lib/server.js

@@ -29,12 +29,14 @@ const zod_1 = require("zod");
 const ws_1 = __importStar(require("ws"));
 const logger_1 = require("./logger");
 const logger = logger_1.defaultLogger.child({ name: 'ws' });
-const requestSchema = zod_1.z.object({
+const singleRequest = zod_1.z.object({
     id: zod_1.z.number(),
     jsonrpc: zod_1.z.literal('2.0'),
     method: zod_1.z.string(),
     params: zod_1.z.array(zod_1.z.any()).default([]),
 });
+const batchRequest = zod_1.z.array(singleRequest);
+const requestSchema = zod_1.z.union([singleRequest, batchRequest]);
 const parseRequest = (request) => {
     try {
         return JSON.parse(request);
@@ -103,6 +105,33 @@ const createServer = async (handler, port) => {
                 }
             },
         };
+        const processRequest = async (req) => {
+            logger.trace({
+                id: req.id,
+                method: req.method,
+            }, 'Received message');
+            try {
+                const resp = await handler(req, subscriptionManager);
+                logger.trace({
+                    id: req.id,
+                    method: req.method,
+                    result: (0, logger_1.truncate)(resp),
+                }, 'Response for request');
+                return {
+                    id: req.id,
+                    jsonrpc: '2.0',
+                    result: resp ?? null,
+                };
+            }
+            catch (e) {
+                logger.info('Error handling request: %s %o', e, e.stack);
+                return {
+                    id: req.id,
+                    jsonrpc: '2.0',
+                    error: e instanceof chopsticks_core_1.ResponseError ? e : { code: -32603, message: `Internal ${e}` },
+                };
+            }
+        };
         ws.on('close', () => {
             logger.debug('Connection closed');
             for (const [subid, onCancel] of Object.entries(subscriptions)) {
@@ -132,30 +161,15 @@ const createServer = async (handler, port) => {
                 return;
             }
             const { data: req } = parsed;
-            logger.trace({
-                id: req.id,
-                method: req.method,
-            }, 'Received message');
-            try {
-                const resp = await handler(req, subscriptionManager);
-                logger.trace({
-                    id: req.id,
-                    method: req.method,
-                    result: (0, logger_1.truncate)(resp),
-                }, 'Sending response for request');
-                send({
-                    id: req.id,
-                    jsonrpc: '2.0',
-                    result: resp ?? null,
-                });
+            if (Array.isArray(req)) {
+                logger.trace({ req }, 'Received batch request');
+                const resp = await Promise.all(req.map(processRequest));
+                send(resp);
             }
-            catch (e) {
-                logger.info('Error handling request: %s %o', e, e.stack);
-                send({
-                    id: req.id,
-                    jsonrpc: '2.0',
-                    error: e instanceof chopsticks_core_1.ResponseError ? e : { code: -32603, message: `Internal ${e}` },
-                });
+            else {
+                logger.trace({ req }, 'Received single request');
+                const resp = await processRequest(req);
+                send(resp);
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.8.4",
+  "version": "0.8.5-1",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "bin": "./chopsticks.js",
@@ -17,7 +17,8 @@
     "docs:prep": "typedoc"
   },
   "dependencies": {
-    "@acala-network/chopsticks-core": "0.8.4",
+    "@acala-network/chopsticks-core": "0.8.5-1",
+    "@acala-network/chopsticks-db": "0.8.5-1",
     "@pnpm/npm-conf": "^2.2.2",
     "@polkadot/api": "^10.9.1",
     "axios": "^1.5.1",