diff --git a/jest.config.js b/jest.config.js
index 38a5431fdc..960dc9786f 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -5,8 +5,7 @@ const config = require('@polkadot/dev/config/jest');
 
 module.exports = Object.assign({}, config, {
   moduleNameMapper: {
-    '@polkadot/api-contract(.*)$': '<rootDir>/packages/api-contract/src/$1',
-    '@polkadot/api-derive(.*)$': '<rootDir>/packages/api-derive/src/$1',
+    '@polkadot/api-(contract|derive)(.*)$': '<rootDir>/packages/api-$1/src/$2',
     // eslint-disable-next-line sort-keys
     '@polkadot/api(.*)$': '<rootDir>/packages/api/src/$1',
     '@polkadot/metadata(.*)$': '<rootDir>/packages/metadata/src/$1',
@@ -25,8 +24,5 @@ module.exports = Object.assign({}, config, {
     '<rootDir>/packages/types/build',
     '<rootDir>/packages/types-known/build'
   ],
-  resolver: '@polkadot/dev/config/jest-resolver',
-  setupFilesAfterEnv: [
-    '@polkadot/dev/config/jest-crypto'
-  ]
+  resolver: '@polkadot/dev/config/jest-resolver'
 });
diff --git a/package.json b/package.json
index c9357dc533..2d7e7a742a 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@babel/core": "^7.12.3",
     "@babel/register": "^7.12.1",
     "@babel/runtime": "^7.12.1",
-    "@polkadot/dev": "^0.59.19",
+    "@polkadot/dev": "^0.59.20",
     "@polkadot/ts": "^0.3.53",
     "@polkadot/typegen": "workspace:packages/typegen",
     "@types/jest": "^26.0.15",
diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json
index 9d254cf36f..e45e1e6126 100644
--- a/packages/api-contract/package.json
+++ b/packages/api-contract/package.json
@@ -27,11 +27,14 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@polkadot/api": "^2.5.2-3",
-    "@polkadot/rpc-core": "^2.5.2-3",
-    "@polkadot/types": "^2.5.2-3",
-    "@polkadot/util": "^4.0.0-5",
+    "@polkadot/api": "2.5.2-3",
+    "@polkadot/types": "2.5.2-3",
+    "@polkadot/util": "^4.0.1",
     "bn.js": "^5.1.3",
     "rxjs": "^6.6.3"
+  },
+  "peerDependencies": {
+    "@polkadot/api": "2.5.2-3",
+    "@polkadot/util": "*"
   }
 }
diff --git a/packages/api-contract/src/util.ts b/packages/api-contract/src/util.ts
index 5c56721978..e7397778ca 100644
--- a/packages/api-contract/src/util.ts
+++ b/packages/api-contract/src/util.ts
@@ -1,4 +1,4 @@
-// Copyright 2017-2020 @polkadot/rpc-core authors & contributors
+// Copyright 2017-2020 @polkadot/rpc-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import { SubmittableResult } from '@polkadot/api';
diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json
index 2e0d656291..4841ef8027 100644
--- a/packages/api-derive/package.json
+++ b/packages/api-derive/package.json
@@ -28,17 +28,21 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-derive#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@polkadot/api": "^2.5.2-3",
-    "@polkadot/rpc-core": "^2.5.2-3",
-    "@polkadot/rpc-provider": "^2.5.2-3",
-    "@polkadot/types": "^2.5.2-3",
-    "@polkadot/util": "^4.0.0-5",
-    "@polkadot/util-crypto": "^4.0.0-5",
+    "@polkadot/api": "2.5.2-3",
+    "@polkadot/rpc-core": "2.5.2-3",
+    "@polkadot/types": "2.5.2-3",
+    "@polkadot/util": "^4.0.1",
+    "@polkadot/util-crypto": "^4.0.1",
     "bn.js": "^5.1.3",
     "memoizee": "^0.4.14",
     "rxjs": "^6.6.3"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^4.0.0-5"
+    "@polkadot/keyring": "^4.0.1",
+    "@polkadot/rpc-provider": "2.5.2-3"
+  },
+  "peerDependencies": {
+    "@polkadot/util": "*",
+    "@polkadot/util-crypto": "*"
   }
 }
