diff --git a/.eslintrc.js b/.eslintrc.js
index 80033e741..6d2c8a4ba 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,29 +1,30 @@
 module.exports = {
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:@typescript-eslint/recommended-requiring-type-checking',
-    'prettier/@typescript-eslint',
-    'plugin:prettier/recommended'
-  ],
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    project: './tsconfig.json'
-  },
-  plugins: [
-    '@typescript-eslint',
-    'prettier',
-    'simple-import-sort'
-  ],
-  rules: {
-    // Sort imports
-    'simple-import-sort/sort': 'error',
-    // https://github.com/eslint/eslint/issues/2321#issuecomment-134665757
-    'no-unused-vars': [2, { args: 'all', argsIgnorePattern: '^_' }],
-    '@typescript-eslint/no-unused-vars': [
-      2,
-      { args: 'all', argsIgnorePattern: '^_' }
-    ],
-    "@typescript-eslint/ban-types": 0,
-  },
+	extends: [
+		'eslint:recommended',
+		'plugin:@typescript-eslint/recommended',
+		'plugin:@typescript-eslint/recommended-requiring-type-checking',
+		'prettier/@typescript-eslint',
+		'plugin:prettier/recommended'
+	],
+	parser: '@typescript-eslint/parser',
+	parserOptions: {
+		project: './tsconfig.json'
+	},
+	plugins: [
+		'@typescript-eslint',
+		'prettier',
+		'simple-import-sort'
+	],
+	rules: {
+		// Sort imports
+		'simple-import-sort/imports': 'error',
+		'simple-import-sort/exports': 'error',
+		// https://github.com/eslint/eslint/issues/2321#issuecomment-134665757
+		'no-unused-vars': [2, { args: 'all', argsIgnorePattern: '^_' }],
+		'@typescript-eslint/no-unused-vars': [
+			2,
+			{ args: 'all', argsIgnorePattern: '^_' }
+		],
+		"@typescript-eslint/ban-types": 0,
+	},
 };
diff --git a/package.json b/package.json
index 73204c5a2..330c47026 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,8 @@
     "test": "jest --silent"
   },
   "dependencies": {
-    "@polkadot/api": "^2.6.1",
-    "@polkadot/util-crypto": "^4.0.1",
+    "@polkadot/api": "^2.7.1",
+    "@polkadot/util-crypto": "^4.1.1",
     "@substrate/calc": "^0.1.2",
     "confmgr": "^1.0.6",
     "express": "^4.17.1",
@@ -46,7 +46,7 @@
     "winston": "^3.3.3"
   },
   "devDependencies": {
-    "@types/express": "^4.17.8",
+    "@types/express": "^4.17.9",
     "@types/express-serve-static-core": "^4.17.13",
     "@types/http-errors": "^1.6.3",
     "@types/jest": "^26.0.15",
@@ -57,7 +57,7 @@
     "eslint": "^7.13.0",
     "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-simple-import-sort": "^5.0.3",
+    "eslint-plugin-simple-import-sort": "^6.0.0",
     "jest": "^26.6.3",
     "prettier": "^2.1.2",
     "rimraf": "^3.0.2",
diff --git a/src/controllers/accounts/index.ts b/src/controllers/accounts/index.ts
index c18d34411..403431ffa 100644
--- a/src/controllers/accounts/index.ts
+++ b/src/controllers/accounts/index.ts
@@ -1,4 +1,4 @@
-export { default as AccountsStakingPayouts } from './AccountsStakingPayoutsController';
 export { default as AccountsBalanceInfo } from './AccountsBalanceInfoController';
 export { default as AccountsStakingInfo } from './AccountsStakingInfoController';
+export { default as AccountsStakingPayouts } from './AccountsStakingPayoutsController';
 export { default as AccountsVestingInfo } from './AccountsVestingInfoController';
diff --git a/src/controllers/index.ts b/src/controllers/index.ts
index 412debb68..6ae6c08bf 100644
--- a/src/controllers/index.ts
+++ b/src/controllers/index.ts
@@ -1,6 +1,6 @@
-export * from './transaction';
 export * from './accounts';
 export * from './blocks';
-export * from './runtime';
-export * from './pallets';
 export * from './node';
+export * from './pallets';
+export * from './runtime';
+export * from './transaction';
diff --git a/src/controllers/node/index.ts b/src/controllers/node/index.ts
index a75808af9..4860d2fc1 100644
--- a/src/controllers/node/index.ts
+++ b/src/controllers/node/index.ts
@@ -1,3 +1,3 @@
 export { default as NodeNetwork } from './NodeNetworkController';
-export { default as NodeVersion } from './NodeVersionController';
 export { default as NodeTransactionPool } from './NodeTransactionPoolController';
+export { default as NodeVersion } from './NodeVersionController';
diff --git a/src/controllers/runtime/index.ts b/src/controllers/runtime/index.ts
index 11161d0eb..a709df982 100644
--- a/src/controllers/runtime/index.ts
+++ b/src/controllers/runtime/index.ts
@@ -1,3 +1,3 @@
 export { default as RuntimeCode } from './RuntimeCodeController';
-export { default as RuntimeSpec } from './RuntimeSpecController';
 export { default as RuntimeMetadata } from './RuntimeMetadataController';
+export { default as RuntimeSpec } from './RuntimeSpecController';
diff --git a/src/controllers/transaction/index.ts b/src/controllers/transaction/index.ts
index 3ea343316..1337f9597 100644
--- a/src/controllers/transaction/index.ts
+++ b/src/controllers/transaction/index.ts
@@ -1,4 +1,4 @@
 export { default as TransactionDryRun } from './TransactionDryRunController';
-export { default as TransactionMaterial } from './TransactionMaterialController';
 export { default as TransactionFeeEstimate } from './TransactionFeeEstimateController';
+export { default as TransactionMaterial } from './TransactionMaterialController';
 export { default as TransactionSubmit } from './TransactionSubmitController';
diff --git a/src/logging/transformers/index.ts b/src/logging/transformers/index.ts
index 0275aeff7..86dcbedd4 100644
--- a/src/logging/transformers/index.ts
+++ b/src/logging/transformers/index.ts
@@ -1,5 +1,5 @@
-export * from './nodeUtilFormat';
-export * from './stripTimestamp';
 export * from './filterApiRpc';
+export * from './nodeUtilFormat';
 export * from './stripAnsi';
+export * from './stripTimestamp';
 export * from './timeStamp';
diff --git a/src/middleware/error/index.ts b/src/middleware/error/index.ts
index 5dea6cea0..b461b2329 100644
--- a/src/middleware/error/index.ts
+++ b/src/middleware/error/index.ts
@@ -1,5 +1,5 @@
-export { txErrorMiddleware as txError } from './txErrorMiddleware';
-export { httpErrorMiddleware as httpError } from './httpErrorMiddleware';
 export { errorMiddleware as error } from './errorMiddleware';
-export { legacyErrorMiddleware as legacyError } from './legacyErrorMiddleware';
+export { httpErrorMiddleware as httpError } from './httpErrorMiddleware';
 export { internalErrorMiddleware as internalError } from './internalErrorMiddleware';
+export { legacyErrorMiddleware as legacyError } from './legacyErrorMiddleware';
+export { txErrorMiddleware as txError } from './txErrorMiddleware';
diff --git a/src/middleware/validate/validateAddressMiddleware.ts b/src/middleware/validate/validateAddressMiddleware.ts
index 0dcb5d5f2..64166abaa 100644
--- a/src/middleware/validate/validateAddressMiddleware.ts
+++ b/src/middleware/validate/validateAddressMiddleware.ts
@@ -1,6 +1,6 @@
-import checkChecksum from '@polkadot/util-crypto/address/checkChecksum';
-import defaults from '@polkadot/util-crypto/address/defaults';
-import base58Decode from '@polkadot/util-crypto/base58/decode';
+import { checkAddressChecksum } from '@polkadot/util-crypto';
+import { base58Decode } from '@polkadot/util-crypto';
+import { defaults } from '@polkadot/util-crypto/address/defaults';
 import { RequestHandler } from 'express';
 import { BadRequest } from 'http-errors';
 
@@ -42,7 +42,7 @@ function checkAddress(address: string): [boolean, string | undefined] {
 		return [false, 'Invalid decoded address length'];
 	}
 
-	const [isValid] = checkChecksum(decoded);
+	const [isValid] = checkAddressChecksum(decoded);
 
 	return [isValid, isValid ? undefined : 'Invalid decoded address checksum'];
 }
diff --git a/src/sanitize/sanitizeNumbers.spec.ts b/src/sanitize/sanitizeNumbers.spec.ts
index 86aae4721..04b2976ed 100644
--- a/src/sanitize/sanitizeNumbers.spec.ts
+++ b/src/sanitize/sanitizeNumbers.spec.ts
@@ -5,42 +5,28 @@ import {
 	Compact,
 	Data,
 	Enum,
+	GenericCall,
 	HashMap,
+	Int,
+	Json,
 	Null,
 	Raw,
 	Result,
 	Set as CodecSet,
 	StorageKey,
 	Struct,
+	Text,
 	Tuple,
 	u8,
 	U8aFixed,
+	u32,
+	u64,
+	u128,
 	Vec,
+	VecFixed,
 } from '@polkadot/types';
