@acala-network/chopsticks-core 0.8.4 → 0.8.5-1

package/lib/api.d.ts

@@ -29,16 +29,7 @@ type SignedBlock = {
  * @example Instantiate an API
  *
  * ```ts
- * let provider: ProviderInterface
- * if (options.genesis) {
- *  if (typeof options.genesis === 'string') {
- *    provider = await GenesisProvider.fromUrl(options.genesis)
- *  } else {
- *    provider = new GenesisProvider(options.genesis)
- *  }
- * } else {
- *  provider = new WsProvider(options.endpoint)
- * }
+ * const provider = new WsProvider(options.endpoint)
  * const api = new Api(provider)
  * await api.isReady
  * ```

package/lib/api.js

@@ -30,16 +30,7 @@ const utils_1 = require("./utils");
  * @example Instantiate an API
  *
  * ```ts
- * let provider: ProviderInterface
- * if (options.genesis) {
- *  if (typeof options.genesis === 'string') {
- *    provider = await GenesisProvider.fromUrl(options.genesis)
- *  } else {
- *    provider = new GenesisProvider(options.genesis)
- *  }
- * } else {
- *  provider = new WsProvider(options.endpoint)
- * }
+ * const provider = new WsProvider(options.endpoint)
  * const api = new Api(provider)
  * await api.isReady
  * ```

package/lib/blockchain/head-state.d.ts

@@ -1,5 +1,5 @@
 import { Block } from './block';
-type Callback = (block: Block, pairs: [string, string][]) => void | Promise<void>;
+type Callback = (block: Block, pairs: [string, string | null][]) => void | Promise<void>;
 export declare const randomId: () => string;
 export declare class HeadState {
     #private;

package/lib/blockchain/head-state.js

@@ -48,7 +48,7 @@ class HeadState {
             const id = (0, exports.randomId)();
             __classPrivateFieldGet(this, _HeadState_storageListeners, "f")[id] = [keys, cb];
             for (const key of keys) {
-                __classPrivateFieldGet(this, _HeadState_oldValues, "f")[key] = yield __classPrivateFieldGet(this, _HeadState_head, "f").get(key);
+                __classPrivateFieldGet(this, _HeadState_oldValues, "f")[key] = yield __classPrivateFieldGet(this, _HeadState_head, "f").get(key).then((val) => val || null);
             }
             return id;
         });
@@ -61,7 +61,7 @@ class HeadState {
             const id = (0, exports.randomId)();
             const codeKey = (0, util_1.stringToHex)(':code');
             __classPrivateFieldGet(this, _HeadState_storageListeners, "f")[id] = [[codeKey], cb];
-            __classPrivateFieldGet(this, _HeadState_oldValues, "f")[codeKey] = yield __classPrivateFieldGet(this, _HeadState_head, "f").get(codeKey);
+            __classPrivateFieldGet(this, _HeadState_oldValues, "f")[codeKey] = yield __classPrivateFieldGet(this, _HeadState_head, "f").get(codeKey).then((val) => val || null);
             return id;
         });
     }

package/lib/blockchain/index.d.ts

@@ -1,11 +1,11 @@
 import { ApplyExtrinsicResult } from '@polkadot/types/interfaces';
-import { DataSource } from 'typeorm';
 import { HexString } from '@polkadot/util/types';
 import { RegisteredTypes } from '@polkadot/types/types';
 import type { TransactionValidity } from '@polkadot/types/interfaces/txqueue';
 import { Api } from '../api';
 import { Block } from './block';
 import { BuildBlockMode, BuildBlockParams, DownwardMessage, HorizontalMessage, TxPool } from './txpool';
+import { Database } from '../database';
 import { HeadState } from './head-state';
 import { InherentProvider } from './inherent';
 import { OffchainWorker } from '../offchain';