diff --git a/packages/api/package.json b/packages/api/package.json
index f37586afdd..b2bb25f26c 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -27,20 +27,25 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@polkadot/api-derive": "^2.5.2-3",
-    "@polkadot/keyring": "^4.0.0-5",
-    "@polkadot/metadata": "^2.5.2-3",
-    "@polkadot/rpc-core": "^2.5.2-3",
-    "@polkadot/rpc-provider": "^2.5.2-3",
-    "@polkadot/types": "^2.5.2-3",
-    "@polkadot/types-known": "^2.5.2-3",
-    "@polkadot/util": "^4.0.0-5",
-    "@polkadot/util-crypto": "^4.0.0-5",
+    "@polkadot/api-derive": "2.5.2-3",
+    "@polkadot/keyring": "^4.0.1",
+    "@polkadot/metadata": "2.5.2-3",
+    "@polkadot/rpc-core": "2.5.2-3",
+    "@polkadot/rpc-provider": "2.5.2-3",
+    "@polkadot/types": "2.5.2-3",
+    "@polkadot/types-known": "2.5.2-3",
+    "@polkadot/util": "^4.0.1",
+    "@polkadot/util-crypto": "^4.0.1",
     "bn.js": "^5.1.3",
     "eventemitter3": "^4.0.7",
     "rxjs": "^6.6.3"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^4.0.0-5"
+    "@polkadot/keyring": "^4.0.1"
+  },
+  "peerDependencies": {
+    "@polkadot/keyring": "*",
+    "@polkadot/util": "*",
+    "@polkadot/util-crypto": "*"
   }
 }
diff --git a/packages/metadata/package.json b/packages/metadata/package.json
index 0b1dbc0f4d..b292d0c781 100644
--- a/packages/metadata/package.json
+++ b/packages/metadata/package.json
@@ -27,13 +27,17 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/type-metadata#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@polkadot/types": "^2.5.2-3",
-    "@polkadot/types-known": "^2.5.2-3",
-    "@polkadot/util": "^4.0.0-5",
-    "@polkadot/util-crypto": "^4.0.0-5",
+    "@polkadot/types": "2.5.2-3",
+    "@polkadot/types-known": "2.5.2-3",
+    "@polkadot/util": "^4.0.1",
+    "@polkadot/util-crypto": "^4.0.1",
     "bn.js": "^5.1.3"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^4.0.0-5"
+    "@polkadot/keyring": "^4.0.1"
+  },
+  "peerDependencies": {
+    "@polkadot/util": "*",
+    "@polkadot/util-crypto": "*"
   }
 }
diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json
index 0df998dc13..22f23d7d90 100644
--- a/packages/rpc-core/package.json
+++ b/packages/rpc-core/package.json
@@ -27,14 +27,17 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-core#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@polkadot/metadata": "^2.5.2-3",
-    "@polkadot/rpc-provider": "^2.5.2-3",
-    "@polkadot/types": "^2.5.2-3",
-    "@polkadot/util": "^4.0.0-5",
+    "@polkadot/metadata": "2.5.2-3",
+    "@polkadot/rpc-provider": "2.5.2-3",
+    "@polkadot/types": "2.5.2-3",
+    "@polkadot/util": "^4.0.1",
     "memoizee": "^0.4.14",
     "rxjs": "^6.6.3"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^4.0.0-5"
+    "@polkadot/keyring": "^4.0.1"
+  },
+  "peerDependencies": {
+    "@polkadot/util": "*"
   }
 }
diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json
index 97b5096676..ff161d8fa1 100644
--- a/packages/rpc-provider/package.json
+++ b/packages/rpc-provider/package.json
@@ -27,18 +27,22 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-provider#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@polkadot/metadata": "^2.5.2-3",
-    "@polkadot/types": "^2.5.2-3",
-    "@polkadot/util": "^4.0.0-5",
-    "@polkadot/util-crypto": "^4.0.0-5",
-    "@polkadot/x-fetch": "^4.0.0-5",
-    "@polkadot/x-ws": "^4.0.0-5",
+    "@polkadot/types": "2.5.2-3",
+    "@polkadot/util": "^4.0.1",
+    "@polkadot/util-crypto": "^4.0.1",
+    "@polkadot/x-fetch": "^4.0.1",
+    "@polkadot/x-ws": "^4.0.1",
     "bn.js": "^5.1.3",
     "eventemitter3": "^4.0.7"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^4.0.0-5",
