diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 956464e211..feee01c6b2 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -15,7 +15,7 @@ module.exports = {
   parserOptions: {
     ...base.parserOptions,
     project: [
-      './tsconfig.json'
+      './tsconfig.eslint.json'
     ]
   },
   rules: {
diff --git a/package.json b/package.json
index ac12a103b2..9b0ca87332 100644
--- a/package.json
+++ b/package.json
@@ -57,11 +57,11 @@
   },
   "devDependencies": {
     "@babel/core": "^7.16.7",
-    "@babel/register": "^7.16.7",
+    "@babel/register": "^7.16.8",
     "@babel/runtime": "^7.16.7",
     "@crustio/crust-pin": "^1.0.0",
     "@pinata/sdk": "^1.1.23",
-    "@polkadot/dev": "^0.65.23",
+    "@polkadot/dev": "^0.65.25",
     "@types/bn.js": "^4.11.6",
     "@types/chart.js": "^2.9.35",
     "@types/file-saver": "^2.0.4",
diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json
index 492ba82046..ae019c6bd4 100644
--- a/packages/apps-config/package.json
+++ b/packages/apps-config/package.json
@@ -45,6 +45,6 @@
     "lodash": "^4.17.21",
     "moonbeam-types-bundle": "2.0.2",
     "pontem-types-bundle": "1.0.15",
-    "rxjs": "^7.5.1"
+    "rxjs": "^7.5.2"
   }
 }
diff --git a/packages/apps-electron/package.json b/packages/apps-electron/package.json
index 5192a32e09..d8362704c4 100644
--- a/packages/apps-electron/package.json
+++ b/packages/apps-electron/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@babel/core": "^7.16.7",
     "@babel/polyfill": "^7.12.1",
-    "@polkadot/dev": "^0.65.23",
+    "@polkadot/dev": "^0.65.25",
     "@polkadot/react-components": "^0.101.2-4",
     "electron-log": "^4.4.4",
     "electron-updater": "^4.6.5"
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 5c445c3016..0639456f1b 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -18,7 +18,7 @@
     "@babel/runtime": "^7.16.7",
     "@polkadot/apps-config": "^0.101.2-4",
     "@polkadot/apps-routing": "^0.101.2-4",
-    "@polkadot/dev": "^0.65.23",
+    "@polkadot/dev": "^0.65.25",
     "@polkadot/react-api": "^0.101.2-4",
     "@polkadot/react-components": "^0.101.2-4",
     "@polkadot/react-hooks": "^0.101.2-4",
diff --git a/packages/page-accounts/package.json b/packages/page-accounts/package.json
index 4397265597..6737332fb9 100644
--- a/packages/page-accounts/package.json
+++ b/packages/page-accounts/package.json
@@ -14,7 +14,7 @@
   "version": "0.101.2-4",
   "dependencies": {
     "@babel/runtime": "^7.16.7",
-    "@polkadot/phishing": "^0.8.9",
+    "@polkadot/phishing": "^0.8.11",
     "@polkadot/react-components": "^0.101.2-4",
     "@polkadot/vanitygen": "^0.48.11",
     "detect-browser": "^5.3.0",
diff --git a/packages/react-api/package.json b/packages/react-api/package.json
index a49566a034..b58ac93ce6 100644
--- a/packages/react-api/package.json
+++ b/packages/react-api/package.json
@@ -19,6 +19,6 @@
     "@polkadot/extension-dapp": "^0.42.5",
     "@substrate/connect": "0.4.6",
     "fflate": "^0.7.2",
-    "rxjs": "^7.5.1"
+    "rxjs": "^7.5.2"
   }
 }