@@ -17,7 +17,7 @@ export interface Options {
     /** Inherent provider, for creating inherents. */
     inherentProvider: InherentProvider;
     /** Datasource for caching storage and blocks data. */
-    db?: DataSource;
+    db?: Database;
     /** Used to create the initial head. */
     header: {
         number: number;
@@ -65,7 +65,7 @@ export declare class Blockchain {
     /** API instance, for getting on-chain data. */
     readonly api: Api;
     /** Datasource for caching storage and blocks data. */
-    readonly db: DataSource | undefined;
+    readonly db: Database | undefined;
     /** Enable mock signature. Any signature starts with 0xdeadbeef and filled by 0xcd is considered valid */
     readonly mockSignatureHost: boolean;
     /** Allow wasm unresolved imports. */
@@ -88,7 +88,7 @@ export declare class Blockchain {
      * Try to load block from db and register it.
      * If pass in number, get block by number, else get block by hash.
      */
-    loadBlockFromDB(key: number | HexString): Promise<Block | undefined>;
+    loadBlockFromDB(hashOrNumber: number | HexString): Promise<Block | undefined>;
     /**
      * Get block by number.
      */

package/lib/blockchain/index.js

@@ -25,7 +25,6 @@ exports.Blockchain = void 0;
 const util_crypto_1 = require("@polkadot/util-crypto");
 const util_1 = require("@polkadot/util");
 const block_1 = require("./block");
-const entities_1 = require("../db/entities");
 const txpool_1 = require("./txpool");
 const head_state_1 = require("./head-state");
 const offchain_1 = require("../offchain");
@@ -104,22 +103,19 @@ class Blockchain {
         logger.debug(`Runtime log level set to ${logger.level}`);
     }
     saveBlockToDB(block) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.db) {
                 const { hash, number, header, extrinsics } = block;
                 // delete old ones with the same block number if any, keep the latest one
-                yield this.db.transaction((transactionalEntityManager) => __awaiter(this, void 0, void 0, function* () {
-                    var _a;
-                    yield transactionalEntityManager.getRepository(entities_1.BlockEntity).delete({ number });
-                    yield transactionalEntityManager.getRepository(entities_1.BlockEntity).upsert({
-                        hash,
-                        number,
-                        header: yield header,
-                        extrinsics: yield extrinsics,
-                        parentHash: (_a = (yield block.parentBlock)) === null || _a === void 0 ? void 0 : _a.hash,
-                        storageDiff: yield block.storageDiff(),
-                    }, ['hash']);
-                }));
+                yield this.db.saveBlock({
+                    hash,
+                    number,
+                    header: (yield header).toHex(),
+                    extrinsics: yield extrinsics,
+                    parentHash: ((_a = (yield block.parentBlock)) === null || _a === void 0 ? void 0 : _a.hash) || null,
+                    storageDiff: yield block.storageDiff(),
+                });
             }
         });
     }
@@ -127,13 +123,13 @@ class Blockchain {
      * Try to load block from db and register it.
      * If pass in number, get block by number, else get block by hash.
      */
-    loadBlockFromDB(key) {
+    loadBlockFromDB(hashOrNumber) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.db) {
-                const blockData = yield this.db
-                    .getRepository(entities_1.BlockEntity)
-                    .findOne({ where: { [typeof key === 'number' ? 'number' : 'hash']: key } });
+                const blockData = typeof hashOrNumber === 'number'
+                    ? yield this.db.queryBlockByNumber(hashOrNumber)
+                    : yield this.db.queryBlock(hashOrNumber);
                 if (blockData) {
                     const { hash, number, header, extrinsics } = blockData;
                     const parentHash = blockData.parentHash || undefined;
@@ -242,7 +238,7 @@ class Blockchain {
             delete __classPrivateFieldGet(this, _Blockchain_blocksByHash, "f")[block.hash];
             // delete from db
             if (this.db) {
-                yield this.db.getRepository(entities_1.BlockEntity).delete({ hash: block.hash });
+                yield this.db.deleteBlock(block.hash);
             }
         });
     }
@@ -452,7 +448,8 @@ class Blockchain {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             yield (0, wasm_executor_1.releaseWorker)();
-            yield ((_a = this.db) === null || _a === void 0 ? void 0 : _a.destroy());
+            yield this.api.disconnect();
+            yield ((_a = this.db) === null || _a === void 0 ? void 0 : _a.close());
         });
     }
 }

package/lib/blockchain/storage-layer.d.ts

@@ -1,5 +1,5 @@
-import { DataSource } from 'typeorm';
 import { Api } from '../api';