+    "@polkadot/keyring": "^4.0.1",
+    "@polkadot/metadata": "2.5.2-3",
     "mock-socket": "^9.0.3",
     "nock": "^13.0.4"
+  },
+  "peerDependencies": {
+    "@polkadot/util": "*",
+    "@polkadot/util-crypto": "*"
   }
 }
diff --git a/packages/typegen/package.json b/packages/typegen/package.json
index e957a41e39..afa94b402a 100644
--- a/packages/typegen/package.json
+++ b/packages/typegen/package.json
@@ -36,11 +36,11 @@
     "@babel/core": "^7.12.3",
     "@babel/register": "^7.12.1",
     "@babel/runtime": "^7.12.1",
-    "@polkadot/api": "^2.5.2-3",
-    "@polkadot/metadata": "^2.5.2-3",
-    "@polkadot/rpc-provider": "^2.5.2-3",
-    "@polkadot/types": "^2.5.2-3",
-    "@polkadot/util": "^4.0.0-5",
+    "@polkadot/api": "2.5.2-3",
+    "@polkadot/metadata": "2.5.2-3",
+    "@polkadot/rpc-provider": "2.5.2-3",
+    "@polkadot/types": "2.5.2-3",
+    "@polkadot/util": "^4.0.1",
     "handlebars": "^4.7.6",
     "websocket": "^1.0.32",
     "yargs": "^16.1.0"
@@ -48,5 +48,8 @@
   "devDependencies": {
     "@types/websocket": "^1.0.1",
     "@types/yargs": "^15.0.9"
+  },
+  "peerDependencies": {
+    "@polkadot/util": "*"
   }
 }
diff --git a/packages/types-known/package.json b/packages/types-known/package.json
index 07bf438e63..1a8dc720bb 100644
--- a/packages/types-known/package.json
+++ b/packages/types-known/package.json
@@ -27,11 +27,14 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types-known#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@polkadot/types": "^2.5.2-3",
-    "@polkadot/util": "^4.0.0-5",
+    "@polkadot/types": "2.5.2-3",
+    "@polkadot/util": "^4.0.1",
     "bn.js": "^5.1.3"
   },
   "devDependencies": {
     "@types/bn.js": "^4.11.6"
+  },
+  "peerDependencies": {
+    "@polkadot/util": "*"
   }
 }
diff --git a/packages/types/package.json b/packages/types/package.json
index dd8719e873..bb7d2d68af 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -27,16 +27,20 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@polkadot/metadata": "^2.5.2-3",
-    "@polkadot/util": "^4.0.0-5",
-    "@polkadot/util-crypto": "^4.0.0-5",
+    "@polkadot/metadata": "2.5.2-3",
+    "@polkadot/util": "^4.0.1",
+    "@polkadot/util-crypto": "^4.0.1",
     "@types/bn.js": "^4.11.6",
     "bn.js": "^5.1.3",
     "memoizee": "^0.4.14",
     "rxjs": "^6.6.3"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^4.0.0-5",
+    "@polkadot/keyring": "^4.0.1",
     "@types/memoizee": "^0.4.4"