diff --git a/tsconfig.build.json b/tsconfig.build.json
new file mode 100644
index 0000000000..3a14fa836d
--- /dev/null
+++ b/tsconfig.build.json
@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.base.json",
+  "exclude": [
+    "build/**/*",
+    "**/build/**/*"
+  ],
+  "compilerOptions": {
+    "baseUrl": "./packages",
+    "outDir": "./build"
+  }
+}
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
index f8dbc9fff9..c6987c5990 100644
--- a/tsconfig.eslint.json
+++ b/tsconfig.eslint.json
@@ -5,6 +5,7 @@
     "**/build/**/*"
   ],
   "compilerOptions": {
-    "baseUrl": "./packages"
+    "baseUrl": "./packages",
+    "composite": false
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
index 3a14fa836d..f1275154ed 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,11 +1,13 @@
 {
   "extends": "./tsconfig.base.json",
-  "exclude": [
-    "build/**/*",
-    "**/build/**/*"
-  ],
   "compilerOptions": {
     "baseUrl": "./packages",
-    "outDir": "./build"
-  }
+    "composite": false
+  },
+  "include": [
+    "packages/**/src/**/*"
+  ],
+  "exclude": [
+    "**/node_modules/**/*"
+  ]
 }
diff --git a/yarn.lock b/yarn.lock
index 60d9faf35f..2bc2c4cb35 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1387,9 +1387,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/register@npm:^7.16.7":
-  version: 7.16.7
-  resolution: "@babel/register@npm:7.16.7"
+"@babel/register@npm:^7.16.7, @babel/register@npm:^7.16.8":
+  version: 7.16.8
+  resolution: "@babel/register@npm:7.16.8"
   dependencies:
     clone-deep: ^4.0.1
     find-cache-dir: ^2.0.0
@@ -1398,7 +1398,7 @@ __metadata:
     source-map-support: ^0.5.16
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 28685b4f23c5ab79560e8f0331a707bd2c6b89114ed06882a14325d0ad7eee4030bcc4a7496526d87ed7ecc001cffffc2cc4c06ba2cd16870ed7196e346cf45f
+  checksum: e6b53de9eff3766cf62397561d3250c1c9da0cd67c5879c439140c42cf5a0a017b69025ec526c015af0b5ae7a50f7df61415be68ff6bb0af78af99a58ba59f85
   languageName: node
   linkType: hard
 
@@ -2631,7 +2631,7 @@ __metadata:
   resolution: "@polkadot/app-accounts@workspace:packages/page-accounts"
   dependencies:
     "@babel/runtime": ^7.16.7
-    "@polkadot/phishing": ^0.8.9
+    "@polkadot/phishing": ^0.8.11
     "@polkadot/react-components": ^0.101.2-4
     "@polkadot/test-support": 0.101.2-4
     "@polkadot/vanitygen": ^0.48.11
@@ -2911,7 +2911,7 @@ __metadata:
     lodash: ^4.17.21
     moonbeam-types-bundle: 2.0.2
     pontem-types-bundle: 1.0.15
-    rxjs: ^7.5.1
+    rxjs: ^7.5.2
   languageName: unknown
   linkType: soft
 
@@ -2921,7 +2921,7 @@ __metadata:
   dependencies:
     "@babel/core": ^7.16.7
     "@babel/polyfill": ^7.12.1
-    "@polkadot/dev": ^0.65.23
+    "@polkadot/dev": ^0.65.25
     "@polkadot/react-components": ^0.101.2-4
     "@types/react-dom": ^17.0.11
     "@types/tmp": ^0.2.3
@@ -2955,7 +2955,7 @@ __metadata:
     "@babel/runtime": ^7.16.7
     "@polkadot/apps-config": ^0.101.2-4
     "@polkadot/apps-routing": ^0.101.2-4
-    "@polkadot/dev": ^0.65.23
+    "@polkadot/dev": ^0.65.25
     "@polkadot/react-api": ^0.101.2-4
     "@polkadot/react-components": ^0.101.2-4
     "@polkadot/react-hooks": ^0.101.2-4
@@ -2992,9 +2992,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/dev@npm:^0.65.23":
-  version: 0.65.23
-  resolution: "@polkadot/dev@npm:0.65.23"
+"@polkadot/dev@npm:^0.65.25":
+  version: 0.65.25
+  resolution: "@polkadot/dev@npm:0.65.25"
   dependencies:
     "@babel/cli": ^7.16.7
     "@babel/core": ^7.16.7