+import { Database } from '../database';
 export declare const enum StorageValueKind {
     Deleted = "Deleted",
     DeletedPrefix = "DeletedPrefix"
@@ -25,7 +25,7 @@ export interface StorageLayerProvider {
 }
 export declare class RemoteStorageLayer implements StorageLayerProvider {
     #private;
-    constructor(api: Api, at: string, db: DataSource | undefined);
+    constructor(api: Api, at: string, db: Database | undefined);
     get(key: string, _cache: boolean): Promise<StorageValue>;
     foldInto(_into: StorageLayer): Promise<StorageLayerProvider>;
     fold(): Promise<void>;

package/lib/blockchain/storage-layer.js

@@ -49,7 +49,6 @@ var _RemoteStorageLayer_api, _RemoteStorageLayer_at, _RemoteStorageLayer_db, _Re
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageLayer = exports.RemoteStorageLayer = exports.StorageValueKind = void 0;
 const lodash_1 = __importDefault(require("lodash"));
-const entities_1 = require("../db/entities");
 const logger_1 = require("../logger");
 const key_cache_1 = __importStar(require("../utils/key-cache"));
 const logger = logger_1.defaultLogger.child({ name: 'layer' });
@@ -72,16 +71,15 @@ class RemoteStorageLayer {
     get(key, _cache) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const keyValuePair = (_a = __classPrivateFieldGet(this, _RemoteStorageLayer_db, "f")) === null || _a === void 0 ? void 0 : _a.getRepository(entities_1.KeyValuePair);
             if (__classPrivateFieldGet(this, _RemoteStorageLayer_db, "f")) {
-                const res = yield (keyValuePair === null || keyValuePair === void 0 ? void 0 : keyValuePair.findOne({ where: { key, blockHash: __classPrivateFieldGet(this, _RemoteStorageLayer_at, "f") } }));
+                const res = yield __classPrivateFieldGet(this, _RemoteStorageLayer_db, "f").queryStorage(__classPrivateFieldGet(this, _RemoteStorageLayer_at, "f"), key);
                 if (res) {
-                    return (_b = res.value) !== null && _b !== void 0 ? _b : undefined;
+                    return (_a = res.value) !== null && _a !== void 0 ? _a : undefined;
                 }
             }
             logger.trace({ at: __classPrivateFieldGet(this, _RemoteStorageLayer_at, "f"), key }, 'RemoteStorageLayer get');
             const data = yield __classPrivateFieldGet(this, _RemoteStorageLayer_api, "f").getStorage(key, __classPrivateFieldGet(this, _RemoteStorageLayer_at, "f"));
-            keyValuePair === null || keyValuePair === void 0 ? void 0 : keyValuePair.upsert({ key, blockHash: __classPrivateFieldGet(this, _RemoteStorageLayer_at, "f"), value: data }, ['key', 'blockHash']);
+            (_b = __classPrivateFieldGet(this, _RemoteStorageLayer_db, "f")) === null || _b === void 0 ? void 0 : _b.saveStorage(__classPrivateFieldGet(this, _RemoteStorageLayer_at, "f"), key, data);
             return data !== null && data !== void 0 ? data : undefined;
         });
     }

package/lib/chopsticks-provider.d.ts

@@ -0,0 +1,32 @@
+import { ProviderInterface, ProviderInterfaceCallback, ProviderInterfaceEmitCb, ProviderInterfaceEmitted } from '@polkadot/rpc-provider/types';
+import { Blockchain } from './blockchain';
+import { Database } from './database';
+interface SubscriptionHandler {
+    callback: ProviderInterfaceCallback;
+    type: string;
+}
+/**
+ * Provider for local chopsticks chain
+ */
+export declare class ChopsticksProvider implements ProviderInterface {
+    #private;
+    readonly chain: Blockchain;
+    constructor(chain: Blockchain);
+    static fromEndpoint: (endpoint: string, block?: number | string | null, db?: Database) => Promise<ChopsticksProvider>;
+    get hasSubscriptions(): boolean;
+    get isClonable(): boolean;
+    get isConnected(): boolean;
+    get isReady(): Promise<void>;
+    clone: () => ChopsticksProvider;
+    connect: () => Promise<void>;
+    disconnect: () => Promise<void>;
+    on: (type: ProviderInterfaceEmitted, sub: ProviderInterfaceEmitCb) => (() => void);
+    subscriptionManager: {
+        subscribe: (method: string, subid: string, onCancel?: () => void) => (data: any) => void;
+        unsubscribe: (subid: string) => void;
+    };
+    send: <T>(method: string, params: unknown[], _isCacheable?: boolean, subscription?: SubscriptionHandler) => Promise<T>;
+    subscribe(type: string, method: string, params: unknown[], callback: ProviderInterfaceCallback): Promise<number | string>;
+    unsubscribe(_type: string, method: string, id: number | string): Promise<boolean>;
+}
+export {};