@acala-network/chopsticks-db 0.8.5-1 → 0.8.5-2

package/lib/base-sql.d.ts

@@ -4,12 +4,12 @@ import { HexString } from '@polkadot/util/types';
 export declare abstract class BaseSqlDatabase implements Database {
     abstract datasource: Promise<DataSource>;
     close: () => Promise<void>;
-    saveBlock: (block: BlockEntry) => Promise<void>;
-    queryBlock: (hash: HexString) => Promise<BlockEntry | null>;
-    queryBlockByNumber: (number: number) => Promise<BlockEntry | null>;
-    queryHighestBlock: () => Promise<BlockEntry | null>;
-    deleteBlock: (hash: HexString) => Promise<void>;
-    blocksCount: () => Promise<number>;
-    saveStorage: (blockHash: HexString, key: HexString, value: HexString | null) => Promise<void>;
-    queryStorage: (blockHash: HexString, key: HexString) => Promise<KeyValueEntry | null>;
+    saveBlock(block: BlockEntry): Promise<void>;
+    queryBlock(hash: HexString): Promise<BlockEntry | null>;
+    queryBlockByNumber(number: number): Promise<BlockEntry | null>;
+    queryHighestBlock(): Promise<BlockEntry | null>;
+    deleteBlock(hash: HexString): Promise<void>;
+    blocksCount(): Promise<number>;
+    saveStorage(blockHash: HexString, key: HexString, value: HexString | null): Promise<void>;
+    queryStorage(blockHash: HexString, key: HexString): Promise<KeyValueEntry | null>;
 }

package/lib/base-sql.js