@@ -3018,8 +3018,8 @@ __metadata:
     "@rollup/plugin-json": ^4.1.0
     "@rollup/plugin-node-resolve": ^13.1.3
     "@rushstack/eslint-patch": ^1.1.0
-    "@typescript-eslint/eslint-plugin": 5.9.0
-    "@typescript-eslint/parser": 5.9.0
+    "@typescript-eslint/eslint-plugin": 5.9.1
+    "@typescript-eslint/parser": 5.9.1
     "@vue/component-compiler-utils": ^3.3.0
     babel-jest: ^27.4.6
     babel-plugin-module-extension-resolver: ^1.0.0-rc.2
@@ -3080,7 +3080,7 @@ __metadata:
     polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs
     polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs
     polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs
-  checksum: 4195a0cd5de5ddc037d275cb412604d702278e990e330a895d688fdde462317ca792e0e6ae652aa67cfd53cf8c09c97f3e601f6176515b9e9c3e18d907316dbb
+  checksum: f49ff9a0f4348eefcd3a6edf53ad337308f029a872170d3b271cee3a6c6c01309063cad84779cfadcdd779beba06bbf1f4153dc2136465864d1cd7b1c5a5d0f3
   languageName: node
   linkType: hard
 
@@ -3208,7 +3208,7 @@ __metadata:
     "@polkadot/extension-dapp": ^0.42.5
     "@substrate/connect": 0.4.6
     fflate: ^0.7.2
-    rxjs: ^7.5.1
+    rxjs: ^7.5.2
   languageName: unknown
   linkType: soft
 
@@ -4865,13 +4865,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:5.9.0":
-  version: 5.9.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:5.9.0"
+"@typescript-eslint/eslint-plugin@npm:5.9.1":
+  version: 5.9.1
+  resolution: "@typescript-eslint/eslint-plugin@npm:5.9.1"
   dependencies:
-    "@typescript-eslint/experimental-utils": 5.9.0
-    "@typescript-eslint/scope-manager": 5.9.0
-    "@typescript-eslint/type-utils": 5.9.0
+    "@typescript-eslint/experimental-utils": 5.9.1
+    "@typescript-eslint/scope-manager": 5.9.1
+    "@typescript-eslint/type-utils": 5.9.1
     debug: ^4.3.2
     functional-red-black-tree: ^1.0.1
     ignore: ^5.1.8
@@ -4884,58 +4884,58 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 31443d4331dddf7618d6b3fdbf148ec6d5ce7c64c85ec3973e520e633467d8d5605896f7eab9d7c6f81c050458c84bca10a6b0ed3537d48e6ee728f8b64d46a2
+  checksum: 75119682f9fa14afc093983be0f477fc21c85c700a47889e3fc5b6d4efe98750b99b0667a8ff371d02153814658ae552d2032e1d0c590c983fe6a74f282d51fb
   languageName: node
   linkType: hard
 
-"@typescript-eslint/experimental-utils@npm:5.9.0":
-  version: 5.9.0
-  resolution: "@typescript-eslint/experimental-utils@npm:5.9.0"
+"@typescript-eslint/experimental-utils@npm:5.9.1":
+  version: 5.9.1
+  resolution: "@typescript-eslint/experimental-utils@npm:5.9.1"
   dependencies:
     "@types/json-schema": ^7.0.9
