@acala-network/chopsticks 0.5.1 → 0.5.3

package/lib/blockchain/index.js

@@ -113,7 +113,7 @@ class Blockchain {
         const registry = await this.head.registry;
         const validity = registry.createType('TransactionValidity', res.result);
         if (validity.isOk) {
-            this.#txpool.submitExtrinsic(extrinsic);
+            await this.#txpool.submitExtrinsic(extrinsic);
             return (0, util_crypto_1.blake2AsHex)(extrinsic, 256);
         }
         throw validity.asErr;

package/lib/blockchain/txpool.d.ts

@@ -28,7 +28,8 @@ export declare class TxPool {
     readonly event: EventEmitter;
     constructor(chain: Blockchain, inherentProvider: InherentProvider, mode?: BuildBlockMode);
     get pendingExtrinsics(): HexString[];
-    submitExtrinsic(extrinsic: HexString): void;
+    pendingExtrinsicsBy(address: string): HexString[];
+    submitExtrinsic(extrinsic: HexString): Promise<void>;
     submitUpwardMessages(id: number, ump: HexString[]): void;
     submitDownwardMessages(dmp: DownwardMessage[]): void;
     submitHorizontalMessages(id: number, hrmp: HorizontalMessage[]): void;

package/lib/blockchain/txpool.js

@@ -32,12 +32,20 @@ class TxPool {
         this.#inherentProvider = inherentProvider;
     }
     get pendingExtrinsics() {
-        return this.#pool;
+        return this.#pool.map(({ extrinsic }) => extrinsic);
     }
-    submitExtrinsic(extrinsic) {
-        this.#pool.push(extrinsic);
+    pendingExtrinsicsBy(address) {
+        return this.#pool.filter(({ signer }) => signer === address).map(({ extrinsic }) => extrinsic);
+    }
+    async submitExtrinsic(extrinsic) {
+        this.#pool.push({ extrinsic, signer: await this.#getSigner(extrinsic) });
         this.#maybeBuildBlock();
     }
+    async #getSigner(extrinsic) {
+        const registry = await this.#chain.head.registry;
+        const tx = registry.createType('GenericExtrinsic', extrinsic);
+        return tx.signer.toString();
+    }
     submitUpwardMessages(id, ump) {
         if (!this.#ump[id]) {
             this.#ump[id] = [];
@@ -79,7 +87,7 @@ class TxPool {
         await this.upcomingBlocks();
     }
     async buildBlock(params) {
-        const transactions = params?.transactions || this.#pool.splice(0);
+        const transactions = params?.transactions || this.#pool.splice(0).map(({ extrinsic }) => extrinsic);
         const upwardMessages = params?.upwardMessages || { ...this.#ump };
         const downwardMessages = params?.downwardMessages || this.#dmp.splice(0);
         const horizontalMessages = params?.horizontalMessages || { ...this.#hrmp };
@@ -133,7 +141,9 @@ class TxPool {
         const [newBlock, pendingExtrinsics] = await (0, block_builder_1.buildBlock)(head, inherents, params.transactions, params.upwardMessages, (extrinsic, error) => {
             this.event.emit(exports.APPLY_EXTRINSIC_ERROR, [extrinsic, error]);
         });
-        this.#pool.push(...pendingExtrinsics);
+        for (const extrinsic of pendingExtrinsics) {
+            this.#pool.push({ extrinsic, signer: await this.#getSigner(extrinsic) });
+        }
         await this.#chain.setHead(newBlock);
         this.#pendingBlocks.shift();
         deferred.resolve();

package/lib/cli.js

@@ -182,6 +182,12 @@ const defaultOptions = {
             await (0, _1.connectVertical)(relaychain, parachain);
         }
     }
+})
+    .command({
+    command: '*',
+    handler() {
+        yargs_1.default.showHelp();
+    },
 })
     .strict()
     .help()

package/lib/rpc/substrate/system.js

@@ -42,7 +42,8 @@ const handlers = {
         const registry = await head.registry;
         const account = registry.createType('AccountId', address);
         const result = await head.call('AccountNonceApi_account_nonce', [account.toHex()]);
-        return registry.createType('Index', (0, util_1.hexToU8a)(result.result)).toNumber();
+        const nonce = registry.createType('Index', (0, util_1.hexToU8a)(result.result)).toNumber();
+        return nonce + context.chain.txPool.pendingExtrinsicsBy(address).length;
     },
 };
 exports.default = handlers;

package/package.json

@@ -1,17 +1,14 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
   "license": "Apache-2.0",
   "bin": "./chopsticks.js",
   "scripts": {
-    "lint": "tsc --noEmit --project tsconfig.json && eslint . --ext .js,.ts && prettier --check .",
-    "fix": "eslint . --ext .js,.ts --fix && prettier -w .",
-    "build": "rm -rf lib && tsc -p ./tsconfig.json",
-    "test": "vitest run",
-    "test:watch": "vitest",
+    "clean": "rm -rf lib tsconfig.tsbuildinfo",
+    "build": "yarn clean && tsc -p ./tsconfig.json",
     "script:start": "cd ../..; ts-node --transpile-only packages/chopsticks/src/cli.ts",
     "script:run": "LOG_LEVEL=trace ts-node-dev --transpile-only --inspect --notify=false src/cli.ts -- dev --config=../../configs/dev.yml",
     "dev:karura": "ts-node-dev --transpile-only --inspect --notify=false src/cli.ts -- dev --config=../../configs/karura.yml",
@@ -20,7 +17,7 @@
     "dev:moonbeam": "ts-node-dev --transpile-only --inspect --notify=false src/cli.ts -- dev --config=../../configs/moonbeam.yml"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.5.1",
+    "@acala-network/chopsticks-executor": "0.5.3",
     "@polkadot/api": "^9.14.2",
     "@polkadot/rpc-provider": "^9.14.2",
     "@polkadot/types": "^9.14.2",
@@ -46,20 +43,11 @@
     "@types/js-yaml": "^4.0.5",
     "@types/lodash": "^4.14.191",
     "@types/node": "^18.14.2",
-    "@types/prettier": "^2.7.2",
     "@types/ws": "^8.5.4",
     "@types/yargs": "^17.0.22",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
-    "@typescript-eslint/parser": "^5.53.0",
-    "eslint": "^8.34.0",
-    "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-sort-imports-es6-autofix": "^0.6.0",
-    "prettier": "^2.8.4",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^4.9.5",
-    "vitest": "^0.29.2"
+    "typescript": "^4.9.5"
   },
   "files": [
     "lib",