@@ -1,69 +1,60 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseSqlDatabase = void 0;
 const entities_1 = require("./db/entities");
 class BaseSqlDatabase {
     constructor() {
-        this.close = () => __awaiter(this, void 0, void 0, function* () {
-            const db = yield this.datasource;
-            yield db.destroy();
-        });
-        this.saveBlock = (block) => __awaiter(this, void 0, void 0, function* () {
-            const db = yield this.datasource;
-            const { hash, number, header, extrinsics, parentHash, storageDiff } = block;
-            yield db.transaction((transactionalEntityManager) => __awaiter(this, void 0, void 0, function* () {
-                yield transactionalEntityManager.getRepository(entities_1.BlockEntity).delete({ number });
-                yield transactionalEntityManager.getRepository(entities_1.BlockEntity).upsert({
-                    hash,
-                    number,
-                    header,
-                    extrinsics,
-                    parentHash,
-                    storageDiff,
-                }, ['hash']);
-            }));
-        });
-        this.queryBlock = (hash) => __awaiter(this, void 0, void 0, function* () {
-            const db = yield this.datasource;
-            return db.getRepository(entities_1.BlockEntity).findOne({ where: { hash } });
-        });
-        this.queryBlockByNumber = (number) => __awaiter(this, void 0, void 0, function* () {
-            const db = yield this.datasource;
-            return db.getRepository(entities_1.BlockEntity).findOne({ where: { number }, order: { number: 'desc' } });
-        });
-        this.queryHighestBlock = () => __awaiter(this, void 0, void 0, function* () {
-            const db = yield this.datasource;
-            return db.getRepository(entities_1.BlockEntity).findOne({ where: {}, order: { number: 'desc' } });
-        });
-        this.deleteBlock = (hash) => __awaiter(this, void 0, void 0, function* () {
-            const db = yield this.datasource;
-            yield db.getRepository(entities_1.BlockEntity).delete({ hash });
-        });
-        this.blocksCount = () => __awaiter(this, void 0, void 0, function* () {
-            const db = yield this.datasource;
-            return db.getRepository(entities_1.BlockEntity).count();
-        });
-        this.saveStorage = (blockHash, key, value) => __awaiter(this, void 0, void 0, function* () {
-            const db = yield this.datasource;
-            yield db.getRepository(entities_1.KeyValuePair).upsert({
-                blockHash,
-                key,
-                value,
-            }, ['blockHash', 'key']);
-        });
-        this.queryStorage = (blockHash, key) => __awaiter(this, void 0, void 0, function* () {
-            const db = yield this.datasource;
-            return db.getRepository(entities_1.KeyValuePair).findOne({ where: { blockHash, key } });
+        this.close = async () => {
+            const db = await this.datasource;
+            await db.destroy();
+        };
+    }
+    async saveBlock(block) {
+        const db = await this.datasource;
+        const { hash, number, header, extrinsics, parentHash, storageDiff } = block;
+        await db.transaction(async (transactionalEntityManager) => {
+            await transactionalEntityManager.getRepository(entities_1.BlockEntity).delete({ number });
+            await transactionalEntityManager.getRepository(entities_1.BlockEntity).upsert({
+                hash,
+                number,
+                header,
+                extrinsics,
+                parentHash,
+                storageDiff,
+            }, ['hash']);
         });
     }
+    async queryBlock(hash) {
+        const db = await this.datasource;
+        return db.getRepository(entities_1.BlockEntity).findOne({ where: { hash } });
+    }
+    async queryBlockByNumber(number) {
+        const db = await this.datasource;
+        return db.getRepository(entities_1.BlockEntity).findOne({ where: { number }, order: { number: 'desc' } });
+    }
+    async queryHighestBlock() {
+        const db = await this.datasource;
+        return db.getRepository(entities_1.BlockEntity).findOne({ where: {}, order: { number: 'desc' } });
+    }
+    async deleteBlock(hash) {
+        const db = await this.datasource;
+        await db.getRepository(entities_1.BlockEntity).delete({ hash });
+    }
+    async blocksCount() {
+        const db = await this.datasource;
+        return db.getRepository(entities_1.BlockEntity).count();
+    }
+    async saveStorage(blockHash, key, value) {
+        const db = await this.datasource;
+        await db.getRepository(entities_1.KeyValuePair).upsert({
+            blockHash,
+            key,
+            value,
+        }, ['blockHash', 'key']);
+    }
+    async queryStorage(blockHash, key) {
+        const db = await this.datasource;
+        return db.getRepository(entities_1.KeyValuePair).findOne({ where: { blockHash, key } });
+    }
 }
 exports.BaseSqlDatabase = BaseSqlDatabase;

package/lib/db/browser.js

@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -41,7 +32,7 @@ const localforage_1 = require("localforage");
 const sql_js_1 = __importDefault(require("sql.js"));
 const entities = __importStar(require("./entities"));
 const sql_wasm_1 = require("./sql-wasm");
-const openDb = (location) => __awaiter(void 0, void 0, void 0, function* () {
+const openDb = async (location) => {
     if (!globalThis.localforage) {
         globalThis.localforage = (0, localforage_1.createInstance)({ name: 'chopsticks' });
     }
@@ -58,7 +49,7 @@ const openDb = (location) => __awaiter(void 0, void 0, void 0, function* () {
             wasmBinary: sql_wasm_1.SQL_WASM_BYTES,
         },
     });
-    yield source.initialize();
+    await source.initialize();
     return source;
-});
+};
 exports.openDb = openDb;

package/lib/db/entities.d.ts

@@ -1,4 +1,4 @@
-import { BlockEntry, KeyValueEntry } from '@acala-network/chopsticks-core/src/database';
+import { BlockEntry, KeyValueEntry } from '@acala-network/chopsticks-core';
 import { EntitySchema } from 'typeorm';
 export declare const KeyValuePair: EntitySchema<KeyValueEntry>;
 export declare const BlockEntity: EntitySchema<BlockEntry>;

package/lib/db/index.js

@@ -22,28 +22,22 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.openDb = void 0;
 const typeorm_1 = require("typeorm");
 const entities = __importStar(require("./entities"));
-const openDb = (dbPath) => __awaiter(void 0, void 0, void 0, function* () {
+const openDb = async (dbPath) => {
     const source = new typeorm_1.DataSource({
         type: 'sqlite',
         database: dbPath,
         entities: Object.values(entities),
         synchronize: true,
         logging: false,
+        enableWAL: true,
+        busyErrorRetry: 1000,
+        busyTimeout: 5000, // retry for 5 seconds, sqlite PRAGMA busy_timeout
     });
-    yield source.initialize();
+    await source.initialize();
     return source;
-});
+};
 exports.openDb = openDb;

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@acala-network/chopsticks-db",
-  "version": "0.8.5-1",
+  "version": "0.8.5-2",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "scripts": {
     "clean": "rm -rf lib tsconfig.tsbuildinfo",
     "pack-wasm": "scripts/pack-wasm.cjs",
-    "build": "yarn pack-wasm; tsc -p ./tsconfig.json",
-    "docs:prep": "typedoc"
+    "build": "yarn pack-wasm; tsc -p ./tsconfig.json"
   },
   "dependencies": {
-    "@acala-network/chopsticks-core": "0.8.5-1",
+    "@acala-network/chopsticks-core": "0.8.5-2",
+    "@polkadot/util": "^12.5.1",
+    "@polkadot/wasm-util": "^7.2.2",
     "localforage": "^1.10.0",
     "sql.js": "^1.8.0",
     "sqlite3": "^5.1.6",