-    "@typescript-eslint/scope-manager": 5.9.0
-    "@typescript-eslint/types": 5.9.0
-    "@typescript-eslint/typescript-estree": 5.9.0
+    "@typescript-eslint/scope-manager": 5.9.1
+    "@typescript-eslint/types": 5.9.1
+    "@typescript-eslint/typescript-estree": 5.9.1
     eslint-scope: ^5.1.1
     eslint-utils: ^3.0.0
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 731b27840642b644e65f4ae321ed47e973ffadacd1aa24a19b02b4b298b5bcfbfa16c2d3d034e87a08c3c45f942c5b974f7619cb143eb23fb950f37418dce791
+  checksum: ff8d38fc572aa4395116df82a596a8632b25bbd490c9f6337a58b95cfd878def1f8e1b431ebbb58bfa3e2b746ac63f59bf78d8b424c3eb3cadf4b3128b758d4c
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:5.9.0":
-  version: 5.9.0
-  resolution: "@typescript-eslint/parser@npm:5.9.0"
+"@typescript-eslint/parser@npm:5.9.1":
+  version: 5.9.1
+  resolution: "@typescript-eslint/parser@npm:5.9.1"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.9.0
-    "@typescript-eslint/types": 5.9.0
-    "@typescript-eslint/typescript-estree": 5.9.0
+    "@typescript-eslint/scope-manager": 5.9.1
+    "@typescript-eslint/types": 5.9.1
+    "@typescript-eslint/typescript-estree": 5.9.1
     debug: ^4.3.2
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: ae95a7eb977b7bb4eec98357577b043d8ba48d47ae43ec18eadd350336b485ce91ac969b92e22143cc77797cc96cf37598d2bddcdd974d45fb3ec4f01b53b92a
+  checksum: 138b31115ccae574d25525389537da71e9bd628e367c136da77f8cf3b4a11ebea138f9851dc6d7df3da163db791aeb8a1ef6d2de557a4248ca8e3ecea6b379f1
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.9.0":
-  version: 5.9.0
-  resolution: "@typescript-eslint/scope-manager@npm:5.9.0"
+"@typescript-eslint/scope-manager@npm:5.9.1":
+  version: 5.9.1
+  resolution: "@typescript-eslint/scope-manager@npm:5.9.1"
   dependencies:
-    "@typescript-eslint/types": 5.9.0
-    "@typescript-eslint/visitor-keys": 5.9.0
-  checksum: 46e7ab0cef558e7faf1aa8d122a265e196566c0073292f5b2f9cede1f63f52860be8e4ef90251c15e0922339c15852584cb5337382035baff87f1203c0c8d1b5
+    "@typescript-eslint/types": 5.9.1
+    "@typescript-eslint/visitor-keys": 5.9.1
+  checksum: 2b532d355885f8b4691fc4726e3d1abe16325c660735eb9d0dc47739ce9259a30ab3f8bfaec1abacf9713d80efdb6a5da6db7e9f96188c61dfe076689b9a4459
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:5.9.0":
-  version: 5.9.0
-  resolution: "@typescript-eslint/type-utils@npm:5.9.0"
+"@typescript-eslint/type-utils@npm:5.9.1":
+  version: 5.9.1
+  resolution: "@typescript-eslint/type-utils@npm:5.9.1"
   dependencies:
-    "@typescript-eslint/experimental-utils": 5.9.0
+    "@typescript-eslint/experimental-utils": 5.9.1
     debug: ^4.3.2
     tsutils: ^3.21.0
   peerDependencies:
@@ -4943,7 +4943,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 787c3277e37f6bbd723ff10aec6ddc61a62860bd2b1d354c4a50c1aec9b479ee4f51be9fd1cdeac2e43e22161481e76409c00e6a4d50549ceaee0c59fc5cd73d
+  checksum: 23df02c241334a7d53cbb1fea911d381db009fc06b38c16b7f48d1789f9ab76a8007f34d03664d15683c87668ba8d0300c4579413b4aeaa5863ee73a4c7f797c
   languageName: node
   linkType: hard
 