-import CodecDate from '@polkadot/types/codec/Date';
-import Int from '@polkadot/types/codec/Int';
-import StructAny from '@polkadot/types/codec/Json';
-import Option from '@polkadot/types/codec/Option';
-import UInt from '@polkadot/types/codec/UInt';
-import VecFixed from '@polkadot/types/codec/VecFixed';
-import Extrinsic from '@polkadot/types/extrinsic/Extrinsic';
-import ExtrinsicEra from '@polkadot/types/extrinsic/ExtrinsicEra';
-import ExtrinsicPayload from '@polkadot/types/extrinsic/ExtrinsicPayload';
-import AccountId from '@polkadot/types/generic/AccountId';
-import Call from '@polkadot/types/generic/Call';
-import Event from '@polkadot/types/generic/Event';
-import Vote from '@polkadot/types/generic/Vote';
-import Bool from '@polkadot/types/primitive/Bool';
-import I8 from '@polkadot/types/primitive/I8';
-import I16 from '@polkadot/types/primitive/I16';
-import I32 from '@polkadot/types/primitive/I32';
-import I64 from '@polkadot/types/primitive/I64';
-import I128 from '@polkadot/types/primitive/I128';
-import Text from '@polkadot/types/primitive/Text';
-import U16 from '@polkadot/types/primitive/U16';
-import U32 from '@polkadot/types/primitive/U32';
-import U64 from '@polkadot/types/primitive/U64';
-import U128 from '@polkadot/types/primitive/U128';
+import { CodecDate } from '@polkadot/types/codec/Date';
+import { UInt } from '@polkadot/types/codec/UInt';
 import * as BN from 'bn.js';
 
 import {
@@ -82,13 +68,16 @@ describe('sanitizeNumbers', () => {
 	describe('javscript native', () => {
 		describe('javascript types it cannot handle properly', () => {
 			it('does not handle WeakMap', () => {
-				const compact = new (Compact.with(U128))(
+				const compact = new (Compact.with(u128))(
 					kusamaRegistry,
 					MAX_U128
 				);
 				const map = new WeakMap()
 					.set({ x: 'x' }, compact)
-					.set({ y: 'y' }, new U128(kusamaRegistry, MAX_U128));
+					.set(
+						{ y: 'y' },
+						kusamaRegistry.createType('u128', MAX_U128)
+					);
 
 				expect(sanitizeNumbers(map)).toStrictEqual({});
 			});
@@ -140,8 +129,8 @@ describe('sanitizeNumbers', () => {
 		it('converts Array', () => {
 			expect(
 				sanitizeNumbers([
-					new U128(kusamaRegistry, MAX_U128),
-					new U64(kusamaRegistry, MAX_U64),
+					kusamaRegistry.createType('u128', MAX_U128),
+					kusamaRegistry.createType('u64', MAX_U64),
 				])
 			).toStrictEqual([MAX_U128, MAX_U64]);
 
@@ -150,11 +139,11 @@ describe('sanitizeNumbers', () => {
 
 		it('converts nested POJO', () => {
 			const pojo = {
-				three: new U32(kusamaRegistry, MAX_U32),
+				three: kusamaRegistry.createType('u32', MAX_U32),
 				x: {
-					six: new U64(kusamaRegistry, MAX_U64),
+					six: kusamaRegistry.createType('u64', MAX_U64),
 					x: {
-						one: new U128(kusamaRegistry, MAX_U128),
+						one: kusamaRegistry.createType('u128', MAX_U128),
 						b: kusamaRegistry.createType('Balance', MAX_U128),
 					},
 				},
@@ -184,15 +173,15 @@ describe('sanitizeNumbers', () => {
 		});
 
 		it('converts javascript Set', () => {
-			const negInt = new Int(kusamaRegistry, MIN_I32, 32);
+			const negInt = kusamaRegistry.createType('i32', MIN_I32);
 
-			const maxInt = new Int(kusamaRegistry, MAX_I64, 64);
+			const maxInt = kusamaRegistry.createType('i64', MAX_I64);
 
 			const struct = new Struct(
 				kusamaRegistry,
 				{
 					foo: Text,
-					bar: U32,
+					bar: 'u32',
 				},
 				{ foo: 'hi :)', bar: MAX_U32 }
 			);
@@ -212,12 +201,12 @@ describe('sanitizeNumbers', () => {
 			const struct = new Struct(
 				kusamaRegistry,
 				{
-					foo: Text,
-					bar: U32,
+					foo: 'Text',
+					bar: 'u32',
 				},
 				{ foo: 'hi :)', bar: MAX_U32 }
 			);
-			const compact = new (Compact.with(U128))(kusamaRegistry, MAX_U128);
+			const compact = new (Compact.with(u128))(kusamaRegistry, MAX_U128);
 			const nest = new Map().set('s', struct).set('b', new BN(MAX_U128));
 			const outer = new Map().set('c', compact).set('n', nest);
 			expect(sanitizeNumbers(outer)).toStrictEqual({
@@ -240,8 +229,8 @@ describe('sanitizeNumbers', () => {
 			const struct = new Struct(
 				kusamaRegistry,
 				{
-					foo: Text,
-					bar: U32,
+					foo: 'Text',
+					bar: 'u32',
 				},
 				{ foo: 'hi :)', bar: MAX_U32 }
 			);
@@ -251,14 +240,14 @@ describe('sanitizeNumbers', () => {
 				bar: MAX_U32,
 			});
 
-			const structAny = new StructAny(kusamaRegistry, {
-				b: new Bool(kusamaRegistry, true),
-				i: new I128(kusamaRegistry, MAX_I128),
-				o: new Option(kusamaRegistry, 'Option<i128>', MAX_I128),
+			const json = new Json(kusamaRegistry, {
+				b: kusamaRegistry.createType('Bool', true),
+				i: kusamaRegistry.createType('i128', MAX_I128),
+				o: kusamaRegistry.createType('Option<i128>', MAX_I128),
 				s: struct,
 			});
 
-			expect(sanitizeNumbers(structAny)).toStrictEqual({
+			expect(sanitizeNumbers(json)).toStrictEqual({
 				b: true,
 				i: MAX_I128,
 				o: MAX_I128,
@@ -296,10 +285,10 @@ describe('sanitizeNumbers', () => {
 		});
 
 		it('handles Codec Bool', () => {
-			const t = new Bool(kusamaRegistry, true);
+			const t = kusamaRegistry.createType('Bool', true);
 			expect(sanitizeNumbers(t)).toBe(true);
 
-			const f = new Bool(kusamaRegistry, false);
+			const f = kusamaRegistry.createType('Bool', false);
 			expect(sanitizeNumbers(f)).toBe(false);
 		});
 
@@ -334,13 +323,13 @@ describe('sanitizeNumbers', () => {
 		});
 
 		it('handles Text', () => {
-			const notEnglish = new Text(kusamaRegistry, '中文');
+			const notEnglish = kusamaRegistry.createType('Text', '中文');
 			expect(sanitizeNumbers(notEnglish)).toBe('中文');
 		});
 
 		describe('number primitives', () => {
 			it('converts u8', () => {
-				const z = new u8(kusamaRegistry, 0);
+				const z = kusamaRegistry.createType('u8', 0);
 				expect(sanitizeNumbers(z)).toBe('0');
 
 				const m = new u8(kusamaRegistry, MAX_U8);
@@ -348,32 +337,32 @@ describe('sanitizeNumbers', () => {
 			});
 
 			it('converts i8', () => {
-				const z = new I8(kusamaRegistry, 0);
+				const z = kusamaRegistry.createType('i8', 0);
 				expect(sanitizeNumbers(z)).toBe('0');
 
-				const min = new I8(kusamaRegistry, MIN_I8);
+				const min = kusamaRegistry.createType('i8', MIN_I8);
 				expect(sanitizeNumbers(min)).toBe(MIN_I8);
 
-				const max = new I8(kusamaRegistry, MAX_I8);
+				const max = kusamaRegistry.createType('i8', MAX_I8);
 				expect(sanitizeNumbers(max)).toBe(MAX_I8);
 			});
 
 			it('converts u16', () => {
-				const z = new U16(kusamaRegistry, 0);
+				const z = kusamaRegistry.createType('u16', 0);
 				expect(sanitizeNumbers(z)).toBe('0');
 
-				const max = new U16(kusamaRegistry, MAX_U16);
+				const max = kusamaRegistry.createType('u16', MAX_U16);
 				expect(sanitizeNumbers(max)).toBe(MAX_U16);
 			});
 
 			it('converts i16', () => {
-				const z = new I16(kusamaRegistry, 0);
+				const z = kusamaRegistry.createType('i16', 0);
 				expect(sanitizeNumbers(z)).toBe('0');
 
-				const min = new I16(kusamaRegistry, MIN_I16);
+				const min = kusamaRegistry.createType('i16', MIN_I16);
 				expect(sanitizeNumbers(min)).toBe(MIN_I16);
 
-				const max = new I16(kusamaRegistry, MAX_I16);
+				const max = kusamaRegistry.createType('i16', MAX_I16);
 				expect(sanitizeNumbers(max)).toBe(MAX_I16);
 			});
 			it('converts Int', () => {
@@ -407,71 +396,77 @@ describe('sanitizeNumbers', () => {
 			});
 
 			it('converts U32', () => {
-				const u32Zero = new U32(kusamaRegistry, '0x0');
+				const u32Zero = kusamaRegistry.createType('u32', '0x0');
 				expect(sanitizeNumbers(u32Zero)).toBe('0');
 
-				const u32Max = new U32(kusamaRegistry, MAX_U32);
+				const u32Max = kusamaRegistry.createType('u32', MAX_U32);
 				expect(sanitizeNumbers(u32Max)).toBe(MAX_U32);
 			});
 
 			it('converts I32', () => {
-				expect(sanitizeNumbers(new I32(kusamaRegistry, MIN_I32))).toBe(
-					MIN_I32
-				);
+				expect(
+					sanitizeNumbers(kusamaRegistry.createType('i32', MIN_I32))
+				).toBe(MIN_I32);
 
-				expect(sanitizeNumbers(new I32(kusamaRegistry, MAX_I32))).toBe(
-					MAX_I32
-				);
+				expect(
+					sanitizeNumbers(kusamaRegistry.createType('i32', MAX_I32))
+				).toBe(MAX_I32);
 			});
 
 			it('converts U64', () => {
-				const u64Zero = new U64(kusamaRegistry, '0x0');
+				const u64Zero = kusamaRegistry.createType('u64', '0x0');
 				expect(sanitizeNumbers(u64Zero)).toBe('0');
 
-				const u64Max = new U64(kusamaRegistry, MAX_U64);
+				const u64Max = kusamaRegistry.createType('u64', MAX_U64);
 				expect(sanitizeNumbers(u64Max)).toBe(MAX_U64);
 			});
 
 			it('converts I64', () => {
-				expect(sanitizeNumbers(new I64(kusamaRegistry, MIN_I64))).toBe(
-					MIN_I64
-				);
+				expect(
+					sanitizeNumbers(kusamaRegistry.createType('i64', MIN_I64))
+				).toBe(MIN_I64);
 
-				expect(sanitizeNumbers(new I64(kusamaRegistry, MAX_I64))).toBe(
-					MAX_I64
-				);
+				expect(
+					sanitizeNumbers(kusamaRegistry.createType('i64', MAX_I64))
+				).toBe(MAX_I64);
 			});
 
 			it('converts U128', () => {
-				const u128Zero = new U128(kusamaRegistry, '0x0');
+				const u128Zero = kusamaRegistry.createType('u128', '0x0');
 				expect(sanitizeNumbers(u128Zero)).toBe('0');
 
-				const u128Max = new U128(kusamaRegistry, MAX_U128);
+				const u128Max = kusamaRegistry.createType('u128', MAX_U128);
 				expect(sanitizeNumbers(u128Max)).toBe(MAX_U128);
 			});
 
 			it('converts II28', () => {
 				expect(
-					sanitizeNumbers(new I128(kusamaRegistry, MAX_I128))
+					sanitizeNumbers(kusamaRegistry.createType('I128', MAX_I128))
 				).toBe(MAX_I128);
 
 				expect(
-					sanitizeNumbers(new I128(kusamaRegistry, MIN_I128))
+					sanitizeNumbers(kusamaRegistry.createType('I128', MIN_I128))
 				).toBe(MIN_I128);
 			});
 		});
 
 		describe('BTreeMap', () => {
-			const mockU32TextMap = new Map<Text, U32>()
+			const mockU32TextMap = new Map<Text, u32>()
 				.set(
-					new Text(kusamaRegistry, 'u32Max'),
-					new U32(kusamaRegistry, '0xffffffff')
+					(kusamaRegistry.createType(
+						'Text',
+						'u32Max'
+					) as unknown) as Text,
+					kusamaRegistry.createType('u32', '0xffffffff')
 				)
 				.set(
-					new Text(kusamaRegistry, 'zero'),
-					new U32(kusamaRegistry, 0)
+					(kusamaRegistry.createType(
+						'Text',
+						'zero'
+					) as unknown) as Text,
+					kusamaRegistry.createType('u32', 0)
 				);
-			const bTreeMapConstructor = BTreeMap.with(Text, U32);
+			const bTreeMapConstructor = BTreeMap.with('Text', 'u32');
 
 			it('converts BTreeMap and nested BTreeMap', () => {
 				const sanitizedBTreeMap = {
@@ -488,10 +483,10 @@ describe('sanitizeNumbers', () => {
 
 			it('converts a nested BTreeMap', () => {
 				const structWithBTreeMap = new Struct(kusamaRegistry, {
-					foo: U32,
+					foo: u32,
 					value: 'BTreeMap<Text, u32>' as 'u32',
 				})
-					.set('foo', new U32(kusamaRegistry, 50))
+					.set('foo', kusamaRegistry.createType('u32', 50))
 					.set(
 						'value',
 						new bTreeMapConstructor(kusamaRegistry, mockU32TextMap)
@@ -508,11 +503,11 @@ describe('sanitizeNumbers', () => {
 		});
 
 		describe('BTreeSet', () => {
-			const U64Set = new Set<U64>()
-				.add(new U64(kusamaRegistry, '0x0'))
-				.add(new U64(kusamaRegistry, '24'))
-				.add(new U64(kusamaRegistry, '30'))
-				.add(new U64(kusamaRegistry, MAX_U64));
+			const U64Set = new Set<u64>()
+				.add(kusamaRegistry.createType('u64', '0x0'))
+				.add(kusamaRegistry.createType('u64', '24'))
+				.add(kusamaRegistry.createType('u64', '30'))
+				.add(kusamaRegistry.createType('u64', MAX_U64));
 
 			const sanitizedBTreeSet = ['0', '24', '30', MAX_U64];
 
@@ -525,10 +520,10 @@ describe('sanitizeNumbers', () => {
 
 			it('converts nested BTreeSet', () => {
 				const structWithBTreeSet = new Struct(kusamaRegistry, {
-					foo: U64,
-					value: BTreeSet.with(U64),
+					foo: 'u64',
+					value: BTreeSet.with('u64'),
 				})
-					.set('foo', new U64(kusamaRegistry, 50))
+					.set('foo', kusamaRegistry.createType('u64', 50))
 					.set('value', new BTreeSet(kusamaRegistry, 'u64', U64Set));
 
 				expect(sanitizeNumbers(structWithBTreeSet)).toStrictEqual({
@@ -548,24 +543,24 @@ describe('sanitizeNumbers', () => {
 
 			expect(
 				sanitizeNumbers(
-					new (Compact.with(U32))(kusamaRegistry, MAX_U32)
+					new (Compact.with(u32))(kusamaRegistry, MAX_U32)
 				)
 			).toBe(MAX_U32);
 
 			expect(
 				sanitizeNumbers(
-					new (Compact.with(U128))(kusamaRegistry, MAX_U128)
+					new (Compact.with('u128'))(kusamaRegistry, MAX_U128)
 				)
 			).toBe(MAX_U128);
 		});
 
 		it('converts nested Enum', () => {
 			const Nest = Enum.with({
-				C: U64,
-				D: U64,
+				C: 'u64',
+				D: 'u64',
 			});
 			const Test = Enum.with({
-				A: U64,
+				A: 'u64',
 				B: Nest,
 			});
 			const test = new Test(
@@ -597,19 +592,18 @@ describe('sanitizeNumbers', () => {
 
 		describe('Option', () => {
 			it('converts None to null', () => {
-				const none = new Option(kusamaRegistry, Text, null);
+				const none = kusamaRegistry.createType('Option<Text>', null);
 				expect(sanitizeNumbers(none)).toBe(null);
 			});
 
 			it('handles wrapped Some(Text)', () => {
-				const hi = new Option(kusamaRegistry, Text, 'hi');
+				const hi = kusamaRegistry.createType('Text', 'hi');
 				expect(sanitizeNumbers(hi)).toBe('hi');
 			});
 
 			it('converts Some(U128)', () => {
-				const u128MaxOption = new Option(
-					kusamaRegistry,
-					U128,
+				const u128MaxOption = kusamaRegistry.createType(
+					'Option<u128>',
 					MAX_U128
 				);
 				expect(sanitizeNumbers(u128MaxOption)).toBe(MAX_U128);
@@ -622,8 +616,8 @@ describe('sanitizeNumbers', () => {
 		});
 
 		it('converts nested HashMap', () => {
-			const outer = HashMap.with(Text, HashMap);
-			const inner = HashMap.with(Text, U128);
+			const outer = HashMap.with('Text', HashMap);
+			const inner = HashMap.with('Text', 'U128');
 
 			const map = new outer(kusamaRegistry, {
 				nest: new inner(kusamaRegistry, { n: MAX_U128 }),
@@ -635,11 +629,11 @@ describe('sanitizeNumbers', () => {
 
 		describe('Result', () => {
 			const ResultConstructor = Result.with({
-				Error: Text,
-				Ok: U128,
+				Error: 'Text',
+				Ok: 'u128',
 			});
-			const message = new Text(kusamaRegistry, 'message');
-			const maxU128 = new U128(kusamaRegistry, MAX_U128);
+			const message = kusamaRegistry.createType('Text', 'message');
+			const maxU128 = kusamaRegistry.createType('u128', MAX_U128);
 
 			// it('handles Ok()', () => {
 			// 	const ok = kusamaRegistry.createType('DispatchResult');
@@ -703,7 +697,7 @@ describe('sanitizeNumbers', () => {
 			// 	expect(sanitizeNumbers(ok)).toBe(message.toString());
 			// });
 			it('handles Ok(Text)', () => {
-				const R = Result.with({ Error: Text, Ok: Text });
+				const R = Result.with({ Error: 'Text', Ok: 'Text' });
 				const ok = new R(kusamaRegistry, {
 					Ok: message,
 				});
@@ -730,8 +724,8 @@ describe('sanitizeNumbers', () => {
 				const struct = new Struct(
 					kusamaRegistry,
 					{
-						foo: Text,
-						bar: U32,
+						foo: 'Text',
+						bar: 'u32',
 					},
 					{ foo: 'hi :)', bar: MAX_U32 }
 				);
@@ -748,8 +742,8 @@ describe('sanitizeNumbers', () => {
 					{
 						foo: Vec.with(
 							Struct.with({
-								w: Text,
-								bar: U32,
+								w: 'Text',
+								bar: 'u32',
 							})
 						),
 					},
@@ -789,16 +783,16 @@ describe('sanitizeNumbers', () => {
 				const struct = new Struct(
 					kusamaRegistry,
 					{
-						n: U32,
+						n: 'u32',
 						x: Struct.with({
-							n: U32,
+							n: 'u32',
 							x: Struct.with({
-								n: U32,
+								n: 'u32',
 								x: Struct.with({
-									n: U32,
+									n: 'u32',
 									x: Struct.with({
-										n: U128,
-										w: Text,
+										n: 'u128',
+										w: 'Text',
 									}),
 								}),
 							}),
@@ -815,7 +809,7 @@ describe('sanitizeNumbers', () => {
 			it('converts a simple Tuple', () => {
 				const tuple = new Tuple(
 					kusamaRegistry,
-					[Text, U128],
+					['Text', 'u128'],
 					['xX', MAX_U128]
 				);
 
@@ -825,7 +819,7 @@ describe('sanitizeNumbers', () => {
 			it('converts a 3 deep nested Tuple', () => {
 				const tuple = new Tuple(
 					kusamaRegistry,
-					[Tuple.with([Tuple.with([U32, U128]), U128]), U32],
+					[Tuple.with([Tuple.with(['u32', 'u128']), 'u128']), 'u32'],
 					[[0, 6074317682114550], 0]
 				);
 
@@ -842,7 +836,7 @@ describe('sanitizeNumbers', () => {
 		});
 
 		it('converts Vec<U128>', () => {
-			const vec = new (Vec.with(U128))(kusamaRegistry, [
+			const vec = new (Vec.with('u128'))(kusamaRegistry, [
 				'0',
 				'366920938463463374607431768211455',
 				MAX_U128,
@@ -855,7 +849,7 @@ describe('sanitizeNumbers', () => {
 		});
 
 		it('converts VecFixed<U128>', () => {
-			const vec = new (VecFixed.with(U128, 3))(kusamaRegistry, [
+			const vec = new (VecFixed.with('u128', 3))(kusamaRegistry, [
 				'0',
 				'366920938463463374607431768211455',
 				MAX_U128,
@@ -886,7 +880,7 @@ describe('sanitizeNumbers', () => {
 		});
 
 		it('handles Call', () => {
-			const c = new Call(kusamaRegistry, {
+			const c = new GenericCall(kusamaRegistry, {
 				args: [
 					'5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw',
 					100000,
@@ -903,8 +897,8 @@ describe('sanitizeNumbers', () => {
 		});
 
 		it('handles Event', () => {
-			const event = new Event(
-				kusamaRegistry,
+			const event = kusamaRegistry.createType(
+				'Event',
 				new Uint8Array([6, 1, 1, 1])
 			);
 			expect(sanitizeNumbers(event)).toStrictEqual({
@@ -942,8 +936,8 @@ describe('sanitizeNumbers', () => {
 		});
 
 		it('handles Extrinsic', () => {
-			const extrinsic = new Extrinsic(
-				kusamaRegistry,
+			const extrinsic = kusamaRegistry.createType(
+				'Extrinsic',
 				'0x250284d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d0182630bcec823e017e7ae576feda0dae3bf76f74049f3b8f72884dcb41169154bc7d179d47b50453f4f8865a5f3030c1e78ed8eff624765d0ff5eb0136a46538e1502000005008eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a4830'
 			);
 			expect(sanitizeNumbers(extrinsic)).toBe(
@@ -952,7 +946,10 @@ describe('sanitizeNumbers', () => {
 		});
 
 		it('handles ExtrinsicEra', () => {
-			const extrinsicEra = new ExtrinsicEra(kusamaRegistry, '0x6502');
+			const extrinsicEra = kusamaRegistry.createType(
+				'ExtrinsicEra',
+				'0x6502'
+			);
 			expect(sanitizeNumbers(extrinsicEra)).toStrictEqual({
 				MortalEra: ['64', '38'],
 			});
@@ -973,8 +970,8 @@ describe('sanitizeNumbers', () => {
 				tip: '0x00000000000000000000000000005678',
 			};
 
-			const extrinsicPayload = new ExtrinsicPayload(
-				kusamaRegistry,
+			const extrinsicPayload = kusamaRegistry.createType(
+				'ExtrinsicPayload',
 				load,
 				{
 					version: 4,
@@ -986,13 +983,13 @@ describe('sanitizeNumbers', () => {
 		});
 
 		it('handles Vote', () => {
-			const aye = new Vote(kusamaRegistry, {
+			const aye = kusamaRegistry.createType('Vote', {
 				aye: true,
 				conviction: 'Locked2x',
 			});
 			expect(sanitizeNumbers(aye)).toBe('0x82');
 
-			const nay = new Vote(kusamaRegistry, {
+			const nay = kusamaRegistry.createType('Vote', {
 				aye: false,
 				conviction: 'Locked2x',
 			});
@@ -1181,7 +1178,7 @@ describe('sanitizeNumbers', () => {
 	});
 
 	it('handles Vec<AccountId>', () => {
-		const vec = new Vec(kusamaRegistry, AccountId, [
+		const vec = new Vec(kusamaRegistry, 'AccountId', [
 			'5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw',
 			'5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty',
 			'5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY',
diff --git a/src/sanitize/sanitizeNumbers.ts b/src/sanitize/sanitizeNumbers.ts
index 0782d875b..a825521d7 100644
--- a/src/sanitize/sanitizeNumbers.ts
+++ b/src/sanitize/sanitizeNumbers.ts
@@ -6,10 +6,10 @@ import {
 	Set as CodecSet,
 	Struct,
 } from '@polkadot/types';
-import AbstractArray from '@polkadot/types/codec/AbstractArray';
-import AbstractInt from '@polkadot/types/codec/AbstractInt';
-import StructAny from '@polkadot/types/codec/Json';
-import CodecMap from '@polkadot/types/codec/Map';
+import { AbstractArray } from '@polkadot/types/codec/AbstractArray';
+import { AbstractInt } from '@polkadot/types/codec/AbstractInt';
+import { Json } from '@polkadot/types/codec/Json';
+import { CodecMap } from '@polkadot/types/codec/Map';
 import { isObject } from '@polkadot/util';
 import * as BN from 'bn.js';
 import { InternalServerError } from 'http-errors';
@@ -53,14 +53,14 @@ function sanitizeCodec(value: Codec): AnyJson {
 		}, {} as Record<string, AnyJson>);
 	}
 
-	if (value instanceof StructAny) {
+	if (value instanceof Json) {
 		// This is essentially a Map with [keys: strings]: any
-		const jsonStructAny: Record<string, AnyJson> = {};
+		const json: Record<string, AnyJson> = {};
 		value.forEach((element, prop) => {
-			jsonStructAny[prop] = sanitizeNumbers(element);
+			json[prop] = sanitizeNumbers(element);
 		});
 
-		return jsonStructAny;
+		return json;
 	}
 
 	if (value instanceof Enum) {
diff --git a/src/services/accounts/index.ts b/src/services/accounts/index.ts
index 746962a72..c1d7c1655 100644
--- a/src/services/accounts/index.ts
+++ b/src/services/accounts/index.ts
@@ -1,4 +1,4 @@
-export * from './AccountsStakingPayoutsService';
 export * from './AccountsBalanceInfoService';
 export * from './AccountsStakingInfoService';
+export * from './AccountsStakingPayoutsService';
 export * from './AccountsVestingInfoService';
diff --git a/src/services/blocks/BlocksService.spec.ts b/src/services/blocks/BlocksService.spec.ts
index 8a37bcfea..f392c208a 100644
--- a/src/services/blocks/BlocksService.spec.ts
+++ b/src/services/blocks/BlocksService.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 import { RpcPromiseResult } from '@polkadot/api/types/rpc';
-import Extrinsic from '@polkadot/types/extrinsic/Extrinsic';
+import { GenericExtrinsic } from '@polkadot/types';
 import { GenericCall } from '@polkadot/types/generic';
 import { BlockHash, Hash, SignedBlock } from '@polkadot/types/interfaces';
 
@@ -50,7 +50,7 @@ describe('BlocksService', () => {
 			);
 			mockBlock789629BadExt.extrinsics.pop();
 			mockBlock789629BadExt.extrinsics.unshift(
-				(undefined as unknown) as Extrinsic
+				(undefined as unknown) as GenericExtrinsic
 			);
 
 			mockApi.rpc.chain.getBlock = (() =>
diff --git a/src/services/index.ts b/src/services/index.ts
index d0e77534d..6ae6c08bf 100644
--- a/src/services/index.ts
+++ b/src/services/index.ts
@@ -1,6 +1,6 @@
 export * from './accounts';
 export * from './blocks';
+export * from './node';
 export * from './pallets';
-export * from './transaction';
 export * from './runtime';
-export * from './node';
+export * from './transaction';
diff --git a/src/services/node/index.ts b/src/services/node/index.ts
index e9d5a8a79..1d4dd7e67 100644
--- a/src/services/node/index.ts
+++ b/src/services/node/index.ts
@@ -1,3 +1,3 @@
 export * from './NodeNetworkService';
-export * from './NodeVersionService';
 export * from './NodeTransactionPoolService';
+export * from './NodeVersionService';
diff --git a/src/services/runtime/RuntimeMetadataService.ts b/src/services/runtime/RuntimeMetadataService.ts
index 3b6b4623b..fd708f1b8 100644
--- a/src/services/runtime/RuntimeMetadataService.ts
+++ b/src/services/runtime/RuntimeMetadataService.ts
@@ -1,4 +1,4 @@
-import { Metadata } from '@polkadot/types';
+import { Metadata } from '@polkadot/metadata';
 import { BlockHash } from '@polkadot/types/interfaces';
 
 import { AbstractService } from '../AbstractService';
diff --git a/src/services/runtime/index.ts b/src/services/runtime/index.ts
index 75f7e0126..c261403ff 100644
--- a/src/services/runtime/index.ts
+++ b/src/services/runtime/index.ts
@@ -1,3 +1,3 @@
 export * from './RuntimeCodeService';
-export * from './RuntimeSpecService';
 export * from './RuntimeMetadataService';
+export * from './RuntimeSpecService';
diff --git a/src/services/test-helpers/mock/index.ts b/src/services/test-helpers/mock/index.ts
index fbcb0f8c9..d7a8121f9 100644
--- a/src/services/test-helpers/mock/index.ts
+++ b/src/services/test-helpers/mock/index.ts
@@ -1,4 +1,4 @@
 export * from './addresses';
-export * from './mockBlock789629';
 export * from './mockApi';
+export * from './mockBlock789629';
 export * from './transactions';
diff --git a/src/services/transaction/index.ts b/src/services/transaction/index.ts
index be49dd501..05528d38f 100644
--- a/src/services/transaction/index.ts
+++ b/src/services/transaction/index.ts
@@ -1,4 +1,4 @@
 export * from './TransactionDryRunService';
-export * from './TransactionMaterialService';
 export * from './TransactionFeeEstimateService';
+export * from './TransactionMaterialService';
 export * from './TransactionSubmitService';
diff --git a/src/test-helpers/metadata/decorated.ts b/src/test-helpers/metadata/decorated.ts
index 2aee4085b..e5f04417c 100644
--- a/src/test-helpers/metadata/decorated.ts
+++ b/src/test-helpers/metadata/decorated.ts
@@ -1,4 +1,4 @@
-import expandMetadata from '@polkadot/metadata/decorate';
+import { expandMetadata } from '@polkadot/metadata/decorate';
 
 import { kusamaRegistry } from '../registries/kusamaRegistry';
 import { polkadotRegistry } from '../registries/polkadotRegistry';
diff --git a/src/test-helpers/metadata/metadata.ts b/src/test-helpers/metadata/metadata.ts
index 45380d855..641626b19 100644
--- a/src/test-helpers/metadata/metadata.ts
+++ b/src/test-helpers/metadata/metadata.ts
@@ -1,5 +1,5 @@
+import { Metadata } from '@polkadot/metadata';
 import substrateMetadataRpc from '@polkadot/metadata/v11/static';
-import { Metadata } from '@polkadot/types';
 
 import { kusamaRegistry } from '../registries/kusamaRegistry';
 import { polkadotRegistry } from '../registries/polkadotRegistry';
diff --git a/src/test-helpers/registries/kusamaRegistry.ts b/src/test-helpers/registries/kusamaRegistry.ts
index 3738b3934..56df61fcb 100644
--- a/src/test-helpers/registries/kusamaRegistry.ts
+++ b/src/test-helpers/registries/kusamaRegistry.ts
@@ -1,5 +1,6 @@
+import { Metadata } from '@polkadot/metadata';
 import substrateMetadataRpc from '@polkadot/metadata/v11/static';
-import { Metadata, TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types';
 import { getSpecTypes } from '@polkadot/types-known';
 
 /**
diff --git a/src/test-helpers/registries/polkadotRegistry.ts b/src/test-helpers/registries/polkadotRegistry.ts
index 4c0f377cd..a98c9dfd6 100644
--- a/src/test-helpers/registries/polkadotRegistry.ts
+++ b/src/test-helpers/registries/polkadotRegistry.ts
@@ -1,4 +1,5 @@
-import { Metadata, TypeRegistry } from '@polkadot/types';
+import { Metadata } from '@polkadot/metadata';
+import { TypeRegistry } from '@polkadot/types';
 import { getSpecTypes } from '@polkadot/types-known';
 
 import { polkadotV16MetadataRpc } from '../metadata/polkadotV16Metadata';
diff --git a/src/types/responses/AccountStakingInfo.ts b/src/types/responses/AccountStakingInfo.ts
index ffc8379fd..5879f9e2a 100644
--- a/src/types/responses/AccountStakingInfo.ts
+++ b/src/types/responses/AccountStakingInfo.ts
@@ -1,5 +1,5 @@
-import AccountId from '@polkadot/types/generic/AccountId';
 import { RewardDestination, StakingLedger } from '@polkadot/types/interfaces';
+import { AccountId } from '@polkadot/types/interfaces/runtime';
 
 import { IAt } from '.';
 
diff --git a/src/types/responses/Block.ts b/src/types/responses/Block.ts
index 6cdffc7a7..db340d545 100644
--- a/src/types/responses/Block.ts
+++ b/src/types/responses/Block.ts
@@ -1,6 +1,6 @@
 import { Compact } from '@polkadot/types';
-import AccountId from '@polkadot/types/generic/AccountId';
 import { BlockHash, BlockNumber, Hash } from '@polkadot/types/interfaces';
+import { AccountId } from '@polkadot/types/interfaces/runtime';
 import { Codec } from '@polkadot/types/types';
 
 import { IExtrinsic, ISanitizedEvent } from '.';
diff --git a/src/types/responses/NodeNetwork.ts b/src/types/responses/NodeNetwork.ts
index 5b36af21a..ecf2a358a 100644
--- a/src/types/responses/NodeNetwork.ts
+++ b/src/types/responses/NodeNetwork.ts
@@ -1,6 +1,5 @@
-import { Text, u64, Vec } from '@polkadot/types';
+import { Bool, Text, u64, Vec } from '@polkadot/types';
 import { NodeRole, PeerInfo } from '@polkadot/types/interfaces';
-import Bool from '@polkadot/types/primitive/Bool';
 
 export interface INodeNetwork {
 	nodeRoles: Vec<NodeRole>;
diff --git a/src/types/responses/SanitizedEvent.ts b/src/types/responses/SanitizedEvent.ts
index 4a2e150b6..43140faff 100644
--- a/src/types/responses/SanitizedEvent.ts
+++ b/src/types/responses/SanitizedEvent.ts
@@ -1,8 +1,8 @@
-import { EventData } from '@polkadot/types/generic/Event';
+import { GenericEventData } from '@polkadot/types';
 
 import { IFrameMethod } from '.';
 
 export interface ISanitizedEvent {
 	method: string | IFrameMethod;
-	data: EventData;
+	data: GenericEventData;
 }
diff --git a/src/types/responses/TransactionMaterial.ts b/src/types/responses/TransactionMaterial.ts
index 8ef57e0b0..78c68636f 100644
--- a/src/types/responses/TransactionMaterial.ts
+++ b/src/types/responses/TransactionMaterial.ts
@@ -1,5 +1,5 @@
 import { BlockHash } from '@polkadot/types/interfaces';
-import U32 from '@polkadot/types/primitive/U32';
+import { u32 } from '@polkadot/types/primitive';
 
 import { IAt } from '.';
 
@@ -8,7 +8,7 @@ export interface ITransactionMaterial {
 	genesisHash: BlockHash;
 	chainName: string;
 	specName: string;
-	specVersion: U32;
-	txVersion: U32;
+	specVersion: u32;
+	txVersion: u32;
 	metadata?: string;
 }
diff --git a/src/types/responses/index.ts b/src/types/responses/index.ts
index bc8fcaf14..34c7b14b1 100644
--- a/src/types/responses/index.ts
+++ b/src/types/responses/index.ts
@@ -1,22 +1,22 @@
-export * from './At';
-export * from './PalletStakingProgress';
-export * from './SanitizedCall';
-export * from './Block';
-export * from './SanitizedEvent';
-export * from './SanitizedArgs';
 export * from './AccountBalanceInfo';
 export * from './AccountStakingInfo';
+export * from './AccountStakingPayouts';
 export * from './AccountVestingInfo';
-export * from './TransactionMaterial';
+export * from './At';
+export * from './Block';
+export * from './EraPayouts';
 export * from './Extrinsic';
+export * from './FrameMethod';
 export * from './MetadataCode';
-export * from './RuntimeSpec';
-export * from './Payout';
-export * from './EraPayouts';
-export * from './AccountStakingPayouts';
 export * from './NodeNetwork';
-export * from './NodeVersion';
 export * from './NodeTransactionPool';
-export * from './TransactionDryRun';
-export * from './FrameMethod';
+export * from './NodeVersion';
+export * from './PalletStakingProgress';
+export * from './Payout';
+export * from './RuntimeSpec';
+export * from './SanitizedArgs';
+export * from './SanitizedCall';
+export * from './SanitizedEvent';
 export * from './SanitizedStorageItemMetadata';
+export * from './TransactionDryRun';
+export * from './TransactionMaterial';
diff --git a/src/types/util/index.ts b/src/types/util/index.ts
index e6ee2c279..b6e385c82 100644
--- a/src/types/util/index.ts
+++ b/src/types/util/index.ts
@@ -1,3 +1,3 @@
-export * from './ToString';
 export * from './PaysFee';
 export * from './RegisteredRoutes';
+export * from './ToString';
diff --git a/yarn.lock b/yarn.lock
index 6f138eb69..677cc51e2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -240,7 +240,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.12.1":
+"@babel/runtime@^7.12.5":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
   integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
@@ -526,148 +526,148 @@
     "@nodelib/fs.scandir" "2.1.3"
     fastq "^1.6.0"
 
-"@polkadot/api-derive@2.6.1":
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-2.6.1.tgz#c6ae29ddd7942876feb757c229c37ba0369c0208"
-  integrity sha512-sEr1MsaLwJy31+yhuxclUHMbTsY5DDoCMEpX+HbplK6GHt0yC0SgpN47c1K8Jykp1aYJJLhAh8EmNfDd+gl0eQ==
-  dependencies:
-    "@babel/runtime" "^7.12.1"
-    "@polkadot/api" "2.6.1"
-    "@polkadot/rpc-core" "2.6.1"
-    "@polkadot/types" "2.6.1"
-    "@polkadot/util" "^4.0.1"
-    "@polkadot/util-crypto" "^4.0.1"
+"@polkadot/api-derive@2.7.1":
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-2.7.1.tgz#d4927e2e9579074466da8613953fd460b1f33466"
+  integrity sha512-tQboJ7VgbHU2lMGxxbsWVZjzS5735cFQKRB036d7or1m4sgyD8cPWopPOo3jyytPmHfuYF0Ni44ZppQeapDxGg==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@polkadot/api" "2.7.1"
+    "@polkadot/rpc-core" "2.7.1"
+    "@polkadot/types" "2.7.1"
+    "@polkadot/util" "^4.1.1"
+    "@polkadot/util-crypto" "^4.1.1"
     bn.js "^5.1.3"
     memoizee "^0.4.14"
     rxjs "^6.6.3"
 
-"@polkadot/api@2.6.1", "@polkadot/api@^2.6.1":
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-2.6.1.tgz#ff526c2398429688f63616a312329562a1cca5e7"
-  integrity sha512-BvS87/VSOkGEMNhXuszxcQ4mEwSGbVABqfE6H1AVsLWtElOnmSa3dZpAaPeo7aO9dLUa/2mxBfvLFZLl+boJ8g==
-  dependencies:
-    "@babel/runtime" "^7.12.1"
-    "@polkadot/api-derive" "2.6.1"
-    "@polkadot/keyring" "^4.0.1"
-    "@polkadot/metadata" "2.6.1"
-    "@polkadot/rpc-core" "2.6.1"
-    "@polkadot/rpc-provider" "2.6.1"
-    "@polkadot/types" "2.6.1"
-    "@polkadot/types-known" "2.6.1"
-    "@polkadot/util" "^4.0.1"
-    "@polkadot/util-crypto" "^4.0.1"
+"@polkadot/api@2.7.1", "@polkadot/api@^2.7.1":
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-2.7.1.tgz#3eb0ae7eecd342a68a68ed6cf082d6c73d0b6281"
+  integrity sha512-xgaLsv/qRTjRfSvFBgm9h9+gXK5pYn2iqlWPndvYSM/IaUZWAQPVWL1uGnrEbEFjHvpi6Fe28wsw+QCM8rBxew==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@polkadot/api-derive" "2.7.1"
+    "@polkadot/keyring" "^4.1.1"
+    "@polkadot/metadata" "2.7.1"
+    "@polkadot/rpc-core" "2.7.1"
+    "@polkadot/rpc-provider" "2.7.1"
+    "@polkadot/types" "2.7.1"
+    "@polkadot/types-known" "2.7.1"
+    "@polkadot/util" "^4.1.1"
+    "@polkadot/util-crypto" "^4.1.1"
     bn.js "^5.1.3"
     eventemitter3 "^4.0.7"
     rxjs "^6.6.3"
 
-"@polkadot/keyring@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-4.0.1.tgz#07ec9e8bfb201a98b761e6f3dae83b60cba3bbaf"
-  integrity sha512-E65gy9WjH+tRys18VB37ilE0crKxmX78ycAq3gUVWfT7dS2XijJLcJnNWRQ3WBuWQ2r9umBcKVXSUQII5YEcpA==
-  dependencies:
-    "@babel/runtime" "^7.12.1"
-    "@polkadot/util" "4.0.1"
-    "@polkadot/util-crypto" "4.0.1"
-
-"@polkadot/metadata@2.6.1":
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-2.6.1.tgz#e5595c52765931f978a4d731c58f63ee01efeaba"
-  integrity sha512-pgKjWc0pF/2CKb06vjLdXjWzX7vgLwI6vXgJ/k4bSLHPJIryYKDp0fp0W+B11dkSzwbjL99sJoiGue6UXfeMeg==
-  dependencies:
-    "@babel/runtime" "^7.12.1"
-    "@polkadot/types" "2.6.1"
-    "@polkadot/types-known" "2.6.1"
-    "@polkadot/util" "^4.0.1"
-    "@polkadot/util-crypto" "^4.0.1"
+"@polkadot/keyring@^4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-4.1.1.tgz#bc5e66a42df4146bb67581665afee637df7fba12"
+  integrity sha512-qKNdaqaohIFwarJEU9XIium5ObzbFCi4Y5cO4JmVfWf+hwcAkeVOEFcz/cGkpIVUQhEHDlvEEoqesd5c1+LC4A==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@polkadot/util" "4.1.1"
+    "@polkadot/util-crypto" "4.1.1"
+
+"@polkadot/metadata@2.7.1":
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-2.7.1.tgz#ad2daf41e2efc21c6c83b2a15469ac40ccb896e7"
+  integrity sha512-lrBYZApKW9iCrZjrfrcuVjM857YIHdmHwJa/Z6QgS7MTGR+8modEKBKs+4hoyMN+NumYAYrHBwzcE2B3mINDyA==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@polkadot/types" "2.7.1"
+    "@polkadot/types-known" "2.7.1"
+    "@polkadot/util" "^4.1.1"
+    "@polkadot/util-crypto" "^4.1.1"
     bn.js "^5.1.3"
 
-"@polkadot/networks@4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/networks/-/networks-4.0.1.tgz#1cab7001d8f5127e7047b83856021334d9638f42"
-  integrity sha512-GzEcVo+lWEdKZ6bK5R33zTGBMLQtf/9GwAf27Acxa23xk6aI5fpSHXcUm5ilUyD9vmNoRH3WnhfgVrTJ7uWe+Q==
+"@polkadot/networks@4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/networks/-/networks-4.1.1.tgz#26a10d58117a2a9e0e538a040446056e43352424"
+  integrity sha512-OqV4YCiWmUZIm82TdKDbjAhTF+paxko5k7bw0OGRIizmA00CNNRLR2q9SI9ux1InvYuL+zZsTOJAoJ5FxMHzgA==
   dependencies:
-    "@babel/runtime" "^7.12.1"
+    "@babel/runtime" "^7.12.5"
 
-"@polkadot/rpc-core@2.6.1":
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-2.6.1.tgz#152cf0bdc2f0a7fa5d9c29b9a9d70523a70144ac"
-  integrity sha512-j7sQHoIc74IrqLOAoNPaMAJuLA2/PG4Q+NoZ2/+CSyHSzNOHc03IDtEi7qkdeuhxnDIJrhTaihNWvC3yMQrPhg==
-  dependencies:
-    "@babel/runtime" "^7.12.1"
-    "@polkadot/metadata" "2.6.1"
-    "@polkadot/rpc-provider" "2.6.1"
-    "@polkadot/types" "2.6.1"
-    "@polkadot/util" "^4.0.1"
+"@polkadot/rpc-core@2.7.1":
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-2.7.1.tgz#4a51f2099019faeaf8d710d02a7855ec58f3f378"
+  integrity sha512-5TA+EZ1sWDwgrfFoMc4SsEwHo9ivO/wfPZsxNixHw1wL68y+3G4pG1YLztcKF//Qp35nOz4JGyX+lNuU3BPXdw==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@polkadot/metadata" "2.7.1"
+    "@polkadot/rpc-provider" "2.7.1"
+    "@polkadot/types" "2.7.1"
+    "@polkadot/util" "^4.1.1"
     memoizee "^0.4.14"
     rxjs "^6.6.3"
 
-"@polkadot/rpc-provider@2.6.1":
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-2.6.1.tgz#529206a949caabfcd94d6b625be25033858de5cd"
-  integrity sha512-9fionqVAXTE9zv9R8Ls9ewlKbnavIB1DikFipGXy9MZ+eonS8DiaOc1RjImLGx9Hf4GQxbMy73pcOvbUdNW2fg==
-  dependencies:
-    "@babel/runtime" "^7.12.1"
-    "@polkadot/types" "2.6.1"
-    "@polkadot/util" "^4.0.1"
-    "@polkadot/util-crypto" "^4.0.1"
-    "@polkadot/x-fetch" "^4.0.1"
-    "@polkadot/x-ws" "^4.0.1"
+"@polkadot/rpc-provider@2.7.1":
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-2.7.1.tgz#dd2515648a70665ecd2b56adcc30e8804ed225d4"
+  integrity sha512-AOS9RfYm8aFuvYo1Bd/SX9eHQJlWbW9IYwNqHLOfXmLRxbIkfVzsc49tCsr+Zy1Ctt/d5bA86P5cUdH0LI0acg==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@polkadot/types" "2.7.1"
+    "@polkadot/util" "^4.1.1"
+    "@polkadot/util-crypto" "^4.1.1"
+    "@polkadot/x-fetch" "^4.1.1"
+    "@polkadot/x-ws" "^4.1.1"
     bn.js "^5.1.3"
     eventemitter3 "^4.0.7"
 
-"@polkadot/types-known@2.6.1":
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/types-known/-/types-known-2.6.1.tgz#ec9a07dbaa1dc274f72d6ba744f592e0e8144cfe"
-  integrity sha512-ZyWFzvuMS1umuhDYExqr9r0/69ME6QkIOgxfhXh9Ag4rkIlH+J0i+YO2H6F11zT+gqGPvqL8Vn2w8XlNjGNwcQ==
+"@polkadot/types-known@2.7.1":
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/types-known/-/types-known-2.7.1.tgz#bb6edef252a6ab83cf4088848d68fa56d004902c"
+  integrity sha512-cnrRJ7HV/ICWwoxNv0cKZZ5EVmPMOnLrcoC1SQYANkOjpxVdloxPdkr+1i6trPJhXntxwRvdFIYqKiAtsfMrGw==
   dependencies:
-    "@babel/runtime" "^7.12.1"
-    "@polkadot/types" "2.6.1"
-    "@polkadot/util" "^4.0.1"
+    "@babel/runtime" "^7.12.5"
+    "@polkadot/types" "2.7.1"
+    "@polkadot/util" "^4.1.1"
     bn.js "^5.1.3"
 
-"@polkadot/types@2.6.1":
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-2.6.1.tgz#f9cb005fdd1788bc2942370f0f4ad5cb61b99c32"
-  integrity sha512-pb3VVOsEKaD7M3tFta9UtDL5zM+2/rsmstwBatA71b53Glr5XPxYtT8LI7dqjHZVLjHxKsYRKtTUhuNB7onQ8w==
+"@polkadot/types@2.7.1":
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-2.7.1.tgz#f3cac7bba7fa7d1d3d7bd3e474b4ef776526e82f"
+  integrity sha512-v7vHozNZxz+pSlQnjogtUwzsNU3E5sZ7+oQipFS/S2zXz2Q8K1QOUE08thZTqR5M4cyPDbbD5sHBaSNOMk5X1Q==
   dependencies:
-    "@babel/runtime" "^7.12.1"
-    "@polkadot/metadata" "2.6.1"
-    "@polkadot/util" "^4.0.1"
-    "@polkadot/util-crypto" "^4.0.1"
+    "@babel/runtime" "^7.12.5"
+    "@polkadot/metadata" "2.7.1"
+    "@polkadot/util" "^4.1.1"
+    "@polkadot/util-crypto" "^4.1.1"
     "@types/bn.js" "^4.11.6"
     bn.js "^5.1.3"
     memoizee "^0.4.14"
     rxjs "^6.6.3"
 
-"@polkadot/util-crypto@4.0.1", "@polkadot/util-crypto@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-4.0.1.tgz#536fcdb159232bc00ef16f0c35d0b41cc8cbb802"
-  integrity sha512-D5gzmvtsZPVZejkngQB4DpKF3WyFxhWtT8DpwkgIxIvOkbS0FvVXCISqSfauh8ZnfrAp4677Ha4YZ3sCKemS5g==
+"@polkadot/util-crypto@4.1.1", "@polkadot/util-crypto@^4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-4.1.1.tgz#b3f9a03c7ad785e72d7a777cdfd76193635f290a"
+  integrity sha512-LuA75GZqT1Lpx+RwMljoqNl0lPrfyDt9hUByGhzHQ0OjcaOzrcrzsmDYqFgz0ec8dg9KpNcbZM9CMI7r7mZ9cg==
   dependencies:
-    "@babel/runtime" "^7.12.1"
-    "@polkadot/networks" "4.0.1"
-    "@polkadot/util" "4.0.1"
+    "@babel/runtime" "^7.12.5"
+    "@polkadot/networks" "4.1.1"
+    "@polkadot/util" "4.1.1"
     "@polkadot/wasm-crypto" "^2.0.1"
-    "@polkadot/x-randomvalues" "4.0.1"
+    "@polkadot/x-randomvalues" "4.1.1"
     base-x "^3.0.8"
     blakejs "^1.1.0"
     bn.js "^5.1.3"
     create-hash "^1.2.0"
     elliptic "^6.5.3"
+    hash.js "^1.1.7"
     js-sha3 "^0.8.0"
-    pbkdf2 "^3.1.1"
     scryptsy "^2.1.0"
     tweetnacl "^1.0.3"
     xxhashjs "^0.2.2"
 
-"@polkadot/util@4.0.1", "@polkadot/util@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-4.0.1.tgz#6cc2958c9a4b188b899bf14b0585060aba375ec6"
-  integrity sha512-t8INPSJZI0eWhobpaR+Ul2h8dKtaw+P8UiAL1Q5WeSD0iaVA2IbJvYacdztvkN1AZEcNgbFSMSDKZmzIKBxHpg==
+"@polkadot/util@4.1.1", "@polkadot/util@^4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-4.1.1.tgz#76668d5f0e00c396d6b6f4ba652348d287ad49c2"
+  integrity sha512-bmXMXq4WKKkowgzgRzCgkWNzu8tT/F4P+cBBlVReOH1UD1AmUG80coD/uIL+kUhLpQVN3xXtdXHIxFQcfK3qKA==
   dependencies:
-    "@babel/runtime" "^7.12.1"
-    "@polkadot/x-textdecoder" "4.0.1"
-    "@polkadot/x-textencoder" "4.0.1"
+    "@babel/runtime" "^7.12.5"
+    "@polkadot/x-textdecoder" "4.1.1"
+    "@polkadot/x-textencoder" "4.1.1"
     "@types/bn.js" "^4.11.6"
     bn.js "^5.1.3"
     camelcase "^5.3.1"
@@ -678,42 +678,42 @@
   resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto/-/wasm-crypto-2.0.1.tgz#cf7384385f832f6389520cc00e52a87fda6f29b6"
   integrity sha512-Vb0q4NToCRHXYJwhLWc4NTy77+n1dtJmkiE1tt8j1pmY4IJ4UL25yBxaS8NCS1LGqofdUYK1wwgrHiq5A78PFA==
 
-"@polkadot/x-fetch@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-fetch/-/x-fetch-4.0.1.tgz#8053278fd8a77a81f5cb09f23ed7a46674610bd8"
-  integrity sha512-Ume+WJ2TWW+QFMKFqixFEr1w6dOPvubkmP+jCQVqWLra0D/uXPmpcgMtiuTIjPl92Q38p37N97xTJl1hP+Kzkw==
+"@polkadot/x-fetch@^4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-fetch/-/x-fetch-4.1.1.tgz#b03083d926da42596fb01871f17912308a34529e"
+  integrity sha512-pja/3bVqppEh/c/Dv9fXTeVDpsRPr7Il8ADw8qyHKQzYhE3qfrcnje1XV78xiaeCwBJMXL33KbaI/Vs0hc/eSw==
   dependencies:
-    "@babel/runtime" "^7.12.1"
+    "@babel/runtime" "^7.12.5"
     "@types/node-fetch" "^2.5.7"
     node-fetch "^2.6.1"
 
-"@polkadot/x-randomvalues@4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-randomvalues/-/x-randomvalues-4.0.1.tgz#30554ad963e80e7fe97a4bee86caacb35aab9fe0"
-  integrity sha512-Oe1LaoE2pQZGQweqRjF8TVXx+6K1Zxe1+IjvCUbwnDOSthn3Q+Tywf9S3Wn+yME6ul08J14GlGtyoHJMLgmqFQ==
+"@polkadot/x-randomvalues@4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-randomvalues/-/x-randomvalues-4.1.1.tgz#cbcd5b591a3d5c7dc3853e51edc5e20239bf3b25"
+  integrity sha512-q1UCOYmYSOIjp97qH+Jw6mtaoaqb65I2R/aKOtd5NDyls0lLq4ctv5YQ8jLTvNrGum8aEKE8ZmYuBuZSQXICPw==
   dependencies:
-    "@babel/runtime" "^7.12.1"
+    "@babel/runtime" "^7.12.5"
 
-"@polkadot/x-textdecoder@4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-textdecoder/-/x-textdecoder-4.0.1.tgz#04ca82d93d1ac80f5a74e897e072c6b8bb33ac7b"
-  integrity sha512-kRn9PY8Ffm8+g55UPbgEwGhVTDA9dFP3hmo9RD1DFXZkB0PyETDB37dr8YVC4C1LXAIBINBhrgjCMlSbJoUwuw==
+"@polkadot/x-textdecoder@4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-textdecoder/-/x-textdecoder-4.1.1.tgz#9bdc94ca962b6f7d931c827e8316cd09fc751aff"
+  integrity sha512-I0u3ymy2wAoi3zaycmBu8HqGudp4nMGKqSGasSB1ko9SKtB++JsWKH99it721rpeSdFXJOpBERQjvapCQXK6sQ==
   dependencies:
-    "@babel/runtime" "^7.12.1"
+    "@babel/runtime" "^7.12.5"
 
-"@polkadot/x-textencoder@4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-textencoder/-/x-textencoder-4.0.1.tgz#1d039416a54aea762e5e6ad2deebe94c08f057a7"
-  integrity sha512-2C1TpImfWDy6R7Bymq2luPo50VZioQE7ruM3pgKAr2ogZIu8KnlilI5V84qWkzVsqU3G3Dk0yqXUXPZqDdDA2g==
+"@polkadot/x-textencoder@4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-textencoder/-/x-textencoder-4.1.1.tgz#828e08895fbb7c29db7ce81d63e2d93ca7750660"
+  integrity sha512-yhDwo2Dy835+OYk5clNVJ0VGGtu6zC9Uw0tDp9BSDSVrb1gZGrhAEGTtvTG8JM4qPJ/XBTaaN9Ul2rnk0VIiOA==
   dependencies:
-    "@babel/runtime" "^7.12.1"
+    "@babel/runtime" "^7.12.5"
 
-"@polkadot/x-ws@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/x-ws/-/x-ws-4.0.1.tgz#7a3d708e27e63766c75df333f98ecc564a061d53"
-  integrity sha512-IHz+mCfnM47echcQTm5qDXMSN753guiz8FMzTzTLwr5/QUuQEkPuSok17GibAYjZBI48FTgp8xG4TLzj5+6Kug==
+"@polkadot/x-ws@^4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/x-ws/-/x-ws-4.1.1.tgz#b5ba15d5f0cd36d1a8cc03c15d4ce661633c55be"
+  integrity sha512-SgNOgxOLsxCUC5g/G7j11rJfHuFkHR3LIMniB1GvkS87SWkbhftwPPgWOwdGOxxy2L3Ud7t4/4wnlUV+cmRcDA==
   dependencies:
-    "@babel/runtime" "^7.12.1"
+    "@babel/runtime" "^7.12.5"
     "@types/websocket" "^1.0.1"
     websocket "^1.0.32"
 
@@ -755,9 +755,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.3.tgz#b8aaeba0a45caca7b56a5de9459872dde3727214"
-  integrity sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be"
+  integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -800,10 +800,10 @@
     "@types/qs" "*"
     "@types/range-parser" "*"
 
-"@types/express@^4.17.8":
-  version "4.17.8"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.8.tgz#3df4293293317e61c60137d273a2e96cd8d5f27a"
-  integrity sha512-wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ==
+"@types/express@^4.17.9":
+  version "4.17.9"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.9.tgz#f5f2df6add703ff28428add52bdec8a1091b0a78"
+  integrity sha512-SDzEIZInC4sivGIFY4Sz1GG6J9UObPwCInYJjko2jzOf/Imx/dlpume6Xxwj1ORL82tBbmN4cPDIDkLbWHk9hw==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
@@ -880,9 +880,9 @@
     form-data "^3.0.0"
 
 "@types/node@*":
-  version "14.14.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.6.tgz#146d3da57b3c636cc0d1769396ce1cfa8991147f"
-  integrity sha512-6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw==
+  version "14.14.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz#8ea1e8f8eae2430cf440564b98c6dfce1ec5945d"
+  integrity sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -905,9 +905,9 @@
   integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
 
 "@types/serve-static@*":
-  version "1.13.6"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.6.tgz#866b1b8dec41c36e28c7be40ac725b88be43c5c1"
-  integrity sha512-nuRJmv7jW7VmCVTn+IgYDkkbbDGyIINOeu/G0d74X3lm6E5KfMeQPJhxIt1ayQeQB3cSxvYs1RA/wipYoFB4EA==
+  version "1.13.7"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.7.tgz#e51b51a0becda910f9fd04c718044da69d6c492e"
+  integrity sha512-3diZWucbR+xTmbDlU+FRRxBf+31OhFew7cJXML/zh9NmvSPTNoFecAwHB66BUqFgENJtqMiyl7JAwUE/siqdLw==
   dependencies:
     "@types/mime" "*"
     "@types/node" "*"
@@ -1529,7 +1529,7 @@ ci-info@^2.0.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
-cipher-base@^1.0.1, cipher-base@^1.0.3:
+cipher-base@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
   integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
@@ -1902,7 +1902,7 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
+create-hash@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
@@ -1913,18 +1913,6 @@ create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
     ripemd160 "^2.0.1"
     sha.js "^2.4.0"
 
-create-hmac@^1.1.4:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
-  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
-  dependencies:
-    cipher-base "^1.0.3"
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-    ripemd160 "^2.0.0"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
 cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -2309,10 +2297,10 @@ eslint-plugin-prettier@^3.1.4:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-simple-import-sort@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-5.0.3.tgz#9ae258ddada6efffc55e47a134afbd279eb31fc6"
-  integrity sha512-1rf3AWiHeWNCQdAq0iXNnlccnH1UDnelGgrPbjBBHE8d2hXVtOudcmy0vTF4hri3iJ0MKz8jBhmH6lJ0ZWZLHQ==
+eslint-plugin-simple-import-sort@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-6.0.0.tgz#036346edede70afab8928cc4c4b5ae3bd8db7f01"
+  integrity sha512-YEx+2Zli3mw4mzLzotZSeor4GqdjFWv6S7LcQeKsoXWD4GzMtP42WCz40kAlB35ehxf7PR5V/4f8g8l9aqWGsg==
 
 eslint-scope@^5.0.0, eslint-scope@^5.1.1:
   version "5.1.1"
@@ -3083,7 +3071,7 @@ hash-base@^3.0.0:
     readable-stream "^3.6.0"
     safe-buffer "^5.2.0"
 
-hash.js@^1.0.0, hash.js@^1.0.3:
+hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
   integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
@@ -3305,7 +3293,7 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.0.0:
+is-core-module@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
   integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
@@ -4910,17 +4898,6 @@ pause-stream@0.0.11:
   dependencies:
     through "~2.3"
 
-pbkdf2@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94"
-  integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==
-  dependencies:
-    create-hash "^1.1.2"
-    create-hmac "^1.1.4"
-    ripemd160 "^2.0.1"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -5328,11 +5305,11 @@ resolve-url@^0.2.1:
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@^1.1.6, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130"
-  integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
   dependencies:
-    is-core-module "^2.0.0"
+    is-core-module "^2.1.0"
     path-parse "^1.0.6"
 
 ret@~0.1.10:
@@ -5359,7 +5336,7 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-ripemd160@^2.0.0, ripemd160@^2.0.1:
+ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
   integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
@@ -5507,7 +5484,7 @@ setprototypeof@1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-sha.js@^2.4.0, sha.js@^2.4.8:
+sha.js@^2.4.0:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
   integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
@@ -5733,9 +5710,9 @@ stack-trace@0.0.x:
   integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
 stack-utils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz#5cf48b4557becb4638d0bc4f21d23f5d19586593"
-  integrity sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277"
+  integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==
   dependencies:
     escape-string-regexp "^2.0.0"
 
@@ -6190,9 +6167,9 @@ type-fest@^0.13.1:
   integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
 
 type-fest@^0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.0.tgz#2edfa6382d48653707344f7fccdb0443d460e8d6"
-  integrity sha512-fbDukFPnJBdn2eZ3RR+5mK2slHLFd6gYHY7jna1KWWy4Yr4XysHuCdXRzy+RiG/HwG4WJat00vdC2UHky5eKiQ==
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
+  integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
 
 type-fest@^0.6.0:
   version "0.6.0"
@@ -6245,9 +6222,9 @@ typescript@^4.0.5:
   integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==
 
 uglify-js@^3.1.4:
-  version "3.11.5"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.5.tgz#d6788bc83cf35ff18ea78a65763e480803409bc6"
-  integrity sha512-btvv/baMqe7HxP7zJSF7Uc16h1mSfuuSplT0/qdjxseesDU+yYzH33eHBH+eMdeRXwujXspaCTooWHQVVBh09w==
+  version "3.11.6"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.6.tgz#144b50d3e05eadd3ad4dd047c60ca541a8cd4e9c"
+  integrity sha512-oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g==
 
 union-value@^1.0.0:
   version "1.0.1"