+  },
+  "peerDependencies": {
+    "@polkadot/util": "*",
+    "@polkadot/util-crypto": "*"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 91ceebad45..13957c3619 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1751,56 +1751,65 @@ __metadata:
   resolution: "@polkadot/api-contract@workspace:packages/api-contract"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/api": ^2.5.2-3
-    "@polkadot/rpc-core": ^2.5.2-3
-    "@polkadot/types": ^2.5.2-3
-    "@polkadot/util": ^4.0.0-5
+    "@polkadot/api": 2.5.2-3
+    "@polkadot/types": 2.5.2-3
+    "@polkadot/util": ^4.0.1
     bn.js: ^5.1.3
     rxjs: ^6.6.3
+  peerDependencies:
+    "@polkadot/api": 2.5.2-3
+    "@polkadot/util": "*"
   languageName: unknown
   linkType: soft
 
-"@polkadot/api-derive@^2.5.2-3, @polkadot/api-derive@workspace:packages/api-derive":
+"@polkadot/api-derive@2.5.2-3, @polkadot/api-derive@workspace:packages/api-derive":
   version: 0.0.0-use.local
   resolution: "@polkadot/api-derive@workspace:packages/api-derive"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/api": ^2.5.2-3
-    "@polkadot/keyring": ^4.0.0-5
-    "@polkadot/rpc-core": ^2.5.2-3
-    "@polkadot/rpc-provider": ^2.5.2-3
-    "@polkadot/types": ^2.5.2-3
-    "@polkadot/util": ^4.0.0-5
-    "@polkadot/util-crypto": ^4.0.0-5
+    "@polkadot/api": 2.5.2-3
+    "@polkadot/keyring": ^4.0.1
+    "@polkadot/rpc-core": 2.5.2-3
+    "@polkadot/rpc-provider": 2.5.2-3
+    "@polkadot/types": 2.5.2-3
+    "@polkadot/util": ^4.0.1
+    "@polkadot/util-crypto": ^4.0.1
     bn.js: ^5.1.3
     memoizee: ^0.4.14
     rxjs: ^6.6.3
+  peerDependencies:
+    "@polkadot/util": "*"
+    "@polkadot/util-crypto": "*"
   languageName: unknown
   linkType: soft
 
-"@polkadot/api@^2.5.2-3, @polkadot/api@workspace:packages/api":
+"@polkadot/api@2.5.2-3, @polkadot/api@workspace:packages/api":
   version: 0.0.0-use.local
   resolution: "@polkadot/api@workspace:packages/api"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/api-derive": ^2.5.2-3
-    "@polkadot/keyring": ^4.0.0-5
-    "@polkadot/metadata": ^2.5.2-3
-    "@polkadot/rpc-core": ^2.5.2-3
-    "@polkadot/rpc-provider": ^2.5.2-3
-    "@polkadot/types": ^2.5.2-3
-    "@polkadot/types-known": ^2.5.2-3
-    "@polkadot/util": ^4.0.0-5
-    "@polkadot/util-crypto": ^4.0.0-5
+    "@polkadot/api-derive": 2.5.2-3
+    "@polkadot/keyring": ^4.0.1
+    "@polkadot/metadata": 2.5.2-3
+    "@polkadot/rpc-core": 2.5.2-3
+    "@polkadot/rpc-provider": 2.5.2-3
+    "@polkadot/types": 2.5.2-3
+    "@polkadot/types-known": 2.5.2-3
+    "@polkadot/util": ^4.0.1
+    "@polkadot/util-crypto": ^4.0.1
     bn.js: ^5.1.3
     eventemitter3: ^4.0.7
     rxjs: ^6.6.3
+  peerDependencies:
+    "@polkadot/keyring": "*"
+    "@polkadot/util": "*"
+    "@polkadot/util-crypto": "*"
   languageName: unknown
   linkType: soft
 
-"@polkadot/dev@npm:^0.59.19":
-  version: 0.59.19
-  resolution: "@polkadot/dev@npm:0.59.19"
+"@polkadot/dev@npm:^0.59.20":
+  version: 0.59.20
+  resolution: "@polkadot/dev@npm:0.59.20"
   dependencies:
     "@babel/cli": ^7.12.1
     "@babel/core": ^7.12.3
@@ -1886,75 +1895,86 @@ __metadata:
     polkadot-exec-typedoc: scripts/polkadot-exec-typedoc.js
     polkadot-exec-vuepress: scripts/polkadot-exec-vuepress.js
     polkadot-exec-webpack: scripts/polkadot-exec-webpack.js
-  checksum: d8d93ad37a15a4c95b09a5f94929e79f06e7a80f9804836b04fdc5c290bd35706c0db745c115bd0007718773b5fde7b955d5fbcd4de05d67712d5a91a5fa8b50
+  checksum: 4d589615cc8bc2d1b302113d734e4f0a22ae8fb86f202648cb4b4a3780022fd7dab1d04ce85c5e8040849878c0372fbf19578ed6cf5cf95589054bda475fbc9b
   languageName: node
   linkType: hard
 
-"@polkadot/keyring@npm:^4.0.0-5":
-  version: 4.0.0-5
-  resolution: "@polkadot/keyring@npm:4.0.0-5"
+"@polkadot/keyring@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@polkadot/keyring@npm:4.0.1"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/util": ^4.0.0-5
-    "@polkadot/util-crypto": ^4.0.0-5
-  checksum: 0868bac33c1857f2c0985f626795cea71c3904a7442bdcf040e2df40f43c59ac8d7a4b7b295d687c3547b91644b3a3c76f576d1716f2eb3e772247cf055ab0af
+    "@polkadot/util": 4.0.1
+    "@polkadot/util-crypto": 4.0.1
+  peerDependencies:
+    "@polkadot/util": 4.0.1
+    "@polkadot/util-crypto": 4.0.1
+  checksum: 2fc0c101b6c24ca60dd6cad59084ab79a7d308bb4e078012f8c31489789de53c198f73fb2f6ab09d712a332d31c28497906f01cd7d4847e8140cc38f5e310d5d
   languageName: node
   linkType: hard
 
-"@polkadot/metadata@^2.5.2-3, @polkadot/metadata@workspace:packages/metadata":
+"@polkadot/metadata@2.5.2-3, @polkadot/metadata@workspace:packages/metadata":
   version: 0.0.0-use.local
   resolution: "@polkadot/metadata@workspace:packages/metadata"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/keyring": ^4.0.0-5
-    "@polkadot/types": ^2.5.2-3
-    "@polkadot/types-known": ^2.5.2-3
-    "@polkadot/util": ^4.0.0-5
-    "@polkadot/util-crypto": ^4.0.0-5
+    "@polkadot/keyring": ^4.0.1
+    "@polkadot/types": 2.5.2-3
+    "@polkadot/types-known": 2.5.2-3
+    "@polkadot/util": ^4.0.1
+    "@polkadot/util-crypto": ^4.0.1
     bn.js: ^5.1.3
+  peerDependencies:
+    "@polkadot/util": "*"
+    "@polkadot/util-crypto": "*"
   languageName: unknown
   linkType: soft
 
-"@polkadot/networks@npm:^4.0.0-5":
-  version: 4.0.0-5
-  resolution: "@polkadot/networks@npm:4.0.0-5"
+"@polkadot/networks@npm:4.0.1":
+  version: 4.0.1
+  resolution: "@polkadot/networks@npm:4.0.1"
   dependencies:
     "@babel/runtime": ^7.12.1
-  checksum: da8f0b0ae29678f292c7f9bbac8b1646a32b99b3a5a0c73622deffc393fd28b1030210449ca91a0abc77c4c4a38e6728c0b18555f12f1855a21454ad9bc335f8
+  checksum: 46f0bdba3a9a6a7649645944dbac4c0e88e5b15c3d25cc13a71a91440bba179c3233cdbb99b3359fe230ff396666315d50aab6248f851748491c77ebc0568e97
   languageName: node
   linkType: hard
 
-"@polkadot/rpc-core@^2.5.2-3, @polkadot/rpc-core@workspace:packages/rpc-core":
+"@polkadot/rpc-core@2.5.2-3, @polkadot/rpc-core@workspace:packages/rpc-core":
   version: 0.0.0-use.local
   resolution: "@polkadot/rpc-core@workspace:packages/rpc-core"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/keyring": ^4.0.0-5
-    "@polkadot/metadata": ^2.5.2-3
-    "@polkadot/rpc-provider": ^2.5.2-3
-    "@polkadot/types": ^2.5.2-3
-    "@polkadot/util": ^4.0.0-5
+    "@polkadot/keyring": ^4.0.1
+    "@polkadot/metadata": 2.5.2-3
+    "@polkadot/rpc-provider": 2.5.2-3
+    "@polkadot/types": 2.5.2-3
+    "@polkadot/util": ^4.0.1
     memoizee: ^0.4.14
     rxjs: ^6.6.3
+  peerDependencies:
+    "@polkadot/util": "*"
   languageName: unknown
   linkType: soft
 
-"@polkadot/rpc-provider@^2.5.2-3, @polkadot/rpc-provider@workspace:packages/rpc-provider":
+"@polkadot/rpc-provider@2.5.2-3, @polkadot/rpc-provider@workspace:packages/rpc-provider":
   version: 0.0.0-use.local
   resolution: "@polkadot/rpc-provider@workspace:packages/rpc-provider"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/keyring": ^4.0.0-5
-    "@polkadot/metadata": ^2.5.2-3
-    "@polkadot/types": ^2.5.2-3
-    "@polkadot/util": ^4.0.0-5
-    "@polkadot/util-crypto": ^4.0.0-5
-    "@polkadot/x-fetch": ^4.0.0-5
-    "@polkadot/x-ws": ^4.0.0-5
+    "@polkadot/keyring": ^4.0.1
+    "@polkadot/metadata": 2.5.2-3
+    "@polkadot/types": 2.5.2-3
+    "@polkadot/util": ^4.0.1
+    "@polkadot/util-crypto": ^4.0.1
+    "@polkadot/x-fetch": ^4.0.1
+    "@polkadot/x-ws": ^4.0.1
     bn.js: ^5.1.3
     eventemitter3: ^4.0.7
     mock-socket: ^9.0.3
     nock: ^13.0.4
+  peerDependencies:
+    "@polkadot/util": "*"
+    "@polkadot/util-crypto": "*"
   languageName: unknown
   linkType: soft
 
@@ -1974,16 +1994,18 @@ __metadata:
     "@babel/core": ^7.12.3
     "@babel/register": ^7.12.1
     "@babel/runtime": ^7.12.1
-    "@polkadot/api": ^2.5.2-3
-    "@polkadot/metadata": ^2.5.2-3
-    "@polkadot/rpc-provider": ^2.5.2-3
-    "@polkadot/types": ^2.5.2-3
-    "@polkadot/util": ^4.0.0-5
+    "@polkadot/api": 2.5.2-3
+    "@polkadot/metadata": 2.5.2-3
+    "@polkadot/rpc-provider": 2.5.2-3
+    "@polkadot/types": 2.5.2-3
+    "@polkadot/util": ^4.0.1
     "@types/websocket": ^1.0.1
     "@types/yargs": ^15.0.9
     handlebars: ^4.7.6
     websocket: ^1.0.32
     yargs: ^16.1.0
+  peerDependencies:
+    "@polkadot/util": "*"
   bin:
     polkadot-types-chain-info: ./scripts/polkadot-types-chain-info.js
     polkadot-types-from-chain: ./scripts/polkadot-types-from-chain.js
@@ -1993,43 +2015,49 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-known@^2.5.2-3, @polkadot/types-known@workspace:packages/types-known":
+"@polkadot/types-known@2.5.2-3, @polkadot/types-known@workspace:packages/types-known":
   version: 0.0.0-use.local
   resolution: "@polkadot/types-known@workspace:packages/types-known"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/types": ^2.5.2-3
-    "@polkadot/util": ^4.0.0-5
+    "@polkadot/types": 2.5.2-3
+    "@polkadot/util": ^4.0.1
     "@types/bn.js": ^4.11.6
     bn.js: ^5.1.3
+  peerDependencies:
+    "@polkadot/util": "*"
   languageName: unknown
   linkType: soft
 
-"@polkadot/types@^2.5.2-3, @polkadot/types@workspace:packages/types":
+"@polkadot/types@2.5.2-3, @polkadot/types@workspace:packages/types":
   version: 0.0.0-use.local
   resolution: "@polkadot/types@workspace:packages/types"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/keyring": ^4.0.0-5
-    "@polkadot/metadata": ^2.5.2-3
-    "@polkadot/util": ^4.0.0-5
-    "@polkadot/util-crypto": ^4.0.0-5
+    "@polkadot/keyring": ^4.0.1
+    "@polkadot/metadata": 2.5.2-3
+    "@polkadot/util": ^4.0.1
+    "@polkadot/util-crypto": ^4.0.1
     "@types/bn.js": ^4.11.6
     "@types/memoizee": ^0.4.4
     bn.js: ^5.1.3
     memoizee: ^0.4.14
     rxjs: ^6.6.3
+  peerDependencies:
+    "@polkadot/util": "*"
+    "@polkadot/util-crypto": "*"
   languageName: unknown
   linkType: soft
 
-"@polkadot/util-crypto@npm:^4.0.0-5":
-  version: 4.0.0-5
-  resolution: "@polkadot/util-crypto@npm:4.0.0-5"
+"@polkadot/util-crypto@npm:4.0.1, @polkadot/util-crypto@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@polkadot/util-crypto@npm:4.0.1"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/networks": ^4.0.0-5
-    "@polkadot/util": ^4.0.0-5
-    "@polkadot/wasm-crypto": ^2.0.0-7
+    "@polkadot/networks": 4.0.1
+    "@polkadot/util": 4.0.1
+    "@polkadot/wasm-crypto": ^2.0.1
+    "@polkadot/x-randomvalues": 4.0.1
     base-x: ^3.0.8
     blakejs: ^1.1.0
     bn.js: ^5.1.3
@@ -2040,71 +2068,83 @@ __metadata:
     scryptsy: ^2.1.0
     tweetnacl: ^1.0.3
     xxhashjs: ^0.2.2
-  checksum: e92339103cd9ab95c71323589bacfaca61b7944bef66e739a6802c13fc23a176711e2fccb6a2c3f7e6adc5e643c3957decac04a60c4bbbf19ebda90b706ef9ea
+  peerDependencies:
+    "@polkadot/util": 4.0.1
+  checksum: 8bb2f44d73e920a1a16eb7c3939c6fd6fb7d33a34844d9600a7b4e58ee67f0ac869b8877e262cec55063207fd0cf7754e49cdabe8c88c0c241ff3129fe315c35
   languageName: node
   linkType: hard
 
-"@polkadot/util@npm:^4.0.0-5":
-  version: 4.0.0-5
-  resolution: "@polkadot/util@npm:4.0.0-5"
+"@polkadot/util@npm:4.0.1, @polkadot/util@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@polkadot/util@npm:4.0.1"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/x-textdecoder": ^4.0.0-5
-    "@polkadot/x-textencoder": ^4.0.0-5
+    "@polkadot/x-textdecoder": 4.0.1
+    "@polkadot/x-textencoder": 4.0.1
     "@types/bn.js": ^4.11.6
     bn.js: ^5.1.3
     camelcase: ^5.3.1
     ip-regex: ^4.2.0
-  checksum: 573f738b02a93546e8a831ab5bf133c190bc8ce007127d306c15b187b3bc72fe738eebafcdf3387ed3b8fe855611448cf459ef8ec5f5455fc291a0dfc07580cf
+  checksum: 316db22e9d63dd25f11e4339a769acb9f594dd134adb32d89805c576764a0b0d03e52467b61de410886308f14b819bd25034d2f6ca08f3abf53ba871e229d726
   languageName: node
   linkType: hard
 
-"@polkadot/wasm-crypto@npm:^2.0.0-7":
-  version: 2.0.0-7
-  resolution: "@polkadot/wasm-crypto@npm:2.0.0-7"
+"@polkadot/wasm-crypto@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@polkadot/wasm-crypto@npm:2.0.1"
   peerDependencies:
     "@polkadot/util": "*"
-  checksum: 018bed0e713bd1d4701a3da12f37d91f5691f7c23315642b9e669d815cbcae26df4695eb468e5eb572f2208a92ca17c24c035685f0e82c51e1fdac4a3c43e03c
+    "@polkadot/x-randomvalues": "*"
+  checksum: eb5ff8e6614c98dcac94967e40d4e96bdd48521f26ab1f6419dbf14a9d76080880ab069ea2a1a55b1bd86b5c9f1480810bfb2ae36f3d54312a1631c0fefb04e3
   languageName: node
   linkType: hard
 
-"@polkadot/x-fetch@npm:^4.0.0-5":
-  version: 4.0.0-5
-  resolution: "@polkadot/x-fetch@npm:4.0.0-5"
+"@polkadot/x-fetch@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@polkadot/x-fetch@npm:4.0.1"
   dependencies:
     "@babel/runtime": ^7.12.1
     "@types/node-fetch": ^2.5.7
     node-fetch: ^2.6.1
-  checksum: 913d7abbd889273c45c42d2582a1db830091431fc12e32715cfae907d2352b44c97b5e8f8ede6d3e5cff41079b50a6528f3f0a1a06e442da9e91e0a0156dc630
+  checksum: d1aa6ede4df491c71af8fccbff032b80df27bbefff407aeea9db7bbf842012a75e2e66ceb57ea2ec733397f6188544a19fed509f693680cfb220fcdccb372ac6
   languageName: node
   linkType: hard
 
-"@polkadot/x-textdecoder@npm:^4.0.0-5":
-  version: 4.0.0-5
-  resolution: "@polkadot/x-textdecoder@npm:4.0.0-5"
+"@polkadot/x-randomvalues@npm:4.0.1":
+  version: 4.0.1
+  resolution: "@polkadot/x-randomvalues@npm:4.0.1"
   dependencies:
     "@babel/runtime": ^7.12.1
-  checksum: 155942a0a1baf2cf8a4f30fc9b922144faa84c4ae5809bb70a68dfba10a4f9e7ebc8d5a8b6d5c401e27b874a741fd3256416af2884979f7f283eb568b1246ee3
+  checksum: 819d8fcb30ada53a588adf4fbb947ec76ce6a72d2ea5b67d85f7ece105dc3734a0afa345e963af80c8c08f91f3248a807e7229f4649179be88e6717d49f14056
   languageName: node
   linkType: hard
 
-"@polkadot/x-textencoder@npm:^4.0.0-5":
-  version: 4.0.0-5
-  resolution: "@polkadot/x-textencoder@npm:4.0.0-5"
+"@polkadot/x-textdecoder@npm:4.0.1":
+  version: 4.0.1
+  resolution: "@polkadot/x-textdecoder@npm:4.0.1"
   dependencies:
     "@babel/runtime": ^7.12.1
-  checksum: c5a08d3ead2c59d3e580a218e906efa6db1721c5d236196f88fdd866e3b7b1360e98bfdab2bbe52515a2a050505aabfb26dc3f9149c2c861e3ce4081798e2368
+  checksum: f12ef770f02756600ced9e35cd8c239f5ffef231f71b39b4f12854f0a64cc154e55dd344ddcbcfca0fb587c24bc0920bfb0288c8dabf27f2a5d317c67eee3eeb
   languageName: node
   linkType: hard
 
-"@polkadot/x-ws@npm:^4.0.0-5":
-  version: 4.0.0-5
-  resolution: "@polkadot/x-ws@npm:4.0.0-5"
+"@polkadot/x-textencoder@npm:4.0.1":
+  version: 4.0.1
+  resolution: "@polkadot/x-textencoder@npm:4.0.1"
+  dependencies:
+    "@babel/runtime": ^7.12.1
+  checksum: 045f1b2b8671c9b75a0144dd373714c12d386fa66c490de5ebd1abfd195b162972db63149376a8838f8626d55aeebd8b2f71c5795157e4009d6be1854cf6c226
+  languageName: node
+  linkType: hard
+
+"@polkadot/x-ws@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@polkadot/x-ws@npm:4.0.1"
   dependencies:
     "@babel/runtime": ^7.12.1
     "@types/websocket": ^1.0.1
     websocket: ^1.0.32
-  checksum: 3bc4860e4e5e70ff71fc0598f474c11b1f28fd90cad8b0e8347c05faf7aa9fed5b5f40de0062a266a30debb0b724d2524f5ba5cf4211aaa35e339d3a3bb4c8c0
+  checksum: f48b366856625a450d13a9bffeba53d2ab592efc939249a223cb68a45c7ae2d50490f6b28501be87e2d35933c9890ba2e2a3510188c9b5916b43ca5c2baa8b65
   languageName: node
   linkType: hard
 
@@ -9382,7 +9422,7 @@ fsevents@^1.2.7:
     "@babel/core": ^7.12.3
     "@babel/register": ^7.12.1
     "@babel/runtime": ^7.12.1
-    "@polkadot/dev": ^0.59.19
+    "@polkadot/dev": ^0.59.20
     "@polkadot/ts": ^0.3.53
     "@polkadot/typegen": "workspace:packages/typegen"
     "@types/jest": ^26.0.15