@@ -4954,19 +4954,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:5.9.0":
-  version: 5.9.0
-  resolution: "@typescript-eslint/types@npm:5.9.0"
-  checksum: 7c4e142600aec266b41418dab1d0cee8cace980b6990692df6522de6eab6705bf515aef36180e4a38c62acb10c92fb474269ac6856a4266d6b035068cd83fad3
+"@typescript-eslint/types@npm:5.9.1":
+  version: 5.9.1
+  resolution: "@typescript-eslint/types@npm:5.9.1"
+  checksum: 99b90da0cad9e8db75c3870adf6457291a93e7bedcdcebcc31ffb0c71db6f82c22845fd1c890684b542c7764b41eb9cbfb6e8c55feaf7692669f334f786b3f14
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.9.0":
-  version: 5.9.0
-  resolution: "@typescript-eslint/typescript-estree@npm:5.9.0"
+"@typescript-eslint/typescript-estree@npm:5.9.1":
+  version: 5.9.1
+  resolution: "@typescript-eslint/typescript-estree@npm:5.9.1"
   dependencies:
-    "@typescript-eslint/types": 5.9.0
-    "@typescript-eslint/visitor-keys": 5.9.0
+    "@typescript-eslint/types": 5.9.1
+    "@typescript-eslint/visitor-keys": 5.9.1
     debug: ^4.3.2
     globby: ^11.0.4
     is-glob: ^4.0.3
@@ -4975,7 +4975,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 71e3f720e335fb08e66950d32b723484aa4d1f4a3163e82259f4be2d11091545070c2e71472be470403cb6f82bf1abe84fa89c1d0b1d47adc8550b3f70aabfb5
+  checksum: a13dabebf8223ddd2f6e8114e6edbb062eb094002ee16d269d901a8c64b9fde6105bf1a8ad491d0abdb770be0641da0022d4bec64e786e4f114c688723ad39ba
   languageName: node
   linkType: hard
 
@@ -5007,13 +5007,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.9.0":
-  version: 5.9.0
-  resolution: "@typescript-eslint/visitor-keys@npm:5.9.0"
+"@typescript-eslint/visitor-keys@npm:5.9.1":
+  version: 5.9.1
+  resolution: "@typescript-eslint/visitor-keys@npm:5.9.1"
   dependencies:
-    "@typescript-eslint/types": 5.9.0
+    "@typescript-eslint/types": 5.9.1
     eslint-visitor-keys: ^3.0.0
-  checksum: 34a595b83b0e7d4f387d6c81b272804b94a1a91478c5f856fdfdd227595bf8562bf3f5d732606d10b4522c3f2617d09d4bacd2193f757a324ea66b3144a68903
+  checksum: 9eb6902161fc9120907d514ed9f4c0237349904e17436571a8ab1820b0426c47de1b8d65eb9804a6544f80b714ffec89f9ed8bf386cb9881f909ef58c145752d
   languageName: node
   linkType: hard
 
@@ -16067,11 +16067,11 @@ __metadata:
   resolution: "polkadot-apps@workspace:."
   dependencies:
     "@babel/core": ^7.16.7
-    "@babel/register": ^7.16.7
+    "@babel/register": ^7.16.8
     "@babel/runtime": ^7.16.7
     "@crustio/crust-pin": ^1.0.0
     "@pinata/sdk": ^1.1.23
-    "@polkadot/dev": ^0.65.23
+    "@polkadot/dev": ^0.65.25
     "@types/bn.js": ^4.11.6
     "@types/chart.js": ^2.9.35
     "@types/file-saver": ^2.0.4
@@ -17686,12 +17686,12 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"rxjs@npm:^7.5.1":
-  version: 7.5.1
-  resolution: "rxjs@npm:7.5.1"
+"rxjs@npm:^7.5.1, rxjs@npm:^7.5.2":
+  version: 7.5.2
+  resolution: "rxjs@npm:7.5.2"
   dependencies:
     tslib: ^2.1.0
-  checksum: 78e3eecb1644dd83adabc8d956f879dca62eb19c8afcd6acac71cf6d94534c33ea201e65387494fdeb1332395cba081e194f5a9699d58a5d48e416b8b52372aa
+  checksum: daf1fe7289de500b25d822fd96cde3c138c7902e8bf0e6aa12a3e70847a5cabeeb4d677f10e19387e1db44b12c5b1be0ff5c79b8cd63ed6ce891d765e566cf4d
   languageName: node
   linkType: hard