From 5d4a1949599cb2f04f2b8951c7aff10d0fc39a37 Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Fri, 14 Aug 2020 10:23:35 +0200
Subject: [PATCH 01/17] Upgrade joy-election

---
 package.json                                  |   3 +-
 pioneer/.eslintignore                         |   1 -
 pioneer/packages/apps-routing/src/index.ts    |   3 +
 .../packages/apps-routing/src/joy-election.ts |  17 +++
 pioneer/packages/apps-routing/src/types.ts    |   2 +
 pioneer/packages/apps/src/Content/index.tsx   |  29 +++-
 pioneer/packages/apps/src/SideBar/Item.tsx    |   7 +-
 pioneer/packages/joy-election/.skip-build     |   0
 pioneer/packages/joy-election/package.json    |   6 +-
 .../packages/joy-election/src/Applicant.tsx   |   4 +-
 .../packages/joy-election/src/Applicants.tsx  |  29 ++--
 .../packages/joy-election/src/ApplyForm.tsx   |  40 +++---
 .../joy-election/src/CandidatePreview.tsx     |   4 +-
 pioneer/packages/joy-election/src/Council.tsx |   6 +-
 .../packages/joy-election/src/Dashboard.tsx   | 128 +++++++++++-------
 pioneer/packages/joy-election/src/Reveals.tsx |  28 ++--
 .../packages/joy-election/src/SealedVote.tsx  |  20 ++-
 .../packages/joy-election/src/SealedVotes.tsx |  29 ++--
 .../joy-election/src/SidebarSubtitle.tsx      |  34 +++++
 .../packages/joy-election/src/VoteForm.tsx    |  54 ++++----
 pioneer/packages/joy-election/src/Votes.tsx   |  35 ++++-
 pioneer/packages/joy-election/src/index.css   |  28 ----
 pioneer/packages/joy-election/src/index.tsx   |  22 +--
 .../packages/joy-election/src/myVotesStore.ts |   2 +-
 pioneer/packages/joy-election/src/style.ts    |  21 +++
 pioneer/packages/joy-election/src/utils.tsx   |   3 +-
 .../packages/joy-utils-old/src/InputStake.tsx |  35 -----
 .../src/MemberByAccountPreview.tsx            |  48 -------
 .../joy-utils-old/src/transport/base.ts       | 107 ---------------
 .../joy-utils-old/src/transport/index.ts      |  34 -----
 .../src/react/components/InputStake.tsx       |  46 +++++++
 .../components/MemberByAccountPreview.tsx     |  43 ++++++
 .../components}/MemberProfilePreview.tsx      |   0
 .../src/react/components}/MembersDropdown.tsx |  14 +-
 .../src/react/components/PromiseComponent.tsx |   0
 .../joy-utils/src/react/context/index.tsx     |   1 +
 .../src/react/context/transport.tsx           |   0
 .../joy-utils/src/react/hooks/index.ts        |   2 +
 .../src/react/hooks/usePromise.tsx            |   0
 .../src/react/hooks/useTransport.tsx          |   0
 .../src/transport}/APIQueryCache.ts           |   0
 .../packages/joy-utils/src/transport/base.ts  |  66 +++++++++
 .../packages/joy-utils/src/transport/index.ts |  34 +++++
 .../src/transport/members.ts                  |  16 +++
 .../src/types/members.ts                      |   4 +
 .../old-apps/apps-routing/src/joy-election.ts |  19 ---
 .../react-components/src/styles/joystream.ts  |  93 +++++--------
 pioneer/tsconfig.json                         |   5 +-
 48 files changed, 609 insertions(+), 513 deletions(-)
 create mode 100644 pioneer/packages/apps-routing/src/joy-election.ts
 delete mode 100644 pioneer/packages/joy-election/.skip-build
 create mode 100644 pioneer/packages/joy-election/src/SidebarSubtitle.tsx
 delete mode 100644 pioneer/packages/joy-election/src/index.css
 create mode 100644 pioneer/packages/joy-election/src/style.ts
 delete mode 100644 pioneer/packages/joy-utils-old/src/InputStake.tsx
 delete mode 100644 pioneer/packages/joy-utils-old/src/MemberByAccountPreview.tsx
 delete mode 100644 pioneer/packages/joy-utils-old/src/transport/base.ts
 delete mode 100644 pioneer/packages/joy-utils-old/src/transport/index.ts
 create mode 100644 pioneer/packages/joy-utils/src/react/components/InputStake.tsx
 create mode 100644 pioneer/packages/joy-utils/src/react/components/MemberByAccountPreview.tsx
 rename pioneer/packages/{joy-utils-old/src => joy-utils/src/react/components}/MemberProfilePreview.tsx (100%)
 rename pioneer/packages/{joy-utils-old/src => joy-utils/src/react/components}/MembersDropdown.tsx (82%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/react/components/PromiseComponent.tsx (100%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/react/context/transport.tsx (100%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/react/hooks/usePromise.tsx (100%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/react/hooks/useTransport.tsx (100%)
 rename pioneer/packages/{joy-utils-old/src => joy-utils/src/transport}/APIQueryCache.ts (100%)
 create mode 100644 pioneer/packages/joy-utils/src/transport/base.ts
 create mode 100644 pioneer/packages/joy-utils/src/transport/index.ts
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/transport/members.ts (53%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/types/members.ts (64%)
 delete mode 100644 pioneer/packages/old-apps/apps-routing/src/joy-election.ts

diff --git a/package.json b/package.json
index 2928330f15..ad47384381 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,8 @@
     "pioneer/packages/react*",
     "pioneer/packages/joy-utils",
     "pioneer/packages/joy-members",
-    "pioneer/packages/joy-pages"
+    "pioneer/packages/joy-pages",
+    "pioneer/packages/joy-election"
   ],
   "resolutions": {
     "@polkadot/api": "1.26.1",
diff --git a/pioneer/.eslintignore b/pioneer/.eslintignore
index 42a2471efd..57bb4f9e3e 100644
--- a/pioneer/.eslintignore
+++ b/pioneer/.eslintignore
@@ -2,7 +2,6 @@
 **/coverage/*
 **/node_modules/*
 packages/old-apps/*
-packages/joy-election/*
 packages/joy-forum/*
 packages/joy-help/*
 packages/joy-media/*
diff --git a/pioneer/packages/apps-routing/src/index.ts b/pioneer/packages/apps-routing/src/index.ts
index f4ba69e507..36f9671d31 100644
--- a/pioneer/packages/apps-routing/src/index.ts
+++ b/pioneer/packages/apps-routing/src/index.ts
@@ -20,11 +20,13 @@ import transfer from './transfer';
 // Joy packages
 import members from './joy-members';
 import { terms, privacyPolicy } from './joy-pages';
+import election from './joy-election';
 
 export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Routes {
   return appSettings.uiMode === 'light'
     ? [
       members(t),
+      election(t),
       null,
       transfer(t),
       accounts(t),
@@ -32,6 +34,7 @@ export default function create (t: <T = string> (key: string, text: string, opti
     ]
     : [
       members(t),
+      election(t),
       null,
       transfer(t),
       accounts(t),
diff --git a/pioneer/packages/apps-routing/src/joy-election.ts b/pioneer/packages/apps-routing/src/joy-election.ts
new file mode 100644
index 0000000000..ebf857ad81
--- /dev/null
+++ b/pioneer/packages/apps-routing/src/joy-election.ts
@@ -0,0 +1,17 @@
+import { Route } from './types';
+
+import Election from '@polkadot/joy-election/index';
+import SidebarSubtitle from '@polkadot/joy-election/SidebarSubtitle';
+
+export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+  return {
+    Component: Election,
+    display: {
+      needsApi: ['query.council.activeCouncil', 'query.councilElection.stage']
+    },
+    text: t<string>('nav.election', 'Council', { ns: 'apps-routing' }),
+    icon: 'university',
+    name: 'council',
+    SubtitleComponent: SidebarSubtitle
+  }
+}
diff --git a/pioneer/packages/apps-routing/src/types.ts b/pioneer/packages/apps-routing/src/types.ts
index 6dce432d8c..4a6695fef2 100644
--- a/pioneer/packages/apps-routing/src/types.ts
+++ b/pioneer/packages/apps-routing/src/types.ts
@@ -24,6 +24,8 @@ export interface Route {
   name: string;
   text: string;
   useCounter?: () => number | string | null;
+  // Joystream-specific
+  SubtitleComponent?: React.ComponentType<any>;
 }
 
 export type Routes = (Route | null)[];
diff --git a/pioneer/packages/apps/src/Content/index.tsx b/pioneer/packages/apps/src/Content/index.tsx
index 63f0238535..cf2dc00224 100644
--- a/pioneer/packages/apps/src/Content/index.tsx
+++ b/pioneer/packages/apps/src/Content/index.tsx
@@ -16,6 +16,11 @@ import { useTranslation } from '../translate';
 import NotFound from './NotFound';
 import Status from './Status';
 
+// Joystream-specific
+// We must use transport provider here instead of /apps/src/index
+// to avoid "Cannot create Transport: The Substrate API is not ready yet." error
+import { TransportProvider } from '@polkadot/joy-utils/react/context';
+
 interface Props {
   className?: string;
 }
@@ -60,11 +65,25 @@ function Content ({ className }: Props): React.ReactElement<Props> {
                 ? <NotFound />
                 : (
                   <ErrorBoundary trigger={name}>
-                    <Component
-                      basePath={`/${name}`}
-                      location={location}
-                      onStatusChange={queueAction}
-                    />
+                    { needsApi
+                      // Add transport provider for routes that need the api
+                      // (the above condition makes sure it's aleady initialized at this point)
+                      ? (
+                        <TransportProvider>
+                          <Component
+                            basePath={`/${name}`}
+                            location={location}
+                            onStatusChange={queueAction}
+                          />
+                        </TransportProvider>
+                      )
+                      : (
+                        <Component
+                          basePath={`/${name}`}
+                          location={location}
+                          onStatusChange={queueAction}
+                        />
+                      ) }
                   </ErrorBoundary>
                 )
               }
diff --git a/pioneer/packages/apps/src/SideBar/Item.tsx b/pioneer/packages/apps/src/SideBar/Item.tsx
index abcd801144..629f9c9c19 100644
--- a/pioneer/packages/apps/src/SideBar/Item.tsx
+++ b/pioneer/packages/apps/src/SideBar/Item.tsx
@@ -79,12 +79,15 @@ function Item ({ isCollapsed, onClick, route }: Props): React.ReactElement<Props
     return null;
   }
 
-  const { Modal, icon, name, text } = route;
+  const { Modal, SubtitleComponent, icon, name, text } = route;
 
   const body = (
     <>
       <Icon icon={icon} />
-      <span className='text'>{text}</span>
+      <span className='text'>
+        {text}
+        { SubtitleComponent && <SubtitleComponent/> }
+      </span>
       {!!count && (
         <Badge
           color='counter'
diff --git a/pioneer/packages/joy-election/.skip-build b/pioneer/packages/joy-election/.skip-build
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/pioneer/packages/joy-election/package.json b/pioneer/packages/joy-election/package.json
index 2bee08d3ff..17c74cd58c 100644
--- a/pioneer/packages/joy-election/package.json
+++ b/pioneer/packages/joy-election/package.json
@@ -7,9 +7,9 @@
   "author": "Joystream contributors",
   "maintainers": [],
   "dependencies": {
-    "@babel/runtime": "^7.7.1",
-    "@polkadot/react-components": "0.37.0-beta.63",
-    "@polkadot/react-query": "0.37.0-beta.63",
+    "@babel/runtime": "^7.10.5",
+    "@polkadot/react-components": "0.51.1",
+    "@polkadot/react-query": "0.51.1",
     "@polkadot/joy-utils": "^0.1.1"
   }
 }
diff --git a/pioneer/packages/joy-election/src/Applicant.tsx b/pioneer/packages/joy-election/src/Applicant.tsx
index b48c3291f3..c8435a3f7f 100644
--- a/pioneer/packages/joy-election/src/Applicant.tsx
+++ b/pioneer/packages/joy-election/src/Applicant.tsx
@@ -4,13 +4,13 @@ import { Table } from 'semantic-ui-react';
 
 import { I18nProps } from '@polkadot/react-components/types';
 import { ApiProps } from '@polkadot/react-api/types';
-import { withCalls } from '@polkadot/react-api/with';
+import { withCalls } from '@polkadot/react-api/hoc';
 import { AccountId } from '@polkadot/types/interfaces';
 import { formatBalance } from '@polkadot/util';
 import CandidatePreview from './CandidatePreview';
 
 import translate from './translate';
-import { calcTotalStake } from '@polkadot/joy-utils/index';
+import { calcTotalStake } from '@polkadot/joy-utils/functions/misc';
 import { ElectionStake } from '@joystream/types/council';
 
 type Props = ApiProps & I18nProps & {
diff --git a/pioneer/packages/joy-election/src/Applicants.tsx b/pioneer/packages/joy-election/src/Applicants.tsx
index e84c85f3d5..e999dc675c 100644
--- a/pioneer/packages/joy-election/src/Applicants.tsx
+++ b/pioneer/packages/joy-election/src/Applicants.tsx
@@ -1,23 +1,26 @@
 import React from 'react';
-import { Table } from 'semantic-ui-react';
+import { Table, Message } from 'semantic-ui-react';
 import BN from 'bn.js';
 
 import { I18nProps } from '@polkadot/react-components/types';
 import { ApiProps } from '@polkadot/react-api/types';
-import { withCalls } from '@polkadot/react-api/with';
+import { withCalls } from '@polkadot/react-api/hoc';
 import { AccountId } from '@polkadot/types/interfaces';
+import { Option } from '@polkadot/types';
 import { formatNumber } from '@polkadot/util';
 
 import translate from './translate';
 import Applicant from './Applicant';
 import ApplyForm from './ApplyForm';
-import Section from '@polkadot/joy-utils/Section';
-import { queryToProp } from '@polkadot/joy-utils/index';
-import { withMyAccount, MyAccountProps } from '@polkadot/joy-utils/MyAccount';
+import Section from '@polkadot/joy-utils/react/components/Section';
+import { queryToProp } from '@polkadot/joy-utils/functions/misc';
+import { withMyAccount, MyAccountProps } from '@polkadot/joy-utils/react/hocs/accounts';
+import { ElectionStage } from '@joystream/types/src/council';
 
 type Props = ApiProps & I18nProps & MyAccountProps & {
   candidacyLimit?: BN;
   applicants?: Array<AccountId>;
+  stage?: Option<ElectionStage>;
 };
 
 class Applicants extends React.PureComponent<Props> {
@@ -38,12 +41,21 @@ class Applicants extends React.PureComponent<Props> {
   )
 
   render () {
-    const { myAddress, applicants = [], candidacyLimit = new BN(0) } = this.props;
+    const { myAddress, applicants = [], candidacyLimit = new BN(0), stage } = this.props;
     const title = <span>Applicants <sup>{applicants.length}/{formatNumber(candidacyLimit)}</sup></span>;
 
     return <>
       <Section title='My application'>
-        <ApplyForm myAddress={myAddress} />
+        { stage?.unwrapOr(undefined)?.isOfType('Announcing')
+          ? (
+            <ApplyForm myAddress={myAddress} />
+          )
+          : (
+            <Message warning>
+              Applying to council is only possible during <i><b>Announcing</b></i> stage.
+            </Message>
+          )
+        }
       </Section>
       <Section title={title}>
         {!applicants.length
@@ -59,6 +71,7 @@ class Applicants extends React.PureComponent<Props> {
 export default translate(
   withCalls<Props>(
     queryToProp('query.councilElection.candidacyLimit'),
-    queryToProp('query.councilElection.applicants')
+    queryToProp('query.councilElection.applicants'),
+    queryToProp('query.councilElection.stage')
   )(withMyAccount(Applicants))
 );
diff --git a/pioneer/packages/joy-election/src/ApplyForm.tsx b/pioneer/packages/joy-election/src/ApplyForm.tsx
index f058fc992c..f0f753f37c 100644
--- a/pioneer/packages/joy-election/src/ApplyForm.tsx
+++ b/pioneer/packages/joy-election/src/ApplyForm.tsx
@@ -3,21 +3,21 @@ import React from 'react';
 
 import { I18nProps } from '@polkadot/react-components/types';
 import { ApiProps } from '@polkadot/react-api/types';
-import { withCalls, withMulti } from '@polkadot/react-api/with';
+import { withCalls, withMulti } from '@polkadot/react-api/hoc';
 import { Labelled } from '@polkadot/react-components/index';
 import { Balance } from '@polkadot/types/interfaces';
 
 import translate from './translate';
-import TxButton from '@polkadot/joy-utils/TxButton';
-import InputStake from '@polkadot/joy-utils/InputStake';
+import TxButton from '@polkadot/joy-utils/react/components/TxButton';
+import InputStake from '@polkadot/joy-utils/react/components/InputStake';
 import { ElectionStake } from '@joystream/types/council';
-import { calcTotalStake, ZERO } from '@polkadot/joy-utils/index';
-import { MyAddressProps, withOnlyMembers } from '@polkadot/joy-utils/MyAccount';
+import { calcTotalStake, ZERO } from '@polkadot/joy-utils/functions/misc';
+import { MyAddressProps } from '@polkadot/joy-utils/react/hocs/accounts';
+import { withOnlyMembers } from '@polkadot/joy-utils/react/hocs/guards';
 
 type Props = ApiProps & I18nProps & MyAddressProps & {
   minStake?: Balance;
   alreadyStaked?: ElectionStake;
-  myBalance?: Balance;
 };
 
 type State = {
@@ -48,15 +48,17 @@ class ApplyForm extends React.PureComponent<Props, State> {
           isValid={isStakeValid}
           onChange={this.onChangeStake}
         />
-        <Labelled style={{ marginTop: '.5rem' }}>
-          <TxButton
-            size='large'
-            isDisabled={!isStakeValid}
-            label={buttonLabel}
-            params={[stake]}
-            tx='councilElection.apply'
-          />
-        </Labelled>
+        <div style={{ marginTop: '.5rem' }}>
+          <Labelled>
+            <TxButton
+              size='large'
+              isDisabled={!isStakeValid}
+              label={buttonLabel}
+              params={[stake]}
+              tx='councilElection.apply'
+            />
+          </Labelled>
+        </div>
       </div>
     );
   }
@@ -71,10 +73,8 @@ class ApplyForm extends React.PureComponent<Props, State> {
 
   private onChangeStake = (stake?: BN): void => {
     stake = stake || ZERO;
-    const { myBalance = ZERO } = this.props;
-    const isStakeLteBalance = stake.lte(myBalance);
     const isStakeGteMinStake = stake.add(this.alreadyStaked()).gte(this.minStake());
-    const isStakeValid = !stake.isZero() && isStakeGteMinStake && isStakeLteBalance;
+    const isStakeValid = !stake.isZero() && isStakeGteMinStake;
     this.setState({ stake, isStakeValid });
   }
 }
@@ -88,8 +88,6 @@ export default withMulti(
     ['query.councilElection.minCouncilStake',
       { propName: 'minStake' }],
     ['query.councilElection.applicantStakes',
-      { paramName: 'myAddress', propName: 'alreadyStaked' }],
-    ['query.balances.freeBalance',
-      { paramName: 'myAddress', propName: 'myBalance' }]
+      { paramName: 'myAddress', propName: 'alreadyStaked' }]
   )
 );
diff --git a/pioneer/packages/joy-election/src/CandidatePreview.tsx b/pioneer/packages/joy-election/src/CandidatePreview.tsx
index 9e6571efb6..bab07182e7 100644
--- a/pioneer/packages/joy-election/src/CandidatePreview.tsx
+++ b/pioneer/packages/joy-election/src/CandidatePreview.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import AddressMini from '@polkadot/react-components/AddressMiniJoy';
-import MemberByAccount from '@polkadot/joy-utils/MemberByAccountPreview';
+import AddressMini from '@polkadot/react-components/AddressMini';
+import MemberByAccount from '@polkadot/joy-utils/react/components/MemberByAccountPreview';
 import { AccountId } from '@polkadot/types/interfaces';
 
 import styled from 'styled-components';
diff --git a/pioneer/packages/joy-election/src/Council.tsx b/pioneer/packages/joy-election/src/Council.tsx
index b81c144883..72f4ff5ea8 100644
--- a/pioneer/packages/joy-election/src/Council.tsx
+++ b/pioneer/packages/joy-election/src/Council.tsx
@@ -2,15 +2,15 @@ import React from 'react';
 
 import { ApiProps } from '@polkadot/react-api/types';
 import { I18nProps } from '@polkadot/react-components/types';
-import { withCalls } from '@polkadot/react-api/with';
+import { withCalls } from '@polkadot/react-api/hoc';
 import { Table } from 'semantic-ui-react';
 import { formatBalance } from '@polkadot/util';
 import CouncilCandidate from './CandidatePreview';
 
-import { calcBackersStake } from '@polkadot/joy-utils/index';
+import { calcBackersStake } from '@polkadot/joy-utils/functions/misc';
 import { Seat } from '@joystream/types/council';
 import translate from './translate';
-import Section from '@polkadot/joy-utils/Section';
+import Section from '@polkadot/joy-utils/react/components/Section';
 
 type Props = ApiProps &
 I18nProps & {
diff --git a/pioneer/packages/joy-election/src/Dashboard.tsx b/pioneer/packages/joy-election/src/Dashboard.tsx
index c7f64ef811..b962c1e5aa 100644
--- a/pioneer/packages/joy-election/src/Dashboard.tsx
+++ b/pioneer/packages/joy-election/src/Dashboard.tsx
@@ -3,14 +3,14 @@ import React from 'react';
 
 import { ApiProps } from '@polkadot/react-api/types';
 import { I18nProps } from '@polkadot/react-components/types';
-import { withCalls } from '@polkadot/react-api/with';
+import { withCalls } from '@polkadot/react-api/hoc';
 import { Option } from '@polkadot/types';
 import { BlockNumber, Balance } from '@polkadot/types/interfaces';
-import { Bubble } from '@polkadot/react-components/index';
+import { Label, Icon } from 'semantic-ui-react';
 import { formatNumber, formatBalance } from '@polkadot/util';
 
-import Section from '@polkadot/joy-utils/Section';
-import { queryToProp } from '@polkadot/joy-utils/index';
+import Section from '@polkadot/joy-utils/react/components/Section';
+import { queryToProp } from '@polkadot/joy-utils/functions/misc';
 import { ElectionStage, Seat } from '@joystream/types/council';
 import translate from './translate';
 
@@ -45,12 +45,17 @@ class Dashboard extends React.PureComponent<Props, State> {
     const title = `Council ${activeCouncil.length > 0 ? '' : '(not elected)'}`;
 
     return <Section title={title}>
-      <Bubble label='Council members'>
-        {activeCouncil.length}
-      </Bubble>
-      <Bubble icon='flag checkered' label='Term ends at block #'>
-        {formatNumber(p.termEndsAt)}
-      </Bubble>
+      <Label.Group color="grey" size="large">
+        <Label>
+          Council members
+          <Label.Detail>{activeCouncil.length}</Label.Detail>
+        </Label>
+        <Label>
+          <Icon name="flag checkered"/>
+          Term ends at block #
+          <Label.Detail>{formatNumber(p.termEndsAt)}</Label.Detail>
+        </Label>
+      </Label.Group>
     </Section>;
   }
 
@@ -76,20 +81,28 @@ class Dashboard extends React.PureComponent<Props, State> {
     const title = <>Election (<span className={stateClass}>{stateText}</span>)</>;
 
     return <Section title={title}>
-      <Bubble icon='target' label='Election round #'>
-        {formatNumber(round)}
-      </Bubble>
-      {isRunning && <>
-        <Bubble label='Stage'>
-          {stageName}
-        </Bubble>
-        <Bubble label='Blocks left'>
-          {formatNumber(leftBlocks)}
-        </Bubble>
-        <Bubble icon='flag checkered' label='Stage ends at block #'>
-          {formatNumber(stageEndsAt)}
-        </Bubble>
-      </>}
+      <Label.Group color="grey" size="large">
+        <Label>
+          <Icon name="target"/>
+          Election round #
+          <Label.Detail>{formatNumber(round)}</Label.Detail>
+        </Label>
+        {isRunning && <>
+          <Label>
+            Stage
+            <Label.Detail>{stageName}</Label.Detail>
+          </Label>
+          <Label>
+            Blocks left
+            <Label.Detail>{formatNumber(leftBlocks)}</Label.Detail>
+          </Label>
+          <Label>
+            <Icon name="flag checkered"/>
+            Stage ends at block #
+            <Label.Detail>{formatNumber(stageEndsAt)}</Label.Detail>
+          </Label>
+        </>}
+      </Label.Group>
     </Section>;
   }
 
@@ -98,33 +111,46 @@ class Dashboard extends React.PureComponent<Props, State> {
     const isAutoStart = (p.autoStart || false).valueOf();
 
     return <Section title='Configuration'>
-      <Bubble label='Auto-start elections'>
-        {isAutoStart ? 'Yes' : 'No'}
-      </Bubble>
-      <Bubble label='New term duration'>
-        {formatNumber(p.newTermDuration)}
-      </Bubble>
-      <Bubble label='Candidacy limit'>
-        {formatNumber(p.candidacyLimit)}
-      </Bubble>
-      <Bubble label='Council size'>
-        {formatNumber(p.councilSize)}
-      </Bubble>
-      <Bubble label='Min. council stake'>
-        {formatBalance(p.minCouncilStake)}
-      </Bubble>
-      <Bubble label='Min. voting stake'>
-        {formatBalance(p.minVotingStake)}
-      </Bubble>
-      <Bubble label='Announcing period'>
-        {formatNumber(p.announcingPeriod)} blocks
-      </Bubble>
-      <Bubble label='Voting period'>
-        {formatNumber(p.votingPeriod)} blocks
-      </Bubble>
-      <Bubble label='Revealing period'>
-        {formatNumber(p.revealingPeriod)} blocks
-      </Bubble>
+      <Label.Group color="grey" size="large">
+        <Label>
+          Auto-start elections
+          <Label.Detail>{isAutoStart ? 'Yes' : 'No'}</Label.Detail>
+        </Label>
+        <Label>
+          New term duration
+          <Label.Detail>{formatNumber(p.newTermDuration)}</Label.Detail>
+        </Label>
+        <Label>
+          Candidacy limit
+          <Label.Detail>{formatNumber(p.candidacyLimit)}</Label.Detail>
+        </Label>
+        <Label>
+          Council size
+          <Label.Detail>{formatNumber(p.councilSize)}</Label.Detail>
+        </Label>
+        <Label>
+          Min. council stake
+          <Label.Detail>{formatBalance(p.minCouncilStake)}</Label.Detail>
+        </Label>
+        <Label>
+          Min. voting stake
+          <Label.Detail>{formatBalance(p.minVotingStake)}</Label.Detail>
+        </Label>
+      </Label.Group>
+      <Label.Group color="grey" size="large">
+        <Label>
+          Announcing period
+          <Label.Detail>{formatNumber(p.announcingPeriod)} blocks</Label.Detail>
+        </Label>
+        <Label>
+          Voting period
+          <Label.Detail>{formatNumber(p.votingPeriod)} blocks</Label.Detail>
+        </Label>
+        <Label>
+          Revealing period
+          <Label.Detail>{formatNumber(p.revealingPeriod)} blocks</Label.Detail>
+        </Label>
+      </Label.Group>
     </Section>;
   }
 
diff --git a/pioneer/packages/joy-election/src/Reveals.tsx b/pioneer/packages/joy-election/src/Reveals.tsx
index 6a20dad6f9..b54330d5f7 100644
--- a/pioneer/packages/joy-election/src/Reveals.tsx
+++ b/pioneer/packages/joy-election/src/Reveals.tsx
@@ -2,16 +2,16 @@ import React from 'react';
 
 import { AppProps, I18nProps } from '@polkadot/react-components/types';
 import { ApiProps } from '@polkadot/react-api/types';
-import { withCalls, withMulti } from '@polkadot/react-api/with';
+import { withCalls, withMulti } from '@polkadot/react-api/hoc';
 import { AccountId } from '@polkadot/types/interfaces';
 import { Input, Labelled, InputAddress } from '@polkadot/react-components/index';
 
 import translate from './translate';
-import { nonEmptyStr, queryToProp, getUrlParam } from '@polkadot/joy-utils/index';
+import { nonEmptyStr, queryToProp, getUrlParam } from '@polkadot/joy-utils/functions/misc';
 import { accountIdsToOptions, hashVote } from './utils';
-import TxButton from '@polkadot/joy-utils/TxButton';
+import TxButton from '@polkadot/joy-utils/react/components/TxButton';
 import { findVoteByHash } from './myVotesStore';
-import { withOnlyMembers } from '@polkadot/joy-utils/MyAccount';
+import { withOnlyMembers } from '@polkadot/joy-utils/react/hocs/guards';
 
 // AppsProps is needed to get a location from the route.
 type Props = AppProps & ApiProps & I18nProps & {
@@ -81,15 +81,17 @@ class RevealVoteForm extends React.PureComponent<Props, State> {
             onChange={this.onChangeSalt}
           />
         </div>}
-        <Labelled style={{ marginTop: '.5rem' }}>
-          <TxButton
-            size='large'
-            isDisabled={!isVoteRevealed}
-            label='Reveal this vote'
-            params={[hashedVote, applicantId, salt]}
-            tx='councilElection.reveal'
-          />
-        </Labelled>
+        <div style={{ marginTop: '.5rem' }}>
+          <Labelled>
+            <TxButton
+              size='large'
+              isDisabled={!isVoteRevealed}
+              label='Reveal this vote'
+              params={[hashedVote, applicantId, salt]}
+              tx='councilElection.reveal'
+            />
+          </Labelled>
+        </div>
       </div>
     );
   }
diff --git a/pioneer/packages/joy-election/src/SealedVote.tsx b/pioneer/packages/joy-election/src/SealedVote.tsx
index 54650328c1..b935d04e11 100644
--- a/pioneer/packages/joy-election/src/SealedVote.tsx
+++ b/pioneer/packages/joy-election/src/SealedVote.tsx
@@ -1,28 +1,30 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { Table } from 'semantic-ui-react';
+import { Table, Message } from 'semantic-ui-react';
 
 import { I18nProps } from '@polkadot/react-components/types';
 import { ApiProps } from '@polkadot/react-api/types';
-import { withCalls } from '@polkadot/react-api/with';
+import { withCalls } from '@polkadot/react-api/hoc';
 import { Hash } from '@polkadot/types/interfaces';
 import { formatBalance } from '@polkadot/util';
 
 import translate from './translate';
-import { calcTotalStake } from '@polkadot/joy-utils/index';
+import { calcTotalStake } from '@polkadot/joy-utils/functions/misc';
 import { SealedVote } from '@joystream/types/council';
-import AddressMini from '@polkadot/react-components/AddressMiniJoy';
+import AddressMini from '@polkadot/react-components/AddressMini';
 import CandidatePreview from './CandidatePreview';
 import { findVoteByHash } from './myVotesStore';
 
 type Props = ApiProps & I18nProps & {
   hash: Hash;
   sealedVote?: SealedVote;
+  isStageRevealing: boolean;
+  isMyVote: boolean;
 };
 
 class Comp extends React.PureComponent<Props> {
   renderCandidateOrAction () {
-    const { hash, sealedVote } = this.props;
+    const { hash, sealedVote, isStageRevealing, isMyVote } = this.props;
     if (!sealedVote) {
       return <em>Unknown hashed vote: {hash.toHex()}</em>;
     }
@@ -30,10 +32,16 @@ class Comp extends React.PureComponent<Props> {
     if (sealedVote.vote.isSome) {
       const candidateId = sealedVote.vote.unwrap();
       return <CandidatePreview accountId={candidateId} />;
-    } else {
+    } else if (isStageRevealing && isMyVote) {
       const revealUrl = `/council/reveals?hashedVote=${hash.toHex()}`;
       return <Link to={revealUrl} className='ui button primary inverted'>Reveal this vote</Link>;
     }
+    else if (isMyVote) {
+      return <Message warning>Wait until <i><b>Revealing</b></i> stage in order to reveal this vote.</Message>
+    }
+    else {
+      return <Message info>This vote has not been revealed yet.</Message>
+    }
   }
 
   render () {
diff --git a/pioneer/packages/joy-election/src/SealedVotes.tsx b/pioneer/packages/joy-election/src/SealedVotes.tsx
index 1f03b66ac0..8dd5abf374 100644
--- a/pioneer/packages/joy-election/src/SealedVotes.tsx
+++ b/pioneer/packages/joy-election/src/SealedVotes.tsx
@@ -4,19 +4,20 @@ import { Button } from 'semantic-ui-react';
 
 import { I18nProps } from '@polkadot/react-components/types';
 import { ApiProps } from '@polkadot/react-api/types';
-import { withCalls } from '@polkadot/react-api/with';
+import { withCalls } from '@polkadot/react-api/hoc';
 import { Hash } from '@polkadot/types/interfaces';
 
 import translate from './translate';
 import SealedVote from './SealedVote';
-import { queryToProp } from '@polkadot/joy-utils/index';
-import { MyAddressProps } from '@polkadot/joy-utils/MyAccount';
+import { queryToProp } from '@polkadot/joy-utils/functions/misc';
+import { MyAddressProps } from '@polkadot/joy-utils/react/hocs/accounts';
 import { SavedVote } from './myVotesStore';
-import Section from '@polkadot/joy-utils/Section';
+import Section from '@polkadot/joy-utils/react/components/Section';
 
 type Props = ApiProps & I18nProps & MyAddressProps & {
   myVotes?: SavedVote[];
   commitments?: Hash[];
+  isStageRevealing: boolean;
 };
 
 class Comp extends React.PureComponent<Props> {
@@ -28,9 +29,13 @@ class Comp extends React.PureComponent<Props> {
     return commitments.filter(x => myVotesOnly === isMyVote(x.toHex()));
   }
 
-  private renderVotes = (votes: Hash[]) => {
+  private renderVotes = (votes: Hash[], areVotesMine: boolean) => {
     return votes.map((hash, index) =>
-      <SealedVote key={index} hash={hash} />
+      <SealedVote
+        key={index}
+        hash={hash}
+        isStageRevealing={this.props.isStageRevealing}
+        isMyVote={areVotesMine}/>
     );
   }
 
@@ -39,17 +44,19 @@ class Comp extends React.PureComponent<Props> {
     const otherVotes = this.filterVotes(false);
 
     return <>
-      <Section title={`My previous votes (${myVotes.length})`}>{
+      <Section title={`My previous votes (${myVotes.length})`}>
+      {
         !myVotes.length
           ? <em>No votes by the current account found on the current browser.</em>
-          : this.renderVotes(myVotes)
-      }</Section>
+          : this.renderVotes(myVotes, true)
+      }
+      { this.props.isStageRevealing && <Button primary as={Link} to="reveals">Reveal other vote</Button> }
+      </Section>
       <Section title={`Other votes (${otherVotes.length})`}>
-        <Button primary as={Link} to="reveals">Reveal a vote</Button>
         {
           !otherVotes.length
             ? <em>No votes submitted by other accounts yet.</em>
-            : this.renderVotes(otherVotes)
+            : this.renderVotes(otherVotes, false)
         }
       </Section>
     </>;
diff --git a/pioneer/packages/joy-election/src/SidebarSubtitle.tsx b/pioneer/packages/joy-election/src/SidebarSubtitle.tsx
new file mode 100644
index 0000000000..bbd59e6c6b
--- /dev/null
+++ b/pioneer/packages/joy-election/src/SidebarSubtitle.tsx
@@ -0,0 +1,34 @@
+/** Component providing election stage subtitle for SideBar menu **/
+import React from 'react';
+import { ElectionStage } from '@joystream/types/council';
+import { Option } from '@polkadot/types/codec';
+import { useApi, useCall } from '@polkadot/react-hooks';
+import styled from 'styled-components';
+
+const colorByStage = {
+  Announcing: '#4caf50',
+  Voting: '#2196f3',
+  Revealing: '#ff5722'
+} as const;
+
+type StyledSubtitleProps = {
+  stage?: keyof typeof colorByStage;
+}
+const StyledSubtitle = styled.div`
+  display: block;
+  font-size: 0.85rem;
+  color: ${ (props: StyledSubtitleProps) => props.stage ? colorByStage[props.stage] : 'grey' };
+`;
+
+export default function SidebarSubtitle () {
+  const apiProps = useApi();
+  const electionStage = useCall<Option<ElectionStage>>(apiProps.isApiReady && apiProps.api.query.councilElection.stage, []);
+
+  if (electionStage) {
+    const stageName = electionStage.unwrapOr(undefined)?.type;
+    const text = stageName ? `${stageName} stage` : 'No active election';
+    return <StyledSubtitle stage={stageName}>{text}</StyledSubtitle>;
+  }
+
+  return null;
+}
diff --git a/pioneer/packages/joy-election/src/VoteForm.tsx b/pioneer/packages/joy-election/src/VoteForm.tsx
index 63fbb78b17..b567669d7f 100644
--- a/pioneer/packages/joy-election/src/VoteForm.tsx
+++ b/pioneer/packages/joy-election/src/VoteForm.tsx
@@ -6,7 +6,7 @@ import { Message, Table } from 'semantic-ui-react';
 
 import { AppProps, I18nProps } from '@polkadot/react-components/types';
 import { ApiProps } from '@polkadot/react-api/types';
-import { withCalls, withMulti } from '@polkadot/react-api/with';
+import { withCalls, withMulti } from '@polkadot/react-api/hoc';
 import { AccountId, Balance } from '@polkadot/types/interfaces';
 import { Button, Input, Labelled } from '@polkadot/react-components/index';
 import { SubmittableResult } from '@polkadot/api';
@@ -14,12 +14,13 @@ import { formatBalance } from '@polkadot/util';
 
 import translate from './translate';
 import { hashVote } from './utils';
-import { queryToProp, ZERO, getUrlParam, nonEmptyStr } from '@polkadot/joy-utils/index';
-import TxButton from '@polkadot/joy-utils/TxButton';
-import InputStake from '@polkadot/joy-utils/InputStake';
+import { queryToProp, ZERO, getUrlParam, nonEmptyStr } from '@polkadot/joy-utils/functions/misc';
+import TxButton from '@polkadot/joy-utils/react/components/TxButton';
+import InputStake from '@polkadot/joy-utils/react/components/InputStake';
 import CandidatePreview from './CandidatePreview';
-import { MyAccountProps, withOnlyMembers } from '@polkadot/joy-utils/MyAccount';
-import MembersDropdown from '@polkadot/joy-utils/MembersDropdown';
+import { MyAccountProps } from '@polkadot/joy-utils/react/hocs/accounts';
+import { withOnlyMembers } from '@polkadot/joy-utils/react/hocs/guards'
+import MembersDropdown from '@polkadot/joy-utils/react/components/MembersDropdown';
 import { saveVote, NewVote } from './myVotesStore';
 import { TxFailedCallback } from '@polkadot/react-components/Status/types';
 
@@ -103,14 +104,11 @@ class Component extends React.PureComponent<Props, State> {
               </Table.Row>
             </Table.Body>
           </Table>
-          <Labelled style={{ marginTop: '.5rem' }}>
-            <Button
-              size='large'
-              label='Submit another vote'
-              onClick={this.resetForm}
-              icon=''
-            />
-          </Labelled>
+          <Button
+            label='Submit another vote'
+            onClick={this.resetForm}
+            icon='arrow-left'
+          />
         </div>
 
       // New vote form:
@@ -137,7 +135,7 @@ class Component extends React.PureComponent<Props, State> {
               onChange={this.onChangeSalt}
             />
             <div className='medium' style={{ margin: '.5rem' }}>
-              <Button onClick={this.newRandomSalt} icon=''>Generate</Button>
+              <Button onClick={this.newRandomSalt} icon='cubes' label='Generate' />
               <Message compact warning size='tiny' content='You need to remember this salt!' />
             </div>
           </div>
@@ -148,18 +146,20 @@ class Component extends React.PureComponent<Props, State> {
               value={hashedVote}
             />
           </div>
-          <Labelled style={{ marginTop: '.5rem' }}>
-            <TxButton
-              size='large'
-              isDisabled={!isFormValid}
-              label='Submit my vote'
-              params={[hashedVote, stake]}
-              tx='councilElection.vote'
-              txStartCb={this.onFormSubmitted}
-              txFailedCb={this.onTxFailed}
-              txSuccessCb={(txResult: SubmittableResult) => this.onTxSuccess(buildNewVote() as NewVote, txResult)}
-            />
-          </Labelled>
+          <div style={{ marginTop: '.5rem' }}>
+            <Labelled>
+              <TxButton
+                size='large'
+                isDisabled={!isFormValid}
+                label='Submit my vote'
+                params={[hashedVote, stake]}
+                tx='councilElection.vote'
+                txStartCb={this.onFormSubmitted}
+                txFailedCb={this.onTxFailed}
+                txSuccessCb={(txResult: SubmittableResult) => this.onTxSuccess(buildNewVote() as NewVote, txResult)}
+              />
+            </Labelled>
+          </div>
         </div>}
       </>
     );
diff --git a/pioneer/packages/joy-election/src/Votes.tsx b/pioneer/packages/joy-election/src/Votes.tsx
index a1558406e6..d238dcd6c6 100644
--- a/pioneer/packages/joy-election/src/Votes.tsx
+++ b/pioneer/packages/joy-election/src/Votes.tsx
@@ -2,30 +2,51 @@ import React from 'react';
 
 import { AppProps, I18nProps } from '@polkadot/react-components/types';
 import { ApiProps } from '@polkadot/react-api/types';
+import { withCalls } from '@polkadot/react-api/hoc';
+import { Message } from 'semantic-ui-react';
+import { Option } from '@polkadot/types';
 
 import translate from './translate';
 import SealedVotes from './SealedVotes';
-import Section from '@polkadot/joy-utils/Section';
-import { withMyAccount, MyAccountProps } from '@polkadot/joy-utils/MyAccount';
+import Section from '@polkadot/joy-utils/react/components/Section';
+import { withMyAccount, MyAccountProps } from '@polkadot/joy-utils/react/hocs/accounts';
 import { getVotesByVoter } from './myVotesStore';
 import VoteForm from './VoteForm';
+import { queryToProp } from '@polkadot/joy-utils/functions/misc';
+import { ElectionStage } from '@joystream/types/src/council';
 
-type Props = AppProps & ApiProps & I18nProps & MyAccountProps & {};
+type Props = AppProps & ApiProps & I18nProps & MyAccountProps & {
+  stage?: Option<ElectionStage>;
+};
 
 class Component extends React.PureComponent<Props> {
   render () {
-    const { myAddress } = this.props;
+    const { myAddress, stage } = this.props;
     const myVotes = myAddress ? getVotesByVoter(myAddress) : [];
 
     return <>
       <Section title='My vote'>
-        <VoteForm {...this.props} myAddress={myAddress} />
+      { stage?.unwrapOr(undefined)?.isOfType('Voting')
+          ? (
+            <VoteForm {...this.props} myAddress={myAddress} />
+          )
+          : (
+            <Message warning>
+              Voting is only possible during <i><b>Voting</b></i> stage.
+            </Message>
+          )
+      }
       </Section>
-      <SealedVotes myAddress={myAddress} myVotes={myVotes} />
+      <SealedVotes
+        isStageRevealing={stage?.unwrapOr(undefined)?.isOfType('Revealing') || false}
+        myAddress={myAddress}
+        myVotes={myVotes} />
     </>;
   }
 }
 
 export default translate(
-  withMyAccount(Component)
+  withCalls<Props>(
+    queryToProp('query.councilElection.stage')
+  )(withMyAccount(Component))
 );
diff --git a/pioneer/packages/joy-election/src/index.css b/pioneer/packages/joy-election/src/index.css
deleted file mode 100644
index 5ad24c8384..0000000000
--- a/pioneer/packages/joy-election/src/index.css
+++ /dev/null
@@ -1,28 +0,0 @@
-
-.JoyElection--NotRunning {
-  /* nothing yet */
-}
-.JoyElection--Running {
-  font-style: italic;
-  color: green;
-}
-.SealedVoteTable {
-  -webkit-box-shadow: 0 1px 2px 0 rgba(34,36,38,.15) !important;
-  box-shadow: 0 1px 2px 0 rgba(34,36,38,.15) !important;
-  tr td:first-child {
-    color: #999 !important;
-    font-weight: normal !important;
-  }
-}
-
-.SidebarSubtitle {
-  &.Announcing {
-    color: #4caf50; /* green */
-  }
-  &.Voting {
-    color: #2196f3; /* blue */
-  }
-  &.Revealing {
-    color: #ff5722; /* red */
-  }
-}
\ No newline at end of file
diff --git a/pioneer/packages/joy-election/src/index.tsx b/pioneer/packages/joy-election/src/index.tsx
index c4206c3aeb..9a6490b190 100644
--- a/pioneer/packages/joy-election/src/index.tsx
+++ b/pioneer/packages/joy-election/src/index.tsx
@@ -1,14 +1,16 @@
 import React from 'react';
 import { Route, Switch } from 'react-router';
 
-import { AppProps, I18nProps } from '@polkadot/react-components/types';
-import { ApiProps } from '@polkadot/react-api/types';
-import { withCalls } from '@polkadot/react-api/with';
+import { I18nProps } from '@polkadot/react-components/types';
+import { RouteProps } from '@polkadot/apps-routing/types';
+import { withCalls } from '@polkadot/react-api/hoc';
 import { AccountId, Hash } from '@polkadot/types/interfaces';
-import Tabs, { TabItem } from '@polkadot/react-components/Tabs';
+import Tabs from '@polkadot/react-components/Tabs';
+import { TabItem } from '@polkadot/react-components/Tabs/types';
 
 // our app-specific styles
-import './index.css';
+import style from './style';
+import styled from 'styled-components';
 
 // local imports and components
 import translate from './translate';
@@ -17,11 +19,13 @@ import Council from './Council';
 import Applicants from './Applicants';
 import Votes from './Votes';
 import Reveals from './Reveals';
-import { queryToProp } from '@polkadot/joy-utils/index';
+import { queryToProp } from '@polkadot/joy-utils/functions/misc';
 import { Seat } from '@joystream/types/council';
 
+const ElectionMain = styled.main`${style}`;
+
 // define out internal types
-type Props = AppProps & ApiProps & I18nProps & {
+type Props = RouteProps & I18nProps & {
   activeCouncil?: Seat[];
   applicants?: AccountId[];
   commitments?: Hash[];
@@ -59,7 +63,7 @@ class App extends React.PureComponent<Props, State> {
     const { basePath } = this.props;
     const tabs = this.buildTabs();
     return (
-      <main className='election--App'>
+      <ElectionMain className='election--App'>
         <header>
           <Tabs basePath={basePath} items={tabs} />
         </header>
@@ -70,7 +74,7 @@ class App extends React.PureComponent<Props, State> {
           <Route path={`${basePath}/reveals`} component={Reveals} />
           <Route component={Dashboard} />
         </Switch>
-      </main>
+      </ElectionMain>
     );
   }
 }
diff --git a/pioneer/packages/joy-election/src/myVotesStore.ts b/pioneer/packages/joy-election/src/myVotesStore.ts
index 46a500780f..cfc3bc3d96 100644
--- a/pioneer/packages/joy-election/src/myVotesStore.ts
+++ b/pioneer/packages/joy-election/src/myVotesStore.ts
@@ -1,5 +1,5 @@
 import store from 'store';
-import { nonEmptyArr } from '@polkadot/joy-utils/index';
+import { nonEmptyArr } from '@polkadot/joy-utils/functions/misc';
 
 const MY_VOTES = 'joy.myVotes';
 
diff --git a/pioneer/packages/joy-election/src/style.ts b/pioneer/packages/joy-election/src/style.ts
new file mode 100644
index 0000000000..74bc548645
--- /dev/null
+++ b/pioneer/packages/joy-election/src/style.ts
@@ -0,0 +1,21 @@
+import { css } from 'styled-components';
+
+const style = css`
+  .JoyElection--NotRunning {
+    /* nothing yet */
+  }
+  .JoyElection--Running {
+    font-style: italic;
+    color: green;
+  }
+  .SealedVoteTable {
+    -webkit-box-shadow: 0 1px 2px 0 rgba(34,36,38,.15) !important;
+    box-shadow: 0 1px 2px 0 rgba(34,36,38,.15) !important;
+    tr td:first-child {
+      color: #999 !important;
+      font-weight: normal !important;
+    }
+  }
+`;
+
+export default style;
diff --git a/pioneer/packages/joy-election/src/utils.tsx b/pioneer/packages/joy-election/src/utils.tsx
index 1a82754ee0..5a4cafb55a 100644
--- a/pioneer/packages/joy-election/src/utils.tsx
+++ b/pioneer/packages/joy-election/src/utils.tsx
@@ -1,10 +1,11 @@
+// TODO: Move to joy-utils?
 import { AccountId } from '@polkadot/types/interfaces';
 
 // Keyring / identicon / address
 // -----------------------------------
 
 import createItem from '@polkadot/ui-keyring/options/item';
-import { findNameByAddress } from '@polkadot/joy-utils/index';
+import { findNameByAddress } from '@polkadot/joy-utils/functions/misc';
 
 // Hash
 // -----------------------------------
diff --git a/pioneer/packages/joy-utils-old/src/InputStake.tsx b/pioneer/packages/joy-utils-old/src/InputStake.tsx
deleted file mode 100644
index a6385a19e4..0000000000
--- a/pioneer/packages/joy-utils-old/src/InputStake.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import BN from 'bn.js';
-import React from 'react';
-import { InputBalance, Bubble } from '@polkadot/react-components/index';
-import { formatBalance } from '@polkadot/util';
-
-type Props = {
-  label?: string;
-  min?: BN;
-  isValid?: boolean;
-  onChange: (stake?: BN) => void;
-};
-
-export default class Component extends React.PureComponent<Props> {
-  render () {
-    const { min, label, isValid, onChange } = this.props;
-    return (
-      <div className='ui--row'>
-        <InputBalance
-          className='medium'
-          label={label || 'Amount to be staked:'}
-          onChange={onChange}
-        />
-        {min && !min.isZero() && <div className='medium' style={{ marginLeft: '.5rem' }}>
-          <Bubble
-            className={`left pointing ${isValid ? 'ok' : 'warn'}`}
-            icon={isValid ? 'check' : 'warning sign'}
-            label='Minimum stake'
-          >
-            {formatBalance(min)}
-          </Bubble>
-        </div>}
-      </div>
-    );
-  }
-}
diff --git a/pioneer/packages/joy-utils-old/src/MemberByAccountPreview.tsx b/pioneer/packages/joy-utils-old/src/MemberByAccountPreview.tsx
deleted file mode 100644
index 7eeb618a24..0000000000
--- a/pioneer/packages/joy-utils-old/src/MemberByAccountPreview.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, { useEffect, useState, useContext } from 'react';
-
-import { Loader } from 'semantic-ui-react';
-import { ApiContext } from '@polkadot/react-api';
-import ProfilePreview from './MemberProfilePreview';
-import { AccountId } from '@polkadot/types/interfaces';
-import { memberFromAccount, MemberFromAccount } from './accounts';
-
-import styled from 'styled-components';
-
-const MemberByAccount = styled.div``;
-
-type Props = {
-  accountId: AccountId | string;
-};
-
-const MemberByAccountPreview: React.FunctionComponent<Props> = ({ accountId }) => {
-  const { api } = useContext(ApiContext);
-  const [member, setMember] = useState(null as MemberFromAccount | null);
-  useEffect(
-    () => {
-      let isSubscribed = true;
-      memberFromAccount(api, accountId).then(member => isSubscribed && setMember(member));
-      return () => { isSubscribed = false; };
-    },
-    [accountId]
-  );
-
-  return (
-    <MemberByAccount>
-      { member
-        ? (
-          member.profile
-            ? <ProfilePreview
-              avatar_uri={member.profile.avatar_uri.toString()}
-              root_account={member.profile.root_account.toString()}
-              handle={member.profile.handle.toString()}
-              id={member.id}
-              link={true}/>
-            : 'Member profile not found!'
-        )
-        : <Loader inline active>Fetching member profile...</Loader>
-      }
-    </MemberByAccount>
-  );
-};
-
-export default MemberByAccountPreview;
diff --git a/pioneer/packages/joy-utils-old/src/transport/base.ts b/pioneer/packages/joy-utils-old/src/transport/base.ts
deleted file mode 100644
index 9375f99c14..0000000000
--- a/pioneer/packages/joy-utils-old/src/transport/base.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { ApiPromise } from '@polkadot/api';
-import { Codec } from '@polkadot/types/types';
-import { APIQueryCache } from '../APIQueryCache';
-
-export default abstract class BaseTransport {
-  protected api: ApiPromise;
-  protected cacheApi: APIQueryCache;
-
-  constructor (api: ApiPromise, cacheApi: APIQueryCache) {
-    this.api = api;
-    this.cacheApi = cacheApi;
-  }
-
-  protected get proposalsEngine () {
-    return this.cacheApi.query.proposalsEngine;
-  }
-
-  protected get proposalsCodex () {
-    return this.cacheApi.query.proposalsCodex;
-  }
-
-  protected get proposalsDiscussion () {
-    return this.cacheApi.query.proposalsDiscussion;
-  }
-
-  protected get members () {
-    return this.cacheApi.query.members;
-  }
-
-  protected get council () {
-    return this.cacheApi.query.council;
-  }
-
-  protected get councilElection () {
-    return this.cacheApi.query.councilElection;
-  }
-
-  protected get actors () {
-    return this.cacheApi.query.actors;
-  }
-
-  protected get contentWorkingGroup () {
-    return this.cacheApi.query.contentWorkingGroup;
-  }
-
-  protected get minting () {
-    return this.cacheApi.query.minting;
-  }
-
-  protected get hiring () {
-    return this.cacheApi.query.hiring;
-  }
-
-  protected get stake () {
-    return this.cacheApi.query.stake;
-  }
-
-  protected get recurringRewards () {
-    return this.cacheApi.query.recurringRewards;
-  }
-
-  protected queryMethodByName (name: string) {
-    const [module, method] = name.split('.');
-    return this.api.query[module][method];
-  }
-
-  // Fetch all double map entries using only the first key
-  //
-  // TODO: FIXME: This may be a risky implementation, because it relies on a few assumptions about how the data is stored etc.
-  // With the current runtime version we can rely on the fact that all storage keys for double-map values start with the same
-  // 32-bytes prefix assuming a given (fixed) value of the first key (ie. for all values like map[x][y], the storage key starts
-  // with the same prefix as long as x remains the same. Changing y will not affect this prefix)
-  protected async doubleMapEntries<T extends Codec> (
-    methodName: string,
-    firstKey: Codec,
-    valueConverter: (hex: string) => T,
-    getEntriesCount: () => Promise<number>,
-    secondKeyStart = 1
-  ): Promise<{ secondKey: number; value: T}[]> {
-    // Get prefix and storage keys of all entries
-    const firstEntryStorageKey = this.queryMethodByName(methodName).key(firstKey, secondKeyStart);
-    const entryStorageKeyPrefix = firstEntryStorageKey.substr(0, 66); // "0x" + 64 hex characters (32 bytes)
-    const allEntriesStorageKeys = await this.api.rpc.state.getKeys(entryStorageKeyPrefix);
-
-    // Create storageKey-to-secondKey map
-    const maxSecondKey = (await getEntriesCount()) - 1 + secondKeyStart;
-    const storageKeyToSecondKey: { [key: string]: number } = {};
-    for (let secondKey = secondKeyStart; secondKey <= maxSecondKey; ++secondKey) {
-      const storageKey = this.queryMethodByName(methodName).key(firstKey, secondKey);
-      storageKeyToSecondKey[storageKey] = secondKey;
-    }
-
-    // Create the resulting entries array
-    const entries: { secondKey: number; value: T }[] = [];
-    for (const key of allEntriesStorageKeys) {
-      const value: any = await this.api.rpc.state.getStorage(key);
-      if (typeof value === 'object' && value !== null && value.raw) {
-        entries.push({
-          secondKey: storageKeyToSecondKey[key.toString()],
-          value: valueConverter(value.raw.toString())
-        });
-      }
-    }
-
-    return entries;
-  }
-}
diff --git a/pioneer/packages/joy-utils-old/src/transport/index.ts b/pioneer/packages/joy-utils-old/src/transport/index.ts
deleted file mode 100644
index a4296adc40..0000000000
--- a/pioneer/packages/joy-utils-old/src/transport/index.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { ApiPromise } from '@polkadot/api';
-import ChainTransport from './chain';
-import ContentWorkingGroupTransport from './contentWorkingGroup';
-import ProposalsTransport from './proposals';
-import MembersTransport from './members';
-import CouncilTransport from './council';
-import ValidatorsTransport from './validators';
-import WorkingGroupsTransport from './workingGroups';
-import { APIQueryCache } from '../APIQueryCache';
-
-export default class Transport {
-  protected api: ApiPromise;
-  protected cacheApi: APIQueryCache;
-  // Specific transports
-  public chain: ChainTransport;
-  public members: MembersTransport;
-  public council: CouncilTransport;
-  public proposals: ProposalsTransport;
-  public contentWorkingGroup: ContentWorkingGroupTransport;
-  public validators: ValidatorsTransport;
-  public workingGroups: WorkingGroupsTransport;
-
-  constructor (api: ApiPromise) {
-    this.api = api;
-    this.cacheApi = new APIQueryCache(api);
-    this.chain = new ChainTransport(api, this.cacheApi);
-    this.members = new MembersTransport(api, this.cacheApi);
-    this.validators = new ValidatorsTransport(api, this.cacheApi);
-    this.council = new CouncilTransport(api, this.cacheApi, this.members, this.chain);
-    this.contentWorkingGroup = new ContentWorkingGroupTransport(api, this.cacheApi, this.members);
-    this.proposals = new ProposalsTransport(api, this.cacheApi, this.members, this.chain, this.council);
-    this.workingGroups = new WorkingGroupsTransport(api, this.cacheApi, this.members);
-  }
-}
diff --git a/pioneer/packages/joy-utils/src/react/components/InputStake.tsx b/pioneer/packages/joy-utils/src/react/components/InputStake.tsx
new file mode 100644
index 0000000000..8e012fe42f
--- /dev/null
+++ b/pioneer/packages/joy-utils/src/react/components/InputStake.tsx
@@ -0,0 +1,46 @@
+import BN from 'bn.js';
+import React from 'react';
+import { InputBalance } from '@polkadot/react-components/index';
+import { Label } from 'semantic-ui-react';
+import { formatBalance } from '@polkadot/util';
+
+type Props = {
+  label?: string;
+  min?: BN;
+  isValid?: boolean;
+  onChange: (stake?: BN) => void;
+};
+
+export default class Component extends React.PureComponent<Props> {
+  render () {
+    const { min, label, isValid, onChange } = this.props;
+    return (
+      <div className='ui--row' style={{ display: 'flex' }}>
+        <InputBalance
+          className='medium'
+          label={label || 'Amount to be staked:'}
+          onChange={onChange}
+        />
+        {min && !min.isZero() && (
+          <div
+            className='medium'
+            style={{
+              marginLeft: '.5rem',
+              display: 'flex',
+              alignItems: 'center'
+            }}>
+            <Label
+              color={ isValid ? 'green' : 'red' }
+              icon={isValid ? 'check' : 'warning sign'}
+              label='Minimum stake'
+              pointing="left"
+            >
+              Minimum stake
+              <Label.Detail>{formatBalance(min)}</Label.Detail>
+            </Label>
+          </div>
+        ) }
+      </div>
+    );
+  }
+}
diff --git a/pioneer/packages/joy-utils/src/react/components/MemberByAccountPreview.tsx b/pioneer/packages/joy-utils/src/react/components/MemberByAccountPreview.tsx
new file mode 100644
index 0000000000..2fc8e28d83
--- /dev/null
+++ b/pioneer/packages/joy-utils/src/react/components/MemberByAccountPreview.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+
+import ProfilePreview from './MemberProfilePreview';
+import { AccountId } from '@polkadot/types/interfaces';
+import { MemberFromAccount } from '../../types/members';
+import { useTransport, usePromise } from '../hooks';
+
+import styled from 'styled-components';
+import PromiseComponent from './PromiseComponent';
+
+const MemberByAccount = styled.div``;
+
+type Props = {
+  accountId: AccountId | string;
+};
+
+const MemberByAccountPreview: React.FunctionComponent<Props> = ({ accountId }) => {
+  const transport = useTransport();
+  const [member, error, loading] = usePromise<MemberFromAccount | null>(
+    () => transport.members.membershipFromAccount(accountId),
+    null,
+    [accountId]
+  );
+
+  return (
+    <PromiseComponent error={error} loading={loading} message="Fetching member profile...">
+      <MemberByAccount>
+        { member && (
+          member.profile
+            ? <ProfilePreview
+              avatar_uri={member.profile.avatar_uri.toString()}
+              root_account={member.profile.root_account.toString()}
+              handle={member.profile.handle.toString()}
+              id={member.memberId}
+              link={true}/>
+            : 'Member profile not found!'
+        ) }
+      </MemberByAccount>
+    </PromiseComponent>
+  );
+};
+
+export default MemberByAccountPreview;
diff --git a/pioneer/packages/joy-utils-old/src/MemberProfilePreview.tsx b/pioneer/packages/joy-utils/src/react/components/MemberProfilePreview.tsx
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/MemberProfilePreview.tsx
rename to pioneer/packages/joy-utils/src/react/components/MemberProfilePreview.tsx
diff --git a/pioneer/packages/joy-utils-old/src/MembersDropdown.tsx b/pioneer/packages/joy-utils/src/react/components/MembersDropdown.tsx
similarity index 82%
rename from pioneer/packages/joy-utils-old/src/MembersDropdown.tsx
rename to pioneer/packages/joy-utils/src/react/components/MembersDropdown.tsx
index a547bbd406..accada8040 100644
--- a/pioneer/packages/joy-utils-old/src/MembersDropdown.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/MembersDropdown.tsx
@@ -1,9 +1,9 @@
-import React, { useEffect, useState, useContext } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Dropdown, DropdownItemProps, DropdownProps } from 'semantic-ui-react';
 import { Membership } from '@joystream/types/members';
-import { memberFromAccount, MemberFromAccount } from './accounts';
+import { MemberFromAccount } from '../../types/members';
+import { useTransport } from '../hooks';
 import { AccountId } from '@polkadot/types/interfaces';
-import { ApiContext } from '@polkadot/react-api';
 import styled from 'styled-components';
 
 const StyledMembersDropdown = styled(Dropdown)`
@@ -16,9 +16,9 @@ const StyledMembersDropdown = styled(Dropdown)`
 function membersToOptions (members: MemberFromAccount[]) {
   const validMembers = members.filter(m => m.profile !== undefined) as (MemberFromAccount & { profile: Membership })[];
   return validMembers
-    .map(({ id, profile, account }) => ({
+    .map(({ memberId, profile, account }) => ({
       key: profile.handle,
-      text: `${profile.handle} (id:${id})`,
+      text: `${profile.handle} (id:${memberId})`,
       value: account,
       image: profile.avatar_uri.toString() ? { avatar: true, src: profile.avatar_uri } : null
     }));
@@ -33,7 +33,7 @@ type Props = {
 };
 
 const MembersDropdown: React.FunctionComponent<Props> = ({ accounts, ...passedProps }) => {
-  const { api } = useContext(ApiContext);
+  const transport = useTransport();
   // State
   const [loading, setLoading] = useState(true);
   const [membersOptions, setMembersOptions] = useState([] as DropdownItemProps[]);
@@ -41,7 +41,7 @@ const MembersDropdown: React.FunctionComponent<Props> = ({ accounts, ...passedPr
   useEffect(() => {
     let isSubscribed = true;
     Promise
-      .all(accounts.map(acc => memberFromAccount(api, acc)))
+      .all(accounts.map(acc => transport.members.membershipFromAccount(acc)))
       .then(members => {
         if (isSubscribed) {
           setMembersOptions(membersToOptions(members));
diff --git a/pioneer/packages/joy-utils-old/src/react/components/PromiseComponent.tsx b/pioneer/packages/joy-utils/src/react/components/PromiseComponent.tsx
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/react/components/PromiseComponent.tsx
rename to pioneer/packages/joy-utils/src/react/components/PromiseComponent.tsx
diff --git a/pioneer/packages/joy-utils/src/react/context/index.tsx b/pioneer/packages/joy-utils/src/react/context/index.tsx
index 7f1069a262..b3cfe458cc 100644
--- a/pioneer/packages/joy-utils/src/react/context/index.tsx
+++ b/pioneer/packages/joy-utils/src/react/context/index.tsx
@@ -1,2 +1,3 @@
 export { MyAccountContext, MyAccountProvider } from './account';
 export { MyMembershipContext, MyMembershipProvider } from './membership';
+export { TransportContext, TransportProvider } from './transport';
diff --git a/pioneer/packages/joy-utils-old/src/react/context/transport.tsx b/pioneer/packages/joy-utils/src/react/context/transport.tsx
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/react/context/transport.tsx
rename to pioneer/packages/joy-utils/src/react/context/transport.tsx
diff --git a/pioneer/packages/joy-utils/src/react/hooks/index.ts b/pioneer/packages/joy-utils/src/react/hooks/index.ts
index f95a7d97e0..fdea80a3df 100644
--- a/pioneer/packages/joy-utils/src/react/hooks/index.ts
+++ b/pioneer/packages/joy-utils/src/react/hooks/index.ts
@@ -1,2 +1,4 @@
 export { default as useMyAccount } from './useMyAccount';
 export { default as useMyMembership } from './useMyMembership';
+export { default as usePromise } from './usePromise';
+export { default as useTransport } from './useTransport';
diff --git a/pioneer/packages/joy-utils-old/src/react/hooks/usePromise.tsx b/pioneer/packages/joy-utils/src/react/hooks/usePromise.tsx
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/react/hooks/usePromise.tsx
rename to pioneer/packages/joy-utils/src/react/hooks/usePromise.tsx
diff --git a/pioneer/packages/joy-utils-old/src/react/hooks/useTransport.tsx b/pioneer/packages/joy-utils/src/react/hooks/useTransport.tsx
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/react/hooks/useTransport.tsx
rename to pioneer/packages/joy-utils/src/react/hooks/useTransport.tsx
diff --git a/pioneer/packages/joy-utils-old/src/APIQueryCache.ts b/pioneer/packages/joy-utils/src/transport/APIQueryCache.ts
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/APIQueryCache.ts
rename to pioneer/packages/joy-utils/src/transport/APIQueryCache.ts
diff --git a/pioneer/packages/joy-utils/src/transport/base.ts b/pioneer/packages/joy-utils/src/transport/base.ts
new file mode 100644
index 0000000000..b8a1433d1b
--- /dev/null
+++ b/pioneer/packages/joy-utils/src/transport/base.ts
@@ -0,0 +1,66 @@
+import { ApiPromise } from '@polkadot/api';
+import { Codec } from '@polkadot/types/types';
+import { APIQueryCache } from './APIQueryCache';
+
+export default abstract class BaseTransport {
+  protected api: ApiPromise;
+  protected cacheApi: APIQueryCache;
+
+  constructor (api: ApiPromise, cacheApi: APIQueryCache) {
+    this.api = api;
+    this.cacheApi = cacheApi;
+  }
+
+  protected get proposalsEngine () {
+    return this.cacheApi.query.proposalsEngine;
+  }
+
+  protected get proposalsCodex () {
+    return this.cacheApi.query.proposalsCodex;
+  }
+
+  protected get proposalsDiscussion () {
+    return this.cacheApi.query.proposalsDiscussion;
+  }
+
+  protected get members () {
+    return this.cacheApi.query.members;
+  }
+
+  protected get council () {
+    return this.cacheApi.query.council;
+  }
+
+  protected get councilElection () {
+    return this.cacheApi.query.councilElection;
+  }
+
+  protected get actors () {
+    return this.cacheApi.query.actors;
+  }
+
+  protected get contentWorkingGroup () {
+    return this.cacheApi.query.contentWorkingGroup;
+  }
+
+  protected get minting () {
+    return this.cacheApi.query.minting;
+  }
+
+  protected get hiring () {
+    return this.cacheApi.query.hiring;
+  }
+
+  protected get stake () {
+    return this.cacheApi.query.stake;
+  }
+
+  protected get recurringRewards () {
+    return this.cacheApi.query.recurringRewards;
+  }
+
+  protected queryMethodByName (name: string) {
+    const [module, method] = name.split('.');
+    return this.api.query[module][method];
+  }
+}
diff --git a/pioneer/packages/joy-utils/src/transport/index.ts b/pioneer/packages/joy-utils/src/transport/index.ts
new file mode 100644
index 0000000000..3060094ec0
--- /dev/null
+++ b/pioneer/packages/joy-utils/src/transport/index.ts
@@ -0,0 +1,34 @@
+import { ApiPromise } from '@polkadot/api';
+// import ChainTransport from './chain';
+// import ContentWorkingGroupTransport from './contentWorkingGroup';
+// import ProposalsTransport from './proposals';
+import MembersTransport from './members';
+// import CouncilTransport from './council';
+// import ValidatorsTransport from './validators';
+// import WorkingGroupsTransport from './workingGroups';
+import { APIQueryCache } from './APIQueryCache';
+
+export default class Transport {
+  protected api: ApiPromise;
+  protected cacheApi: APIQueryCache;
+  // Specific transports
+  // public chain: ChainTransport;
+  public members: MembersTransport;
+  // public council: CouncilTransport;
+  // public proposals: ProposalsTransport;
+  // public contentWorkingGroup: ContentWorkingGroupTransport;
+  // public validators: ValidatorsTransport;
+  // public workingGroups: WorkingGroupsTransport;
+
+  constructor (api: ApiPromise) {
+    this.api = api;
+    this.cacheApi = new APIQueryCache(api);
+    // this.chain = new ChainTransport(api, this.cacheApi);
+    this.members = new MembersTransport(api, this.cacheApi);
+    // this.validators = new ValidatorsTransport(api, this.cacheApi);
+    // this.council = new CouncilTransport(api, this.cacheApi, this.members, this.chain);
+    // this.contentWorkingGroup = new ContentWorkingGroupTransport(api, this.cacheApi, this.members);
+    // this.proposals = new ProposalsTransport(api, this.cacheApi, this.members, this.chain, this.council);
+    // this.workingGroups = new WorkingGroupsTransport(api, this.cacheApi, this.members);
+  }
+}
diff --git a/pioneer/packages/joy-utils-old/src/transport/members.ts b/pioneer/packages/joy-utils/src/transport/members.ts
similarity index 53%
rename from pioneer/packages/joy-utils-old/src/transport/members.ts
rename to pioneer/packages/joy-utils/src/transport/members.ts
index 8263d87d59..5a90bf74df 100644
--- a/pioneer/packages/joy-utils-old/src/transport/members.ts
+++ b/pioneer/packages/joy-utils/src/transport/members.ts
@@ -1,5 +1,8 @@
 import BaseTransport from './base';
 import { MemberId, Membership } from '@joystream/types/members';
+import { Vec } from '@polkadot/types/codec';
+import { AccountId } from '@polkadot/types/interfaces';
+import { MemberFromAccount } from '../types/members';
 
 export default class MembersTransport extends BaseTransport {
   async membershipById (id: MemberId | number): Promise<Membership | null> {
@@ -21,4 +24,17 @@ export default class MembersTransport extends BaseTransport {
   async nextMemberId (): Promise<number> {
     return (await this.members.nextMemberId() as MemberId).toNumber();
   }
+
+  async membershipFromAccount (accountId: AccountId | string): Promise<MemberFromAccount> {
+    const memberIdsRoot = (await this.members.memberIdsByRootAccountId(accountId)) as Vec<MemberId>;
+    const memberIdsController = (await this.members.memberIdsByControllerAccountId(accountId)) as Vec<MemberId>;
+    const memberId: MemberId | undefined = memberIdsRoot.toArray().concat(memberIdsController.toArray())[0];
+    const profile = memberId ? await this.expectedMembership(memberId) : undefined;
+
+    return {
+      account: accountId.toString(),
+      memberId: memberId && memberId.toNumber(),
+      profile,
+    };
+  }
 }
diff --git a/pioneer/packages/joy-utils-old/src/types/members.ts b/pioneer/packages/joy-utils/src/types/members.ts
similarity index 64%
rename from pioneer/packages/joy-utils-old/src/types/members.ts
rename to pioneer/packages/joy-utils/src/types/members.ts
index 76f5882de1..1528222ebe 100644
--- a/pioneer/packages/joy-utils-old/src/types/members.ts
+++ b/pioneer/packages/joy-utils/src/types/members.ts
@@ -1,3 +1,5 @@
+import { Membership } from '@joystream/types/members';
+
 export type ParsedMember = {
   about: string;
   avatar_uri: string;
@@ -10,3 +12,5 @@ export type ParsedMember = {
   subscription: any;
   suspended: boolean;
 };
+
+export type MemberFromAccount = { account: string; memberId?: number; profile?: Membership };
diff --git a/pioneer/packages/old-apps/apps-routing/src/joy-election.ts b/pioneer/packages/old-apps/apps-routing/src/joy-election.ts
deleted file mode 100644
index 2f88963545..0000000000
--- a/pioneer/packages/old-apps/apps-routing/src/joy-election.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Routes } from './types';
-
-import Election from '@polkadot/joy-election/index';
-
-export const councilSidebarName = 'council';
-
-export default [
-  {
-    Component: Election,
-    display: {
-      needsApi: ['query.council.activeCouncil', 'query.councilElection.stage']
-    },
-    i18n: {
-      defaultValue: 'Council'
-    },
-    icon: 'university',
-    name: councilSidebarName
-  }
-] as Routes;
diff --git a/pioneer/packages/react-components/src/styles/joystream.ts b/pioneer/packages/react-components/src/styles/joystream.ts
index 4e5054789e..8f79fa4993 100644
--- a/pioneer/packages/react-components/src/styles/joystream.ts
+++ b/pioneer/packages/react-components/src/styles/joystream.ts
@@ -31,60 +31,6 @@ export default css`
     }
   }
 
-  .ui--AddressMini {
-    .ui--IdentityIcon {
-      margin-left: 0;
-    }
-    .ui--AddressMini-info {
-      display: block;
-    }
-    .ui--AddressMini-details {
-      display: block;
-      text-align: left;
-    }
-    .ui--AddressSummary-name,
-    .ui--AddressSummary-balance,
-    .ui--AddressSummary-memo {
-      display: inline-block;
-      margin-top: 0;
-      padding-top: 0;
-      font-size: 0.8rem !important;
-      margin-right: 1rem;
-      font-weight: 100;
-      opacity: 0.8;
-      overflow: hidden;
-    }
-  }
-
-  .ui--Bubble.ui.label {
-    background-color: #f2f2f2;
-    margin: 0.25rem 0;
-    margin-right: 0.5rem;
-
-    &.pointing:before {
-      background-color: #e6e6e6;
-    }
-    &.warn {
-      color: #f2711c !important;
-      border: 1px solid;
-    }
-    &.ok {
-      color: #21ba45 !important;
-      border: 1px solid;
-    }
-  }
-
-  .SidebarItem {
-    display: inline-flex;
-    flex-direction: column;
-
-    .SidebarSubtitle {
-      display: block;
-      font-size: 0.85rem;
-      color: grey;
-    }
-  }
-
   .JoySection {
     margin: 2rem 0;
 
@@ -185,19 +131,50 @@ export default css`
     color: #3b83c0;
   }
 
-  /* Overrides */
+  /* Remove IdentityIcon border (not working well for members list) */
   .ui--IdentityIcon {
     border: none !important;
   }
-  /* Normalize SideBar icons width */
-  .apps--SideBar-Item-NavLink svg {
-    width: 20px !important;
+
+  .apps--SideBar-Item-NavLink {
+    /* Normalize SideBar icons width */
+    svg {
+      width: 20px !important;
+    }
+    /* Display SideBar subtitle below title */
+    .text {
+      display: inline-flex;
+      flex-direction: column;
+    }
   }
+
   /* Fix "collapsed" sidebar on mobile */
   .apps--Wrapper:not(.menu-open) .apps--SideBar-Scroll {
     padding: 0 !important;
   }
+
+  /* Turn off global text-transform on h1 */
   h1 {
     text-transform: none;
   }
+
+  /* AddressMini customization */
+  .ui--AddressMini {
+    display: grid;
+    grid-template-rows: auto auto;
+    grid-template-columns: min-content min-content;
+    .ui--AddressMini-icon {
+      grid-row: 1/3;
+      grid-column: 2/3;
+      align-self: center;
+    }
+    .ui--AddressMini-balances .ui--FormatBalance {
+      font-size: 1rem !important;
+      margin: 0 !important;
+    }
+    .ui--AddressMini-info {
+      min-width: 10em;
+      max-width: 10em;
+    }
+  }
 `;
diff --git a/pioneer/tsconfig.json b/pioneer/tsconfig.json
index 2226b26297..d884cad8f0 100644
--- a/pioneer/tsconfig.json
+++ b/pioneer/tsconfig.json
@@ -4,7 +4,6 @@
     "build/**/*",
     "**/build/**/*",
     "packages/old-apps/**",
-    "packages/joy-election/**/*",
     "packages/joy-forum/**/*",
     "packages/joy-help/**/*",
     "packages/joy-media/**/*",
@@ -23,8 +22,8 @@
       "@polkadot/types/augment": [ "../types/src/definitions/augment-types.ts" ],
       // "@joystream/types/": [ "../types/src/" ],
       // "@joystream/types/*": [ "../types/src/*" ],
-      // "@polkadot/joy-election/": [ "packages/joy-election/src/" ],
-      // "@polkadot/joy-election/*": [ "packages/joy-election/src/*" ],
+      "@polkadot/joy-election/": [ "packages/joy-election/src/" ],
+      "@polkadot/joy-election/*": [ "packages/joy-election/src/*" ],
       // "@polkadot/joy-forum/": [ "packages/joy-forum/src/" ],
       // "@polkadot/joy-forum/*": [ "packages/joy-forum/src/*" ],
       // "@polkadot/joy-help/": [ "packages/joy-help/src/" ],

From ea98e5dd637fd54e4b096e8e1d8554a50ea287b1 Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Fri, 14 Aug 2020 11:24:10 +0200
Subject: [PATCH 02/17] Linter autofix

---
 .../packages/apps-routing/src/joy-election.ts  |  2 +-
 .../packages/joy-election/src/ApplyForm.tsx    |  1 +
 pioneer/packages/joy-election/src/Council.tsx  |  3 ++-
 .../packages/joy-election/src/Dashboard.tsx    | 17 ++++++++++-------
 pioneer/packages/joy-election/src/Reveals.tsx  |  2 ++
 .../packages/joy-election/src/SealedVote.tsx   | 13 +++++++------
 .../packages/joy-election/src/SealedVotes.tsx  | 18 ++++++++++--------
 .../joy-election/src/SidebarSubtitle.tsx       |  3 ++-
 pioneer/packages/joy-election/src/VoteForm.tsx |  9 +++++++--
 pioneer/packages/joy-election/src/Votes.tsx    |  4 ++--
 pioneer/packages/joy-election/src/index.tsx    |  2 ++
 .../packages/joy-election/src/myVotesStore.ts  | 12 ++++++++----
 pioneer/packages/joy-election/src/utils.tsx    |  9 +++++++--
 .../src/react/components/InputStake.tsx        |  3 ++-
 .../components/MemberByAccountPreview.tsx      |  2 +-
 .../react/components/MemberProfilePreview.tsx  |  5 +++--
 .../src/react/components/MembersDropdown.tsx   | 10 +++++++---
 .../src/react/components/PromiseComponent.tsx  |  2 ++
 .../joy-utils/src/react/hooks/usePromise.tsx   |  9 +++++++--
 .../joy-utils/src/transport/APIQueryCache.ts   | 10 ++++++++--
 .../packages/joy-utils/src/transport/base.ts   |  1 +
 .../joy-utils/src/transport/members.ts         |  4 +++-
 22 files changed, 95 insertions(+), 46 deletions(-)

diff --git a/pioneer/packages/apps-routing/src/joy-election.ts b/pioneer/packages/apps-routing/src/joy-election.ts
index ebf857ad81..cbff554d99 100644
--- a/pioneer/packages/apps-routing/src/joy-election.ts
+++ b/pioneer/packages/apps-routing/src/joy-election.ts
@@ -13,5 +13,5 @@ export default function create (t: <T = string> (key: string, text: string, opti
     icon: 'university',
     name: 'council',
     SubtitleComponent: SidebarSubtitle
-  }
+  };
 }
diff --git a/pioneer/packages/joy-election/src/ApplyForm.tsx b/pioneer/packages/joy-election/src/ApplyForm.tsx
index f0f753f37c..5685d3371b 100644
--- a/pioneer/packages/joy-election/src/ApplyForm.tsx
+++ b/pioneer/packages/joy-election/src/ApplyForm.tsx
@@ -75,6 +75,7 @@ class ApplyForm extends React.PureComponent<Props, State> {
     stake = stake || ZERO;
     const isStakeGteMinStake = stake.add(this.alreadyStaked()).gte(this.minStake());
     const isStakeValid = !stake.isZero() && isStakeGteMinStake;
+
     this.setState({ stake, isStakeValid });
   }
 }
diff --git a/pioneer/packages/joy-election/src/Council.tsx b/pioneer/packages/joy-election/src/Council.tsx
index 72f4ff5ea8..6ad36df3f5 100644
--- a/pioneer/packages/joy-election/src/Council.tsx
+++ b/pioneer/packages/joy-election/src/Council.tsx
@@ -53,9 +53,10 @@ class Council extends React.PureComponent<Props, State> {
 
   render () {
     const { council = [] } = this.props;
+
     // console.log({ council });
     return (
-      <Section title="Active council members">
+      <Section title='Active council members'>
         {!council.length ? <em>Council is not elected yet</em> : this.renderTable(council)}
       </Section>
     );
diff --git a/pioneer/packages/joy-election/src/Dashboard.tsx b/pioneer/packages/joy-election/src/Dashboard.tsx
index b962c1e5aa..f115cc1917 100644
--- a/pioneer/packages/joy-election/src/Dashboard.tsx
+++ b/pioneer/packages/joy-election/src/Dashboard.tsx
@@ -45,13 +45,13 @@ class Dashboard extends React.PureComponent<Props, State> {
     const title = `Council ${activeCouncil.length > 0 ? '' : '(not elected)'}`;
 
     return <Section title={title}>
-      <Label.Group color="grey" size="large">
+      <Label.Group color='grey' size='large'>
         <Label>
           Council members
           <Label.Detail>{activeCouncil.length}</Label.Detail>
         </Label>
         <Label>
-          <Icon name="flag checkered"/>
+          <Icon name='flag checkered'/>
           Term ends at block #
           <Label.Detail>{formatNumber(p.termEndsAt)}</Label.Detail>
         </Label>
@@ -64,13 +64,16 @@ class Dashboard extends React.PureComponent<Props, State> {
 
     let stageName: string | undefined;
     let stageEndsAt: BlockNumber | undefined;
+
     if (stage && stage.isSome) {
       const stageValue = stage.value as ElectionStage;
+
       stageEndsAt = stageValue.value as BlockNumber; // contained value
       stageName = stageValue.type; // name of Enum variant
     }
 
     let leftBlocks: BN | undefined;
+
     if (stageEndsAt && bestNumber) {
       leftBlocks = stageEndsAt.sub(bestNumber);
     }
@@ -81,9 +84,9 @@ class Dashboard extends React.PureComponent<Props, State> {
     const title = <>Election (<span className={stateClass}>{stateText}</span>)</>;
 
     return <Section title={title}>
-      <Label.Group color="grey" size="large">
+      <Label.Group color='grey' size='large'>
         <Label>
-          <Icon name="target"/>
+          <Icon name='target'/>
           Election round #
           <Label.Detail>{formatNumber(round)}</Label.Detail>
         </Label>
@@ -97,7 +100,7 @@ class Dashboard extends React.PureComponent<Props, State> {
             <Label.Detail>{formatNumber(leftBlocks)}</Label.Detail>
           </Label>
           <Label>
-            <Icon name="flag checkered"/>
+            <Icon name='flag checkered'/>
             Stage ends at block #
             <Label.Detail>{formatNumber(stageEndsAt)}</Label.Detail>
           </Label>
@@ -111,7 +114,7 @@ class Dashboard extends React.PureComponent<Props, State> {
     const isAutoStart = (p.autoStart || false).valueOf();
 
     return <Section title='Configuration'>
-      <Label.Group color="grey" size="large">
+      <Label.Group color='grey' size='large'>
         <Label>
           Auto-start elections
           <Label.Detail>{isAutoStart ? 'Yes' : 'No'}</Label.Detail>
@@ -137,7 +140,7 @@ class Dashboard extends React.PureComponent<Props, State> {
           <Label.Detail>{formatBalance(p.minVotingStake)}</Label.Detail>
         </Label>
       </Label.Group>
-      <Label.Group color="grey" size="large">
+      <Label.Group color='grey' size='large'>
         <Label>
           Announcing period
           <Label.Detail>{formatNumber(p.announcingPeriod)} blocks</Label.Detail>
diff --git a/pioneer/packages/joy-election/src/Reveals.tsx b/pioneer/packages/joy-election/src/Reveals.tsx
index b54330d5f7..ae556d042d 100644
--- a/pioneer/packages/joy-election/src/Reveals.tsx
+++ b/pioneer/packages/joy-election/src/Reveals.tsx
@@ -30,6 +30,7 @@ class RevealVoteForm extends React.PureComponent<Props, State> {
   constructor (props: Props) {
     super(props);
     let { applicantId, location } = this.props;
+
     applicantId = applicantId || getUrlParam(location, 'applicantId');
     const hashedVote = getUrlParam(location, 'hashedVote');
 
@@ -45,6 +46,7 @@ class RevealVoteForm extends React.PureComponent<Props, State> {
     const applicantOpts = accountIdsToOptions(this.props.applicants || []);
 
     const myVote = hashedVote ? findVoteByHash(hashedVote) : undefined;
+
     if (myVote) {
       // Try to substitue applicantId and salt from local sotre:
       if (!applicantId) applicantId = myVote.applicantId;
diff --git a/pioneer/packages/joy-election/src/SealedVote.tsx b/pioneer/packages/joy-election/src/SealedVote.tsx
index b935d04e11..769a884e4a 100644
--- a/pioneer/packages/joy-election/src/SealedVote.tsx
+++ b/pioneer/packages/joy-election/src/SealedVote.tsx
@@ -25,22 +25,23 @@ type Props = ApiProps & I18nProps & {
 class Comp extends React.PureComponent<Props> {
   renderCandidateOrAction () {
     const { hash, sealedVote, isStageRevealing, isMyVote } = this.props;
+
     if (!sealedVote) {
       return <em>Unknown hashed vote: {hash.toHex()}</em>;
     }
 
     if (sealedVote.vote.isSome) {
       const candidateId = sealedVote.vote.unwrap();
+
       return <CandidatePreview accountId={candidateId} />;
     } else if (isStageRevealing && isMyVote) {
       const revealUrl = `/council/reveals?hashedVote=${hash.toHex()}`;
+
       return <Link to={revealUrl} className='ui button primary inverted'>Reveal this vote</Link>;
-    }
-    else if (isMyVote) {
-      return <Message warning>Wait until <i><b>Revealing</b></i> stage in order to reveal this vote.</Message>
-    }
-    else {
-      return <Message info>This vote has not been revealed yet.</Message>
+    } else if (isMyVote) {
+      return <Message warning>Wait until <i><b>Revealing</b></i> stage in order to reveal this vote.</Message>;
+    } else {
+      return <Message info>This vote has not been revealed yet.</Message>;
     }
   }
 
diff --git a/pioneer/packages/joy-election/src/SealedVotes.tsx b/pioneer/packages/joy-election/src/SealedVotes.tsx
index 8dd5abf374..f7908e4c48 100644
--- a/pioneer/packages/joy-election/src/SealedVotes.tsx
+++ b/pioneer/packages/joy-election/src/SealedVotes.tsx
@@ -23,10 +23,12 @@ type Props = ApiProps & I18nProps & MyAddressProps & {
 class Comp extends React.PureComponent<Props> {
   private filterVotes = (myVotesOnly: boolean): Hash[] => {
     const { myVotes = [], commitments = [] } = this.props;
+
     const isMyVote = (hash: string): boolean => {
-      return myVotes.find(x => x.hash === hash) !== undefined;
+      return myVotes.find((x) => x.hash === hash) !== undefined;
     };
-    return commitments.filter(x => myVotesOnly === isMyVote(x.toHex()));
+
+    return commitments.filter((x) => myVotesOnly === isMyVote(x.toHex()));
   }
 
   private renderVotes = (votes: Hash[], areVotesMine: boolean) => {
@@ -45,12 +47,12 @@ class Comp extends React.PureComponent<Props> {
 
     return <>
       <Section title={`My previous votes (${myVotes.length})`}>
-      {
-        !myVotes.length
-          ? <em>No votes by the current account found on the current browser.</em>
-          : this.renderVotes(myVotes, true)
-      }
-      { this.props.isStageRevealing && <Button primary as={Link} to="reveals">Reveal other vote</Button> }
+        {
+          !myVotes.length
+            ? <em>No votes by the current account found on the current browser.</em>
+            : this.renderVotes(myVotes, true)
+        }
+        { this.props.isStageRevealing && <Button primary as={Link} to='reveals'>Reveal other vote</Button> }
       </Section>
       <Section title={`Other votes (${otherVotes.length})`}>
         {
diff --git a/pioneer/packages/joy-election/src/SidebarSubtitle.tsx b/pioneer/packages/joy-election/src/SidebarSubtitle.tsx
index bbd59e6c6b..82e63d39bf 100644
--- a/pioneer/packages/joy-election/src/SidebarSubtitle.tsx
+++ b/pioneer/packages/joy-election/src/SidebarSubtitle.tsx
@@ -17,7 +17,7 @@ type StyledSubtitleProps = {
 const StyledSubtitle = styled.div`
   display: block;
   font-size: 0.85rem;
-  color: ${ (props: StyledSubtitleProps) => props.stage ? colorByStage[props.stage] : 'grey' };
+  color: ${(props: StyledSubtitleProps) => props.stage ? colorByStage[props.stage] : 'grey'};
 `;
 
 export default function SidebarSubtitle () {
@@ -27,6 +27,7 @@ export default function SidebarSubtitle () {
   if (electionStage) {
     const stageName = electionStage.unwrapOr(undefined)?.type;
     const text = stageName ? `${stageName} stage` : 'No active election';
+
     return <StyledSubtitle stage={stageName}>{text}</StyledSubtitle>;
   }
 
diff --git a/pioneer/packages/joy-election/src/VoteForm.tsx b/pioneer/packages/joy-election/src/VoteForm.tsx
index b567669d7f..1a7e1232ff 100644
--- a/pioneer/packages/joy-election/src/VoteForm.tsx
+++ b/pioneer/packages/joy-election/src/VoteForm.tsx
@@ -19,7 +19,7 @@ import TxButton from '@polkadot/joy-utils/react/components/TxButton';
 import InputStake from '@polkadot/joy-utils/react/components/InputStake';
 import CandidatePreview from './CandidatePreview';
 import { MyAccountProps } from '@polkadot/joy-utils/react/hocs/accounts';
-import { withOnlyMembers } from '@polkadot/joy-utils/react/hocs/guards'
+import { withOnlyMembers } from '@polkadot/joy-utils/react/hocs/guards';
 import MembersDropdown from '@polkadot/joy-utils/react/components/MembersDropdown';
 import { saveVote, NewVote } from './myVotesStore';
 import { TxFailedCallback } from '@polkadot/react-components/Status/types';
@@ -50,6 +50,7 @@ class Component extends React.PureComponent<Props, State> {
     super(props);
 
     let { applicantId, location } = this.props;
+
     applicantId = applicantId || getUrlParam(location, 'applicantId');
 
     this.state = {
@@ -118,7 +119,7 @@ class Component extends React.PureComponent<Props, State> {
               onChange={ (event, data) => this.onChangeApplicant(data.value as string) }
               accounts={this.props.applicants || []}
               value={applicantId || ''}
-              placeholder="Select an applicant you support"
+              placeholder='Select an applicant you support'
             />
           </div>
           <InputStake
@@ -181,12 +182,15 @@ class Component extends React.PureComponent<Props, State> {
 
   private onTxSuccess = (vote: NewVote, txResult: SubmittableResult): void => {
     let hasVotedEvent = false;
+
     txResult.events.forEach((event, i) => {
       const { section, method } = event.event;
+
       if (section === 'councilElection' && method === 'Voted') {
         hasVotedEvent = true;
       }
     });
+
     if (hasVotedEvent) {
       saveVote(vote);
       this.setState({ isFormSubmitted: true });
@@ -203,6 +207,7 @@ class Component extends React.PureComponent<Props, State> {
 
   private onChangeStake = (stake?: BN) => {
     const isStakeValid = stake && stake.gte(this.minStake());
+
     this.setState({ stake, isStakeValid });
   }
 
diff --git a/pioneer/packages/joy-election/src/Votes.tsx b/pioneer/packages/joy-election/src/Votes.tsx
index d238dcd6c6..1d1baadea3 100644
--- a/pioneer/packages/joy-election/src/Votes.tsx
+++ b/pioneer/packages/joy-election/src/Votes.tsx
@@ -26,7 +26,7 @@ class Component extends React.PureComponent<Props> {
 
     return <>
       <Section title='My vote'>
-      { stage?.unwrapOr(undefined)?.isOfType('Voting')
+        { stage?.unwrapOr(undefined)?.isOfType('Voting')
           ? (
             <VoteForm {...this.props} myAddress={myAddress} />
           )
@@ -35,7 +35,7 @@ class Component extends React.PureComponent<Props> {
               Voting is only possible during <i><b>Voting</b></i> stage.
             </Message>
           )
-      }
+        }
       </Section>
       <SealedVotes
         isStageRevealing={stage?.unwrapOr(undefined)?.isOfType('Revealing') || false}
diff --git a/pioneer/packages/joy-election/src/index.tsx b/pioneer/packages/joy-election/src/index.tsx
index 9a6490b190..918178c188 100644
--- a/pioneer/packages/joy-election/src/index.tsx
+++ b/pioneer/packages/joy-election/src/index.tsx
@@ -38,6 +38,7 @@ class App extends React.PureComponent<Props, State> {
 
   private buildTabs (): TabItem[] {
     const { t, activeCouncil = [], applicants = [], commitments = [] } = this.props;
+
     return [
       {
         isRoot: true,
@@ -62,6 +63,7 @@ class App extends React.PureComponent<Props, State> {
   render () {
     const { basePath } = this.props;
     const tabs = this.buildTabs();
+
     return (
       <ElectionMain className='election--App'>
         <header>
diff --git a/pioneer/packages/joy-election/src/myVotesStore.ts b/pioneer/packages/joy-election/src/myVotesStore.ts
index cfc3bc3d96..62b0006e40 100644
--- a/pioneer/packages/joy-election/src/myVotesStore.ts
+++ b/pioneer/packages/joy-election/src/myVotesStore.ts
@@ -20,22 +20,25 @@ export type SavedVote = NewVote & {
 /** Get all votes that are stored in a local sotrage.  */
 export const getAllVotes = (): SavedVote[] => {
   const votes = store.get(MY_VOTES);
+
   return nonEmptyArr(votes) ? votes as SavedVote[] : [];
 };
 
 export const getVotesByVoter = (voterId: string): SavedVote[] => {
-  return getAllVotes().filter(v => v.voterId === voterId);
+  return getAllVotes().filter((v) => v.voterId === voterId);
 };
 
 export const findVoteByHash = (hash: string): SavedVote | undefined => {
-  return getAllVotes().find(v => v.hash === hash);
+  return getAllVotes().find((v) => v.hash === hash);
 };
 
 export const saveVote = (vote: NewVote): void => {
   const votes = getAllVotes();
-  const similarVote = votes.find(v => v.hash === vote.hash);
+  const similarVote = votes.find((v) => v.hash === vote.hash);
+
   if (similarVote) {
     console.log('There is a vote with the same hash in a storage:', similarVote);
+
     return;
   }
 
@@ -45,7 +48,8 @@ export const saveVote = (vote: NewVote): void => {
 
 export const revealVote = (hash: string): void => {
   const votes = getAllVotes();
-  const savedVote = votes.find(v => v.hash === hash);
+  const savedVote = votes.find((v) => v.hash === hash);
+
   if (savedVote && !savedVote.isRevealed) {
     savedVote.isRevealed = true;
     savedVote.revealedOnTime = Date.now();
diff --git a/pioneer/packages/joy-election/src/utils.tsx b/pioneer/packages/joy-election/src/utils.tsx
index 5a4cafb55a..812fa652ad 100644
--- a/pioneer/packages/joy-election/src/utils.tsx
+++ b/pioneer/packages/joy-election/src/utils.tsx
@@ -22,16 +22,19 @@ export type HashedVote = {
 
 const createAddressOption = (address: string) => {
   const name = findNameByAddress(address);
+
   return createItem(address, name);
 };
 
-export const accountIdsToOptions = (applicants: Array<AccountId>): any => {
+export const accountIdsToOptions = (applicants: Array<AccountId>) => {
   if (applicants && applicants.length) {
-    return applicants.map(a => {
+    return applicants.map((a) => {
       const addr = a.toString();
+
       return createAddressOption(addr);
     });
   }
+
   return [];
 };
 
@@ -45,10 +48,12 @@ export const hashVote = (accountId?: string | null, salt?: string): string | nul
   const accountU8a = decodeAddress(accountId);
   const saltU8a = stringToU8a(salt);
   const voteU8a = new Uint8Array(accountU8a.length + saltU8a.length);
+
   voteU8a.set(accountU8a);
   voteU8a.set(saltU8a, accountU8a.length);
 
   const hash = blake2AsHex(voteU8a, 256);
+
   // console.log('Vote hash:', hash, 'for', { accountId, salt });
   return hash;
 };
diff --git a/pioneer/packages/joy-utils/src/react/components/InputStake.tsx b/pioneer/packages/joy-utils/src/react/components/InputStake.tsx
index 8e012fe42f..5c18e525ee 100644
--- a/pioneer/packages/joy-utils/src/react/components/InputStake.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/InputStake.tsx
@@ -14,6 +14,7 @@ type Props = {
 export default class Component extends React.PureComponent<Props> {
   render () {
     const { min, label, isValid, onChange } = this.props;
+
     return (
       <div className='ui--row' style={{ display: 'flex' }}>
         <InputBalance
@@ -33,7 +34,7 @@ export default class Component extends React.PureComponent<Props> {
               color={ isValid ? 'green' : 'red' }
               icon={isValid ? 'check' : 'warning sign'}
               label='Minimum stake'
-              pointing="left"
+              pointing='left'
             >
               Minimum stake
               <Label.Detail>{formatBalance(min)}</Label.Detail>
diff --git a/pioneer/packages/joy-utils/src/react/components/MemberByAccountPreview.tsx b/pioneer/packages/joy-utils/src/react/components/MemberByAccountPreview.tsx
index 2fc8e28d83..bcae5779f7 100644
--- a/pioneer/packages/joy-utils/src/react/components/MemberByAccountPreview.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/MemberByAccountPreview.tsx
@@ -23,7 +23,7 @@ const MemberByAccountPreview: React.FunctionComponent<Props> = ({ accountId }) =
   );
 
   return (
-    <PromiseComponent error={error} loading={loading} message="Fetching member profile...">
+    <PromiseComponent error={error} loading={loading} message='Fetching member profile...'>
       <MemberByAccount>
         { member && (
           member.profile
diff --git a/pioneer/packages/joy-utils/src/react/components/MemberProfilePreview.tsx b/pioneer/packages/joy-utils/src/react/components/MemberProfilePreview.tsx
index af503bc575..69ea8b7cab 100644
--- a/pioneer/packages/joy-utils/src/react/components/MemberProfilePreview.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/MemberProfilePreview.tsx
@@ -48,9 +48,9 @@ export default function ProfilePreview (
   const Preview = (
     <StyledProfilePreview>
       {avatar_uri.toString() ? (
-        <Image src={avatar_uri.toString()} avatar floated="left" />
+        <Image src={avatar_uri.toString()} avatar floated='left' />
       ) : (
-        <IdentityIcon className="image" value={root_account.toString()} size={40} />
+        <IdentityIcon className='image' value={root_account.toString()} size={40} />
       )}
       <Details>
         <DetailsHandle>{handle.toString()}</DetailsHandle>
@@ -77,6 +77,7 @@ export function ProfilePreviewFromStruct (
   { profile, link, id, children }: React.PropsWithChildren<ProfilePreviewFromStructProps>
 ) {
   const { avatar_uri, root_account, handle } = profile;
+
   return (
     <ProfilePreview {...{ avatar_uri, root_account, handle, link, id }}>
       {children}
diff --git a/pioneer/packages/joy-utils/src/react/components/MembersDropdown.tsx b/pioneer/packages/joy-utils/src/react/components/MembersDropdown.tsx
index accada8040..6777c33944 100644
--- a/pioneer/packages/joy-utils/src/react/components/MembersDropdown.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/MembersDropdown.tsx
@@ -14,7 +14,8 @@ const StyledMembersDropdown = styled(Dropdown)`
 `;
 
 function membersToOptions (members: MemberFromAccount[]) {
-  const validMembers = members.filter(m => m.profile !== undefined) as (MemberFromAccount & { profile: Membership })[];
+  const validMembers = members.filter((m) => m.profile !== undefined) as (MemberFromAccount & { profile: Membership })[];
+
   return validMembers
     .map(({ memberId, profile, account }) => ({
       key: profile.handle,
@@ -37,17 +38,20 @@ const MembersDropdown: React.FunctionComponent<Props> = ({ accounts, ...passedPr
   // State
   const [loading, setLoading] = useState(true);
   const [membersOptions, setMembersOptions] = useState([] as DropdownItemProps[]);
+
   // Generate members options array on load
   useEffect(() => {
     let isSubscribed = true;
+
     Promise
-      .all(accounts.map(acc => transport.members.membershipFromAccount(acc)))
-      .then(members => {
+      .all(accounts.map((acc) => transport.members.membershipFromAccount(acc)))
+      .then((members) => {
         if (isSubscribed) {
           setMembersOptions(membersToOptions(members));
           setLoading(false);
         }
       });
+
     return () => { isSubscribed = false; };
   }, [accounts]);
 
diff --git a/pioneer/packages/joy-utils/src/react/components/PromiseComponent.tsx b/pioneer/packages/joy-utils/src/react/components/PromiseComponent.tsx
index 18395aa101..b91c54ef75 100644
--- a/pioneer/packages/joy-utils/src/react/components/PromiseComponent.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/PromiseComponent.tsx
@@ -7,6 +7,7 @@ type ErrorProps = {
 
 export function Error ({ error }: ErrorProps) {
   console.error(error);
+
   return (
     <Container style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
       <Message negative>
@@ -34,6 +35,7 @@ type PromiseComponentProps = {
   error: any;
   message: string;
 }
+
 const PromiseComponent: React.FunctionComponent<PromiseComponentProps> = ({ loading, error, message, children }) => {
   if (loading && !error) {
     return <Loading text={ message }/>;
diff --git a/pioneer/packages/joy-utils/src/react/hooks/usePromise.tsx b/pioneer/packages/joy-utils/src/react/hooks/usePromise.tsx
index 67f4d679ff..7dcc60475c 100644
--- a/pioneer/packages/joy-utils/src/react/hooks/usePromise.tsx
+++ b/pioneer/packages/joy-utils/src/react/hooks/usePromise.tsx
@@ -17,18 +17,21 @@ export default function usePromise<T> (
   let isSubscribed = true;
   const execute = useCallback(() => {
     setState({ value: state.value, error: null, isPending: true });
+
     return promise()
-      .then(value => {
+      .then((value) => {
         if (isSubscribed) {
           setState({ value, error: null, isPending: false });
+
           if (onUpdate) {
             onUpdate(value);
           }
         }
       })
-      .catch(error => {
+      .catch((error) => {
         if (isSubscribed) {
           setState({ value: defaultValue, error: error, isPending: false });
+
           if (onUpdate) {
             onUpdate(defaultValue); // This should represent an empty value in most cases
           }
@@ -38,11 +41,13 @@ export default function usePromise<T> (
 
   useEffect(() => {
     execute();
+
     return () => {
       isSubscribed = false;
     };
   }, dependsOn);
 
   const { value, error, isPending } = state;
+
   return [value, error, isPending, execute];
 }
diff --git a/pioneer/packages/joy-utils/src/transport/APIQueryCache.ts b/pioneer/packages/joy-utils/src/transport/APIQueryCache.ts
index 8643a7b7e1..07bd9d1fd1 100644
--- a/pioneer/packages/joy-utils/src/transport/APIQueryCache.ts
+++ b/pioneer/packages/joy-utils/src/transport/APIQueryCache.ts
@@ -40,22 +40,28 @@ export class APIQueryCache {
   }
 
   protected buildQuery () {
-    const modules = Object.keys(this.api.query).map(key => ({ name: key, storage: this.api.query[key] }));
+    const modules = Object.keys(this.api.query).map((key) => ({ name: key, storage: this.api.query[key] }));
+
     modules.map((module) => {
       this.query[module.name] = {};
 
-      const funcs = Object.keys(module.storage).map(key => ({ name: key, storage: module.storage[key] }));
+      const funcs = Object.keys(module.storage).map((key) => ({ name: key, storage: module.storage[key] }));
+
       funcs.map((func) => {
         this.query[module.name][func.name] = async (...args: any): Promise<Codec> => {
           const cacheKey = module.name + func.name + JSON.stringify(args);
           const cacheValue = this.cache.get(cacheKey);
+
           if (cacheValue) {
             this.cacheHits++;
+
             return cacheValue;
           }
 
           const toCache = await this.api.query[module.name][func.name](...args);
+
           this.cache.set(cacheKey, toCache);
+
           return toCache;
         };
       });
diff --git a/pioneer/packages/joy-utils/src/transport/base.ts b/pioneer/packages/joy-utils/src/transport/base.ts
index b8a1433d1b..102a9d2083 100644
--- a/pioneer/packages/joy-utils/src/transport/base.ts
+++ b/pioneer/packages/joy-utils/src/transport/base.ts
@@ -61,6 +61,7 @@ export default abstract class BaseTransport {
 
   protected queryMethodByName (name: string) {
     const [module, method] = name.split('.');
+
     return this.api.query[module][method];
   }
 }
diff --git a/pioneer/packages/joy-utils/src/transport/members.ts b/pioneer/packages/joy-utils/src/transport/members.ts
index 5a90bf74df..059b1a2f61 100644
--- a/pioneer/packages/joy-utils/src/transport/members.ts
+++ b/pioneer/packages/joy-utils/src/transport/members.ts
@@ -7,6 +7,7 @@ import { MemberFromAccount } from '../types/members';
 export default class MembersTransport extends BaseTransport {
   async membershipById (id: MemberId | number): Promise<Membership | null> {
     const member = (await this.members.membershipById(id)) as Membership;
+
     // Can't just use member.isEmpty because member.suspended is Bool (which isEmpty method always returns false)
     return member.handle.isEmpty ? null : member;
   }
@@ -14,6 +15,7 @@ export default class MembersTransport extends BaseTransport {
   // Throws if profile not found
   async expectedMembership (id: MemberId | number): Promise<Membership> {
     const member = await this.membershipById(id);
+
     if (!member) {
       throw new Error(`Expected member profile not found! ID: ${id.toString()}`);
     }
@@ -34,7 +36,7 @@ export default class MembersTransport extends BaseTransport {
     return {
       account: accountId.toString(),
       memberId: memberId && memberId.toNumber(),
-      profile,
+      profile
     };
   }
 }

From 2e655f7f8f3dca6500145641487e12c40e8a4c7b Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Fri, 14 Aug 2020 14:14:39 +0200
Subject: [PATCH 03/17] Linting: Manual fixes (required refactoring usePromise)

---
 .../packages/joy-election/src/Applicants.tsx  |  3 +-
 pioneer/packages/joy-election/src/Council.tsx |  6 +--
 .../packages/joy-election/src/Dashboard.tsx   |  5 ++-
 pioneer/packages/joy-election/src/Reveals.tsx | 10 ++---
 .../packages/joy-election/src/VoteForm.tsx    |  8 ++--
 pioneer/packages/joy-election/src/Votes.tsx   |  5 ++-
 pioneer/packages/joy-election/src/index.tsx   |  7 +--
 .../packages/joy-election/src/myVotesStore.ts |  2 +-
 .../packages/joy-utils/src/functions/misc.ts  | 14 ++++++
 .../src/react/components/MembersDropdown.tsx  | 15 ++++---
 .../src/react/components/PromiseComponent.tsx |  6 +--
 .../joy-utils/src/react/context/transport.tsx |  2 +-
 .../joy-utils/src/react/hooks/usePromise.tsx  | 44 +++++++++++++------
 .../joy-utils/src/transport/APIQueryCache.ts  |  8 ++--
 .../packages/joy-utils/src/transport/base.ts  |  1 -
 15 files changed, 87 insertions(+), 49 deletions(-)

diff --git a/pioneer/packages/joy-election/src/Applicants.tsx b/pioneer/packages/joy-election/src/Applicants.tsx
index e999dc675c..68a8c916fb 100644
--- a/pioneer/packages/joy-election/src/Applicants.tsx
+++ b/pioneer/packages/joy-election/src/Applicants.tsx
@@ -16,8 +16,9 @@ import Section from '@polkadot/joy-utils/react/components/Section';
 import { queryToProp } from '@polkadot/joy-utils/functions/misc';
 import { withMyAccount, MyAccountProps } from '@polkadot/joy-utils/react/hocs/accounts';
 import { ElectionStage } from '@joystream/types/src/council';
+import { RouteProps } from 'react-router-dom';
 
-type Props = ApiProps & I18nProps & MyAccountProps & {
+type Props = RouteProps & ApiProps & I18nProps & MyAccountProps & {
   candidacyLimit?: BN;
   applicants?: Array<AccountId>;
   stage?: Option<ElectionStage>;
diff --git a/pioneer/packages/joy-election/src/Council.tsx b/pioneer/packages/joy-election/src/Council.tsx
index 6ad36df3f5..f4e9e9597d 100644
--- a/pioneer/packages/joy-election/src/Council.tsx
+++ b/pioneer/packages/joy-election/src/Council.tsx
@@ -11,13 +11,13 @@ import { calcBackersStake } from '@polkadot/joy-utils/functions/misc';
 import { Seat } from '@joystream/types/council';
 import translate from './translate';
 import Section from '@polkadot/joy-utils/react/components/Section';
+import { RouteProps } from 'react-router-dom';
 
-type Props = ApiProps &
-I18nProps & {
+type Props = RouteProps & ApiProps & I18nProps & {
   council?: Seat[];
 };
 
-type State = {};
+type State = Record<any, never>;
 
 class Council extends React.PureComponent<Props, State> {
   state: State = {};
diff --git a/pioneer/packages/joy-election/src/Dashboard.tsx b/pioneer/packages/joy-election/src/Dashboard.tsx
index f115cc1917..da6fffbd9c 100644
--- a/pioneer/packages/joy-election/src/Dashboard.tsx
+++ b/pioneer/packages/joy-election/src/Dashboard.tsx
@@ -13,8 +13,9 @@ import Section from '@polkadot/joy-utils/react/components/Section';
 import { queryToProp } from '@polkadot/joy-utils/functions/misc';
 import { ElectionStage, Seat } from '@joystream/types/council';
 import translate from './translate';
+import { RouteProps } from 'react-router-dom';
 
-type Props = ApiProps & I18nProps & {
+type Props = RouteProps & ApiProps & I18nProps & {
   bestNumber?: BN;
 
   activeCouncil?: Seat[];
@@ -34,7 +35,7 @@ type Props = ApiProps & I18nProps & {
   stage?: Option<ElectionStage>;
 };
 
-type State = {};
+type State = Record<any, never>;
 
 class Dashboard extends React.PureComponent<Props, State> {
   state: State = {};
diff --git a/pioneer/packages/joy-election/src/Reveals.tsx b/pioneer/packages/joy-election/src/Reveals.tsx
index ae556d042d..0c980ac7ff 100644
--- a/pioneer/packages/joy-election/src/Reveals.tsx
+++ b/pioneer/packages/joy-election/src/Reveals.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { AppProps, I18nProps } from '@polkadot/react-components/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { ApiProps } from '@polkadot/react-api/types';
 import { withCalls, withMulti } from '@polkadot/react-api/hoc';
 import { AccountId } from '@polkadot/types/interfaces';
@@ -12,12 +12,12 @@ import { accountIdsToOptions, hashVote } from './utils';
 import TxButton from '@polkadot/joy-utils/react/components/TxButton';
 import { findVoteByHash } from './myVotesStore';
 import { withOnlyMembers } from '@polkadot/joy-utils/react/hocs/guards';
+import { RouteProps } from 'react-router-dom';
 
 // AppsProps is needed to get a location from the route.
-type Props = AppProps & ApiProps & I18nProps & {
+type Props = RouteProps & ApiProps & I18nProps & {
   applicantId?: string | null;
   applicants?: AccountId[];
-  location: any;
 };
 
 type State = {
@@ -31,8 +31,8 @@ class RevealVoteForm extends React.PureComponent<Props, State> {
     super(props);
     let { applicantId, location } = this.props;
 
-    applicantId = applicantId || getUrlParam(location, 'applicantId');
-    const hashedVote = getUrlParam(location, 'hashedVote');
+    applicantId = applicantId || (location && getUrlParam(location, 'applicantId'));
+    const hashedVote = location && getUrlParam(location, 'hashedVote');
 
     this.state = {
       applicantId,
diff --git a/pioneer/packages/joy-election/src/VoteForm.tsx b/pioneer/packages/joy-election/src/VoteForm.tsx
index 1a7e1232ff..fdb74b95d8 100644
--- a/pioneer/packages/joy-election/src/VoteForm.tsx
+++ b/pioneer/packages/joy-election/src/VoteForm.tsx
@@ -4,7 +4,7 @@ import uuid from 'uuid/v4';
 import React from 'react';
 import { Message, Table } from 'semantic-ui-react';
 
-import { AppProps, I18nProps } from '@polkadot/react-components/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { ApiProps } from '@polkadot/react-api/types';
 import { withCalls, withMulti } from '@polkadot/react-api/hoc';
 import { AccountId, Balance } from '@polkadot/types/interfaces';
@@ -23,6 +23,7 @@ import { withOnlyMembers } from '@polkadot/joy-utils/react/hocs/guards';
 import MembersDropdown from '@polkadot/joy-utils/react/components/MembersDropdown';
 import { saveVote, NewVote } from './myVotesStore';
 import { TxFailedCallback } from '@polkadot/react-components/Status/types';
+import { RouteProps } from 'react-router-dom';
 
 // TODO use a crypto-prooven generator instead of UUID 4.
 function randomSalt () {
@@ -30,11 +31,10 @@ function randomSalt () {
 }
 
 // AppsProps is needed to get a location from the route.
-type Props = AppProps & ApiProps & I18nProps & MyAccountProps & {
+type Props = RouteProps & ApiProps & I18nProps & MyAccountProps & {
   applicantId?: string | null;
   minVotingStake?: Balance;
   applicants?: AccountId[];
-  location?: any;
 };
 
 type State = {
@@ -51,7 +51,7 @@ class Component extends React.PureComponent<Props, State> {
 
     let { applicantId, location } = this.props;
 
-    applicantId = applicantId || getUrlParam(location, 'applicantId');
+    applicantId = applicantId || (location && getUrlParam(location, 'applicantId'));
 
     this.state = {
       applicantId,
diff --git a/pioneer/packages/joy-election/src/Votes.tsx b/pioneer/packages/joy-election/src/Votes.tsx
index 1d1baadea3..7890d30781 100644
--- a/pioneer/packages/joy-election/src/Votes.tsx
+++ b/pioneer/packages/joy-election/src/Votes.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { AppProps, I18nProps } from '@polkadot/react-components/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { ApiProps } from '@polkadot/react-api/types';
 import { withCalls } from '@polkadot/react-api/hoc';
 import { Message } from 'semantic-ui-react';
@@ -14,8 +14,9 @@ import { getVotesByVoter } from './myVotesStore';
 import VoteForm from './VoteForm';
 import { queryToProp } from '@polkadot/joy-utils/functions/misc';
 import { ElectionStage } from '@joystream/types/src/council';
+import { RouteProps } from 'react-router-dom';
 
-type Props = AppProps & ApiProps & I18nProps & MyAccountProps & {
+type Props = RouteProps & ApiProps & I18nProps & MyAccountProps & {
   stage?: Option<ElectionStage>;
 };
 
diff --git a/pioneer/packages/joy-election/src/index.tsx b/pioneer/packages/joy-election/src/index.tsx
index 918178c188..7e6be023af 100644
--- a/pioneer/packages/joy-election/src/index.tsx
+++ b/pioneer/packages/joy-election/src/index.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Route, Switch } from 'react-router';
 
 import { I18nProps } from '@polkadot/react-components/types';
-import { RouteProps } from '@polkadot/apps-routing/types';
+import { RouteProps as AppMainRouteProps } from '@polkadot/apps-routing/types';
 import { withCalls } from '@polkadot/react-api/hoc';
 import { AccountId, Hash } from '@polkadot/types/interfaces';
 import Tabs from '@polkadot/react-components/Tabs';
@@ -21,17 +21,18 @@ import Votes from './Votes';
 import Reveals from './Reveals';
 import { queryToProp } from '@polkadot/joy-utils/functions/misc';
 import { Seat } from '@joystream/types/council';
+import { ApiProps } from '@polkadot/react-api/types';
 
 const ElectionMain = styled.main`${style}`;
 
 // define out internal types
-type Props = RouteProps & I18nProps & {
+type Props = AppMainRouteProps & ApiProps & I18nProps & {
   activeCouncil?: Seat[];
   applicants?: AccountId[];
   commitments?: Hash[];
 };
 
-type State = {};
+type State = Record<any, never>;
 
 class App extends React.PureComponent<Props, State> {
   state: State = {};
diff --git a/pioneer/packages/joy-election/src/myVotesStore.ts b/pioneer/packages/joy-election/src/myVotesStore.ts
index 62b0006e40..16921a8b72 100644
--- a/pioneer/packages/joy-election/src/myVotesStore.ts
+++ b/pioneer/packages/joy-election/src/myVotesStore.ts
@@ -19,7 +19,7 @@ export type SavedVote = NewVote & {
 
 /** Get all votes that are stored in a local sotrage.  */
 export const getAllVotes = (): SavedVote[] => {
-  const votes = store.get(MY_VOTES);
+  const votes = store.get(MY_VOTES) as unknown;
 
   return nonEmptyArr(votes) ? votes as SavedVote[] : [];
 };
diff --git a/pioneer/packages/joy-utils/src/functions/misc.ts b/pioneer/packages/joy-utils/src/functions/misc.ts
index 5f9deaf90e..5f96730c33 100644
--- a/pioneer/packages/joy-utils/src/functions/misc.ts
+++ b/pioneer/packages/joy-utils/src/functions/misc.ts
@@ -6,6 +6,7 @@ import { Options as QueryOptions } from '@polkadot/react-api/hoc/types';
 import queryString from 'query-string';
 import { SubmittableResult } from '@polkadot/api';
 import { Codec } from '@polkadot/types/types';
+import { Location } from 'history';
 
 export const ZERO = new BN(0);
 
@@ -165,3 +166,16 @@ export function includeKeys<T extends { [k: string]: any }> (obj: T, ...allowedK
 export function bytesToString (bytes: Bytes) {
   return Buffer.from(bytes.toString().substr(2), 'hex').toString();
 }
+
+export function normalizeError (e: any): string {
+  let message: string;
+
+  if (e instanceof Error) {
+    message = e.message;
+  } else {
+    message = JSON.stringify(e);
+  }
+
+  // Prevent returning falsely value
+  return message || 'Unexpected error';
+}
diff --git a/pioneer/packages/joy-utils/src/react/components/MembersDropdown.tsx b/pioneer/packages/joy-utils/src/react/components/MembersDropdown.tsx
index 6777c33944..d53a4ba490 100644
--- a/pioneer/packages/joy-utils/src/react/components/MembersDropdown.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/MembersDropdown.tsx
@@ -1,6 +1,5 @@
 import React, { useEffect, useState } from 'react';
 import { Dropdown, DropdownItemProps, DropdownProps } from 'semantic-ui-react';
-import { Membership } from '@joystream/types/members';
 import { MemberFromAccount } from '../../types/members';
 import { useTransport } from '../hooks';
 import { AccountId } from '@polkadot/types/interfaces';
@@ -14,14 +13,15 @@ const StyledMembersDropdown = styled(Dropdown)`
 `;
 
 function membersToOptions (members: MemberFromAccount[]) {
-  const validMembers = members.filter((m) => m.profile !== undefined) as (MemberFromAccount & { profile: Membership })[];
+  const validMembers = members.filter((m) => m.profile !== undefined);
 
+  // Here we can assert "profile!" and "memberId!", because we filtered out those that don't have it.
   return validMembers
     .map(({ memberId, profile, account }) => ({
-      key: profile.handle,
-      text: `${profile.handle} (id:${memberId})`,
+      key: profile!.handle.toString(),
+      text: `${profile!.handle.toString()} (id:${memberId!})`,
       value: account,
-      image: profile.avatar_uri.toString() ? { avatar: true, src: profile.avatar_uri } : null
+      image: profile!.avatar_uri.toString() ? { avatar: true, src: profile!.avatar_uri } : null
     }));
 }
 
@@ -50,9 +50,12 @@ const MembersDropdown: React.FunctionComponent<Props> = ({ accounts, ...passedPr
           setMembersOptions(membersToOptions(members));
           setLoading(false);
         }
-      });
+      })
+      .catch((e) => { throw e; });
 
     return () => { isSubscribed = false; };
+    // We don't need transport.members as dependency here, because we assume it's always the same, so:
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [accounts]);
 
   return (
diff --git a/pioneer/packages/joy-utils/src/react/components/PromiseComponent.tsx b/pioneer/packages/joy-utils/src/react/components/PromiseComponent.tsx
index b91c54ef75..bc46d329e8 100644
--- a/pioneer/packages/joy-utils/src/react/components/PromiseComponent.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/PromiseComponent.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Container, Message, Loader } from 'semantic-ui-react';
 
 type ErrorProps = {
-  error: any;
+  error: string | null;
 };
 
 export function Error ({ error }: ErrorProps) {
@@ -12,7 +12,7 @@ export function Error ({ error }: ErrorProps) {
     <Container style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
       <Message negative>
         <Message.Header>Oops! We got an error!</Message.Header>
-        <p>{error.message}</p>
+        <p>{error}</p>
       </Message>
     </Container>
   );
@@ -32,7 +32,7 @@ export function Loading ({ text }: LoadingProps) {
 
 type PromiseComponentProps = {
   loading: boolean;
-  error: any;
+  error: string | null;
   message: string;
 }
 
diff --git a/pioneer/packages/joy-utils/src/react/context/transport.tsx b/pioneer/packages/joy-utils/src/react/context/transport.tsx
index 29acbdae87..91a599572a 100644
--- a/pioneer/packages/joy-utils/src/react/context/transport.tsx
+++ b/pioneer/packages/joy-utils/src/react/context/transport.tsx
@@ -6,7 +6,7 @@ import Transport from '../../transport/index';
 
 export const TransportContext = createContext<Transport>((null as unknown) as Transport);
 
-export function TransportProvider ({ children }: { children: React.PropsWithChildren<{}> }) {
+export function TransportProvider ({ children }: { children: React.PropsWithChildren<unknown> }) {
   const api: ApiProps = useContext(ApiContext);
 
   if (!api) {
diff --git a/pioneer/packages/joy-utils/src/react/hooks/usePromise.tsx b/pioneer/packages/joy-utils/src/react/hooks/usePromise.tsx
index 7dcc60475c..cb4f8f8190 100644
--- a/pioneer/packages/joy-utils/src/react/hooks/usePromise.tsx
+++ b/pioneer/packages/joy-utils/src/react/hooks/usePromise.tsx
@@ -1,6 +1,8 @@
-import { useState, useEffect, useCallback } from 'react';
+import { useState, useEffect, useRef } from 'react';
+import { normalizeError } from '../../functions/misc';
+import { randomBytes } from 'crypto';
 
-export type UsePromiseReturnValues<T> = [T, any, boolean, () => Promise<void|null>];
+export type UsePromiseReturnValues<T> = [T, string | null, boolean];
 
 export default function usePromise<T> (
   promise: () => Promise<T>,
@@ -10,44 +12,58 @@ export default function usePromise<T> (
 ): UsePromiseReturnValues<T> {
   const [state, setState] = useState<{
     value: T;
-    error: any;
+    error: string | null;
     isPending: boolean;
   }>({ value: defaultValue, error: null, isPending: true });
 
-  let isSubscribed = true;
-  const execute = useCallback(() => {
-    setState({ value: state.value, error: null, isPending: true });
+  const subscribedPromiseToken = useRef<string | null>(null);
 
-    return promise()
+  const executeAndSubscribePromise = () => {
+    setState((state) => ({ ...state, error: null, isPending: true }));
+
+    const thisPromiseToken = randomBytes(32).toString('hex');
+
+    subscribedPromiseToken.current = thisPromiseToken;
+
+    promise()
       .then((value) => {
-        if (isSubscribed) {
+        if (subscribedPromiseToken.current === thisPromiseToken) {
           setState({ value, error: null, isPending: false });
 
           if (onUpdate) {
             onUpdate(value);
           }
+        } else {
+          console.warn('usePromise: Token didn\'t match on .then()');
+          console.warn(`Subscribed promise: ${subscribedPromiseToken.current || 'NONE'}. Resolved promise: ${thisPromiseToken}.`);
         }
       })
       .catch((error) => {
-        if (isSubscribed) {
-          setState({ value: defaultValue, error: error, isPending: false });
+        if (subscribedPromiseToken.current === thisPromiseToken) {
+          setState({ value: defaultValue, error: normalizeError(error), isPending: false });
 
           if (onUpdate) {
             onUpdate(defaultValue); // This should represent an empty value in most cases
           }
+        } else {
+          console.warn('usePromise: Token didn\'t match on .catch()');
+          console.warn(`Subscribed promise: ${subscribedPromiseToken.current || 'NONE'}. Rejected promise: ${thisPromiseToken}.`);
         }
       });
-  }, [promise]);
+  };
 
   useEffect(() => {
-    execute();
+    executeAndSubscribePromise();
 
     return () => {
-      isSubscribed = false;
+      subscribedPromiseToken.current = null;
     };
+    // Silence "React Hook useEffect was passed a dependency list that is not an array literal",
+    // since we want to preserve the ability to pass custom "depnendencies".
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, dependsOn);
 
   const { value, error, isPending } = state;
 
-  return [value, error, isPending, execute];
+  return [value, error, isPending];
 }
diff --git a/pioneer/packages/joy-utils/src/transport/APIQueryCache.ts b/pioneer/packages/joy-utils/src/transport/APIQueryCache.ts
index 07bd9d1fd1..d04b9579f2 100644
--- a/pioneer/packages/joy-utils/src/transport/APIQueryCache.ts
+++ b/pioneer/packages/joy-utils/src/transport/APIQueryCache.ts
@@ -24,15 +24,17 @@ export class APIQueryCache {
     this.api = api;
     this.buildQuery();
     this.cache = new Map<string, Codec>();
-    this.breakCacheOnNewBlocks();
+    this.breakCacheOnNewBlocks()
+      .then((unsub) => { this.unsubscribeFn = unsub; })
+      .catch((e) => { throw e; });
   }
 
   unsubscribe () {
     this.unsubscribeFn();
   }
 
-  protected async breakCacheOnNewBlocks () {
-    this.unsubscribeFn = await this.api.rpc.chain.subscribeNewHeads((header) => {
+  protected breakCacheOnNewBlocks () {
+    return this.api.rpc.chain.subscribeNewHeads((header) => {
       this.cache = new Map<string, Codec>();
       // console.log("cache hits in this block", this.cacheHits)
       this.cacheHits = 0;
diff --git a/pioneer/packages/joy-utils/src/transport/base.ts b/pioneer/packages/joy-utils/src/transport/base.ts
index 102a9d2083..0e37496ee2 100644
--- a/pioneer/packages/joy-utils/src/transport/base.ts
+++ b/pioneer/packages/joy-utils/src/transport/base.ts
@@ -1,5 +1,4 @@
 import { ApiPromise } from '@polkadot/api';
-import { Codec } from '@polkadot/types/types';
 import { APIQueryCache } from './APIQueryCache';
 
 export default abstract class BaseTransport {

From 9fadcaf0be61f876522d2fb244635370f3f16caf Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Fri, 14 Aug 2020 16:17:12 +0200
Subject: [PATCH 04/17] Minor UI improvements

---
 .../packages/joy-election/src/Applicant.tsx   | 11 +++---
 .../packages/joy-election/src/Applicants.tsx  | 36 +++++++++++--------
 .../packages/joy-election/src/SealedVotes.tsx |  4 +--
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/pioneer/packages/joy-election/src/Applicant.tsx b/pioneer/packages/joy-election/src/Applicant.tsx
index c8435a3f7f..0626c53e1e 100644
--- a/pioneer/packages/joy-election/src/Applicant.tsx
+++ b/pioneer/packages/joy-election/src/Applicant.tsx
@@ -17,11 +17,12 @@ type Props = ApiProps & I18nProps & {
   index: number;
   accountId: AccountId;
   stake?: ElectionStake;
+  isVotingStage: boolean;
 };
 
 class Applicant extends React.PureComponent<Props> {
   render () {
-    const { index, accountId, stake } = this.props;
+    const { index, accountId, stake, isVotingStage } = this.props;
     const voteUrl = `/council/votes?applicantId=${accountId.toString()}`;
 
     return (
@@ -33,9 +34,11 @@ class Applicant extends React.PureComponent<Props> {
         <Table.Cell style={{ textAlign: 'right' }}>
           {formatBalance(calcTotalStake(stake))}
         </Table.Cell>
-        <Table.Cell>
-          <Link to={voteUrl} className='ui button primary inverted'>Vote</Link>
-        </Table.Cell>
+        { isVotingStage && (
+          <Table.Cell>
+            <Link to={voteUrl} className='ui button primary inverted'>Vote</Link>
+          </Table.Cell>
+        ) }
       </Table.Row>
     );
   }
diff --git a/pioneer/packages/joy-election/src/Applicants.tsx b/pioneer/packages/joy-election/src/Applicants.tsx
index 68a8c916fb..3ee84db4d7 100644
--- a/pioneer/packages/joy-election/src/Applicants.tsx
+++ b/pioneer/packages/joy-election/src/Applicants.tsx
@@ -25,21 +25,27 @@ type Props = RouteProps & ApiProps & I18nProps & MyAccountProps & {
 };
 
 class Applicants extends React.PureComponent<Props> {
-  private renderTable = (applicants: Array<AccountId>) => (
-    <Table celled selectable compact>
-      <Table.Header>
-        <Table.Row>
-          <Table.HeaderCell>#</Table.HeaderCell>
-          <Table.HeaderCell>Applicant</Table.HeaderCell>
-          <Table.HeaderCell>Total stake</Table.HeaderCell>
-          <Table.HeaderCell style={{ width: '1%' }}>Actions</Table.HeaderCell>
-        </Table.Row>
-      </Table.Header>
-      <Table.Body>{applicants.map((accountId, index) => (
-        <Applicant key={index} index={index} accountId={accountId} />
-      ))}</Table.Body>
-    </Table>
-  )
+  private renderTable = (applicants: Array<AccountId>) => {
+    const isVotingStage = this.props.stage?.unwrapOr(undefined)?.isOfType('Voting') || false;
+
+    return (
+      <Table celled selectable compact>
+        <Table.Header>
+          <Table.Row>
+            <Table.HeaderCell>#</Table.HeaderCell>
+            <Table.HeaderCell>Applicant</Table.HeaderCell>
+            <Table.HeaderCell>Total stake</Table.HeaderCell>
+            { isVotingStage && (
+              <Table.HeaderCell style={{ width: '1%' }}>Actions</Table.HeaderCell>
+            ) }
+          </Table.Row>
+        </Table.Header>
+        <Table.Body>{applicants.map((accountId, index) => (
+          <Applicant key={index} index={index} accountId={accountId} isVotingStage={isVotingStage}/>
+        ))}</Table.Body>
+      </Table>
+    );
+  }
 
   render () {
     const { myAddress, applicants = [], candidacyLimit = new BN(0), stage } = this.props;
diff --git a/pioneer/packages/joy-election/src/SealedVotes.tsx b/pioneer/packages/joy-election/src/SealedVotes.tsx
index f7908e4c48..5effd2b117 100644
--- a/pioneer/packages/joy-election/src/SealedVotes.tsx
+++ b/pioneer/packages/joy-election/src/SealedVotes.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { Button } from 'semantic-ui-react';
+import { Button, Message } from 'semantic-ui-react';
 
 import { I18nProps } from '@polkadot/react-components/types';
 import { ApiProps } from '@polkadot/react-api/types';
@@ -49,7 +49,7 @@ class Comp extends React.PureComponent<Props> {
       <Section title={`My previous votes (${myVotes.length})`}>
         {
           !myVotes.length
-            ? <em>No votes by the current account found on the current browser.</em>
+            ? <Message info>No votes by the current account found on the current browser.</Message>
             : this.renderVotes(myVotes, true)
         }
         { this.props.isStageRevealing && <Button primary as={Link} to='reveals'>Reveal other vote</Button> }

From f7d87da7fa803169254d005616c947cf0a4cc228 Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Tue, 18 Aug 2020 13:14:19 +0200
Subject: [PATCH 05/17] joy-proposals upgrade

---
 pioneer/.eslintignore                         |   1 -
 pioneer/packages/apps-routing/src/index.ts    |   3 +
 .../apps-routing/src/joy-proposals.ts         |  16 ++
 .../packages/joy-election/src/ApplyForm.tsx   |   1 -
 pioneer/packages/joy-election/src/Reveals.tsx |   1 -
 .../packages/joy-election/src/VoteForm.tsx    |   1 -
 pioneer/packages/joy-members/src/EditForm.tsx |   1 -
 pioneer/packages/joy-proposals/.skip-build    |   0
 .../joy-proposals/src/Proposal/Body.tsx       | 253 ++++++++++--------
 .../src/Proposal/ChooseProposalType.tsx       |   2 +-
 .../joy-proposals/src/Proposal/Details.tsx    |   2 +-
 .../src/Proposal/ProposalDetails.tsx          |   8 +-
 .../src/Proposal/ProposalFromId.tsx           |   7 +-
 .../src/Proposal/ProposalPreview.tsx          |   3 -
 .../src/Proposal/ProposalPreviewList.tsx      |   2 +-
 .../joy-proposals/src/Proposal/Votes.tsx      |   2 +-
 .../src/Proposal/VotingSection.tsx            |  39 ++-
 .../Proposal/discussion/DiscussionPost.tsx    |   2 +-
 .../discussion/DiscussionPostForm.tsx         |   5 +-
 .../discussion/ProposalDiscussion.tsx         |   2 +-
 .../src/forms/AddWorkingGroupOpeningForm.tsx  |   3 +-
 .../BeginReviewLeaderApplicationsForm.tsx     |   3 +-
 .../DecreaseWorkingGroupLeadStakeForm.tsx     |   1 -
 .../FillWorkingGroupLeaderOpeningForm.tsx     |  40 ++-
 .../src/forms/GenericProposalForm.tsx         |  41 ++-
 .../forms/GenericWorkingGroupProposalForm.tsx |   5 +-
 .../src/forms/MintCapacityForm.tsx            |   1 -
 .../src/forms/RuntimeUpgradeForm.tsx          |   1 -
 .../forms/SetContentWorkingGroupLeadForm.tsx  |   3 +-
 .../SetContentWorkingGroupMintCapForm.tsx     |   2 +-
 .../src/forms/SetCouncilParamsForm.tsx        |  31 ++-
 .../src/forms/SetMaxValidatorCountForm.tsx    |   1 -
 .../forms/SetWorkingGroupLeadRewardForm.tsx   |   1 -
 .../forms/SetWorkingGroupMintCapacityForm.tsx |   1 -
 .../joy-proposals/src/forms/SignalForm.tsx    |   1 -
 .../forms/SlashWorkingGroupLeadStakeForm.tsx  |   1 -
 .../src/forms/SpendingProposalForm.tsx        |   1 -
 .../forms/TerminateWorkingGroupLeaderForm.tsx |  25 +-
 .../joy-proposals/src/forms/forms.css         |  23 --
 pioneer/packages/joy-proposals/src/index.css  |   0
 pioneer/packages/joy-proposals/src/index.tsx  | 111 ++++----
 .../src/stories/data/ProposalDetails.mock.ts  |   6 +-
 .../src/{Proposal/Proposal.css => style.ts}   |   8 +-
 .../joy-proposals/src/validationSchema.ts     |  35 ++-
 .../src/consts/members.ts                     |   0
 .../src/consts/proposals.ts                   |   0
 .../src/consts/workingGroups.ts               |   0
 .../src/react/components/TxButton.tsx         | 141 +++++-----
 .../working-groups/ApplicationDetails.tsx     |   2 +-
 .../components/working-groups/LeadInfo.tsx    |   2 +-
 .../joy-utils/src/react/hooks/index.ts        |   1 +
 .../proposals/useProposalSubscription.tsx     |   0
 .../joy-utils/src/react/hooks/usePromise.tsx  |   4 +-
 .../packages/joy-utils/src/transport/base.ts  |  17 ++
 .../src/transport/chain.ts                    |   0
 .../src/transport/contentWorkingGroup.ts      |  13 +-
 .../src/transport/council.ts                  |  38 ++-
 .../packages/joy-utils/src/transport/index.ts |  36 +--
 .../joy-utils/src/transport/members.ts        |   7 +-
 .../src/transport/proposals.ts                |  69 ++---
 .../src/transport/validators.ts               |   0
 .../src/transport/workingGroups.ts            | 104 +++----
 .../src/types/common.ts                       |   0
 .../src/types/proposals.ts                    |  15 +-
 .../src/types/storageProviders.ts             |   0
 .../src/types/workingGroups.ts                |   0
 .../apps-routing/src/joy-proposals.ts         |  17 --
 pioneer/tsconfig.json                         |   5 +-
 types/src/index.ts                            |  10 +
 69 files changed, 598 insertions(+), 579 deletions(-)
 create mode 100644 pioneer/packages/apps-routing/src/joy-proposals.ts
 delete mode 100644 pioneer/packages/joy-proposals/.skip-build
 delete mode 100644 pioneer/packages/joy-proposals/src/forms/forms.css
 delete mode 100644 pioneer/packages/joy-proposals/src/index.css
 rename pioneer/packages/joy-proposals/src/{Proposal/Proposal.css => style.ts} (80%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/consts/members.ts (100%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/consts/proposals.ts (100%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/consts/workingGroups.ts (100%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/react/components/working-groups/ApplicationDetails.tsx (97%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/react/components/working-groups/LeadInfo.tsx (95%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/react/hooks/proposals/useProposalSubscription.tsx (100%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/transport/chain.ts (100%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/transport/contentWorkingGroup.ts (72%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/transport/council.ts (75%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/transport/proposals.ts (77%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/transport/validators.ts (100%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/transport/workingGroups.ts (61%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/types/common.ts (100%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/types/proposals.ts (83%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/types/storageProviders.ts (100%)
 rename pioneer/packages/{joy-utils-old => joy-utils}/src/types/workingGroups.ts (100%)
 delete mode 100644 pioneer/packages/old-apps/apps-routing/src/joy-proposals.ts

diff --git a/pioneer/.eslintignore b/pioneer/.eslintignore
index 57bb4f9e3e..6abdb1d141 100644
--- a/pioneer/.eslintignore
+++ b/pioneer/.eslintignore
@@ -5,7 +5,6 @@ packages/old-apps/*
 packages/joy-forum/*
 packages/joy-help/*
 packages/joy-media/*
-packages/joy-proposals/*
 packages/joy-roles/*
 packages/joy-settings/*
 packages/joy-utils-old/*
diff --git a/pioneer/packages/apps-routing/src/index.ts b/pioneer/packages/apps-routing/src/index.ts
index 36f9671d31..597d45b1a3 100644
--- a/pioneer/packages/apps-routing/src/index.ts
+++ b/pioneer/packages/apps-routing/src/index.ts
@@ -21,12 +21,14 @@ import transfer from './transfer';
 import members from './joy-members';
 import { terms, privacyPolicy } from './joy-pages';
 import election from './joy-election';
+import proposals from './joy-proposals';
 
 export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Routes {
   return appSettings.uiMode === 'light'
     ? [
       members(t),
       election(t),
+      proposals(t),
       null,
       transfer(t),
       accounts(t),
@@ -35,6 +37,7 @@ export default function create (t: <T = string> (key: string, text: string, opti
     : [
       members(t),
       election(t),
+      proposals(t),
       null,
       transfer(t),
       accounts(t),
diff --git a/pioneer/packages/apps-routing/src/joy-proposals.ts b/pioneer/packages/apps-routing/src/joy-proposals.ts
new file mode 100644
index 0000000000..0399968997
--- /dev/null
+++ b/pioneer/packages/apps-routing/src/joy-proposals.ts
@@ -0,0 +1,16 @@
+import { Route } from './types';
+
+import Proposals from '@polkadot/joy-proposals/index';
+
+export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+  return {
+    Component: Proposals,
+    display: {
+      needsApi: ['query.proposalsEngine.proposalCount']
+    },
+    text: t<string>('nav.proposals', 'Proposals', { ns: 'apps-routing' }),
+    icon: 'tasks',
+    name: 'proposals',
+    // TODO: useCounter with active proposals count? (could be a nice addition)
+  };
+}
diff --git a/pioneer/packages/joy-election/src/ApplyForm.tsx b/pioneer/packages/joy-election/src/ApplyForm.tsx
index 5685d3371b..518d95ce51 100644
--- a/pioneer/packages/joy-election/src/ApplyForm.tsx
+++ b/pioneer/packages/joy-election/src/ApplyForm.tsx
@@ -51,7 +51,6 @@ class ApplyForm extends React.PureComponent<Props, State> {
         <div style={{ marginTop: '.5rem' }}>
           <Labelled>
             <TxButton
-              size='large'
               isDisabled={!isStakeValid}
               label={buttonLabel}
               params={[stake]}
diff --git a/pioneer/packages/joy-election/src/Reveals.tsx b/pioneer/packages/joy-election/src/Reveals.tsx
index 0c980ac7ff..7b51d2cb0c 100644
--- a/pioneer/packages/joy-election/src/Reveals.tsx
+++ b/pioneer/packages/joy-election/src/Reveals.tsx
@@ -86,7 +86,6 @@ class RevealVoteForm extends React.PureComponent<Props, State> {
         <div style={{ marginTop: '.5rem' }}>
           <Labelled>
             <TxButton
-              size='large'
               isDisabled={!isVoteRevealed}
               label='Reveal this vote'
               params={[hashedVote, applicantId, salt]}
diff --git a/pioneer/packages/joy-election/src/VoteForm.tsx b/pioneer/packages/joy-election/src/VoteForm.tsx
index fdb74b95d8..418c4bd6d0 100644
--- a/pioneer/packages/joy-election/src/VoteForm.tsx
+++ b/pioneer/packages/joy-election/src/VoteForm.tsx
@@ -150,7 +150,6 @@ class Component extends React.PureComponent<Props, State> {
           <div style={{ marginTop: '.5rem' }}>
             <Labelled>
               <TxButton
-                size='large'
                 isDisabled={!isFormValid}
                 label='Submit my vote'
                 params={[hashedVote, stake]}
diff --git a/pioneer/packages/joy-members/src/EditForm.tsx b/pioneer/packages/joy-members/src/EditForm.tsx
index 9d0c229173..58525d9ba4 100644
--- a/pioneer/packages/joy-members/src/EditForm.tsx
+++ b/pioneer/packages/joy-members/src/EditForm.tsx
@@ -172,7 +172,6 @@ const InnerForm = (props: FormProps) => {
           <div style={{ display: 'flex' }}>
             <TxButton
               type='submit'
-              size='large'
               label={profile ? 'Update my profile' : 'Register'}
               isDisabled={!dirty || isSubmitting}
               params={buildTxParams()}
diff --git a/pioneer/packages/joy-proposals/.skip-build b/pioneer/packages/joy-proposals/.skip-build
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/pioneer/packages/joy-proposals/src/Proposal/Body.tsx b/pioneer/packages/joy-proposals/src/Proposal/Body.tsx
index 1989d2b698..4ac7096a62 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/Body.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/Body.tsx
@@ -1,35 +1,32 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { Card, Header, Button, Icon, Message } from 'semantic-ui-react';
-import { ProposalType } from '@polkadot/joy-utils/types/proposals';
+import { Card, Header, Message, Icon } from 'semantic-ui-react';
+import { ProposalType, ParsedProposalDetails, SpecificProposalDetails, RuntimeUpgradeProposalDetails } from '@polkadot/joy-utils/types/proposals';
 import { bytesToString } from '@polkadot/joy-utils/functions/misc';
 import styled from 'styled-components';
-import AddressMini from '@polkadot/react-components/AddressMiniJoy';
-import TxButton from '@polkadot/joy-utils/TxButton';
-import { ProposalId, TerminateRoleParameters } from '@joystream/types/proposals';
+import AddressMini from '@polkadot/react-components/AddressMini';
+import { SemanticTxButton } from '@polkadot/joy-utils/react/components/TxButton';
+import { ProposalId, ProposalDetails } from '@joystream/types/proposals';
 import { MemberId, Membership } from '@joystream/types/members';
-import ProfilePreview from '@polkadot/joy-utils/MemberProfilePreview';
+import ProfilePreview from '@polkadot/joy-utils/react/components/MemberProfilePreview';
 import { useTransport, usePromise } from '@polkadot/joy-utils/react/hooks';
-import { Option, Bytes } from '@polkadot/types/';
-import { BlockNumber } from '@polkadot/types/interfaces';
+import { Option } from '@polkadot/types/';
+import { BlockNumber, Balance, AccountId } from '@polkadot/types/interfaces';
 import { formatBalance } from '@polkadot/util';
-import { PromiseComponent } from '@polkadot/joy-utils/react/components';
+import PromiseComponent from '@polkadot/joy-utils/react/components/PromiseComponent';
 import ReactMarkdown from 'react-markdown';
-import { WorkingGroupOpeningPolicyCommitment, RewardPolicy } from '@joystream/types/working-group';
-import {
-  ActivateOpeningAt,
-  ActivateOpeningAtKeys,
-  StakingPolicy
-} from '@joystream/types/hiring';
-import { WorkingGroup, WorkingGroupKey } from '@joystream/types/common';
+import { StakingPolicy } from '@joystream/types/hiring';
+import { WorkingGroup } from '@joystream/types/common';
 import { ApplicationsDetailsByOpening } from '@polkadot/joy-utils/react/components/working-groups/ApplicationDetails';
 import { LeadInfoFromId } from '@polkadot/joy-utils/react/components/working-groups/LeadInfo';
 import { formatReward } from '@polkadot/joy-utils/functions/format';
+import BN from 'bn.js';
+import { WorkerId } from '@joystream/types/src/working-group';
 
 type BodyProps = {
   title: string;
   description: string;
-  params: any[];
+  params: ParsedProposalDetails;
   type: ProposalType;
   iAmProposer: boolean;
   proposalId: number | ProposalId;
@@ -38,13 +35,18 @@ type BodyProps = {
   cancellationFee: number;
 };
 
-function ProposedAddress (props: { address?: string | null }) {
-  if (props.address === null || props.address === undefined) {
+function ProposedAddress (props: { accountId?: AccountId }) {
+  if (!props.accountId) {
     return <>NONE</>;
   }
 
   return (
-    <AddressMini value={props.address} isShort={false} isPadded={false} withAddress={true} style={{ padding: 0 }} />
+    <AddressMini
+      value={props.accountId.toString()}
+      isShort={false}
+      isPadded={false}
+      withAddress={true}
+      style={{ padding: 0 }} />
   );
 }
 
@@ -62,7 +64,7 @@ function ProposedMember (props: { memberId?: MemberId | number | null }) {
 
   return (
     <PromiseComponent error={error} loading={loading} message="Fetching profile...">
-      { (member && !member.handle.isEmpty) ? (
+      { (member && !member.isEmpty) ? (
         <ProfilePreview
           avatar_uri={ member.avatar_uri.toString() }
           root_account={ member.root_account.toString() }
@@ -99,11 +101,11 @@ class ParsedParam {
 }
 
 // The methods for parsing params by Proposal type.
-const paramParsers: { [x in ProposalType]: (params: any[]) => ParsedParam[]} = {
-  Text: ([content]) => [
+const paramParsers: { [k in ProposalType]: (params: SpecificProposalDetails<k>) => ParsedParam[]} = {
+  Text: content => [
     new ParsedParam(
       'Content',
-      <ReactMarkdown className='TextProposalContent' source={content} linkTarget='_blank' />,
+      <ReactMarkdown className='TextProposalContent' source={content.toString()} linkTarget='_blank' />,
       true
     )
   ],
@@ -111,63 +113,65 @@ const paramParsers: { [x in ProposalType]: (params: any[]) => ParsedParam[]} = {
     new ParsedParam('Blake2b256 hash of WASM code', hash, true),
     new ParsedParam('File size', filesize + ' bytes')
   ],
-  SetElectionParameters: ([params]) => [
-    new ParsedParam('Announcing period', params.announcing_period + ' blocks'),
-    new ParsedParam('Voting period', params.voting_period + ' blocks'),
-    new ParsedParam('Revealing period', params.revealing_period + ' blocks'),
-    new ParsedParam('Council size', params.council_size + ' members'),
-    new ParsedParam('Candidacy limit', params.candidacy_limit + ' members'),
-    new ParsedParam('New term duration', params.new_term_duration + ' blocks'),
+  SetElectionParameters: params => [
+    new ParsedParam('Announcing period', params.announcing_period.toString() + ' blocks'),
+    new ParsedParam('Voting period', params.voting_period.toString() + ' blocks'),
+    new ParsedParam('Revealing period', params.revealing_period.toString() + ' blocks'),
+    new ParsedParam('Council size', params.council_size.toString() + ' members'),
+    new ParsedParam('Candidacy limit', params.candidacy_limit.toString() + ' members'),
+    new ParsedParam('New term duration', params.new_term_duration.toString() + ' blocks'),
     new ParsedParam('Min. council stake', formatBalance(params.min_council_stake)),
     new ParsedParam('Min. voting stake', formatBalance(params.min_voting_stake))
   ],
   Spending: ([amount, account]) => [
-    new ParsedParam('Amount', formatBalance(amount)),
-    new ParsedParam('Account', <ProposedAddress address={account} />)
+    new ParsedParam('Amount', formatBalance(amount as Balance)),
+    new ParsedParam('Account', <ProposedAddress accountId={account as AccountId} />)
   ],
-  SetLead: ([memberId, accountId]) => [
-    new ParsedParam('Member', <ProposedMember memberId={ memberId } />),
-    new ParsedParam('Account id', <ProposedAddress address={accountId} />)
+  SetLead: params => [
+    new ParsedParam('Member', <ProposedMember memberId={params.unwrapOr([])[0] as MemberId | undefined} />),
+    new ParsedParam('Account id', <ProposedAddress accountId={params.unwrapOr([])[1] as AccountId | undefined} />)
   ],
-  SetContentWorkingGroupMintCapacity: ([capacity]) => [
+  SetContentWorkingGroupMintCapacity: capacity => [
     new ParsedParam('Mint capacity', formatBalance(capacity))
   ],
-  EvictStorageProvider: ([accountId]) => [
-    new ParsedParam('Storage provider account', <ProposedAddress address={accountId} />)
+  EvictStorageProvider: accountId => [
+    new ParsedParam('Storage provider account', <ProposedAddress accountId={accountId} />)
   ],
-  SetValidatorCount: ([count]) => [
-    new ParsedParam('Validator count', count)
+  SetValidatorCount: count => [
+    new ParsedParam('Validator count', count.toString())
   ],
-  SetStorageRoleParameters: ([params]) => [
+  SetStorageRoleParameters: params => [
     new ParsedParam('Min. stake', formatBalance(params.min_stake)),
     // "Min. actors": params.min_actors,
-    new ParsedParam('Max. actors', params.max_actors),
+    new ParsedParam('Max. actors', params.max_actors.toString()),
     new ParsedParam('Reward', formatBalance(params.reward)),
-    new ParsedParam('Reward period', params.reward_period + ' blocks'),
+    new ParsedParam('Reward period', `${params.reward_period.toString()} blocks`),
     // "Bonding period": params.bonding_period + " blocks",
-    new ParsedParam('Unbonding period', params.unbonding_period + ' blocks'),
+    new ParsedParam('Unbonding period', `${params.unbonding_period.toString()} blocks`),
     // "Min. service period": params.min_service_period + " blocks",
     // "Startup grace period": params.startup_grace_period + " blocks",
     new ParsedParam('Entry request fee', formatBalance(params.entry_request_fee))
   ],
-  AddWorkingGroupLeaderOpening: ([{ activate_at, commitment, human_readable_text, working_group }]) => {
-    const workingGroup = new WorkingGroup(working_group);
-    const activateAt = new ActivateOpeningAt(activate_at);
-    const activateAtBlock = activateAt.type === ActivateOpeningAtKeys.ExactBlock ? activateAt.value : null;
-    const OPCommitment = new WorkingGroupOpeningPolicyCommitment(commitment);
+  AddWorkingGroupLeaderOpening: ({
+    activate_at: activateAt,
+    commitment,
+    human_readable_text: humanReadableText,
+    working_group: workingGroup
+  }) => {
+    const activateAtBlock = activateAt.isOfType('ExactBlock') ? activateAt.asType('ExactBlock') : null;
     const {
       application_staking_policy: applicationSP,
       role_staking_policy: roleSP,
       application_rationing_policy: rationingPolicy
-    } = OPCommitment;
-    let HRT = bytesToString(new Bytes(human_readable_text));
+    } = commitment;
+    let HRT = bytesToString(humanReadableText);
     try { HRT = JSON.stringify(JSON.parse(HRT), undefined, 4); } catch (e) { /* Do nothing */ }
     const formatStake = (stake: Option<StakingPolicy>) => (
-      stake.isSome ? stake.unwrap().amount_mode.type + `(${stake.unwrap().amount})` : 'NONE'
+      stake.isSome ? stake.unwrap().amount_mode.type + `(${stake.unwrap().amount.toString()})` : 'NONE'
     );
     const formatPeriod = (unstakingPeriod: Option<BlockNumber>) => (
-      unstakingPeriod.unwrapOr(0) + ' blocks'
-    );
+      `${unstakingPeriod.unwrapOr(new BN(0)).toString()} blocks`
+    )
     return [
       new ParsedParam('Working group', workingGroup.type),
       new ParsedParam('Activate at', `${activateAt.type}${activateAtBlock ? `(${activateAtBlock.toString()})` : ''}`),
@@ -177,34 +181,35 @@ const paramParsers: { [x in ProposalType]: (params: any[]) => ParsedParam[]} = {
         'Max. applications',
         rationingPolicy.isSome ? rationingPolicy.unwrap().max_active_applicants.toNumber() : 'UNLIMITED'
       ),
+      new ParsedParam('Max. review period length', `${commitment.max_review_period_length.toString()} blocks`),
       new ParsedParam(
         'Terminate unstaking period (role stake)',
-        formatPeriod(OPCommitment.terminate_role_stake_unstaking_period)
+        formatPeriod(commitment.terminate_role_stake_unstaking_period)
       ),
       new ParsedParam(
         'Exit unstaking period (role stake)',
-        formatPeriod(OPCommitment.exit_role_stake_unstaking_period)
+        formatPeriod(commitment.exit_role_stake_unstaking_period)
       ),
       // <required_to_prevent_sneaking>
       new ParsedParam(
         'Terminate unstaking period (appl. stake)',
-        formatPeriod(OPCommitment.terminate_application_stake_unstaking_period)
+        formatPeriod(commitment.terminate_application_stake_unstaking_period)
       ),
       new ParsedParam(
         'Exit unstaking period (appl. stake)',
-        formatPeriod(OPCommitment.exit_role_application_stake_unstaking_period)
+        formatPeriod(commitment.exit_role_application_stake_unstaking_period)
       ),
       new ParsedParam(
         'Appl. accepted unstaking period (appl. stake)',
-        formatPeriod(OPCommitment.fill_opening_successful_applicant_application_stake_unstaking_period)
+        formatPeriod(commitment.fill_opening_successful_applicant_application_stake_unstaking_period)
       ),
       new ParsedParam(
         'Appl. failed unstaking period (role stake)',
-        formatPeriod(OPCommitment.fill_opening_failed_applicant_role_stake_unstaking_period)
+        formatPeriod(commitment.fill_opening_failed_applicant_role_stake_unstaking_period)
       ),
       new ParsedParam(
         'Appl. failed unstaking period (appl. stake)',
-        formatPeriod(OPCommitment.fill_opening_failed_applicant_application_stake_unstaking_period)
+        formatPeriod(commitment.fill_opening_failed_applicant_application_stake_unstaking_period)
       ),
       new ParsedParam(
         'Crowded out unstaking period (role stake)',
@@ -227,55 +232,76 @@ const paramParsers: { [x in ProposalType]: (params: any[]) => ParsedParam[]} = {
     ];
   },
   SetWorkingGroupMintCapacity: ([capacity, group]) => [
-    new ParsedParam('Working group', (new WorkingGroup(group)).type),
-    new ParsedParam('Mint capacity', formatBalance(capacity))
+    new ParsedParam('Working group', (group as WorkingGroup).type),
+    new ParsedParam('Mint capacity', formatBalance((capacity as Balance)))
   ],
   BeginReviewWorkingGroupLeaderApplication: ([id, group]) => [
-    new ParsedParam('Working group', (new WorkingGroup(group)).type),
+    new ParsedParam('Working group', (group as WorkingGroup).type),
     // TODO: Adjust the link to work with multiple groups after working-groups are normalized!
-    new ParsedParam('Opening id', <Link to={`/working-groups/opportunities/storageProviders/${id}`}>#{id}</Link>)
+    new ParsedParam(
+      'Opening id',
+      <Link to={`/working-groups/opportunities/storageProviders/${id.toString()}`}>#{id.toString()}</Link>
+    )
+  ],
+  FillWorkingGroupLeaderOpening: ({
+    opening_id: openingId,
+    successful_application_id: succesfulApplicationId,
+    reward_policy: rewardPolicy,
+    working_group: workingGroup
+  }) => [
+    new ParsedParam('Working group', workingGroup.type),
+    // TODO: Adjust the link to work with multiple groups after working-groups are normalized!
+    new ParsedParam(
+      'Opening id',
+      <Link to={`/working-groups/opportunities/storageProviders/${openingId.toString()}`}>#{openingId.toString()}</Link>),
+    new ParsedParam('Reward policy', rewardPolicy.isSome ? formatReward(rewardPolicy.unwrap(), true) : 'NONE'),
+    new ParsedParam(
+      'Result',
+      <ApplicationsDetailsByOpening
+        openingId={openingId.toNumber()}
+        acceptedIds={[succesfulApplicationId.toNumber()]}
+        group={workingGroup.type}/>,
+      true
+    )
   ],
-  FillWorkingGroupLeaderOpening: ([params]) => {
-    const { opening_id, successful_application_id, reward_policy, working_group } = params;
-    const rewardPolicy = reward_policy && new RewardPolicy(reward_policy);
-    return [
-      new ParsedParam('Working group', (new WorkingGroup(working_group)).type),
-      // TODO: Adjust the link to work with multiple groups after working-groups are normalized!
-      new ParsedParam('Opening id', <Link to={`/working-groups/opportunities/storageProviders/${opening_id}`}>#{opening_id}</Link>),
-      new ParsedParam('Reward policy', rewardPolicy ? formatReward(rewardPolicy, true) : 'NONE'),
-      new ParsedParam(
-        'Result',
-        <ApplicationsDetailsByOpening
-          openingId={opening_id}
-          acceptedIds={[successful_application_id]}
-          group={(new WorkingGroup(working_group)).type as WorkingGroupKey}/>,
-        true
-      )
-    ];
-  },
   SlashWorkingGroupLeaderStake: ([leadId, amount, group]) => [
-    new ParsedParam('Working group', (new WorkingGroup(group)).type),
-    new ParsedParam('Slash amount', formatBalance(amount)),
-    new ParsedParam('Lead', <LeadInfoFromId group={(new WorkingGroup(group).type as WorkingGroupKey)} leadId={leadId}/>, true)
+    new ParsedParam('Working group', (group as WorkingGroup).type),
+    new ParsedParam('Slash amount', formatBalance(amount as Balance)),
+    new ParsedParam(
+      'Lead',
+      <LeadInfoFromId group={(group as WorkingGroup).type} leadId={(leadId as WorkerId).toNumber()}/>,
+      true
+    )
   ],
   DecreaseWorkingGroupLeaderStake: ([leadId, amount, group]) => [
-    new ParsedParam('Working group', (new WorkingGroup(group)).type),
-    new ParsedParam('Decrease amount', formatBalance(amount)),
-    new ParsedParam('Lead', <LeadInfoFromId group={(new WorkingGroup(group).type as WorkingGroupKey)} leadId={leadId}/>, true)
+    new ParsedParam('Working group', (group as WorkingGroup).type),
+    new ParsedParam('Decrease amount', formatBalance(amount as Balance)),
+    new ParsedParam(
+      'Lead',
+      <LeadInfoFromId group={(group as WorkingGroup).type} leadId={(leadId as WorkerId).toNumber()}/>,
+      true
+    )
   ],
   SetWorkingGroupLeaderReward: ([leadId, amount, group]) => [
-    new ParsedParam('Working group', (new WorkingGroup(group)).type),
-    new ParsedParam('New reward amount', formatBalance(amount)),
-    new ParsedParam('Lead', <LeadInfoFromId group={(new WorkingGroup(group).type as WorkingGroupKey)} leadId={leadId}/>, true)
+    new ParsedParam('Working group', (group as WorkingGroup).type),
+    new ParsedParam('New reward amount', formatBalance(amount as Balance)),
+    new ParsedParam(
+      'Lead',
+      <LeadInfoFromId group={(group as WorkingGroup).type} leadId={(leadId as WorkerId).toNumber()}/>,
+      true
+    )
   ],
-  TerminateWorkingGroupLeaderRole: ([params]) => {
-    const paramsObj = new TerminateRoleParameters(params);
-    const { working_group: workingGroup, rationale, worker_id: leadId, slash } = paramsObj;
+  TerminateWorkingGroupLeaderRole: ({
+    working_group: workingGroup,
+    rationale,
+    worker_id: leadId,
+    slash
+  }) => {
     return [
       new ParsedParam('Working group', workingGroup.type),
       new ParsedParam('Rationale', bytesToString(rationale), true),
       new ParsedParam('Slash stake', slash.isTrue ? 'YES' : 'NO'),
-      new ParsedParam('Lead', <LeadInfoFromId group={workingGroup.type as WorkingGroupKey} leadId={leadId.toNumber()}/>, true)
+      new ParsedParam('Lead', <LeadInfoFromId group={workingGroup.type} leadId={leadId.toNumber()}/>, true)
     ];
   }
 };
@@ -330,15 +356,20 @@ export default function Body ({
   type,
   title,
   description,
-  params = [],
+  params,
   iAmProposer,
   proposalId,
   proposerId,
   isCancellable,
   cancellationFee
 }: BodyProps) {
-  const parseParams = paramParsers[type];
-  const parsedParams = parseParams(params);
+  // Assert more generic type (since TypeScript cannot possibly know the value of "type" here yet)
+  const parseParams = paramParsers[type] as (params: SpecificProposalDetails<ProposalType>) => ParsedParam[];
+  const parsedParams = parseParams(
+    type === 'RuntimeUpgrade'
+      ? params as RuntimeUpgradeProposalDetails
+      : (params as ProposalDetails).asType(type)
+  );
   return (
     <Card fluid>
       <Card.Content>
@@ -368,17 +399,17 @@ export default function Body ({
                 The cancellation fee for this type of proposal is:&nbsp;
                 <b>{ cancellationFee ? formatBalance(cancellationFee) : 'NONE' }</b>
               </p>
-              <Button.Group color="red">
-                <TxButton
-                  params={ [proposerId, proposalId] }
-                  tx={ 'proposalsEngine.cancelProposal' }
-                  onClick={ sendTx => { sendTx(); } }
-                  className={'icon left labeled'}
-                >
-                  <Icon name="cancel" inverted />
-                  Withdraw proposal
-                </TxButton>
-              </Button.Group>
+              <SemanticTxButton
+                params={ [proposerId, proposalId] }
+                tx={ 'proposalsEngine.cancelProposal' }
+                onClick={ sendTx => { sendTx(); } }
+                icon
+                color={ 'red' }
+                labelPosition={ 'left' }
+              >
+                <Icon name="cancel" inverted />
+                Withdraw proposal
+              </SemanticTxButton>
             </Message.Content>
           </Message>
           </>) }
diff --git a/pioneer/packages/joy-proposals/src/Proposal/ChooseProposalType.tsx b/pioneer/packages/joy-proposals/src/Proposal/ChooseProposalType.tsx
index fbd8194ab6..a207d37153 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/ChooseProposalType.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/ChooseProposalType.tsx
@@ -4,7 +4,7 @@ import { Item, Dropdown } from 'semantic-ui-react';
 
 import { useTransport, usePromise } from '@polkadot/joy-utils/react/hooks';
 import { Categories } from '@polkadot/joy-utils/types/proposals';
-import { PromiseComponent } from '@polkadot/joy-utils/react/components';
+import PromiseComponent from '@polkadot/joy-utils/react/components/PromiseComponent';
 import './ChooseProposalType.css';
 import { RouteComponentProps } from 'react-router-dom';
 
diff --git a/pioneer/packages/joy-proposals/src/Proposal/Details.tsx b/pioneer/packages/joy-proposals/src/Proposal/Details.tsx
index 3289f0037b..4e0ce73193 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/Details.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/Details.tsx
@@ -5,7 +5,7 @@ import { metadata as proposalConsts } from '@polkadot/joy-utils/consts/proposals
 import { ExtendedProposalStatus } from './ProposalDetails';
 import styled from 'styled-components';
 
-import ProfilePreview from '@polkadot/joy-utils/MemberProfilePreview';
+import ProfilePreview from '@polkadot/joy-utils/react/components/MemberProfilePreview';
 
 const DetailsContainer = styled(Item.Group)`
   display: grid;
diff --git a/pioneer/packages/joy-proposals/src/Proposal/ProposalDetails.tsx b/pioneer/packages/joy-proposals/src/Proposal/ProposalDetails.tsx
index f3f85b5fe7..cd15d109e7 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/ProposalDetails.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/ProposalDetails.tsx
@@ -4,17 +4,15 @@ import Details from './Details';
 import Body from './Body';
 import VotingSection from './VotingSection';
 import Votes from './Votes';
-import { MyAccountProps, withMyAccount } from '@polkadot/joy-utils/MyAccount';
+import { MyAccountProps, withMyAccount } from '@polkadot/joy-utils/react/hocs/accounts';
 import { ParsedProposal, ProposalVotes } from '@polkadot/joy-utils/types/proposals';
 import { withCalls } from '@polkadot/react-api';
-import { withMulti } from '@polkadot/react-api/with';
-
-import './Proposal.css';
+import { withMulti } from '@polkadot/react-api/hoc';
 import { ProposalId, ProposalDecisionStatuses, ApprovedProposalStatuses, ExecutionFailedStatus } from '@joystream/types/proposals';
 import { BlockNumber } from '@polkadot/types/interfaces';
 import { MemberId } from '@joystream/types/members';
 import { Seat } from '@joystream/types/council';
-import { PromiseComponent } from '@polkadot/joy-utils/react/components';
+import PromiseComponent from '@polkadot/joy-utils/react/components/PromiseComponent';
 import ProposalDiscussion from './discussion/ProposalDiscussion';
 
 import styled from 'styled-components';
diff --git a/pioneer/packages/joy-proposals/src/Proposal/ProposalFromId.tsx b/pioneer/packages/joy-proposals/src/Proposal/ProposalFromId.tsx
index 9750685060..dfab2be622 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/ProposalFromId.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/ProposalFromId.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import ProposalDetails from './ProposalDetails';
 import { useProposalSubscription } from '@polkadot/joy-utils/react/hooks';
-import { PromiseComponent } from '@polkadot/joy-utils/react/components';
-import { ProposalId } from '@joystream/types/proposals';
+import PromiseComponent from '@polkadot/joy-utils/react/components/PromiseComponent';
+import { useApi } from '@polkadot/react-hooks';
 
 export default function ProposalFromId (props: RouteComponentProps<any>) {
   const {
@@ -11,8 +11,9 @@ export default function ProposalFromId (props: RouteComponentProps<any>) {
       params: { id }
     }
   } = props;
+  const { api } = useApi();
 
-  const { proposal: proposalState, votes: votesState } = useProposalSubscription(new ProposalId(id));
+  const { proposal: proposalState, votes: votesState } = useProposalSubscription(api.createType('ProposalId', id));
 
   return (
     <PromiseComponent
diff --git a/pioneer/packages/joy-proposals/src/Proposal/ProposalPreview.tsx b/pioneer/packages/joy-proposals/src/Proposal/ProposalPreview.tsx
index c562d634f6..a1fd36ac87 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/ProposalPreview.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/ProposalPreview.tsx
@@ -7,8 +7,6 @@ import { BlockNumber } from '@polkadot/types/interfaces';
 import styled from 'styled-components';
 import ReactMarkdown from 'react-markdown';
 
-import './Proposal.css';
-
 const ProposalIdBox = styled.div`
   position: absolute;
   top: 0;
@@ -33,7 +31,6 @@ export default function ProposalPreview ({ proposal, bestNumber }: ProposalPrevi
   return (
     <Card
       fluid
-      className="Proposal"
       href={`#/proposals/${proposal.id}`}>
       <ProposalIdBox>{ `#${proposal.id.toString()}` }</ProposalIdBox>
       <Card.Content>
diff --git a/pioneer/packages/joy-proposals/src/Proposal/ProposalPreviewList.tsx b/pioneer/packages/joy-proposals/src/Proposal/ProposalPreviewList.tsx
index 22df3b8803..ad031539db 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/ProposalPreviewList.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/ProposalPreviewList.tsx
@@ -6,7 +6,7 @@ import { Link, useLocation } from 'react-router-dom';
 import ProposalPreview from './ProposalPreview';
 import { ParsedProposal, proposalStatusFilters, ProposalStatusFilter, ProposalsBatch } from '@polkadot/joy-utils/types/proposals';
 import { useTransport, usePromise } from '@polkadot/joy-utils/react/hooks';
-import { PromiseComponent } from '@polkadot/joy-utils/react/components';
+import PromiseComponent from '@polkadot/joy-utils/react/components/PromiseComponent';
 import { withCalls } from '@polkadot/react-api';
 import { BlockNumber } from '@polkadot/types/interfaces';
 import { Dropdown } from '@polkadot/react-components';
diff --git a/pioneer/packages/joy-proposals/src/Proposal/Votes.tsx b/pioneer/packages/joy-proposals/src/Proposal/Votes.tsx
index 576e10e1c9..dbe2815d8c 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/Votes.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/Votes.tsx
@@ -4,7 +4,7 @@ import useVoteStyles from './useVoteStyles';
 import { ProposalVotes } from '@polkadot/joy-utils/types/proposals';
 import { VoteKind } from '@joystream/types/proposals';
 import { VoteKindStr } from './VotingSection';
-import ProfilePreview from '@polkadot/joy-utils/MemberProfilePreview';
+import ProfilePreview from '@polkadot/joy-utils/react/components/MemberProfilePreview';
 
 type VotesProps = {
   votes: ProposalVotes;
diff --git a/pioneer/packages/joy-proposals/src/Proposal/VotingSection.tsx b/pioneer/packages/joy-proposals/src/Proposal/VotingSection.tsx
index 7e10d4b1fb..086dcd5d53 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/VotingSection.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/VotingSection.tsx
@@ -1,8 +1,8 @@
 import React, { useState } from 'react';
 
-import { Icon, Button, Message, Divider, Header } from 'semantic-ui-react';
+import { Icon, Message, Divider, Header } from 'semantic-ui-react';
 import useVoteStyles from './useVoteStyles';
-import TxButton from '@polkadot/joy-utils/TxButton';
+import { SemanticTxButton } from '@polkadot/joy-utils/react/components/TxButton';
 import { MemberId } from '@joystream/types/members';
 import { ProposalId, VoteKind, VoteKinds } from '@joystream/types/proposals';
 import { useTransport, usePromise } from '@polkadot/joy-utils/react/hooks';
@@ -35,24 +35,23 @@ type VoteButtonProps = {
 function VoteButton ({ voteKind, proposalId, memberId, onSuccess }: VoteButtonProps) {
   const { icon, color } = useVoteStyles(voteKind);
   return (
-    // Button.Group "cheat" to force TxButton color
-    <Button.Group color={color} style={{ marginRight: '5px' }}>
-      <TxButton
-        // isDisabled={ isSubmitting }
-        params={[
-          memberId,
-          proposalId,
-          voteKind
-        ]}
-        tx={ 'proposalsEngine.vote' }
-        onClick={ sendTx => sendTx() }
-        txFailedCb={ () => null }
-        txSuccessCb={ onSuccess }
-        className={'icon left labeled'}>
-        <Icon name={icon} inverted />
-        { voteKind }
-      </TxButton>
-    </Button.Group>
+    <SemanticTxButton
+      params={[
+        memberId,
+        proposalId,
+        voteKind
+      ]}
+      tx={ 'proposalsEngine.vote' }
+      onClick={ sendTx => sendTx() }
+      txFailedCb={ () => null }
+      txSuccessCb={ onSuccess }
+      color={color}
+      style={{ marginRight: '5px' }}
+      icon
+      labelPosition={ 'left' }>
+      <Icon name={icon} inverted />
+      { voteKind }
+    </SemanticTxButton>
   );
 }
 
diff --git a/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPost.tsx b/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPost.tsx
index 40d3125e22..4869c5dac0 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPost.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPost.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { Button, Icon } from 'semantic-ui-react';
 import { ParsedPost } from '@polkadot/joy-utils/types/proposals';
-import MemberProfilePreview from '@polkadot/joy-utils/MemberProfilePreview';
+import MemberProfilePreview from '@polkadot/joy-utils/react/components/MemberProfilePreview';
 import DiscussionPostForm from './DiscussionPostForm';
 import { MemberId } from '@joystream/types/members';
 import { useTransport } from '@polkadot/joy-utils/react/hooks';
diff --git a/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPostForm.tsx b/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPostForm.tsx
index 5b7ff204fd..c19a25a4ee 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPostForm.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPostForm.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 import { Form, Field, withFormik, FormikProps } from 'formik';
 import * as Yup from 'yup';
 
-import TxButton from '@polkadot/joy-utils/TxButton';
-import * as JoyForms from '@polkadot/joy-utils/forms';
+import TxButton from '@polkadot/joy-utils/react/components/TxButton';
+import * as JoyForms from '@polkadot/joy-utils/react/components/forms';
 import { SubmittableResult } from '@polkadot/api';
 import { Button } from 'semantic-ui-react';
 import { TxFailedCallback, TxCallback } from '@polkadot/react-components/Status/types';
@@ -89,7 +89,6 @@ const DiscussionPostFormInner = (props: InnerProps) => {
       <LabelledField invisibleLabel {...props}>
         <TxButton
           type="submit"
-          size="large"
           label={isEditForm ? 'Update' : 'Add Post'}
           isDisabled={isSubmitting || !isValid}
           params={buildTxParams()}
diff --git a/pioneer/packages/joy-proposals/src/Proposal/discussion/ProposalDiscussion.tsx b/pioneer/packages/joy-proposals/src/Proposal/discussion/ProposalDiscussion.tsx
index 7c7ed77038..49700ab76d 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/discussion/ProposalDiscussion.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/discussion/ProposalDiscussion.tsx
@@ -3,7 +3,7 @@ import { Divider, Header } from 'semantic-ui-react';
 import { useTransport, usePromise } from '@polkadot/joy-utils/react/hooks';
 import { ProposalId } from '@joystream/types/proposals';
 import { ParsedDiscussion } from '@polkadot/joy-utils/types/proposals';
-import { PromiseComponent } from '@polkadot/joy-utils/react/components';
+import PromiseComponent from '@polkadot/joy-utils/react/components/PromiseComponent';
 import DiscussionPost from './DiscussionPost';
 import DiscussionPostForm from './DiscussionPostForm';
 import { MemberId } from '@joystream/types/members';
diff --git a/pioneer/packages/joy-proposals/src/forms/AddWorkingGroupOpeningForm.tsx b/pioneer/packages/joy-proposals/src/forms/AddWorkingGroupOpeningForm.tsx
index e65d0e628e..03d73faff7 100644
--- a/pioneer/packages/joy-proposals/src/forms/AddWorkingGroupOpeningForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/AddWorkingGroupOpeningForm.tsx
@@ -15,7 +15,6 @@ import {
 } from './GenericWorkingGroupProposalForm';
 import { FormField, InputFormField, TextareaFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
-import './forms.css';
 import { ActivateOpeningAtKey, ActivateOpeningAtDef, StakingAmountLimitModeKeys, IApplicationRationingPolicy, IStakingPolicy } from '@joystream/types/hiring';
 import { GenericJoyStreamRoleSchema } from '@joystream/types/hiring/schemas/role.schema.typings';
 import { Dropdown, Grid, Message, Checkbox } from 'semantic-ui-react';
@@ -347,7 +346,7 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...genericFormDefaultOptions.validationSchema,
     ...Validation.AddWorkingGroupLeaderOpening(
       props.currentBlock?.toNumber() || 0,
-      props.HRTConstraint || InputValidationLengthConstraint.createWithMaxAllowed()
+      props.HRTConstraint
     )
   }),
   handleSubmit: genericFormDefaultOptions.handleSubmit,
diff --git a/pioneer/packages/joy-proposals/src/forms/BeginReviewLeaderApplicationsForm.tsx b/pioneer/packages/joy-proposals/src/forms/BeginReviewLeaderApplicationsForm.tsx
index 22431c13a1..2e2b30b2fc 100644
--- a/pioneer/packages/joy-proposals/src/forms/BeginReviewLeaderApplicationsForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/BeginReviewLeaderApplicationsForm.tsx
@@ -14,13 +14,12 @@ import {
 } from './GenericWorkingGroupProposalForm';
 import FormField from './FormFields';
 import { withFormContainer } from './FormContainer';
-import './forms.css';
 import { Dropdown, Message } from 'semantic-ui-react';
 import _ from 'lodash';
 import Validation from '../validationSchema';
 import { useTransport, usePromise } from '@polkadot/joy-utils/react/hooks';
 import { OpeningData } from '@polkadot/joy-utils/types/workingGroups';
-import { PromiseComponent } from '@polkadot/joy-utils/react/components';
+import PromiseComponent from '@polkadot/joy-utils/react/components/PromiseComponent';
 import { getFormErrorLabelsProps } from './errorHandling';
 
 export type FormValues = WGFormValues & {
diff --git a/pioneer/packages/joy-proposals/src/forms/DecreaseWorkingGroupLeadStakeForm.tsx b/pioneer/packages/joy-proposals/src/forms/DecreaseWorkingGroupLeadStakeForm.tsx
index 735a57275f..7809b1c37b 100644
--- a/pioneer/packages/joy-proposals/src/forms/DecreaseWorkingGroupLeadStakeForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/DecreaseWorkingGroupLeadStakeForm.tsx
@@ -15,7 +15,6 @@ import {
 } from './GenericWorkingGroupProposalForm';
 import { InputFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
-import './forms.css';
 import { Grid } from 'semantic-ui-react';
 import { formatBalance } from '@polkadot/util';
 import _ from 'lodash';
diff --git a/pioneer/packages/joy-proposals/src/forms/FillWorkingGroupLeaderOpeningForm.tsx b/pioneer/packages/joy-proposals/src/forms/FillWorkingGroupLeaderOpeningForm.tsx
index 527ace5488..38b8bb5800 100644
--- a/pioneer/packages/joy-proposals/src/forms/FillWorkingGroupLeaderOpeningForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/FillWorkingGroupLeaderOpeningForm.tsx
@@ -14,24 +14,19 @@ import {
 } from './GenericWorkingGroupProposalForm';
 import { FormField, RewardPolicyFields } from './FormFields';
 import { withFormContainer } from './FormContainer';
-import './forms.css';
 import { Dropdown, DropdownItemProps, Header, Checkbox, Message } from 'semantic-ui-react';
 import _ from 'lodash';
 import Validation from '../validationSchema';
 import { useTransport, usePromise } from '@polkadot/joy-utils/react/hooks';
 import { OpeningData, ParsedApplication } from '@polkadot/joy-utils/types/workingGroups';
-import { PromiseComponent } from '@polkadot/joy-utils/react/components';
+import PromiseComponent from '@polkadot/joy-utils/react/components/PromiseComponent';
 import { formatBalance } from '@polkadot/util';
 import { withCalls } from '@polkadot/react-api';
-import { Option } from '@polkadot/types';
 import { BlockNumber } from '@polkadot/types/interfaces';
-import { u32 as U32, u128 as U128 } from '@polkadot/types/primitive';
 import { getFormErrorLabelsProps } from './errorHandling';
-import { RewardPolicy } from '@joystream/types/working-group';
-import { FillOpeningParameters } from '@joystream/types/proposals';
-import { WorkingGroup } from '@joystream/types/common';
-import { OpeningId, ApplicationId } from '@joystream/types/hiring';
 import { ApplicationsDetails } from '@polkadot/joy-utils/react/components/working-groups/ApplicationDetails';
+import { SimplifiedTypeInterface } from '@polkadot/joy-utils/types/common';
+import { IFillOpeningParameters } from '@joystream/types/src/proposals';
 
 export type FormValues = WGFormValues & {
   openingId: string;
@@ -61,23 +56,20 @@ type FormContainerProps = ProposalFormContainerProps<ExportComponentProps> & {
 };
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
-const valuesToFillOpeningParams = (values: FormValues): FillOpeningParameters => (
-  new FillOpeningParameters({
-    working_group: new WorkingGroup(values.workingGroup),
-    successful_application_id: new ApplicationId(values.successfulApplicant),
-    opening_id: new OpeningId(values.openingId),
-    reward_policy: new (Option.with(RewardPolicy))(
+const valuesToFillOpeningParams = (values: FormValues): SimplifiedTypeInterface<IFillOpeningParameters> => (
+  {
+    working_group: values.workingGroup,
+    successful_application_id: values.successfulApplicant,
+    opening_id: values.openingId,
+    reward_policy:
       values.includeReward
-        ? new RewardPolicy({
-          amount_per_payout: new U128(values.rewardAmount),
-          next_payment_at_block: new U32(values.rewardNextBlock),
-          payout_interval: new (Option.with('BlockNumber'))(
-            values.rewardRecurring ? values.rewardInterval : null
-          ) as Option<BlockNumber>
-        })
-        : null
-    ) as Option<RewardPolicy>
-  })
+        ? {
+          amount_per_payout: values.rewardAmount,
+          next_payment_at_block: values.rewardNextBlock,
+          payout_interval: values.rewardRecurring ? values.rewardInterval : undefined
+        }
+        : undefined
+  }
 );
 
 const FillWorkingGroupLeaderOpeningForm: React.FunctionComponent<FormInnerProps> = props => {
diff --git a/pioneer/packages/joy-proposals/src/forms/GenericProposalForm.tsx b/pioneer/packages/joy-proposals/src/forms/GenericProposalForm.tsx
index 3c0aca1c8a..f5f86a4557 100644
--- a/pioneer/packages/joy-proposals/src/forms/GenericProposalForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/GenericProposalForm.tsx
@@ -4,11 +4,12 @@ import { Form, Icon, Button, Message } from 'semantic-ui-react';
 import { getFormErrorLabelsProps } from './errorHandling';
 import Validation from '../validationSchema';
 import { InputFormField, TextareaFormField } from './FormFields';
-import TxButton from '@polkadot/joy-utils/TxButton';
+import TxButton from '@polkadot/joy-utils/react/components/TxButton';
 import { SubmittableResult } from '@polkadot/api';
 import { TxFailedCallback, TxCallback } from '@polkadot/react-components/Status/types';
-import { MyAccountProps, withOnlyMembers } from '@polkadot/joy-utils/MyAccount';
-import { withMulti } from '@polkadot/react-api/with';
+import { MyAccountProps } from '@polkadot/joy-utils/react/hocs/accounts';
+import { withOnlyMembers } from '@polkadot/joy-utils/react/hocs/guards';
+import { withMulti } from '@polkadot/react-api/hoc';
 import { withCalls } from '@polkadot/react-api';
 import { CallProps } from '@polkadot/react-api/types';
 import { Balance, Event } from '@polkadot/types/interfaces';
@@ -16,8 +17,8 @@ import { RouteComponentProps } from 'react-router';
 import { ProposalType } from '@polkadot/joy-utils/types/proposals';
 import proposalsConsts from '@polkadot/joy-utils/consts/proposals';
 import { formatBalance } from '@polkadot/util';
-import './forms.css';
 import { ProposalId } from '@joystream/types/proposals';
+import styled from 'styled-components';
 
 // Generic form values
 export type GenericFormValues = {
@@ -74,6 +75,33 @@ export const genericFormDefaultOptions: GenericFormDefaultOptions = {
   }
 };
 
+const StyledGenericProposalForm = styled.div`
+  .proposal-form {
+    margin: 0 auto;
+  }
+
+  .ui.form.proposal-form {
+    & label {
+      font-size: 1rem;
+    }
+
+    & input[name="tokens"] {
+      max-width: 16rem;
+    }
+  }
+
+  .form-buttons {
+    display: flex;
+    button {
+      margin-right: 0.5em;
+    }
+  }
+
+  .ui.dropdown .ui.avatar.image {
+    width: 2em !important;
+  }
+`;
+
 // Generic proposal form with basic structure, "Title" and "Rationale" fields
 // Other fields can be passed as children
 export const GenericProposalForm: React.FunctionComponent<GenericFormInnerProps> = props => {
@@ -162,7 +190,7 @@ export const GenericProposalForm: React.FunctionComponent<GenericFormInnerProps>
     proposalsConsts[proposalType].stake;
 
   return (
-    <div className="Forms" ref={formContainerRef}>
+    <StyledGenericProposalForm ref={formContainerRef}>
       <Form
         className="proposal-form"
         onSubmit={txMethod
@@ -199,7 +227,6 @@ export const GenericProposalForm: React.FunctionComponent<GenericFormInnerProps>
             <TxButton
               type="button" // Tx button uses custom submit handler - "onTxButtonClick"
               label="Submit proposal"
-              icon="paper plane"
               isDisabled={disabled || isSubmitting}
               params={(submitParams || []).map(p => (p === '{STAKE}' ? requiredStake : p))}
               tx={`proposalsCodex.${txMethod}`}
@@ -220,7 +247,7 @@ export const GenericProposalForm: React.FunctionComponent<GenericFormInnerProps>
           </Button>
         </div>
       </Form>
-    </div>
+    </StyledGenericProposalForm>
   );
 };
 
diff --git a/pioneer/packages/joy-proposals/src/forms/GenericWorkingGroupProposalForm.tsx b/pioneer/packages/joy-proposals/src/forms/GenericWorkingGroupProposalForm.tsx
index 4c228e15dd..3da45c7bb3 100644
--- a/pioneer/packages/joy-proposals/src/forms/GenericWorkingGroupProposalForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/GenericWorkingGroupProposalForm.tsx
@@ -11,10 +11,9 @@ import {
 import { FormField } from './FormFields';
 import { ProposalType } from '@polkadot/joy-utils/types/proposals';
 import { WorkingGroupKey, WorkingGroupDef } from '@joystream/types/common';
-import './forms.css';
 import { Dropdown, Message } from 'semantic-ui-react';
 import { usePromise, useTransport } from '@polkadot/joy-utils/react/hooks';
-import { PromiseComponent } from '@polkadot/joy-utils/react/components';
+import PromiseComponent from '@polkadot/joy-utils/react/components/PromiseComponent';
 import { WorkerData } from '@polkadot/joy-utils/types/workingGroups';
 import { LeadInfo } from '@polkadot/joy-utils/react/components/working-groups/LeadInfo';
 
@@ -70,7 +69,7 @@ export const GenericWorkingGroupProposalForm: React.FunctionComponent<FormInnerP
   const leadMissing = leadRequired && (!leadRes.loading && !leadRes.error) && !leadRes.lead;
   const stakeMissing = leadStakeRequired && (!leadRes.loading && !leadRes.error) && (leadRes.lead && !leadRes.lead.stake);
   const rewardMissing = leadRewardRequired && (!leadRes.loading && !leadRes.error) && (leadRes.lead && !leadRes.lead.reward);
-  const isDisabled = disabled || leadMissing || stakeMissing || rewardMissing || leadRes.error;
+  const isDisabled = disabled || leadMissing || stakeMissing || rewardMissing || Boolean(leadRes.error);
 
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
   return (
diff --git a/pioneer/packages/joy-proposals/src/forms/MintCapacityForm.tsx b/pioneer/packages/joy-proposals/src/forms/MintCapacityForm.tsx
index 8c6c0296cc..25edcc8e5d 100644
--- a/pioneer/packages/joy-proposals/src/forms/MintCapacityForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/MintCapacityForm.tsx
@@ -16,7 +16,6 @@ import { InputFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
 import { ProposalType } from '@polkadot/joy-utils/types/proposals';
 import { formatBalance } from '@polkadot/util';
-import './forms.css';
 
 export type FormValues = GenericFormValues & {
   capacity: string;
diff --git a/pioneer/packages/joy-proposals/src/forms/RuntimeUpgradeForm.tsx b/pioneer/packages/joy-proposals/src/forms/RuntimeUpgradeForm.tsx
index ea16a093b7..9ed2ab19c0 100644
--- a/pioneer/packages/joy-proposals/src/forms/RuntimeUpgradeForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/RuntimeUpgradeForm.tsx
@@ -13,7 +13,6 @@ import {
 } from './GenericProposalForm';
 import Validation from '../validationSchema';
 import { withFormContainer } from './FormContainer';
-import './forms.css';
 import FileDropdown from './FileDropdown';
 
 export type FormValues = GenericFormValues & {
diff --git a/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupLeadForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupLeadForm.tsx
index 17bb481874..7144166729 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupLeadForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupLeadForm.tsx
@@ -17,9 +17,8 @@ import { FormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
 import { useTransport, usePromise } from '@polkadot/joy-utils/react/hooks';
 import { Membership } from '@joystream/types/members';
-import { PromiseComponent } from '@polkadot/joy-utils/react/components';
+import PromiseComponent from '@polkadot/joy-utils/react/components/PromiseComponent';
 import _ from 'lodash';
-import './forms.css';
 
 export type FormValues = GenericFormValues & {
   workingGroupLead: any;
diff --git a/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupMintCapForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupMintCapForm.tsx
index be7f149cb1..a48d6a5676 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupMintCapForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupMintCapForm.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import MintCapacityForm from './MintCapacityForm';
 import { RouteComponentProps } from 'react-router';
 import { useTransport, usePromise } from '@polkadot/joy-utils/react/hooks';
-import { PromiseComponent } from '@polkadot/joy-utils/react/components';
+import PromiseComponent from '@polkadot/joy-utils/react/components/PromiseComponent';
 
 const ContentWorkingGroupMintCapForm = (props: RouteComponentProps) => {
   const transport = useTransport();
diff --git a/pioneer/packages/joy-proposals/src/forms/SetCouncilParamsForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetCouncilParamsForm.tsx
index 1cafa3f9c8..6f1a94313a 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetCouncilParamsForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetCouncilParamsForm.tsx
@@ -15,12 +15,11 @@ import {
 import Validation from '../validationSchema';
 import { InputFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
-import { createType } from '@polkadot/types';
-import './forms.css';
 import { useTransport, usePromise } from '@polkadot/joy-utils/react/hooks';
 import _ from 'lodash';
-import { ElectionParameters } from '@joystream/types/council';
-import { PromiseComponent } from '@polkadot/joy-utils/react/components';
+import PromiseComponent from '@polkadot/joy-utils/react/components/PromiseComponent';
+import { IElectionParameters } from '@joystream/types/src/council';
+import { SimplifiedTypeInterface } from '@polkadot/joy-utils/types/common';
 
 export type FormValues = GenericFormValues & {
   announcingPeriod: string;
@@ -50,17 +49,17 @@ type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormVal
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
-function createElectionParameters (values: FormValues): ElectionParameters {
-  return new ElectionParameters({
-    announcing_period: createType('BlockNumber', parseInt(values.announcingPeriod)),
-    voting_period: createType('BlockNumber', parseInt(values.votingPeriod)),
-    revealing_period: createType('BlockNumber', parseInt(values.revealingPeriod)),
-    council_size: createType('u32', values.councilSize),
-    candidacy_limit: createType('u32', values.candidacyLimit),
-    new_term_duration: createType('BlockNumber', parseInt(values.newTermDuration)),
-    min_council_stake: createType('Balance', values.minCouncilStake),
-    min_voting_stake: createType('Balance', values.minVotingStake)
-  });
+function createElectionParameters (values: FormValues): SimplifiedTypeInterface<IElectionParameters> {
+  return {
+    announcing_period: parseInt(values.announcingPeriod),
+    voting_period: parseInt(values.votingPeriod),
+    revealing_period: parseInt(values.revealingPeriod),
+    council_size: values.councilSize,
+    candidacy_limit: values.candidacyLimit,
+    new_term_duration: parseInt(values.newTermDuration),
+    min_council_stake: values.minCouncilStake,
+    min_voting_stake: values.minVotingStake
+  };
 }
 
 const SetCouncilParamsForm: React.FunctionComponent<FormInnerProps> = props => {
@@ -69,7 +68,7 @@ const SetCouncilParamsForm: React.FunctionComponent<FormInnerProps> = props => {
   const [placeholders, setPlaceholders] = useState<{ [k in keyof FormValues]: string }>(defaultValues);
 
   const transport = useTransport();
-  const [councilParams, error, loading] = usePromise<ElectionParameters | null>(() => transport.council.electionParameters(), null);
+  const [councilParams, error, loading] = usePromise<IElectionParameters | null>(() => transport.council.electionParameters(), null);
   useEffect(() => {
     if (councilParams) {
       const fetchedPlaceholders = { ...placeholders };
diff --git a/pioneer/packages/joy-proposals/src/forms/SetMaxValidatorCountForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetMaxValidatorCountForm.tsx
index e274d2dff6..f32031b705 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetMaxValidatorCountForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetMaxValidatorCountForm.tsx
@@ -15,7 +15,6 @@ import Validation from '../validationSchema';
 import { InputFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
 import { useTransport, usePromise } from '@polkadot/joy-utils/react/hooks';
-import './forms.css';
 
 export type FormValues = GenericFormValues & {
   maxValidatorCount: string;
diff --git a/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupLeadRewardForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupLeadRewardForm.tsx
index 39f15b2a13..528692ed1f 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupLeadRewardForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupLeadRewardForm.tsx
@@ -15,7 +15,6 @@ import {
 } from './GenericWorkingGroupProposalForm';
 import { InputFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
-import './forms.css';
 import { Grid } from 'semantic-ui-react';
 import { formatBalance } from '@polkadot/util';
 import _ from 'lodash';
diff --git a/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupMintCapacityForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupMintCapacityForm.tsx
index a53006273f..9b4513383a 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupMintCapacityForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupMintCapacityForm.tsx
@@ -15,7 +15,6 @@ import {
 } from './GenericWorkingGroupProposalForm';
 import { InputFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
-import './forms.css';
 import { Grid } from 'semantic-ui-react';
 import { formatBalance } from '@polkadot/util';
 import _ from 'lodash';
diff --git a/pioneer/packages/joy-proposals/src/forms/SignalForm.tsx b/pioneer/packages/joy-proposals/src/forms/SignalForm.tsx
index 1163346db8..b0c722febe 100644
--- a/pioneer/packages/joy-proposals/src/forms/SignalForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SignalForm.tsx
@@ -14,7 +14,6 @@ import {
 import Validation from '../validationSchema';
 import { TextareaFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
-import './forms.css';
 
 export type FormValues = GenericFormValues & {
   description: string;
diff --git a/pioneer/packages/joy-proposals/src/forms/SlashWorkingGroupLeadStakeForm.tsx b/pioneer/packages/joy-proposals/src/forms/SlashWorkingGroupLeadStakeForm.tsx
index c9e4692a62..ceaaf76375 100644
--- a/pioneer/packages/joy-proposals/src/forms/SlashWorkingGroupLeadStakeForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SlashWorkingGroupLeadStakeForm.tsx
@@ -15,7 +15,6 @@ import {
 } from './GenericWorkingGroupProposalForm';
 import { InputFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
-import './forms.css';
 import { Grid } from 'semantic-ui-react';
 import { formatBalance } from '@polkadot/util';
 import _ from 'lodash';
diff --git a/pioneer/packages/joy-proposals/src/forms/SpendingProposalForm.tsx b/pioneer/packages/joy-proposals/src/forms/SpendingProposalForm.tsx
index 125e2535d9..298af09cb1 100644
--- a/pioneer/packages/joy-proposals/src/forms/SpendingProposalForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SpendingProposalForm.tsx
@@ -17,7 +17,6 @@ import { InputFormField, FormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
 import { InputAddress } from '@polkadot/react-components/index';
 import { formatBalance } from '@polkadot/util';
-import './forms.css';
 
 export type FormValues = GenericFormValues & {
   destinationAccount: any;
diff --git a/pioneer/packages/joy-proposals/src/forms/TerminateWorkingGroupLeaderForm.tsx b/pioneer/packages/joy-proposals/src/forms/TerminateWorkingGroupLeaderForm.tsx
index c44b225042..2fd5020364 100644
--- a/pioneer/packages/joy-proposals/src/forms/TerminateWorkingGroupLeaderForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/TerminateWorkingGroupLeaderForm.tsx
@@ -13,20 +13,17 @@ import {
   defaultValues as wgFromDefaultValues
 } from './GenericWorkingGroupProposalForm';
 import { withFormContainer } from './FormContainer';
-import './forms.css';
 import _ from 'lodash';
 import Validation from '../validationSchema';
 import { WorkerData } from '@polkadot/joy-utils/types/workingGroups';
 import { getFormErrorLabelsProps } from './errorHandling';
 import FormField, { TextareaFormField } from './FormFields';
 import { Checkbox } from 'semantic-ui-react';
-import { TerminateRoleParameters } from '@joystream/types/proposals';
-import { WorkerId } from '@joystream/types/working-group';
-import { Bytes } from '@polkadot/types';
-import { WorkingGroup, InputValidationLengthConstraint } from '@joystream/types/common';
-import { bool as Bool } from '@polkadot/types/primitive';
+import { InputValidationLengthConstraint } from '@joystream/types/common';
 import { withCalls } from '@polkadot/react-api';
 import { formatBalance } from '@polkadot/util';
+import { SimplifiedTypeInterface } from '@polkadot/joy-utils/types/common';
+import { ITerminateRoleParameters } from '@joystream/types/src/proposals';
 
 export type FormValues = WGFormValues & {
   terminationRationale: string;
@@ -46,13 +43,13 @@ type FormContainerProps = ProposalFormContainerProps<ExportComponentProps> & {
 };
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
-const valuesToTerminateRoleParams = (values: FormValues, lead: WorkerData): TerminateRoleParameters => {
-  return new TerminateRoleParameters({
-    worker_id: new WorkerId(lead.workerId),
-    rationale: new Bytes(values.terminationRationale),
-    slash: lead.stake ? new Bool(values.slashStake) : new Bool(false),
-    working_group: new WorkingGroup(values.workingGroup)
-  });
+const valuesToTerminateRoleParams = (values: FormValues, lead: WorkerData): SimplifiedTypeInterface<ITerminateRoleParameters> => {
+  return {
+    worker_id: lead.workerId,
+    rationale: values.terminationRationale,
+    slash: lead.stake ? values.slashStake : false,
+    working_group: values.workingGroup
+  };
 };
 
 const TerminateWorkingGroupLeaderForm: React.FunctionComponent<FormInnerProps> = props => {
@@ -111,7 +108,7 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
   validationSchema: (props: FormContainerProps) => Yup.object().shape({
     ...genericFormDefaultOptions.validationSchema,
     ...Validation.TerminateWorkingGroupLeaderRole(
-      props.terminationRationaleConstraint || InputValidationLengthConstraint.createWithMaxAllowed()
+      props.terminationRationaleConstraint
     )
   }),
   handleSubmit: genericFormDefaultOptions.handleSubmit,
diff --git a/pioneer/packages/joy-proposals/src/forms/forms.css b/pioneer/packages/joy-proposals/src/forms/forms.css
deleted file mode 100644
index d800c9c497..0000000000
--- a/pioneer/packages/joy-proposals/src/forms/forms.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.Forms {
-  .proposal-form {
-    margin: 0 auto;
-  }
-
-  .ui.form.proposal-form {
-    & label {
-      font-size: 1rem;
-    }
-
-    & input[name="tokens"] {
-      max-width: 16rem;
-    }
-  }
-
-  .form-buttons {
-    display: flex;
-  }
-
-  .ui.dropdown .ui.avatar.image {
-    width: 2em !important;
-  }
-}
diff --git a/pioneer/packages/joy-proposals/src/index.css b/pioneer/packages/joy-proposals/src/index.css
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/pioneer/packages/joy-proposals/src/index.tsx b/pioneer/packages/joy-proposals/src/index.tsx
index ffa06eae0a..ec3cd611ad 100644
--- a/pioneer/packages/joy-proposals/src/index.tsx
+++ b/pioneer/packages/joy-proposals/src/index.tsx
@@ -4,13 +4,10 @@ import { Link } from 'react-router-dom';
 import styled from 'styled-components';
 import { Breadcrumb } from 'semantic-ui-react';
 
-import { AppProps, I18nProps } from '@polkadot/react-components/types';
-import { TransportProvider } from '@polkadot/joy-utils/react/context';
+import { I18nProps } from '@polkadot/react-components/types';
 import { ProposalPreviewList, ProposalFromId, ChooseProposalType } from './Proposal';
 import _ from 'lodash';
 
-import './index.css';
-
 import translate from './translate';
 import NotDone from './NotDone';
 import {
@@ -30,8 +27,12 @@ import {
   SetWorkingGroupLeadRewardForm,
   TerminateWorkingGroupLeaderForm
 } from './forms';
+import { RouteProps as AppMainRouteProps } from '@polkadot/apps-routing/types';
+import style from './style';
+
+const ProposalsMain = styled.main`${style}`;
 
-interface Props extends AppProps, I18nProps {}
+interface Props extends AppMainRouteProps, I18nProps {}
 
 const StyledHeader = styled.header`
   text-align: left;
@@ -46,59 +47,57 @@ function App (props: Props): React.ReactElement<Props> {
   const { basePath } = props;
 
   return (
-    <TransportProvider>
-      <main className="proposal--App">
-        <StyledHeader>
-          <Breadcrumb>
-            <Switch>
-              <Route path={`${basePath}/new/:type`} render={props => (
-                <>
-                  <Breadcrumb.Section link as={Link} to={basePath}>Proposals</Breadcrumb.Section>
-                  <Breadcrumb.Divider icon="right angle" />
-                  <Breadcrumb.Section link as={Link} to={`${basePath}/new`}>New proposal</Breadcrumb.Section>
-                  <Breadcrumb.Divider icon="right angle" />
-                  <Breadcrumb.Section active>{_.startCase(props.match.params.type)}</Breadcrumb.Section>
-                </>
-              )} />
-              <Route path={`${basePath}/new`}>
+    <ProposalsMain className="proposal--App">
+      <StyledHeader>
+        <Breadcrumb>
+          <Switch>
+            <Route path={`${basePath}/new/:type`} render={props => (
+              <>
                 <Breadcrumb.Section link as={Link} to={basePath}>Proposals</Breadcrumb.Section>
                 <Breadcrumb.Divider icon="right angle" />
-                <Breadcrumb.Section active>New proposal</Breadcrumb.Section>
-              </Route>
-              <Route>
-                <Breadcrumb.Section active>Proposals</Breadcrumb.Section>
-              </Route>
-            </Switch>
-          </Breadcrumb>
-        </StyledHeader>
-        <Switch>
-          <Route exact path={`${basePath}/new`} component={ChooseProposalType} />
-          <Route exact path={`${basePath}/new/text`} component={SignalForm} />
-          <Route exact path={`${basePath}/new/runtime-upgrade`} component={RuntimeUpgradeForm} />
-          <Route exact path={`${basePath}/new/set-election-parameters`} component={SetCouncilParamsForm} />
-          <Route exact path={`${basePath}/new/spending`} component={SpendingProposalForm} />
-          <Route exact path={`${basePath}/new/set-lead`} component={SetContentWorkingGroupLeadForm} />
-          <Route
-            exact
-            path={`${basePath}/new/set-content-working-group-mint-capacity`}
-            component={SetContentWorkingGroupMintCapForm}
-          />
-          <Route exact path={`${basePath}/new/set-validator-count`} component={SetMaxValidatorCountForm} />
-          <Route exact path={`${basePath}/new/add-working-group-leader-opening`} component={AddWorkingGroupOpeningForm} />
-          <Route exact path={`${basePath}/new/set-working-group-mint-capacity`} component={SetWorkingGroupMintCapacityForm} />
-          <Route exact path={`${basePath}/new/begin-review-working-group-leader-application`} component={BeginReviewLeaderApplicationsForm} />
-          <Route exact path={`${basePath}/new/fill-working-group-leader-opening`} component={FillWorkingGroupLeaderOpeningForm} />
-          <Route exact path={`${basePath}/new/decrease-working-group-leader-stake`} component={DecreaseWorkingGroupLeadStakeFrom} />
-          <Route exact path={`${basePath}/new/slash-working-group-leader-stake`} component={SlashWorkingGroupLeadStakeForm} />
-          <Route exact path={`${basePath}/new/set-working-group-leader-reward`} component={SetWorkingGroupLeadRewardForm} />
-          <Route exact path={`${basePath}/new/terminate-working-group-leader-role`} component={TerminateWorkingGroupLeaderForm} />
-          <Route exact path={`${basePath}/active`} component={NotDone} />
-          <Route exact path={`${basePath}/finalized`} component={NotDone} />
-          <Route exact path={`${basePath}/:id`} component={ProposalFromId} />
-          <Route component={ProposalPreviewList} />
-        </Switch>
-      </main>
-    </TransportProvider>
+                <Breadcrumb.Section link as={Link} to={`${basePath}/new`}>New proposal</Breadcrumb.Section>
+                <Breadcrumb.Divider icon="right angle" />
+                <Breadcrumb.Section active>{_.startCase(props.match.params.type)}</Breadcrumb.Section>
+              </>
+            )} />
+            <Route path={`${basePath}/new`}>
+              <Breadcrumb.Section link as={Link} to={basePath}>Proposals</Breadcrumb.Section>
+              <Breadcrumb.Divider icon="right angle" />
+              <Breadcrumb.Section active>New proposal</Breadcrumb.Section>
+            </Route>
+            <Route>
+              <Breadcrumb.Section active>Proposals</Breadcrumb.Section>
+            </Route>
+          </Switch>
+        </Breadcrumb>
+      </StyledHeader>
+      <Switch>
+        <Route exact path={`${basePath}/new`} component={ChooseProposalType} />
+        <Route exact path={`${basePath}/new/text`} component={SignalForm} />
+        <Route exact path={`${basePath}/new/runtime-upgrade`} component={RuntimeUpgradeForm} />
+        <Route exact path={`${basePath}/new/set-election-parameters`} component={SetCouncilParamsForm} />
+        <Route exact path={`${basePath}/new/spending`} component={SpendingProposalForm} />
+        <Route exact path={`${basePath}/new/set-lead`} component={SetContentWorkingGroupLeadForm} />
+        <Route
+          exact
+          path={`${basePath}/new/set-content-working-group-mint-capacity`}
+          component={SetContentWorkingGroupMintCapForm}
+        />
+        <Route exact path={`${basePath}/new/set-validator-count`} component={SetMaxValidatorCountForm} />
+        <Route exact path={`${basePath}/new/add-working-group-leader-opening`} component={AddWorkingGroupOpeningForm} />
+        <Route exact path={`${basePath}/new/set-working-group-mint-capacity`} component={SetWorkingGroupMintCapacityForm} />
+        <Route exact path={`${basePath}/new/begin-review-working-group-leader-application`} component={BeginReviewLeaderApplicationsForm} />
+        <Route exact path={`${basePath}/new/fill-working-group-leader-opening`} component={FillWorkingGroupLeaderOpeningForm} />
+        <Route exact path={`${basePath}/new/decrease-working-group-leader-stake`} component={DecreaseWorkingGroupLeadStakeFrom} />
+        <Route exact path={`${basePath}/new/slash-working-group-leader-stake`} component={SlashWorkingGroupLeadStakeForm} />
+        <Route exact path={`${basePath}/new/set-working-group-leader-reward`} component={SetWorkingGroupLeadRewardForm} />
+        <Route exact path={`${basePath}/new/terminate-working-group-leader-role`} component={TerminateWorkingGroupLeaderForm} />
+        <Route exact path={`${basePath}/active`} component={NotDone} />
+        <Route exact path={`${basePath}/finalized`} component={NotDone} />
+        <Route exact path={`${basePath}/:id`} component={ProposalFromId} />
+        <Route component={ProposalPreviewList} />
+      </Switch>
+    </ProposalsMain>
   );
 }
 
diff --git a/pioneer/packages/joy-proposals/src/stories/data/ProposalDetails.mock.ts b/pioneer/packages/joy-proposals/src/stories/data/ProposalDetails.mock.ts
index 474db8c862..e985cc160e 100644
--- a/pioneer/packages/joy-proposals/src/stories/data/ProposalDetails.mock.ts
+++ b/pioneer/packages/joy-proposals/src/stories/data/ProposalDetails.mock.ts
@@ -1,13 +1,13 @@
 import { ParsedProposal } from '@polkadot/joy-utils/types/proposals';
-import { ProposalId } from '@joystream/types/proposals';
+import { createMock } from '@joystream/types';
 
 const mockedProposal: ParsedProposal = {
-  id: new ProposalId(100),
+  id: createMock('ProposalId', 100),
   title: 'Awesome Proposal',
   description: 'Please send me some tokens for coffee',
   createdAtBlock: 36,
   type: 'Text',
-  details: ['Ciao'],
+  details: createMock('ProposalDetails', { Text: 'Ciao' }),
   parameters: {
     approvalQuorumPercentage: 66,
     approvalThresholdPercentage: 80,
diff --git a/pioneer/packages/joy-proposals/src/Proposal/Proposal.css b/pioneer/packages/joy-proposals/src/style.ts
similarity index 80%
rename from pioneer/packages/joy-proposals/src/Proposal/Proposal.css
rename to pioneer/packages/joy-proposals/src/style.ts
index d3dd08ab20..3802a35c76 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/Proposal.css
+++ b/pioneer/packages/joy-proposals/src/style.ts
@@ -1,7 +1,7 @@
-.Proposal {
-  position: relative;
+import { css } from 'styled-components';
 
-  .description {
+export default css`
+  .ui.card .description {
     word-wrap: break-word;
     word-break: break-word;
   }
@@ -26,4 +26,4 @@
   .ui.tabular.list-menu {
     margin-bottom: 2rem;
   }
-}
+`;
diff --git a/pioneer/packages/joy-proposals/src/validationSchema.ts b/pioneer/packages/joy-proposals/src/validationSchema.ts
index 7b3c68c28c..0507461755 100644
--- a/pioneer/packages/joy-proposals/src/validationSchema.ts
+++ b/pioneer/packages/joy-proposals/src/validationSchema.ts
@@ -152,9 +152,9 @@ type FormValuesByType<T extends ValidationTypeKeys> =
   never;
 
 type ValidationSchemaFuncParamsByType<T extends ValidationTypeKeys> =
-  T extends 'AddWorkingGroupLeaderOpening' ? [number, InputValidationLengthConstraint] :
+  T extends 'AddWorkingGroupLeaderOpening' ? [number, InputValidationLengthConstraint | undefined] :
   T extends 'FillWorkingGroupLeaderOpening' ? [number] :
-  T extends 'TerminateWorkingGroupLeaderRole' ? [InputValidationLengthConstraint] :
+  T extends 'TerminateWorkingGroupLeaderRole' ? [InputValidationLengthConstraint | undefined] :
   [];
 
 /* eslint-enable @typescript-eslint/indent */
@@ -178,6 +178,23 @@ function minMaxInt (min: number, max: number, fieldName: string) {
     .max(max, errorMessage(fieldName, min, max));
 }
 
+function minMaxStrFromConstraint(constraint: InputValidationLengthConstraint | undefined, fieldName: string) {
+  const schema = Yup.string().required(`${fieldName} is required!`);
+  return constraint
+    ? (
+      schema
+        .min(
+          constraint.min.toNumber(),
+          `${fieldName} must be at least ${constraint.min.toNumber()} character(s) long`
+        )
+        .max(
+          constraint.max.toNumber(),
+          `${fieldName} cannot be more than ${constraint.max.toNumber()} character(s) long`
+        )
+    )
+    : schema;
+}
+
 const Validation: ValidationType = {
   All: () => ({
     title: Yup.string()
@@ -303,7 +320,7 @@ const Validation: ValidationType = {
         errorMessage('The max validator count', MAX_VALIDATOR_COUNT_MIN, MAX_VALIDATOR_COUNT_MAX)
       )
   }),
-  AddWorkingGroupLeaderOpening: (currentBlock: number, { min: HRTMin, max: HRTMax }: InputValidationLengthConstraint) => ({
+  AddWorkingGroupLeaderOpening: (currentBlock: number, HRTConstraint?: InputValidationLengthConstraint) => ({
     workingGroup: Yup.string(),
     activateAt: Yup.string().required(),
     activateAtBlock: Yup.number()
@@ -346,8 +363,7 @@ const Validation: ValidationType = {
       LEAVE_ROLE_UNSTAKING_MAX,
       'Leave role unstaking period'
     ),
-    humanReadableText: Yup.string()
-      .required()
+    humanReadableText: minMaxStrFromConstraint(HRTConstraint, 'human_readable_text')
       .test(
         'schemaIsValid',
         'Schema validation failed!',
@@ -368,8 +384,6 @@ const Validation: ValidationType = {
           return true;
         }
       )
-      .min(HRTMin.toNumber(), `human_readable_text must be at least ${HRTMin.toNumber()} character(s) long`)
-      .max(HRTMax.toNumber(), `human_readable_text cannot be more than ${HRTMax.toNumber()} character(s) long`)
   }),
   SetWorkingGroupMintCapacity: () => ({
     workingGroup: Yup.string(),
@@ -421,12 +435,9 @@ const Validation: ValidationType = {
     workingGroup: Yup.string(),
     amount: minMaxInt(MIN_REWARD_AMOUNT, MAX_REWARD_AMOUNT, 'Reward amount')
   }),
-  TerminateWorkingGroupLeaderRole: ({ min, max }: InputValidationLengthConstraint) => ({
+  TerminateWorkingGroupLeaderRole: (rationaleConstraint?: InputValidationLengthConstraint) => ({
     workingGroup: Yup.string(),
-    terminationRationale: Yup.string()
-      .required('Termination rationale is required')
-      .min(min.toNumber(), `Termination rationale must be at least ${min.toNumber()} character(s) long`)
-      .max(max.toNumber(), `Termination rationale cannot be more than ${max.toNumber()} character(s) long`),
+    terminationRationale: minMaxStrFromConstraint(rationaleConstraint, 'Termination rationale'),
     slashStake: Yup.boolean()
   })
 };
diff --git a/pioneer/packages/joy-utils-old/src/consts/members.ts b/pioneer/packages/joy-utils/src/consts/members.ts
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/consts/members.ts
rename to pioneer/packages/joy-utils/src/consts/members.ts
diff --git a/pioneer/packages/joy-utils-old/src/consts/proposals.ts b/pioneer/packages/joy-utils/src/consts/proposals.ts
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/consts/proposals.ts
rename to pioneer/packages/joy-utils/src/consts/proposals.ts
diff --git a/pioneer/packages/joy-utils-old/src/consts/workingGroups.ts b/pioneer/packages/joy-utils/src/consts/workingGroups.ts
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/consts/workingGroups.ts
rename to pioneer/packages/joy-utils/src/consts/workingGroups.ts
diff --git a/pioneer/packages/joy-utils/src/react/components/TxButton.tsx b/pioneer/packages/joy-utils/src/react/components/TxButton.tsx
index 73eb3b3bbe..9ada4c4d8b 100644
--- a/pioneer/packages/joy-utils/src/react/components/TxButton.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/TxButton.tsx
@@ -1,67 +1,55 @@
-import React from 'react';
-import { BareProps, ApiProps } from '@polkadot/react-api/types';
-import { QueueTxExtrinsicAdd, PartialQueueTxExtrinsic, TxFailedCallback, TxCallback } from '@polkadot/react-components/Status/types';
+import React, { useContext } from 'react';
+import { TxFailedCallback, TxCallback } from '@polkadot/react-components/Status/types';
 import { Button } from '@polkadot/react-components/index';
-import { QueueConsumer } from '@polkadot/react-components/Status/Context';
-import { withApi } from '@polkadot/react-api/index';
+import QueueContext from '@polkadot/react-components/Status/Context';
 import { assert } from '@polkadot/util';
-import { withMyAccount, MyAccountProps } from '../hocs/accounts';
-import { IconName } from '@fortawesome/fontawesome-svg-core';
-
-type InjectedProps = {
-  queueExtrinsic: QueueTxExtrinsicAdd;
-};
+import { ButtonProps as DefaultButtonProps } from '@polkadot/react-components/Button/types';
+import { StrictButtonProps as SemanticButtonStrictProps, Button as SemanticButton } from 'semantic-ui-react';
+import { useApi } from '@polkadot/react-hooks';
+import { useMyAccount } from '../hooks';
+import _ from 'lodash';
 
 export type OnTxButtonClick = (sendTx: () => void) => void;
 
-type BasicButtonProps = {
+type TxButtonBaseProps = {
   accountId?: string;
   type?: 'submit' | 'button';
-  isBasic?: boolean;
-  isDisabled?: boolean;
-  label?: React.ReactNode;
   params: Array<any>;
   tx: string;
-
-  className?: string;
-  style?: Record<string, string | number>;
-  children?: React.ReactNode;
-  compact?: boolean;
-  icon?: IconName;
-
   onClick?: OnTxButtonClick;
   txFailedCb?: TxFailedCallback;
   txSuccessCb?: TxCallback;
   txStartCb?: () => void;
   txUpdateCb?: TxCallback;
-};
-
-type PropsWithApi = BareProps & ApiProps & MyAccountProps & PartialQueueTxExtrinsic & BasicButtonProps
-
-class TxButtonInner extends React.PureComponent<PropsWithApi & InjectedProps> {
-  render () {
-    const { myAddress, accountId, isDisabled, icon = 'check', onClick } = this.props;
-    const origin = accountId || myAddress;
-
-    return (
-      <Button
-        {...this.props}
-        isDisabled={isDisabled || !origin}
-        icon={icon}
-        onClick={() => {
-          if (onClick) onClick(this.send);
-          else this.send();
-        }}
-      />
-    );
-  }
+}
 
-  private send = (): void => {
-    const {
-      myAddress, accountId, api, params, queueExtrinsic, tx,
-      txFailedCb, txSuccessCb, txStartCb, txUpdateCb
-    } = this.props;
-    const origin = accountId || myAddress;
+// Allows us to exclude those from button props
+const txButtonNotPassedProps: readonly (keyof TxButtonBaseProps)[] = [
+  'accountId',
+  'params',
+  'tx',
+  'onClick',
+  'txFailedCb',
+  'txSuccessCb',
+  'txStartCb',
+  'txUpdateCb'
+ ] as const;
+
+type SemanticButtonProps = SemanticButtonStrictProps & { style?: React.CSSProperties };
+
+type TxButtonProps<ButtonComponentProps extends Record<string, any>> = Omit<ButtonComponentProps, 'onClick'> & TxButtonBaseProps;
+
+function useTxButton(props: TxButtonBaseProps) {
+  const { queueExtrinsic } = useContext(QueueContext);
+  const { api } = useApi();
+  const { state: { address: myAddress } } = useMyAccount();
+  const {
+    accountId, params, tx,
+    txFailedCb, txSuccessCb, txStartCb, txUpdateCb
+  } = props;
+  const origin = accountId || myAddress;
+
+  const sendTx = () => {
     const [section, method] = tx.split('.');
 
     assert(api.tx[section] && api.tx[section][method], `Unable to find api.tx.${section}.${method}`);
@@ -75,24 +63,51 @@ class TxButtonInner extends React.PureComponent<PropsWithApi & InjectedProps> {
       txUpdateCb
     });
   }
+
+  return { origin, sendTx };
 }
 
-class TxButton extends React.PureComponent<PropsWithApi> {
-  render () {
-    return (
-      <QueueConsumer>
-        {({ queueExtrinsic }) => (
-          <TxButtonInner
-            {...this.props}
-            queueExtrinsic={queueExtrinsic}
-          />
-        )}
-      </QueueConsumer>
-    );
-  }
+// Make icon optional since we provide default value
+type DefaultTxButtonProps = TxButtonProps<Omit<DefaultButtonProps, 'icon'> & { icon?: DefaultButtonProps['icon'] }>;
+
+export const DefaultTxButton = (props: DefaultTxButtonProps) => {
+  const { origin, sendTx } = useTxButton(props);
+  const { isDisabled, icon = 'check', onClick } = props;
+  const buttonProps = _.omit(props, txButtonNotPassedProps);
+
+  return (
+    <Button
+      {...buttonProps}
+      isDisabled={isDisabled || !origin}
+      icon={icon}
+      onClick={() => {
+        if (onClick) onClick(sendTx);
+        else sendTx();
+      }}
+    />
+  );
+}
+
+type SemanticTxButtonProps = TxButtonProps<SemanticButtonProps>;
+
+export const SemanticTxButton = (props: SemanticTxButtonProps) => {
+  const { origin, sendTx } = useTxButton(props);
+  const { disabled, onClick } = props;
+  const buttonProps = _.omit(props, txButtonNotPassedProps);
+
+  return (
+    <SemanticButton
+      {...buttonProps}
+      disabled={disabled || !origin}
+      onClick={() => {
+        if (onClick) onClick(sendTx);
+        else sendTx();
+      }}
+    />
+  );
 }
 
-export default withApi(withMyAccount(TxButton));
+export default DefaultTxButton;
 
 // const SubstrateTxButton = withApi(withMyAccount(TxButton));
 
diff --git a/pioneer/packages/joy-utils-old/src/react/components/working-groups/ApplicationDetails.tsx b/pioneer/packages/joy-utils/src/react/components/working-groups/ApplicationDetails.tsx
similarity index 97%
rename from pioneer/packages/joy-utils-old/src/react/components/working-groups/ApplicationDetails.tsx
rename to pioneer/packages/joy-utils/src/react/components/working-groups/ApplicationDetails.tsx
index 5fc74ad45a..efb8884322 100644
--- a/pioneer/packages/joy-utils-old/src/react/components/working-groups/ApplicationDetails.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/working-groups/ApplicationDetails.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { ParsedApplication } from '../../../types/workingGroups';
-import { ProfilePreviewFromStruct as MemberPreview } from '../../../MemberProfilePreview';
+import { ProfilePreviewFromStruct as MemberPreview } from '../MemberProfilePreview';
 import { useTransport, usePromise } from '../../hooks';
 import { Item, Label, Button } from 'semantic-ui-react';
 import { formatBalance } from '@polkadot/util';
diff --git a/pioneer/packages/joy-utils-old/src/react/components/working-groups/LeadInfo.tsx b/pioneer/packages/joy-utils/src/react/components/working-groups/LeadInfo.tsx
similarity index 95%
rename from pioneer/packages/joy-utils-old/src/react/components/working-groups/LeadInfo.tsx
rename to pioneer/packages/joy-utils/src/react/components/working-groups/LeadInfo.tsx
index 23f9bbbc2a..17840f8ca3 100644
--- a/pioneer/packages/joy-utils-old/src/react/components/working-groups/LeadInfo.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/working-groups/LeadInfo.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { WorkerData } from '../../../types/workingGroups';
-import { ProfilePreviewFromStruct as MemberPreview } from '../../../MemberProfilePreview';
+import { ProfilePreviewFromStruct as MemberPreview } from '../MemberProfilePreview';
 import { Label, Message } from 'semantic-ui-react';
 import { formatBalance } from '@polkadot/util';
 import { WorkingGroupKey } from '@joystream/types/common';
diff --git a/pioneer/packages/joy-utils/src/react/hooks/index.ts b/pioneer/packages/joy-utils/src/react/hooks/index.ts
index fdea80a3df..6b3b582558 100644
--- a/pioneer/packages/joy-utils/src/react/hooks/index.ts
+++ b/pioneer/packages/joy-utils/src/react/hooks/index.ts
@@ -2,3 +2,4 @@ export { default as useMyAccount } from './useMyAccount';
 export { default as useMyMembership } from './useMyMembership';
 export { default as usePromise } from './usePromise';
 export { default as useTransport } from './useTransport';
+export { default as useProposalSubscription } from './proposals/useProposalSubscription';
diff --git a/pioneer/packages/joy-utils-old/src/react/hooks/proposals/useProposalSubscription.tsx b/pioneer/packages/joy-utils/src/react/hooks/proposals/useProposalSubscription.tsx
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/react/hooks/proposals/useProposalSubscription.tsx
rename to pioneer/packages/joy-utils/src/react/hooks/proposals/useProposalSubscription.tsx
diff --git a/pioneer/packages/joy-utils/src/react/hooks/usePromise.tsx b/pioneer/packages/joy-utils/src/react/hooks/usePromise.tsx
index cb4f8f8190..db5d6e8c2c 100644
--- a/pioneer/packages/joy-utils/src/react/hooks/usePromise.tsx
+++ b/pioneer/packages/joy-utils/src/react/hooks/usePromise.tsx
@@ -2,7 +2,7 @@ import { useState, useEffect, useRef } from 'react';
 import { normalizeError } from '../../functions/misc';
 import { randomBytes } from 'crypto';
 
-export type UsePromiseReturnValues<T> = [T, string | null, boolean];
+export type UsePromiseReturnValues<T> = [T, string | null, boolean, () => void];
 
 export default function usePromise<T> (
   promise: () => Promise<T>,
@@ -65,5 +65,5 @@ export default function usePromise<T> (
 
   const { value, error, isPending } = state;
 
-  return [value, error, isPending];
+  return [value, error, isPending, executeAndSubscribePromise];
 }
diff --git a/pioneer/packages/joy-utils/src/transport/base.ts b/pioneer/packages/joy-utils/src/transport/base.ts
index 0e37496ee2..90384bf27f 100644
--- a/pioneer/packages/joy-utils/src/transport/base.ts
+++ b/pioneer/packages/joy-utils/src/transport/base.ts
@@ -1,4 +1,7 @@
 import { ApiPromise } from '@polkadot/api';
+import { UInt } from '@polkadot/types/codec';
+import { Codec, CodecArg } from '@polkadot/types/types';
+import { QueryableStorageEntry } from '@polkadot/api/types/storage';
 import { APIQueryCache } from './APIQueryCache';
 
 export default abstract class BaseTransport {
@@ -63,4 +66,18 @@ export default abstract class BaseTransport {
 
     return this.api.query[module][method];
   }
+
+  protected async entriesByIds<IDType extends UInt, ValueType extends Codec> (
+    apiMethod: QueryableStorageEntry<'promise'>,
+    firstKey?: CodecArg // First key in case of double maps
+  ): Promise<[IDType, ValueType][]> {
+    const entries: [IDType, ValueType][] = (await apiMethod.entries<ValueType>(firstKey))
+      .map(([storageKey, value]) => ([
+        // If double-map (first key is provided), we map entries by second key
+        storageKey.args[firstKey !== undefined ? 1 : 0] as IDType,
+        value
+      ]));
+
+    return entries.sort((a, b) => a[0].toNumber() - b[0].toNumber());
+  }
 }
diff --git a/pioneer/packages/joy-utils-old/src/transport/chain.ts b/pioneer/packages/joy-utils/src/transport/chain.ts
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/transport/chain.ts
rename to pioneer/packages/joy-utils/src/transport/chain.ts
diff --git a/pioneer/packages/joy-utils-old/src/transport/contentWorkingGroup.ts b/pioneer/packages/joy-utils/src/transport/contentWorkingGroup.ts
similarity index 72%
rename from pioneer/packages/joy-utils-old/src/transport/contentWorkingGroup.ts
rename to pioneer/packages/joy-utils/src/transport/contentWorkingGroup.ts
index b6500c3d95..222377ebe4 100644
--- a/pioneer/packages/joy-utils-old/src/transport/contentWorkingGroup.ts
+++ b/pioneer/packages/joy-utils/src/transport/contentWorkingGroup.ts
@@ -1,12 +1,11 @@
 import { Membership } from '@joystream/types/members';
-import { u128, Vec, Option } from '@polkadot/types/';
+import { u128, Option } from '@polkadot/types/';
 import BaseTransport from './base';
 import { MintId, Mint } from '@joystream/types/mint';
 import { LeadId, Lead } from '@joystream/types/content-working-group';
 import { ApiPromise } from '@polkadot/api';
 import MembersTransport from './members';
-import { APIQueryCache } from '../APIQueryCache';
-import { SingleLinkedMapEntry } from '..';
+import { APIQueryCache } from './APIQueryCache';
 
 export default class ContentWorkingGroupTransport extends BaseTransport {
   private membersT: MembersTransport;
@@ -18,8 +17,8 @@ export default class ContentWorkingGroupTransport extends BaseTransport {
 
   async currentMintCap (): Promise<number> {
     const WGMintId = (await this.contentWorkingGroup.mint()) as MintId;
-    const WGMint = (await this.minting.mints(WGMintId)) as Vec<Mint>;
-    return (WGMint[0].get('capacity') as u128).toNumber();
+    const WGMint = (await this.minting.mints(WGMintId)) as Mint;
+    return (WGMint.get('capacity') as u128).toNumber();
   }
 
   async currentLead (): Promise<{ id: number; profile: Membership } | null> {
@@ -28,9 +27,9 @@ export default class ContentWorkingGroupTransport extends BaseTransport {
 
     if (!leadId) return null;
 
-    const lead = new SingleLinkedMapEntry(Lead, await this.contentWorkingGroup.leadById(leadId)).value;
+    const lead = await this.contentWorkingGroup.leadById(leadId) as Lead;
 
-    if (!lead.stage.isOfType('Active')) {
+    if (lead.isEmpty || !lead.stage.isOfType('Active')) {
       return null;
     }
 
diff --git a/pioneer/packages/joy-utils-old/src/transport/council.ts b/pioneer/packages/joy-utils/src/transport/council.ts
similarity index 75%
rename from pioneer/packages/joy-utils-old/src/transport/council.ts
rename to pioneer/packages/joy-utils/src/transport/council.ts
index f962450f20..13fd29dd6e 100644
--- a/pioneer/packages/joy-utils-old/src/transport/council.ts
+++ b/pioneer/packages/joy-utils/src/transport/council.ts
@@ -1,14 +1,13 @@
 import { ParsedMember } from '../types/members';
 import BaseTransport from './base';
-import { Seats, ElectionParameters } from '@joystream/types/council';
+import { Seats, IElectionParameters } from '@joystream/types/council';
 import { MemberId, Membership } from '@joystream/types/members';
 import { u32, Vec } from '@polkadot/types/';
 import { Balance, BlockNumber } from '@polkadot/types/interfaces';
-import { FIRST_MEMBER_ID } from '../consts/members';
 import { ApiPromise } from '@polkadot/api';
 import MembersTransport from './members';
 import ChainTransport from './chain';
-import { APIQueryCache } from '../APIQueryCache';
+import { APIQueryCache } from './APIQueryCache';
 
 export default class CouncilTransport extends BaseTransport {
   private membersT: MembersTransport;
@@ -46,28 +45,21 @@ export default class CouncilTransport extends BaseTransport {
   async membersExceptCouncil (): Promise<{ id: number; profile: Membership }[]> {
     // Council members to filter out
     const activeCouncil = (await this.council.activeCouncil()) as Seats;
-    const membersCount = ((await this.members.nextMemberId()) as MemberId).toNumber();
-    const profiles: { id: number; profile: Membership }[] = [];
-    for (let id = FIRST_MEMBER_ID.toNumber(); id < membersCount; ++id) {
-      const profile = (await this.membersT.membershipById(new MemberId(id)));
-      if (
-        !profile ||
+
+    return (await this.membersT.allMembers())
+      .filter(([memberId, member]) => (
         // Filter out council members
-        activeCouncil.some(
-          seat =>
-            seat.member.toString() === profile.controller_account.toString() ||
-            seat.member.toString() === profile.root_account.toString()
+        !activeCouncil.some((seat) =>
+            seat.member.eq(member.controller_account) ||
+            seat.member.eq(member.root_account)
         )
-      ) {
-        continue;
-      }
-      profiles.push({ id, profile });
-    }
-
-    return profiles;
+      ))
+      .map(([memberId, member]) => (
+        { id: memberId.toNumber(), profile: member }
+      ));
   }
 
-  async electionParameters (): Promise<ElectionParameters> {
+  async electionParameters (): Promise<IElectionParameters> {
     const announcing_period = (await this.councilElection.announcingPeriod()) as BlockNumber;
     const voting_period = (await this.councilElection.votingPeriod()) as BlockNumber;
     const revealing_period = (await this.councilElection.revealingPeriod()) as BlockNumber;
@@ -77,7 +69,7 @@ export default class CouncilTransport extends BaseTransport {
     const candidacy_limit = (await this.councilElection.candidacyLimit()) as u32;
     const council_size = (await this.councilElection.councilSize()) as u32;
 
-    return new ElectionParameters({
+    return {
       announcing_period,
       voting_period,
       revealing_period,
@@ -86,6 +78,6 @@ export default class CouncilTransport extends BaseTransport {
       min_voting_stake,
       candidacy_limit,
       council_size
-    });
+    }
   }
 }
diff --git a/pioneer/packages/joy-utils/src/transport/index.ts b/pioneer/packages/joy-utils/src/transport/index.ts
index 3060094ec0..d57b303400 100644
--- a/pioneer/packages/joy-utils/src/transport/index.ts
+++ b/pioneer/packages/joy-utils/src/transport/index.ts
@@ -1,34 +1,34 @@
 import { ApiPromise } from '@polkadot/api';
-// import ChainTransport from './chain';
-// import ContentWorkingGroupTransport from './contentWorkingGroup';
-// import ProposalsTransport from './proposals';
+import ChainTransport from './chain';
+import ContentWorkingGroupTransport from './contentWorkingGroup';
+import ProposalsTransport from './proposals';
 import MembersTransport from './members';
-// import CouncilTransport from './council';
-// import ValidatorsTransport from './validators';
-// import WorkingGroupsTransport from './workingGroups';
+import CouncilTransport from './council';
+import ValidatorsTransport from './validators';
+import WorkingGroupsTransport from './workingGroups';
 import { APIQueryCache } from './APIQueryCache';
 
 export default class Transport {
   protected api: ApiPromise;
   protected cacheApi: APIQueryCache;
   // Specific transports
-  // public chain: ChainTransport;
+  public chain: ChainTransport;
   public members: MembersTransport;
-  // public council: CouncilTransport;
-  // public proposals: ProposalsTransport;
-  // public contentWorkingGroup: ContentWorkingGroupTransport;
-  // public validators: ValidatorsTransport;
-  // public workingGroups: WorkingGroupsTransport;
+  public council: CouncilTransport;
+  public proposals: ProposalsTransport;
+  public contentWorkingGroup: ContentWorkingGroupTransport;
+  public validators: ValidatorsTransport;
+  public workingGroups: WorkingGroupsTransport;
 
   constructor (api: ApiPromise) {
     this.api = api;
     this.cacheApi = new APIQueryCache(api);
-    // this.chain = new ChainTransport(api, this.cacheApi);
+    this.chain = new ChainTransport(api, this.cacheApi);
     this.members = new MembersTransport(api, this.cacheApi);
-    // this.validators = new ValidatorsTransport(api, this.cacheApi);
-    // this.council = new CouncilTransport(api, this.cacheApi, this.members, this.chain);
-    // this.contentWorkingGroup = new ContentWorkingGroupTransport(api, this.cacheApi, this.members);
-    // this.proposals = new ProposalsTransport(api, this.cacheApi, this.members, this.chain, this.council);
-    // this.workingGroups = new WorkingGroupsTransport(api, this.cacheApi, this.members);
+    this.validators = new ValidatorsTransport(api, this.cacheApi);
+    this.council = new CouncilTransport(api, this.cacheApi, this.members, this.chain);
+    this.contentWorkingGroup = new ContentWorkingGroupTransport(api, this.cacheApi, this.members);
+    this.proposals = new ProposalsTransport(api, this.cacheApi, this.members, this.chain, this.council);
+    this.workingGroups = new WorkingGroupsTransport(api, this.cacheApi, this.members);
   }
 }
diff --git a/pioneer/packages/joy-utils/src/transport/members.ts b/pioneer/packages/joy-utils/src/transport/members.ts
index 059b1a2f61..eafb26035b 100644
--- a/pioneer/packages/joy-utils/src/transport/members.ts
+++ b/pioneer/packages/joy-utils/src/transport/members.ts
@@ -8,8 +8,7 @@ export default class MembersTransport extends BaseTransport {
   async membershipById (id: MemberId | number): Promise<Membership | null> {
     const member = (await this.members.membershipById(id)) as Membership;
 
-    // Can't just use member.isEmpty because member.suspended is Bool (which isEmpty method always returns false)
-    return member.handle.isEmpty ? null : member;
+    return member.isEmpty ? null : member;
   }
 
   // Throws if profile not found
@@ -39,4 +38,8 @@ export default class MembersTransport extends BaseTransport {
       profile
     };
   }
+
+  async allMembers(): Promise<[MemberId, Membership][]> {
+    return this.entriesByIds<MemberId, Membership>(this.api.query.members.membershipById);
+  }
 }
diff --git a/pioneer/packages/joy-utils-old/src/transport/proposals.ts b/pioneer/packages/joy-utils/src/transport/proposals.ts
similarity index 77%
rename from pioneer/packages/joy-utils-old/src/transport/proposals.ts
rename to pioneer/packages/joy-utils/src/transport/proposals.ts
index d3e088ee37..c3617c7146 100644
--- a/pioneer/packages/joy-utils-old/src/transport/proposals.ts
+++ b/pioneer/packages/joy-utils/src/transport/proposals.ts
@@ -8,7 +8,8 @@ import {
   ParsedDiscussion,
   DiscussionContraints,
   ProposalStatusFilter,
-  ProposalsBatch
+  ProposalsBatch,
+  ParsedProposalDetails
 } from '../types/proposals';
 import { ParsedMember } from '../types/members';
 
@@ -17,13 +18,12 @@ import BaseTransport from './base';
 import { ThreadId, PostId } from '@joystream/types/common';
 import { Proposal, ProposalId, VoteKind, DiscussionThread, DiscussionPost, ProposalDetails, Finalized, ProposalDecisionStatus } from '@joystream/types/proposals';
 import { MemberId } from '@joystream/types/members';
-import { u32, u64, Bytes, Null } from '@polkadot/types/';
+import { u32, Bytes, Null } from '@polkadot/types/';
 import { BalanceOf } from '@polkadot/types/interfaces';
 
 import { bytesToString } from '../functions/misc';
 import _ from 'lodash';
 import { metadata as proposalsConsts, apiMethods as proposalsApiMethods } from '../consts/proposals';
-import { FIRST_MEMBER_ID } from '../consts/members';
 
 import { ApiPromise } from '@polkadot/api';
 import MembersTransport from './members';
@@ -31,12 +31,11 @@ import ChainTransport from './chain';
 import CouncilTransport from './council';
 
 import { blake2AsHex } from '@polkadot/util-crypto';
-import { APIQueryCache } from '../APIQueryCache';
-import { MultipleLinkedMapEntry } from '../LinkedMapEntry';
+import { APIQueryCache } from './APIQueryCache';
 
 type ProposalDetailsCacheEntry = {
   type: ProposalType;
-  details: any[];
+  details: ParsedProposalDetails;
 }
 type ProposalDetailsCache = {
   [id: number]: ProposalDetailsCacheEntry | undefined;
@@ -83,18 +82,14 @@ export default class ProposalsTransport extends BaseTransport {
     if (cachedProposalDetails) {
       return cachedProposalDetails;
     } else {
-      // TODO: The right typesafe handling with JoyEnum would be very useful here
       const rawDetails = await this.rawProposalDetails(id);
-      const type = rawDetails.type as ProposalType;
-      let details: any[];
+      const type = rawDetails.type;
+      let details: ParsedProposalDetails = rawDetails;
       if (type === 'RuntimeUpgrade') {
         // In case of RuntimeUpgrade proposal we override details to just contain the hash and filesize
         // (instead of full WASM bytecode)
         const wasm = rawDetails.value as Bytes;
         details = [blake2AsHex(wasm, 256), wasm.length];
-      } else {
-        const detailsJSON = rawDetails.value.toJSON();
-        details = Array.isArray(detailsJSON) ? detailsJSON : [detailsJSON];
       }
       // Save entry in cache
       this.proposalDetailsCache[id.toNumber()] = { type, details };
@@ -135,18 +130,15 @@ export default class ProposalsTransport extends BaseTransport {
 
   async proposalsIds () {
     const total: number = (await this.proposalCount()).toNumber();
-    return Array.from({ length: total }, (_, i) => new ProposalId(i + 1));
+    return Array.from({ length: total }, (_, i) => this.api.createType('ProposalId', i + 1));
   }
 
   async activeProposalsIds () {
-    const result = new MultipleLinkedMapEntry(ProposalId, Null, await this.proposalsEngine.activeProposalIds());
-    // linked_keys will be [0] if there are no active proposals!
-    return result.linked_keys.join('') !== '0' ? result.linked_keys : [];
-  }
+    const result = await this.entriesByIds<ProposalId, Null>(
+      this.api.query.proposalsEngine.activeProposalIds
+    )
 
-  async proposals () {
-    const ids = await this.proposalsIds();
-    return Promise.all(ids.map(id => this.proposalById(id)));
+    return result.map(([proposalId]) => proposalId);
   }
 
   async proposalsBatch (status: ProposalStatusFilter, batchNumber = 1, batchSize = 5): Promise<ProposalsBatch> {
@@ -157,11 +149,10 @@ export default class ProposalsTransport extends BaseTransport {
 
     if (status !== 'All' && status !== 'Active') {
       rawProposalsWithIds = rawProposalsWithIds.filter(({ proposal }) => {
-        if (proposal.status.type !== 'Finalized') {
+        if (!proposal.status.isOfType('Finalized')) {
           return false;
         }
-        const finalStatus = ((proposal.status.value as Finalized).get('proposalStatus') as ProposalDecisionStatus);
-        return finalStatus.type === status;
+        return proposal.status.asType('Finalized').proposalStatus.type === status;
       });
     }
 
@@ -177,11 +168,6 @@ export default class ProposalsTransport extends BaseTransport {
     };
   }
 
-  async proposedBy (member: MemberId) {
-    const proposals = await this.proposals();
-    return proposals.filter(({ proposerId }) => member.eq(proposerId));
-  }
-
   async voteByProposalAndMember (proposalId: ProposalId, voterId: MemberId): Promise<VoteKind | null> {
     const vote = (await this.proposalsEngine.voteExistsByProposalByVoter(proposalId, voterId)) as VoteKind;
     const hasVoted = (await this.api.query.proposalsEngine.voteExistsByProposalByVoter.size(proposalId, voterId)).toNumber();
@@ -189,23 +175,18 @@ export default class ProposalsTransport extends BaseTransport {
   }
 
   async votes (proposalId: ProposalId): Promise<ProposalVotes> {
-    const voteEntries = await this.doubleMapEntries(
-      'proposalsEngine.voteExistsByProposalByVoter', // Double map of intrest
-      proposalId, // First double-map key value
-      (v) => new VoteKind(v), // Converter from hex
-      async () => (await this.membersT.nextMemberId()), // A function that returns the number of iterations to go through when chekcing possible values for the second double-map key (memberId)
-      FIRST_MEMBER_ID.toNumber() // Min. possible value for second double-map key (memberId)
+    const voteEntries = await this.entriesByIds<MemberId, VoteKind>(
+      this.api.query.proposalsEngine.voteExistsByProposalByVoter,
+      proposalId
     );
 
     const votesWithMembers: ProposalVote[] = [];
-    for (const voteEntry of voteEntries) {
-      const memberId = voteEntry.secondKey;
-      const vote = voteEntry.value;
+    for (const [memberId, vote] of voteEntries) {
       const parsedMember = (await this.membersT.expectedMembership(memberId)).toJSON() as ParsedMember;
       votesWithMembers.push({
         vote,
         member: {
-          memberId: new MemberId(memberId),
+          memberId,
           ...parsedMember
         }
       });
@@ -252,17 +233,15 @@ export default class ProposalsTransport extends BaseTransport {
       return null;
     }
     const thread = (await this.proposalsDiscussion.threadById(threadId)) as DiscussionThread;
-    const postEntries = await this.doubleMapEntries(
-      'proposalsDiscussion.postThreadIdByPostId',
-      threadId,
-      (v) => new DiscussionPost(v),
-      async () => ((await this.proposalsDiscussion.postCount()) as u64).toNumber()
+    const postEntries = await this.entriesByIds<PostId, DiscussionPost>(
+      this.api.query.proposalsDiscussion.postThreadIdByPostId,
+      threadId
     );
 
     const parsedPosts: ParsedPost[] = [];
-    for (const { secondKey: postId, value: post } of postEntries) {
+    for (const [postId, post] of postEntries) {
       parsedPosts.push({
-        postId: new PostId(postId),
+        postId: postId,
         threadId: post.thread_id,
         text: bytesToString(post.text),
         createdAt: await this.chainT.blockTimestamp(post.created_at.toNumber()),
diff --git a/pioneer/packages/joy-utils-old/src/transport/validators.ts b/pioneer/packages/joy-utils/src/transport/validators.ts
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/transport/validators.ts
rename to pioneer/packages/joy-utils/src/transport/validators.ts
diff --git a/pioneer/packages/joy-utils-old/src/transport/workingGroups.ts b/pioneer/packages/joy-utils/src/transport/workingGroups.ts
similarity index 61%
rename from pioneer/packages/joy-utils-old/src/transport/workingGroups.ts
rename to pioneer/packages/joy-utils/src/transport/workingGroups.ts
index afeaad6590..c97311f3f8 100644
--- a/pioneer/packages/joy-utils-old/src/transport/workingGroups.ts
+++ b/pioneer/packages/joy-utils/src/transport/workingGroups.ts
@@ -3,16 +3,14 @@ import { Balance } from '@polkadot/types/interfaces';
 import BaseTransport from './base';
 import { ApiPromise } from '@polkadot/api';
 import MembersTransport from './members';
-import { SingleLinkedMapEntry } from '../index';
 import { Worker, WorkerId, Opening as WGOpening, Application as WGApplication, OpeningTypeKey } from '@joystream/types/working-group';
 import { apiModuleByGroup } from '../consts/workingGroups';
 import { WorkingGroupKey } from '@joystream/types/common';
 import { WorkerData, OpeningData, ParsedApplication } from '../types/workingGroups';
 import { OpeningId, ApplicationId, Opening, Application, ActiveOpeningStageKey } from '@joystream/types/hiring';
-import { MultipleLinkedMapEntry } from '../LinkedMapEntry';
 import { Stake, StakeId } from '@joystream/types/stake';
-import { RewardRelationshipId, RewardRelationship } from '@joystream/types/recurring-rewards';
-import { APIQueryCache } from '../APIQueryCache';
+import { RewardRelationship } from '@joystream/types/recurring-rewards';
+import { APIQueryCache } from './APIQueryCache';
 
 export default class WorkingGroupsTransport extends BaseTransport {
   private membersT: MembersTransport;
@@ -22,19 +20,20 @@ export default class WorkingGroupsTransport extends BaseTransport {
     this.membersT = membersTransport;
   }
 
+  protected apiQueryByGroup(group: WorkingGroupKey) {
+    const module = apiModuleByGroup[group];
+    return this.api.query[module];
+  }
+
   protected queryByGroup (group: WorkingGroupKey) {
     const module = apiModuleByGroup[group];
     return this.cacheApi.query[module];
   }
 
   public async groupMemberById (group: WorkingGroupKey, workerId: number): Promise<WorkerData | null> {
-    const workerLink = new SingleLinkedMapEntry(
-      Worker,
-      await this.queryByGroup(group).workerById(workerId)
-    );
-    const worker = workerLink.value;
+    const worker = await this.queryByGroup(group).workerById(workerId) as Worker;
 
-    if (!worker.is_active) {
+    if (worker.isEmpty) {
       return null;
     }
 
@@ -43,7 +42,7 @@ export default class WorkingGroupsTransport extends BaseTransport {
       : undefined;
 
     const reward = worker.reward_relationship.isSome
-      ? (await this.rewardRelationship(worker.reward_relationship.unwrap()))
+      ? (await this.recurringRewards.rewardRelationships(worker.reward_relationship.unwrap()) as RewardRelationship)
       : undefined;
 
     const profile = await this.membersT.expectedMembership(worker.member_id);
@@ -64,21 +63,18 @@ export default class WorkingGroupsTransport extends BaseTransport {
   }
 
   public async allOpenings (group: WorkingGroupKey, type?: OpeningTypeKey): Promise<OpeningData[]> {
-    const nextId = (await this.queryByGroup(group).nextOpeningId()) as OpeningId;
-
-    if (nextId.eq(0)) {
-      return [];
-    }
-
-    const query = this.queryByGroup(group).openingById();
-    const result = new MultipleLinkedMapEntry(OpeningId, WGOpening, await query);
+    const wgOpeningEntries = await this.entriesByIds<OpeningId, WGOpening>(this.apiQueryByGroup(group).openingById);
+    const hiringOpenings = await Promise.all(
+      wgOpeningEntries.map(
+        ([wgOpeningId, wgOpening]) => this.hiring.openingById(wgOpening.hiring_opening_id)
+      )
+    ) as Opening[];
+
+    return hiringOpenings
+      .map((hiringOpening, index) => {
+        const id = wgOpeningEntries[index][0];
+        const opening = wgOpeningEntries[index][1];
 
-    const { linked_keys: openingIds, linked_values: openings } = result;
-    return (await Promise.all(openings.map(opening => this.hiring.openingById(opening.hiring_opening_id))))
-      .map((hiringOpeningRes, index) => {
-        const id = openingIds[index];
-        const opening = openings[index];
-        const hiringOpening = (new SingleLinkedMapEntry(Opening, hiringOpeningRes)).value;
         return { id, opening, hiringOpening };
       })
       .filter(openingData => !type || openingData.opening.opening_type.isOfType(type));
@@ -93,42 +89,24 @@ export default class WorkingGroupsTransport extends BaseTransport {
   }
 
   async wgApplicationById (group: WorkingGroupKey, wgApplicationId: number | ApplicationId): Promise<WGApplication> {
-    const nextAppId = await this.queryByGroup(group).nextApplicationId() as ApplicationId;
+    const wgApplication = (await this.queryByGroup(group).applicationById(wgApplicationId)) as WGApplication;
 
-    if (wgApplicationId < 0 || wgApplicationId >= nextAppId.toNumber()) {
-      throw new Error(`Invalid working group application ID (${wgApplicationId})!`);
+    if (wgApplication.isEmpty) {
+      throw new Error(`Working group application not found (ID: ${wgApplicationId})!`);
     }
 
-    return new SingleLinkedMapEntry(
-      WGApplication,
-      await this.queryByGroup(group).applicationById(wgApplicationId)
-    ).value;
-  }
-
-  protected async hiringApplicationById (id: number | ApplicationId): Promise<Application> {
-    return new SingleLinkedMapEntry(
-      Application,
-      await this.hiring.applicationById(id)
-    ).value;
+    return wgApplication;
   }
 
   protected async stakeValue (stakeId: StakeId): Promise<Balance> {
-    return new SingleLinkedMapEntry(
-      Stake,
-      await this.stake.stakes(stakeId)
-    ).value.value;
-  }
+    const stake = await this.stake.stakes(stakeId) as Stake;
 
-  protected async rewardRelationship (relationshipId: RewardRelationshipId): Promise<RewardRelationship> {
-    return new SingleLinkedMapEntry(
-      RewardRelationship,
-      await this.recurringRewards.rewardRelationships(relationshipId)
-    ).value;
+    return stake.value;
   }
 
   protected async parseApplication (wgApplicationId: number, wgApplication: WGApplication): Promise<ParsedApplication> {
     const appId = wgApplication.application_id;
-    const application = await this.hiringApplicationById(appId);
+    const application = await this.hiring.applicationById(appId) as Application;
 
     const { active_role_staking_id: roleStakingId, active_application_staking_id: appStakingId } = application;
 
@@ -152,18 +130,20 @@ export default class WorkingGroupsTransport extends BaseTransport {
   }
 
   async openingApplications (group: WorkingGroupKey, wgOpeningId: number): Promise<ParsedApplication[]> {
-    const applications: ParsedApplication[] = [];
-
-    const nextAppId = await this.queryByGroup(group).nextApplicationId() as ApplicationId;
-    for (let i = 0; i < nextAppId.toNumber(); i++) {
-      const wgApplication = await this.wgApplicationById(group, i);
-      if (wgApplication.opening_id.toNumber() !== wgOpeningId) {
-        continue;
-      }
-      applications.push(await this.parseApplication(i, wgApplication));
-    }
-
-    return applications;
+    const wgApplicationsEntries =
+      await this.entriesByIds<ApplicationId, WGApplication>(this.apiQueryByGroup(group).applicationById);
+
+    return Promise.all(
+      wgApplicationsEntries
+        .filter(
+          ([wgApplicationById, wgApplication]) => wgApplication.opening_id.eq(wgOpeningId)
+        )
+        .map(
+          ([wgApplicationId, wgApplication]) => (
+            this.parseApplication(wgApplicationId.toNumber(), wgApplication)
+          )
+        )
+    );
   }
 
   async openingActiveApplications (group: WorkingGroupKey, wgOpeningId: number): Promise<ParsedApplication[]> {
diff --git a/pioneer/packages/joy-utils-old/src/types/common.ts b/pioneer/packages/joy-utils/src/types/common.ts
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/types/common.ts
rename to pioneer/packages/joy-utils/src/types/common.ts
diff --git a/pioneer/packages/joy-utils-old/src/types/proposals.ts b/pioneer/packages/joy-utils/src/types/proposals.ts
similarity index 83%
rename from pioneer/packages/joy-utils-old/src/types/proposals.ts
rename to pioneer/packages/joy-utils/src/types/proposals.ts
index c6d9f44110..832f11e3e5 100644
--- a/pioneer/packages/joy-utils-old/src/types/proposals.ts
+++ b/pioneer/packages/joy-utils/src/types/proposals.ts
@@ -2,6 +2,7 @@ import { ProposalId, VoteKind } from '@joystream/types/proposals';
 import { MemberId, Membership } from '@joystream/types/members';
 import { ThreadId, PostId } from '@joystream/types/common';
 import { ParsedMember } from './members';
+import { ProposalDetails } from '@joystream/types/src/proposals';
 
 export const ProposalTypes = [
   'Text',
@@ -28,6 +29,18 @@ export type ProposalType = typeof ProposalTypes[number];
 export const proposalStatusFilters = ['All', 'Active', 'Canceled', 'Approved', 'Rejected', 'Slashed', 'Expired'] as const;
 export type ProposalStatusFilter = typeof proposalStatusFilters[number];
 
+// Overriden for better optimalization
+export type RuntimeUpgradeProposalDetails = [
+  string, // hash as hex
+  number // file size in bytes
+]
+
+export type ParsedProposalDetails = ProposalDetails | RuntimeUpgradeProposalDetails;
+
+export type SpecificProposalDetails<T extends keyof ProposalDetails['typeDefinitions']> =
+  T extends 'RuntimeUpgrade' ? RuntimeUpgradeProposalDetails :
+  InstanceType<ProposalDetails['typeDefinitions'][Exclude<T, 'RuntimeUpgrade'>]>;
+
 export type ParsedProposal = {
   id: ProposalId;
   type: ProposalType;
@@ -38,7 +51,7 @@ export type ParsedProposal = {
   proposerId: number;
   createdAtBlock: number;
   createdAt: Date;
-  details: any[];
+  details: ParsedProposalDetails;
   votingResults: any;
   parameters: {
     approvalQuorumPercentage: number;
diff --git a/pioneer/packages/joy-utils-old/src/types/storageProviders.ts b/pioneer/packages/joy-utils/src/types/storageProviders.ts
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/types/storageProviders.ts
rename to pioneer/packages/joy-utils/src/types/storageProviders.ts
diff --git a/pioneer/packages/joy-utils-old/src/types/workingGroups.ts b/pioneer/packages/joy-utils/src/types/workingGroups.ts
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/types/workingGroups.ts
rename to pioneer/packages/joy-utils/src/types/workingGroups.ts
diff --git a/pioneer/packages/old-apps/apps-routing/src/joy-proposals.ts b/pioneer/packages/old-apps/apps-routing/src/joy-proposals.ts
deleted file mode 100644
index a2903ab127..0000000000
--- a/pioneer/packages/old-apps/apps-routing/src/joy-proposals.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Routes } from './types';
-
-import Proposals from '@polkadot/joy-proposals/';
-
-export default [
-  {
-    Component: Proposals,
-    display: {
-      needsApi: ['query.proposalsEngine.proposalCount']
-    },
-    i18n: {
-      defaultValue: 'Proposals'
-    },
-    icon: 'tasks',
-    name: 'proposals'
-  }
-] as Routes;
diff --git a/pioneer/tsconfig.json b/pioneer/tsconfig.json
index d884cad8f0..032ae0f2e3 100644
--- a/pioneer/tsconfig.json
+++ b/pioneer/tsconfig.json
@@ -7,7 +7,6 @@
     "packages/joy-forum/**/*",
     "packages/joy-help/**/*",
     "packages/joy-media/**/*",
-    "packages/joy-proposals/**/*",
     "packages/joy-roles/**/*",
     "packages/joy-settings/**/*",
     "packages/joy-utils-old/**/*"
@@ -34,8 +33,8 @@
       "@polkadot/joy-members/*": [ "packages/joy-members/src/*" ],
       "@polkadot/joy-pages/": [ "packages/joy-pages/src/" ],
       "@polkadot/joy-pages/*": [ "packages/joy-pages/src/*" ],
-      // "@polkadot/joy-proposals/": [ "packages/joy-proposals/src/" ],
-      // "@polkadot/joy-proposals/*": [ "packages/joy-proposals/src/*" ],
+      "@polkadot/joy-proposals/": [ "packages/joy-proposals/src/" ],
+      "@polkadot/joy-proposals/*": [ "packages/joy-proposals/src/*" ],
       // "@polkadot/joy-roles/": [ "packages/joy-roles/src/" ],
       // "@polkadot/joy-roles/*": [ "packages/joy-roles/src/*" ],
       // "@polkadot/joy-settings/": [ "packages/joy-settings/src/" ],
diff --git a/types/src/index.ts b/types/src/index.ts
index f934f24a33..4413d28294 100644
--- a/types/src/index.ts
+++ b/types/src/index.ts
@@ -15,6 +15,8 @@ import workingGroup from './working-group'
 import discovery from './discovery'
 import media from './media'
 import proposals from './proposals'
+import { InterfaceTypes } from '@polkadot/types/types/registry'
+import { createType, TypeRegistry } from '@polkadot/types'
 
 export {
   common,
@@ -58,3 +60,11 @@ export const types: RegistryTypes = {
   Address: 'AccountId',
   LookupSource: 'AccountId',
 }
+
+// Allows creating types without api instance (it's not a recommended way though, so should be used just for mocks)
+const mockRegistry = new TypeRegistry();
+mockRegistry.register(types);
+
+export function createMock<TypeName extends keyof InterfaceTypes>(type: TypeName, value: any): InterfaceTypes[TypeName] {
+  return createType(mockRegistry, type, value);
+}

From b64b89e225fd079e67f87a889c5583674ee410b3 Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Tue, 18 Aug 2020 13:47:20 +0200
Subject: [PATCH 06/17] Linter autofix

---
 .../apps-routing/src/joy-proposals.ts         |   2 +-
 .../joy-proposals/src/Proposal/Body.tsx       |  32 +++--
 .../src/Proposal/ChooseProposalType.tsx       |  10 +-
 .../joy-proposals/src/Proposal/Details.tsx    |  15 +-
 .../src/Proposal/ProposalDetails.tsx          |  11 +-
 .../src/Proposal/ProposalPreview.tsx          |   4 +-
 .../src/Proposal/ProposalPreviewList.tsx      |  30 ++--
 .../src/Proposal/ProposalTypePreview.tsx      |  24 ++--
 .../joy-proposals/src/Proposal/Votes.tsx      |   9 +-
 .../src/Proposal/VotingSection.tsx            |   8 +-
 .../Proposal/discussion/DiscussionPost.tsx    |   5 +-
 .../discussion/DiscussionPostForm.tsx         |  23 +--
 .../discussion/ProposalDiscussion.tsx         |   4 +-
 .../src/Proposal/useVoteStyles.tsx            |   3 +
 .../src/forms/AddWorkingGroupOpeningForm.tsx  | 133 +++++++++---------
 .../BeginReviewLeaderApplicationsForm.tsx     |  25 ++--
 .../DecreaseWorkingGroupLeadStakeForm.tsx     |  24 ++--
 .../joy-proposals/src/forms/FileDropdown.tsx  |  11 +-
 .../FillWorkingGroupLeaderOpeningForm.tsx     |  42 +++---
 .../joy-proposals/src/forms/FormContainer.tsx |   1 +
 .../joy-proposals/src/forms/FormFields.tsx    |  10 +-
 .../src/forms/GenericProposalForm.tsx         |  44 +++---
 .../forms/GenericWorkingGroupProposalForm.tsx |  17 ++-
 .../joy-proposals/src/forms/LabelWithHelp.tsx |   9 +-
 .../src/forms/MintCapacityForm.tsx            |  11 +-
 .../src/forms/RuntimeUpgradeForm.tsx          |  19 ++-
 .../forms/SetContentWorkingGroupLeadForm.tsx  |  25 ++--
 .../SetContentWorkingGroupMintCapForm.tsx     |   8 +-
 .../src/forms/SetCouncilParamsForm.tsx        |  71 +++++-----
 .../src/forms/SetMaxValidatorCountForm.tsx    |  19 ++-
 .../forms/SetWorkingGroupLeadRewardForm.tsx   |  24 ++--
 .../forms/SetWorkingGroupMintCapacityForm.tsx |  24 ++--
 .../joy-proposals/src/forms/SignalForm.tsx    |  20 ++-
 .../forms/SlashWorkingGroupLeadStakeForm.tsx  |  25 ++--
 .../src/forms/SpendingProposalForm.tsx        |  31 ++--
 .../forms/TerminateWorkingGroupLeaderForm.tsx |  24 ++--
 .../joy-proposals/src/forms/errorHandling.ts  |   1 +
 pioneer/packages/joy-proposals/src/index.tsx  |  16 +--
 .../src/stories/ProposalForms.stories.tsx     |   6 +-
 .../stories/data/ProposalPreviewList.mock.ts  |   1 +
 .../joy-proposals/src/validationSchema.ts     |  15 +-
 .../src/react/components/TxButton.tsx         |  10 +-
 .../working-groups/ApplicationDetails.tsx     |  15 +-
 .../components/working-groups/LeadInfo.tsx    |   4 +-
 .../proposals/useProposalSubscription.tsx     |  10 +-
 .../packages/joy-utils/src/transport/chain.ts |   2 +-
 .../src/transport/contentWorkingGroup.ts      |   1 +
 .../joy-utils/src/transport/council.ts        |  11 +-
 .../joy-utils/src/transport/members.ts        |   2 +-
 .../joy-utils/src/transport/proposals.ts      |  32 +++--
 .../joy-utils/src/transport/validators.ts     |   3 +-
 .../joy-utils/src/transport/workingGroups.ts  |  11 +-
 .../packages/joy-utils/src/types/proposals.ts |   2 +-
 53 files changed, 497 insertions(+), 442 deletions(-)

diff --git a/pioneer/packages/apps-routing/src/joy-proposals.ts b/pioneer/packages/apps-routing/src/joy-proposals.ts
index 0399968997..4c76e21eb8 100644
--- a/pioneer/packages/apps-routing/src/joy-proposals.ts
+++ b/pioneer/packages/apps-routing/src/joy-proposals.ts
@@ -10,7 +10,7 @@ export default function create (t: <T = string> (key: string, text: string, opti
     },
     text: t<string>('nav.proposals', 'Proposals', { ns: 'apps-routing' }),
     icon: 'tasks',
-    name: 'proposals',
+    name: 'proposals'
     // TODO: useCounter with active proposals count? (could be a nice addition)
   };
 }
diff --git a/pioneer/packages/joy-proposals/src/Proposal/Body.tsx b/pioneer/packages/joy-proposals/src/Proposal/Body.tsx
index 4ac7096a62..4acab3301c 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/Body.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/Body.tsx
@@ -54,6 +54,7 @@ function ProposedMember (props: { memberId?: MemberId | number | null }) {
   if (props.memberId === null || props.memberId === undefined) {
     return <>NONE</>;
   }
+
   const memberId: MemberId | number = props.memberId;
 
   const transport = useTransport();
@@ -63,7 +64,7 @@ function ProposedMember (props: { memberId?: MemberId | number | null }) {
   );
 
   return (
-    <PromiseComponent error={error} loading={loading} message="Fetching profile...">
+    <PromiseComponent error={error} loading={loading} message='Fetching profile...'>
       { (member && !member.isEmpty) ? (
         <ProfilePreview
           avatar_uri={ member.avatar_uri.toString() }
@@ -102,7 +103,7 @@ class ParsedParam {
 
 // The methods for parsing params by Proposal type.
 const paramParsers: { [k in ProposalType]: (params: SpecificProposalDetails<k>) => ParsedParam[]} = {
-  Text: content => [
+  Text: (content) => [
     new ParsedParam(
       'Content',
       <ReactMarkdown className='TextProposalContent' source={content.toString()} linkTarget='_blank' />,
@@ -113,7 +114,7 @@ const paramParsers: { [k in ProposalType]: (params: SpecificProposalDetails<k>)
     new ParsedParam('Blake2b256 hash of WASM code', hash, true),
     new ParsedParam('File size', filesize + ' bytes')
   ],
-  SetElectionParameters: params => [
+  SetElectionParameters: (params) => [
     new ParsedParam('Announcing period', params.announcing_period.toString() + ' blocks'),
     new ParsedParam('Voting period', params.voting_period.toString() + ' blocks'),
     new ParsedParam('Revealing period', params.revealing_period.toString() + ' blocks'),
@@ -127,20 +128,20 @@ const paramParsers: { [k in ProposalType]: (params: SpecificProposalDetails<k>)
     new ParsedParam('Amount', formatBalance(amount as Balance)),
     new ParsedParam('Account', <ProposedAddress accountId={account as AccountId} />)
   ],
-  SetLead: params => [
+  SetLead: (params) => [
     new ParsedParam('Member', <ProposedMember memberId={params.unwrapOr([])[0] as MemberId | undefined} />),
     new ParsedParam('Account id', <ProposedAddress accountId={params.unwrapOr([])[1] as AccountId | undefined} />)
   ],
-  SetContentWorkingGroupMintCapacity: capacity => [
+  SetContentWorkingGroupMintCapacity: (capacity) => [
     new ParsedParam('Mint capacity', formatBalance(capacity))
   ],
-  EvictStorageProvider: accountId => [
+  EvictStorageProvider: (accountId) => [
     new ParsedParam('Storage provider account', <ProposedAddress accountId={accountId} />)
   ],
-  SetValidatorCount: count => [
+  SetValidatorCount: (count) => [
     new ParsedParam('Validator count', count.toString())
   ],
-  SetStorageRoleParameters: params => [
+  SetStorageRoleParameters: (params) => [
     new ParsedParam('Min. stake', formatBalance(params.min_stake)),
     // "Min. actors": params.min_actors,
     new ParsedParam('Max. actors', params.max_actors.toString()),
@@ -165,13 +166,16 @@ const paramParsers: { [k in ProposalType]: (params: SpecificProposalDetails<k>)
       application_rationing_policy: rationingPolicy
     } = commitment;
     let HRT = bytesToString(humanReadableText);
+
     try { HRT = JSON.stringify(JSON.parse(HRT), undefined, 4); } catch (e) { /* Do nothing */ }
+
     const formatStake = (stake: Option<StakingPolicy>) => (
       stake.isSome ? stake.unwrap().amount_mode.type + `(${stake.unwrap().amount.toString()})` : 'NONE'
     );
     const formatPeriod = (unstakingPeriod: Option<BlockNumber>) => (
       `${unstakingPeriod.unwrapOr(new BN(0)).toString()} blocks`
-    )
+    );
+
     return [
       new ParsedParam('Working group', workingGroup.type),
       new ParsedParam('Activate at', `${activateAt.type}${activateAtBlock ? `(${activateAtBlock.toString()})` : ''}`),
@@ -331,6 +335,7 @@ const ParamsHeader = styled.h4`
   padding: 0.3rem;
   left: 0.5rem;
 `;
+
 type ProposalParamProps = { fullWidth?: boolean };
 const ProposalParam = ({ fullWidth, children }: React.PropsWithChildren<ProposalParamProps>) => (
   <div style={{ gridColumn: (fullWidth || undefined) && '1/3' }}>
@@ -370,11 +375,12 @@ export default function Body ({
       ? params as RuntimeUpgradeProposalDetails
       : (params as ProposalDetails).asType(type)
   );
+
   return (
     <Card fluid>
       <Card.Content>
         <Card.Header>
-          <Header as="h1">{title}</Header>
+          <Header as='h1'>{title}</Header>
         </Card.Header>
         <StyledProposalDescription>
           <ReactMarkdown source={description} linkTarget='_blank' />
@@ -402,17 +408,17 @@ export default function Body ({
               <SemanticTxButton
                 params={ [proposerId, proposalId] }
                 tx={ 'proposalsEngine.cancelProposal' }
-                onClick={ sendTx => { sendTx(); } }
+                onClick={ (sendTx) => { sendTx(); } }
                 icon
                 color={ 'red' }
                 labelPosition={ 'left' }
               >
-                <Icon name="cancel" inverted />
+                <Icon name='cancel' inverted />
                 Withdraw proposal
               </SemanticTxButton>
             </Message.Content>
           </Message>
-          </>) }
+        </>) }
       </Card.Content>
     </Card>
   );
diff --git a/pioneer/packages/joy-proposals/src/Proposal/ChooseProposalType.tsx b/pioneer/packages/joy-proposals/src/Proposal/ChooseProposalType.tsx
index a207d37153..742e4483b9 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/ChooseProposalType.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/ChooseProposalType.tsx
@@ -15,12 +15,12 @@ export default function ChooseProposalType (props: RouteComponentProps) {
   const [category, setCategory] = useState('');
 
   return (
-    <div className="ChooseProposalType">
+    <div className='ChooseProposalType'>
       <PromiseComponent error={error} loading={loading} message={'Fetching proposals\' parameters...'}>
-        <div className="filters">
+        <div className='filters'>
           <Dropdown
-            placeholder="Category"
-            options={Object.values(Categories).map(category => ({ value: category, text: category }))}
+            placeholder='Category'
+            options={Object.values(Categories).map((category) => ({ value: category, text: category }))}
             value={category}
             onChange={(e, data) => setCategory((data.value || '').toString())}
             clearable
@@ -29,7 +29,7 @@ export default function ChooseProposalType (props: RouteComponentProps) {
         </div>
         <Item.Group>
           {proposalTypes
-            .filter(typeInfo => (!category || typeInfo.category === category) && !typeInfo.outdated)
+            .filter((typeInfo) => (!category || typeInfo.category === category) && !typeInfo.outdated)
             .map((typeInfo, idx) => (
               <ProposalTypePreview key={`${typeInfo} - ${idx}`} typeInfo={typeInfo} history={props.history} />
             ))}
diff --git a/pioneer/packages/joy-proposals/src/Proposal/Details.tsx b/pioneer/packages/joy-proposals/src/Proposal/Details.tsx
index 4e0ce73193..328431064d 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/Details.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/Details.tsx
@@ -57,7 +57,7 @@ const Detail: React.FunctionComponent<DetailProps> = ({ name, value, children })
   <Item>
     <Item.Content>
       <Item.Extra>{ name }:</Item.Extra>
-      { value && <Header as="h4">{value}</Header> }
+      { value && <Header as='h4'>{value}</Header> }
       { children }
     </Item.Content>
   </Item>
@@ -72,9 +72,10 @@ type DetailsProps = {
 export default function Details ({ proposal, extendedStatus, proposerLink = false }: DetailsProps) {
   const { type, createdAt, createdAtBlock, proposer } = proposal;
   const { displayStatus, periodStatus, expiresIn, finalizedAtBlock, executedAtBlock, executionFailReason } = extendedStatus;
+
   return (
     <DetailsContainer>
-      <Detail name="Proposed By">
+      <Detail name='Proposed By'>
         <ProfilePreview
           avatar_uri={proposer.avatar_uri}
           root_account={proposer.root_account}
@@ -83,10 +84,10 @@ export default function Details ({ proposal, extendedStatus, proposerLink = fals
         />
         <Item.Extra>{ `${createdAt.toLocaleString()}` }</Item.Extra>
       </Detail>
-      <Detail name="Proposal type" value={type}>
-        <Item.Extra>{ proposalConsts[type].outdated && <Label size="small">Outdated proposal type</Label> }</Item.Extra>
+      <Detail name='Proposal type' value={type}>
+        <Item.Extra>{ proposalConsts[type].outdated && <Label size='small'>Outdated proposal type</Label> }</Item.Extra>
       </Detail>
-      <Detail name="Stage" value={displayStatus}>
+      <Detail name='Stage' value={displayStatus}>
         <Item.Extra>
           { createdAtBlock && <BlockInfo>Created at block <b>#{ createdAtBlock }</b></BlockInfo> }
           { finalizedAtBlock && <BlockInfo>Finalized at block <b>#{ finalizedAtBlock }</b></BlockInfo> }
@@ -98,13 +99,13 @@ export default function Details ({ proposal, extendedStatus, proposerLink = fals
           ) }
         </Item.Extra>
       </Detail>
-      { (periodStatus !== null) && <Detail name="Substage" value={periodStatus} /> }
+      { (periodStatus !== null) && <Detail name='Substage' value={periodStatus} /> }
       {expiresIn !== null && (
         <Detail
           name={ periodStatus === 'Grace period' ? 'Executes in' : 'Expires in' }
           value={`${expiresIn.toLocaleString('en-US')} blocks`} />
       ) }
-      {executionFailReason && <Detail name="Execution error" value={ executionFailReason } /> }
+      {executionFailReason && <Detail name='Execution error' value={ executionFailReason } /> }
     </DetailsContainer>
   );
 }
diff --git a/pioneer/packages/joy-proposals/src/Proposal/ProposalDetails.tsx b/pioneer/packages/joy-proposals/src/Proposal/ProposalDetails.tsx
index 4f9bbae56f..1d21a09f34 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/ProposalDetails.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/ProposalDetails.tsx
@@ -79,20 +79,26 @@ export function getExtendedStatus (proposal: ParsedProposal, bestNumber: BlockNu
   if (basicStatus === 'Finalized') {
     const { finalizedAt, proposalStatus } = proposal.status.Finalized;
     const decisionStatus: ProposalDecisionStatuses = Object.keys(proposalStatus)[0] as ProposalDecisionStatuses;
+
     displayStatus = decisionStatus;
     finalizedAtBlock = finalizedAt as number;
+
     if (decisionStatus === 'Approved') {
       const approvedStatus: ApprovedProposalStatuses = Object.keys(proposalStatus.Approved)[0] as ApprovedProposalStatuses;
+
       if (approvedStatus === 'PendingExecution') {
         const finalizedAge = best - finalizedAt;
+
         periodStatus = 'Grace period';
         expiresIn = Math.max(gracePeriod - finalizedAge, 0) || null;
       } else {
         // Executed / ExecutionFailed
         displayStatus = approvedStatus;
         executedAtBlock = finalizedAtBlock + gracePeriod;
+
         if (approvedStatus === 'ExecutionFailed') {
           const executionFailedStatus = proposalStatus.Approved.ExecutionFailed as ExecutionFailedStatus;
+
           executionFailReason = Buffer.from(executionFailedStatus.error.toString().replace('0x', ''), 'hex').toString();
         }
       }
@@ -125,12 +131,13 @@ function ProposalDetails ({
   council,
   bestNumber
 }: ProposalDetailsProps) {
-  const iAmCouncilMember = Boolean(iAmMember && council && council.some(seat => seat.member.toString() === myAddress));
+  const iAmCouncilMember = Boolean(iAmMember && council && council.some((seat) => seat.member.toString() === myAddress));
   const iAmProposer = Boolean(iAmMember && myMemberId !== undefined && proposal.proposerId === myMemberId.toNumber());
   const extendedStatus = getExtendedStatus(proposal, bestNumber);
   const isVotingPeriod = extendedStatus.periodStatus === 'Voting period';
+
   return (
-    <div className="Proposal">
+    <div className='Proposal'>
       <Details proposal={proposal} extendedStatus={extendedStatus} proposerLink={ true }/>
       <ProposalDetailsMain>
         <Body
diff --git a/pioneer/packages/joy-proposals/src/Proposal/ProposalPreview.tsx b/pioneer/packages/joy-proposals/src/Proposal/ProposalPreview.tsx
index a1fd36ac87..4a6aab4cbf 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/ProposalPreview.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/ProposalPreview.tsx
@@ -26,8 +26,10 @@ export type ProposalPreviewProps = {
   proposal: ParsedProposal;
   bestNumber?: BlockNumber;
 };
+
 export default function ProposalPreview ({ proposal, bestNumber }: ProposalPreviewProps) {
   const extendedStatus = getExtendedStatus(proposal, bestNumber);
+
   return (
     <Card
       fluid
@@ -35,7 +37,7 @@ export default function ProposalPreview ({ proposal, bestNumber }: ProposalPrevi
       <ProposalIdBox>{ `#${proposal.id.toString()}` }</ProposalIdBox>
       <Card.Content>
         <Card.Header>
-          <Header as="h1">{proposal.title}</Header>
+          <Header as='h1'>{proposal.title}</Header>
         </Card.Header>
         <Card.Description>
           <ProposalDesc>
diff --git a/pioneer/packages/joy-proposals/src/Proposal/ProposalPreviewList.tsx b/pioneer/packages/joy-proposals/src/Proposal/ProposalPreviewList.tsx
index ad031539db..e160532267 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/ProposalPreviewList.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/ProposalPreviewList.tsx
@@ -41,7 +41,7 @@ function ProposalPreviewList ({ bestNumber }: ProposalPreviewListProps) {
     [activeFilter, currentPage]
   );
 
-  const filterOptions = proposalStatusFilters.map(filter => ({
+  const filterOptions = proposalStatusFilters.map((filter) => ({
     text: filter,
     value: filter
   }));
@@ -52,20 +52,20 @@ function ProposalPreviewList ({ bestNumber }: ProposalPreviewListProps) {
   };
 
   return (
-    <Container className="Proposal" fluid>
+    <Container className='Proposal' fluid>
       <FilterContainer>
         <Button primary as={Link} to={`${pathname}/new`}>
-          <Icon name="add" />
+          <Icon name='add' />
           New proposal
         </Button>
         <StyledDropdown
-          label="Proposal state"
+          label='Proposal state'
           options={filterOptions}
           value={activeFilter}
           onChange={_onChangePrefix}
         />
       </FilterContainer>
-      <PromiseComponent error={ error } loading={ loading } message="Fetching proposals...">
+      <PromiseComponent error={ error } loading={ loading } message='Fetching proposals...'>
         { proposalsBatch && (<>
           <PaginationBox>
             { proposalsBatch.totalBatches > 1 && (
@@ -81,16 +81,16 @@ function ProposalPreviewList ({ bestNumber }: ProposalPreviewListProps) {
               />
             ) }
           </PaginationBox>
-           { proposalsBatch.proposals.length
-             ? (
-               <Card.Group>
-                 {proposalsBatch.proposals.map((prop: ParsedProposal, idx: number) => (
-                   <ProposalPreview key={`${prop.title}-${idx}`} proposal={prop} bestNumber={bestNumber} />
-                 ))}
-               </Card.Group>
-             )
-             : `There are currently no ${activeFilter !== 'All' ? activeFilter.toLocaleLowerCase() : 'submitted'} proposals.`
-           }
+          { proposalsBatch.proposals.length
+            ? (
+              <Card.Group>
+                {proposalsBatch.proposals.map((prop: ParsedProposal, idx: number) => (
+                  <ProposalPreview key={`${prop.title}-${idx}`} proposal={prop} bestNumber={bestNumber} />
+                ))}
+              </Card.Group>
+            )
+            : `There are currently no ${activeFilter !== 'All' ? activeFilter.toLocaleLowerCase() : 'submitted'} proposals.`
+          }
         </>) }
       </PromiseComponent>
     </Container>
diff --git a/pioneer/packages/joy-proposals/src/Proposal/ProposalTypePreview.tsx b/pioneer/packages/joy-proposals/src/Proposal/ProposalTypePreview.tsx
index 092848a77b..fc10dbf01b 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/ProposalTypePreview.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/ProposalTypePreview.tsx
@@ -62,9 +62,9 @@ type ProposalTypePreviewProps = {
 };
 
 const ProposalTypeDetail = (props: { title: string; value: string }) => (
-  <div className="proposal-detail">
-    <div className="detail-title">{ `${props.title}:` }</div>
-    <div className="detail-value">{ props.value }</div>
+  <div className='proposal-detail'>
+    <div className='detail-title'>{ `${props.title}:` }</div>
+    <div className='detail-value'>{ props.value }</div>
   </div>
 );
 
@@ -90,7 +90,7 @@ export default function ProposalTypePreview (props: ProposalTypePreviewProps) {
   };
 
   return (
-    <Item className="ProposalType">
+    <Item className='ProposalType'>
       {/*
         TODO: We can add it once we have the actual assets
         <Item.Image size="tiny" src={image} />
@@ -98,18 +98,18 @@ export default function ProposalTypePreview (props: ProposalTypePreviewProps) {
       <Item.Content>
         <Item.Header>{_.startCase(type)}</Item.Header>
         <Item.Description>{description}</Item.Description>
-        <div className="proposal-details">
+        <div className='proposal-details'>
           <ProposalTypeDetail
-            title="Stake"
+            title='Stake'
             value={ formatBalance(stake) } />
           <ProposalTypeDetail
-            title="Cancellation fee"
+            title='Cancellation fee'
             value={ cancellationFee ? formatBalance(cancellationFee) : 'NONE' } />
           <ProposalTypeDetail
-            title="Grace period"
+            title='Grace period'
             value={ gracePeriod ? `${gracePeriod} block${gracePeriod > 1 ? 's' : ''}` : 'NONE' } />
           <ProposalTypeDetail
-            title="Voting period"
+            title='Voting period'
             value={ votingPeriod ? `${votingPeriod} block${votingPeriod > 1 ? 's' : ''}` : 'NONE' } />
         </div>
         <QuorumsAndThresholds>
@@ -139,10 +139,10 @@ export default function ProposalTypePreview (props: ProposalTypePreviewProps) {
           ) }
         </QuorumsAndThresholds>
       </Item.Content>
-      <div className="actions">
-        <CreateButton primary size="medium" onClick={handleClick}>
+      <div className='actions'>
+        <CreateButton primary size='medium' onClick={handleClick}>
           Create
-          <Icon name="chevron right" />
+          <Icon name='chevron right' />
         </CreateButton>
       </div>
     </Item>
diff --git a/pioneer/packages/joy-proposals/src/Proposal/Votes.tsx b/pioneer/packages/joy-proposals/src/Proposal/Votes.tsx
index 42f9c5eec7..5186ff18c3 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/Votes.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/Votes.tsx
@@ -24,20 +24,21 @@ export default function Votes ({ proposal: { id, votingResults } }: VotesProps)
     <PromiseComponent
       error={error}
       loading={loading}
-      message="Fetching the votes...">
+      message='Fetching the votes...'>
       { (votes && votes.votes.length > 0)
         ? (
           <>
-            <Header as="h3">
+            <Header as='h3'>
               All Votes: ({votes.votes.length}/{votes.councilMembersLength})
             </Header>
             <Divider />
-            <Table basic="very">
+            <Table basic='very'>
               <Table.Body>
                 {votes.votes.map((proposalVote, idx) => {
                   const { vote, member } = proposalVote;
                   const voteStr = (vote as VoteKind).type.toString() as VoteKindStr;
                   const { icon, textColor } = useVoteStyles(voteStr);
+
                   return (
                     <Table.Row key={`${member.handle}-${idx}`}>
                       <Table.Cell className={textColor}>
@@ -59,7 +60,7 @@ export default function Votes ({ proposal: { id, votingResults } }: VotesProps)
           </>
         )
         : (
-          <Header as="h4">No votes have been submitted!</Header>
+          <Header as='h4'>No votes have been submitted!</Header>
         )
       }
     </PromiseComponent>
diff --git a/pioneer/packages/joy-proposals/src/Proposal/VotingSection.tsx b/pioneer/packages/joy-proposals/src/Proposal/VotingSection.tsx
index 086dcd5d53..a18251bd91 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/VotingSection.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/VotingSection.tsx
@@ -32,8 +32,10 @@ type VoteButtonProps = {
   proposalId: ProposalId;
   onSuccess: () => void;
 }
+
 function VoteButton ({ voteKind, proposalId, memberId, onSuccess }: VoteButtonProps) {
   const { icon, color } = useVoteStyles(voteKind);
+
   return (
     <SemanticTxButton
       params={[
@@ -42,7 +44,7 @@ function VoteButton ({ voteKind, proposalId, memberId, onSuccess }: VoteButtonPr
         voteKind
       ]}
       tx={ 'proposalsEngine.vote' }
-      onClick={ sendTx => sendTx() }
+      onClick={ (sendTx) => sendTx() }
       txFailedCb={ () => null }
       txSuccessCb={ onSuccess }
       color={color}
@@ -87,7 +89,7 @@ export default function VotingSection ({
       <Message icon color={color}>
         <Icon name={icon} />
         <Message.Content>
-          You voted <span className="bold">{`"${voteStr}"`}</span>
+          You voted <span className='bold'>{`"${voteStr}"`}</span>
         </Message.Content>
       </Message>
     );
@@ -97,7 +99,7 @@ export default function VotingSection ({
 
   return (
     <>
-      <Header as="h3">Sumbit your vote</Header>
+      <Header as='h3'>Sumbit your vote</Header>
       <Divider />
       <VoteButtons>
         { VoteKinds.map((voteKind) =>
diff --git a/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPost.tsx b/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPost.tsx
index 4869c5dac0..b1c26fdea5 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPost.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPost.tsx
@@ -61,6 +61,7 @@ export default function DiscussionPost ({
     authorId.toNumber() === memberId.toNumber() &&
     editsCount < constraints.maxPostEdits
   );
+
   const onEditSuccess = () => {
     setEditing(false);
     refreshDiscussion();
@@ -98,9 +99,9 @@ export default function DiscussionPost ({
               <CommentAction
                 onClick={() => setEditing(true)}
                 primary
-                size="tiny"
+                size='tiny'
                 icon>
-                <Icon name="pencil" />
+                <Icon name='pencil' />
               </CommentAction>
             </CommentActions>
           ) }
diff --git a/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPostForm.tsx b/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPostForm.tsx
index c19a25a4ee..b9161990bb 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPostForm.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/discussion/DiscussionPostForm.tsx
@@ -76,7 +76,7 @@ const DiscussionPostFormInner = (props: InnerProps) => {
   };
 
   return (
-    <Form className="ui form JoyForm">
+    <Form className='ui form JoyForm'>
       <LabelledField name='text' {...props}>
         <Field
           component='textarea'
@@ -88,7 +88,7 @@ const DiscussionPostFormInner = (props: InnerProps) => {
       </LabelledField>
       <LabelledField invisibleLabel {...props}>
         <TxButton
-          type="submit"
+          type='submit'
           label={isEditForm ? 'Update' : 'Add Post'}
           isDisabled={isSubmitting || !isValid}
           params={buildTxParams()}
@@ -99,20 +99,20 @@ const DiscussionPostFormInner = (props: InnerProps) => {
         />
         { isEditForm ? (
           <Button
-            type="button"
-            size="large"
+            type='button'
+            size='large'
             disabled={isSubmitting}
-            color="red"
+            color='red'
             onClick={() => onSuccess()}
-            content="Cancel"
+            content='Cancel'
           />
         ) : (
           <Button
-            type="button"
-            size="large"
+            type='button'
+            size='large'
             disabled={isSubmitting}
             onClick={() => resetForm()}
-            content="Clear"
+            content='Clear'
           />
         ) }
       </LabelledField>
@@ -122,8 +122,9 @@ const DiscussionPostFormInner = (props: InnerProps) => {
 
 const DiscussionPostFormOuter = withFormik<OuterProps, FormValues>({
   // Transform outer props into form values
-  mapPropsToValues: props => {
+  mapPropsToValues: (props) => {
     const { post } = props;
+
     return { text: post && post.postId ? post.text : '' };
   },
   validationSchema: ({ constraints: c }: OuterProps) => (Yup.object().shape({
@@ -132,7 +133,7 @@ const DiscussionPostFormOuter = withFormik<OuterProps, FormValues>({
       .required('Post content is required')
       .max(c.maxPostLength, `The content cannot be longer than ${c.maxPostLength} characters`)
   })),
-  handleSubmit: values => {
+  handleSubmit: (values) => {
     // do submitting things
   }
 })(DiscussionPostFormInner);
diff --git a/pioneer/packages/joy-proposals/src/Proposal/discussion/ProposalDiscussion.tsx b/pioneer/packages/joy-proposals/src/Proposal/discussion/ProposalDiscussion.tsx
index 49700ab76d..e17f3ee142 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/discussion/ProposalDiscussion.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/discussion/ProposalDiscussion.tsx
@@ -28,7 +28,7 @@ export default function ProposalDiscussion ({
     <PromiseComponent error={error} loading={loading} message={'Fetching discussion posts...'}>
       { discussion && (
         <>
-          <Header as="h3">Discussion ({ discussion.posts.length})</Header>
+          <Header as='h3'>Discussion ({ discussion.posts.length})</Header>
           <Divider />
           { discussion.posts.length ? (
             discussion.posts.map((post, key) => (
@@ -40,7 +40,7 @@ export default function ProposalDiscussion ({
             ))
           )
             : (
-              <Header as="h4" style={{ margin: '1rem 0' }}>Nothing has been posted here yet!</Header>
+              <Header as='h4' style={{ margin: '1rem 0' }}>Nothing has been posted here yet!</Header>
             )
           }
           { memberId && (
diff --git a/pioneer/packages/joy-proposals/src/Proposal/useVoteStyles.tsx b/pioneer/packages/joy-proposals/src/Proposal/useVoteStyles.tsx
index 0c5de83079..73bf4be562 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/useVoteStyles.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/useVoteStyles.tsx
@@ -14,18 +14,21 @@ export default function useVoteStyles (
       textColor = 'text-green';
       break;
     }
+
     case 'Abstain': {
       icon = 'meh';
       color = 'grey';
       textColor = 'text-grey';
       break;
     }
+
     case 'Reject': {
       icon = 'frown';
       color = 'orange';
       textColor = 'text-orange';
       break;
     }
+
     case 'Slash': {
       icon = 'times';
       color = 'red';
diff --git a/pioneer/packages/joy-proposals/src/forms/AddWorkingGroupOpeningForm.tsx b/pioneer/packages/joy-proposals/src/forms/AddWorkingGroupOpeningForm.tsx
index 03d73faff7..92210193d5 100644
--- a/pioneer/packages/joy-proposals/src/forms/AddWorkingGroupOpeningForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/AddWorkingGroupOpeningForm.tsx
@@ -1,18 +1,14 @@
 import React, { useEffect } from 'react';
 import { getFormErrorLabelsProps, FormErrorLabelsProps } from './errorHandling';
 import * as Yup from 'yup';
-import {
-  withProposalFormData,
+import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
   ProposalFormInnerProps,
-  genericFormDefaultOptions
-} from './GenericProposalForm';
-import {
-  GenericWorkingGroupProposalForm,
+  genericFormDefaultOptions } from './GenericProposalForm';
+import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
-  defaultValues as wgFromDefaultValues
-} from './GenericWorkingGroupProposalForm';
+  defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
 import { FormField, InputFormField, TextareaFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
 import { ActivateOpeningAtKey, ActivateOpeningAtDef, StakingAmountLimitModeKeys, IApplicationRationingPolicy, IStakingPolicy } from '@joystream/types/hiring';
@@ -108,6 +104,7 @@ type StakeFieldsProps = Pick<FormInnerProps, 'values' | 'handleChange' | 'setFie
   errorLabelsProps: FormErrorLabelsProps<FormValues>;
   stakeType: 'role' | 'application';
 };
+
 const StakeFields: React.FunctionComponent<StakeFieldsProps> = ({
   values,
   errorLabelsProps,
@@ -116,35 +113,35 @@ const StakeFields: React.FunctionComponent<StakeFieldsProps> = ({
   setFieldValue
 }) => {
   return (
-  <>
-    <FormField label={`${_.startCase(stakeType)} stake` }>
-      <Checkbox
-        toggle
-        onChange={(e, data) => { setFieldValue(`${stakeType}StakeRequired`, data.checked); }}
-        label={ `Require ${stakeType} stake` }
-        checked={ stakeType === 'role' ? values.roleStakeRequired : values.applicationStakeRequired }/>
-    </FormField>
-    { (stakeType === 'role' ? values.roleStakeRequired : values.applicationStakeRequired) && (<>
-      <FormField label="Stake mode">
-        <Dropdown
+    <>
+      <FormField label={`${_.startCase(stakeType)} stake` }>
+        <Checkbox
+          toggle
+          onChange={(e, data) => { setFieldValue(`${stakeType}StakeRequired`, data.checked); }}
+          label={ `Require ${stakeType} stake` }
+          checked={ stakeType === 'role' ? values.roleStakeRequired : values.applicationStakeRequired }/>
+      </FormField>
+      { (stakeType === 'role' ? values.roleStakeRequired : values.applicationStakeRequired) && (<>
+        <FormField label='Stake mode'>
+          <Dropdown
+            onChange={handleChange}
+            name={ `${stakeType}StakeMode` }
+            selection
+            options={[StakingAmountLimitModeKeys.Exact, StakingAmountLimitModeKeys.AtLeast].map((mode) => ({ text: mode, value: mode }))}
+            value={ stakeType === 'role' ? values.roleStakeMode : values.applicationStakeMode }
+          />
+        </FormField>
+        <InputFormField
+          label='Stake value'
+          unit={formatBalance.getDefaults().unit}
           onChange={handleChange}
-          name={ `${stakeType}StakeMode` }
-          selection
-          options={[StakingAmountLimitModeKeys.Exact, StakingAmountLimitModeKeys.AtLeast].map(mode => ({ text: mode, value: mode }))}
-          value={ stakeType === 'role' ? values.roleStakeMode : values.applicationStakeMode }
+          name={ `${stakeType}StakeValue` }
+          error={ stakeType === 'role' ? errorLabelsProps.roleStakeValue : errorLabelsProps.applicationStakeValue}
+          value={ stakeType === 'role' ? values.roleStakeValue : values.applicationStakeValue}
+          placeholder={'ie. 100'}
         />
-      </FormField>
-      <InputFormField
-        label="Stake value"
-        unit={formatBalance.getDefaults().unit}
-        onChange={handleChange}
-        name={ `${stakeType}StakeValue` }
-        error={ stakeType === 'role' ? errorLabelsProps.roleStakeValue : errorLabelsProps.applicationStakeValue}
-        value={ stakeType === 'role' ? values.roleStakeValue : values.applicationStakeValue}
-        placeholder={'ie. 100'}
-      />
-    </>) }
-  </>
+      </>) }
+    </>
   );
 };
 
@@ -152,32 +149,41 @@ const valuesToAddOpeningParams = (values: FormValues): SimplifiedTypeInterface<I
   const commitment: SimplifiedTypeInterface<IWorkingGroupOpeningPolicyCommitment> = {
     max_review_period_length: parseInt(values.maxReviewPeriodLength)
   };
+
   if (parseInt(values.terminateRoleUnstakingPeriod) > 0) {
     commitment.terminate_role_stake_unstaking_period = parseInt(values.terminateRoleUnstakingPeriod);
   }
+
   if (parseInt(values.leaveRoleUnstakingPeriod) > 0) {
     commitment.exit_role_stake_unstaking_period = parseInt(values.leaveRoleUnstakingPeriod);
   }
+
   if (values.applicationsLimited) {
     const rationingPolicy: SimplifiedTypeInterface<IApplicationRationingPolicy> = {
       max_active_applicants: parseInt(values.maxApplications)
     };
+
     commitment.application_rationing_policy = rationingPolicy;
   }
+
   if (values.applicationStakeRequired) {
     const applicationStakingPolicy: SimplifiedTypeInterface<IStakingPolicy> = {
       amount: parseInt(values.applicationStakeValue),
       amount_mode: values.applicationStakeMode
     };
+
     commitment.application_staking_policy = applicationStakingPolicy;
   }
+
   if (values.roleStakeRequired) {
     const roleStakingPolicy: SimplifiedTypeInterface<IStakingPolicy> = {
       amount: parseInt(values.roleStakeValue),
       amount_mode: values.roleStakeMode
     };
+
     commitment.role_staking_policy = roleStakingPolicy;
   }
+
   return {
     activate_at: { [values.activateAt]: values.activateAt === 'ExactBlock' ? parseInt(values.activateAtBlock) : null },
     commitment: commitment,
@@ -186,8 +192,9 @@ const valuesToAddOpeningParams = (values: FormValues): SimplifiedTypeInterface<I
   };
 };
 
-const AddWorkingGroupOpeningForm: React.FunctionComponent<FormInnerProps> = props => {
+const AddWorkingGroupOpeningForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const { handleChange, errors, touched, values, setFieldValue, myMemberId, myMembership } = props;
+
   useEffect(() => {
     if (myMembership && !touched.humanReadableText) {
       setFieldValue(
@@ -201,8 +208,8 @@ const AddWorkingGroupOpeningForm: React.FunctionComponent<FormInnerProps> = prop
   return (
     <GenericWorkingGroupProposalForm
       {...props}
-      txMethod="createAddWorkingGroupLeaderOpeningProposal"
-      proposalType="AddWorkingGroupLeaderOpening"
+      txMethod='createAddWorkingGroupLeaderOpeningProposal'
+      proposalType='AddWorkingGroupLeaderOpening'
       submitParams={[
         myMemberId,
         values.title,
@@ -211,15 +218,15 @@ const AddWorkingGroupOpeningForm: React.FunctionComponent<FormInnerProps> = prop
         valuesToAddOpeningParams(values)
       ]}
     >
-      <Grid columns="4" doubling stackable verticalAlign="bottom">
+      <Grid columns='4' doubling stackable verticalAlign='bottom'>
         <Grid.Row>
           <Grid.Column>
-            <FormField label="Activate opening at">
+            <FormField label='Activate opening at'>
               <Dropdown
                 onChange={handleChange}
-                name="activateAt"
+                name='activateAt'
                 selection
-                options={Object.keys(ActivateOpeningAtDef).map(wgKey => ({ text: wgKey, value: wgKey }))}
+                options={Object.keys(ActivateOpeningAtDef).map((wgKey) => ({ text: wgKey, value: wgKey }))}
                 value={values.activateAt}
               />
             </FormField>
@@ -228,7 +235,7 @@ const AddWorkingGroupOpeningForm: React.FunctionComponent<FormInnerProps> = prop
             { values.activateAt === 'ExactBlock' && (
               <InputFormField
                 onChange={handleChange}
-                name="activateAtBlock"
+                name='activateAtBlock'
                 error={errorLabelsProps.activateAtBlock}
                 value={values.activateAtBlock}
                 placeholder={'Provide the block number'}
@@ -243,35 +250,35 @@ const AddWorkingGroupOpeningForm: React.FunctionComponent<FormInnerProps> = prop
           but no applicants will be able to apply yet) until current block number will equal the specified number.
         </Message>
       ) }
-      <Grid columns="4" doubling stackable verticalAlign="bottom">
+      <Grid columns='4' doubling stackable verticalAlign='bottom'>
         <Grid.Row>
           <Grid.Column>
             <InputFormField
-              label="Max. review period"
+              label='Max. review period'
               onChange={handleChange}
-              name="maxReviewPeriodLength"
+              name='maxReviewPeriodLength'
               error={errorLabelsProps.maxReviewPeriodLength}
               value={values.maxReviewPeriodLength}
               placeholder={'ie. 72000'}
-              unit="blocks"
+              unit='blocks'
             />
           </Grid.Column>
         </Grid.Row>
       </Grid>
-      <Grid columns="4" doubling stackable verticalAlign="bottom">
+      <Grid columns='4' doubling stackable verticalAlign='bottom'>
         <Grid.Row>
           <Grid.Column>
-            <FormField label="Applications limit">
+            <FormField label='Applications limit'>
               <Checkbox
                 toggle
                 onChange={(e, data) => { setFieldValue('applicationsLimited', data.checked); }}
-                label="Limit applications"
+                label='Limit applications'
                 checked={values.applicationsLimited}/>
             </FormField>
             { values.applicationsLimited && (
               <InputFormField
                 onChange={handleChange}
-                name="maxApplications"
+                name='maxApplications'
                 error={errorLabelsProps.maxApplications}
                 value={values.maxApplications}
                 placeholder={'Max. number of applications'}
@@ -280,27 +287,27 @@ const AddWorkingGroupOpeningForm: React.FunctionComponent<FormInnerProps> = prop
           </Grid.Column>
         </Grid.Row>
       </Grid>
-      <Grid columns="2" stackable style={{ marginBottom: 0 }}>
+      <Grid columns='2' stackable style={{ marginBottom: 0 }}>
         <Grid.Row>
           <Grid.Column>
-            <StakeFields stakeType="application" {...{ errorLabelsProps, values, handleChange, setFieldValue }}/>
+            <StakeFields stakeType='application' {...{ errorLabelsProps, values, handleChange, setFieldValue }}/>
           </Grid.Column>
           <Grid.Column>
-            <StakeFields stakeType="role" {...{ errorLabelsProps, values, handleChange, setFieldValue }}/>
+            <StakeFields stakeType='role' {...{ errorLabelsProps, values, handleChange, setFieldValue }}/>
           </Grid.Column>
         </Grid.Row>
       </Grid>
-      <Grid columns="2" stackable style={{ marginBottom: 0 }}>
+      <Grid columns='2' stackable style={{ marginBottom: 0 }}>
         <Grid.Row>
           <Grid.Column>
             <InputFormField
               onChange={handleChange}
-              name="terminateRoleUnstakingPeriod"
+              name='terminateRoleUnstakingPeriod'
               error={errorLabelsProps.terminateRoleUnstakingPeriod}
               value={values.terminateRoleUnstakingPeriod}
               label={'Terminate role unstaking period'}
               placeholder={'ie. 14400'}
-              unit="blocks"
+              unit='blocks'
               help={
                 'In case leader role or application is terminated - this will be the unstaking period for the role stake (in blocks).'
               }
@@ -309,12 +316,12 @@ const AddWorkingGroupOpeningForm: React.FunctionComponent<FormInnerProps> = prop
           <Grid.Column>
             <InputFormField
               onChange={handleChange}
-              name="leaveRoleUnstakingPeriod"
+              name='leaveRoleUnstakingPeriod'
               error={errorLabelsProps.leaveRoleUnstakingPeriod}
               value={values.leaveRoleUnstakingPeriod}
               label={'Leave role unstaking period'}
               placeholder={'ie. 14400'}
-              unit="blocks"
+              unit='blocks'
               help={
                 'In case leader leaves/exits his role - this will be the unstaking period for his role stake (in blocks). ' +
                 'It also applies when user is withdrawing an active leader application.'
@@ -324,11 +331,11 @@ const AddWorkingGroupOpeningForm: React.FunctionComponent<FormInnerProps> = prop
         </Grid.Row>
       </Grid>
       <TextareaFormField
-        label="Opening schema (human_readable_text)"
-        help="JSON schema that describes some characteristics of the opening presented in the UI (headers, content, application form etc.)"
+        label='Opening schema (human_readable_text)'
+        help='JSON schema that describes some characteristics of the opening presented in the UI (headers, content, application form etc.)'
         onChange={handleChange}
-        name="humanReadableText"
-        placeholder="Paste the JSON schema here..."
+        name='humanReadableText'
+        placeholder='Paste the JSON schema here...'
         error={errorLabelsProps.humanReadableText}
         value={values.humanReadableText}
         rows={20}
diff --git a/pioneer/packages/joy-proposals/src/forms/BeginReviewLeaderApplicationsForm.tsx b/pioneer/packages/joy-proposals/src/forms/BeginReviewLeaderApplicationsForm.tsx
index 2e2b30b2fc..df4588a545 100644
--- a/pioneer/packages/joy-proposals/src/forms/BeginReviewLeaderApplicationsForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/BeginReviewLeaderApplicationsForm.tsx
@@ -1,17 +1,13 @@
 import React from 'react';
 import * as Yup from 'yup';
-import {
-  withProposalFormData,
+import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
   ProposalFormInnerProps,
-  genericFormDefaultOptions
-} from './GenericProposalForm';
-import {
-  GenericWorkingGroupProposalForm,
+  genericFormDefaultOptions } from './GenericProposalForm';
+import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
-  defaultValues as wgFromDefaultValues
-} from './GenericWorkingGroupProposalForm';
+  defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
 import FormField from './FormFields';
 import { withFormContainer } from './FormContainer';
 import { Dropdown, Message } from 'semantic-ui-react';
@@ -36,7 +32,7 @@ type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormVal
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
-const BeginReviewLeadeApplicationsForm: React.FunctionComponent<FormInnerProps> = props => {
+const BeginReviewLeadeApplicationsForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const { handleChange, values, myMemberId, errors, touched } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
   const transport = useTransport();
@@ -47,8 +43,9 @@ const BeginReviewLeadeApplicationsForm: React.FunctionComponent<FormInnerProps>
   );
   const openingsOptions = openings
     // Map to options
-    .map(od => {
+    .map((od) => {
       const hrt = od.hiringOpening.parse_human_readable_text_with_fallback();
+
       return {
         text: `${od.id.toString()}: ${hrt.headline} (${hrt.job.title})`,
         value: od.id.toString()
@@ -58,8 +55,8 @@ const BeginReviewLeadeApplicationsForm: React.FunctionComponent<FormInnerProps>
   return (
     <GenericWorkingGroupProposalForm
       {...props}
-      txMethod="createBeginReviewWorkingGroupLeaderApplicationsProposal"
-      proposalType="BeginReviewWorkingGroupLeaderApplication"
+      txMethod='createBeginReviewWorkingGroupLeaderApplicationsProposal'
+      proposalType='BeginReviewWorkingGroupLeaderApplication'
       disabled={!openingsOptions.length}
       submitParams={[
         myMemberId,
@@ -70,7 +67,7 @@ const BeginReviewLeadeApplicationsForm: React.FunctionComponent<FormInnerProps>
         values.workingGroup
       ]}
     >
-      <PromiseComponent error={openingsError} loading={openingsLoading} message="Fetching openings...">
+      <PromiseComponent error={openingsError} loading={openingsLoading} message='Fetching openings...'>
         { !openingsOptions.length
           ? (
             <Message error visible>
@@ -83,7 +80,7 @@ const BeginReviewLeadeApplicationsForm: React.FunctionComponent<FormInnerProps>
           )
           : (
             <FormField
-              label="Working Group Opening"
+              label='Working Group Opening'
               error={errorLabelsProps.openingId}
               showErrorMsg>
               <Dropdown
diff --git a/pioneer/packages/joy-proposals/src/forms/DecreaseWorkingGroupLeadStakeForm.tsx b/pioneer/packages/joy-proposals/src/forms/DecreaseWorkingGroupLeadStakeForm.tsx
index 7809b1c37b..eecc219abd 100644
--- a/pioneer/packages/joy-proposals/src/forms/DecreaseWorkingGroupLeadStakeForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/DecreaseWorkingGroupLeadStakeForm.tsx
@@ -1,18 +1,14 @@
 import React, { useState, useEffect } from 'react';
 import { getFormErrorLabelsProps } from './errorHandling';
 import * as Yup from 'yup';
-import {
-  withProposalFormData,
+import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
   ProposalFormInnerProps,
-  genericFormDefaultOptions
-} from './GenericProposalForm';
-import {
-  GenericWorkingGroupProposalForm,
+  genericFormDefaultOptions } from './GenericProposalForm';
+import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
-  defaultValues as wgFromDefaultValues
-} from './GenericWorkingGroupProposalForm';
+  defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
 import { InputFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
 import { Grid } from 'semantic-ui-react';
@@ -35,7 +31,7 @@ type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormVal
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
-const DecreaseWorkingGroupLeadStakeForm: React.FunctionComponent<FormInnerProps> = props => {
+const DecreaseWorkingGroupLeadStakeForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const { handleChange, errors, touched, values, myMemberId, setFieldError } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
   const [lead, setLead] = useState<WorkerData | null>(null);
@@ -52,8 +48,8 @@ const DecreaseWorkingGroupLeadStakeForm: React.FunctionComponent<FormInnerProps>
   return (
     <GenericWorkingGroupProposalForm
       {...props}
-      txMethod="createDecreaseWorkingGroupLeaderStakeProposal"
-      proposalType="DecreaseWorkingGroupLeaderStake"
+      txMethod='createDecreaseWorkingGroupLeaderStakeProposal'
+      proposalType='DecreaseWorkingGroupLeaderStake'
       leadRequired={true}
       leadStakeRequired={true}
       onLeadChange={(lead: WorkerData | null) => setLead(lead)}
@@ -68,12 +64,12 @@ const DecreaseWorkingGroupLeadStakeForm: React.FunctionComponent<FormInnerProps>
       ]}
     >
       { (lead && lead.stake) && (
-        <Grid columns="4" doubling stackable verticalAlign="bottom">
+        <Grid columns='4' doubling stackable verticalAlign='bottom'>
           <Grid.Column>
             <InputFormField
-              label="Amount to decrease"
+              label='Amount to decrease'
               onChange={handleChange}
-              name="amount"
+              name='amount'
               error={errorLabelsProps.amount}
               value={values.amount}
               unit={formatBalance.getDefaults().unit}
diff --git a/pioneer/packages/joy-proposals/src/forms/FileDropdown.tsx b/pioneer/packages/joy-proposals/src/forms/FileDropdown.tsx
index efbe211f31..84a8e6f5f2 100644
--- a/pioneer/packages/joy-proposals/src/forms/FileDropdown.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/FileDropdown.tsx
@@ -73,6 +73,7 @@ const innerSpanStyle = (): React.CSSProperties => {
 // https://developer.mozilla.org/en-US/docs/Web/API/Blob/text
 const parseFileAsUtf8 = async (file: any): Promise<string> => {
   const text = await file.text();
+
   return text;
 };
 
@@ -109,16 +110,19 @@ type FileDropdownProps<FormValuesT> = {
 export default function FileDropdown<ValuesT = {}> (props: FileDropdownProps<ValuesT>) {
   const [parsing, setParsing] = useState(false);
   const { error, name, setFieldValue, setFieldTouched, acceptedFormats, defaultText, interpretAs } = props;
+
   return (
     <Dropzone
-      onDropAccepted={async acceptedFiles => {
+      onDropAccepted={async (acceptedFiles) => {
         setParsing(true);
         let contents;
+
         if (interpretAs === 'utf-8') {
           contents = await parseFileAsUtf8(acceptedFiles[0]);
         } else {
           contents = await parseFileAsBinary(acceptedFiles[0]);
         }
+
         setFieldValue(name, contents, true);
         setFieldTouched(name, true);
         setParsing(false);
@@ -128,17 +132,18 @@ export default function FileDropdown<ValuesT = {}> (props: FileDropdownProps<Val
     >
       {({ getRootProps, getInputProps, acceptedFiles, rejectedFiles, isDragActive }) => {
         const status = determineStatus(acceptedFiles, rejectedFiles, error, isDragActive, parsing);
+
         return (
           <section>
             <div {...getRootProps({ style: dropdownDivStyle(status) })}>
               <input {...getInputProps()} />
               {
                 <span style={innerSpanStyle()}>
-                  <Icon name="cloud upload" size="huge" style={dropdownIconStyle()} />
+                  <Icon name='cloud upload' size='huge' style={dropdownIconStyle()} />
                   <p>
                     {status === Status.Parsing && (
                       <>
-                        <Loader style={{ marginRight: '0.5em' }} size="small" inline active /> Uploading...
+                        <Loader style={{ marginRight: '0.5em' }} size='small' inline active /> Uploading...
                       </>
                     )}
                     {status === Status.Rejected && (
diff --git a/pioneer/packages/joy-proposals/src/forms/FillWorkingGroupLeaderOpeningForm.tsx b/pioneer/packages/joy-proposals/src/forms/FillWorkingGroupLeaderOpeningForm.tsx
index 38b8bb5800..044c121061 100644
--- a/pioneer/packages/joy-proposals/src/forms/FillWorkingGroupLeaderOpeningForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/FillWorkingGroupLeaderOpeningForm.tsx
@@ -1,17 +1,13 @@
 import React from 'react';
 import * as Yup from 'yup';
-import {
-  withProposalFormData,
+import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
   ProposalFormInnerProps,
-  genericFormDefaultOptions
-} from './GenericProposalForm';
-import {
-  GenericWorkingGroupProposalForm,
+  genericFormDefaultOptions } from './GenericProposalForm';
+import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
-  defaultValues as wgFromDefaultValues
-} from './GenericWorkingGroupProposalForm';
+  defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
 import { FormField, RewardPolicyFields } from './FormFields';
 import { withFormContainer } from './FormContainer';
 import { Dropdown, DropdownItemProps, Header, Checkbox, Message } from 'semantic-ui-react';
@@ -72,7 +68,7 @@ const valuesToFillOpeningParams = (values: FormValues): SimplifiedTypeInterface<
   }
 );
 
-const FillWorkingGroupLeaderOpeningForm: React.FunctionComponent<FormInnerProps> = props => {
+const FillWorkingGroupLeaderOpeningForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const { handleChange, setFieldValue, values, myMemberId, errors, touched } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
   const transport = useTransport();
@@ -83,8 +79,9 @@ const FillWorkingGroupLeaderOpeningForm: React.FunctionComponent<FormInnerProps>
   );
   const openingsOptions: DropdownItemProps[] = openings
     // Map to options
-    .map(od => {
+    .map((od) => {
       const hrt = od.hiringOpening.parse_human_readable_text_with_fallback();
+
       return {
         text: `${od.id.toString()}: ${hrt.headline} (${hrt.job.title})`,
         value: od.id.toString()
@@ -98,7 +95,7 @@ const FillWorkingGroupLeaderOpeningForm: React.FunctionComponent<FormInnerProps>
     [values.workingGroup, values.openingId]
   );
   const applicationsOptions = activeApplications
-    .map(a => {
+    .map((a) => {
       return {
         text: `${a.wgApplicationId}: ${a.member.handle}`,
         image: a.member.avatar_uri.toString() ? { avatar: true, src: a.member.avatar_uri.toString() } : undefined,
@@ -112,8 +109,8 @@ const FillWorkingGroupLeaderOpeningForm: React.FunctionComponent<FormInnerProps>
   return (
     <GenericWorkingGroupProposalForm
       {...props}
-      txMethod="createFillWorkingGroupLeaderOpeningProposal"
-      proposalType="FillWorkingGroupLeaderOpening"
+      txMethod='createFillWorkingGroupLeaderOpeningProposal'
+      proposalType='FillWorkingGroupLeaderOpening'
       disabled={!openingsOptions.length || !applicationsOptions.length}
       submitParams={[
         myMemberId,
@@ -123,7 +120,7 @@ const FillWorkingGroupLeaderOpeningForm: React.FunctionComponent<FormInnerProps>
         valuesToFillOpeningParams(values)
       ]}
     >
-      <PromiseComponent error={openingsError} loading={openingsLoading} message="Fetching openings...">
+      <PromiseComponent error={openingsError} loading={openingsLoading} message='Fetching openings...'>
         { !openingsOptions.length
           ? (
             <Message error visible>
@@ -136,11 +133,12 @@ const FillWorkingGroupLeaderOpeningForm: React.FunctionComponent<FormInnerProps>
           )
           : (
             <FormField
-              label="Working Group Opening"
+              label='Working Group Opening'
               error={errorLabelsProps.openingId}>
               <Dropdown
                 onChange={(...args) => {
                   setFieldValue('successfulApplicants', []);
+
                   // "as any" assert is required due to some invalid typing of Formik's "handleChange" function (it takes 2 args, not 1)
                   return (handleChange as any)(...args);
                 }}
@@ -155,7 +153,7 @@ const FillWorkingGroupLeaderOpeningForm: React.FunctionComponent<FormInnerProps>
         }
       </PromiseComponent>
       { values.openingId && (
-        <PromiseComponent error={applError} loading={applLoading} message="Fetching applications...">
+        <PromiseComponent error={applError} loading={applLoading} message='Fetching applications...'>
           { !applicationsOptions.length
             ? (
               <Message error visible>
@@ -169,23 +167,23 @@ const FillWorkingGroupLeaderOpeningForm: React.FunctionComponent<FormInnerProps>
             : (
               <>
                 <FormField
-                  label="Successful applicant"
+                  label='Successful applicant'
                   error={errorLabelsProps.successfulApplicant}>
                   <Dropdown
-                    placeholder="Select successful applicant"
+                    placeholder='Select successful applicant'
                     fluid
                     selection
                     options={applicationsOptions}
                     value={values.successfulApplicant}
                     onChange={handleChange}
-                    name="successfulApplicant"/>
+                    name='successfulApplicant'/>
                 </FormField>
                 {values.successfulApplicant && (<>
-                  <Header as="h3">Selected applicant:</Header>
+                  <Header as='h3'>Selected applicant:</Header>
                   <ApplicationsDetails applications={
-                    [activeApplications.find(a => a.wgApplicationId.toString() === values.successfulApplicant)!]
+                    [activeApplications.find((a) => a.wgApplicationId.toString() === values.successfulApplicant)!]
                   }/>
-                  <Header as="h3">Reward policy:</Header>
+                  <Header as='h3'>Reward policy:</Header>
                   <FormField>
                     <Checkbox
                       toggle
diff --git a/pioneer/packages/joy-proposals/src/forms/FormContainer.tsx b/pioneer/packages/joy-proposals/src/forms/FormContainer.tsx
index 5db8ad55ab..03d7fbc02b 100644
--- a/pioneer/packages/joy-proposals/src/forms/FormContainer.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/FormContainer.tsx
@@ -10,6 +10,7 @@ export function withFormContainer<MyFormProps, FormValues> (formikProps: any) {
           props.setFieldTouched(data.name);
         }
       };
+
       const handleChange = (e: React.ChangeEvent<HTMLInputElement>, data: any): void => {
         if (data && data.name) {
           props.setFieldValue(data.name, data.value);
diff --git a/pioneer/packages/joy-proposals/src/forms/FormFields.tsx b/pioneer/packages/joy-proposals/src/forms/FormFields.tsx
index f4bbbcb97e..548743d10b 100644
--- a/pioneer/packages/joy-proposals/src/forms/FormFields.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/FormFields.tsx
@@ -23,6 +23,7 @@ type InputFormFieldProps = Omit<FormInputProps, 'error'> & {
 export function InputFormField (props: InputFormFieldProps) {
   const { unit } = props;
   const fieldProps = { ...props, label: undefined, error: undefined };
+
   return (
     <FormField {...props} showErrorMsg={true}>
       <Form.Input
@@ -42,6 +43,7 @@ type TextareaFormFieldProps = Omit<FormTextAreaProps, 'error'> & {
 
 export function TextareaFormField (props: TextareaFormFieldProps) {
   const fieldProps = { ...props, label: undefined, error: undefined };
+
   return (
     <FormField {...props} showErrorMsg={true}>
       <Form.TextArea {...fieldProps}/>
@@ -62,6 +64,7 @@ const StyledFormField = styled(Form.Field)`
 
 export function FormField (props: React.PropsWithChildren<FormFieldProps>) {
   const { error, showErrorMsg = false, label, help, children } = props;
+
   return (
     <StyledFormField error={!!error}>
       { (label && help)
@@ -84,6 +87,7 @@ type RewardPolicyFieldsProps<ValuesT extends ReawrdPolicyFieldsType> =
   Pick<FormikProps<ValuesT>, 'values' | 'handleChange' | 'setFieldValue'> & {
     errorLabelsProps: FormErrorLabelsProps<ValuesT>;
   };
+
 export function RewardPolicyFields<ValuesT extends ReawrdPolicyFieldsType> ({
   values,
   errorLabelsProps,
@@ -93,7 +97,7 @@ export function RewardPolicyFields<ValuesT extends ReawrdPolicyFieldsType> ({
   return (
     <>
       <InputFormField
-        label="Amount per payout"
+        label='Amount per payout'
         unit={formatBalance.getDefaults().unit}
         onChange={handleChange}
         name={'rewardAmount'}
@@ -102,7 +106,7 @@ export function RewardPolicyFields<ValuesT extends ReawrdPolicyFieldsType> ({
         placeholder={'ie. 100'}
       />
       <InputFormField
-        label="Next payment at block"
+        label='Next payment at block'
         onChange={handleChange}
         name={'rewardNextBlock'}
         error={errorLabelsProps.rewardNextBlock}
@@ -117,7 +121,7 @@ export function RewardPolicyFields<ValuesT extends ReawrdPolicyFieldsType> ({
       </FormField>
       { values.rewardRecurring && (
         <InputFormField
-          label="Reward interval"
+          label='Reward interval'
           onChange={handleChange}
           name={'rewardInterval'}
           error={errorLabelsProps.rewardInterval}
diff --git a/pioneer/packages/joy-proposals/src/forms/GenericProposalForm.tsx b/pioneer/packages/joy-proposals/src/forms/GenericProposalForm.tsx
index f5f86a4557..0f2daa5b41 100644
--- a/pioneer/packages/joy-proposals/src/forms/GenericProposalForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/GenericProposalForm.tsx
@@ -104,7 +104,7 @@ const StyledGenericProposalForm = styled.div`
 
 // Generic proposal form with basic structure, "Title" and "Rationale" fields
 // Other fields can be passed as children
-export const GenericProposalForm: React.FunctionComponent<GenericFormInnerProps> = props => {
+export const GenericProposalForm: React.FunctionComponent<GenericFormInnerProps> = (props) => {
   const {
     handleChange,
     handleSubmit,
@@ -139,6 +139,7 @@ export const GenericProposalForm: React.FunctionComponent<GenericFormInnerProps>
       if (isValid) {
         afterSubmit();
       }
+
       setAfterSubmit(null);
       setSubmitting(false);
     }
@@ -149,9 +150,11 @@ export const GenericProposalForm: React.FunctionComponent<GenericFormInnerProps>
   useEffect(() => {
     if (!isValidating && formContainerRef.current !== null) {
       const [errorField] = formContainerRef.current.getElementsByClassName('error field');
+
       if (errorField) {
         errorField.scrollIntoView({ behavior: 'smooth' });
         const [errorInput] = errorField.querySelectorAll('input,textarea');
+
         if (errorInput) {
           (errorInput as (HTMLInputElement | HTMLTextAreaElement)).focus();
         }
@@ -173,13 +176,16 @@ export const GenericProposalForm: React.FunctionComponent<GenericFormInnerProps>
     if (!history) return;
     // Determine proposal id
     let createdProposalId: number | null = null;
+
     for (const e of txResult.events) {
       const event = e.get('event') as Event | undefined;
+
       if (event !== undefined && event.method === 'ProposalCreated') {
         createdProposalId = (event.data[1] as ProposalId).toNumber();
         break;
       }
     }
+
     setSubmitting(false);
     history.push(`/proposals/${createdProposalId}`);
   };
@@ -192,57 +198,57 @@ export const GenericProposalForm: React.FunctionComponent<GenericFormInnerProps>
   return (
     <StyledGenericProposalForm ref={formContainerRef}>
       <Form
-        className="proposal-form"
+        className='proposal-form'
         onSubmit={txMethod
           ? () => { /* Do nothing. Tx button uses custom submit handler - "onTxButtonClick" */ }
           : handleSubmit
         }>
         <InputFormField
-          label="Title"
-          help="The title of your proposal"
+          label='Title'
+          help='The title of your proposal'
           onChange={handleChange}
-          name="title"
-          placeholder="Title for your awesome proposal..."
+          name='title'
+          placeholder='Title for your awesome proposal...'
           error={errorLabelsProps.title}
           value={values.title}
         />
         <TextareaFormField
-          label="Rationale"
-          help="The rationale behind your proposal"
+          label='Rationale'
+          help='The rationale behind your proposal'
           onChange={handleChange}
-          name="rationale"
-          placeholder="This proposal is awesome because..."
+          name='rationale'
+          placeholder='This proposal is awesome because...'
           error={errorLabelsProps.rationale}
           value={values.rationale}
         />
         {children}
         <Message warning visible>
           <Message.Content>
-            <Icon name="warning circle" />
+            <Icon name='warning circle' />
             Required stake: <b>{ formatBalance(requiredStake) }</b>
           </Message.Content>
         </Message>
-        <div className="form-buttons">
+        <div className='form-buttons'>
           {txMethod ? (
             <TxButton
-              type="button" // Tx button uses custom submit handler - "onTxButtonClick"
-              label="Submit proposal"
+              type='button' // Tx button uses custom submit handler - "onTxButtonClick"
+              label='Submit proposal'
               isDisabled={disabled || isSubmitting}
-              params={(submitParams || []).map(p => (p === '{STAKE}' ? requiredStake : p))}
+              params={(submitParams || []).map((p) => (p === '{STAKE}' ? requiredStake : p))}
               tx={`proposalsCodex.${txMethod}`}
               txFailedCb={onTxFailed}
               txSuccessCb={onTxSuccess}
               onClick={onTxButtonClick} // This replaces standard submit
             />
           ) : (
-            <Button type="submit" color="blue" loading={isSubmitting}>
-              <Icon name="paper plane" />
+            <Button type='submit' color='blue' loading={isSubmitting}>
+              <Icon name='paper plane' />
               Submit
             </Button>
           )}
 
-          <Button type="button" color="grey" onClick={handleReset}>
-            <Icon name="times" />
+          <Button type='button' color='grey' onClick={handleReset}>
+            <Icon name='times' />
             Clear
           </Button>
         </div>
diff --git a/pioneer/packages/joy-proposals/src/forms/GenericWorkingGroupProposalForm.tsx b/pioneer/packages/joy-proposals/src/forms/GenericWorkingGroupProposalForm.tsx
index 3da45c7bb3..98bc9dfaa3 100644
--- a/pioneer/packages/joy-proposals/src/forms/GenericWorkingGroupProposalForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/GenericWorkingGroupProposalForm.tsx
@@ -1,13 +1,11 @@
 import React from 'react';
 import { getFormErrorLabelsProps } from './errorHandling';
-import {
-  GenericProposalForm,
+import { GenericProposalForm,
   GenericFormValues,
   genericFormDefaultValues,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps
-} from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import { FormField } from './FormFields';
 import { ProposalType } from '@polkadot/joy-utils/types/proposals';
 import { WorkingGroupKey, WorkingGroupDef } from '@joystream/types/common';
@@ -45,7 +43,7 @@ type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormVal
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 export type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
-export const GenericWorkingGroupProposalForm: React.FunctionComponent<FormInnerProps> = props => {
+export const GenericWorkingGroupProposalForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const {
     handleChange,
     errors,
@@ -72,17 +70,18 @@ export const GenericWorkingGroupProposalForm: React.FunctionComponent<FormInnerP
   const isDisabled = disabled || leadMissing || stakeMissing || rewardMissing || Boolean(leadRes.error);
 
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
+
   return (
     <GenericProposalForm {...props} disabled={isDisabled}>
       <FormField
         error={errorLabelsProps.workingGroup}
-        label="Working group"
+        label='Working group'
       >
         <Dropdown
-          name="workingGroup"
-          placeholder="Select the working group"
+          name='workingGroup'
+          placeholder='Select the working group'
           selection
-          options={Object.keys(WorkingGroupDef).map(wgKey => ({ text: wgKey + ' Working Group', value: wgKey }))}
+          options={Object.keys(WorkingGroupDef).map((wgKey) => ({ text: wgKey + ' Working Group', value: wgKey }))}
           value={values.workingGroup}
           onChange={ handleChange }
         />
diff --git a/pioneer/packages/joy-proposals/src/forms/LabelWithHelp.tsx b/pioneer/packages/joy-proposals/src/forms/LabelWithHelp.tsx
index d8880ba5bc..deb9be8c0d 100644
--- a/pioneer/packages/joy-proposals/src/forms/LabelWithHelp.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/LabelWithHelp.tsx
@@ -5,6 +5,7 @@ type LabelWithHelpProps = { text: string; help: string };
 
 export default function LabelWithHelp (props: LabelWithHelpProps) {
   const [open, setOpen] = useState(false);
+
   return (
     <label
       style={{ position: 'relative', cursor: 'pointer', padding: '0.25em 0' }}
@@ -15,10 +16,10 @@ export default function LabelWithHelp (props: LabelWithHelpProps) {
       <span style={{ position: 'absolute', display: 'inline-flex', flexWrap: 'wrap', marginTop: '-0.25em' }}>
         <Icon
           style={{ margin: '0.25em 0.1em 0.5em 0.25em' }}
-          name="help circle"
-          color="grey"/>
-        <Transition animation="fade" visible={open} duration={500}>
-          <Label basic style={{ minWidth: '150px' }} color="grey" content={props.help}/>
+          name='help circle'
+          color='grey'/>
+        <Transition animation='fade' visible={open} duration={500}>
+          <Label basic style={{ minWidth: '150px' }} color='grey' content={props.help}/>
         </Transition>
       </span>
     </label>
diff --git a/pioneer/packages/joy-proposals/src/forms/MintCapacityForm.tsx b/pioneer/packages/joy-proposals/src/forms/MintCapacityForm.tsx
index 25edcc8e5d..3e720864a1 100644
--- a/pioneer/packages/joy-proposals/src/forms/MintCapacityForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/MintCapacityForm.tsx
@@ -1,16 +1,14 @@
 import React from 'react';
 import * as Yup from 'yup';
 import { getFormErrorLabelsProps } from './errorHandling';
-import {
-  GenericProposalForm,
+import { GenericProposalForm,
   GenericFormValues,
   genericFormDefaultOptions,
   genericFormDefaultValues,
   withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps
-} from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import Validation from '../validationSchema';
 import { InputFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
@@ -38,9 +36,10 @@ type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormVal
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
-const MintCapacityForm: React.FunctionComponent<FormInnerProps> = props => {
+const MintCapacityForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const { handleChange, errors, touched, mintCapacityGroup, values, txMethod, initialData, proposalType } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
+
   return (
     <GenericProposalForm
       {...props}
@@ -51,7 +50,7 @@ const MintCapacityForm: React.FunctionComponent<FormInnerProps> = props => {
       <InputFormField
         error={errorLabelsProps.capacity}
         onChange={handleChange}
-        name="capacity"
+        name='capacity'
         placeholder={ (initialData && initialData.capacity) }
         label={`${mintCapacityGroup} Mint Capacity`}
         help={`The new mint capacity you propse for ${mintCapacityGroup}`}
diff --git a/pioneer/packages/joy-proposals/src/forms/RuntimeUpgradeForm.tsx b/pioneer/packages/joy-proposals/src/forms/RuntimeUpgradeForm.tsx
index 9ed2ab19c0..e9ad215e59 100644
--- a/pioneer/packages/joy-proposals/src/forms/RuntimeUpgradeForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/RuntimeUpgradeForm.tsx
@@ -1,16 +1,14 @@
 import React from 'react';
 import { Form } from 'semantic-ui-react';
 import * as Yup from 'yup';
-import {
-  GenericProposalForm,
+import { GenericProposalForm,
   GenericFormValues,
   genericFormDefaultOptions,
   genericFormDefaultValues,
   withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps
-} from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import Validation from '../validationSchema';
 import { withFormContainer } from './FormContainer';
 import FileDropdown from './FileDropdown';
@@ -30,22 +28,23 @@ type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormVal
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
-const RuntimeUpgradeForm: React.FunctionComponent<FormInnerProps> = props => {
+const RuntimeUpgradeForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const { errors, setFieldValue, setFieldTouched, values, touched } = props;
+
   return (
     <GenericProposalForm
       {...props}
-      txMethod="createRuntimeUpgradeProposal"
-      proposalType="RuntimeUpgrade"
+      txMethod='createRuntimeUpgradeProposal'
+      proposalType='RuntimeUpgrade'
       submitParams={[props.myMemberId, values.title, values.rationale, '{STAKE}', values.WASM]}
     >
       <Form.Field>
         <FileDropdown<FormValues>
           setFieldValue={setFieldValue}
           setFieldTouched={setFieldTouched}
-          defaultText="Drag-n-drop WASM bytecode of a runtime upgrade (*.wasm)"
-          acceptedFormats=".wasm"
-          name="WASM"
+          defaultText='Drag-n-drop WASM bytecode of a runtime upgrade (*.wasm)'
+          acceptedFormats='.wasm'
+          name='WASM'
           error={touched.WASM ? errors.WASM : undefined}
           interpretAs='binary'
         />
diff --git a/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupLeadForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupLeadForm.tsx
index 7144166729..91e3056eca 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupLeadForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupLeadForm.tsx
@@ -2,16 +2,14 @@ import React, { useEffect, useState } from 'react';
 import { Dropdown, Label, Loader, Message, Icon, DropdownItemProps, DropdownOnSearchChangeData, DropdownProps } from 'semantic-ui-react';
 import { getFormErrorLabelsProps } from './errorHandling';
 import * as Yup from 'yup';
-import {
-  GenericProposalForm,
+import { GenericProposalForm,
   GenericFormValues,
   genericFormDefaultOptions,
   genericFormDefaultValues,
   withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps
-} from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import Validation from '../validationSchema';
 import { FormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
@@ -61,13 +59,15 @@ function filterMembers (options: DropdownItemProps[], query: string) {
   if (query.length < MEMBERS_QUERY_MIN_LENGTH) {
     return [MEMBERS_NONE_OPTION];
   }
+
   const regexp = new RegExp(_.escapeRegExp(query));
+
   return options.filter((opt) => regexp.test((opt.text || '').toString()));
 }
 
 type MemberWithId = { id: number; profile: Membership };
 
-const SetContentWorkingGroupsLeadForm: React.FunctionComponent<FormInnerProps> = props => {
+const SetContentWorkingGroupsLeadForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const { handleChange, errors, touched, values } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
   // State
@@ -84,6 +84,7 @@ const SetContentWorkingGroupsLeadForm: React.FunctionComponent<FormInnerProps> =
     () => transport.contentWorkingGroup.currentLead(),
     null
   );
+
   // Generate members options array on load
   useEffect(() => {
     if (members.length) {
@@ -96,11 +97,11 @@ const SetContentWorkingGroupsLeadForm: React.FunctionComponent<FormInnerProps> =
   }, [membersSearchQuery]);
 
   return (
-    <PromiseComponent error={clError} loading={clLoading} message="Fetching current lead...">
+    <PromiseComponent error={clError} loading={clLoading} message='Fetching current lead...'>
       <GenericProposalForm
         {...props}
-        txMethod="createSetLeadProposal"
-        proposalType="SetLead"
+        txMethod='createSetLeadProposal'
+        proposalType='SetLead'
         submitParams={[
           props.myMemberId,
           values.title,
@@ -116,7 +117,7 @@ const SetContentWorkingGroupsLeadForm: React.FunctionComponent<FormInnerProps> =
         ) : (<>
           <FormField
             error={errorLabelsProps.workingGroupLead}
-            label="New Content Working Group Lead"
+            label='New Content Working Group Lead'
             help={
               'The member you propose to set as a new Content Working Group Lead. ' +
               'Start typing handle or use "id:[ID]" query. ' +
@@ -140,7 +141,7 @@ const SetContentWorkingGroupsLeadForm: React.FunctionComponent<FormInnerProps> =
               onSearchChange={ (e: React.SyntheticEvent, data: DropdownOnSearchChangeData) => {
                 setMembersSearchQuery(data.searchQuery);
               } }
-              name="workingGroupLead"
+              name='workingGroupLead'
               placeholder={ 'Start typing member handle or "id:[ID]" query...' }
               fluid
               selection
@@ -149,7 +150,9 @@ const SetContentWorkingGroupsLeadForm: React.FunctionComponent<FormInnerProps> =
                 (e: React.ChangeEvent<any>, data: DropdownProps) => {
                   // Fix TypeScript issue
                   const originalHandler = handleChange as (e: React.ChangeEvent<any>, data: DropdownProps) => void;
+
                   originalHandler(e, data);
+
                   if (!data.value) {
                     setMembersSearchQuery('');
                   }
@@ -161,7 +164,7 @@ const SetContentWorkingGroupsLeadForm: React.FunctionComponent<FormInnerProps> =
           </FormField>
           <Message info active={1}>
             <Message.Content>
-              <Icon name="info circle"/>
+              <Icon name='info circle'/>
               Current Content Working Group lead: <b>{ (currentLead && currentLead.profile.handle) || 'NONE' }</b>
             </Message.Content>
           </Message>
diff --git a/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupMintCapForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupMintCapForm.tsx
index a48d6a5676..331695584f 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupMintCapForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupMintCapForm.tsx
@@ -9,11 +9,11 @@ const ContentWorkingGroupMintCapForm = (props: RouteComponentProps) => {
   const [mintCapacity, error, loading] = usePromise<number>(() => transport.contentWorkingGroup.currentMintCap(), 0);
 
   return (
-    <PromiseComponent error={error} loading={loading} message="Fetching current mint capacity...">
+    <PromiseComponent error={error} loading={loading} message='Fetching current mint capacity...'>
       <MintCapacityForm
-        mintCapacityGroup="Content Working Group"
-        txMethod="createSetContentWorkingGroupMintCapacityProposal"
-        proposalType="SetContentWorkingGroupMintCapacity"
+        mintCapacityGroup='Content Working Group'
+        txMethod='createSetContentWorkingGroupMintCapacityProposal'
+        proposalType='SetContentWorkingGroupMintCapacity'
         initialData={{ capacity: mintCapacity.toString() }}
         {...props} />
     </PromiseComponent>
diff --git a/pioneer/packages/joy-proposals/src/forms/SetCouncilParamsForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetCouncilParamsForm.tsx
index 6f1a94313a..aba4f91c0e 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetCouncilParamsForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetCouncilParamsForm.tsx
@@ -2,16 +2,14 @@ import React, { useEffect, useState } from 'react';
 import { getFormErrorLabelsProps } from './errorHandling';
 import { Divider, Form } from 'semantic-ui-react';
 import * as Yup from 'yup';
-import {
-  GenericProposalForm,
+import { GenericProposalForm,
   GenericFormValues,
   genericFormDefaultOptions,
   genericFormDefaultValues,
   withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps
-} from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import Validation from '../validationSchema';
 import { InputFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
@@ -62,13 +60,14 @@ function createElectionParameters (values: FormValues): SimplifiedTypeInterface<
   };
 }
 
-const SetCouncilParamsForm: React.FunctionComponent<FormInnerProps> = props => {
+const SetCouncilParamsForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const { handleChange, errors, touched, values, setFieldValue, setFieldError } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
   const [placeholders, setPlaceholders] = useState<{ [k in keyof FormValues]: string }>(defaultValues);
 
   const transport = useTransport();
   const [councilParams, error, loading] = usePromise<IElectionParameters | null>(() => transport.council.electionParameters(), null);
+
   useEffect(() => {
     if (councilParams) {
       const fetchedPlaceholders = { ...placeholders };
@@ -82,8 +81,10 @@ const SetCouncilParamsForm: React.FunctionComponent<FormInnerProps> = props => {
         'candidacy_limit',
         'council_size'
       ] as const;
-      fieldsToPopulate.forEach(field => {
+
+      fieldsToPopulate.forEach((field) => {
         const camelCaseField = _.camelCase(field) as keyof FormValues;
+
         setFieldValue(camelCaseField, councilParams[field].toString());
         fetchedPlaceholders[camelCaseField] = councilParams[field].toString();
       });
@@ -97,49 +98,49 @@ const SetCouncilParamsForm: React.FunctionComponent<FormInnerProps> = props => {
   }
 
   return (
-    <PromiseComponent error={error} loading={loading} message="Fetching current parameters...">
+    <PromiseComponent error={error} loading={loading} message='Fetching current parameters...'>
       <GenericProposalForm
         {...props}
-        txMethod="createSetElectionParametersProposal"
-        proposalType="SetElectionParameters"
+        txMethod='createSetElectionParametersProposal'
+        proposalType='SetElectionParameters'
         submitParams={[props.myMemberId, values.title, values.rationale, '{STAKE}', createElectionParameters(values)]}
       >
         <Divider horizontal>Voting </Divider>
-        <Form.Group widths="equal" style={{ marginBottom: '8rem' }}>
+        <Form.Group widths='equal' style={{ marginBottom: '8rem' }}>
           <InputFormField
-            label="Announcing Period"
-            help="Announcing period in blocks"
+            label='Announcing Period'
+            help='Announcing period in blocks'
             onChange={handleChange}
-            name="announcingPeriod"
+            name='announcingPeriod'
             error={errorLabelsProps.announcingPeriod}
             value={values.announcingPeriod}
             placeholder={ placeholders.announcingPeriod }
           />
           <InputFormField
-            label="Voting Period"
-            help="Voting period in blocks"
+            label='Voting Period'
+            help='Voting period in blocks'
             onChange={handleChange}
-            name="votingPeriod"
+            name='votingPeriod'
             error={errorLabelsProps.votingPeriod}
             value={values.votingPeriod}
             placeholder={ placeholders.votingPeriod }
           />
           <InputFormField
-            label="Revealing Period"
-            help="Revealing period in blocks"
+            label='Revealing Period'
+            help='Revealing period in blocks'
             fluid
             onChange={handleChange}
-            name="revealingPeriod"
+            name='revealingPeriod'
             error={errorLabelsProps.revealingPeriod}
             value={values.revealingPeriod}
             placeholder={ placeholders.revealingPeriod }
           />
           <InputFormField
-            label="Minimum Voting Stake"
-            help="The minimum voting stake"
+            label='Minimum Voting Stake'
+            help='The minimum voting stake'
             fluid
             onChange={handleChange}
-            name="minVotingStake"
+            name='minVotingStake'
             error={errorLabelsProps.minVotingStake}
             value={values.minVotingStake}
             placeholder={ placeholders.minVotingStake }
@@ -147,44 +148,44 @@ const SetCouncilParamsForm: React.FunctionComponent<FormInnerProps> = props => {
           />
         </Form.Group>
         <Divider horizontal>Council</Divider>
-        <Form.Group widths="equal" style={{ marginBottom: '8rem' }}>
+        <Form.Group widths='equal' style={{ marginBottom: '8rem' }}>
           <InputFormField
-            label="Minimum Council Stake"
-            help="The minimum council stake"
+            label='Minimum Council Stake'
+            help='The minimum council stake'
             fluid
             onChange={handleChange}
-            name="minCouncilStake"
+            name='minCouncilStake'
             error={errorLabelsProps.minCouncilStake}
             value={values.minCouncilStake}
             placeholder={ placeholders.minCouncilStake }
             disabled
           />
           <InputFormField
-            label="New Term Duration"
-            help="Duration of the new term in blocks"
+            label='New Term Duration'
+            help='Duration of the new term in blocks'
             fluid
             onChange={handleChange}
-            name="newTermDuration"
+            name='newTermDuration'
             error={errorLabelsProps.newTermDuration}
             value={values.newTermDuration}
             placeholder={ placeholders.newTermDuration }
           />
           <InputFormField
-            label="Council Size"
-            help="The size of the council (number of seats)"
+            label='Council Size'
+            help='The size of the council (number of seats)'
             fluid
             onChange={handleChange}
-            name="councilSize"
+            name='councilSize'
             error={errorLabelsProps.councilSize}
             value={values.councilSize}
             placeholder={ placeholders.councilSize }
           />
           <InputFormField
-            label="Candidacy Limit"
-            help="How many candidates that will be allowed in to the voting stage"
+            label='Candidacy Limit'
+            help='How many candidates that will be allowed in to the voting stage'
             fluid
             onChange={handleChange}
-            name="candidacyLimit"
+            name='candidacyLimit'
             error={errorLabelsProps.candidacyLimit}
             value={values.candidacyLimit}
             placeholder={ placeholders.candidacyLimit }
diff --git a/pioneer/packages/joy-proposals/src/forms/SetMaxValidatorCountForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetMaxValidatorCountForm.tsx
index f32031b705..1f252bdcd6 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetMaxValidatorCountForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetMaxValidatorCountForm.tsx
@@ -1,16 +1,14 @@
 import React, { useEffect } from 'react';
 import { getFormErrorLabelsProps } from './errorHandling';
 import * as Yup from 'yup';
-import {
-  GenericProposalForm,
+import { GenericProposalForm,
   GenericFormValues,
   genericFormDefaultOptions,
   genericFormDefaultValues,
   withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps
-} from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import Validation from '../validationSchema';
 import { InputFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
@@ -30,7 +28,7 @@ type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormVal
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
-const SetMaxValidatorCountForm: React.FunctionComponent<FormInnerProps> = props => {
+const SetMaxValidatorCountForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const transport = useTransport();
   const [validatorCount] = usePromise<number>(() => transport.validators.maxCount(), 20);
   const { handleChange, errors, touched, values, setFieldValue } = props;
@@ -41,19 +39,20 @@ const SetMaxValidatorCountForm: React.FunctionComponent<FormInnerProps> = props
       setFieldValue('maxValidatorCount', validatorCount);
     }
   }, [validatorCount]);
+
   return (
     <GenericProposalForm
       {...props}
-      txMethod="createSetValidatorCountProposal"
-      proposalType="SetValidatorCount"
+      txMethod='createSetValidatorCountProposal'
+      proposalType='SetValidatorCount'
       submitParams={[props.myMemberId, values.title, values.rationale, '{STAKE}', values.maxValidatorCount]}
     >
       <InputFormField
         error={errorLabelsProps.maxValidatorCount}
-        label="Max Validator Count"
-        help="The new value for maximum number of Validators that you propose"
+        label='Max Validator Count'
+        help='The new value for maximum number of Validators that you propose'
         onChange={handleChange}
-        name="maxValidatorCount"
+        name='maxValidatorCount'
         placeholder={validatorCount}
         value={values.maxValidatorCount}
       />
diff --git a/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupLeadRewardForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupLeadRewardForm.tsx
index 528692ed1f..8879c2f851 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupLeadRewardForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupLeadRewardForm.tsx
@@ -1,18 +1,14 @@
 import React, { useState } from 'react';
 import { getFormErrorLabelsProps } from './errorHandling';
 import * as Yup from 'yup';
-import {
-  withProposalFormData,
+import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
   ProposalFormInnerProps,
-  genericFormDefaultOptions
-} from './GenericProposalForm';
-import {
-  GenericWorkingGroupProposalForm,
+  genericFormDefaultOptions } from './GenericProposalForm';
+import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
-  defaultValues as wgFromDefaultValues
-} from './GenericWorkingGroupProposalForm';
+  defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
 import { InputFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
 import { Grid } from 'semantic-ui-react';
@@ -35,7 +31,7 @@ type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormVal
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
-const SetWorkingGroupLeadRewardForm: React.FunctionComponent<FormInnerProps> = props => {
+const SetWorkingGroupLeadRewardForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const { handleChange, errors, touched, values, myMemberId } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
   const [lead, setLead] = useState<WorkerData | null>(null);
@@ -43,8 +39,8 @@ const SetWorkingGroupLeadRewardForm: React.FunctionComponent<FormInnerProps> = p
   return (
     <GenericWorkingGroupProposalForm
       {...props}
-      txMethod="createSetWorkingGroupLeaderRewardProposal"
-      proposalType="SetWorkingGroupLeaderReward"
+      txMethod='createSetWorkingGroupLeaderRewardProposal'
+      proposalType='SetWorkingGroupLeaderReward'
       leadRequired={true}
       leadRewardRequired={true}
       onLeadChange={(lead: WorkerData | null) => setLead(lead)}
@@ -59,12 +55,12 @@ const SetWorkingGroupLeadRewardForm: React.FunctionComponent<FormInnerProps> = p
       ]}
     >
       { (lead && lead.reward) && (
-        <Grid columns="4" doubling stackable verticalAlign="bottom">
+        <Grid columns='4' doubling stackable verticalAlign='bottom'>
           <Grid.Column>
             <InputFormField
-              label="New reward amount"
+              label='New reward amount'
               onChange={handleChange}
-              name="amount"
+              name='amount'
               error={errorLabelsProps.amount}
               value={values.amount}
               unit={formatBalance.getDefaults().unit}
diff --git a/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupMintCapacityForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupMintCapacityForm.tsx
index 9b4513383a..9ba9d72ec9 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupMintCapacityForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupMintCapacityForm.tsx
@@ -1,18 +1,14 @@
 import React from 'react';
 import { getFormErrorLabelsProps } from './errorHandling';
 import * as Yup from 'yup';
-import {
-  withProposalFormData,
+import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
   ProposalFormInnerProps,
-  genericFormDefaultOptions
-} from './GenericProposalForm';
-import {
-  GenericWorkingGroupProposalForm,
+  genericFormDefaultOptions } from './GenericProposalForm';
+import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
-  defaultValues as wgFromDefaultValues
-} from './GenericWorkingGroupProposalForm';
+  defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
 import { InputFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
 import { Grid } from 'semantic-ui-react';
@@ -34,15 +30,15 @@ type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormVal
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
-const SetWorkingGroupMintCapacityForm: React.FunctionComponent<FormInnerProps> = props => {
+const SetWorkingGroupMintCapacityForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const { handleChange, errors, touched, values, myMemberId } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
 
   return (
     <GenericWorkingGroupProposalForm
       {...props}
-      txMethod="createSetWorkingGroupMintCapacityProposal"
-      proposalType="SetWorkingGroupMintCapacity"
+      txMethod='createSetWorkingGroupMintCapacityProposal'
+      proposalType='SetWorkingGroupMintCapacity'
       submitParams={[
         myMemberId,
         values.title,
@@ -52,12 +48,12 @@ const SetWorkingGroupMintCapacityForm: React.FunctionComponent<FormInnerProps> =
         values.workingGroup
       ]}
     >
-      <Grid columns="4" doubling stackable verticalAlign="bottom">
+      <Grid columns='4' doubling stackable verticalAlign='bottom'>
         <Grid.Column>
           <InputFormField
-            label="Mint capacity"
+            label='Mint capacity'
             onChange={handleChange}
-            name="capacity"
+            name='capacity'
             error={errorLabelsProps.capacity}
             value={values.capacity}
             placeholder={'ie. 100000'}
diff --git a/pioneer/packages/joy-proposals/src/forms/SignalForm.tsx b/pioneer/packages/joy-proposals/src/forms/SignalForm.tsx
index b0c722febe..996d0b9691 100644
--- a/pioneer/packages/joy-proposals/src/forms/SignalForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SignalForm.tsx
@@ -1,16 +1,14 @@
 import React from 'react';
 import { getFormErrorLabelsProps } from './errorHandling';
 import * as Yup from 'yup';
-import {
-  GenericProposalForm,
+import { GenericProposalForm,
   GenericFormValues,
   genericFormDefaultOptions,
   genericFormDefaultValues,
   withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps
-} from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import Validation from '../validationSchema';
 import { TextareaFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
@@ -29,23 +27,23 @@ type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormVal
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
-const SignalForm: React.FunctionComponent<FormInnerProps> = props => {
+const SignalForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const { handleChange, errors, touched, values } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
 
   return (
     <GenericProposalForm
       {...props}
-      txMethod="createTextProposal"
-      proposalType="Text"
+      txMethod='createTextProposal'
+      proposalType='Text'
       submitParams={[props.myMemberId, values.title, values.rationale, '{STAKE}', values.description]}
     >
       <TextareaFormField
-        label="Description"
-        help="The extensive description of your proposal"
+        label='Description'
+        help='The extensive description of your proposal'
         onChange={handleChange}
-        name="description"
-        placeholder="What I would like to propose is..."
+        name='description'
+        placeholder='What I would like to propose is...'
         error={errorLabelsProps.description}
         value={values.description}
       />
diff --git a/pioneer/packages/joy-proposals/src/forms/SlashWorkingGroupLeadStakeForm.tsx b/pioneer/packages/joy-proposals/src/forms/SlashWorkingGroupLeadStakeForm.tsx
index ceaaf76375..5c2fd5e69b 100644
--- a/pioneer/packages/joy-proposals/src/forms/SlashWorkingGroupLeadStakeForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SlashWorkingGroupLeadStakeForm.tsx
@@ -1,18 +1,14 @@
 import React, { useState, useEffect } from 'react';
 import { getFormErrorLabelsProps } from './errorHandling';
 import * as Yup from 'yup';
-import {
-  withProposalFormData,
+import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
   ProposalFormInnerProps,
-  genericFormDefaultOptions
-} from './GenericProposalForm';
-import {
-  GenericWorkingGroupProposalForm,
+  genericFormDefaultOptions } from './GenericProposalForm';
+import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
-  defaultValues as wgFromDefaultValues
-} from './GenericWorkingGroupProposalForm';
+  defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
 import { InputFormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
 import { Grid } from 'semantic-ui-react';
@@ -35,10 +31,11 @@ type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormVal
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
-const SlashWorkingGroupLeadStakeForm: React.FunctionComponent<FormInnerProps> = props => {
+const SlashWorkingGroupLeadStakeForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const { handleChange, errors, touched, values, myMemberId, setFieldError } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
   const [lead, setLead] = useState<WorkerData | null>(null);
+
   // Here we validate if stake <= current lead stake.
   // Because it depends on selected working group,
   // there's no easy way to do it using validationSchema
@@ -51,8 +48,8 @@ const SlashWorkingGroupLeadStakeForm: React.FunctionComponent<FormInnerProps> =
   return (
     <GenericWorkingGroupProposalForm
       {...props}
-      txMethod="createSlashWorkingGroupLeaderStakeProposal"
-      proposalType="SlashWorkingGroupLeaderStake"
+      txMethod='createSlashWorkingGroupLeaderStakeProposal'
+      proposalType='SlashWorkingGroupLeaderStake'
       leadRequired={true}
       leadStakeRequired={true}
       onLeadChange={(lead: WorkerData | null) => setLead(lead)}
@@ -67,12 +64,12 @@ const SlashWorkingGroupLeadStakeForm: React.FunctionComponent<FormInnerProps> =
       ]}
     >
       { (lead && lead.stake) && (
-        <Grid columns="4" doubling stackable verticalAlign="bottom">
+        <Grid columns='4' doubling stackable verticalAlign='bottom'>
           <Grid.Column>
             <InputFormField
-              label="Amount to slash"
+              label='Amount to slash'
               onChange={handleChange}
-              name="amount"
+              name='amount'
               error={errorLabelsProps.amount}
               value={values.amount}
               unit={formatBalance.getDefaults().unit}
diff --git a/pioneer/packages/joy-proposals/src/forms/SpendingProposalForm.tsx b/pioneer/packages/joy-proposals/src/forms/SpendingProposalForm.tsx
index 298af09cb1..989610de25 100644
--- a/pioneer/packages/joy-proposals/src/forms/SpendingProposalForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SpendingProposalForm.tsx
@@ -2,16 +2,14 @@ import React from 'react';
 import { getFormErrorLabelsProps } from './errorHandling';
 import * as Yup from 'yup';
 import { Label } from 'semantic-ui-react';
-import {
-  GenericProposalForm,
+import { GenericProposalForm,
   GenericFormValues,
   genericFormDefaultOptions,
   genericFormDefaultValues,
   withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps
-} from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import Validation from '../validationSchema';
 import { InputFormField, FormField } from './FormFields';
 import { withFormContainer } from './FormContainer';
@@ -34,14 +32,15 @@ type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormVal
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
-const SpendingProposalForm: React.FunctionComponent<FormInnerProps> = props => {
+const SpendingProposalForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const { handleChange, errors, touched, values, setFieldValue } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
+
   return (
     <GenericProposalForm
       {...props}
-      txMethod="createSpendingProposal"
-      proposalType="Spending"
+      txMethod='createSpendingProposal'
+      proposalType='Spending'
       submitParams={[
         props.myMemberId,
         values.title,
@@ -52,24 +51,24 @@ const SpendingProposalForm: React.FunctionComponent<FormInnerProps> = props => {
       ]}
     >
       <InputFormField
-        label="Amount of tokens"
-        help="The amount of tokens you propose to spend"
+        label='Amount of tokens'
+        help='The amount of tokens you propose to spend'
         onChange={handleChange}
-        name="tokens"
-        placeholder="100"
+        name='tokens'
+        placeholder='100'
         error={errorLabelsProps.tokens}
         unit={ formatBalance.getDefaults().unit }
         value={values.tokens}
       />
       <FormField
         error={errorLabelsProps.destinationAccount}
-        label="Destination account"
-        help="The account you propose to send the tokens into"
+        label='Destination account'
+        help='The account you propose to send the tokens into'
       >
         <InputAddress
-          onChange={address => setFieldValue('destinationAccount', address)}
-          type="all"
-          placeholder="Select Destination Account"
+          onChange={(address) => setFieldValue('destinationAccount', address)}
+          type='all'
+          placeholder='Select Destination Account'
           value={values.destinationAccount}
         />
         {errorLabelsProps.destinationAccount && <Label {...errorLabelsProps.destinationAccount} prompt />}
diff --git a/pioneer/packages/joy-proposals/src/forms/TerminateWorkingGroupLeaderForm.tsx b/pioneer/packages/joy-proposals/src/forms/TerminateWorkingGroupLeaderForm.tsx
index 2fd5020364..fc41c32848 100644
--- a/pioneer/packages/joy-proposals/src/forms/TerminateWorkingGroupLeaderForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/TerminateWorkingGroupLeaderForm.tsx
@@ -1,17 +1,13 @@
 import React, { useState } from 'react';
 import * as Yup from 'yup';
-import {
-  withProposalFormData,
+import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
   ProposalFormInnerProps,
-  genericFormDefaultOptions
-} from './GenericProposalForm';
-import {
-  GenericWorkingGroupProposalForm,
+  genericFormDefaultOptions } from './GenericProposalForm';
+import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
-  defaultValues as wgFromDefaultValues
-} from './GenericWorkingGroupProposalForm';
+  defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
 import { withFormContainer } from './FormContainer';
 import _ from 'lodash';
 import Validation from '../validationSchema';
@@ -52,7 +48,7 @@ const valuesToTerminateRoleParams = (values: FormValues, lead: WorkerData): Simp
   };
 };
 
-const TerminateWorkingGroupLeaderForm: React.FunctionComponent<FormInnerProps> = props => {
+const TerminateWorkingGroupLeaderForm: React.FunctionComponent<FormInnerProps> = (props) => {
   const { handleChange, errors, touched, values, myMemberId, setFieldValue } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
   const [lead, setLead] = useState<WorkerData | null>(null);
@@ -60,8 +56,8 @@ const TerminateWorkingGroupLeaderForm: React.FunctionComponent<FormInnerProps> =
   return (
     <GenericWorkingGroupProposalForm
       {...props}
-      txMethod="createTerminateWorkingGroupLeaderRoleProposal"
-      proposalType="TerminateWorkingGroupLeaderRole"
+      txMethod='createTerminateWorkingGroupLeaderRoleProposal'
+      proposalType='TerminateWorkingGroupLeaderRole'
       leadRequired={true}
       onLeadChange={(lead: WorkerData | null) => setLead(lead)}
       submitParams={[
@@ -74,15 +70,15 @@ const TerminateWorkingGroupLeaderForm: React.FunctionComponent<FormInnerProps> =
     >
       { lead && (<>
         <TextareaFormField
-          label="Termination rationale"
+          label='Termination rationale'
           help={
             'This rationale is an required argument of "terminateWorkerRole" extrinsic, ' +
             'it may differ from proposal rationale and has different length constraints. ' +
             'If the propsal gets executed, this rationale will become part of "TerminatedLeader" event.'
           }
           onChange={handleChange}
-          name="terminationRationale"
-          placeholder="Provide a clear rationale for terminating the leader role..."
+          name='terminationRationale'
+          placeholder='Provide a clear rationale for terminating the leader role...'
           error={errorLabelsProps.terminationRationale}
           value={values.terminationRationale}
         />
diff --git a/pioneer/packages/joy-proposals/src/forms/errorHandling.ts b/pioneer/packages/joy-proposals/src/forms/errorHandling.ts
index 8e5c1ea272..f70b3094a2 100644
--- a/pioneer/packages/joy-proposals/src/forms/errorHandling.ts
+++ b/pioneer/packages/joy-proposals/src/forms/errorHandling.ts
@@ -27,6 +27,7 @@ export function getFormErrorLabelsProps<ValuesT> (
   touched: FormikTouched<ValuesT>
 ): FormErrorLabelsProps<ValuesT> {
   const errorStates: Partial<FormErrorLabelsProps<ValuesT>> = {};
+
   for (const fieldName in errors) {
     errorStates[fieldName] = getErrorLabelProps<ValuesT>(errors, touched, fieldName);
   }
diff --git a/pioneer/packages/joy-proposals/src/index.tsx b/pioneer/packages/joy-proposals/src/index.tsx
index ec3cd611ad..e895cae2d7 100644
--- a/pioneer/packages/joy-proposals/src/index.tsx
+++ b/pioneer/packages/joy-proposals/src/index.tsx
@@ -10,8 +10,7 @@ import _ from 'lodash';
 
 import translate from './translate';
 import NotDone from './NotDone';
-import {
-  SignalForm,
+import { SignalForm,
   SpendingProposalForm,
   SetContentWorkingGroupLeadForm,
   SetContentWorkingGroupMintCapForm,
@@ -25,8 +24,7 @@ import {
   DecreaseWorkingGroupLeadStakeFrom,
   SlashWorkingGroupLeadStakeForm,
   SetWorkingGroupLeadRewardForm,
-  TerminateWorkingGroupLeaderForm
-} from './forms';
+  TerminateWorkingGroupLeaderForm } from './forms';
 import { RouteProps as AppMainRouteProps } from '@polkadot/apps-routing/types';
 import style from './style';
 
@@ -47,22 +45,22 @@ function App (props: Props): React.ReactElement<Props> {
   const { basePath } = props;
 
   return (
-    <ProposalsMain className="proposal--App">
+    <ProposalsMain className='proposal--App'>
       <StyledHeader>
         <Breadcrumb>
           <Switch>
-            <Route path={`${basePath}/new/:type`} render={props => (
+            <Route path={`${basePath}/new/:type`} render={(props) => (
               <>
                 <Breadcrumb.Section link as={Link} to={basePath}>Proposals</Breadcrumb.Section>
-                <Breadcrumb.Divider icon="right angle" />
+                <Breadcrumb.Divider icon='right angle' />
                 <Breadcrumb.Section link as={Link} to={`${basePath}/new`}>New proposal</Breadcrumb.Section>
-                <Breadcrumb.Divider icon="right angle" />
+                <Breadcrumb.Divider icon='right angle' />
                 <Breadcrumb.Section active>{_.startCase(props.match.params.type)}</Breadcrumb.Section>
               </>
             )} />
             <Route path={`${basePath}/new`}>
               <Breadcrumb.Section link as={Link} to={basePath}>Proposals</Breadcrumb.Section>
-              <Breadcrumb.Divider icon="right angle" />
+              <Breadcrumb.Divider icon='right angle' />
               <Breadcrumb.Section active>New proposal</Breadcrumb.Section>
             </Route>
             <Route>
diff --git a/pioneer/packages/joy-proposals/src/stories/ProposalForms.stories.tsx b/pioneer/packages/joy-proposals/src/stories/ProposalForms.stories.tsx
index 8741642416..ec0a4a68f8 100644
--- a/pioneer/packages/joy-proposals/src/stories/ProposalForms.stories.tsx
+++ b/pioneer/packages/joy-proposals/src/stories/ProposalForms.stories.tsx
@@ -1,14 +1,12 @@
 import '../index.css';
-import {
-  SignalForm,
+import { SignalForm,
   SpendingProposalForm,
   SetCouncilParamsForm,
   SetContentWorkingGroupLeadForm,
   RuntimeUpgradeForm,
   SetContentWorkingGroupMintCapForm,
   SetCouncilMintCapForm,
-  SetMaxValidatorCountForm
-} from '../forms';
+  SetMaxValidatorCountForm } from '../forms';
 import withMock from './withMock';
 
 export default {
diff --git a/pioneer/packages/joy-proposals/src/stories/data/ProposalPreviewList.mock.ts b/pioneer/packages/joy-proposals/src/stories/data/ProposalPreviewList.mock.ts
index 4cf5485ca6..e6f8242fec 100644
--- a/pioneer/packages/joy-proposals/src/stories/data/ProposalPreviewList.mock.ts
+++ b/pioneer/packages/joy-proposals/src/stories/data/ProposalPreviewList.mock.ts
@@ -92,4 +92,5 @@ import mockedProposal from './ProposalDetails.mock';
 //   }
 // ];
 const MockProposalPreviewList = Array.from({ length: 5 }, (_, i) => mockedProposal);
+
 export default MockProposalPreviewList;
diff --git a/pioneer/packages/joy-proposals/src/validationSchema.ts b/pioneer/packages/joy-proposals/src/validationSchema.ts
index 0507461755..8966d8e22c 100644
--- a/pioneer/packages/joy-proposals/src/validationSchema.ts
+++ b/pioneer/packages/joy-proposals/src/validationSchema.ts
@@ -178,8 +178,9 @@ function minMaxInt (min: number, max: number, fieldName: string) {
     .max(max, errorMessage(fieldName, min, max));
 }
 
-function minMaxStrFromConstraint(constraint: InputValidationLengthConstraint | undefined, fieldName: string) {
+function minMaxStrFromConstraint (constraint: InputValidationLengthConstraint | undefined, fieldName: string) {
   const schema = Yup.string().required(`${fieldName} is required!`);
+
   return constraint
     ? (
       schema
@@ -211,9 +212,9 @@ const Validation: ValidationType = {
   }),
   RuntimeUpgrade: () => ({
     WASM: Yup.mixed()
-      .test('fileArrayBuffer', 'Unexpected data format, file cannot be processed.', value => typeof value.byteLength !== 'undefined')
-      .test('fileSizeMin', `Minimum file size is ${FILE_SIZE_BYTES_MIN} bytes.`, value => value.byteLength >= FILE_SIZE_BYTES_MIN)
-      .test('fileSizeMax', `Maximum file size is ${FILE_SIZE_BYTES_MAX} bytes.`, value => value.byteLength <= FILE_SIZE_BYTES_MAX)
+      .test('fileArrayBuffer', 'Unexpected data format, file cannot be processed.', (value) => typeof value.byteLength !== 'undefined')
+      .test('fileSizeMin', `Minimum file size is ${FILE_SIZE_BYTES_MIN} bytes.`, (value) => value.byteLength >= FILE_SIZE_BYTES_MIN)
+      .test('fileSizeMax', `Maximum file size is ${FILE_SIZE_BYTES_MAX} bytes.`, (value) => value.byteLength <= FILE_SIZE_BYTES_MAX)
   }),
   SetElectionParameters: () => ({
     announcingPeriod: Yup.number()
@@ -369,18 +370,22 @@ const Validation: ValidationType = {
         'Schema validation failed!',
         function (val) {
           let schemaObj: any;
+
           try {
             schemaObj = JSON.parse(val);
           } catch (e) {
             return this.createError({ message: 'Schema validation failed: Invalid JSON' });
           }
+
           const isValid = schemaValidator(schemaObj);
           const errors = schemaValidator.errors || [];
+
           if (!isValid) {
             return this.createError({
-              message: 'Schema validation failed: ' + errors.map(e => `${e.message}${e.dataPath && ` (${e.dataPath})`}`).join(', ')
+              message: 'Schema validation failed: ' + errors.map((e) => `${e.message}${e.dataPath && ` (${e.dataPath})`}`).join(', ')
             });
           }
+
           return true;
         }
       )
diff --git a/pioneer/packages/joy-utils/src/react/components/TxButton.tsx b/pioneer/packages/joy-utils/src/react/components/TxButton.tsx
index 9ada4c4d8b..29496c5ec9 100644
--- a/pioneer/packages/joy-utils/src/react/components/TxButton.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/TxButton.tsx
@@ -33,13 +33,13 @@ const txButtonNotPassedProps: readonly (keyof TxButtonBaseProps)[] = [
   'txSuccessCb',
   'txStartCb',
   'txUpdateCb'
- ] as const;
+] as const;
 
 type SemanticButtonProps = SemanticButtonStrictProps & { style?: React.CSSProperties };
 
 type TxButtonProps<ButtonComponentProps extends Record<string, any>> = Omit<ButtonComponentProps, 'onClick'> & TxButtonBaseProps;
 
-function useTxButton(props: TxButtonBaseProps) {
+function useTxButton (props: TxButtonBaseProps) {
   const { queueExtrinsic } = useContext(QueueContext);
   const { api } = useApi();
   const { state: { address: myAddress } } = useMyAccount();
@@ -62,7 +62,7 @@ function useTxButton(props: TxButtonBaseProps) {
       txStartCb,
       txUpdateCb
     });
-  }
+  };
 
   return { origin, sendTx };
 }
@@ -86,7 +86,7 @@ export const DefaultTxButton = (props: DefaultTxButtonProps) => {
       }}
     />
   );
-}
+};
 
 type SemanticTxButtonProps = TxButtonProps<SemanticButtonProps>;
 
@@ -105,7 +105,7 @@ export const SemanticTxButton = (props: SemanticTxButtonProps) => {
       }}
     />
   );
-}
+};
 
 export default DefaultTxButton;
 
diff --git a/pioneer/packages/joy-utils/src/react/components/working-groups/ApplicationDetails.tsx b/pioneer/packages/joy-utils/src/react/components/working-groups/ApplicationDetails.tsx
index efb8884322..c0e4f9f532 100644
--- a/pioneer/packages/joy-utils/src/react/components/working-groups/ApplicationDetails.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/working-groups/ApplicationDetails.tsx
@@ -13,16 +13,19 @@ type ApplicationsDetailsProps = {
 }
 
 export const ApplicationsDetails = ({ applications, acceptedIds }: ApplicationsDetailsProps) => {
-  const rejectedApplications = acceptedIds !== undefined ? applications.filter(a => !acceptedIds.includes(a.wgApplicationId)) : [];
+  const rejectedApplications = acceptedIds !== undefined ? applications.filter((a) => !acceptedIds.includes(a.wgApplicationId)) : [];
   const [showAll, setShowAll] = useState(!rejectedApplications.length);
-  const shownApplications = applications.filter(a => showAll || acceptedIds?.includes(a.wgApplicationId));
+  const shownApplications = applications.filter((a) => showAll || acceptedIds?.includes(a.wgApplicationId));
+
   return (<>
     <Item.Group>
       {
         shownApplications.map(({ member, stakes, wgApplicationId, humanReadableText }) => {
           let HRT = humanReadableText.toString();
           const accepted = acceptedIds?.includes(wgApplicationId);
+
           try { HRT = JSON.stringify(JSON.parse(HRT), undefined, 4); } catch (e) { /* Do nothing */ }
+
           return (
             <Item key={wgApplicationId} style={{
               background: 'white',
@@ -51,7 +54,7 @@ export const ApplicationsDetails = ({ applications, acceptedIds }: ApplicationsD
       }
     </Item.Group>
     {rejectedApplications.length > 0 && (
-      <Button fluid onClick={() => setShowAll(current => !current)}>
+      <Button fluid onClick={() => setShowAll((current) => !current)}>
         { showAll ? 'Hide rejected applications' : 'Show rejected applications' }
       </Button>
     )}
@@ -67,13 +70,13 @@ type ApplicationsDetailsByIdsProps = {
 export const ApplicationsDetailsByIds = ({ group, ids, acceptedIds }: ApplicationsDetailsByIdsProps) => {
   const transport = useTransport();
   const [applications, error, loading] = usePromise<ParsedApplication[]>(
-    () => Promise.all(ids.map(id => transport.workingGroups.parsedApplicationById(group, id))),
+    () => Promise.all(ids.map((id) => transport.workingGroups.parsedApplicationById(group, id))),
     [],
     [ids]
   );
 
   return (
-    <PromiseComponent {...{ error, loading }} message="Fetching application(s)...">
+    <PromiseComponent {...{ error, loading }} message='Fetching application(s)...'>
       <ApplicationsDetails applications={applications} acceptedIds={acceptedIds}/>
     </PromiseComponent>
   );
@@ -95,7 +98,7 @@ export const ApplicationsDetailsByOpening = ({ group, openingId, acceptedIds }:
   );
 
   return (
-    <PromiseComponent {...{ error, loading }} message="Fetching applications...">
+    <PromiseComponent {...{ error, loading }} message='Fetching applications...'>
       <ApplicationsDetails applications={applications} acceptedIds={acceptedIds}/>
     </PromiseComponent>
   );
diff --git a/pioneer/packages/joy-utils/src/react/components/working-groups/LeadInfo.tsx b/pioneer/packages/joy-utils/src/react/components/working-groups/LeadInfo.tsx
index 17840f8ca3..e6e32a3fb7 100644
--- a/pioneer/packages/joy-utils/src/react/components/working-groups/LeadInfo.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/working-groups/LeadInfo.tsx
@@ -49,8 +49,8 @@ export const LeadInfoFromId = ({ leadId, group }: LeadInfoFromIdProps) => {
   );
 
   return (
-    <PromiseComponent error={error} loading={loading} message="Fetching current lead...">
-      <LeadInfo lead={lead} group={group} header={false} emptyMessage="Leader no longer active!"/>
+    <PromiseComponent error={error} loading={loading} message='Fetching current lead...'>
+      <LeadInfo lead={lead} group={group} header={false} emptyMessage='Leader no longer active!'/>
     </PromiseComponent>
   );
 };
diff --git a/pioneer/packages/joy-utils/src/react/hooks/proposals/useProposalSubscription.tsx b/pioneer/packages/joy-utils/src/react/hooks/proposals/useProposalSubscription.tsx
index 554d7c4026..5122ee3642 100644
--- a/pioneer/packages/joy-utils/src/react/hooks/proposals/useProposalSubscription.tsx
+++ b/pioneer/packages/joy-utils/src/react/hooks/proposals/useProposalSubscription.tsx
@@ -16,34 +16,38 @@ const useProposalSubscription = (id: ProposalId) => {
     // onMount...
     let unmounted = false;
     let unsubscribeProposal: (() => void) | undefined;
+
     const refreshProposalData = () => {
       transport.proposals.proposalById(id)
-        .then(newData => {
+        .then((newData) => {
           if (!unmounted) {
             setData(newData);
             setLoading(false);
           }
         })
-        .catch(error => {
+        .catch((error) => {
           if (!unmounted) {
             setError(error);
             setLoading(false);
           }
         });
     };
+
     // Create the subscription
     transport.proposals.subscribeProposal(id, refreshProposalData)
-      .then(unsubscribe => {
+      .then((unsubscribe) => {
         if (!unmounted) {
           unsubscribeProposal = unsubscribe;
         } else {
           unsubscribe(); // If already unmounted - unsubscribe immedietally!
         }
       });
+
     return () => {
       // onUnmount...
       // Clean the subscription
       unmounted = true;
+
       if (unsubscribeProposal) {
         unsubscribeProposal();
       }
diff --git a/pioneer/packages/joy-utils/src/transport/chain.ts b/pioneer/packages/joy-utils/src/transport/chain.ts
index 0d249cb38a..72608a6361 100644
--- a/pioneer/packages/joy-utils/src/transport/chain.ts
+++ b/pioneer/packages/joy-utils/src/transport/chain.ts
@@ -9,7 +9,7 @@ export default class ChainTransport extends BaseTransport {
   }
 
   async blockTimestamp (height: number): Promise<Date> {
-    const blockTime = (await this.api.query.timestamp.now.at(await this.blockHash(height))) as Moment;
+    const blockTime = (await this.api.query.timestamp.now.at(await this.blockHash(height)));
 
     return new Date(blockTime.toNumber());
   }
diff --git a/pioneer/packages/joy-utils/src/transport/contentWorkingGroup.ts b/pioneer/packages/joy-utils/src/transport/contentWorkingGroup.ts
index 222377ebe4..19e1fe36b6 100644
--- a/pioneer/packages/joy-utils/src/transport/contentWorkingGroup.ts
+++ b/pioneer/packages/joy-utils/src/transport/contentWorkingGroup.ts
@@ -18,6 +18,7 @@ export default class ContentWorkingGroupTransport extends BaseTransport {
   async currentMintCap (): Promise<number> {
     const WGMintId = (await this.contentWorkingGroup.mint()) as MintId;
     const WGMint = (await this.minting.mints(WGMintId)) as Mint;
+
     return (WGMint.get('capacity') as u128).toNumber();
   }
 
diff --git a/pioneer/packages/joy-utils/src/transport/council.ts b/pioneer/packages/joy-utils/src/transport/council.ts
index 13fd29dd6e..6cd11c8cfa 100644
--- a/pioneer/packages/joy-utils/src/transport/council.ts
+++ b/pioneer/packages/joy-utils/src/transport/council.ts
@@ -22,7 +22,8 @@ export default class CouncilTransport extends BaseTransport {
   async councilMembersLength (atBlock?: number): Promise<number> {
     if (atBlock) {
       const blockHash = await this.chainT.blockHash(atBlock);
-      return ((await this.api.query.council.activeCouncil.at(blockHash)) as Seats).length;
+
+      return ((await this.api.query.council.activeCouncil.at(blockHash))).length;
     }
 
     return ((await this.council.activeCouncil()) as Seats).length;
@@ -30,10 +31,12 @@ export default class CouncilTransport extends BaseTransport {
 
   async councilMembers (): Promise<(ParsedMember & { memberId: MemberId })[]> {
     const council = (await this.council.activeCouncil()) as Seats;
+
     return Promise.all(
-      council.map(async seat => {
+      council.map(async (seat) => {
         const memberIds = (await this.members.memberIdsByControllerAccountId(seat.member)) as Vec<MemberId>;
         const member = (await this.membersT.expectedMembership(memberIds[0])).toJSON() as ParsedMember;
+
         return {
           ...member,
           memberId: memberIds[0]
@@ -50,7 +53,7 @@ export default class CouncilTransport extends BaseTransport {
       .filter(([memberId, member]) => (
         // Filter out council members
         !activeCouncil.some((seat) =>
-            seat.member.eq(member.controller_account) ||
+          seat.member.eq(member.controller_account) ||
             seat.member.eq(member.root_account)
         )
       ))
@@ -78,6 +81,6 @@ export default class CouncilTransport extends BaseTransport {
       min_voting_stake,
       candidacy_limit,
       council_size
-    }
+    };
   }
 }
diff --git a/pioneer/packages/joy-utils/src/transport/members.ts b/pioneer/packages/joy-utils/src/transport/members.ts
index eafb26035b..0c5d8f8a29 100644
--- a/pioneer/packages/joy-utils/src/transport/members.ts
+++ b/pioneer/packages/joy-utils/src/transport/members.ts
@@ -39,7 +39,7 @@ export default class MembersTransport extends BaseTransport {
     };
   }
 
-  async allMembers(): Promise<[MemberId, Membership][]> {
+  async allMembers (): Promise<[MemberId, Membership][]> {
     return this.entriesByIds<MemberId, Membership>(this.api.query.members.membershipById);
   }
 }
diff --git a/pioneer/packages/joy-utils/src/transport/proposals.ts b/pioneer/packages/joy-utils/src/transport/proposals.ts
index c3617c7146..856e04ce50 100644
--- a/pioneer/packages/joy-utils/src/transport/proposals.ts
+++ b/pioneer/packages/joy-utils/src/transport/proposals.ts
@@ -1,5 +1,4 @@
-import {
-  ParsedProposal,
+import { ParsedProposal,
   ProposalType,
   ProposalTypes,
   ProposalVote,
@@ -9,14 +8,13 @@ import {
   DiscussionContraints,
   ProposalStatusFilter,
   ProposalsBatch,
-  ParsedProposalDetails
-} from '../types/proposals';
+  ParsedProposalDetails } from '../types/proposals';
 import { ParsedMember } from '../types/members';
 
 import BaseTransport from './base';
 
 import { ThreadId, PostId } from '@joystream/types/common';
-import { Proposal, ProposalId, VoteKind, DiscussionThread, DiscussionPost, ProposalDetails, Finalized, ProposalDecisionStatus } from '@joystream/types/proposals';
+import { Proposal, ProposalId, VoteKind, DiscussionThread, DiscussionPost, ProposalDetails } from '@joystream/types/proposals';
 import { MemberId } from '@joystream/types/members';
 import { u32, Bytes, Null } from '@polkadot/types/';
 import { BalanceOf } from '@polkadot/types/interfaces';
@@ -78,6 +76,7 @@ export default class ProposalsTransport extends BaseTransport {
 
   async typeAndDetails (id: ProposalId) {
     const cachedProposalDetails = this.proposalDetailsCache[id.toNumber()];
+
     // Avoid fetching runtime upgrade proposal details if we already have them cached
     if (cachedProposalDetails) {
       return cachedProposalDetails;
@@ -85,12 +84,15 @@ export default class ProposalsTransport extends BaseTransport {
       const rawDetails = await this.rawProposalDetails(id);
       const type = rawDetails.type;
       let details: ParsedProposalDetails = rawDetails;
+
       if (type === 'RuntimeUpgrade') {
         // In case of RuntimeUpgrade proposal we override details to just contain the hash and filesize
         // (instead of full WASM bytecode)
         const wasm = rawDetails.value as Bytes;
+
         details = [blake2AsHex(wasm, 256), wasm.length];
       }
+
       // Save entry in cache
       this.proposalDetailsCache[id.toNumber()] = { type, details };
 
@@ -100,9 +102,11 @@ export default class ProposalsTransport extends BaseTransport {
 
   async proposalById (id: ProposalId, rawProposal?: Proposal): Promise<ParsedProposal> {
     const { type, details } = await this.typeAndDetails(id);
+
     if (!rawProposal) {
       rawProposal = await this.rawProposalById(id);
     }
+
     const proposer = (await this.membersT.expectedMembership(rawProposal.proposerId)).toJSON() as ParsedMember;
     const proposal = rawProposal.toJSON() as {
       title: string;
@@ -130,13 +134,14 @@ export default class ProposalsTransport extends BaseTransport {
 
   async proposalsIds () {
     const total: number = (await this.proposalCount()).toNumber();
+
     return Array.from({ length: total }, (_, i) => this.api.createType('ProposalId', i + 1));
   }
 
   async activeProposalsIds () {
     const result = await this.entriesByIds<ProposalId, Null>(
       this.api.query.proposalsEngine.activeProposalIds
-    )
+    );
 
     return result.map(([proposalId]) => proposalId);
   }
@@ -144,7 +149,7 @@ export default class ProposalsTransport extends BaseTransport {
   async proposalsBatch (status: ProposalStatusFilter, batchNumber = 1, batchSize = 5): Promise<ProposalsBatch> {
     const ids = (status === 'Active' ? await this.activeProposalsIds() : await this.proposalsIds())
       .sort((id1, id2) => id2.cmp(id1)); // Sort by newest
-    let rawProposalsWithIds = (await Promise.all(ids.map(id => this.rawProposalById(id))))
+    let rawProposalsWithIds = (await Promise.all(ids.map((id) => this.rawProposalById(id))))
       .map((proposal, index) => ({ id: ids[index], proposal }));
 
     if (status !== 'All' && status !== 'Active') {
@@ -152,11 +157,13 @@ export default class ProposalsTransport extends BaseTransport {
         if (!proposal.status.isOfType('Finalized')) {
           return false;
         }
+
         return proposal.status.asType('Finalized').proposalStatus.type === status;
       });
     }
 
     const totalBatches = Math.ceil(rawProposalsWithIds.length / batchSize);
+
     rawProposalsWithIds = rawProposalsWithIds.slice((batchNumber - 1) * batchSize, batchNumber * batchSize);
     const proposals = await Promise.all(rawProposalsWithIds.map(({ proposal, id }) => this.proposalById(id, proposal)));
 
@@ -171,6 +178,7 @@ export default class ProposalsTransport extends BaseTransport {
   async voteByProposalAndMember (proposalId: ProposalId, voterId: MemberId): Promise<VoteKind | null> {
     const vote = (await this.proposalsEngine.voteExistsByProposalByVoter(proposalId, voterId)) as VoteKind;
     const hasVoted = (await this.api.query.proposalsEngine.voteExistsByProposalByVoter.size(proposalId, voterId)).toNumber();
+
     return hasVoted ? vote : null;
   }
 
@@ -181,8 +189,10 @@ export default class ProposalsTransport extends BaseTransport {
     );
 
     const votesWithMembers: ProposalVote[] = [];
+
     for (const [memberId, vote] of voteEntries) {
       const parsedMember = (await this.membersT.expectedMembership(memberId)).toJSON() as ParsedMember;
+
       votesWithMembers.push({
         vote,
         member: {
@@ -204,12 +214,15 @@ export default class ProposalsTransport extends BaseTransport {
     const methods = proposalsApiMethods[type];
     let votingPeriod = 0;
     let gracePeriod = 0;
+
     if (methods) {
       votingPeriod = ((await this.proposalsCodex[methods.votingPeriod]()) as u32).toNumber();
       gracePeriod = ((await this.proposalsCodex[methods.gracePeriod]()) as u32).toNumber();
     }
+
     // Currently it's same for all types, but this will change soon (?)
     const cancellationFee = this.cancellationFee();
+
     return {
       type,
       votingPeriod,
@@ -220,7 +233,7 @@ export default class ProposalsTransport extends BaseTransport {
   }
 
   async proposalsTypesParameters () {
-    return Promise.all(ProposalTypes.map(type => this.parametersFromProposalType(type)));
+    return Promise.all(ProposalTypes.map((type) => this.parametersFromProposalType(type)));
   }
 
   async subscribeProposal (id: number|ProposalId, callback: () => void) {
@@ -229,9 +242,11 @@ export default class ProposalsTransport extends BaseTransport {
 
   async discussion (id: number|ProposalId): Promise<ParsedDiscussion | null> {
     const threadId = (await this.proposalsCodex.threadIdByProposalId(id)) as ThreadId;
+
     if (!threadId.toNumber()) {
       return null;
     }
+
     const thread = (await this.proposalsDiscussion.threadById(threadId)) as DiscussionThread;
     const postEntries = await this.entriesByIds<PostId, DiscussionPost>(
       this.api.query.proposalsDiscussion.postThreadIdByPostId,
@@ -239,6 +254,7 @@ export default class ProposalsTransport extends BaseTransport {
     );
 
     const parsedPosts: ParsedPost[] = [];
+
     for (const [postId, post] of postEntries) {
       parsedPosts.push({
         postId: postId,
diff --git a/pioneer/packages/joy-utils/src/transport/validators.ts b/pioneer/packages/joy-utils/src/transport/validators.ts
index dbe06c8a9a..768de57d56 100644
--- a/pioneer/packages/joy-utils/src/transport/validators.ts
+++ b/pioneer/packages/joy-utils/src/transport/validators.ts
@@ -3,7 +3,8 @@ import { u32 } from '@polkadot/types/';
 
 export default class ValidatorsTransport extends BaseTransport {
   async maxCount (): Promise<number> {
-    const count = ((await this.api.query.staking.validatorCount()) as u32).toNumber();
+    const count = ((await this.api.query.staking.validatorCount())).toNumber();
+
     return count;
   }
 }
diff --git a/pioneer/packages/joy-utils/src/transport/workingGroups.ts b/pioneer/packages/joy-utils/src/transport/workingGroups.ts
index c97311f3f8..ca647f2766 100644
--- a/pioneer/packages/joy-utils/src/transport/workingGroups.ts
+++ b/pioneer/packages/joy-utils/src/transport/workingGroups.ts
@@ -20,13 +20,15 @@ export default class WorkingGroupsTransport extends BaseTransport {
     this.membersT = membersTransport;
   }
 
-  protected apiQueryByGroup(group: WorkingGroupKey) {
+  protected apiQueryByGroup (group: WorkingGroupKey) {
     const module = apiModuleByGroup[group];
+
     return this.api.query[module];
   }
 
   protected queryByGroup (group: WorkingGroupKey) {
     const module = apiModuleByGroup[group];
+
     return this.cacheApi.query[module];
   }
 
@@ -77,12 +79,12 @@ export default class WorkingGroupsTransport extends BaseTransport {
 
         return { id, opening, hiringOpening };
       })
-      .filter(openingData => !type || openingData.opening.opening_type.isOfType(type));
+      .filter((openingData) => !type || openingData.opening.opening_type.isOfType(type));
   }
 
   public async activeOpenings (group: WorkingGroupKey, substage?: ActiveOpeningStageKey, type?: OpeningTypeKey) {
     return (await this.allOpenings(group, type))
-      .filter(od =>
+      .filter((od) =>
         od.hiringOpening.stage.isOfType('Active') &&
         (!substage || od.hiringOpening.stage.asType('Active').stage.isOfType(substage))
       );
@@ -126,6 +128,7 @@ export default class WorkingGroupsTransport extends BaseTransport {
 
   async parsedApplicationById (group: WorkingGroupKey, wgApplicationId: number): Promise<ParsedApplication> {
     const wgApplication = await this.wgApplicationById(group, wgApplicationId);
+
     return this.parseApplication(wgApplicationId, wgApplication);
   }
 
@@ -148,6 +151,6 @@ export default class WorkingGroupsTransport extends BaseTransport {
 
   async openingActiveApplications (group: WorkingGroupKey, wgOpeningId: number): Promise<ParsedApplication[]> {
     return (await this.openingApplications(group, wgOpeningId))
-      .filter(a => a.stage.isOfType('Active'));
+      .filter((a) => a.stage.isOfType('Active'));
   }
 }
diff --git a/pioneer/packages/joy-utils/src/types/proposals.ts b/pioneer/packages/joy-utils/src/types/proposals.ts
index 832f11e3e5..ebcc1881cb 100644
--- a/pioneer/packages/joy-utils/src/types/proposals.ts
+++ b/pioneer/packages/joy-utils/src/types/proposals.ts
@@ -39,7 +39,7 @@ export type ParsedProposalDetails = ProposalDetails | RuntimeUpgradeProposalDeta
 
 export type SpecificProposalDetails<T extends keyof ProposalDetails['typeDefinitions']> =
   T extends 'RuntimeUpgrade' ? RuntimeUpgradeProposalDetails :
-  InstanceType<ProposalDetails['typeDefinitions'][Exclude<T, 'RuntimeUpgrade'>]>;
+    InstanceType<ProposalDetails['typeDefinitions'][Exclude<T, 'RuntimeUpgrade'>]>;
 
 export type ParsedProposal = {
   id: ProposalId;

From 75ab8ab50706b413db8da0e12323ea461d6cab01 Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Tue, 18 Aug 2020 17:51:36 +0200
Subject: [PATCH 07/17] Linter manual fixes (+ some cleanup)

---
 .../joy-proposals/src/Proposal/Body.tsx       | 30 ++++++------
 .../src/Proposal/ChooseProposalType.tsx       |  4 +-
 .../src/Proposal/ProposalDetails.tsx          | 22 ++++-----
 .../src/Proposal/ProposalFromId.tsx           |  4 +-
 .../src/Proposal/ProposalPreview.tsx          |  2 +-
 .../src/Proposal/ProposalTypePreview.tsx      | 18 ++++----
 .../joy-proposals/src/Proposal/Votes.tsx      |  4 +-
 .../src/Proposal/VotingSection.tsx            |  6 +--
 .../{useVoteStyles.tsx => getVoteStyles.tsx}  |  2 +-
 .../src/forms/AddWorkingGroupOpeningForm.tsx  | 22 ++++-----
 .../BeginReviewLeaderApplicationsForm.tsx     | 15 ++----
 .../DecreaseWorkingGroupLeadStakeForm.tsx     | 15 ++----
 .../joy-proposals/src/forms/FileDropdown.tsx  |  8 ++--
 .../FillWorkingGroupLeaderOpeningForm.tsx     | 29 +++++-------
 .../joy-proposals/src/forms/FormContainer.tsx |  8 ++--
 .../joy-proposals/src/forms/FormFields.tsx    | 14 +++---
 .../src/forms/GenericProposalForm.tsx         | 46 ++++++++-----------
 .../src/forms/MintCapacityForm.tsx            |  7 ++-
 .../src/forms/RuntimeUpgradeForm.tsx          |  9 ++--
 .../forms/SetContentWorkingGroupLeadForm.tsx  | 17 +++----
 .../src/forms/SetCouncilParamsForm.tsx        | 11 +++--
 .../src/forms/SetMaxValidatorCountForm.tsx    | 10 ++--
 .../forms/SetWorkingGroupLeadRewardForm.tsx   | 15 ++----
 .../forms/SetWorkingGroupMintCapacityForm.tsx | 15 ++----
 .../joy-proposals/src/forms/SignalForm.tsx    |  9 ++--
 .../forms/SlashWorkingGroupLeadStakeForm.tsx  | 15 ++----
 .../src/forms/SpendingProposalForm.tsx        | 13 ++----
 .../forms/TerminateWorkingGroupLeaderForm.tsx | 19 +++-----
 pioneer/packages/joy-proposals/src/index.tsx  |  4 +-
 .../src/stories/data/ProposalDetails.mock.ts  | 12 ++---
 .../joy-proposals/src/stories/withMock.tsx    |  2 +-
 .../joy-proposals/src/validationSchema.ts     | 20 ++++----
 .../proposals/useProposalSubscription.tsx     |  9 ++--
 .../packages/joy-utils/src/transport/chain.ts |  1 -
 .../joy-utils/src/transport/council.ts        |  3 +-
 .../joy-utils/src/transport/proposals.ts      | 17 +++----
 .../joy-utils/src/transport/validators.ts     |  1 -
 .../joy-utils/src/transport/workingGroups.ts  |  2 +-
 .../packages/joy-utils/src/types/proposals.ts | 16 ++-----
 39 files changed, 202 insertions(+), 274 deletions(-)
 rename pioneer/packages/joy-proposals/src/Proposal/{useVoteStyles.tsx => getVoteStyles.tsx} (95%)

diff --git a/pioneer/packages/joy-proposals/src/Proposal/Body.tsx b/pioneer/packages/joy-proposals/src/Proposal/Body.tsx
index 4acab3301c..b2fe335721 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/Body.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/Body.tsx
@@ -50,16 +50,11 @@ function ProposedAddress (props: { accountId?: AccountId }) {
   );
 }
 
-function ProposedMember (props: { memberId?: MemberId | number | null }) {
-  if (props.memberId === null || props.memberId === undefined) {
-    return <>NONE</>;
-  }
-
-  const memberId: MemberId | number = props.memberId;
-
+function ProposedMember (props: { memberId: MemberId | number }) {
   const transport = useTransport();
+
   const [member, error, loading] = usePromise<Membership | null>(
-    () => transport.members.membershipById(memberId),
+    () => transport.members.membershipById(props.memberId),
     null
   );
 
@@ -112,15 +107,15 @@ const paramParsers: { [k in ProposalType]: (params: SpecificProposalDetails<k>)
   ],
   RuntimeUpgrade: ([hash, filesize]) => [
     new ParsedParam('Blake2b256 hash of WASM code', hash, true),
-    new ParsedParam('File size', filesize + ' bytes')
+    new ParsedParam('File size', `${filesize} bytes`)
   ],
   SetElectionParameters: (params) => [
-    new ParsedParam('Announcing period', params.announcing_period.toString() + ' blocks'),
-    new ParsedParam('Voting period', params.voting_period.toString() + ' blocks'),
-    new ParsedParam('Revealing period', params.revealing_period.toString() + ' blocks'),
-    new ParsedParam('Council size', params.council_size.toString() + ' members'),
-    new ParsedParam('Candidacy limit', params.candidacy_limit.toString() + ' members'),
-    new ParsedParam('New term duration', params.new_term_duration.toString() + ' blocks'),
+    new ParsedParam('Announcing period', `${params.announcing_period.toString()} blocks`),
+    new ParsedParam('Voting period', `${params.voting_period.toString()} blocks`),
+    new ParsedParam('Revealing period', `${params.revealing_period.toString()} blocks`),
+    new ParsedParam('Council size', `${params.council_size.toString()} members`),
+    new ParsedParam('Candidacy limit', `${params.candidacy_limit.toString()} members`),
+    new ParsedParam('New term duration', `${params.new_term_duration.toString()} blocks`),
     new ParsedParam('Min. council stake', formatBalance(params.min_council_stake)),
     new ParsedParam('Min. voting stake', formatBalance(params.min_voting_stake))
   ],
@@ -129,7 +124,10 @@ const paramParsers: { [k in ProposalType]: (params: SpecificProposalDetails<k>)
     new ParsedParam('Account', <ProposedAddress accountId={account as AccountId} />)
   ],
   SetLead: (params) => [
-    new ParsedParam('Member', <ProposedMember memberId={params.unwrapOr([])[0] as MemberId | undefined} />),
+    new ParsedParam(
+      'Member',
+      params.isSome ? <ProposedMember memberId={params.unwrap()[0] as MemberId} /> : 'NONE'
+    ),
     new ParsedParam('Account id', <ProposedAddress accountId={params.unwrapOr([])[1] as AccountId | undefined} />)
   ],
   SetContentWorkingGroupMintCapacity: (capacity) => [
diff --git a/pioneer/packages/joy-proposals/src/Proposal/ChooseProposalType.tsx b/pioneer/packages/joy-proposals/src/Proposal/ChooseProposalType.tsx
index 742e4483b9..09645da010 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/ChooseProposalType.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/ChooseProposalType.tsx
@@ -30,8 +30,8 @@ export default function ChooseProposalType (props: RouteComponentProps) {
         <Item.Group>
           {proposalTypes
             .filter((typeInfo) => (!category || typeInfo.category === category) && !typeInfo.outdated)
-            .map((typeInfo, idx) => (
-              <ProposalTypePreview key={`${typeInfo} - ${idx}`} typeInfo={typeInfo} history={props.history} />
+            .map((typeInfo) => (
+              <ProposalTypePreview key={typeInfo.type} typeInfo={typeInfo} history={props.history} />
             ))}
         </Item.Group>
       </PromiseComponent>
diff --git a/pioneer/packages/joy-proposals/src/Proposal/ProposalDetails.tsx b/pioneer/packages/joy-proposals/src/Proposal/ProposalDetails.tsx
index 1d21a09f34..bb419b680f 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/ProposalDetails.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/ProposalDetails.tsx
@@ -8,7 +8,7 @@ import { MyAccountProps, withMyAccount } from '@polkadot/joy-utils/react/hocs/ac
 import { ParsedProposal } from '@polkadot/joy-utils/types/proposals';
 import { withCalls } from '@polkadot/react-api';
 import { withMulti } from '@polkadot/react-api/hoc';
-import { ProposalId, ProposalDecisionStatuses, ApprovedProposalStatuses, ExecutionFailedStatus } from '@joystream/types/proposals';
+import { ProposalId, ProposalDecisionStatuses, ApprovedProposalStatuses } from '@joystream/types/proposals';
 import { BlockNumber } from '@polkadot/types/interfaces';
 import { MemberId } from '@joystream/types/members';
 import { Seat } from '@joystream/types/council';
@@ -57,7 +57,7 @@ export type ExtendedProposalStatus = {
 }
 
 export function getExtendedStatus (proposal: ParsedProposal, bestNumber: BlockNumber | undefined): ExtendedProposalStatus {
-  const basicStatus = Object.keys(proposal.status)[0] as BasicProposalStatus;
+  const basicStatus: BasicProposalStatus = proposal.status.type;
   let expiresIn: number | null = null;
 
   let displayStatus: ProposalDisplayStatus = basicStatus;
@@ -73,31 +73,31 @@ export function getExtendedStatus (proposal: ParsedProposal, bestNumber: BlockNu
 
   if (basicStatus === 'Active') {
     periodStatus = 'Voting period';
-    expiresIn = Math.max(votingPeriod - blockAge, 0) || null;
+    expiresIn = Math.max(votingPeriod.toNumber() - blockAge, 0) || null;
   }
 
   if (basicStatus === 'Finalized') {
-    const { finalizedAt, proposalStatus } = proposal.status.Finalized;
-    const decisionStatus: ProposalDecisionStatuses = Object.keys(proposalStatus)[0] as ProposalDecisionStatuses;
+    const { finalizedAt, proposalStatus } = proposal.status.asType('Finalized');
+    const decisionStatus: ProposalDecisionStatuses = proposalStatus.type;
 
     displayStatus = decisionStatus;
-    finalizedAtBlock = finalizedAt as number;
+    finalizedAtBlock = finalizedAt.toNumber();
 
     if (decisionStatus === 'Approved') {
-      const approvedStatus: ApprovedProposalStatuses = Object.keys(proposalStatus.Approved)[0] as ApprovedProposalStatuses;
+      const approvedStatus: ApprovedProposalStatuses = proposalStatus.asType('Approved').type;
 
       if (approvedStatus === 'PendingExecution') {
-        const finalizedAge = best - finalizedAt;
+        const finalizedAge = best - finalizedAt.toNumber();
 
         periodStatus = 'Grace period';
-        expiresIn = Math.max(gracePeriod - finalizedAge, 0) || null;
+        expiresIn = Math.max(gracePeriod.toNumber() - finalizedAge, 0) || null;
       } else {
         // Executed / ExecutionFailed
         displayStatus = approvedStatus;
-        executedAtBlock = finalizedAtBlock + gracePeriod;
+        executedAtBlock = finalizedAtBlock + gracePeriod.toNumber();
 
         if (approvedStatus === 'ExecutionFailed') {
-          const executionFailedStatus = proposalStatus.Approved.ExecutionFailed as ExecutionFailedStatus;
+          const executionFailedStatus = proposalStatus.asType('Approved').asType('ExecutionFailed');
 
           executionFailReason = Buffer.from(executionFailedStatus.error.toString().replace('0x', ''), 'hex').toString();
         }
diff --git a/pioneer/packages/joy-proposals/src/Proposal/ProposalFromId.tsx b/pioneer/packages/joy-proposals/src/Proposal/ProposalFromId.tsx
index 20b4ada8ce..763029002b 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/ProposalFromId.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/ProposalFromId.tsx
@@ -5,7 +5,9 @@ import { useProposalSubscription } from '@polkadot/joy-utils/react/hooks';
 import PromiseComponent from '@polkadot/joy-utils/react/components/PromiseComponent';
 import { useApi } from '@polkadot/react-hooks';
 
-export default function ProposalFromId (props: RouteComponentProps<any>) {
+type RouteParams = { id?: string | undefined };
+
+export default function ProposalFromId (props: RouteComponentProps<RouteParams>) {
   const {
     match: {
       params: { id }
diff --git a/pioneer/packages/joy-proposals/src/Proposal/ProposalPreview.tsx b/pioneer/packages/joy-proposals/src/Proposal/ProposalPreview.tsx
index 4a6aab4cbf..5ef4be2cf2 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/ProposalPreview.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/ProposalPreview.tsx
@@ -33,7 +33,7 @@ export default function ProposalPreview ({ proposal, bestNumber }: ProposalPrevi
   return (
     <Card
       fluid
-      href={`#/proposals/${proposal.id}`}>
+      href={`#/proposals/${proposal.id.toString()}`}>
       <ProposalIdBox>{ `#${proposal.id.toString()}` }</ProposalIdBox>
       <Card.Content>
         <Card.Header>
diff --git a/pioneer/packages/joy-proposals/src/Proposal/ProposalTypePreview.tsx b/pioneer/packages/joy-proposals/src/Proposal/ProposalTypePreview.tsx
index fc10dbf01b..994faf34bf 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/ProposalTypePreview.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/ProposalTypePreview.tsx
@@ -6,7 +6,7 @@ import { Item, Icon, Button, Label } from 'semantic-ui-react';
 import { ProposalType, Category } from '@polkadot/joy-utils/types/proposals';
 import _ from 'lodash';
 import styled from 'styled-components';
-import useVoteStyles from './useVoteStyles';
+import getVoteStyles from './getVoteStyles';
 import { formatBalance } from '@polkadot/util';
 
 import './ProposalType.css';
@@ -114,26 +114,26 @@ export default function ProposalTypePreview (props: ProposalTypePreviewProps) {
         </div>
         <QuorumsAndThresholds>
           { approvalQuorum && (
-            <QuorumThresholdLabel color={ useVoteStyles('Approve').color }>
-              <Icon name={ useVoteStyles('Approve').icon } />
+            <QuorumThresholdLabel color={ getVoteStyles('Approve').color }>
+              <Icon name={ getVoteStyles('Approve').icon } />
               Approval Quorum: <b>{ approvalQuorum }%</b>
             </QuorumThresholdLabel>
           ) }
           { approvalThreshold && (
-            <QuorumThresholdLabel color={ useVoteStyles('Approve').color }>
-              <Icon name={ useVoteStyles('Approve').icon } />
+            <QuorumThresholdLabel color={ getVoteStyles('Approve').color }>
+              <Icon name={ getVoteStyles('Approve').icon } />
               Approval Threshold: <b>{ approvalThreshold }%</b>
             </QuorumThresholdLabel>
           ) }
           { slashingQuorum && (
-            <QuorumThresholdLabel color={ useVoteStyles('Slash').color }>
-              <Icon name={ useVoteStyles('Slash').icon } />
+            <QuorumThresholdLabel color={ getVoteStyles('Slash').color }>
+              <Icon name={ getVoteStyles('Slash').icon } />
               Slashing Quorum: <b>{ slashingQuorum }%</b>
             </QuorumThresholdLabel>
           ) }
           { slashingThreshold && (
-            <QuorumThresholdLabel color={ useVoteStyles('Slash').color }>
-              <Icon name={ useVoteStyles('Slash').icon } />
+            <QuorumThresholdLabel color={ getVoteStyles('Slash').color }>
+              <Icon name={ getVoteStyles('Slash').icon } />
               Slashing Threshold: <b>{ slashingThreshold }%</b>
             </QuorumThresholdLabel>
           ) }
diff --git a/pioneer/packages/joy-proposals/src/Proposal/Votes.tsx b/pioneer/packages/joy-proposals/src/Proposal/Votes.tsx
index 5186ff18c3..20cea5011d 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/Votes.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/Votes.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Header, Divider, Table, Icon } from 'semantic-ui-react';
-import useVoteStyles from './useVoteStyles';
+import getVoteStyles from './getVoteStyles';
 import { VoteKind } from '@joystream/types/proposals';
 import { VoteKindStr } from './VotingSection';
 import ProfilePreview from '@polkadot/joy-utils/react/components/MemberProfilePreview';
@@ -37,7 +37,7 @@ export default function Votes ({ proposal: { id, votingResults } }: VotesProps)
                 {votes.votes.map((proposalVote, idx) => {
                   const { vote, member } = proposalVote;
                   const voteStr = (vote as VoteKind).type.toString() as VoteKindStr;
-                  const { icon, textColor } = useVoteStyles(voteStr);
+                  const { icon, textColor } = getVoteStyles(voteStr);
 
                   return (
                     <Table.Row key={`${member.handle}-${idx}`}>
diff --git a/pioneer/packages/joy-proposals/src/Proposal/VotingSection.tsx b/pioneer/packages/joy-proposals/src/Proposal/VotingSection.tsx
index a18251bd91..2908792788 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/VotingSection.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/VotingSection.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 
 import { Icon, Message, Divider, Header } from 'semantic-ui-react';
-import useVoteStyles from './useVoteStyles';
+import getVoteStyles from './getVoteStyles';
 import { SemanticTxButton } from '@polkadot/joy-utils/react/components/TxButton';
 import { MemberId } from '@joystream/types/members';
 import { ProposalId, VoteKind, VoteKinds } from '@joystream/types/proposals';
@@ -34,7 +34,7 @@ type VoteButtonProps = {
 }
 
 function VoteButton ({ voteKind, proposalId, memberId, onSuccess }: VoteButtonProps) {
-  const { icon, color } = useVoteStyles(voteKind);
+  const { icon, color } = getVoteStyles(voteKind);
 
   return (
     <SemanticTxButton
@@ -83,7 +83,7 @@ export default function VotingSection ({
   const voteStr: VoteKindStr | null = voted || (vote && vote.type.toString() as VoteKindStr);
 
   if (voteStr) {
-    const { icon, color } = useVoteStyles(voteStr);
+    const { icon, color } = getVoteStyles(voteStr);
 
     return (
       <Message icon color={color}>
diff --git a/pioneer/packages/joy-proposals/src/Proposal/useVoteStyles.tsx b/pioneer/packages/joy-proposals/src/Proposal/getVoteStyles.tsx
similarity index 95%
rename from pioneer/packages/joy-proposals/src/Proposal/useVoteStyles.tsx
rename to pioneer/packages/joy-proposals/src/Proposal/getVoteStyles.tsx
index 73bf4be562..a39f463534 100644
--- a/pioneer/packages/joy-proposals/src/Proposal/useVoteStyles.tsx
+++ b/pioneer/packages/joy-proposals/src/Proposal/getVoteStyles.tsx
@@ -1,6 +1,6 @@
 import { SemanticCOLORS, SemanticICONS } from 'semantic-ui-react';
 
-export default function useVoteStyles (
+export default function getVoteStyles (
   value: 'Approve' | 'Abstain' | 'Reject' | 'Slash'
 ): { textColor: string; icon: SemanticICONS; color: SemanticCOLORS } {
   let textColor;
diff --git a/pioneer/packages/joy-proposals/src/forms/AddWorkingGroupOpeningForm.tsx b/pioneer/packages/joy-proposals/src/forms/AddWorkingGroupOpeningForm.tsx
index 92210193d5..28df203d5c 100644
--- a/pioneer/packages/joy-proposals/src/forms/AddWorkingGroupOpeningForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/AddWorkingGroupOpeningForm.tsx
@@ -4,8 +4,7 @@ import * as Yup from 'yup';
 import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps,
-  genericFormDefaultOptions } from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
   defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
@@ -92,7 +91,7 @@ const HRTDefault: (memberHandle: string, group: WorkingGroupKey) => GenericJoySt
     }
   });
 
-type FormAdditionalProps = {}; // Aditional props coming all the way from export component into the inner form.
+type FormAdditionalProps = Record<any, never>; // Aditional props coming all the way from export component into the inner form.
 type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormValues>;
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps> & {
   currentBlock?: BlockNumber;
@@ -193,7 +192,7 @@ const valuesToAddOpeningParams = (values: FormValues): SimplifiedTypeInterface<I
 };
 
 const AddWorkingGroupOpeningForm: React.FunctionComponent<FormInnerProps> = (props) => {
-  const { handleChange, errors, touched, values, setFieldValue, myMemberId, myMembership } = props;
+  const { handleChange, errors, touched, values, setFieldValue, myMembership } = props;
 
   useEffect(() => {
     if (myMembership && !touched.humanReadableText) {
@@ -202,7 +201,8 @@ const AddWorkingGroupOpeningForm: React.FunctionComponent<FormInnerProps> = (pro
         JSON.stringify(HRTDefault(myMembership.handle.toString(), values.workingGroup), undefined, 4)
       );
     }
-  }, [values.workingGroup, myMembership]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [values.workingGroup, myMembership, touched.humanReadableText]);
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
 
   return (
@@ -210,13 +210,7 @@ const AddWorkingGroupOpeningForm: React.FunctionComponent<FormInnerProps> = (pro
       {...props}
       txMethod='createAddWorkingGroupLeaderOpeningProposal'
       proposalType='AddWorkingGroupLeaderOpening'
-      submitParams={[
-        myMemberId,
-        values.title,
-        values.rationale,
-        '{STAKE}',
-        valuesToAddOpeningParams(values)
-      ]}
+      submitParams={[valuesToAddOpeningParams(values)]}
     >
       <Grid columns='4' doubling stackable verticalAlign='bottom'>
         <Grid.Row>
@@ -350,13 +344,13 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...(props.initialData || {})
   }),
   validationSchema: (props: FormContainerProps) => Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All(),
     ...Validation.AddWorkingGroupLeaderOpening(
       props.currentBlock?.toNumber() || 0,
       props.HRTConstraint
     )
   }),
-  handleSubmit: genericFormDefaultOptions.handleSubmit,
+  handleSubmit: () => null,
   displayName: 'AddWorkingGroupOpeningForm'
 })(AddWorkingGroupOpeningForm);
 
diff --git a/pioneer/packages/joy-proposals/src/forms/BeginReviewLeaderApplicationsForm.tsx b/pioneer/packages/joy-proposals/src/forms/BeginReviewLeaderApplicationsForm.tsx
index df4588a545..e35f9011ad 100644
--- a/pioneer/packages/joy-proposals/src/forms/BeginReviewLeaderApplicationsForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/BeginReviewLeaderApplicationsForm.tsx
@@ -3,8 +3,7 @@ import * as Yup from 'yup';
 import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps,
-  genericFormDefaultOptions } from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
   defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
@@ -27,13 +26,13 @@ const defaultValues: FormValues = {
   openingId: ''
 };
 
-type FormAdditionalProps = {}; // Aditional props coming all the way from export component into the inner form.
+type FormAdditionalProps = Record<any, never>; // Aditional props coming all the way from export component into the inner form.
 type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormValues>;
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
 const BeginReviewLeadeApplicationsForm: React.FunctionComponent<FormInnerProps> = (props) => {
-  const { handleChange, values, myMemberId, errors, touched } = props;
+  const { handleChange, values, errors, touched } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
   const transport = useTransport();
   const [openings, openingsError, openingsLoading] = usePromise(
@@ -59,10 +58,6 @@ const BeginReviewLeadeApplicationsForm: React.FunctionComponent<FormInnerProps>
       proposalType='BeginReviewWorkingGroupLeaderApplication'
       disabled={!openingsOptions.length}
       submitParams={[
-        myMemberId,
-        values.title,
-        values.rationale,
-        '{STAKE}',
         values.openingId,
         values.workingGroup
       ]}
@@ -104,10 +99,10 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...(props.initialData || {})
   }),
   validationSchema: Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All(),
     ...Validation.BeginReviewWorkingGroupLeaderApplication()
   }),
-  handleSubmit: genericFormDefaultOptions.handleSubmit,
+  handleSubmit: () => null,
   displayName: 'BeginReviewLeadeApplicationsForm'
 })(BeginReviewLeadeApplicationsForm);
 
diff --git a/pioneer/packages/joy-proposals/src/forms/DecreaseWorkingGroupLeadStakeForm.tsx b/pioneer/packages/joy-proposals/src/forms/DecreaseWorkingGroupLeadStakeForm.tsx
index eecc219abd..59da084f52 100644
--- a/pioneer/packages/joy-proposals/src/forms/DecreaseWorkingGroupLeadStakeForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/DecreaseWorkingGroupLeadStakeForm.tsx
@@ -4,8 +4,7 @@ import * as Yup from 'yup';
 import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps,
-  genericFormDefaultOptions } from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
   defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
@@ -26,13 +25,13 @@ const defaultValues: FormValues = {
   amount: ''
 };
 
-type FormAdditionalProps = {}; // Aditional props coming all the way from export component into the inner form.
+type FormAdditionalProps = Record<any, never>; // Aditional props coming all the way from export component into the inner form.
 type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormValues>;
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
 const DecreaseWorkingGroupLeadStakeForm: React.FunctionComponent<FormInnerProps> = (props) => {
-  const { handleChange, errors, touched, values, myMemberId, setFieldError } = props;
+  const { handleChange, errors, touched, values, setFieldError } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
   const [lead, setLead] = useState<WorkerData | null>(null);
 
@@ -54,10 +53,6 @@ const DecreaseWorkingGroupLeadStakeForm: React.FunctionComponent<FormInnerProps>
       leadStakeRequired={true}
       onLeadChange={(lead: WorkerData | null) => setLead(lead)}
       submitParams={[
-        myMemberId,
-        values.title,
-        values.rationale,
-        '{STAKE}',
         lead?.workerId,
         values.amount,
         values.workingGroup
@@ -87,10 +82,10 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...(props.initialData || {})
   }),
   validationSchema: Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All(),
     ...Validation.DecreaseWorkingGroupLeaderStake()
   }),
-  handleSubmit: genericFormDefaultOptions.handleSubmit,
+  handleSubmit: () => null,
   displayName: 'DecreaseWorkingGroupLeadStakeForm'
 })(DecreaseWorkingGroupLeadStakeForm);
 
diff --git a/pioneer/packages/joy-proposals/src/forms/FileDropdown.tsx b/pioneer/packages/joy-proposals/src/forms/FileDropdown.tsx
index 84a8e6f5f2..9284c56ec3 100644
--- a/pioneer/packages/joy-proposals/src/forms/FileDropdown.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/FileDropdown.tsx
@@ -71,7 +71,7 @@ const innerSpanStyle = (): React.CSSProperties => {
 
 // Interpret the file as a UTF-8 string
 // https://developer.mozilla.org/en-US/docs/Web/API/Blob/text
-const parseFileAsUtf8 = async (file: any): Promise<string> => {
+const parseFileAsUtf8 = async (file: File): Promise<string> => {
   const text = await file.text();
 
   return text;
@@ -79,7 +79,7 @@ const parseFileAsUtf8 = async (file: any): Promise<string> => {
 
 // Interpret the file as containing binary data. This will load the entire
 // file into memory which may crash the brower with very large files.
-const parseFileAsBinary = async (file: any): Promise<ArrayBuffer> => {
+const parseFileAsBinary = async (file: File): Promise<ArrayBuffer> => {
   // return file.arrayBuffer();
   // This newer API not fully supported yet in all browsers
   // https://developer.mozilla.org/en-US/docs/Web/API/Blob/arrayBuffer
@@ -107,13 +107,13 @@ type FileDropdownProps<FormValuesT> = {
   interpretAs: 'utf-8' | 'binary';
 };
 
-export default function FileDropdown<ValuesT = {}> (props: FileDropdownProps<ValuesT>) {
+export default function FileDropdown<ValuesT = Record<string, any>> (props: FileDropdownProps<ValuesT>) {
   const [parsing, setParsing] = useState(false);
   const { error, name, setFieldValue, setFieldTouched, acceptedFormats, defaultText, interpretAs } = props;
 
   return (
     <Dropzone
-      onDropAccepted={async (acceptedFiles) => {
+      onDropAccepted={async (acceptedFiles: File[]) => {
         setParsing(true);
         let contents;
 
diff --git a/pioneer/packages/joy-proposals/src/forms/FillWorkingGroupLeaderOpeningForm.tsx b/pioneer/packages/joy-proposals/src/forms/FillWorkingGroupLeaderOpeningForm.tsx
index 044c121061..1a47924dab 100644
--- a/pioneer/packages/joy-proposals/src/forms/FillWorkingGroupLeaderOpeningForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/FillWorkingGroupLeaderOpeningForm.tsx
@@ -3,14 +3,13 @@ import * as Yup from 'yup';
 import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps,
-  genericFormDefaultOptions } from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
   defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
 import { FormField, RewardPolicyFields } from './FormFields';
 import { withFormContainer } from './FormContainer';
-import { Dropdown, DropdownItemProps, Header, Checkbox, Message } from 'semantic-ui-react';
+import { Dropdown, DropdownItemProps, DropdownProps, Header, Checkbox, Message } from 'semantic-ui-react';
 import _ from 'lodash';
 import Validation from '../validationSchema';
 import { useTransport, usePromise } from '@polkadot/joy-utils/react/hooks';
@@ -45,7 +44,7 @@ const defaultValues: FormValues = {
   rewardInterval: ''
 };
 
-type FormAdditionalProps = {}; // Aditional props coming all the way from export component into the inner form.
+type FormAdditionalProps = Record<any, never>; // Aditional props coming all the way from export component into the inner form.
 type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormValues>;
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps> & {
   currentBlock?: BlockNumber;
@@ -69,7 +68,7 @@ const valuesToFillOpeningParams = (values: FormValues): SimplifiedTypeInterface<
 );
 
 const FillWorkingGroupLeaderOpeningForm: React.FunctionComponent<FormInnerProps> = (props) => {
-  const { handleChange, setFieldValue, values, myMemberId, errors, touched } = props;
+  const { handleChange, setFieldValue, values, errors, touched } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
   const transport = useTransport();
   const [openings, openingsError, openingsLoading] = usePromise<OpeningData[]>(
@@ -97,11 +96,11 @@ const FillWorkingGroupLeaderOpeningForm: React.FunctionComponent<FormInnerProps>
   const applicationsOptions = activeApplications
     .map((a) => {
       return {
-        text: `${a.wgApplicationId}: ${a.member.handle}`,
+        text: `${a.wgApplicationId}: ${a.member.handle.toString()}`,
         image: a.member.avatar_uri.toString() ? { avatar: true, src: a.member.avatar_uri.toString() } : undefined,
         description:
           (a.stakes.application ? `Appl. stake: ${formatBalance(a.stakes.application)}` : '') +
-          (a.stakes.role ? (a.stakes.application && ', ') + `Role stake: ${formatBalance(a.stakes.role)}` : ''),
+          (a.stakes.role ? `${(a.stakes.application && ', ')} Role stake: ${formatBalance(a.stakes.role)}` : ''),
         value: a.wgApplicationId.toString()
       };
     });
@@ -112,13 +111,7 @@ const FillWorkingGroupLeaderOpeningForm: React.FunctionComponent<FormInnerProps>
       txMethod='createFillWorkingGroupLeaderOpeningProposal'
       proposalType='FillWorkingGroupLeaderOpening'
       disabled={!openingsOptions.length || !applicationsOptions.length}
-      submitParams={[
-        myMemberId,
-        values.title,
-        values.rationale,
-        '{STAKE}',
-        valuesToFillOpeningParams(values)
-      ]}
+      submitParams={[valuesToFillOpeningParams(values)]}
     >
       <PromiseComponent error={openingsError} loading={openingsLoading} message='Fetching openings...'>
         { !openingsOptions.length
@@ -139,8 +132,8 @@ const FillWorkingGroupLeaderOpeningForm: React.FunctionComponent<FormInnerProps>
                 onChange={(...args) => {
                   setFieldValue('successfulApplicants', []);
 
-                  // "as any" assert is required due to some invalid typing of Formik's "handleChange" function (it takes 2 args, not 1)
-                  return (handleChange as any)(...args);
+                  // This assert is required due to some invalid typing of Formik's "handleChange" function (it takes 2 args, not 1)
+                  return (handleChange as Exclude<DropdownProps['onChange'], undefined>)(...args);
                 }}
                 placeholder={'Select an opening'}
                 name={'openingId'}
@@ -208,10 +201,10 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...(props.initialData || {})
   }),
   validationSchema: (props: FormContainerProps) => Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All(),
     ...Validation.FillWorkingGroupLeaderOpening(props.currentBlock?.toNumber() || 0)
   }),
-  handleSubmit: genericFormDefaultOptions.handleSubmit,
+  handleSubmit: () => null,
   displayName: 'FillWorkingGroupLeaderOpeningForm'
 })(FillWorkingGroupLeaderOpeningForm);
 
diff --git a/pioneer/packages/joy-proposals/src/forms/FormContainer.tsx b/pioneer/packages/joy-proposals/src/forms/FormContainer.tsx
index 03d7fbc02b..380eef2e49 100644
--- a/pioneer/packages/joy-proposals/src/forms/FormContainer.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/FormContainer.tsx
@@ -1,17 +1,17 @@
 import React from 'react';
-import { withFormik } from 'formik';
+import { withFormik, WithFormikConfig } from 'formik';
 
-export function withFormContainer<MyFormProps, FormValues> (formikProps: any) {
+export function withFormContainer<MyFormProps, FormValues> (formikProps: WithFormikConfig<MyFormProps, FormValues>) {
   return function (InnerForm: React.ComponentType<any>) {
     return withFormik<MyFormProps, FormValues>(formikProps)(function (props) {
-      const handleBlur = (e: React.FocusEvent<HTMLInputElement>, data: any): void => {
+      const handleBlur = (e: React.FocusEvent<HTMLInputElement>, data?: { name: string, value: any }): void => {
         if (data && data.name) {
           props.setFieldValue(data.name, data.value);
           props.setFieldTouched(data.name);
         }
       };
 
-      const handleChange = (e: React.ChangeEvent<HTMLInputElement>, data: any): void => {
+      const handleChange = (e: React.ChangeEvent<HTMLInputElement>, data?: { name: string, value: any }): void => {
         if (data && data.name) {
           props.setFieldValue(data.name, data.value);
           props.setFieldTouched(data.name);
diff --git a/pioneer/packages/joy-proposals/src/forms/FormFields.tsx b/pioneer/packages/joy-proposals/src/forms/FormFields.tsx
index 548743d10b..d98f252575 100644
--- a/pioneer/packages/joy-proposals/src/forms/FormFields.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/FormFields.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Form, FormInputProps, FormTextAreaProps, Label, LabelProps, Checkbox } from 'semantic-ui-react';
+import { Form, StrictFormInputProps, StrictFormTextAreaProps, Label, LabelProps, Checkbox } from 'semantic-ui-react';
 import { FormikProps } from 'formik';
 import LabelWithHelp from './LabelWithHelp';
 import { FormErrorLabelsProps } from './errorHandling';
@@ -14,13 +14,13 @@ import styled from 'styled-components';
  * and to easily switch the structure/display of a typical form field.
 */
 
-type InputFormFieldProps = Omit<FormInputProps, 'error'> & {
+type StrictInputFormFieldProps = Omit<StrictFormInputProps, 'error'> & {
   help?: string;
   unit?: string;
   error?: LabelProps;
 };
 
-export function InputFormField (props: InputFormFieldProps) {
+export function InputFormField (props: { [key: string]: any } & StrictInputFormFieldProps) {
   const { unit } = props;
   const fieldProps = { ...props, label: undefined, error: undefined };
 
@@ -36,12 +36,12 @@ export function InputFormField (props: InputFormFieldProps) {
   );
 }
 
-type TextareaFormFieldProps = Omit<FormTextAreaProps, 'error'> & {
+type StrictTextareaFormFieldProps = Omit<StrictFormTextAreaProps, 'error'> & {
   help?: string;
   error?: LabelProps;
 };
 
-export function TextareaFormField (props: TextareaFormFieldProps) {
+export function TextareaFormField (props: { [key: string]: any } & StrictTextareaFormFieldProps) {
   const fieldProps = { ...props, label: undefined, error: undefined };
 
   return (
@@ -51,7 +51,7 @@ export function TextareaFormField (props: TextareaFormFieldProps) {
   );
 }
 
-type FormFieldProps = Omit<(InputFormFieldProps | TextareaFormFieldProps), 'error'> & {
+type StrictFormFieldProps = Omit<(StrictInputFormFieldProps | StrictTextareaFormFieldProps), 'error'> & {
   error?: LabelProps;
   showErrorMsg?: boolean;
 };
@@ -62,7 +62,7 @@ const StyledFormField = styled(Form.Field)`
   }
 `;
 
-export function FormField (props: React.PropsWithChildren<FormFieldProps>) {
+export function FormField (props: React.PropsWithChildren<{ [key: string]: any } & StrictFormFieldProps>) {
   const { error, showErrorMsg = false, label, help, children } = props;
 
   return (
diff --git a/pioneer/packages/joy-proposals/src/forms/GenericProposalForm.tsx b/pioneer/packages/joy-proposals/src/forms/GenericProposalForm.tsx
index 0f2daa5b41..17edc2e1de 100644
--- a/pioneer/packages/joy-proposals/src/forms/GenericProposalForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/GenericProposalForm.tsx
@@ -1,8 +1,7 @@
 import React, { useEffect, useState, useRef } from 'react';
-import { FormikProps, WithFormikConfig } from 'formik';
+import { FormikProps } from 'formik';
 import { Form, Icon, Button, Message } from 'semantic-ui-react';
 import { getFormErrorLabelsProps } from './errorHandling';
-import Validation from '../validationSchema';
 import { InputFormField, TextareaFormField } from './FormFields';
 import TxButton from '@polkadot/joy-utils/react/components/TxButton';
 import { SubmittableResult } from '@polkadot/api';
@@ -47,9 +46,9 @@ export type ProposalFormInnerProps<ContainerPropsT, FormValuesT> = ContainerProp
 
 // Types only used in this file
 type GenericProposalFormAdditionalProps = {
-  txMethod?: string;
+  txMethod: string;
   submitParams?: any[];
-  proposalType?: ProposalType;
+  proposalType: ProposalType;
   disabled?: boolean;
 };
 
@@ -59,21 +58,6 @@ ProposalFormExportProps<GenericProposalFormAdditionalProps, GenericFormValues>
 
 >;
 type GenericFormInnerProps = ProposalFormInnerProps<GenericFormContainerProps, GenericFormValues>;
-type GenericFormDefaultOptions = WithFormikConfig<GenericFormContainerProps, GenericFormValues>;
-
-// Default "withFormik" options that can be extended in specific forms
-export const genericFormDefaultOptions: GenericFormDefaultOptions = {
-  mapPropsToValues: (props: GenericFormContainerProps) => ({
-    ...genericFormDefaultValues,
-    ...(props.initialData || {})
-  }),
-  validationSchema: {
-    ...Validation.All()
-  },
-  handleSubmit: (values, { setSubmitting, resetForm }) => {
-    // This is handled via TxButton
-  }
-};
 
 const StyledGenericProposalForm = styled.div`
   .proposal-form {
@@ -106,6 +90,7 @@ const StyledGenericProposalForm = styled.div`
 // Other fields can be passed as children
 export const GenericProposalForm: React.FunctionComponent<GenericFormInnerProps> = (props) => {
   const {
+    myMemberId,
     handleChange,
     handleSubmit,
     errors,
@@ -121,7 +106,6 @@ export const GenericProposalForm: React.FunctionComponent<GenericFormInnerProps>
     submitParams,
     setSubmitting,
     history,
-    balances_totalIssuance,
     proposalType,
     disabled = false
   } = props;
@@ -143,6 +127,8 @@ export const GenericProposalForm: React.FunctionComponent<GenericFormInnerProps>
       setAfterSubmit(null);
       setSubmitting(false);
     }
+    // setSubmitting shouldn't change, so we don't specify it as dependency to avoid complications
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isValidating, isValid, afterSubmit]);
 
   // Focus first error field when isValidating changes to false (which happens after form is validated)
@@ -187,13 +173,13 @@ export const GenericProposalForm: React.FunctionComponent<GenericFormInnerProps>
     }
 
     setSubmitting(false);
-    history.push(`/proposals/${createdProposalId}`);
+
+    if (createdProposalId !== null) {
+      history.push(`/proposals/${createdProposalId}`);
+    }
   };
 
-  const requiredStake: number | undefined =
-    balances_totalIssuance &&
-    proposalType &&
-    proposalsConsts[proposalType].stake;
+  const requiredStake = proposalType && proposalsConsts[proposalType].stake;
 
   return (
     <StyledGenericProposalForm ref={formContainerRef}>
@@ -234,7 +220,15 @@ export const GenericProposalForm: React.FunctionComponent<GenericFormInnerProps>
               type='button' // Tx button uses custom submit handler - "onTxButtonClick"
               label='Submit proposal'
               isDisabled={disabled || isSubmitting}
-              params={(submitParams || []).map((p) => (p === '{STAKE}' ? requiredStake : p))}
+              params={[
+                myMemberId,
+                values.title,
+                values.rationale,
+                requiredStake,
+                // submitParams is any[], but it's not much of an issue (params can vary a lot)
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+                ...(submitParams || [])
+              ]}
               tx={`proposalsCodex.${txMethod}`}
               txFailedCb={onTxFailed}
               txSuccessCb={onTxSuccess}
diff --git a/pioneer/packages/joy-proposals/src/forms/MintCapacityForm.tsx b/pioneer/packages/joy-proposals/src/forms/MintCapacityForm.tsx
index 3e720864a1..81372f8796 100644
--- a/pioneer/packages/joy-proposals/src/forms/MintCapacityForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/MintCapacityForm.tsx
@@ -3,7 +3,6 @@ import * as Yup from 'yup';
 import { getFormErrorLabelsProps } from './errorHandling';
 import { GenericProposalForm,
   GenericFormValues,
-  genericFormDefaultOptions,
   genericFormDefaultValues,
   withProposalFormData,
   ProposalFormExportProps,
@@ -45,7 +44,7 @@ const MintCapacityForm: React.FunctionComponent<FormInnerProps> = (props) => {
       {...props}
       txMethod={txMethod}
       proposalType={proposalType}
-      submitParams={[props.myMemberId, values.title, values.rationale, '{STAKE}', values.capacity]}
+      submitParams={[values.capacity]}
     >
       <InputFormField
         error={errorLabelsProps.capacity}
@@ -67,10 +66,10 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...(props.initialData || {})
   }),
   validationSchema: Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All(),
     ...Validation.SetContentWorkingGroupMintCapacity()
   }),
-  handleSubmit: genericFormDefaultOptions.handleSubmit,
+  handleSubmit: () => null,
   displayName: 'MintCapacityForm'
 })(MintCapacityForm);
 
diff --git a/pioneer/packages/joy-proposals/src/forms/RuntimeUpgradeForm.tsx b/pioneer/packages/joy-proposals/src/forms/RuntimeUpgradeForm.tsx
index e9ad215e59..0edd23a533 100644
--- a/pioneer/packages/joy-proposals/src/forms/RuntimeUpgradeForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/RuntimeUpgradeForm.tsx
@@ -3,7 +3,6 @@ import { Form } from 'semantic-ui-react';
 import * as Yup from 'yup';
 import { GenericProposalForm,
   GenericFormValues,
-  genericFormDefaultOptions,
   genericFormDefaultValues,
   withProposalFormData,
   ProposalFormExportProps,
@@ -23,7 +22,7 @@ const defaultValues: FormValues = {
   WASM: new ArrayBuffer(0)
 };
 
-type FormAdditionalProps = {}; // Aditional props coming all the way from export comonent into the inner form.
+type FormAdditionalProps = Record<any, never>; // Aditional props coming all the way from export comonent into the inner form.
 type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormValues>;
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
@@ -36,7 +35,7 @@ const RuntimeUpgradeForm: React.FunctionComponent<FormInnerProps> = (props) => {
       {...props}
       txMethod='createRuntimeUpgradeProposal'
       proposalType='RuntimeUpgrade'
-      submitParams={[props.myMemberId, values.title, values.rationale, '{STAKE}', values.WASM]}
+      submitParams={[values.WASM]}
     >
       <Form.Field>
         <FileDropdown<FormValues>
@@ -59,10 +58,10 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...(props.initialData || {})
   }),
   validationSchema: Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All(),
     ...Validation.RuntimeUpgrade()
   }),
-  handleSubmit: genericFormDefaultOptions.handleSubmit,
+  handleSubmit: () => null,
   displayName: 'RuntimeUpgradeForm'
 })(RuntimeUpgradeForm);
 
diff --git a/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupLeadForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupLeadForm.tsx
index 91e3056eca..91d7b008aa 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupLeadForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupLeadForm.tsx
@@ -4,7 +4,6 @@ import { getFormErrorLabelsProps } from './errorHandling';
 import * as Yup from 'yup';
 import { GenericProposalForm,
   GenericFormValues,
-  genericFormDefaultOptions,
   genericFormDefaultValues,
   withProposalFormData,
   ProposalFormExportProps,
@@ -19,7 +18,7 @@ import PromiseComponent from '@polkadot/joy-utils/react/components/PromiseCompon
 import _ from 'lodash';
 
 export type FormValues = GenericFormValues & {
-  workingGroupLead: any;
+  workingGroupLead: string;
 };
 
 const defaultValues: FormValues = {
@@ -27,7 +26,7 @@ const defaultValues: FormValues = {
   workingGroupLead: ''
 };
 
-type FormAdditionalProps = {}; // Aditional props coming all the way from export comonent into the inner form.
+type FormAdditionalProps = Record<any, never>; // Aditional props coming all the way from export comonent into the inner form.
 type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormValues>;
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
@@ -48,7 +47,7 @@ function membersToOptions (members: { id: number; profile: Membership }[]) {
     members
       .map(({ id, profile }) => ({
         key: profile.handle,
-        text: `${profile.handle} (id:${id})`,
+        text: `${profile.handle.toString()} (id:${id})`,
         value: memberOptionKey(id, profile),
         image: profile.avatar_uri.toString() ? { avatar: true, src: profile.avatar_uri } : null
       }))
@@ -94,7 +93,7 @@ const SetContentWorkingGroupsLeadForm: React.FunctionComponent<FormInnerProps> =
   // Filter options on search query change (we "pulled-out" this logic here to avoid lags)
   useEffect(() => {
     setFilteredOptions(filterMembers(membersOptions, membersSearchQuery));
-  }, [membersSearchQuery]);
+  }, [membersSearchQuery, membersOptions]);
 
   return (
     <PromiseComponent error={clError} loading={clLoading} message='Fetching current lead...'>
@@ -103,10 +102,6 @@ const SetContentWorkingGroupsLeadForm: React.FunctionComponent<FormInnerProps> =
         txMethod='createSetLeadProposal'
         proposalType='SetLead'
         submitParams={[
-          props.myMemberId,
-          values.title,
-          values.rationale,
-          '{STAKE}',
           values.workingGroupLead !== MEMBERS_NONE_OPTION.value ? values.workingGroupLead.split(':') : undefined
         ]}
       >
@@ -180,10 +175,10 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...(props.initialData || {})
   }),
   validationSchema: Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All(),
     ...Validation.SetLead()
   }),
-  handleSubmit: genericFormDefaultOptions.handleSubmit,
+  handleSubmit: () => null,
   displayName: 'SetContentWorkingGroupLeadForm'
 })(SetContentWorkingGroupsLeadForm);
 
diff --git a/pioneer/packages/joy-proposals/src/forms/SetCouncilParamsForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetCouncilParamsForm.tsx
index aba4f91c0e..7e111490b4 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetCouncilParamsForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetCouncilParamsForm.tsx
@@ -4,7 +4,6 @@ import { Divider, Form } from 'semantic-ui-react';
 import * as Yup from 'yup';
 import { GenericProposalForm,
   GenericFormValues,
-  genericFormDefaultOptions,
   genericFormDefaultValues,
   withProposalFormData,
   ProposalFormExportProps,
@@ -42,7 +41,7 @@ const defaultValues: FormValues = {
   councilSize: ''
 };
 
-type FormAdditionalProps = {}; // Aditional props coming all the way from export comonent into the inner form.
+type FormAdditionalProps = Record<any, never>; // Aditional props coming all the way from export comonent into the inner form.
 type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormValues>;
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
@@ -90,6 +89,8 @@ const SetCouncilParamsForm: React.FunctionComponent<FormInnerProps> = (props) =>
       });
       setPlaceholders(fetchedPlaceholders);
     }
+    // We don't need dependency on "placeholders"
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [councilParams]);
 
   // This logic may be moved somewhere else in the future, but it's quite easy to enforce it here:
@@ -103,7 +104,7 @@ const SetCouncilParamsForm: React.FunctionComponent<FormInnerProps> = (props) =>
         {...props}
         txMethod='createSetElectionParametersProposal'
         proposalType='SetElectionParameters'
-        submitParams={[props.myMemberId, values.title, values.rationale, '{STAKE}', createElectionParameters(values)]}
+        submitParams={[createElectionParameters(values)]}
       >
         <Divider horizontal>Voting </Divider>
         <Form.Group widths='equal' style={{ marginBottom: '8rem' }}>
@@ -202,10 +203,10 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...(props.initialData || {})
   }),
   validationSchema: Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All(),
     ...Validation.SetElectionParameters()
   }),
-  handleSubmit: genericFormDefaultOptions.handleSubmit,
+  handleSubmit: () => null,
   displayName: 'SetCouncilParamsForm'
 })(SetCouncilParamsForm);
 
diff --git a/pioneer/packages/joy-proposals/src/forms/SetMaxValidatorCountForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetMaxValidatorCountForm.tsx
index 1f252bdcd6..da7766d817 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetMaxValidatorCountForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetMaxValidatorCountForm.tsx
@@ -3,7 +3,6 @@ import { getFormErrorLabelsProps } from './errorHandling';
 import * as Yup from 'yup';
 import { GenericProposalForm,
   GenericFormValues,
-  genericFormDefaultOptions,
   genericFormDefaultValues,
   withProposalFormData,
   ProposalFormExportProps,
@@ -23,7 +22,7 @@ const defaultValues: FormValues = {
   maxValidatorCount: ''
 };
 
-type FormAdditionalProps = {}; // Aditional props coming all the way from export comonent into the inner form.
+type FormAdditionalProps = Record<any, never>; // Aditional props coming all the way from export comonent into the inner form.
 type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormValues>;
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
@@ -38,6 +37,7 @@ const SetMaxValidatorCountForm: React.FunctionComponent<FormInnerProps> = (props
     if (validatorCount) {
       setFieldValue('maxValidatorCount', validatorCount);
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [validatorCount]);
 
   return (
@@ -45,7 +45,7 @@ const SetMaxValidatorCountForm: React.FunctionComponent<FormInnerProps> = (props
       {...props}
       txMethod='createSetValidatorCountProposal'
       proposalType='SetValidatorCount'
-      submitParams={[props.myMemberId, values.title, values.rationale, '{STAKE}', values.maxValidatorCount]}
+      submitParams={[values.maxValidatorCount]}
     >
       <InputFormField
         error={errorLabelsProps.maxValidatorCount}
@@ -66,10 +66,10 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...(props.initialData || {})
   }),
   validationSchema: Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All(),
     ...Validation.SetValidatorCount()
   }),
-  handleSubmit: genericFormDefaultOptions.handleSubmit,
+  handleSubmit: () => null,
   displayName: 'SetMaxValidatorCountForm'
 })(SetMaxValidatorCountForm);
 
diff --git a/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupLeadRewardForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupLeadRewardForm.tsx
index 8879c2f851..3e9e7333bf 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupLeadRewardForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupLeadRewardForm.tsx
@@ -4,8 +4,7 @@ import * as Yup from 'yup';
 import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps,
-  genericFormDefaultOptions } from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
   defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
@@ -26,13 +25,13 @@ const defaultValues: FormValues = {
   amount: ''
 };
 
-type FormAdditionalProps = {}; // Aditional props coming all the way from export component into the inner form.
+type FormAdditionalProps = Record<any, never>; // Aditional props coming all the way from export component into the inner form.
 type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormValues>;
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
 const SetWorkingGroupLeadRewardForm: React.FunctionComponent<FormInnerProps> = (props) => {
-  const { handleChange, errors, touched, values, myMemberId } = props;
+  const { handleChange, errors, touched, values } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
   const [lead, setLead] = useState<WorkerData | null>(null);
 
@@ -45,10 +44,6 @@ const SetWorkingGroupLeadRewardForm: React.FunctionComponent<FormInnerProps> = (
       leadRewardRequired={true}
       onLeadChange={(lead: WorkerData | null) => setLead(lead)}
       submitParams={[
-        myMemberId,
-        values.title,
-        values.rationale,
-        '{STAKE}',
         lead?.workerId,
         values.amount,
         values.workingGroup
@@ -78,10 +73,10 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...(props.initialData || {})
   }),
   validationSchema: Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All(),
     ...Validation.SetWorkingGroupLeaderReward()
   }),
-  handleSubmit: genericFormDefaultOptions.handleSubmit,
+  handleSubmit: () => null,
   displayName: 'SetWorkingGroupLeadRewardForm'
 })(SetWorkingGroupLeadRewardForm);
 
diff --git a/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupMintCapacityForm.tsx b/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupMintCapacityForm.tsx
index 9ba9d72ec9..3f2ab3931c 100644
--- a/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupMintCapacityForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SetWorkingGroupMintCapacityForm.tsx
@@ -4,8 +4,7 @@ import * as Yup from 'yup';
 import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps,
-  genericFormDefaultOptions } from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
   defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
@@ -25,13 +24,13 @@ const defaultValues: FormValues = {
   capacity: ''
 };
 
-type FormAdditionalProps = {}; // Aditional props coming all the way from export component into the inner form.
+type FormAdditionalProps = Record<any, never>; // Aditional props coming all the way from export component into the inner form.
 type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormValues>;
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
 const SetWorkingGroupMintCapacityForm: React.FunctionComponent<FormInnerProps> = (props) => {
-  const { handleChange, errors, touched, values, myMemberId } = props;
+  const { handleChange, errors, touched, values } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
 
   return (
@@ -40,10 +39,6 @@ const SetWorkingGroupMintCapacityForm: React.FunctionComponent<FormInnerProps> =
       txMethod='createSetWorkingGroupMintCapacityProposal'
       proposalType='SetWorkingGroupMintCapacity'
       submitParams={[
-        myMemberId,
-        values.title,
-        values.rationale,
-        '{STAKE}',
         values.capacity,
         values.workingGroup
       ]}
@@ -71,10 +66,10 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...(props.initialData || {})
   }),
   validationSchema: Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All(),
     ...Validation.SetWorkingGroupMintCapacity()
   }),
-  handleSubmit: genericFormDefaultOptions.handleSubmit,
+  handleSubmit: () => null,
   displayName: 'SetWorkingGroupMintCapacityForm'
 })(SetWorkingGroupMintCapacityForm);
 
diff --git a/pioneer/packages/joy-proposals/src/forms/SignalForm.tsx b/pioneer/packages/joy-proposals/src/forms/SignalForm.tsx
index 996d0b9691..a507e30d9b 100644
--- a/pioneer/packages/joy-proposals/src/forms/SignalForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SignalForm.tsx
@@ -3,7 +3,6 @@ import { getFormErrorLabelsProps } from './errorHandling';
 import * as Yup from 'yup';
 import { GenericProposalForm,
   GenericFormValues,
-  genericFormDefaultOptions,
   genericFormDefaultValues,
   withProposalFormData,
   ProposalFormExportProps,
@@ -22,7 +21,7 @@ const defaultValues: FormValues = {
   description: ''
 };
 
-type FormAdditionalProps = {}; // Aditional props coming all the way from export comonent into the inner form.
+type FormAdditionalProps = Record<any, never>; // Aditional props coming all the way from export comonent into the inner form.
 type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormValues>;
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
@@ -36,7 +35,7 @@ const SignalForm: React.FunctionComponent<FormInnerProps> = (props) => {
       {...props}
       txMethod='createTextProposal'
       proposalType='Text'
-      submitParams={[props.myMemberId, values.title, values.rationale, '{STAKE}', values.description]}
+      submitParams={[values.description]}
     >
       <TextareaFormField
         label='Description'
@@ -57,10 +56,10 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...(props.initialData || {})
   }),
   validationSchema: Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All(),
     ...Validation.Text()
   }),
-  handleSubmit: genericFormDefaultOptions.handleSubmit,
+  handleSubmit: () => null,
   displayName: 'SignalForm'
 })(SignalForm);
 
diff --git a/pioneer/packages/joy-proposals/src/forms/SlashWorkingGroupLeadStakeForm.tsx b/pioneer/packages/joy-proposals/src/forms/SlashWorkingGroupLeadStakeForm.tsx
index 5c2fd5e69b..50f4ecb46c 100644
--- a/pioneer/packages/joy-proposals/src/forms/SlashWorkingGroupLeadStakeForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SlashWorkingGroupLeadStakeForm.tsx
@@ -4,8 +4,7 @@ import * as Yup from 'yup';
 import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps,
-  genericFormDefaultOptions } from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
   defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
@@ -26,13 +25,13 @@ const defaultValues: FormValues = {
   amount: ''
 };
 
-type FormAdditionalProps = {}; // Aditional props coming all the way from export component into the inner form.
+type FormAdditionalProps = Record<any, never>; // Aditional props coming all the way from export component into the inner form.
 type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormValues>;
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
 
 const SlashWorkingGroupLeadStakeForm: React.FunctionComponent<FormInnerProps> = (props) => {
-  const { handleChange, errors, touched, values, myMemberId, setFieldError } = props;
+  const { handleChange, errors, touched, values, setFieldError } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
   const [lead, setLead] = useState<WorkerData | null>(null);
 
@@ -54,10 +53,6 @@ const SlashWorkingGroupLeadStakeForm: React.FunctionComponent<FormInnerProps> =
       leadStakeRequired={true}
       onLeadChange={(lead: WorkerData | null) => setLead(lead)}
       submitParams={[
-        myMemberId,
-        values.title,
-        values.rationale,
-        '{STAKE}',
         lead?.workerId,
         values.amount,
         values.workingGroup
@@ -87,10 +82,10 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...(props.initialData || {})
   }),
   validationSchema: Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All(),
     ...Validation.SlashWorkingGroupLeaderStake()
   }),
-  handleSubmit: genericFormDefaultOptions.handleSubmit,
+  handleSubmit: () => null,
   displayName: 'SlashWorkingGroupLeadStakeForm'
 })(SlashWorkingGroupLeadStakeForm);
 
diff --git a/pioneer/packages/joy-proposals/src/forms/SpendingProposalForm.tsx b/pioneer/packages/joy-proposals/src/forms/SpendingProposalForm.tsx
index 989610de25..550a4f4b0c 100644
--- a/pioneer/packages/joy-proposals/src/forms/SpendingProposalForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/SpendingProposalForm.tsx
@@ -4,7 +4,6 @@ import * as Yup from 'yup';
 import { Label } from 'semantic-ui-react';
 import { GenericProposalForm,
   GenericFormValues,
-  genericFormDefaultOptions,
   genericFormDefaultValues,
   withProposalFormData,
   ProposalFormExportProps,
@@ -17,7 +16,7 @@ import { InputAddress } from '@polkadot/react-components/index';
 import { formatBalance } from '@polkadot/util';
 
 export type FormValues = GenericFormValues & {
-  destinationAccount: any;
+  destinationAccount: string;
   tokens: string;
 };
 
@@ -27,7 +26,7 @@ const defaultValues: FormValues = {
   tokens: ''
 };
 
-type FormAdditionalProps = {}; // Aditional props coming all the way from export comonent into the inner form.
+type FormAdditionalProps = Record<any, never>; // Aditional props coming all the way from export comonent into the inner form.
 type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormValues>;
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps>;
 type FormInnerProps = ProposalFormInnerProps<FormContainerProps, FormValues>;
@@ -42,10 +41,6 @@ const SpendingProposalForm: React.FunctionComponent<FormInnerProps> = (props) =>
       txMethod='createSpendingProposal'
       proposalType='Spending'
       submitParams={[
-        props.myMemberId,
-        values.title,
-        values.rationale,
-        '{STAKE}',
         values.tokens,
         values.destinationAccount
       ]}
@@ -83,10 +78,10 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...(props.initialData || {})
   }),
   validationSchema: Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All(),
     ...Validation.Spending()
   }),
-  handleSubmit: genericFormDefaultOptions.handleSubmit,
+  handleSubmit: () => null,
   displayName: 'SpendingProposalsForm'
 })(SpendingProposalForm);
 
diff --git a/pioneer/packages/joy-proposals/src/forms/TerminateWorkingGroupLeaderForm.tsx b/pioneer/packages/joy-proposals/src/forms/TerminateWorkingGroupLeaderForm.tsx
index fc41c32848..476f0ed37b 100644
--- a/pioneer/packages/joy-proposals/src/forms/TerminateWorkingGroupLeaderForm.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/TerminateWorkingGroupLeaderForm.tsx
@@ -3,8 +3,7 @@ import * as Yup from 'yup';
 import { withProposalFormData,
   ProposalFormExportProps,
   ProposalFormContainerProps,
-  ProposalFormInnerProps,
-  genericFormDefaultOptions } from './GenericProposalForm';
+  ProposalFormInnerProps } from './GenericProposalForm';
 import { GenericWorkingGroupProposalForm,
   FormValues as WGFormValues,
   defaultValues as wgFromDefaultValues } from './GenericWorkingGroupProposalForm';
@@ -32,7 +31,7 @@ const defaultValues: FormValues = {
   slashStake: false
 };
 
-type FormAdditionalProps = {}; // Aditional props coming all the way from export component into the inner form.
+type FormAdditionalProps = Record<any, never>; // Aditional props coming all the way from export component into the inner form.
 type ExportComponentProps = ProposalFormExportProps<FormAdditionalProps, FormValues>;
 type FormContainerProps = ProposalFormContainerProps<ExportComponentProps> & {
   terminationRationaleConstraint?: InputValidationLengthConstraint;
@@ -49,7 +48,7 @@ const valuesToTerminateRoleParams = (values: FormValues, lead: WorkerData): Simp
 };
 
 const TerminateWorkingGroupLeaderForm: React.FunctionComponent<FormInnerProps> = (props) => {
-  const { handleChange, errors, touched, values, myMemberId, setFieldValue } = props;
+  const { handleChange, errors, touched, values, setFieldValue } = props;
   const errorLabelsProps = getFormErrorLabelsProps<FormValues>(errors, touched);
   const [lead, setLead] = useState<WorkerData | null>(null);
 
@@ -60,13 +59,7 @@ const TerminateWorkingGroupLeaderForm: React.FunctionComponent<FormInnerProps> =
       proposalType='TerminateWorkingGroupLeaderRole'
       leadRequired={true}
       onLeadChange={(lead: WorkerData | null) => setLead(lead)}
-      submitParams={[
-        myMemberId,
-        values.title,
-        values.rationale,
-        '{STAKE}',
-        lead && valuesToTerminateRoleParams(values, lead)
-      ]}
+      submitParams={[lead && valuesToTerminateRoleParams(values, lead)]}
     >
       { lead && (<>
         <TextareaFormField
@@ -102,12 +95,12 @@ const FormContainer = withFormContainer<FormContainerProps, FormValues>({
     ...(props.initialData || {})
   }),
   validationSchema: (props: FormContainerProps) => Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All(),
     ...Validation.TerminateWorkingGroupLeaderRole(
       props.terminationRationaleConstraint
     )
   }),
-  handleSubmit: genericFormDefaultOptions.handleSubmit,
+  handleSubmit: () => null,
   displayName: 'TerminateWorkingGroupLeaderForm'
 })(TerminateWorkingGroupLeaderForm);
 
diff --git a/pioneer/packages/joy-proposals/src/index.tsx b/pioneer/packages/joy-proposals/src/index.tsx
index e895cae2d7..f94335421b 100644
--- a/pioneer/packages/joy-proposals/src/index.tsx
+++ b/pioneer/packages/joy-proposals/src/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Route, Switch } from 'react-router';
+import { Route, Switch, RouteComponentProps } from 'react-router';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
 import { Breadcrumb } from 'semantic-ui-react';
@@ -49,7 +49,7 @@ function App (props: Props): React.ReactElement<Props> {
       <StyledHeader>
         <Breadcrumb>
           <Switch>
-            <Route path={`${basePath}/new/:type`} render={(props) => (
+            <Route path={`${basePath}/new/:type`} render={(props: RouteComponentProps<{ type?: string }>) => (
               <>
                 <Breadcrumb.Section link as={Link} to={basePath}>Proposals</Breadcrumb.Section>
                 <Breadcrumb.Divider icon='right angle' />
diff --git a/pioneer/packages/joy-proposals/src/stories/data/ProposalDetails.mock.ts b/pioneer/packages/joy-proposals/src/stories/data/ProposalDetails.mock.ts
index e985cc160e..9c0f56f138 100644
--- a/pioneer/packages/joy-proposals/src/stories/data/ProposalDetails.mock.ts
+++ b/pioneer/packages/joy-proposals/src/stories/data/ProposalDetails.mock.ts
@@ -8,7 +8,7 @@ const mockedProposal: ParsedProposal = {
   createdAtBlock: 36,
   type: 'Text',
   details: createMock('ProposalDetails', { Text: 'Ciao' }),
-  parameters: {
+  parameters: createMock('ProposalParameters', {
     approvalQuorumPercentage: 66,
     approvalThresholdPercentage: 80,
     gracePeriod: 0,
@@ -16,14 +16,14 @@ const mockedProposal: ParsedProposal = {
     slashingQuorumPercentage: 60,
     slashingThresholdPercentage: 80,
     votingPeriod: 7200
-  },
+  }),
   proposerId: 303,
-  status: {
+  status: createMock('ProposalStatus', {
     Active: {
       stakeId: 0,
       sourceAccountId: '5C4hrfkRjSLwQSFVtCvtbV6wctV1WFnkiexUZWLAh4Bc7jib'
     }
-  },
+  }),
   proposer: {
     about: 'Bob',
     avatar_uri: 'https://react.semantic-ui.com/images/avatar/large/steve.jpg',
@@ -38,12 +38,12 @@ const mockedProposal: ParsedProposal = {
     subscription: null,
     suspended: false
   },
-  votingResults: {
+  votingResults: createMock('VotingResults', {
     abstensions: 3,
     approvals: 0,
     rejections: 1,
     slashes: 0
-  },
+  }),
   createdAt: new Date('Mar 25, 2020 at 14:20'),
   cancellationFee: 5
 };
diff --git a/pioneer/packages/joy-proposals/src/stories/withMock.tsx b/pioneer/packages/joy-proposals/src/stories/withMock.tsx
index 23d921e795..2a018e5b7c 100644
--- a/pioneer/packages/joy-proposals/src/stories/withMock.tsx
+++ b/pioneer/packages/joy-proposals/src/stories/withMock.tsx
@@ -4,7 +4,7 @@ import { match, RouteComponentProps } from 'react-router';
 
 const history = createMemoryHistory();
 const path = '/';
-const matchObj: match<{}> = {
+const matchObj: match<Record<string, string | undefined>> = {
   isExact: false,
   path,
   url: path,
diff --git a/pioneer/packages/joy-proposals/src/validationSchema.ts b/pioneer/packages/joy-proposals/src/validationSchema.ts
index 8966d8e22c..983a3cc72e 100644
--- a/pioneer/packages/joy-proposals/src/validationSchema.ts
+++ b/pioneer/packages/joy-proposals/src/validationSchema.ts
@@ -105,7 +105,7 @@ const DECREASE_LEAD_STAKE_MIN = 1;
 const SLASH_LEAD_STAKE_MIN = 1;
 // Max is validated in form component, because it depends on selected working group's leader stake
 
-function errorMessage (name: string, min?: number | string, max?: number | string, unit?: string): string {
+function errorMessage (name: string, min: number | string, max: number | string, unit?: string): string {
   return `${name} should be at least ${min} and no more than ${max}${unit ? ` ${unit}.` : '.'}`;
 }
 
@@ -119,7 +119,7 @@ Ex:
 import Validation from 'path/to/validationSchema'
 ...
   validationSchema: Yup.object().shape({
-    ...genericFormDefaultOptions.validationSchema,
+    ...Validation.All()
     ...Validation.Text()
   }),
 
@@ -159,7 +159,7 @@ type ValidationSchemaFuncParamsByType<T extends ValidationTypeKeys> =
 
 /* eslint-enable @typescript-eslint/indent */
 
-type ValidationSchemaFunc<FieldValuesT extends {}, ParamsT extends any[] = []> = (...params: ParamsT) =>
+type ValidationSchemaFunc<FieldValuesT extends Record<string, any>, ParamsT extends any[] = []> = (...params: ParamsT) =>
 ({ [fieldK in keyof FieldValuesT]: Yup.Schema<any> });
 
 type ValidationType = {
@@ -212,9 +212,9 @@ const Validation: ValidationType = {
   }),
   RuntimeUpgrade: () => ({
     WASM: Yup.mixed()
-      .test('fileArrayBuffer', 'Unexpected data format, file cannot be processed.', (value) => typeof value.byteLength !== 'undefined')
-      .test('fileSizeMin', `Minimum file size is ${FILE_SIZE_BYTES_MIN} bytes.`, (value) => value.byteLength >= FILE_SIZE_BYTES_MIN)
-      .test('fileSizeMax', `Maximum file size is ${FILE_SIZE_BYTES_MAX} bytes.`, (value) => value.byteLength <= FILE_SIZE_BYTES_MAX)
+      .test('fileArrayBuffer', 'Unexpected data format, file cannot be processed.', (value) => value instanceof ArrayBuffer)
+      .test('fileSizeMin', `Minimum file size is ${FILE_SIZE_BYTES_MIN} bytes.`, (value: ArrayBuffer) => value.byteLength >= FILE_SIZE_BYTES_MIN)
+      .test('fileSizeMax', `Maximum file size is ${FILE_SIZE_BYTES_MAX} bytes.`, (value: ArrayBuffer) => value.byteLength <= FILE_SIZE_BYTES_MAX)
   }),
   SetElectionParameters: () => ({
     announcingPeriod: Yup.number()
@@ -368,11 +368,11 @@ const Validation: ValidationType = {
       .test(
         'schemaIsValid',
         'Schema validation failed!',
-        function (val) {
-          let schemaObj: any;
+        function (val: string) {
+          let schemaObj: Record<string, unknown>;
 
           try {
-            schemaObj = JSON.parse(val);
+            schemaObj = JSON.parse(val) as Record<string, unknown>;
           } catch (e) {
             return this.createError({ message: 'Schema validation failed: Invalid JSON' });
           }
@@ -382,7 +382,7 @@ const Validation: ValidationType = {
 
           if (!isValid) {
             return this.createError({
-              message: 'Schema validation failed: ' + errors.map((e) => `${e.message}${e.dataPath && ` (${e.dataPath})`}`).join(', ')
+              message: 'Schema validation failed: ' + errors.map((e) => `${e.message || ''}${e.dataPath && ` (${e.dataPath})`}`).join(', ')
             });
           }
 
diff --git a/pioneer/packages/joy-utils/src/react/hooks/proposals/useProposalSubscription.tsx b/pioneer/packages/joy-utils/src/react/hooks/proposals/useProposalSubscription.tsx
index 5122ee3642..3a7b32c5df 100644
--- a/pioneer/packages/joy-utils/src/react/hooks/proposals/useProposalSubscription.tsx
+++ b/pioneer/packages/joy-utils/src/react/hooks/proposals/useProposalSubscription.tsx
@@ -2,6 +2,7 @@ import { useState, useEffect } from 'react';
 import { useTransport } from '../';
 import { ProposalId } from '@joystream/types/proposals';
 import { ParsedProposal } from '@polkadot/joy-utils/types/proposals';
+import { normalizeError } from '@polkadot/joy-utils/functions/misc';
 
 // Take advantage of polkadot api subscriptions to re-fetch proposal data and votes
 // each time there is some runtime change in the proposal
@@ -9,7 +10,7 @@ const useProposalSubscription = (id: ProposalId) => {
   const transport = useTransport();
   // State holding current proposal data
   const [data, setData] = useState<ParsedProposal | null>(null);
-  const [error, setError] = useState<any>(null);
+  const [error, setError] = useState<string | null>(null);
   const [loading, setLoading] = useState<boolean>(true);
 
   useEffect(() => {
@@ -27,7 +28,7 @@ const useProposalSubscription = (id: ProposalId) => {
         })
         .catch((error) => {
           if (!unmounted) {
-            setError(error);
+            setError(normalizeError(error));
             setLoading(false);
           }
         });
@@ -41,7 +42,8 @@ const useProposalSubscription = (id: ProposalId) => {
         } else {
           unsubscribe(); // If already unmounted - unsubscribe immedietally!
         }
-      });
+      })
+      .catch((e) => { throw e; });
 
     return () => {
       // onUnmount...
@@ -52,6 +54,7 @@ const useProposalSubscription = (id: ProposalId) => {
         unsubscribeProposal();
       }
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   return { data, error, loading };
diff --git a/pioneer/packages/joy-utils/src/transport/chain.ts b/pioneer/packages/joy-utils/src/transport/chain.ts
index 72608a6361..9a6d8dc8bb 100644
--- a/pioneer/packages/joy-utils/src/transport/chain.ts
+++ b/pioneer/packages/joy-utils/src/transport/chain.ts
@@ -1,5 +1,4 @@
 import BaseTransport from './base';
-import { Moment } from '@polkadot/types/interfaces';
 
 export default class ChainTransport extends BaseTransport {
   async blockHash (height: number): Promise<string> {
diff --git a/pioneer/packages/joy-utils/src/transport/council.ts b/pioneer/packages/joy-utils/src/transport/council.ts
index 6cd11c8cfa..0dc79dff62 100644
--- a/pioneer/packages/joy-utils/src/transport/council.ts
+++ b/pioneer/packages/joy-utils/src/transport/council.ts
@@ -22,8 +22,9 @@ export default class CouncilTransport extends BaseTransport {
   async councilMembersLength (atBlock?: number): Promise<number> {
     if (atBlock) {
       const blockHash = await this.chainT.blockHash(atBlock);
+      const seats = await this.api.query.council.activeCouncil.at<Seats>(blockHash);
 
-      return ((await this.api.query.council.activeCouncil.at(blockHash))).length;
+      return seats.length;
     }
 
     return ((await this.council.activeCouncil()) as Seats).length;
diff --git a/pioneer/packages/joy-utils/src/transport/proposals.ts b/pioneer/packages/joy-utils/src/transport/proposals.ts
index 856e04ce50..dc78670ec5 100644
--- a/pioneer/packages/joy-utils/src/transport/proposals.ts
+++ b/pioneer/packages/joy-utils/src/transport/proposals.ts
@@ -108,25 +108,22 @@ export default class ProposalsTransport extends BaseTransport {
     }
 
     const proposer = (await this.membersT.expectedMembership(rawProposal.proposerId)).toJSON() as ParsedMember;
-    const proposal = rawProposal.toJSON() as {
-      title: string;
-      description: string;
-      parameters: any;
-      votingResults: any;
-      proposerId: number;
-      status: any;
-    };
     const createdAtBlock = rawProposal.createdAt;
     const createdAt = await this.chainT.blockTimestamp(createdAtBlock.toNumber());
     const cancellationFee = this.cancellationFee();
 
     return {
       id,
-      ...proposal,
+      title: rawProposal.title.toString(),
+      description: rawProposal.description.toString(),
+      parameters: rawProposal.parameters,
+      votingResults: rawProposal.votingResults,
+      proposerId: rawProposal.proposerId.toNumber(),
+      status: rawProposal.status,
       details,
       type,
       proposer,
-      createdAtBlock: createdAtBlock.toJSON(),
+      createdAtBlock: createdAtBlock.toNumber(),
       createdAt,
       cancellationFee
     };
diff --git a/pioneer/packages/joy-utils/src/transport/validators.ts b/pioneer/packages/joy-utils/src/transport/validators.ts
index 768de57d56..0afb763b5e 100644
--- a/pioneer/packages/joy-utils/src/transport/validators.ts
+++ b/pioneer/packages/joy-utils/src/transport/validators.ts
@@ -1,5 +1,4 @@
 import BaseTransport from './base';
-import { u32 } from '@polkadot/types/';
 
 export default class ValidatorsTransport extends BaseTransport {
   async maxCount (): Promise<number> {
diff --git a/pioneer/packages/joy-utils/src/transport/workingGroups.ts b/pioneer/packages/joy-utils/src/transport/workingGroups.ts
index ca647f2766..5818410376 100644
--- a/pioneer/packages/joy-utils/src/transport/workingGroups.ts
+++ b/pioneer/packages/joy-utils/src/transport/workingGroups.ts
@@ -94,7 +94,7 @@ export default class WorkingGroupsTransport extends BaseTransport {
     const wgApplication = (await this.queryByGroup(group).applicationById(wgApplicationId)) as WGApplication;
 
     if (wgApplication.isEmpty) {
-      throw new Error(`Working group application not found (ID: ${wgApplicationId})!`);
+      throw new Error(`Working group application not found (ID: ${wgApplicationId.toString()})!`);
     }
 
     return wgApplication;
diff --git a/pioneer/packages/joy-utils/src/types/proposals.ts b/pioneer/packages/joy-utils/src/types/proposals.ts
index ebcc1881cb..d3414aa491 100644
--- a/pioneer/packages/joy-utils/src/types/proposals.ts
+++ b/pioneer/packages/joy-utils/src/types/proposals.ts
@@ -2,7 +2,7 @@ import { ProposalId, VoteKind } from '@joystream/types/proposals';
 import { MemberId, Membership } from '@joystream/types/members';
 import { ThreadId, PostId } from '@joystream/types/common';
 import { ParsedMember } from './members';
-import { ProposalDetails } from '@joystream/types/src/proposals';
+import { ProposalDetails, ProposalStatus, VotingResults, ProposalParameters } from '@joystream/types/src/proposals';
 
 export const ProposalTypes = [
   'Text',
@@ -46,22 +46,14 @@ export type ParsedProposal = {
   type: ProposalType;
   title: string;
   description: string;
-  status: any;
+  status: ProposalStatus;
   proposer: ParsedMember;
   proposerId: number;
   createdAtBlock: number;
   createdAt: Date;
   details: ParsedProposalDetails;
-  votingResults: any;
-  parameters: {
-    approvalQuorumPercentage: number;
-    approvalThresholdPercentage: number;
-    gracePeriod: number;
-    requiredStake: number;
-    slashingQuorumPercentage: number;
-    slashingThresholdPercentage: number;
-    votingPeriod: number;
-  };
+  votingResults: VotingResults;
+  parameters: ProposalParameters;
   cancellationFee: number;
 };
 

From e19eb611a55332de55f6d69ed8a97e8632c04398 Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Tue, 18 Aug 2020 18:39:31 +0200
Subject: [PATCH 08/17] Fix joy-proposals dependencies and react-dropzone
 compatibility

---
 pioneer/packages/joy-proposals/package.json            |  8 ++++----
 .../packages/joy-proposals/src/forms/FileDropdown.tsx  | 10 +++++-----
 yarn.lock                                              | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pioneer/packages/joy-proposals/package.json b/pioneer/packages/joy-proposals/package.json
index 145902f003..22c5cb01ee 100644
--- a/pioneer/packages/joy-proposals/package.json
+++ b/pioneer/packages/joy-proposals/package.json
@@ -7,10 +7,10 @@
   "author": "Joystream contributors",
   "maintainers": [],
   "dependencies": {
-    "@babel/runtime": "^7.7.1",
+    "@babel/runtime": "^7.10.5",
     "@polkadot/joy-utils": "^0.1.1",
-    "@polkadot/react-components": "0.37.0-beta.63",
-    "@polkadot/react-query": "0.37.0-beta.63",
-    "react-dropzone": "^10.2.2"
+    "@polkadot/react-components": "0.51.1",
+    "@polkadot/react-query": "0.51.1",
+    "react-dropzone": "^11.0.2"
   }
 }
diff --git a/pioneer/packages/joy-proposals/src/forms/FileDropdown.tsx b/pioneer/packages/joy-proposals/src/forms/FileDropdown.tsx
index 9284c56ec3..d2c5d994ce 100644
--- a/pioneer/packages/joy-proposals/src/forms/FileDropdown.tsx
+++ b/pioneer/packages/joy-proposals/src/forms/FileDropdown.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { FormikProps } from 'formik';
 import { Icon, Loader } from 'semantic-ui-react';
-import Dropzone from 'react-dropzone';
+import Dropzone, { FileRejection } from 'react-dropzone';
 
 enum Status {
   Accepted = 'accepted',
@@ -13,13 +13,13 @@ enum Status {
 
 const determineStatus = (
   acceptedFiles: File[],
-  rejectedFiles: File[],
+  fileRejections: FileRejection[],
   error: string | undefined,
   isDragActive: boolean,
   parsing: boolean
 ): Status => {
   if (parsing) return Status.Parsing;
-  if (error || rejectedFiles.length) return Status.Rejected;
+  if (error || fileRejections.length) return Status.Rejected;
   if (acceptedFiles.length) return Status.Accepted;
   if (isDragActive) return Status.Active;
 
@@ -130,8 +130,8 @@ export default function FileDropdown<ValuesT = Record<string, any>> (props: File
       multiple={false}
       accept={acceptedFormats}
     >
-      {({ getRootProps, getInputProps, acceptedFiles, rejectedFiles, isDragActive }) => {
-        const status = determineStatus(acceptedFiles, rejectedFiles, error, isDragActive, parsing);
+      {({ getRootProps, getInputProps, acceptedFiles, fileRejections, isDragActive }) => {
+        const status = determineStatus(acceptedFiles, fileRejections, error, isDragActive, parsing);
 
         return (
           <section>
diff --git a/yarn.lock b/yarn.lock
index 1e051ebe20..f109c1935a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11565,7 +11565,7 @@ find-babel-config@^1.2.0:
     json5 "^0.5.1"
     path-exists "^3.0.0"
 
-find-cache-dir@^2.1.0:
+find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
   integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
@@ -19164,7 +19164,7 @@ pirates@^3.0.2:
   dependencies:
     node-modules-regexp "^1.0.0"
 
-pirates@^4.0.1:
+pirates@^4.0.0, pirates@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
   integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
@@ -20487,9 +20487,9 @@ react-draggable@^4.0.3:
     prop-types "^15.6.0"
 
 react-dropzone@^11.0.2:
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-11.0.2.tgz#1a4084f520c2eafbeb24026760b3ee8f3759cfd3"
-  integrity sha512-/Wde9Il1aJ1FtWllg3N2taIeJh4aftx6UGUG8R1TmLnZit2RnDcEjcKwEEbKwgLXTTh8QQpiZWQJq45jTy1jCA==
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-11.0.3.tgz#59c396a1482454fa78466f8565336f40ce7f7c84"
+  integrity sha512-+MoMOoKZfkZ9i1+qEFl2ZU29AB/c9K2bFxyACqGynguJunmqO+k2PJ2AcuiH51xVNl9R7q/x5QdBaIWb6RtoSw==
   dependencies:
     attr-accept "^2.0.0"
     file-selector "^0.1.12"

From ea9098d58762d2d877328c71def05af608aa88ad Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Wed, 19 Aug 2020 12:11:33 +0200
Subject: [PATCH 09/17] Full typegen support, tooling, linter fixes

---
 types/.eslintignore                           |    2 +
 types/.prettierignore                         |    3 +-
 .../augment-types.ts                          | 3674 +++++++++--------
 types/augment/all/definitions.ts              |    5 +
 types/augment/all/defs.json                   |  867 ++++
 types/augment/all/index.ts                    |    4 +
 types/augment/all/types.ts                    | 1242 ++++++
 types/augment/augment-api-consts.ts           |  247 ++
 types/augment/augment-api-query.ts            | 1149 ++++++
 types/augment/augment-api-tx.ts               | 1389 +++++++
 types/augment/augment-api.ts                  |    7 +
 types/augment/augment-types.ts                | 2387 +++++++++++
 types/augment/definitions.ts                  |    1 +
 types/augment/index.ts                        |    4 +
 types/augment/types.ts                        |    4 +
 types/package.json                            |   12 +-
 types/src/JoyEnum.ts                          |    4 +
 types/src/JoyStruct.ts                        |    4 +
 types/src/common.ts                           |    2 +-
 types/src/content-working-group/index.ts      |    4 +-
 types/src/definitions/definitions.ts          |    2 -
 types/src/forum.ts                            |    4 +-
 types/src/hiring/index.ts                     |    5 +-
 types/src/mint/index.ts                       |    1 -
 types/src/proposals.ts                        |    6 +-
 types/src/scripts/defsFromTypes.ts            |   41 -
 ...teAugmentTypes.ts => generateCodecDefs.ts} |   52 +-
 types/src/scripts/generateRegistryJson.ts     |   87 +
 types/src/stake/index.ts                      |    2 +-
 types/src/versioned-store/EntityCodec.ts      |    6 +-
 .../batching/parametrized-property-value.ts   |    5 +-
 .../src/versioned-store/permissions/index.ts  |    3 +
 types/src/working-group/index.ts              |    2 -
 types/tsconfig-augment-codec.json             |   12 +
 types/tsconfig-augment.json                   |   13 +
 types/tsconfig-base.json                      |    5 +-
 types/tsconfig-scripts.json                   |    6 -
 37 files changed, 9344 insertions(+), 1919 deletions(-)
 rename types/{src/definitions => augment-codec}/augment-types.ts (98%)
 create mode 100644 types/augment/all/definitions.ts
 create mode 100644 types/augment/all/defs.json
 create mode 100644 types/augment/all/index.ts
 create mode 100644 types/augment/all/types.ts
 create mode 100644 types/augment/augment-api-consts.ts
 create mode 100644 types/augment/augment-api-query.ts
 create mode 100644 types/augment/augment-api-tx.ts
 create mode 100644 types/augment/augment-api.ts
 create mode 100644 types/augment/augment-types.ts
 create mode 100644 types/augment/definitions.ts
 create mode 100644 types/augment/index.ts
 create mode 100644 types/augment/types.ts
 delete mode 100644 types/src/definitions/definitions.ts
 delete mode 100644 types/src/scripts/defsFromTypes.ts
 rename types/src/scripts/{updateAugmentTypes.ts => generateCodecDefs.ts} (63%)
 create mode 100644 types/src/scripts/generateRegistryJson.ts
 create mode 100644 types/tsconfig-augment-codec.json
 create mode 100644 types/tsconfig-augment.json
 delete mode 100644 types/tsconfig-scripts.json

diff --git a/types/.eslintignore b/types/.eslintignore
index 5b29e1583e..784e6edbf6 100644
--- a/types/.eslintignore
+++ b/types/.eslintignore
@@ -1 +1,3 @@
 **/*.d.ts
+augment/
+augment-types/
diff --git a/types/.prettierignore b/types/.prettierignore
index af795fe3ab..cf97865545 100644
--- a/types/.prettierignore
+++ b/types/.prettierignore
@@ -4,4 +4,5 @@
 hiring/schemas/role.schema.json
 lib/
 build/
-src/definitions
+augment/
+augment-codec/
diff --git a/types/src/definitions/augment-types.ts b/types/augment-codec/augment-types.ts
similarity index 98%
rename from types/src/definitions/augment-types.ts
rename to types/augment-codec/augment-types.ts
index a5f75ca2a5..26253c5c36 100644
--- a/types/src/definitions/augment-types.ts
+++ b/types/augment-codec/augment-types.ts
@@ -1,6 +1,24 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
+/** CUSTOMIMPORTS **/
+import { Credential as Credential, CredentialSet as CredentialSet, BlockAndTime as BlockAndTime, ThreadId as ThreadId, PostId as PostId, InputValidationLengthConstraint as InputValidationLengthConstraint, WorkingGroup as WorkingGroup, SlashingTerms as SlashingTerms, SlashableTerms as SlashableTerms } from '../common'
+import { EntryMethod as EntryMethod, MemberId as MemberId, PaidTermId as PaidTermId, SubscriptionId as SubscriptionId, Membership as Membership, PaidMembershipTerms as PaidMembershipTerms, ActorId as ActorId } from '../members'
+import { ElectionStage as ElectionStage, ElectionStake as ElectionStake, SealedVote as SealedVote, TransferableStake as TransferableStake, ElectionParameters as ElectionParameters, Seat as Seat, Seats as Seats, Backer as Backer, Backers as Backers } from '../council'
+import { RoleParameters as RoleParameters } from '../roles'
+import { PostTextChange as PostTextChange, ModerationAction as ModerationAction, ChildPositionInParentCategory as ChildPositionInParentCategory, CategoryId as CategoryId, Category as Category, Thread as Thread, Post as Post, ReplyId as ReplyId, Reply as Reply } from '../forum'
+import { Stake as Stake, StakingStatus as StakingStatus, Staked as Staked, StakedStatus as StakedStatus, Unstaking as Unstaking, Slash as Slash } from '../stake'
+import { Mint as Mint, NextAdjustment as NextAdjustment, AdjustOnInterval as AdjustOnInterval, AdjustCapacityBy as AdjustCapacityBy } from '../mint'
+import { Recipient as Recipient, RewardRelationship as RewardRelationship } from '../recurring-rewards'
+import { Application as Application, ApplicationStage as ApplicationStage, ActivateOpeningAt as ActivateOpeningAt, ApplicationRationingPolicy as ApplicationRationingPolicy, OpeningStage as OpeningStage, StakingPolicy as StakingPolicy, Opening as Opening, WaitingToBeingOpeningStageVariant as WaitingToBeingOpeningStageVariant, ActiveOpeningStageVariant as ActiveOpeningStageVariant, ActiveOpeningStage as ActiveOpeningStage, AcceptingApplications as AcceptingApplications, ReviewPeriod as ReviewPeriod, Deactivated as Deactivated, OpeningDeactivationCause as OpeningDeactivationCause, InactiveApplicationStage as InactiveApplicationStage, UnstakingApplicationStage as UnstakingApplicationStage, ApplicationDeactivationCause as ApplicationDeactivationCause, StakingAmountLimitMode as StakingAmountLimitMode } from '../hiring'
+import { Class as Class, Entity as Entity, ClassSchema as ClassSchema, Property as Property, PropertyType as PropertyType, PropertyValue as PropertyValue, ClassPropertyValue as ClassPropertyValue } from '../versioned-store'
+import { EntityPermissions as EntityPermissions, ReferenceConstraint as ReferenceConstraint, ClassPermissionsType as ClassPermissionsType, Operation as Operation, OperationType as OperationType, CreateEntity as CreateEntity, UpdatePropertyValues as UpdatePropertyValues, AddSchemaSupportToEntity as AddSchemaSupportToEntity, ParametrizedEntity as ParametrizedEntity, ParametrizedClassPropertyValue as ParametrizedClassPropertyValue, ParametrizedPropertyValue as ParametrizedPropertyValue, PropertyOfClass as PropertyOfClass } from '../versioned-store/permissions'
+import { OptionalText as OptionalText, Channel as Channel, ChannelContentType as ChannelContentType, ChannelCurationStatus as ChannelCurationStatus, ChannelPublicationStatus as ChannelPublicationStatus, CurationActor as CurationActor, Curator as Curator, CuratorApplication as CuratorApplication, CuratorOpening as CuratorOpening, Lead as Lead, OpeningPolicyCommitment as OpeningPolicyCommitment, Principal as Principal, WorkingGroupUnstaker as WorkingGroupUnstaker, CuratorApplicationIdToCuratorIdMap as CuratorApplicationIdToCuratorIdMap, CuratorApplicationIdSet as CuratorApplicationIdSet, CuratorRoleStakeProfile as CuratorRoleStakeProfile, CuratorRoleStage as CuratorRoleStage, CuratorExitSummary as CuratorExitSummary, CuratorExitInitiationOrigin as CuratorExitInitiationOrigin, LeadRoleState as LeadRoleState, ExitedLeadRole as ExitedLeadRole, CuratorInduction as CuratorInduction } from '../content-working-group'
+import { RationaleText as RationaleText, Application as ApplicationOf, ApplicationIdSet as ApplicationIdSet, ApplicationIdToWorkerIdMap as ApplicationIdToWorkerIdMap, WorkerId as WorkerId, Worker as WorkerOf, Opening as OpeningOf, StorageProviderId as StorageProviderId, OpeningType as OpeningType, ApplicationId as HiringApplicationId, RewardPolicy as RewardPolicy, WorkingGroupOpeningPolicyCommitment as WorkingGroupOpeningPolicyCommitment, RoleStakeProfile as RoleStakeProfile } from '../working-group'
+import { Url as Url, IPNSIdentity as IPNSIdentity, ServiceProviderRecord as ServiceProviderRecord } from '../discovery'
+import { ContentId as ContentId, LiaisonJudgement as LiaisonJudgement, DataObject as DataObject, DataObjectStorageRelationshipId as DataObjectStorageRelationshipId, DataObjectStorageRelationship as DataObjectStorageRelationship, DataObjectTypeId as DataObjectTypeId, DataObjectType as DataObjectType, DataObjectsMap as DataObjectsMap } from '../media'
+import { ProposalId as ProposalId, ProposalStatus as ProposalStatus, Proposal as ProposalOf, ProposalDetails as ProposalDetails, ProposalDetails as ProposalDetailsOf, VotingResults as VotingResults, ProposalParameters as ProposalParameters, VoteKind as VoteKind, ThreadCounter as ThreadCounter, DiscussionThread as DiscussionThread, DiscussionPost as DiscussionPost, AddOpeningParameters as AddOpeningParameters, FillOpeningParameters as FillOpeningParameters, TerminateRoleParameters as TerminateRoleParameters, ActiveStake as ActiveStake, Finalized as Finalized, ProposalDecisionStatus as ProposalDecisionStatus, ExecutionFailed as ExecutionFailed, Approved as Approved, SetLeadParams as SetLeadParams } from '../proposals'
+/** /CUSTOMIMPORTS **/
 import { Compact, Option, Raw, Vec } from '@polkadot/types/codec';
 import { BitVec, Bytes, Data, DoNotConstruct, Null, StorageKey, Text, Type, U256, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types/primitive';
 import { BlockAttestations, IncludedBlocks, MoreAttestations } from '@polkadot/types/interfaces/attestations';
@@ -45,1831 +63,9 @@ import { OpenTip, OpenTipFinderTo225, OpenTipTip, OpenTipTo225, TreasuryProposal
 import { Multiplier } from '@polkadot/types/interfaces/txpayment';
 import { CallHash, Multisig, Timepoint } from '@polkadot/types/interfaces/utility';
 import { VestingInfo } from '@polkadot/types/interfaces/vesting';
-/** CUSTOMIMPORTS **/
-import { Credential as Credential, CredentialSet as CredentialSet, BlockAndTime as BlockAndTime, ThreadId as ThreadId, PostId as PostId, InputValidationLengthConstraint as InputValidationLengthConstraint, WorkingGroup as WorkingGroup, SlashingTerms as SlashingTerms, SlashableTerms as SlashableTerms } from '../common'
-import { EntryMethod as EntryMethod, MemberId as MemberId, PaidTermId as PaidTermId, SubscriptionId as SubscriptionId, Membership as Membership, PaidMembershipTerms as PaidMembershipTerms, ActorId as ActorId } from '../members'
-import { ElectionStage as ElectionStage, ElectionStake as ElectionStake, SealedVote as SealedVote, TransferableStake as TransferableStake, ElectionParameters as ElectionParameters, Seat as Seat, Seats as Seats, Backer as Backer, Backers as Backers } from '../council'
-import { RoleParameters as RoleParameters } from '../roles'
-import { PostTextChange as PostTextChange, ModerationAction as ModerationAction, ChildPositionInParentCategory as ChildPositionInParentCategory, CategoryId as CategoryId, Category as Category, Thread as Thread, Post as Post, ReplyId as ReplyId, Reply as Reply } from '../forum'
-import { Stake as Stake, StakingStatus as StakingStatus, Staked as Staked, StakedStatus as StakedStatus, Unstaking as Unstaking, Slash as Slash } from '../stake'
-import { Mint as Mint, NextAdjustment as NextAdjustment, AdjustOnInterval as AdjustOnInterval, AdjustCapacityBy as AdjustCapacityBy } from '../mint'
-import { Recipient as Recipient, RewardRelationship as RewardRelationship } from '../recurring-rewards'
-import { Application as Application, ApplicationStage as ApplicationStage, ActivateOpeningAt as ActivateOpeningAt, ApplicationRationingPolicy as ApplicationRationingPolicy, OpeningStage as OpeningStage, StakingPolicy as StakingPolicy, Opening as Opening, WaitingToBeingOpeningStageVariant as WaitingToBeingOpeningStageVariant, ActiveOpeningStageVariant as ActiveOpeningStageVariant, ActiveOpeningStage as ActiveOpeningStage, AcceptingApplications as AcceptingApplications, ReviewPeriod as ReviewPeriod, Deactivated as Deactivated, OpeningDeactivationCause as OpeningDeactivationCause, InactiveApplicationStage as InactiveApplicationStage, UnstakingApplicationStage as UnstakingApplicationStage, ApplicationDeactivationCause as ApplicationDeactivationCause } from '../hiring'
-import { Class as Class, Entity as Entity, ClassSchema as ClassSchema, Property as Property, PropertyType as PropertyType, PropertyValue as PropertyValue, ClassPropertyValue as ClassPropertyValue } from '../versioned-store'
-import { EntityPermissions as EntityPermissions, ReferenceConstraint as ReferenceConstraint, ClassPermissionsType as ClassPermissionsType, Operation as Operation, OperationType as OperationType, CreateEntity as CreateEntity, UpdatePropertyValues as UpdatePropertyValues, AddSchemaSupportToEntity as AddSchemaSupportToEntity, ParametrizedEntity as ParametrizedEntity, ParametrizedClassPropertyValue as ParametrizedClassPropertyValue, ParametrizedPropertyValue as ParametrizedPropertyValue } from '../versioned-store/permissions'
-import { OptionalText as OptionalText, Channel as Channel, ChannelContentType as ChannelContentType, ChannelCurationStatus as ChannelCurationStatus, ChannelPublicationStatus as ChannelPublicationStatus, CurationActor as CurationActor, Curator as Curator, CuratorApplication as CuratorApplication, CuratorOpening as CuratorOpening, Lead as Lead, OpeningPolicyCommitment as OpeningPolicyCommitment, Principal as Principal, WorkingGroupUnstaker as WorkingGroupUnstaker, CuratorApplicationIdToCuratorIdMap as CuratorApplicationIdToCuratorIdMap, CuratorApplicationIdSet as CuratorApplicationIdSet, CuratorRoleStakeProfile as CuratorRoleStakeProfile, CuratorRoleStage as CuratorRoleStage, CuratorExitSummary as CuratorExitSummary, CuratorExitInitiationOrigin as CuratorExitInitiationOrigin, ExitedLeadRole as ExitedLeadRole, CuratorInduction as CuratorInduction } from '../content-working-group'
-import { RationaleText as RationaleText, Application as ApplicationOf, ApplicationIdSet as ApplicationIdSet, ApplicationIdToWorkerIdMap as ApplicationIdToWorkerIdMap, WorkerId as WorkerId, Worker as WorkerOf, Opening as OpeningOf, StorageProviderId as StorageProviderId, OpeningType as OpeningType, ApplicationId as HiringApplicationId, RewardPolicy as RewardPolicy, OpeningId as working_group__OpeningId, WorkerId as working_group__WorkerId, WorkingGroupOpeningPolicyCommitment as WorkingGroupOpeningPolicyCommitment, RoleStakeProfile as RoleStakeProfile } from '../working-group'
-import { Url as Url, IPNSIdentity as IPNSIdentity, ServiceProviderRecord as ServiceProviderRecord } from '../discovery'
-import { ContentId as ContentId, LiaisonJudgement as LiaisonJudgement, DataObject as DataObject, DataObjectStorageRelationshipId as DataObjectStorageRelationshipId, DataObjectStorageRelationship as DataObjectStorageRelationship, DataObjectTypeId as DataObjectTypeId, DataObjectType as DataObjectType, DataObjectsMap as DataObjectsMap } from '../media'
-import { ProposalId as ProposalId, ProposalStatus as ProposalStatus, Proposal as ProposalOf, ProposalDetails as ProposalDetails, ProposalDetails as ProposalDetailsOf, VotingResults as VotingResults, ProposalParameters as ProposalParameters, VoteKind as VoteKind, ThreadCounter as ThreadCounter, DiscussionThread as DiscussionThread, DiscussionPost as DiscussionPost, AddOpeningParameters as AddOpeningParameters, FillOpeningParameters as FillOpeningParameters, TerminateRoleParameters as TerminateRoleParameters, ActiveStake as ActiveStake, FinalizationData as FinalizationData, ProposalDecisionStatus as ProposalDecisionStatus, ExecutionFailed as ExecutionFailed } from '../proposals'
-/** /CUSTOMIMPORTS **/
 
 declare module '@polkadot/types/types/registry' {
   export interface InterfaceTypes {
-    BitVec: BitVec;
-    'Option<BitVec>': Option<BitVec>;
-    'Vec<BitVec>': Vec<BitVec>;
-    bool: bool;
-    'Option<bool>': Option<bool>;
-    'Vec<bool>': Vec<bool>;
-    Bytes: Bytes;
-    'Option<Bytes>': Option<Bytes>;
-    'Vec<Bytes>': Vec<Bytes>;
-    Data: Data;
-    'Option<Data>': Option<Data>;
-    'Vec<Data>': Vec<Data>;
-    DoNotConstruct: DoNotConstruct;
-    'Option<DoNotConstruct>': Option<DoNotConstruct>;
-    'Vec<DoNotConstruct>': Vec<DoNotConstruct>;
-    i8: i8;
-    'Option<i8>': Option<i8>;
-    'Vec<i8>': Vec<i8>;
-    i16: i16;
-    'Option<i16>': Option<i16>;
-    'Vec<i16>': Vec<i16>;
-    i32: i32;
-    'Option<i32>': Option<i32>;
-    'Vec<i32>': Vec<i32>;
-    i64: i64;
-    'Option<i64>': Option<i64>;
-    'Vec<i64>': Vec<i64>;
-    i128: i128;
-    'Option<i128>': Option<i128>;
-    'Vec<i128>': Vec<i128>;
-    i256: i256;
-    'Option<i256>': Option<i256>;
-    'Vec<i256>': Vec<i256>;
-    Null: Null;
-    'Option<Null>': Option<Null>;
-    'Vec<Null>': Vec<Null>;
-    StorageKey: StorageKey;
-    'Option<StorageKey>': Option<StorageKey>;
-    'Vec<StorageKey>': Vec<StorageKey>;
-    Text: Text;
-    'Option<Text>': Option<Text>;
-    'Vec<Text>': Vec<Text>;
-    Type: Type;
-    'Option<Type>': Option<Type>;
-    'Vec<Type>': Vec<Type>;
-    u8: u8;
-    'Compact<u8>': Compact<u8>;
-    'Option<u8>': Option<u8>;
-    'Vec<u8>': Vec<u8>;
-    u16: u16;
-    'Compact<u16>': Compact<u16>;
-    'Option<u16>': Option<u16>;
-    'Vec<u16>': Vec<u16>;
-    u32: u32;
-    'Compact<u32>': Compact<u32>;
-    'Option<u32>': Option<u32>;
-    'Vec<u32>': Vec<u32>;
-    u64: u64;
-    'Compact<u64>': Compact<u64>;
-    'Option<u64>': Option<u64>;
-    'Vec<u64>': Vec<u64>;
-    u128: u128;
-    'Compact<u128>': Compact<u128>;
-    'Option<u128>': Option<u128>;
-    'Vec<u128>': Vec<u128>;
-    u256: u256;
-    'Compact<u256>': Compact<u256>;
-    'Option<u256>': Option<u256>;
-    'Vec<u256>': Vec<u256>;
-    U256: U256;
-    'Compact<U256>': Compact<U256>;
-    'Option<U256>': Option<U256>;
-    'Vec<U256>': Vec<U256>;
-    usize: usize;
-    'Compact<usize>': Compact<usize>;
-    'Option<usize>': Option<usize>;
-    'Vec<usize>': Vec<usize>;
-    Raw: Raw;
-    'Option<Raw>': Option<Raw>;
-    'Vec<Raw>': Vec<Raw>;
-    AccountId: AccountId;
-    'Option<AccountId>': Option<AccountId>;
-    'Vec<AccountId>': Vec<AccountId>;
-    AccountIdOf: AccountIdOf;
-    'Option<AccountIdOf>': Option<AccountIdOf>;
-    'Vec<AccountIdOf>': Vec<AccountIdOf>;
-    AccountIndex: AccountIndex;
-    'Option<AccountIndex>': Option<AccountIndex>;
-    'Vec<AccountIndex>': Vec<AccountIndex>;
-    Address: Address;
-    'Option<Address>': Option<Address>;
-    'Vec<Address>': Vec<Address>;
-    AssetId: AssetId;
-    'Compact<AssetId>': Compact<AssetId>;
-    'Option<AssetId>': Option<AssetId>;
-    'Vec<AssetId>': Vec<AssetId>;
-    Balance: Balance;
-    'Compact<Balance>': Compact<Balance>;
-    'Option<Balance>': Option<Balance>;
-    'Vec<Balance>': Vec<Balance>;
-    BalanceOf: BalanceOf;
-    'Option<BalanceOf>': Option<BalanceOf>;
-    'Vec<BalanceOf>': Vec<BalanceOf>;
-    Block: Block;
-    'Option<Block>': Option<Block>;
-    'Vec<Block>': Vec<Block>;
-    BlockNumber: BlockNumber;
-    'Compact<BlockNumber>': Compact<BlockNumber>;
-    'Option<BlockNumber>': Option<BlockNumber>;
-    'Vec<BlockNumber>': Vec<BlockNumber>;
-    Call: Call;
-    'Option<Call>': Option<Call>;
-    'Vec<Call>': Vec<Call>;
-    ChangesTrieConfiguration: ChangesTrieConfiguration;
-    'Option<ChangesTrieConfiguration>': Option<ChangesTrieConfiguration>;
-    'Vec<ChangesTrieConfiguration>': Vec<ChangesTrieConfiguration>;
-    ConsensusEngineId: ConsensusEngineId;
-    'Option<ConsensusEngineId>': Option<ConsensusEngineId>;
-    'Vec<ConsensusEngineId>': Vec<ConsensusEngineId>;
-    Digest: Digest;
-    'Option<Digest>': Option<Digest>;
-    'Vec<Digest>': Vec<Digest>;
-    DigestItem: DigestItem;
-    'Option<DigestItem>': Option<DigestItem>;
-    'Vec<DigestItem>': Vec<DigestItem>;
-    ExtrinsicsWeight: ExtrinsicsWeight;
-    'Option<ExtrinsicsWeight>': Option<ExtrinsicsWeight>;
-    'Vec<ExtrinsicsWeight>': Vec<ExtrinsicsWeight>;
-    Fixed64: Fixed64;
-    'Option<Fixed64>': Option<Fixed64>;
-    'Vec<Fixed64>': Vec<Fixed64>;
-    Fixed128: Fixed128;
-    'Option<Fixed128>': Option<Fixed128>;
-    'Vec<Fixed128>': Vec<Fixed128>;
-    H160: H160;
-    'Option<H160>': Option<H160>;
-    'Vec<H160>': Vec<H160>;
-    H256: H256;
-    'Option<H256>': Option<H256>;
-    'Vec<H256>': Vec<H256>;
-    H512: H512;
-    'Option<H512>': Option<H512>;
-    'Vec<H512>': Vec<H512>;
-    Hash: Hash;
-    'Option<Hash>': Option<Hash>;
-    'Vec<Hash>': Vec<Hash>;
-    Header: Header;
-    'Option<Header>': Option<Header>;
-    'Vec<Header>': Vec<Header>;
-    Index: Index;
-    'Compact<Index>': Compact<Index>;
-    'Option<Index>': Option<Index>;
-    'Vec<Index>': Vec<Index>;
-    Justification: Justification;
-    'Option<Justification>': Option<Justification>;
-    'Vec<Justification>': Vec<Justification>;
-    KeyValue: KeyValue;
-    'Option<KeyValue>': Option<KeyValue>;
-    'Vec<KeyValue>': Vec<KeyValue>;
-    KeyTypeId: KeyTypeId;
-    'Compact<KeyTypeId>': Compact<KeyTypeId>;
-    'Option<KeyTypeId>': Option<KeyTypeId>;
-    'Vec<KeyTypeId>': Vec<KeyTypeId>;
-    LockIdentifier: LockIdentifier;
-    'Option<LockIdentifier>': Option<LockIdentifier>;
-    'Vec<LockIdentifier>': Vec<LockIdentifier>;
-    LookupSource: LookupSource;
-    'Option<LookupSource>': Option<LookupSource>;
-    'Vec<LookupSource>': Vec<LookupSource>;
-    LookupTarget: LookupTarget;
-    'Option<LookupTarget>': Option<LookupTarget>;
-    'Vec<LookupTarget>': Vec<LookupTarget>;
-    ModuleId: ModuleId;
-    'Option<ModuleId>': Option<ModuleId>;
-    'Vec<ModuleId>': Vec<ModuleId>;
-    Moment: Moment;
-    'Compact<Moment>': Compact<Moment>;
-    'Option<Moment>': Option<Moment>;
-    'Vec<Moment>': Vec<Moment>;
-    OpaqueCall: OpaqueCall;
-    'Option<OpaqueCall>': Option<OpaqueCall>;
-    'Vec<OpaqueCall>': Vec<OpaqueCall>;
-    Origin: Origin;
-    'Option<Origin>': Option<Origin>;
-    'Vec<Origin>': Vec<Origin>;
-    Pays: Pays;
-    'Option<Pays>': Option<Pays>;
-    'Vec<Pays>': Vec<Pays>;
-    Perbill: Perbill;
-    'Compact<Perbill>': Compact<Perbill>;
-    'Option<Perbill>': Option<Perbill>;
-    'Vec<Perbill>': Vec<Perbill>;
-    Percent: Percent;
-    'Compact<Percent>': Compact<Percent>;
-    'Option<Percent>': Option<Percent>;
-    'Vec<Percent>': Vec<Percent>;
-    Permill: Permill;
-    'Compact<Permill>': Compact<Permill>;
-    'Option<Permill>': Option<Permill>;
-    'Vec<Permill>': Vec<Permill>;
-    Perquintill: Perquintill;
-    'Compact<Perquintill>': Compact<Perquintill>;
-    'Option<Perquintill>': Option<Perquintill>;
-    'Vec<Perquintill>': Vec<Perquintill>;
-    Phantom: Phantom;
-    'Option<Phantom>': Option<Phantom>;
-    'Vec<Phantom>': Vec<Phantom>;
-    PhantomData: PhantomData;
-    'Option<PhantomData>': Option<PhantomData>;
-    'Vec<PhantomData>': Vec<PhantomData>;
-    ProxyType: ProxyType;
-    'Option<ProxyType>': Option<ProxyType>;
-    'Vec<ProxyType>': Vec<ProxyType>;
-    Releases: Releases;
-    'Option<Releases>': Option<Releases>;
-    'Vec<Releases>': Vec<Releases>;
-    RuntimeDbWeight: RuntimeDbWeight;
-    'Option<RuntimeDbWeight>': Option<RuntimeDbWeight>;
-    'Vec<RuntimeDbWeight>': Vec<RuntimeDbWeight>;
-    SignedBlock: SignedBlock;
-    'Option<SignedBlock>': Option<SignedBlock>;
-    'Vec<SignedBlock>': Vec<SignedBlock>;
-    StorageData: StorageData;
-    'Option<StorageData>': Option<StorageData>;
-    'Vec<StorageData>': Vec<StorageData>;
-    ValidatorId: ValidatorId;
-    'Option<ValidatorId>': Option<ValidatorId>;
-    'Vec<ValidatorId>': Vec<ValidatorId>;
-    Weight: Weight;
-    'Compact<Weight>': Compact<Weight>;
-    'Option<Weight>': Option<Weight>;
-    'Vec<Weight>': Vec<Weight>;
-    WeightMultiplier: WeightMultiplier;
-    'Option<WeightMultiplier>': Option<WeightMultiplier>;
-    'Vec<WeightMultiplier>': Vec<WeightMultiplier>;
-    PreRuntime: PreRuntime;
-    'Option<PreRuntime>': Option<PreRuntime>;
-    'Vec<PreRuntime>': Vec<PreRuntime>;
-    SealV0: SealV0;
-    'Option<SealV0>': Option<SealV0>;
-    'Vec<SealV0>': Vec<SealV0>;
-    Seal: Seal;
-    'Option<Seal>': Option<Seal>;
-    'Vec<Seal>': Vec<Seal>;
-    Consensus: Consensus;
-    'Option<Consensus>': Option<Consensus>;
-    'Vec<Consensus>': Vec<Consensus>;
-    UncleEntryItem: UncleEntryItem;
-    'Option<UncleEntryItem>': Option<UncleEntryItem>;
-    'Vec<UncleEntryItem>': Vec<UncleEntryItem>;
-    RawAuraPreDigest: RawAuraPreDigest;
-    'Option<RawAuraPreDigest>': Option<RawAuraPreDigest>;
-    'Vec<RawAuraPreDigest>': Vec<RawAuraPreDigest>;
-    AllowedSlots: AllowedSlots;
-    'Option<AllowedSlots>': Option<AllowedSlots>;
-    'Vec<AllowedSlots>': Vec<AllowedSlots>;
-    BabeAuthorityWeight: BabeAuthorityWeight;
-    'Compact<BabeAuthorityWeight>': Compact<BabeAuthorityWeight>;
-    'Option<BabeAuthorityWeight>': Option<BabeAuthorityWeight>;
-    'Vec<BabeAuthorityWeight>': Vec<BabeAuthorityWeight>;
-    BabeBlockWeight: BabeBlockWeight;
-    'Compact<BabeBlockWeight>': Compact<BabeBlockWeight>;
-    'Option<BabeBlockWeight>': Option<BabeBlockWeight>;
-    'Vec<BabeBlockWeight>': Vec<BabeBlockWeight>;
-    BabeEquivocationProof: BabeEquivocationProof;
-    'Option<BabeEquivocationProof>': Option<BabeEquivocationProof>;
-    'Vec<BabeEquivocationProof>': Vec<BabeEquivocationProof>;
-    BabeWeight: BabeWeight;
-    'Compact<BabeWeight>': Compact<BabeWeight>;
-    'Option<BabeWeight>': Option<BabeWeight>;
-    'Vec<BabeWeight>': Vec<BabeWeight>;
-    MaybeRandomness: MaybeRandomness;
-    'Option<MaybeRandomness>': Option<MaybeRandomness>;
-    'Vec<MaybeRandomness>': Vec<MaybeRandomness>;
-    MaybeVrf: MaybeVrf;
-    'Option<MaybeVrf>': Option<MaybeVrf>;
-    'Vec<MaybeVrf>': Vec<MaybeVrf>;
-    EpochAuthorship: EpochAuthorship;
-    'Option<EpochAuthorship>': Option<EpochAuthorship>;
-    'Vec<EpochAuthorship>': Vec<EpochAuthorship>;
-    NextConfigDescriptor: NextConfigDescriptor;
-    'Option<NextConfigDescriptor>': Option<NextConfigDescriptor>;
-    'Vec<NextConfigDescriptor>': Vec<NextConfigDescriptor>;
-    NextConfigDescriptorV1: NextConfigDescriptorV1;
-    'Option<NextConfigDescriptorV1>': Option<NextConfigDescriptorV1>;
-    'Vec<NextConfigDescriptorV1>': Vec<NextConfigDescriptorV1>;
-    Randomness: Randomness;
-    'Option<Randomness>': Option<Randomness>;
-    'Vec<Randomness>': Vec<Randomness>;
-    RawBabePreDigest: RawBabePreDigest;
-    'Option<RawBabePreDigest>': Option<RawBabePreDigest>;
-    'Vec<RawBabePreDigest>': Vec<RawBabePreDigest>;
-    RawBabePreDigestPrimary: RawBabePreDigestPrimary;
-    'Option<RawBabePreDigestPrimary>': Option<RawBabePreDigestPrimary>;
-    'Vec<RawBabePreDigestPrimary>': Vec<RawBabePreDigestPrimary>;
-    RawBabePreDigestSecondaryPlain: RawBabePreDigestSecondaryPlain;
-    'Option<RawBabePreDigestSecondaryPlain>': Option<RawBabePreDigestSecondaryPlain>;
-    'Vec<RawBabePreDigestSecondaryPlain>': Vec<RawBabePreDigestSecondaryPlain>;
-    RawBabePreDigestSecondaryVRF: RawBabePreDigestSecondaryVRF;
-    'Option<RawBabePreDigestSecondaryVRF>': Option<RawBabePreDigestSecondaryVRF>;
-    'Vec<RawBabePreDigestSecondaryVRF>': Vec<RawBabePreDigestSecondaryVRF>;
-    RawBabePreDigestTo159: RawBabePreDigestTo159;
-    'Option<RawBabePreDigestTo159>': Option<RawBabePreDigestTo159>;
-    'Vec<RawBabePreDigestTo159>': Vec<RawBabePreDigestTo159>;
-    RawBabePreDigestPrimaryTo159: RawBabePreDigestPrimaryTo159;
-    'Option<RawBabePreDigestPrimaryTo159>': Option<RawBabePreDigestPrimaryTo159>;
-    'Vec<RawBabePreDigestPrimaryTo159>': Vec<RawBabePreDigestPrimaryTo159>;
-    RawBabePreDigestSecondaryTo159: RawBabePreDigestSecondaryTo159;
-    'Option<RawBabePreDigestSecondaryTo159>': Option<RawBabePreDigestSecondaryTo159>;
-    'Vec<RawBabePreDigestSecondaryTo159>': Vec<RawBabePreDigestSecondaryTo159>;
-    RawBabePreDigestCompat: RawBabePreDigestCompat;
-    'Option<RawBabePreDigestCompat>': Option<RawBabePreDigestCompat>;
-    'Vec<RawBabePreDigestCompat>': Vec<RawBabePreDigestCompat>;
-    SlotNumber: SlotNumber;
-    'Compact<SlotNumber>': Compact<SlotNumber>;
-    'Option<SlotNumber>': Option<SlotNumber>;
-    'Vec<SlotNumber>': Vec<SlotNumber>;
-    VrfData: VrfData;
-    'Option<VrfData>': Option<VrfData>;
-    'Vec<VrfData>': Vec<VrfData>;
-    VrfOutput: VrfOutput;
-    'Option<VrfOutput>': Option<VrfOutput>;
-    'Vec<VrfOutput>': Vec<VrfOutput>;
-    VrfProof: VrfProof;
-    'Option<VrfProof>': Option<VrfProof>;
-    'Vec<VrfProof>': Vec<VrfProof>;
-    AccountData: AccountData;
-    'Option<AccountData>': Option<AccountData>;
-    'Vec<AccountData>': Vec<AccountData>;
-    BalanceLockTo212: BalanceLockTo212;
-    'Option<BalanceLockTo212>': Option<BalanceLockTo212>;
-    'Vec<BalanceLockTo212>': Vec<BalanceLockTo212>;
-    BalanceLock: BalanceLock;
-    'Option<BalanceLock>': Option<BalanceLock>;
-    'Vec<BalanceLock>': Vec<BalanceLock>;
-    BalanceStatus: BalanceStatus;
-    'Option<BalanceStatus>': Option<BalanceStatus>;
-    'Vec<BalanceStatus>': Vec<BalanceStatus>;
-    Reasons: Reasons;
-    'Option<Reasons>': Option<Reasons>;
-    'Vec<Reasons>': Vec<Reasons>;
-    VestingSchedule: VestingSchedule;
-    'Option<VestingSchedule>': Option<VestingSchedule>;
-    'Vec<VestingSchedule>': Vec<VestingSchedule>;
-    WithdrawReasons: WithdrawReasons;
-    'Option<WithdrawReasons>': Option<WithdrawReasons>;
-    'Vec<WithdrawReasons>': Vec<WithdrawReasons>;
-    MemberCount: MemberCount;
-    'Compact<MemberCount>': Compact<MemberCount>;
-    'Option<MemberCount>': Option<MemberCount>;
-    'Vec<MemberCount>': Vec<MemberCount>;
-    ProposalIndex: ProposalIndex;
-    'Compact<ProposalIndex>': Compact<ProposalIndex>;
-    'Option<ProposalIndex>': Option<ProposalIndex>;
-    'Vec<ProposalIndex>': Vec<ProposalIndex>;
-    VotesTo230: VotesTo230;
-    'Option<VotesTo230>': Option<VotesTo230>;
-    'Vec<VotesTo230>': Vec<VotesTo230>;
-    Votes: Votes;
-    'Option<Votes>': Option<Votes>;
-    'Vec<Votes>': Vec<Votes>;
-    AuthorityId: AuthorityId;
-    'Option<AuthorityId>': Option<AuthorityId>;
-    'Vec<AuthorityId>': Vec<AuthorityId>;
-    RawVRFOutput: RawVRFOutput;
-    'Option<RawVRFOutput>': Option<RawVRFOutput>;
-    'Vec<RawVRFOutput>': Vec<RawVRFOutput>;
-    AliveContractInfo: AliveContractInfo;
-    'Option<AliveContractInfo>': Option<AliveContractInfo>;
-    'Vec<AliveContractInfo>': Vec<AliveContractInfo>;
-    CodeHash: CodeHash;
-    'Option<CodeHash>': Option<CodeHash>;
-    'Vec<CodeHash>': Vec<CodeHash>;
-    ContractCallRequest: ContractCallRequest;
-    'Option<ContractCallRequest>': Option<ContractCallRequest>;
-    'Vec<ContractCallRequest>': Vec<ContractCallRequest>;
-    ContractExecResultSuccessTo255: ContractExecResultSuccessTo255;
-    'Option<ContractExecResultSuccessTo255>': Option<ContractExecResultSuccessTo255>;
-    'Vec<ContractExecResultSuccessTo255>': Vec<ContractExecResultSuccessTo255>;
-    ContractExecResultTo255: ContractExecResultTo255;
-    'Option<ContractExecResultTo255>': Option<ContractExecResultTo255>;
-    'Vec<ContractExecResultTo255>': Vec<ContractExecResultTo255>;
-    ContractExecResultSuccess: ContractExecResultSuccess;
-    'Option<ContractExecResultSuccess>': Option<ContractExecResultSuccess>;
-    'Vec<ContractExecResultSuccess>': Vec<ContractExecResultSuccess>;
-    ContractExecResult: ContractExecResult;
-    'Option<ContractExecResult>': Option<ContractExecResult>;
-    'Vec<ContractExecResult>': Vec<ContractExecResult>;
-    ContractInfo: ContractInfo;
-    'Option<ContractInfo>': Option<ContractInfo>;
-    'Vec<ContractInfo>': Vec<ContractInfo>;
-    ContractStorageKey: ContractStorageKey;
-    'Option<ContractStorageKey>': Option<ContractStorageKey>;
-    'Vec<ContractStorageKey>': Vec<ContractStorageKey>;
-    Gas: Gas;
-    'Compact<Gas>': Compact<Gas>;
-    'Option<Gas>': Option<Gas>;
-    'Vec<Gas>': Vec<Gas>;
-    PrefabWasmModule: PrefabWasmModule;
-    'Option<PrefabWasmModule>': Option<PrefabWasmModule>;
-    'Vec<PrefabWasmModule>': Vec<PrefabWasmModule>;
-    PrefabWasmModuleReserved: PrefabWasmModuleReserved;
-    'Option<PrefabWasmModuleReserved>': Option<PrefabWasmModuleReserved>;
-    'Vec<PrefabWasmModuleReserved>': Vec<PrefabWasmModuleReserved>;
-    ScheduleTo212: ScheduleTo212;
-    'Option<ScheduleTo212>': Option<ScheduleTo212>;
-    'Vec<ScheduleTo212>': Vec<ScheduleTo212>;
-    Schedule: Schedule;
-    'Option<Schedule>': Option<Schedule>;
-    'Vec<Schedule>': Vec<Schedule>;
-    SeedOf: SeedOf;
-    'Option<SeedOf>': Option<SeedOf>;
-    'Vec<SeedOf>': Vec<SeedOf>;
-    TombstoneContractInfo: TombstoneContractInfo;
-    'Option<TombstoneContractInfo>': Option<TombstoneContractInfo>;
-    'Vec<TombstoneContractInfo>': Vec<TombstoneContractInfo>;
-    TrieId: TrieId;
-    'Option<TrieId>': Option<TrieId>;
-    'Vec<TrieId>': Vec<TrieId>;
-    AccountVote: AccountVote;
-    'Option<AccountVote>': Option<AccountVote>;
-    'Vec<AccountVote>': Vec<AccountVote>;
-    AccountVoteSplit: AccountVoteSplit;
-    'Option<AccountVoteSplit>': Option<AccountVoteSplit>;
-    'Vec<AccountVoteSplit>': Vec<AccountVoteSplit>;
-    AccountVoteStandard: AccountVoteStandard;
-    'Option<AccountVoteStandard>': Option<AccountVoteStandard>;
-    'Vec<AccountVoteStandard>': Vec<AccountVoteStandard>;
-    Conviction: Conviction;
-    'Option<Conviction>': Option<Conviction>;
-    'Vec<Conviction>': Vec<Conviction>;
-    Delegations: Delegations;
-    'Option<Delegations>': Option<Delegations>;
-    'Vec<Delegations>': Vec<Delegations>;
-    PreimageStatus: PreimageStatus;
-    'Option<PreimageStatus>': Option<PreimageStatus>;
-    'Vec<PreimageStatus>': Vec<PreimageStatus>;
-    PreimageStatusAvailable: PreimageStatusAvailable;
-    'Option<PreimageStatusAvailable>': Option<PreimageStatusAvailable>;
-    'Vec<PreimageStatusAvailable>': Vec<PreimageStatusAvailable>;
-    PriorLock: PriorLock;
-    'Option<PriorLock>': Option<PriorLock>;
-    'Vec<PriorLock>': Vec<PriorLock>;
-    PropIndex: PropIndex;
-    'Compact<PropIndex>': Compact<PropIndex>;
-    'Option<PropIndex>': Option<PropIndex>;
-    'Vec<PropIndex>': Vec<PropIndex>;
-    Proposal: Proposal;
-    'Option<Proposal>': Option<Proposal>;
-    'Vec<Proposal>': Vec<Proposal>;
-    ProxyState: ProxyState;
-    'Option<ProxyState>': Option<ProxyState>;
-    'Vec<ProxyState>': Vec<ProxyState>;
-    ReferendumIndex: ReferendumIndex;
-    'Compact<ReferendumIndex>': Compact<ReferendumIndex>;
-    'Option<ReferendumIndex>': Option<ReferendumIndex>;
-    'Vec<ReferendumIndex>': Vec<ReferendumIndex>;
-    ReferendumInfoTo239: ReferendumInfoTo239;
-    'Option<ReferendumInfoTo239>': Option<ReferendumInfoTo239>;
-    'Vec<ReferendumInfoTo239>': Vec<ReferendumInfoTo239>;
-    ReferendumInfo: ReferendumInfo;
-    'Option<ReferendumInfo>': Option<ReferendumInfo>;
-    'Vec<ReferendumInfo>': Vec<ReferendumInfo>;
-    ReferendumInfoFinished: ReferendumInfoFinished;
-    'Option<ReferendumInfoFinished>': Option<ReferendumInfoFinished>;
-    'Vec<ReferendumInfoFinished>': Vec<ReferendumInfoFinished>;
-    ReferendumStatus: ReferendumStatus;
-    'Option<ReferendumStatus>': Option<ReferendumStatus>;
-    'Vec<ReferendumStatus>': Vec<ReferendumStatus>;
-    Tally: Tally;
-    'Option<Tally>': Option<Tally>;
-    'Vec<Tally>': Vec<Tally>;
-    Voting: Voting;
-    'Option<Voting>': Option<Voting>;
-    'Vec<Voting>': Vec<Voting>;
-    VotingDirect: VotingDirect;
-    'Option<VotingDirect>': Option<VotingDirect>;
-    'Vec<VotingDirect>': Vec<VotingDirect>;
-    VotingDirectVote: VotingDirectVote;
-    'Option<VotingDirectVote>': Option<VotingDirectVote>;
-    'Vec<VotingDirectVote>': Vec<VotingDirectVote>;
-    VotingDelegating: VotingDelegating;
-    'Option<VotingDelegating>': Option<VotingDelegating>;
-    'Vec<VotingDelegating>': Vec<VotingDelegating>;
-    ApprovalFlag: ApprovalFlag;
-    'Compact<ApprovalFlag>': Compact<ApprovalFlag>;
-    'Option<ApprovalFlag>': Option<ApprovalFlag>;
-    'Vec<ApprovalFlag>': Vec<ApprovalFlag>;
-    DefunctVoter: DefunctVoter;
-    'Option<DefunctVoter>': Option<DefunctVoter>;
-    'Vec<DefunctVoter>': Vec<DefunctVoter>;
-    Renouncing: Renouncing;
-    'Option<Renouncing>': Option<Renouncing>;
-    'Vec<Renouncing>': Vec<Renouncing>;
-    SetIndex: SetIndex;
-    'Compact<SetIndex>': Compact<SetIndex>;
-    'Option<SetIndex>': Option<SetIndex>;
-    'Vec<SetIndex>': Vec<SetIndex>;
-    Vote: Vote;
-    'Option<Vote>': Option<Vote>;
-    'Vec<Vote>': Vec<Vote>;
-    VoteIndex: VoteIndex;
-    'Compact<VoteIndex>': Compact<VoteIndex>;
-    'Option<VoteIndex>': Option<VoteIndex>;
-    'Vec<VoteIndex>': Vec<VoteIndex>;
-    VoterInfo: VoterInfo;
-    'Option<VoterInfo>': Option<VoterInfo>;
-    'Vec<VoterInfo>': Vec<VoterInfo>;
-    VoteThreshold: VoteThreshold;
-    'Option<VoteThreshold>': Option<VoteThreshold>;
-    'Vec<VoteThreshold>': Vec<VoteThreshold>;
-    CreatedBlock: CreatedBlock;
-    'Option<CreatedBlock>': Option<CreatedBlock>;
-    'Vec<CreatedBlock>': Vec<CreatedBlock>;
-    ImportedAux: ImportedAux;
-    'Option<ImportedAux>': Option<ImportedAux>;
-    'Vec<ImportedAux>': Vec<ImportedAux>;
-    Account: Account;
-    'Option<Account>': Option<Account>;
-    'Vec<Account>': Vec<Account>;
-    Log: Log;
-    'Option<Log>': Option<Log>;
-    'Vec<Log>': Vec<Log>;
-    Vicinity: Vicinity;
-    'Option<Vicinity>': Option<Vicinity>;
-    'Vec<Vicinity>': Vec<Vicinity>;
-    Extrinsic: Extrinsic;
-    'Option<Extrinsic>': Option<Extrinsic>;
-    'Vec<Extrinsic>': Vec<Extrinsic>;
-    ExtrinsicEra: ExtrinsicEra;
-    'Option<ExtrinsicEra>': Option<ExtrinsicEra>;
-    'Vec<ExtrinsicEra>': Vec<ExtrinsicEra>;
-    ExtrinsicPayload: ExtrinsicPayload;
-    'Option<ExtrinsicPayload>': Option<ExtrinsicPayload>;
-    'Vec<ExtrinsicPayload>': Vec<ExtrinsicPayload>;
-    ExtrinsicV1: ExtrinsicV1;
-    'Option<ExtrinsicV1>': Option<ExtrinsicV1>;
-    'Vec<ExtrinsicV1>': Vec<ExtrinsicV1>;
-    ExtrinsicPayloadV1: ExtrinsicPayloadV1;
-    'Option<ExtrinsicPayloadV1>': Option<ExtrinsicPayloadV1>;
-    'Vec<ExtrinsicPayloadV1>': Vec<ExtrinsicPayloadV1>;
-    ExtrinsicSignatureV1: ExtrinsicSignatureV1;
-    'Option<ExtrinsicSignatureV1>': Option<ExtrinsicSignatureV1>;
-    'Vec<ExtrinsicSignatureV1>': Vec<ExtrinsicSignatureV1>;
-    ExtrinsicV2: ExtrinsicV2;
-    'Option<ExtrinsicV2>': Option<ExtrinsicV2>;
-    'Vec<ExtrinsicV2>': Vec<ExtrinsicV2>;
-    ExtrinsicPayloadV2: ExtrinsicPayloadV2;
-    'Option<ExtrinsicPayloadV2>': Option<ExtrinsicPayloadV2>;
-    'Vec<ExtrinsicPayloadV2>': Vec<ExtrinsicPayloadV2>;
-    ExtrinsicSignatureV2: ExtrinsicSignatureV2;
-    'Option<ExtrinsicSignatureV2>': Option<ExtrinsicSignatureV2>;
-    'Vec<ExtrinsicSignatureV2>': Vec<ExtrinsicSignatureV2>;
-    ExtrinsicV3: ExtrinsicV3;
-    'Option<ExtrinsicV3>': Option<ExtrinsicV3>;
-    'Vec<ExtrinsicV3>': Vec<ExtrinsicV3>;
-    ExtrinsicPayloadV3: ExtrinsicPayloadV3;
-    'Option<ExtrinsicPayloadV3>': Option<ExtrinsicPayloadV3>;
-    'Vec<ExtrinsicPayloadV3>': Vec<ExtrinsicPayloadV3>;
-    ExtrinsicSignatureV3: ExtrinsicSignatureV3;
-    'Option<ExtrinsicSignatureV3>': Option<ExtrinsicSignatureV3>;
-    'Vec<ExtrinsicSignatureV3>': Vec<ExtrinsicSignatureV3>;
-    ExtrinsicV4: ExtrinsicV4;
-    'Option<ExtrinsicV4>': Option<ExtrinsicV4>;
-    'Vec<ExtrinsicV4>': Vec<ExtrinsicV4>;
-    ExtrinsicPayloadV4: ExtrinsicPayloadV4;
-    'Option<ExtrinsicPayloadV4>': Option<ExtrinsicPayloadV4>;
-    'Vec<ExtrinsicPayloadV4>': Vec<ExtrinsicPayloadV4>;
-    ExtrinsicSignatureV4: ExtrinsicSignatureV4;
-    'Option<ExtrinsicSignatureV4>': Option<ExtrinsicSignatureV4>;
-    'Vec<ExtrinsicSignatureV4>': Vec<ExtrinsicSignatureV4>;
-    ExtrinsicUnknown: ExtrinsicUnknown;
-    'Option<ExtrinsicUnknown>': Option<ExtrinsicUnknown>;
-    'Vec<ExtrinsicUnknown>': Vec<ExtrinsicUnknown>;
-    ExtrinsicPayloadUnknown: ExtrinsicPayloadUnknown;
-    'Option<ExtrinsicPayloadUnknown>': Option<ExtrinsicPayloadUnknown>;
-    'Vec<ExtrinsicPayloadUnknown>': Vec<ExtrinsicPayloadUnknown>;
-    ImmortalEra: ImmortalEra;
-    'Option<ImmortalEra>': Option<ImmortalEra>;
-    'Vec<ImmortalEra>': Vec<ImmortalEra>;
-    MortalEra: MortalEra;
-    'Option<MortalEra>': Option<MortalEra>;
-    'Vec<MortalEra>': Vec<MortalEra>;
-    MultiSignature: MultiSignature;
-    'Option<MultiSignature>': Option<MultiSignature>;
-    'Vec<MultiSignature>': Vec<MultiSignature>;
-    Signature: Signature;
-    'Option<Signature>': Option<Signature>;
-    'Vec<Signature>': Vec<Signature>;
-    SignerPayload: SignerPayload;
-    'Option<SignerPayload>': Option<SignerPayload>;
-    'Vec<SignerPayload>': Vec<SignerPayload>;
-    EcdsaSignature: EcdsaSignature;
-    'Option<EcdsaSignature>': Option<EcdsaSignature>;
-    'Vec<EcdsaSignature>': Vec<EcdsaSignature>;
-    Ed25519Signature: Ed25519Signature;
-    'Option<Ed25519Signature>': Option<Ed25519Signature>;
-    'Vec<Ed25519Signature>': Vec<Ed25519Signature>;
-    Sr25519Signature: Sr25519Signature;
-    'Option<Sr25519Signature>': Option<Sr25519Signature>;
-    'Vec<Sr25519Signature>': Vec<Sr25519Signature>;
-    AssetOptions: AssetOptions;
-    'Option<AssetOptions>': Option<AssetOptions>;
-    'Vec<AssetOptions>': Vec<AssetOptions>;
-    Owner: Owner;
-    'Option<Owner>': Option<Owner>;
-    'Vec<Owner>': Vec<Owner>;
-    PermissionsV1: PermissionsV1;
-    'Option<PermissionsV1>': Option<PermissionsV1>;
-    'Vec<PermissionsV1>': Vec<PermissionsV1>;
-    PermissionVersions: PermissionVersions;
-    'Option<PermissionVersions>': Option<PermissionVersions>;
-    'Vec<PermissionVersions>': Vec<PermissionVersions>;
-    PermissionLatest: PermissionLatest;
-    'Option<PermissionLatest>': Option<PermissionLatest>;
-    'Vec<PermissionLatest>': Vec<PermissionLatest>;
-    AuthorityIndex: AuthorityIndex;
-    'Compact<AuthorityIndex>': Compact<AuthorityIndex>;
-    'Option<AuthorityIndex>': Option<AuthorityIndex>;
-    'Vec<AuthorityIndex>': Vec<AuthorityIndex>;
-    AuthorityList: AuthorityList;
-    'Option<AuthorityList>': Option<AuthorityList>;
-    'Vec<AuthorityList>': Vec<AuthorityList>;
-    AuthorityWeight: AuthorityWeight;
-    'Compact<AuthorityWeight>': Compact<AuthorityWeight>;
-    'Option<AuthorityWeight>': Option<AuthorityWeight>;
-    'Vec<AuthorityWeight>': Vec<AuthorityWeight>;
-    GrandpaEquivocation: GrandpaEquivocation;
-    'Option<GrandpaEquivocation>': Option<GrandpaEquivocation>;
-    'Vec<GrandpaEquivocation>': Vec<GrandpaEquivocation>;
-    GrandpaEquivocationProof: GrandpaEquivocationProof;
-    'Option<GrandpaEquivocationProof>': Option<GrandpaEquivocationProof>;
-    'Vec<GrandpaEquivocationProof>': Vec<GrandpaEquivocationProof>;
-    GrandpaEquivocationValue: GrandpaEquivocationValue;
-    'Option<GrandpaEquivocationValue>': Option<GrandpaEquivocationValue>;
-    'Vec<GrandpaEquivocationValue>': Vec<GrandpaEquivocationValue>;
-    GrandpaPrevote: GrandpaPrevote;
-    'Option<GrandpaPrevote>': Option<GrandpaPrevote>;
-    'Vec<GrandpaPrevote>': Vec<GrandpaPrevote>;
-    KeyOwnerProof: KeyOwnerProof;
-    'Option<KeyOwnerProof>': Option<KeyOwnerProof>;
-    'Vec<KeyOwnerProof>': Vec<KeyOwnerProof>;
-    NextAuthority: NextAuthority;
-    'Option<NextAuthority>': Option<NextAuthority>;
-    'Vec<NextAuthority>': Vec<NextAuthority>;
-    PendingPause: PendingPause;
-    'Option<PendingPause>': Option<PendingPause>;
-    'Vec<PendingPause>': Vec<PendingPause>;
-    PendingResume: PendingResume;
-    'Option<PendingResume>': Option<PendingResume>;
-    'Vec<PendingResume>': Vec<PendingResume>;
-    Precommits: Precommits;
-    'Option<Precommits>': Option<Precommits>;
-    'Vec<Precommits>': Vec<Precommits>;
-    Prevotes: Prevotes;
-    'Option<Prevotes>': Option<Prevotes>;
-    'Vec<Prevotes>': Vec<Prevotes>;
-    ReportedRoundStates: ReportedRoundStates;
-    'Option<ReportedRoundStates>': Option<ReportedRoundStates>;
-    'Vec<ReportedRoundStates>': Vec<ReportedRoundStates>;
-    RoundState: RoundState;
-    'Option<RoundState>': Option<RoundState>;
-    'Vec<RoundState>': Vec<RoundState>;
-    SetId: SetId;
-    'Compact<SetId>': Compact<SetId>;
-    'Option<SetId>': Option<SetId>;
-    'Vec<SetId>': Vec<SetId>;
-    StoredPendingChange: StoredPendingChange;
-    'Option<StoredPendingChange>': Option<StoredPendingChange>;
-    'Vec<StoredPendingChange>': Vec<StoredPendingChange>;
-    StoredState: StoredState;
-    'Option<StoredState>': Option<StoredState>;
-    'Vec<StoredState>': Vec<StoredState>;
-    IdentityFields: IdentityFields;
-    'Option<IdentityFields>': Option<IdentityFields>;
-    'Vec<IdentityFields>': Vec<IdentityFields>;
-    IdentityInfoAdditional: IdentityInfoAdditional;
-    'Option<IdentityInfoAdditional>': Option<IdentityInfoAdditional>;
-    'Vec<IdentityInfoAdditional>': Vec<IdentityInfoAdditional>;
-    IdentityInfo: IdentityInfo;
-    'Option<IdentityInfo>': Option<IdentityInfo>;
-    'Vec<IdentityInfo>': Vec<IdentityInfo>;
-    IdentityJudgement: IdentityJudgement;
-    'Option<IdentityJudgement>': Option<IdentityJudgement>;
-    'Vec<IdentityJudgement>': Vec<IdentityJudgement>;
-    RegistrationJudgement: RegistrationJudgement;
-    'Option<RegistrationJudgement>': Option<RegistrationJudgement>;
-    'Vec<RegistrationJudgement>': Vec<RegistrationJudgement>;
-    Registration: Registration;
-    'Option<Registration>': Option<Registration>;
-    'Vec<Registration>': Vec<Registration>;
-    RegistrarIndex: RegistrarIndex;
-    'Compact<RegistrarIndex>': Compact<RegistrarIndex>;
-    'Option<RegistrarIndex>': Option<RegistrarIndex>;
-    'Vec<RegistrarIndex>': Vec<RegistrarIndex>;
-    RegistrarInfo: RegistrarInfo;
-    'Option<RegistrarInfo>': Option<RegistrarInfo>;
-    'Vec<RegistrarInfo>': Vec<RegistrarInfo>;
-    AuthIndex: AuthIndex;
-    'Compact<AuthIndex>': Compact<AuthIndex>;
-    'Option<AuthIndex>': Option<AuthIndex>;
-    'Vec<AuthIndex>': Vec<AuthIndex>;
-    AuthoritySignature: AuthoritySignature;
-    'Option<AuthoritySignature>': Option<AuthoritySignature>;
-    'Vec<AuthoritySignature>': Vec<AuthoritySignature>;
-    Heartbeat: Heartbeat;
-    'Option<Heartbeat>': Option<Heartbeat>;
-    'Vec<Heartbeat>': Vec<Heartbeat>;
-    HeartbeatTo244: HeartbeatTo244;
-    'Option<HeartbeatTo244>': Option<HeartbeatTo244>;
-    'Vec<HeartbeatTo244>': Vec<HeartbeatTo244>;
-    OpaqueMultiaddr: OpaqueMultiaddr;
-    'Option<OpaqueMultiaddr>': Option<OpaqueMultiaddr>;
-    'Vec<OpaqueMultiaddr>': Vec<OpaqueMultiaddr>;
-    OpaquePeerId: OpaquePeerId;
-    'Option<OpaquePeerId>': Option<OpaquePeerId>;
-    'Vec<OpaquePeerId>': Vec<OpaquePeerId>;
-    OpaqueNetworkState: OpaqueNetworkState;
-    'Option<OpaqueNetworkState>': Option<OpaqueNetworkState>;
-    'Vec<OpaqueNetworkState>': Vec<OpaqueNetworkState>;
-    DeferredOffenceOf: DeferredOffenceOf;
-    'Option<DeferredOffenceOf>': Option<DeferredOffenceOf>;
-    'Vec<DeferredOffenceOf>': Vec<DeferredOffenceOf>;
-    Kind: Kind;
-    'Option<Kind>': Option<Kind>;
-    'Vec<Kind>': Vec<Kind>;
-    OffenceDetails: OffenceDetails;
-    'Option<OffenceDetails>': Option<OffenceDetails>;
-    'Vec<OffenceDetails>': Vec<OffenceDetails>;
-    Offender: Offender;
-    'Option<Offender>': Option<Offender>;
-    'Vec<Offender>': Vec<Offender>;
-    OpaqueTimeSlot: OpaqueTimeSlot;
-    'Option<OpaqueTimeSlot>': Option<OpaqueTimeSlot>;
-    'Vec<OpaqueTimeSlot>': Vec<OpaqueTimeSlot>;
-    ReportIdOf: ReportIdOf;
-    'Option<ReportIdOf>': Option<ReportIdOf>;
-    'Vec<ReportIdOf>': Vec<ReportIdOf>;
-    Reporter: Reporter;
-    'Option<Reporter>': Option<Reporter>;
-    'Vec<Reporter>': Vec<Reporter>;
-    ActiveRecovery: ActiveRecovery;
-    'Option<ActiveRecovery>': Option<ActiveRecovery>;
-    'Vec<ActiveRecovery>': Vec<ActiveRecovery>;
-    RecoveryConfig: RecoveryConfig;
-    'Option<RecoveryConfig>': Option<RecoveryConfig>;
-    'Vec<RecoveryConfig>': Vec<RecoveryConfig>;
-    Period: Period;
-    'Option<Period>': Option<Period>;
-    'Vec<Period>': Vec<Period>;
-    Priority: Priority;
-    'Compact<Priority>': Compact<Priority>;
-    'Option<Priority>': Option<Priority>;
-    'Vec<Priority>': Vec<Priority>;
-    SchedulePeriod: SchedulePeriod;
-    'Option<SchedulePeriod>': Option<SchedulePeriod>;
-    'Vec<SchedulePeriod>': Vec<SchedulePeriod>;
-    SchedulePriority: SchedulePriority;
-    'Option<SchedulePriority>': Option<SchedulePriority>;
-    'Vec<SchedulePriority>': Vec<SchedulePriority>;
-    Scheduled: Scheduled;
-    'Option<Scheduled>': Option<Scheduled>;
-    'Vec<Scheduled>': Vec<Scheduled>;
-    TaskAddress: TaskAddress;
-    'Option<TaskAddress>': Option<TaskAddress>;
-    'Vec<TaskAddress>': Vec<TaskAddress>;
-    Keys: Keys;
-    'Option<Keys>': Option<Keys>;
-    'Vec<Keys>': Vec<Keys>;
-    SessionKeys1: SessionKeys1;
-    'Option<SessionKeys1>': Option<SessionKeys1>;
-    'Vec<SessionKeys1>': Vec<SessionKeys1>;
-    SessionKeys2: SessionKeys2;
-    'Option<SessionKeys2>': Option<SessionKeys2>;
-    'Vec<SessionKeys2>': Vec<SessionKeys2>;
-    SessionKeys3: SessionKeys3;
-    'Option<SessionKeys3>': Option<SessionKeys3>;
-    'Vec<SessionKeys3>': Vec<SessionKeys3>;
-    SessionKeys4: SessionKeys4;
-    'Option<SessionKeys4>': Option<SessionKeys4>;
-    'Vec<SessionKeys4>': Vec<SessionKeys4>;
-    SessionKeys5: SessionKeys5;
-    'Option<SessionKeys5>': Option<SessionKeys5>;
-    'Vec<SessionKeys5>': Vec<SessionKeys5>;
-    SessionKeys6: SessionKeys6;
-    'Option<SessionKeys6>': Option<SessionKeys6>;
-    'Vec<SessionKeys6>': Vec<SessionKeys6>;
-    FullIdentification: FullIdentification;
-    'Option<FullIdentification>': Option<FullIdentification>;
-    'Vec<FullIdentification>': Vec<FullIdentification>;
-    IdentificationTuple: IdentificationTuple;
-    'Option<IdentificationTuple>': Option<IdentificationTuple>;
-    'Vec<IdentificationTuple>': Vec<IdentificationTuple>;
-    MembershipProof: MembershipProof;
-    'Option<MembershipProof>': Option<MembershipProof>;
-    'Vec<MembershipProof>': Vec<MembershipProof>;
-    SessionIndex: SessionIndex;
-    'Compact<SessionIndex>': Compact<SessionIndex>;
-    'Option<SessionIndex>': Option<SessionIndex>;
-    'Vec<SessionIndex>': Vec<SessionIndex>;
-    ValidatorCount: ValidatorCount;
-    'Compact<ValidatorCount>': Compact<ValidatorCount>;
-    'Option<ValidatorCount>': Option<ValidatorCount>;
-    'Vec<ValidatorCount>': Vec<ValidatorCount>;
-    Bid: Bid;
-    'Option<Bid>': Option<Bid>;
-    'Vec<Bid>': Vec<Bid>;
-    BidKind: BidKind;
-    'Option<BidKind>': Option<BidKind>;
-    'Vec<BidKind>': Vec<BidKind>;
-    SocietyJudgement: SocietyJudgement;
-    'Option<SocietyJudgement>': Option<SocietyJudgement>;
-    'Vec<SocietyJudgement>': Vec<SocietyJudgement>;
-    SocietyVote: SocietyVote;
-    'Option<SocietyVote>': Option<SocietyVote>;
-    'Vec<SocietyVote>': Vec<SocietyVote>;
-    StrikeCount: StrikeCount;
-    'Compact<StrikeCount>': Compact<StrikeCount>;
-    'Option<StrikeCount>': Option<StrikeCount>;
-    'Vec<StrikeCount>': Vec<StrikeCount>;
-    VouchingStatus: VouchingStatus;
-    'Option<VouchingStatus>': Option<VouchingStatus>;
-    'Vec<VouchingStatus>': Vec<VouchingStatus>;
-    Points: Points;
-    'Compact<Points>': Compact<Points>;
-    'Option<Points>': Option<Points>;
-    'Vec<Points>': Vec<Points>;
-    EraPoints: EraPoints;
-    'Option<EraPoints>': Option<EraPoints>;
-    'Vec<EraPoints>': Vec<EraPoints>;
-    ActiveEraInfo: ActiveEraInfo;
-    'Option<ActiveEraInfo>': Option<ActiveEraInfo>;
-    'Vec<ActiveEraInfo>': Vec<ActiveEraInfo>;
-    CompactAssignments: CompactAssignments;
-    'Option<CompactAssignments>': Option<CompactAssignments>;
-    'Vec<CompactAssignments>': Vec<CompactAssignments>;
-    CompactScore: CompactScore;
-    'Option<CompactScore>': Option<CompactScore>;
-    'Vec<CompactScore>': Vec<CompactScore>;
-    ElectionCompute: ElectionCompute;
-    'Option<ElectionCompute>': Option<ElectionCompute>;
-    'Vec<ElectionCompute>': Vec<ElectionCompute>;
-    ElectionResult: ElectionResult;
-    'Option<ElectionResult>': Option<ElectionResult>;
-    'Vec<ElectionResult>': Vec<ElectionResult>;
-    ElectionScore: ElectionScore;
-    'Option<ElectionScore>': Option<ElectionScore>;
-    'Vec<ElectionScore>': Vec<ElectionScore>;
-    ElectionSize: ElectionSize;
-    'Option<ElectionSize>': Option<ElectionSize>;
-    'Vec<ElectionSize>': Vec<ElectionSize>;
-    ElectionStatus: ElectionStatus;
-    'Option<ElectionStatus>': Option<ElectionStatus>;
-    'Vec<ElectionStatus>': Vec<ElectionStatus>;
-    EraIndex: EraIndex;
-    'Compact<EraIndex>': Compact<EraIndex>;
-    'Option<EraIndex>': Option<EraIndex>;
-    'Vec<EraIndex>': Vec<EraIndex>;
-    EraRewardPoints: EraRewardPoints;
-    'Option<EraRewardPoints>': Option<EraRewardPoints>;
-    'Vec<EraRewardPoints>': Vec<EraRewardPoints>;
-    EraRewards: EraRewards;
-    'Option<EraRewards>': Option<EraRewards>;
-    'Vec<EraRewards>': Vec<EraRewards>;
-    Exposure: Exposure;
-    'Option<Exposure>': Option<Exposure>;
-    'Vec<Exposure>': Vec<Exposure>;
-    Forcing: Forcing;
-    'Option<Forcing>': Option<Forcing>;
-    'Vec<Forcing>': Vec<Forcing>;
-    IndividualExposure: IndividualExposure;
-    'Option<IndividualExposure>': Option<IndividualExposure>;
-    'Vec<IndividualExposure>': Vec<IndividualExposure>;
-    KeyType: KeyType;
-    'Option<KeyType>': Option<KeyType>;
-    'Vec<KeyType>': Vec<KeyType>;
-    MomentOf: MomentOf;
-    'Option<MomentOf>': Option<MomentOf>;
-    'Vec<MomentOf>': Vec<MomentOf>;
-    Nominations: Nominations;
-    'Option<Nominations>': Option<Nominations>;
-    'Vec<Nominations>': Vec<Nominations>;
-    NominatorIndex: NominatorIndex;
-    'Compact<NominatorIndex>': Compact<NominatorIndex>;
-    'Option<NominatorIndex>': Option<NominatorIndex>;
-    'Vec<NominatorIndex>': Vec<NominatorIndex>;
-    OffchainAccuracy: OffchainAccuracy;
-    'Option<OffchainAccuracy>': Option<OffchainAccuracy>;
-    'Vec<OffchainAccuracy>': Vec<OffchainAccuracy>;
-    PerU16: PerU16;
-    'Compact<PerU16>': Compact<PerU16>;
-    'Option<PerU16>': Option<PerU16>;
-    'Vec<PerU16>': Vec<PerU16>;
-    PhragmenScore: PhragmenScore;
-    'Option<PhragmenScore>': Option<PhragmenScore>;
-    'Vec<PhragmenScore>': Vec<PhragmenScore>;
-    RewardDestination: RewardDestination;
-    'Option<RewardDestination>': Option<RewardDestination>;
-    'Vec<RewardDestination>': Vec<RewardDestination>;
-    RewardPoint: RewardPoint;
-    'Compact<RewardPoint>': Compact<RewardPoint>;
-    'Option<RewardPoint>': Option<RewardPoint>;
-    'Vec<RewardPoint>': Vec<RewardPoint>;
-    SlashJournalEntry: SlashJournalEntry;
-    'Option<SlashJournalEntry>': Option<SlashJournalEntry>;
-    'Vec<SlashJournalEntry>': Vec<SlashJournalEntry>;
-    SlashingSpansTo204: SlashingSpansTo204;
-    'Option<SlashingSpansTo204>': Option<SlashingSpansTo204>;
-    'Vec<SlashingSpansTo204>': Vec<SlashingSpansTo204>;
-    SlashingSpans: SlashingSpans;
-    'Option<SlashingSpans>': Option<SlashingSpans>;
-    'Vec<SlashingSpans>': Vec<SlashingSpans>;
-    SpanIndex: SpanIndex;
-    'Compact<SpanIndex>': Compact<SpanIndex>;
-    'Option<SpanIndex>': Option<SpanIndex>;
-    'Vec<SpanIndex>': Vec<SpanIndex>;
-    SpanRecord: SpanRecord;
-    'Option<SpanRecord>': Option<SpanRecord>;
-    'Vec<SpanRecord>': Vec<SpanRecord>;
-    StakingLedgerTo223: StakingLedgerTo223;
-    'Option<StakingLedgerTo223>': Option<StakingLedgerTo223>;
-    'Vec<StakingLedgerTo223>': Vec<StakingLedgerTo223>;
-    StakingLedgerTo240: StakingLedgerTo240;
-    'Option<StakingLedgerTo240>': Option<StakingLedgerTo240>;
-    'Vec<StakingLedgerTo240>': Vec<StakingLedgerTo240>;
-    StakingLedger: StakingLedger;
-    'Option<StakingLedger>': Option<StakingLedger>;
-    'Vec<StakingLedger>': Vec<StakingLedger>;
-    UnappliedSlashOther: UnappliedSlashOther;
-    'Option<UnappliedSlashOther>': Option<UnappliedSlashOther>;
-    'Vec<UnappliedSlashOther>': Vec<UnappliedSlashOther>;
-    UnappliedSlash: UnappliedSlash;
-    'Option<UnappliedSlash>': Option<UnappliedSlash>;
-    'Vec<UnappliedSlash>': Vec<UnappliedSlash>;
-    UnlockChunk: UnlockChunk;
-    'Option<UnlockChunk>': Option<UnlockChunk>;
-    'Vec<UnlockChunk>': Vec<UnlockChunk>;
-    ValidatorIndex: ValidatorIndex;
-    'Compact<ValidatorIndex>': Compact<ValidatorIndex>;
-    'Option<ValidatorIndex>': Option<ValidatorIndex>;
-    'Vec<ValidatorIndex>': Vec<ValidatorIndex>;
-    ValidatorPrefs: ValidatorPrefs;
-    'Option<ValidatorPrefs>': Option<ValidatorPrefs>;
-    'Vec<ValidatorPrefs>': Vec<ValidatorPrefs>;
-    ValidatorPrefsTo196: ValidatorPrefsTo196;
-    'Option<ValidatorPrefsTo196>': Option<ValidatorPrefsTo196>;
-    'Vec<ValidatorPrefsTo196>': Vec<ValidatorPrefsTo196>;
-    ValidatorPrefsTo145: ValidatorPrefsTo145;
-    'Option<ValidatorPrefsTo145>': Option<ValidatorPrefsTo145>;
-    'Vec<ValidatorPrefsTo145>': Vec<ValidatorPrefsTo145>;
-    WeightToFeeCoefficient: WeightToFeeCoefficient;
-    'Option<WeightToFeeCoefficient>': Option<WeightToFeeCoefficient>;
-    'Vec<WeightToFeeCoefficient>': Vec<WeightToFeeCoefficient>;
-    AccountInfo: AccountInfo;
-    'Option<AccountInfo>': Option<AccountInfo>;
-    'Vec<AccountInfo>': Vec<AccountInfo>;
-    ApplyExtrinsicResult: ApplyExtrinsicResult;
-    'Option<ApplyExtrinsicResult>': Option<ApplyExtrinsicResult>;
-    'Vec<ApplyExtrinsicResult>': Vec<ApplyExtrinsicResult>;
-    ChainProperties: ChainProperties;
-    'Option<ChainProperties>': Option<ChainProperties>;
-    'Vec<ChainProperties>': Vec<ChainProperties>;
-    ChainType: ChainType;
-    'Option<ChainType>': Option<ChainType>;
-    'Vec<ChainType>': Vec<ChainType>;
-    DigestOf: DigestOf;
-    'Option<DigestOf>': Option<DigestOf>;
-    'Vec<DigestOf>': Vec<DigestOf>;
-    DispatchClass: DispatchClass;
-    'Option<DispatchClass>': Option<DispatchClass>;
-    'Vec<DispatchClass>': Vec<DispatchClass>;
-    DispatchError: DispatchError;
-    'Option<DispatchError>': Option<DispatchError>;
-    'Vec<DispatchError>': Vec<DispatchError>;
-    DispatchErrorModule: DispatchErrorModule;
-    'Option<DispatchErrorModule>': Option<DispatchErrorModule>;
-    'Vec<DispatchErrorModule>': Vec<DispatchErrorModule>;
-    DispatchErrorTo198: DispatchErrorTo198;
-    'Option<DispatchErrorTo198>': Option<DispatchErrorTo198>;
-    'Vec<DispatchErrorTo198>': Vec<DispatchErrorTo198>;
-    DispatchInfo: DispatchInfo;
-    'Option<DispatchInfo>': Option<DispatchInfo>;
-    'Vec<DispatchInfo>': Vec<DispatchInfo>;
-    DispatchInfoTo190: DispatchInfoTo190;
-    'Option<DispatchInfoTo190>': Option<DispatchInfoTo190>;
-    'Vec<DispatchInfoTo190>': Vec<DispatchInfoTo190>;
-    DispatchInfoTo244: DispatchInfoTo244;
-    'Option<DispatchInfoTo244>': Option<DispatchInfoTo244>;
-    'Vec<DispatchInfoTo244>': Vec<DispatchInfoTo244>;
-    DispatchOutcome: DispatchOutcome;
-    'Option<DispatchOutcome>': Option<DispatchOutcome>;
-    'Vec<DispatchOutcome>': Vec<DispatchOutcome>;
-    DispatchResult: DispatchResult;
-    'Option<DispatchResult>': Option<DispatchResult>;
-    'Vec<DispatchResult>': Vec<DispatchResult>;
-    DispatchResultOf: DispatchResultOf;
-    'Option<DispatchResultOf>': Option<DispatchResultOf>;
-    'Vec<DispatchResultOf>': Vec<DispatchResultOf>;
-    DispatchResultTo198: DispatchResultTo198;
-    'Option<DispatchResultTo198>': Option<DispatchResultTo198>;
-    'Vec<DispatchResultTo198>': Vec<DispatchResultTo198>;
-    Event: Event;
-    'Option<Event>': Option<Event>;
-    'Vec<Event>': Vec<Event>;
-    EventId: EventId;
-    'Option<EventId>': Option<EventId>;
-    'Vec<EventId>': Vec<EventId>;
-    EventIndex: EventIndex;
-    'Compact<EventIndex>': Compact<EventIndex>;
-    'Option<EventIndex>': Option<EventIndex>;
-    'Vec<EventIndex>': Vec<EventIndex>;
-    EventRecord: EventRecord;
-    'Option<EventRecord>': Option<EventRecord>;
-    'Vec<EventRecord>': Vec<EventRecord>;
-    EventRecordTo76: EventRecordTo76;
-    'Option<EventRecordTo76>': Option<EventRecordTo76>;
-    'Vec<EventRecordTo76>': Vec<EventRecordTo76>;
-    Health: Health;
-    'Option<Health>': Option<Health>;
-    'Vec<Health>': Vec<Health>;
-    InvalidTransaction: InvalidTransaction;
-    'Option<InvalidTransaction>': Option<InvalidTransaction>;
-    'Vec<InvalidTransaction>': Vec<InvalidTransaction>;
-    Key: Key;
-    'Option<Key>': Option<Key>;
-    'Vec<Key>': Vec<Key>;
-    LastRuntimeUpgradeInfo: LastRuntimeUpgradeInfo;
-    'Option<LastRuntimeUpgradeInfo>': Option<LastRuntimeUpgradeInfo>;
-    'Vec<LastRuntimeUpgradeInfo>': Vec<LastRuntimeUpgradeInfo>;
-    NetworkState: NetworkState;
-    'Option<NetworkState>': Option<NetworkState>;
-    'Vec<NetworkState>': Vec<NetworkState>;
-    NetworkStatePeerset: NetworkStatePeerset;
-    'Option<NetworkStatePeerset>': Option<NetworkStatePeerset>;
-    'Vec<NetworkStatePeerset>': Vec<NetworkStatePeerset>;
-    NetworkStatePeersetInfo: NetworkStatePeersetInfo;
-    'Option<NetworkStatePeersetInfo>': Option<NetworkStatePeersetInfo>;
-    'Vec<NetworkStatePeersetInfo>': Vec<NetworkStatePeersetInfo>;
-    NodeRole: NodeRole;
-    'Option<NodeRole>': Option<NodeRole>;
-    'Vec<NodeRole>': Vec<NodeRole>;
-    NotConnectedPeer: NotConnectedPeer;
-    'Option<NotConnectedPeer>': Option<NotConnectedPeer>;
-    'Vec<NotConnectedPeer>': Vec<NotConnectedPeer>;
-    Peer: Peer;
-    'Option<Peer>': Option<Peer>;
-    'Vec<Peer>': Vec<Peer>;
-    PeerEndpoint: PeerEndpoint;
-    'Option<PeerEndpoint>': Option<PeerEndpoint>;
-    'Vec<PeerEndpoint>': Vec<PeerEndpoint>;
-    PeerEndpointAddr: PeerEndpointAddr;
-    'Option<PeerEndpointAddr>': Option<PeerEndpointAddr>;
-    'Vec<PeerEndpointAddr>': Vec<PeerEndpointAddr>;
-    PeerPing: PeerPing;
-    'Option<PeerPing>': Option<PeerPing>;
-    'Vec<PeerPing>': Vec<PeerPing>;
-    PeerInfo: PeerInfo;
-    'Option<PeerInfo>': Option<PeerInfo>;
-    'Vec<PeerInfo>': Vec<PeerInfo>;
-    Phase: Phase;
-    'Option<Phase>': Option<Phase>;
-    'Vec<Phase>': Vec<Phase>;
-    RefCount: RefCount;
-    'Compact<RefCount>': Compact<RefCount>;
-    'Option<RefCount>': Option<RefCount>;
-    'Vec<RefCount>': Vec<RefCount>;
-    TransactionValidityError: TransactionValidityError;
-    'Option<TransactionValidityError>': Option<TransactionValidityError>;
-    'Vec<TransactionValidityError>': Vec<TransactionValidityError>;
-    UnknownTransaction: UnknownTransaction;
-    'Option<UnknownTransaction>': Option<UnknownTransaction>;
-    'Vec<UnknownTransaction>': Vec<UnknownTransaction>;
-    OpenTip: OpenTip;
-    'Option<OpenTip>': Option<OpenTip>;
-    'Vec<OpenTip>': Vec<OpenTip>;
-    OpenTipTo225: OpenTipTo225;
-    'Option<OpenTipTo225>': Option<OpenTipTo225>;
-    'Vec<OpenTipTo225>': Vec<OpenTipTo225>;
-    OpenTipFinderTo225: OpenTipFinderTo225;
-    'Option<OpenTipFinderTo225>': Option<OpenTipFinderTo225>;
-    'Vec<OpenTipFinderTo225>': Vec<OpenTipFinderTo225>;
-    OpenTipTip: OpenTipTip;
-    'Option<OpenTipTip>': Option<OpenTipTip>;
-    'Vec<OpenTipTip>': Vec<OpenTipTip>;
-    TreasuryProposal: TreasuryProposal;
-    'Option<TreasuryProposal>': Option<TreasuryProposal>;
-    'Vec<TreasuryProposal>': Vec<TreasuryProposal>;
-    Multiplier: Multiplier;
-    'Option<Multiplier>': Option<Multiplier>;
-    'Vec<Multiplier>': Vec<Multiplier>;
-    CallHash: CallHash;
-    'Option<CallHash>': Option<CallHash>;
-    'Vec<CallHash>': Vec<CallHash>;
-    Multisig: Multisig;
-    'Option<Multisig>': Option<Multisig>;
-    'Vec<Multisig>': Vec<Multisig>;
-    Timepoint: Timepoint;
-    'Option<Timepoint>': Option<Timepoint>;
-    'Vec<Timepoint>': Vec<Timepoint>;
-    VestingInfo: VestingInfo;
-    'Option<VestingInfo>': Option<VestingInfo>;
-    'Vec<VestingInfo>': Vec<VestingInfo>;
-    BlockAttestations: BlockAttestations;
-    'Option<BlockAttestations>': Option<BlockAttestations>;
-    'Vec<BlockAttestations>': Vec<BlockAttestations>;
-    IncludedBlocks: IncludedBlocks;
-    'Option<IncludedBlocks>': Option<IncludedBlocks>;
-    'Vec<IncludedBlocks>': Vec<IncludedBlocks>;
-    MoreAttestations: MoreAttestations;
-    'Option<MoreAttestations>': Option<MoreAttestations>;
-    'Vec<MoreAttestations>': Vec<MoreAttestations>;
-    EthereumAddress: EthereumAddress;
-    'Option<EthereumAddress>': Option<EthereumAddress>;
-    'Vec<EthereumAddress>': Vec<EthereumAddress>;
-    StatementKind: StatementKind;
-    'Option<StatementKind>': Option<StatementKind>;
-    'Vec<StatementKind>': Vec<StatementKind>;
-    AbridgedCandidateReceipt: AbridgedCandidateReceipt;
-    'Option<AbridgedCandidateReceipt>': Option<AbridgedCandidateReceipt>;
-    'Vec<AbridgedCandidateReceipt>': Vec<AbridgedCandidateReceipt>;
-    AttestedCandidate: AttestedCandidate;
-    'Option<AttestedCandidate>': Option<AttestedCandidate>;
-    'Vec<AttestedCandidate>': Vec<AttestedCandidate>;
-    AuctionIndex: AuctionIndex;
-    'Compact<AuctionIndex>': Compact<AuctionIndex>;
-    'Option<AuctionIndex>': Option<AuctionIndex>;
-    'Vec<AuctionIndex>': Vec<AuctionIndex>;
-    Bidder: Bidder;
-    'Option<Bidder>': Option<Bidder>;
-    'Vec<Bidder>': Vec<Bidder>;
-    CandidateCommitments: CandidateCommitments;
-    'Option<CandidateCommitments>': Option<CandidateCommitments>;
-    'Vec<CandidateCommitments>': Vec<CandidateCommitments>;
-    CandidateReceipt: CandidateReceipt;
-    'Option<CandidateReceipt>': Option<CandidateReceipt>;
-    'Vec<CandidateReceipt>': Vec<CandidateReceipt>;
-    CollatorId: CollatorId;
-    'Option<CollatorId>': Option<CollatorId>;
-    'Vec<CollatorId>': Vec<CollatorId>;
-    CollatorSignature: CollatorSignature;
-    'Option<CollatorSignature>': Option<CollatorSignature>;
-    'Vec<CollatorSignature>': Vec<CollatorSignature>;
-    DoubleVoteReport: DoubleVoteReport;
-    'Option<DoubleVoteReport>': Option<DoubleVoteReport>;
-    'Vec<DoubleVoteReport>': Vec<DoubleVoteReport>;
-    DownwardMessage: DownwardMessage;
-    'Option<DownwardMessage>': Option<DownwardMessage>;
-    'Vec<DownwardMessage>': Vec<DownwardMessage>;
-    GlobalValidationSchedule: GlobalValidationSchedule;
-    'Option<GlobalValidationSchedule>': Option<GlobalValidationSchedule>;
-    'Vec<GlobalValidationSchedule>': Vec<GlobalValidationSchedule>;
-    HeadData: HeadData;
-    'Option<HeadData>': Option<HeadData>;
-    'Vec<HeadData>': Vec<HeadData>;
-    IncomingParachain: IncomingParachain;
-    'Option<IncomingParachain>': Option<IncomingParachain>;
-    'Vec<IncomingParachain>': Vec<IncomingParachain>;
-    IncomingParachainFixed: IncomingParachainFixed;
-    'Option<IncomingParachainFixed>': Option<IncomingParachainFixed>;
-    'Vec<IncomingParachainFixed>': Vec<IncomingParachainFixed>;
-    IncomingParachainDeploy: IncomingParachainDeploy;
-    'Option<IncomingParachainDeploy>': Option<IncomingParachainDeploy>;
-    'Vec<IncomingParachainDeploy>': Vec<IncomingParachainDeploy>;
-    LeasePeriod: LeasePeriod;
-    'Option<LeasePeriod>': Option<LeasePeriod>;
-    'Vec<LeasePeriod>': Vec<LeasePeriod>;
-    LeasePeriodOf: LeasePeriodOf;
-    'Option<LeasePeriodOf>': Option<LeasePeriodOf>;
-    'Vec<LeasePeriodOf>': Vec<LeasePeriodOf>;
-    LocalValidationData: LocalValidationData;
-    'Option<LocalValidationData>': Option<LocalValidationData>;
-    'Vec<LocalValidationData>': Vec<LocalValidationData>;
-    NewBidder: NewBidder;
-    'Option<NewBidder>': Option<NewBidder>;
-    'Vec<NewBidder>': Vec<NewBidder>;
-    ParachainDispatchOrigin: ParachainDispatchOrigin;
-    'Option<ParachainDispatchOrigin>': Option<ParachainDispatchOrigin>;
-    'Vec<ParachainDispatchOrigin>': Vec<ParachainDispatchOrigin>;
-    ParaId: ParaId;
-    'Compact<ParaId>': Compact<ParaId>;
-    'Option<ParaId>': Option<ParaId>;
-    'Vec<ParaId>': Vec<ParaId>;
-    ParaInfo: ParaInfo;
-    'Option<ParaInfo>': Option<ParaInfo>;
-    'Vec<ParaInfo>': Vec<ParaInfo>;
-    ParaPastCodeMeta: ParaPastCodeMeta;
-    'Option<ParaPastCodeMeta>': Option<ParaPastCodeMeta>;
-    'Vec<ParaPastCodeMeta>': Vec<ParaPastCodeMeta>;
-    ParaScheduling: ParaScheduling;
-    'Option<ParaScheduling>': Option<ParaScheduling>;
-    'Vec<ParaScheduling>': Vec<ParaScheduling>;
-    Remark: Remark;
-    'Option<Remark>': Option<Remark>;
-    'Vec<Remark>': Vec<Remark>;
-    Retriable: Retriable;
-    'Option<Retriable>': Option<Retriable>;
-    'Vec<Retriable>': Vec<Retriable>;
-    Scheduling: Scheduling;
-    'Option<Scheduling>': Option<Scheduling>;
-    'Vec<Scheduling>': Vec<Scheduling>;
-    SigningContext: SigningContext;
-    'Option<SigningContext>': Option<SigningContext>;
-    'Vec<SigningContext>': Vec<SigningContext>;
-    SlotRange: SlotRange;
-    'Option<SlotRange>': Option<SlotRange>;
-    'Vec<SlotRange>': Vec<SlotRange>;
-    Statement: Statement;
-    'Option<Statement>': Option<Statement>;
-    'Vec<Statement>': Vec<Statement>;
-    SubId: SubId;
-    'Compact<SubId>': Compact<SubId>;
-    'Option<SubId>': Option<SubId>;
-    'Vec<SubId>': Vec<SubId>;
-    UpwardMessage: UpwardMessage;
-    'Option<UpwardMessage>': Option<UpwardMessage>;
-    'Vec<UpwardMessage>': Vec<UpwardMessage>;
-    ValidationCode: ValidationCode;
-    'Option<ValidationCode>': Option<ValidationCode>;
-    'Vec<ValidationCode>': Vec<ValidationCode>;
-    ValidatorSignature: ValidatorSignature;
-    'Option<ValidatorSignature>': Option<ValidatorSignature>;
-    'Vec<ValidatorSignature>': Vec<ValidatorSignature>;
-    ValidityAttestation: ValidityAttestation;
-    'Option<ValidityAttestation>': Option<ValidityAttestation>;
-    'Vec<ValidityAttestation>': Vec<ValidityAttestation>;
-    WinningData: WinningData;
-    'Option<WinningData>': Option<WinningData>;
-    'Vec<WinningData>': Vec<WinningData>;
-    WinningDataEntry: WinningDataEntry;
-    'Option<WinningDataEntry>': Option<WinningDataEntry>;
-    'Vec<WinningDataEntry>': Vec<WinningDataEntry>;
-    Approvals: Approvals;
-    'Option<Approvals>': Option<Approvals>;
-    'Vec<Approvals>': Vec<Approvals>;
-    AccountStatus: AccountStatus;
-    'Option<AccountStatus>': Option<AccountStatus>;
-    'Vec<AccountStatus>': Vec<AccountStatus>;
-    AccountValidity: AccountValidity;
-    'Option<AccountValidity>': Option<AccountValidity>;
-    'Vec<AccountValidity>': Vec<AccountValidity>;
-    CallMetadataV0: CallMetadataV0;
-    'Option<CallMetadataV0>': Option<CallMetadataV0>;
-    'Vec<CallMetadataV0>': Vec<CallMetadataV0>;
-    EventMetadataV0: EventMetadataV0;
-    'Option<EventMetadataV0>': Option<EventMetadataV0>;
-    'Vec<EventMetadataV0>': Vec<EventMetadataV0>;
-    FunctionArgumentMetadataV0: FunctionArgumentMetadataV0;
-    'Option<FunctionArgumentMetadataV0>': Option<FunctionArgumentMetadataV0>;
-    'Vec<FunctionArgumentMetadataV0>': Vec<FunctionArgumentMetadataV0>;
-    FunctionMetadataV0: FunctionMetadataV0;
-    'Option<FunctionMetadataV0>': Option<FunctionMetadataV0>;
-    'Vec<FunctionMetadataV0>': Vec<FunctionMetadataV0>;
-    MapTypeV0: MapTypeV0;
-    'Option<MapTypeV0>': Option<MapTypeV0>;
-    'Vec<MapTypeV0>': Vec<MapTypeV0>;
-    MetadataV0: MetadataV0;
-    'Option<MetadataV0>': Option<MetadataV0>;
-    'Vec<MetadataV0>': Vec<MetadataV0>;
-    ModuleMetadataV0: ModuleMetadataV0;
-    'Option<ModuleMetadataV0>': Option<ModuleMetadataV0>;
-    'Vec<ModuleMetadataV0>': Vec<ModuleMetadataV0>;
-    OuterDispatchCallV0: OuterDispatchCallV0;
-    'Option<OuterDispatchCallV0>': Option<OuterDispatchCallV0>;
-    'Vec<OuterDispatchCallV0>': Vec<OuterDispatchCallV0>;
-    OuterDispatchMetadataV0: OuterDispatchMetadataV0;
-    'Option<OuterDispatchMetadataV0>': Option<OuterDispatchMetadataV0>;
-    'Vec<OuterDispatchMetadataV0>': Vec<OuterDispatchMetadataV0>;
-    OuterEventEventMetadataEventsV0: OuterEventEventMetadataEventsV0;
-    'Option<OuterEventEventMetadataEventsV0>': Option<OuterEventEventMetadataEventsV0>;
-    'Vec<OuterEventEventMetadataEventsV0>': Vec<OuterEventEventMetadataEventsV0>;
-    OuterEventEventMetadataV0: OuterEventEventMetadataV0;
-    'Option<OuterEventEventMetadataV0>': Option<OuterEventEventMetadataV0>;
-    'Vec<OuterEventEventMetadataV0>': Vec<OuterEventEventMetadataV0>;
-    OuterEventMetadataV0: OuterEventMetadataV0;
-    'Option<OuterEventMetadataV0>': Option<OuterEventMetadataV0>;
-    'Vec<OuterEventMetadataV0>': Vec<OuterEventMetadataV0>;
-    PlainTypeV0: PlainTypeV0;
-    'Option<PlainTypeV0>': Option<PlainTypeV0>;
-    'Vec<PlainTypeV0>': Vec<PlainTypeV0>;
-    RuntimeModuleMetadataV0: RuntimeModuleMetadataV0;
-    'Option<RuntimeModuleMetadataV0>': Option<RuntimeModuleMetadataV0>;
-    'Vec<RuntimeModuleMetadataV0>': Vec<RuntimeModuleMetadataV0>;
-    StorageFunctionMetadataV0: StorageFunctionMetadataV0;
-    'Option<StorageFunctionMetadataV0>': Option<StorageFunctionMetadataV0>;
-    'Vec<StorageFunctionMetadataV0>': Vec<StorageFunctionMetadataV0>;
-    StorageFunctionModifierV0: StorageFunctionModifierV0;
-    'Option<StorageFunctionModifierV0>': Option<StorageFunctionModifierV0>;
-    'Vec<StorageFunctionModifierV0>': Vec<StorageFunctionModifierV0>;
-    StorageFunctionTypeV0: StorageFunctionTypeV0;
-    'Option<StorageFunctionTypeV0>': Option<StorageFunctionTypeV0>;
-    'Vec<StorageFunctionTypeV0>': Vec<StorageFunctionTypeV0>;
-    StorageMetadataV0: StorageMetadataV0;
-    'Option<StorageMetadataV0>': Option<StorageMetadataV0>;
-    'Vec<StorageMetadataV0>': Vec<StorageMetadataV0>;
-    EventMetadataV1: EventMetadataV1;
-    'Option<EventMetadataV1>': Option<EventMetadataV1>;
-    'Vec<EventMetadataV1>': Vec<EventMetadataV1>;
-    FunctionArgumentMetadataV1: FunctionArgumentMetadataV1;
-    'Option<FunctionArgumentMetadataV1>': Option<FunctionArgumentMetadataV1>;
-    'Vec<FunctionArgumentMetadataV1>': Vec<FunctionArgumentMetadataV1>;
-    FunctionMetadataV1: FunctionMetadataV1;
-    'Option<FunctionMetadataV1>': Option<FunctionMetadataV1>;
-    'Vec<FunctionMetadataV1>': Vec<FunctionMetadataV1>;
-    MetadataV1: MetadataV1;
-    'Option<MetadataV1>': Option<MetadataV1>;
-    'Vec<MetadataV1>': Vec<MetadataV1>;
-    ModuleMetadataV1: ModuleMetadataV1;
-    'Option<ModuleMetadataV1>': Option<ModuleMetadataV1>;
-    'Vec<ModuleMetadataV1>': Vec<ModuleMetadataV1>;
-    StorageFunctionMetadataV1: StorageFunctionMetadataV1;
-    'Option<StorageFunctionMetadataV1>': Option<StorageFunctionMetadataV1>;
-    'Vec<StorageFunctionMetadataV1>': Vec<StorageFunctionMetadataV1>;
-    StorageFunctionModifierV1: StorageFunctionModifierV1;
-    'Option<StorageFunctionModifierV1>': Option<StorageFunctionModifierV1>;
-    'Vec<StorageFunctionModifierV1>': Vec<StorageFunctionModifierV1>;
-    StorageFunctionTypeV1: StorageFunctionTypeV1;
-    'Option<StorageFunctionTypeV1>': Option<StorageFunctionTypeV1>;
-    'Vec<StorageFunctionTypeV1>': Vec<StorageFunctionTypeV1>;
-    EventMetadataV2: EventMetadataV2;
-    'Option<EventMetadataV2>': Option<EventMetadataV2>;
-    'Vec<EventMetadataV2>': Vec<EventMetadataV2>;
-    FunctionArgumentMetadataV2: FunctionArgumentMetadataV2;
-    'Option<FunctionArgumentMetadataV2>': Option<FunctionArgumentMetadataV2>;
-    'Vec<FunctionArgumentMetadataV2>': Vec<FunctionArgumentMetadataV2>;
-    FunctionMetadataV2: FunctionMetadataV2;
-    'Option<FunctionMetadataV2>': Option<FunctionMetadataV2>;
-    'Vec<FunctionMetadataV2>': Vec<FunctionMetadataV2>;
-    MapTypeV2: MapTypeV2;
-    'Option<MapTypeV2>': Option<MapTypeV2>;
-    'Vec<MapTypeV2>': Vec<MapTypeV2>;
-    MetadataV2: MetadataV2;
-    'Option<MetadataV2>': Option<MetadataV2>;
-    'Vec<MetadataV2>': Vec<MetadataV2>;
-    ModuleMetadataV2: ModuleMetadataV2;
-    'Option<ModuleMetadataV2>': Option<ModuleMetadataV2>;
-    'Vec<ModuleMetadataV2>': Vec<ModuleMetadataV2>;
-    PlainTypeV2: PlainTypeV2;
-    'Option<PlainTypeV2>': Option<PlainTypeV2>;
-    'Vec<PlainTypeV2>': Vec<PlainTypeV2>;
-    StorageFunctionMetadataV2: StorageFunctionMetadataV2;
-    'Option<StorageFunctionMetadataV2>': Option<StorageFunctionMetadataV2>;
-    'Vec<StorageFunctionMetadataV2>': Vec<StorageFunctionMetadataV2>;
-    StorageFunctionModifierV2: StorageFunctionModifierV2;
-    'Option<StorageFunctionModifierV2>': Option<StorageFunctionModifierV2>;
-    'Vec<StorageFunctionModifierV2>': Vec<StorageFunctionModifierV2>;
-    StorageFunctionTypeV2: StorageFunctionTypeV2;
-    'Option<StorageFunctionTypeV2>': Option<StorageFunctionTypeV2>;
-    'Vec<StorageFunctionTypeV2>': Vec<StorageFunctionTypeV2>;
-    DoubleMapTypeV3: DoubleMapTypeV3;
-    'Option<DoubleMapTypeV3>': Option<DoubleMapTypeV3>;
-    'Vec<DoubleMapTypeV3>': Vec<DoubleMapTypeV3>;
-    EventMetadataV3: EventMetadataV3;
-    'Option<EventMetadataV3>': Option<EventMetadataV3>;
-    'Vec<EventMetadataV3>': Vec<EventMetadataV3>;
-    FunctionArgumentMetadataV3: FunctionArgumentMetadataV3;
-    'Option<FunctionArgumentMetadataV3>': Option<FunctionArgumentMetadataV3>;
-    'Vec<FunctionArgumentMetadataV3>': Vec<FunctionArgumentMetadataV3>;
-    FunctionMetadataV3: FunctionMetadataV3;
-    'Option<FunctionMetadataV3>': Option<FunctionMetadataV3>;
-    'Vec<FunctionMetadataV3>': Vec<FunctionMetadataV3>;
-    MapTypeV3: MapTypeV3;
-    'Option<MapTypeV3>': Option<MapTypeV3>;
-    'Vec<MapTypeV3>': Vec<MapTypeV3>;
-    MetadataV3: MetadataV3;
-    'Option<MetadataV3>': Option<MetadataV3>;
-    'Vec<MetadataV3>': Vec<MetadataV3>;
-    ModuleMetadataV3: ModuleMetadataV3;
-    'Option<ModuleMetadataV3>': Option<ModuleMetadataV3>;
-    'Vec<ModuleMetadataV3>': Vec<ModuleMetadataV3>;
-    PlainTypeV3: PlainTypeV3;
-    'Option<PlainTypeV3>': Option<PlainTypeV3>;
-    'Vec<PlainTypeV3>': Vec<PlainTypeV3>;
-    StorageFunctionMetadataV3: StorageFunctionMetadataV3;
-    'Option<StorageFunctionMetadataV3>': Option<StorageFunctionMetadataV3>;
-    'Vec<StorageFunctionMetadataV3>': Vec<StorageFunctionMetadataV3>;
-    StorageFunctionModifierV3: StorageFunctionModifierV3;
-    'Option<StorageFunctionModifierV3>': Option<StorageFunctionModifierV3>;
-    'Vec<StorageFunctionModifierV3>': Vec<StorageFunctionModifierV3>;
-    StorageFunctionTypeV3: StorageFunctionTypeV3;
-    'Option<StorageFunctionTypeV3>': Option<StorageFunctionTypeV3>;
-    'Vec<StorageFunctionTypeV3>': Vec<StorageFunctionTypeV3>;
-    DoubleMapTypeV4: DoubleMapTypeV4;
-    'Option<DoubleMapTypeV4>': Option<DoubleMapTypeV4>;
-    'Vec<DoubleMapTypeV4>': Vec<DoubleMapTypeV4>;
-    EventMetadataV4: EventMetadataV4;
-    'Option<EventMetadataV4>': Option<EventMetadataV4>;
-    'Vec<EventMetadataV4>': Vec<EventMetadataV4>;
-    FunctionArgumentMetadataV4: FunctionArgumentMetadataV4;
-    'Option<FunctionArgumentMetadataV4>': Option<FunctionArgumentMetadataV4>;
-    'Vec<FunctionArgumentMetadataV4>': Vec<FunctionArgumentMetadataV4>;
-    FunctionMetadataV4: FunctionMetadataV4;
-    'Option<FunctionMetadataV4>': Option<FunctionMetadataV4>;
-    'Vec<FunctionMetadataV4>': Vec<FunctionMetadataV4>;
-    MapTypeV4: MapTypeV4;
-    'Option<MapTypeV4>': Option<MapTypeV4>;
-    'Vec<MapTypeV4>': Vec<MapTypeV4>;
-    MetadataV4: MetadataV4;
-    'Option<MetadataV4>': Option<MetadataV4>;
-    'Vec<MetadataV4>': Vec<MetadataV4>;
-    ModuleMetadataV4: ModuleMetadataV4;
-    'Option<ModuleMetadataV4>': Option<ModuleMetadataV4>;
-    'Vec<ModuleMetadataV4>': Vec<ModuleMetadataV4>;
-    PlainTypeV4: PlainTypeV4;
-    'Option<PlainTypeV4>': Option<PlainTypeV4>;
-    'Vec<PlainTypeV4>': Vec<PlainTypeV4>;
-    StorageFunctionMetadataV4: StorageFunctionMetadataV4;
-    'Option<StorageFunctionMetadataV4>': Option<StorageFunctionMetadataV4>;
-    'Vec<StorageFunctionMetadataV4>': Vec<StorageFunctionMetadataV4>;
-    StorageFunctionModifierV4: StorageFunctionModifierV4;
-    'Option<StorageFunctionModifierV4>': Option<StorageFunctionModifierV4>;
-    'Vec<StorageFunctionModifierV4>': Vec<StorageFunctionModifierV4>;
-    StorageFunctionTypeV4: StorageFunctionTypeV4;
-    'Option<StorageFunctionTypeV4>': Option<StorageFunctionTypeV4>;
-    'Vec<StorageFunctionTypeV4>': Vec<StorageFunctionTypeV4>;
-    StorageHasherV4: StorageHasherV4;
-    'Option<StorageHasherV4>': Option<StorageHasherV4>;
-    'Vec<StorageHasherV4>': Vec<StorageHasherV4>;
-    DoubleMapTypeV5: DoubleMapTypeV5;
-    'Option<DoubleMapTypeV5>': Option<DoubleMapTypeV5>;
-    'Vec<DoubleMapTypeV5>': Vec<DoubleMapTypeV5>;
-    EventMetadataV5: EventMetadataV5;
-    'Option<EventMetadataV5>': Option<EventMetadataV5>;
-    'Vec<EventMetadataV5>': Vec<EventMetadataV5>;
-    FunctionArgumentMetadataV5: FunctionArgumentMetadataV5;
-    'Option<FunctionArgumentMetadataV5>': Option<FunctionArgumentMetadataV5>;
-    'Vec<FunctionArgumentMetadataV5>': Vec<FunctionArgumentMetadataV5>;
-    FunctionMetadataV5: FunctionMetadataV5;
-    'Option<FunctionMetadataV5>': Option<FunctionMetadataV5>;
-    'Vec<FunctionMetadataV5>': Vec<FunctionMetadataV5>;
-    MapTypeV5: MapTypeV5;
-    'Option<MapTypeV5>': Option<MapTypeV5>;
-    'Vec<MapTypeV5>': Vec<MapTypeV5>;
-    MetadataV5: MetadataV5;
-    'Option<MetadataV5>': Option<MetadataV5>;
-    'Vec<MetadataV5>': Vec<MetadataV5>;
-    ModuleMetadataV5: ModuleMetadataV5;
-    'Option<ModuleMetadataV5>': Option<ModuleMetadataV5>;
-    'Vec<ModuleMetadataV5>': Vec<ModuleMetadataV5>;
-    PlainTypeV5: PlainTypeV5;
-    'Option<PlainTypeV5>': Option<PlainTypeV5>;
-    'Vec<PlainTypeV5>': Vec<PlainTypeV5>;
-    StorageFunctionMetadataV5: StorageFunctionMetadataV5;
-    'Option<StorageFunctionMetadataV5>': Option<StorageFunctionMetadataV5>;
-    'Vec<StorageFunctionMetadataV5>': Vec<StorageFunctionMetadataV5>;
-    StorageFunctionModifierV5: StorageFunctionModifierV5;
-    'Option<StorageFunctionModifierV5>': Option<StorageFunctionModifierV5>;
-    'Vec<StorageFunctionModifierV5>': Vec<StorageFunctionModifierV5>;
-    StorageFunctionTypeV5: StorageFunctionTypeV5;
-    'Option<StorageFunctionTypeV5>': Option<StorageFunctionTypeV5>;
-    'Vec<StorageFunctionTypeV5>': Vec<StorageFunctionTypeV5>;
-    StorageHasherV5: StorageHasherV5;
-    'Option<StorageHasherV5>': Option<StorageHasherV5>;
-    'Vec<StorageHasherV5>': Vec<StorageHasherV5>;
-    DoubleMapTypeV6: DoubleMapTypeV6;
-    'Option<DoubleMapTypeV6>': Option<DoubleMapTypeV6>;
-    'Vec<DoubleMapTypeV6>': Vec<DoubleMapTypeV6>;
-    EventMetadataV6: EventMetadataV6;
-    'Option<EventMetadataV6>': Option<EventMetadataV6>;
-    'Vec<EventMetadataV6>': Vec<EventMetadataV6>;
-    FunctionArgumentMetadataV6: FunctionArgumentMetadataV6;
-    'Option<FunctionArgumentMetadataV6>': Option<FunctionArgumentMetadataV6>;
-    'Vec<FunctionArgumentMetadataV6>': Vec<FunctionArgumentMetadataV6>;
-    FunctionMetadataV6: FunctionMetadataV6;
-    'Option<FunctionMetadataV6>': Option<FunctionMetadataV6>;
-    'Vec<FunctionMetadataV6>': Vec<FunctionMetadataV6>;
-    MapTypeV6: MapTypeV6;
-    'Option<MapTypeV6>': Option<MapTypeV6>;
-    'Vec<MapTypeV6>': Vec<MapTypeV6>;
-    MetadataV6: MetadataV6;
-    'Option<MetadataV6>': Option<MetadataV6>;
-    'Vec<MetadataV6>': Vec<MetadataV6>;
-    ModuleConstantMetadataV6: ModuleConstantMetadataV6;
-    'Option<ModuleConstantMetadataV6>': Option<ModuleConstantMetadataV6>;
-    'Vec<ModuleConstantMetadataV6>': Vec<ModuleConstantMetadataV6>;
-    ModuleMetadataV6: ModuleMetadataV6;
-    'Option<ModuleMetadataV6>': Option<ModuleMetadataV6>;
-    'Vec<ModuleMetadataV6>': Vec<ModuleMetadataV6>;
-    PlainTypeV6: PlainTypeV6;
-    'Option<PlainTypeV6>': Option<PlainTypeV6>;
-    'Vec<PlainTypeV6>': Vec<PlainTypeV6>;
-    StorageEntryModifierV6: StorageEntryModifierV6;
-    'Option<StorageEntryModifierV6>': Option<StorageEntryModifierV6>;
-    'Vec<StorageEntryModifierV6>': Vec<StorageEntryModifierV6>;
-    StorageEntryMetadataV6: StorageEntryMetadataV6;
-    'Option<StorageEntryMetadataV6>': Option<StorageEntryMetadataV6>;
-    'Vec<StorageEntryMetadataV6>': Vec<StorageEntryMetadataV6>;
-    StorageEntryTypeV6: StorageEntryTypeV6;
-    'Option<StorageEntryTypeV6>': Option<StorageEntryTypeV6>;
-    'Vec<StorageEntryTypeV6>': Vec<StorageEntryTypeV6>;
-    StorageHasherV6: StorageHasherV6;
-    'Option<StorageHasherV6>': Option<StorageHasherV6>;
-    'Vec<StorageHasherV6>': Vec<StorageHasherV6>;
-    DoubleMapTypeV7: DoubleMapTypeV7;
-    'Option<DoubleMapTypeV7>': Option<DoubleMapTypeV7>;
-    'Vec<DoubleMapTypeV7>': Vec<DoubleMapTypeV7>;
-    EventMetadataV7: EventMetadataV7;
-    'Option<EventMetadataV7>': Option<EventMetadataV7>;
-    'Vec<EventMetadataV7>': Vec<EventMetadataV7>;
-    FunctionArgumentMetadataV7: FunctionArgumentMetadataV7;
-    'Option<FunctionArgumentMetadataV7>': Option<FunctionArgumentMetadataV7>;
-    'Vec<FunctionArgumentMetadataV7>': Vec<FunctionArgumentMetadataV7>;
-    FunctionMetadataV7: FunctionMetadataV7;
-    'Option<FunctionMetadataV7>': Option<FunctionMetadataV7>;
-    'Vec<FunctionMetadataV7>': Vec<FunctionMetadataV7>;
-    MapTypeV7: MapTypeV7;
-    'Option<MapTypeV7>': Option<MapTypeV7>;
-    'Vec<MapTypeV7>': Vec<MapTypeV7>;
-    MetadataV7: MetadataV7;
-    'Option<MetadataV7>': Option<MetadataV7>;
-    'Vec<MetadataV7>': Vec<MetadataV7>;
-    ModuleConstantMetadataV7: ModuleConstantMetadataV7;
-    'Option<ModuleConstantMetadataV7>': Option<ModuleConstantMetadataV7>;
-    'Vec<ModuleConstantMetadataV7>': Vec<ModuleConstantMetadataV7>;
-    ModuleMetadataV7: ModuleMetadataV7;
-    'Option<ModuleMetadataV7>': Option<ModuleMetadataV7>;
-    'Vec<ModuleMetadataV7>': Vec<ModuleMetadataV7>;
-    PlainTypeV7: PlainTypeV7;
-    'Option<PlainTypeV7>': Option<PlainTypeV7>;
-    'Vec<PlainTypeV7>': Vec<PlainTypeV7>;
-    StorageEntryModifierV7: StorageEntryModifierV7;
-    'Option<StorageEntryModifierV7>': Option<StorageEntryModifierV7>;
-    'Vec<StorageEntryModifierV7>': Vec<StorageEntryModifierV7>;
-    StorageEntryMetadataV7: StorageEntryMetadataV7;
-    'Option<StorageEntryMetadataV7>': Option<StorageEntryMetadataV7>;
-    'Vec<StorageEntryMetadataV7>': Vec<StorageEntryMetadataV7>;
-    StorageEntryTypeV7: StorageEntryTypeV7;
-    'Option<StorageEntryTypeV7>': Option<StorageEntryTypeV7>;
-    'Vec<StorageEntryTypeV7>': Vec<StorageEntryTypeV7>;
-    StorageHasherV7: StorageHasherV7;
-    'Option<StorageHasherV7>': Option<StorageHasherV7>;
-    'Vec<StorageHasherV7>': Vec<StorageHasherV7>;
-    StorageMetadataV7: StorageMetadataV7;
-    'Option<StorageMetadataV7>': Option<StorageMetadataV7>;
-    'Vec<StorageMetadataV7>': Vec<StorageMetadataV7>;
-    DoubleMapTypeV8: DoubleMapTypeV8;
-    'Option<DoubleMapTypeV8>': Option<DoubleMapTypeV8>;
-    'Vec<DoubleMapTypeV8>': Vec<DoubleMapTypeV8>;
-    ErrorMetadataV8: ErrorMetadataV8;
-    'Option<ErrorMetadataV8>': Option<ErrorMetadataV8>;
-    'Vec<ErrorMetadataV8>': Vec<ErrorMetadataV8>;
-    EventMetadataV8: EventMetadataV8;
-    'Option<EventMetadataV8>': Option<EventMetadataV8>;
-    'Vec<EventMetadataV8>': Vec<EventMetadataV8>;
-    FunctionArgumentMetadataV8: FunctionArgumentMetadataV8;
-    'Option<FunctionArgumentMetadataV8>': Option<FunctionArgumentMetadataV8>;
-    'Vec<FunctionArgumentMetadataV8>': Vec<FunctionArgumentMetadataV8>;
-    FunctionMetadataV8: FunctionMetadataV8;
-    'Option<FunctionMetadataV8>': Option<FunctionMetadataV8>;
-    'Vec<FunctionMetadataV8>': Vec<FunctionMetadataV8>;
-    MapTypeV8: MapTypeV8;
-    'Option<MapTypeV8>': Option<MapTypeV8>;
-    'Vec<MapTypeV8>': Vec<MapTypeV8>;
-    MetadataV8: MetadataV8;
-    'Option<MetadataV8>': Option<MetadataV8>;
-    'Vec<MetadataV8>': Vec<MetadataV8>;
-    ModuleConstantMetadataV8: ModuleConstantMetadataV8;
-    'Option<ModuleConstantMetadataV8>': Option<ModuleConstantMetadataV8>;
-    'Vec<ModuleConstantMetadataV8>': Vec<ModuleConstantMetadataV8>;
-    ModuleMetadataV8: ModuleMetadataV8;
-    'Option<ModuleMetadataV8>': Option<ModuleMetadataV8>;
-    'Vec<ModuleMetadataV8>': Vec<ModuleMetadataV8>;
-    PlainTypeV8: PlainTypeV8;
-    'Option<PlainTypeV8>': Option<PlainTypeV8>;
-    'Vec<PlainTypeV8>': Vec<PlainTypeV8>;
-    StorageEntryModifierV8: StorageEntryModifierV8;
-    'Option<StorageEntryModifierV8>': Option<StorageEntryModifierV8>;
-    'Vec<StorageEntryModifierV8>': Vec<StorageEntryModifierV8>;
-    StorageEntryMetadataV8: StorageEntryMetadataV8;
-    'Option<StorageEntryMetadataV8>': Option<StorageEntryMetadataV8>;
-    'Vec<StorageEntryMetadataV8>': Vec<StorageEntryMetadataV8>;
-    StorageEntryTypeV8: StorageEntryTypeV8;
-    'Option<StorageEntryTypeV8>': Option<StorageEntryTypeV8>;
-    'Vec<StorageEntryTypeV8>': Vec<StorageEntryTypeV8>;
-    StorageHasherV8: StorageHasherV8;
-    'Option<StorageHasherV8>': Option<StorageHasherV8>;
-    'Vec<StorageHasherV8>': Vec<StorageHasherV8>;
-    StorageMetadataV8: StorageMetadataV8;
-    'Option<StorageMetadataV8>': Option<StorageMetadataV8>;
-    'Vec<StorageMetadataV8>': Vec<StorageMetadataV8>;
-    DoubleMapTypeV9: DoubleMapTypeV9;
-    'Option<DoubleMapTypeV9>': Option<DoubleMapTypeV9>;
-    'Vec<DoubleMapTypeV9>': Vec<DoubleMapTypeV9>;
-    ErrorMetadataV9: ErrorMetadataV9;
-    'Option<ErrorMetadataV9>': Option<ErrorMetadataV9>;
-    'Vec<ErrorMetadataV9>': Vec<ErrorMetadataV9>;
-    EventMetadataV9: EventMetadataV9;
-    'Option<EventMetadataV9>': Option<EventMetadataV9>;
-    'Vec<EventMetadataV9>': Vec<EventMetadataV9>;
-    FunctionArgumentMetadataV9: FunctionArgumentMetadataV9;
-    'Option<FunctionArgumentMetadataV9>': Option<FunctionArgumentMetadataV9>;
-    'Vec<FunctionArgumentMetadataV9>': Vec<FunctionArgumentMetadataV9>;
-    FunctionMetadataV9: FunctionMetadataV9;
-    'Option<FunctionMetadataV9>': Option<FunctionMetadataV9>;
-    'Vec<FunctionMetadataV9>': Vec<FunctionMetadataV9>;
-    MapTypeV9: MapTypeV9;
-    'Option<MapTypeV9>': Option<MapTypeV9>;
-    'Vec<MapTypeV9>': Vec<MapTypeV9>;
-    MetadataV9: MetadataV9;
-    'Option<MetadataV9>': Option<MetadataV9>;
-    'Vec<MetadataV9>': Vec<MetadataV9>;
-    ModuleConstantMetadataV9: ModuleConstantMetadataV9;
-    'Option<ModuleConstantMetadataV9>': Option<ModuleConstantMetadataV9>;
-    'Vec<ModuleConstantMetadataV9>': Vec<ModuleConstantMetadataV9>;
-    ModuleMetadataV9: ModuleMetadataV9;
-    'Option<ModuleMetadataV9>': Option<ModuleMetadataV9>;
-    'Vec<ModuleMetadataV9>': Vec<ModuleMetadataV9>;
-    PlainTypeV9: PlainTypeV9;
-    'Option<PlainTypeV9>': Option<PlainTypeV9>;
-    'Vec<PlainTypeV9>': Vec<PlainTypeV9>;
-    StorageEntryModifierV9: StorageEntryModifierV9;
-    'Option<StorageEntryModifierV9>': Option<StorageEntryModifierV9>;
-    'Vec<StorageEntryModifierV9>': Vec<StorageEntryModifierV9>;
-    StorageEntryMetadataV9: StorageEntryMetadataV9;
-    'Option<StorageEntryMetadataV9>': Option<StorageEntryMetadataV9>;
-    'Vec<StorageEntryMetadataV9>': Vec<StorageEntryMetadataV9>;
-    StorageEntryTypeV9: StorageEntryTypeV9;
-    'Option<StorageEntryTypeV9>': Option<StorageEntryTypeV9>;
-    'Vec<StorageEntryTypeV9>': Vec<StorageEntryTypeV9>;
-    StorageHasherV9: StorageHasherV9;
-    'Option<StorageHasherV9>': Option<StorageHasherV9>;
-    'Vec<StorageHasherV9>': Vec<StorageHasherV9>;
-    StorageMetadataV9: StorageMetadataV9;
-    'Option<StorageMetadataV9>': Option<StorageMetadataV9>;
-    'Vec<StorageMetadataV9>': Vec<StorageMetadataV9>;
-    DoubleMapTypeV10: DoubleMapTypeV10;
-    'Option<DoubleMapTypeV10>': Option<DoubleMapTypeV10>;
-    'Vec<DoubleMapTypeV10>': Vec<DoubleMapTypeV10>;
-    ErrorMetadataV10: ErrorMetadataV10;
-    'Option<ErrorMetadataV10>': Option<ErrorMetadataV10>;
-    'Vec<ErrorMetadataV10>': Vec<ErrorMetadataV10>;
-    EventMetadataV10: EventMetadataV10;
-    'Option<EventMetadataV10>': Option<EventMetadataV10>;
-    'Vec<EventMetadataV10>': Vec<EventMetadataV10>;
-    FunctionArgumentMetadataV10: FunctionArgumentMetadataV10;
-    'Option<FunctionArgumentMetadataV10>': Option<FunctionArgumentMetadataV10>;
-    'Vec<FunctionArgumentMetadataV10>': Vec<FunctionArgumentMetadataV10>;
-    FunctionMetadataV10: FunctionMetadataV10;
-    'Option<FunctionMetadataV10>': Option<FunctionMetadataV10>;
-    'Vec<FunctionMetadataV10>': Vec<FunctionMetadataV10>;
-    MapTypeV10: MapTypeV10;
-    'Option<MapTypeV10>': Option<MapTypeV10>;
-    'Vec<MapTypeV10>': Vec<MapTypeV10>;
-    MetadataV10: MetadataV10;
-    'Option<MetadataV10>': Option<MetadataV10>;
-    'Vec<MetadataV10>': Vec<MetadataV10>;
-    ModuleConstantMetadataV10: ModuleConstantMetadataV10;
-    'Option<ModuleConstantMetadataV10>': Option<ModuleConstantMetadataV10>;
-    'Vec<ModuleConstantMetadataV10>': Vec<ModuleConstantMetadataV10>;
-    ModuleMetadataV10: ModuleMetadataV10;
-    'Option<ModuleMetadataV10>': Option<ModuleMetadataV10>;
-    'Vec<ModuleMetadataV10>': Vec<ModuleMetadataV10>;
-    PlainTypeV10: PlainTypeV10;
-    'Option<PlainTypeV10>': Option<PlainTypeV10>;
-    'Vec<PlainTypeV10>': Vec<PlainTypeV10>;
-    StorageEntryModifierV10: StorageEntryModifierV10;
-    'Option<StorageEntryModifierV10>': Option<StorageEntryModifierV10>;
-    'Vec<StorageEntryModifierV10>': Vec<StorageEntryModifierV10>;
-    StorageEntryMetadataV10: StorageEntryMetadataV10;
-    'Option<StorageEntryMetadataV10>': Option<StorageEntryMetadataV10>;
-    'Vec<StorageEntryMetadataV10>': Vec<StorageEntryMetadataV10>;
-    StorageEntryTypeV10: StorageEntryTypeV10;
-    'Option<StorageEntryTypeV10>': Option<StorageEntryTypeV10>;
-    'Vec<StorageEntryTypeV10>': Vec<StorageEntryTypeV10>;
-    StorageMetadataV10: StorageMetadataV10;
-    'Option<StorageMetadataV10>': Option<StorageMetadataV10>;
-    'Vec<StorageMetadataV10>': Vec<StorageMetadataV10>;
-    StorageHasherV10: StorageHasherV10;
-    'Option<StorageHasherV10>': Option<StorageHasherV10>;
-    'Vec<StorageHasherV10>': Vec<StorageHasherV10>;
-    DoubleMapTypeV11: DoubleMapTypeV11;
-    'Option<DoubleMapTypeV11>': Option<DoubleMapTypeV11>;
-    'Vec<DoubleMapTypeV11>': Vec<DoubleMapTypeV11>;
-    ErrorMetadataV11: ErrorMetadataV11;
-    'Option<ErrorMetadataV11>': Option<ErrorMetadataV11>;
-    'Vec<ErrorMetadataV11>': Vec<ErrorMetadataV11>;
-    EventMetadataV11: EventMetadataV11;
-    'Option<EventMetadataV11>': Option<EventMetadataV11>;
-    'Vec<EventMetadataV11>': Vec<EventMetadataV11>;
-    ExtrinsicMetadataV11: ExtrinsicMetadataV11;
-    'Option<ExtrinsicMetadataV11>': Option<ExtrinsicMetadataV11>;
-    'Vec<ExtrinsicMetadataV11>': Vec<ExtrinsicMetadataV11>;
-    FunctionArgumentMetadataV11: FunctionArgumentMetadataV11;
-    'Option<FunctionArgumentMetadataV11>': Option<FunctionArgumentMetadataV11>;
-    'Vec<FunctionArgumentMetadataV11>': Vec<FunctionArgumentMetadataV11>;
-    FunctionMetadataV11: FunctionMetadataV11;
-    'Option<FunctionMetadataV11>': Option<FunctionMetadataV11>;
-    'Vec<FunctionMetadataV11>': Vec<FunctionMetadataV11>;
-    MapTypeV11: MapTypeV11;
-    'Option<MapTypeV11>': Option<MapTypeV11>;
-    'Vec<MapTypeV11>': Vec<MapTypeV11>;
-    MetadataV11: MetadataV11;
-    'Option<MetadataV11>': Option<MetadataV11>;
-    'Vec<MetadataV11>': Vec<MetadataV11>;
-    ModuleConstantMetadataV11: ModuleConstantMetadataV11;
-    'Option<ModuleConstantMetadataV11>': Option<ModuleConstantMetadataV11>;
-    'Vec<ModuleConstantMetadataV11>': Vec<ModuleConstantMetadataV11>;
-    ModuleMetadataV11: ModuleMetadataV11;
-    'Option<ModuleMetadataV11>': Option<ModuleMetadataV11>;
-    'Vec<ModuleMetadataV11>': Vec<ModuleMetadataV11>;
-    PlainTypeV11: PlainTypeV11;
-    'Option<PlainTypeV11>': Option<PlainTypeV11>;
-    'Vec<PlainTypeV11>': Vec<PlainTypeV11>;
-    StorageEntryModifierV11: StorageEntryModifierV11;
-    'Option<StorageEntryModifierV11>': Option<StorageEntryModifierV11>;
-    'Vec<StorageEntryModifierV11>': Vec<StorageEntryModifierV11>;
-    StorageEntryMetadataV11: StorageEntryMetadataV11;
-    'Option<StorageEntryMetadataV11>': Option<StorageEntryMetadataV11>;
-    'Vec<StorageEntryMetadataV11>': Vec<StorageEntryMetadataV11>;
-    StorageEntryTypeV11: StorageEntryTypeV11;
-    'Option<StorageEntryTypeV11>': Option<StorageEntryTypeV11>;
-    'Vec<StorageEntryTypeV11>': Vec<StorageEntryTypeV11>;
-    StorageMetadataV11: StorageMetadataV11;
-    'Option<StorageMetadataV11>': Option<StorageMetadataV11>;
-    'Vec<StorageMetadataV11>': Vec<StorageMetadataV11>;
-    StorageHasherV11: StorageHasherV11;
-    'Option<StorageHasherV11>': Option<StorageHasherV11>;
-    'Vec<StorageHasherV11>': Vec<StorageHasherV11>;
-    DoubleMapTypeLatest: DoubleMapTypeLatest;
-    'Option<DoubleMapTypeLatest>': Option<DoubleMapTypeLatest>;
-    'Vec<DoubleMapTypeLatest>': Vec<DoubleMapTypeLatest>;
-    EventMetadataLatest: EventMetadataLatest;
-    'Option<EventMetadataLatest>': Option<EventMetadataLatest>;
-    'Vec<EventMetadataLatest>': Vec<EventMetadataLatest>;
-    ExtrinsicMetadataLatest: ExtrinsicMetadataLatest;
-    'Option<ExtrinsicMetadataLatest>': Option<ExtrinsicMetadataLatest>;
-    'Vec<ExtrinsicMetadataLatest>': Vec<ExtrinsicMetadataLatest>;
-    FunctionArgumentMetadataLatest: FunctionArgumentMetadataLatest;
-    'Option<FunctionArgumentMetadataLatest>': Option<FunctionArgumentMetadataLatest>;
-    'Vec<FunctionArgumentMetadataLatest>': Vec<FunctionArgumentMetadataLatest>;
-    FunctionMetadataLatest: FunctionMetadataLatest;
-    'Option<FunctionMetadataLatest>': Option<FunctionMetadataLatest>;
-    'Vec<FunctionMetadataLatest>': Vec<FunctionMetadataLatest>;
-    MapTypeLatest: MapTypeLatest;
-    'Option<MapTypeLatest>': Option<MapTypeLatest>;
-    'Vec<MapTypeLatest>': Vec<MapTypeLatest>;
-    MetadataLatest: MetadataLatest;
-    'Option<MetadataLatest>': Option<MetadataLatest>;
-    'Vec<MetadataLatest>': Vec<MetadataLatest>;
-    ModuleConstantMetadataLatest: ModuleConstantMetadataLatest;
-    'Option<ModuleConstantMetadataLatest>': Option<ModuleConstantMetadataLatest>;
-    'Vec<ModuleConstantMetadataLatest>': Vec<ModuleConstantMetadataLatest>;
-    ModuleMetadataLatest: ModuleMetadataLatest;
-    'Option<ModuleMetadataLatest>': Option<ModuleMetadataLatest>;
-    'Vec<ModuleMetadataLatest>': Vec<ModuleMetadataLatest>;
-    PlainTypeLatest: PlainTypeLatest;
-    'Option<PlainTypeLatest>': Option<PlainTypeLatest>;
-    'Vec<PlainTypeLatest>': Vec<PlainTypeLatest>;
-    StorageEntryMetadataLatest: StorageEntryMetadataLatest;
-    'Option<StorageEntryMetadataLatest>': Option<StorageEntryMetadataLatest>;
-    'Vec<StorageEntryMetadataLatest>': Vec<StorageEntryMetadataLatest>;
-    StorageEntryModifierLatest: StorageEntryModifierLatest;
-    'Option<StorageEntryModifierLatest>': Option<StorageEntryModifierLatest>;
-    'Vec<StorageEntryModifierLatest>': Vec<StorageEntryModifierLatest>;
-    StorageEntryTypeLatest: StorageEntryTypeLatest;
-    'Option<StorageEntryTypeLatest>': Option<StorageEntryTypeLatest>;
-    'Vec<StorageEntryTypeLatest>': Vec<StorageEntryTypeLatest>;
-    StorageMetadataLatest: StorageMetadataLatest;
-    'Option<StorageMetadataLatest>': Option<StorageMetadataLatest>;
-    'Vec<StorageMetadataLatest>': Vec<StorageMetadataLatest>;
-    StorageHasher: StorageHasher;
-    'Option<StorageHasher>': Option<StorageHasher>;
-    'Vec<StorageHasher>': Vec<StorageHasher>;
-    MetadataAll: MetadataAll;
-    'Option<MetadataAll>': Option<MetadataAll>;
-    'Vec<MetadataAll>': Vec<MetadataAll>;
-    RpcMethods: RpcMethods;
-    'Option<RpcMethods>': Option<RpcMethods>;
-    'Vec<RpcMethods>': Vec<RpcMethods>;
-    ExtrinsicOrHash: ExtrinsicOrHash;
-    'Option<ExtrinsicOrHash>': Option<ExtrinsicOrHash>;
-    'Vec<ExtrinsicOrHash>': Vec<ExtrinsicOrHash>;
-    ExtrinsicStatus: ExtrinsicStatus;
-    'Option<ExtrinsicStatus>': Option<ExtrinsicStatus>;
-    'Vec<ExtrinsicStatus>': Vec<ExtrinsicStatus>;
-    BlockHash: BlockHash;
-    'Option<BlockHash>': Option<BlockHash>;
-    'Vec<BlockHash>': Vec<BlockHash>;
-    PrefixedStorageKey: PrefixedStorageKey;
-    'Option<PrefixedStorageKey>': Option<PrefixedStorageKey>;
-    'Vec<PrefixedStorageKey>': Vec<PrefixedStorageKey>;
-    StorageKind: StorageKind;
-    'Option<StorageKind>': Option<StorageKind>;
-    'Vec<StorageKind>': Vec<StorageKind>;
-    RuntimeDispatchInfo: RuntimeDispatchInfo;
-    'Option<RuntimeDispatchInfo>': Option<RuntimeDispatchInfo>;
-    'Vec<RuntimeDispatchInfo>': Vec<RuntimeDispatchInfo>;
-    ApiId: ApiId;
-    'Option<ApiId>': Option<ApiId>;
-    'Vec<ApiId>': Vec<ApiId>;
-    KeyValueOption: KeyValueOption;
-    'Option<KeyValueOption>': Option<KeyValueOption>;
-    'Vec<KeyValueOption>': Vec<KeyValueOption>;
-    ReadProof: ReadProof;
-    'Option<ReadProof>': Option<ReadProof>;
-    'Vec<ReadProof>': Vec<ReadProof>;
-    RuntimeVersionApi: RuntimeVersionApi;
-    'Option<RuntimeVersionApi>': Option<RuntimeVersionApi>;
-    'Vec<RuntimeVersionApi>': Vec<RuntimeVersionApi>;
-    RuntimeVersion: RuntimeVersion;
-    'Option<RuntimeVersion>': Option<RuntimeVersion>;
-    'Vec<RuntimeVersion>': Vec<RuntimeVersion>;
-    StorageChangeSet: StorageChangeSet;
-    'Option<StorageChangeSet>': Option<StorageChangeSet>;
-    'Vec<StorageChangeSet>': Vec<StorageChangeSet>;
     /** CUSTOMTYPES **/
     "Credential": Credential;
     "Option<Credential>": Option<Credential>;
@@ -2009,9 +205,6 @@ declare module '@polkadot/types/types/registry' {
     "BalanceOfMint": Balance;
     "Option<BalanceOfMint>": Option<Balance>;
     "Vec<BalanceOfMint>": Vec<Balance>;
-    "minting::BalanceOf": Balance;
-    "Option<minting::BalanceOf>": Option<Balance>;
-    "Vec<minting::BalanceOf>": Vec<Balance>;
     "NextAdjustment": NextAdjustment;
     "Option<NextAdjustment>": Option<NextAdjustment>;
     "Vec<NextAdjustment>": Vec<NextAdjustment>;
@@ -2090,6 +283,9 @@ declare module '@polkadot/types/types/registry' {
     "ApplicationDeactivationCause": ApplicationDeactivationCause;
     "Option<ApplicationDeactivationCause>": Option<ApplicationDeactivationCause>;
     "Vec<ApplicationDeactivationCause>": Vec<ApplicationDeactivationCause>;
+    "StakingAmountLimitMode": StakingAmountLimitMode;
+    "Option<StakingAmountLimitMode>": Option<StakingAmountLimitMode>;
+    "Vec<StakingAmountLimitMode>": Vec<StakingAmountLimitMode>;
     "ClassId": u64;
     "Option<ClassId>": Option<u64>;
     "Vec<ClassId>": Vec<u64>;
@@ -2150,6 +346,9 @@ declare module '@polkadot/types/types/registry' {
     "ParametrizedPropertyValue": ParametrizedPropertyValue;
     "Option<ParametrizedPropertyValue>": Option<ParametrizedPropertyValue>;
     "Vec<ParametrizedPropertyValue>": Vec<ParametrizedPropertyValue>;
+    "PropertyOfClass": PropertyOfClass;
+    "Option<PropertyOfClass>": Option<PropertyOfClass>;
+    "Vec<PropertyOfClass>": Vec<PropertyOfClass>;
     "ChannelId": u64;
     "Option<ChannelId>": Option<u64>;
     "Vec<ChannelId>": Vec<u64>;
@@ -2225,6 +424,9 @@ declare module '@polkadot/types/types/registry' {
     "CuratorExitInitiationOrigin": CuratorExitInitiationOrigin;
     "Option<CuratorExitInitiationOrigin>": Option<CuratorExitInitiationOrigin>;
     "Vec<CuratorExitInitiationOrigin>": Vec<CuratorExitInitiationOrigin>;
+    "LeadRoleState": LeadRoleState;
+    "Option<LeadRoleState>": Option<LeadRoleState>;
+    "Vec<LeadRoleState>": Vec<LeadRoleState>;
     "ExitedLeadRole": ExitedLeadRole;
     "Option<ExitedLeadRole>": Option<ExitedLeadRole>;
     "Vec<ExitedLeadRole>": Vec<ExitedLeadRole>;
@@ -2264,12 +466,6 @@ declare module '@polkadot/types/types/registry' {
     "RewardPolicy": RewardPolicy;
     "Option<RewardPolicy>": Option<RewardPolicy>;
     "Vec<RewardPolicy>": Vec<RewardPolicy>;
-    "working_group::OpeningId": working_group__OpeningId;
-    "Option<working_group::OpeningId>": Option<working_group__OpeningId>;
-    "Vec<working_group::OpeningId>": Vec<working_group__OpeningId>;
-    "working_group::WorkerId": working_group__WorkerId;
-    "Option<working_group::WorkerId>": Option<working_group__WorkerId>;
-    "Vec<working_group::WorkerId>": Vec<working_group__WorkerId>;
     "WorkingGroupOpeningPolicyCommitment": WorkingGroupOpeningPolicyCommitment;
     "Option<WorkingGroupOpeningPolicyCommitment>": Option<WorkingGroupOpeningPolicyCommitment>;
     "Vec<WorkingGroupOpeningPolicyCommitment>": Vec<WorkingGroupOpeningPolicyCommitment>;
@@ -2354,15 +550,1825 @@ declare module '@polkadot/types/types/registry' {
     "ActiveStake": ActiveStake;
     "Option<ActiveStake>": Option<ActiveStake>;
     "Vec<ActiveStake>": Vec<ActiveStake>;
-    "FinalizationData": FinalizationData;
-    "Option<FinalizationData>": Option<FinalizationData>;
-    "Vec<FinalizationData>": Vec<FinalizationData>;
+    "Finalized": Finalized;
+    "Option<Finalized>": Option<Finalized>;
+    "Vec<Finalized>": Vec<Finalized>;
     "ProposalDecisionStatus": ProposalDecisionStatus;
     "Option<ProposalDecisionStatus>": Option<ProposalDecisionStatus>;
     "Vec<ProposalDecisionStatus>": Vec<ProposalDecisionStatus>;
     "ExecutionFailed": ExecutionFailed;
     "Option<ExecutionFailed>": Option<ExecutionFailed>;
     "Vec<ExecutionFailed>": Vec<ExecutionFailed>;
+    "Approved": Approved;
+    "Option<Approved>": Option<Approved>;
+    "Vec<Approved>": Vec<Approved>;
+    "SetLeadParams": SetLeadParams;
+    "Option<SetLeadParams>": Option<SetLeadParams>;
+    "Vec<SetLeadParams>": Vec<SetLeadParams>;
     /** /CUSTOMTYPES **/
+    BitVec: BitVec;
+    'Option<BitVec>': Option<BitVec>;
+    'Vec<BitVec>': Vec<BitVec>;
+    bool: bool;
+    'Option<bool>': Option<bool>;
+    'Vec<bool>': Vec<bool>;
+    Bytes: Bytes;
+    'Option<Bytes>': Option<Bytes>;
+    'Vec<Bytes>': Vec<Bytes>;
+    Data: Data;
+    'Option<Data>': Option<Data>;
+    'Vec<Data>': Vec<Data>;
+    DoNotConstruct: DoNotConstruct;
+    'Option<DoNotConstruct>': Option<DoNotConstruct>;
+    'Vec<DoNotConstruct>': Vec<DoNotConstruct>;
+    i8: i8;
+    'Option<i8>': Option<i8>;
+    'Vec<i8>': Vec<i8>;
+    i16: i16;
+    'Option<i16>': Option<i16>;
+    'Vec<i16>': Vec<i16>;
+    i32: i32;
+    'Option<i32>': Option<i32>;
+    'Vec<i32>': Vec<i32>;
+    i64: i64;
+    'Option<i64>': Option<i64>;
+    'Vec<i64>': Vec<i64>;
+    i128: i128;
+    'Option<i128>': Option<i128>;
+    'Vec<i128>': Vec<i128>;
+    i256: i256;
+    'Option<i256>': Option<i256>;
+    'Vec<i256>': Vec<i256>;
+    Null: Null;
+    'Option<Null>': Option<Null>;
+    'Vec<Null>': Vec<Null>;
+    StorageKey: StorageKey;
+    'Option<StorageKey>': Option<StorageKey>;
+    'Vec<StorageKey>': Vec<StorageKey>;
+    Text: Text;
+    'Option<Text>': Option<Text>;
+    'Vec<Text>': Vec<Text>;
+    Type: Type;
+    'Option<Type>': Option<Type>;
+    'Vec<Type>': Vec<Type>;
+    u8: u8;
+    'Compact<u8>': Compact<u8>;
+    'Option<u8>': Option<u8>;
+    'Vec<u8>': Vec<u8>;
+    u16: u16;
+    'Compact<u16>': Compact<u16>;
+    'Option<u16>': Option<u16>;
+    'Vec<u16>': Vec<u16>;
+    u32: u32;
+    'Compact<u32>': Compact<u32>;
+    'Option<u32>': Option<u32>;
+    'Vec<u32>': Vec<u32>;
+    u64: u64;
+    'Compact<u64>': Compact<u64>;
+    'Option<u64>': Option<u64>;
+    'Vec<u64>': Vec<u64>;
+    u128: u128;
+    'Compact<u128>': Compact<u128>;
+    'Option<u128>': Option<u128>;
+    'Vec<u128>': Vec<u128>;
+    u256: u256;
+    'Compact<u256>': Compact<u256>;
+    'Option<u256>': Option<u256>;
+    'Vec<u256>': Vec<u256>;
+    U256: U256;
+    'Compact<U256>': Compact<U256>;
+    'Option<U256>': Option<U256>;
+    'Vec<U256>': Vec<U256>;
+    usize: usize;
+    'Compact<usize>': Compact<usize>;
+    'Option<usize>': Option<usize>;
+    'Vec<usize>': Vec<usize>;
+    Raw: Raw;
+    'Option<Raw>': Option<Raw>;
+    'Vec<Raw>': Vec<Raw>;
+    AccountId: AccountId;
+    'Option<AccountId>': Option<AccountId>;
+    'Vec<AccountId>': Vec<AccountId>;
+    AccountIdOf: AccountIdOf;
+    'Option<AccountIdOf>': Option<AccountIdOf>;
+    'Vec<AccountIdOf>': Vec<AccountIdOf>;
+    AccountIndex: AccountIndex;
+    'Option<AccountIndex>': Option<AccountIndex>;
+    'Vec<AccountIndex>': Vec<AccountIndex>;
+    Address: Address;
+    'Option<Address>': Option<Address>;
+    'Vec<Address>': Vec<Address>;
+    AssetId: AssetId;
+    'Compact<AssetId>': Compact<AssetId>;
+    'Option<AssetId>': Option<AssetId>;
+    'Vec<AssetId>': Vec<AssetId>;
+    Balance: Balance;
+    'Compact<Balance>': Compact<Balance>;
+    'Option<Balance>': Option<Balance>;
+    'Vec<Balance>': Vec<Balance>;
+    BalanceOf: BalanceOf;
+    'Option<BalanceOf>': Option<BalanceOf>;
+    'Vec<BalanceOf>': Vec<BalanceOf>;
+    Block: Block;
+    'Option<Block>': Option<Block>;
+    'Vec<Block>': Vec<Block>;
+    BlockNumber: BlockNumber;
+    'Compact<BlockNumber>': Compact<BlockNumber>;
+    'Option<BlockNumber>': Option<BlockNumber>;
+    'Vec<BlockNumber>': Vec<BlockNumber>;
+    Call: Call;
+    'Option<Call>': Option<Call>;
+    'Vec<Call>': Vec<Call>;
+    ChangesTrieConfiguration: ChangesTrieConfiguration;
+    'Option<ChangesTrieConfiguration>': Option<ChangesTrieConfiguration>;
+    'Vec<ChangesTrieConfiguration>': Vec<ChangesTrieConfiguration>;
+    ConsensusEngineId: ConsensusEngineId;
+    'Option<ConsensusEngineId>': Option<ConsensusEngineId>;
+    'Vec<ConsensusEngineId>': Vec<ConsensusEngineId>;
+    Digest: Digest;
+    'Option<Digest>': Option<Digest>;
+    'Vec<Digest>': Vec<Digest>;
+    DigestItem: DigestItem;
+    'Option<DigestItem>': Option<DigestItem>;
+    'Vec<DigestItem>': Vec<DigestItem>;
+    ExtrinsicsWeight: ExtrinsicsWeight;
+    'Option<ExtrinsicsWeight>': Option<ExtrinsicsWeight>;
+    'Vec<ExtrinsicsWeight>': Vec<ExtrinsicsWeight>;
+    Fixed64: Fixed64;
+    'Option<Fixed64>': Option<Fixed64>;
+    'Vec<Fixed64>': Vec<Fixed64>;
+    Fixed128: Fixed128;
+    'Option<Fixed128>': Option<Fixed128>;
+    'Vec<Fixed128>': Vec<Fixed128>;
+    H160: H160;
+    'Option<H160>': Option<H160>;
+    'Vec<H160>': Vec<H160>;
+    H256: H256;
+    'Option<H256>': Option<H256>;
+    'Vec<H256>': Vec<H256>;
+    H512: H512;
+    'Option<H512>': Option<H512>;
+    'Vec<H512>': Vec<H512>;
+    Hash: Hash;
+    'Option<Hash>': Option<Hash>;
+    'Vec<Hash>': Vec<Hash>;
+    Header: Header;
+    'Option<Header>': Option<Header>;
+    'Vec<Header>': Vec<Header>;
+    Index: Index;
+    'Compact<Index>': Compact<Index>;
+    'Option<Index>': Option<Index>;
+    'Vec<Index>': Vec<Index>;
+    Justification: Justification;
+    'Option<Justification>': Option<Justification>;
+    'Vec<Justification>': Vec<Justification>;
+    KeyValue: KeyValue;
+    'Option<KeyValue>': Option<KeyValue>;
+    'Vec<KeyValue>': Vec<KeyValue>;
+    KeyTypeId: KeyTypeId;
+    'Compact<KeyTypeId>': Compact<KeyTypeId>;
+    'Option<KeyTypeId>': Option<KeyTypeId>;
+    'Vec<KeyTypeId>': Vec<KeyTypeId>;
+    LockIdentifier: LockIdentifier;
+    'Option<LockIdentifier>': Option<LockIdentifier>;
+    'Vec<LockIdentifier>': Vec<LockIdentifier>;
+    LookupSource: LookupSource;
+    'Option<LookupSource>': Option<LookupSource>;
+    'Vec<LookupSource>': Vec<LookupSource>;
+    LookupTarget: LookupTarget;
+    'Option<LookupTarget>': Option<LookupTarget>;
+    'Vec<LookupTarget>': Vec<LookupTarget>;
+    ModuleId: ModuleId;
+    'Option<ModuleId>': Option<ModuleId>;
+    'Vec<ModuleId>': Vec<ModuleId>;
+    Moment: Moment;
+    'Compact<Moment>': Compact<Moment>;
+    'Option<Moment>': Option<Moment>;
+    'Vec<Moment>': Vec<Moment>;
+    OpaqueCall: OpaqueCall;
+    'Option<OpaqueCall>': Option<OpaqueCall>;
+    'Vec<OpaqueCall>': Vec<OpaqueCall>;
+    Origin: Origin;
+    'Option<Origin>': Option<Origin>;
+    'Vec<Origin>': Vec<Origin>;
+    Pays: Pays;
+    'Option<Pays>': Option<Pays>;
+    'Vec<Pays>': Vec<Pays>;
+    Perbill: Perbill;
+    'Compact<Perbill>': Compact<Perbill>;
+    'Option<Perbill>': Option<Perbill>;
+    'Vec<Perbill>': Vec<Perbill>;
+    Percent: Percent;
+    'Compact<Percent>': Compact<Percent>;
+    'Option<Percent>': Option<Percent>;
+    'Vec<Percent>': Vec<Percent>;
+    Permill: Permill;
+    'Compact<Permill>': Compact<Permill>;
+    'Option<Permill>': Option<Permill>;
+    'Vec<Permill>': Vec<Permill>;
+    Perquintill: Perquintill;
+    'Compact<Perquintill>': Compact<Perquintill>;
+    'Option<Perquintill>': Option<Perquintill>;
+    'Vec<Perquintill>': Vec<Perquintill>;
+    Phantom: Phantom;
+    'Option<Phantom>': Option<Phantom>;
+    'Vec<Phantom>': Vec<Phantom>;
+    PhantomData: PhantomData;
+    'Option<PhantomData>': Option<PhantomData>;
+    'Vec<PhantomData>': Vec<PhantomData>;
+    ProxyType: ProxyType;
+    'Option<ProxyType>': Option<ProxyType>;
+    'Vec<ProxyType>': Vec<ProxyType>;
+    Releases: Releases;
+    'Option<Releases>': Option<Releases>;
+    'Vec<Releases>': Vec<Releases>;
+    RuntimeDbWeight: RuntimeDbWeight;
+    'Option<RuntimeDbWeight>': Option<RuntimeDbWeight>;
+    'Vec<RuntimeDbWeight>': Vec<RuntimeDbWeight>;
+    SignedBlock: SignedBlock;
+    'Option<SignedBlock>': Option<SignedBlock>;
+    'Vec<SignedBlock>': Vec<SignedBlock>;
+    StorageData: StorageData;
+    'Option<StorageData>': Option<StorageData>;
+    'Vec<StorageData>': Vec<StorageData>;
+    ValidatorId: ValidatorId;
+    'Option<ValidatorId>': Option<ValidatorId>;
+    'Vec<ValidatorId>': Vec<ValidatorId>;
+    Weight: Weight;
+    'Compact<Weight>': Compact<Weight>;
+    'Option<Weight>': Option<Weight>;
+    'Vec<Weight>': Vec<Weight>;
+    WeightMultiplier: WeightMultiplier;
+    'Option<WeightMultiplier>': Option<WeightMultiplier>;
+    'Vec<WeightMultiplier>': Vec<WeightMultiplier>;
+    PreRuntime: PreRuntime;
+    'Option<PreRuntime>': Option<PreRuntime>;
+    'Vec<PreRuntime>': Vec<PreRuntime>;
+    SealV0: SealV0;
+    'Option<SealV0>': Option<SealV0>;
+    'Vec<SealV0>': Vec<SealV0>;
+    Seal: Seal;
+    'Option<Seal>': Option<Seal>;
+    'Vec<Seal>': Vec<Seal>;
+    Consensus: Consensus;
+    'Option<Consensus>': Option<Consensus>;
+    'Vec<Consensus>': Vec<Consensus>;
+    UncleEntryItem: UncleEntryItem;
+    'Option<UncleEntryItem>': Option<UncleEntryItem>;
+    'Vec<UncleEntryItem>': Vec<UncleEntryItem>;
+    RawAuraPreDigest: RawAuraPreDigest;
+    'Option<RawAuraPreDigest>': Option<RawAuraPreDigest>;
+    'Vec<RawAuraPreDigest>': Vec<RawAuraPreDigest>;
+    AllowedSlots: AllowedSlots;
+    'Option<AllowedSlots>': Option<AllowedSlots>;
+    'Vec<AllowedSlots>': Vec<AllowedSlots>;
+    BabeAuthorityWeight: BabeAuthorityWeight;
+    'Compact<BabeAuthorityWeight>': Compact<BabeAuthorityWeight>;
+    'Option<BabeAuthorityWeight>': Option<BabeAuthorityWeight>;
+    'Vec<BabeAuthorityWeight>': Vec<BabeAuthorityWeight>;
+    BabeBlockWeight: BabeBlockWeight;
+    'Compact<BabeBlockWeight>': Compact<BabeBlockWeight>;
+    'Option<BabeBlockWeight>': Option<BabeBlockWeight>;
+    'Vec<BabeBlockWeight>': Vec<BabeBlockWeight>;
+    BabeEquivocationProof: BabeEquivocationProof;
+    'Option<BabeEquivocationProof>': Option<BabeEquivocationProof>;
+    'Vec<BabeEquivocationProof>': Vec<BabeEquivocationProof>;
+    BabeWeight: BabeWeight;
+    'Compact<BabeWeight>': Compact<BabeWeight>;
+    'Option<BabeWeight>': Option<BabeWeight>;
+    'Vec<BabeWeight>': Vec<BabeWeight>;
+    MaybeRandomness: MaybeRandomness;
+    'Option<MaybeRandomness>': Option<MaybeRandomness>;
+    'Vec<MaybeRandomness>': Vec<MaybeRandomness>;
+    MaybeVrf: MaybeVrf;
+    'Option<MaybeVrf>': Option<MaybeVrf>;
+    'Vec<MaybeVrf>': Vec<MaybeVrf>;
+    EpochAuthorship: EpochAuthorship;
+    'Option<EpochAuthorship>': Option<EpochAuthorship>;
+    'Vec<EpochAuthorship>': Vec<EpochAuthorship>;
+    NextConfigDescriptor: NextConfigDescriptor;
+    'Option<NextConfigDescriptor>': Option<NextConfigDescriptor>;
+    'Vec<NextConfigDescriptor>': Vec<NextConfigDescriptor>;
+    NextConfigDescriptorV1: NextConfigDescriptorV1;
+    'Option<NextConfigDescriptorV1>': Option<NextConfigDescriptorV1>;
+    'Vec<NextConfigDescriptorV1>': Vec<NextConfigDescriptorV1>;
+    Randomness: Randomness;
+    'Option<Randomness>': Option<Randomness>;
+    'Vec<Randomness>': Vec<Randomness>;
+    RawBabePreDigest: RawBabePreDigest;
+    'Option<RawBabePreDigest>': Option<RawBabePreDigest>;
+    'Vec<RawBabePreDigest>': Vec<RawBabePreDigest>;
+    RawBabePreDigestPrimary: RawBabePreDigestPrimary;
+    'Option<RawBabePreDigestPrimary>': Option<RawBabePreDigestPrimary>;
+    'Vec<RawBabePreDigestPrimary>': Vec<RawBabePreDigestPrimary>;
+    RawBabePreDigestSecondaryPlain: RawBabePreDigestSecondaryPlain;
+    'Option<RawBabePreDigestSecondaryPlain>': Option<RawBabePreDigestSecondaryPlain>;
+    'Vec<RawBabePreDigestSecondaryPlain>': Vec<RawBabePreDigestSecondaryPlain>;
+    RawBabePreDigestSecondaryVRF: RawBabePreDigestSecondaryVRF;
+    'Option<RawBabePreDigestSecondaryVRF>': Option<RawBabePreDigestSecondaryVRF>;
+    'Vec<RawBabePreDigestSecondaryVRF>': Vec<RawBabePreDigestSecondaryVRF>;
+    RawBabePreDigestTo159: RawBabePreDigestTo159;
+    'Option<RawBabePreDigestTo159>': Option<RawBabePreDigestTo159>;
+    'Vec<RawBabePreDigestTo159>': Vec<RawBabePreDigestTo159>;
+    RawBabePreDigestPrimaryTo159: RawBabePreDigestPrimaryTo159;
+    'Option<RawBabePreDigestPrimaryTo159>': Option<RawBabePreDigestPrimaryTo159>;
+    'Vec<RawBabePreDigestPrimaryTo159>': Vec<RawBabePreDigestPrimaryTo159>;
+    RawBabePreDigestSecondaryTo159: RawBabePreDigestSecondaryTo159;
+    'Option<RawBabePreDigestSecondaryTo159>': Option<RawBabePreDigestSecondaryTo159>;
+    'Vec<RawBabePreDigestSecondaryTo159>': Vec<RawBabePreDigestSecondaryTo159>;
+    RawBabePreDigestCompat: RawBabePreDigestCompat;
+    'Option<RawBabePreDigestCompat>': Option<RawBabePreDigestCompat>;
+    'Vec<RawBabePreDigestCompat>': Vec<RawBabePreDigestCompat>;
+    SlotNumber: SlotNumber;
+    'Compact<SlotNumber>': Compact<SlotNumber>;
+    'Option<SlotNumber>': Option<SlotNumber>;
+    'Vec<SlotNumber>': Vec<SlotNumber>;
+    VrfData: VrfData;
+    'Option<VrfData>': Option<VrfData>;
+    'Vec<VrfData>': Vec<VrfData>;
+    VrfOutput: VrfOutput;
+    'Option<VrfOutput>': Option<VrfOutput>;
+    'Vec<VrfOutput>': Vec<VrfOutput>;
+    VrfProof: VrfProof;
+    'Option<VrfProof>': Option<VrfProof>;
+    'Vec<VrfProof>': Vec<VrfProof>;
+    AccountData: AccountData;
+    'Option<AccountData>': Option<AccountData>;
+    'Vec<AccountData>': Vec<AccountData>;
+    BalanceLockTo212: BalanceLockTo212;
+    'Option<BalanceLockTo212>': Option<BalanceLockTo212>;
+    'Vec<BalanceLockTo212>': Vec<BalanceLockTo212>;
+    BalanceLock: BalanceLock;
+    'Option<BalanceLock>': Option<BalanceLock>;
+    'Vec<BalanceLock>': Vec<BalanceLock>;
+    BalanceStatus: BalanceStatus;
+    'Option<BalanceStatus>': Option<BalanceStatus>;
+    'Vec<BalanceStatus>': Vec<BalanceStatus>;
+    Reasons: Reasons;
+    'Option<Reasons>': Option<Reasons>;
+    'Vec<Reasons>': Vec<Reasons>;
+    VestingSchedule: VestingSchedule;
+    'Option<VestingSchedule>': Option<VestingSchedule>;
+    'Vec<VestingSchedule>': Vec<VestingSchedule>;
+    WithdrawReasons: WithdrawReasons;
+    'Option<WithdrawReasons>': Option<WithdrawReasons>;
+    'Vec<WithdrawReasons>': Vec<WithdrawReasons>;
+    MemberCount: MemberCount;
+    'Compact<MemberCount>': Compact<MemberCount>;
+    'Option<MemberCount>': Option<MemberCount>;
+    'Vec<MemberCount>': Vec<MemberCount>;
+    ProposalIndex: ProposalIndex;
+    'Compact<ProposalIndex>': Compact<ProposalIndex>;
+    'Option<ProposalIndex>': Option<ProposalIndex>;
+    'Vec<ProposalIndex>': Vec<ProposalIndex>;
+    VotesTo230: VotesTo230;
+    'Option<VotesTo230>': Option<VotesTo230>;
+    'Vec<VotesTo230>': Vec<VotesTo230>;
+    Votes: Votes;
+    'Option<Votes>': Option<Votes>;
+    'Vec<Votes>': Vec<Votes>;
+    AuthorityId: AuthorityId;
+    'Option<AuthorityId>': Option<AuthorityId>;
+    'Vec<AuthorityId>': Vec<AuthorityId>;
+    RawVRFOutput: RawVRFOutput;
+    'Option<RawVRFOutput>': Option<RawVRFOutput>;
+    'Vec<RawVRFOutput>': Vec<RawVRFOutput>;
+    AliveContractInfo: AliveContractInfo;
+    'Option<AliveContractInfo>': Option<AliveContractInfo>;
+    'Vec<AliveContractInfo>': Vec<AliveContractInfo>;
+    CodeHash: CodeHash;
+    'Option<CodeHash>': Option<CodeHash>;
+    'Vec<CodeHash>': Vec<CodeHash>;
+    ContractCallRequest: ContractCallRequest;
+    'Option<ContractCallRequest>': Option<ContractCallRequest>;
+    'Vec<ContractCallRequest>': Vec<ContractCallRequest>;
+    ContractExecResultSuccessTo255: ContractExecResultSuccessTo255;
+    'Option<ContractExecResultSuccessTo255>': Option<ContractExecResultSuccessTo255>;
+    'Vec<ContractExecResultSuccessTo255>': Vec<ContractExecResultSuccessTo255>;
+    ContractExecResultTo255: ContractExecResultTo255;
+    'Option<ContractExecResultTo255>': Option<ContractExecResultTo255>;
+    'Vec<ContractExecResultTo255>': Vec<ContractExecResultTo255>;
+    ContractExecResultSuccess: ContractExecResultSuccess;
+    'Option<ContractExecResultSuccess>': Option<ContractExecResultSuccess>;
+    'Vec<ContractExecResultSuccess>': Vec<ContractExecResultSuccess>;
+    ContractExecResult: ContractExecResult;
+    'Option<ContractExecResult>': Option<ContractExecResult>;
+    'Vec<ContractExecResult>': Vec<ContractExecResult>;
+    ContractInfo: ContractInfo;
+    'Option<ContractInfo>': Option<ContractInfo>;
+    'Vec<ContractInfo>': Vec<ContractInfo>;
+    ContractStorageKey: ContractStorageKey;
+    'Option<ContractStorageKey>': Option<ContractStorageKey>;
+    'Vec<ContractStorageKey>': Vec<ContractStorageKey>;
+    Gas: Gas;
+    'Compact<Gas>': Compact<Gas>;
+    'Option<Gas>': Option<Gas>;
+    'Vec<Gas>': Vec<Gas>;
+    PrefabWasmModule: PrefabWasmModule;
+    'Option<PrefabWasmModule>': Option<PrefabWasmModule>;
+    'Vec<PrefabWasmModule>': Vec<PrefabWasmModule>;
+    PrefabWasmModuleReserved: PrefabWasmModuleReserved;
+    'Option<PrefabWasmModuleReserved>': Option<PrefabWasmModuleReserved>;
+    'Vec<PrefabWasmModuleReserved>': Vec<PrefabWasmModuleReserved>;
+    ScheduleTo212: ScheduleTo212;
+    'Option<ScheduleTo212>': Option<ScheduleTo212>;
+    'Vec<ScheduleTo212>': Vec<ScheduleTo212>;
+    Schedule: Schedule;
+    'Option<Schedule>': Option<Schedule>;
+    'Vec<Schedule>': Vec<Schedule>;
+    SeedOf: SeedOf;
+    'Option<SeedOf>': Option<SeedOf>;
+    'Vec<SeedOf>': Vec<SeedOf>;
+    TombstoneContractInfo: TombstoneContractInfo;
+    'Option<TombstoneContractInfo>': Option<TombstoneContractInfo>;
+    'Vec<TombstoneContractInfo>': Vec<TombstoneContractInfo>;
+    TrieId: TrieId;
+    'Option<TrieId>': Option<TrieId>;
+    'Vec<TrieId>': Vec<TrieId>;
+    AccountVote: AccountVote;
+    'Option<AccountVote>': Option<AccountVote>;
+    'Vec<AccountVote>': Vec<AccountVote>;
+    AccountVoteSplit: AccountVoteSplit;
+    'Option<AccountVoteSplit>': Option<AccountVoteSplit>;
+    'Vec<AccountVoteSplit>': Vec<AccountVoteSplit>;
+    AccountVoteStandard: AccountVoteStandard;
+    'Option<AccountVoteStandard>': Option<AccountVoteStandard>;
+    'Vec<AccountVoteStandard>': Vec<AccountVoteStandard>;
+    Conviction: Conviction;
+    'Option<Conviction>': Option<Conviction>;
+    'Vec<Conviction>': Vec<Conviction>;
+    Delegations: Delegations;
+    'Option<Delegations>': Option<Delegations>;
+    'Vec<Delegations>': Vec<Delegations>;
+    PreimageStatus: PreimageStatus;
+    'Option<PreimageStatus>': Option<PreimageStatus>;
+    'Vec<PreimageStatus>': Vec<PreimageStatus>;
+    PreimageStatusAvailable: PreimageStatusAvailable;
+    'Option<PreimageStatusAvailable>': Option<PreimageStatusAvailable>;
+    'Vec<PreimageStatusAvailable>': Vec<PreimageStatusAvailable>;
+    PriorLock: PriorLock;
+    'Option<PriorLock>': Option<PriorLock>;
+    'Vec<PriorLock>': Vec<PriorLock>;
+    PropIndex: PropIndex;
+    'Compact<PropIndex>': Compact<PropIndex>;
+    'Option<PropIndex>': Option<PropIndex>;
+    'Vec<PropIndex>': Vec<PropIndex>;
+    Proposal: Proposal;
+    'Option<Proposal>': Option<Proposal>;
+    'Vec<Proposal>': Vec<Proposal>;
+    ProxyState: ProxyState;
+    'Option<ProxyState>': Option<ProxyState>;
+    'Vec<ProxyState>': Vec<ProxyState>;
+    ReferendumIndex: ReferendumIndex;
+    'Compact<ReferendumIndex>': Compact<ReferendumIndex>;
+    'Option<ReferendumIndex>': Option<ReferendumIndex>;
+    'Vec<ReferendumIndex>': Vec<ReferendumIndex>;
+    ReferendumInfoTo239: ReferendumInfoTo239;
+    'Option<ReferendumInfoTo239>': Option<ReferendumInfoTo239>;
+    'Vec<ReferendumInfoTo239>': Vec<ReferendumInfoTo239>;
+    ReferendumInfo: ReferendumInfo;
+    'Option<ReferendumInfo>': Option<ReferendumInfo>;
+    'Vec<ReferendumInfo>': Vec<ReferendumInfo>;
+    ReferendumInfoFinished: ReferendumInfoFinished;
+    'Option<ReferendumInfoFinished>': Option<ReferendumInfoFinished>;
+    'Vec<ReferendumInfoFinished>': Vec<ReferendumInfoFinished>;
+    ReferendumStatus: ReferendumStatus;
+    'Option<ReferendumStatus>': Option<ReferendumStatus>;
+    'Vec<ReferendumStatus>': Vec<ReferendumStatus>;
+    Tally: Tally;
+    'Option<Tally>': Option<Tally>;
+    'Vec<Tally>': Vec<Tally>;
+    Voting: Voting;
+    'Option<Voting>': Option<Voting>;
+    'Vec<Voting>': Vec<Voting>;
+    VotingDirect: VotingDirect;
+    'Option<VotingDirect>': Option<VotingDirect>;
+    'Vec<VotingDirect>': Vec<VotingDirect>;
+    VotingDirectVote: VotingDirectVote;
+    'Option<VotingDirectVote>': Option<VotingDirectVote>;
+    'Vec<VotingDirectVote>': Vec<VotingDirectVote>;
+    VotingDelegating: VotingDelegating;
+    'Option<VotingDelegating>': Option<VotingDelegating>;
+    'Vec<VotingDelegating>': Vec<VotingDelegating>;
+    ApprovalFlag: ApprovalFlag;
+    'Compact<ApprovalFlag>': Compact<ApprovalFlag>;
+    'Option<ApprovalFlag>': Option<ApprovalFlag>;
+    'Vec<ApprovalFlag>': Vec<ApprovalFlag>;
+    DefunctVoter: DefunctVoter;
+    'Option<DefunctVoter>': Option<DefunctVoter>;
+    'Vec<DefunctVoter>': Vec<DefunctVoter>;
+    Renouncing: Renouncing;
+    'Option<Renouncing>': Option<Renouncing>;
+    'Vec<Renouncing>': Vec<Renouncing>;
+    SetIndex: SetIndex;
+    'Compact<SetIndex>': Compact<SetIndex>;
+    'Option<SetIndex>': Option<SetIndex>;
+    'Vec<SetIndex>': Vec<SetIndex>;
+    Vote: Vote;
+    'Option<Vote>': Option<Vote>;
+    'Vec<Vote>': Vec<Vote>;
+    VoteIndex: VoteIndex;
+    'Compact<VoteIndex>': Compact<VoteIndex>;
+    'Option<VoteIndex>': Option<VoteIndex>;
+    'Vec<VoteIndex>': Vec<VoteIndex>;
+    VoterInfo: VoterInfo;
+    'Option<VoterInfo>': Option<VoterInfo>;
+    'Vec<VoterInfo>': Vec<VoterInfo>;
+    VoteThreshold: VoteThreshold;
+    'Option<VoteThreshold>': Option<VoteThreshold>;
+    'Vec<VoteThreshold>': Vec<VoteThreshold>;
+    CreatedBlock: CreatedBlock;
+    'Option<CreatedBlock>': Option<CreatedBlock>;
+    'Vec<CreatedBlock>': Vec<CreatedBlock>;
+    ImportedAux: ImportedAux;
+    'Option<ImportedAux>': Option<ImportedAux>;
+    'Vec<ImportedAux>': Vec<ImportedAux>;
+    Account: Account;
+    'Option<Account>': Option<Account>;
+    'Vec<Account>': Vec<Account>;
+    Log: Log;
+    'Option<Log>': Option<Log>;
+    'Vec<Log>': Vec<Log>;
+    Vicinity: Vicinity;
+    'Option<Vicinity>': Option<Vicinity>;
+    'Vec<Vicinity>': Vec<Vicinity>;
+    Extrinsic: Extrinsic;
+    'Option<Extrinsic>': Option<Extrinsic>;
+    'Vec<Extrinsic>': Vec<Extrinsic>;
+    ExtrinsicEra: ExtrinsicEra;
+    'Option<ExtrinsicEra>': Option<ExtrinsicEra>;
+    'Vec<ExtrinsicEra>': Vec<ExtrinsicEra>;
+    ExtrinsicPayload: ExtrinsicPayload;
+    'Option<ExtrinsicPayload>': Option<ExtrinsicPayload>;
+    'Vec<ExtrinsicPayload>': Vec<ExtrinsicPayload>;
+    ExtrinsicV1: ExtrinsicV1;
+    'Option<ExtrinsicV1>': Option<ExtrinsicV1>;
+    'Vec<ExtrinsicV1>': Vec<ExtrinsicV1>;
+    ExtrinsicPayloadV1: ExtrinsicPayloadV1;
+    'Option<ExtrinsicPayloadV1>': Option<ExtrinsicPayloadV1>;
+    'Vec<ExtrinsicPayloadV1>': Vec<ExtrinsicPayloadV1>;
+    ExtrinsicSignatureV1: ExtrinsicSignatureV1;
+    'Option<ExtrinsicSignatureV1>': Option<ExtrinsicSignatureV1>;
+    'Vec<ExtrinsicSignatureV1>': Vec<ExtrinsicSignatureV1>;
+    ExtrinsicV2: ExtrinsicV2;
+    'Option<ExtrinsicV2>': Option<ExtrinsicV2>;
+    'Vec<ExtrinsicV2>': Vec<ExtrinsicV2>;
+    ExtrinsicPayloadV2: ExtrinsicPayloadV2;
+    'Option<ExtrinsicPayloadV2>': Option<ExtrinsicPayloadV2>;
+    'Vec<ExtrinsicPayloadV2>': Vec<ExtrinsicPayloadV2>;
+    ExtrinsicSignatureV2: ExtrinsicSignatureV2;
+    'Option<ExtrinsicSignatureV2>': Option<ExtrinsicSignatureV2>;
+    'Vec<ExtrinsicSignatureV2>': Vec<ExtrinsicSignatureV2>;
+    ExtrinsicV3: ExtrinsicV3;
+    'Option<ExtrinsicV3>': Option<ExtrinsicV3>;
+    'Vec<ExtrinsicV3>': Vec<ExtrinsicV3>;
+    ExtrinsicPayloadV3: ExtrinsicPayloadV3;
+    'Option<ExtrinsicPayloadV3>': Option<ExtrinsicPayloadV3>;
+    'Vec<ExtrinsicPayloadV3>': Vec<ExtrinsicPayloadV3>;
+    ExtrinsicSignatureV3: ExtrinsicSignatureV3;
+    'Option<ExtrinsicSignatureV3>': Option<ExtrinsicSignatureV3>;
+    'Vec<ExtrinsicSignatureV3>': Vec<ExtrinsicSignatureV3>;
+    ExtrinsicV4: ExtrinsicV4;
+    'Option<ExtrinsicV4>': Option<ExtrinsicV4>;
+    'Vec<ExtrinsicV4>': Vec<ExtrinsicV4>;
+    ExtrinsicPayloadV4: ExtrinsicPayloadV4;
+    'Option<ExtrinsicPayloadV4>': Option<ExtrinsicPayloadV4>;
+    'Vec<ExtrinsicPayloadV4>': Vec<ExtrinsicPayloadV4>;
+    ExtrinsicSignatureV4: ExtrinsicSignatureV4;
+    'Option<ExtrinsicSignatureV4>': Option<ExtrinsicSignatureV4>;
+    'Vec<ExtrinsicSignatureV4>': Vec<ExtrinsicSignatureV4>;
+    ExtrinsicUnknown: ExtrinsicUnknown;
+    'Option<ExtrinsicUnknown>': Option<ExtrinsicUnknown>;
+    'Vec<ExtrinsicUnknown>': Vec<ExtrinsicUnknown>;
+    ExtrinsicPayloadUnknown: ExtrinsicPayloadUnknown;
+    'Option<ExtrinsicPayloadUnknown>': Option<ExtrinsicPayloadUnknown>;
+    'Vec<ExtrinsicPayloadUnknown>': Vec<ExtrinsicPayloadUnknown>;
+    ImmortalEra: ImmortalEra;
+    'Option<ImmortalEra>': Option<ImmortalEra>;
+    'Vec<ImmortalEra>': Vec<ImmortalEra>;
+    MortalEra: MortalEra;
+    'Option<MortalEra>': Option<MortalEra>;
+    'Vec<MortalEra>': Vec<MortalEra>;
+    MultiSignature: MultiSignature;
+    'Option<MultiSignature>': Option<MultiSignature>;
+    'Vec<MultiSignature>': Vec<MultiSignature>;
+    Signature: Signature;
+    'Option<Signature>': Option<Signature>;
+    'Vec<Signature>': Vec<Signature>;
+    SignerPayload: SignerPayload;
+    'Option<SignerPayload>': Option<SignerPayload>;
+    'Vec<SignerPayload>': Vec<SignerPayload>;
+    EcdsaSignature: EcdsaSignature;
+    'Option<EcdsaSignature>': Option<EcdsaSignature>;
+    'Vec<EcdsaSignature>': Vec<EcdsaSignature>;
+    Ed25519Signature: Ed25519Signature;
+    'Option<Ed25519Signature>': Option<Ed25519Signature>;
+    'Vec<Ed25519Signature>': Vec<Ed25519Signature>;
+    Sr25519Signature: Sr25519Signature;
+    'Option<Sr25519Signature>': Option<Sr25519Signature>;
+    'Vec<Sr25519Signature>': Vec<Sr25519Signature>;
+    AssetOptions: AssetOptions;
+    'Option<AssetOptions>': Option<AssetOptions>;
+    'Vec<AssetOptions>': Vec<AssetOptions>;
+    Owner: Owner;
+    'Option<Owner>': Option<Owner>;
+    'Vec<Owner>': Vec<Owner>;
+    PermissionsV1: PermissionsV1;
+    'Option<PermissionsV1>': Option<PermissionsV1>;
+    'Vec<PermissionsV1>': Vec<PermissionsV1>;
+    PermissionVersions: PermissionVersions;
+    'Option<PermissionVersions>': Option<PermissionVersions>;
+    'Vec<PermissionVersions>': Vec<PermissionVersions>;
+    PermissionLatest: PermissionLatest;
+    'Option<PermissionLatest>': Option<PermissionLatest>;
+    'Vec<PermissionLatest>': Vec<PermissionLatest>;
+    AuthorityIndex: AuthorityIndex;
+    'Compact<AuthorityIndex>': Compact<AuthorityIndex>;
+    'Option<AuthorityIndex>': Option<AuthorityIndex>;
+    'Vec<AuthorityIndex>': Vec<AuthorityIndex>;
+    AuthorityList: AuthorityList;
+    'Option<AuthorityList>': Option<AuthorityList>;
+    'Vec<AuthorityList>': Vec<AuthorityList>;
+    AuthorityWeight: AuthorityWeight;
+    'Compact<AuthorityWeight>': Compact<AuthorityWeight>;
+    'Option<AuthorityWeight>': Option<AuthorityWeight>;
+    'Vec<AuthorityWeight>': Vec<AuthorityWeight>;
+    GrandpaEquivocation: GrandpaEquivocation;
+    'Option<GrandpaEquivocation>': Option<GrandpaEquivocation>;
+    'Vec<GrandpaEquivocation>': Vec<GrandpaEquivocation>;
+    GrandpaEquivocationProof: GrandpaEquivocationProof;
+    'Option<GrandpaEquivocationProof>': Option<GrandpaEquivocationProof>;
+    'Vec<GrandpaEquivocationProof>': Vec<GrandpaEquivocationProof>;
+    GrandpaEquivocationValue: GrandpaEquivocationValue;
+    'Option<GrandpaEquivocationValue>': Option<GrandpaEquivocationValue>;
+    'Vec<GrandpaEquivocationValue>': Vec<GrandpaEquivocationValue>;
+    GrandpaPrevote: GrandpaPrevote;
+    'Option<GrandpaPrevote>': Option<GrandpaPrevote>;
+    'Vec<GrandpaPrevote>': Vec<GrandpaPrevote>;
+    KeyOwnerProof: KeyOwnerProof;
+    'Option<KeyOwnerProof>': Option<KeyOwnerProof>;
+    'Vec<KeyOwnerProof>': Vec<KeyOwnerProof>;
+    NextAuthority: NextAuthority;
+    'Option<NextAuthority>': Option<NextAuthority>;
+    'Vec<NextAuthority>': Vec<NextAuthority>;
+    PendingPause: PendingPause;
+    'Option<PendingPause>': Option<PendingPause>;
+    'Vec<PendingPause>': Vec<PendingPause>;
+    PendingResume: PendingResume;
+    'Option<PendingResume>': Option<PendingResume>;
+    'Vec<PendingResume>': Vec<PendingResume>;
+    Precommits: Precommits;
+    'Option<Precommits>': Option<Precommits>;
+    'Vec<Precommits>': Vec<Precommits>;
+    Prevotes: Prevotes;
+    'Option<Prevotes>': Option<Prevotes>;
+    'Vec<Prevotes>': Vec<Prevotes>;
+    ReportedRoundStates: ReportedRoundStates;
+    'Option<ReportedRoundStates>': Option<ReportedRoundStates>;
+    'Vec<ReportedRoundStates>': Vec<ReportedRoundStates>;
+    RoundState: RoundState;
+    'Option<RoundState>': Option<RoundState>;
+    'Vec<RoundState>': Vec<RoundState>;
+    SetId: SetId;
+    'Compact<SetId>': Compact<SetId>;
+    'Option<SetId>': Option<SetId>;
+    'Vec<SetId>': Vec<SetId>;
+    StoredPendingChange: StoredPendingChange;
+    'Option<StoredPendingChange>': Option<StoredPendingChange>;
+    'Vec<StoredPendingChange>': Vec<StoredPendingChange>;
+    StoredState: StoredState;
+    'Option<StoredState>': Option<StoredState>;
+    'Vec<StoredState>': Vec<StoredState>;
+    IdentityFields: IdentityFields;
+    'Option<IdentityFields>': Option<IdentityFields>;
+    'Vec<IdentityFields>': Vec<IdentityFields>;
+    IdentityInfoAdditional: IdentityInfoAdditional;
+    'Option<IdentityInfoAdditional>': Option<IdentityInfoAdditional>;
+    'Vec<IdentityInfoAdditional>': Vec<IdentityInfoAdditional>;
+    IdentityInfo: IdentityInfo;
+    'Option<IdentityInfo>': Option<IdentityInfo>;
+    'Vec<IdentityInfo>': Vec<IdentityInfo>;
+    IdentityJudgement: IdentityJudgement;
+    'Option<IdentityJudgement>': Option<IdentityJudgement>;
+    'Vec<IdentityJudgement>': Vec<IdentityJudgement>;
+    RegistrationJudgement: RegistrationJudgement;
+    'Option<RegistrationJudgement>': Option<RegistrationJudgement>;
+    'Vec<RegistrationJudgement>': Vec<RegistrationJudgement>;
+    Registration: Registration;
+    'Option<Registration>': Option<Registration>;
+    'Vec<Registration>': Vec<Registration>;
+    RegistrarIndex: RegistrarIndex;
+    'Compact<RegistrarIndex>': Compact<RegistrarIndex>;
+    'Option<RegistrarIndex>': Option<RegistrarIndex>;
+    'Vec<RegistrarIndex>': Vec<RegistrarIndex>;
+    RegistrarInfo: RegistrarInfo;
+    'Option<RegistrarInfo>': Option<RegistrarInfo>;
+    'Vec<RegistrarInfo>': Vec<RegistrarInfo>;
+    AuthIndex: AuthIndex;
+    'Compact<AuthIndex>': Compact<AuthIndex>;
+    'Option<AuthIndex>': Option<AuthIndex>;
+    'Vec<AuthIndex>': Vec<AuthIndex>;
+    AuthoritySignature: AuthoritySignature;
+    'Option<AuthoritySignature>': Option<AuthoritySignature>;
+    'Vec<AuthoritySignature>': Vec<AuthoritySignature>;
+    Heartbeat: Heartbeat;
+    'Option<Heartbeat>': Option<Heartbeat>;
+    'Vec<Heartbeat>': Vec<Heartbeat>;
+    HeartbeatTo244: HeartbeatTo244;
+    'Option<HeartbeatTo244>': Option<HeartbeatTo244>;
+    'Vec<HeartbeatTo244>': Vec<HeartbeatTo244>;
+    OpaqueMultiaddr: OpaqueMultiaddr;
+    'Option<OpaqueMultiaddr>': Option<OpaqueMultiaddr>;
+    'Vec<OpaqueMultiaddr>': Vec<OpaqueMultiaddr>;
+    OpaquePeerId: OpaquePeerId;
+    'Option<OpaquePeerId>': Option<OpaquePeerId>;
+    'Vec<OpaquePeerId>': Vec<OpaquePeerId>;
+    OpaqueNetworkState: OpaqueNetworkState;
+    'Option<OpaqueNetworkState>': Option<OpaqueNetworkState>;
+    'Vec<OpaqueNetworkState>': Vec<OpaqueNetworkState>;
+    DeferredOffenceOf: DeferredOffenceOf;
+    'Option<DeferredOffenceOf>': Option<DeferredOffenceOf>;
+    'Vec<DeferredOffenceOf>': Vec<DeferredOffenceOf>;
+    Kind: Kind;
+    'Option<Kind>': Option<Kind>;
+    'Vec<Kind>': Vec<Kind>;
+    OffenceDetails: OffenceDetails;
+    'Option<OffenceDetails>': Option<OffenceDetails>;
+    'Vec<OffenceDetails>': Vec<OffenceDetails>;
+    Offender: Offender;
+    'Option<Offender>': Option<Offender>;
+    'Vec<Offender>': Vec<Offender>;
+    OpaqueTimeSlot: OpaqueTimeSlot;
+    'Option<OpaqueTimeSlot>': Option<OpaqueTimeSlot>;
+    'Vec<OpaqueTimeSlot>': Vec<OpaqueTimeSlot>;
+    ReportIdOf: ReportIdOf;
+    'Option<ReportIdOf>': Option<ReportIdOf>;
+    'Vec<ReportIdOf>': Vec<ReportIdOf>;
+    Reporter: Reporter;
+    'Option<Reporter>': Option<Reporter>;
+    'Vec<Reporter>': Vec<Reporter>;
+    ActiveRecovery: ActiveRecovery;
+    'Option<ActiveRecovery>': Option<ActiveRecovery>;
+    'Vec<ActiveRecovery>': Vec<ActiveRecovery>;
+    RecoveryConfig: RecoveryConfig;
+    'Option<RecoveryConfig>': Option<RecoveryConfig>;
+    'Vec<RecoveryConfig>': Vec<RecoveryConfig>;
+    Period: Period;
+    'Option<Period>': Option<Period>;
+    'Vec<Period>': Vec<Period>;
+    Priority: Priority;
+    'Compact<Priority>': Compact<Priority>;
+    'Option<Priority>': Option<Priority>;
+    'Vec<Priority>': Vec<Priority>;
+    SchedulePeriod: SchedulePeriod;
+    'Option<SchedulePeriod>': Option<SchedulePeriod>;
+    'Vec<SchedulePeriod>': Vec<SchedulePeriod>;
+    SchedulePriority: SchedulePriority;
+    'Option<SchedulePriority>': Option<SchedulePriority>;
+    'Vec<SchedulePriority>': Vec<SchedulePriority>;
+    Scheduled: Scheduled;
+    'Option<Scheduled>': Option<Scheduled>;
+    'Vec<Scheduled>': Vec<Scheduled>;
+    TaskAddress: TaskAddress;
+    'Option<TaskAddress>': Option<TaskAddress>;
+    'Vec<TaskAddress>': Vec<TaskAddress>;
+    Keys: Keys;
+    'Option<Keys>': Option<Keys>;
+    'Vec<Keys>': Vec<Keys>;
+    SessionKeys1: SessionKeys1;
+    'Option<SessionKeys1>': Option<SessionKeys1>;
+    'Vec<SessionKeys1>': Vec<SessionKeys1>;
+    SessionKeys2: SessionKeys2;
+    'Option<SessionKeys2>': Option<SessionKeys2>;
+    'Vec<SessionKeys2>': Vec<SessionKeys2>;
+    SessionKeys3: SessionKeys3;
+    'Option<SessionKeys3>': Option<SessionKeys3>;
+    'Vec<SessionKeys3>': Vec<SessionKeys3>;
+    SessionKeys4: SessionKeys4;
+    'Option<SessionKeys4>': Option<SessionKeys4>;
+    'Vec<SessionKeys4>': Vec<SessionKeys4>;
+    SessionKeys5: SessionKeys5;
+    'Option<SessionKeys5>': Option<SessionKeys5>;
+    'Vec<SessionKeys5>': Vec<SessionKeys5>;
+    SessionKeys6: SessionKeys6;
+    'Option<SessionKeys6>': Option<SessionKeys6>;
+    'Vec<SessionKeys6>': Vec<SessionKeys6>;
+    FullIdentification: FullIdentification;
+    'Option<FullIdentification>': Option<FullIdentification>;
+    'Vec<FullIdentification>': Vec<FullIdentification>;
+    IdentificationTuple: IdentificationTuple;
+    'Option<IdentificationTuple>': Option<IdentificationTuple>;
+    'Vec<IdentificationTuple>': Vec<IdentificationTuple>;
+    MembershipProof: MembershipProof;
+    'Option<MembershipProof>': Option<MembershipProof>;
+    'Vec<MembershipProof>': Vec<MembershipProof>;
+    SessionIndex: SessionIndex;
+    'Compact<SessionIndex>': Compact<SessionIndex>;
+    'Option<SessionIndex>': Option<SessionIndex>;
+    'Vec<SessionIndex>': Vec<SessionIndex>;
+    ValidatorCount: ValidatorCount;
+    'Compact<ValidatorCount>': Compact<ValidatorCount>;
+    'Option<ValidatorCount>': Option<ValidatorCount>;
+    'Vec<ValidatorCount>': Vec<ValidatorCount>;
+    Bid: Bid;
+    'Option<Bid>': Option<Bid>;
+    'Vec<Bid>': Vec<Bid>;
+    BidKind: BidKind;
+    'Option<BidKind>': Option<BidKind>;
+    'Vec<BidKind>': Vec<BidKind>;
+    SocietyJudgement: SocietyJudgement;
+    'Option<SocietyJudgement>': Option<SocietyJudgement>;
+    'Vec<SocietyJudgement>': Vec<SocietyJudgement>;
+    SocietyVote: SocietyVote;
+    'Option<SocietyVote>': Option<SocietyVote>;
+    'Vec<SocietyVote>': Vec<SocietyVote>;
+    StrikeCount: StrikeCount;
+    'Compact<StrikeCount>': Compact<StrikeCount>;
+    'Option<StrikeCount>': Option<StrikeCount>;
+    'Vec<StrikeCount>': Vec<StrikeCount>;
+    VouchingStatus: VouchingStatus;
+    'Option<VouchingStatus>': Option<VouchingStatus>;
+    'Vec<VouchingStatus>': Vec<VouchingStatus>;
+    Points: Points;
+    'Compact<Points>': Compact<Points>;
+    'Option<Points>': Option<Points>;
+    'Vec<Points>': Vec<Points>;
+    EraPoints: EraPoints;
+    'Option<EraPoints>': Option<EraPoints>;
+    'Vec<EraPoints>': Vec<EraPoints>;
+    ActiveEraInfo: ActiveEraInfo;
+    'Option<ActiveEraInfo>': Option<ActiveEraInfo>;
+    'Vec<ActiveEraInfo>': Vec<ActiveEraInfo>;
+    CompactAssignments: CompactAssignments;
+    'Option<CompactAssignments>': Option<CompactAssignments>;
+    'Vec<CompactAssignments>': Vec<CompactAssignments>;
+    CompactScore: CompactScore;
+    'Option<CompactScore>': Option<CompactScore>;
+    'Vec<CompactScore>': Vec<CompactScore>;
+    ElectionCompute: ElectionCompute;
+    'Option<ElectionCompute>': Option<ElectionCompute>;
+    'Vec<ElectionCompute>': Vec<ElectionCompute>;
+    ElectionResult: ElectionResult;
+    'Option<ElectionResult>': Option<ElectionResult>;
+    'Vec<ElectionResult>': Vec<ElectionResult>;
+    ElectionScore: ElectionScore;
+    'Option<ElectionScore>': Option<ElectionScore>;
+    'Vec<ElectionScore>': Vec<ElectionScore>;
+    ElectionSize: ElectionSize;
+    'Option<ElectionSize>': Option<ElectionSize>;
+    'Vec<ElectionSize>': Vec<ElectionSize>;
+    ElectionStatus: ElectionStatus;
+    'Option<ElectionStatus>': Option<ElectionStatus>;
+    'Vec<ElectionStatus>': Vec<ElectionStatus>;
+    EraIndex: EraIndex;
+    'Compact<EraIndex>': Compact<EraIndex>;
+    'Option<EraIndex>': Option<EraIndex>;
+    'Vec<EraIndex>': Vec<EraIndex>;
+    EraRewardPoints: EraRewardPoints;
+    'Option<EraRewardPoints>': Option<EraRewardPoints>;
+    'Vec<EraRewardPoints>': Vec<EraRewardPoints>;
+    EraRewards: EraRewards;
+    'Option<EraRewards>': Option<EraRewards>;
+    'Vec<EraRewards>': Vec<EraRewards>;
+    Exposure: Exposure;
+    'Option<Exposure>': Option<Exposure>;
+    'Vec<Exposure>': Vec<Exposure>;
+    Forcing: Forcing;
+    'Option<Forcing>': Option<Forcing>;
+    'Vec<Forcing>': Vec<Forcing>;
+    IndividualExposure: IndividualExposure;
+    'Option<IndividualExposure>': Option<IndividualExposure>;
+    'Vec<IndividualExposure>': Vec<IndividualExposure>;
+    KeyType: KeyType;
+    'Option<KeyType>': Option<KeyType>;
+    'Vec<KeyType>': Vec<KeyType>;
+    MomentOf: MomentOf;
+    'Option<MomentOf>': Option<MomentOf>;
+    'Vec<MomentOf>': Vec<MomentOf>;
+    Nominations: Nominations;
+    'Option<Nominations>': Option<Nominations>;
+    'Vec<Nominations>': Vec<Nominations>;
+    NominatorIndex: NominatorIndex;
+    'Compact<NominatorIndex>': Compact<NominatorIndex>;
+    'Option<NominatorIndex>': Option<NominatorIndex>;
+    'Vec<NominatorIndex>': Vec<NominatorIndex>;
+    OffchainAccuracy: OffchainAccuracy;
+    'Option<OffchainAccuracy>': Option<OffchainAccuracy>;
+    'Vec<OffchainAccuracy>': Vec<OffchainAccuracy>;
+    PerU16: PerU16;
+    'Compact<PerU16>': Compact<PerU16>;
+    'Option<PerU16>': Option<PerU16>;
+    'Vec<PerU16>': Vec<PerU16>;
+    PhragmenScore: PhragmenScore;
+    'Option<PhragmenScore>': Option<PhragmenScore>;
+    'Vec<PhragmenScore>': Vec<PhragmenScore>;
+    RewardDestination: RewardDestination;
+    'Option<RewardDestination>': Option<RewardDestination>;
+    'Vec<RewardDestination>': Vec<RewardDestination>;
+    RewardPoint: RewardPoint;
+    'Compact<RewardPoint>': Compact<RewardPoint>;
+    'Option<RewardPoint>': Option<RewardPoint>;
+    'Vec<RewardPoint>': Vec<RewardPoint>;
+    SlashJournalEntry: SlashJournalEntry;
+    'Option<SlashJournalEntry>': Option<SlashJournalEntry>;
+    'Vec<SlashJournalEntry>': Vec<SlashJournalEntry>;
+    SlashingSpansTo204: SlashingSpansTo204;
+    'Option<SlashingSpansTo204>': Option<SlashingSpansTo204>;
+    'Vec<SlashingSpansTo204>': Vec<SlashingSpansTo204>;
+    SlashingSpans: SlashingSpans;
+    'Option<SlashingSpans>': Option<SlashingSpans>;
+    'Vec<SlashingSpans>': Vec<SlashingSpans>;
+    SpanIndex: SpanIndex;
+    'Compact<SpanIndex>': Compact<SpanIndex>;
+    'Option<SpanIndex>': Option<SpanIndex>;
+    'Vec<SpanIndex>': Vec<SpanIndex>;
+    SpanRecord: SpanRecord;
+    'Option<SpanRecord>': Option<SpanRecord>;
+    'Vec<SpanRecord>': Vec<SpanRecord>;
+    StakingLedgerTo223: StakingLedgerTo223;
+    'Option<StakingLedgerTo223>': Option<StakingLedgerTo223>;
+    'Vec<StakingLedgerTo223>': Vec<StakingLedgerTo223>;
+    StakingLedgerTo240: StakingLedgerTo240;
+    'Option<StakingLedgerTo240>': Option<StakingLedgerTo240>;
+    'Vec<StakingLedgerTo240>': Vec<StakingLedgerTo240>;
+    StakingLedger: StakingLedger;
+    'Option<StakingLedger>': Option<StakingLedger>;
+    'Vec<StakingLedger>': Vec<StakingLedger>;
+    UnappliedSlashOther: UnappliedSlashOther;
+    'Option<UnappliedSlashOther>': Option<UnappliedSlashOther>;
+    'Vec<UnappliedSlashOther>': Vec<UnappliedSlashOther>;
+    UnappliedSlash: UnappliedSlash;
+    'Option<UnappliedSlash>': Option<UnappliedSlash>;
+    'Vec<UnappliedSlash>': Vec<UnappliedSlash>;
+    UnlockChunk: UnlockChunk;
+    'Option<UnlockChunk>': Option<UnlockChunk>;
+    'Vec<UnlockChunk>': Vec<UnlockChunk>;
+    ValidatorIndex: ValidatorIndex;
+    'Compact<ValidatorIndex>': Compact<ValidatorIndex>;
+    'Option<ValidatorIndex>': Option<ValidatorIndex>;
+    'Vec<ValidatorIndex>': Vec<ValidatorIndex>;
+    ValidatorPrefs: ValidatorPrefs;
+    'Option<ValidatorPrefs>': Option<ValidatorPrefs>;
+    'Vec<ValidatorPrefs>': Vec<ValidatorPrefs>;
+    ValidatorPrefsTo196: ValidatorPrefsTo196;
+    'Option<ValidatorPrefsTo196>': Option<ValidatorPrefsTo196>;
+    'Vec<ValidatorPrefsTo196>': Vec<ValidatorPrefsTo196>;
+    ValidatorPrefsTo145: ValidatorPrefsTo145;
+    'Option<ValidatorPrefsTo145>': Option<ValidatorPrefsTo145>;
+    'Vec<ValidatorPrefsTo145>': Vec<ValidatorPrefsTo145>;
+    WeightToFeeCoefficient: WeightToFeeCoefficient;
+    'Option<WeightToFeeCoefficient>': Option<WeightToFeeCoefficient>;
+    'Vec<WeightToFeeCoefficient>': Vec<WeightToFeeCoefficient>;
+    AccountInfo: AccountInfo;
+    'Option<AccountInfo>': Option<AccountInfo>;
+    'Vec<AccountInfo>': Vec<AccountInfo>;
+    ApplyExtrinsicResult: ApplyExtrinsicResult;
+    'Option<ApplyExtrinsicResult>': Option<ApplyExtrinsicResult>;
+    'Vec<ApplyExtrinsicResult>': Vec<ApplyExtrinsicResult>;
+    ChainProperties: ChainProperties;
+    'Option<ChainProperties>': Option<ChainProperties>;
+    'Vec<ChainProperties>': Vec<ChainProperties>;
+    ChainType: ChainType;
+    'Option<ChainType>': Option<ChainType>;
+    'Vec<ChainType>': Vec<ChainType>;
+    DigestOf: DigestOf;
+    'Option<DigestOf>': Option<DigestOf>;
+    'Vec<DigestOf>': Vec<DigestOf>;
+    DispatchClass: DispatchClass;
+    'Option<DispatchClass>': Option<DispatchClass>;
+    'Vec<DispatchClass>': Vec<DispatchClass>;
+    DispatchError: DispatchError;
+    'Option<DispatchError>': Option<DispatchError>;
+    'Vec<DispatchError>': Vec<DispatchError>;
+    DispatchErrorModule: DispatchErrorModule;
+    'Option<DispatchErrorModule>': Option<DispatchErrorModule>;
+    'Vec<DispatchErrorModule>': Vec<DispatchErrorModule>;
+    DispatchErrorTo198: DispatchErrorTo198;
+    'Option<DispatchErrorTo198>': Option<DispatchErrorTo198>;
+    'Vec<DispatchErrorTo198>': Vec<DispatchErrorTo198>;
+    DispatchInfo: DispatchInfo;
+    'Option<DispatchInfo>': Option<DispatchInfo>;
+    'Vec<DispatchInfo>': Vec<DispatchInfo>;
+    DispatchInfoTo190: DispatchInfoTo190;
+    'Option<DispatchInfoTo190>': Option<DispatchInfoTo190>;
+    'Vec<DispatchInfoTo190>': Vec<DispatchInfoTo190>;
+    DispatchInfoTo244: DispatchInfoTo244;
+    'Option<DispatchInfoTo244>': Option<DispatchInfoTo244>;
+    'Vec<DispatchInfoTo244>': Vec<DispatchInfoTo244>;
+    DispatchOutcome: DispatchOutcome;
+    'Option<DispatchOutcome>': Option<DispatchOutcome>;
+    'Vec<DispatchOutcome>': Vec<DispatchOutcome>;
+    DispatchResult: DispatchResult;
+    'Option<DispatchResult>': Option<DispatchResult>;
+    'Vec<DispatchResult>': Vec<DispatchResult>;
+    DispatchResultOf: DispatchResultOf;
+    'Option<DispatchResultOf>': Option<DispatchResultOf>;
+    'Vec<DispatchResultOf>': Vec<DispatchResultOf>;
+    DispatchResultTo198: DispatchResultTo198;
+    'Option<DispatchResultTo198>': Option<DispatchResultTo198>;
+    'Vec<DispatchResultTo198>': Vec<DispatchResultTo198>;
+    Event: Event;
+    'Option<Event>': Option<Event>;
+    'Vec<Event>': Vec<Event>;
+    EventId: EventId;
+    'Option<EventId>': Option<EventId>;
+    'Vec<EventId>': Vec<EventId>;
+    EventIndex: EventIndex;
+    'Compact<EventIndex>': Compact<EventIndex>;
+    'Option<EventIndex>': Option<EventIndex>;
+    'Vec<EventIndex>': Vec<EventIndex>;
+    EventRecord: EventRecord;
+    'Option<EventRecord>': Option<EventRecord>;
+    'Vec<EventRecord>': Vec<EventRecord>;
+    EventRecordTo76: EventRecordTo76;
+    'Option<EventRecordTo76>': Option<EventRecordTo76>;
+    'Vec<EventRecordTo76>': Vec<EventRecordTo76>;
+    Health: Health;
+    'Option<Health>': Option<Health>;
+    'Vec<Health>': Vec<Health>;
+    InvalidTransaction: InvalidTransaction;
+    'Option<InvalidTransaction>': Option<InvalidTransaction>;
+    'Vec<InvalidTransaction>': Vec<InvalidTransaction>;
+    Key: Key;
+    'Option<Key>': Option<Key>;
+    'Vec<Key>': Vec<Key>;
+    LastRuntimeUpgradeInfo: LastRuntimeUpgradeInfo;
+    'Option<LastRuntimeUpgradeInfo>': Option<LastRuntimeUpgradeInfo>;
+    'Vec<LastRuntimeUpgradeInfo>': Vec<LastRuntimeUpgradeInfo>;
+    NetworkState: NetworkState;
+    'Option<NetworkState>': Option<NetworkState>;
+    'Vec<NetworkState>': Vec<NetworkState>;
+    NetworkStatePeerset: NetworkStatePeerset;
+    'Option<NetworkStatePeerset>': Option<NetworkStatePeerset>;
+    'Vec<NetworkStatePeerset>': Vec<NetworkStatePeerset>;
+    NetworkStatePeersetInfo: NetworkStatePeersetInfo;
+    'Option<NetworkStatePeersetInfo>': Option<NetworkStatePeersetInfo>;
+    'Vec<NetworkStatePeersetInfo>': Vec<NetworkStatePeersetInfo>;
+    NodeRole: NodeRole;
+    'Option<NodeRole>': Option<NodeRole>;
+    'Vec<NodeRole>': Vec<NodeRole>;
+    NotConnectedPeer: NotConnectedPeer;
+    'Option<NotConnectedPeer>': Option<NotConnectedPeer>;
+    'Vec<NotConnectedPeer>': Vec<NotConnectedPeer>;
+    Peer: Peer;
+    'Option<Peer>': Option<Peer>;
+    'Vec<Peer>': Vec<Peer>;
+    PeerEndpoint: PeerEndpoint;
+    'Option<PeerEndpoint>': Option<PeerEndpoint>;
+    'Vec<PeerEndpoint>': Vec<PeerEndpoint>;
+    PeerEndpointAddr: PeerEndpointAddr;
+    'Option<PeerEndpointAddr>': Option<PeerEndpointAddr>;
+    'Vec<PeerEndpointAddr>': Vec<PeerEndpointAddr>;
+    PeerPing: PeerPing;
+    'Option<PeerPing>': Option<PeerPing>;
+    'Vec<PeerPing>': Vec<PeerPing>;
+    PeerInfo: PeerInfo;
+    'Option<PeerInfo>': Option<PeerInfo>;
+    'Vec<PeerInfo>': Vec<PeerInfo>;
+    Phase: Phase;
+    'Option<Phase>': Option<Phase>;
+    'Vec<Phase>': Vec<Phase>;
+    RefCount: RefCount;
+    'Compact<RefCount>': Compact<RefCount>;
+    'Option<RefCount>': Option<RefCount>;
+    'Vec<RefCount>': Vec<RefCount>;
+    TransactionValidityError: TransactionValidityError;
+    'Option<TransactionValidityError>': Option<TransactionValidityError>;
+    'Vec<TransactionValidityError>': Vec<TransactionValidityError>;
+    UnknownTransaction: UnknownTransaction;
+    'Option<UnknownTransaction>': Option<UnknownTransaction>;
+    'Vec<UnknownTransaction>': Vec<UnknownTransaction>;
+    OpenTip: OpenTip;
+    'Option<OpenTip>': Option<OpenTip>;
+    'Vec<OpenTip>': Vec<OpenTip>;
+    OpenTipTo225: OpenTipTo225;
+    'Option<OpenTipTo225>': Option<OpenTipTo225>;
+    'Vec<OpenTipTo225>': Vec<OpenTipTo225>;
+    OpenTipFinderTo225: OpenTipFinderTo225;
+    'Option<OpenTipFinderTo225>': Option<OpenTipFinderTo225>;
+    'Vec<OpenTipFinderTo225>': Vec<OpenTipFinderTo225>;
+    OpenTipTip: OpenTipTip;
+    'Option<OpenTipTip>': Option<OpenTipTip>;
+    'Vec<OpenTipTip>': Vec<OpenTipTip>;
+    TreasuryProposal: TreasuryProposal;
+    'Option<TreasuryProposal>': Option<TreasuryProposal>;
+    'Vec<TreasuryProposal>': Vec<TreasuryProposal>;
+    Multiplier: Multiplier;
+    'Option<Multiplier>': Option<Multiplier>;
+    'Vec<Multiplier>': Vec<Multiplier>;
+    CallHash: CallHash;
+    'Option<CallHash>': Option<CallHash>;
+    'Vec<CallHash>': Vec<CallHash>;
+    Multisig: Multisig;
+    'Option<Multisig>': Option<Multisig>;
+    'Vec<Multisig>': Vec<Multisig>;
+    Timepoint: Timepoint;
+    'Option<Timepoint>': Option<Timepoint>;
+    'Vec<Timepoint>': Vec<Timepoint>;
+    VestingInfo: VestingInfo;
+    'Option<VestingInfo>': Option<VestingInfo>;
+    'Vec<VestingInfo>': Vec<VestingInfo>;
+    BlockAttestations: BlockAttestations;
+    'Option<BlockAttestations>': Option<BlockAttestations>;
+    'Vec<BlockAttestations>': Vec<BlockAttestations>;
+    IncludedBlocks: IncludedBlocks;
+    'Option<IncludedBlocks>': Option<IncludedBlocks>;
+    'Vec<IncludedBlocks>': Vec<IncludedBlocks>;
+    MoreAttestations: MoreAttestations;
+    'Option<MoreAttestations>': Option<MoreAttestations>;
+    'Vec<MoreAttestations>': Vec<MoreAttestations>;
+    EthereumAddress: EthereumAddress;
+    'Option<EthereumAddress>': Option<EthereumAddress>;
+    'Vec<EthereumAddress>': Vec<EthereumAddress>;
+    StatementKind: StatementKind;
+    'Option<StatementKind>': Option<StatementKind>;
+    'Vec<StatementKind>': Vec<StatementKind>;
+    AbridgedCandidateReceipt: AbridgedCandidateReceipt;
+    'Option<AbridgedCandidateReceipt>': Option<AbridgedCandidateReceipt>;
+    'Vec<AbridgedCandidateReceipt>': Vec<AbridgedCandidateReceipt>;
+    AttestedCandidate: AttestedCandidate;
+    'Option<AttestedCandidate>': Option<AttestedCandidate>;
+    'Vec<AttestedCandidate>': Vec<AttestedCandidate>;
+    AuctionIndex: AuctionIndex;
+    'Compact<AuctionIndex>': Compact<AuctionIndex>;
+    'Option<AuctionIndex>': Option<AuctionIndex>;
+    'Vec<AuctionIndex>': Vec<AuctionIndex>;
+    Bidder: Bidder;
+    'Option<Bidder>': Option<Bidder>;
+    'Vec<Bidder>': Vec<Bidder>;
+    CandidateCommitments: CandidateCommitments;
+    'Option<CandidateCommitments>': Option<CandidateCommitments>;
+    'Vec<CandidateCommitments>': Vec<CandidateCommitments>;
+    CandidateReceipt: CandidateReceipt;
+    'Option<CandidateReceipt>': Option<CandidateReceipt>;
+    'Vec<CandidateReceipt>': Vec<CandidateReceipt>;
+    CollatorId: CollatorId;
+    'Option<CollatorId>': Option<CollatorId>;
+    'Vec<CollatorId>': Vec<CollatorId>;
+    CollatorSignature: CollatorSignature;
+    'Option<CollatorSignature>': Option<CollatorSignature>;
+    'Vec<CollatorSignature>': Vec<CollatorSignature>;
+    DoubleVoteReport: DoubleVoteReport;
+    'Option<DoubleVoteReport>': Option<DoubleVoteReport>;
+    'Vec<DoubleVoteReport>': Vec<DoubleVoteReport>;
+    DownwardMessage: DownwardMessage;
+    'Option<DownwardMessage>': Option<DownwardMessage>;
+    'Vec<DownwardMessage>': Vec<DownwardMessage>;
+    GlobalValidationSchedule: GlobalValidationSchedule;
+    'Option<GlobalValidationSchedule>': Option<GlobalValidationSchedule>;
+    'Vec<GlobalValidationSchedule>': Vec<GlobalValidationSchedule>;
+    HeadData: HeadData;
+    'Option<HeadData>': Option<HeadData>;
+    'Vec<HeadData>': Vec<HeadData>;
+    IncomingParachain: IncomingParachain;
+    'Option<IncomingParachain>': Option<IncomingParachain>;
+    'Vec<IncomingParachain>': Vec<IncomingParachain>;
+    IncomingParachainFixed: IncomingParachainFixed;
+    'Option<IncomingParachainFixed>': Option<IncomingParachainFixed>;
+    'Vec<IncomingParachainFixed>': Vec<IncomingParachainFixed>;
+    IncomingParachainDeploy: IncomingParachainDeploy;
+    'Option<IncomingParachainDeploy>': Option<IncomingParachainDeploy>;
+    'Vec<IncomingParachainDeploy>': Vec<IncomingParachainDeploy>;
+    LeasePeriod: LeasePeriod;
+    'Option<LeasePeriod>': Option<LeasePeriod>;
+    'Vec<LeasePeriod>': Vec<LeasePeriod>;
+    LeasePeriodOf: LeasePeriodOf;
+    'Option<LeasePeriodOf>': Option<LeasePeriodOf>;
+    'Vec<LeasePeriodOf>': Vec<LeasePeriodOf>;
+    LocalValidationData: LocalValidationData;
+    'Option<LocalValidationData>': Option<LocalValidationData>;
+    'Vec<LocalValidationData>': Vec<LocalValidationData>;
+    NewBidder: NewBidder;
+    'Option<NewBidder>': Option<NewBidder>;
+    'Vec<NewBidder>': Vec<NewBidder>;
+    ParachainDispatchOrigin: ParachainDispatchOrigin;
+    'Option<ParachainDispatchOrigin>': Option<ParachainDispatchOrigin>;
+    'Vec<ParachainDispatchOrigin>': Vec<ParachainDispatchOrigin>;
+    ParaId: ParaId;
+    'Compact<ParaId>': Compact<ParaId>;
+    'Option<ParaId>': Option<ParaId>;
+    'Vec<ParaId>': Vec<ParaId>;
+    ParaInfo: ParaInfo;
+    'Option<ParaInfo>': Option<ParaInfo>;
+    'Vec<ParaInfo>': Vec<ParaInfo>;
+    ParaPastCodeMeta: ParaPastCodeMeta;
+    'Option<ParaPastCodeMeta>': Option<ParaPastCodeMeta>;
+    'Vec<ParaPastCodeMeta>': Vec<ParaPastCodeMeta>;
+    ParaScheduling: ParaScheduling;
+    'Option<ParaScheduling>': Option<ParaScheduling>;
+    'Vec<ParaScheduling>': Vec<ParaScheduling>;
+    Remark: Remark;
+    'Option<Remark>': Option<Remark>;
+    'Vec<Remark>': Vec<Remark>;
+    Retriable: Retriable;
+    'Option<Retriable>': Option<Retriable>;
+    'Vec<Retriable>': Vec<Retriable>;
+    Scheduling: Scheduling;
+    'Option<Scheduling>': Option<Scheduling>;
+    'Vec<Scheduling>': Vec<Scheduling>;
+    SigningContext: SigningContext;
+    'Option<SigningContext>': Option<SigningContext>;
+    'Vec<SigningContext>': Vec<SigningContext>;
+    SlotRange: SlotRange;
+    'Option<SlotRange>': Option<SlotRange>;
+    'Vec<SlotRange>': Vec<SlotRange>;
+    Statement: Statement;
+    'Option<Statement>': Option<Statement>;
+    'Vec<Statement>': Vec<Statement>;
+    SubId: SubId;
+    'Compact<SubId>': Compact<SubId>;
+    'Option<SubId>': Option<SubId>;
+    'Vec<SubId>': Vec<SubId>;
+    UpwardMessage: UpwardMessage;
+    'Option<UpwardMessage>': Option<UpwardMessage>;
+    'Vec<UpwardMessage>': Vec<UpwardMessage>;
+    ValidationCode: ValidationCode;
+    'Option<ValidationCode>': Option<ValidationCode>;
+    'Vec<ValidationCode>': Vec<ValidationCode>;
+    ValidatorSignature: ValidatorSignature;
+    'Option<ValidatorSignature>': Option<ValidatorSignature>;
+    'Vec<ValidatorSignature>': Vec<ValidatorSignature>;
+    ValidityAttestation: ValidityAttestation;
+    'Option<ValidityAttestation>': Option<ValidityAttestation>;
+    'Vec<ValidityAttestation>': Vec<ValidityAttestation>;
+    WinningData: WinningData;
+    'Option<WinningData>': Option<WinningData>;
+    'Vec<WinningData>': Vec<WinningData>;
+    WinningDataEntry: WinningDataEntry;
+    'Option<WinningDataEntry>': Option<WinningDataEntry>;
+    'Vec<WinningDataEntry>': Vec<WinningDataEntry>;
+    Approvals: Approvals;
+    'Option<Approvals>': Option<Approvals>;
+    'Vec<Approvals>': Vec<Approvals>;
+    AccountStatus: AccountStatus;
+    'Option<AccountStatus>': Option<AccountStatus>;
+    'Vec<AccountStatus>': Vec<AccountStatus>;
+    AccountValidity: AccountValidity;
+    'Option<AccountValidity>': Option<AccountValidity>;
+    'Vec<AccountValidity>': Vec<AccountValidity>;
+    CallMetadataV0: CallMetadataV0;
+    'Option<CallMetadataV0>': Option<CallMetadataV0>;
+    'Vec<CallMetadataV0>': Vec<CallMetadataV0>;
+    EventMetadataV0: EventMetadataV0;
+    'Option<EventMetadataV0>': Option<EventMetadataV0>;
+    'Vec<EventMetadataV0>': Vec<EventMetadataV0>;
+    FunctionArgumentMetadataV0: FunctionArgumentMetadataV0;
+    'Option<FunctionArgumentMetadataV0>': Option<FunctionArgumentMetadataV0>;
+    'Vec<FunctionArgumentMetadataV0>': Vec<FunctionArgumentMetadataV0>;
+    FunctionMetadataV0: FunctionMetadataV0;
+    'Option<FunctionMetadataV0>': Option<FunctionMetadataV0>;
+    'Vec<FunctionMetadataV0>': Vec<FunctionMetadataV0>;
+    MapTypeV0: MapTypeV0;
+    'Option<MapTypeV0>': Option<MapTypeV0>;
+    'Vec<MapTypeV0>': Vec<MapTypeV0>;
+    MetadataV0: MetadataV0;
+    'Option<MetadataV0>': Option<MetadataV0>;
+    'Vec<MetadataV0>': Vec<MetadataV0>;
+    ModuleMetadataV0: ModuleMetadataV0;
+    'Option<ModuleMetadataV0>': Option<ModuleMetadataV0>;
+    'Vec<ModuleMetadataV0>': Vec<ModuleMetadataV0>;
+    OuterDispatchCallV0: OuterDispatchCallV0;
+    'Option<OuterDispatchCallV0>': Option<OuterDispatchCallV0>;
+    'Vec<OuterDispatchCallV0>': Vec<OuterDispatchCallV0>;
+    OuterDispatchMetadataV0: OuterDispatchMetadataV0;
+    'Option<OuterDispatchMetadataV0>': Option<OuterDispatchMetadataV0>;
+    'Vec<OuterDispatchMetadataV0>': Vec<OuterDispatchMetadataV0>;
+    OuterEventEventMetadataEventsV0: OuterEventEventMetadataEventsV0;
+    'Option<OuterEventEventMetadataEventsV0>': Option<OuterEventEventMetadataEventsV0>;
+    'Vec<OuterEventEventMetadataEventsV0>': Vec<OuterEventEventMetadataEventsV0>;
+    OuterEventEventMetadataV0: OuterEventEventMetadataV0;
+    'Option<OuterEventEventMetadataV0>': Option<OuterEventEventMetadataV0>;
+    'Vec<OuterEventEventMetadataV0>': Vec<OuterEventEventMetadataV0>;
+    OuterEventMetadataV0: OuterEventMetadataV0;
+    'Option<OuterEventMetadataV0>': Option<OuterEventMetadataV0>;
+    'Vec<OuterEventMetadataV0>': Vec<OuterEventMetadataV0>;
+    PlainTypeV0: PlainTypeV0;
+    'Option<PlainTypeV0>': Option<PlainTypeV0>;
+    'Vec<PlainTypeV0>': Vec<PlainTypeV0>;
+    RuntimeModuleMetadataV0: RuntimeModuleMetadataV0;
+    'Option<RuntimeModuleMetadataV0>': Option<RuntimeModuleMetadataV0>;
+    'Vec<RuntimeModuleMetadataV0>': Vec<RuntimeModuleMetadataV0>;
+    StorageFunctionMetadataV0: StorageFunctionMetadataV0;
+    'Option<StorageFunctionMetadataV0>': Option<StorageFunctionMetadataV0>;
+    'Vec<StorageFunctionMetadataV0>': Vec<StorageFunctionMetadataV0>;
+    StorageFunctionModifierV0: StorageFunctionModifierV0;
+    'Option<StorageFunctionModifierV0>': Option<StorageFunctionModifierV0>;
+    'Vec<StorageFunctionModifierV0>': Vec<StorageFunctionModifierV0>;
+    StorageFunctionTypeV0: StorageFunctionTypeV0;
+    'Option<StorageFunctionTypeV0>': Option<StorageFunctionTypeV0>;
+    'Vec<StorageFunctionTypeV0>': Vec<StorageFunctionTypeV0>;
+    StorageMetadataV0: StorageMetadataV0;
+    'Option<StorageMetadataV0>': Option<StorageMetadataV0>;
+    'Vec<StorageMetadataV0>': Vec<StorageMetadataV0>;
+    EventMetadataV1: EventMetadataV1;
+    'Option<EventMetadataV1>': Option<EventMetadataV1>;
+    'Vec<EventMetadataV1>': Vec<EventMetadataV1>;
+    FunctionArgumentMetadataV1: FunctionArgumentMetadataV1;
+    'Option<FunctionArgumentMetadataV1>': Option<FunctionArgumentMetadataV1>;
+    'Vec<FunctionArgumentMetadataV1>': Vec<FunctionArgumentMetadataV1>;
+    FunctionMetadataV1: FunctionMetadataV1;
+    'Option<FunctionMetadataV1>': Option<FunctionMetadataV1>;
+    'Vec<FunctionMetadataV1>': Vec<FunctionMetadataV1>;
+    MetadataV1: MetadataV1;
+    'Option<MetadataV1>': Option<MetadataV1>;
+    'Vec<MetadataV1>': Vec<MetadataV1>;
+    ModuleMetadataV1: ModuleMetadataV1;
+    'Option<ModuleMetadataV1>': Option<ModuleMetadataV1>;
+    'Vec<ModuleMetadataV1>': Vec<ModuleMetadataV1>;
+    StorageFunctionMetadataV1: StorageFunctionMetadataV1;
+    'Option<StorageFunctionMetadataV1>': Option<StorageFunctionMetadataV1>;
+    'Vec<StorageFunctionMetadataV1>': Vec<StorageFunctionMetadataV1>;
+    StorageFunctionModifierV1: StorageFunctionModifierV1;
+    'Option<StorageFunctionModifierV1>': Option<StorageFunctionModifierV1>;
+    'Vec<StorageFunctionModifierV1>': Vec<StorageFunctionModifierV1>;
+    StorageFunctionTypeV1: StorageFunctionTypeV1;
+    'Option<StorageFunctionTypeV1>': Option<StorageFunctionTypeV1>;
+    'Vec<StorageFunctionTypeV1>': Vec<StorageFunctionTypeV1>;
+    EventMetadataV2: EventMetadataV2;
+    'Option<EventMetadataV2>': Option<EventMetadataV2>;
+    'Vec<EventMetadataV2>': Vec<EventMetadataV2>;
+    FunctionArgumentMetadataV2: FunctionArgumentMetadataV2;
+    'Option<FunctionArgumentMetadataV2>': Option<FunctionArgumentMetadataV2>;
+    'Vec<FunctionArgumentMetadataV2>': Vec<FunctionArgumentMetadataV2>;
+    FunctionMetadataV2: FunctionMetadataV2;
+    'Option<FunctionMetadataV2>': Option<FunctionMetadataV2>;
+    'Vec<FunctionMetadataV2>': Vec<FunctionMetadataV2>;
+    MapTypeV2: MapTypeV2;
+    'Option<MapTypeV2>': Option<MapTypeV2>;
+    'Vec<MapTypeV2>': Vec<MapTypeV2>;
+    MetadataV2: MetadataV2;
+    'Option<MetadataV2>': Option<MetadataV2>;
+    'Vec<MetadataV2>': Vec<MetadataV2>;
+    ModuleMetadataV2: ModuleMetadataV2;
+    'Option<ModuleMetadataV2>': Option<ModuleMetadataV2>;
+    'Vec<ModuleMetadataV2>': Vec<ModuleMetadataV2>;
+    PlainTypeV2: PlainTypeV2;
+    'Option<PlainTypeV2>': Option<PlainTypeV2>;
+    'Vec<PlainTypeV2>': Vec<PlainTypeV2>;
+    StorageFunctionMetadataV2: StorageFunctionMetadataV2;
+    'Option<StorageFunctionMetadataV2>': Option<StorageFunctionMetadataV2>;
+    'Vec<StorageFunctionMetadataV2>': Vec<StorageFunctionMetadataV2>;
+    StorageFunctionModifierV2: StorageFunctionModifierV2;
+    'Option<StorageFunctionModifierV2>': Option<StorageFunctionModifierV2>;
+    'Vec<StorageFunctionModifierV2>': Vec<StorageFunctionModifierV2>;
+    StorageFunctionTypeV2: StorageFunctionTypeV2;
+    'Option<StorageFunctionTypeV2>': Option<StorageFunctionTypeV2>;
+    'Vec<StorageFunctionTypeV2>': Vec<StorageFunctionTypeV2>;
+    DoubleMapTypeV3: DoubleMapTypeV3;
+    'Option<DoubleMapTypeV3>': Option<DoubleMapTypeV3>;
+    'Vec<DoubleMapTypeV3>': Vec<DoubleMapTypeV3>;
+    EventMetadataV3: EventMetadataV3;
+    'Option<EventMetadataV3>': Option<EventMetadataV3>;
+    'Vec<EventMetadataV3>': Vec<EventMetadataV3>;
+    FunctionArgumentMetadataV3: FunctionArgumentMetadataV3;
+    'Option<FunctionArgumentMetadataV3>': Option<FunctionArgumentMetadataV3>;
+    'Vec<FunctionArgumentMetadataV3>': Vec<FunctionArgumentMetadataV3>;
+    FunctionMetadataV3: FunctionMetadataV3;
+    'Option<FunctionMetadataV3>': Option<FunctionMetadataV3>;
+    'Vec<FunctionMetadataV3>': Vec<FunctionMetadataV3>;
+    MapTypeV3: MapTypeV3;
+    'Option<MapTypeV3>': Option<MapTypeV3>;
+    'Vec<MapTypeV3>': Vec<MapTypeV3>;
+    MetadataV3: MetadataV3;
+    'Option<MetadataV3>': Option<MetadataV3>;
+    'Vec<MetadataV3>': Vec<MetadataV3>;
+    ModuleMetadataV3: ModuleMetadataV3;
+    'Option<ModuleMetadataV3>': Option<ModuleMetadataV3>;
+    'Vec<ModuleMetadataV3>': Vec<ModuleMetadataV3>;
+    PlainTypeV3: PlainTypeV3;
+    'Option<PlainTypeV3>': Option<PlainTypeV3>;
+    'Vec<PlainTypeV3>': Vec<PlainTypeV3>;
+    StorageFunctionMetadataV3: StorageFunctionMetadataV3;
+    'Option<StorageFunctionMetadataV3>': Option<StorageFunctionMetadataV3>;
+    'Vec<StorageFunctionMetadataV3>': Vec<StorageFunctionMetadataV3>;
+    StorageFunctionModifierV3: StorageFunctionModifierV3;
+    'Option<StorageFunctionModifierV3>': Option<StorageFunctionModifierV3>;
+    'Vec<StorageFunctionModifierV3>': Vec<StorageFunctionModifierV3>;
+    StorageFunctionTypeV3: StorageFunctionTypeV3;
+    'Option<StorageFunctionTypeV3>': Option<StorageFunctionTypeV3>;
+    'Vec<StorageFunctionTypeV3>': Vec<StorageFunctionTypeV3>;
+    DoubleMapTypeV4: DoubleMapTypeV4;
+    'Option<DoubleMapTypeV4>': Option<DoubleMapTypeV4>;
+    'Vec<DoubleMapTypeV4>': Vec<DoubleMapTypeV4>;
+    EventMetadataV4: EventMetadataV4;
+    'Option<EventMetadataV4>': Option<EventMetadataV4>;
+    'Vec<EventMetadataV4>': Vec<EventMetadataV4>;
+    FunctionArgumentMetadataV4: FunctionArgumentMetadataV4;
+    'Option<FunctionArgumentMetadataV4>': Option<FunctionArgumentMetadataV4>;
+    'Vec<FunctionArgumentMetadataV4>': Vec<FunctionArgumentMetadataV4>;
+    FunctionMetadataV4: FunctionMetadataV4;
+    'Option<FunctionMetadataV4>': Option<FunctionMetadataV4>;
+    'Vec<FunctionMetadataV4>': Vec<FunctionMetadataV4>;
+    MapTypeV4: MapTypeV4;
+    'Option<MapTypeV4>': Option<MapTypeV4>;
+    'Vec<MapTypeV4>': Vec<MapTypeV4>;
+    MetadataV4: MetadataV4;
+    'Option<MetadataV4>': Option<MetadataV4>;
+    'Vec<MetadataV4>': Vec<MetadataV4>;
+    ModuleMetadataV4: ModuleMetadataV4;
+    'Option<ModuleMetadataV4>': Option<ModuleMetadataV4>;
+    'Vec<ModuleMetadataV4>': Vec<ModuleMetadataV4>;
+    PlainTypeV4: PlainTypeV4;
+    'Option<PlainTypeV4>': Option<PlainTypeV4>;
+    'Vec<PlainTypeV4>': Vec<PlainTypeV4>;
+    StorageFunctionMetadataV4: StorageFunctionMetadataV4;
+    'Option<StorageFunctionMetadataV4>': Option<StorageFunctionMetadataV4>;
+    'Vec<StorageFunctionMetadataV4>': Vec<StorageFunctionMetadataV4>;
+    StorageFunctionModifierV4: StorageFunctionModifierV4;
+    'Option<StorageFunctionModifierV4>': Option<StorageFunctionModifierV4>;
+    'Vec<StorageFunctionModifierV4>': Vec<StorageFunctionModifierV4>;
+    StorageFunctionTypeV4: StorageFunctionTypeV4;
+    'Option<StorageFunctionTypeV4>': Option<StorageFunctionTypeV4>;
+    'Vec<StorageFunctionTypeV4>': Vec<StorageFunctionTypeV4>;
+    StorageHasherV4: StorageHasherV4;
+    'Option<StorageHasherV4>': Option<StorageHasherV4>;
+    'Vec<StorageHasherV4>': Vec<StorageHasherV4>;
+    DoubleMapTypeV5: DoubleMapTypeV5;
+    'Option<DoubleMapTypeV5>': Option<DoubleMapTypeV5>;
+    'Vec<DoubleMapTypeV5>': Vec<DoubleMapTypeV5>;
+    EventMetadataV5: EventMetadataV5;
+    'Option<EventMetadataV5>': Option<EventMetadataV5>;
+    'Vec<EventMetadataV5>': Vec<EventMetadataV5>;
+    FunctionArgumentMetadataV5: FunctionArgumentMetadataV5;
+    'Option<FunctionArgumentMetadataV5>': Option<FunctionArgumentMetadataV5>;
+    'Vec<FunctionArgumentMetadataV5>': Vec<FunctionArgumentMetadataV5>;
+    FunctionMetadataV5: FunctionMetadataV5;
+    'Option<FunctionMetadataV5>': Option<FunctionMetadataV5>;
+    'Vec<FunctionMetadataV5>': Vec<FunctionMetadataV5>;
+    MapTypeV5: MapTypeV5;
+    'Option<MapTypeV5>': Option<MapTypeV5>;
+    'Vec<MapTypeV5>': Vec<MapTypeV5>;
+    MetadataV5: MetadataV5;
+    'Option<MetadataV5>': Option<MetadataV5>;
+    'Vec<MetadataV5>': Vec<MetadataV5>;
+    ModuleMetadataV5: ModuleMetadataV5;
+    'Option<ModuleMetadataV5>': Option<ModuleMetadataV5>;
+    'Vec<ModuleMetadataV5>': Vec<ModuleMetadataV5>;
+    PlainTypeV5: PlainTypeV5;
+    'Option<PlainTypeV5>': Option<PlainTypeV5>;
+    'Vec<PlainTypeV5>': Vec<PlainTypeV5>;
+    StorageFunctionMetadataV5: StorageFunctionMetadataV5;
+    'Option<StorageFunctionMetadataV5>': Option<StorageFunctionMetadataV5>;
+    'Vec<StorageFunctionMetadataV5>': Vec<StorageFunctionMetadataV5>;
+    StorageFunctionModifierV5: StorageFunctionModifierV5;
+    'Option<StorageFunctionModifierV5>': Option<StorageFunctionModifierV5>;
+    'Vec<StorageFunctionModifierV5>': Vec<StorageFunctionModifierV5>;
+    StorageFunctionTypeV5: StorageFunctionTypeV5;
+    'Option<StorageFunctionTypeV5>': Option<StorageFunctionTypeV5>;
+    'Vec<StorageFunctionTypeV5>': Vec<StorageFunctionTypeV5>;
+    StorageHasherV5: StorageHasherV5;
+    'Option<StorageHasherV5>': Option<StorageHasherV5>;
+    'Vec<StorageHasherV5>': Vec<StorageHasherV5>;
+    DoubleMapTypeV6: DoubleMapTypeV6;
+    'Option<DoubleMapTypeV6>': Option<DoubleMapTypeV6>;
+    'Vec<DoubleMapTypeV6>': Vec<DoubleMapTypeV6>;
+    EventMetadataV6: EventMetadataV6;
+    'Option<EventMetadataV6>': Option<EventMetadataV6>;
+    'Vec<EventMetadataV6>': Vec<EventMetadataV6>;
+    FunctionArgumentMetadataV6: FunctionArgumentMetadataV6;
+    'Option<FunctionArgumentMetadataV6>': Option<FunctionArgumentMetadataV6>;
+    'Vec<FunctionArgumentMetadataV6>': Vec<FunctionArgumentMetadataV6>;
+    FunctionMetadataV6: FunctionMetadataV6;
+    'Option<FunctionMetadataV6>': Option<FunctionMetadataV6>;
+    'Vec<FunctionMetadataV6>': Vec<FunctionMetadataV6>;
+    MapTypeV6: MapTypeV6;
+    'Option<MapTypeV6>': Option<MapTypeV6>;
+    'Vec<MapTypeV6>': Vec<MapTypeV6>;
+    MetadataV6: MetadataV6;
+    'Option<MetadataV6>': Option<MetadataV6>;
+    'Vec<MetadataV6>': Vec<MetadataV6>;
+    ModuleConstantMetadataV6: ModuleConstantMetadataV6;
+    'Option<ModuleConstantMetadataV6>': Option<ModuleConstantMetadataV6>;
+    'Vec<ModuleConstantMetadataV6>': Vec<ModuleConstantMetadataV6>;
+    ModuleMetadataV6: ModuleMetadataV6;
+    'Option<ModuleMetadataV6>': Option<ModuleMetadataV6>;
+    'Vec<ModuleMetadataV6>': Vec<ModuleMetadataV6>;
+    PlainTypeV6: PlainTypeV6;
+    'Option<PlainTypeV6>': Option<PlainTypeV6>;
+    'Vec<PlainTypeV6>': Vec<PlainTypeV6>;
+    StorageEntryModifierV6: StorageEntryModifierV6;
+    'Option<StorageEntryModifierV6>': Option<StorageEntryModifierV6>;
+    'Vec<StorageEntryModifierV6>': Vec<StorageEntryModifierV6>;
+    StorageEntryMetadataV6: StorageEntryMetadataV6;
+    'Option<StorageEntryMetadataV6>': Option<StorageEntryMetadataV6>;
+    'Vec<StorageEntryMetadataV6>': Vec<StorageEntryMetadataV6>;
+    StorageEntryTypeV6: StorageEntryTypeV6;
+    'Option<StorageEntryTypeV6>': Option<StorageEntryTypeV6>;
+    'Vec<StorageEntryTypeV6>': Vec<StorageEntryTypeV6>;
+    StorageHasherV6: StorageHasherV6;
+    'Option<StorageHasherV6>': Option<StorageHasherV6>;
+    'Vec<StorageHasherV6>': Vec<StorageHasherV6>;
+    DoubleMapTypeV7: DoubleMapTypeV7;
+    'Option<DoubleMapTypeV7>': Option<DoubleMapTypeV7>;
+    'Vec<DoubleMapTypeV7>': Vec<DoubleMapTypeV7>;
+    EventMetadataV7: EventMetadataV7;
+    'Option<EventMetadataV7>': Option<EventMetadataV7>;
+    'Vec<EventMetadataV7>': Vec<EventMetadataV7>;
+    FunctionArgumentMetadataV7: FunctionArgumentMetadataV7;
+    'Option<FunctionArgumentMetadataV7>': Option<FunctionArgumentMetadataV7>;
+    'Vec<FunctionArgumentMetadataV7>': Vec<FunctionArgumentMetadataV7>;
+    FunctionMetadataV7: FunctionMetadataV7;
+    'Option<FunctionMetadataV7>': Option<FunctionMetadataV7>;
+    'Vec<FunctionMetadataV7>': Vec<FunctionMetadataV7>;
+    MapTypeV7: MapTypeV7;
+    'Option<MapTypeV7>': Option<MapTypeV7>;
+    'Vec<MapTypeV7>': Vec<MapTypeV7>;
+    MetadataV7: MetadataV7;
+    'Option<MetadataV7>': Option<MetadataV7>;
+    'Vec<MetadataV7>': Vec<MetadataV7>;
+    ModuleConstantMetadataV7: ModuleConstantMetadataV7;
+    'Option<ModuleConstantMetadataV7>': Option<ModuleConstantMetadataV7>;
+    'Vec<ModuleConstantMetadataV7>': Vec<ModuleConstantMetadataV7>;
+    ModuleMetadataV7: ModuleMetadataV7;
+    'Option<ModuleMetadataV7>': Option<ModuleMetadataV7>;
+    'Vec<ModuleMetadataV7>': Vec<ModuleMetadataV7>;
+    PlainTypeV7: PlainTypeV7;
+    'Option<PlainTypeV7>': Option<PlainTypeV7>;
+    'Vec<PlainTypeV7>': Vec<PlainTypeV7>;
+    StorageEntryModifierV7: StorageEntryModifierV7;
+    'Option<StorageEntryModifierV7>': Option<StorageEntryModifierV7>;
+    'Vec<StorageEntryModifierV7>': Vec<StorageEntryModifierV7>;
+    StorageEntryMetadataV7: StorageEntryMetadataV7;
+    'Option<StorageEntryMetadataV7>': Option<StorageEntryMetadataV7>;
+    'Vec<StorageEntryMetadataV7>': Vec<StorageEntryMetadataV7>;
+    StorageEntryTypeV7: StorageEntryTypeV7;
+    'Option<StorageEntryTypeV7>': Option<StorageEntryTypeV7>;
+    'Vec<StorageEntryTypeV7>': Vec<StorageEntryTypeV7>;
+    StorageHasherV7: StorageHasherV7;
+    'Option<StorageHasherV7>': Option<StorageHasherV7>;
+    'Vec<StorageHasherV7>': Vec<StorageHasherV7>;
+    StorageMetadataV7: StorageMetadataV7;
+    'Option<StorageMetadataV7>': Option<StorageMetadataV7>;
+    'Vec<StorageMetadataV7>': Vec<StorageMetadataV7>;
+    DoubleMapTypeV8: DoubleMapTypeV8;
+    'Option<DoubleMapTypeV8>': Option<DoubleMapTypeV8>;
+    'Vec<DoubleMapTypeV8>': Vec<DoubleMapTypeV8>;
+    ErrorMetadataV8: ErrorMetadataV8;
+    'Option<ErrorMetadataV8>': Option<ErrorMetadataV8>;
+    'Vec<ErrorMetadataV8>': Vec<ErrorMetadataV8>;
+    EventMetadataV8: EventMetadataV8;
+    'Option<EventMetadataV8>': Option<EventMetadataV8>;
+    'Vec<EventMetadataV8>': Vec<EventMetadataV8>;
+    FunctionArgumentMetadataV8: FunctionArgumentMetadataV8;
+    'Option<FunctionArgumentMetadataV8>': Option<FunctionArgumentMetadataV8>;
+    'Vec<FunctionArgumentMetadataV8>': Vec<FunctionArgumentMetadataV8>;
+    FunctionMetadataV8: FunctionMetadataV8;
+    'Option<FunctionMetadataV8>': Option<FunctionMetadataV8>;
+    'Vec<FunctionMetadataV8>': Vec<FunctionMetadataV8>;
+    MapTypeV8: MapTypeV8;
+    'Option<MapTypeV8>': Option<MapTypeV8>;
+    'Vec<MapTypeV8>': Vec<MapTypeV8>;
+    MetadataV8: MetadataV8;
+    'Option<MetadataV8>': Option<MetadataV8>;
+    'Vec<MetadataV8>': Vec<MetadataV8>;
+    ModuleConstantMetadataV8: ModuleConstantMetadataV8;
+    'Option<ModuleConstantMetadataV8>': Option<ModuleConstantMetadataV8>;
+    'Vec<ModuleConstantMetadataV8>': Vec<ModuleConstantMetadataV8>;
+    ModuleMetadataV8: ModuleMetadataV8;
+    'Option<ModuleMetadataV8>': Option<ModuleMetadataV8>;
+    'Vec<ModuleMetadataV8>': Vec<ModuleMetadataV8>;
+    PlainTypeV8: PlainTypeV8;
+    'Option<PlainTypeV8>': Option<PlainTypeV8>;
+    'Vec<PlainTypeV8>': Vec<PlainTypeV8>;
+    StorageEntryModifierV8: StorageEntryModifierV8;
+    'Option<StorageEntryModifierV8>': Option<StorageEntryModifierV8>;
+    'Vec<StorageEntryModifierV8>': Vec<StorageEntryModifierV8>;
+    StorageEntryMetadataV8: StorageEntryMetadataV8;
+    'Option<StorageEntryMetadataV8>': Option<StorageEntryMetadataV8>;
+    'Vec<StorageEntryMetadataV8>': Vec<StorageEntryMetadataV8>;
+    StorageEntryTypeV8: StorageEntryTypeV8;
+    'Option<StorageEntryTypeV8>': Option<StorageEntryTypeV8>;
+    'Vec<StorageEntryTypeV8>': Vec<StorageEntryTypeV8>;
+    StorageHasherV8: StorageHasherV8;
+    'Option<StorageHasherV8>': Option<StorageHasherV8>;
+    'Vec<StorageHasherV8>': Vec<StorageHasherV8>;
+    StorageMetadataV8: StorageMetadataV8;
+    'Option<StorageMetadataV8>': Option<StorageMetadataV8>;
+    'Vec<StorageMetadataV8>': Vec<StorageMetadataV8>;
+    DoubleMapTypeV9: DoubleMapTypeV9;
+    'Option<DoubleMapTypeV9>': Option<DoubleMapTypeV9>;
+    'Vec<DoubleMapTypeV9>': Vec<DoubleMapTypeV9>;
+    ErrorMetadataV9: ErrorMetadataV9;
+    'Option<ErrorMetadataV9>': Option<ErrorMetadataV9>;
+    'Vec<ErrorMetadataV9>': Vec<ErrorMetadataV9>;
+    EventMetadataV9: EventMetadataV9;
+    'Option<EventMetadataV9>': Option<EventMetadataV9>;
+    'Vec<EventMetadataV9>': Vec<EventMetadataV9>;
+    FunctionArgumentMetadataV9: FunctionArgumentMetadataV9;
+    'Option<FunctionArgumentMetadataV9>': Option<FunctionArgumentMetadataV9>;
+    'Vec<FunctionArgumentMetadataV9>': Vec<FunctionArgumentMetadataV9>;
+    FunctionMetadataV9: FunctionMetadataV9;
+    'Option<FunctionMetadataV9>': Option<FunctionMetadataV9>;
+    'Vec<FunctionMetadataV9>': Vec<FunctionMetadataV9>;
+    MapTypeV9: MapTypeV9;
+    'Option<MapTypeV9>': Option<MapTypeV9>;
+    'Vec<MapTypeV9>': Vec<MapTypeV9>;
+    MetadataV9: MetadataV9;
+    'Option<MetadataV9>': Option<MetadataV9>;
+    'Vec<MetadataV9>': Vec<MetadataV9>;
+    ModuleConstantMetadataV9: ModuleConstantMetadataV9;
+    'Option<ModuleConstantMetadataV9>': Option<ModuleConstantMetadataV9>;
+    'Vec<ModuleConstantMetadataV9>': Vec<ModuleConstantMetadataV9>;
+    ModuleMetadataV9: ModuleMetadataV9;
+    'Option<ModuleMetadataV9>': Option<ModuleMetadataV9>;
+    'Vec<ModuleMetadataV9>': Vec<ModuleMetadataV9>;
+    PlainTypeV9: PlainTypeV9;
+    'Option<PlainTypeV9>': Option<PlainTypeV9>;
+    'Vec<PlainTypeV9>': Vec<PlainTypeV9>;
+    StorageEntryModifierV9: StorageEntryModifierV9;
+    'Option<StorageEntryModifierV9>': Option<StorageEntryModifierV9>;
+    'Vec<StorageEntryModifierV9>': Vec<StorageEntryModifierV9>;
+    StorageEntryMetadataV9: StorageEntryMetadataV9;
+    'Option<StorageEntryMetadataV9>': Option<StorageEntryMetadataV9>;
+    'Vec<StorageEntryMetadataV9>': Vec<StorageEntryMetadataV9>;
+    StorageEntryTypeV9: StorageEntryTypeV9;
+    'Option<StorageEntryTypeV9>': Option<StorageEntryTypeV9>;
+    'Vec<StorageEntryTypeV9>': Vec<StorageEntryTypeV9>;
+    StorageHasherV9: StorageHasherV9;
+    'Option<StorageHasherV9>': Option<StorageHasherV9>;
+    'Vec<StorageHasherV9>': Vec<StorageHasherV9>;
+    StorageMetadataV9: StorageMetadataV9;
+    'Option<StorageMetadataV9>': Option<StorageMetadataV9>;
+    'Vec<StorageMetadataV9>': Vec<StorageMetadataV9>;
+    DoubleMapTypeV10: DoubleMapTypeV10;
+    'Option<DoubleMapTypeV10>': Option<DoubleMapTypeV10>;
+    'Vec<DoubleMapTypeV10>': Vec<DoubleMapTypeV10>;
+    ErrorMetadataV10: ErrorMetadataV10;
+    'Option<ErrorMetadataV10>': Option<ErrorMetadataV10>;
+    'Vec<ErrorMetadataV10>': Vec<ErrorMetadataV10>;
+    EventMetadataV10: EventMetadataV10;
+    'Option<EventMetadataV10>': Option<EventMetadataV10>;
+    'Vec<EventMetadataV10>': Vec<EventMetadataV10>;
+    FunctionArgumentMetadataV10: FunctionArgumentMetadataV10;
+    'Option<FunctionArgumentMetadataV10>': Option<FunctionArgumentMetadataV10>;
+    'Vec<FunctionArgumentMetadataV10>': Vec<FunctionArgumentMetadataV10>;
+    FunctionMetadataV10: FunctionMetadataV10;
+    'Option<FunctionMetadataV10>': Option<FunctionMetadataV10>;
+    'Vec<FunctionMetadataV10>': Vec<FunctionMetadataV10>;
+    MapTypeV10: MapTypeV10;
+    'Option<MapTypeV10>': Option<MapTypeV10>;
+    'Vec<MapTypeV10>': Vec<MapTypeV10>;
+    MetadataV10: MetadataV10;
+    'Option<MetadataV10>': Option<MetadataV10>;
+    'Vec<MetadataV10>': Vec<MetadataV10>;
+    ModuleConstantMetadataV10: ModuleConstantMetadataV10;
+    'Option<ModuleConstantMetadataV10>': Option<ModuleConstantMetadataV10>;
+    'Vec<ModuleConstantMetadataV10>': Vec<ModuleConstantMetadataV10>;
+    ModuleMetadataV10: ModuleMetadataV10;
+    'Option<ModuleMetadataV10>': Option<ModuleMetadataV10>;
+    'Vec<ModuleMetadataV10>': Vec<ModuleMetadataV10>;
+    PlainTypeV10: PlainTypeV10;
+    'Option<PlainTypeV10>': Option<PlainTypeV10>;
+    'Vec<PlainTypeV10>': Vec<PlainTypeV10>;
+    StorageEntryModifierV10: StorageEntryModifierV10;
+    'Option<StorageEntryModifierV10>': Option<StorageEntryModifierV10>;
+    'Vec<StorageEntryModifierV10>': Vec<StorageEntryModifierV10>;
+    StorageEntryMetadataV10: StorageEntryMetadataV10;
+    'Option<StorageEntryMetadataV10>': Option<StorageEntryMetadataV10>;
+    'Vec<StorageEntryMetadataV10>': Vec<StorageEntryMetadataV10>;
+    StorageEntryTypeV10: StorageEntryTypeV10;
+    'Option<StorageEntryTypeV10>': Option<StorageEntryTypeV10>;
+    'Vec<StorageEntryTypeV10>': Vec<StorageEntryTypeV10>;
+    StorageMetadataV10: StorageMetadataV10;
+    'Option<StorageMetadataV10>': Option<StorageMetadataV10>;
+    'Vec<StorageMetadataV10>': Vec<StorageMetadataV10>;
+    StorageHasherV10: StorageHasherV10;
+    'Option<StorageHasherV10>': Option<StorageHasherV10>;
+    'Vec<StorageHasherV10>': Vec<StorageHasherV10>;
+    DoubleMapTypeV11: DoubleMapTypeV11;
+    'Option<DoubleMapTypeV11>': Option<DoubleMapTypeV11>;
+    'Vec<DoubleMapTypeV11>': Vec<DoubleMapTypeV11>;
+    ErrorMetadataV11: ErrorMetadataV11;
+    'Option<ErrorMetadataV11>': Option<ErrorMetadataV11>;
+    'Vec<ErrorMetadataV11>': Vec<ErrorMetadataV11>;
+    EventMetadataV11: EventMetadataV11;
+    'Option<EventMetadataV11>': Option<EventMetadataV11>;
+    'Vec<EventMetadataV11>': Vec<EventMetadataV11>;
+    ExtrinsicMetadataV11: ExtrinsicMetadataV11;
+    'Option<ExtrinsicMetadataV11>': Option<ExtrinsicMetadataV11>;
+    'Vec<ExtrinsicMetadataV11>': Vec<ExtrinsicMetadataV11>;
+    FunctionArgumentMetadataV11: FunctionArgumentMetadataV11;
+    'Option<FunctionArgumentMetadataV11>': Option<FunctionArgumentMetadataV11>;
+    'Vec<FunctionArgumentMetadataV11>': Vec<FunctionArgumentMetadataV11>;
+    FunctionMetadataV11: FunctionMetadataV11;
+    'Option<FunctionMetadataV11>': Option<FunctionMetadataV11>;
+    'Vec<FunctionMetadataV11>': Vec<FunctionMetadataV11>;
+    MapTypeV11: MapTypeV11;
+    'Option<MapTypeV11>': Option<MapTypeV11>;
+    'Vec<MapTypeV11>': Vec<MapTypeV11>;
+    MetadataV11: MetadataV11;
+    'Option<MetadataV11>': Option<MetadataV11>;
+    'Vec<MetadataV11>': Vec<MetadataV11>;
+    ModuleConstantMetadataV11: ModuleConstantMetadataV11;
+    'Option<ModuleConstantMetadataV11>': Option<ModuleConstantMetadataV11>;
+    'Vec<ModuleConstantMetadataV11>': Vec<ModuleConstantMetadataV11>;
+    ModuleMetadataV11: ModuleMetadataV11;
+    'Option<ModuleMetadataV11>': Option<ModuleMetadataV11>;
+    'Vec<ModuleMetadataV11>': Vec<ModuleMetadataV11>;
+    PlainTypeV11: PlainTypeV11;
+    'Option<PlainTypeV11>': Option<PlainTypeV11>;
+    'Vec<PlainTypeV11>': Vec<PlainTypeV11>;
+    StorageEntryModifierV11: StorageEntryModifierV11;
+    'Option<StorageEntryModifierV11>': Option<StorageEntryModifierV11>;
+    'Vec<StorageEntryModifierV11>': Vec<StorageEntryModifierV11>;
+    StorageEntryMetadataV11: StorageEntryMetadataV11;
+    'Option<StorageEntryMetadataV11>': Option<StorageEntryMetadataV11>;
+    'Vec<StorageEntryMetadataV11>': Vec<StorageEntryMetadataV11>;
+    StorageEntryTypeV11: StorageEntryTypeV11;
+    'Option<StorageEntryTypeV11>': Option<StorageEntryTypeV11>;
+    'Vec<StorageEntryTypeV11>': Vec<StorageEntryTypeV11>;
+    StorageMetadataV11: StorageMetadataV11;
+    'Option<StorageMetadataV11>': Option<StorageMetadataV11>;
+    'Vec<StorageMetadataV11>': Vec<StorageMetadataV11>;
+    StorageHasherV11: StorageHasherV11;
+    'Option<StorageHasherV11>': Option<StorageHasherV11>;
+    'Vec<StorageHasherV11>': Vec<StorageHasherV11>;
+    DoubleMapTypeLatest: DoubleMapTypeLatest;
+    'Option<DoubleMapTypeLatest>': Option<DoubleMapTypeLatest>;
+    'Vec<DoubleMapTypeLatest>': Vec<DoubleMapTypeLatest>;
+    EventMetadataLatest: EventMetadataLatest;
+    'Option<EventMetadataLatest>': Option<EventMetadataLatest>;
+    'Vec<EventMetadataLatest>': Vec<EventMetadataLatest>;
+    ExtrinsicMetadataLatest: ExtrinsicMetadataLatest;
+    'Option<ExtrinsicMetadataLatest>': Option<ExtrinsicMetadataLatest>;
+    'Vec<ExtrinsicMetadataLatest>': Vec<ExtrinsicMetadataLatest>;
+    FunctionArgumentMetadataLatest: FunctionArgumentMetadataLatest;
+    'Option<FunctionArgumentMetadataLatest>': Option<FunctionArgumentMetadataLatest>;
+    'Vec<FunctionArgumentMetadataLatest>': Vec<FunctionArgumentMetadataLatest>;
+    FunctionMetadataLatest: FunctionMetadataLatest;
+    'Option<FunctionMetadataLatest>': Option<FunctionMetadataLatest>;
+    'Vec<FunctionMetadataLatest>': Vec<FunctionMetadataLatest>;
+    MapTypeLatest: MapTypeLatest;
+    'Option<MapTypeLatest>': Option<MapTypeLatest>;
+    'Vec<MapTypeLatest>': Vec<MapTypeLatest>;
+    MetadataLatest: MetadataLatest;
+    'Option<MetadataLatest>': Option<MetadataLatest>;
+    'Vec<MetadataLatest>': Vec<MetadataLatest>;
+    ModuleConstantMetadataLatest: ModuleConstantMetadataLatest;
+    'Option<ModuleConstantMetadataLatest>': Option<ModuleConstantMetadataLatest>;
+    'Vec<ModuleConstantMetadataLatest>': Vec<ModuleConstantMetadataLatest>;
+    ModuleMetadataLatest: ModuleMetadataLatest;
+    'Option<ModuleMetadataLatest>': Option<ModuleMetadataLatest>;
+    'Vec<ModuleMetadataLatest>': Vec<ModuleMetadataLatest>;
+    PlainTypeLatest: PlainTypeLatest;
+    'Option<PlainTypeLatest>': Option<PlainTypeLatest>;
+    'Vec<PlainTypeLatest>': Vec<PlainTypeLatest>;
+    StorageEntryMetadataLatest: StorageEntryMetadataLatest;
+    'Option<StorageEntryMetadataLatest>': Option<StorageEntryMetadataLatest>;
+    'Vec<StorageEntryMetadataLatest>': Vec<StorageEntryMetadataLatest>;
+    StorageEntryModifierLatest: StorageEntryModifierLatest;
+    'Option<StorageEntryModifierLatest>': Option<StorageEntryModifierLatest>;
+    'Vec<StorageEntryModifierLatest>': Vec<StorageEntryModifierLatest>;
+    StorageEntryTypeLatest: StorageEntryTypeLatest;
+    'Option<StorageEntryTypeLatest>': Option<StorageEntryTypeLatest>;
+    'Vec<StorageEntryTypeLatest>': Vec<StorageEntryTypeLatest>;
+    StorageMetadataLatest: StorageMetadataLatest;
+    'Option<StorageMetadataLatest>': Option<StorageMetadataLatest>;
+    'Vec<StorageMetadataLatest>': Vec<StorageMetadataLatest>;
+    StorageHasher: StorageHasher;
+    'Option<StorageHasher>': Option<StorageHasher>;
+    'Vec<StorageHasher>': Vec<StorageHasher>;
+    MetadataAll: MetadataAll;
+    'Option<MetadataAll>': Option<MetadataAll>;
+    'Vec<MetadataAll>': Vec<MetadataAll>;
+    RpcMethods: RpcMethods;
+    'Option<RpcMethods>': Option<RpcMethods>;
+    'Vec<RpcMethods>': Vec<RpcMethods>;
+    ExtrinsicOrHash: ExtrinsicOrHash;
+    'Option<ExtrinsicOrHash>': Option<ExtrinsicOrHash>;
+    'Vec<ExtrinsicOrHash>': Vec<ExtrinsicOrHash>;
+    ExtrinsicStatus: ExtrinsicStatus;
+    'Option<ExtrinsicStatus>': Option<ExtrinsicStatus>;
+    'Vec<ExtrinsicStatus>': Vec<ExtrinsicStatus>;
+    BlockHash: BlockHash;
+    'Option<BlockHash>': Option<BlockHash>;
+    'Vec<BlockHash>': Vec<BlockHash>;
+    PrefixedStorageKey: PrefixedStorageKey;
+    'Option<PrefixedStorageKey>': Option<PrefixedStorageKey>;
+    'Vec<PrefixedStorageKey>': Vec<PrefixedStorageKey>;
+    StorageKind: StorageKind;
+    'Option<StorageKind>': Option<StorageKind>;
+    'Vec<StorageKind>': Vec<StorageKind>;
+    RuntimeDispatchInfo: RuntimeDispatchInfo;
+    'Option<RuntimeDispatchInfo>': Option<RuntimeDispatchInfo>;
+    'Vec<RuntimeDispatchInfo>': Vec<RuntimeDispatchInfo>;
+    ApiId: ApiId;
+    'Option<ApiId>': Option<ApiId>;
+    'Vec<ApiId>': Vec<ApiId>;
+    KeyValueOption: KeyValueOption;
+    'Option<KeyValueOption>': Option<KeyValueOption>;
+    'Vec<KeyValueOption>': Vec<KeyValueOption>;
+    ReadProof: ReadProof;
+    'Option<ReadProof>': Option<ReadProof>;
+    'Vec<ReadProof>': Vec<ReadProof>;
+    RuntimeVersionApi: RuntimeVersionApi;
+    'Option<RuntimeVersionApi>': Option<RuntimeVersionApi>;
+    'Vec<RuntimeVersionApi>': Vec<RuntimeVersionApi>;
+    RuntimeVersion: RuntimeVersion;
+    'Option<RuntimeVersion>': Option<RuntimeVersion>;
+    'Vec<RuntimeVersion>': Vec<RuntimeVersion>;
+    StorageChangeSet: StorageChangeSet;
+    'Option<StorageChangeSet>': Option<StorageChangeSet>;
+    'Vec<StorageChangeSet>': Vec<StorageChangeSet>;
   }
 }
diff --git a/types/augment/all/definitions.ts b/types/augment/all/definitions.ts
new file mode 100644
index 0000000000..ba857e4bfd
--- /dev/null
+++ b/types/augment/all/definitions.ts
@@ -0,0 +1,5 @@
+const defs = require('./defs.json');
+
+export default {
+  types: defs
+}
diff --git a/types/augment/all/defs.json b/types/augment/all/defs.json
new file mode 100644
index 0000000000..cfc58e020e
--- /dev/null
+++ b/types/augment/all/defs.json
@@ -0,0 +1,867 @@
+{
+    "MemoText": "Text",
+    "Credential": "u64",
+    "CredentialSet": "Vec<Credential>",
+    "BlockAndTime": {
+        "block": "u32",
+        "time": "u64"
+    },
+    "ThreadId": "u64",
+    "PostId": "u64",
+    "InputValidationLengthConstraint": {
+        "min": "u16",
+        "max_min_diff": "u16"
+    },
+    "WorkingGroup": {
+        "_enum": [
+            "Storage"
+        ]
+    },
+    "SlashingTerms": {
+        "_enum": {
+            "Unslashable": "Null",
+            "Slashable": "SlashableTerms"
+        }
+    },
+    "SlashableTerms": {
+        "max_count": "u16",
+        "max_percent_pts_per_time": "u16"
+    },
+    "EntryMethod": {
+        "_enum": {
+            "Paid": "u64",
+            "Screening": "AccountId",
+            "Genesis": "Null"
+        }
+    },
+    "MemberId": "u64",
+    "PaidTermId": "u64",
+    "SubscriptionId": "u64",
+    "Membership": {
+        "handle": "Text",
+        "avatar_uri": "Text",
+        "about": "Text",
+        "registered_at_block": "u32",
+        "registered_at_time": "u64",
+        "entry": "EntryMethod",
+        "suspended": "bool",
+        "subscription": "Option<SubscriptionId>",
+        "root_account": "GenericAccountId",
+        "controller_account": "GenericAccountId"
+    },
+    "PaidMembershipTerms": {
+        "fee": "u128",
+        "text": "Text"
+    },
+    "ActorId": "u64",
+    "ElectionStage": {
+        "_enum": {
+            "Announcing": "u32",
+            "Voting": "u32",
+            "Revealing": "u32"
+        }
+    },
+    "ElectionStake": {
+        "new": "u128",
+        "transferred": "u128"
+    },
+    "SealedVote": {
+        "voter": "GenericAccountId",
+        "commitment": "[u8;32]",
+        "stake": "ElectionStake",
+        "vote": "Option<GenericAccountId>"
+    },
+    "TransferableStake": {
+        "seat": "u128",
+        "backing": "u128"
+    },
+    "ElectionParameters": {
+        "announcing_period": "u32",
+        "voting_period": "u32",
+        "revealing_period": "u32",
+        "council_size": "u32",
+        "candidacy_limit": "u32",
+        "new_term_duration": "u32",
+        "min_council_stake": "u128",
+        "min_voting_stake": "u128"
+    },
+    "Seat": {
+        "member": "GenericAccountId",
+        "stake": "u128",
+        "backers": "Backers"
+    },
+    "Seats": "Vec<Seat>",
+    "Backer": {
+        "member": "GenericAccountId",
+        "stake": "u128"
+    },
+    "Backers": "Vec<Backer>",
+    "RoleParameters": {
+        "min_stake": "u128",
+        "min_actors": "u32",
+        "max_actors": "u32",
+        "reward": "u128",
+        "reward_period": "u32",
+        "bonding_period": "u32",
+        "unbonding_period": "u32",
+        "min_service_period": "u32",
+        "startup_grace_period": "u32",
+        "entry_request_fee": "u128"
+    },
+    "PostTextChange": {
+        "expired_at": "BlockAndTime",
+        "text": "Text"
+    },
+    "ModerationAction": {
+        "moderated_at": "BlockAndTime",
+        "moderator_id": "GenericAccountId",
+        "rationale": "Text"
+    },
+    "ChildPositionInParentCategory": {
+        "parent_id": "CategoryId",
+        "child_nr_in_parent_category": "u32"
+    },
+    "CategoryId": "u64",
+    "Category": {
+        "id": "CategoryId",
+        "title": "Text",
+        "description": "Text",
+        "created_at": "BlockAndTime",
+        "deleted": "bool",
+        "archived": "bool",
+        "num_direct_subcategories": "u32",
+        "num_direct_unmoderated_threads": "u32",
+        "num_direct_moderated_threads": "u32",
+        "position_in_parent_category": "Option<ChildPositionInParentCategory>",
+        "moderator_id": "GenericAccountId"
+    },
+    "Thread": {
+        "id": "ThreadId",
+        "title": "Text",
+        "category_id": "CategoryId",
+        "nr_in_category": "u32",
+        "moderation": "Option<ModerationAction>",
+        "num_unmoderated_posts": "u32",
+        "num_moderated_posts": "u32",
+        "created_at": "BlockAndTime",
+        "author_id": "GenericAccountId"
+    },
+    "Post": {
+        "id": "PostId",
+        "thread_id": "ThreadId",
+        "nr_in_thread": "u32",
+        "current_text": "Text",
+        "moderation": "Option<ModerationAction>",
+        "text_change_history": "Vec<PostTextChange>",
+        "created_at": "BlockAndTime",
+        "author_id": "GenericAccountId"
+    },
+    "ReplyId": "u64",
+    "Reply": {
+        "owner": "GenericAccountId",
+        "thread_id": "ThreadId",
+        "text": "Text",
+        "moderation": "Option<ModerationAction>"
+    },
+    "StakeId": "u64",
+    "Stake": {
+        "created": "u32",
+        "staking_status": "StakingStatus"
+    },
+    "StakingStatus": {
+        "_enum": {
+            "NotStaked": "Null",
+            "Staked": "Staked"
+        }
+    },
+    "Staked": {
+        "staked_amount": "u128",
+        "staked_status": "StakedStatus",
+        "next_slash_id": "u64",
+        "ongoing_slashes": "BTreeMap<u64,Slash>"
+    },
+    "StakedStatus": {
+        "_enum": {
+            "Normal": "Null",
+            "Unstaking": "Unstaking"
+        }
+    },
+    "Unstaking": {
+        "started_at_block": "u32",
+        "is_active": "bool",
+        "blocks_remaining_in_active_period_for_unstaking": "u32"
+    },
+    "Slash": {
+        "started_at_block": "u32",
+        "is_active": "bool",
+        "blocks_remaining_in_active_period_for_slashing": "u32",
+        "slash_amount": "u128"
+    },
+    "MintId": "u64",
+    "Mint": {
+        "capacity": "u128",
+        "next_adjustment": "Option<NextAdjustment>",
+        "created_at": "u32",
+        "total_minted": "u128"
+    },
+    "MintBalanceOf": "Balance",
+    "BalanceOfMint": "Balance",
+    "NextAdjustment": {
+        "adjustment": "AdjustOnInterval",
+        "at_block": "u32"
+    },
+    "AdjustOnInterval": {
+        "block_interval": "u32",
+        "adjustment_type": "AdjustCapacityBy"
+    },
+    "AdjustCapacityBy": {
+        "_enum": {
+            "Setting": "u128",
+            "Adding": "u128",
+            "Reducing": "u128"
+        }
+    },
+    "RecipientId": "u64",
+    "RewardRelationshipId": "u64",
+    "Recipient": {
+        "total_reward_received": "u128",
+        "total_reward_missed": "u128"
+    },
+    "RewardRelationship": {
+        "recipient": "u64",
+        "mint_id": "u64",
+        "account": "GenericAccountId",
+        "amount_per_payout": "u128",
+        "next_payment_at_block": "Option<u32>",
+        "payout_interval": "Option<u32>",
+        "total_reward_received": "u128",
+        "total_reward_missed": "u128"
+    },
+    "ApplicationId": "u64",
+    "OpeningId": "u64",
+    "Application": {
+        "opening_id": "u64",
+        "application_index_in_opening": "u32",
+        "add_to_opening_in_block": "u32",
+        "active_role_staking_id": "Option<u64>",
+        "active_application_staking_id": "Option<u64>",
+        "stage": "ApplicationStage",
+        "human_readable_text": "Text"
+    },
+    "ApplicationStage": {
+        "_enum": {
+            "Active": "Null",
+            "Unstaking": "UnstakingApplicationStage",
+            "Inactive": "InactiveApplicationStage"
+        }
+    },
+    "ActivateOpeningAt": {
+        "_enum": {
+            "CurrentBlock": "Null",
+            "ExactBlock": "u32"
+        }
+    },
+    "ApplicationRationingPolicy": {
+        "max_active_applicants": "u32"
+    },
+    "OpeningStage": {
+        "_enum": {
+            "WaitingToBegin": "WaitingToBeingOpeningStageVariant",
+            "Active": "ActiveOpeningStageVariant"
+        }
+    },
+    "StakingPolicy": {
+        "amount": "u128",
+        "amount_mode": "StakingAmountLimitMode",
+        "crowded_out_unstaking_period_length": "Option<u32>",
+        "review_period_expired_unstaking_period_length": "Option<u32>"
+    },
+    "Opening": {
+        "created": "u32",
+        "stage": "OpeningStage",
+        "max_review_period_length": "u32",
+        "application_rationing_policy": "Option<ApplicationRationingPolicy>",
+        "application_staking_policy": "Option<StakingPolicy>",
+        "role_staking_policy": "Option<StakingPolicy>",
+        "human_readable_text": "Text"
+    },
+    "WaitingToBeingOpeningStageVariant": {
+        "begins_at_block": "u32"
+    },
+    "ActiveOpeningStageVariant": {
+        "stage": "ActiveOpeningStage",
+        "applications_added": "Vec<HiringApplicationId>",
+        "active_application_count": "u32",
+        "unstaking_application_count": "u32",
+        "deactivated_application_count": "u32"
+    },
+    "ActiveOpeningStage": {
+        "_enum": {
+            "AcceptingApplications": "AcceptingApplications",
+            "ReviewPeriod": "ReviewPeriod",
+            "Deactivated": "Deactivated"
+        }
+    },
+    "AcceptingApplications": {
+        "started_accepting_applicants_at_block": "u32"
+    },
+    "ReviewPeriod": {
+        "started_accepting_applicants_at_block": "u32",
+        "started_review_period_at_block": "u32"
+    },
+    "Deactivated": {
+        "cause": "OpeningDeactivationCause",
+        "deactivated_at_block": "u32",
+        "started_accepting_applicants_at_block": "u32",
+        "started_review_period_at_block": "Option<u32>"
+    },
+    "OpeningDeactivationCause": {
+        "_enum": [
+            "CancelledBeforeActivation",
+            "CancelledAcceptingApplications",
+            "CancelledInReviewPeriod",
+            "ReviewPeriodExpired",
+            "Filled"
+        ]
+    },
+    "InactiveApplicationStage": {
+        "deactivation_initiated": "u32",
+        "deactivated": "u32",
+        "cause": "ApplicationDeactivationCause"
+    },
+    "UnstakingApplicationStage": {
+        "deactivation_initiated": "u32",
+        "cause": "ApplicationDeactivationCause"
+    },
+    "ApplicationDeactivationCause": {
+        "_enum": [
+            "External",
+            "Hired",
+            "NotHired",
+            "CrowdedOut",
+            "OpeningCancelled",
+            "ReviewPeriodExpired",
+            "OpeningFilled"
+        ]
+    },
+    "StakingAmountLimitMode": {
+        "_enum": [
+            "AtLeast",
+            "Exact"
+        ]
+    },
+    "ClassId": "u64",
+    "EntityId": "u64",
+    "Class": {
+        "id": "u64",
+        "properties": "Vec<Property>",
+        "schemas": "Vec<ClassSchema>",
+        "name": "Text",
+        "description": "Text"
+    },
+    "Entity": {
+        "id": "u64",
+        "class_id": "u64",
+        "in_class_schema_indexes": "Vec<u16>"
+    },
+    "ClassSchema": {
+        "properties": "Vec<u16>"
+    },
+    "Property": {
+        "prop_type": "PropertyType",
+        "required": "bool",
+        "name": "Text",
+        "description": "Text"
+    },
+    "PropertyType": {
+        "_enum": {
+            "None": "Null",
+            "Bool": "Null",
+            "Uint16": "Null",
+            "Uint32": "Null",
+            "Uint64": "Null",
+            "Int16": "Null",
+            "Int32": "Null",
+            "Int64": "Null",
+            "Text": "u16",
+            "Internal": "u64",
+            "BoolVec": "u16",
+            "Uint16Vec": "u16",
+            "Uint32Vec": "u16",
+            "Uint64Vec": "u16",
+            "Int16Vec": "u16",
+            "Int32Vec": "u16",
+            "Int64Vec": "u16",
+            "TextVec": "(u16,u16)",
+            "InternalVec": "(u16,u64)"
+        }
+    },
+    "PropertyValue": {
+        "_enum": {
+            "None": "Null",
+            "Bool": "bool",
+            "Uint16": "u16",
+            "Uint32": "u32",
+            "Uint64": "u64",
+            "Int16": "i16",
+            "Int32": "i32",
+            "Int64": "i64",
+            "Text": "Text",
+            "Internal": "u64",
+            "BoolVec": "Vec<bool>",
+            "Uint16Vec": "Vec<u16>",
+            "Uint32Vec": "Vec<u32>",
+            "Uint64Vec": "Vec<u64>",
+            "Int16Vec": "Vec<i16>",
+            "Int32Vec": "Vec<i32>",
+            "Int64Vec": "Vec<i64>",
+            "TextVec": "Vec<Text>",
+            "InternalVec": "Vec<u64>"
+        }
+    },
+    "ClassPropertyValue": {
+        "in_class_index": "u16",
+        "value": "PropertyValue"
+    },
+    "EntityPermissions": {
+        "update": "CredentialSet",
+        "maintainer_has_all_permissions": "bool"
+    },
+    "ReferenceConstraint": {
+        "_enum": {
+            "NoReferencingAllowed": "Null",
+            "NoConstraint": "Null",
+            "Restricted": "Vec<PropertyOfClass>"
+        }
+    },
+    "ClassPermissionsType": {
+        "entity_permissions": "EntityPermissions",
+        "entities_can_be_created": "bool",
+        "add_schemas": "CredentialSet",
+        "create_entities": "CredentialSet",
+        "reference_constraint": "ReferenceConstraint",
+        "admins": "CredentialSet",
+        "last_permissions_update": "u32"
+    },
+    "Operation": {
+        "with_credential": "Option<Credential>",
+        "as_entity_maintainer": "bool",
+        "operation_type": "OperationType"
+    },
+    "OperationType": {
+        "_enum": {
+            "CreateEntity": "CreateEntity",
+            "UpdatePropertyValues": "UpdatePropertyValues",
+            "AddSchemaSupportToEntity": "AddSchemaSupportToEntity"
+        }
+    },
+    "CreateEntity": {
+        "class_id": "u64"
+    },
+    "UpdatePropertyValues": {
+        "entity_id": "ParametrizedEntity",
+        "parametrized_property_values": "Vec<ParametrizedClassPropertyValue>"
+    },
+    "AddSchemaSupportToEntity": {
+        "entity_id": "ParametrizedEntity",
+        "schema_id": "u16",
+        "parametrized_property_values": "Vec<ParametrizedClassPropertyValue>"
+    },
+    "ParametrizedEntity": {
+        "_enum": {
+            "InternalEntityJustAdded": "u32",
+            "ExistingEntity": "u64"
+        }
+    },
+    "ParametrizedClassPropertyValue": {
+        "in_class_index": "u16",
+        "value": "ParametrizedPropertyValue"
+    },
+    "ParametrizedPropertyValue": {
+        "_enum": {
+            "PropertyValue": "PropertyValue",
+            "InternalEntityJustAdded": "u32",
+            "InternalEntityVec": "Vec<ParametrizedEntity>"
+        }
+    },
+    "PropertyOfClass": {
+        "class_id": "u64",
+        "property_index": "u16"
+    },
+    "ChannelId": "u64",
+    "CuratorId": "u64",
+    "CuratorOpeningId": "u64",
+    "CuratorApplicationId": "u64",
+    "LeadId": "u64",
+    "PrincipalId": "u64",
+    "OptionalText": "Option<Text>",
+    "Channel": {
+        "verified": "bool",
+        "handle": "Text",
+        "title": "OptionalText",
+        "description": "OptionalText",
+        "avatar": "OptionalText",
+        "banner": "OptionalText",
+        "content": "ChannelContentType",
+        "owner": "MemberId",
+        "role_account": "GenericAccountId",
+        "publication_status": "ChannelPublicationStatus",
+        "curation_status": "ChannelCurationStatus",
+        "created": "u32",
+        "principal_id": "u64"
+    },
+    "ChannelContentType": {
+        "_enum": [
+            "Video",
+            "Music",
+            "Ebook"
+        ]
+    },
+    "ChannelCurationStatus": {
+        "_enum": [
+            "Normal",
+            "Censored"
+        ]
+    },
+    "ChannelPublicationStatus": {
+        "_enum": [
+            "Public",
+            "Unlisted"
+        ]
+    },
+    "CurationActor": {
+        "_enum": {
+            "Lead": "Null",
+            "Curator": "u64"
+        }
+    },
+    "Curator": {
+        "role_account": "GenericAccountId",
+        "reward_relationship": "Option<u64>",
+        "role_stake_profile": "Option<CuratorRoleStakeProfile>",
+        "stage": "CuratorRoleStage",
+        "induction": "CuratorInduction",
+        "principal_id": "u64"
+    },
+    "CuratorApplication": {
+        "role_account": "GenericAccountId",
+        "curator_opening_id": "u64",
+        "member_id": "MemberId",
+        "application_id": "HiringApplicationId"
+    },
+    "CuratorOpening": {
+        "opening_id": "u64",
+        "curator_applications": "Vec<u64>",
+        "policy_commitment": "OpeningPolicyCommitment"
+    },
+    "Lead": {
+        "member_id": "MemberId",
+        "role_account": "GenericAccountId",
+        "reward_relationship": "Option<u64>",
+        "inducted": "u32",
+        "stage": "LeadRoleState"
+    },
+    "OpeningPolicyCommitment": {
+        "application_rationing_policy": "Option<ApplicationRationingPolicy>",
+        "max_review_period_length": "u32",
+        "application_staking_policy": "Option<StakingPolicy>",
+        "role_staking_policy": "Option<StakingPolicy>",
+        "role_slashing_terms": "SlashingTerms",
+        "fill_opening_successful_applicant_application_stake_unstaking_period": "Option<u32>",
+        "fill_opening_failed_applicant_application_stake_unstaking_period": "Option<u32>",
+        "fill_opening_failed_applicant_role_stake_unstaking_period": "Option<u32>",
+        "terminate_curator_application_stake_unstaking_period": "Option<u32>",
+        "terminate_curator_role_stake_unstaking_period": "Option<u32>",
+        "exit_curator_role_application_stake_unstaking_period": "Option<u32>",
+        "exit_curator_role_stake_unstaking_period": "Option<u32>"
+    },
+    "Principal": {
+        "_enum": {
+            "Lead": "Null",
+            "Curator": "u64",
+            "ChannelOwner": "u64"
+        }
+    },
+    "WorkingGroupUnstaker": {
+        "_enum": {
+            "Lead": "u64",
+            "Curator": "u64"
+        }
+    },
+    "CuratorApplicationIdToCuratorIdMap": "BTreeMap<HiringApplicationId,u64>",
+    "CuratorApplicationIdSet": "Vec<u64>",
+    "CuratorRoleStakeProfile": {
+        "stake_id": "u64",
+        "termination_unstaking_period": "Option<u32>",
+        "exit_unstaking_period": "Option<u32>"
+    },
+    "CuratorRoleStage": {
+        "_enum": {
+            "Active": "Null",
+            "Unstaking": "CuratorExitSummary",
+            "Exited": "CuratorExitSummary"
+        }
+    },
+    "CuratorExitSummary": {
+        "origin": "CuratorExitInitiationOrigin",
+        "initiated_at_block_number": "u32",
+        "rationale_text": "Text"
+    },
+    "CuratorExitInitiationOrigin": {
+        "_enum": [
+            "Lead",
+            "Curator"
+        ]
+    },
+    "LeadRoleState": {
+        "_enum": {
+            "Active": "Null",
+            "Exited": "ExitedLeadRole"
+        }
+    },
+    "ExitedLeadRole": {
+        "initiated_at_block_number": "u32"
+    },
+    "CuratorInduction": {
+        "lead": "u64",
+        "curator_application_id": "u64",
+        "at_block": "u32"
+    },
+    "RationaleText": "Bytes",
+    "ApplicationOf": {
+        "role_account_id": "GenericAccountId",
+        "opening_id": "u64",
+        "member_id": "MemberId",
+        "application_id": "HiringApplicationId"
+    },
+    "ApplicationIdSet": "BTreeSet<HiringApplicationId>",
+    "ApplicationIdToWorkerIdMap": "BTreeMap<HiringApplicationId,WorkerId>",
+    "WorkerId": "u64",
+    "WorkerOf": {
+        "member_id": "MemberId",
+        "role_account_id": "GenericAccountId",
+        "reward_relationship": "Option<u64>",
+        "role_stake_profile": "Option<RoleStakeProfile>"
+    },
+    "OpeningOf": {
+        "hiring_opening_id": "u64",
+        "applications": "Vec<HiringApplicationId>",
+        "policy_commitment": "WorkingGroupOpeningPolicyCommitment",
+        "opening_type": "OpeningType"
+    },
+    "StorageProviderId": "u64",
+    "OpeningType": {
+        "_enum": {
+            "Leader": "Null",
+            "Worker": "Null"
+        }
+    },
+    "HiringApplicationId": "u64",
+    "RewardPolicy": {
+        "amount_per_payout": "u128",
+        "next_payment_at_block": "u32",
+        "payout_interval": "Option<u32>"
+    },
+    "WorkingGroupOpeningPolicyCommitment": {
+        "application_rationing_policy": "Option<ApplicationRationingPolicy>",
+        "max_review_period_length": "u32",
+        "application_staking_policy": "Option<StakingPolicy>",
+        "role_staking_policy": "Option<StakingPolicy>",
+        "role_slashing_terms": "SlashingTerms",
+        "fill_opening_successful_applicant_application_stake_unstaking_period": "Option<u32>",
+        "fill_opening_failed_applicant_application_stake_unstaking_period": "Option<u32>",
+        "fill_opening_failed_applicant_role_stake_unstaking_period": "Option<u32>",
+        "terminate_application_stake_unstaking_period": "Option<u32>",
+        "terminate_role_stake_unstaking_period": "Option<u32>",
+        "exit_role_application_stake_unstaking_period": "Option<u32>",
+        "exit_role_stake_unstaking_period": "Option<u32>"
+    },
+    "RoleStakeProfile": {
+        "stake_id": "u64",
+        "termination_unstaking_period": "Option<u32>",
+        "exit_unstaking_period": "Option<u32>"
+    },
+    "Url": "Text",
+    "IPNSIdentity": "Text",
+    "ServiceProviderRecord": {
+        "identity": "IPNSIdentity",
+        "expires_at": "u32"
+    },
+    "ContentId": "[u8;32]",
+    "LiaisonJudgement": {
+        "_enum": [
+            "Pending",
+            "Accepted",
+            "Rejected"
+        ]
+    },
+    "DataObject": {
+        "owner": "MemberId",
+        "added_at": "BlockAndTime",
+        "type_id": "DataObjectTypeId",
+        "liaison": "StorageProviderId",
+        "liaison_judgement": "LiaisonJudgement",
+        "ipfs_content_id": "Text"
+    },
+    "DataObjectStorageRelationshipId": "u64",
+    "DataObjectStorageRelationship": {
+        "content_id": "ContentId",
+        "storage_provider": "StorageProviderId",
+        "ready": "bool"
+    },
+    "DataObjectTypeId": "u64",
+    "DataObjectType": {
+        "description": "Text",
+        "active": "bool"
+    },
+    "DataObjectsMap": "BTreeMap<ContentId,DataObject>",
+    "ProposalId": "u32",
+    "ProposalStatus": {
+        "_enum": {
+            "Active": "Option<ActiveStake>",
+            "Finalized": "Finalized"
+        }
+    },
+    "ProposalOf": {
+        "parameters": "ProposalParameters",
+        "proposerId": "MemberId",
+        "title": "Text",
+        "description": "Text",
+        "createdAt": "u32",
+        "status": "ProposalStatus",
+        "votingResults": "VotingResults"
+    },
+    "ProposalDetails": {
+        "_enum": {
+            "Text": "Text",
+            "RuntimeUpgrade": "Vec<u8>",
+            "SetElectionParameters": "ElectionParameters",
+            "Spending": "(Balance,AccountId)",
+            "SetLead": "Option<SetLeadParams>",
+            "SetContentWorkingGroupMintCapacity": "u128",
+            "EvictStorageProvider": "GenericAccountId",
+            "SetValidatorCount": "u32",
+            "SetStorageRoleParameters": "RoleParameters",
+            "AddWorkingGroupLeaderOpening": "AddOpeningParameters",
+            "BeginReviewWorkingGroupLeaderApplication": "(u64,WorkingGroup)",
+            "FillWorkingGroupLeaderOpening": "FillOpeningParameters",
+            "SetWorkingGroupMintCapacity": "(Balance,WorkingGroup)",
+            "DecreaseWorkingGroupLeaderStake": "(WorkerId,Balance,WorkingGroup)",
+            "SlashWorkingGroupLeaderStake": "(WorkerId,Balance,WorkingGroup)",
+            "SetWorkingGroupLeaderReward": "(WorkerId,Balance,WorkingGroup)",
+            "TerminateWorkingGroupLeaderRole": "TerminateRoleParameters"
+        }
+    },
+    "ProposalDetailsOf": {
+        "_enum": {
+            "Text": "Text",
+            "RuntimeUpgrade": "Vec<u8>",
+            "SetElectionParameters": "ElectionParameters",
+            "Spending": "(Balance,AccountId)",
+            "SetLead": "Option<SetLeadParams>",
+            "SetContentWorkingGroupMintCapacity": "u128",
+            "EvictStorageProvider": "GenericAccountId",
+            "SetValidatorCount": "u32",
+            "SetStorageRoleParameters": "RoleParameters",
+            "AddWorkingGroupLeaderOpening": "AddOpeningParameters",
+            "BeginReviewWorkingGroupLeaderApplication": "(u64,WorkingGroup)",
+            "FillWorkingGroupLeaderOpening": "FillOpeningParameters",
+            "SetWorkingGroupMintCapacity": "(Balance,WorkingGroup)",
+            "DecreaseWorkingGroupLeaderStake": "(WorkerId,Balance,WorkingGroup)",
+            "SlashWorkingGroupLeaderStake": "(WorkerId,Balance,WorkingGroup)",
+            "SetWorkingGroupLeaderReward": "(WorkerId,Balance,WorkingGroup)",
+            "TerminateWorkingGroupLeaderRole": "TerminateRoleParameters"
+        }
+    },
+    "VotingResults": {
+        "abstensions": "u32",
+        "approvals": "u32",
+        "rejections": "u32",
+        "slashes": "u32"
+    },
+    "ProposalParameters": {
+        "votingPeriod": "u32",
+        "gracePeriod": "u32",
+        "approvalQuorumPercentage": "u32",
+        "approvalThresholdPercentage": "u32",
+        "slashingQuorumPercentage": "u32",
+        "slashingThresholdPercentage": "u32",
+        "requiredStake": "Option<u128>"
+    },
+    "VoteKind": {
+        "_enum": [
+            "Approve",
+            "Reject",
+            "Slash",
+            "Abstain"
+        ]
+    },
+    "ThreadCounter": {
+        "author_id": "MemberId",
+        "counter": "u32"
+    },
+    "DiscussionThread": {
+        "title": "Bytes",
+        "created_at": "u32",
+        "author_id": "MemberId"
+    },
+    "DiscussionPost": {
+        "text": "Bytes",
+        "created_at": "u32",
+        "updated_at": "u32",
+        "author_id": "MemberId",
+        "thread_id": "ThreadId",
+        "edition_number": "u32"
+    },
+    "AddOpeningParameters": {
+        "activate_at": "ActivateOpeningAt",
+        "commitment": "WorkingGroupOpeningPolicyCommitment",
+        "human_readable_text": "Bytes",
+        "working_group": "WorkingGroup"
+    },
+    "FillOpeningParameters": {
+        "opening_id": "u64",
+        "successful_application_id": "HiringApplicationId",
+        "reward_policy": "Option<RewardPolicy>",
+        "working_group": "WorkingGroup"
+    },
+    "TerminateRoleParameters": {
+        "worker_id": "WorkerId",
+        "rationale": "Bytes",
+        "slash": "bool",
+        "working_group": "WorkingGroup"
+    },
+    "ActiveStake": {
+        "stake_id": "u64",
+        "source_account_id": "GenericAccountId"
+    },
+    "Finalized": {
+        "proposalStatus": "ProposalDecisionStatus",
+        "finalizedAt": "u32",
+        "encodedUnstakingErrorDueToBrokenRuntime": "Option<Vec<u8>>",
+        "stakeDataAfterUnstakingError": "Option<ActiveStake>"
+    },
+    "ProposalDecisionStatus": {
+        "_enum": {
+            "Canceled": "Null",
+            "Vetoed": "Null",
+            "Rejected": "Null",
+            "Slashed": "Null",
+            "Expired": "Null",
+            "Approved": "Approved"
+        }
+    },
+    "ExecutionFailed": {
+        "error": "Vec<u8>"
+    },
+    "Approved": {
+        "_enum": {
+            "PendingExecution": "Null",
+            "Executed": "Null",
+            "ExecutionFailed": "ExecutionFailed"
+        }
+    },
+    "SetLeadParams": "(MemberId,GenericAccountId)",
+    "Address": "AccountId",
+    "LookupSource": "AccountId"
+}
\ No newline at end of file
diff --git a/types/augment/all/index.ts b/types/augment/all/index.ts
new file mode 100644
index 0000000000..2d307291c3
--- /dev/null
+++ b/types/augment/all/index.ts
@@ -0,0 +1,4 @@
+// Auto-generated via `yarn polkadot-types-from-defs`, do not edit
+/* eslint-disable */
+
+export * from './types';
diff --git a/types/augment/all/types.ts b/types/augment/all/types.ts
new file mode 100644
index 0000000000..7182bcdfc3
--- /dev/null
+++ b/types/augment/all/types.ts
@@ -0,0 +1,1242 @@
+// Auto-generated via `yarn polkadot-types-from-defs`, do not edit
+/* eslint-disable */
+
+import { ITuple } from '@polkadot/types/types';
+import { BTreeMap, BTreeSet, Enum, Option, Struct, U8aFixed, Vec } from '@polkadot/types/codec';
+import { GenericAccountId } from '@polkadot/types/generic';
+import { Bytes, Text, bool, i16, i32, i64, u128, u16, u32, u64 } from '@polkadot/types/primitive';
+import { AccountId, Balance } from '@polkadot/types/interfaces/runtime';
+
+/** @name AcceptingApplications */
+export interface AcceptingApplications extends Struct {
+  readonly started_accepting_applicants_at_block: u32;
+}
+
+/** @name ActivateOpeningAt */
+export interface ActivateOpeningAt extends Enum {
+  readonly isCurrentBlock: boolean;
+  readonly isExactBlock: boolean;
+  readonly asExactBlock: u32;
+}
+
+/** @name ActiveOpeningStage */
+export interface ActiveOpeningStage extends Enum {
+  readonly isAcceptingApplications: boolean;
+  readonly asAcceptingApplications: AcceptingApplications;
+  readonly isReviewPeriod: boolean;
+  readonly asReviewPeriod: ReviewPeriod;
+  readonly isDeactivated: boolean;
+  readonly asDeactivated: Deactivated;
+}
+
+/** @name ActiveOpeningStageVariant */
+export interface ActiveOpeningStageVariant extends Struct {
+  readonly stage: ActiveOpeningStage;
+  readonly applications_added: Vec<HiringApplicationId>;
+  readonly active_application_count: u32;
+  readonly unstaking_application_count: u32;
+  readonly deactivated_application_count: u32;
+}
+
+/** @name ActiveStake */
+export interface ActiveStake extends Struct {
+  readonly stake_id: u64;
+  readonly source_account_id: GenericAccountId;
+}
+
+/** @name ActorId */
+export interface ActorId extends u64 {}
+
+/** @name AddOpeningParameters */
+export interface AddOpeningParameters extends Struct {
+  readonly activate_at: ActivateOpeningAt;
+  readonly commitment: WorkingGroupOpeningPolicyCommitment;
+  readonly human_readable_text: Bytes;
+  readonly working_group: WorkingGroup;
+}
+
+/** @name Address */
+export interface Address extends AccountId {}
+
+/** @name AddSchemaSupportToEntity */
+export interface AddSchemaSupportToEntity extends Struct {
+  readonly entity_id: ParametrizedEntity;
+  readonly schema_id: u16;
+  readonly parametrized_property_values: Vec<ParametrizedClassPropertyValue>;
+}
+
+/** @name AdjustCapacityBy */
+export interface AdjustCapacityBy extends Enum {
+  readonly isSetting: boolean;
+  readonly asSetting: u128;
+  readonly isAdding: boolean;
+  readonly asAdding: u128;
+  readonly isReducing: boolean;
+  readonly asReducing: u128;
+}
+
+/** @name AdjustOnInterval */
+export interface AdjustOnInterval extends Struct {
+  readonly block_interval: u32;
+  readonly adjustment_type: AdjustCapacityBy;
+}
+
+/** @name Application */
+export interface Application extends Struct {
+  readonly opening_id: u64;
+  readonly application_index_in_opening: u32;
+  readonly add_to_opening_in_block: u32;
+  readonly active_role_staking_id: Option<u64>;
+  readonly active_application_staking_id: Option<u64>;
+  readonly stage: ApplicationStage;
+  readonly human_readable_text: Text;
+}
+
+/** @name ApplicationDeactivationCause */
+export interface ApplicationDeactivationCause extends Enum {
+  readonly isExternal: boolean;
+  readonly isHired: boolean;
+  readonly isNotHired: boolean;
+  readonly isCrowdedOut: boolean;
+  readonly isOpeningCancelled: boolean;
+  readonly isReviewPeriodExpired: boolean;
+  readonly isOpeningFilled: boolean;
+}
+
+/** @name ApplicationId */
+export interface ApplicationId extends u64 {}
+
+/** @name ApplicationIdSet */
+export interface ApplicationIdSet extends BTreeSet<HiringApplicationId> {}
+
+/** @name ApplicationIdToWorkerIdMap */
+export interface ApplicationIdToWorkerIdMap extends BTreeMap<HiringApplicationId, WorkerId> {}
+
+/** @name ApplicationOf */
+export interface ApplicationOf extends Struct {
+  readonly role_account_id: GenericAccountId;
+  readonly opening_id: u64;
+  readonly member_id: MemberId;
+  readonly application_id: HiringApplicationId;
+}
+
+/** @name ApplicationRationingPolicy */
+export interface ApplicationRationingPolicy extends Struct {
+  readonly max_active_applicants: u32;
+}
+
+/** @name ApplicationStage */
+export interface ApplicationStage extends Enum {
+  readonly isActive: boolean;
+  readonly isUnstaking: boolean;
+  readonly asUnstaking: UnstakingApplicationStage;
+  readonly isInactive: boolean;
+  readonly asInactive: InactiveApplicationStage;
+}
+
+/** @name Approved */
+export interface Approved extends Enum {
+  readonly isPendingExecution: boolean;
+  readonly isExecuted: boolean;
+  readonly isExecutionFailed: boolean;
+  readonly asExecutionFailed: ExecutionFailed;
+}
+
+/** @name Backer */
+export interface Backer extends Struct {
+  readonly member: GenericAccountId;
+  readonly stake: u128;
+}
+
+/** @name Backers */
+export interface Backers extends Vec<Backer> {}
+
+/** @name BalanceOfMint */
+export interface BalanceOfMint extends Balance {}
+
+/** @name BlockAndTime */
+export interface BlockAndTime extends Struct {
+  readonly block: u32;
+  readonly time: u64;
+}
+
+/** @name Category */
+export interface Category extends Struct {
+  readonly id: CategoryId;
+  readonly title: Text;
+  readonly description: Text;
+  readonly created_at: BlockAndTime;
+  readonly deleted: bool;
+  readonly archived: bool;
+  readonly num_direct_subcategories: u32;
+  readonly num_direct_unmoderated_threads: u32;
+  readonly num_direct_moderated_threads: u32;
+  readonly position_in_parent_category: Option<ChildPositionInParentCategory>;
+  readonly moderator_id: GenericAccountId;
+}
+
+/** @name CategoryId */
+export interface CategoryId extends u64 {}
+
+/** @name Channel */
+export interface Channel extends Struct {
+  readonly verified: bool;
+  readonly handle: Text;
+  readonly title: OptionalText;
+  readonly description: OptionalText;
+  readonly avatar: OptionalText;
+  readonly banner: OptionalText;
+  readonly content: ChannelContentType;
+  readonly owner: MemberId;
+  readonly role_account: GenericAccountId;
+  readonly publication_status: ChannelPublicationStatus;
+  readonly curation_status: ChannelCurationStatus;
+  readonly created: u32;
+  readonly principal_id: u64;
+}
+
+/** @name ChannelContentType */
+export interface ChannelContentType extends Enum {
+  readonly isVideo: boolean;
+  readonly isMusic: boolean;
+  readonly isEbook: boolean;
+}
+
+/** @name ChannelCurationStatus */
+export interface ChannelCurationStatus extends Enum {
+  readonly isNormal: boolean;
+  readonly isCensored: boolean;
+}
+
+/** @name ChannelId */
+export interface ChannelId extends u64 {}
+
+/** @name ChannelPublicationStatus */
+export interface ChannelPublicationStatus extends Enum {
+  readonly isPublic: boolean;
+  readonly isUnlisted: boolean;
+}
+
+/** @name ChildPositionInParentCategory */
+export interface ChildPositionInParentCategory extends Struct {
+  readonly parent_id: CategoryId;
+  readonly child_nr_in_parent_category: u32;
+}
+
+/** @name Class */
+export interface Class extends Struct {
+  readonly id: u64;
+  readonly properties: Vec<Property>;
+  readonly schemas: Vec<ClassSchema>;
+  readonly name: Text;
+  readonly description: Text;
+}
+
+/** @name ClassId */
+export interface ClassId extends u64 {}
+
+/** @name ClassPermissionsType */
+export interface ClassPermissionsType extends Struct {
+  readonly entity_permissions: EntityPermissions;
+  readonly entities_can_be_created: bool;
+  readonly add_schemas: CredentialSet;
+  readonly create_entities: CredentialSet;
+  readonly reference_constraint: ReferenceConstraint;
+  readonly admins: CredentialSet;
+  readonly last_permissions_update: u32;
+}
+
+/** @name ClassPropertyValue */
+export interface ClassPropertyValue extends Struct {
+  readonly in_class_index: u16;
+  readonly value: PropertyValue;
+}
+
+/** @name ClassSchema */
+export interface ClassSchema extends Struct {
+  readonly properties: Vec<u16>;
+}
+
+/** @name ContentId */
+export interface ContentId extends U8aFixed {}
+
+/** @name CreateEntity */
+export interface CreateEntity extends Struct {
+  readonly class_id: u64;
+}
+
+/** @name Credential */
+export interface Credential extends u64 {}
+
+/** @name CredentialSet */
+export interface CredentialSet extends Vec<Credential> {}
+
+/** @name CurationActor */
+export interface CurationActor extends Enum {
+  readonly isLead: boolean;
+  readonly isCurator: boolean;
+  readonly asCurator: u64;
+}
+
+/** @name Curator */
+export interface Curator extends Struct {
+  readonly role_account: GenericAccountId;
+  readonly reward_relationship: Option<u64>;
+  readonly role_stake_profile: Option<CuratorRoleStakeProfile>;
+  readonly stage: CuratorRoleStage;
+  readonly induction: CuratorInduction;
+  readonly principal_id: u64;
+}
+
+/** @name CuratorApplication */
+export interface CuratorApplication extends Struct {
+  readonly role_account: GenericAccountId;
+  readonly curator_opening_id: u64;
+  readonly member_id: MemberId;
+  readonly application_id: HiringApplicationId;
+}
+
+/** @name CuratorApplicationId */
+export interface CuratorApplicationId extends u64 {}
+
+/** @name CuratorApplicationIdSet */
+export interface CuratorApplicationIdSet extends Vec<u64> {}
+
+/** @name CuratorApplicationIdToCuratorIdMap */
+export interface CuratorApplicationIdToCuratorIdMap extends BTreeMap<HiringApplicationId, u64> {}
+
+/** @name CuratorExitInitiationOrigin */
+export interface CuratorExitInitiationOrigin extends Enum {
+  readonly isLead: boolean;
+  readonly isCurator: boolean;
+}
+
+/** @name CuratorExitSummary */
+export interface CuratorExitSummary extends Struct {
+  readonly origin: CuratorExitInitiationOrigin;
+  readonly initiated_at_block_number: u32;
+  readonly rationale_text: Text;
+}
+
+/** @name CuratorId */
+export interface CuratorId extends u64 {}
+
+/** @name CuratorInduction */
+export interface CuratorInduction extends Struct {
+  readonly lead: u64;
+  readonly curator_application_id: u64;
+  readonly at_block: u32;
+}
+
+/** @name CuratorOpening */
+export interface CuratorOpening extends Struct {
+  readonly opening_id: u64;
+  readonly curator_applications: Vec<u64>;
+  readonly policy_commitment: OpeningPolicyCommitment;
+}
+
+/** @name CuratorOpeningId */
+export interface CuratorOpeningId extends u64 {}
+
+/** @name CuratorRoleStage */
+export interface CuratorRoleStage extends Enum {
+  readonly isActive: boolean;
+  readonly isUnstaking: boolean;
+  readonly asUnstaking: CuratorExitSummary;
+  readonly isExited: boolean;
+  readonly asExited: CuratorExitSummary;
+}
+
+/** @name CuratorRoleStakeProfile */
+export interface CuratorRoleStakeProfile extends Struct {
+  readonly stake_id: u64;
+  readonly termination_unstaking_period: Option<u32>;
+  readonly exit_unstaking_period: Option<u32>;
+}
+
+/** @name DataObject */
+export interface DataObject extends Struct {
+  readonly owner: MemberId;
+  readonly added_at: BlockAndTime;
+  readonly type_id: DataObjectTypeId;
+  readonly liaison: StorageProviderId;
+  readonly liaison_judgement: LiaisonJudgement;
+  readonly ipfs_content_id: Text;
+}
+
+/** @name DataObjectsMap */
+export interface DataObjectsMap extends BTreeMap<ContentId, DataObject> {}
+
+/** @name DataObjectStorageRelationship */
+export interface DataObjectStorageRelationship extends Struct {
+  readonly content_id: ContentId;
+  readonly storage_provider: StorageProviderId;
+  readonly ready: bool;
+}
+
+/** @name DataObjectStorageRelationshipId */
+export interface DataObjectStorageRelationshipId extends u64 {}
+
+/** @name DataObjectType */
+export interface DataObjectType extends Struct {
+  readonly description: Text;
+  readonly active: bool;
+}
+
+/** @name DataObjectTypeId */
+export interface DataObjectTypeId extends u64 {}
+
+/** @name Deactivated */
+export interface Deactivated extends Struct {
+  readonly cause: OpeningDeactivationCause;
+  readonly deactivated_at_block: u32;
+  readonly started_accepting_applicants_at_block: u32;
+  readonly started_review_period_at_block: Option<u32>;
+}
+
+/** @name DiscussionPost */
+export interface DiscussionPost extends Struct {
+  readonly text: Bytes;
+  readonly created_at: u32;
+  readonly updated_at: u32;
+  readonly author_id: MemberId;
+  readonly thread_id: ThreadId;
+  readonly edition_number: u32;
+}
+
+/** @name DiscussionThread */
+export interface DiscussionThread extends Struct {
+  readonly title: Bytes;
+  readonly created_at: u32;
+  readonly author_id: MemberId;
+}
+
+/** @name ElectionParameters */
+export interface ElectionParameters extends Struct {
+  readonly announcing_period: u32;
+  readonly voting_period: u32;
+  readonly revealing_period: u32;
+  readonly council_size: u32;
+  readonly candidacy_limit: u32;
+  readonly new_term_duration: u32;
+  readonly min_council_stake: u128;
+  readonly min_voting_stake: u128;
+}
+
+/** @name ElectionStage */
+export interface ElectionStage extends Enum {
+  readonly isAnnouncing: boolean;
+  readonly asAnnouncing: u32;
+  readonly isVoting: boolean;
+  readonly asVoting: u32;
+  readonly isRevealing: boolean;
+  readonly asRevealing: u32;
+}
+
+/** @name ElectionStake */
+export interface ElectionStake extends Struct {
+  readonly new: u128;
+  readonly transferred: u128;
+}
+
+/** @name Entity */
+export interface Entity extends Struct {
+  readonly id: u64;
+  readonly class_id: u64;
+  readonly in_class_schema_indexes: Vec<u16>;
+}
+
+/** @name EntityId */
+export interface EntityId extends u64 {}
+
+/** @name EntityPermissions */
+export interface EntityPermissions extends Struct {
+  readonly update: CredentialSet;
+  readonly maintainer_has_all_permissions: bool;
+}
+
+/** @name EntryMethod */
+export interface EntryMethod extends Enum {
+  readonly isPaid: boolean;
+  readonly asPaid: u64;
+  readonly isScreening: boolean;
+  readonly asScreening: AccountId;
+  readonly isGenesis: boolean;
+}
+
+/** @name ExecutionFailed */
+export interface ExecutionFailed extends Struct {
+  readonly error: Bytes;
+}
+
+/** @name ExitedLeadRole */
+export interface ExitedLeadRole extends Struct {
+  readonly initiated_at_block_number: u32;
+}
+
+/** @name FillOpeningParameters */
+export interface FillOpeningParameters extends Struct {
+  readonly opening_id: u64;
+  readonly successful_application_id: HiringApplicationId;
+  readonly reward_policy: Option<RewardPolicy>;
+  readonly working_group: WorkingGroup;
+}
+
+/** @name Finalized */
+export interface Finalized extends Struct {
+  readonly proposalStatus: ProposalDecisionStatus;
+  readonly finalizedAt: u32;
+  readonly encodedUnstakingErrorDueToBrokenRuntime: Option<Bytes>;
+  readonly stakeDataAfterUnstakingError: Option<ActiveStake>;
+}
+
+/** @name HiringApplicationId */
+export interface HiringApplicationId extends u64 {}
+
+/** @name InactiveApplicationStage */
+export interface InactiveApplicationStage extends Struct {
+  readonly deactivation_initiated: u32;
+  readonly deactivated: u32;
+  readonly cause: ApplicationDeactivationCause;
+}
+
+/** @name InputValidationLengthConstraint */
+export interface InputValidationLengthConstraint extends Struct {
+  readonly min: u16;
+  readonly max_min_diff: u16;
+}
+
+/** @name IPNSIdentity */
+export interface IPNSIdentity extends Text {}
+
+/** @name Lead */
+export interface Lead extends Struct {
+  readonly member_id: MemberId;
+  readonly role_account: GenericAccountId;
+  readonly reward_relationship: Option<u64>;
+  readonly inducted: u32;
+  readonly stage: LeadRoleState;
+}
+
+/** @name LeadId */
+export interface LeadId extends u64 {}
+
+/** @name LeadRoleState */
+export interface LeadRoleState extends Enum {
+  readonly isActive: boolean;
+  readonly isExited: boolean;
+  readonly asExited: ExitedLeadRole;
+}
+
+/** @name LiaisonJudgement */
+export interface LiaisonJudgement extends Enum {
+  readonly isPending: boolean;
+  readonly isAccepted: boolean;
+  readonly isRejected: boolean;
+}
+
+/** @name LookupSource */
+export interface LookupSource extends AccountId {}
+
+/** @name MemberId */
+export interface MemberId extends u64 {}
+
+/** @name Membership */
+export interface Membership extends Struct {
+  readonly handle: Text;
+  readonly avatar_uri: Text;
+  readonly about: Text;
+  readonly registered_at_block: u32;
+  readonly registered_at_time: u64;
+  readonly entry: EntryMethod;
+  readonly suspended: bool;
+  readonly subscription: Option<SubscriptionId>;
+  readonly root_account: GenericAccountId;
+  readonly controller_account: GenericAccountId;
+}
+
+/** @name MemoText */
+export interface MemoText extends Text {}
+
+/** @name Mint */
+export interface Mint extends Struct {
+  readonly capacity: u128;
+  readonly next_adjustment: Option<NextAdjustment>;
+  readonly created_at: u32;
+  readonly total_minted: u128;
+}
+
+/** @name MintBalanceOf */
+export interface MintBalanceOf extends Balance {}
+
+/** @name MintId */
+export interface MintId extends u64 {}
+
+/** @name ModerationAction */
+export interface ModerationAction extends Struct {
+  readonly moderated_at: BlockAndTime;
+  readonly moderator_id: GenericAccountId;
+  readonly rationale: Text;
+}
+
+/** @name NextAdjustment */
+export interface NextAdjustment extends Struct {
+  readonly adjustment: AdjustOnInterval;
+  readonly at_block: u32;
+}
+
+/** @name Opening */
+export interface Opening extends Struct {
+  readonly created: u32;
+  readonly stage: OpeningStage;
+  readonly max_review_period_length: u32;
+  readonly application_rationing_policy: Option<ApplicationRationingPolicy>;
+  readonly application_staking_policy: Option<StakingPolicy>;
+  readonly role_staking_policy: Option<StakingPolicy>;
+  readonly human_readable_text: Text;
+}
+
+/** @name OpeningDeactivationCause */
+export interface OpeningDeactivationCause extends Enum {
+  readonly isCancelledBeforeActivation: boolean;
+  readonly isCancelledAcceptingApplications: boolean;
+  readonly isCancelledInReviewPeriod: boolean;
+  readonly isReviewPeriodExpired: boolean;
+  readonly isFilled: boolean;
+}
+
+/** @name OpeningId */
+export interface OpeningId extends u64 {}
+
+/** @name OpeningOf */
+export interface OpeningOf extends Struct {
+  readonly hiring_opening_id: u64;
+  readonly applications: Vec<HiringApplicationId>;
+  readonly policy_commitment: WorkingGroupOpeningPolicyCommitment;
+  readonly opening_type: OpeningType;
+}
+
+/** @name OpeningPolicyCommitment */
+export interface OpeningPolicyCommitment extends Struct {
+  readonly application_rationing_policy: Option<ApplicationRationingPolicy>;
+  readonly max_review_period_length: u32;
+  readonly application_staking_policy: Option<StakingPolicy>;
+  readonly role_staking_policy: Option<StakingPolicy>;
+  readonly role_slashing_terms: SlashingTerms;
+  readonly fill_opening_successful_applicant_application_stake_unstaking_period: Option<u32>;
+  readonly fill_opening_failed_applicant_application_stake_unstaking_period: Option<u32>;
+  readonly fill_opening_failed_applicant_role_stake_unstaking_period: Option<u32>;
+  readonly terminate_curator_application_stake_unstaking_period: Option<u32>;
+  readonly terminate_curator_role_stake_unstaking_period: Option<u32>;
+  readonly exit_curator_role_application_stake_unstaking_period: Option<u32>;
+  readonly exit_curator_role_stake_unstaking_period: Option<u32>;
+}
+
+/** @name OpeningStage */
+export interface OpeningStage extends Enum {
+  readonly isWaitingToBegin: boolean;
+  readonly asWaitingToBegin: WaitingToBeingOpeningStageVariant;
+  readonly isActive: boolean;
+  readonly asActive: ActiveOpeningStageVariant;
+}
+
+/** @name OpeningType */
+export interface OpeningType extends Enum {
+  readonly isLeader: boolean;
+  readonly isWorker: boolean;
+}
+
+/** @name Operation */
+export interface Operation extends Struct {
+  readonly with_credential: Option<Credential>;
+  readonly as_entity_maintainer: bool;
+  readonly operation_type: OperationType;
+}
+
+/** @name OperationType */
+export interface OperationType extends Enum {
+  readonly isCreateEntity: boolean;
+  readonly asCreateEntity: CreateEntity;
+  readonly isUpdatePropertyValues: boolean;
+  readonly asUpdatePropertyValues: UpdatePropertyValues;
+  readonly isAddSchemaSupportToEntity: boolean;
+  readonly asAddSchemaSupportToEntity: AddSchemaSupportToEntity;
+}
+
+/** @name OptionalText */
+export interface OptionalText extends Option<Text> {}
+
+/** @name PaidMembershipTerms */
+export interface PaidMembershipTerms extends Struct {
+  readonly fee: u128;
+  readonly text: Text;
+}
+
+/** @name PaidTermId */
+export interface PaidTermId extends u64 {}
+
+/** @name ParametrizedClassPropertyValue */
+export interface ParametrizedClassPropertyValue extends Struct {
+  readonly in_class_index: u16;
+  readonly value: ParametrizedPropertyValue;
+}
+
+/** @name ParametrizedEntity */
+export interface ParametrizedEntity extends Enum {
+  readonly isInternalEntityJustAdded: boolean;
+  readonly asInternalEntityJustAdded: u32;
+  readonly isExistingEntity: boolean;
+  readonly asExistingEntity: u64;
+}
+
+/** @name ParametrizedPropertyValue */
+export interface ParametrizedPropertyValue extends Enum {
+  readonly isPropertyValue: boolean;
+  readonly asPropertyValue: PropertyValue;
+  readonly isInternalEntityJustAdded: boolean;
+  readonly asInternalEntityJustAdded: u32;
+  readonly isInternalEntityVec: boolean;
+  readonly asInternalEntityVec: Vec<ParametrizedEntity>;
+}
+
+/** @name Post */
+export interface Post extends Struct {
+  readonly id: PostId;
+  readonly thread_id: ThreadId;
+  readonly nr_in_thread: u32;
+  readonly current_text: Text;
+  readonly moderation: Option<ModerationAction>;
+  readonly text_change_history: Vec<PostTextChange>;
+  readonly created_at: BlockAndTime;
+  readonly author_id: GenericAccountId;
+}
+
+/** @name PostId */
+export interface PostId extends u64 {}
+
+/** @name PostTextChange */
+export interface PostTextChange extends Struct {
+  readonly expired_at: BlockAndTime;
+  readonly text: Text;
+}
+
+/** @name Principal */
+export interface Principal extends Enum {
+  readonly isLead: boolean;
+  readonly isCurator: boolean;
+  readonly asCurator: u64;
+  readonly isChannelOwner: boolean;
+  readonly asChannelOwner: u64;
+}
+
+/** @name PrincipalId */
+export interface PrincipalId extends u64 {}
+
+/** @name Property */
+export interface Property extends Struct {
+  readonly prop_type: PropertyType;
+  readonly required: bool;
+  readonly name: Text;
+  readonly description: Text;
+}
+
+/** @name PropertyOfClass */
+export interface PropertyOfClass extends Struct {
+  readonly class_id: u64;
+  readonly property_index: u16;
+}
+
+/** @name PropertyType */
+export interface PropertyType extends Enum {
+  readonly isNone: boolean;
+  readonly isBool: boolean;
+  readonly isUint16: boolean;
+  readonly isUint32: boolean;
+  readonly isUint64: boolean;
+  readonly isInt16: boolean;
+  readonly isInt32: boolean;
+  readonly isInt64: boolean;
+  readonly isText: boolean;
+  readonly asText: u16;
+  readonly isInternal: boolean;
+  readonly asInternal: u64;
+  readonly isBoolVec: boolean;
+  readonly asBoolVec: u16;
+  readonly isUint16Vec: boolean;
+  readonly asUint16Vec: u16;
+  readonly isUint32Vec: boolean;
+  readonly asUint32Vec: u16;
+  readonly isUint64Vec: boolean;
+  readonly asUint64Vec: u16;
+  readonly isInt16Vec: boolean;
+  readonly asInt16Vec: u16;
+  readonly isInt32Vec: boolean;
+  readonly asInt32Vec: u16;
+  readonly isInt64Vec: boolean;
+  readonly asInt64Vec: u16;
+  readonly isTextVec: boolean;
+  readonly asTextVec: ITuple<[u16, u16]>;
+  readonly isInternalVec: boolean;
+  readonly asInternalVec: ITuple<[u16, u64]>;
+}
+
+/** @name PropertyValue */
+export interface PropertyValue extends Enum {
+  readonly isNone: boolean;
+  readonly isBool: boolean;
+  readonly asBool: bool;
+  readonly isUint16: boolean;
+  readonly asUint16: u16;
+  readonly isUint32: boolean;
+  readonly asUint32: u32;
+  readonly isUint64: boolean;
+  readonly asUint64: u64;
+  readonly isInt16: boolean;
+  readonly asInt16: i16;
+  readonly isInt32: boolean;
+  readonly asInt32: i32;
+  readonly isInt64: boolean;
+  readonly asInt64: i64;
+  readonly isText: boolean;
+  readonly asText: Text;
+  readonly isInternal: boolean;
+  readonly asInternal: u64;
+  readonly isBoolVec: boolean;
+  readonly asBoolVec: Vec<bool>;
+  readonly isUint16Vec: boolean;
+  readonly asUint16Vec: Vec<u16>;
+  readonly isUint32Vec: boolean;
+  readonly asUint32Vec: Vec<u32>;
+  readonly isUint64Vec: boolean;
+  readonly asUint64Vec: Vec<u64>;
+  readonly isInt16Vec: boolean;
+  readonly asInt16Vec: Vec<i16>;
+  readonly isInt32Vec: boolean;
+  readonly asInt32Vec: Vec<i32>;
+  readonly isInt64Vec: boolean;
+  readonly asInt64Vec: Vec<i64>;
+  readonly isTextVec: boolean;
+  readonly asTextVec: Vec<Text>;
+  readonly isInternalVec: boolean;
+  readonly asInternalVec: Vec<u64>;
+}
+
+/** @name ProposalDecisionStatus */
+export interface ProposalDecisionStatus extends Enum {
+  readonly isCanceled: boolean;
+  readonly isVetoed: boolean;
+  readonly isRejected: boolean;
+  readonly isSlashed: boolean;
+  readonly isExpired: boolean;
+  readonly isApproved: boolean;
+  readonly asApproved: Approved;
+}
+
+/** @name ProposalDetails */
+export interface ProposalDetails extends Enum {
+  readonly isText: boolean;
+  readonly asText: Text;
+  readonly isRuntimeUpgrade: boolean;
+  readonly asRuntimeUpgrade: Bytes;
+  readonly isSetElectionParameters: boolean;
+  readonly asSetElectionParameters: ElectionParameters;
+  readonly isSpending: boolean;
+  readonly asSpending: ITuple<[Balance, AccountId]>;
+  readonly isSetLead: boolean;
+  readonly asSetLead: Option<SetLeadParams>;
+  readonly isSetContentWorkingGroupMintCapacity: boolean;
+  readonly asSetContentWorkingGroupMintCapacity: u128;
+  readonly isEvictStorageProvider: boolean;
+  readonly asEvictStorageProvider: GenericAccountId;
+  readonly isSetValidatorCount: boolean;
+  readonly asSetValidatorCount: u32;
+  readonly isSetStorageRoleParameters: boolean;
+  readonly asSetStorageRoleParameters: RoleParameters;
+  readonly isAddWorkingGroupLeaderOpening: boolean;
+  readonly asAddWorkingGroupLeaderOpening: AddOpeningParameters;
+  readonly isBeginReviewWorkingGroupLeaderApplication: boolean;
+  readonly asBeginReviewWorkingGroupLeaderApplication: ITuple<[u64, WorkingGroup]>;
+  readonly isFillWorkingGroupLeaderOpening: boolean;
+  readonly asFillWorkingGroupLeaderOpening: FillOpeningParameters;
+  readonly isSetWorkingGroupMintCapacity: boolean;
+  readonly asSetWorkingGroupMintCapacity: ITuple<[Balance, WorkingGroup]>;
+  readonly isDecreaseWorkingGroupLeaderStake: boolean;
+  readonly asDecreaseWorkingGroupLeaderStake: ITuple<[WorkerId, Balance, WorkingGroup]>;
+  readonly isSlashWorkingGroupLeaderStake: boolean;
+  readonly asSlashWorkingGroupLeaderStake: ITuple<[WorkerId, Balance, WorkingGroup]>;
+  readonly isSetWorkingGroupLeaderReward: boolean;
+  readonly asSetWorkingGroupLeaderReward: ITuple<[WorkerId, Balance, WorkingGroup]>;
+  readonly isTerminateWorkingGroupLeaderRole: boolean;
+  readonly asTerminateWorkingGroupLeaderRole: TerminateRoleParameters;
+}
+
+/** @name ProposalDetailsOf */
+export interface ProposalDetailsOf extends Enum {
+  readonly isText: boolean;
+  readonly asText: Text;
+  readonly isRuntimeUpgrade: boolean;
+  readonly asRuntimeUpgrade: Bytes;
+  readonly isSetElectionParameters: boolean;
+  readonly asSetElectionParameters: ElectionParameters;
+  readonly isSpending: boolean;
+  readonly asSpending: ITuple<[Balance, AccountId]>;
+  readonly isSetLead: boolean;
+  readonly asSetLead: Option<SetLeadParams>;
+  readonly isSetContentWorkingGroupMintCapacity: boolean;
+  readonly asSetContentWorkingGroupMintCapacity: u128;
+  readonly isEvictStorageProvider: boolean;
+  readonly asEvictStorageProvider: GenericAccountId;
+  readonly isSetValidatorCount: boolean;
+  readonly asSetValidatorCount: u32;
+  readonly isSetStorageRoleParameters: boolean;
+  readonly asSetStorageRoleParameters: RoleParameters;
+  readonly isAddWorkingGroupLeaderOpening: boolean;
+  readonly asAddWorkingGroupLeaderOpening: AddOpeningParameters;
+  readonly isBeginReviewWorkingGroupLeaderApplication: boolean;
+  readonly asBeginReviewWorkingGroupLeaderApplication: ITuple<[u64, WorkingGroup]>;
+  readonly isFillWorkingGroupLeaderOpening: boolean;
+  readonly asFillWorkingGroupLeaderOpening: FillOpeningParameters;
+  readonly isSetWorkingGroupMintCapacity: boolean;
+  readonly asSetWorkingGroupMintCapacity: ITuple<[Balance, WorkingGroup]>;
+  readonly isDecreaseWorkingGroupLeaderStake: boolean;
+  readonly asDecreaseWorkingGroupLeaderStake: ITuple<[WorkerId, Balance, WorkingGroup]>;
+  readonly isSlashWorkingGroupLeaderStake: boolean;
+  readonly asSlashWorkingGroupLeaderStake: ITuple<[WorkerId, Balance, WorkingGroup]>;
+  readonly isSetWorkingGroupLeaderReward: boolean;
+  readonly asSetWorkingGroupLeaderReward: ITuple<[WorkerId, Balance, WorkingGroup]>;
+  readonly isTerminateWorkingGroupLeaderRole: boolean;
+  readonly asTerminateWorkingGroupLeaderRole: TerminateRoleParameters;
+}
+
+/** @name ProposalId */
+export interface ProposalId extends u32 {}
+
+/** @name ProposalOf */
+export interface ProposalOf extends Struct {
+  readonly parameters: ProposalParameters;
+  readonly proposerId: MemberId;
+  readonly title: Text;
+  readonly description: Text;
+  readonly createdAt: u32;
+  readonly status: ProposalStatus;
+  readonly votingResults: VotingResults;
+}
+
+/** @name ProposalParameters */
+export interface ProposalParameters extends Struct {
+  readonly votingPeriod: u32;
+  readonly gracePeriod: u32;
+  readonly approvalQuorumPercentage: u32;
+  readonly approvalThresholdPercentage: u32;
+  readonly slashingQuorumPercentage: u32;
+  readonly slashingThresholdPercentage: u32;
+  readonly requiredStake: Option<u128>;
+}
+
+/** @name ProposalStatus */
+export interface ProposalStatus extends Enum {
+  readonly isActive: boolean;
+  readonly asActive: Option<ActiveStake>;
+  readonly isFinalized: boolean;
+  readonly asFinalized: Finalized;
+}
+
+/** @name RationaleText */
+export interface RationaleText extends Bytes {}
+
+/** @name Recipient */
+export interface Recipient extends Struct {
+  readonly total_reward_received: u128;
+  readonly total_reward_missed: u128;
+}
+
+/** @name RecipientId */
+export interface RecipientId extends u64 {}
+
+/** @name ReferenceConstraint */
+export interface ReferenceConstraint extends Enum {
+  readonly isNoReferencingAllowed: boolean;
+  readonly isNoConstraint: boolean;
+  readonly isRestricted: boolean;
+  readonly asRestricted: Vec<PropertyOfClass>;
+}
+
+/** @name Reply */
+export interface Reply extends Struct {
+  readonly owner: GenericAccountId;
+  readonly thread_id: ThreadId;
+  readonly text: Text;
+  readonly moderation: Option<ModerationAction>;
+}
+
+/** @name ReplyId */
+export interface ReplyId extends u64 {}
+
+/** @name ReviewPeriod */
+export interface ReviewPeriod extends Struct {
+  readonly started_accepting_applicants_at_block: u32;
+  readonly started_review_period_at_block: u32;
+}
+
+/** @name RewardPolicy */
+export interface RewardPolicy extends Struct {
+  readonly amount_per_payout: u128;
+  readonly next_payment_at_block: u32;
+  readonly payout_interval: Option<u32>;
+}
+
+/** @name RewardRelationship */
+export interface RewardRelationship extends Struct {
+  readonly recipient: u64;
+  readonly mint_id: u64;
+  readonly account: GenericAccountId;
+  readonly amount_per_payout: u128;
+  readonly next_payment_at_block: Option<u32>;
+  readonly payout_interval: Option<u32>;
+  readonly total_reward_received: u128;
+  readonly total_reward_missed: u128;
+}
+
+/** @name RewardRelationshipId */
+export interface RewardRelationshipId extends u64 {}
+
+/** @name RoleParameters */
+export interface RoleParameters extends Struct {
+  readonly min_stake: u128;
+  readonly min_actors: u32;
+  readonly max_actors: u32;
+  readonly reward: u128;
+  readonly reward_period: u32;
+  readonly bonding_period: u32;
+  readonly unbonding_period: u32;
+  readonly min_service_period: u32;
+  readonly startup_grace_period: u32;
+  readonly entry_request_fee: u128;
+}
+
+/** @name RoleStakeProfile */
+export interface RoleStakeProfile extends Struct {
+  readonly stake_id: u64;
+  readonly termination_unstaking_period: Option<u32>;
+  readonly exit_unstaking_period: Option<u32>;
+}
+
+/** @name SealedVote */
+export interface SealedVote extends Struct {
+  readonly voter: GenericAccountId;
+  readonly commitment: U8aFixed;
+  readonly stake: ElectionStake;
+  readonly vote: Option<GenericAccountId>;
+}
+
+/** @name Seat */
+export interface Seat extends Struct {
+  readonly member: GenericAccountId;
+  readonly stake: u128;
+  readonly backers: Backers;
+}
+
+/** @name Seats */
+export interface Seats extends Vec<Seat> {}
+
+/** @name ServiceProviderRecord */
+export interface ServiceProviderRecord extends Struct {
+  readonly identity: IPNSIdentity;
+  readonly expires_at: u32;
+}
+
+/** @name SetLeadParams */
+export interface SetLeadParams extends ITuple<[MemberId, GenericAccountId]> {}
+
+/** @name Slash */
+export interface Slash extends Struct {
+  readonly started_at_block: u32;
+  readonly is_active: bool;
+  readonly blocks_remaining_in_active_period_for_slashing: u32;
+  readonly slash_amount: u128;
+}
+
+/** @name SlashableTerms */
+export interface SlashableTerms extends Struct {
+  readonly max_count: u16;
+  readonly max_percent_pts_per_time: u16;
+}
+
+/** @name SlashingTerms */
+export interface SlashingTerms extends Enum {
+  readonly isUnslashable: boolean;
+  readonly isSlashable: boolean;
+  readonly asSlashable: SlashableTerms;
+}
+
+/** @name Stake */
+export interface Stake extends Struct {
+  readonly created: u32;
+  readonly staking_status: StakingStatus;
+}
+
+/** @name Staked */
+export interface Staked extends Struct {
+  readonly staked_amount: u128;
+  readonly staked_status: StakedStatus;
+  readonly next_slash_id: u64;
+  readonly ongoing_slashes: BTreeMap<u64, Slash>;
+}
+
+/** @name StakedStatus */
+export interface StakedStatus extends Enum {
+  readonly isNormal: boolean;
+  readonly isUnstaking: boolean;
+  readonly asUnstaking: Unstaking;
+}
+
+/** @name StakeId */
+export interface StakeId extends u64 {}
+
+/** @name StakingAmountLimitMode */
+export interface StakingAmountLimitMode extends Enum {
+  readonly isAtLeast: boolean;
+  readonly isExact: boolean;
+}
+
+/** @name StakingPolicy */
+export interface StakingPolicy extends Struct {
+  readonly amount: u128;
+  readonly amount_mode: StakingAmountLimitMode;
+  readonly crowded_out_unstaking_period_length: Option<u32>;
+  readonly review_period_expired_unstaking_period_length: Option<u32>;
+}
+
+/** @name StakingStatus */
+export interface StakingStatus extends Enum {
+  readonly isNotStaked: boolean;
+  readonly isStaked: boolean;
+  readonly asStaked: Staked;
+}
+
+/** @name StorageProviderId */
+export interface StorageProviderId extends u64 {}
+
+/** @name SubscriptionId */
+export interface SubscriptionId extends u64 {}
+
+/** @name TerminateRoleParameters */
+export interface TerminateRoleParameters extends Struct {
+  readonly worker_id: WorkerId;
+  readonly rationale: Bytes;
+  readonly slash: bool;
+  readonly working_group: WorkingGroup;
+}
+
+/** @name Thread */
+export interface Thread extends Struct {
+  readonly id: ThreadId;
+  readonly title: Text;
+  readonly category_id: CategoryId;
+  readonly nr_in_category: u32;
+  readonly moderation: Option<ModerationAction>;
+  readonly num_unmoderated_posts: u32;
+  readonly num_moderated_posts: u32;
+  readonly created_at: BlockAndTime;
+  readonly author_id: GenericAccountId;
+}
+
+/** @name ThreadCounter */
+export interface ThreadCounter extends Struct {
+  readonly author_id: MemberId;
+  readonly counter: u32;
+}
+
+/** @name ThreadId */
+export interface ThreadId extends u64 {}
+
+/** @name TransferableStake */
+export interface TransferableStake extends Struct {
+  readonly seat: u128;
+  readonly backing: u128;
+}
+
+/** @name Unstaking */
+export interface Unstaking extends Struct {
+  readonly started_at_block: u32;
+  readonly is_active: bool;
+  readonly blocks_remaining_in_active_period_for_unstaking: u32;
+}
+
+/** @name UnstakingApplicationStage */
+export interface UnstakingApplicationStage extends Struct {
+  readonly deactivation_initiated: u32;
+  readonly cause: ApplicationDeactivationCause;
+}
+
+/** @name UpdatePropertyValues */
+export interface UpdatePropertyValues extends Struct {
+  readonly entity_id: ParametrizedEntity;
+  readonly parametrized_property_values: Vec<ParametrizedClassPropertyValue>;
+}
+
+/** @name Url */
+export interface Url extends Text {}
+
+/** @name VoteKind */
+export interface VoteKind extends Enum {
+  readonly isApprove: boolean;
+  readonly isReject: boolean;
+  readonly isSlash: boolean;
+  readonly isAbstain: boolean;
+}
+
+/** @name VotingResults */
+export interface VotingResults extends Struct {
+  readonly abstensions: u32;
+  readonly approvals: u32;
+  readonly rejections: u32;
+  readonly slashes: u32;
+}
+
+/** @name WaitingToBeingOpeningStageVariant */
+export interface WaitingToBeingOpeningStageVariant extends Struct {
+  readonly begins_at_block: u32;
+}
+
+/** @name WorkerId */
+export interface WorkerId extends u64 {}
+
+/** @name WorkerOf */
+export interface WorkerOf extends Struct {
+  readonly member_id: MemberId;
+  readonly role_account_id: GenericAccountId;
+  readonly reward_relationship: Option<u64>;
+  readonly role_stake_profile: Option<RoleStakeProfile>;
+}
+
+/** @name WorkingGroup */
+export interface WorkingGroup extends Enum {
+  readonly isStorage: boolean;
+}
+
+/** @name WorkingGroupOpeningPolicyCommitment */
+export interface WorkingGroupOpeningPolicyCommitment extends Struct {
+  readonly application_rationing_policy: Option<ApplicationRationingPolicy>;
+  readonly max_review_period_length: u32;
+  readonly application_staking_policy: Option<StakingPolicy>;
+  readonly role_staking_policy: Option<StakingPolicy>;
+  readonly role_slashing_terms: SlashingTerms;
+  readonly fill_opening_successful_applicant_application_stake_unstaking_period: Option<u32>;
+  readonly fill_opening_failed_applicant_application_stake_unstaking_period: Option<u32>;
+  readonly fill_opening_failed_applicant_role_stake_unstaking_period: Option<u32>;
+  readonly terminate_application_stake_unstaking_period: Option<u32>;
+  readonly terminate_role_stake_unstaking_period: Option<u32>;
+  readonly exit_role_application_stake_unstaking_period: Option<u32>;
+  readonly exit_role_stake_unstaking_period: Option<u32>;
+}
+
+/** @name WorkingGroupUnstaker */
+export interface WorkingGroupUnstaker extends Enum {
+  readonly isLead: boolean;
+  readonly asLead: u64;
+  readonly isCurator: boolean;
+  readonly asCurator: u64;
+}
+
+export type PHANTOM_ALL = 'all';
diff --git a/types/augment/augment-api-consts.ts b/types/augment/augment-api-consts.ts
new file mode 100644
index 0000000000..5dc1fc5a0e
--- /dev/null
+++ b/types/augment/augment-api-consts.ts
@@ -0,0 +1,247 @@
+// Auto-generated via `yarn polkadot-types-from-chain`, do not edit
+/* eslint-disable */
+
+import { Vec } from '@polkadot/types/codec';
+import { u32, u64 } from '@polkadot/types/primitive';
+import { Balance, BalanceOf, BlockNumber, Moment, Perbill, RuntimeDbWeight, Weight } from '@polkadot/types/interfaces/runtime';
+import { SessionIndex } from '@polkadot/types/interfaces/session';
+import { EraIndex } from '@polkadot/types/interfaces/staking';
+import { WeightToFeeCoefficient } from '@polkadot/types/interfaces/support';
+
+declare module '@polkadot/metadata/Decorated/consts/types' {
+  export interface Constants {
+    babe: {
+      /**
+       * The number of **slots** that an epoch takes. We couple sessions to
+       * epochs, i.e. we start a new session once the new epoch begins.
+       **/
+      epochDuration: AugmentedConst<u64>;
+      /**
+       * The expected average block time at which BABE should be creating
+       * blocks. Since BABE is probabilistic it is not trivial to figure out
+       * what the expected average block time should be based on the slot
+       * duration and the security parameter `c` (where `1 - c` represents
+       * the probability of a slot being empty).
+       **/
+      expectedBlockTime: AugmentedConst<Moment>;
+    };
+    balances: {
+      /**
+       * The minimum amount required to keep an account open.
+       **/
+      existentialDeposit: AugmentedConst<Balance>;
+    };
+    contracts: {
+      /**
+       * The maximum nesting level of a call/instantiate stack. A reasonable default
+       * value is 100.
+       **/
+      maxDepth: AugmentedConst<u32>;
+      /**
+       * The maximum size of a storage value in bytes. A reasonable default is 16 KiB.
+       **/
+      maxValueSize: AugmentedConst<u32>;
+      /**
+       * Price of a byte of storage per one block interval. Should be greater than 0.
+       **/
+      rentByteFee: AugmentedConst<BalanceOf>;
+      /**
+       * The amount of funds a contract should deposit in order to offset
+       * the cost of one byte.
+       * 
+       * Let's suppose the deposit is 1,000 BU (balance units)/byte and the rent is 1 BU/byte/day,
+       * then a contract with 1,000,000 BU that uses 1,000 bytes of storage would pay no rent.
+       * But if the balance reduced to 500,000 BU and the storage stayed the same at 1,000,
+       * then it would pay 500 BU/day.
+       **/
+      rentDepositOffset: AugmentedConst<BalanceOf>;
+      /**
+       * Number of block delay an extrinsic claim surcharge has.
+       * 
+       * When claim surcharge is called by an extrinsic the rent is checked
+       * for current_block - delay
+       **/
+      signedClaimHandicap: AugmentedConst<BlockNumber>;
+      /**
+       * A size offset for an contract. A just created account with untouched storage will have that
+       * much of storage from the perspective of the state rent.
+       * 
+       * This is a simple way to ensure that contracts with empty storage eventually get deleted
+       * by making them pay rent. This creates an incentive to remove them early in order to save
+       * rent.
+       **/
+      storageSizeOffset: AugmentedConst<u32>;
+      /**
+       * Reward that is received by the party whose touch has led
+       * to removal of a contract.
+       **/
+      surchargeReward: AugmentedConst<BalanceOf>;
+      /**
+       * The minimum amount required to generate a tombstone.
+       **/
+      tombstoneDeposit: AugmentedConst<BalanceOf>;
+    };
+    dataDirectory: {
+      /**
+       * Maximum objects allowed per inject_data_objects() transaction
+       **/
+      maxObjectsPerInjection: AugmentedConst<u32>;
+    };
+    finalityTracker: {
+      /**
+       * The delay after which point things become suspicious. Default is 1000.
+       **/
+      reportLatency: AugmentedConst<BlockNumber>;
+      /**
+       * The number of recent samples to keep from this chain. Default is 101.
+       **/
+      windowSize: AugmentedConst<BlockNumber>;
+    };
+    proposalsCodex: {
+      /**
+       * Exports max wasm code length of the runtime upgrade proposal const.
+       **/
+      runtimeUpgradeWasmProposalMaxLength: AugmentedConst<u32>;
+      /**
+       * Exports max allowed text proposal length const.
+       **/
+      textProposalMaxLength: AugmentedConst<u32>;
+    };
+    proposalsDiscussion: {
+      /**
+       * Exports post edition number limit const.
+       **/
+      maxPostEditionNumber: AugmentedConst<u32>;
+      /**
+       * Exports max thread by same author in a row number limit const.
+       **/
+      maxThreadInARowNumber: AugmentedConst<u32>;
+      /**
+       * Exports post length limit const.
+       **/
+      postLengthLimit: AugmentedConst<u32>;
+      /**
+       * Exports thread title length limit const.
+       **/
+      threadTitleLengthLimit: AugmentedConst<u32>;
+    };
+    proposalsEngine: {
+      /**
+       * Exports const - the fee is applied when cancel the proposal. A fee would be slashed (burned).
+       **/
+      cancellationFee: AugmentedConst<BalanceOf>;
+      /**
+       * Exports const -  max allowed proposal description length.
+       **/
+      descriptionMaxLength: AugmentedConst<u32>;
+      /**
+       * Exports const -  max simultaneous active proposals number.
+       **/
+      maxActiveProposalLimit: AugmentedConst<u32>;
+      /**
+       * Exports const -  the fee is applied when the proposal gets rejected. A fee would be slashed (burned).
+       **/
+      rejectionFee: AugmentedConst<BalanceOf>;
+      /**
+       * Exports const -  max allowed proposal title length.
+       **/
+      titleMaxLength: AugmentedConst<u32>;
+    };
+    staking: {
+      /**
+       * Number of eras that staked funds must remain bonded for.
+       **/
+      bondingDuration: AugmentedConst<EraIndex>;
+      /**
+       * The number of blocks before the end of the era from which election submissions are allowed.
+       * 
+       * Setting this to zero will disable the offchain compute and only on-chain seq-phragmen will
+       * be used.
+       * 
+       * This is bounded by being within the last session. Hence, setting it to a value more than the
+       * length of a session will be pointless.
+       **/
+      electionLookahead: AugmentedConst<BlockNumber>;
+      /**
+       * Maximum number of balancing iterations to run in the offchain submission.
+       * 
+       * If set to 0, balance_solution will not be executed at all.
+       **/
+      maxIterations: AugmentedConst<u32>;
+      /**
+       * The maximum number of nominators rewarded for each validator.
+       * 
+       * For each validator only the `$MaxNominatorRewardedPerValidator` biggest stakers can claim
+       * their reward. This used to limit the i/o cost for the nominator payout.
+       **/
+      maxNominatorRewardedPerValidator: AugmentedConst<u32>;
+      /**
+       * The threshold of improvement that should be provided for a new solution to be accepted.
+       **/
+      minSolutionScoreBump: AugmentedConst<Perbill>;
+      /**
+       * Number of sessions per era.
+       **/
+      sessionsPerEra: AugmentedConst<SessionIndex>;
+      /**
+       * Number of eras that slashes are deferred by, after computation.
+       * 
+       * This should be less than the bonding duration.
+       * Set to 0 if slashes should be applied immediately, without opportunity for
+       * intervention.
+       **/
+      slashDeferDuration: AugmentedConst<EraIndex>;
+    };
+    storageWorkingGroup: {
+      /**
+       * Exports const -  max simultaneous active worker number.
+       **/
+      maxWorkerNumberLimit: AugmentedConst<u32>;
+    };
+    system: {
+      /**
+       * The base weight of executing a block, independent of the transactions in the block.
+       **/
+      blockExecutionWeight: AugmentedConst<Weight>;
+      /**
+       * The maximum number of blocks to allow in mortal eras.
+       **/
+      blockHashCount: AugmentedConst<BlockNumber>;
+      /**
+       * The weight of runtime database operations the runtime can invoke.
+       **/
+      dbWeight: AugmentedConst<RuntimeDbWeight>;
+      /**
+       * The base weight of an Extrinsic in the block, independent of the of extrinsic being executed.
+       **/
+      extrinsicBaseWeight: AugmentedConst<Weight>;
+      /**
+       * The maximum length of a block (in bytes).
+       **/
+      maximumBlockLength: AugmentedConst<u32>;
+      /**
+       * The maximum weight of a block.
+       **/
+      maximumBlockWeight: AugmentedConst<Weight>;
+    };
+    timestamp: {
+      /**
+       * The minimum period between blocks. Beware that this is different to the *expected* period
+       * that the block production apparatus provides. Your chosen consensus system will generally
+       * work with this to determine a sensible block time. e.g. For Aura, it will be double this
+       * period on default settings.
+       **/
+      minimumPeriod: AugmentedConst<Moment>;
+    };
+    transactionPayment: {
+      /**
+       * The fee to be paid for making a transaction; the per-byte portion.
+       **/
+      transactionByteFee: AugmentedConst<BalanceOf>;
+      /**
+       * The polynomial that is applied in order to derive fee from weight.
+       **/
+      weightToFee: AugmentedConst<Vec<WeightToFeeCoefficient>>;
+    };
+  }
+}
diff --git a/types/augment/augment-api-query.ts b/types/augment/augment-api-query.ts
new file mode 100644
index 0000000000..1d0a570fbb
--- /dev/null
+++ b/types/augment/augment-api-query.ts
@@ -0,0 +1,1149 @@
+// Auto-generated via `yarn polkadot-types-from-chain`, do not edit
+/* eslint-disable */
+
+import { AnyNumber, ITuple, Observable } from '@polkadot/types/types';
+import { Option, Vec } from '@polkadot/types/codec';
+import { Bytes, bool, u32, u64 } from '@polkadot/types/primitive';
+import { Application, ApplicationId, ApplicationOf, Category, CategoryId, Channel, ChannelId, Class, ClassId, ClassPermissionsType, ContentId, Credential, Curator, CuratorApplication, CuratorApplicationId, CuratorId, CuratorOpening, CuratorOpeningId, DataObject, DataObjectStorageRelationship, DataObjectStorageRelationshipId, DataObjectType, DataObjectTypeId, DiscussionPost, DiscussionThread, ElectionStage, ElectionStake, Entity, EntityId, HiringApplicationId, InputValidationLengthConstraint, Lead, LeadId, MemberId, Membership, MemoText, Mint, MintId, Opening, OpeningId, OpeningOf, PaidMembershipTerms, PaidTermId, Post, PostId, Principal, PrincipalId, ProposalDetailsOf, ProposalId, ProposalOf, Recipient, RecipientId, RewardRelationship, RewardRelationshipId, SealedVote, Seats, Stake, StakeId, StorageProviderId, Thread, ThreadCounter, ThreadId, TransferableStake, Url, VoteKind, WorkerId, WorkerOf, WorkingGroupUnstaker } from './all';
+import { UncleEntryItem } from '@polkadot/types/interfaces/authorship';
+import { BabeAuthorityWeight, MaybeRandomness, NextConfigDescriptor, Randomness } from '@polkadot/types/interfaces/babe';
+import { AccountData, BalanceLock } from '@polkadot/types/interfaces/balances';
+import { AuthorityId } from '@polkadot/types/interfaces/consensus';
+import { CodeHash, ContractInfo, PrefabWasmModule, Schedule } from '@polkadot/types/interfaces/contracts';
+import { SetId, StoredPendingChange, StoredState } from '@polkadot/types/interfaces/grandpa';
+import { AuthIndex } from '@polkadot/types/interfaces/imOnline';
+import { DeferredOffenceOf, Kind, OffenceDetails, OpaqueTimeSlot, ReportIdOf } from '@polkadot/types/interfaces/offences';
+import { AccountId, Balance, BalanceOf, BlockNumber, ExtrinsicsWeight, Hash, KeyTypeId, Moment, Perbill, Releases, ValidatorId } from '@polkadot/types/interfaces/runtime';
+import { Keys, SessionIndex } from '@polkadot/types/interfaces/session';
+import { ActiveEraInfo, ElectionResult, ElectionScore, ElectionStatus, EraIndex, EraRewardPoints, Exposure, Forcing, Nominations, RewardDestination, SlashingSpans, SpanIndex, SpanRecord, StakingLedger, UnappliedSlash, ValidatorPrefs } from '@polkadot/types/interfaces/staking';
+import { AccountInfo, DigestOf, EventIndex, EventRecord, LastRuntimeUpgradeInfo, Phase } from '@polkadot/types/interfaces/system';
+import { Multiplier } from '@polkadot/types/interfaces/txpayment';
+import { ApiTypes } from '@polkadot/api/types';
+
+declare module '@polkadot/api/types/storage' {
+  export interface AugmentedQueries<ApiType> {
+    authorship: {
+      /**
+       * Author of current block.
+       **/
+      author: AugmentedQuery<ApiType, () => Observable<Option<AccountId>>>;
+      /**
+       * Whether uncles were already set in this block.
+       **/
+      didSetUncles: AugmentedQuery<ApiType, () => Observable<bool>>;
+      /**
+       * Uncles
+       **/
+      uncles: AugmentedQuery<ApiType, () => Observable<Vec<UncleEntryItem>>>;
+    };
+    babe: {
+      /**
+       * Current epoch authorities.
+       **/
+      authorities: AugmentedQuery<ApiType, () => Observable<Vec<ITuple<[AuthorityId, BabeAuthorityWeight]>>>>;
+      /**
+       * Current slot number.
+       **/
+      currentSlot: AugmentedQuery<ApiType, () => Observable<u64>>;
+      /**
+       * Current epoch index.
+       **/
+      epochIndex: AugmentedQuery<ApiType, () => Observable<u64>>;
+      /**
+       * The slot at which the first epoch actually started. This is 0
+       * until the first block of the chain.
+       **/
+      genesisSlot: AugmentedQuery<ApiType, () => Observable<u64>>;
+      /**
+       * Temporary value (cleared at block finalization) which is `Some`
+       * if per-block initialization has already been called for current block.
+       **/
+      initialized: AugmentedQuery<ApiType, () => Observable<Option<MaybeRandomness>>>;
+      /**
+       * How late the current block is compared to its parent.
+       * 
+       * This entry is populated as part of block execution and is cleaned up
+       * on block finalization. Querying this storage entry outside of block
+       * execution context should always yield zero.
+       **/
+      lateness: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Next epoch configuration, if changed.
+       **/
+      nextEpochConfig: AugmentedQuery<ApiType, () => Observable<Option<NextConfigDescriptor>>>;
+      /**
+       * Next epoch randomness.
+       **/
+      nextRandomness: AugmentedQuery<ApiType, () => Observable<Randomness>>;
+      /**
+       * The epoch randomness for the *current* epoch.
+       * 
+       * # Security
+       * 
+       * This MUST NOT be used for gambling, as it can be influenced by a
+       * malicious validator in the short term. It MAY be used in many
+       * cryptographic protocols, however, so long as one remembers that this
+       * (like everything else on-chain) it is public. For example, it can be
+       * used where a number is needed that cannot have been chosen by an
+       * adversary, for purposes such as public-coin zero-knowledge proofs.
+       **/
+      randomness: AugmentedQuery<ApiType, () => Observable<Randomness>>;
+      /**
+       * Randomness under construction.
+       * 
+       * We make a tradeoff between storage accesses and list length.
+       * We store the under-construction randomness in segments of up to
+       * `UNDER_CONSTRUCTION_SEGMENT_LENGTH`.
+       * 
+       * Once a segment reaches this length, we begin the next one.
+       * We reset all segments and return to `0` at the beginning of every
+       * epoch.
+       **/
+      segmentIndex: AugmentedQuery<ApiType, () => Observable<u32>>;
+      /**
+       * TWOX-NOTE: `SegmentIndex` is an increasing integer, so this is okay.
+       **/
+      underConstruction: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<Vec<Randomness>>>;
+    };
+    balances: {
+      /**
+       * The balance of an account.
+       * 
+       * NOTE: This is only used in the case that this module is used to store balances.
+       **/
+      account: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<AccountData>>;
+      /**
+       * Any liquidity locks on some account balances.
+       * NOTE: Should only be accessed when setting, changing and freeing a lock.
+       **/
+      locks: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<Vec<BalanceLock>>>;
+      /**
+       * Storage version of the pallet.
+       * 
+       * This is set to v2.0.0 for new networks.
+       **/
+      storageVersion: AugmentedQuery<ApiType, () => Observable<Releases>>;
+      /**
+       * The total units issued in the system.
+       **/
+      totalIssuance: AugmentedQuery<ApiType, () => Observable<Balance>>;
+    };
+    contentWorkingGroup: {
+      channelAvatarConstraint: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      channelBannerConstraint: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      /**
+       * Maps identifier to corresponding channel.
+       **/
+      channelById: AugmentedQuery<ApiType, (arg: ChannelId | AnyNumber | Uint8Array) => Observable<Channel>>;
+      /**
+       * Whether it is currently possible to create a channel via `create_channel` extrinsic.
+       **/
+      channelCreationEnabled: AugmentedQuery<ApiType, () => Observable<bool>>;
+      channelDescriptionConstraint: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      channelHandleConstraint: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      /**
+       * Maps (unique) channel handle to the corresponding identifier for the channel.
+       * Mapping is required to allow efficient (O(log N)) on-chain verification that a proposed handle is indeed unique
+       * at the time it is being proposed.
+       **/
+      channelIdByHandle: AugmentedQuery<ApiType, (arg: Bytes | string | Uint8Array) => Observable<ChannelId>>;
+      channelTitleConstraint: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      /**
+       * Maps identifier to curator application on opening.
+       **/
+      curatorApplicationById: AugmentedQuery<ApiType, (arg: CuratorApplicationId | AnyNumber | Uint8Array) => Observable<CuratorApplication>>;
+      curatorApplicationHumanReadableText: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      /**
+       * Maps identifier to corresponding curator.
+       **/
+      curatorById: AugmentedQuery<ApiType, (arg: CuratorId | AnyNumber | Uint8Array) => Observable<Curator>>;
+      curatorExitRationaleText: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      /**
+       * Maps identifeir to curator opening.
+       **/
+      curatorOpeningById: AugmentedQuery<ApiType, (arg: CuratorOpeningId | AnyNumber | Uint8Array) => Observable<CuratorOpening>>;
+      /**
+       * The current lead.
+       **/
+      currentLeadId: AugmentedQuery<ApiType, () => Observable<Option<LeadId>>>;
+      /**
+       * Maps identifier to corresponding lead.
+       **/
+      leadById: AugmentedQuery<ApiType, (arg: LeadId | AnyNumber | Uint8Array) => Observable<Lead>>;
+      /**
+       * The mint currently funding the rewards for this module.
+       **/
+      mint: AugmentedQuery<ApiType, () => Observable<MintId>>;
+      /**
+       * Identifier to be used by the next channel introduced.
+       **/
+      nextChannelId: AugmentedQuery<ApiType, () => Observable<ChannelId>>;
+      /**
+       * Next identifier value for new curator application.
+       **/
+      nextCuratorApplicationId: AugmentedQuery<ApiType, () => Observable<CuratorApplicationId>>;
+      /**
+       * Next identifier for new curator.
+       **/
+      nextCuratorId: AugmentedQuery<ApiType, () => Observable<CuratorId>>;
+      /**
+       * Next identifier valuefor new curator opening.
+       **/
+      nextCuratorOpeningId: AugmentedQuery<ApiType, () => Observable<CuratorOpeningId>>;
+      /**
+       * Next identifier for new current lead.
+       **/
+      nextLeadId: AugmentedQuery<ApiType, () => Observable<LeadId>>;
+      /**
+       * Next identifier for
+       **/
+      nextPrincipalId: AugmentedQuery<ApiType, () => Observable<PrincipalId>>;
+      openingHumanReadableText: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      /**
+       * Maps identifier to principal.
+       **/
+      principalById: AugmentedQuery<ApiType, (arg: PrincipalId | AnyNumber | Uint8Array) => Observable<Principal>>;
+      /**
+       * Recover curator by the role stake which is currently unstaking.
+       **/
+      unstakerByStakeId: AugmentedQuery<ApiType, (arg: StakeId | AnyNumber | Uint8Array) => Observable<WorkingGroupUnstaker>>;
+    };
+    contracts: {
+      /**
+       * The subtrie counter.
+       **/
+      accountCounter: AugmentedQuery<ApiType, () => Observable<u64>>;
+      /**
+       * A mapping between an original code hash and instrumented wasm code, ready for execution.
+       **/
+      codeStorage: AugmentedQuery<ApiType, (arg: CodeHash | string | Uint8Array) => Observable<Option<PrefabWasmModule>>>;
+      /**
+       * The code associated with a given account.
+       * 
+       * TWOX-NOTE: SAFE since `AccountId` is a secure hash.
+       **/
+      contractInfoOf: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<Option<ContractInfo>>>;
+      /**
+       * Current cost schedule for contracts.
+       **/
+      currentSchedule: AugmentedQuery<ApiType, () => Observable<Schedule>>;
+      /**
+       * A mapping from an original code hash to the original code, untouched by instrumentation.
+       **/
+      pristineCode: AugmentedQuery<ApiType, (arg: CodeHash | string | Uint8Array) => Observable<Option<Bytes>>>;
+    };
+    council: {
+      activeCouncil: AugmentedQuery<ApiType, () => Observable<Seats>>;
+      /**
+       * Reward amount paid out at each PayoutInterval
+       **/
+      amountPerPayout: AugmentedQuery<ApiType, () => Observable<BalanceOf>>;
+      /**
+       * The mint that funds council member rewards and spending proposals budget. It is an Option
+       * because it was introduced in a runtime upgrade. It will be automatically created when
+       * a successful call to set_council_mint_capacity() is made.
+       **/
+      councilMint: AugmentedQuery<ApiType, () => Observable<Option<MintId>>>;
+      /**
+       * How many blocks after the reward is created, the first payout will be made
+       **/
+      firstPayoutAfterRewardCreated: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Optional interval in blocks on which a reward payout will be made to each council member
+       **/
+      payoutInterval: AugmentedQuery<ApiType, () => Observable<Option<BlockNumber>>>;
+      /**
+       * The reward relationships currently in place. There may not necessarily be a 1-1 correspondance with
+       * the active council, since there are multiple ways of setting/adding/removing council members, some of which
+       * do not involve creating a relationship.
+       **/
+      rewardRelationships: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<RewardRelationshipId>>;
+      termEndsAt: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+    };
+    councilElection: {
+      announcingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      applicants: AugmentedQuery<ApiType, () => Observable<Vec<AccountId>>>;
+      applicantStakes: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<ElectionStake>>;
+      autoStart: AugmentedQuery<ApiType, () => Observable<bool>>;
+      candidacyLimit: AugmentedQuery<ApiType, () => Observable<u32>>;
+      commitments: AugmentedQuery<ApiType, () => Observable<Vec<Hash>>>;
+      councilSize: AugmentedQuery<ApiType, () => Observable<u32>>;
+      existingStakeHolders: AugmentedQuery<ApiType, () => Observable<Vec<AccountId>>>;
+      minCouncilStake: AugmentedQuery<ApiType, () => Observable<BalanceOf>>;
+      minVotingStake: AugmentedQuery<ApiType, () => Observable<BalanceOf>>;
+      newTermDuration: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      revealingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      round: AugmentedQuery<ApiType, () => Observable<u32>>;
+      stage: AugmentedQuery<ApiType, () => Observable<Option<ElectionStage>>>;
+      transferableStakes: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<TransferableStake>>;
+      votes: AugmentedQuery<ApiType, (arg: Hash | string | Uint8Array) => Observable<SealedVote>>;
+      votingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+    };
+    dataDirectory: {
+      /**
+       * Maps data objects by their content id.
+       **/
+      dataObjectByContentId: AugmentedQuery<ApiType, (arg: ContentId | string | Uint8Array) => Observable<Option<DataObject>>>;
+      /**
+       * List of ids known to the system.
+       **/
+      knownContentIds: AugmentedQuery<ApiType, () => Observable<Vec<ContentId>>>;
+    };
+    dataObjectStorageRegistry: {
+      /**
+       * Defines first relationship id.
+       **/
+      firstRelationshipId: AugmentedQuery<ApiType, () => Observable<DataObjectStorageRelationshipId>>;
+      /**
+       * Defines next relationship id.
+       **/
+      nextRelationshipId: AugmentedQuery<ApiType, () => Observable<DataObjectStorageRelationshipId>>;
+      /**
+       * Mapping of Data object types
+       **/
+      relationships: AugmentedQuery<ApiType, (arg: DataObjectStorageRelationshipId | AnyNumber | Uint8Array) => Observable<Option<DataObjectStorageRelationship>>>;
+      /**
+       * Keeps a list of storage relationships per content id.
+       **/
+      relationshipsByContentId: AugmentedQuery<ApiType, (arg: ContentId | string | Uint8Array) => Observable<Vec<DataObjectStorageRelationshipId>>>;
+    };
+    dataObjectTypeRegistry: {
+      /**
+       * Mapping of Data object types.
+       **/
+      dataObjectTypes: AugmentedQuery<ApiType, (arg: DataObjectTypeId | AnyNumber | Uint8Array) => Observable<Option<DataObjectType>>>;
+      /**
+       * Data object type ids should start at this value.
+       **/
+      firstDataObjectTypeId: AugmentedQuery<ApiType, () => Observable<DataObjectTypeId>>;
+      /**
+       * Provides id counter for the data object types.
+       **/
+      nextDataObjectTypeId: AugmentedQuery<ApiType, () => Observable<DataObjectTypeId>>;
+    };
+    discovery: {
+      /**
+       * Mapping of service providers' storage provider id to their AccountInfo
+       **/
+      accountInfoByStorageProviderId: AugmentedQuery<ApiType, (arg: StorageProviderId | AnyNumber | Uint8Array) => Observable<AccountInfo>>;
+      /**
+       * Bootstrap endpoints maintained by root
+       **/
+      bootstrapEndpoints: AugmentedQuery<ApiType, () => Observable<Vec<Url>>>;
+      /**
+       * Lifetime of an AccountInfo record in AccountInfoByAccountId map
+       **/
+      defaultLifetime: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+    };
+    forum: {
+      /**
+       * Map category identifier to corresponding category.
+       **/
+      categoryById: AugmentedQuery<ApiType, (arg: CategoryId | AnyNumber | Uint8Array) => Observable<Category>>;
+      categoryDescriptionConstraint: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      /**
+       * Input constraints
+       * These are all forward looking, that is they are enforced on all
+       * future calls.
+       **/
+      categoryTitleConstraint: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      /**
+       * Account of forum sudo.
+       **/
+      forumSudo: AugmentedQuery<ApiType, () => Observable<Option<AccountId>>>;
+      /**
+       * Category identifier value to be used for the next Category created.
+       **/
+      nextCategoryId: AugmentedQuery<ApiType, () => Observable<CategoryId>>;
+      /**
+       * Post identifier value to be used for for next post created.
+       **/
+      nextPostId: AugmentedQuery<ApiType, () => Observable<PostId>>;
+      /**
+       * Thread identifier value to be used for next Thread in threadById.
+       **/
+      nextThreadId: AugmentedQuery<ApiType, () => Observable<ThreadId>>;
+      /**
+       * Map post identifier to corresponding post.
+       **/
+      postById: AugmentedQuery<ApiType, (arg: PostId | AnyNumber | Uint8Array) => Observable<Post>>;
+      postModerationRationaleConstraint: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      postTextConstraint: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      /**
+       * Map thread identifier to corresponding thread.
+       **/
+      threadById: AugmentedQuery<ApiType, (arg: ThreadId | AnyNumber | Uint8Array) => Observable<Thread>>;
+      threadModerationRationaleConstraint: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      threadTitleConstraint: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+    };
+    grandpa: {
+      /**
+       * The number of changes (both in terms of keys and underlying economic responsibilities)
+       * in the "set" of Grandpa validators from genesis.
+       **/
+      currentSetId: AugmentedQuery<ApiType, () => Observable<SetId>>;
+      /**
+       * next block number where we can force a change.
+       **/
+      nextForced: AugmentedQuery<ApiType, () => Observable<Option<BlockNumber>>>;
+      /**
+       * Pending change: (signaled at, scheduled change).
+       **/
+      pendingChange: AugmentedQuery<ApiType, () => Observable<Option<StoredPendingChange>>>;
+      /**
+       * A mapping from grandpa set ID to the index of the *most recent* session for which its
+       * members were responsible.
+       * 
+       * TWOX-NOTE: `SetId` is not under user control.
+       **/
+      setIdSession: AugmentedQuery<ApiType, (arg: SetId | AnyNumber | Uint8Array) => Observable<Option<SessionIndex>>>;
+      /**
+       * `true` if we are currently stalled.
+       **/
+      stalled: AugmentedQuery<ApiType, () => Observable<Option<ITuple<[BlockNumber, BlockNumber]>>>>;
+      /**
+       * State of the current authority set.
+       **/
+      state: AugmentedQuery<ApiType, () => Observable<StoredState>>;
+    };
+    hiring: {
+      /**
+       * Applications
+       **/
+      applicationById: AugmentedQuery<ApiType, (arg: ApplicationId | AnyNumber | Uint8Array) => Observable<Application>>;
+      /**
+       * Internal purpose of given stake, i.e. fro what application, and whether for the role or for the application.
+       **/
+      applicationIdByStakingId: AugmentedQuery<ApiType, (arg: StakeId | AnyNumber | Uint8Array) => Observable<ApplicationId>>;
+      /**
+       * Identifier for next application to be added.
+       **/
+      nextApplicationId: AugmentedQuery<ApiType, () => Observable<ApplicationId>>;
+      /**
+       * Identifier for next opening to be added.
+       **/
+      nextOpeningId: AugmentedQuery<ApiType, () => Observable<OpeningId>>;
+      /**
+       * Openings.
+       **/
+      openingById: AugmentedQuery<ApiType, (arg: OpeningId | AnyNumber | Uint8Array) => Observable<Opening>>;
+    };
+    imOnline: {
+      /**
+       * For each session index, we keep a mapping of `T::ValidatorId` to the
+       * number of blocks authored by the given authority.
+       **/
+      authoredBlocks: AugmentedQueryDoubleMap<ApiType, (key1: SessionIndex | AnyNumber | Uint8Array, key2: ValidatorId | string | Uint8Array) => Observable<u32>>;
+      /**
+       * The block number after which it's ok to send heartbeats in current session.
+       * 
+       * At the beginning of each session we set this to a value that should
+       * fall roughly in the middle of the session duration.
+       * The idea is to first wait for the validators to produce a block
+       * in the current session, so that the heartbeat later on will not be necessary.
+       **/
+      heartbeatAfter: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * The current set of keys that may issue a heartbeat.
+       **/
+      keys: AugmentedQuery<ApiType, () => Observable<Vec<AuthorityId>>>;
+      /**
+       * For each session index, we keep a mapping of `AuthIndex` to
+       * `offchain::OpaqueNetworkState`.
+       **/
+      receivedHeartbeats: AugmentedQueryDoubleMap<ApiType, (key1: SessionIndex | AnyNumber | Uint8Array, key2: AuthIndex | AnyNumber | Uint8Array) => Observable<Option<Bytes>>>;
+    };
+    members: {
+      /**
+       * Active Paid membership terms
+       **/
+      activePaidMembershipTerms: AugmentedQuery<ApiType, () => Observable<Vec<PaidTermId>>>;
+      maxAboutTextLength: AugmentedQuery<ApiType, () => Observable<u32>>;
+      maxAvatarUriLength: AugmentedQuery<ApiType, () => Observable<u32>>;
+      maxHandleLength: AugmentedQuery<ApiType, () => Observable<u32>>;
+      /**
+       * Registered unique handles and their mapping to their owner
+       **/
+      memberIdByHandle: AugmentedQuery<ApiType, (arg: Bytes | string | Uint8Array) => Observable<MemberId>>;
+      /**
+       * Mapping of a controller account id to vector of member ids it controls
+       **/
+      memberIdsByControllerAccountId: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<Vec<MemberId>>>;
+      /**
+       * Mapping of a root account id to vector of member ids it controls.
+       **/
+      memberIdsByRootAccountId: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<Vec<MemberId>>>;
+      /**
+       * Mapping of member's id to their membership profile
+       **/
+      membershipById: AugmentedQuery<ApiType, (arg: MemberId | AnyNumber | Uint8Array) => Observable<Membership>>;
+      minHandleLength: AugmentedQuery<ApiType, () => Observable<u32>>;
+      /**
+       * Is the platform is accepting new members or not
+       **/
+      newMembershipsAllowed: AugmentedQuery<ApiType, () => Observable<bool>>;
+      /**
+       * MemberId to assign to next member that is added to the registry, and is also the
+       * total number of members created. MemberIds start at Zero.
+       **/
+      nextMemberId: AugmentedQuery<ApiType, () => Observable<MemberId>>;
+      /**
+       * Next paid membership terms id
+       **/
+      nextPaidMembershipTermsId: AugmentedQuery<ApiType, () => Observable<PaidTermId>>;
+      /**
+       * Paid membership terms record
+       **/
+      paidMembershipTermsById: AugmentedQuery<ApiType, (arg: PaidTermId | AnyNumber | Uint8Array) => Observable<PaidMembershipTerms>>;
+      screeningAuthority: AugmentedQuery<ApiType, () => Observable<AccountId>>;
+    };
+    memo: {
+      maxMemoLength: AugmentedQuery<ApiType, () => Observable<u32>>;
+      memo: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<MemoText>>;
+    };
+    minting: {
+      /**
+       * Mints
+       **/
+      mints: AugmentedQuery<ApiType, (arg: MintId | AnyNumber | Uint8Array) => Observable<Mint>>;
+      /**
+       * The number of mints created.
+       **/
+      mintsCreated: AugmentedQuery<ApiType, () => Observable<MintId>>;
+    };
+    offences: {
+      /**
+       * A vector of reports of the same kind that happened at the same time slot.
+       **/
+      concurrentReportsIndex: AugmentedQueryDoubleMap<ApiType, (key1: Kind | string | Uint8Array, key2: OpaqueTimeSlot | string | Uint8Array) => Observable<Vec<ReportIdOf>>>;
+      /**
+       * Deferred reports that have been rejected by the offence handler and need to be submitted
+       * at a later time.
+       **/
+      deferredOffences: AugmentedQuery<ApiType, () => Observable<Vec<DeferredOffenceOf>>>;
+      /**
+       * The primary structure that holds all offence records keyed by report identifiers.
+       **/
+      reports: AugmentedQuery<ApiType, (arg: ReportIdOf | string | Uint8Array) => Observable<Option<OffenceDetails>>>;
+      /**
+       * Enumerates all reports of a kind along with the time they happened.
+       * 
+       * All reports are sorted by the time of offence.
+       * 
+       * Note that the actual type of this mapping is `Vec<u8>`, this is because values of
+       * different types are not supported at the moment so we are doing the manual serialization.
+       **/
+      reportsByKindIndex: AugmentedQuery<ApiType, (arg: Kind | string | Uint8Array) => Observable<Bytes>>;
+    };
+    proposalsCodex: {
+      /**
+       * Grace period for the 'add working group opening' proposal
+       **/
+      addWorkingGroupOpeningProposalGracePeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Voting period for the 'add working group opening' proposal
+       **/
+      addWorkingGroupOpeningProposalVotingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Grace period for the 'begin review working group leader applications' proposal
+       **/
+      beginReviewWorkingGroupLeaderApplicationsProposalGracePeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Voting period for the 'begin review working group leader applications' proposal
+       **/
+      beginReviewWorkingGroupLeaderApplicationsProposalVotingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Grace period for the 'decrease working group leader stake' proposal
+       **/
+      decreaseWorkingGroupLeaderStakeProposalGracePeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Voting period for the 'decrease working group leader stake' proposal
+       **/
+      decreaseWorkingGroupLeaderStakeProposalVotingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Grace period for the 'fill working group leader opening' proposal
+       **/
+      fillWorkingGroupLeaderOpeningProposalGracePeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Voting period for the 'fill working group leader opening' proposal
+       **/
+      fillWorkingGroupLeaderOpeningProposalVotingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Map proposal id to proposal details
+       **/
+      proposalDetailsByProposalId: AugmentedQuery<ApiType, (arg: ProposalId | AnyNumber | Uint8Array) => Observable<ProposalDetailsOf>>;
+      /**
+       * Grace period for the 'runtime upgrade' proposal
+       **/
+      runtimeUpgradeProposalGracePeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Voting period for the 'runtime upgrade' proposal
+       **/
+      runtimeUpgradeProposalVotingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Grace period for the 'set content working group mint capacity' proposal
+       **/
+      setContentWorkingGroupMintCapacityProposalGracePeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Voting period for the 'set content working group mint capacity' proposal
+       **/
+      setContentWorkingGroupMintCapacityProposalVotingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Grace period for the 'set election parameters' proposal
+       **/
+      setElectionParametersProposalGracePeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Voting period for the 'set election parameters' proposal
+       **/
+      setElectionParametersProposalVotingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Grace period for the 'set lead' proposal
+       **/
+      setLeadProposalGracePeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Voting period for the 'set lead' proposal
+       **/
+      setLeadProposalVotingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Grace period for the 'set validator count' proposal
+       **/
+      setValidatorCountProposalGracePeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Voting period for the 'set validator count' proposal
+       **/
+      setValidatorCountProposalVotingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Grace period for the 'set working group leader reward' proposal
+       **/
+      setWorkingGroupLeaderRewardProposalGracePeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Voting period for the 'set working group leader reward' proposal
+       **/
+      setWorkingGroupLeaderRewardProposalVotingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Grace period for the 'set working group mint capacity' proposal
+       **/
+      setWorkingGroupMintCapacityProposalGracePeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Voting period for the 'set working group mint capacity' proposal
+       **/
+      setWorkingGroupMintCapacityProposalVotingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Grace period for the 'slash working group leader stake' proposal
+       **/
+      slashWorkingGroupLeaderStakeProposalGracePeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Voting period for the 'slash working group leader stake' proposal
+       **/
+      slashWorkingGroupLeaderStakeProposalVotingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Grace period for the 'spending' proposal
+       **/
+      spendingProposalGracePeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Voting period for the 'spending' proposal
+       **/
+      spendingProposalVotingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Grace period for the 'terminate working group leader role' proposal
+       **/
+      terminateWorkingGroupLeaderRoleProposalGracePeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Voting period for the 'terminate working group leader role' proposal
+       **/
+      terminateWorkingGroupLeaderRoleProposalVotingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Grace period for the 'text' proposal
+       **/
+      textProposalGracePeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Voting period for the 'text' proposal
+       **/
+      textProposalVotingPeriod: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Map proposal id to its discussion thread id
+       **/
+      threadIdByProposalId: AugmentedQuery<ApiType, (arg: ProposalId | AnyNumber | Uint8Array) => Observable<ThreadId>>;
+    };
+    proposalsDiscussion: {
+      /**
+       * Last author thread counter (part of the antispam mechanism)
+       **/
+      lastThreadAuthorCounter: AugmentedQuery<ApiType, () => Observable<Option<ThreadCounter>>>;
+      /**
+       * Count of all posts that have been created.
+       **/
+      postCount: AugmentedQuery<ApiType, () => Observable<u64>>;
+      /**
+       * Map thread id and post id to corresponding post.
+       **/
+      postThreadIdByPostId: AugmentedQueryDoubleMap<ApiType, (key1: ThreadId | AnyNumber | Uint8Array, key2: PostId | AnyNumber | Uint8Array) => Observable<DiscussionPost>>;
+      /**
+       * Map thread identifier to corresponding thread.
+       **/
+      threadById: AugmentedQuery<ApiType, (arg: ThreadId | AnyNumber | Uint8Array) => Observable<DiscussionThread>>;
+      /**
+       * Count of all threads that have been created.
+       **/
+      threadCount: AugmentedQuery<ApiType, () => Observable<u64>>;
+    };
+    proposalsEngine: {
+      /**
+       * Count of active proposals.
+       **/
+      activeProposalCount: AugmentedQuery<ApiType, () => Observable<u32>>;
+      /**
+       * Ids of proposals that are open for voting (have not been finalized yet).
+       **/
+      activeProposalIds: AugmentedQuery<ApiType, (arg: ProposalId | AnyNumber | Uint8Array) => Observable<ITuple<[]>>>;
+      /**
+       * Map proposal executable code by proposal id.
+       **/
+      dispatchableCallCode: AugmentedQuery<ApiType, (arg: ProposalId | AnyNumber | Uint8Array) => Observable<Bytes>>;
+      /**
+       * Ids of proposals that were approved and theirs grace period was not expired.
+       **/
+      pendingExecutionProposalIds: AugmentedQuery<ApiType, (arg: ProposalId | AnyNumber | Uint8Array) => Observable<ITuple<[]>>>;
+      /**
+       * Count of all proposals that have been created.
+       **/
+      proposalCount: AugmentedQuery<ApiType, () => Observable<u32>>;
+      /**
+       * Map proposal by its id.
+       **/
+      proposals: AugmentedQuery<ApiType, (arg: ProposalId | AnyNumber | Uint8Array) => Observable<ProposalOf>>;
+      /**
+       * Map proposal id by stake id. Required by StakingEventsHandler callback call
+       **/
+      stakesProposals: AugmentedQuery<ApiType, (arg: StakeId | AnyNumber | Uint8Array) => Observable<ProposalId>>;
+      /**
+       * Double map for preventing duplicate votes. Should be cleaned after usage.
+       **/
+      voteExistsByProposalByVoter: AugmentedQueryDoubleMap<ApiType, (key1: ProposalId | AnyNumber | Uint8Array, key2: MemberId | AnyNumber | Uint8Array) => Observable<VoteKind>>;
+    };
+    randomnessCollectiveFlip: {
+      /**
+       * Series of block headers from the last 81 blocks that acts as random seed material. This
+       * is arranged as a ring buffer with `block_number % 81` being the index into the `Vec` of
+       * the oldest hash.
+       **/
+      randomMaterial: AugmentedQuery<ApiType, () => Observable<Vec<Hash>>>;
+    };
+    recurringRewards: {
+      recipients: AugmentedQuery<ApiType, (arg: RecipientId | AnyNumber | Uint8Array) => Observable<Recipient>>;
+      recipientsCreated: AugmentedQuery<ApiType, () => Observable<RecipientId>>;
+      rewardRelationships: AugmentedQuery<ApiType, (arg: RewardRelationshipId | AnyNumber | Uint8Array) => Observable<RewardRelationship>>;
+      rewardRelationshipsCreated: AugmentedQuery<ApiType, () => Observable<RewardRelationshipId>>;
+    };
+    session: {
+      /**
+       * Current index of the session.
+       **/
+      currentIndex: AugmentedQuery<ApiType, () => Observable<SessionIndex>>;
+      /**
+       * Indices of disabled validators.
+       * 
+       * The set is cleared when `on_session_ending` returns a new set of identities.
+       **/
+      disabledValidators: AugmentedQuery<ApiType, () => Observable<Vec<u32>>>;
+      /**
+       * The owner of a key. The key is the `KeyTypeId` + the encoded key.
+       **/
+      keyOwner: AugmentedQuery<ApiType, (arg: ITuple<[KeyTypeId, Bytes]> | [KeyTypeId | AnyNumber | Uint8Array, Bytes | string | Uint8Array]) => Observable<Option<ValidatorId>>>;
+      /**
+       * The next session keys for a validator.
+       **/
+      nextKeys: AugmentedQuery<ApiType, (arg: ValidatorId | string | Uint8Array) => Observable<Option<Keys>>>;
+      /**
+       * True if the underlying economic identities or weighting behind the validators
+       * has changed in the queued validator set.
+       **/
+      queuedChanged: AugmentedQuery<ApiType, () => Observable<bool>>;
+      /**
+       * The queued keys for the next session. When the next session begins, these keys
+       * will be used to determine the validator's session keys.
+       **/
+      queuedKeys: AugmentedQuery<ApiType, () => Observable<Vec<ITuple<[ValidatorId, Keys]>>>>;
+      /**
+       * The current set of validators.
+       **/
+      validators: AugmentedQuery<ApiType, () => Observable<Vec<ValidatorId>>>;
+    };
+    stake: {
+      /**
+       * Maps identifiers to a stake.
+       **/
+      stakes: AugmentedQuery<ApiType, (arg: StakeId | AnyNumber | Uint8Array) => Observable<Stake>>;
+      /**
+       * Identifier value for next stake, and count of total stakes created (not necessarily the number of current
+       * stakes in the Stakes map as stakes can be removed.)
+       **/
+      stakesCreated: AugmentedQuery<ApiType, () => Observable<StakeId>>;
+    };
+    staking: {
+      /**
+       * The active era information, it holds index and start.
+       * 
+       * The active era is the era currently rewarded.
+       * Validator set of this era must be equal to `SessionInterface::validators`.
+       **/
+      activeEra: AugmentedQuery<ApiType, () => Observable<Option<ActiveEraInfo>>>;
+      /**
+       * Map from all locked "stash" accounts to the controller account.
+       **/
+      bonded: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<Option<AccountId>>>;
+      /**
+       * A mapping from still-bonded eras to the first session index of that era.
+       * 
+       * Must contains information for eras for the range:
+       * `[active_era - bounding_duration; active_era]`
+       **/
+      bondedEras: AugmentedQuery<ApiType, () => Observable<Vec<ITuple<[EraIndex, SessionIndex]>>>>;
+      /**
+       * The amount of currency given to reporters of a slash event which was
+       * canceled by extraordinary circumstances (e.g. governance).
+       **/
+      canceledSlashPayout: AugmentedQuery<ApiType, () => Observable<BalanceOf>>;
+      /**
+       * The current era index.
+       * 
+       * This is the latest planned era, depending on how the Session pallet queues the validator
+       * set, it might be active or not.
+       **/
+      currentEra: AugmentedQuery<ApiType, () => Observable<Option<EraIndex>>>;
+      /**
+       * The earliest era for which we have a pending, unapplied slash.
+       **/
+      earliestUnappliedSlash: AugmentedQuery<ApiType, () => Observable<Option<EraIndex>>>;
+      /**
+       * Flag to control the execution of the offchain election. When `Open(_)`, we accept
+       * solutions to be submitted.
+       **/
+      eraElectionStatus: AugmentedQuery<ApiType, () => Observable<ElectionStatus>>;
+      /**
+       * Rewards for the last `HISTORY_DEPTH` eras.
+       * If reward hasn't been set or has been removed then 0 reward is returned.
+       **/
+      erasRewardPoints: AugmentedQuery<ApiType, (arg: EraIndex | AnyNumber | Uint8Array) => Observable<EraRewardPoints>>;
+      /**
+       * Exposure of validator at era.
+       * 
+       * This is keyed first by the era index to allow bulk deletion and then the stash account.
+       * 
+       * Is it removed after `HISTORY_DEPTH` eras.
+       * If stakers hasn't been set or has been removed then empty exposure is returned.
+       **/
+      erasStakers: AugmentedQueryDoubleMap<ApiType, (key1: EraIndex | AnyNumber | Uint8Array, key2: AccountId | string | Uint8Array) => Observable<Exposure>>;
+      /**
+       * Clipped Exposure of validator at era.
+       * 
+       * This is similar to [`ErasStakers`] but number of nominators exposed is reduced to the
+       * `T::MaxNominatorRewardedPerValidator` biggest stakers.
+       * (Note: the field `total` and `own` of the exposure remains unchanged).
+       * This is used to limit the i/o cost for the nominator payout.
+       * 
+       * This is keyed fist by the era index to allow bulk deletion and then the stash account.
+       * 
+       * Is it removed after `HISTORY_DEPTH` eras.
+       * If stakers hasn't been set or has been removed then empty exposure is returned.
+       **/
+      erasStakersClipped: AugmentedQueryDoubleMap<ApiType, (key1: EraIndex | AnyNumber | Uint8Array, key2: AccountId | string | Uint8Array) => Observable<Exposure>>;
+      /**
+       * The session index at which the era start for the last `HISTORY_DEPTH` eras.
+       **/
+      erasStartSessionIndex: AugmentedQuery<ApiType, (arg: EraIndex | AnyNumber | Uint8Array) => Observable<Option<SessionIndex>>>;
+      /**
+       * The total amount staked for the last `HISTORY_DEPTH` eras.
+       * If total hasn't been set or has been removed then 0 stake is returned.
+       **/
+      erasTotalStake: AugmentedQuery<ApiType, (arg: EraIndex | AnyNumber | Uint8Array) => Observable<BalanceOf>>;
+      /**
+       * Similar to `ErasStakers`, this holds the preferences of validators.
+       * 
+       * This is keyed first by the era index to allow bulk deletion and then the stash account.
+       * 
+       * Is it removed after `HISTORY_DEPTH` eras.
+       **/
+      erasValidatorPrefs: AugmentedQueryDoubleMap<ApiType, (key1: EraIndex | AnyNumber | Uint8Array, key2: AccountId | string | Uint8Array) => Observable<ValidatorPrefs>>;
+      /**
+       * The total validator era payout for the last `HISTORY_DEPTH` eras.
+       * 
+       * Eras that haven't finished yet or has been removed doesn't have reward.
+       **/
+      erasValidatorReward: AugmentedQuery<ApiType, (arg: EraIndex | AnyNumber | Uint8Array) => Observable<Option<BalanceOf>>>;
+      /**
+       * Mode of era forcing.
+       **/
+      forceEra: AugmentedQuery<ApiType, () => Observable<Forcing>>;
+      /**
+       * Number of eras to keep in history.
+       * 
+       * Information is kept for eras in `[current_era - history_depth; current_era]`.
+       * 
+       * Must be more than the number of eras delayed by session otherwise. I.e. active era must
+       * always be in history. I.e. `active_era > current_era - history_depth` must be
+       * guaranteed.
+       **/
+      historyDepth: AugmentedQuery<ApiType, () => Observable<u32>>;
+      /**
+       * Any validators that may never be slashed or forcibly kicked. It's a Vec since they're
+       * easy to initialize and the performance hit is minimal (we expect no more than four
+       * invulnerables) and restricted to testnets.
+       **/
+      invulnerables: AugmentedQuery<ApiType, () => Observable<Vec<AccountId>>>;
+      /**
+       * True if the current **planned** session is final. Note that this does not take era
+       * forcing into account.
+       **/
+      isCurrentSessionFinal: AugmentedQuery<ApiType, () => Observable<bool>>;
+      /**
+       * Map from all (unlocked) "controller" accounts to the info regarding the staking.
+       **/
+      ledger: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<Option<StakingLedger>>>;
+      /**
+       * Minimum number of staking participants before emergency conditions are imposed.
+       **/
+      minimumValidatorCount: AugmentedQuery<ApiType, () => Observable<u32>>;
+      /**
+       * The map from nominator stash key to the set of stash keys of all validators to nominate.
+       **/
+      nominators: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<Option<Nominations>>>;
+      /**
+       * All slashing events on nominators, mapped by era to the highest slash value of the era.
+       **/
+      nominatorSlashInEra: AugmentedQueryDoubleMap<ApiType, (key1: EraIndex | AnyNumber | Uint8Array, key2: AccountId | string | Uint8Array) => Observable<Option<BalanceOf>>>;
+      /**
+       * Where the reward payment should be made. Keyed by stash.
+       **/
+      payee: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<RewardDestination>>;
+      /**
+       * The next validator set. At the end of an era, if this is available (potentially from the
+       * result of an offchain worker), it is immediately used. Otherwise, the on-chain election
+       * is executed.
+       **/
+      queuedElected: AugmentedQuery<ApiType, () => Observable<Option<ElectionResult>>>;
+      /**
+       * The score of the current [`QueuedElected`].
+       **/
+      queuedScore: AugmentedQuery<ApiType, () => Observable<Option<ElectionScore>>>;
+      /**
+       * Slashing spans for stash accounts.
+       **/
+      slashingSpans: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<Option<SlashingSpans>>>;
+      /**
+       * The percentage of the slash that is distributed to reporters.
+       * 
+       * The rest of the slashed value is handled by the `Slash`.
+       **/
+      slashRewardFraction: AugmentedQuery<ApiType, () => Observable<Perbill>>;
+      /**
+       * Snapshot of nominators at the beginning of the current election window. This should only
+       * have a value when [`EraElectionStatus`] == `ElectionStatus::Open(_)`.
+       **/
+      snapshotNominators: AugmentedQuery<ApiType, () => Observable<Option<Vec<AccountId>>>>;
+      /**
+       * Snapshot of validators at the beginning of the current election window. This should only
+       * have a value when [`EraElectionStatus`] == `ElectionStatus::Open(_)`.
+       **/
+      snapshotValidators: AugmentedQuery<ApiType, () => Observable<Option<Vec<AccountId>>>>;
+      /**
+       * Records information about the maximum slash of a stash within a slashing span,
+       * as well as how much reward has been paid out.
+       **/
+      spanSlash: AugmentedQuery<ApiType, (arg: ITuple<[AccountId, SpanIndex]> | [AccountId | string | Uint8Array, SpanIndex | AnyNumber | Uint8Array]) => Observable<SpanRecord>>;
+      /**
+       * True if network has been upgraded to this version.
+       * Storage version of the pallet.
+       * 
+       * This is set to v3.0.0 for new networks.
+       **/
+      storageVersion: AugmentedQuery<ApiType, () => Observable<Releases>>;
+      /**
+       * All unapplied slashes that are queued for later.
+       **/
+      unappliedSlashes: AugmentedQuery<ApiType, (arg: EraIndex | AnyNumber | Uint8Array) => Observable<Vec<UnappliedSlash>>>;
+      /**
+       * The ideal number of staking participants.
+       **/
+      validatorCount: AugmentedQuery<ApiType, () => Observable<u32>>;
+      /**
+       * The map from (wannabe) validator stash key to the preferences of that validator.
+       **/
+      validators: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<ValidatorPrefs>>;
+      /**
+       * All slashing events on validators, mapped by era to the highest slash proportion
+       * and slash value of the era.
+       **/
+      validatorSlashInEra: AugmentedQueryDoubleMap<ApiType, (key1: EraIndex | AnyNumber | Uint8Array, key2: AccountId | string | Uint8Array) => Observable<Option<ITuple<[Perbill, BalanceOf]>>>>;
+    };
+    storageWorkingGroup: {
+      /**
+       * Count of active workers.
+       **/
+      activeWorkerCount: AugmentedQuery<ApiType, () => Observable<u32>>;
+      /**
+       * Maps identifier to worker application on opening.
+       **/
+      applicationById: AugmentedQuery<ApiType, (arg: ApplicationId | AnyNumber | Uint8Array) => Observable<ApplicationOf>>;
+      /**
+       * The current lead.
+       **/
+      currentLead: AugmentedQuery<ApiType, () => Observable<Option<WorkerId>>>;
+      /**
+       * Map member id by hiring application id.
+       * Required by StakingEventsHandler callback call to refund the balance on unstaking.
+       **/
+      memberIdByHiringApplicationId: AugmentedQuery<ApiType, (arg: HiringApplicationId | AnyNumber | Uint8Array) => Observable<MemberId>>;
+      /**
+       * The mint currently funding the rewards for this module.
+       **/
+      mint: AugmentedQuery<ApiType, () => Observable<MintId>>;
+      /**
+       * Next identifier value for new worker application.
+       **/
+      nextApplicationId: AugmentedQuery<ApiType, () => Observable<ApplicationId>>;
+      /**
+       * Next identifier value for new worker opening.
+       **/
+      nextOpeningId: AugmentedQuery<ApiType, () => Observable<OpeningId>>;
+      /**
+       * Next identifier for new worker.
+       **/
+      nextWorkerId: AugmentedQuery<ApiType, () => Observable<WorkerId>>;
+      /**
+       * Maps identifier to worker opening.
+       **/
+      openingById: AugmentedQuery<ApiType, (arg: OpeningId | AnyNumber | Uint8Array) => Observable<OpeningOf>>;
+      /**
+       * Opening human readable text length limits
+       **/
+      openingHumanReadableText: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      /**
+       * Worker application human readable text length limits
+       **/
+      workerApplicationHumanReadableText: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      /**
+       * Maps identifier to corresponding worker.
+       **/
+      workerById: AugmentedQuery<ApiType, (arg: WorkerId | AnyNumber | Uint8Array) => Observable<WorkerOf>>;
+      /**
+       * Worker exit rationale text length limits.
+       **/
+      workerExitRationaleText: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+    };
+    sudo: {
+      /**
+       * The `AccountId` of the sudo key.
+       **/
+      key: AugmentedQuery<ApiType, () => Observable<AccountId>>;
+    };
+    system: {
+      /**
+       * The full account information for a particular account ID.
+       **/
+      account: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<AccountInfo>>;
+      /**
+       * Total length (in bytes) for all extrinsics put together, for the current block.
+       **/
+      allExtrinsicsLen: AugmentedQuery<ApiType, () => Observable<Option<u32>>>;
+      /**
+       * Map of block numbers to block hashes.
+       **/
+      blockHash: AugmentedQuery<ApiType, (arg: BlockNumber | AnyNumber | Uint8Array) => Observable<Hash>>;
+      /**
+       * The current weight for the block.
+       **/
+      blockWeight: AugmentedQuery<ApiType, () => Observable<ExtrinsicsWeight>>;
+      /**
+       * Digest of the current block, also part of the block header.
+       **/
+      digest: AugmentedQuery<ApiType, () => Observable<DigestOf>>;
+      /**
+       * The number of events in the `Events<T>` list.
+       **/
+      eventCount: AugmentedQuery<ApiType, () => Observable<EventIndex>>;
+      /**
+       * Events deposited for the current block.
+       **/
+      events: AugmentedQuery<ApiType, () => Observable<Vec<EventRecord>>>;
+      /**
+       * Mapping between a topic (represented by T::Hash) and a vector of indexes
+       * of events in the `<Events<T>>` list.
+       * 
+       * All topic vectors have deterministic storage locations depending on the topic. This
+       * allows light-clients to leverage the changes trie storage tracking mechanism and
+       * in case of changes fetch the list of events of interest.
+       * 
+       * The value has the type `(T::BlockNumber, EventIndex)` because if we used only just
+       * the `EventIndex` then in case if the topic has the same contents on the next block
+       * no notification will be triggered thus the event might be lost.
+       **/
+      eventTopics: AugmentedQuery<ApiType, (arg: Hash | string | Uint8Array) => Observable<Vec<ITuple<[BlockNumber, EventIndex]>>>>;
+      /**
+       * The execution phase of the block.
+       **/
+      executionPhase: AugmentedQuery<ApiType, () => Observable<Option<Phase>>>;
+      /**
+       * Total extrinsics count for the current block.
+       **/
+      extrinsicCount: AugmentedQuery<ApiType, () => Observable<Option<u32>>>;
+      /**
+       * Extrinsics data for the current block (maps an extrinsic's index to its data).
+       **/
+      extrinsicData: AugmentedQuery<ApiType, (arg: u32 | AnyNumber | Uint8Array) => Observable<Bytes>>;
+      /**
+       * Extrinsics root of the current block, also part of the block header.
+       **/
+      extrinsicsRoot: AugmentedQuery<ApiType, () => Observable<Hash>>;
+      /**
+       * Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
+       **/
+      lastRuntimeUpgrade: AugmentedQuery<ApiType, () => Observable<Option<LastRuntimeUpgradeInfo>>>;
+      /**
+       * The current block number being processed. Set by `execute_block`.
+       **/
+      number: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
+      /**
+       * Hash of the previous block.
+       **/
+      parentHash: AugmentedQuery<ApiType, () => Observable<Hash>>;
+    };
+    timestamp: {
+      /**
+       * Did the timestamp get updated in this block?
+       **/
+      didUpdate: AugmentedQuery<ApiType, () => Observable<bool>>;
+      /**
+       * Current time for the current block.
+       **/
+      now: AugmentedQuery<ApiType, () => Observable<Moment>>;
+    };
+    transactionPayment: {
+      nextFeeMultiplier: AugmentedQuery<ApiType, () => Observable<Multiplier>>;
+      storageVersion: AugmentedQuery<ApiType, () => Observable<Releases>>;
+    };
+    versionedStore: {
+      classById: AugmentedQuery<ApiType, (arg: ClassId | AnyNumber | Uint8Array) => Observable<Class>>;
+      classDescriptionConstraint: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      classNameConstraint: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      entityById: AugmentedQuery<ApiType, (arg: EntityId | AnyNumber | Uint8Array) => Observable<Entity>>;
+      nextClassId: AugmentedQuery<ApiType, () => Observable<ClassId>>;
+      nextEntityId: AugmentedQuery<ApiType, () => Observable<EntityId>>;
+      propertyDescriptionConstraint: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+      propertyNameConstraint: AugmentedQuery<ApiType, () => Observable<InputValidationLengthConstraint>>;
+    };
+    versionedStorePermissions: {
+      /**
+       * ClassPermissions of corresponding Classes in the versioned store
+       **/
+      classPermissionsByClassId: AugmentedQuery<ApiType, (arg: ClassId | AnyNumber | Uint8Array) => Observable<ClassPermissionsType>>;
+      /**
+       * Owner of an entity in the versioned store. If it is None then it is owned by the system.
+       **/
+      entityMaintainerByEntityId: AugmentedQuery<ApiType, (arg: EntityId | AnyNumber | Uint8Array) => Observable<Option<Credential>>>;
+    };
+  }
+
+  export interface QueryableStorage<ApiType extends ApiTypes> extends AugmentedQueries<ApiType> {
+  }
+}
diff --git a/types/augment/augment-api-tx.ts b/types/augment/augment-api-tx.ts
new file mode 100644
index 0000000000..df6f28a9e8
--- /dev/null
+++ b/types/augment/augment-api-tx.ts
@@ -0,0 +1,1389 @@
+// Auto-generated via `yarn polkadot-types-from-chain`, do not edit
+/* eslint-disable */
+
+import { AnyNumber, ITuple } from '@polkadot/types/types';
+import { Compact, Option, Vec } from '@polkadot/types/codec';
+import { Bytes, bool, u16, u32, u64 } from '@polkadot/types/primitive';
+import { ActivateOpeningAt, AddOpeningParameters, ApplicationId, ApplicationIdSet, BalanceOfMint, CategoryId, ChannelContentType, ChannelCurationStatus, ChannelId, ChannelPublicationStatus, ClassId, ClassPermissionsType, ClassPropertyValue, ContentId, Credential, CredentialSet, CurationActor, CuratorApplicationId, CuratorApplicationIdSet, CuratorId, CuratorOpeningId, DataObjectStorageRelationshipId, DataObjectType, DataObjectTypeId, DataObjectsMap, ElectionParameters, EntityId, EntityPermissions, FillOpeningParameters, MemberId, MemoText, OpeningId, OpeningPolicyCommitment, OpeningType, Operation, OptionalText, PaidTermId, PostId, Property, ProposalId, ReferenceConstraint, RewardPolicy, StorageProviderId, TerminateRoleParameters, ThreadId, Url, VoteKind, WorkerId, WorkingGroup } from './all';
+import { CodeHash, Gas, Schedule } from '@polkadot/types/interfaces/contracts';
+import { Extrinsic, Signature } from '@polkadot/types/interfaces/extrinsics';
+import { GrandpaEquivocationProof, KeyOwnerProof } from '@polkadot/types/interfaces/grandpa';
+import { Heartbeat } from '@polkadot/types/interfaces/imOnline';
+import { AccountId, Balance, BalanceOf, BlockNumber, Call, ChangesTrieConfiguration, Hash, Header, KeyValue, LookupSource, Moment, Perbill, Percent, Weight } from '@polkadot/types/interfaces/runtime';
+import { Keys } from '@polkadot/types/interfaces/session';
+import { CompactAssignments, ElectionScore, ElectionSize, EraIndex, RewardDestination, ValidatorIndex, ValidatorPrefs } from '@polkadot/types/interfaces/staking';
+import { Key } from '@polkadot/types/interfaces/system';
+import { ApiTypes, SubmittableExtrinsic } from '@polkadot/api/types';
+
+declare module '@polkadot/api/types/submittable' {
+  export interface AugmentedSubmittables<ApiType> {
+    authorship: {
+      /**
+       * Provide a set of uncles.
+       **/
+      setUncles: AugmentedSubmittable<(newUncles: Vec<Header> | (Header | { parentHash?: any; number?: any; stateRoot?: any; extrinsicsRoot?: any; digest?: any } | string | Uint8Array)[]) => SubmittableExtrinsic<ApiType>>;
+    };
+    balances: {
+      /**
+       * Exactly as `transfer`, except the origin must be root and the source account may be
+       * specified.
+       * # <weight>
+       * - Same as transfer, but additional read and write because the source account is
+       * not assumed to be in the overlay.
+       * # </weight>
+       **/
+      forceTransfer: AugmentedSubmittable<(source: LookupSource | string | Uint8Array, dest: LookupSource | string | Uint8Array, value: Compact<Balance> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Set the balances of a given account.
+       * 
+       * This will alter `FreeBalance` and `ReservedBalance` in storage. it will
+       * also decrease the total issuance of the system (`TotalIssuance`).
+       * If the new free or reserved balance is below the existential deposit,
+       * it will reset the account nonce (`frame_system::AccountNonce`).
+       * 
+       * The dispatch origin for this call is `root`.
+       * 
+       * # <weight>
+       * - Independent of the arguments.
+       * - Contains a limited number of reads and writes.
+       * ---------------------
+       * - Base Weight:
+       * - Creating: 27.56 µs
+       * - Killing: 35.11 µs
+       * - DB Weight: 1 Read, 1 Write to `who`
+       * # </weight>
+       **/
+      setBalance: AugmentedSubmittable<(who: LookupSource | string | Uint8Array, newFree: Compact<Balance> | AnyNumber | Uint8Array, newReserved: Compact<Balance> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Transfer some liquid free balance to another account.
+       * 
+       * `transfer` will set the `FreeBalance` of the sender and receiver.
+       * It will decrease the total issuance of the system by the `TransferFee`.
+       * If the sender's account is below the existential deposit as a result
+       * of the transfer, the account will be reaped.
+       * 
+       * The dispatch origin for this call must be `Signed` by the transactor.
+       * 
+       * # <weight>
+       * - Dependent on arguments but not critical, given proper implementations for
+       * input config types. See related functions below.
+       * - It contains a limited number of reads and writes internally and no complex computation.
+       * 
+       * Related functions:
+       * 
+       * - `ensure_can_withdraw` is always called internally but has a bounded complexity.
+       * - Transferring balances to accounts that did not exist before will cause
+       * `T::OnNewAccount::on_new_account` to be called.
+       * - Removing enough funds from an account will trigger `T::DustRemoval::on_unbalanced`.
+       * - `transfer_keep_alive` works the same way as `transfer`, but has an additional
+       * check that the transfer will not kill the origin account.
+       * ---------------------------------
+       * - Base Weight: 73.64 µs, worst case scenario (account created, account removed)
+       * - DB Weight: 1 Read and 1 Write to destination account
+       * - Origin account is already in memory, so no DB operations for them.
+       * # </weight>
+       **/
+      transfer: AugmentedSubmittable<(dest: LookupSource | string | Uint8Array, value: Compact<Balance> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Same as the [`transfer`] call, but with a check that the transfer will not kill the
+       * origin account.
+       * 
+       * 99% of the time you want [`transfer`] instead.
+       * 
+       * [`transfer`]: struct.Module.html#method.transfer
+       * # <weight>
+       * - Cheaper than transfer because account cannot be killed.
+       * - Base Weight: 51.4 µs
+       * - DB Weight: 1 Read and 1 Write to dest (sender is in overlay already)
+       * #</weight>
+       **/
+      transferKeepAlive: AugmentedSubmittable<(dest: LookupSource | string | Uint8Array, value: Compact<Balance> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    contentWorkingGroup: {
+      /**
+       * Begin accepting curator applications to an opening that is active.
+       **/
+      acceptCuratorApplications: AugmentedSubmittable<(curatorOpeningId: CuratorOpeningId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Add an opening for a curator role.
+       **/
+      addCuratorOpening: AugmentedSubmittable<(activateAt: ActivateOpeningAt | { CurrentBlock: any } | { ExactBlock: any } | string | Uint8Array, commitment: OpeningPolicyCommitment | { application_rationing_policy?: any; max_review_period_length?: any; application_staking_policy?: any; role_staking_policy?: any; role_slashing_terms?: any; fill_opening_successful_applicant_application_stake_unstaking_period?: any; fill_opening_failed_applicant_application_stake_unstaking_period?: any; fill_opening_failed_applicant_role_stake_unstaking_period?: any; terminate_curator_application_stake_unstaking_period?: any; terminate_curator_role_stake_unstaking_period?: any; exit_curator_role_application_stake_unstaking_period?: any; exit_curator_role_stake_unstaking_period?: any } | string | Uint8Array, humanReadableText: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Apply on a curator opening.
+       **/
+      applyOnCuratorOpening: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, curatorOpeningId: CuratorOpeningId | AnyNumber | Uint8Array, roleAccount: AccountId | string | Uint8Array, optRoleStakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, optApplicationStakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, humanReadableText: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Begin reviewing, and therefore not accepting new applications.
+       **/
+      beginCuratorApplicantReview: AugmentedSubmittable<(curatorOpeningId: CuratorOpeningId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create a new channel.
+       **/
+      createChannel: AugmentedSubmittable<(owner: MemberId | AnyNumber | Uint8Array, roleAccount: AccountId | string | Uint8Array, content: ChannelContentType | 'Video'|'Music'|'Ebook' | number | Uint8Array, handle: Bytes | string | Uint8Array, title: OptionalText | null | object | string | Uint8Array, description: OptionalText | null | object | string | Uint8Array, avatar: OptionalText | null | object | string | Uint8Array, banner: OptionalText | null | object | string | Uint8Array, publicationStatus: ChannelPublicationStatus | 'Public'|'Unlisted' | number | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Fill opening for curator
+       **/
+      fillCuratorOpening: AugmentedSubmittable<(curatorOpeningId: CuratorOpeningId | AnyNumber | Uint8Array, successfulCuratorApplicationIds: CuratorApplicationIdSet, rewardPolicy: Option<RewardPolicy> | null | object | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Add to capacity of current acive mint.
+       * This may be deprecated in the future, since set_mint_capacity is sufficient to
+       * both increase and decrease capacity. Although when considering that it may be executed
+       * by a proposal, given the temporal delay in approving a proposal, it might be more suitable
+       * than set_mint_capacity?
+       **/
+      increaseMintCapacity: AugmentedSubmittable<(additionalCapacity: BalanceOf | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * An active curator leaves role
+       **/
+      leaveCuratorRole: AugmentedSubmittable<(curatorId: CuratorId | AnyNumber | Uint8Array, rationaleText: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Replace the current lead. First unsets the active lead if there is one.
+       * If a value is provided for new_lead it will then set that new lead.
+       * It is responsibility of the caller to ensure the new lead can be set
+       * to avoid the lead role being vacant at the end of the call.
+       **/
+      replaceLead: AugmentedSubmittable<(newLead: Option<ITuple<[MemberId, AccountId]>> | null | object | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Add an opening for a curator role.
+       **/
+      setChannelCreationEnabled: AugmentedSubmittable<(enabled: bool | boolean | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Sets the capacity of the current active mint
+       **/
+      setMintCapacity: AugmentedSubmittable<(newCapacity: BalanceOf | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Lead terminate curator application
+       **/
+      terminateCuratorApplication: AugmentedSubmittable<(curatorApplicationId: CuratorApplicationId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Lead can terminate and active curator
+       **/
+      terminateCuratorRole: AugmentedSubmittable<(curatorId: CuratorId | AnyNumber | Uint8Array, rationaleText: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * An owner transfers channel ownership to a new owner.
+       * 
+       * Notice that working group participants cannot do this.
+       * Notice that censored or unlisted channel may still be transferred.
+       * Notice that transfers are unilateral, so new owner cannot block. This may be problematic: https://github.com/Joystream/substrate-runtime-joystream/issues/95
+       **/
+      transferChannelOwnership: AugmentedSubmittable<(channelId: ChannelId | AnyNumber | Uint8Array, newOwner: MemberId | AnyNumber | Uint8Array, newRoleAccount: AccountId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Update channel as a curation actor
+       **/
+      updateChannelAsCurationActor: AugmentedSubmittable<(curationActor: CurationActor | { Lead: any } | { Curator: any } | string | Uint8Array, channelId: ChannelId | AnyNumber | Uint8Array, newVerified: Option<bool> | null | object | string | Uint8Array, newCurationStatus: Option<ChannelCurationStatus> | null | object | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Channel owner updates some channel properties
+       **/
+      updateChannelAsOwner: AugmentedSubmittable<(channelId: ChannelId | AnyNumber | Uint8Array, newHandle: Option<Bytes> | null | object | string | Uint8Array, newTitle: Option<OptionalText> | null | object | string | Uint8Array, newDescription: Option<OptionalText> | null | object | string | Uint8Array, newAvatar: Option<OptionalText> | null | object | string | Uint8Array, newBanner: Option<OptionalText> | null | object | string | Uint8Array, newPublicationStatus: Option<ChannelPublicationStatus> | null | object | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * An active curator can update the reward account associated
+       * with a set reward relationship.
+       **/
+      updateCuratorRewardAccount: AugmentedSubmittable<(curatorId: CuratorId | AnyNumber | Uint8Array, newRewardAccount: AccountId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * An active curator can update the associated role account.
+       **/
+      updateCuratorRoleAccount: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, curatorId: CuratorId | AnyNumber | Uint8Array, newRoleAccount: AccountId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      withdrawCuratorApplication: AugmentedSubmittable<(curatorApplicationId: CuratorApplicationId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    contracts: {
+      /**
+       * Makes a call to an account, optionally transferring some balance.
+       * 
+       * * If the account is a smart-contract account, the associated code will be
+       * executed and any value will be transferred.
+       * * If the account is a regular account, any value will be transferred.
+       * * If no account exists and the call value is not less than `existential_deposit`,
+       * a regular account will be created and any value will be transferred.
+       **/
+      call: AugmentedSubmittable<(dest: LookupSource | string | Uint8Array, value: Compact<BalanceOf> | AnyNumber | Uint8Array, gasLimit: Compact<Gas> | AnyNumber | Uint8Array, data: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Allows block producers to claim a small reward for evicting a contract. If a block producer
+       * fails to do so, a regular users will be allowed to claim the reward.
+       * 
+       * If contract is not evicted as a result of this call, no actions are taken and
+       * the sender is not eligible for the reward.
+       **/
+      claimSurcharge: AugmentedSubmittable<(dest: AccountId | string | Uint8Array, auxSender: Option<AccountId> | null | object | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Instantiates a new contract from the `codehash` generated by `put_code`, optionally transferring some balance.
+       * 
+       * Instantiation is executed as follows:
+       * 
+       * - The destination address is computed based on the sender and hash of the code.
+       * - The smart-contract account is created at the computed address.
+       * - The `ctor_code` is executed in the context of the newly-created account. Buffer returned
+       * after the execution is saved as the `code` of the account. That code will be invoked
+       * upon any call received by this account.
+       * - The contract is initialized.
+       **/
+      instantiate: AugmentedSubmittable<(endowment: Compact<BalanceOf> | AnyNumber | Uint8Array, gasLimit: Compact<Gas> | AnyNumber | Uint8Array, codeHash: CodeHash | string | Uint8Array, data: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Stores the given binary Wasm code into the chain's storage and returns its `codehash`.
+       * You can instantiate contracts only with stored code.
+       **/
+      putCode: AugmentedSubmittable<(code: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Updates the schedule for metering contracts.
+       * 
+       * The schedule must have a greater version than the stored schedule.
+       **/
+      updateSchedule: AugmentedSubmittable<(schedule: Schedule | { version?: any; putCodePerByteCost?: any; growMemCost?: any; regularOpCost?: any; returnDataPerByteCost?: any; eventDataPerByteCost?: any; eventPerTopicCost?: any; eventBaseCost?: any; sandboxDataReadCost?: any; sandboxDataWriteCost?: any; transferCost?: any; maxEventTopics?: any; maxStackHeight?: any; maxMemoryPages?: any; enablePrintln?: any; maxSubjectLen?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    council: {
+      /**
+       * Adds a zero staked council member. A member added in this way does not get a recurring reward.
+       **/
+      addCouncilMember: AugmentedSubmittable<(account: AccountId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Remove a single council member and their reward.
+       **/
+      removeCouncilMember: AugmentedSubmittable<(accountToRemove: AccountId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Force set a zero staked council. Stakes in existing council seats are not returned.
+       * Existing council rewards are removed and new council members do NOT get any rewards.
+       * Avoid using this call if possible, will be deprecated. The term of the new council is
+       * not extended.
+       **/
+      setCouncil: AugmentedSubmittable<(accounts: Vec<AccountId> | (AccountId | string | Uint8Array)[]) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Sets the capacity of the the council mint, if it doesn't exist, attempts to
+       * create a new one.
+       **/
+      setCouncilMintCapacity: AugmentedSubmittable<(capacity: BalanceOf | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Sets the council rewards which is only applied on new council being elected.
+       **/
+      setCouncilRewards: AugmentedSubmittable<(amountPerPayout: BalanceOf | AnyNumber | Uint8Array, payoutInterval: Option<BlockNumber> | null | object | string | Uint8Array, firstPayoutAfterRewardCreated: BlockNumber | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Set blocknumber when council term will end
+       **/
+      setTermEndsAt: AugmentedSubmittable<(endsAt: BlockNumber | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Attempts to mint and transfer amount to destination account
+       **/
+      spendFromCouncilMint: AugmentedSubmittable<(amount: BalanceOf | AnyNumber | Uint8Array, destination: AccountId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    councilElection: {
+      apply: AugmentedSubmittable<(stake: BalanceOf | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      forceStartElection: AugmentedSubmittable<() => SubmittableExtrinsic<ApiType>>;
+      forceStopElection: AugmentedSubmittable<() => SubmittableExtrinsic<ApiType>>;
+      reveal: AugmentedSubmittable<(commitment: Hash | string | Uint8Array, vote: AccountId | string | Uint8Array, salt: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      setAutoStart: AugmentedSubmittable<(flag: bool | boolean | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Sets new election parameters. Some combination of parameters that are not desirable, so
+       * the parameters are checked for validity.
+       * The call will fail if an election is in progress. If a council is not being elected for some
+       * reaon after multiple rounds, force_stop_election() can be called to stop elections and followed by
+       * set_election_parameters().
+       **/
+      setElectionParameters: AugmentedSubmittable<(params: ElectionParameters | { announcing_period?: any; voting_period?: any; revealing_period?: any; council_size?: any; candidacy_limit?: any; new_term_duration?: any; min_council_stake?: any; min_voting_stake?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      setStageAnnouncing: AugmentedSubmittable<(endsAt: BlockNumber | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      setStageRevealing: AugmentedSubmittable<(endsAt: BlockNumber | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      setStageVoting: AugmentedSubmittable<(endsAt: BlockNumber | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      vote: AugmentedSubmittable<(commitment: Hash | string | Uint8Array, stake: BalanceOf | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    dataDirectory: {
+      /**
+       * Storage provider accepts a content. Requires signed storage provider account and its id.
+       * The LiaisonJudgement can be updated, but only by the liaison.
+       **/
+      acceptContent: AugmentedSubmittable<(storageProviderId: StorageProviderId | AnyNumber | Uint8Array, contentId: ContentId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Adds the content to the system. Member id should match its origin. The created DataObject
+       * awaits liaison to accept or reject it.
+       **/
+      addContent: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, contentId: ContentId | string | Uint8Array, typeId: DataObjectTypeId | AnyNumber | Uint8Array, size: u64 | AnyNumber | Uint8Array, ipfsContentId: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Injects a set of data objects and their corresponding content id into the directory.
+       * The operation is "silent" - no events will be emitted as objects are added.
+       * The number of objects that can be added per call is limited to prevent the dispatch
+       * from causing the block production to fail if it takes too much time to process.
+       * Existing data objects will be overwritten.
+       **/
+      injectDataObjects: AugmentedSubmittable<(objects: DataObjectsMap) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Storage provider rejects a content. Requires signed storage provider account and its id.
+       * The LiaisonJudgement can be updated, but only by the liaison.
+       **/
+      rejectContent: AugmentedSubmittable<(storageProviderId: StorageProviderId | AnyNumber | Uint8Array, contentId: ContentId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Removes the content id from the list of known content ids. Requires root privileges.
+       **/
+      removeKnownContentId: AugmentedSubmittable<(contentId: ContentId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    dataObjectStorageRegistry: {
+      /**
+       * Add storage provider-to-content relationship. The storage provider should be registered
+       * in the storage working group.
+       **/
+      addRelationship: AugmentedSubmittable<(storageProviderId: StorageProviderId | AnyNumber | Uint8Array, cid: ContentId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Activates storage provider-to-content relationship. The storage provider should be registered
+       * in the storage working group. A storage provider may flip their own ready state, but nobody else.
+       **/
+      setRelationshipReady: AugmentedSubmittable<(storageProviderId: StorageProviderId | AnyNumber | Uint8Array, id: DataObjectStorageRelationshipId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Deactivates storage provider-to-content relationship. The storage provider should be registered
+       * in the storage working group. A storage provider may flip their own ready state, but nobody else.
+       **/
+      unsetRelationshipReady: AugmentedSubmittable<(storageProviderId: StorageProviderId | AnyNumber | Uint8Array, id: DataObjectStorageRelationshipId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    dataObjectTypeRegistry: {
+      /**
+       * Activates existing data object type. Requires leader privileges.
+       **/
+      activateDataObjectType: AugmentedSubmittable<(id: DataObjectTypeId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Deactivates existing data object type. Requires leader privileges.
+       **/
+      deactivateDataObjectType: AugmentedSubmittable<(id: DataObjectTypeId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Registers the new data object type. Requires leader privileges.
+       **/
+      registerDataObjectType: AugmentedSubmittable<(dataObjectType: DataObjectType | { description?: any; active?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Updates existing data object type. Requires leader privileges.
+       **/
+      updateDataObjectType: AugmentedSubmittable<(id: DataObjectTypeId | AnyNumber | Uint8Array, dataObjectType: DataObjectType | { description?: any; active?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    discovery: {
+      /**
+       * Sets bootstrap endpoints for the Colossus. Requires root privileges.
+       **/
+      setBootstrapEndpoints: AugmentedSubmittable<(endpoints: Vec<Url> | (Url | string)[]) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Sets default lifetime for storage providers accounts info. Requires root privileges.
+       **/
+      setDefaultLifetime: AugmentedSubmittable<(lifetime: BlockNumber | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Creates the AccountInfo to save an IPNS identity for the storage provider.
+       * Requires signed storage provider credentials.
+       **/
+      setIpnsId: AugmentedSubmittable<(storageProviderId: StorageProviderId | AnyNumber | Uint8Array, id: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Deletes the AccountInfo with the IPNS identity for the storage provider.
+       * Requires signed storage provider credentials.
+       **/
+      unsetIpnsId: AugmentedSubmittable<(storageProviderId: StorageProviderId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    finalityTracker: {
+      /**
+       * Hint that the author of this block thinks the best finalized
+       * block is the given number.
+       **/
+      finalHint: AugmentedSubmittable<(hint: Compact<BlockNumber> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    forum: {
+      /**
+       * Edit post text
+       **/
+      addPost: AugmentedSubmittable<(threadId: ThreadId | AnyNumber | Uint8Array, text: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Add a new category.
+       **/
+      createCategory: AugmentedSubmittable<(parent: Option<CategoryId> | null | object | string | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create new thread in category
+       **/
+      createThread: AugmentedSubmittable<(categoryId: CategoryId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, text: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Edit post text
+       **/
+      editPostText: AugmentedSubmittable<(postId: PostId | AnyNumber | Uint8Array, newText: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Moderate post
+       **/
+      moderatePost: AugmentedSubmittable<(postId: PostId | AnyNumber | Uint8Array, rationale: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Moderate thread
+       **/
+      moderateThread: AugmentedSubmittable<(threadId: ThreadId | AnyNumber | Uint8Array, rationale: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Set forum sudo.
+       **/
+      setForumSudo: AugmentedSubmittable<(newForumSudo: Option<AccountId> | null | object | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Update category
+       **/
+      updateCategory: AugmentedSubmittable<(categoryId: CategoryId | AnyNumber | Uint8Array, newArchivalStatus: Option<bool> | null | object | string | Uint8Array, newDeletionStatus: Option<bool> | null | object | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    grandpa: {
+      /**
+       * Report voter equivocation/misbehavior. This method will verify the
+       * equivocation proof and validate the given key ownership proof
+       * against the extracted offender. If both are valid, the offence
+       * will be reported.
+       * 
+       * Since the weight of the extrinsic is 0, in order to avoid DoS by
+       * submission of invalid equivocation reports, a mandatory pre-validation of
+       * the extrinsic is implemented in a `SignedExtension`.
+       **/
+      reportEquivocation: AugmentedSubmittable<(equivocationProof: GrandpaEquivocationProof | { setId?: any; equivocation?: any } | string | Uint8Array, keyOwnerProof: KeyOwnerProof | { session?: any; trieNodes?: any; validatorCount?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    imOnline: {
+      /**
+       * # <weight>
+       * - Complexity: `O(K + E)` where K is length of `Keys` and E is length of
+       * `Heartbeat.network_state.external_address`
+       * 
+       * - `O(K)`: decoding of length `K`
+       * - `O(E)`: decoding/encoding of length `E`
+       * - DbReads: pallet_session `Validators`, pallet_session `CurrentIndex`, `Keys`,
+       * `ReceivedHeartbeats`
+       * - DbWrites: `ReceivedHeartbeats`
+       * # </weight>
+       **/
+      heartbeat: AugmentedSubmittable<(heartbeat: Heartbeat | { blockNumber?: any; networkState?: any; sessionIndex?: any; authorityIndex?: any; validatorsLen?: any } | string | Uint8Array, signature: Signature | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    members: {
+      addScreenedMember: AugmentedSubmittable<(newMemberAccount: AccountId | string | Uint8Array, handle: Option<Bytes> | null | object | string | Uint8Array, avatarUri: Option<Bytes> | null | object | string | Uint8Array, about: Option<Bytes> | null | object | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Non-members can buy membership
+       **/
+      buyMembership: AugmentedSubmittable<(paidTermsId: PaidTermId | AnyNumber | Uint8Array, handle: Option<Bytes> | null | object | string | Uint8Array, avatarUri: Option<Bytes> | null | object | string | Uint8Array, about: Option<Bytes> | null | object | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Change member's about text
+       **/
+      changeMemberAboutText: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, text: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Change member's avatar
+       **/
+      changeMemberAvatar: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, uri: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Change member's handle. Will ensure new handle is unique and old one will be available
+       * for other members to use.
+       **/
+      changeMemberHandle: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, handle: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      setControllerAccount: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, newControllerAccount: AccountId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      setRootAccount: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, newRootAccount: AccountId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      setScreeningAuthority: AugmentedSubmittable<(authority: AccountId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Update member's all or some of handle, avatar and about text.
+       **/
+      updateMembership: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, handle: Option<Bytes> | null | object | string | Uint8Array, avatarUri: Option<Bytes> | null | object | string | Uint8Array, about: Option<Bytes> | null | object | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    memo: {
+      updateMemo: AugmentedSubmittable<(memo: MemoText | string) => SubmittableExtrinsic<ApiType>>;
+    };
+    proposalsCodex: {
+      /**
+       * Create 'Add working group leader opening' proposal type.
+       * This proposal uses `add_opening()` extrinsic from the Joystream `working group` module.
+       **/
+      createAddWorkingGroupLeaderOpeningProposal: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, stakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, addOpeningParameters: AddOpeningParameters | { activate_at?: any; commitment?: any; human_readable_text?: any; working_group?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create 'Begin review working group leader applications' proposal type.
+       * This proposal uses `begin_applicant_review()` extrinsic from the Joystream `working group` module.
+       **/
+      createBeginReviewWorkingGroupLeaderApplicationsProposal: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, stakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, openingId: OpeningId | AnyNumber | Uint8Array, workingGroup: WorkingGroup | 'Storage' | number | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create 'decrease working group leader stake' proposal type.
+       * This proposal uses `decrease_stake()` extrinsic from the `working-group`  module.
+       **/
+      createDecreaseWorkingGroupLeaderStakeProposal: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, stakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, workerId: WorkerId | AnyNumber | Uint8Array, decreasingStake: BalanceOf | AnyNumber | Uint8Array, workingGroup: WorkingGroup | 'Storage' | number | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create 'Fill working group leader opening' proposal type.
+       * This proposal uses `fill_opening()` extrinsic from the Joystream `working group` module.
+       **/
+      createFillWorkingGroupLeaderOpeningProposal: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, stakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, fillOpeningParameters: FillOpeningParameters | { opening_id?: any; successful_application_id?: any; reward_policy?: any; working_group?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create 'Runtime upgrade' proposal type. Runtime upgrade can be initiated only by
+       * members from the hardcoded list `RuntimeUpgradeProposalAllowedProposers`
+       **/
+      createRuntimeUpgradeProposal: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, stakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, wasm: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create 'Set content working group mint capacity' proposal type.
+       * This proposal uses `set_mint_capacity()` extrinsic from the `content-working-group`  module.
+       **/
+      createSetContentWorkingGroupMintCapacityProposal: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, stakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, mintBalance: BalanceOfMint | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create 'Set election parameters' proposal type. This proposal uses `set_election_parameters()`
+       * extrinsic from the `governance::election module`.
+       **/
+      createSetElectionParametersProposal: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, stakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, electionParameters: ElectionParameters | { announcing_period?: any; voting_period?: any; revealing_period?: any; council_size?: any; candidacy_limit?: any; new_term_duration?: any; min_council_stake?: any; min_voting_stake?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create 'Set lead' proposal type.
+       * This proposal uses `replace_lead()` extrinsic from the `content_working_group`  module.
+       **/
+      createSetLeadProposal: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, stakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, newLead: Option<ITuple<[MemberId, AccountId]>> | null | object | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create 'Evict storage provider' proposal type.
+       * This proposal uses `set_validator_count()` extrinsic from the Substrate `staking`  module.
+       **/
+      createSetValidatorCountProposal: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, stakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, newValidatorCount: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create 'set working group leader reward' proposal type.
+       * This proposal uses `update_reward_amount()` extrinsic from the `working-group`  module.
+       **/
+      createSetWorkingGroupLeaderRewardProposal: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, stakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, workerId: WorkerId | AnyNumber | Uint8Array, rewardAmount: BalanceOfMint | AnyNumber | Uint8Array, workingGroup: WorkingGroup | 'Storage' | number | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create 'Set working group mint capacity' proposal type.
+       * This proposal uses `set_mint_capacity()` extrinsic from the `working-group`  module.
+       **/
+      createSetWorkingGroupMintCapacityProposal: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, stakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, mintBalance: BalanceOfMint | AnyNumber | Uint8Array, workingGroup: WorkingGroup | 'Storage' | number | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create 'slash working group leader stake' proposal type.
+       * This proposal uses `slash_stake()` extrinsic from the `working-group`  module.
+       **/
+      createSlashWorkingGroupLeaderStakeProposal: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, stakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, workerId: WorkerId | AnyNumber | Uint8Array, slashingStake: BalanceOf | AnyNumber | Uint8Array, workingGroup: WorkingGroup | 'Storage' | number | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create 'Spending' proposal type.
+       * This proposal uses `spend_from_council_mint()` extrinsic from the `governance::council`  module.
+       **/
+      createSpendingProposal: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, stakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, balance: BalanceOfMint | AnyNumber | Uint8Array, destination: AccountId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create 'terminate working group leader rolw' proposal type.
+       * This proposal uses `terminate_role()` extrinsic from the `working-group`  module.
+       **/
+      createTerminateWorkingGroupLeaderRoleProposal: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, stakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, terminateRoleParameters: TerminateRoleParameters | { worker_id?: any; rationale?: any; slash?: any; working_group?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Create 'Text (signal)' proposal type.
+       **/
+      createTextProposal: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, title: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, stakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, text: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Runtime upgrade proposal extrinsic.
+       * Should be used as callable object to pass to the `engine` module.
+       **/
+      executeRuntimeUpgradeProposal: AugmentedSubmittable<(wasm: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Text proposal extrinsic. Should be used as callable object to pass to the `engine` module.
+       **/
+      executeTextProposal: AugmentedSubmittable<(text: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    proposalsDiscussion: {
+      /**
+       * Adds a post with author origin check.
+       **/
+      addPost: AugmentedSubmittable<(postAuthorId: MemberId | AnyNumber | Uint8Array, threadId: ThreadId | AnyNumber | Uint8Array, text: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Updates a post with author origin check. Update attempts number is limited.
+       **/
+      updatePost: AugmentedSubmittable<(postAuthorId: MemberId | AnyNumber | Uint8Array, threadId: ThreadId | AnyNumber | Uint8Array, postId: PostId | AnyNumber | Uint8Array, text: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    proposalsEngine: {
+      /**
+       * Cancel a proposal by its original proposer.
+       **/
+      cancelProposal: AugmentedSubmittable<(proposerId: MemberId | AnyNumber | Uint8Array, proposalId: ProposalId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Veto a proposal. Must be root.
+       **/
+      vetoProposal: AugmentedSubmittable<(proposalId: ProposalId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Vote extrinsic. Conditions:  origin must allow votes.
+       **/
+      vote: AugmentedSubmittable<(voterId: MemberId | AnyNumber | Uint8Array, proposalId: ProposalId | AnyNumber | Uint8Array, vote: VoteKind | 'Approve'|'Reject'|'Slash'|'Abstain' | number | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    session: {
+      /**
+       * Removes any session key(s) of the function caller.
+       * This doesn't take effect until the next session.
+       * 
+       * The dispatch origin of this function must be signed.
+       * 
+       * # <weight>
+       * - Complexity: `O(1)` in number of key types.
+       * Actual cost depends on the number of length of `T::Keys::key_ids()` which is fixed.
+       * - DbReads: `T::ValidatorIdOf`, `NextKeys`, `origin account`
+       * - DbWrites: `NextKeys`, `origin account`
+       * - DbWrites per key id: `KeyOwnder`
+       * # </weight>
+       **/
+      purgeKeys: AugmentedSubmittable<() => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Sets the session key(s) of the function caller to `keys`.
+       * Allows an account to set its session key prior to becoming a validator.
+       * This doesn't take effect until the next session.
+       * 
+       * The dispatch origin of this function must be signed.
+       * 
+       * # <weight>
+       * - Complexity: `O(1)`
+       * Actual cost depends on the number of length of `T::Keys::key_ids()` which is fixed.
+       * - DbReads: `origin account`, `T::ValidatorIdOf`, `NextKeys`
+       * - DbWrites: `origin account`, `NextKeys`
+       * - DbReads per key id: `KeyOwner`
+       * - DbWrites per key id: `KeyOwner`
+       * # </weight>
+       **/
+      setKeys: AugmentedSubmittable<(keys: Keys, proof: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    staking: {
+      /**
+       * Take the origin account as a stash and lock up `value` of its balance. `controller` will
+       * be the account that controls it.
+       * 
+       * `value` must be more than the `minimum_balance` specified by `T::Currency`.
+       * 
+       * The dispatch origin for this call must be _Signed_ by the stash account.
+       * 
+       * Emits `Bonded`.
+       * 
+       * # <weight>
+       * - Independent of the arguments. Moderate complexity.
+       * - O(1).
+       * - Three extra DB entries.
+       * 
+       * NOTE: Two of the storage writes (`Self::bonded`, `Self::payee`) are _never_ cleaned
+       * unless the `origin` falls below _existential deposit_ and gets removed as dust.
+       * ------------------
+       * Base Weight: 67.87 µs
+       * DB Weight:
+       * - Read: Bonded, Ledger, [Origin Account], Current Era, History Depth, Locks
+       * - Write: Bonded, Payee, [Origin Account], Locks, Ledger
+       * # </weight>
+       **/
+      bond: AugmentedSubmittable<(controller: LookupSource | string | Uint8Array, value: Compact<BalanceOf> | AnyNumber | Uint8Array, payee: RewardDestination | 'Staked'|'Stash'|'Controller' | number | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Add some extra amount that have appeared in the stash `free_balance` into the balance up
+       * for staking.
+       * 
+       * Use this if there are additional funds in your stash account that you wish to bond.
+       * Unlike [`bond`] or [`unbond`] this function does not impose any limitation on the amount
+       * that can be added.
+       * 
+       * The dispatch origin for this call must be _Signed_ by the stash, not the controller and
+       * it can be only called when [`EraElectionStatus`] is `Closed`.
+       * 
+       * Emits `Bonded`.
+       * 
+       * # <weight>
+       * - Independent of the arguments. Insignificant complexity.
+       * - O(1).
+       * - One DB entry.
+       * ------------
+       * Base Weight: 54.88 µs
+       * DB Weight:
+       * - Read: Era Election Status, Bonded, Ledger, [Origin Account], Locks
+       * - Write: [Origin Account], Locks, Ledger
+       * # </weight>
+       **/
+      bondExtra: AugmentedSubmittable<(maxAdditional: Compact<BalanceOf> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Cancel enactment of a deferred slash.
+       * 
+       * Can be called by the `T::SlashCancelOrigin`.
+       * 
+       * Parameters: era and indices of the slashes for that era to kill.
+       * 
+       * # <weight>
+       * Complexity: O(U + S)
+       * with U unapplied slashes weighted with U=1000
+       * and S is the number of slash indices to be canceled.
+       * - Base: 5870 + 34.61 * S µs
+       * - Read: Unapplied Slashes
+       * - Write: Unapplied Slashes
+       * # </weight>
+       **/
+      cancelDeferredSlash: AugmentedSubmittable<(era: EraIndex | AnyNumber | Uint8Array, slashIndices: Vec<u32> | (u32 | AnyNumber | Uint8Array)[]) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Declare no desire to either validate or nominate.
+       * 
+       * Effects will be felt at the beginning of the next era.
+       * 
+       * The dispatch origin for this call must be _Signed_ by the controller, not the stash.
+       * And, it can be only called when [`EraElectionStatus`] is `Closed`.
+       * 
+       * # <weight>
+       * - Independent of the arguments. Insignificant complexity.
+       * - Contains one read.
+       * - Writes are limited to the `origin` account key.
+       * --------
+       * Base Weight: 16.53 µs
+       * DB Weight:
+       * - Read: EraElectionStatus, Ledger
+       * - Write: Validators, Nominators
+       * # </weight>
+       **/
+      chill: AugmentedSubmittable<() => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Force there to be a new era at the end of the next session. After this, it will be
+       * reset to normal (non-forced) behaviour.
+       * 
+       * The dispatch origin must be Root.
+       * 
+       * # <weight>
+       * - No arguments.
+       * - Base Weight: 1.959 µs
+       * - Write ForceEra
+       * # </weight>
+       **/
+      forceNewEra: AugmentedSubmittable<() => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Force there to be a new era at the end of sessions indefinitely.
+       * 
+       * The dispatch origin must be Root.
+       * 
+       * # <weight>
+       * - Base Weight: 2.05 µs
+       * - Write: ForceEra
+       * # </weight>
+       **/
+      forceNewEraAlways: AugmentedSubmittable<() => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Force there to be no new eras indefinitely.
+       * 
+       * The dispatch origin must be Root.
+       * 
+       * # <weight>
+       * - No arguments.
+       * - Base Weight: 1.857 µs
+       * - Write: ForceEra
+       * # </weight>
+       **/
+      forceNoEras: AugmentedSubmittable<() => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Force a current staker to become completely unstaked, immediately.
+       * 
+       * The dispatch origin must be Root.
+       * 
+       * # <weight>
+       * O(S) where S is the number of slashing spans to be removed
+       * Base Weight: 53.07 + 2.365 * S µs
+       * Reads: Bonded, Slashing Spans, Account, Locks
+       * Writes: Bonded, Slashing Spans (if S > 0), Ledger, Payee, Validators, Nominators, Account, Locks
+       * Writes Each: SpanSlash * S
+       * # </weight>
+       **/
+      forceUnstake: AugmentedSubmittable<(stash: AccountId | string | Uint8Array, numSlashingSpans: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Increments the ideal number of validators.
+       * 
+       * The dispatch origin must be Root.
+       * 
+       * # <weight>
+       * Base Weight: 1.717 µs
+       * Read/Write: Validator Count
+       * # </weight>
+       **/
+      increaseValidatorCount: AugmentedSubmittable<(additional: Compact<u32> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Declare the desire to nominate `targets` for the origin controller.
+       * 
+       * Effects will be felt at the beginning of the next era. This can only be called when
+       * [`EraElectionStatus`] is `Closed`.
+       * 
+       * The dispatch origin for this call must be _Signed_ by the controller, not the stash.
+       * And, it can be only called when [`EraElectionStatus`] is `Closed`.
+       * 
+       * # <weight>
+       * - The transaction's complexity is proportional to the size of `targets` (N)
+       * which is capped at CompactAssignments::LIMIT (MAX_NOMINATIONS).
+       * - Both the reads and writes follow a similar pattern.
+       * ---------
+       * Base Weight: 22.34 + .36 * N µs
+       * where N is the number of targets
+       * DB Weight:
+       * - Reads: Era Election Status, Ledger, Current Era
+       * - Writes: Validators, Nominators
+       * # </weight>
+       **/
+      nominate: AugmentedSubmittable<(targets: Vec<LookupSource> | (LookupSource | string | Uint8Array)[]) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Pay out all the stakers behind a single validator for a single era.
+       * 
+       * - `validator_stash` is the stash account of the validator. Their nominators, up to
+       * `T::MaxNominatorRewardedPerValidator`, will also receive their rewards.
+       * - `era` may be any era between `[current_era - history_depth; current_era]`.
+       * 
+       * The origin of this call must be _Signed_. Any account can call this function, even if
+       * it is not one of the stakers.
+       * 
+       * This can only be called when [`EraElectionStatus`] is `Closed`.
+       * 
+       * # <weight>
+       * - Time complexity: at most O(MaxNominatorRewardedPerValidator).
+       * - Contains a limited number of reads and writes.
+       * -----------
+       * N is the Number of payouts for the validator (including the validator)
+       * Base Weight:
+       * - Reward Destination Staked: 110 + 54.2 * N µs (Median Slopes)
+       * - Reward Destination Controller (Creating): 120 + 41.95 * N µs (Median Slopes)
+       * DB Weight:
+       * - Read: EraElectionStatus, CurrentEra, HistoryDepth, ErasValidatorReward,
+       * ErasStakersClipped, ErasRewardPoints, ErasValidatorPrefs (8 items)
+       * - Read Each: Bonded, Ledger, Payee, Locks, System Account (5 items)
+       * - Write Each: System Account, Locks, Ledger (3 items)
+       * # </weight>
+       **/
+      payoutStakers: AugmentedSubmittable<(validatorStash: AccountId | string | Uint8Array, era: EraIndex | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Remove all data structure concerning a staker/stash once its balance is zero.
+       * This is essentially equivalent to `withdraw_unbonded` except it can be called by anyone
+       * and the target `stash` must have no funds left.
+       * 
+       * This can be called from any origin.
+       * 
+       * - `stash`: The stash account to reap. Its balance must be zero.
+       * 
+       * # <weight>
+       * Complexity: O(S) where S is the number of slashing spans on the account.
+       * Base Weight: 75.94 + 2.396 * S µs
+       * DB Weight:
+       * - Reads: Stash Account, Bonded, Slashing Spans, Locks
+       * - Writes: Bonded, Slashing Spans (if S > 0), Ledger, Payee, Validators, Nominators, Stash Account, Locks
+       * - Writes Each: SpanSlash * S
+       * # </weight>
+       **/
+      reapStash: AugmentedSubmittable<(stash: AccountId | string | Uint8Array, numSlashingSpans: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Rebond a portion of the stash scheduled to be unlocked.
+       * 
+       * The dispatch origin must be signed by the controller, and it can be only called when
+       * [`EraElectionStatus`] is `Closed`.
+       * 
+       * # <weight>
+       * - Time complexity: O(L), where L is unlocking chunks
+       * - Bounded by `MAX_UNLOCKING_CHUNKS`.
+       * - Storage changes: Can't increase storage, only decrease it.
+       * ---------------
+       * - Base Weight: 34.51 µs * .048 L µs
+       * - DB Weight:
+       * - Reads: EraElectionStatus, Ledger, Locks, [Origin Account]
+       * - Writes: [Origin Account], Locks, Ledger
+       * # </weight>
+       **/
+      rebond: AugmentedSubmittable<(value: Compact<BalanceOf> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Scale up the ideal number of validators by a factor.
+       * 
+       * The dispatch origin must be Root.
+       * 
+       * # <weight>
+       * Base Weight: 1.717 µs
+       * Read/Write: Validator Count
+       * # </weight>
+       **/
+      scaleValidatorCount: AugmentedSubmittable<(factor: Percent | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * (Re-)set the controller of a stash.
+       * 
+       * Effects will be felt at the beginning of the next era.
+       * 
+       * The dispatch origin for this call must be _Signed_ by the stash, not the controller.
+       * 
+       * # <weight>
+       * - Independent of the arguments. Insignificant complexity.
+       * - Contains a limited number of reads.
+       * - Writes are limited to the `origin` account key.
+       * ----------
+       * Base Weight: 25.22 µs
+       * DB Weight:
+       * - Read: Bonded, Ledger New Controller, Ledger Old Controller
+       * - Write: Bonded, Ledger New Controller, Ledger Old Controller
+       * # </weight>
+       **/
+      setController: AugmentedSubmittable<(controller: LookupSource | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Set `HistoryDepth` value. This function will delete any history information
+       * when `HistoryDepth` is reduced.
+       * 
+       * Parameters:
+       * - `new_history_depth`: The new history depth you would like to set.
+       * - `era_items_deleted`: The number of items that will be deleted by this dispatch.
+       * This should report all the storage items that will be deleted by clearing old
+       * era history. Needed to report an accurate weight for the dispatch. Trusted by
+       * `Root` to report an accurate number.
+       * 
+       * Origin must be root.
+       * 
+       * # <weight>
+       * - E: Number of history depths removed, i.e. 10 -> 7 = 3
+       * - Base Weight: 29.13 * E µs
+       * - DB Weight:
+       * - Reads: Current Era, History Depth
+       * - Writes: History Depth
+       * - Clear Prefix Each: Era Stakers, EraStakersClipped, ErasValidatorPrefs
+       * - Writes Each: ErasValidatorReward, ErasRewardPoints, ErasTotalStake, ErasStartSessionIndex
+       * # </weight>
+       **/
+      setHistoryDepth: AugmentedSubmittable<(newHistoryDepth: Compact<EraIndex> | AnyNumber | Uint8Array, eraItemsDeleted: Compact<u32> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Set the validators who cannot be slashed (if any).
+       * 
+       * The dispatch origin must be Root.
+       * 
+       * # <weight>
+       * - O(V)
+       * - Base Weight: 2.208 + .006 * V µs
+       * - Write: Invulnerables
+       * # </weight>
+       **/
+      setInvulnerables: AugmentedSubmittable<(validators: Vec<AccountId> | (AccountId | string | Uint8Array)[]) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * (Re-)set the payment target for a controller.
+       * 
+       * Effects will be felt at the beginning of the next era.
+       * 
+       * The dispatch origin for this call must be _Signed_ by the controller, not the stash.
+       * 
+       * # <weight>
+       * - Independent of the arguments. Insignificant complexity.
+       * - Contains a limited number of reads.
+       * - Writes are limited to the `origin` account key.
+       * ---------
+       * - Base Weight: 11.33 µs
+       * - DB Weight:
+       * - Read: Ledger
+       * - Write: Payee
+       * # </weight>
+       **/
+      setPayee: AugmentedSubmittable<(payee: RewardDestination | 'Staked'|'Stash'|'Controller' | number | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Sets the ideal number of validators.
+       * 
+       * The dispatch origin must be Root.
+       * 
+       * # <weight>
+       * Base Weight: 1.717 µs
+       * Write: Validator Count
+       * # </weight>
+       **/
+      setValidatorCount: AugmentedSubmittable<(updated: Compact<u32> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Submit an election result to the chain. If the solution:
+       * 
+       * 1. is valid.
+       * 2. has a better score than a potentially existing solution on chain.
+       * 
+       * then, it will be _put_ on chain.
+       * 
+       * A solution consists of two pieces of data:
+       * 
+       * 1. `winners`: a flat vector of all the winners of the round.
+       * 2. `assignments`: the compact version of an assignment vector that encodes the edge
+       * weights.
+       * 
+       * Both of which may be computed using _phragmen_, or any other algorithm.
+       * 
+       * Additionally, the submitter must provide:
+       * 
+       * - The `score` that they claim their solution has.
+       * 
+       * Both validators and nominators will be represented by indices in the solution. The
+       * indices should respect the corresponding types ([`ValidatorIndex`] and
+       * [`NominatorIndex`]). Moreover, they should be valid when used to index into
+       * [`SnapshotValidators`] and [`SnapshotNominators`]. Any invalid index will cause the
+       * solution to be rejected. These two storage items are set during the election window and
+       * may be used to determine the indices.
+       * 
+       * A solution is valid if:
+       * 
+       * 0. It is submitted when [`EraElectionStatus`] is `Open`.
+       * 1. Its claimed score is equal to the score computed on-chain.
+       * 2. Presents the correct number of winners.
+       * 3. All indexes must be value according to the snapshot vectors. All edge values must
+       * also be correct and should not overflow the granularity of the ratio type (i.e. 256
+       * or billion).
+       * 4. For each edge, all targets are actually nominated by the voter.
+       * 5. Has correct self-votes.
+       * 
+       * A solutions score is consisted of 3 parameters:
+       * 
+       * 1. `min { support.total }` for each support of a winner. This value should be maximized.
+       * 2. `sum { support.total }` for each support of a winner. This value should be minimized.
+       * 3. `sum { support.total^2 }` for each support of a winner. This value should be
+       * minimized (to ensure less variance)
+       * 
+       * # <weight>
+       * See `crate::weight` module.
+       * # </weight>
+       **/
+      submitElectionSolution: AugmentedSubmittable<(winners: Vec<ValidatorIndex> | (ValidatorIndex | AnyNumber | Uint8Array)[], compact: CompactAssignments | { votes1?: any; votes2?: any; votes3?: any; votes4?: any; votes5?: any; votes6?: any; votes7?: any; votes8?: any; votes9?: any; votes10?: any; votes11?: any; votes12?: any; votes13?: any; votes14?: any; votes15?: any; votes16?: any } | string | Uint8Array, score: ElectionScore, era: EraIndex | AnyNumber | Uint8Array, size: ElectionSize | { validators?: any; nominators?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Unsigned version of `submit_election_solution`.
+       * 
+       * Note that this must pass the [`ValidateUnsigned`] check which only allows transactions
+       * from the local node to be included. In other words, only the block author can include a
+       * transaction in the block.
+       * 
+       * # <weight>
+       * See `crate::weight` module.
+       * # </weight>
+       **/
+      submitElectionSolutionUnsigned: AugmentedSubmittable<(winners: Vec<ValidatorIndex> | (ValidatorIndex | AnyNumber | Uint8Array)[], compact: CompactAssignments | { votes1?: any; votes2?: any; votes3?: any; votes4?: any; votes5?: any; votes6?: any; votes7?: any; votes8?: any; votes9?: any; votes10?: any; votes11?: any; votes12?: any; votes13?: any; votes14?: any; votes15?: any; votes16?: any } | string | Uint8Array, score: ElectionScore, era: EraIndex | AnyNumber | Uint8Array, size: ElectionSize | { validators?: any; nominators?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Schedule a portion of the stash to be unlocked ready for transfer out after the bond
+       * period ends. If this leaves an amount actively bonded less than
+       * T::Currency::minimum_balance(), then it is increased to the full amount.
+       * 
+       * Once the unlock period is done, you can call `withdraw_unbonded` to actually move
+       * the funds out of management ready for transfer.
+       * 
+       * No more than a limited number of unlocking chunks (see `MAX_UNLOCKING_CHUNKS`)
+       * can co-exists at the same time. In that case, [`Call::withdraw_unbonded`] need
+       * to be called first to remove some of the chunks (if possible).
+       * 
+       * The dispatch origin for this call must be _Signed_ by the controller, not the stash.
+       * And, it can be only called when [`EraElectionStatus`] is `Closed`.
+       * 
+       * Emits `Unbonded`.
+       * 
+       * See also [`Call::withdraw_unbonded`].
+       * 
+       * # <weight>
+       * - Independent of the arguments. Limited but potentially exploitable complexity.
+       * - Contains a limited number of reads.
+       * - Each call (requires the remainder of the bonded balance to be above `minimum_balance`)
+       * will cause a new entry to be inserted into a vector (`Ledger.unlocking`) kept in storage.
+       * The only way to clean the aforementioned storage item is also user-controlled via
+       * `withdraw_unbonded`.
+       * - One DB entry.
+       * ----------
+       * Base Weight: 50.34 µs
+       * DB Weight:
+       * - Read: Era Election Status, Ledger, Current Era, Locks, [Origin Account]
+       * - Write: [Origin Account], Locks, Ledger
+       * </weight>
+       **/
+      unbond: AugmentedSubmittable<(value: Compact<BalanceOf> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Declare the desire to validate for the origin controller.
+       * 
+       * Effects will be felt at the beginning of the next era.
+       * 
+       * The dispatch origin for this call must be _Signed_ by the controller, not the stash.
+       * And, it can be only called when [`EraElectionStatus`] is `Closed`.
+       * 
+       * # <weight>
+       * - Independent of the arguments. Insignificant complexity.
+       * - Contains a limited number of reads.
+       * - Writes are limited to the `origin` account key.
+       * -----------
+       * Base Weight: 17.13 µs
+       * DB Weight:
+       * - Read: Era Election Status, Ledger
+       * - Write: Nominators, Validators
+       * # </weight>
+       **/
+      validate: AugmentedSubmittable<(prefs: ValidatorPrefs | { commission?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Remove any unlocked chunks from the `unlocking` queue from our management.
+       * 
+       * This essentially frees up that balance to be used by the stash account to do
+       * whatever it wants.
+       * 
+       * The dispatch origin for this call must be _Signed_ by the controller, not the stash.
+       * And, it can be only called when [`EraElectionStatus`] is `Closed`.
+       * 
+       * Emits `Withdrawn`.
+       * 
+       * See also [`Call::unbond`].
+       * 
+       * # <weight>
+       * - Could be dependent on the `origin` argument and how much `unlocking` chunks exist.
+       * It implies `consolidate_unlocked` which loops over `Ledger.unlocking`, which is
+       * indirectly user-controlled. See [`unbond`] for more detail.
+       * - Contains a limited number of reads, yet the size of which could be large based on `ledger`.
+       * - Writes are limited to the `origin` account key.
+       * ---------------
+       * Complexity O(S) where S is the number of slashing spans to remove
+       * Base Weight:
+       * Update: 50.52 + .028 * S µs
+       * - Reads: EraElectionStatus, Ledger, Current Era, Locks, [Origin Account]
+       * - Writes: [Origin Account], Locks, Ledger
+       * Kill: 79.41 + 2.366 * S µs
+       * - Reads: EraElectionStatus, Ledger, Current Era, Bonded, Slashing Spans, [Origin Account], Locks
+       * - Writes: Bonded, Slashing Spans (if S > 0), Ledger, Payee, Validators, Nominators, [Origin Account], Locks
+       * - Writes Each: SpanSlash * S
+       * NOTE: Weight annotation is the kill scenario, we refund otherwise.
+       * # </weight>
+       **/
+      withdrawUnbonded: AugmentedSubmittable<(numSlashingSpans: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    storageWorkingGroup: {
+      /**
+       * Begin accepting worker applications to an opening that is active.
+       * Require signed leader origin or the root (to accept applications for the leader position).
+       **/
+      acceptApplications: AugmentedSubmittable<(openingId: OpeningId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Add an opening for a worker role.
+       * Require signed leader origin or the root (to add opening for the leader position).
+       **/
+      addOpening: AugmentedSubmittable<(activateAt: ActivateOpeningAt | { CurrentBlock: any } | { ExactBlock: any } | string | Uint8Array, commitment: OpeningPolicyCommitment | { application_rationing_policy?: any; max_review_period_length?: any; application_staking_policy?: any; role_staking_policy?: any; role_slashing_terms?: any; fill_opening_successful_applicant_application_stake_unstaking_period?: any; fill_opening_failed_applicant_application_stake_unstaking_period?: any; fill_opening_failed_applicant_role_stake_unstaking_period?: any; terminate_curator_application_stake_unstaking_period?: any; terminate_curator_role_stake_unstaking_period?: any; exit_curator_role_application_stake_unstaking_period?: any; exit_curator_role_stake_unstaking_period?: any } | string | Uint8Array, humanReadableText: Bytes | string | Uint8Array, openingType: OpeningType | 'Leader'|'Worker' | number | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Apply on a worker opening.
+       **/
+      applyOnOpening: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, openingId: OpeningId | AnyNumber | Uint8Array, roleAccountId: AccountId | string | Uint8Array, optRoleStakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, optApplicationStakeBalance: Option<BalanceOf> | null | object | string | Uint8Array, humanReadableText: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Begin reviewing, and therefore not accepting new applications.
+       * Require signed leader origin or the root (to begin review applications for the leader position).
+       **/
+      beginApplicantReview: AugmentedSubmittable<(openingId: OpeningId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Decreases the worker/lead stake and returns the remainder to the worker role_account_id.
+       * Can be decreased to zero, no actions on zero stake.
+       * Require signed leader origin or the root (to decrease the leader stake).
+       **/
+      decreaseStake: AugmentedSubmittable<(workerId: WorkerId | AnyNumber | Uint8Array, balance: BalanceOf | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Fill opening for worker/lead.
+       * Require signed leader origin or the root (to fill opening for the leader position).
+       **/
+      fillOpening: AugmentedSubmittable<(openingId: OpeningId | AnyNumber | Uint8Array, successfulApplicationIds: ApplicationIdSet, rewardPolicy: Option<RewardPolicy> | null | object | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Increases the worker/lead stake, demands a worker origin. Transfers tokens from the worker
+       * role_account_id to the stake. No limits on the stake.
+       **/
+      increaseStake: AugmentedSubmittable<(workerId: WorkerId | AnyNumber | Uint8Array, balance: BalanceOf | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Leave the role by the active worker.
+       **/
+      leaveRole: AugmentedSubmittable<(workerId: WorkerId | AnyNumber | Uint8Array, rationaleText: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Sets the capacity to enable working group budget. Requires root origin.
+       **/
+      setMintCapacity: AugmentedSubmittable<(newCapacity: BalanceOf | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Slashes the worker stake, demands a leader origin. No limits, no actions on zero stake.
+       * If slashing balance greater than the existing stake - stake is slashed to zero.
+       * Require signed leader origin or the root (to slash the leader stake).
+       **/
+      slashStake: AugmentedSubmittable<(workerId: WorkerId | AnyNumber | Uint8Array, balance: BalanceOf | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Terminate the worker application. Can be done by the lead only.
+       **/
+      terminateApplication: AugmentedSubmittable<(applicationId: ApplicationId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Terminate the active worker by the lead.
+       * Require signed leader origin or the root (to terminate the leader role).
+       **/
+      terminateRole: AugmentedSubmittable<(workerId: WorkerId | AnyNumber | Uint8Array, rationaleText: Bytes | string | Uint8Array, slashStake: bool | boolean | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Update the reward account associated with a set reward relationship for the active worker.
+       **/
+      updateRewardAccount: AugmentedSubmittable<(workerId: WorkerId | AnyNumber | Uint8Array, newRewardAccountId: AccountId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Update the reward amount associated with a set reward relationship for the active worker.
+       * Require signed leader origin or the root (to update leader reward amount).
+       **/
+      updateRewardAmount: AugmentedSubmittable<(workerId: WorkerId | AnyNumber | Uint8Array, newAmount: BalanceOfMint | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Update the associated role account of the active worker/lead.
+       **/
+      updateRoleAccount: AugmentedSubmittable<(workerId: WorkerId | AnyNumber | Uint8Array, newRoleAccountId: AccountId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Withdraw the worker application. Can be done by the worker itself only.
+       **/
+      withdrawApplication: AugmentedSubmittable<(applicationId: ApplicationId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    sudo: {
+      /**
+       * Authenticates the current sudo key and sets the given AccountId (`new`) as the new sudo key.
+       * 
+       * The dispatch origin for this call must be _Signed_.
+       * 
+       * # <weight>
+       * - O(1).
+       * - Limited storage reads.
+       * - One DB change.
+       * # </weight>
+       **/
+      setKey: AugmentedSubmittable<(updated: LookupSource | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Authenticates the sudo key and dispatches a function call with `Root` origin.
+       * 
+       * The dispatch origin for this call must be _Signed_.
+       * 
+       * # <weight>
+       * - O(1).
+       * - Limited storage reads.
+       * - One DB write (event).
+       * - Weight of derivative `call` execution + 10,000.
+       * # </weight>
+       **/
+      sudo: AugmentedSubmittable<(call: Call | { callIndex?: any; args?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Authenticates the sudo key and dispatches a function call with `Signed` origin from
+       * a given account.
+       * 
+       * The dispatch origin for this call must be _Signed_.
+       * 
+       * # <weight>
+       * - O(1).
+       * - Limited storage reads.
+       * - One DB write (event).
+       * - Weight of derivative `call` execution + 10,000.
+       * # </weight>
+       **/
+      sudoAs: AugmentedSubmittable<(who: LookupSource | string | Uint8Array, call: Call | { callIndex?: any; args?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Authenticates the sudo key and dispatches a function call with `Root` origin.
+       * This function does not check the weight of the call, and instead allows the
+       * Sudo user to specify the weight of the call.
+       * 
+       * The dispatch origin for this call must be _Signed_.
+       * 
+       * # <weight>
+       * - O(1).
+       * - The weight of this call is defined by the caller.
+       * # </weight>
+       **/
+      sudoUncheckedWeight: AugmentedSubmittable<(call: Call | { callIndex?: any; args?: any } | string | Uint8Array, weight: Weight | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    system: {
+      /**
+       * A dispatch that will fill the block weight up to the given ratio.
+       **/
+      fillBlock: AugmentedSubmittable<(ratio: Perbill | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Kill all storage items with a key that starts with the given prefix.
+       * 
+       * **NOTE:** We rely on the Root origin to provide us the number of subkeys under
+       * the prefix we are removing to accurately calculate the weight of this function.
+       * 
+       * # <weight>
+       * - `O(P)` where `P` amount of keys with prefix `prefix`
+       * - `P` storage deletions.
+       * - Base Weight: 0.834 * P µs
+       * - Writes: Number of subkeys + 1
+       * # </weight>
+       **/
+      killPrefix: AugmentedSubmittable<(prefix: Key | string | Uint8Array, subkeys: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Kill some items from storage.
+       * 
+       * # <weight>
+       * - `O(IK)` where `I` length of `keys` and `K` length of one key
+       * - `I` storage deletions.
+       * - Base Weight: .378 * i µs
+       * - Writes: Number of items
+       * # </weight>
+       **/
+      killStorage: AugmentedSubmittable<(keys: Vec<Key> | (Key | string | Uint8Array)[]) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Make some on-chain remark.
+       * 
+       * # <weight>
+       * - `O(1)`
+       * - Base Weight: 0.665 µs, independent of remark length.
+       * - No DB operations.
+       * # </weight>
+       **/
+      remark: AugmentedSubmittable<(remark: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Set the new changes trie configuration.
+       * 
+       * # <weight>
+       * - `O(1)`
+       * - 1 storage write or delete (codec `O(1)`).
+       * - 1 call to `deposit_log`: Uses `append` API, so O(1)
+       * - Base Weight: 7.218 µs
+       * - DB Weight:
+       * - Writes: Changes Trie, System Digest
+       * # </weight>
+       **/
+      setChangesTrieConfig: AugmentedSubmittable<(changesTrieConfig: Option<ChangesTrieConfiguration> | null | object | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Set the new runtime code.
+       * 
+       * # <weight>
+       * - `O(C + S)` where `C` length of `code` and `S` complexity of `can_set_code`
+       * - 1 storage write (codec `O(C)`).
+       * - 1 call to `can_set_code`: `O(S)` (calls `sp_io::misc::runtime_version` which is expensive).
+       * - 1 event.
+       * The weight of this function is dependent on the runtime, but generally this is very expensive.
+       * We will treat this as a full block.
+       * # </weight>
+       **/
+      setCode: AugmentedSubmittable<(code: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Set the new runtime code without doing any checks of the given `code`.
+       * 
+       * # <weight>
+       * - `O(C)` where `C` length of `code`
+       * - 1 storage write (codec `O(C)`).
+       * - 1 event.
+       * The weight of this function is dependent on the runtime. We will treat this as a full block.
+       * # </weight>
+       **/
+      setCodeWithoutChecks: AugmentedSubmittable<(code: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Set the number of pages in the WebAssembly environment's heap.
+       * 
+       * # <weight>
+       * - `O(1)`
+       * - 1 storage write.
+       * - Base Weight: 1.405 µs
+       * - 1 write to HEAP_PAGES
+       * # </weight>
+       **/
+      setHeapPages: AugmentedSubmittable<(pages: u64 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Set some items of storage.
+       * 
+       * # <weight>
+       * - `O(I)` where `I` length of `items`
+       * - `I` storage writes (`O(1)`).
+       * - Base Weight: 0.568 * i µs
+       * - Writes: Number of items
+       * # </weight>
+       **/
+      setStorage: AugmentedSubmittable<(items: Vec<KeyValue> | (KeyValue)[]) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Kill the sending account, assuming there are no references outstanding and the composite
+       * data is equal to its default value.
+       * 
+       * # <weight>
+       * - `O(1)`
+       * - 1 storage read and deletion.
+       * --------------------
+       * Base Weight: 8.626 µs
+       * No DB Read or Write operations because caller is already in overlay
+       * # </weight>
+       **/
+      suicide: AugmentedSubmittable<() => SubmittableExtrinsic<ApiType>>;
+    };
+    timestamp: {
+      /**
+       * Set the current time.
+       * 
+       * This call should be invoked exactly once per block. It will panic at the finalization
+       * phase, if this call hasn't been invoked by that time.
+       * 
+       * The timestamp should be greater than the previous one by the amount specified by
+       * `MinimumPeriod`.
+       * 
+       * The dispatch origin for this call must be `Inherent`.
+       * 
+       * # <weight>
+       * - `O(T)` where `T` complexity of `on_timestamp_set`
+       * - 1 storage read and 1 storage mutation (codec `O(1)`). (because of `DidUpdate::take` in `on_finalize`)
+       * - 1 event handler `on_timestamp_set` `O(T)`.
+       * - Benchmark: 7.678 (min squares analysis)
+       * - NOTE: This benchmark was done for a runtime with insignificant `on_timestamp_set` handlers.
+       * New benchmarking is needed when adding new handlers.
+       * # </weight>
+       **/
+      set: AugmentedSubmittable<(now: Compact<Moment> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+    };
+    versionedStorePermissions: {
+      addClassSchema: AugmentedSubmittable<(withCredential: Option<Credential> | null | object | string | Uint8Array, classId: ClassId | AnyNumber | Uint8Array, existingProperties: Vec<u16> | (u16 | AnyNumber | Uint8Array)[], newProperties: Vec<Property> | (Property | { prop_type?: any; required?: any; name?: any; description?: any } | string | Uint8Array)[]) => SubmittableExtrinsic<ApiType>>;
+      addSchemaSupportToEntity: AugmentedSubmittable<(withCredential: Option<Credential> | null | object | string | Uint8Array, asEntityMaintainer: bool | boolean | Uint8Array, entityId: EntityId | AnyNumber | Uint8Array, schemaId: u16 | AnyNumber | Uint8Array, propertyValues: Vec<ClassPropertyValue> | (ClassPropertyValue | { in_class_index?: any; value?: any } | string | Uint8Array)[]) => SubmittableExtrinsic<ApiType>>;
+      createClass: AugmentedSubmittable<(name: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array, classPermissions: ClassPermissionsType | { entity_permissions?: any; entities_can_be_created?: any; add_schemas?: any; create_entities?: any; reference_constraint?: any; admins?: any; last_permissions_update?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      createClassWithDefaultPermissions: AugmentedSubmittable<(name: Bytes | string | Uint8Array, description: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Creates a new entity of type class_id. The maintainer is set to be either None if the origin is root, or the provided credential
+       * associated with signer.
+       **/
+      createEntity: AugmentedSubmittable<(withCredential: Option<Credential> | null | object | string | Uint8Array, classId: ClassId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      setClassAddSchemasSet: AugmentedSubmittable<(withCredential: Option<Credential> | null | object | string | Uint8Array, classId: ClassId | AnyNumber | Uint8Array, credentialSet: CredentialSet) => SubmittableExtrinsic<ApiType>>;
+      /**
+       * Sets the admins for a class
+       **/
+      setClassAdmins: AugmentedSubmittable<(classId: ClassId | AnyNumber | Uint8Array, admins: CredentialSet) => SubmittableExtrinsic<ApiType>>;
+      setClassCreateEntitiesSet: AugmentedSubmittable<(withCredential: Option<Credential> | null | object | string | Uint8Array, classId: ClassId | AnyNumber | Uint8Array, credentialSet: CredentialSet) => SubmittableExtrinsic<ApiType>>;
+      setClassEntitiesCanBeCreated: AugmentedSubmittable<(withCredential: Option<Credential> | null | object | string | Uint8Array, classId: ClassId | AnyNumber | Uint8Array, canBeCreated: bool | boolean | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      setClassEntityPermissions: AugmentedSubmittable<(withCredential: Option<Credential> | null | object | string | Uint8Array, classId: ClassId | AnyNumber | Uint8Array, entityPermissions: EntityPermissions | { update?: any; maintainer_has_all_permissions?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      setClassReferenceConstraint: AugmentedSubmittable<(withCredential: Option<Credential> | null | object | string | Uint8Array, classId: ClassId | AnyNumber | Uint8Array, constraint: ReferenceConstraint | { NoReferencingAllowed: any } | { NoConstraint: any } | { Restricted: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
+      transaction: AugmentedSubmittable<(operations: Vec<Operation> | (Operation | { with_credential?: any; as_entity_maintainer?: any; operation_type?: any } | string | Uint8Array)[]) => SubmittableExtrinsic<ApiType>>;
+      updateEntityPropertyValues: AugmentedSubmittable<(withCredential: Option<Credential> | null | object | string | Uint8Array, asEntityMaintainer: bool | boolean | Uint8Array, entityId: EntityId | AnyNumber | Uint8Array, propertyValues: Vec<ClassPropertyValue> | (ClassPropertyValue | { in_class_index?: any; value?: any } | string | Uint8Array)[]) => SubmittableExtrinsic<ApiType>>;
+    };
+  }
+
+  export interface SubmittableExtrinsics<ApiType extends ApiTypes> extends AugmentedSubmittables<ApiType> {
+    (extrinsic: Call | Extrinsic | Uint8Array | string): SubmittableExtrinsic<ApiType>;
+  }
+}
diff --git a/types/augment/augment-api.ts b/types/augment/augment-api.ts
new file mode 100644
index 0000000000..7669e6442c
--- /dev/null
+++ b/types/augment/augment-api.ts
@@ -0,0 +1,7 @@
+// Auto-generated via `yarn polkadot-types-from-chain`, do not edit
+/* eslint-disable */
+
+import '@polkadot/api/augment/rpc';
+import './augment-api-consts';
+import './augment-api-query';
+import './augment-api-tx';
diff --git a/types/augment/augment-types.ts b/types/augment/augment-types.ts
new file mode 100644
index 0000000000..8a01b37bea
--- /dev/null
+++ b/types/augment/augment-types.ts
@@ -0,0 +1,2387 @@
+// Auto-generated via `yarn polkadot-types-from-defs`, do not edit
+/* eslint-disable */
+
+import { Compact, Option, Raw, Vec } from '@polkadot/types/codec';
+import { BitVec, Bytes, Data, DoNotConstruct, Null, StorageKey, Text, Type, U256, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types/primitive';
+import { AcceptingApplications, ActivateOpeningAt, ActiveOpeningStage, ActiveOpeningStageVariant, ActiveStake, ActorId, AddOpeningParameters, AddSchemaSupportToEntity, AdjustCapacityBy, AdjustOnInterval, Application, ApplicationDeactivationCause, ApplicationId, ApplicationIdSet, ApplicationIdToWorkerIdMap, ApplicationOf, ApplicationRationingPolicy, ApplicationStage, Approved, Backer, Backers, BalanceOfMint, BlockAndTime, Category, CategoryId, Channel, ChannelContentType, ChannelCurationStatus, ChannelId, ChannelPublicationStatus, ChildPositionInParentCategory, Class, ClassId, ClassPermissionsType, ClassPropertyValue, ClassSchema, ContentId, CreateEntity, Credential, CredentialSet, CurationActor, Curator, CuratorApplication, CuratorApplicationId, CuratorApplicationIdSet, CuratorApplicationIdToCuratorIdMap, CuratorExitInitiationOrigin, CuratorExitSummary, CuratorId, CuratorInduction, CuratorOpening, CuratorOpeningId, CuratorRoleStage, CuratorRoleStakeProfile, DataObject, DataObjectStorageRelationship, DataObjectStorageRelationshipId, DataObjectType, DataObjectTypeId, DataObjectsMap, Deactivated, DiscussionPost, DiscussionThread, ElectionParameters, ElectionStage, ElectionStake, Entity, EntityId, EntityPermissions, EntryMethod, ExecutionFailed, ExitedLeadRole, FillOpeningParameters, Finalized, HiringApplicationId, IPNSIdentity, InactiveApplicationStage, InputValidationLengthConstraint, Lead, LeadId, LeadRoleState, LiaisonJudgement, MemberId, Membership, MemoText, Mint, MintBalanceOf, MintId, ModerationAction, NextAdjustment, Opening, OpeningDeactivationCause, OpeningId, OpeningOf, OpeningPolicyCommitment, OpeningStage, OpeningType, Operation, OperationType, OptionalText, PaidMembershipTerms, PaidTermId, ParametrizedClassPropertyValue, ParametrizedEntity, ParametrizedPropertyValue, Post, PostId, PostTextChange, Principal, PrincipalId, Property, PropertyOfClass, PropertyType, PropertyValue, ProposalDecisionStatus, ProposalDetails, ProposalDetailsOf, ProposalId, ProposalOf, ProposalParameters, ProposalStatus, RationaleText, Recipient, RecipientId, ReferenceConstraint, Reply, ReplyId, ReviewPeriod, RewardPolicy, RewardRelationship, RewardRelationshipId, RoleParameters, RoleStakeProfile, SealedVote, Seat, Seats, ServiceProviderRecord, SetLeadParams, Slash, SlashableTerms, SlashingTerms, Stake, StakeId, Staked, StakedStatus, StakingAmountLimitMode, StakingPolicy, StakingStatus, StorageProviderId, SubscriptionId, TerminateRoleParameters, Thread, ThreadCounter, ThreadId, TransferableStake, Unstaking, UnstakingApplicationStage, UpdatePropertyValues, Url, VoteKind, VotingResults, WaitingToBeingOpeningStageVariant, WorkerId, WorkerOf, WorkingGroup, WorkingGroupOpeningPolicyCommitment, WorkingGroupUnstaker } from './all';
+import { BlockAttestations, IncludedBlocks, MoreAttestations } from '@polkadot/types/interfaces/attestations';
+import { RawAuraPreDigest } from '@polkadot/types/interfaces/aura';
+import { ExtrinsicOrHash, ExtrinsicStatus } from '@polkadot/types/interfaces/author';
+import { UncleEntryItem } from '@polkadot/types/interfaces/authorship';
+import { AllowedSlots, BabeAuthorityWeight, BabeBlockWeight, BabeEquivocationProof, BabeWeight, EpochAuthorship, MaybeRandomness, MaybeVrf, NextConfigDescriptor, NextConfigDescriptorV1, Randomness, RawBabePreDigest, RawBabePreDigestCompat, RawBabePreDigestPrimary, RawBabePreDigestPrimaryTo159, RawBabePreDigestSecondaryPlain, RawBabePreDigestSecondaryTo159, RawBabePreDigestSecondaryVRF, RawBabePreDigestTo159, SlotNumber, VrfData, VrfOutput, VrfProof } from '@polkadot/types/interfaces/babe';
+import { AccountData, BalanceLock, BalanceLockTo212, BalanceStatus, Reasons, VestingSchedule, WithdrawReasons } from '@polkadot/types/interfaces/balances';
+import { BlockHash } from '@polkadot/types/interfaces/chain';
+import { PrefixedStorageKey } from '@polkadot/types/interfaces/childstate';
+import { EthereumAddress, StatementKind } from '@polkadot/types/interfaces/claims';
+import { MemberCount, ProposalIndex, Votes, VotesTo230 } from '@polkadot/types/interfaces/collective';
+import { AuthorityId, RawVRFOutput } from '@polkadot/types/interfaces/consensus';
+import { AliveContractInfo, CodeHash, ContractCallRequest, ContractExecResult, ContractExecResultSuccess, ContractExecResultSuccessTo255, ContractExecResultTo255, ContractInfo, ContractStorageKey, Gas, PrefabWasmModule, PrefabWasmModuleReserved, Schedule, ScheduleTo212, SeedOf, TombstoneContractInfo, TrieId } from '@polkadot/types/interfaces/contracts';
+import { AccountVote, AccountVoteSplit, AccountVoteStandard, Conviction, Delegations, PreimageStatus, PreimageStatusAvailable, PriorLock, PropIndex, Proposal, ProxyState, ReferendumIndex, ReferendumInfo, ReferendumInfoFinished, ReferendumInfoTo239, ReferendumStatus, Tally, Voting, VotingDelegating, VotingDirect, VotingDirectVote } from '@polkadot/types/interfaces/democracy';
+import { ApprovalFlag, DefunctVoter, Renouncing, SetIndex, Vote, VoteIndex, VoteThreshold, VoterInfo } from '@polkadot/types/interfaces/elections';
+import { CreatedBlock, ImportedAux } from '@polkadot/types/interfaces/engine';
+import { Account, Log, Vicinity } from '@polkadot/types/interfaces/evm';
+import { EcdsaSignature, Ed25519Signature, Extrinsic, ExtrinsicEra, ExtrinsicPayload, ExtrinsicPayloadUnknown, ExtrinsicPayloadV1, ExtrinsicPayloadV2, ExtrinsicPayloadV3, ExtrinsicPayloadV4, ExtrinsicSignatureV1, ExtrinsicSignatureV2, ExtrinsicSignatureV3, ExtrinsicSignatureV4, ExtrinsicUnknown, ExtrinsicV1, ExtrinsicV2, ExtrinsicV3, ExtrinsicV4, ImmortalEra, MortalEra, MultiSignature, Signature, SignerPayload, Sr25519Signature } from '@polkadot/types/interfaces/extrinsics';
+import { AssetOptions, Owner, PermissionLatest, PermissionVersions, PermissionsV1 } from '@polkadot/types/interfaces/genericAsset';
+import { AuthorityIndex, AuthorityList, AuthorityWeight, GrandpaEquivocation, GrandpaEquivocationProof, GrandpaEquivocationValue, GrandpaPrevote, KeyOwnerProof, NextAuthority, PendingPause, PendingResume, Precommits, Prevotes, ReportedRoundStates, RoundState, SetId, StoredPendingChange, StoredState } from '@polkadot/types/interfaces/grandpa';
+import { IdentityFields, IdentityInfo, IdentityInfoAdditional, IdentityJudgement, RegistrarIndex, RegistrarInfo, Registration, RegistrationJudgement } from '@polkadot/types/interfaces/identity';
+import { AuthIndex, AuthoritySignature, Heartbeat, HeartbeatTo244, OpaqueMultiaddr, OpaqueNetworkState, OpaquePeerId } from '@polkadot/types/interfaces/imOnline';
+import { CallMetadataV0, DoubleMapTypeLatest, DoubleMapTypeV10, DoubleMapTypeV11, DoubleMapTypeV3, DoubleMapTypeV4, DoubleMapTypeV5, DoubleMapTypeV6, DoubleMapTypeV7, DoubleMapTypeV8, DoubleMapTypeV9, ErrorMetadataV10, ErrorMetadataV11, ErrorMetadataV8, ErrorMetadataV9, EventMetadataLatest, EventMetadataV0, EventMetadataV1, EventMetadataV10, EventMetadataV11, EventMetadataV2, EventMetadataV3, EventMetadataV4, EventMetadataV5, EventMetadataV6, EventMetadataV7, EventMetadataV8, EventMetadataV9, ExtrinsicMetadataLatest, ExtrinsicMetadataV11, FunctionArgumentMetadataLatest, FunctionArgumentMetadataV0, FunctionArgumentMetadataV1, FunctionArgumentMetadataV10, FunctionArgumentMetadataV11, FunctionArgumentMetadataV2, FunctionArgumentMetadataV3, FunctionArgumentMetadataV4, FunctionArgumentMetadataV5, FunctionArgumentMetadataV6, FunctionArgumentMetadataV7, FunctionArgumentMetadataV8, FunctionArgumentMetadataV9, FunctionMetadataLatest, FunctionMetadataV0, FunctionMetadataV1, FunctionMetadataV10, FunctionMetadataV11, FunctionMetadataV2, FunctionMetadataV3, FunctionMetadataV4, FunctionMetadataV5, FunctionMetadataV6, FunctionMetadataV7, FunctionMetadataV8, FunctionMetadataV9, MapTypeLatest, MapTypeV0, MapTypeV10, MapTypeV11, MapTypeV2, MapTypeV3, MapTypeV4, MapTypeV5, MapTypeV6, MapTypeV7, MapTypeV8, MapTypeV9, MetadataAll, MetadataLatest, MetadataV0, MetadataV1, MetadataV10, MetadataV11, MetadataV2, MetadataV3, MetadataV4, MetadataV5, MetadataV6, MetadataV7, MetadataV8, MetadataV9, ModuleConstantMetadataLatest, ModuleConstantMetadataV10, ModuleConstantMetadataV11, ModuleConstantMetadataV6, ModuleConstantMetadataV7, ModuleConstantMetadataV8, ModuleConstantMetadataV9, ModuleMetadataLatest, ModuleMetadataV0, ModuleMetadataV1, ModuleMetadataV10, ModuleMetadataV11, ModuleMetadataV2, ModuleMetadataV3, ModuleMetadataV4, ModuleMetadataV5, ModuleMetadataV6, ModuleMetadataV7, ModuleMetadataV8, ModuleMetadataV9, OuterDispatchCallV0, OuterDispatchMetadataV0, OuterEventEventMetadataEventsV0, OuterEventEventMetadataV0, OuterEventMetadataV0, PlainTypeLatest, PlainTypeV0, PlainTypeV10, PlainTypeV11, PlainTypeV2, PlainTypeV3, PlainTypeV4, PlainTypeV5, PlainTypeV6, PlainTypeV7, PlainTypeV8, PlainTypeV9, RuntimeModuleMetadataV0, StorageEntryMetadataLatest, StorageEntryMetadataV10, StorageEntryMetadataV11, StorageEntryMetadataV6, StorageEntryMetadataV7, StorageEntryMetadataV8, StorageEntryMetadataV9, StorageEntryModifierLatest, StorageEntryModifierV10, StorageEntryModifierV11, StorageEntryModifierV6, StorageEntryModifierV7, StorageEntryModifierV8, StorageEntryModifierV9, StorageEntryTypeLatest, StorageEntryTypeV10, StorageEntryTypeV11, StorageEntryTypeV6, StorageEntryTypeV7, StorageEntryTypeV8, StorageEntryTypeV9, StorageFunctionMetadataV0, StorageFunctionMetadataV1, StorageFunctionMetadataV2, StorageFunctionMetadataV3, StorageFunctionMetadataV4, StorageFunctionMetadataV5, StorageFunctionModifierV0, StorageFunctionModifierV1, StorageFunctionModifierV2, StorageFunctionModifierV3, StorageFunctionModifierV4, StorageFunctionModifierV5, StorageFunctionTypeV0, StorageFunctionTypeV1, StorageFunctionTypeV2, StorageFunctionTypeV3, StorageFunctionTypeV4, StorageFunctionTypeV5, StorageHasher, StorageHasherV10, StorageHasherV11, StorageHasherV4, StorageHasherV5, StorageHasherV6, StorageHasherV7, StorageHasherV8, StorageHasherV9, StorageMetadataLatest, StorageMetadataV0, StorageMetadataV10, StorageMetadataV11, StorageMetadataV7, StorageMetadataV8, StorageMetadataV9 } from '@polkadot/types/interfaces/metadata';
+import { StorageKind } from '@polkadot/types/interfaces/offchain';
+import { DeferredOffenceOf, Kind, OffenceDetails, Offender, OpaqueTimeSlot, ReportIdOf, Reporter } from '@polkadot/types/interfaces/offences';
+import { AbridgedCandidateReceipt, AttestedCandidate, AuctionIndex, Bidder, CandidateCommitments, CandidateReceipt, CollatorId, CollatorSignature, DoubleVoteReport, DownwardMessage, GlobalValidationSchedule, HeadData, IncomingParachain, IncomingParachainDeploy, IncomingParachainFixed, LeasePeriod, LeasePeriodOf, LocalValidationData, NewBidder, ParaId, ParaInfo, ParaPastCodeMeta, ParaScheduling, ParachainDispatchOrigin, Remark, Retriable, Scheduling, SigningContext, SlotRange, Statement, SubId, UpwardMessage, ValidationCode, ValidatorSignature, ValidityAttestation, WinningData, WinningDataEntry } from '@polkadot/types/interfaces/parachains';
+import { RuntimeDispatchInfo } from '@polkadot/types/interfaces/payment';
+import { Approvals } from '@polkadot/types/interfaces/poll';
+import { AccountStatus, AccountValidity } from '@polkadot/types/interfaces/purchase';
+import { ActiveRecovery, RecoveryConfig } from '@polkadot/types/interfaces/recovery';
+import { RpcMethods } from '@polkadot/types/interfaces/rpc';
+import { AccountId, AccountIdOf, AccountIndex, Address, AssetId, Balance, BalanceOf, Block, BlockNumber, Call, ChangesTrieConfiguration, Consensus, ConsensusEngineId, Digest, DigestItem, ExtrinsicsWeight, Fixed128, Fixed64, H160, H256, H512, Hash, Header, Index, Justification, KeyTypeId, KeyValue, LockIdentifier, LookupSource, LookupTarget, ModuleId, Moment, OpaqueCall, Origin, Pays, Perbill, Percent, Permill, Perquintill, Phantom, PhantomData, PreRuntime, ProxyType, Releases, RuntimeDbWeight, Seal, SealV0, SignedBlock, StorageData, ValidatorId, Weight, WeightMultiplier } from '@polkadot/types/interfaces/runtime';
+import { Period, Priority, SchedulePeriod, SchedulePriority, Scheduled, TaskAddress } from '@polkadot/types/interfaces/scheduler';
+import { FullIdentification, IdentificationTuple, Keys, MembershipProof, SessionIndex, SessionKeys1, SessionKeys2, SessionKeys3, SessionKeys4, SessionKeys5, SessionKeys6, ValidatorCount } from '@polkadot/types/interfaces/session';
+import { Bid, BidKind, SocietyJudgement, SocietyVote, StrikeCount, VouchingStatus } from '@polkadot/types/interfaces/society';
+import { ActiveEraInfo, CompactAssignments, CompactScore, ElectionCompute, ElectionResult, ElectionScore, ElectionSize, ElectionStatus, EraIndex, EraPoints, EraRewardPoints, EraRewards, Exposure, Forcing, IndividualExposure, KeyType, MomentOf, Nominations, NominatorIndex, OffchainAccuracy, PerU16, PhragmenScore, Points, RewardDestination, RewardPoint, SlashJournalEntry, SlashingSpans, SlashingSpansTo204, SpanIndex, SpanRecord, StakingLedger, StakingLedgerTo223, StakingLedgerTo240, UnappliedSlash, UnappliedSlashOther, UnlockChunk, ValidatorIndex, ValidatorPrefs, ValidatorPrefsTo145, ValidatorPrefsTo196 } from '@polkadot/types/interfaces/staking';
+import { ApiId, KeyValueOption, ReadProof, RuntimeVersion, RuntimeVersionApi, StorageChangeSet } from '@polkadot/types/interfaces/state';
+import { WeightToFeeCoefficient } from '@polkadot/types/interfaces/support';
+import { AccountInfo, ApplyExtrinsicResult, ChainProperties, ChainType, DigestOf, DispatchClass, DispatchError, DispatchErrorModule, DispatchErrorTo198, DispatchInfo, DispatchInfoTo190, DispatchInfoTo244, DispatchOutcome, DispatchResult, DispatchResultOf, DispatchResultTo198, Event, EventId, EventIndex, EventRecord, EventRecordTo76, Health, InvalidTransaction, Key, LastRuntimeUpgradeInfo, NetworkState, NetworkStatePeerset, NetworkStatePeersetInfo, NodeRole, NotConnectedPeer, Peer, PeerEndpoint, PeerEndpointAddr, PeerInfo, PeerPing, Phase, RefCount, TransactionValidityError, UnknownTransaction } from '@polkadot/types/interfaces/system';
+import { OpenTip, OpenTipFinderTo225, OpenTipTip, OpenTipTo225, TreasuryProposal } from '@polkadot/types/interfaces/treasury';
+import { Multiplier } from '@polkadot/types/interfaces/txpayment';
+import { CallHash, Multisig, Timepoint } from '@polkadot/types/interfaces/utility';
+import { VestingInfo } from '@polkadot/types/interfaces/vesting';
+
+declare module '@polkadot/types/types/registry' {
+  export interface InterfaceTypes {
+    BitVec: BitVec;
+    'Option<BitVec>': Option<BitVec>;
+    'Vec<BitVec>': Vec<BitVec>;
+    bool: bool;
+    'Option<bool>': Option<bool>;
+    'Vec<bool>': Vec<bool>;
+    Bytes: Bytes;
+    'Option<Bytes>': Option<Bytes>;
+    'Vec<Bytes>': Vec<Bytes>;
+    Data: Data;
+    'Option<Data>': Option<Data>;
+    'Vec<Data>': Vec<Data>;
+    DoNotConstruct: DoNotConstruct;
+    'Option<DoNotConstruct>': Option<DoNotConstruct>;
+    'Vec<DoNotConstruct>': Vec<DoNotConstruct>;
+    i8: i8;
+    'Option<i8>': Option<i8>;
+    'Vec<i8>': Vec<i8>;
+    i16: i16;
+    'Option<i16>': Option<i16>;
+    'Vec<i16>': Vec<i16>;
+    i32: i32;
+    'Option<i32>': Option<i32>;
+    'Vec<i32>': Vec<i32>;
+    i64: i64;
+    'Option<i64>': Option<i64>;
+    'Vec<i64>': Vec<i64>;
+    i128: i128;
+    'Option<i128>': Option<i128>;
+    'Vec<i128>': Vec<i128>;
+    i256: i256;
+    'Option<i256>': Option<i256>;
+    'Vec<i256>': Vec<i256>;
+    Null: Null;
+    'Option<Null>': Option<Null>;
+    'Vec<Null>': Vec<Null>;
+    StorageKey: StorageKey;
+    'Option<StorageKey>': Option<StorageKey>;
+    'Vec<StorageKey>': Vec<StorageKey>;
+    Text: Text;
+    'Option<Text>': Option<Text>;
+    'Vec<Text>': Vec<Text>;
+    Type: Type;
+    'Option<Type>': Option<Type>;
+    'Vec<Type>': Vec<Type>;
+    u8: u8;
+    'Compact<u8>': Compact<u8>;
+    'Option<u8>': Option<u8>;
+    'Vec<u8>': Vec<u8>;
+    u16: u16;
+    'Compact<u16>': Compact<u16>;
+    'Option<u16>': Option<u16>;
+    'Vec<u16>': Vec<u16>;
+    u32: u32;
+    'Compact<u32>': Compact<u32>;
+    'Option<u32>': Option<u32>;
+    'Vec<u32>': Vec<u32>;
+    u64: u64;
+    'Compact<u64>': Compact<u64>;
+    'Option<u64>': Option<u64>;
+    'Vec<u64>': Vec<u64>;
+    u128: u128;
+    'Compact<u128>': Compact<u128>;
+    'Option<u128>': Option<u128>;
+    'Vec<u128>': Vec<u128>;
+    u256: u256;
+    'Compact<u256>': Compact<u256>;
+    'Option<u256>': Option<u256>;
+    'Vec<u256>': Vec<u256>;
+    U256: U256;
+    'Compact<U256>': Compact<U256>;
+    'Option<U256>': Option<U256>;
+    'Vec<U256>': Vec<U256>;
+    usize: usize;
+    'Compact<usize>': Compact<usize>;
+    'Option<usize>': Option<usize>;
+    'Vec<usize>': Vec<usize>;
+    Raw: Raw;
+    'Option<Raw>': Option<Raw>;
+    'Vec<Raw>': Vec<Raw>;
+    AccountId: AccountId;
+    'Option<AccountId>': Option<AccountId>;
+    'Vec<AccountId>': Vec<AccountId>;
+    AccountIdOf: AccountIdOf;
+    'Option<AccountIdOf>': Option<AccountIdOf>;
+    'Vec<AccountIdOf>': Vec<AccountIdOf>;
+    AccountIndex: AccountIndex;
+    'Option<AccountIndex>': Option<AccountIndex>;
+    'Vec<AccountIndex>': Vec<AccountIndex>;
+    Address: Address;
+    'Option<Address>': Option<Address>;
+    'Vec<Address>': Vec<Address>;
+    AssetId: AssetId;
+    'Compact<AssetId>': Compact<AssetId>;
+    'Option<AssetId>': Option<AssetId>;
+    'Vec<AssetId>': Vec<AssetId>;
+    Balance: Balance;
+    'Compact<Balance>': Compact<Balance>;
+    'Option<Balance>': Option<Balance>;
+    'Vec<Balance>': Vec<Balance>;
+    BalanceOf: BalanceOf;
+    'Option<BalanceOf>': Option<BalanceOf>;
+    'Vec<BalanceOf>': Vec<BalanceOf>;
+    Block: Block;
+    'Option<Block>': Option<Block>;
+    'Vec<Block>': Vec<Block>;
+    BlockNumber: BlockNumber;
+    'Compact<BlockNumber>': Compact<BlockNumber>;
+    'Option<BlockNumber>': Option<BlockNumber>;
+    'Vec<BlockNumber>': Vec<BlockNumber>;
+    Call: Call;
+    'Option<Call>': Option<Call>;
+    'Vec<Call>': Vec<Call>;
+    ChangesTrieConfiguration: ChangesTrieConfiguration;
+    'Option<ChangesTrieConfiguration>': Option<ChangesTrieConfiguration>;
+    'Vec<ChangesTrieConfiguration>': Vec<ChangesTrieConfiguration>;
+    ConsensusEngineId: ConsensusEngineId;
+    'Option<ConsensusEngineId>': Option<ConsensusEngineId>;
+    'Vec<ConsensusEngineId>': Vec<ConsensusEngineId>;
+    Digest: Digest;
+    'Option<Digest>': Option<Digest>;
+    'Vec<Digest>': Vec<Digest>;
+    DigestItem: DigestItem;
+    'Option<DigestItem>': Option<DigestItem>;
+    'Vec<DigestItem>': Vec<DigestItem>;
+    ExtrinsicsWeight: ExtrinsicsWeight;
+    'Option<ExtrinsicsWeight>': Option<ExtrinsicsWeight>;
+    'Vec<ExtrinsicsWeight>': Vec<ExtrinsicsWeight>;
+    Fixed64: Fixed64;
+    'Option<Fixed64>': Option<Fixed64>;
+    'Vec<Fixed64>': Vec<Fixed64>;
+    Fixed128: Fixed128;
+    'Option<Fixed128>': Option<Fixed128>;
+    'Vec<Fixed128>': Vec<Fixed128>;
+    H160: H160;
+    'Option<H160>': Option<H160>;
+    'Vec<H160>': Vec<H160>;
+    H256: H256;
+    'Option<H256>': Option<H256>;
+    'Vec<H256>': Vec<H256>;
+    H512: H512;
+    'Option<H512>': Option<H512>;
+    'Vec<H512>': Vec<H512>;
+    Hash: Hash;
+    'Option<Hash>': Option<Hash>;
+    'Vec<Hash>': Vec<Hash>;
+    Header: Header;
+    'Option<Header>': Option<Header>;
+    'Vec<Header>': Vec<Header>;
+    Index: Index;
+    'Compact<Index>': Compact<Index>;
+    'Option<Index>': Option<Index>;
+    'Vec<Index>': Vec<Index>;
+    Justification: Justification;
+    'Option<Justification>': Option<Justification>;
+    'Vec<Justification>': Vec<Justification>;
+    KeyValue: KeyValue;
+    'Option<KeyValue>': Option<KeyValue>;
+    'Vec<KeyValue>': Vec<KeyValue>;
+    KeyTypeId: KeyTypeId;
+    'Compact<KeyTypeId>': Compact<KeyTypeId>;
+    'Option<KeyTypeId>': Option<KeyTypeId>;
+    'Vec<KeyTypeId>': Vec<KeyTypeId>;
+    LockIdentifier: LockIdentifier;
+    'Option<LockIdentifier>': Option<LockIdentifier>;
+    'Vec<LockIdentifier>': Vec<LockIdentifier>;
+    LookupSource: LookupSource;
+    'Option<LookupSource>': Option<LookupSource>;
+    'Vec<LookupSource>': Vec<LookupSource>;
+    LookupTarget: LookupTarget;
+    'Option<LookupTarget>': Option<LookupTarget>;
+    'Vec<LookupTarget>': Vec<LookupTarget>;
+    ModuleId: ModuleId;
+    'Option<ModuleId>': Option<ModuleId>;
+    'Vec<ModuleId>': Vec<ModuleId>;
+    Moment: Moment;
+    'Compact<Moment>': Compact<Moment>;
+    'Option<Moment>': Option<Moment>;
+    'Vec<Moment>': Vec<Moment>;
+    OpaqueCall: OpaqueCall;
+    'Option<OpaqueCall>': Option<OpaqueCall>;
+    'Vec<OpaqueCall>': Vec<OpaqueCall>;
+    Origin: Origin;
+    'Option<Origin>': Option<Origin>;
+    'Vec<Origin>': Vec<Origin>;
+    Pays: Pays;
+    'Option<Pays>': Option<Pays>;
+    'Vec<Pays>': Vec<Pays>;
+    Perbill: Perbill;
+    'Compact<Perbill>': Compact<Perbill>;
+    'Option<Perbill>': Option<Perbill>;
+    'Vec<Perbill>': Vec<Perbill>;
+    Percent: Percent;
+    'Compact<Percent>': Compact<Percent>;
+    'Option<Percent>': Option<Percent>;
+    'Vec<Percent>': Vec<Percent>;
+    Permill: Permill;
+    'Compact<Permill>': Compact<Permill>;
+    'Option<Permill>': Option<Permill>;
+    'Vec<Permill>': Vec<Permill>;
+    Perquintill: Perquintill;
+    'Compact<Perquintill>': Compact<Perquintill>;
+    'Option<Perquintill>': Option<Perquintill>;
+    'Vec<Perquintill>': Vec<Perquintill>;
+    Phantom: Phantom;
+    'Option<Phantom>': Option<Phantom>;
+    'Vec<Phantom>': Vec<Phantom>;
+    PhantomData: PhantomData;
+    'Option<PhantomData>': Option<PhantomData>;
+    'Vec<PhantomData>': Vec<PhantomData>;
+    ProxyType: ProxyType;
+    'Option<ProxyType>': Option<ProxyType>;
+    'Vec<ProxyType>': Vec<ProxyType>;
+    Releases: Releases;
+    'Option<Releases>': Option<Releases>;
+    'Vec<Releases>': Vec<Releases>;
+    RuntimeDbWeight: RuntimeDbWeight;
+    'Option<RuntimeDbWeight>': Option<RuntimeDbWeight>;
+    'Vec<RuntimeDbWeight>': Vec<RuntimeDbWeight>;
+    SignedBlock: SignedBlock;
+    'Option<SignedBlock>': Option<SignedBlock>;
+    'Vec<SignedBlock>': Vec<SignedBlock>;
+    StorageData: StorageData;
+    'Option<StorageData>': Option<StorageData>;
+    'Vec<StorageData>': Vec<StorageData>;
+    ValidatorId: ValidatorId;
+    'Option<ValidatorId>': Option<ValidatorId>;
+    'Vec<ValidatorId>': Vec<ValidatorId>;
+    Weight: Weight;
+    'Compact<Weight>': Compact<Weight>;
+    'Option<Weight>': Option<Weight>;
+    'Vec<Weight>': Vec<Weight>;
+    WeightMultiplier: WeightMultiplier;
+    'Option<WeightMultiplier>': Option<WeightMultiplier>;
+    'Vec<WeightMultiplier>': Vec<WeightMultiplier>;
+    PreRuntime: PreRuntime;
+    'Option<PreRuntime>': Option<PreRuntime>;
+    'Vec<PreRuntime>': Vec<PreRuntime>;
+    SealV0: SealV0;
+    'Option<SealV0>': Option<SealV0>;
+    'Vec<SealV0>': Vec<SealV0>;
+    Seal: Seal;
+    'Option<Seal>': Option<Seal>;
+    'Vec<Seal>': Vec<Seal>;
+    Consensus: Consensus;
+    'Option<Consensus>': Option<Consensus>;
+    'Vec<Consensus>': Vec<Consensus>;
+    UncleEntryItem: UncleEntryItem;
+    'Option<UncleEntryItem>': Option<UncleEntryItem>;
+    'Vec<UncleEntryItem>': Vec<UncleEntryItem>;
+    RawAuraPreDigest: RawAuraPreDigest;
+    'Option<RawAuraPreDigest>': Option<RawAuraPreDigest>;
+    'Vec<RawAuraPreDigest>': Vec<RawAuraPreDigest>;
+    AllowedSlots: AllowedSlots;
+    'Option<AllowedSlots>': Option<AllowedSlots>;
+    'Vec<AllowedSlots>': Vec<AllowedSlots>;
+    BabeAuthorityWeight: BabeAuthorityWeight;
+    'Compact<BabeAuthorityWeight>': Compact<BabeAuthorityWeight>;
+    'Option<BabeAuthorityWeight>': Option<BabeAuthorityWeight>;
+    'Vec<BabeAuthorityWeight>': Vec<BabeAuthorityWeight>;
+    BabeBlockWeight: BabeBlockWeight;
+    'Compact<BabeBlockWeight>': Compact<BabeBlockWeight>;
+    'Option<BabeBlockWeight>': Option<BabeBlockWeight>;
+    'Vec<BabeBlockWeight>': Vec<BabeBlockWeight>;
+    BabeEquivocationProof: BabeEquivocationProof;
+    'Option<BabeEquivocationProof>': Option<BabeEquivocationProof>;
+    'Vec<BabeEquivocationProof>': Vec<BabeEquivocationProof>;
+    BabeWeight: BabeWeight;
+    'Compact<BabeWeight>': Compact<BabeWeight>;
+    'Option<BabeWeight>': Option<BabeWeight>;
+    'Vec<BabeWeight>': Vec<BabeWeight>;
+    MaybeRandomness: MaybeRandomness;
+    'Option<MaybeRandomness>': Option<MaybeRandomness>;
+    'Vec<MaybeRandomness>': Vec<MaybeRandomness>;
+    MaybeVrf: MaybeVrf;
+    'Option<MaybeVrf>': Option<MaybeVrf>;
+    'Vec<MaybeVrf>': Vec<MaybeVrf>;
+    EpochAuthorship: EpochAuthorship;
+    'Option<EpochAuthorship>': Option<EpochAuthorship>;
+    'Vec<EpochAuthorship>': Vec<EpochAuthorship>;
+    NextConfigDescriptor: NextConfigDescriptor;
+    'Option<NextConfigDescriptor>': Option<NextConfigDescriptor>;
+    'Vec<NextConfigDescriptor>': Vec<NextConfigDescriptor>;
+    NextConfigDescriptorV1: NextConfigDescriptorV1;
+    'Option<NextConfigDescriptorV1>': Option<NextConfigDescriptorV1>;
+    'Vec<NextConfigDescriptorV1>': Vec<NextConfigDescriptorV1>;
+    Randomness: Randomness;
+    'Option<Randomness>': Option<Randomness>;
+    'Vec<Randomness>': Vec<Randomness>;
+    RawBabePreDigest: RawBabePreDigest;
+    'Option<RawBabePreDigest>': Option<RawBabePreDigest>;
+    'Vec<RawBabePreDigest>': Vec<RawBabePreDigest>;
+    RawBabePreDigestPrimary: RawBabePreDigestPrimary;
+    'Option<RawBabePreDigestPrimary>': Option<RawBabePreDigestPrimary>;
+    'Vec<RawBabePreDigestPrimary>': Vec<RawBabePreDigestPrimary>;
+    RawBabePreDigestSecondaryPlain: RawBabePreDigestSecondaryPlain;
+    'Option<RawBabePreDigestSecondaryPlain>': Option<RawBabePreDigestSecondaryPlain>;
+    'Vec<RawBabePreDigestSecondaryPlain>': Vec<RawBabePreDigestSecondaryPlain>;
+    RawBabePreDigestSecondaryVRF: RawBabePreDigestSecondaryVRF;
+    'Option<RawBabePreDigestSecondaryVRF>': Option<RawBabePreDigestSecondaryVRF>;
+    'Vec<RawBabePreDigestSecondaryVRF>': Vec<RawBabePreDigestSecondaryVRF>;
+    RawBabePreDigestTo159: RawBabePreDigestTo159;
+    'Option<RawBabePreDigestTo159>': Option<RawBabePreDigestTo159>;
+    'Vec<RawBabePreDigestTo159>': Vec<RawBabePreDigestTo159>;
+    RawBabePreDigestPrimaryTo159: RawBabePreDigestPrimaryTo159;
+    'Option<RawBabePreDigestPrimaryTo159>': Option<RawBabePreDigestPrimaryTo159>;
+    'Vec<RawBabePreDigestPrimaryTo159>': Vec<RawBabePreDigestPrimaryTo159>;
+    RawBabePreDigestSecondaryTo159: RawBabePreDigestSecondaryTo159;
+    'Option<RawBabePreDigestSecondaryTo159>': Option<RawBabePreDigestSecondaryTo159>;
+    'Vec<RawBabePreDigestSecondaryTo159>': Vec<RawBabePreDigestSecondaryTo159>;
+    RawBabePreDigestCompat: RawBabePreDigestCompat;
+    'Option<RawBabePreDigestCompat>': Option<RawBabePreDigestCompat>;
+    'Vec<RawBabePreDigestCompat>': Vec<RawBabePreDigestCompat>;
+    SlotNumber: SlotNumber;
+    'Compact<SlotNumber>': Compact<SlotNumber>;
+    'Option<SlotNumber>': Option<SlotNumber>;
+    'Vec<SlotNumber>': Vec<SlotNumber>;
+    VrfData: VrfData;
+    'Option<VrfData>': Option<VrfData>;
+    'Vec<VrfData>': Vec<VrfData>;
+    VrfOutput: VrfOutput;
+    'Option<VrfOutput>': Option<VrfOutput>;
+    'Vec<VrfOutput>': Vec<VrfOutput>;
+    VrfProof: VrfProof;
+    'Option<VrfProof>': Option<VrfProof>;
+    'Vec<VrfProof>': Vec<VrfProof>;
+    AccountData: AccountData;
+    'Option<AccountData>': Option<AccountData>;
+    'Vec<AccountData>': Vec<AccountData>;
+    BalanceLockTo212: BalanceLockTo212;
+    'Option<BalanceLockTo212>': Option<BalanceLockTo212>;
+    'Vec<BalanceLockTo212>': Vec<BalanceLockTo212>;
+    BalanceLock: BalanceLock;
+    'Option<BalanceLock>': Option<BalanceLock>;
+    'Vec<BalanceLock>': Vec<BalanceLock>;
+    BalanceStatus: BalanceStatus;
+    'Option<BalanceStatus>': Option<BalanceStatus>;
+    'Vec<BalanceStatus>': Vec<BalanceStatus>;
+    Reasons: Reasons;
+    'Option<Reasons>': Option<Reasons>;
+    'Vec<Reasons>': Vec<Reasons>;
+    VestingSchedule: VestingSchedule;
+    'Option<VestingSchedule>': Option<VestingSchedule>;
+    'Vec<VestingSchedule>': Vec<VestingSchedule>;
+    WithdrawReasons: WithdrawReasons;
+    'Option<WithdrawReasons>': Option<WithdrawReasons>;
+    'Vec<WithdrawReasons>': Vec<WithdrawReasons>;
+    MemberCount: MemberCount;
+    'Compact<MemberCount>': Compact<MemberCount>;
+    'Option<MemberCount>': Option<MemberCount>;
+    'Vec<MemberCount>': Vec<MemberCount>;
+    ProposalIndex: ProposalIndex;
+    'Compact<ProposalIndex>': Compact<ProposalIndex>;
+    'Option<ProposalIndex>': Option<ProposalIndex>;
+    'Vec<ProposalIndex>': Vec<ProposalIndex>;
+    VotesTo230: VotesTo230;
+    'Option<VotesTo230>': Option<VotesTo230>;
+    'Vec<VotesTo230>': Vec<VotesTo230>;
+    Votes: Votes;
+    'Option<Votes>': Option<Votes>;
+    'Vec<Votes>': Vec<Votes>;
+    AuthorityId: AuthorityId;
+    'Option<AuthorityId>': Option<AuthorityId>;
+    'Vec<AuthorityId>': Vec<AuthorityId>;
+    RawVRFOutput: RawVRFOutput;
+    'Option<RawVRFOutput>': Option<RawVRFOutput>;
+    'Vec<RawVRFOutput>': Vec<RawVRFOutput>;
+    AliveContractInfo: AliveContractInfo;
+    'Option<AliveContractInfo>': Option<AliveContractInfo>;
+    'Vec<AliveContractInfo>': Vec<AliveContractInfo>;
+    CodeHash: CodeHash;
+    'Option<CodeHash>': Option<CodeHash>;
+    'Vec<CodeHash>': Vec<CodeHash>;
+    ContractCallRequest: ContractCallRequest;
+    'Option<ContractCallRequest>': Option<ContractCallRequest>;
+    'Vec<ContractCallRequest>': Vec<ContractCallRequest>;
+    ContractExecResultSuccessTo255: ContractExecResultSuccessTo255;
+    'Option<ContractExecResultSuccessTo255>': Option<ContractExecResultSuccessTo255>;
+    'Vec<ContractExecResultSuccessTo255>': Vec<ContractExecResultSuccessTo255>;
+    ContractExecResultTo255: ContractExecResultTo255;
+    'Option<ContractExecResultTo255>': Option<ContractExecResultTo255>;
+    'Vec<ContractExecResultTo255>': Vec<ContractExecResultTo255>;
+    ContractExecResultSuccess: ContractExecResultSuccess;
+    'Option<ContractExecResultSuccess>': Option<ContractExecResultSuccess>;
+    'Vec<ContractExecResultSuccess>': Vec<ContractExecResultSuccess>;
+    ContractExecResult: ContractExecResult;
+    'Option<ContractExecResult>': Option<ContractExecResult>;
+    'Vec<ContractExecResult>': Vec<ContractExecResult>;
+    ContractInfo: ContractInfo;
+    'Option<ContractInfo>': Option<ContractInfo>;
+    'Vec<ContractInfo>': Vec<ContractInfo>;
+    ContractStorageKey: ContractStorageKey;
+    'Option<ContractStorageKey>': Option<ContractStorageKey>;
+    'Vec<ContractStorageKey>': Vec<ContractStorageKey>;
+    Gas: Gas;
+    'Compact<Gas>': Compact<Gas>;
+    'Option<Gas>': Option<Gas>;
+    'Vec<Gas>': Vec<Gas>;
+    PrefabWasmModule: PrefabWasmModule;
+    'Option<PrefabWasmModule>': Option<PrefabWasmModule>;
+    'Vec<PrefabWasmModule>': Vec<PrefabWasmModule>;
+    PrefabWasmModuleReserved: PrefabWasmModuleReserved;
+    'Option<PrefabWasmModuleReserved>': Option<PrefabWasmModuleReserved>;
+    'Vec<PrefabWasmModuleReserved>': Vec<PrefabWasmModuleReserved>;
+    ScheduleTo212: ScheduleTo212;
+    'Option<ScheduleTo212>': Option<ScheduleTo212>;
+    'Vec<ScheduleTo212>': Vec<ScheduleTo212>;
+    Schedule: Schedule;
+    'Option<Schedule>': Option<Schedule>;
+    'Vec<Schedule>': Vec<Schedule>;
+    SeedOf: SeedOf;
+    'Option<SeedOf>': Option<SeedOf>;
+    'Vec<SeedOf>': Vec<SeedOf>;
+    TombstoneContractInfo: TombstoneContractInfo;
+    'Option<TombstoneContractInfo>': Option<TombstoneContractInfo>;
+    'Vec<TombstoneContractInfo>': Vec<TombstoneContractInfo>;
+    TrieId: TrieId;
+    'Option<TrieId>': Option<TrieId>;
+    'Vec<TrieId>': Vec<TrieId>;
+    AccountVote: AccountVote;
+    'Option<AccountVote>': Option<AccountVote>;
+    'Vec<AccountVote>': Vec<AccountVote>;
+    AccountVoteSplit: AccountVoteSplit;
+    'Option<AccountVoteSplit>': Option<AccountVoteSplit>;
+    'Vec<AccountVoteSplit>': Vec<AccountVoteSplit>;
+    AccountVoteStandard: AccountVoteStandard;
+    'Option<AccountVoteStandard>': Option<AccountVoteStandard>;
+    'Vec<AccountVoteStandard>': Vec<AccountVoteStandard>;
+    Conviction: Conviction;
+    'Option<Conviction>': Option<Conviction>;
+    'Vec<Conviction>': Vec<Conviction>;
+    Delegations: Delegations;
+    'Option<Delegations>': Option<Delegations>;
+    'Vec<Delegations>': Vec<Delegations>;
+    PreimageStatus: PreimageStatus;
+    'Option<PreimageStatus>': Option<PreimageStatus>;
+    'Vec<PreimageStatus>': Vec<PreimageStatus>;
+    PreimageStatusAvailable: PreimageStatusAvailable;
+    'Option<PreimageStatusAvailable>': Option<PreimageStatusAvailable>;
+    'Vec<PreimageStatusAvailable>': Vec<PreimageStatusAvailable>;
+    PriorLock: PriorLock;
+    'Option<PriorLock>': Option<PriorLock>;
+    'Vec<PriorLock>': Vec<PriorLock>;
+    PropIndex: PropIndex;
+    'Compact<PropIndex>': Compact<PropIndex>;
+    'Option<PropIndex>': Option<PropIndex>;
+    'Vec<PropIndex>': Vec<PropIndex>;
+    Proposal: Proposal;
+    'Option<Proposal>': Option<Proposal>;
+    'Vec<Proposal>': Vec<Proposal>;
+    ProxyState: ProxyState;
+    'Option<ProxyState>': Option<ProxyState>;
+    'Vec<ProxyState>': Vec<ProxyState>;
+    ReferendumIndex: ReferendumIndex;
+    'Compact<ReferendumIndex>': Compact<ReferendumIndex>;
+    'Option<ReferendumIndex>': Option<ReferendumIndex>;
+    'Vec<ReferendumIndex>': Vec<ReferendumIndex>;
+    ReferendumInfoTo239: ReferendumInfoTo239;
+    'Option<ReferendumInfoTo239>': Option<ReferendumInfoTo239>;
+    'Vec<ReferendumInfoTo239>': Vec<ReferendumInfoTo239>;
+    ReferendumInfo: ReferendumInfo;
+    'Option<ReferendumInfo>': Option<ReferendumInfo>;
+    'Vec<ReferendumInfo>': Vec<ReferendumInfo>;
+    ReferendumInfoFinished: ReferendumInfoFinished;
+    'Option<ReferendumInfoFinished>': Option<ReferendumInfoFinished>;
+    'Vec<ReferendumInfoFinished>': Vec<ReferendumInfoFinished>;
+    ReferendumStatus: ReferendumStatus;
+    'Option<ReferendumStatus>': Option<ReferendumStatus>;
+    'Vec<ReferendumStatus>': Vec<ReferendumStatus>;
+    Tally: Tally;
+    'Option<Tally>': Option<Tally>;
+    'Vec<Tally>': Vec<Tally>;
+    Voting: Voting;
+    'Option<Voting>': Option<Voting>;
+    'Vec<Voting>': Vec<Voting>;
+    VotingDirect: VotingDirect;
+    'Option<VotingDirect>': Option<VotingDirect>;
+    'Vec<VotingDirect>': Vec<VotingDirect>;
+    VotingDirectVote: VotingDirectVote;
+    'Option<VotingDirectVote>': Option<VotingDirectVote>;
+    'Vec<VotingDirectVote>': Vec<VotingDirectVote>;
+    VotingDelegating: VotingDelegating;
+    'Option<VotingDelegating>': Option<VotingDelegating>;
+    'Vec<VotingDelegating>': Vec<VotingDelegating>;
+    ApprovalFlag: ApprovalFlag;
+    'Compact<ApprovalFlag>': Compact<ApprovalFlag>;
+    'Option<ApprovalFlag>': Option<ApprovalFlag>;
+    'Vec<ApprovalFlag>': Vec<ApprovalFlag>;
+    DefunctVoter: DefunctVoter;
+    'Option<DefunctVoter>': Option<DefunctVoter>;
+    'Vec<DefunctVoter>': Vec<DefunctVoter>;
+    Renouncing: Renouncing;
+    'Option<Renouncing>': Option<Renouncing>;
+    'Vec<Renouncing>': Vec<Renouncing>;
+    SetIndex: SetIndex;
+    'Compact<SetIndex>': Compact<SetIndex>;
+    'Option<SetIndex>': Option<SetIndex>;
+    'Vec<SetIndex>': Vec<SetIndex>;
+    Vote: Vote;
+    'Option<Vote>': Option<Vote>;
+    'Vec<Vote>': Vec<Vote>;
+    VoteIndex: VoteIndex;
+    'Compact<VoteIndex>': Compact<VoteIndex>;
+    'Option<VoteIndex>': Option<VoteIndex>;
+    'Vec<VoteIndex>': Vec<VoteIndex>;
+    VoterInfo: VoterInfo;
+    'Option<VoterInfo>': Option<VoterInfo>;
+    'Vec<VoterInfo>': Vec<VoterInfo>;
+    VoteThreshold: VoteThreshold;
+    'Option<VoteThreshold>': Option<VoteThreshold>;
+    'Vec<VoteThreshold>': Vec<VoteThreshold>;
+    CreatedBlock: CreatedBlock;
+    'Option<CreatedBlock>': Option<CreatedBlock>;
+    'Vec<CreatedBlock>': Vec<CreatedBlock>;
+    ImportedAux: ImportedAux;
+    'Option<ImportedAux>': Option<ImportedAux>;
+    'Vec<ImportedAux>': Vec<ImportedAux>;
+    Account: Account;
+    'Option<Account>': Option<Account>;
+    'Vec<Account>': Vec<Account>;
+    Log: Log;
+    'Option<Log>': Option<Log>;
+    'Vec<Log>': Vec<Log>;
+    Vicinity: Vicinity;
+    'Option<Vicinity>': Option<Vicinity>;
+    'Vec<Vicinity>': Vec<Vicinity>;
+    Extrinsic: Extrinsic;
+    'Option<Extrinsic>': Option<Extrinsic>;
+    'Vec<Extrinsic>': Vec<Extrinsic>;
+    ExtrinsicEra: ExtrinsicEra;
+    'Option<ExtrinsicEra>': Option<ExtrinsicEra>;
+    'Vec<ExtrinsicEra>': Vec<ExtrinsicEra>;
+    ExtrinsicPayload: ExtrinsicPayload;
+    'Option<ExtrinsicPayload>': Option<ExtrinsicPayload>;
+    'Vec<ExtrinsicPayload>': Vec<ExtrinsicPayload>;
+    ExtrinsicV1: ExtrinsicV1;
+    'Option<ExtrinsicV1>': Option<ExtrinsicV1>;
+    'Vec<ExtrinsicV1>': Vec<ExtrinsicV1>;
+    ExtrinsicPayloadV1: ExtrinsicPayloadV1;
+    'Option<ExtrinsicPayloadV1>': Option<ExtrinsicPayloadV1>;
+    'Vec<ExtrinsicPayloadV1>': Vec<ExtrinsicPayloadV1>;
+    ExtrinsicSignatureV1: ExtrinsicSignatureV1;
+    'Option<ExtrinsicSignatureV1>': Option<ExtrinsicSignatureV1>;
+    'Vec<ExtrinsicSignatureV1>': Vec<ExtrinsicSignatureV1>;
+    ExtrinsicV2: ExtrinsicV2;
+    'Option<ExtrinsicV2>': Option<ExtrinsicV2>;
+    'Vec<ExtrinsicV2>': Vec<ExtrinsicV2>;
+    ExtrinsicPayloadV2: ExtrinsicPayloadV2;
+    'Option<ExtrinsicPayloadV2>': Option<ExtrinsicPayloadV2>;
+    'Vec<ExtrinsicPayloadV2>': Vec<ExtrinsicPayloadV2>;
+    ExtrinsicSignatureV2: ExtrinsicSignatureV2;
+    'Option<ExtrinsicSignatureV2>': Option<ExtrinsicSignatureV2>;
+    'Vec<ExtrinsicSignatureV2>': Vec<ExtrinsicSignatureV2>;
+    ExtrinsicV3: ExtrinsicV3;
+    'Option<ExtrinsicV3>': Option<ExtrinsicV3>;
+    'Vec<ExtrinsicV3>': Vec<ExtrinsicV3>;
+    ExtrinsicPayloadV3: ExtrinsicPayloadV3;
+    'Option<ExtrinsicPayloadV3>': Option<ExtrinsicPayloadV3>;
+    'Vec<ExtrinsicPayloadV3>': Vec<ExtrinsicPayloadV3>;
+    ExtrinsicSignatureV3: ExtrinsicSignatureV3;
+    'Option<ExtrinsicSignatureV3>': Option<ExtrinsicSignatureV3>;
+    'Vec<ExtrinsicSignatureV3>': Vec<ExtrinsicSignatureV3>;
+    ExtrinsicV4: ExtrinsicV4;
+    'Option<ExtrinsicV4>': Option<ExtrinsicV4>;
+    'Vec<ExtrinsicV4>': Vec<ExtrinsicV4>;
+    ExtrinsicPayloadV4: ExtrinsicPayloadV4;
+    'Option<ExtrinsicPayloadV4>': Option<ExtrinsicPayloadV4>;
+    'Vec<ExtrinsicPayloadV4>': Vec<ExtrinsicPayloadV4>;
+    ExtrinsicSignatureV4: ExtrinsicSignatureV4;
+    'Option<ExtrinsicSignatureV4>': Option<ExtrinsicSignatureV4>;
+    'Vec<ExtrinsicSignatureV4>': Vec<ExtrinsicSignatureV4>;
+    ExtrinsicUnknown: ExtrinsicUnknown;
+    'Option<ExtrinsicUnknown>': Option<ExtrinsicUnknown>;
+    'Vec<ExtrinsicUnknown>': Vec<ExtrinsicUnknown>;
+    ExtrinsicPayloadUnknown: ExtrinsicPayloadUnknown;
+    'Option<ExtrinsicPayloadUnknown>': Option<ExtrinsicPayloadUnknown>;
+    'Vec<ExtrinsicPayloadUnknown>': Vec<ExtrinsicPayloadUnknown>;
+    ImmortalEra: ImmortalEra;
+    'Option<ImmortalEra>': Option<ImmortalEra>;
+    'Vec<ImmortalEra>': Vec<ImmortalEra>;
+    MortalEra: MortalEra;
+    'Option<MortalEra>': Option<MortalEra>;
+    'Vec<MortalEra>': Vec<MortalEra>;
+    MultiSignature: MultiSignature;
+    'Option<MultiSignature>': Option<MultiSignature>;
+    'Vec<MultiSignature>': Vec<MultiSignature>;
+    Signature: Signature;
+    'Option<Signature>': Option<Signature>;
+    'Vec<Signature>': Vec<Signature>;
+    SignerPayload: SignerPayload;
+    'Option<SignerPayload>': Option<SignerPayload>;
+    'Vec<SignerPayload>': Vec<SignerPayload>;
+    EcdsaSignature: EcdsaSignature;
+    'Option<EcdsaSignature>': Option<EcdsaSignature>;
+    'Vec<EcdsaSignature>': Vec<EcdsaSignature>;
+    Ed25519Signature: Ed25519Signature;
+    'Option<Ed25519Signature>': Option<Ed25519Signature>;
+    'Vec<Ed25519Signature>': Vec<Ed25519Signature>;
+    Sr25519Signature: Sr25519Signature;
+    'Option<Sr25519Signature>': Option<Sr25519Signature>;
+    'Vec<Sr25519Signature>': Vec<Sr25519Signature>;
+    AssetOptions: AssetOptions;
+    'Option<AssetOptions>': Option<AssetOptions>;
+    'Vec<AssetOptions>': Vec<AssetOptions>;
+    Owner: Owner;
+    'Option<Owner>': Option<Owner>;
+    'Vec<Owner>': Vec<Owner>;
+    PermissionsV1: PermissionsV1;
+    'Option<PermissionsV1>': Option<PermissionsV1>;
+    'Vec<PermissionsV1>': Vec<PermissionsV1>;
+    PermissionVersions: PermissionVersions;
+    'Option<PermissionVersions>': Option<PermissionVersions>;
+    'Vec<PermissionVersions>': Vec<PermissionVersions>;
+    PermissionLatest: PermissionLatest;
+    'Option<PermissionLatest>': Option<PermissionLatest>;
+    'Vec<PermissionLatest>': Vec<PermissionLatest>;
+    AuthorityIndex: AuthorityIndex;
+    'Compact<AuthorityIndex>': Compact<AuthorityIndex>;
+    'Option<AuthorityIndex>': Option<AuthorityIndex>;
+    'Vec<AuthorityIndex>': Vec<AuthorityIndex>;
+    AuthorityList: AuthorityList;
+    'Option<AuthorityList>': Option<AuthorityList>;
+    'Vec<AuthorityList>': Vec<AuthorityList>;
+    AuthorityWeight: AuthorityWeight;
+    'Compact<AuthorityWeight>': Compact<AuthorityWeight>;
+    'Option<AuthorityWeight>': Option<AuthorityWeight>;
+    'Vec<AuthorityWeight>': Vec<AuthorityWeight>;
+    GrandpaEquivocation: GrandpaEquivocation;
+    'Option<GrandpaEquivocation>': Option<GrandpaEquivocation>;
+    'Vec<GrandpaEquivocation>': Vec<GrandpaEquivocation>;
+    GrandpaEquivocationProof: GrandpaEquivocationProof;
+    'Option<GrandpaEquivocationProof>': Option<GrandpaEquivocationProof>;
+    'Vec<GrandpaEquivocationProof>': Vec<GrandpaEquivocationProof>;
+    GrandpaEquivocationValue: GrandpaEquivocationValue;
+    'Option<GrandpaEquivocationValue>': Option<GrandpaEquivocationValue>;
+    'Vec<GrandpaEquivocationValue>': Vec<GrandpaEquivocationValue>;
+    GrandpaPrevote: GrandpaPrevote;
+    'Option<GrandpaPrevote>': Option<GrandpaPrevote>;
+    'Vec<GrandpaPrevote>': Vec<GrandpaPrevote>;
+    KeyOwnerProof: KeyOwnerProof;
+    'Option<KeyOwnerProof>': Option<KeyOwnerProof>;
+    'Vec<KeyOwnerProof>': Vec<KeyOwnerProof>;
+    NextAuthority: NextAuthority;
+    'Option<NextAuthority>': Option<NextAuthority>;
+    'Vec<NextAuthority>': Vec<NextAuthority>;
+    PendingPause: PendingPause;
+    'Option<PendingPause>': Option<PendingPause>;
+    'Vec<PendingPause>': Vec<PendingPause>;
+    PendingResume: PendingResume;
+    'Option<PendingResume>': Option<PendingResume>;
+    'Vec<PendingResume>': Vec<PendingResume>;
+    Precommits: Precommits;
+    'Option<Precommits>': Option<Precommits>;
+    'Vec<Precommits>': Vec<Precommits>;
+    Prevotes: Prevotes;
+    'Option<Prevotes>': Option<Prevotes>;
+    'Vec<Prevotes>': Vec<Prevotes>;
+    ReportedRoundStates: ReportedRoundStates;
+    'Option<ReportedRoundStates>': Option<ReportedRoundStates>;
+    'Vec<ReportedRoundStates>': Vec<ReportedRoundStates>;
+    RoundState: RoundState;
+    'Option<RoundState>': Option<RoundState>;
+    'Vec<RoundState>': Vec<RoundState>;
+    SetId: SetId;
+    'Compact<SetId>': Compact<SetId>;
+    'Option<SetId>': Option<SetId>;
+    'Vec<SetId>': Vec<SetId>;
+    StoredPendingChange: StoredPendingChange;
+    'Option<StoredPendingChange>': Option<StoredPendingChange>;
+    'Vec<StoredPendingChange>': Vec<StoredPendingChange>;
+    StoredState: StoredState;
+    'Option<StoredState>': Option<StoredState>;
+    'Vec<StoredState>': Vec<StoredState>;
+    IdentityFields: IdentityFields;
+    'Option<IdentityFields>': Option<IdentityFields>;
+    'Vec<IdentityFields>': Vec<IdentityFields>;
+    IdentityInfoAdditional: IdentityInfoAdditional;
+    'Option<IdentityInfoAdditional>': Option<IdentityInfoAdditional>;
+    'Vec<IdentityInfoAdditional>': Vec<IdentityInfoAdditional>;
+    IdentityInfo: IdentityInfo;
+    'Option<IdentityInfo>': Option<IdentityInfo>;
+    'Vec<IdentityInfo>': Vec<IdentityInfo>;
+    IdentityJudgement: IdentityJudgement;
+    'Option<IdentityJudgement>': Option<IdentityJudgement>;
+    'Vec<IdentityJudgement>': Vec<IdentityJudgement>;
+    RegistrationJudgement: RegistrationJudgement;
+    'Option<RegistrationJudgement>': Option<RegistrationJudgement>;
+    'Vec<RegistrationJudgement>': Vec<RegistrationJudgement>;
+    Registration: Registration;
+    'Option<Registration>': Option<Registration>;
+    'Vec<Registration>': Vec<Registration>;
+    RegistrarIndex: RegistrarIndex;
+    'Compact<RegistrarIndex>': Compact<RegistrarIndex>;
+    'Option<RegistrarIndex>': Option<RegistrarIndex>;
+    'Vec<RegistrarIndex>': Vec<RegistrarIndex>;
+    RegistrarInfo: RegistrarInfo;
+    'Option<RegistrarInfo>': Option<RegistrarInfo>;
+    'Vec<RegistrarInfo>': Vec<RegistrarInfo>;
+    AuthIndex: AuthIndex;
+    'Compact<AuthIndex>': Compact<AuthIndex>;
+    'Option<AuthIndex>': Option<AuthIndex>;
+    'Vec<AuthIndex>': Vec<AuthIndex>;
+    AuthoritySignature: AuthoritySignature;
+    'Option<AuthoritySignature>': Option<AuthoritySignature>;
+    'Vec<AuthoritySignature>': Vec<AuthoritySignature>;
+    Heartbeat: Heartbeat;
+    'Option<Heartbeat>': Option<Heartbeat>;
+    'Vec<Heartbeat>': Vec<Heartbeat>;
+    HeartbeatTo244: HeartbeatTo244;
+    'Option<HeartbeatTo244>': Option<HeartbeatTo244>;
+    'Vec<HeartbeatTo244>': Vec<HeartbeatTo244>;
+    OpaqueMultiaddr: OpaqueMultiaddr;
+    'Option<OpaqueMultiaddr>': Option<OpaqueMultiaddr>;
+    'Vec<OpaqueMultiaddr>': Vec<OpaqueMultiaddr>;
+    OpaquePeerId: OpaquePeerId;
+    'Option<OpaquePeerId>': Option<OpaquePeerId>;
+    'Vec<OpaquePeerId>': Vec<OpaquePeerId>;
+    OpaqueNetworkState: OpaqueNetworkState;
+    'Option<OpaqueNetworkState>': Option<OpaqueNetworkState>;
+    'Vec<OpaqueNetworkState>': Vec<OpaqueNetworkState>;
+    DeferredOffenceOf: DeferredOffenceOf;
+    'Option<DeferredOffenceOf>': Option<DeferredOffenceOf>;
+    'Vec<DeferredOffenceOf>': Vec<DeferredOffenceOf>;
+    Kind: Kind;
+    'Option<Kind>': Option<Kind>;
+    'Vec<Kind>': Vec<Kind>;
+    OffenceDetails: OffenceDetails;
+    'Option<OffenceDetails>': Option<OffenceDetails>;
+    'Vec<OffenceDetails>': Vec<OffenceDetails>;
+    Offender: Offender;
+    'Option<Offender>': Option<Offender>;
+    'Vec<Offender>': Vec<Offender>;
+    OpaqueTimeSlot: OpaqueTimeSlot;
+    'Option<OpaqueTimeSlot>': Option<OpaqueTimeSlot>;
+    'Vec<OpaqueTimeSlot>': Vec<OpaqueTimeSlot>;
+    ReportIdOf: ReportIdOf;
+    'Option<ReportIdOf>': Option<ReportIdOf>;
+    'Vec<ReportIdOf>': Vec<ReportIdOf>;
+    Reporter: Reporter;
+    'Option<Reporter>': Option<Reporter>;
+    'Vec<Reporter>': Vec<Reporter>;
+    ActiveRecovery: ActiveRecovery;
+    'Option<ActiveRecovery>': Option<ActiveRecovery>;
+    'Vec<ActiveRecovery>': Vec<ActiveRecovery>;
+    RecoveryConfig: RecoveryConfig;
+    'Option<RecoveryConfig>': Option<RecoveryConfig>;
+    'Vec<RecoveryConfig>': Vec<RecoveryConfig>;
+    Period: Period;
+    'Option<Period>': Option<Period>;
+    'Vec<Period>': Vec<Period>;
+    Priority: Priority;
+    'Compact<Priority>': Compact<Priority>;
+    'Option<Priority>': Option<Priority>;
+    'Vec<Priority>': Vec<Priority>;
+    SchedulePeriod: SchedulePeriod;
+    'Option<SchedulePeriod>': Option<SchedulePeriod>;
+    'Vec<SchedulePeriod>': Vec<SchedulePeriod>;
+    SchedulePriority: SchedulePriority;
+    'Option<SchedulePriority>': Option<SchedulePriority>;
+    'Vec<SchedulePriority>': Vec<SchedulePriority>;
+    Scheduled: Scheduled;
+    'Option<Scheduled>': Option<Scheduled>;
+    'Vec<Scheduled>': Vec<Scheduled>;
+    TaskAddress: TaskAddress;
+    'Option<TaskAddress>': Option<TaskAddress>;
+    'Vec<TaskAddress>': Vec<TaskAddress>;
+    Keys: Keys;
+    'Option<Keys>': Option<Keys>;
+    'Vec<Keys>': Vec<Keys>;
+    SessionKeys1: SessionKeys1;
+    'Option<SessionKeys1>': Option<SessionKeys1>;
+    'Vec<SessionKeys1>': Vec<SessionKeys1>;
+    SessionKeys2: SessionKeys2;
+    'Option<SessionKeys2>': Option<SessionKeys2>;
+    'Vec<SessionKeys2>': Vec<SessionKeys2>;
+    SessionKeys3: SessionKeys3;
+    'Option<SessionKeys3>': Option<SessionKeys3>;
+    'Vec<SessionKeys3>': Vec<SessionKeys3>;
+    SessionKeys4: SessionKeys4;
+    'Option<SessionKeys4>': Option<SessionKeys4>;
+    'Vec<SessionKeys4>': Vec<SessionKeys4>;
+    SessionKeys5: SessionKeys5;
+    'Option<SessionKeys5>': Option<SessionKeys5>;
+    'Vec<SessionKeys5>': Vec<SessionKeys5>;
+    SessionKeys6: SessionKeys6;
+    'Option<SessionKeys6>': Option<SessionKeys6>;
+    'Vec<SessionKeys6>': Vec<SessionKeys6>;
+    FullIdentification: FullIdentification;
+    'Option<FullIdentification>': Option<FullIdentification>;
+    'Vec<FullIdentification>': Vec<FullIdentification>;
+    IdentificationTuple: IdentificationTuple;
+    'Option<IdentificationTuple>': Option<IdentificationTuple>;
+    'Vec<IdentificationTuple>': Vec<IdentificationTuple>;
+    MembershipProof: MembershipProof;
+    'Option<MembershipProof>': Option<MembershipProof>;
+    'Vec<MembershipProof>': Vec<MembershipProof>;
+    SessionIndex: SessionIndex;
+    'Compact<SessionIndex>': Compact<SessionIndex>;
+    'Option<SessionIndex>': Option<SessionIndex>;
+    'Vec<SessionIndex>': Vec<SessionIndex>;
+    ValidatorCount: ValidatorCount;
+    'Compact<ValidatorCount>': Compact<ValidatorCount>;
+    'Option<ValidatorCount>': Option<ValidatorCount>;
+    'Vec<ValidatorCount>': Vec<ValidatorCount>;
+    Bid: Bid;
+    'Option<Bid>': Option<Bid>;
+    'Vec<Bid>': Vec<Bid>;
+    BidKind: BidKind;
+    'Option<BidKind>': Option<BidKind>;
+    'Vec<BidKind>': Vec<BidKind>;
+    SocietyJudgement: SocietyJudgement;
+    'Option<SocietyJudgement>': Option<SocietyJudgement>;
+    'Vec<SocietyJudgement>': Vec<SocietyJudgement>;
+    SocietyVote: SocietyVote;
+    'Option<SocietyVote>': Option<SocietyVote>;
+    'Vec<SocietyVote>': Vec<SocietyVote>;
+    StrikeCount: StrikeCount;
+    'Compact<StrikeCount>': Compact<StrikeCount>;
+    'Option<StrikeCount>': Option<StrikeCount>;
+    'Vec<StrikeCount>': Vec<StrikeCount>;
+    VouchingStatus: VouchingStatus;
+    'Option<VouchingStatus>': Option<VouchingStatus>;
+    'Vec<VouchingStatus>': Vec<VouchingStatus>;
+    Points: Points;
+    'Compact<Points>': Compact<Points>;
+    'Option<Points>': Option<Points>;
+    'Vec<Points>': Vec<Points>;
+    EraPoints: EraPoints;
+    'Option<EraPoints>': Option<EraPoints>;
+    'Vec<EraPoints>': Vec<EraPoints>;
+    ActiveEraInfo: ActiveEraInfo;
+    'Option<ActiveEraInfo>': Option<ActiveEraInfo>;
+    'Vec<ActiveEraInfo>': Vec<ActiveEraInfo>;
+    CompactAssignments: CompactAssignments;
+    'Option<CompactAssignments>': Option<CompactAssignments>;
+    'Vec<CompactAssignments>': Vec<CompactAssignments>;
+    CompactScore: CompactScore;
+    'Option<CompactScore>': Option<CompactScore>;
+    'Vec<CompactScore>': Vec<CompactScore>;
+    ElectionCompute: ElectionCompute;
+    'Option<ElectionCompute>': Option<ElectionCompute>;
+    'Vec<ElectionCompute>': Vec<ElectionCompute>;
+    ElectionResult: ElectionResult;
+    'Option<ElectionResult>': Option<ElectionResult>;
+    'Vec<ElectionResult>': Vec<ElectionResult>;
+    ElectionScore: ElectionScore;
+    'Option<ElectionScore>': Option<ElectionScore>;
+    'Vec<ElectionScore>': Vec<ElectionScore>;
+    ElectionSize: ElectionSize;
+    'Option<ElectionSize>': Option<ElectionSize>;
+    'Vec<ElectionSize>': Vec<ElectionSize>;
+    ElectionStatus: ElectionStatus;
+    'Option<ElectionStatus>': Option<ElectionStatus>;
+    'Vec<ElectionStatus>': Vec<ElectionStatus>;
+    EraIndex: EraIndex;
+    'Compact<EraIndex>': Compact<EraIndex>;
+    'Option<EraIndex>': Option<EraIndex>;
+    'Vec<EraIndex>': Vec<EraIndex>;
+    EraRewardPoints: EraRewardPoints;
+    'Option<EraRewardPoints>': Option<EraRewardPoints>;
+    'Vec<EraRewardPoints>': Vec<EraRewardPoints>;
+    EraRewards: EraRewards;
+    'Option<EraRewards>': Option<EraRewards>;
+    'Vec<EraRewards>': Vec<EraRewards>;
+    Exposure: Exposure;
+    'Option<Exposure>': Option<Exposure>;
+    'Vec<Exposure>': Vec<Exposure>;
+    Forcing: Forcing;
+    'Option<Forcing>': Option<Forcing>;
+    'Vec<Forcing>': Vec<Forcing>;
+    IndividualExposure: IndividualExposure;
+    'Option<IndividualExposure>': Option<IndividualExposure>;
+    'Vec<IndividualExposure>': Vec<IndividualExposure>;
+    KeyType: KeyType;
+    'Option<KeyType>': Option<KeyType>;
+    'Vec<KeyType>': Vec<KeyType>;
+    MomentOf: MomentOf;
+    'Option<MomentOf>': Option<MomentOf>;
+    'Vec<MomentOf>': Vec<MomentOf>;
+    Nominations: Nominations;
+    'Option<Nominations>': Option<Nominations>;
+    'Vec<Nominations>': Vec<Nominations>;
+    NominatorIndex: NominatorIndex;
+    'Compact<NominatorIndex>': Compact<NominatorIndex>;
+    'Option<NominatorIndex>': Option<NominatorIndex>;
+    'Vec<NominatorIndex>': Vec<NominatorIndex>;
+    OffchainAccuracy: OffchainAccuracy;
+    'Option<OffchainAccuracy>': Option<OffchainAccuracy>;
+    'Vec<OffchainAccuracy>': Vec<OffchainAccuracy>;
+    PerU16: PerU16;
+    'Compact<PerU16>': Compact<PerU16>;
+    'Option<PerU16>': Option<PerU16>;
+    'Vec<PerU16>': Vec<PerU16>;
+    PhragmenScore: PhragmenScore;
+    'Option<PhragmenScore>': Option<PhragmenScore>;
+    'Vec<PhragmenScore>': Vec<PhragmenScore>;
+    RewardDestination: RewardDestination;
+    'Option<RewardDestination>': Option<RewardDestination>;
+    'Vec<RewardDestination>': Vec<RewardDestination>;
+    RewardPoint: RewardPoint;
+    'Compact<RewardPoint>': Compact<RewardPoint>;
+    'Option<RewardPoint>': Option<RewardPoint>;
+    'Vec<RewardPoint>': Vec<RewardPoint>;
+    SlashJournalEntry: SlashJournalEntry;
+    'Option<SlashJournalEntry>': Option<SlashJournalEntry>;
+    'Vec<SlashJournalEntry>': Vec<SlashJournalEntry>;
+    SlashingSpansTo204: SlashingSpansTo204;
+    'Option<SlashingSpansTo204>': Option<SlashingSpansTo204>;
+    'Vec<SlashingSpansTo204>': Vec<SlashingSpansTo204>;
+    SlashingSpans: SlashingSpans;
+    'Option<SlashingSpans>': Option<SlashingSpans>;
+    'Vec<SlashingSpans>': Vec<SlashingSpans>;
+    SpanIndex: SpanIndex;
+    'Compact<SpanIndex>': Compact<SpanIndex>;
+    'Option<SpanIndex>': Option<SpanIndex>;
+    'Vec<SpanIndex>': Vec<SpanIndex>;
+    SpanRecord: SpanRecord;
+    'Option<SpanRecord>': Option<SpanRecord>;
+    'Vec<SpanRecord>': Vec<SpanRecord>;
+    StakingLedgerTo223: StakingLedgerTo223;
+    'Option<StakingLedgerTo223>': Option<StakingLedgerTo223>;
+    'Vec<StakingLedgerTo223>': Vec<StakingLedgerTo223>;
+    StakingLedgerTo240: StakingLedgerTo240;
+    'Option<StakingLedgerTo240>': Option<StakingLedgerTo240>;
+    'Vec<StakingLedgerTo240>': Vec<StakingLedgerTo240>;
+    StakingLedger: StakingLedger;
+    'Option<StakingLedger>': Option<StakingLedger>;
+    'Vec<StakingLedger>': Vec<StakingLedger>;
+    UnappliedSlashOther: UnappliedSlashOther;
+    'Option<UnappliedSlashOther>': Option<UnappliedSlashOther>;
+    'Vec<UnappliedSlashOther>': Vec<UnappliedSlashOther>;
+    UnappliedSlash: UnappliedSlash;
+    'Option<UnappliedSlash>': Option<UnappliedSlash>;
+    'Vec<UnappliedSlash>': Vec<UnappliedSlash>;
+    UnlockChunk: UnlockChunk;
+    'Option<UnlockChunk>': Option<UnlockChunk>;
+    'Vec<UnlockChunk>': Vec<UnlockChunk>;
+    ValidatorIndex: ValidatorIndex;
+    'Compact<ValidatorIndex>': Compact<ValidatorIndex>;
+    'Option<ValidatorIndex>': Option<ValidatorIndex>;
+    'Vec<ValidatorIndex>': Vec<ValidatorIndex>;
+    ValidatorPrefs: ValidatorPrefs;
+    'Option<ValidatorPrefs>': Option<ValidatorPrefs>;
+    'Vec<ValidatorPrefs>': Vec<ValidatorPrefs>;
+    ValidatorPrefsTo196: ValidatorPrefsTo196;
+    'Option<ValidatorPrefsTo196>': Option<ValidatorPrefsTo196>;
+    'Vec<ValidatorPrefsTo196>': Vec<ValidatorPrefsTo196>;
+    ValidatorPrefsTo145: ValidatorPrefsTo145;
+    'Option<ValidatorPrefsTo145>': Option<ValidatorPrefsTo145>;
+    'Vec<ValidatorPrefsTo145>': Vec<ValidatorPrefsTo145>;
+    WeightToFeeCoefficient: WeightToFeeCoefficient;
+    'Option<WeightToFeeCoefficient>': Option<WeightToFeeCoefficient>;
+    'Vec<WeightToFeeCoefficient>': Vec<WeightToFeeCoefficient>;
+    AccountInfo: AccountInfo;
+    'Option<AccountInfo>': Option<AccountInfo>;
+    'Vec<AccountInfo>': Vec<AccountInfo>;
+    ApplyExtrinsicResult: ApplyExtrinsicResult;
+    'Option<ApplyExtrinsicResult>': Option<ApplyExtrinsicResult>;
+    'Vec<ApplyExtrinsicResult>': Vec<ApplyExtrinsicResult>;
+    ChainProperties: ChainProperties;
+    'Option<ChainProperties>': Option<ChainProperties>;
+    'Vec<ChainProperties>': Vec<ChainProperties>;
+    ChainType: ChainType;
+    'Option<ChainType>': Option<ChainType>;
+    'Vec<ChainType>': Vec<ChainType>;
+    DigestOf: DigestOf;
+    'Option<DigestOf>': Option<DigestOf>;
+    'Vec<DigestOf>': Vec<DigestOf>;
+    DispatchClass: DispatchClass;
+    'Option<DispatchClass>': Option<DispatchClass>;
+    'Vec<DispatchClass>': Vec<DispatchClass>;
+    DispatchError: DispatchError;
+    'Option<DispatchError>': Option<DispatchError>;
+    'Vec<DispatchError>': Vec<DispatchError>;
+    DispatchErrorModule: DispatchErrorModule;
+    'Option<DispatchErrorModule>': Option<DispatchErrorModule>;
+    'Vec<DispatchErrorModule>': Vec<DispatchErrorModule>;
+    DispatchErrorTo198: DispatchErrorTo198;
+    'Option<DispatchErrorTo198>': Option<DispatchErrorTo198>;
+    'Vec<DispatchErrorTo198>': Vec<DispatchErrorTo198>;
+    DispatchInfo: DispatchInfo;
+    'Option<DispatchInfo>': Option<DispatchInfo>;
+    'Vec<DispatchInfo>': Vec<DispatchInfo>;
+    DispatchInfoTo190: DispatchInfoTo190;
+    'Option<DispatchInfoTo190>': Option<DispatchInfoTo190>;
+    'Vec<DispatchInfoTo190>': Vec<DispatchInfoTo190>;
+    DispatchInfoTo244: DispatchInfoTo244;
+    'Option<DispatchInfoTo244>': Option<DispatchInfoTo244>;
+    'Vec<DispatchInfoTo244>': Vec<DispatchInfoTo244>;
+    DispatchOutcome: DispatchOutcome;
+    'Option<DispatchOutcome>': Option<DispatchOutcome>;
+    'Vec<DispatchOutcome>': Vec<DispatchOutcome>;
+    DispatchResult: DispatchResult;
+    'Option<DispatchResult>': Option<DispatchResult>;
+    'Vec<DispatchResult>': Vec<DispatchResult>;
+    DispatchResultOf: DispatchResultOf;
+    'Option<DispatchResultOf>': Option<DispatchResultOf>;
+    'Vec<DispatchResultOf>': Vec<DispatchResultOf>;
+    DispatchResultTo198: DispatchResultTo198;
+    'Option<DispatchResultTo198>': Option<DispatchResultTo198>;
+    'Vec<DispatchResultTo198>': Vec<DispatchResultTo198>;
+    Event: Event;
+    'Option<Event>': Option<Event>;
+    'Vec<Event>': Vec<Event>;
+    EventId: EventId;
+    'Option<EventId>': Option<EventId>;
+    'Vec<EventId>': Vec<EventId>;
+    EventIndex: EventIndex;
+    'Compact<EventIndex>': Compact<EventIndex>;
+    'Option<EventIndex>': Option<EventIndex>;
+    'Vec<EventIndex>': Vec<EventIndex>;
+    EventRecord: EventRecord;
+    'Option<EventRecord>': Option<EventRecord>;
+    'Vec<EventRecord>': Vec<EventRecord>;
+    EventRecordTo76: EventRecordTo76;
+    'Option<EventRecordTo76>': Option<EventRecordTo76>;
+    'Vec<EventRecordTo76>': Vec<EventRecordTo76>;
+    Health: Health;
+    'Option<Health>': Option<Health>;
+    'Vec<Health>': Vec<Health>;
+    InvalidTransaction: InvalidTransaction;
+    'Option<InvalidTransaction>': Option<InvalidTransaction>;
+    'Vec<InvalidTransaction>': Vec<InvalidTransaction>;
+    Key: Key;
+    'Option<Key>': Option<Key>;
+    'Vec<Key>': Vec<Key>;
+    LastRuntimeUpgradeInfo: LastRuntimeUpgradeInfo;
+    'Option<LastRuntimeUpgradeInfo>': Option<LastRuntimeUpgradeInfo>;
+    'Vec<LastRuntimeUpgradeInfo>': Vec<LastRuntimeUpgradeInfo>;
+    NetworkState: NetworkState;
+    'Option<NetworkState>': Option<NetworkState>;
+    'Vec<NetworkState>': Vec<NetworkState>;
+    NetworkStatePeerset: NetworkStatePeerset;
+    'Option<NetworkStatePeerset>': Option<NetworkStatePeerset>;
+    'Vec<NetworkStatePeerset>': Vec<NetworkStatePeerset>;
+    NetworkStatePeersetInfo: NetworkStatePeersetInfo;
+    'Option<NetworkStatePeersetInfo>': Option<NetworkStatePeersetInfo>;
+    'Vec<NetworkStatePeersetInfo>': Vec<NetworkStatePeersetInfo>;
+    NodeRole: NodeRole;
+    'Option<NodeRole>': Option<NodeRole>;
+    'Vec<NodeRole>': Vec<NodeRole>;
+    NotConnectedPeer: NotConnectedPeer;
+    'Option<NotConnectedPeer>': Option<NotConnectedPeer>;
+    'Vec<NotConnectedPeer>': Vec<NotConnectedPeer>;
+    Peer: Peer;
+    'Option<Peer>': Option<Peer>;
+    'Vec<Peer>': Vec<Peer>;
+    PeerEndpoint: PeerEndpoint;
+    'Option<PeerEndpoint>': Option<PeerEndpoint>;
+    'Vec<PeerEndpoint>': Vec<PeerEndpoint>;
+    PeerEndpointAddr: PeerEndpointAddr;
+    'Option<PeerEndpointAddr>': Option<PeerEndpointAddr>;
+    'Vec<PeerEndpointAddr>': Vec<PeerEndpointAddr>;
+    PeerPing: PeerPing;
+    'Option<PeerPing>': Option<PeerPing>;
+    'Vec<PeerPing>': Vec<PeerPing>;
+    PeerInfo: PeerInfo;
+    'Option<PeerInfo>': Option<PeerInfo>;
+    'Vec<PeerInfo>': Vec<PeerInfo>;
+    Phase: Phase;
+    'Option<Phase>': Option<Phase>;
+    'Vec<Phase>': Vec<Phase>;
+    RefCount: RefCount;
+    'Compact<RefCount>': Compact<RefCount>;
+    'Option<RefCount>': Option<RefCount>;
+    'Vec<RefCount>': Vec<RefCount>;
+    TransactionValidityError: TransactionValidityError;
+    'Option<TransactionValidityError>': Option<TransactionValidityError>;
+    'Vec<TransactionValidityError>': Vec<TransactionValidityError>;
+    UnknownTransaction: UnknownTransaction;
+    'Option<UnknownTransaction>': Option<UnknownTransaction>;
+    'Vec<UnknownTransaction>': Vec<UnknownTransaction>;
+    OpenTip: OpenTip;
+    'Option<OpenTip>': Option<OpenTip>;
+    'Vec<OpenTip>': Vec<OpenTip>;
+    OpenTipTo225: OpenTipTo225;
+    'Option<OpenTipTo225>': Option<OpenTipTo225>;
+    'Vec<OpenTipTo225>': Vec<OpenTipTo225>;
+    OpenTipFinderTo225: OpenTipFinderTo225;
+    'Option<OpenTipFinderTo225>': Option<OpenTipFinderTo225>;
+    'Vec<OpenTipFinderTo225>': Vec<OpenTipFinderTo225>;
+    OpenTipTip: OpenTipTip;
+    'Option<OpenTipTip>': Option<OpenTipTip>;
+    'Vec<OpenTipTip>': Vec<OpenTipTip>;
+    TreasuryProposal: TreasuryProposal;
+    'Option<TreasuryProposal>': Option<TreasuryProposal>;
+    'Vec<TreasuryProposal>': Vec<TreasuryProposal>;
+    Multiplier: Multiplier;
+    'Option<Multiplier>': Option<Multiplier>;
+    'Vec<Multiplier>': Vec<Multiplier>;
+    CallHash: CallHash;
+    'Option<CallHash>': Option<CallHash>;
+    'Vec<CallHash>': Vec<CallHash>;
+    Multisig: Multisig;
+    'Option<Multisig>': Option<Multisig>;
+    'Vec<Multisig>': Vec<Multisig>;
+    Timepoint: Timepoint;
+    'Option<Timepoint>': Option<Timepoint>;
+    'Vec<Timepoint>': Vec<Timepoint>;
+    VestingInfo: VestingInfo;
+    'Option<VestingInfo>': Option<VestingInfo>;
+    'Vec<VestingInfo>': Vec<VestingInfo>;
+    BlockAttestations: BlockAttestations;
+    'Option<BlockAttestations>': Option<BlockAttestations>;
+    'Vec<BlockAttestations>': Vec<BlockAttestations>;
+    IncludedBlocks: IncludedBlocks;
+    'Option<IncludedBlocks>': Option<IncludedBlocks>;
+    'Vec<IncludedBlocks>': Vec<IncludedBlocks>;
+    MoreAttestations: MoreAttestations;
+    'Option<MoreAttestations>': Option<MoreAttestations>;
+    'Vec<MoreAttestations>': Vec<MoreAttestations>;
+    EthereumAddress: EthereumAddress;
+    'Option<EthereumAddress>': Option<EthereumAddress>;
+    'Vec<EthereumAddress>': Vec<EthereumAddress>;
+    StatementKind: StatementKind;
+    'Option<StatementKind>': Option<StatementKind>;
+    'Vec<StatementKind>': Vec<StatementKind>;
+    AbridgedCandidateReceipt: AbridgedCandidateReceipt;
+    'Option<AbridgedCandidateReceipt>': Option<AbridgedCandidateReceipt>;
+    'Vec<AbridgedCandidateReceipt>': Vec<AbridgedCandidateReceipt>;
+    AttestedCandidate: AttestedCandidate;
+    'Option<AttestedCandidate>': Option<AttestedCandidate>;
+    'Vec<AttestedCandidate>': Vec<AttestedCandidate>;
+    AuctionIndex: AuctionIndex;
+    'Compact<AuctionIndex>': Compact<AuctionIndex>;
+    'Option<AuctionIndex>': Option<AuctionIndex>;
+    'Vec<AuctionIndex>': Vec<AuctionIndex>;
+    Bidder: Bidder;
+    'Option<Bidder>': Option<Bidder>;
+    'Vec<Bidder>': Vec<Bidder>;
+    CandidateCommitments: CandidateCommitments;
+    'Option<CandidateCommitments>': Option<CandidateCommitments>;
+    'Vec<CandidateCommitments>': Vec<CandidateCommitments>;
+    CandidateReceipt: CandidateReceipt;
+    'Option<CandidateReceipt>': Option<CandidateReceipt>;
+    'Vec<CandidateReceipt>': Vec<CandidateReceipt>;
+    CollatorId: CollatorId;
+    'Option<CollatorId>': Option<CollatorId>;
+    'Vec<CollatorId>': Vec<CollatorId>;
+    CollatorSignature: CollatorSignature;
+    'Option<CollatorSignature>': Option<CollatorSignature>;
+    'Vec<CollatorSignature>': Vec<CollatorSignature>;
+    DoubleVoteReport: DoubleVoteReport;
+    'Option<DoubleVoteReport>': Option<DoubleVoteReport>;
+    'Vec<DoubleVoteReport>': Vec<DoubleVoteReport>;
+    DownwardMessage: DownwardMessage;
+    'Option<DownwardMessage>': Option<DownwardMessage>;
+    'Vec<DownwardMessage>': Vec<DownwardMessage>;
+    GlobalValidationSchedule: GlobalValidationSchedule;
+    'Option<GlobalValidationSchedule>': Option<GlobalValidationSchedule>;
+    'Vec<GlobalValidationSchedule>': Vec<GlobalValidationSchedule>;
+    HeadData: HeadData;
+    'Option<HeadData>': Option<HeadData>;
+    'Vec<HeadData>': Vec<HeadData>;
+    IncomingParachain: IncomingParachain;
+    'Option<IncomingParachain>': Option<IncomingParachain>;
+    'Vec<IncomingParachain>': Vec<IncomingParachain>;
+    IncomingParachainFixed: IncomingParachainFixed;
+    'Option<IncomingParachainFixed>': Option<IncomingParachainFixed>;
+    'Vec<IncomingParachainFixed>': Vec<IncomingParachainFixed>;
+    IncomingParachainDeploy: IncomingParachainDeploy;
+    'Option<IncomingParachainDeploy>': Option<IncomingParachainDeploy>;
+    'Vec<IncomingParachainDeploy>': Vec<IncomingParachainDeploy>;
+    LeasePeriod: LeasePeriod;
+    'Option<LeasePeriod>': Option<LeasePeriod>;
+    'Vec<LeasePeriod>': Vec<LeasePeriod>;
+    LeasePeriodOf: LeasePeriodOf;
+    'Option<LeasePeriodOf>': Option<LeasePeriodOf>;
+    'Vec<LeasePeriodOf>': Vec<LeasePeriodOf>;
+    LocalValidationData: LocalValidationData;
+    'Option<LocalValidationData>': Option<LocalValidationData>;
+    'Vec<LocalValidationData>': Vec<LocalValidationData>;
+    NewBidder: NewBidder;
+    'Option<NewBidder>': Option<NewBidder>;
+    'Vec<NewBidder>': Vec<NewBidder>;
+    ParachainDispatchOrigin: ParachainDispatchOrigin;
+    'Option<ParachainDispatchOrigin>': Option<ParachainDispatchOrigin>;
+    'Vec<ParachainDispatchOrigin>': Vec<ParachainDispatchOrigin>;
+    ParaId: ParaId;
+    'Compact<ParaId>': Compact<ParaId>;
+    'Option<ParaId>': Option<ParaId>;
+    'Vec<ParaId>': Vec<ParaId>;
+    ParaInfo: ParaInfo;
+    'Option<ParaInfo>': Option<ParaInfo>;
+    'Vec<ParaInfo>': Vec<ParaInfo>;
+    ParaPastCodeMeta: ParaPastCodeMeta;
+    'Option<ParaPastCodeMeta>': Option<ParaPastCodeMeta>;
+    'Vec<ParaPastCodeMeta>': Vec<ParaPastCodeMeta>;
+    ParaScheduling: ParaScheduling;
+    'Option<ParaScheduling>': Option<ParaScheduling>;
+    'Vec<ParaScheduling>': Vec<ParaScheduling>;
+    Remark: Remark;
+    'Option<Remark>': Option<Remark>;
+    'Vec<Remark>': Vec<Remark>;
+    Retriable: Retriable;
+    'Option<Retriable>': Option<Retriable>;
+    'Vec<Retriable>': Vec<Retriable>;
+    Scheduling: Scheduling;
+    'Option<Scheduling>': Option<Scheduling>;
+    'Vec<Scheduling>': Vec<Scheduling>;
+    SigningContext: SigningContext;
+    'Option<SigningContext>': Option<SigningContext>;
+    'Vec<SigningContext>': Vec<SigningContext>;
+    SlotRange: SlotRange;
+    'Option<SlotRange>': Option<SlotRange>;
+    'Vec<SlotRange>': Vec<SlotRange>;
+    Statement: Statement;
+    'Option<Statement>': Option<Statement>;
+    'Vec<Statement>': Vec<Statement>;
+    SubId: SubId;
+    'Compact<SubId>': Compact<SubId>;
+    'Option<SubId>': Option<SubId>;
+    'Vec<SubId>': Vec<SubId>;
+    UpwardMessage: UpwardMessage;
+    'Option<UpwardMessage>': Option<UpwardMessage>;
+    'Vec<UpwardMessage>': Vec<UpwardMessage>;
+    ValidationCode: ValidationCode;
+    'Option<ValidationCode>': Option<ValidationCode>;
+    'Vec<ValidationCode>': Vec<ValidationCode>;
+    ValidatorSignature: ValidatorSignature;
+    'Option<ValidatorSignature>': Option<ValidatorSignature>;
+    'Vec<ValidatorSignature>': Vec<ValidatorSignature>;
+    ValidityAttestation: ValidityAttestation;
+    'Option<ValidityAttestation>': Option<ValidityAttestation>;
+    'Vec<ValidityAttestation>': Vec<ValidityAttestation>;
+    WinningData: WinningData;
+    'Option<WinningData>': Option<WinningData>;
+    'Vec<WinningData>': Vec<WinningData>;
+    WinningDataEntry: WinningDataEntry;
+    'Option<WinningDataEntry>': Option<WinningDataEntry>;
+    'Vec<WinningDataEntry>': Vec<WinningDataEntry>;
+    Approvals: Approvals;
+    'Option<Approvals>': Option<Approvals>;
+    'Vec<Approvals>': Vec<Approvals>;
+    AccountStatus: AccountStatus;
+    'Option<AccountStatus>': Option<AccountStatus>;
+    'Vec<AccountStatus>': Vec<AccountStatus>;
+    AccountValidity: AccountValidity;
+    'Option<AccountValidity>': Option<AccountValidity>;
+    'Vec<AccountValidity>': Vec<AccountValidity>;
+    CallMetadataV0: CallMetadataV0;
+    'Option<CallMetadataV0>': Option<CallMetadataV0>;
+    'Vec<CallMetadataV0>': Vec<CallMetadataV0>;
+    EventMetadataV0: EventMetadataV0;
+    'Option<EventMetadataV0>': Option<EventMetadataV0>;
+    'Vec<EventMetadataV0>': Vec<EventMetadataV0>;
+    FunctionArgumentMetadataV0: FunctionArgumentMetadataV0;
+    'Option<FunctionArgumentMetadataV0>': Option<FunctionArgumentMetadataV0>;
+    'Vec<FunctionArgumentMetadataV0>': Vec<FunctionArgumentMetadataV0>;
+    FunctionMetadataV0: FunctionMetadataV0;
+    'Option<FunctionMetadataV0>': Option<FunctionMetadataV0>;
+    'Vec<FunctionMetadataV0>': Vec<FunctionMetadataV0>;
+    MapTypeV0: MapTypeV0;
+    'Option<MapTypeV0>': Option<MapTypeV0>;
+    'Vec<MapTypeV0>': Vec<MapTypeV0>;
+    MetadataV0: MetadataV0;
+    'Option<MetadataV0>': Option<MetadataV0>;
+    'Vec<MetadataV0>': Vec<MetadataV0>;
+    ModuleMetadataV0: ModuleMetadataV0;
+    'Option<ModuleMetadataV0>': Option<ModuleMetadataV0>;
+    'Vec<ModuleMetadataV0>': Vec<ModuleMetadataV0>;
+    OuterDispatchCallV0: OuterDispatchCallV0;
+    'Option<OuterDispatchCallV0>': Option<OuterDispatchCallV0>;
+    'Vec<OuterDispatchCallV0>': Vec<OuterDispatchCallV0>;
+    OuterDispatchMetadataV0: OuterDispatchMetadataV0;
+    'Option<OuterDispatchMetadataV0>': Option<OuterDispatchMetadataV0>;
+    'Vec<OuterDispatchMetadataV0>': Vec<OuterDispatchMetadataV0>;
+    OuterEventEventMetadataEventsV0: OuterEventEventMetadataEventsV0;
+    'Option<OuterEventEventMetadataEventsV0>': Option<OuterEventEventMetadataEventsV0>;
+    'Vec<OuterEventEventMetadataEventsV0>': Vec<OuterEventEventMetadataEventsV0>;
+    OuterEventEventMetadataV0: OuterEventEventMetadataV0;
+    'Option<OuterEventEventMetadataV0>': Option<OuterEventEventMetadataV0>;
+    'Vec<OuterEventEventMetadataV0>': Vec<OuterEventEventMetadataV0>;
+    OuterEventMetadataV0: OuterEventMetadataV0;
+    'Option<OuterEventMetadataV0>': Option<OuterEventMetadataV0>;
+    'Vec<OuterEventMetadataV0>': Vec<OuterEventMetadataV0>;
+    PlainTypeV0: PlainTypeV0;
+    'Option<PlainTypeV0>': Option<PlainTypeV0>;
+    'Vec<PlainTypeV0>': Vec<PlainTypeV0>;
+    RuntimeModuleMetadataV0: RuntimeModuleMetadataV0;
+    'Option<RuntimeModuleMetadataV0>': Option<RuntimeModuleMetadataV0>;
+    'Vec<RuntimeModuleMetadataV0>': Vec<RuntimeModuleMetadataV0>;
+    StorageFunctionMetadataV0: StorageFunctionMetadataV0;
+    'Option<StorageFunctionMetadataV0>': Option<StorageFunctionMetadataV0>;
+    'Vec<StorageFunctionMetadataV0>': Vec<StorageFunctionMetadataV0>;
+    StorageFunctionModifierV0: StorageFunctionModifierV0;
+    'Option<StorageFunctionModifierV0>': Option<StorageFunctionModifierV0>;
+    'Vec<StorageFunctionModifierV0>': Vec<StorageFunctionModifierV0>;
+    StorageFunctionTypeV0: StorageFunctionTypeV0;
+    'Option<StorageFunctionTypeV0>': Option<StorageFunctionTypeV0>;
+    'Vec<StorageFunctionTypeV0>': Vec<StorageFunctionTypeV0>;
+    StorageMetadataV0: StorageMetadataV0;
+    'Option<StorageMetadataV0>': Option<StorageMetadataV0>;
+    'Vec<StorageMetadataV0>': Vec<StorageMetadataV0>;
+    EventMetadataV1: EventMetadataV1;
+    'Option<EventMetadataV1>': Option<EventMetadataV1>;
+    'Vec<EventMetadataV1>': Vec<EventMetadataV1>;
+    FunctionArgumentMetadataV1: FunctionArgumentMetadataV1;
+    'Option<FunctionArgumentMetadataV1>': Option<FunctionArgumentMetadataV1>;
+    'Vec<FunctionArgumentMetadataV1>': Vec<FunctionArgumentMetadataV1>;
+    FunctionMetadataV1: FunctionMetadataV1;
+    'Option<FunctionMetadataV1>': Option<FunctionMetadataV1>;
+    'Vec<FunctionMetadataV1>': Vec<FunctionMetadataV1>;
+    MetadataV1: MetadataV1;
+    'Option<MetadataV1>': Option<MetadataV1>;
+    'Vec<MetadataV1>': Vec<MetadataV1>;
+    ModuleMetadataV1: ModuleMetadataV1;
+    'Option<ModuleMetadataV1>': Option<ModuleMetadataV1>;
+    'Vec<ModuleMetadataV1>': Vec<ModuleMetadataV1>;
+    StorageFunctionMetadataV1: StorageFunctionMetadataV1;
+    'Option<StorageFunctionMetadataV1>': Option<StorageFunctionMetadataV1>;
+    'Vec<StorageFunctionMetadataV1>': Vec<StorageFunctionMetadataV1>;
+    StorageFunctionModifierV1: StorageFunctionModifierV1;
+    'Option<StorageFunctionModifierV1>': Option<StorageFunctionModifierV1>;
+    'Vec<StorageFunctionModifierV1>': Vec<StorageFunctionModifierV1>;
+    StorageFunctionTypeV1: StorageFunctionTypeV1;
+    'Option<StorageFunctionTypeV1>': Option<StorageFunctionTypeV1>;
+    'Vec<StorageFunctionTypeV1>': Vec<StorageFunctionTypeV1>;
+    EventMetadataV2: EventMetadataV2;
+    'Option<EventMetadataV2>': Option<EventMetadataV2>;
+    'Vec<EventMetadataV2>': Vec<EventMetadataV2>;
+    FunctionArgumentMetadataV2: FunctionArgumentMetadataV2;
+    'Option<FunctionArgumentMetadataV2>': Option<FunctionArgumentMetadataV2>;
+    'Vec<FunctionArgumentMetadataV2>': Vec<FunctionArgumentMetadataV2>;
+    FunctionMetadataV2: FunctionMetadataV2;
+    'Option<FunctionMetadataV2>': Option<FunctionMetadataV2>;
+    'Vec<FunctionMetadataV2>': Vec<FunctionMetadataV2>;
+    MapTypeV2: MapTypeV2;
+    'Option<MapTypeV2>': Option<MapTypeV2>;
+    'Vec<MapTypeV2>': Vec<MapTypeV2>;
+    MetadataV2: MetadataV2;
+    'Option<MetadataV2>': Option<MetadataV2>;
+    'Vec<MetadataV2>': Vec<MetadataV2>;
+    ModuleMetadataV2: ModuleMetadataV2;
+    'Option<ModuleMetadataV2>': Option<ModuleMetadataV2>;
+    'Vec<ModuleMetadataV2>': Vec<ModuleMetadataV2>;
+    PlainTypeV2: PlainTypeV2;
+    'Option<PlainTypeV2>': Option<PlainTypeV2>;
+    'Vec<PlainTypeV2>': Vec<PlainTypeV2>;
+    StorageFunctionMetadataV2: StorageFunctionMetadataV2;
+    'Option<StorageFunctionMetadataV2>': Option<StorageFunctionMetadataV2>;
+    'Vec<StorageFunctionMetadataV2>': Vec<StorageFunctionMetadataV2>;
+    StorageFunctionModifierV2: StorageFunctionModifierV2;
+    'Option<StorageFunctionModifierV2>': Option<StorageFunctionModifierV2>;
+    'Vec<StorageFunctionModifierV2>': Vec<StorageFunctionModifierV2>;
+    StorageFunctionTypeV2: StorageFunctionTypeV2;
+    'Option<StorageFunctionTypeV2>': Option<StorageFunctionTypeV2>;
+    'Vec<StorageFunctionTypeV2>': Vec<StorageFunctionTypeV2>;
+    DoubleMapTypeV3: DoubleMapTypeV3;
+    'Option<DoubleMapTypeV3>': Option<DoubleMapTypeV3>;
+    'Vec<DoubleMapTypeV3>': Vec<DoubleMapTypeV3>;
+    EventMetadataV3: EventMetadataV3;
+    'Option<EventMetadataV3>': Option<EventMetadataV3>;
+    'Vec<EventMetadataV3>': Vec<EventMetadataV3>;
+    FunctionArgumentMetadataV3: FunctionArgumentMetadataV3;
+    'Option<FunctionArgumentMetadataV3>': Option<FunctionArgumentMetadataV3>;
+    'Vec<FunctionArgumentMetadataV3>': Vec<FunctionArgumentMetadataV3>;
+    FunctionMetadataV3: FunctionMetadataV3;
+    'Option<FunctionMetadataV3>': Option<FunctionMetadataV3>;
+    'Vec<FunctionMetadataV3>': Vec<FunctionMetadataV3>;
+    MapTypeV3: MapTypeV3;
+    'Option<MapTypeV3>': Option<MapTypeV3>;
+    'Vec<MapTypeV3>': Vec<MapTypeV3>;
+    MetadataV3: MetadataV3;
+    'Option<MetadataV3>': Option<MetadataV3>;
+    'Vec<MetadataV3>': Vec<MetadataV3>;
+    ModuleMetadataV3: ModuleMetadataV3;
+    'Option<ModuleMetadataV3>': Option<ModuleMetadataV3>;
+    'Vec<ModuleMetadataV3>': Vec<ModuleMetadataV3>;
+    PlainTypeV3: PlainTypeV3;
+    'Option<PlainTypeV3>': Option<PlainTypeV3>;
+    'Vec<PlainTypeV3>': Vec<PlainTypeV3>;
+    StorageFunctionMetadataV3: StorageFunctionMetadataV3;
+    'Option<StorageFunctionMetadataV3>': Option<StorageFunctionMetadataV3>;
+    'Vec<StorageFunctionMetadataV3>': Vec<StorageFunctionMetadataV3>;
+    StorageFunctionModifierV3: StorageFunctionModifierV3;
+    'Option<StorageFunctionModifierV3>': Option<StorageFunctionModifierV3>;
+    'Vec<StorageFunctionModifierV3>': Vec<StorageFunctionModifierV3>;
+    StorageFunctionTypeV3: StorageFunctionTypeV3;
+    'Option<StorageFunctionTypeV3>': Option<StorageFunctionTypeV3>;
+    'Vec<StorageFunctionTypeV3>': Vec<StorageFunctionTypeV3>;
+    DoubleMapTypeV4: DoubleMapTypeV4;
+    'Option<DoubleMapTypeV4>': Option<DoubleMapTypeV4>;
+    'Vec<DoubleMapTypeV4>': Vec<DoubleMapTypeV4>;
+    EventMetadataV4: EventMetadataV4;
+    'Option<EventMetadataV4>': Option<EventMetadataV4>;
+    'Vec<EventMetadataV4>': Vec<EventMetadataV4>;
+    FunctionArgumentMetadataV4: FunctionArgumentMetadataV4;
+    'Option<FunctionArgumentMetadataV4>': Option<FunctionArgumentMetadataV4>;
+    'Vec<FunctionArgumentMetadataV4>': Vec<FunctionArgumentMetadataV4>;
+    FunctionMetadataV4: FunctionMetadataV4;
+    'Option<FunctionMetadataV4>': Option<FunctionMetadataV4>;
+    'Vec<FunctionMetadataV4>': Vec<FunctionMetadataV4>;
+    MapTypeV4: MapTypeV4;
+    'Option<MapTypeV4>': Option<MapTypeV4>;
+    'Vec<MapTypeV4>': Vec<MapTypeV4>;
+    MetadataV4: MetadataV4;
+    'Option<MetadataV4>': Option<MetadataV4>;
+    'Vec<MetadataV4>': Vec<MetadataV4>;
+    ModuleMetadataV4: ModuleMetadataV4;
+    'Option<ModuleMetadataV4>': Option<ModuleMetadataV4>;
+    'Vec<ModuleMetadataV4>': Vec<ModuleMetadataV4>;
+    PlainTypeV4: PlainTypeV4;
+    'Option<PlainTypeV4>': Option<PlainTypeV4>;
+    'Vec<PlainTypeV4>': Vec<PlainTypeV4>;
+    StorageFunctionMetadataV4: StorageFunctionMetadataV4;
+    'Option<StorageFunctionMetadataV4>': Option<StorageFunctionMetadataV4>;
+    'Vec<StorageFunctionMetadataV4>': Vec<StorageFunctionMetadataV4>;
+    StorageFunctionModifierV4: StorageFunctionModifierV4;
+    'Option<StorageFunctionModifierV4>': Option<StorageFunctionModifierV4>;
+    'Vec<StorageFunctionModifierV4>': Vec<StorageFunctionModifierV4>;
+    StorageFunctionTypeV4: StorageFunctionTypeV4;
+    'Option<StorageFunctionTypeV4>': Option<StorageFunctionTypeV4>;
+    'Vec<StorageFunctionTypeV4>': Vec<StorageFunctionTypeV4>;
+    StorageHasherV4: StorageHasherV4;
+    'Option<StorageHasherV4>': Option<StorageHasherV4>;
+    'Vec<StorageHasherV4>': Vec<StorageHasherV4>;
+    DoubleMapTypeV5: DoubleMapTypeV5;
+    'Option<DoubleMapTypeV5>': Option<DoubleMapTypeV5>;
+    'Vec<DoubleMapTypeV5>': Vec<DoubleMapTypeV5>;
+    EventMetadataV5: EventMetadataV5;
+    'Option<EventMetadataV5>': Option<EventMetadataV5>;
+    'Vec<EventMetadataV5>': Vec<EventMetadataV5>;
+    FunctionArgumentMetadataV5: FunctionArgumentMetadataV5;
+    'Option<FunctionArgumentMetadataV5>': Option<FunctionArgumentMetadataV5>;
+    'Vec<FunctionArgumentMetadataV5>': Vec<FunctionArgumentMetadataV5>;
+    FunctionMetadataV5: FunctionMetadataV5;
+    'Option<FunctionMetadataV5>': Option<FunctionMetadataV5>;
+    'Vec<FunctionMetadataV5>': Vec<FunctionMetadataV5>;
+    MapTypeV5: MapTypeV5;
+    'Option<MapTypeV5>': Option<MapTypeV5>;
+    'Vec<MapTypeV5>': Vec<MapTypeV5>;
+    MetadataV5: MetadataV5;
+    'Option<MetadataV5>': Option<MetadataV5>;
+    'Vec<MetadataV5>': Vec<MetadataV5>;
+    ModuleMetadataV5: ModuleMetadataV5;
+    'Option<ModuleMetadataV5>': Option<ModuleMetadataV5>;
+    'Vec<ModuleMetadataV5>': Vec<ModuleMetadataV5>;
+    PlainTypeV5: PlainTypeV5;
+    'Option<PlainTypeV5>': Option<PlainTypeV5>;
+    'Vec<PlainTypeV5>': Vec<PlainTypeV5>;
+    StorageFunctionMetadataV5: StorageFunctionMetadataV5;
+    'Option<StorageFunctionMetadataV5>': Option<StorageFunctionMetadataV5>;
+    'Vec<StorageFunctionMetadataV5>': Vec<StorageFunctionMetadataV5>;
+    StorageFunctionModifierV5: StorageFunctionModifierV5;
+    'Option<StorageFunctionModifierV5>': Option<StorageFunctionModifierV5>;
+    'Vec<StorageFunctionModifierV5>': Vec<StorageFunctionModifierV5>;
+    StorageFunctionTypeV5: StorageFunctionTypeV5;
+    'Option<StorageFunctionTypeV5>': Option<StorageFunctionTypeV5>;
+    'Vec<StorageFunctionTypeV5>': Vec<StorageFunctionTypeV5>;
+    StorageHasherV5: StorageHasherV5;
+    'Option<StorageHasherV5>': Option<StorageHasherV5>;
+    'Vec<StorageHasherV5>': Vec<StorageHasherV5>;
+    DoubleMapTypeV6: DoubleMapTypeV6;
+    'Option<DoubleMapTypeV6>': Option<DoubleMapTypeV6>;
+    'Vec<DoubleMapTypeV6>': Vec<DoubleMapTypeV6>;
+    EventMetadataV6: EventMetadataV6;
+    'Option<EventMetadataV6>': Option<EventMetadataV6>;
+    'Vec<EventMetadataV6>': Vec<EventMetadataV6>;
+    FunctionArgumentMetadataV6: FunctionArgumentMetadataV6;
+    'Option<FunctionArgumentMetadataV6>': Option<FunctionArgumentMetadataV6>;
+    'Vec<FunctionArgumentMetadataV6>': Vec<FunctionArgumentMetadataV6>;
+    FunctionMetadataV6: FunctionMetadataV6;
+    'Option<FunctionMetadataV6>': Option<FunctionMetadataV6>;
+    'Vec<FunctionMetadataV6>': Vec<FunctionMetadataV6>;
+    MapTypeV6: MapTypeV6;
+    'Option<MapTypeV6>': Option<MapTypeV6>;
+    'Vec<MapTypeV6>': Vec<MapTypeV6>;
+    MetadataV6: MetadataV6;
+    'Option<MetadataV6>': Option<MetadataV6>;
+    'Vec<MetadataV6>': Vec<MetadataV6>;
+    ModuleConstantMetadataV6: ModuleConstantMetadataV6;
+    'Option<ModuleConstantMetadataV6>': Option<ModuleConstantMetadataV6>;
+    'Vec<ModuleConstantMetadataV6>': Vec<ModuleConstantMetadataV6>;
+    ModuleMetadataV6: ModuleMetadataV6;
+    'Option<ModuleMetadataV6>': Option<ModuleMetadataV6>;
+    'Vec<ModuleMetadataV6>': Vec<ModuleMetadataV6>;
+    PlainTypeV6: PlainTypeV6;
+    'Option<PlainTypeV6>': Option<PlainTypeV6>;
+    'Vec<PlainTypeV6>': Vec<PlainTypeV6>;
+    StorageEntryModifierV6: StorageEntryModifierV6;
+    'Option<StorageEntryModifierV6>': Option<StorageEntryModifierV6>;
+    'Vec<StorageEntryModifierV6>': Vec<StorageEntryModifierV6>;
+    StorageEntryMetadataV6: StorageEntryMetadataV6;
+    'Option<StorageEntryMetadataV6>': Option<StorageEntryMetadataV6>;
+    'Vec<StorageEntryMetadataV6>': Vec<StorageEntryMetadataV6>;
+    StorageEntryTypeV6: StorageEntryTypeV6;
+    'Option<StorageEntryTypeV6>': Option<StorageEntryTypeV6>;
+    'Vec<StorageEntryTypeV6>': Vec<StorageEntryTypeV6>;
+    StorageHasherV6: StorageHasherV6;
+    'Option<StorageHasherV6>': Option<StorageHasherV6>;
+    'Vec<StorageHasherV6>': Vec<StorageHasherV6>;
+    DoubleMapTypeV7: DoubleMapTypeV7;
+    'Option<DoubleMapTypeV7>': Option<DoubleMapTypeV7>;
+    'Vec<DoubleMapTypeV7>': Vec<DoubleMapTypeV7>;
+    EventMetadataV7: EventMetadataV7;
+    'Option<EventMetadataV7>': Option<EventMetadataV7>;
+    'Vec<EventMetadataV7>': Vec<EventMetadataV7>;
+    FunctionArgumentMetadataV7: FunctionArgumentMetadataV7;
+    'Option<FunctionArgumentMetadataV7>': Option<FunctionArgumentMetadataV7>;
+    'Vec<FunctionArgumentMetadataV7>': Vec<FunctionArgumentMetadataV7>;
+    FunctionMetadataV7: FunctionMetadataV7;
+    'Option<FunctionMetadataV7>': Option<FunctionMetadataV7>;
+    'Vec<FunctionMetadataV7>': Vec<FunctionMetadataV7>;
+    MapTypeV7: MapTypeV7;
+    'Option<MapTypeV7>': Option<MapTypeV7>;
+    'Vec<MapTypeV7>': Vec<MapTypeV7>;
+    MetadataV7: MetadataV7;
+    'Option<MetadataV7>': Option<MetadataV7>;
+    'Vec<MetadataV7>': Vec<MetadataV7>;
+    ModuleConstantMetadataV7: ModuleConstantMetadataV7;
+    'Option<ModuleConstantMetadataV7>': Option<ModuleConstantMetadataV7>;
+    'Vec<ModuleConstantMetadataV7>': Vec<ModuleConstantMetadataV7>;
+    ModuleMetadataV7: ModuleMetadataV7;
+    'Option<ModuleMetadataV7>': Option<ModuleMetadataV7>;
+    'Vec<ModuleMetadataV7>': Vec<ModuleMetadataV7>;
+    PlainTypeV7: PlainTypeV7;
+    'Option<PlainTypeV7>': Option<PlainTypeV7>;
+    'Vec<PlainTypeV7>': Vec<PlainTypeV7>;
+    StorageEntryModifierV7: StorageEntryModifierV7;
+    'Option<StorageEntryModifierV7>': Option<StorageEntryModifierV7>;
+    'Vec<StorageEntryModifierV7>': Vec<StorageEntryModifierV7>;
+    StorageEntryMetadataV7: StorageEntryMetadataV7;
+    'Option<StorageEntryMetadataV7>': Option<StorageEntryMetadataV7>;
+    'Vec<StorageEntryMetadataV7>': Vec<StorageEntryMetadataV7>;
+    StorageEntryTypeV7: StorageEntryTypeV7;
+    'Option<StorageEntryTypeV7>': Option<StorageEntryTypeV7>;
+    'Vec<StorageEntryTypeV7>': Vec<StorageEntryTypeV7>;
+    StorageHasherV7: StorageHasherV7;
+    'Option<StorageHasherV7>': Option<StorageHasherV7>;
+    'Vec<StorageHasherV7>': Vec<StorageHasherV7>;
+    StorageMetadataV7: StorageMetadataV7;
+    'Option<StorageMetadataV7>': Option<StorageMetadataV7>;
+    'Vec<StorageMetadataV7>': Vec<StorageMetadataV7>;
+    DoubleMapTypeV8: DoubleMapTypeV8;
+    'Option<DoubleMapTypeV8>': Option<DoubleMapTypeV8>;
+    'Vec<DoubleMapTypeV8>': Vec<DoubleMapTypeV8>;
+    ErrorMetadataV8: ErrorMetadataV8;
+    'Option<ErrorMetadataV8>': Option<ErrorMetadataV8>;
+    'Vec<ErrorMetadataV8>': Vec<ErrorMetadataV8>;
+    EventMetadataV8: EventMetadataV8;
+    'Option<EventMetadataV8>': Option<EventMetadataV8>;
+    'Vec<EventMetadataV8>': Vec<EventMetadataV8>;
+    FunctionArgumentMetadataV8: FunctionArgumentMetadataV8;
+    'Option<FunctionArgumentMetadataV8>': Option<FunctionArgumentMetadataV8>;
+    'Vec<FunctionArgumentMetadataV8>': Vec<FunctionArgumentMetadataV8>;
+    FunctionMetadataV8: FunctionMetadataV8;
+    'Option<FunctionMetadataV8>': Option<FunctionMetadataV8>;
+    'Vec<FunctionMetadataV8>': Vec<FunctionMetadataV8>;
+    MapTypeV8: MapTypeV8;
+    'Option<MapTypeV8>': Option<MapTypeV8>;
+    'Vec<MapTypeV8>': Vec<MapTypeV8>;
+    MetadataV8: MetadataV8;
+    'Option<MetadataV8>': Option<MetadataV8>;
+    'Vec<MetadataV8>': Vec<MetadataV8>;
+    ModuleConstantMetadataV8: ModuleConstantMetadataV8;
+    'Option<ModuleConstantMetadataV8>': Option<ModuleConstantMetadataV8>;
+    'Vec<ModuleConstantMetadataV8>': Vec<ModuleConstantMetadataV8>;
+    ModuleMetadataV8: ModuleMetadataV8;
+    'Option<ModuleMetadataV8>': Option<ModuleMetadataV8>;
+    'Vec<ModuleMetadataV8>': Vec<ModuleMetadataV8>;
+    PlainTypeV8: PlainTypeV8;
+    'Option<PlainTypeV8>': Option<PlainTypeV8>;
+    'Vec<PlainTypeV8>': Vec<PlainTypeV8>;
+    StorageEntryModifierV8: StorageEntryModifierV8;
+    'Option<StorageEntryModifierV8>': Option<StorageEntryModifierV8>;
+    'Vec<StorageEntryModifierV8>': Vec<StorageEntryModifierV8>;
+    StorageEntryMetadataV8: StorageEntryMetadataV8;
+    'Option<StorageEntryMetadataV8>': Option<StorageEntryMetadataV8>;
+    'Vec<StorageEntryMetadataV8>': Vec<StorageEntryMetadataV8>;
+    StorageEntryTypeV8: StorageEntryTypeV8;
+    'Option<StorageEntryTypeV8>': Option<StorageEntryTypeV8>;
+    'Vec<StorageEntryTypeV8>': Vec<StorageEntryTypeV8>;
+    StorageHasherV8: StorageHasherV8;
+    'Option<StorageHasherV8>': Option<StorageHasherV8>;
+    'Vec<StorageHasherV8>': Vec<StorageHasherV8>;
+    StorageMetadataV8: StorageMetadataV8;
+    'Option<StorageMetadataV8>': Option<StorageMetadataV8>;
+    'Vec<StorageMetadataV8>': Vec<StorageMetadataV8>;
+    DoubleMapTypeV9: DoubleMapTypeV9;
+    'Option<DoubleMapTypeV9>': Option<DoubleMapTypeV9>;
+    'Vec<DoubleMapTypeV9>': Vec<DoubleMapTypeV9>;
+    ErrorMetadataV9: ErrorMetadataV9;
+    'Option<ErrorMetadataV9>': Option<ErrorMetadataV9>;
+    'Vec<ErrorMetadataV9>': Vec<ErrorMetadataV9>;
+    EventMetadataV9: EventMetadataV9;
+    'Option<EventMetadataV9>': Option<EventMetadataV9>;
+    'Vec<EventMetadataV9>': Vec<EventMetadataV9>;
+    FunctionArgumentMetadataV9: FunctionArgumentMetadataV9;
+    'Option<FunctionArgumentMetadataV9>': Option<FunctionArgumentMetadataV9>;
+    'Vec<FunctionArgumentMetadataV9>': Vec<FunctionArgumentMetadataV9>;
+    FunctionMetadataV9: FunctionMetadataV9;
+    'Option<FunctionMetadataV9>': Option<FunctionMetadataV9>;
+    'Vec<FunctionMetadataV9>': Vec<FunctionMetadataV9>;
+    MapTypeV9: MapTypeV9;
+    'Option<MapTypeV9>': Option<MapTypeV9>;
+    'Vec<MapTypeV9>': Vec<MapTypeV9>;
+    MetadataV9: MetadataV9;
+    'Option<MetadataV9>': Option<MetadataV9>;
+    'Vec<MetadataV9>': Vec<MetadataV9>;
+    ModuleConstantMetadataV9: ModuleConstantMetadataV9;
+    'Option<ModuleConstantMetadataV9>': Option<ModuleConstantMetadataV9>;
+    'Vec<ModuleConstantMetadataV9>': Vec<ModuleConstantMetadataV9>;
+    ModuleMetadataV9: ModuleMetadataV9;
+    'Option<ModuleMetadataV9>': Option<ModuleMetadataV9>;
+    'Vec<ModuleMetadataV9>': Vec<ModuleMetadataV9>;
+    PlainTypeV9: PlainTypeV9;
+    'Option<PlainTypeV9>': Option<PlainTypeV9>;
+    'Vec<PlainTypeV9>': Vec<PlainTypeV9>;
+    StorageEntryModifierV9: StorageEntryModifierV9;
+    'Option<StorageEntryModifierV9>': Option<StorageEntryModifierV9>;
+    'Vec<StorageEntryModifierV9>': Vec<StorageEntryModifierV9>;
+    StorageEntryMetadataV9: StorageEntryMetadataV9;
+    'Option<StorageEntryMetadataV9>': Option<StorageEntryMetadataV9>;
+    'Vec<StorageEntryMetadataV9>': Vec<StorageEntryMetadataV9>;
+    StorageEntryTypeV9: StorageEntryTypeV9;
+    'Option<StorageEntryTypeV9>': Option<StorageEntryTypeV9>;
+    'Vec<StorageEntryTypeV9>': Vec<StorageEntryTypeV9>;
+    StorageHasherV9: StorageHasherV9;
+    'Option<StorageHasherV9>': Option<StorageHasherV9>;
+    'Vec<StorageHasherV9>': Vec<StorageHasherV9>;
+    StorageMetadataV9: StorageMetadataV9;
+    'Option<StorageMetadataV9>': Option<StorageMetadataV9>;
+    'Vec<StorageMetadataV9>': Vec<StorageMetadataV9>;
+    DoubleMapTypeV10: DoubleMapTypeV10;
+    'Option<DoubleMapTypeV10>': Option<DoubleMapTypeV10>;
+    'Vec<DoubleMapTypeV10>': Vec<DoubleMapTypeV10>;
+    ErrorMetadataV10: ErrorMetadataV10;
+    'Option<ErrorMetadataV10>': Option<ErrorMetadataV10>;
+    'Vec<ErrorMetadataV10>': Vec<ErrorMetadataV10>;
+    EventMetadataV10: EventMetadataV10;
+    'Option<EventMetadataV10>': Option<EventMetadataV10>;
+    'Vec<EventMetadataV10>': Vec<EventMetadataV10>;
+    FunctionArgumentMetadataV10: FunctionArgumentMetadataV10;
+    'Option<FunctionArgumentMetadataV10>': Option<FunctionArgumentMetadataV10>;
+    'Vec<FunctionArgumentMetadataV10>': Vec<FunctionArgumentMetadataV10>;
+    FunctionMetadataV10: FunctionMetadataV10;
+    'Option<FunctionMetadataV10>': Option<FunctionMetadataV10>;
+    'Vec<FunctionMetadataV10>': Vec<FunctionMetadataV10>;
+    MapTypeV10: MapTypeV10;
+    'Option<MapTypeV10>': Option<MapTypeV10>;
+    'Vec<MapTypeV10>': Vec<MapTypeV10>;
+    MetadataV10: MetadataV10;
+    'Option<MetadataV10>': Option<MetadataV10>;
+    'Vec<MetadataV10>': Vec<MetadataV10>;
+    ModuleConstantMetadataV10: ModuleConstantMetadataV10;
+    'Option<ModuleConstantMetadataV10>': Option<ModuleConstantMetadataV10>;
+    'Vec<ModuleConstantMetadataV10>': Vec<ModuleConstantMetadataV10>;
+    ModuleMetadataV10: ModuleMetadataV10;
+    'Option<ModuleMetadataV10>': Option<ModuleMetadataV10>;
+    'Vec<ModuleMetadataV10>': Vec<ModuleMetadataV10>;
+    PlainTypeV10: PlainTypeV10;
+    'Option<PlainTypeV10>': Option<PlainTypeV10>;
+    'Vec<PlainTypeV10>': Vec<PlainTypeV10>;
+    StorageEntryModifierV10: StorageEntryModifierV10;
+    'Option<StorageEntryModifierV10>': Option<StorageEntryModifierV10>;
+    'Vec<StorageEntryModifierV10>': Vec<StorageEntryModifierV10>;
+    StorageEntryMetadataV10: StorageEntryMetadataV10;
+    'Option<StorageEntryMetadataV10>': Option<StorageEntryMetadataV10>;
+    'Vec<StorageEntryMetadataV10>': Vec<StorageEntryMetadataV10>;
+    StorageEntryTypeV10: StorageEntryTypeV10;
+    'Option<StorageEntryTypeV10>': Option<StorageEntryTypeV10>;
+    'Vec<StorageEntryTypeV10>': Vec<StorageEntryTypeV10>;
+    StorageMetadataV10: StorageMetadataV10;
+    'Option<StorageMetadataV10>': Option<StorageMetadataV10>;
+    'Vec<StorageMetadataV10>': Vec<StorageMetadataV10>;
+    StorageHasherV10: StorageHasherV10;
+    'Option<StorageHasherV10>': Option<StorageHasherV10>;
+    'Vec<StorageHasherV10>': Vec<StorageHasherV10>;
+    DoubleMapTypeV11: DoubleMapTypeV11;
+    'Option<DoubleMapTypeV11>': Option<DoubleMapTypeV11>;
+    'Vec<DoubleMapTypeV11>': Vec<DoubleMapTypeV11>;
+    ErrorMetadataV11: ErrorMetadataV11;
+    'Option<ErrorMetadataV11>': Option<ErrorMetadataV11>;
+    'Vec<ErrorMetadataV11>': Vec<ErrorMetadataV11>;
+    EventMetadataV11: EventMetadataV11;
+    'Option<EventMetadataV11>': Option<EventMetadataV11>;
+    'Vec<EventMetadataV11>': Vec<EventMetadataV11>;
+    ExtrinsicMetadataV11: ExtrinsicMetadataV11;
+    'Option<ExtrinsicMetadataV11>': Option<ExtrinsicMetadataV11>;
+    'Vec<ExtrinsicMetadataV11>': Vec<ExtrinsicMetadataV11>;
+    FunctionArgumentMetadataV11: FunctionArgumentMetadataV11;
+    'Option<FunctionArgumentMetadataV11>': Option<FunctionArgumentMetadataV11>;
+    'Vec<FunctionArgumentMetadataV11>': Vec<FunctionArgumentMetadataV11>;
+    FunctionMetadataV11: FunctionMetadataV11;
+    'Option<FunctionMetadataV11>': Option<FunctionMetadataV11>;
+    'Vec<FunctionMetadataV11>': Vec<FunctionMetadataV11>;
+    MapTypeV11: MapTypeV11;
+    'Option<MapTypeV11>': Option<MapTypeV11>;
+    'Vec<MapTypeV11>': Vec<MapTypeV11>;
+    MetadataV11: MetadataV11;
+    'Option<MetadataV11>': Option<MetadataV11>;
+    'Vec<MetadataV11>': Vec<MetadataV11>;
+    ModuleConstantMetadataV11: ModuleConstantMetadataV11;
+    'Option<ModuleConstantMetadataV11>': Option<ModuleConstantMetadataV11>;
+    'Vec<ModuleConstantMetadataV11>': Vec<ModuleConstantMetadataV11>;
+    ModuleMetadataV11: ModuleMetadataV11;
+    'Option<ModuleMetadataV11>': Option<ModuleMetadataV11>;
+    'Vec<ModuleMetadataV11>': Vec<ModuleMetadataV11>;
+    PlainTypeV11: PlainTypeV11;
+    'Option<PlainTypeV11>': Option<PlainTypeV11>;
+    'Vec<PlainTypeV11>': Vec<PlainTypeV11>;
+    StorageEntryModifierV11: StorageEntryModifierV11;
+    'Option<StorageEntryModifierV11>': Option<StorageEntryModifierV11>;
+    'Vec<StorageEntryModifierV11>': Vec<StorageEntryModifierV11>;
+    StorageEntryMetadataV11: StorageEntryMetadataV11;
+    'Option<StorageEntryMetadataV11>': Option<StorageEntryMetadataV11>;
+    'Vec<StorageEntryMetadataV11>': Vec<StorageEntryMetadataV11>;
+    StorageEntryTypeV11: StorageEntryTypeV11;
+    'Option<StorageEntryTypeV11>': Option<StorageEntryTypeV11>;
+    'Vec<StorageEntryTypeV11>': Vec<StorageEntryTypeV11>;
+    StorageMetadataV11: StorageMetadataV11;
+    'Option<StorageMetadataV11>': Option<StorageMetadataV11>;
+    'Vec<StorageMetadataV11>': Vec<StorageMetadataV11>;
+    StorageHasherV11: StorageHasherV11;
+    'Option<StorageHasherV11>': Option<StorageHasherV11>;
+    'Vec<StorageHasherV11>': Vec<StorageHasherV11>;
+    DoubleMapTypeLatest: DoubleMapTypeLatest;
+    'Option<DoubleMapTypeLatest>': Option<DoubleMapTypeLatest>;
+    'Vec<DoubleMapTypeLatest>': Vec<DoubleMapTypeLatest>;
+    EventMetadataLatest: EventMetadataLatest;
+    'Option<EventMetadataLatest>': Option<EventMetadataLatest>;
+    'Vec<EventMetadataLatest>': Vec<EventMetadataLatest>;
+    ExtrinsicMetadataLatest: ExtrinsicMetadataLatest;
+    'Option<ExtrinsicMetadataLatest>': Option<ExtrinsicMetadataLatest>;
+    'Vec<ExtrinsicMetadataLatest>': Vec<ExtrinsicMetadataLatest>;
+    FunctionArgumentMetadataLatest: FunctionArgumentMetadataLatest;
+    'Option<FunctionArgumentMetadataLatest>': Option<FunctionArgumentMetadataLatest>;
+    'Vec<FunctionArgumentMetadataLatest>': Vec<FunctionArgumentMetadataLatest>;
+    FunctionMetadataLatest: FunctionMetadataLatest;
+    'Option<FunctionMetadataLatest>': Option<FunctionMetadataLatest>;
+    'Vec<FunctionMetadataLatest>': Vec<FunctionMetadataLatest>;
+    MapTypeLatest: MapTypeLatest;
+    'Option<MapTypeLatest>': Option<MapTypeLatest>;
+    'Vec<MapTypeLatest>': Vec<MapTypeLatest>;
+    MetadataLatest: MetadataLatest;
+    'Option<MetadataLatest>': Option<MetadataLatest>;
+    'Vec<MetadataLatest>': Vec<MetadataLatest>;
+    ModuleConstantMetadataLatest: ModuleConstantMetadataLatest;
+    'Option<ModuleConstantMetadataLatest>': Option<ModuleConstantMetadataLatest>;
+    'Vec<ModuleConstantMetadataLatest>': Vec<ModuleConstantMetadataLatest>;
+    ModuleMetadataLatest: ModuleMetadataLatest;
+    'Option<ModuleMetadataLatest>': Option<ModuleMetadataLatest>;
+    'Vec<ModuleMetadataLatest>': Vec<ModuleMetadataLatest>;
+    PlainTypeLatest: PlainTypeLatest;
+    'Option<PlainTypeLatest>': Option<PlainTypeLatest>;
+    'Vec<PlainTypeLatest>': Vec<PlainTypeLatest>;
+    StorageEntryMetadataLatest: StorageEntryMetadataLatest;
+    'Option<StorageEntryMetadataLatest>': Option<StorageEntryMetadataLatest>;
+    'Vec<StorageEntryMetadataLatest>': Vec<StorageEntryMetadataLatest>;
+    StorageEntryModifierLatest: StorageEntryModifierLatest;
+    'Option<StorageEntryModifierLatest>': Option<StorageEntryModifierLatest>;
+    'Vec<StorageEntryModifierLatest>': Vec<StorageEntryModifierLatest>;
+    StorageEntryTypeLatest: StorageEntryTypeLatest;
+    'Option<StorageEntryTypeLatest>': Option<StorageEntryTypeLatest>;
+    'Vec<StorageEntryTypeLatest>': Vec<StorageEntryTypeLatest>;
+    StorageMetadataLatest: StorageMetadataLatest;
+    'Option<StorageMetadataLatest>': Option<StorageMetadataLatest>;
+    'Vec<StorageMetadataLatest>': Vec<StorageMetadataLatest>;
+    StorageHasher: StorageHasher;
+    'Option<StorageHasher>': Option<StorageHasher>;
+    'Vec<StorageHasher>': Vec<StorageHasher>;
+    MetadataAll: MetadataAll;
+    'Option<MetadataAll>': Option<MetadataAll>;
+    'Vec<MetadataAll>': Vec<MetadataAll>;
+    RpcMethods: RpcMethods;
+    'Option<RpcMethods>': Option<RpcMethods>;
+    'Vec<RpcMethods>': Vec<RpcMethods>;
+    ExtrinsicOrHash: ExtrinsicOrHash;
+    'Option<ExtrinsicOrHash>': Option<ExtrinsicOrHash>;
+    'Vec<ExtrinsicOrHash>': Vec<ExtrinsicOrHash>;
+    ExtrinsicStatus: ExtrinsicStatus;
+    'Option<ExtrinsicStatus>': Option<ExtrinsicStatus>;
+    'Vec<ExtrinsicStatus>': Vec<ExtrinsicStatus>;
+    BlockHash: BlockHash;
+    'Option<BlockHash>': Option<BlockHash>;
+    'Vec<BlockHash>': Vec<BlockHash>;
+    PrefixedStorageKey: PrefixedStorageKey;
+    'Option<PrefixedStorageKey>': Option<PrefixedStorageKey>;
+    'Vec<PrefixedStorageKey>': Vec<PrefixedStorageKey>;
+    StorageKind: StorageKind;
+    'Option<StorageKind>': Option<StorageKind>;
+    'Vec<StorageKind>': Vec<StorageKind>;
+    RuntimeDispatchInfo: RuntimeDispatchInfo;
+    'Option<RuntimeDispatchInfo>': Option<RuntimeDispatchInfo>;
+    'Vec<RuntimeDispatchInfo>': Vec<RuntimeDispatchInfo>;
+    ApiId: ApiId;
+    'Option<ApiId>': Option<ApiId>;
+    'Vec<ApiId>': Vec<ApiId>;
+    KeyValueOption: KeyValueOption;
+    'Option<KeyValueOption>': Option<KeyValueOption>;
+    'Vec<KeyValueOption>': Vec<KeyValueOption>;
+    ReadProof: ReadProof;
+    'Option<ReadProof>': Option<ReadProof>;
+    'Vec<ReadProof>': Vec<ReadProof>;
+    RuntimeVersionApi: RuntimeVersionApi;
+    'Option<RuntimeVersionApi>': Option<RuntimeVersionApi>;
+    'Vec<RuntimeVersionApi>': Vec<RuntimeVersionApi>;
+    RuntimeVersion: RuntimeVersion;
+    'Option<RuntimeVersion>': Option<RuntimeVersion>;
+    'Vec<RuntimeVersion>': Vec<RuntimeVersion>;
+    StorageChangeSet: StorageChangeSet;
+    'Option<StorageChangeSet>': Option<StorageChangeSet>;
+    'Vec<StorageChangeSet>': Vec<StorageChangeSet>;
+    MemoText: MemoText;
+    'Option<MemoText>': Option<MemoText>;
+    'Vec<MemoText>': Vec<MemoText>;
+    Credential: Credential;
+    'Compact<Credential>': Compact<Credential>;
+    'Option<Credential>': Option<Credential>;
+    'Vec<Credential>': Vec<Credential>;
+    CredentialSet: CredentialSet;
+    'Option<CredentialSet>': Option<CredentialSet>;
+    'Vec<CredentialSet>': Vec<CredentialSet>;
+    BlockAndTime: BlockAndTime;
+    'Option<BlockAndTime>': Option<BlockAndTime>;
+    'Vec<BlockAndTime>': Vec<BlockAndTime>;
+    ThreadId: ThreadId;
+    'Compact<ThreadId>': Compact<ThreadId>;
+    'Option<ThreadId>': Option<ThreadId>;
+    'Vec<ThreadId>': Vec<ThreadId>;
+    PostId: PostId;
+    'Compact<PostId>': Compact<PostId>;
+    'Option<PostId>': Option<PostId>;
+    'Vec<PostId>': Vec<PostId>;
+    InputValidationLengthConstraint: InputValidationLengthConstraint;
+    'Option<InputValidationLengthConstraint>': Option<InputValidationLengthConstraint>;
+    'Vec<InputValidationLengthConstraint>': Vec<InputValidationLengthConstraint>;
+    WorkingGroup: WorkingGroup;
+    'Option<WorkingGroup>': Option<WorkingGroup>;
+    'Vec<WorkingGroup>': Vec<WorkingGroup>;
+    SlashingTerms: SlashingTerms;
+    'Option<SlashingTerms>': Option<SlashingTerms>;
+    'Vec<SlashingTerms>': Vec<SlashingTerms>;
+    SlashableTerms: SlashableTerms;
+    'Option<SlashableTerms>': Option<SlashableTerms>;
+    'Vec<SlashableTerms>': Vec<SlashableTerms>;
+    EntryMethod: EntryMethod;
+    'Option<EntryMethod>': Option<EntryMethod>;
+    'Vec<EntryMethod>': Vec<EntryMethod>;
+    MemberId: MemberId;
+    'Compact<MemberId>': Compact<MemberId>;
+    'Option<MemberId>': Option<MemberId>;
+    'Vec<MemberId>': Vec<MemberId>;
+    PaidTermId: PaidTermId;
+    'Compact<PaidTermId>': Compact<PaidTermId>;
+    'Option<PaidTermId>': Option<PaidTermId>;
+    'Vec<PaidTermId>': Vec<PaidTermId>;
+    SubscriptionId: SubscriptionId;
+    'Compact<SubscriptionId>': Compact<SubscriptionId>;
+    'Option<SubscriptionId>': Option<SubscriptionId>;
+    'Vec<SubscriptionId>': Vec<SubscriptionId>;
+    Membership: Membership;
+    'Option<Membership>': Option<Membership>;
+    'Vec<Membership>': Vec<Membership>;
+    PaidMembershipTerms: PaidMembershipTerms;
+    'Option<PaidMembershipTerms>': Option<PaidMembershipTerms>;
+    'Vec<PaidMembershipTerms>': Vec<PaidMembershipTerms>;
+    ActorId: ActorId;
+    'Compact<ActorId>': Compact<ActorId>;
+    'Option<ActorId>': Option<ActorId>;
+    'Vec<ActorId>': Vec<ActorId>;
+    ElectionStage: ElectionStage;
+    'Option<ElectionStage>': Option<ElectionStage>;
+    'Vec<ElectionStage>': Vec<ElectionStage>;
+    ElectionStake: ElectionStake;
+    'Option<ElectionStake>': Option<ElectionStake>;
+    'Vec<ElectionStake>': Vec<ElectionStake>;
+    SealedVote: SealedVote;
+    'Option<SealedVote>': Option<SealedVote>;
+    'Vec<SealedVote>': Vec<SealedVote>;
+    TransferableStake: TransferableStake;
+    'Option<TransferableStake>': Option<TransferableStake>;
+    'Vec<TransferableStake>': Vec<TransferableStake>;
+    ElectionParameters: ElectionParameters;
+    'Option<ElectionParameters>': Option<ElectionParameters>;
+    'Vec<ElectionParameters>': Vec<ElectionParameters>;
+    Seat: Seat;
+    'Option<Seat>': Option<Seat>;
+    'Vec<Seat>': Vec<Seat>;
+    Seats: Seats;
+    'Option<Seats>': Option<Seats>;
+    'Vec<Seats>': Vec<Seats>;
+    Backer: Backer;
+    'Option<Backer>': Option<Backer>;
+    'Vec<Backer>': Vec<Backer>;
+    Backers: Backers;
+    'Option<Backers>': Option<Backers>;
+    'Vec<Backers>': Vec<Backers>;
+    RoleParameters: RoleParameters;
+    'Option<RoleParameters>': Option<RoleParameters>;
+    'Vec<RoleParameters>': Vec<RoleParameters>;
+    PostTextChange: PostTextChange;
+    'Option<PostTextChange>': Option<PostTextChange>;
+    'Vec<PostTextChange>': Vec<PostTextChange>;
+    ModerationAction: ModerationAction;
+    'Option<ModerationAction>': Option<ModerationAction>;
+    'Vec<ModerationAction>': Vec<ModerationAction>;
+    ChildPositionInParentCategory: ChildPositionInParentCategory;
+    'Option<ChildPositionInParentCategory>': Option<ChildPositionInParentCategory>;
+    'Vec<ChildPositionInParentCategory>': Vec<ChildPositionInParentCategory>;
+    CategoryId: CategoryId;
+    'Compact<CategoryId>': Compact<CategoryId>;
+    'Option<CategoryId>': Option<CategoryId>;
+    'Vec<CategoryId>': Vec<CategoryId>;
+    Category: Category;
+    'Option<Category>': Option<Category>;
+    'Vec<Category>': Vec<Category>;
+    Thread: Thread;
+    'Option<Thread>': Option<Thread>;
+    'Vec<Thread>': Vec<Thread>;
+    Post: Post;
+    'Option<Post>': Option<Post>;
+    'Vec<Post>': Vec<Post>;
+    ReplyId: ReplyId;
+    'Compact<ReplyId>': Compact<ReplyId>;
+    'Option<ReplyId>': Option<ReplyId>;
+    'Vec<ReplyId>': Vec<ReplyId>;
+    Reply: Reply;
+    'Option<Reply>': Option<Reply>;
+    'Vec<Reply>': Vec<Reply>;
+    StakeId: StakeId;
+    'Compact<StakeId>': Compact<StakeId>;
+    'Option<StakeId>': Option<StakeId>;
+    'Vec<StakeId>': Vec<StakeId>;
+    Stake: Stake;
+    'Option<Stake>': Option<Stake>;
+    'Vec<Stake>': Vec<Stake>;
+    StakingStatus: StakingStatus;
+    'Option<StakingStatus>': Option<StakingStatus>;
+    'Vec<StakingStatus>': Vec<StakingStatus>;
+    Staked: Staked;
+    'Option<Staked>': Option<Staked>;
+    'Vec<Staked>': Vec<Staked>;
+    StakedStatus: StakedStatus;
+    'Option<StakedStatus>': Option<StakedStatus>;
+    'Vec<StakedStatus>': Vec<StakedStatus>;
+    Unstaking: Unstaking;
+    'Option<Unstaking>': Option<Unstaking>;
+    'Vec<Unstaking>': Vec<Unstaking>;
+    Slash: Slash;
+    'Option<Slash>': Option<Slash>;
+    'Vec<Slash>': Vec<Slash>;
+    MintId: MintId;
+    'Compact<MintId>': Compact<MintId>;
+    'Option<MintId>': Option<MintId>;
+    'Vec<MintId>': Vec<MintId>;
+    Mint: Mint;
+    'Option<Mint>': Option<Mint>;
+    'Vec<Mint>': Vec<Mint>;
+    MintBalanceOf: MintBalanceOf;
+    'Option<MintBalanceOf>': Option<MintBalanceOf>;
+    'Vec<MintBalanceOf>': Vec<MintBalanceOf>;
+    BalanceOfMint: BalanceOfMint;
+    'Option<BalanceOfMint>': Option<BalanceOfMint>;
+    'Vec<BalanceOfMint>': Vec<BalanceOfMint>;
+    NextAdjustment: NextAdjustment;
+    'Option<NextAdjustment>': Option<NextAdjustment>;
+    'Vec<NextAdjustment>': Vec<NextAdjustment>;
+    AdjustOnInterval: AdjustOnInterval;
+    'Option<AdjustOnInterval>': Option<AdjustOnInterval>;
+    'Vec<AdjustOnInterval>': Vec<AdjustOnInterval>;
+    AdjustCapacityBy: AdjustCapacityBy;
+    'Option<AdjustCapacityBy>': Option<AdjustCapacityBy>;
+    'Vec<AdjustCapacityBy>': Vec<AdjustCapacityBy>;
+    RecipientId: RecipientId;
+    'Compact<RecipientId>': Compact<RecipientId>;
+    'Option<RecipientId>': Option<RecipientId>;
+    'Vec<RecipientId>': Vec<RecipientId>;
+    RewardRelationshipId: RewardRelationshipId;
+    'Compact<RewardRelationshipId>': Compact<RewardRelationshipId>;
+    'Option<RewardRelationshipId>': Option<RewardRelationshipId>;
+    'Vec<RewardRelationshipId>': Vec<RewardRelationshipId>;
+    Recipient: Recipient;
+    'Option<Recipient>': Option<Recipient>;
+    'Vec<Recipient>': Vec<Recipient>;
+    RewardRelationship: RewardRelationship;
+    'Option<RewardRelationship>': Option<RewardRelationship>;
+    'Vec<RewardRelationship>': Vec<RewardRelationship>;
+    ApplicationId: ApplicationId;
+    'Compact<ApplicationId>': Compact<ApplicationId>;
+    'Option<ApplicationId>': Option<ApplicationId>;
+    'Vec<ApplicationId>': Vec<ApplicationId>;
+    OpeningId: OpeningId;
+    'Compact<OpeningId>': Compact<OpeningId>;
+    'Option<OpeningId>': Option<OpeningId>;
+    'Vec<OpeningId>': Vec<OpeningId>;
+    Application: Application;
+    'Option<Application>': Option<Application>;
+    'Vec<Application>': Vec<Application>;
+    ApplicationStage: ApplicationStage;
+    'Option<ApplicationStage>': Option<ApplicationStage>;
+    'Vec<ApplicationStage>': Vec<ApplicationStage>;
+    ActivateOpeningAt: ActivateOpeningAt;
+    'Option<ActivateOpeningAt>': Option<ActivateOpeningAt>;
+    'Vec<ActivateOpeningAt>': Vec<ActivateOpeningAt>;
+    ApplicationRationingPolicy: ApplicationRationingPolicy;
+    'Option<ApplicationRationingPolicy>': Option<ApplicationRationingPolicy>;
+    'Vec<ApplicationRationingPolicy>': Vec<ApplicationRationingPolicy>;
+    OpeningStage: OpeningStage;
+    'Option<OpeningStage>': Option<OpeningStage>;
+    'Vec<OpeningStage>': Vec<OpeningStage>;
+    StakingPolicy: StakingPolicy;
+    'Option<StakingPolicy>': Option<StakingPolicy>;
+    'Vec<StakingPolicy>': Vec<StakingPolicy>;
+    Opening: Opening;
+    'Option<Opening>': Option<Opening>;
+    'Vec<Opening>': Vec<Opening>;
+    WaitingToBeingOpeningStageVariant: WaitingToBeingOpeningStageVariant;
+    'Option<WaitingToBeingOpeningStageVariant>': Option<WaitingToBeingOpeningStageVariant>;
+    'Vec<WaitingToBeingOpeningStageVariant>': Vec<WaitingToBeingOpeningStageVariant>;
+    ActiveOpeningStageVariant: ActiveOpeningStageVariant;
+    'Option<ActiveOpeningStageVariant>': Option<ActiveOpeningStageVariant>;
+    'Vec<ActiveOpeningStageVariant>': Vec<ActiveOpeningStageVariant>;
+    ActiveOpeningStage: ActiveOpeningStage;
+    'Option<ActiveOpeningStage>': Option<ActiveOpeningStage>;
+    'Vec<ActiveOpeningStage>': Vec<ActiveOpeningStage>;
+    AcceptingApplications: AcceptingApplications;
+    'Option<AcceptingApplications>': Option<AcceptingApplications>;
+    'Vec<AcceptingApplications>': Vec<AcceptingApplications>;
+    ReviewPeriod: ReviewPeriod;
+    'Option<ReviewPeriod>': Option<ReviewPeriod>;
+    'Vec<ReviewPeriod>': Vec<ReviewPeriod>;
+    Deactivated: Deactivated;
+    'Option<Deactivated>': Option<Deactivated>;
+    'Vec<Deactivated>': Vec<Deactivated>;
+    OpeningDeactivationCause: OpeningDeactivationCause;
+    'Option<OpeningDeactivationCause>': Option<OpeningDeactivationCause>;
+    'Vec<OpeningDeactivationCause>': Vec<OpeningDeactivationCause>;
+    InactiveApplicationStage: InactiveApplicationStage;
+    'Option<InactiveApplicationStage>': Option<InactiveApplicationStage>;
+    'Vec<InactiveApplicationStage>': Vec<InactiveApplicationStage>;
+    UnstakingApplicationStage: UnstakingApplicationStage;
+    'Option<UnstakingApplicationStage>': Option<UnstakingApplicationStage>;
+    'Vec<UnstakingApplicationStage>': Vec<UnstakingApplicationStage>;
+    ApplicationDeactivationCause: ApplicationDeactivationCause;
+    'Option<ApplicationDeactivationCause>': Option<ApplicationDeactivationCause>;
+    'Vec<ApplicationDeactivationCause>': Vec<ApplicationDeactivationCause>;
+    StakingAmountLimitMode: StakingAmountLimitMode;
+    'Option<StakingAmountLimitMode>': Option<StakingAmountLimitMode>;
+    'Vec<StakingAmountLimitMode>': Vec<StakingAmountLimitMode>;
+    ClassId: ClassId;
+    'Compact<ClassId>': Compact<ClassId>;
+    'Option<ClassId>': Option<ClassId>;
+    'Vec<ClassId>': Vec<ClassId>;
+    EntityId: EntityId;
+    'Compact<EntityId>': Compact<EntityId>;
+    'Option<EntityId>': Option<EntityId>;
+    'Vec<EntityId>': Vec<EntityId>;
+    Class: Class;
+    'Option<Class>': Option<Class>;
+    'Vec<Class>': Vec<Class>;
+    Entity: Entity;
+    'Option<Entity>': Option<Entity>;
+    'Vec<Entity>': Vec<Entity>;
+    ClassSchema: ClassSchema;
+    'Option<ClassSchema>': Option<ClassSchema>;
+    'Vec<ClassSchema>': Vec<ClassSchema>;
+    Property: Property;
+    'Option<Property>': Option<Property>;
+    'Vec<Property>': Vec<Property>;
+    PropertyType: PropertyType;
+    'Option<PropertyType>': Option<PropertyType>;
+    'Vec<PropertyType>': Vec<PropertyType>;
+    PropertyValue: PropertyValue;
+    'Option<PropertyValue>': Option<PropertyValue>;
+    'Vec<PropertyValue>': Vec<PropertyValue>;
+    ClassPropertyValue: ClassPropertyValue;
+    'Option<ClassPropertyValue>': Option<ClassPropertyValue>;
+    'Vec<ClassPropertyValue>': Vec<ClassPropertyValue>;
+    EntityPermissions: EntityPermissions;
+    'Option<EntityPermissions>': Option<EntityPermissions>;
+    'Vec<EntityPermissions>': Vec<EntityPermissions>;
+    ReferenceConstraint: ReferenceConstraint;
+    'Option<ReferenceConstraint>': Option<ReferenceConstraint>;
+    'Vec<ReferenceConstraint>': Vec<ReferenceConstraint>;
+    ClassPermissionsType: ClassPermissionsType;
+    'Option<ClassPermissionsType>': Option<ClassPermissionsType>;
+    'Vec<ClassPermissionsType>': Vec<ClassPermissionsType>;
+    Operation: Operation;
+    'Option<Operation>': Option<Operation>;
+    'Vec<Operation>': Vec<Operation>;
+    OperationType: OperationType;
+    'Option<OperationType>': Option<OperationType>;
+    'Vec<OperationType>': Vec<OperationType>;
+    CreateEntity: CreateEntity;
+    'Option<CreateEntity>': Option<CreateEntity>;
+    'Vec<CreateEntity>': Vec<CreateEntity>;
+    UpdatePropertyValues: UpdatePropertyValues;
+    'Option<UpdatePropertyValues>': Option<UpdatePropertyValues>;
+    'Vec<UpdatePropertyValues>': Vec<UpdatePropertyValues>;
+    AddSchemaSupportToEntity: AddSchemaSupportToEntity;
+    'Option<AddSchemaSupportToEntity>': Option<AddSchemaSupportToEntity>;
+    'Vec<AddSchemaSupportToEntity>': Vec<AddSchemaSupportToEntity>;
+    ParametrizedEntity: ParametrizedEntity;
+    'Option<ParametrizedEntity>': Option<ParametrizedEntity>;
+    'Vec<ParametrizedEntity>': Vec<ParametrizedEntity>;
+    ParametrizedClassPropertyValue: ParametrizedClassPropertyValue;
+    'Option<ParametrizedClassPropertyValue>': Option<ParametrizedClassPropertyValue>;
+    'Vec<ParametrizedClassPropertyValue>': Vec<ParametrizedClassPropertyValue>;
+    ParametrizedPropertyValue: ParametrizedPropertyValue;
+    'Option<ParametrizedPropertyValue>': Option<ParametrizedPropertyValue>;
+    'Vec<ParametrizedPropertyValue>': Vec<ParametrizedPropertyValue>;
+    PropertyOfClass: PropertyOfClass;
+    'Option<PropertyOfClass>': Option<PropertyOfClass>;
+    'Vec<PropertyOfClass>': Vec<PropertyOfClass>;
+    ChannelId: ChannelId;
+    'Compact<ChannelId>': Compact<ChannelId>;
+    'Option<ChannelId>': Option<ChannelId>;
+    'Vec<ChannelId>': Vec<ChannelId>;
+    CuratorId: CuratorId;
+    'Compact<CuratorId>': Compact<CuratorId>;
+    'Option<CuratorId>': Option<CuratorId>;
+    'Vec<CuratorId>': Vec<CuratorId>;
+    CuratorOpeningId: CuratorOpeningId;
+    'Compact<CuratorOpeningId>': Compact<CuratorOpeningId>;
+    'Option<CuratorOpeningId>': Option<CuratorOpeningId>;
+    'Vec<CuratorOpeningId>': Vec<CuratorOpeningId>;
+    CuratorApplicationId: CuratorApplicationId;
+    'Compact<CuratorApplicationId>': Compact<CuratorApplicationId>;
+    'Option<CuratorApplicationId>': Option<CuratorApplicationId>;
+    'Vec<CuratorApplicationId>': Vec<CuratorApplicationId>;
+    LeadId: LeadId;
+    'Compact<LeadId>': Compact<LeadId>;
+    'Option<LeadId>': Option<LeadId>;
+    'Vec<LeadId>': Vec<LeadId>;
+    PrincipalId: PrincipalId;
+    'Compact<PrincipalId>': Compact<PrincipalId>;
+    'Option<PrincipalId>': Option<PrincipalId>;
+    'Vec<PrincipalId>': Vec<PrincipalId>;
+    OptionalText: OptionalText;
+    'Option<OptionalText>': Option<OptionalText>;
+    'Vec<OptionalText>': Vec<OptionalText>;
+    Channel: Channel;
+    'Option<Channel>': Option<Channel>;
+    'Vec<Channel>': Vec<Channel>;
+    ChannelContentType: ChannelContentType;
+    'Option<ChannelContentType>': Option<ChannelContentType>;
+    'Vec<ChannelContentType>': Vec<ChannelContentType>;
+    ChannelCurationStatus: ChannelCurationStatus;
+    'Option<ChannelCurationStatus>': Option<ChannelCurationStatus>;
+    'Vec<ChannelCurationStatus>': Vec<ChannelCurationStatus>;
+    ChannelPublicationStatus: ChannelPublicationStatus;
+    'Option<ChannelPublicationStatus>': Option<ChannelPublicationStatus>;
+    'Vec<ChannelPublicationStatus>': Vec<ChannelPublicationStatus>;
+    CurationActor: CurationActor;
+    'Option<CurationActor>': Option<CurationActor>;
+    'Vec<CurationActor>': Vec<CurationActor>;
+    Curator: Curator;
+    'Option<Curator>': Option<Curator>;
+    'Vec<Curator>': Vec<Curator>;
+    CuratorApplication: CuratorApplication;
+    'Option<CuratorApplication>': Option<CuratorApplication>;
+    'Vec<CuratorApplication>': Vec<CuratorApplication>;
+    CuratorOpening: CuratorOpening;
+    'Option<CuratorOpening>': Option<CuratorOpening>;
+    'Vec<CuratorOpening>': Vec<CuratorOpening>;
+    Lead: Lead;
+    'Option<Lead>': Option<Lead>;
+    'Vec<Lead>': Vec<Lead>;
+    OpeningPolicyCommitment: OpeningPolicyCommitment;
+    'Option<OpeningPolicyCommitment>': Option<OpeningPolicyCommitment>;
+    'Vec<OpeningPolicyCommitment>': Vec<OpeningPolicyCommitment>;
+    Principal: Principal;
+    'Option<Principal>': Option<Principal>;
+    'Vec<Principal>': Vec<Principal>;
+    WorkingGroupUnstaker: WorkingGroupUnstaker;
+    'Option<WorkingGroupUnstaker>': Option<WorkingGroupUnstaker>;
+    'Vec<WorkingGroupUnstaker>': Vec<WorkingGroupUnstaker>;
+    CuratorApplicationIdToCuratorIdMap: CuratorApplicationIdToCuratorIdMap;
+    'Option<CuratorApplicationIdToCuratorIdMap>': Option<CuratorApplicationIdToCuratorIdMap>;
+    'Vec<CuratorApplicationIdToCuratorIdMap>': Vec<CuratorApplicationIdToCuratorIdMap>;
+    CuratorApplicationIdSet: CuratorApplicationIdSet;
+    'Option<CuratorApplicationIdSet>': Option<CuratorApplicationIdSet>;
+    'Vec<CuratorApplicationIdSet>': Vec<CuratorApplicationIdSet>;
+    CuratorRoleStakeProfile: CuratorRoleStakeProfile;
+    'Option<CuratorRoleStakeProfile>': Option<CuratorRoleStakeProfile>;
+    'Vec<CuratorRoleStakeProfile>': Vec<CuratorRoleStakeProfile>;
+    CuratorRoleStage: CuratorRoleStage;
+    'Option<CuratorRoleStage>': Option<CuratorRoleStage>;
+    'Vec<CuratorRoleStage>': Vec<CuratorRoleStage>;
+    CuratorExitSummary: CuratorExitSummary;
+    'Option<CuratorExitSummary>': Option<CuratorExitSummary>;
+    'Vec<CuratorExitSummary>': Vec<CuratorExitSummary>;
+    CuratorExitInitiationOrigin: CuratorExitInitiationOrigin;
+    'Option<CuratorExitInitiationOrigin>': Option<CuratorExitInitiationOrigin>;
+    'Vec<CuratorExitInitiationOrigin>': Vec<CuratorExitInitiationOrigin>;
+    LeadRoleState: LeadRoleState;
+    'Option<LeadRoleState>': Option<LeadRoleState>;
+    'Vec<LeadRoleState>': Vec<LeadRoleState>;
+    ExitedLeadRole: ExitedLeadRole;
+    'Option<ExitedLeadRole>': Option<ExitedLeadRole>;
+    'Vec<ExitedLeadRole>': Vec<ExitedLeadRole>;
+    CuratorInduction: CuratorInduction;
+    'Option<CuratorInduction>': Option<CuratorInduction>;
+    'Vec<CuratorInduction>': Vec<CuratorInduction>;
+    RationaleText: RationaleText;
+    'Option<RationaleText>': Option<RationaleText>;
+    'Vec<RationaleText>': Vec<RationaleText>;
+    ApplicationOf: ApplicationOf;
+    'Option<ApplicationOf>': Option<ApplicationOf>;
+    'Vec<ApplicationOf>': Vec<ApplicationOf>;
+    ApplicationIdSet: ApplicationIdSet;
+    'Option<ApplicationIdSet>': Option<ApplicationIdSet>;
+    'Vec<ApplicationIdSet>': Vec<ApplicationIdSet>;
+    ApplicationIdToWorkerIdMap: ApplicationIdToWorkerIdMap;
+    'Option<ApplicationIdToWorkerIdMap>': Option<ApplicationIdToWorkerIdMap>;
+    'Vec<ApplicationIdToWorkerIdMap>': Vec<ApplicationIdToWorkerIdMap>;
+    WorkerId: WorkerId;
+    'Compact<WorkerId>': Compact<WorkerId>;
+    'Option<WorkerId>': Option<WorkerId>;
+    'Vec<WorkerId>': Vec<WorkerId>;
+    WorkerOf: WorkerOf;
+    'Option<WorkerOf>': Option<WorkerOf>;
+    'Vec<WorkerOf>': Vec<WorkerOf>;
+    OpeningOf: OpeningOf;
+    'Option<OpeningOf>': Option<OpeningOf>;
+    'Vec<OpeningOf>': Vec<OpeningOf>;
+    StorageProviderId: StorageProviderId;
+    'Compact<StorageProviderId>': Compact<StorageProviderId>;
+    'Option<StorageProviderId>': Option<StorageProviderId>;
+    'Vec<StorageProviderId>': Vec<StorageProviderId>;
+    OpeningType: OpeningType;
+    'Option<OpeningType>': Option<OpeningType>;
+    'Vec<OpeningType>': Vec<OpeningType>;
+    HiringApplicationId: HiringApplicationId;
+    'Compact<HiringApplicationId>': Compact<HiringApplicationId>;
+    'Option<HiringApplicationId>': Option<HiringApplicationId>;
+    'Vec<HiringApplicationId>': Vec<HiringApplicationId>;
+    RewardPolicy: RewardPolicy;
+    'Option<RewardPolicy>': Option<RewardPolicy>;
+    'Vec<RewardPolicy>': Vec<RewardPolicy>;
+    WorkingGroupOpeningPolicyCommitment: WorkingGroupOpeningPolicyCommitment;
+    'Option<WorkingGroupOpeningPolicyCommitment>': Option<WorkingGroupOpeningPolicyCommitment>;
+    'Vec<WorkingGroupOpeningPolicyCommitment>': Vec<WorkingGroupOpeningPolicyCommitment>;
+    RoleStakeProfile: RoleStakeProfile;
+    'Option<RoleStakeProfile>': Option<RoleStakeProfile>;
+    'Vec<RoleStakeProfile>': Vec<RoleStakeProfile>;
+    Url: Url;
+    'Option<Url>': Option<Url>;
+    'Vec<Url>': Vec<Url>;
+    IPNSIdentity: IPNSIdentity;
+    'Option<IPNSIdentity>': Option<IPNSIdentity>;
+    'Vec<IPNSIdentity>': Vec<IPNSIdentity>;
+    ServiceProviderRecord: ServiceProviderRecord;
+    'Option<ServiceProviderRecord>': Option<ServiceProviderRecord>;
+    'Vec<ServiceProviderRecord>': Vec<ServiceProviderRecord>;
+    ContentId: ContentId;
+    'Option<ContentId>': Option<ContentId>;
+    'Vec<ContentId>': Vec<ContentId>;
+    LiaisonJudgement: LiaisonJudgement;
+    'Option<LiaisonJudgement>': Option<LiaisonJudgement>;
+    'Vec<LiaisonJudgement>': Vec<LiaisonJudgement>;
+    DataObject: DataObject;
+    'Option<DataObject>': Option<DataObject>;
+    'Vec<DataObject>': Vec<DataObject>;
+    DataObjectStorageRelationshipId: DataObjectStorageRelationshipId;
+    'Compact<DataObjectStorageRelationshipId>': Compact<DataObjectStorageRelationshipId>;
+    'Option<DataObjectStorageRelationshipId>': Option<DataObjectStorageRelationshipId>;
+    'Vec<DataObjectStorageRelationshipId>': Vec<DataObjectStorageRelationshipId>;
+    DataObjectStorageRelationship: DataObjectStorageRelationship;
+    'Option<DataObjectStorageRelationship>': Option<DataObjectStorageRelationship>;
+    'Vec<DataObjectStorageRelationship>': Vec<DataObjectStorageRelationship>;
+    DataObjectTypeId: DataObjectTypeId;
+    'Compact<DataObjectTypeId>': Compact<DataObjectTypeId>;
+    'Option<DataObjectTypeId>': Option<DataObjectTypeId>;
+    'Vec<DataObjectTypeId>': Vec<DataObjectTypeId>;
+    DataObjectType: DataObjectType;
+    'Option<DataObjectType>': Option<DataObjectType>;
+    'Vec<DataObjectType>': Vec<DataObjectType>;
+    DataObjectsMap: DataObjectsMap;
+    'Option<DataObjectsMap>': Option<DataObjectsMap>;
+    'Vec<DataObjectsMap>': Vec<DataObjectsMap>;
+    ProposalId: ProposalId;
+    'Compact<ProposalId>': Compact<ProposalId>;
+    'Option<ProposalId>': Option<ProposalId>;
+    'Vec<ProposalId>': Vec<ProposalId>;
+    ProposalStatus: ProposalStatus;
+    'Option<ProposalStatus>': Option<ProposalStatus>;
+    'Vec<ProposalStatus>': Vec<ProposalStatus>;
+    ProposalOf: ProposalOf;
+    'Option<ProposalOf>': Option<ProposalOf>;
+    'Vec<ProposalOf>': Vec<ProposalOf>;
+    ProposalDetails: ProposalDetails;
+    'Option<ProposalDetails>': Option<ProposalDetails>;
+    'Vec<ProposalDetails>': Vec<ProposalDetails>;
+    ProposalDetailsOf: ProposalDetailsOf;
+    'Option<ProposalDetailsOf>': Option<ProposalDetailsOf>;
+    'Vec<ProposalDetailsOf>': Vec<ProposalDetailsOf>;
+    VotingResults: VotingResults;
+    'Option<VotingResults>': Option<VotingResults>;
+    'Vec<VotingResults>': Vec<VotingResults>;
+    ProposalParameters: ProposalParameters;
+    'Option<ProposalParameters>': Option<ProposalParameters>;
+    'Vec<ProposalParameters>': Vec<ProposalParameters>;
+    VoteKind: VoteKind;
+    'Option<VoteKind>': Option<VoteKind>;
+    'Vec<VoteKind>': Vec<VoteKind>;
+    ThreadCounter: ThreadCounter;
+    'Option<ThreadCounter>': Option<ThreadCounter>;
+    'Vec<ThreadCounter>': Vec<ThreadCounter>;
+    DiscussionThread: DiscussionThread;
+    'Option<DiscussionThread>': Option<DiscussionThread>;
+    'Vec<DiscussionThread>': Vec<DiscussionThread>;
+    DiscussionPost: DiscussionPost;
+    'Option<DiscussionPost>': Option<DiscussionPost>;
+    'Vec<DiscussionPost>': Vec<DiscussionPost>;
+    AddOpeningParameters: AddOpeningParameters;
+    'Option<AddOpeningParameters>': Option<AddOpeningParameters>;
+    'Vec<AddOpeningParameters>': Vec<AddOpeningParameters>;
+    FillOpeningParameters: FillOpeningParameters;
+    'Option<FillOpeningParameters>': Option<FillOpeningParameters>;
+    'Vec<FillOpeningParameters>': Vec<FillOpeningParameters>;
+    TerminateRoleParameters: TerminateRoleParameters;
+    'Option<TerminateRoleParameters>': Option<TerminateRoleParameters>;
+    'Vec<TerminateRoleParameters>': Vec<TerminateRoleParameters>;
+    ActiveStake: ActiveStake;
+    'Option<ActiveStake>': Option<ActiveStake>;
+    'Vec<ActiveStake>': Vec<ActiveStake>;
+    Finalized: Finalized;
+    'Option<Finalized>': Option<Finalized>;
+    'Vec<Finalized>': Vec<Finalized>;
+    ProposalDecisionStatus: ProposalDecisionStatus;
+    'Option<ProposalDecisionStatus>': Option<ProposalDecisionStatus>;
+    'Vec<ProposalDecisionStatus>': Vec<ProposalDecisionStatus>;
+    ExecutionFailed: ExecutionFailed;
+    'Option<ExecutionFailed>': Option<ExecutionFailed>;
+    'Vec<ExecutionFailed>': Vec<ExecutionFailed>;
+    Approved: Approved;
+    'Option<Approved>': Option<Approved>;
+    'Vec<Approved>': Vec<Approved>;
+    SetLeadParams: SetLeadParams;
+    'Option<SetLeadParams>': Option<SetLeadParams>;
+    'Vec<SetLeadParams>': Vec<SetLeadParams>;
+  }
+}
diff --git a/types/augment/definitions.ts b/types/augment/definitions.ts
new file mode 100644
index 0000000000..35d81ee3ef
--- /dev/null
+++ b/types/augment/definitions.ts
@@ -0,0 +1 @@
+export { default as all } from './all/definitions'
diff --git a/types/augment/index.ts b/types/augment/index.ts
new file mode 100644
index 0000000000..2d307291c3
--- /dev/null
+++ b/types/augment/index.ts
@@ -0,0 +1,4 @@
+// Auto-generated via `yarn polkadot-types-from-defs`, do not edit
+/* eslint-disable */
+
+export * from './types';
diff --git a/types/augment/types.ts b/types/augment/types.ts
new file mode 100644
index 0000000000..aa1dd5e43d
--- /dev/null
+++ b/types/augment/types.ts
@@ -0,0 +1,4 @@
+// Auto-generated via `yarn polkadot-types-from-defs`, do not edit
+/* eslint-disable */
+
+export * from './all/types';
diff --git a/types/package.json b/types/package.json
index 0bf23c3dcb..4836d49dbd 100644
--- a/types/package.json
+++ b/types/package.json
@@ -9,10 +9,14 @@
     "build": "tsc --build tsconfig.json",
     "lint": "eslint ./ --quiet --ext .ts",
     "format": "prettier ./ --write",
-    "checks": "yarn build && madge --circular ./ && yarn lint && prettier ./ --check",
-    "generate:defs": "ts-node node_modules/.bin/polkadot-types-from-defs --package ./src --input ./src/definitions",
-    "update:augment-types": "tsc --build tsconfig-scripts.json && node ./src/scripts/updateAugmentTypes.js",
-    "print:typedef": "tsc --build tsconfig-scripts.json && node ./src/scripts/defsFromTypes.js"
+    "check:augment": "tsc --build tsconfig-augment.json && tsc --build tsconfig-augment-codec.json",
+    "checks": "yarn build && madge --circular ./ && yarn lint && prettier ./ --check && yarn check:augment",
+    "generate:defs": "ts-node node_modules/.bin/polkadot-types-from-defs --package . --input ./augment",
+    "generate:meta": "ts-node node_modules/.bin/polkadot-types-from-chain --package . --endpoint ws://127.0.0.1:9944 --output ./augment --strict",
+    "generate:codec-defs": "ts-node ./src/scripts/generateCodecDefs.ts",
+    "generate:registry-json": "ts-node ./src/scripts/generateRegistryJson.ts",
+    "generate:augment": "yarn generate:registry-json && yarn generate:defs && yarn generate:meta",
+    "generate:all": "yarn generate:augment && yarn generate:codec-defs"
   },
   "author": "Joystream contributors",
   "maintainers": [],
diff --git a/types/src/JoyEnum.ts b/types/src/JoyEnum.ts
index 4598eb5018..147a230a15 100644
--- a/types/src/JoyEnum.ts
+++ b/types/src/JoyEnum.ts
@@ -31,12 +31,16 @@ export function JoyEnum<Types extends Record<string, Constructor>>(types: Types)
     ) {
       return new JoyEnumObject(registry, { [typeKey]: value })
     }
+
+    // eslint-disable-next-line no-useless-constructor
     constructor(registry: Registry, value?: any, index?: number) {
       super(registry, value, index)
     }
+
     public isOfType(typeKey: keyof Types) {
       return this.type === typeKey
     }
+
     public asType<TypeKey extends keyof Types>(typeKey: TypeKey) {
       if (!this.isOfType(typeKey)) {
         throw new Error(`Enum.asType(${typeKey}) - value is not of type ${typeKey}`)
diff --git a/types/src/JoyStruct.ts b/types/src/JoyStruct.ts
index 582b9e4230..7d83438015 100644
--- a/types/src/JoyStruct.ts
+++ b/types/src/JoyStruct.ts
@@ -42,15 +42,19 @@ export function JoyStructCustom<FieldTypes extends Record<string, Constructor>>(
   fields: FieldTypes
 ): ExtendedStructConstructor<FieldTypes> {
   return class JoyStructObject extends Struct.with(fields) {
+    // eslint-disable-next-line no-useless-constructor
     constructor(registry: Registry, value?: { [k in keyof FieldTypes]: InstanceType<FieldTypes[k]> }) {
       super(registry, value)
     }
+
     getField<FieldKey extends keyof FieldTypes>(key: FieldKey): InstanceType<FieldTypes[FieldKey]> {
       return this.get(key as string) as InstanceType<FieldTypes[FieldKey]>
     }
+
     getString<FieldKey extends keyof FieldTypes>(key: FieldKey): string {
       return this.getField(key).toString()
     }
+
     // TODO: Check why would this ever be needed
     cloneValues(): { [k in keyof FieldTypes]: FieldTypes[k] } {
       const objectClone = {} as Partial<{ [k in keyof FieldTypes]: Codec }>
diff --git a/types/src/common.ts b/types/src/common.ts
index 4914811d4e..c1ddb30149 100644
--- a/types/src/common.ts
+++ b/types/src/common.ts
@@ -61,7 +61,7 @@ export type InputValidationLengthConstraintType = {
 export class InputValidationLengthConstraint extends JoyStructDecorated({ min: u16, max_min_diff: u16 })
   implements InputValidationLengthConstraintType {
   get max(): u16 {
-    return new u16(this.registry, this.min.add(this.max_min_diff))
+    return this.registry.createType('u16', this.min.add(this.max_min_diff))
   }
 }
 
diff --git a/types/src/content-working-group/index.ts b/types/src/content-working-group/index.ts
index 6cf2dfa598..eaddb032b9 100644
--- a/types/src/content-working-group/index.ts
+++ b/types/src/content-working-group/index.ts
@@ -175,7 +175,7 @@ export class Curator
   }
 
   get is_active(): boolean {
-    return this.stage.type == CuratorRoleStageKeys.Active
+    return this.stage.isOfType('Active')
   }
 }
 
@@ -197,6 +197,7 @@ export class CuratorApplication
   get role_account_id(): AccountId {
     return this.role_account
   }
+
   // Helper for working-group compatibility
   get opening_id(): CuratorOpeningId {
     return this.curator_opening_id
@@ -325,6 +326,7 @@ export const contentWorkingGroupTypes = {
   CuratorRoleStage,
   CuratorExitSummary,
   CuratorExitInitiationOrigin,
+  LeadRoleState,
   ExitedLeadRole,
   CuratorInduction,
 }
diff --git a/types/src/definitions/definitions.ts b/types/src/definitions/definitions.ts
deleted file mode 100644
index 9cbb7a973c..0000000000
--- a/types/src/definitions/definitions.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// We can put our types definitions here in the future (in order to use @polkadot/typegen)
-export {}
diff --git a/types/src/forum.ts b/types/src/forum.ts
index 770dd101ed..9f931108e0 100644
--- a/types/src/forum.ts
+++ b/types/src/forum.ts
@@ -144,7 +144,7 @@ export class Category extends JoyStructCustom({
   }
 
   get num_threads_created(): u32 {
-    return new u32(this.registry, this.num_direct_unmoderated_threads.add(this.num_direct_moderated_threads))
+    return this.registry.createType('u32', this.num_direct_unmoderated_threads.add(this.num_direct_moderated_threads))
   }
 
   get hasSubcategories(): boolean {
@@ -236,7 +236,7 @@ export class Thread extends JoyStructCustom({
   }
 
   get num_posts_ever_created(): u32 {
-    return new u32(this.registry, this.num_unmoderated_posts.add(this.num_moderated_posts))
+    return this.registry.createType('u32', this.num_unmoderated_posts.add(this.num_moderated_posts))
   }
 
   get created_at(): BlockAndTime {
diff --git a/types/src/hiring/index.ts b/types/src/hiring/index.ts
index 9c2be810b8..5ba083f432 100644
--- a/types/src/hiring/index.ts
+++ b/types/src/hiring/index.ts
@@ -6,7 +6,7 @@ import { StakeId } from '../stake'
 
 import { GenericJoyStreamRoleSchema } from './schemas/role.schema.typings'
 
-import ajv from 'ajv'
+import Ajv from 'ajv'
 
 import * as role_schema_json from './schemas/role.schema.json'
 import { RegistryTypes } from '@polkadot/types/types'
@@ -220,7 +220,7 @@ export class StakingPolicy
     review_period_expired_unstaking_period_length: Option.with(u32),
   })
   implements IStakingPolicy {}
-export const schemaValidator: ajv.ValidateFunction = new ajv({ allErrors: true }).compile(role_schema_json)
+export const schemaValidator: Ajv.ValidateFunction = new Ajv({ allErrors: true }).compile(role_schema_json)
 
 const OpeningHRTFallback: GenericJoyStreamRoleSchema = {
   version: 1,
@@ -355,6 +355,7 @@ export const hiringTypes: RegistryTypes = {
   InactiveApplicationStage,
   UnstakingApplicationStage,
   ApplicationDeactivationCause,
+  StakingAmountLimitMode,
 }
 
 export default hiringTypes
diff --git a/types/src/mint/index.ts b/types/src/mint/index.ts
index c2c1d080d2..461bb125bf 100644
--- a/types/src/mint/index.ts
+++ b/types/src/mint/index.ts
@@ -53,7 +53,6 @@ export const mintTypes: RegistryTypes = {
   Mint,
   MintBalanceOf: 'Balance',
   BalanceOfMint: 'Balance',
-  'minting::BalanceOf': 'Balance',
   // Expose in registry for api.createType purposes:
   NextAdjustment,
   AdjustOnInterval,
diff --git a/types/src/proposals.ts b/types/src/proposals.ts
index a70ab6df0e..c6ff7a9b6f 100644
--- a/types/src/proposals.ts
+++ b/types/src/proposals.ts
@@ -153,7 +153,7 @@ export class ProposalId extends u32 {}
 
 export class SpendingParams extends Tuple.with(['Balance', 'AccountId']) {}
 
-class SetLeadParams extends Tuple.with([MemberId, AccountId]) {}
+export class SetLeadParams extends Tuple.with([MemberId, AccountId]) {}
 
 export class SetLead extends Option.with(SetLeadParams) {}
 
@@ -287,9 +287,11 @@ export const proposalsTypes = {
   TerminateRoleParameters,
   // Expose in registry for api.createType purposes:
   ActiveStake,
-  FinalizationData,
+  Finalized,
   ProposalDecisionStatus,
   ExecutionFailed,
+  Approved,
+  SetLeadParams,
 }
 
 export default proposalsTypes
diff --git a/types/src/scripts/defsFromTypes.ts b/types/src/scripts/defsFromTypes.ts
deleted file mode 100644
index 78b3704e87..0000000000
--- a/types/src/scripts/defsFromTypes.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-// Conversion of Joystream types into @polkadot/typegen compatible RegistryTypes object
-// (will require a few additonal tweaks to work, currently just logs the output in the console)
-
-import { types } from '../index'
-import { Constructor, Codec, RegistryTypes, Registry } from '@polkadot/types/types'
-import { TypeRegistry } from '@polkadot/types'
-
-function normalizeDef(registry: Registry, defOrConstructor: any, typeName: string) {
-  if (typeof defOrConstructor === 'string') {
-    return defOrConstructor
-  } else if (typeof defOrConstructor === 'function') {
-    const defString = new (defOrConstructor as Constructor<Codec>)(registry).toRawType().toString()
-    try {
-      const obj = JSON.parse(defString)
-      // def is an object:
-      return obj
-    } catch (e) {
-      // def if just a type name:
-      return defString
-    }
-  }
-
-  throw new Error(`Unkown type entry for ${typeName} found in registry!`)
-}
-
-async function defsFromTypes() {
-  const registry = new TypeRegistry()
-  registry.setKnownTypes({ types })
-  registry.register(types)
-  const defs: RegistryTypes = {}
-  Object.entries(registry.knownTypes.types as any).forEach(([typeName, defOrConstructor]) => {
-    const def = normalizeDef(registry, defOrConstructor, typeName)
-    defs[typeName] = def
-  })
-
-  return defs
-}
-
-defsFromTypes()
-  .then((defs) => console.log(defs))
-  .catch(console.error)
diff --git a/types/src/scripts/updateAugmentTypes.ts b/types/src/scripts/generateCodecDefs.ts
similarity index 63%
rename from types/src/scripts/updateAugmentTypes.ts
rename to types/src/scripts/generateCodecDefs.ts
index 52e3cd90d8..400c295eaa 100644
--- a/types/src/scripts/updateAugmentTypes.ts
+++ b/types/src/scripts/generateCodecDefs.ts
@@ -1,4 +1,5 @@
-// Adds Joystream types to /definitions/augment-types.ts allowing better api.createType TS support
+// Creates /augment-codec/augment-types.ts file with api augmentation that allows
+// creating custom Joystream "Codec types" with api.createType
 
 import common from '../common'
 import members from '../members'
@@ -18,6 +19,11 @@ import media from '../media'
 import proposals from '../proposals'
 import fs from 'fs'
 import path from 'path'
+import * as defaultDefinitions from '@polkadot/types/interfaces/definitions'
+import { generateInterfaceTypes } from '@polkadot/typegen/generate/interfaceRegistry'
+
+const OUTPUT_PATH = path.join(__dirname, '../../augment-codec/augment-types.ts')
+const IMPORTS_DIR = '..'
 
 const typesByModule = {
   'common': common,
@@ -44,7 +50,10 @@ type AugmentTypes = { [typeName: string]: string }
 const imports: Imports = {}
 const augmentTypes: AugmentTypes = {}
 
-const populateFileByTemplateTag = (fileContent: string, tag: string, lines: string[]) => {
+const CUSTOM_IMPORTS_TAG = 'CUSTOMIMPORTS'
+const CUSTOM_TYPES_TAG = 'CUSTOMTYPES'
+
+const populateFileByTemplateTag = (fileContent: string, tag: string, insertLines: string[]) => {
   const fileLines = fileContent.split('\n')
   const startIndex = fileLines.findIndex((line) => line.includes(`/** ${tag} **/`))
   const endIndex = fileLines.findIndex((line) => line.includes(`/** /${tag} **/`))
@@ -53,28 +62,49 @@ const populateFileByTemplateTag = (fileContent: string, tag: string, lines: stri
     throw new Error(`populateFileByTemplateTag: Invalid tag (${tag})`)
   }
 
-  const whitespaceMatch = fileLines[startIndex].match(/^(\s)+/)
-  const whitespace = whitespaceMatch ? whitespaceMatch[0] : ''
+  const [whitespace] = fileLines[startIndex].match(/^(\s)+/) || ['']
+  fileLines.splice(startIndex + 1, endIndex - (startIndex + 1), ...insertLines.map((line) => `${whitespace}${line}`))
+
+  return fileLines.join('\n')
+}
 
-  fileLines.splice(startIndex + 1, endIndex - (startIndex + 1), ...lines.map((line) => `${whitespace}${line}`))
+const addTagsIfDontExist = (fileContent: string): string => {
+  const fileLines = fileContent.split('\n')
+  // Custom imports
+  if (fileLines.findIndex((line) => line.includes(`/** ${CUSTOM_IMPORTS_TAG} **/`)) === -1) {
+    const firstImportIndex = fileLines.findIndex((line) => line.includes('import'))
+    fileLines.splice(firstImportIndex, 0, `/** ${CUSTOM_IMPORTS_TAG} **/`, `/** /${CUSTOM_IMPORTS_TAG} **/`)
+  }
+  // Custom types
+  if (fileLines.findIndex((line) => line.includes(`/** ${CUSTOM_TYPES_TAG} **/`)) === -1) {
+    const firstTypeIndex = fileLines.findIndex((line) => line.includes('export interface InterfaceTypes')) + 1
+    const [whitespace] = fileLines[firstTypeIndex].match(/^(\s)+/) || ['']
+    fileLines.splice(
+      firstTypeIndex,
+      0,
+      `${whitespace}/** ${CUSTOM_TYPES_TAG} **/`,
+      `${whitespace}/** /${CUSTOM_TYPES_TAG} **/`
+    )
+  }
 
   return fileLines.join('\n')
 }
 
 const updateAugmentTypesFile = (filePath: string, imports: Imports, augmentTypes: AugmentTypes) => {
   let fileContent = fs.readFileSync(filePath).toString()
+  fileContent = addTagsIfDontExist(fileContent)
   fileContent = populateFileByTemplateTag(
     fileContent,
-    'CUSTOMIMPORTS',
+    CUSTOM_IMPORTS_TAG,
     Object.entries(imports).map(
       ([moduleName, importStatements]) =>
         // import as to avoid namespace clashes
-        `import { ${importStatements.join(', ')} } from '../${moduleName}'`
+        `import { ${importStatements.join(', ')} } from '${IMPORTS_DIR}/${moduleName}'`
     )
   )
   fileContent = populateFileByTemplateTag(
     fileContent,
-    'CUSTOMTYPES',
+    CUSTOM_TYPES_TAG,
     Object.entries(augmentTypes).map(([typeName, constructorName]) => `"${typeName}": ${constructorName};`)
   )
 
@@ -87,6 +117,10 @@ const addAugmentTypes = (typeName: string, constructorName: string) => {
   augmentTypes[`Vec<${typeName}>`] = `Vec<${constructorName}>`
 }
 
+console.log('Generating default interface types based on current @polkadot/types definitions...')
+generateInterfaceTypes({ '@polkadot/types/interfaces': defaultDefinitions }, OUTPUT_PATH)
+
+console.log('Adding custom Joystream types...')
 Object.entries(typesByModule).forEach(([moduleName, types]) => {
   console.log('Module: ', moduleName)
   console.log('Types found:', Object.keys(types))
@@ -107,4 +141,4 @@ Object.entries(typesByModule).forEach(([moduleName, types]) => {
   })
 })
 
-updateAugmentTypesFile(path.join(__dirname, '../definitions/augment-types.ts'), imports, augmentTypes)
+updateAugmentTypesFile(OUTPUT_PATH, imports, augmentTypes)
diff --git a/types/src/scripts/generateRegistryJson.ts b/types/src/scripts/generateRegistryJson.ts
new file mode 100644
index 0000000000..a746a0aa5e
--- /dev/null
+++ b/types/src/scripts/generateRegistryJson.ts
@@ -0,0 +1,87 @@
+// Conversion of Joystream types into @polkadot/typegen compatible RegistryTypes json file
+
+import { types } from '../index'
+import { Constructor, Codec, RegistryTypes, Registry } from '@polkadot/types/types'
+import { Struct } from '@polkadot/types/codec'
+import { TypeRegistry } from '@polkadot/types'
+import fs from 'fs'
+import path from 'path'
+
+const OUTPUT_PATH = path.join(__dirname, '../../augment/all/defs.json')
+
+function normalizeDef(registry: Registry, defOrConstructor: any, typeName: string): RegistryTypes[string] {
+  if (typeof defOrConstructor === 'string') {
+    // Replace unhandled BTreeSet with Vec
+    defOrConstructor = defOrConstructor.replace('BTreeSet<', 'Vec<')
+    return defOrConstructor
+  } else if (typeof defOrConstructor === 'function') {
+    const defString = new (defOrConstructor as Constructor<Codec>)(registry).toRawType().toString()
+    let obj: any
+
+    try {
+      obj = JSON.parse(defString)
+    } catch (e) {
+      // def if just a type name:
+      return defString
+    }
+
+    // def is an object:
+    const normalizedObj: any = {}
+    if (obj._enum && Array.isArray(obj._enum)) {
+      // Enum as array - No need to normalize
+      return obj
+    } else if (obj._enum && !Array.isArray(obj._enum)) {
+      // Enum as object - normalize properties
+      normalizedObj._enum = {}
+      Object.entries(obj._enum).forEach(([key, value]) => {
+        const normalizedValue = normalizeDef(registry, value, `${typeName}[${key}]`)
+        if (typeof normalizedValue !== 'string') {
+          throw new Error(
+            `Too many nested definitions in ${typeName} enum. Did you forget to expose some types in the registry?`
+          )
+        }
+        normalizedObj._enum[key] = normalizedValue
+      })
+    } else if (obj._set) {
+      // Set - we don't need those now, but perhaps worth looking into at some point
+      throw new Error('_set definitions are not supported yet!')
+    } else {
+      // Struct - normalize properties
+      const emptyStruct = new Struct(registry, {}) as any
+      for (const [key, value] of Object.entries(obj)) {
+        // Prevent interface clashes
+        // FIXME: Would be way better if this was actually done by @polkadot/typegen tool
+        if (emptyStruct[key] !== undefined) {
+          continue
+        }
+        const normalizedValue = normalizeDef(registry, value, `${typeName}[${key}]`)
+        if (typeof normalizedValue !== 'string') {
+          throw new Error(
+            `Too many nested definitions in ${typeName} struct. Did you forget to expose some types in the registry?`
+          )
+        }
+        normalizedObj[key] = normalizedValue
+      }
+    }
+
+    return normalizedObj
+  }
+
+  throw new Error(`Unkown type entry for ${typeName} found in registry!`)
+}
+
+function defsFromTypes(types: RegistryTypes) {
+  const registry = new TypeRegistry()
+  registry.setKnownTypes({ types })
+  registry.register(types)
+  const defs: RegistryTypes = {}
+  Object.entries(registry.knownTypes.types as any).forEach(([typeName, defOrConstructor]) => {
+    const def = normalizeDef(registry, defOrConstructor, typeName)
+    defs[typeName] = def
+  })
+
+  return defs
+}
+
+const defs = defsFromTypes(types)
+fs.writeFileSync(OUTPUT_PATH, JSON.stringify(defs, undefined, 4))
diff --git a/types/src/stake/index.ts b/types/src/stake/index.ts
index 584da2293b..05b1741421 100644
--- a/types/src/stake/index.ts
+++ b/types/src/stake/index.ts
@@ -80,7 +80,7 @@ export class Stake
       return this.staking_status.asType('Staked').staked_amount
     }
 
-    return new u128(this.registry, 0)
+    return this.registry.createType('Balance', 0)
   }
 }
 
diff --git a/types/src/versioned-store/EntityCodec.ts b/types/src/versioned-store/EntityCodec.ts
index f35f47dd8e..7d0942dc54 100644
--- a/types/src/versioned-store/EntityCodec.ts
+++ b/types/src/versioned-store/EntityCodec.ts
@@ -1,5 +1,5 @@
 import BN from 'bn.js'
-import { Text, bool, Vec, u16 } from '@polkadot/types'
+import { Text, bool, Vec } from '@polkadot/types'
 import { Codec, Registry } from '@polkadot/types/types'
 import { Class, Entity, VecClassPropertyValue, ClassPropertyValue, EntityId, ClassId, unifyPropName } from '.'
 import * as PV from './PropertyValue'
@@ -12,7 +12,7 @@ import ChannelId from '../content-working-group/ChannelId'
  * like string, number, boolean, etc.
  */
 function substrateToPlain<T>(x: Codec): T | undefined {
-  let res: any = undefined
+  let res: any
 
   if (x instanceof PV.None) {
     res = undefined
@@ -262,7 +262,7 @@ export abstract class EntityCodec<T extends PlainEntity> {
             new ClassPropertyValue(
               this.registry, // FIXME: createType?
               {
-                in_class_index: new u16(this.registry, meta.index),
+                in_class_index: this.registry.createType('u16', meta.index),
                 value: codecValue,
               }
             )
diff --git a/types/src/versioned-store/permissions/batching/parametrized-property-value.ts b/types/src/versioned-store/permissions/batching/parametrized-property-value.ts
index 9bfea379b1..8a7296f8a3 100644
--- a/types/src/versioned-store/permissions/batching/parametrized-property-value.ts
+++ b/types/src/versioned-store/permissions/batching/parametrized-property-value.ts
@@ -1,10 +1,9 @@
 import { u32, Vec } from '@polkadot/types'
-import { PropertyValue as VersionedStorePropertyValue, PropertyValueEnumValue } from '../../PropertyValue'
+import { PropertyValue, PropertyValueEnumValue } from '../../PropertyValue'
 import { ParametrizedEntity } from './parametrized-entity'
 import { Registry } from '@polkadot/types/types'
 import { JoyEnum } from '../../../common'
 
-export class PropertyValue extends VersionedStorePropertyValue {}
 export class InternalEntityJustAdded extends u32 {}
 export class InternalEntityVec extends Vec.with(ParametrizedEntity) {}
 
@@ -16,7 +15,7 @@ export const ParametrizedPropertyValueDef = {
 export class ParametrizedPropertyValue extends JoyEnum(ParametrizedPropertyValueDef) {
   // TODO: Are those worth preserving?
   static PropertyValue(registry: Registry, value: PropertyValueEnumValue): ParametrizedPropertyValue {
-    return new ParametrizedPropertyValue(registry, { PropertyValue: new VersionedStorePropertyValue(registry, value) })
+    return new ParametrizedPropertyValue(registry, { PropertyValue: new PropertyValue(registry, value) })
   }
 
   static InternalEntityJustAdded(registry: Registry, index: number | u32): ParametrizedPropertyValue {
diff --git a/types/src/versioned-store/permissions/index.ts b/types/src/versioned-store/permissions/index.ts
index af1215a8e7..f790d46a09 100644
--- a/types/src/versioned-store/permissions/index.ts
+++ b/types/src/versioned-store/permissions/index.ts
@@ -7,6 +7,7 @@ import { ParametrizedEntity } from './batching/parametrized-entity'
 import { RegistryTypes } from '@polkadot/types/types'
 import ParametrizedClassPropertyValue from './batching/ParametrizedClassPropertyValue'
 import { ParametrizedPropertyValue } from './batching/parametrized-property-value'
+import PropertyOfClass from './PropertyOfClass'
 
 export {
   EntityPermissions,
@@ -20,6 +21,7 @@ export {
   ParametrizedEntity,
   ParametrizedClassPropertyValue,
   ParametrizedPropertyValue,
+  PropertyOfClass,
 }
 
 export const versionedStorePermissionsTypes: RegistryTypes = {
@@ -35,6 +37,7 @@ export const versionedStorePermissionsTypes: RegistryTypes = {
   ParametrizedEntity,
   ParametrizedClassPropertyValue,
   ParametrizedPropertyValue,
+  PropertyOfClass,
 }
 
 export default versionedStorePermissionsTypes
diff --git a/types/src/working-group/index.ts b/types/src/working-group/index.ts
index a2e5edce0e..15c2e15ebe 100644
--- a/types/src/working-group/index.ts
+++ b/types/src/working-group/index.ts
@@ -175,8 +175,6 @@ export const workingGroupTypes: RegistryTypes = {
   /// Alias used by the runtime working-group module
   HiringApplicationId: ApplicationId,
   RewardPolicy,
-  'working_group::OpeningId': OpeningId,
-  'working_group::WorkerId': WorkerId,
   // Expose in registry for api.createType purposes:
   WorkingGroupOpeningPolicyCommitment,
   RoleStakeProfile,
diff --git a/types/tsconfig-augment-codec.json b/types/tsconfig-augment-codec.json
new file mode 100644
index 0000000000..e571738842
--- /dev/null
+++ b/types/tsconfig-augment-codec.json
@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig-base.json",
+  "compilerOptions": {
+    "noEmit": true, // No need to actually create any output
+    "paths": {
+      "@polkadot/types/augment": ["augment-codec/augment-types.ts"]
+    }
+  },
+  "include": [
+    "augment-codec/**/*.ts"
+  ]
+}
diff --git a/types/tsconfig-augment.json b/types/tsconfig-augment.json
new file mode 100644
index 0000000000..e44e9d87f3
--- /dev/null
+++ b/types/tsconfig-augment.json
@@ -0,0 +1,13 @@
+{
+  "extends": "./tsconfig-base.json",
+  "compilerOptions": {
+    "noEmit": true, // No need to actually create any output
+    "paths": {
+      "@polkadot/types/augment": ["augment/augment-types.ts"],
+      "@polkadot/api/augment": ["augment/augment-api.ts"]
+    }
+  },
+  "include": [
+    "augment/**/*.ts"
+  ]
+}
diff --git a/types/tsconfig-base.json b/types/tsconfig-base.json
index 43cdbce3a4..d235a17f57 100644
--- a/types/tsconfig-base.json
+++ b/types/tsconfig-base.json
@@ -16,10 +16,7 @@
       "node"
     ],
     "forceConsistentCasingInFileNames": true,
-    "baseUrl": ".",
-    "paths": {
-      "@polkadot/types/augment": ["src/definitions/augment-types.ts"]
-    }
+    "baseUrl": "."
   },
   "exclude": [
     "node_modules",
diff --git a/types/tsconfig-scripts.json b/types/tsconfig-scripts.json
deleted file mode 100644
index cb2cc7ce7d..0000000000
--- a/types/tsconfig-scripts.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "extends": "./tsconfig-base.json",
-  "include": [
-    "src/**/*.ts" // Include all files to make sure they're always up-to-date when running scripts
-  ],
-}

From 673855f7a9d20dfcd999f5a0944f1ced1f0e4e07 Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Thu, 20 Aug 2020 10:27:24 +0200
Subject: [PATCH 10/17] Add joy-proposals as workspace

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ad47384381..ac8c77ea47 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,8 @@
     "pioneer/packages/joy-utils",
     "pioneer/packages/joy-members",
     "pioneer/packages/joy-pages",
-    "pioneer/packages/joy-election"
+    "pioneer/packages/joy-election",
+    "pioneer/packages/joy-proposals"
   ],
   "resolutions": {
     "@polkadot/api": "1.26.1",

From 17933d4c0399da8813ef22589c35cd6bbbc5e96b Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Fri, 21 Aug 2020 12:39:37 +0200
Subject: [PATCH 11/17] Upgrade joy-roles + fix components flow

---
 package.json                                  |   3 +-
 pioneer/.eslintignore                         |   1 -
 pioneer/package.json                          |   6 +-
 pioneer/packages/apps-routing/src/index.ts    |   3 +
 .../apps-routing/src/joy-roles.ts             |  14 +-
 pioneer/packages/apps/webpack.base.config.js  |  11 +
 pioneer/packages/joy-roles/.skip-build        |   0
 pioneer/packages/joy-roles/package.json       |   6 +-
 .../packages/joy-roles/src/balances.spec.ts   |  12 +-
 pioneer/packages/joy-roles/src/balances.ts    |  14 +-
 .../joy-roles/src/classifiers.spec.ts         | 110 +--
 pioneer/packages/joy-roles/src/classifiers.ts |  13 +-
 .../joy-roles/src/flows/apply.controller.tsx  |  79 +-
 .../packages/joy-roles/src/flows/apply.tsx    | 100 +--
 pioneer/packages/joy-roles/src/index.tsx      |  64 +-
 pioneer/packages/joy-roles/src/mocks.ts       |  49 +-
 .../joy-roles/src/tabs/Admin.controller.tsx   | 294 +++----
 .../joy-roles/src/tabs/MyRoles.controller.tsx |  27 +-
 .../src/tabs/MyRoles.elements.stories.tsx     |  41 +-
 .../packages/joy-roles/src/tabs/MyRoles.tsx   |   5 +-
 .../src/tabs/Opportunities.controller.tsx     |  16 +-
 .../tabs/Opportunities.elements.stories.tsx   | 105 ++-
 .../src/tabs/Opportunities.stories.tsx        |  26 +-
 .../joy-roles/src/tabs/Opportunities.tsx      |   6 +-
 .../src/tabs/Opportunity.controller.tsx       |  35 +-
 .../src/tabs/WorkingGroup.controller.tsx      |   8 +-
 .../src/tabs/WorkingGroup.stories.tsx         |  34 +-
 .../joy-roles/src/tabs/WorkingGroup.tsx       |   2 +-
 .../packages/joy-roles/src/transport.mock.ts  | 133 ++-
 .../joy-roles/src/transport.substrate.ts      | 282 +++----
 pioneer/packages/joy-roles/src/transport.ts   |   9 +-
 .../packages/joy-utils-old/src/Loadable.tsx   |  18 -
 pioneer/packages/joy-utils-old/src/View.tsx   |  76 --
 .../src/functions}/accounts.ts                |  23 -
 .../joy-utils/src/react/components/index.tsx  |   7 +
 .../src/react/helpers}/Controller.tsx         |   2 +-
 .../src/react/helpers}/Observable.ts          |   6 +-
 .../src/react/helpers}/Subscribable.ts        |   0
 .../joy-utils/src/react/helpers/index.ts      |   5 +
 .../src/react/helpers}/memoize.ts             |   0
 .../joy-utils/src/react/hocs/Loadable.tsx     |  22 +
 .../joy-utils/src/react/hocs/View.tsx         |  71 ++
 .../joy-utils/src/react/hocs/index.ts         |   2 +
 .../src/transport/mock/base.ts}               |  10 +-
 .../react-components/src/styles/joystream.ts  |   6 +
 pioneer/tsconfig.json                         |  17 +-
 yarn.lock                                     | 771 +++++++++++++++++-
 47 files changed, 1528 insertions(+), 1016 deletions(-)
 rename pioneer/packages/{old-apps => }/apps-routing/src/joy-roles.ts (50%)
 delete mode 100644 pioneer/packages/joy-roles/.skip-build
 delete mode 100644 pioneer/packages/joy-utils-old/src/Loadable.tsx
 delete mode 100644 pioneer/packages/joy-utils-old/src/View.tsx
 rename pioneer/packages/{joy-utils-old/src => joy-utils/src/functions}/accounts.ts (78%)
 rename pioneer/packages/{joy-utils-old/src => joy-utils/src/react/helpers}/Controller.tsx (92%)
 rename pioneer/packages/{joy-utils-old/src => joy-utils/src/react/helpers}/Observable.ts (87%)
 rename pioneer/packages/{joy-utils-old/src => joy-utils/src/react/helpers}/Subscribable.ts (100%)
 rename pioneer/packages/{joy-utils-old/src => joy-utils/src/react/helpers}/memoize.ts (100%)
 create mode 100644 pioneer/packages/joy-utils/src/react/hocs/Loadable.tsx
 create mode 100644 pioneer/packages/joy-utils/src/react/hocs/View.tsx
 create mode 100644 pioneer/packages/joy-utils/src/react/hocs/index.ts
 rename pioneer/packages/{joy-utils-old/src/Transport.ts => joy-utils/src/transport/mock/base.ts} (51%)

diff --git a/package.json b/package.json
index ac8c77ea47..d8f6f4a04e 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,8 @@
     "pioneer/packages/joy-members",
     "pioneer/packages/joy-pages",
     "pioneer/packages/joy-election",
-    "pioneer/packages/joy-proposals"
+    "pioneer/packages/joy-proposals",
+    "pioneer/packages/joy-roles"
   ],
   "resolutions": {
     "@polkadot/api": "1.26.1",
diff --git a/pioneer/.eslintignore b/pioneer/.eslintignore
index 6abdb1d141..293b8583b2 100644
--- a/pioneer/.eslintignore
+++ b/pioneer/.eslintignore
@@ -5,7 +5,6 @@ packages/old-apps/*
 packages/joy-forum/*
 packages/joy-help/*
 packages/joy-media/*
-packages/joy-roles/*
 packages/joy-settings/*
 packages/joy-utils-old/*
 .eslintrc.js
diff --git a/pioneer/package.json b/pioneer/package.json
index b050147ce3..290ee51883 100644
--- a/pioneer/package.json
+++ b/pioneer/package.json
@@ -40,7 +40,7 @@
     "@types/chart.js": "^2.9.23",
     "@types/file-saver": "^2.0.1",
     "@types/i18next": "^13.0.0",
-    "@types/jest": "^26.0.7",
+    "@types/jest": "^26.0.10",
     "@types/react-beautiful-dnd": "^13.0.0",
     "@types/react-copy-to-clipboard": "^4.3.0",
     "@types/react-dom": "^16.9.8",
@@ -78,7 +78,9 @@
     "storybook-react-router": "^1.0.8",
     "typescript": "^3.9.7",
     "eslint-plugin-header": "^3.0.0",
-    "eslint-plugin-sort-destructure-keys": "^1.3.5"
+    "eslint-plugin-sort-destructure-keys": "^1.3.5",
+    "jest": "^26.4.1",
+    "ts-jest": "^26.2.0"
   },
   "dependencies": {
     "@types/lodash": "^4.14.138",
diff --git a/pioneer/packages/apps-routing/src/index.ts b/pioneer/packages/apps-routing/src/index.ts
index 597d45b1a3..55ad59d500 100644
--- a/pioneer/packages/apps-routing/src/index.ts
+++ b/pioneer/packages/apps-routing/src/index.ts
@@ -22,11 +22,13 @@ import members from './joy-members';
 import { terms, privacyPolicy } from './joy-pages';
 import election from './joy-election';
 import proposals from './joy-proposals';
+import roles from './joy-roles';
 
 export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Routes {
   return appSettings.uiMode === 'light'
     ? [
       members(t),
+      roles(t),
       election(t),
       proposals(t),
       null,
@@ -36,6 +38,7 @@ export default function create (t: <T = string> (key: string, text: string, opti
     ]
     : [
       members(t),
+      roles(t),
       election(t),
       proposals(t),
       null,
diff --git a/pioneer/packages/old-apps/apps-routing/src/joy-roles.ts b/pioneer/packages/apps-routing/src/joy-roles.ts
similarity index 50%
rename from pioneer/packages/old-apps/apps-routing/src/joy-roles.ts
rename to pioneer/packages/apps-routing/src/joy-roles.ts
index 7131a2fce8..8664da1e52 100644
--- a/pioneer/packages/old-apps/apps-routing/src/joy-roles.ts
+++ b/pioneer/packages/apps-routing/src/joy-roles.ts
@@ -1,9 +1,9 @@
-import { Routes } from './types';
+import { Route } from './types';
 
 import Roles from '@polkadot/joy-roles/index';
 
-export default ([
-  {
+export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+  return {
     Component: Roles,
     display: {
       needsApi: [
@@ -11,10 +11,8 @@ export default ([
         'query.storageWorkingGroup.mint'
       ]
     },
-    i18n: {
-      defaultValue: 'Working groups'
-    },
+    text: t<string>('nav.roles', 'Working groups', { ns: 'apps-routing' }),
     icon: 'users',
     name: 'working-groups'
-  }
-] as Routes);
+  };
+}
diff --git a/pioneer/packages/apps/webpack.base.config.js b/pioneer/packages/apps/webpack.base.config.js
index c0f79a4010..14d96e3999 100644
--- a/pioneer/packages/apps/webpack.base.config.js
+++ b/pioneer/packages/apps/webpack.base.config.js
@@ -69,6 +69,17 @@ function createWebpack (ENV, context) {
             }
           ]
         },
+        {
+          test: /\.s[ac]ss$/i,
+          use: [
+            // Creates `style` nodes from JS strings
+            'style-loader',
+            // Translates CSS into CommonJS
+            'css-loader',
+            // Compiles Sass to CSS
+            'sass-loader'
+          ]
+        },
         {
           include: /node_modules/,
           test: /\.css$/,
diff --git a/pioneer/packages/joy-roles/.skip-build b/pioneer/packages/joy-roles/.skip-build
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/pioneer/packages/joy-roles/package.json b/pioneer/packages/joy-roles/package.json
index 07bbeba30d..3abbab493e 100644
--- a/pioneer/packages/joy-roles/package.json
+++ b/pioneer/packages/joy-roles/package.json
@@ -11,10 +11,10 @@
   "author": "Joystream contributors",
   "maintainers": [],
   "dependencies": {
-    "@babel/runtime": "^7.7.1",
+    "@babel/runtime": "^7.10.5",
     "@polkadot/joy-utils": "^0.1.1",
-    "@polkadot/react-components": "0.37.0-beta.63",
-    "@polkadot/react-query": "0.37.0-beta.63",
+    "@polkadot/react-components": "0.51.1",
+    "@polkadot/react-query": "0.51.1",
     "@types/faker": "^4.1.8",
     "faker": "^4.1.0",
     "marked": "^0.7.0",
diff --git a/pioneer/packages/joy-roles/src/balances.spec.ts b/pioneer/packages/joy-roles/src/balances.spec.ts
index efd406b784..e586587408 100644
--- a/pioneer/packages/joy-roles/src/balances.spec.ts
+++ b/pioneer/packages/joy-roles/src/balances.spec.ts
@@ -1,12 +1,12 @@
 import { Balance } from '@polkadot/types/interfaces';
-import { u128 } from '@polkadot/types';
+import { createMock } from '@joystream/types';
 import { Avg, AvgDelta, Min, Step, Sum } from './balances';
 
 describe('Balance arithmetic', (): void => {
   it('Can calculate a sum', (): void => {
     const input: Balance[] = [];
     for (let i = 0; i < 10; i++) {
-      input.push(new u128(i));
+      input.push(createMock('u128', i));
     }
 
     expect(Sum(input).toNumber()).toEqual(45);
@@ -15,7 +15,7 @@ describe('Balance arithmetic', (): void => {
   it('Can calculate an average', (): void => {
     const input: Balance[] = [];
     for (let i = 0; i < 10; i++) {
-      input.push(new u128(i));
+      input.push(createMock('u128', i));
     }
 
     expect(Avg(input).toNumber()).toEqual(4);
@@ -24,7 +24,7 @@ describe('Balance arithmetic', (): void => {
   it('Can calculate an average delta', (): void => {
     const input: Balance[] = [];
     for (let i = 0; i < 10; i++) {
-      input.push(new u128(i));
+      input.push(createMock('u128', i));
     }
 
     expect(AvgDelta(input).toNumber()).toEqual(1);
@@ -33,7 +33,7 @@ describe('Balance arithmetic', (): void => {
   it('Can calculate a step value with large numbers', (): void => {
     const input: Balance[] = [];
     for (let i = 0; i < 10; i++) {
-      input.push(new u128(i * 10));
+      input.push(createMock('u128', i * 10));
     }
 
     expect(Step(input).toNumber()).toEqual(4);
@@ -42,7 +42,7 @@ describe('Balance arithmetic', (): void => {
   it('Can calculate a step value with small numbers', (): void => {
     const input: Balance[] = [];
     for (let i = 0; i < 10; i++) {
-      input.push(new u128(i));
+      input.push(createMock('u128', i));
     }
 
     expect(Min(Step(input)).toNumber()).toEqual(1);
diff --git a/pioneer/packages/joy-roles/src/balances.ts b/pioneer/packages/joy-roles/src/balances.ts
index d0c85731ce..5846c7fb0f 100644
--- a/pioneer/packages/joy-roles/src/balances.ts
+++ b/pioneer/packages/joy-roles/src/balances.ts
@@ -1,15 +1,15 @@
 import { Balance } from '@polkadot/types/interfaces';
-import { u128 } from '@polkadot/types';
+import { createMock } from '@joystream/types';
 
-export const Zero = new u128(0);
-export const One = new u128(1);
+export const Zero = createMock('Balance', 0);
+export const One = createMock('Balance', 1);
 
-export const Add = (x: Balance, y: Balance): Balance => new u128(x.add(y));
-export const Sub = (x: Balance, y: Balance): Balance => new u128(x.sub(y));
+export const Add = (x: Balance, y: Balance): Balance => createMock('Balance', x.add(y));
+export const Sub = (x: Balance, y: Balance): Balance => createMock('Balance', x.sub(y));
 export const Sum = (balances: Balance[]): Balance => balances.reduce(Add, Zero);
 
 export const Avg = (xs: Balance[]): Balance =>
-  xs[0] === undefined ? Zero : new u128(Sum(xs).divn(xs.length));
+  xs[0] === undefined ? Zero : createMock('Balance', Sum(xs).divn(xs.length));
 
 export const AvgDelta = (xs: Balance[]): Balance => {
   if (xs.length < 2) {
@@ -28,7 +28,7 @@ export const AvgDelta = (xs: Balance[]): Balance => {
 };
 
 // An average value to 'step' up balances, like on the nudge controls for a slider
-export const Step = (xs: Balance[], ticks = 10): Balance => new u128(Avg(xs).divn(ticks));
+export const Step = (xs: Balance[], ticks = 10): Balance => createMock('Balance', Avg(xs).divn(ticks));
 export const Min = (x: Balance, min: Balance = One): Balance => x.gte(min) ? x : min;
 export const Sort = (xs: Balance[]): Balance[] => {
   xs.sort((a, b): number => {
diff --git a/pioneer/packages/joy-roles/src/classifiers.spec.ts b/pioneer/packages/joy-roles/src/classifiers.spec.ts
index 8d0e18c730..5919ebe246 100644
--- a/pioneer/packages/joy-roles/src/classifiers.spec.ts
+++ b/pioneer/packages/joy-roles/src/classifiers.spec.ts
@@ -1,18 +1,11 @@
-import { Option, Text, u32 } from '@polkadot/types';
-import {
-  AcceptingApplications,
-  ActiveOpeningStage,
-  ApplicationRationingPolicy,
-  StakingPolicy,
-  Opening, OpeningStage,
-  ReviewPeriod
-} from '@joystream/types/hiring';
+import { Opening } from '@joystream/types/hiring';
 
 import {
   OpeningState,
   IBlockQueryer,
   classifyOpeningStage, OpeningStageClassification
 } from './classifiers';
+import { createMock } from '@joystream/types';
 
 class MockBlockQueryer {
   hash: string
@@ -36,8 +29,7 @@ class MockBlockQueryer {
     return this.timestamp;
   }
 
-  // eslint-disable-next-line @typescript-eslint/require-await
-  async expectedBlockTime (): Promise<number> {
+  expectedBlockTime (): number {
     return 6;
   }
 }
@@ -58,18 +50,15 @@ describe('hiring.Opening-> OpeningStageClassification', (): void => {
     {
       description: 'WaitingToBegin',
       input: {
-        opening: new Opening({
-          created: new u32(100),
-          stage: new OpeningStage({
+        opening: createMock('Opening', {
+          created: 100,
+          stage: createMock('OpeningStage', {
             WaitingToBegin: {
-              begins_at_block: new u32(100)
+              begins_at_block: 100
             }
           }),
-          max_review_period_length: new u32(100),
-          application_rationing_policy: new Option(ApplicationRationingPolicy),
-          application_staking_policy: new Option(StakingPolicy),
-          role_staking_policy: new Option(StakingPolicy),
-          human_readable_text: new Text()
+          max_review_period_length: 100,
+          human_readable_text: ''
         }),
         queryer: new MockBlockQueryer('somehash', now)
       },
@@ -83,22 +72,19 @@ describe('hiring.Opening-> OpeningStageClassification', (): void => {
     {
       description: 'Accepting applications',
       input: {
-        opening: new Opening({
-          created: new u32(100),
-          stage: new OpeningStage({
+        opening: createMock('Opening', {
+          created: 100,
+          stage: createMock('OpeningStage', {
             Active: {
-              stage: new ActiveOpeningStage({
-                acceptingApplications: new AcceptingApplications({
-                  started_accepting_applicants_at_block: new u32(100)
-                })
+              stage: createMock('ActiveOpeningStage', {
+                acceptingApplications: {
+                  started_accepting_applicants_at_block: 100
+                }
               })
             }
           }),
-          max_review_period_length: new u32(100),
-          application_rationing_policy: new Option(ApplicationRationingPolicy),
-          application_staking_policy: new Option(StakingPolicy),
-          role_staking_policy: new Option(StakingPolicy),
-          human_readable_text: new Text()
+          max_review_period_length: 100,
+          human_readable_text: ''
         }),
         queryer: new MockBlockQueryer('somehash', now)
       },
@@ -112,23 +98,20 @@ describe('hiring.Opening-> OpeningStageClassification', (): void => {
     {
       description: 'In review period',
       input: {
-        opening: new Opening({
-          created: new u32(100),
-          stage: new OpeningStage({
+        opening: createMock('Opening', {
+          created: 100,
+          stage: createMock('OpeningStage', {
             Active: {
-              stage: new ActiveOpeningStage({
-                reviewPeriod: new ReviewPeriod({
-                  started_accepting_applicants_at_block: new u32(100),
-                  started_review_period_at_block: new u32(100)
-                })
+              stage: createMock('ActiveOpeningStage', {
+                reviewPeriod: {
+                  started_accepting_applicants_at_block: 100,
+                  started_review_period_at_block: 100
+                }
               })
             }
           }),
-          max_review_period_length: new u32(14400),
-          application_rationing_policy: new Option(ApplicationRationingPolicy),
-          application_staking_policy: new Option(StakingPolicy),
-          role_staking_policy: new Option(StakingPolicy),
-          human_readable_text: new Text()
+          max_review_period_length: 14400,
+          human_readable_text: ''
         }),
         queryer: new MockBlockQueryer('somehash', now)
       },
@@ -141,43 +124,6 @@ describe('hiring.Opening-> OpeningStageClassification', (): void => {
         review_end_time: new Date('2020-01-24T11:47:04.433Z')
       }
     }
-    /*
-     * jest is having trouble with the enum type
-    {
-      description: "Deactivated: cancelled",
-      input: {
-        opening: new Opening({
-          created: new u32(100),
-          stage: new OpeningStage({
-            'Active': {
-              stage: new ActiveOpeningStage({
-                reviewPeriod: new Deactivated({
-                  cause: new OpeningDeactivationCause(
-        OpeningDeactivationCauseKeys.CancelledBeforeActivation,
-                  ),
-                  deactivated_at_block: new u32(123),
-                  started_accepting_applicants_at_block: new u32(100),
-                  started_review_period_at_block: new Option(u32, 100),
-                })
-              })
-            }
-          }),
-          max_review_period_length: new u32(100),
-          application_rationing_policy: new Option(ApplicationRationingPolicy),
-          application_staking_policy: new Option(StakingPolicy),
-          role_staking_policy: new Option(StakingPolicy),
-          human_readable_text: new Text(),
-        }),
-        queryer: new MockBlockQueryer("somehash", now),
-      },
-      output: {
-        state: OpeningState.Cancelled,
-        starting_block: 123,
-        starting_block_hash: "somehash",
-        starting_time: now,
-      },
-    },
-    */
   ];
 
   cases.forEach((test: Test) => {
diff --git a/pioneer/packages/joy-roles/src/classifiers.ts b/pioneer/packages/joy-roles/src/classifiers.ts
index e8c4695c5e..4bc2dd7ce4 100644
--- a/pioneer/packages/joy-roles/src/classifiers.ts
+++ b/pioneer/packages/joy-roles/src/classifiers.ts
@@ -1,6 +1,6 @@
 import moment from 'moment';
 
-import { Option, u128 } from '@polkadot/types';
+import { Option } from '@polkadot/types';
 import { Balance } from '@polkadot/types/interfaces';
 
 import {
@@ -25,6 +25,7 @@ import {
   RoleStakeRequirement,
   StakeType
 } from './StakeRequirement';
+import { createMock } from '@joystream/types';
 
 export enum CancelledReason {
   ApplicantCancelled = 0,
@@ -53,7 +54,7 @@ export interface OpeningStageClassification {
 export interface IBlockQueryer {
   blockHash(height: number): Promise<string>;
   blockTimestamp(height: number): Promise<Date>;
-  expectedBlockTime: () => Promise<number>;
+  expectedBlockTime: () => number;
 }
 
 async function classifyActiveOpeningStageAcceptingApplications (
@@ -76,10 +77,8 @@ async function classifyActiveOpeningStageReviewPeriod (
 ): Promise<OpeningStageClassification> {
   const blockNumber = stage.started_review_period_at_block.toNumber();
   const maxReviewLengthInBlocks = opening.max_review_period_length.toNumber();
-  const [startDate, blockTime] = await Promise.all([
-    queryer.blockTimestamp(blockNumber),
-    queryer.expectedBlockTime()
-  ]);
+  const startDate = await queryer.blockTimestamp(blockNumber);
+  const blockTime = queryer.expectedBlockTime();
   const endDate = moment(startDate).add(maxReviewLengthInBlocks * blockTime, 's');
 
   return {
@@ -216,7 +215,7 @@ function classifyStakeRequirement<T extends StakeRequirement> (
   option: Option<StakingPolicy>
 ): T {
   if (option.isNone) {
-    return new constructor(new u128(0));
+    return new constructor(createMock('Balance', 0));
   }
 
   const policy = option.unwrap();
diff --git a/pioneer/packages/joy-roles/src/flows/apply.controller.tsx b/pioneer/packages/joy-roles/src/flows/apply.controller.tsx
index 7455ce0617..88aa5e2dbd 100644
--- a/pioneer/packages/joy-roles/src/flows/apply.controller.tsx
+++ b/pioneer/packages/joy-roles/src/flows/apply.controller.tsx
@@ -1,16 +1,14 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 
 import { formatBalance } from '@polkadot/util';
-import { u128 } from '@polkadot/types';
 import { Balance } from '@polkadot/types/interfaces';
-import AccountId from '@polkadot/types/primitive/Generic/AccountId';
+import AccountId from '@polkadot/types/generic/AccountId';
 
-import { Controller, View } from '@polkadot/joy-utils/index';
+import { Controller } from '@polkadot/joy-utils/react/helpers';
+import { View } from '@polkadot/joy-utils/react/hocs';
 
 import { GenericJoyStreamRoleSchema } from '@joystream/types/hiring/schemas/role.schema.typings';
 
-import { Container } from 'semantic-ui-react';
-
 import { ITransport } from '../transport';
 
 import { keyPairDetails, FlowModal, ProgressSteps } from './apply';
@@ -18,6 +16,7 @@ import { keyPairDetails, FlowModal, ProgressSteps } from './apply';
 import { OpeningStakeAndApplicationStatus } from '../tabs/Opportunities';
 import { Min, Step, Sum } from '../balances';
 import { WorkingGroups, AvailableGroups } from '../working_groups';
+import { createMock } from '@joystream/types';
 
 type State = {
   // Input data from state
@@ -48,14 +47,14 @@ type State = {
 
 const newEmptyState = (): State => {
   return {
-    applicationStake: new u128(0),
-    roleStake: new u128(0),
+    applicationStake: createMock('u128', 0),
+    roleStake: createMock('u128', 0),
     appDetails: {},
     hasError: false,
     transactionDetails: new Map<string, string>(),
     roleKeyNameBase: '',
     roleKeyName: '',
-    txKeyAddress: new AccountId(),
+    txKeyAddress: createMock('AccountId', undefined),
     activeStep: 0,
     txInProgress: false,
     complete: false
@@ -123,6 +122,7 @@ export class ApplyController extends Controller<State, ITransport> {
           this.state.activeStep = this.state.hasConfirmStep
             ? ProgressSteps.ConfirmStakes
             : ProgressSteps.ApplicationDetails;
+          this.state.complete = false;
 
           this.state.roleKeyNameBase = hrt.job.title + ' role key';
 
@@ -224,38 +224,37 @@ export class ApplyController extends Controller<State, ITransport> {
 }
 
 export const ApplyView = View<ApplyController, State>(
-  (state, controller, params) => {
-    controller.findOpening(params.get('id'), params.get('group'));
+  ({ state, controller, params }) => {
+    useEffect(() => {
+      controller.findOpening(params.get('id'), params.get('group'));
+    }, [params.get('id'), params.get('group')])
     return (
-      <Container className="apply-flow">
-        <div className="dimmer"></div>
-        <FlowModal
-          role={state.role!}
-          applications={state.applications!}
-          keypairs={state.keypairs!}
-          hasConfirmStep={state.hasConfirmStep!}
-          step={state.step!}
-          slots={state.slots!}
-          transactionDetails={state.transactionDetails}
-          roleKeyName={state.roleKeyName}
-          prepareApplicationTransaction={(...args) => controller.prepareApplicationTransaction(...args)}
-          makeApplicationTransaction={() => controller.makeApplicationTransaction()}
-          applicationStake={state.applicationStake}
-          setApplicationStake={(v) => controller.setApplicationStake(v)}
-          roleStake={state.roleStake}
-          setRoleStake={(v) => controller.setRoleStake(v)}
-          appDetails={state.appDetails}
-          setAppDetails={(v) => controller.setAppDetails(v)}
-          txKeyAddress={state.txKeyAddress}
-          setTxKeyAddress={(v) => controller.setTxKeyAddress(v)}
-          activeStep={state.activeStep}
-          setActiveStep={(v) => controller.setActiveStep(v)}
-          txInProgress={state.txInProgress}
-          setTxInProgress={(v) => controller.setTxInProgress(v)}
-          complete={state.complete}
-          setComplete={(v) => controller.setComplete(v)}
-        />
-      </Container>
+      <FlowModal
+        role={state.role!}
+        applications={state.applications!}
+        keypairs={state.keypairs!}
+        hasConfirmStep={state.hasConfirmStep!}
+        step={state.step!}
+        slots={state.slots!}
+        transactionDetails={state.transactionDetails}
+        roleKeyName={state.roleKeyName}
+        prepareApplicationTransaction={controller.prepareApplicationTransaction.bind(controller)}
+        makeApplicationTransaction={controller.makeApplicationTransaction.bind(controller)}
+        applicationStake={state.applicationStake}
+        setApplicationStake={controller.setApplicationStake.bind(controller)}
+        roleStake={state.roleStake}
+        setRoleStake={controller.setRoleStake.bind(controller)}
+        appDetails={state.appDetails}
+        setAppDetails={controller.setAppDetails.bind(controller)}
+        txKeyAddress={state.txKeyAddress}
+        setTxKeyAddress={controller.setTxKeyAddress.bind(controller)}
+        activeStep={state.activeStep}
+        setActiveStep={controller.setActiveStep.bind(controller)}
+        txInProgress={state.txInProgress}
+        setTxInProgress={controller.setTxInProgress.bind(controller)}
+        complete={state.complete}
+        setComplete={controller.setComplete.bind(controller)}
+      />
     );
   }
 );
diff --git a/pioneer/packages/joy-roles/src/flows/apply.tsx b/pioneer/packages/joy-roles/src/flows/apply.tsx
index 4d59aa96ed..5a17addfcf 100644
--- a/pioneer/packages/joy-roles/src/flows/apply.tsx
+++ b/pioneer/packages/joy-roles/src/flows/apply.tsx
@@ -3,12 +3,8 @@ import { useHistory, Link } from 'react-router-dom';
 
 import { formatBalance } from '@polkadot/util';
 import { Balance } from '@polkadot/types/interfaces';
-import {
-  GenericAccountId,
-  u128
-} from '@polkadot/types';
 
-import { useMyAccount } from '@polkadot/joy-utils/MyAccountContext';
+import { useMyAccount } from '@polkadot/joy-utils/react/hooks';
 
 import {
   Accordion,
@@ -28,7 +24,7 @@ import {
 } from 'semantic-ui-react';
 
 import Identicon from '@polkadot/react-identicon';
-import AccountId from '@polkadot/types/primitive/Generic/AccountId';
+import AccountId from '@polkadot/types/generic/AccountId';
 
 import {
   GenericJoyStreamRoleSchema,
@@ -44,8 +40,9 @@ import {
 } from '../tabs/Opportunities';
 import { IStakeRequirement } from '../StakeRequirement';
 
-import { Loadable } from '@polkadot/joy-utils/index';
+import { Loadable } from '@polkadot/joy-utils/react/hocs';
 import { Add } from '../balances';
+import { createMock } from '@joystream/types';
 
 type accordionProps = {
   title: string;
@@ -92,6 +89,7 @@ export type keyPairDetails = {
 
 export type FundSourceSelectorProps = {
   keypairs: keyPairDetails[];
+  selected?: AccountId;
   totalStake?: Balance;
 }
 
@@ -105,7 +103,7 @@ export function FundSourceSelector (props: FundSourceSelectorProps & FundSourceC
 
   const onChangeDropdown = (e: any, { value }: any) => {
     if (typeof props.addressCallback !== 'undefined') {
-      props.addressCallback(new GenericAccountId(value));
+      props.addressCallback(createMock('AccountId', value));
     }
   };
 
@@ -115,7 +113,7 @@ export function FundSourceSelector (props: FundSourceSelectorProps & FundSourceC
     }
   };
 
-  props.keypairs.map((v) => {
+  props.keypairs.forEach((v) => {
     if (props.totalStake && v.balance.lt(props.totalStake)) {
       return;
     }
@@ -134,13 +132,6 @@ export function FundSourceSelector (props: FundSourceSelectorProps & FundSourceC
     });
   });
 
-  useEffect(() => {
-    if (pairs.length > 0 && typeof props.addressCallback !== 'undefined') {
-      props.addressCallback(new GenericAccountId(pairs[0].accountId));
-    }
-  }, []);
-
-  const accCtx = useMyAccount();
   let passphraseCallback = null;
   if (props.passphraseCallback) {
     passphraseCallback = (
@@ -164,7 +155,7 @@ export function FundSourceSelector (props: FundSourceSelectorProps & FundSourceC
           selection
           options={pairs}
           onChange={onChangeDropdown}
-          defaultValue={accCtx.state.inited ? accCtx.state.address : undefined}
+          value={props.selected && props.selected.toString()}
         />
       </Form.Field>
       {passphraseCallback}
@@ -211,7 +202,7 @@ export function StakeRankSelector (props: StakeRankSelectorProps) {
   props.slots.forEach(slotStake => props.stake.gt(slotStake.sub(props.otherStake)) && --estimatedSlot);
 
   const changeValue = (e: any, { value }: any) => {
-    const newStake = new u128(value);
+    const newStake = createMock('Balance', value);
     props.setStake(newStake);
   };
 
@@ -584,7 +575,7 @@ export function ConfirmStakes2Up (props: ConfirmStakes2UpProps) {
                 <Label color={valid ? 'green' : 'red'}>
                   <Icon name='times circle' />
                   Your current combined stake
-                  <Label.Detail>{formatBalance(new u128(props.selectedApplicationStake.add(props.selectedRoleStake)))}</Label.Detail>
+                  <Label.Detail>{formatBalance(props.selectedApplicationStake.add(props.selectedRoleStake))}</Label.Detail>
                 </Label>
                 { maxNumberOfApplications > 0 && (
                   <Label color='grey'>
@@ -613,10 +604,10 @@ type StakeRankMiniSelectorProps = {
 function StakeRankMiniSelector (props: StakeRankMiniSelectorProps) {
   const changeValue = (e: any, { value }: any) => {
     if (value < 0) {
-      props.setValue(new u128(0));
+      props.setValue(createMock('Balance', 0));
       return;
     }
-    const newStake = new u128(value);
+    const newStake = createMock('Balance', value);
     props.setValue(newStake);
   };
 
@@ -919,6 +910,7 @@ export const SubmitApplicationStage = (props: SubmitApplicationStageProps) => {
         <Label attached='top'>Source of funds</Label>
         <p>Please select the account that will be used as the source of funds.</p>
         <FundSourceSelector {...props}
+          selected={props.keyAddress}
           addressCallback={props.setKeyAddress}
         />
       </Segment>
@@ -1033,10 +1025,12 @@ export const FlowModal = Loadable<FlowModalProps>(
       complete, setComplete
     } = props;
 
-    const accCtx = useMyAccount();
-    if (txKeyAddress.isEmpty) {
-      setTxKeyAddress(new AccountId(accCtx.state.address));
-    }
+    const accContext = useMyAccount();
+    useEffect(() => {
+      if (txKeyAddress.isEmpty) {
+        setTxKeyAddress(createMock('AccountId', accContext.state.address));
+      }
+    }, [txKeyAddress]);
 
     const history = useHistory();
     const cancel = () => {
@@ -1095,35 +1089,6 @@ export const FlowModal = Loadable<FlowModalProps>(
       setSelectedRoleStake: setRoleStake
     };
 
-    const stages: { [k in ProgressSteps]: JSX.Element } = {
-      [ProgressSteps.ConfirmStakes]: (<ConfirmStakesStage
-        {...props}
-        nextTransition={enterApplicationDetailsState}
-        prevTransition={cancel}
-        {...setStakeProps}
-      />),
-
-      [ProgressSteps.ApplicationDetails]: (<ApplicationDetailsStage
-        setData={setAppDetails}
-        data={appDetails}
-        applicationDetails={props.role.application}
-        nextTransition={enterSubmitApplicationState}
-        prevTransition={() => { props.hasConfirmStep ? enterConfirmStakeState() : cancel(); }}
-      />),
-
-      [ProgressSteps.SubmitApplication]: (<SubmitApplicationStage
-        {...props}
-        nextTransition={enterDoneState}
-        prevTransition={enterApplicationDetailsState}
-        keyAddress={txKeyAddress}
-        setKeyAddress={setTxKeyAddress}
-        transactionDetails={props.transactionDetails}
-        totalStake={Add(applicationStake, roleStake)}
-      />),
-
-      [ProgressSteps.Done]: (<DoneStage {...props} roleKeyName={props.roleKeyName} />)
-    };
-
     const cancelText = complete ? 'Close' : 'Cancel application';
 
     return (
@@ -1147,7 +1112,32 @@ export const FlowModal = Loadable<FlowModalProps>(
           <Grid columns="equal">
             <Grid.Column width={11} className="main">
               <ProgressStepsView activeStep={activeStep} hasConfirmStep={props.hasConfirmStep} />
-              {stages[activeStep]}
+              { activeStep === ProgressSteps.ConfirmStakes && (<ConfirmStakesStage
+                  {...props}
+                  nextTransition={enterApplicationDetailsState}
+                  prevTransition={cancel}
+                  {...setStakeProps}
+                />
+              ) }
+              { activeStep === ProgressSteps.ApplicationDetails && (<ApplicationDetailsStage
+                  setData={setAppDetails}
+                  data={appDetails}
+                  applicationDetails={props.role.application}
+                  nextTransition={enterSubmitApplicationState}
+                  prevTransition={() => { props.hasConfirmStep ? enterConfirmStakeState() : cancel(); }}
+                />
+              ) }
+              { activeStep === ProgressSteps.SubmitApplication && (<SubmitApplicationStage
+                  {...props}
+                  nextTransition={enterDoneState}
+                  prevTransition={enterApplicationDetailsState}
+                  keyAddress={txKeyAddress}
+                  setKeyAddress={setTxKeyAddress}
+                  transactionDetails={props.transactionDetails}
+                  totalStake={Add(applicationStake, roleStake)}
+                />
+               ) }
+              { activeStep === ProgressSteps.Done && (<DoneStage {...props} roleKeyName={props.roleKeyName} />) }
             </Grid.Column>
             <Grid.Column width={5} className="summary">
               <Header as='h3'>{props.role.headline}</Header>
diff --git a/pioneer/packages/joy-roles/src/index.tsx b/pioneer/packages/joy-roles/src/index.tsx
index aeabe4a4df..f5c5de89a8 100644
--- a/pioneer/packages/joy-roles/src/index.tsx
+++ b/pioneer/packages/joy-roles/src/index.tsx
@@ -4,13 +4,11 @@ import { ApiContext } from '@polkadot/react-api';
 import { AppProps, I18nProps } from '@polkadot/react-components/types';
 import { ApiProps } from '@polkadot/react-api/types';
 
-import { Route, Switch, RouteComponentProps } from 'react-router';
+import { Route, Switch } from 'react-router';
 import Tabs from '@polkadot/react-components/Tabs';
 import { withMulti } from '@polkadot/react-api/index';
 import QueueContext from '@polkadot/react-components/Status/Context';
-import { withMyAccount, MyAccountProps } from '@polkadot/joy-utils/MyAccount';
-
-import { ViewComponent } from '@polkadot/joy-utils/index';
+import { withMyAccount, MyAccountProps } from '@polkadot/joy-utils/react/hocs/accounts';
 
 import { Transport } from './transport.substrate';
 
@@ -25,15 +23,6 @@ import './index.sass';
 
 import translate from './translate';
 
-const renderViewComponent = (Component: ViewComponent<any>, props?: RouteComponentProps) => {
-  let params = new Map<string, string>();
-  if (props && props.match.params) {
-    params = new Map<string, string>(Object.entries(props.match.params));
-  }
-
-  return <Component params={params} />;
-};
-
 type Props = AppProps & ApiProps & I18nProps & MyAccountProps
 
 export const App: React.FC<Props> = (props: Props) => {
@@ -53,20 +42,26 @@ export const App: React.FC<Props> = (props: Props) => {
 
   const { api } = useContext(ApiContext);
   const { queueExtrinsic } = useContext(QueueContext);
-  const transport = new Transport(api, queueExtrinsic);
+  const [transport] = useState(() => new Transport(api, queueExtrinsic));
 
-  const [wgCtrl] = useState(new WorkingGroupsController(transport));
-  const oppCtrl = new OpportunityController(transport, props.myMemberId);
-  const oppsCtrl = new OpportunitiesController(transport, props.myMemberId);
-  const [applyCtrl] = useState(new ApplyController(transport));
-  const myRolesCtrl = new MyRolesController(transport, props.myAddress);
-  const [adminCtrl] = useState(new AdminController(transport, api, queueExtrinsic));
+  const [wgCtrl] = useState(() => new WorkingGroupsController(transport));
+  const [oppCtrl] = useState(() => new OpportunityController(transport));
+  const [oppsCtrl] = useState(() => new OpportunitiesController(transport));
+  const [applyCtrl] = useState(() => new ApplyController(transport));
+  const [myRolesCtrl] = useState(() => new MyRolesController(transport));
+  const [adminCtrl] = useState(() => new AdminController(transport, api, queueExtrinsic));
 
   useEffect(() => {
     return () => {
       transport.unsubscribe();
     };
-  });
+  }, []);
+
+  useEffect(() => {
+    oppCtrl.setMemberId(props.myMemberId);
+    oppsCtrl.setMemberId(props.myMemberId);
+    myRolesCtrl.setMyAddress(props.myAddress);
+  }, [props.myMemberId, props.myAddress]);
 
   const { basePath } = props;
 
@@ -86,13 +81,26 @@ export const App: React.FC<Props> = (props: Props) => {
         />
       </header>
       <Switch>
-        <Route path={`${basePath}/opportunities/:group/:id([0-9]+)/apply`} render={(props) => renderViewComponent(ApplyView(applyCtrl), props)} />
-        <Route path={`${basePath}/opportunities/:group/:id([0-9]+)`} render={(props) => renderViewComponent(OpportunityView(oppCtrl), props)} />
-        <Route path={`${basePath}/opportunities/:group/:lead(lead)?`} render={(props) => renderViewComponent(OpportunitiesView(oppsCtrl), props)} />
-        <Route path={`${basePath}/opportunities`} render={() => renderViewComponent(OpportunitiesView(oppsCtrl))} />
-        <Route path={`${basePath}/my-roles`} render={() => renderViewComponent(MyRolesView(myRolesCtrl))} />
-        <Route path={`${basePath}/admin`} render={() => renderViewComponent(AdminView(adminCtrl))} />
-        <Route render={() => renderViewComponent(WorkingGroupsView(wgCtrl))} />
+        <Route
+          path={`${basePath}/opportunities/:group/:id([0-9]+)/apply`}
+          render={(props) => <ApplyView controller={applyCtrl} params={props.match.params}/>} />
+        <Route
+          path={`${basePath}/opportunities/:group/:id([0-9]+)`}
+          render={(props) => <OpportunityView controller={oppCtrl} params={props.match.params}/>} />
+        <Route
+          path={`${basePath}/opportunities/:group/:lead(lead)?`}
+          render={(props) => <OpportunitiesView controller={oppsCtrl} params={props.match.params}/>} />
+        <Route
+          path={`${basePath}/opportunities`}
+          render={(props) => <OpportunitiesView controller={oppsCtrl} params={props.match.params}/>} />
+        <Route
+          path={`${basePath}/my-roles`}
+          render={(props) => <MyRolesView controller={myRolesCtrl} params={props.match.params}/>} />
+        <Route
+          path={`${basePath}/admin`}
+          render={(props) => <AdminView controller={adminCtrl} params={props.match.params}/>} />
+        <Route
+          render={(props) => <WorkingGroupsView controller={wgCtrl} params={props.match.params}/> } />
       </Switch>
     </main>
   );
diff --git a/pioneer/packages/joy-roles/src/mocks.ts b/pioneer/packages/joy-roles/src/mocks.ts
index 1ec3ac28da..b106c93dc4 100644
--- a/pioneer/packages/joy-roles/src/mocks.ts
+++ b/pioneer/packages/joy-roles/src/mocks.ts
@@ -1,41 +1,22 @@
-import { bool, Option, Text, u32, u64, Vec } from '@polkadot/types';
-import AccountId from '@polkadot/types/primitive/Generic/AccountId';
+import { IMembership } from '@joystream/types/members';
 
-import { IMembership, EntryMethod } from '@joystream/types/members';
-
-import {
-  AcceptingApplications,
-  ActiveOpeningStage,
-  OpeningStage,
-  ActiveOpeningStageVariant,
-  ApplicationId
-} from '@joystream/types/hiring';
+import { createMock } from '@joystream/types';
 
 export function mockProfile (name: string, avatar_uri = ''): IMembership {
-  return {
-    handle: new Text(name),
-    avatar_uri: new Text(avatar_uri),
-    about: new Text(''),
-    registered_at_block: new u32(0),
-    registered_at_time: new u64(0),
-    entry: new EntryMethod(),
-    suspended: new bool(false),
-    subscription: new Option(u64),
-    root_account: new AccountId('5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
-    controller_account: new AccountId('5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp')
-  };
+  return createMock('Membership', {
+    handle: name,
+    avatar_uri: avatar_uri,
+    root_account: '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp',
+    controller_account: '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'
+  });
 }
 
-export const mockStage = new OpeningStage({
-  Active: new ActiveOpeningStageVariant({
-    applications_added: new (Vec.with(ApplicationId))([]),
-    active_application_count: new u32(0),
-    unstaking_application_count: new u32(0),
-    deactivated_application_count: new u32(0),
-    stage: new ActiveOpeningStage({
-      AcceptingApplications: new AcceptingApplications({
-        started_accepting_applicants_at_block: new u32(100)
-      })
+export const mockStage = createMock('OpeningStage', {
+  Active: {
+    stage: createMock('ActiveOpeningStage', {
+      AcceptingApplications: {
+        started_accepting_applicants_at_block: 100
+      }
     })
-  })
+  }
 });
diff --git a/pioneer/packages/joy-roles/src/tabs/Admin.controller.tsx b/pioneer/packages/joy-roles/src/tabs/Admin.controller.tsx
index 5a5d40a5cd..92f530f081 100644
--- a/pioneer/packages/joy-roles/src/tabs/Admin.controller.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Admin.controller.tsx
@@ -3,12 +3,12 @@ import { Link } from 'react-router-dom';
 import { formatBalance } from '@polkadot/util';
 
 import { ApiPromise } from '@polkadot/api';
-import { GenericAccountId, Option, Text, Vec, u32, u128 } from '@polkadot/types';
+import { Option, Text, Vec } from '@polkadot/types';
 import { Balance } from '@polkadot/types/interfaces';
 
-import { SingleLinkedMapEntry, Controller, View } from '@polkadot/joy-utils/index';
-import { useMyAccount } from '@polkadot/joy-utils/MyAccountContext';
-import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
+import { Controller } from '@polkadot/joy-utils/react/helpers';
+import { View } from '@polkadot/joy-utils/react/hocs';
+import { useMyAccount } from '@polkadot/joy-utils/react/hooks';
 import { QueueTxExtrinsicAdd } from '@polkadot/react-components/Status/types';
 
 import {
@@ -35,8 +35,6 @@ import {
   Application,
   ApplicationStage,
   ActivateOpeningAt,
-  ApplicationRationingPolicy,
-  CurrentBlock,
   Opening,
   OpeningStage,
   StakingPolicy,
@@ -68,6 +66,7 @@ import {
 } from '../openingStateMarkup';
 
 import { Add, Zero } from '../balances';
+import { createMock } from '@joystream/types';
 
 type ids = {
   curatorId: number;
@@ -110,102 +109,94 @@ type State = {
 }
 
 function newHRT (title: string): Text {
-  return new Text(JSON.stringify({
-    version: 1,
-    headline: 'some headline',
-    job: {
-      title: title,
-      description: 'some job description'
-    },
-    application: {
-      sections: [
-        {
-          title: 'About you',
-          questions: [
-            {
-              title: 'your name',
-              type: 'text'
-            }
-          ]
-        },
-        {
-          title: 'Something else',
-          questions: [
-            {
-              title: 'another thing',
-              type: 'text area'
-            }
-          ]
+  return createMock('Text', JSON.stringify({
+      version: 1,
+      headline: 'some headline',
+      job: {
+        title: title,
+        description: 'some job description'
+      },
+      application: {
+        sections: [
+          {
+            title: 'About you',
+            questions: [
+              {
+                title: 'your name',
+                type: 'text'
+              }
+            ]
+          },
+          {
+            title: 'Something else',
+            questions: [
+              {
+                title: 'another thing',
+                type: 'text area'
+              }
+            ]
+          }
+        ]
+      },
+      reward: '10 JOY per block',
+      creator: {
+        membership: {
+          handle: 'ben'
         }
-      ]
-    },
-    reward: '10 JOY per block',
-    creator: {
-      membership: {
-        handle: 'ben'
+      },
+      process: {
+        details: [
+          'Some custom detail'
+        ]
       }
-    },
-    process: {
-      details: [
-        'Some custom detail'
-      ]
-    }
-  })
+    })
   );
 }
 
 const createRationingPolicyOpt = (maxApplicants: number) =>
-  new Option<ApplicationRationingPolicy>(
-    ApplicationRationingPolicy,
-    new ApplicationRationingPolicy({
-      max_active_applicants: new u32(maxApplicants)
-    })
-  );
+  createMock('Option<ApplicationRationingPolicy>', {
+    max_active_applicants: maxApplicants
+  });
 const createStakingPolicyOpt = (amount: number, amount_mode: StakingAmountLimitMode): Option<StakingPolicy> =>
-  new Option(
-    StakingPolicy,
-    new StakingPolicy({
-      amount: new u128(amount),
-      amount_mode,
-      crowded_out_unstaking_period_length: new Option('BlockNumber', null),
-      review_period_expired_unstaking_period_length: new Option('BlockNumber', null)
-    })
-  );
+  createMock('Option<StakingPolicy>', {
+    amount,
+    amount_mode
+  });
 
-const STAKING_MODE_EXACT = new StakingAmountLimitMode(StakingAmountLimitModeKeys.Exact);
-const STAKING_MODE_AT_LEAST = new StakingAmountLimitMode(StakingAmountLimitModeKeys.AtLeast);
+const STAKING_MODE_EXACT = createMock('StakingAmountLimitMode', StakingAmountLimitModeKeys.Exact);
+const STAKING_MODE_AT_LEAST = createMock('StakingAmountLimitMode', StakingAmountLimitModeKeys.AtLeast);
 
 const stockOpenings: openingDescriptor[] = [
   {
     title: 'Test config A: no application stake, no role stake, no applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999)
+      max_review_period_length: createMock('u32', 99999)
     },
     text: newHRT('Test configuration A')
   },
   {
     title: 'Test config B: no application stake, no role stake, 10 applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999)
+      max_review_period_length: createMock('u32', 99999)
     },
     text: newHRT('Test configuration B')
   },
   {
     title: 'Test config C: fixed application stake (100), no role stake, no applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
+      max_review_period_length: createMock('u32', 99999),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT)
     },
     text: newHRT('Test configuration C')
   },
   {
     title: 'Test config D: fixed application stake (100), no role stake, 10 applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
+      max_review_period_length: createMock('u32', 99999),
       application_rationing_policy: createRationingPolicyOpt(10),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT)
     },
@@ -213,18 +204,18 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config E: no application stake, fixed role stake (100), no applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
+      max_review_period_length: createMock('u32', 99999),
       role_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT)
     },
     text: newHRT('Test configuration E')
   },
   {
     title: 'Test config F: no application stake, fixed role stake (100), 10 applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
+      max_review_period_length: createMock('u32', 99999),
       application_rationing_policy: createRationingPolicyOpt(10),
       role_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT)
     },
@@ -232,18 +223,18 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config G: minimum application stake (100), no role stake, no applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
+      max_review_period_length: createMock('u32', 99999),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST)
     },
     text: newHRT('Test configuration G')
   },
   {
     title: 'Test config H: minimum application stake (100), no role stake, 10 applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
+      max_review_period_length: createMock('u32', 99999),
       application_rationing_policy: createRationingPolicyOpt(10),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST)
     },
@@ -251,18 +242,18 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config I: no application stake, minimum role stake (100), no applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
+      max_review_period_length: createMock('u32', 99999),
       role_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST)
     },
     text: newHRT('Test configuration I')
   },
   {
     title: 'Test config J: no application stake, minimum role stake (100), 10 applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
+      max_review_period_length: createMock('u32', 99999),
       application_rationing_policy: createRationingPolicyOpt(10),
       role_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST)
     },
@@ -270,9 +261,9 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config K: fixed application stake (100), fixed role stake (200), no applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
+      max_review_period_length: createMock('u32', 99999),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_EXACT)
     },
@@ -280,9 +271,9 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config L: fixed application stake (100), fixed role stake (200), 10 applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
+      max_review_period_length: createMock('u32', 99999),
       application_rationing_policy: createRationingPolicyOpt(10),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_EXACT)
@@ -291,9 +282,9 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config M: Minimum application stake (100), minimum role stake (200), no applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
+      max_review_period_length: createMock('u32', 99999),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_AT_LEAST)
     },
@@ -301,9 +292,9 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config N: Minimum application stake (100), minimum role stake (200), 10 applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
+      max_review_period_length: createMock('u32', 99999),
       application_rationing_policy: createRationingPolicyOpt(10),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_AT_LEAST)
@@ -312,9 +303,9 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config O: Fixed application stake (100), minimum role stake (200), no applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
+      max_review_period_length: createMock('u32', 99999),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_AT_LEAST)
     },
@@ -322,15 +313,10 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config P: Fixed application stake (100), minimum role stake (200), 10 applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
-      application_rationing_policy: new Option<ApplicationRationingPolicy>(
-        ApplicationRationingPolicy,
-        new ApplicationRationingPolicy({
-          max_active_applicants: new u32(10)
-        })
-      ),
+      max_review_period_length: createMock('u32', 99999),
+      application_rationing_policy: createRationingPolicyOpt(10),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_AT_LEAST)
     },
@@ -338,9 +324,9 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config Q: Minimum application stake (100), fixed role stake (200), no applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
+      max_review_period_length: createMock('u32', 99999),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_EXACT)
     },
@@ -348,9 +334,9 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config R: Minimum application stake (100), fixed role stake (200), 10 applicant limit',
-    start: new ActivateOpeningAt(CurrentBlock),
+    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: new u32(99999),
+      max_review_period_length: createMock('u32', 99999),
       application_rationing_policy: createRationingPolicyOpt(10),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_EXACT)
@@ -376,21 +362,18 @@ export class AdminController extends Controller<State, ITransport> {
     this.api = api;
     this.queueExtrinsic = queueExtrinsic;
     this.state.currentDescriptor = stockOpenings[0];
-    this.updateState();
+    this.refreshState();
   }
 
-  onTxSuccess = () => { this.updateState(); }
+  onTxSuccess = () => { this.closeModal(); this.refreshState(); }
 
   newOpening (accountId: string, desc: openingDescriptor) {
     const tx = this.api.tx.contentWorkingGroup.addCuratorOpening(
       desc.start,
       desc.policy,
       desc.text
-    ) as unknown as SubmittableExtrinsic;
+    );
 
-    // FIXME: Normally we would keep it open in case of errror, but due to bad design
-    // the values in the form are reset at this point anyway, so there is no point
-    this.closeModal();
     this.queueExtrinsic({ extrinsic: tx, txSuccessCb: this.onTxSuccess, accountId });
   }
 
@@ -408,11 +391,11 @@ export class AdminController extends Controller<State, ITransport> {
     const tx = this.api.tx.contentWorkingGroup.applyOnCuratorOpening(
       membershipIds[0],
       openingId,
-      new GenericAccountId(creatorAddress),
-      new Option(u128, 400),
-      new Option(u128, 400),
-      new Text('This is my application')
-    ) as unknown as SubmittableExtrinsic;
+      creatorAddress,
+      400,
+      400,
+      'This is my application'
+    );
     this.queueExtrinsic({ extrinsic: tx, txSuccessCb: this.onTxSuccess, accountId: creatorAddress });
   }
 
@@ -426,26 +409,21 @@ export class AdminController extends Controller<State, ITransport> {
       openingId,
       applications,
       null
-    ) as unknown as SubmittableExtrinsic;
+    );
     this.queueExtrinsic({ extrinsic: tx, txSuccessCb: this.onTxSuccess, accountId });
   }
 
   protected async profile (id: MemberId): Promise<Membership> {
     const member = (await this.api.query.members.membershipById(id)) as Membership;
-    if (member.handle.isEmpty) {
+    if (member.isEmpty) {
       throw new Error(`Expected member profile not found! (id: ${id.toString()}`);
     }
     return member;
   }
 
   protected async stakeValue (stakeId: StakeId): Promise<Balance> {
-    const stake = new SingleLinkedMapEntry<Stake>(
-      Stake,
-      await this.api.query.stake.stakes(
-        stakeId
-      )
-    );
-    return stake.value.value;
+    const stake = await this.api.query.stake.stakes(stakeId) as Stake;
+    return stake.value;
   }
 
   protected async roleStake (application: Application): Promise<Balance> {
@@ -464,67 +442,49 @@ export class AdminController extends Controller<State, ITransport> {
     return this.stakeValue(application.active_application_staking_id.unwrap());
   }
 
-  async updateState () {
+  async refreshState () {
     this.state.openings = new Map<number, opening>();
 
     const nextOpeningId = await this.api.query.contentWorkingGroup.nextCuratorOpeningId() as CuratorOpeningId;
     for (let i = nextOpeningId.toNumber() - 1; i >= 0; i--) {
-      const curatorOpening = new SingleLinkedMapEntry<CuratorOpening>(
-        CuratorOpening,
-        await this.api.query.contentWorkingGroup.curatorOpeningById(i)
-      );
+      const curatorOpening = await this.api.query.contentWorkingGroup.curatorOpeningById(i) as CuratorOpening;
 
-      const openingId = curatorOpening.value.opening_id;
+      const openingId = curatorOpening.opening_id;
 
-      const baseOpening = new SingleLinkedMapEntry<Opening>(
-        Opening,
-        await this.api.query.hiring.openingById(
-          openingId
-        )
-      );
+      const baseOpening = await this.api.query.hiring.openingById(openingId) as Opening;
 
-      const hrt = baseOpening.value.parse_human_readable_text_with_fallback();
+      const hrt = baseOpening.parse_human_readable_text_with_fallback();
       const title = hrt.job.title;
 
       this.state.openings.set(i, {
         openingId: openingId.toNumber(),
         curatorId: i,
         applications: new Array<application>(),
-        state: baseOpening.value.stage,
+        state: baseOpening.stage,
         title: title,
-        classification: await classifyOpeningStage(this.transport, baseOpening.value)
+        classification: await classifyOpeningStage(this.transport, baseOpening)
       });
     }
 
     const nextAppid = await this.api.query.contentWorkingGroup.nextCuratorApplicationId() as CuratorApplicationId;
     for (let i = 0; i < nextAppid.toNumber(); i++) {
-      const cApplication = new SingleLinkedMapEntry<CuratorApplication>(
-        CuratorApplication,
-        await this.api.query.contentWorkingGroup.curatorApplicationById(i)
-      );
+      const cApplication = await this.api.query.contentWorkingGroup.curatorApplicationById(i) as CuratorApplication;
 
-      const appId = cApplication.value.application_id;
-      const baseApplications = new SingleLinkedMapEntry<Application>(
-        Application,
-        await this.api.query.hiring.applicationById(
-          appId
-        )
-      );
+      const appId = cApplication.application_id;
+      const baseApplications = await this.api.query.hiring.applicationById(appId) as Application;
 
-      const curatorOpening = this.state.openings.get(
-        cApplication.value.curator_opening_id.toNumber()
-      ) as opening;
+      const curatorOpening = this.state.openings.get(cApplication.curator_opening_id.toNumber()) as opening;
 
       curatorOpening.applications.push({
         openingId: appId.toNumber(),
         curatorId: i,
-        stage: baseApplications.value.stage,
-        account: cApplication.value.role_account_id.toString(),
-        memberId: cApplication.value.member_id.toNumber(),
-        profile: (await this.profile(cApplication.value.member_id)),
-        applicationStake: await this.applicationStake(baseApplications.value),
-        roleStake: await this.roleStake(baseApplications.value),
-        application: baseApplications.value
+        stage: baseApplications.stage,
+        account: cApplication.role_account_id.toString(),
+        memberId: cApplication.member_id.toNumber(),
+        profile: (await this.profile(cApplication.member_id)),
+        applicationStake: await this.applicationStake(baseApplications),
+        roleStake: await this.roleStake(baseApplications),
+        application: baseApplications
       });
     }
 
@@ -573,7 +533,7 @@ const AdminContainer = ({ state, controller }: AdminContainerProps) => {
             <Modal
               open={state.modalOpen}
               onClose={() => controller.closeModal()}
-              mountNode={containerRef.current} // Prevent conflicts with tx-modal (after form values reset issue is fixed, see FIXME: above)
+              mountNode={containerRef.current} // Prevent conflicts with tx-modal
             >
               <Modal.Content image>
                 <Modal.Description>
@@ -593,7 +553,7 @@ const AdminContainer = ({ state, controller }: AdminContainerProps) => {
 };
 
 export const AdminView = View<AdminController, State>(
-  (state, controller) => {
+  ({ state, controller }) => {
     return (
       <AdminContainer state={state} controller={controller} />
     );
@@ -627,11 +587,11 @@ const NewOpening = (props: NewOpeningProps) => {
     switch (value) {
       case 'CurrentBlock':
         setShowExactBlock(false);
-        setStart(new ActivateOpeningAt(CurrentBlock));
+        setStart(createMock('ActivateOpeningAt', 'CurrentBlock'));
         break;
 
       case 'ExactBlock':
-        setStart(new ActivateOpeningAt({ ExactBlock: exactBlock }));
+        setStart(createMock('ActivateOpeningAt', { ExactBlock: exactBlock }));
         setShowExactBlock(true);
         break;
     }
@@ -639,7 +599,7 @@ const NewOpening = (props: NewOpeningProps) => {
 
   const onChangeExactBlock = (e: any, { value }: any) => {
     setExactBlock(value);
-    setStart(new ActivateOpeningAt({ ExactBlock: value }));
+    setStart(createMock('ActivateOpeningAt', { ExactBlock: value }));
   };
 
   const [policy, setPolicy] = useState(props.desc.policy);
@@ -709,7 +669,7 @@ const NewOpening = (props: NewOpeningProps) => {
     props.fn({
       start: start,
       policy: policy,
-      text: new Text(text),
+      text: createMock('Text', text),
       title: ''
     });
   };
@@ -738,7 +698,7 @@ const NewOpening = (props: NewOpeningProps) => {
         <Input
           type="number"
           value={policy.max_review_period_length.toNumber()}
-          onChange={(e: any, { value }: any) => onChangePolicyField('max_review_period_length', new u32(value))}
+          onChange={(e: any, { value }: any) => onChangePolicyField('max_review_period_length', createMock('u32', value))}
         />
       </Form.Field>
 
diff --git a/pioneer/packages/joy-roles/src/tabs/MyRoles.controller.tsx b/pioneer/packages/joy-roles/src/tabs/MyRoles.controller.tsx
index a1859810a9..feeffcc603 100644
--- a/pioneer/packages/joy-roles/src/tabs/MyRoles.controller.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/MyRoles.controller.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
 import { Container } from 'semantic-ui-react';
-import { Controller, View } from '@polkadot/joy-utils/index';
+import { Controller } from '@polkadot/joy-utils/react/helpers';
+import { View } from '@polkadot/joy-utils/react/hocs';
 import { ITransport } from '../transport';
 import {
   Applications, OpeningApplication,
@@ -23,13 +24,23 @@ const newEmptyState = (): State => {
 };
 
 export class MyRolesController extends Controller<State, ITransport> {
-  constructor (transport: ITransport, myAddress: string | undefined, initialState: State = newEmptyState()) {
+  constructor (transport: ITransport, initialState: State = newEmptyState()) {
     super(transport, initialState);
+  }
+
+  refreshState() {
+    if (!this.state.myAddress) {
+      return;
+    }
+    // Set actual data
+    this.updateCurationGroupRoles(this.state.myAddress);
+    this.updateApplications(this.state.myAddress);
+  }
 
+  setMyAddress (myAddress: string | undefined) {
     if (typeof myAddress === 'string') {
       this.state.myAddress = myAddress;
-      this.updateCurationGroupRoles(myAddress);
-      this.updateApplications(myAddress);
+      this.refreshState();
     }
   }
 
@@ -54,16 +65,18 @@ export class MyRolesController extends Controller<State, ITransport> {
   }
 
   leaveRole (role: ActiveRole, rationale: string) {
-    this.transport.leaveRole(role.group, this.state.myAddress, role.workerId.toNumber(), rationale);
+    const successCb = this.refreshState.bind(this);
+    this.transport.leaveRole(role.group, this.state.myAddress, role.workerId.toNumber(), rationale, successCb);
   }
 
   cancelApplication (application: OpeningApplication) {
-    this.transport.withdrawApplication(application.meta.group, this.state.myAddress, application.id);
+    const successCb = this.refreshState.bind(this);
+    this.transport.withdrawApplication(application.meta.group, this.state.myAddress, application.id, successCb);
   }
 }
 
 export const MyRolesView = View<MyRolesController, State>(
-  (state, controller) => (
+  ({ state, controller }) => (
     <Container className="my-roles">
       <CurrentRoles currentRoles={state.currentRoles} />
       <Applications applications={state.applications} cancelCallback={(a) => controller.cancelApplication(a)} />
diff --git a/pioneer/packages/joy-roles/src/tabs/MyRoles.elements.stories.tsx b/pioneer/packages/joy-roles/src/tabs/MyRoles.elements.stories.tsx
index d44954aa70..23abdd3346 100644
--- a/pioneer/packages/joy-roles/src/tabs/MyRoles.elements.stories.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/MyRoles.elements.stories.tsx
@@ -1,13 +1,11 @@
 import React from 'react';
 import { withKnobs } from '@storybook/addon-knobs';
+import { createMock } from '@joystream/types';
 
 import {
   Container
 } from 'semantic-ui-react';
 
-import {
-  u128
-} from '@polkadot/types';
 
 import {
   CurrentRoles, CurrentRolesProps,
@@ -30,7 +28,6 @@ import {
   yesterday
 } from './Opportunities.stories';
 
-import { CuratorId } from '@joystream/types/content-working-group';
 import { WorkingGroups, workerRoleNameByGroup } from '../working_groups';
 
 export default {
@@ -46,10 +43,10 @@ export function CurrentRolesFragment () {
   const props: CurrentRolesProps = {
     currentRoles: [
       {
-        workerId: new CuratorId(1),
+        workerId: createMock('CuratorId', 1),
         name: workerRoleNameByGroup[WorkingGroups.StorageProviders],
-        reward: new u128(321),
-        stake: new u128(100),
+        reward: createMock('u128', 321),
+        stake: createMock('u128', 100),
         group: WorkingGroups.StorageProviders,
         CTAs: [
           {
@@ -59,11 +56,11 @@ export function CurrentRolesFragment () {
         ]
       },
       {
-        workerId: new CuratorId(1),
+        workerId: createMock('CuratorId', 1),
         name: 'Some other role',
         url: 'some URL',
-        reward: new u128(321),
-        stake: new u128(12343200),
+        reward: createMock('u128', 321),
+        stake: createMock('u128', 12343200),
         group: WorkingGroups.ContentCurators,
         CTAs: [
           {
@@ -176,8 +173,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       starting_time: yesterday()
     },
     opening: opening,
-    applicationStake: new u128(5),
-    roleStake: new u128(15),
+    applicationStake: createMock('u128', 5),
+    roleStake: createMock('u128', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 15,
     capacity: 20
@@ -196,8 +193,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       starting_time: yesterday()
     },
     opening: opening,
-    applicationStake: new u128(5),
-    roleStake: new u128(15),
+    applicationStake: createMock('u128', 5),
+    roleStake: createMock('u128', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 21,
     capacity: 20
@@ -218,8 +215,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       review_end_block: 12345
     },
     opening: opening,
-    applicationStake: new u128(5),
-    roleStake: new u128(15),
+    applicationStake: createMock('u128', 5),
+    roleStake: createMock('u128', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 15,
     capacity: 20
@@ -240,8 +237,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       review_end_block: 12345
     },
     opening: opening,
-    applicationStake: new u128(5),
-    roleStake: new u128(15),
+    applicationStake: createMock('u128', 5),
+    roleStake: createMock('u128', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 21,
     capacity: 20
@@ -260,8 +257,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       starting_time: yesterday()
     },
     opening: opening,
-    applicationStake: new u128(5),
-    roleStake: new u128(15),
+    applicationStake: createMock('u128', 5),
+    roleStake: createMock('u128', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 21,
     capacity: 20
@@ -280,8 +277,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       starting_time: yesterday()
     },
     opening: opening,
-    applicationStake: new u128(5),
-    roleStake: new u128(15),
+    applicationStake: createMock('u128', 5),
+    roleStake: createMock('u128', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 21,
     capacity: 20,
diff --git a/pioneer/packages/joy-roles/src/tabs/MyRoles.tsx b/pioneer/packages/joy-roles/src/tabs/MyRoles.tsx
index ef1ff8e9f3..70bd6d28ec 100644
--- a/pioneer/packages/joy-roles/src/tabs/MyRoles.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/MyRoles.tsx
@@ -17,10 +17,9 @@ import {
 } from 'semantic-ui-react';
 
 import { formatBalance } from '@polkadot/util';
-import { u128 } from '@polkadot/types';
 import { Balance } from '@polkadot/types/interfaces';
 
-import { Loadable } from '@polkadot/joy-utils/index';
+import { Loadable } from '@polkadot/joy-utils/react/hocs';
 import { Opening } from '@joystream/types/hiring';
 
 import {
@@ -456,7 +455,7 @@ export function Application (props: ApplicationProps) {
                   Total stake
                 </Table.Cell>
                 <Table.Cell>
-                  {formatBalance(new u128(props.roleStake.add(props.applicationStake)))}
+                  {formatBalance(props.roleStake.add(props.applicationStake))}
                 </Table.Cell>
               </Table.Row>
             </Table.Body>
diff --git a/pioneer/packages/joy-roles/src/tabs/Opportunities.controller.tsx b/pioneer/packages/joy-roles/src/tabs/Opportunities.controller.tsx
index 22dd966b81..dce9802c57 100644
--- a/pioneer/packages/joy-roles/src/tabs/Opportunities.controller.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Opportunities.controller.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
-import { Controller, View } from '@polkadot/joy-utils/index';
+import { Controller } from '@polkadot/joy-utils/react/helpers';
+import { View } from '@polkadot/joy-utils/react/hocs';
 
 import { ITransport } from '../transport';
 
@@ -20,13 +21,20 @@ type State = {
 }
 
 export class OpportunitiesController extends Controller<State, ITransport> {
-  constructor (transport: ITransport, memberId?: MemberId, initialState: State = {}) {
+  constructor (transport: ITransport, initialState: State = {}) {
     super(transport, initialState);
-    this.state.memberId = memberId;
+  }
+
+  refreshState() {
     this.getOpportunities();
     this.getBlocktime();
   }
 
+  async setMemberId(memberId?: MemberId) {
+    this.state.memberId = memberId;
+    this.dispatch();
+  }
+
   async getOpportunities () {
     this.state.opportunities = await this.transport.currentOpportunities();
     this.dispatch();
@@ -39,7 +47,7 @@ export class OpportunitiesController extends Controller<State, ITransport> {
 }
 
 export const OpportunitiesView = View<OpportunitiesController, State>(
-  (state, controller, params) => (
+  ({ state, controller, params }) => (
     <OpeningsView
       group={AvailableGroups.includes(params.get('group') as any) ? params.get('group') as WorkingGroups : undefined}
       lead={!!params.get('lead')}
diff --git a/pioneer/packages/joy-roles/src/tabs/Opportunities.elements.stories.tsx b/pioneer/packages/joy-roles/src/tabs/Opportunities.elements.stories.tsx
index e73ebbce7f..f2f5fffdd0 100644
--- a/pioneer/packages/joy-roles/src/tabs/Opportunities.elements.stories.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Opportunities.elements.stories.tsx
@@ -2,8 +2,6 @@ import React from 'react';
 import { withKnobs } from '@storybook/addon-knobs';
 import { Card, Container } from 'semantic-ui-react';
 
-import { u128 } from '@polkadot/types';
-
 import {
   OpeningBodyApplicationsStatus, OpeningStakeAndApplicationStatus,
   OpeningBodyReviewInProgress,
@@ -23,6 +21,7 @@ import { OpeningMetadata } from '../OpeningMetadata';
 import 'semantic-ui-css/semantic.min.css';
 import '@polkadot/joy-roles/index.sass';
 import { WorkingGroups } from '../working_groups';
+import { createMock } from '@joystream/types';
 
 export default {
   title: 'Roles / Components / Opportunities groups tab / Elements',
@@ -93,81 +92,81 @@ export function OpeningApplicationsStatusByState () {
       _description: 'No limit, no applications, no stake',
       numberOfApplications: 0,
       maxNumberOfApplications: 0,
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(0)),
-      requiredRoleStake: new RoleStakeRequirement(new u128(0)),
-      defactoMinimumStake: new u128(0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0)),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
+      defactoMinimumStake: createMock('Balance', 0)
     },
     {
       _description: 'No limit, some applications, no stake',
       numberOfApplications: 15,
       maxNumberOfApplications: 0,
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(0)),
-      requiredRoleStake: new RoleStakeRequirement(new u128(0)),
-      defactoMinimumStake: new u128(0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0)),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
+      defactoMinimumStake: createMock('Balance', 0)
     },
     {
       _description: 'Limit, no applications, no stake',
       numberOfApplications: 0,
       maxNumberOfApplications: 20,
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(0)),
-      requiredRoleStake: new RoleStakeRequirement(new u128(0)),
-      defactoMinimumStake: new u128(0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0)),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
+      defactoMinimumStake: createMock('Balance', 0)
     },
     {
       _description: 'Limit, some applications, no stake',
       numberOfApplications: 10,
       maxNumberOfApplications: 20,
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(0)),
-      requiredRoleStake: new RoleStakeRequirement(new u128(0)),
-      defactoMinimumStake: new u128(0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0)),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
+      defactoMinimumStake: createMock('Balance', 0)
     },
     {
       _description: 'Limit, full applications, no stake (application impossible)',
       numberOfApplications: 20,
       maxNumberOfApplications: 20,
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(0)),
-      requiredRoleStake: new RoleStakeRequirement(new u128(0)),
-      defactoMinimumStake: new u128(0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0)),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
+      defactoMinimumStake: createMock('Balance', 0)
     },
     {
       _description: 'No limit, no applications, some stake',
       numberOfApplications: 0,
       maxNumberOfApplications: 0,
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(10)),
-      requiredRoleStake: new RoleStakeRequirement(new u128(0)),
-      defactoMinimumStake: new u128(0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 10)),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
+      defactoMinimumStake: createMock('Balance', 0)
     },
     {
       _description: 'No limit, some applications, some stake',
       numberOfApplications: 15,
       maxNumberOfApplications: 0,
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(10)),
-      requiredRoleStake: new RoleStakeRequirement(new u128(0)),
-      defactoMinimumStake: new u128(0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 10)),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
+      defactoMinimumStake: createMock('Balance', 0)
     },
     {
       _description: 'Limit, no applications, some stake',
       numberOfApplications: 0,
       maxNumberOfApplications: 20,
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(10)),
-      requiredRoleStake: new RoleStakeRequirement(new u128(0)),
-      defactoMinimumStake: new u128(0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 10)),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
+      defactoMinimumStake: createMock('Balance', 0)
     },
     {
       _description: 'Limit, some applications, some stake',
       numberOfApplications: 10,
       maxNumberOfApplications: 20,
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(10)),
-      requiredRoleStake: new RoleStakeRequirement(new u128(0)),
-      defactoMinimumStake: new u128(0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 10)),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
+      defactoMinimumStake: createMock('Balance', 0)
     },
     {
       _description: 'Limit, full applications, some stake',
       numberOfApplications: 20,
       maxNumberOfApplications: 20,
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(10)),
-      requiredRoleStake: new RoleStakeRequirement(new u128(0)),
-      defactoMinimumStake: new u128(0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 10)),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
+      defactoMinimumStake: createMock('Balance', 0)
     }
   ];
 
@@ -189,51 +188,51 @@ export function OpeningApplicationsStakeRequirementByStake () {
   const permutations: (StakeRequirementProps & TestProps)[] = [
     {
       _description: 'No stakes required (should be empty)',
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(0)),
-      requiredRoleStake: new RoleStakeRequirement(new u128(0)),
-      defactoMinimumStake: new u128(0),
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0)),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
+      defactoMinimumStake: createMock('Balance', 0),
       maxNumberOfApplications: 0
     },
     {
       _description: 'App stake required; no role stake required',
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(500)),
-      requiredRoleStake: new RoleStakeRequirement(new u128(0)),
-      defactoMinimumStake: new u128(0),
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 500)),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
+      defactoMinimumStake: createMock('Balance', 0),
       maxNumberOfApplications: 0
     },
     {
       _description: 'App stake required >; no role stake required',
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(500), StakeType.AtLeast),
-      requiredRoleStake: new RoleStakeRequirement(new u128(0)),
-      defactoMinimumStake: new u128(0),
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 500), StakeType.AtLeast),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
+      defactoMinimumStake: createMock('Balance', 0),
       maxNumberOfApplications: 0
     },
     {
       _description: 'No app stake required; role stake required',
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(0)),
-      requiredRoleStake: new RoleStakeRequirement(new u128(101)),
-      defactoMinimumStake: new u128(0),
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0)),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 101)),
+      defactoMinimumStake: createMock('Balance', 0),
       maxNumberOfApplications: 0
     },
     {
       _description: 'No app stake required; role stake required',
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(0), StakeType.AtLeast),
-      requiredRoleStake: new RoleStakeRequirement(new u128(102)),
-      defactoMinimumStake: new u128(0),
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0), StakeType.AtLeast),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 102)),
+      defactoMinimumStake: createMock('Balance', 0),
       maxNumberOfApplications: 0
     },
     {
       _description: '>= App stake required; role stake required',
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(101), StakeType.AtLeast),
-      requiredRoleStake: new RoleStakeRequirement(new u128(102)),
-      defactoMinimumStake: new u128(0),
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 101), StakeType.AtLeast),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 102)),
+      defactoMinimumStake: createMock('Balance', 0),
       maxNumberOfApplications: 0
     },
     {
       _description: 'App stake required; no role stake required; dynamic minimum > 0',
-      requiredApplicationStake: new ApplicationStakeRequirement(new u128(500)),
-      requiredRoleStake: new RoleStakeRequirement(new u128(0)),
-      defactoMinimumStake: new u128(1000),
+      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 500)),
+      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
+      defactoMinimumStake: createMock('Balance', 1000),
       maxNumberOfApplications: 20
     }
   ];
diff --git a/pioneer/packages/joy-roles/src/tabs/Opportunities.stories.tsx b/pioneer/packages/joy-roles/src/tabs/Opportunities.stories.tsx
index 10e9daf4a2..7905afefdb 100644
--- a/pioneer/packages/joy-roles/src/tabs/Opportunities.stories.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Opportunities.stories.tsx
@@ -2,14 +2,8 @@ import React from 'react';
 import { number, select, text, withKnobs } from '@storybook/addon-knobs';
 import * as faker from 'faker';
 
-import { Option, Text, u32, u128 } from '@polkadot/types';
 import { Balance } from '@polkadot/types/interfaces';
 
-import {
-  Opening,
-  ApplicationRationingPolicy,
-  StakingPolicy
-} from '@joystream/types/hiring';
 import { mockStage } from '../mocks';
 import {
   OpeningView,
@@ -27,6 +21,7 @@ import { OpeningMetadata } from '../OpeningMetadata';
 import 'semantic-ui-css/semantic.min.css';
 import '@polkadot/joy-roles/index.sass';
 import { WorkingGroups } from '../working_groups';
+import { createMock } from '@joystream/types';
 
 export default {
   title: 'Roles / Components / Opportunities groups tab',
@@ -53,16 +48,13 @@ export function yesterday (): Date {
 }
 
 export function newMockHumanReadableText (obj: any) {
-  return new Text(JSON.stringify(obj));
+  return createMock('Text', JSON.stringify(obj));
 }
 
-export const opening = new Opening({
-  created: new u32(100),
+export const opening = createMock('Opening', {
+  created: 100,
   stage: mockStage,
-  max_review_period_length: new u32(100),
-  application_rationing_policy: new Option(ApplicationRationingPolicy),
-  application_staking_policy: new Option(StakingPolicy),
-  role_staking_policy: new Option(StakingPolicy),
+  max_review_period_length: 100,
   human_readable_text: newMockHumanReadableText({
     version: 1,
     headline: text('Headline', 'Help us curate awesome content', 'Role'),
@@ -137,15 +129,15 @@ export function OpportunitySandbox () {
     numberOfApplications: number('Applications count', 0, applicationSliderOptions, 'Role rationing policy'),
     maxNumberOfApplications: number('Application max', 0, applicationSliderOptions, 'Role rationing policy'),
     requiredApplicationStake: new ApplicationStakeRequirement(
-      new u128(number('Application stake', 500, moneySliderOptions, 'Role stakes'))
+      createMock('Balance', number('Application stake', 500, moneySliderOptions, 'Role stakes'))
     ),
     requiredRoleStake: new RoleStakeRequirement(
-      new u128(number('Role stake', 0, moneySliderOptions, 'Role stakes'))
+      createMock('Balance', number('Role stake', 0, moneySliderOptions, 'Role stakes'))
     ),
-    defactoMinimumStake: new u128(0)
+    defactoMinimumStake: createMock('Balance', 0)
   };
 
-  const defactoMinimumStake: Balance = new u128(number('Dynamic min stake', 0, moneySliderOptions, 'Role stakes'));
+  const defactoMinimumStake: Balance = createMock('Balance', number('Dynamic min stake', 0, moneySliderOptions, 'Role stakes'));
 
   const meta: OpeningMetadata = {
     id: '1',
diff --git a/pioneer/packages/joy-roles/src/tabs/Opportunities.tsx b/pioneer/packages/joy-roles/src/tabs/Opportunities.tsx
index b85d67de8c..ab46fa12b6 100644
--- a/pioneer/packages/joy-roles/src/tabs/Opportunities.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Opportunities.tsx
@@ -22,7 +22,7 @@ import {
 import { formatBalance } from '@polkadot/util';
 import { Balance } from '@polkadot/types/interfaces';
 
-import { useMyAccount } from '@polkadot/joy-utils/MyAccountContext';
+import { useMyAccount } from '@polkadot/joy-utils/react/hooks';
 
 import { Countdown } from '../elements';
 import { ApplicationStakeRequirement, RoleStakeRequirement } from '../StakeRequirement';
@@ -38,7 +38,7 @@ import {
   openingDescription
 } from '../openingStateMarkup';
 
-import { Loadable } from '@polkadot/joy-utils/index';
+import { Loadable } from '@polkadot/joy-utils/react/hocs';
 import styled from 'styled-components';
 import _ from 'lodash';
 import { WorkingGroups, AvailableGroups, workerRoleNameByGroup } from '../working_groups';
@@ -571,7 +571,7 @@ export const OpeningsView = Loadable<OpeningsViewProps>(
           filteredOpenings.length
             ? filteredOpenings.map((opening, key) => (
               <OpeningView
-                key={key}
+                key={`${opening.meta.group}-${opening.meta.id}`}
                 {...opening}
                 block_time_in_seconds={props.block_time_in_seconds as number}
                 member_id={props.member_id} />
diff --git a/pioneer/packages/joy-roles/src/tabs/Opportunity.controller.tsx b/pioneer/packages/joy-roles/src/tabs/Opportunity.controller.tsx
index 420c7037c6..1d3f850fa6 100644
--- a/pioneer/packages/joy-roles/src/tabs/Opportunity.controller.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Opportunity.controller.tsx
@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 
-import { Controller, memoize, View, Params } from '@polkadot/joy-utils/index';
+import { Controller, memoize } from '@polkadot/joy-utils/react/helpers';
+import { View } from '@polkadot/joy-utils/react/hocs';
 
 import { ITransport } from '../transport';
 
@@ -21,19 +22,23 @@ type State = {
 }
 
 export class OpportunityController extends Controller<State, ITransport> {
-  constructor (transport: ITransport, memberId?: MemberId, initialState: State = {}) {
+  constructor (transport: ITransport, initialState: State = {}) {
     super(transport, initialState);
-    this.state.memberId = memberId;
     this.getBlocktime();
   }
 
+  async setMemberId(memberId?: MemberId) {
+    this.state.memberId = memberId;
+    this.dispatch();
+  }
+
   @memoize()
   async getOpportunity (group: string | undefined, id: string | undefined) {
-    if (!id) {
-      return this.onError('OpportunityController: no ID provided in params');
+    if (!id || !group) {
+      return;
     }
 
-    if (!group || !AvailableGroups.includes(group as any)) {
+    if (!AvailableGroups.includes(group as any)) {
       return this.onError('OppportunityController: invalid group provided in params');
     }
 
@@ -47,14 +52,14 @@ export class OpportunityController extends Controller<State, ITransport> {
   }
 }
 
-const renderOpeningView = (state: State, controller: OpportunityController, params: Params) => {
-  controller.getOpportunity(params.get('group'), params.get('id'));
-  return (
-    <OpeningView {...state.opportunity!} block_time_in_seconds={state.blockTime!} member_id={state.memberId} />
-  );
-};
-
 export const OpportunityView = View<OpportunityController, State>({
   errorComponent: OpeningError,
-  render: renderOpeningView
+  renderComponent: ({ state, controller, params }) => {
+    useEffect(() => {
+      controller.getOpportunity(params.get('group'), params.get('id'));
+    }, [params.get('group'), params.get('id')]);
+    return (
+      <OpeningView {...state.opportunity!} block_time_in_seconds={state.blockTime!} member_id={state.memberId} />
+    );
+  }
 });
diff --git a/pioneer/packages/joy-roles/src/tabs/WorkingGroup.controller.tsx b/pioneer/packages/joy-roles/src/tabs/WorkingGroup.controller.tsx
index feff90daf4..f59a5dafde 100644
--- a/pioneer/packages/joy-roles/src/tabs/WorkingGroup.controller.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/WorkingGroup.controller.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
-import { Controller, View } from '@polkadot/joy-utils/index';
+import { Controller } from '@polkadot/joy-utils/react/helpers';
+import { View } from '@polkadot/joy-utils/react/hocs';
 
 import { ITransport } from '../transport';
 
@@ -20,6 +21,9 @@ type State = {
 export class WorkingGroupsController extends Controller<State, ITransport> {
   constructor (transport: ITransport, initialState: State = {}) {
     super(transport, {});
+  }
+
+  refreshState() {
     this.getCurationGroup();
     this.getStorageGroup();
   }
@@ -49,7 +53,7 @@ const WorkingGroupsOverview = styled.div`
 `;
 
 export const WorkingGroupsView = View<WorkingGroupsController, State>(
-  (state) => (
+  ({ state }) => (
     <WorkingGroupsOverview>
       <ContentCurators {...state.contentCurators}/>
       <StorageProviders {...state.storageProviders}/>
diff --git a/pioneer/packages/joy-roles/src/tabs/WorkingGroup.stories.tsx b/pioneer/packages/joy-roles/src/tabs/WorkingGroup.stories.tsx
index 5b066e8ebc..71e55dd600 100644
--- a/pioneer/packages/joy-roles/src/tabs/WorkingGroup.stories.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/WorkingGroup.stories.tsx
@@ -1,9 +1,7 @@
 import React from 'react';
 import { boolean, number, text, withKnobs } from '@storybook/addon-knobs';
 
-import { u128, GenericAccountId } from '@polkadot/types';
-
-import { MemberId } from '@joystream/types/members';
+import { createMock } from '@joystream/types';
 
 import { ContentCurators } from '@polkadot/joy-roles/tabs/WorkingGroup';
 import { GroupMember } from '../elements';
@@ -22,59 +20,59 @@ export default {
 export function ContentCuratorsSection () {
   const members: GroupMember[] = [
     {
-      memberId: new MemberId(1),
-      roleAccount: new GenericAccountId('5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
+      memberId: createMock('MemberId', 1),
+      roleAccount: createMock('AccountId', '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
       profile: mockProfile(
         text('Handle', 'benholdencrowther', 'Ben'),
         text('Avatar URL', 'https://www.benholdencrowther.com/wp-content/uploads/2019/03/Hanging_Gardens_of_Babylon.jpg', 'Ben')
       ),
       title: text('Title', 'Curation lead', 'Ben'),
-      stake: new u128(number('Stake', 10101, {}, 'Ben')),
+      stake: createMock('Balance', number('Stake', 10101, {}, 'Ben')),
       workerId: 1,
       group: WorkingGroups.ContentCurators
     },
     {
-      memberId: new MemberId(2),
-      roleAccount: new GenericAccountId('5DfJWGbBAH8hLAg8rcRYZW5BEZbE4BJeCQKoxUeqoyewLSew'),
+      memberId: createMock('MemberId', 2),
+      roleAccount: createMock('AccountId', '5DfJWGbBAH8hLAg8rcRYZW5BEZbE4BJeCQKoxUeqoyewLSew'),
       profile: mockProfile(text('Handle', 'bwhm0', 'Martin')),
       title: text('Title', 'Content curator', 'Martin'),
-      stake: new u128(number('Stake', 10101, {}, 'Martin')),
+      stake: createMock('Balance', number('Stake', 10101, {}, 'Martin')),
       workerId: 2,
       group: WorkingGroups.ContentCurators
     },
     {
-      memberId: new MemberId(3),
-      roleAccount: new GenericAccountId('5DQqNWRFPruFs9YKheVMqxUbqoXeMzAWfVfcJgzuia7NA3D3'),
+      memberId: createMock('MemberId', 3),
+      roleAccount: createMock('AccountId', '5DQqNWRFPruFs9YKheVMqxUbqoXeMzAWfVfcJgzuia7NA3D3'),
       profile: mockProfile(
         'yourheropaul',
         'https://yhp.io/img/paul.svg'
       ),
       title: text('Title', 'Content curator', 'Paul'),
-      stake: new u128(number('Stake', 10101, {}, 'Paul')),
+      stake: createMock('Balance', number('Stake', 10101, {}, 'Paul')),
       workerId: 3,
       group: WorkingGroups.ContentCurators
     },
     {
-      memberId: new MemberId(4),
-      roleAccount: new GenericAccountId('5GSMNn8Sy8k64mGUWPDafjMZu9bQNX26GujbBQ1LeJpNbrfg'),
+      memberId: createMock('MemberId', 4),
+      roleAccount: createMock('AccountId', '5GSMNn8Sy8k64mGUWPDafjMZu9bQNX26GujbBQ1LeJpNbrfg'),
       profile: mockProfile(
         'alex_joystream',
         'https://avatars2.githubusercontent.com/u/153928?s=200&v=4'
       ),
       title: text('Title', 'Content curator', 'Alex'),
-      stake: new u128(number('Stake', 10101, {}, 'Alex')),
+      stake: createMock('Balance', number('Stake', 10101, {}, 'Alex')),
       workerId: 4,
       group: WorkingGroups.ContentCurators
     },
     {
-      memberId: new MemberId(5),
-      roleAccount: new GenericAccountId('5Gn9n7SDJ7VgHqHQWYzkSA4vX6DCmS5TFWdHxikTXp9b4L32'),
+      memberId: createMock('MemberId', 5),
+      roleAccount: createMock('AccountId', '5Gn9n7SDJ7VgHqHQWYzkSA4vX6DCmS5TFWdHxikTXp9b4L32'),
       profile: mockProfile(
         'mokhtar',
         'https://avatars2.githubusercontent.com/u/1621012?s=460&v=4'
       ),
       title: text('Title', 'Content curator', 'Mokhtar'),
-      stake: new u128(number('Stake', 10101, {}, 'Mokhtar')),
+      stake: createMock('Balance', number('Stake', 10101, {}, 'Mokhtar')),
       workerId: 5,
       group: WorkingGroups.ContentCurators
     }
diff --git a/pioneer/packages/joy-roles/src/tabs/WorkingGroup.tsx b/pioneer/packages/joy-roles/src/tabs/WorkingGroup.tsx
index 156cfda5dc..59758b4a52 100644
--- a/pioneer/packages/joy-roles/src/tabs/WorkingGroup.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/WorkingGroup.tsx
@@ -3,7 +3,7 @@ import { Button, Card, Icon, Message, SemanticICONS } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
 
 import { GroupLeadView, GroupMember, GroupMemberView, GroupLead } from '../elements';
-import { Loadable } from '@polkadot/joy-utils/index';
+import { Loadable } from '@polkadot/joy-utils/react/hocs';
 
 import { WorkingGroups } from '../working_groups';
 import styled from 'styled-components';
diff --git a/pioneer/packages/joy-roles/src/transport.mock.ts b/pioneer/packages/joy-roles/src/transport.mock.ts
index c66cf19a40..eb8ecda9fa 100644
--- a/pioneer/packages/joy-roles/src/transport.mock.ts
+++ b/pioneer/packages/joy-roles/src/transport.mock.ts
@@ -1,20 +1,14 @@
 import { Observable } from 'rxjs';
 import { Balance } from '@polkadot/types/interfaces';
-import { Option, u32, u128, GenericAccountId } from '@polkadot/types';
 
-import { Subscribable, Transport as TransportBase } from '@polkadot/joy-utils/index';
+import { Subscribable } from '@polkadot/joy-utils/react/helpers';
+import MockTransportBase from '@polkadot/joy-utils/transport/mock/base';
 
 import { ITransport } from './transport';
 
-import { MemberId } from '@joystream/types/members';
-import {
-  Opening,
-  ApplicationRationingPolicy,
-  StakingPolicy
-} from '@joystream/types/hiring';
+import { createMock } from '@joystream/types';
 
 import { WorkingGroupMembership, GroupLeadStatus } from './tabs/WorkingGroup';
-import { CuratorId } from '@joystream/types/content-working-group';
 import { WorkingGroupOpening } from './tabs/Opportunities';
 import { ActiveRole, OpeningApplication } from './tabs/MyRoles';
 import { ApplicationStakeRequirement, RoleStakeRequirement, StakeType } from './StakeRequirement';
@@ -27,15 +21,7 @@ import * as faker from 'faker';
 import { mockProfile, mockStage } from './mocks';
 import { WorkingGroups, workerRoleNameByGroup } from './working_groups';
 
-export class Transport extends TransportBase implements ITransport {
-  protected simulateApiResponse<T> (value: T): Promise<T> {
-    return this.promise<T>(value, this.randomTimeout());
-  }
-
-  protected randomTimeout (min = 1, max = 20): number {
-    return Math.random() * (max - min) + min;
-  }
-
+export class Transport extends MockTransportBase implements ITransport {
   groupLeadStatus (group: WorkingGroups = WorkingGroups.ContentCurators): Promise<GroupLeadStatus> {
     return this.simulateApiResponse<GroupLeadStatus>({
       loaded: true
@@ -49,59 +35,59 @@ export class Transport extends TransportBase implements ITransport {
       leadRolesAvailable: false,
       workers: [
         {
-          memberId: new MemberId(1),
-          roleAccount: new GenericAccountId('5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
+          memberId: createMock('MemberId', 1),
+          roleAccount: createMock('AccountId', '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
           profile: mockProfile(
             'benholdencrowther',
             'https://www.benholdencrowther.com/wp-content/uploads/2019/03/Hanging_Gardens_of_Babylon.jpg'
           ),
           title: 'Content curator',
-          stake: new u128(10101),
+          stake: createMock('u128', 10101),
           workerId: 1,
           group: WorkingGroups.ContentCurators
         },
         {
-          memberId: new MemberId(2),
-          roleAccount: new GenericAccountId('5DfJWGbBAH8hLAg8rcRYZW5BEZbE4BJeCQKoxUeqoyewLSew'),
+          memberId: createMock('MemberId', 2),
+          roleAccount: createMock('AccountId', '5DfJWGbBAH8hLAg8rcRYZW5BEZbE4BJeCQKoxUeqoyewLSew'),
           profile: mockProfile('bwhm0'),
           title: 'Content curator',
-          stake: new u128(10101),
+          stake: createMock('u128', 10101),
           workerId: 2,
           group: WorkingGroups.ContentCurators
         },
         {
-          memberId: new MemberId(3),
-          roleAccount: new GenericAccountId('5DQqNWRFPruFs9YKheVMqxUbqoXeMzAWfVfcJgzuia7NA3D3'),
+          memberId: createMock('MemberId', 3),
+          roleAccount: createMock('AccountId', '5DQqNWRFPruFs9YKheVMqxUbqoXeMzAWfVfcJgzuia7NA3D3'),
           profile: mockProfile(
             'yourheropaul',
             'https://yhp.io/img/paul.svg'
           ),
           title: 'Content curator',
-          stake: new u128(10101),
+          stake: createMock('u128', 10101),
           workerId: 3,
           group: WorkingGroups.ContentCurators
         },
         {
-          memberId: new MemberId(4),
-          roleAccount: new GenericAccountId('5GSMNn8Sy8k64mGUWPDafjMZu9bQNX26GujbBQ1LeJpNbrfg'),
+          memberId: createMock('MemberId', 4),
+          roleAccount: createMock('AccountId', '5GSMNn8Sy8k64mGUWPDafjMZu9bQNX26GujbBQ1LeJpNbrfg'),
           profile: mockProfile(
             'alex_joystream',
             'https://avatars2.githubusercontent.com/u/153928?s=200&v=4'
           ),
           title: 'Content curator',
-          stake: new u128(10101),
+          stake: createMock('u128', 10101),
           workerId: 4,
           group: WorkingGroups.ContentCurators
         },
         {
-          memberId: new MemberId(3),
-          roleAccount: new GenericAccountId('5Gn9n7SDJ7VgHqHQWYzkSA4vX6DCmS5TFWdHxikTXp9b4L32'),
+          memberId: createMock('MemberId', 3),
+          roleAccount: createMock('AccountId', '5Gn9n7SDJ7VgHqHQWYzkSA4vX6DCmS5TFWdHxikTXp9b4L32'),
           profile: mockProfile(
             'mokhtar',
             'https://avatars2.githubusercontent.com/u/1621012?s=460&v=4'
           ),
           title: 'Content curator',
-          stake: new u128(10101),
+          stake: createMock('u128', 10101),
           workerId: 5,
           group: WorkingGroups.ContentCurators
         }
@@ -116,14 +102,14 @@ export class Transport extends TransportBase implements ITransport {
       leadRolesAvailable: true,
       workers: [
         {
-          memberId: new MemberId(1),
-          roleAccount: new GenericAccountId('5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
+          memberId: createMock('MemberId', 1),
+          roleAccount: createMock('AccountId', '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
           profile: mockProfile(
             'benholdencrowther',
             'https://www.benholdencrowther.com/wp-content/uploads/2019/03/Hanging_Gardens_of_Babylon.jpg'
           ),
           title: 'Storage provider',
-          stake: new u128(10101),
+          stake: createMock('u128', 10101),
           workerId: 1,
           group: WorkingGroups.StorageProviders
         }
@@ -135,13 +121,10 @@ export class Transport extends TransportBase implements ITransport {
     return this.simulateApiResponse<Array<WorkingGroupOpening>>(
       [
         {
-          opening: new Opening({
-            created: new u32(50000),
+          opening: createMock('Opening', {
+            created: 50000,
             stage: mockStage,
-            max_review_period_length: new u32(100),
-            application_rationing_policy: new Option(ApplicationRationingPolicy),
-            application_staking_policy: new Option(StakingPolicy),
-            role_staking_policy: new Option(StakingPolicy),
+            max_review_period_length: 100,
             human_readable_text: newMockHumanReadableText({
               version: 1,
               headline: 'Help us curate awesome content',
@@ -195,14 +178,14 @@ export class Transport extends TransportBase implements ITransport {
             numberOfApplications: 0,
             maxNumberOfApplications: 0,
             requiredApplicationStake: new ApplicationStakeRequirement(
-              new u128(500)
+              createMock('u128', 500)
             ),
             requiredRoleStake: new RoleStakeRequirement(
-              new u128(0)
+              createMock('u128', 0)
             ),
-            defactoMinimumStake: new u128(0)
+            defactoMinimumStake: createMock('u128', 0)
           },
-          defactoMinimumStake: new u128(0)
+          defactoMinimumStake: createMock('u128', 0)
         }
       ]
     );
@@ -212,13 +195,10 @@ export class Transport extends TransportBase implements ITransport {
   async groupOpening (group: WorkingGroups, id: number): Promise<WorkingGroupOpening> {
     return this.simulateApiResponse<WorkingGroupOpening>(
       {
-        opening: new Opening({
-          created: new u32(50000),
+        opening: createMock('Opening', {
+          created: 50000,
           stage: mockStage,
-          max_review_period_length: new u32(100),
-          application_rationing_policy: new Option(ApplicationRationingPolicy),
-          application_staking_policy: new Option(StakingPolicy),
-          role_staking_policy: new Option(StakingPolicy),
+          max_review_period_length: 100,
           human_readable_text: newMockHumanReadableText({
             version: 1,
             headline: 'Help us curate awesome content',
@@ -276,15 +256,15 @@ export class Transport extends TransportBase implements ITransport {
           numberOfApplications: 0,
           maxNumberOfApplications: 0,
           requiredApplicationStake: new ApplicationStakeRequirement(
-            new u128(501),
+            createMock('u128', 501),
             StakeType.AtLeast
           ),
           requiredRoleStake: new RoleStakeRequirement(
-            new u128(502)
+            createMock('u128', 502)
           ),
-          defactoMinimumStake: new u128(0)
+          defactoMinimumStake: createMock('u128', 0)
         },
-        defactoMinimumStake: new u128(0)
+        defactoMinimumStake: createMock('u128', 0)
       }
     );
   }
@@ -292,14 +272,14 @@ export class Transport extends TransportBase implements ITransport {
   openingApplicationRanks (group: WorkingGroups, openingId: number): Promise<Balance[]> {
     const slots: Balance[] = [];
     for (let i = 0; i < 20; i++) {
-      slots.push(new u128((i * 100) + 10 + i + 1));
+      slots.push(createMock('u128', (i * 100) + 10 + i + 1));
     }
 
     return this.simulateApiResponse<Balance[]>(slots);
   }
 
-  expectedBlockTime (): Promise<number> {
-    return this.promise<number>(6);
+  expectedBlockTime (): number {
+    return 6;
   }
 
   blockHash (height: number): Promise<string> {
@@ -310,28 +290,24 @@ export class Transport extends TransportBase implements ITransport {
     return this.promise<Date>(new Date());
   }
 
-  transactionFee (): Promise<Balance> {
-    return this.simulateApiResponse<Balance>(new u128(5));
-  }
-
   accounts (): Subscribable<keyPairDetails[]> {
     return new Observable<keyPairDetails[]>(observer => {
       observer.next(
         [
           {
             shortName: 'KP1',
-            accountId: new GenericAccountId('5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
-            balance: new u128(23342)
+            accountId: createMock('AccountId', '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
+            balance: createMock('u128', 23342)
           },
           {
             shortName: 'KP2',
-            accountId: new GenericAccountId('5DQqNWRFPruFs9YKheVMqxUbqoXeMzAWfVfcJgzuia7NA3D3'),
-            balance: new u128(993342)
+            accountId: createMock('AccountId', '5DQqNWRFPruFs9YKheVMqxUbqoXeMzAWfVfcJgzuia7NA3D3'),
+            balance: createMock('u128', 993342)
           },
           {
             shortName: 'KP3',
-            accountId: new GenericAccountId('5DBaczGTDhcHgwsZzNE5qW15GrQxxdyros4pYkcKrSUovFQ9'),
-            balance: new u128(242)
+            accountId: createMock('AccountId', '5DBaczGTDhcHgwsZzNE5qW15GrQxxdyros4pYkcKrSUovFQ9'),
+            balance: createMock('u128', 242)
           }
         ]
       );
@@ -352,13 +328,10 @@ export class Transport extends TransportBase implements ITransport {
         starting_block_hash: 'somehash',
         starting_time: yesterday()
       },
-      opening: new Opening({
-        created: new u32(50000),
+      opening: createMock('Opening', {
+        created: 50000,
         stage: mockStage,
-        max_review_period_length: new u32(100),
-        application_rationing_policy: new Option(ApplicationRationingPolicy),
-        application_staking_policy: new Option(StakingPolicy),
-        role_staking_policy: new Option(StakingPolicy),
+        max_review_period_length: 100,
         human_readable_text: newMockHumanReadableText({
           version: 1,
           headline: 'Help us curate awesome content',
@@ -400,8 +373,8 @@ export class Transport extends TransportBase implements ITransport {
           }
         })
       }),
-      applicationStake: new u128(5),
-      roleStake: new u128(15),
+      applicationStake: createMock('u128', 5),
+      roleStake: createMock('u128', 15),
       rank: 21,
       capacity: 20
     }];
@@ -411,12 +384,12 @@ export class Transport extends TransportBase implements ITransport {
   async myRoles (address: string): Promise<ActiveRole[]> {
     return [
       {
-        workerId: new CuratorId(1),
+        workerId: createMock('CuratorId', 1),
         name: workerRoleNameByGroup[WorkingGroups.ContentCurators],
         group: WorkingGroups.ContentCurators,
         url: 'some URL',
-        reward: new u128(321),
-        stake: new u128(12343200)
+        reward: createMock('u128', 321),
+        stake: createMock('u128', 12343200)
       }
     ];
   }
diff --git a/pioneer/packages/joy-roles/src/transport.substrate.ts b/pioneer/packages/joy-roles/src/transport.substrate.ts
index a975b6dc4e..4025cd7246 100644
--- a/pioneer/packages/joy-roles/src/transport.substrate.ts
+++ b/pioneer/packages/joy-roles/src/transport.substrate.ts
@@ -2,14 +2,15 @@ import { map, switchMap } from 'rxjs/operators';
 
 import ApiPromise from '@polkadot/api/promise';
 import { Balance } from '@polkadot/types/interfaces';
-import { GenericAccountId, Option, u128, Vec } from '@polkadot/types';
+import { Option, Vec } from '@polkadot/types';
 import { Constructor } from '@polkadot/types/types';
 import { Moment } from '@polkadot/types/interfaces/runtime';
 import { QueueTxExtrinsicAdd } from '@polkadot/react-components/Status/types';
-import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
 import keyringOption from '@polkadot/ui-keyring/options';
 
-import { APIQueryCache, MultipleLinkedMapEntry, SingleLinkedMapEntry, Subscribable, Transport as TransportBase } from '@polkadot/joy-utils/index';
+import { APIQueryCache } from '@polkadot/joy-utils/transport/APIQueryCache';
+import { Subscribable } from '@polkadot/joy-utils/react/helpers';
+import BaseTransport from '@polkadot/joy-utils/transport/base';
 
 import { ITransport } from './transport';
 import { GroupMember } from './elements';
@@ -32,8 +33,8 @@ import {
 import { Application, Opening, OpeningId, ApplicationId, ActiveApplicationStage } from '@joystream/types/hiring';
 import { Stake, StakeId } from '@joystream/types/stake';
 import { RewardRelationship, RewardRelationshipId } from '@joystream/types/recurring-rewards';
-import { Membership, MemberId, ActorId } from '@joystream/types/members';
-import { createAccount, generateSeed } from '@polkadot/joy-utils/accounts';
+import { Membership, MemberId } from '@joystream/types/members';
+import { createAccount, generateSeed } from '@polkadot/joy-utils/functions/accounts';
 
 import { WorkingGroupMembership, GroupLeadStatus } from './tabs/WorkingGroup';
 import { WorkingGroupOpening } from './tabs/Opportunities';
@@ -146,23 +147,26 @@ const workingGroupsApiMapping: WGApiMapping = {
   }
 };
 
-export class Transport extends TransportBase implements ITransport {
-  protected api: ApiPromise
-  protected cachedApi: APIQueryCache
+export class Transport extends BaseTransport implements ITransport {
   protected queueExtrinsic: QueueTxExtrinsicAdd
 
   constructor (api: ApiPromise, queueExtrinsic: QueueTxExtrinsicAdd) {
-    super();
-    this.api = api;
-    this.cachedApi = new APIQueryCache(api);
+    super(api, new APIQueryCache(api));
     this.queueExtrinsic = queueExtrinsic;
   }
 
+  apiMethodByGroup(group: WorkingGroups, method: WGApiMethodType) {
+    const apiModule = workingGroupsApiMapping[group].module;
+    const apiMethod = workingGroupsApiMapping[group].methods.query[method];
+
+    return this.api.query[apiModule][apiMethod];
+  }
+
   cachedApiMethodByGroup (group: WorkingGroups, method: WGApiMethodType) {
     const apiModule = workingGroupsApiMapping[group].module;
     const apiMethod = workingGroupsApiMapping[group].methods.query[method];
 
-    return this.cachedApi.query[apiModule][apiMethod];
+    return this.cacheApi.query[apiModule][apiMethod];
   }
 
   apiExtrinsicByGroup (group: WorkingGroups, method: WGApiTxMethodType) {
@@ -173,17 +177,12 @@ export class Transport extends TransportBase implements ITransport {
   }
 
   unsubscribe () {
-    this.cachedApi.unsubscribe();
+    this.cacheApi.unsubscribe();
   }
 
   protected async stakeValue (stakeId: StakeId): Promise<Balance> {
-    const stake = new SingleLinkedMapEntry<Stake>(
-      Stake,
-      await this.cachedApi.query.stake.stakes(
-        stakeId
-      )
-    );
-    return stake.value.value;
+    const stake = await this.cacheApi.query.stake.stakes(stakeId) as Stake;
+    return stake.value;
   }
 
   protected async workerStake (stakeProfile: GroupWorkerStakeProfile): Promise<Balance> {
@@ -191,25 +190,20 @@ export class Transport extends TransportBase implements ITransport {
   }
 
   protected async rewardRelationshipById (id: RewardRelationshipId): Promise<RewardRelationship | undefined> {
-    const rewardRelationship = new SingleLinkedMapEntry<RewardRelationship>(
-      RewardRelationship,
-      await this.cachedApi.query.recurringRewards.rewardRelationships(id)
-    ).value;
+    const rewardRelationship = await this.cacheApi.query.recurringRewards.rewardRelationships(id) as RewardRelationship;
 
     return rewardRelationship.isEmpty ? undefined : rewardRelationship;
   }
 
   protected async workerTotalReward (relationshipId: RewardRelationshipId): Promise<Balance> {
     const relationship = await this.rewardRelationshipById(relationshipId);
-    return relationship?.total_reward_received || new u128(0);
+    return relationship?.total_reward_received || this.api.createType('Balance', 0);
   }
 
   protected async curatorMemberId (curator: Curator): Promise<MemberId> {
     const curatorApplicationId = curator.induction.curator_application_id;
-    const curatorApplication = new SingleLinkedMapEntry<CuratorApplication>(
-      CuratorApplication,
-      await this.cachedApi.query.contentWorkingGroup.curatorApplicationById(curatorApplicationId)
-    ).value;
+    const curatorApplication =
+      await this.cacheApi.query.contentWorkingGroup.curatorApplicationById(curatorApplicationId) as CuratorApplication;
 
     return curatorApplication.member_id;
   }
@@ -231,12 +225,12 @@ export class Transport extends TransportBase implements ITransport {
       ? await this.curatorMemberId(worker as Curator)
       : (worker as Worker).member_id;
 
-    const profile = await this.cachedApi.query.members.membershipById(memberId) as Membership;
+    const profile = await this.cacheApi.query.members.membershipById(memberId) as Membership;
     if (profile.handle.isEmpty) {
       throw new Error('No group member profile found!');
     }
 
-    let stakeValue: Balance = new u128(0);
+    let stakeValue: Balance = this.api.createType('Balance', 0);
     if (worker.role_stake_profile && worker.role_stake_profile.isSome) {
       stakeValue = await this.workerStake(worker.role_stake_profile.unwrap());
     }
@@ -256,27 +250,18 @@ export class Transport extends TransportBase implements ITransport {
   }
 
   protected async areGroupRolesOpen (group: WorkingGroups, lead = false): Promise<boolean> {
-    const nextId = await this.cachedApiMethodByGroup(group, 'nextOpeningId')() as GroupOpeningId;
-
-    // This is chain specfic, but if next id is still 0, it means no openings have been added yet
-    if (nextId.eq(0)) {
-      return false;
-    }
-
-    const groupOpenings = new MultipleLinkedMapEntry<GroupOpeningId, GroupOpening>(
-      OpeningId,
-      workingGroupsApiMapping[group].openingType,
-      await this.cachedApiMethodByGroup(group, 'openingById')()
+    const groupOpenings = await this.entriesByIds<GroupOpeningId, GroupOpening>(
+      this.apiMethodByGroup(group, 'openingById')
     );
 
-    for (const groupOpening of groupOpenings.linked_values) {
+    for (const [/* id */, groupOpening] of groupOpenings) {
       const opening = await this.opening(groupOpening.hiring_opening_id.toNumber());
       if (
         opening.is_active &&
         (
           groupOpening instanceof WGOpening
             ? (lead === groupOpening.opening_type.isOfType('Leader'))
-            : !lead // Lead opening are never available for content working group currently
+            : !lead // Lead openings are never available for content working group currently
         )
       ) {
         return true;
@@ -287,41 +272,35 @@ export class Transport extends TransportBase implements ITransport {
   }
 
   protected async currentCuratorLead (): Promise<GroupLeadWithMemberId | null> {
-    const optLeadId = (await this.cachedApi.query.contentWorkingGroup.currentLeadId()) as Option<LeadId>;
+    const optLeadId = (await this.cacheApi.query.contentWorkingGroup.currentLeadId()) as Option<LeadId>;
 
     if (!optLeadId.isSome) {
       return null;
     }
 
     const leadId = optLeadId.unwrap();
-    const lead = new SingleLinkedMapEntry<Lead>(
-      Lead,
-      await this.cachedApi.query.contentWorkingGroup.leadById(leadId)
-    );
+    const lead = await this.cacheApi.query.contentWorkingGroup.leadById(leadId) as Lead;
 
-    const memberId = lead.value.member_id;
+    if (lead.isEmpty || !lead.stage.isOfType('Active')) {
+      return null;
+    }
 
-    return {
-      lead: lead.value,
-      memberId
-    };
+    const memberId = lead.member_id;
+
+    return { lead, memberId };
   }
 
   protected async currentStorageLead (): Promise <GroupLeadWithMemberId | null> {
-    const optLeadId = (await this.cachedApi.query.storageWorkingGroup.currentLead()) as Option<WorkerId>;
+    const optLeadId = (await this.cacheApi.query.storageWorkingGroup.currentLead()) as Option<WorkerId>;
 
     if (!optLeadId.isSome) {
       return null;
     }
 
     const leadWorkerId = optLeadId.unwrap();
-    const leadWorkerLink = new SingleLinkedMapEntry(
-      Worker,
-      await this.cachedApi.query.storageWorkingGroup.workerById(leadWorkerId)
-    );
-    const leadWorker = leadWorkerLink.value;
+    const leadWorker = await this.cacheApi.query.storageWorkingGroup.workerById(leadWorkerId) as Worker;
 
-    if (!leadWorker.is_active) {
+    if (leadWorker.isEmpty) {
       return null;
     }
 
@@ -338,7 +317,7 @@ export class Transport extends TransportBase implements ITransport {
       : await this.currentStorageLead();
 
     if (currentLead !== null) {
-      const profile = await this.cachedApi.query.members.membershipById(currentLead.memberId) as Membership;
+      const profile = await this.cacheApi.query.members.membershipById(currentLead.memberId) as Membership;
 
       if (profile.handle.isEmpty) {
         throw new Error(`${group} lead profile not found!`);
@@ -377,29 +356,14 @@ export class Transport extends TransportBase implements ITransport {
     const leadRolesAvailable = await this.areGroupRolesOpen(group, true);
     const leadStatus = await this.groupLeadStatus(group);
 
-    const nextId = await this.cachedApiMethodByGroup(group, 'nextWorkerId')() as GroupWorkerId;
-
-    let workersWithIds: { worker: GroupWorker; id: GroupWorkerId }[] = [];
-    // This is chain specfic, but if next id is still 0, it means no workers have been added yet
-    if (!nextId.eq(0)) {
-      const values = new MultipleLinkedMapEntry<GroupWorkerId, GroupWorker>(
-        ActorId,
-        workingGroupsApiMapping[group].workerType,
-        await this.cachedApiMethodByGroup(group, 'workerById')() as GroupWorker
-      );
-
-      workersWithIds = values.linked_values
-        // First bind workers with ids
-        .map((worker, i) => ({ worker, id: values.linked_keys[i] }))
-        // Filter by: active and "not lead"
-        .filter(({ worker, id }) => worker.is_active && (!leadStatus.lead?.workerId || !id.eq(leadStatus.lead.workerId)));
-    }
+    const workers = (await this.entriesByIds<GroupWorkerId, GroupWorker>(
+        this.apiMethodByGroup(group, 'workerById')
+      ))
+      .filter(([id, worker]) => worker.is_active && (!leadStatus.lead?.workerId || !id.eq(leadStatus.lead.workerId)));
 
     return {
       leadStatus,
-      workers: await Promise.all(
-        workersWithIds.map(({ worker, id }) => this.groupMember(group, id, worker))
-      ),
+      workers: await Promise.all(workers.map(([id, worker]) => this.groupMember(group, id, worker))),
       workerRolesAvailable,
       leadRolesAvailable
     };
@@ -440,43 +404,29 @@ export class Transport extends TransportBase implements ITransport {
   }
 
   protected async opening (id: number): Promise<Opening> {
-    const opening = new SingleLinkedMapEntry<Opening>(
-      Opening,
-      await this.cachedApi.query.hiring.openingById(id)
-    );
+    const opening = await this.cacheApi.query.hiring.openingById(id) as Opening;
 
-    return opening.value;
+    return opening;
   }
 
   protected async groupOpeningApplications (group: WorkingGroups, groupOpeningId: number): Promise<WorkingGroupPair<Application, GroupApplication>[]> {
-    const output = new Array<WorkingGroupPair<Application, GroupApplication>>();
-
-    const nextAppid = (await this.cachedApiMethodByGroup(group, 'nextApplicationId')()) as GroupApplicationId;
-    for (let i = 0; i < nextAppid.toNumber(); i++) {
-      const cApplication = new SingleLinkedMapEntry<GroupApplication>(
-        workingGroupsApiMapping[group].applicationType,
-        await this.cachedApiMethodByGroup(group, 'applicationById')(i)
-      );
-
-      if (cApplication.value.opening_id.toNumber() !== groupOpeningId) {
-        continue;
-      }
+    const groupApplications = await this.entriesByIds<GroupApplicationId, GroupApplication>(
+      this.apiMethodByGroup(group, 'applicationById')
+    );
 
-      const appId = cApplication.value.application_id;
-      const baseApplications = new SingleLinkedMapEntry<Application>(
-        Application,
-        await this.cachedApi.query.hiring.applicationById(
-          appId
-        )
-      );
+    const openingGroupApplications = groupApplications
+      .filter(([id, groupApplication]) => groupApplication.opening_id.toNumber() === groupOpeningId);
 
-      output.push({
-        hiringModule: baseApplications.value,
-        workingGroup: cApplication.value
-      });
-    }
+    const openingHiringApplications = (await Promise.all(
+      openingGroupApplications.map(
+        ([id, groupApplication]) => this.cacheApi.query.hiring.applicationById(groupApplication.application_id)
+      )
+    )) as Application[];
 
-    return output;
+    return openingHiringApplications.map((hiringApplication, index) => ({
+      hiringModule: hiringApplication,
+      workingGroup: openingGroupApplications[index][1]
+    }));
   }
 
   async groupOpening (group: WorkingGroups, id: number): Promise<WorkingGroupOpening> {
@@ -485,10 +435,7 @@ export class Transport extends TransportBase implements ITransport {
       throw new Error('invalid id');
     }
 
-    const groupOpening = new SingleLinkedMapEntry<GroupOpening>(
-      workingGroupsApiMapping[group].openingType,
-      await this.cachedApiMethodByGroup(group, 'openingById')(id)
-    ).value;
+    const groupOpening = await this.cachedApiMethodByGroup(group, 'openingById')(id) as GroupOpening;
 
     const opening = await this.opening(
       groupOpening.hiring_opening_id.toNumber()
@@ -510,9 +457,9 @@ export class Transport extends TransportBase implements ITransport {
         maxNumberOfApplications: opening.max_applicants,
         requiredApplicationStake: stakes.application,
         requiredRoleStake: stakes.role,
-        defactoMinimumStake: new u128(0)
+        defactoMinimumStake: this.api.createType('u128', 0)
       },
-      defactoMinimumStake: new u128(0)
+      defactoMinimumStake: this.api.createType('u128', 0)
     });
   }
 
@@ -541,10 +488,8 @@ export class Transport extends TransportBase implements ITransport {
     );
   }
 
-  expectedBlockTime (): Promise<number> {
-    return this.promise<number>(
-      (this.api.consts.babe.expectedBlockTime as Moment).toNumber() / 1000
-    );
+  expectedBlockTime (): number {
+    return (this.api.consts.babe.expectedBlockTime as Moment).toNumber() / 1000;
   }
 
   async blockHash (height: number): Promise<string> {
@@ -560,10 +505,6 @@ export class Transport extends TransportBase implements ITransport {
     return new Date(blockTime.toNumber());
   }
 
-  transactionFee (): Promise<Balance> {
-    return this.promise<Balance>(new u128(5));
-  }
-
   accounts (): Subscribable<keyPairDetails[]> {
     return keyringOption.optionsSubject.pipe(
       map(accounts => {
@@ -572,8 +513,8 @@ export class Transport extends TransportBase implements ITransport {
           .map(async (result, k) => {
             return {
               shortName: result.name,
-              accountId: new GenericAccountId(result.value as string),
-              balance: await this.cachedApi.query.balances.freeBalance(result.value as string)
+              accountId: this.api.createType('AccountId', result.value),
+              balance: (await this.api.derive.balances.account(result.value as string)).freeBalance
             };
           });
       }),
@@ -627,51 +568,40 @@ export class Transport extends TransportBase implements ITransport {
   }
 
   async openingApplicationsByAddressAndGroup (group: WorkingGroups, roleKey: string): Promise<OpeningApplication[]> {
-    const applications = new MultipleLinkedMapEntry<GroupApplicationId, GroupApplication>(
-      ApplicationId,
-      workingGroupsApiMapping[group].applicationType,
-      await this.cachedApiMethodByGroup(group, 'applicationById')()
-    );
-
-    const myApps = applications.linked_values.filter(app => app.role_account_id.eq(roleKey));
-    const myAppIds = applications.linked_keys.filter((id, key) => applications.linked_values[key].role_account_id.eq(roleKey));
+    const myGroupApplications = (await this.entriesByIds<GroupApplicationId, GroupApplication>(
+        await this.apiMethodByGroup(group, 'applicationById')
+      ))
+      .filter(([id, groupApplication]) => groupApplication.role_account_id.eq(roleKey))
 
-    const hiringAppPairs = await Promise.all(
-      myApps.map(
-        async app => new SingleLinkedMapEntry<Application>(
-          Application,
-          await this.cachedApi.query.hiring.applicationById(
-            app.application_id
-          )
-        )
+    const myHiringApplications = await Promise.all(
+      myGroupApplications.map(
+        ([id, groupApplication]) => this.cacheApi.query.hiring.applicationById(groupApplication.application_id)
       )
-    );
-
-    const hiringApps = hiringAppPairs.map(app => app.value);
+    ) as Application[];
 
     const stakes = await Promise.all(
-      hiringApps.map(app => this.applicationStakes(app))
+      myHiringApplications.map(app => this.applicationStakes(app))
     );
 
     const openings = await Promise.all(
-      myApps.map(application => {
-        return this.groupOpening(group, application.opening_id.toNumber());
+      myGroupApplications.map(([id, groupApplication]) => {
+        return this.groupOpening(group, groupApplication.opening_id.toNumber());
       })
     );
 
     const allAppsByOpening = (await Promise.all(
-      myApps.map(application => {
-        return this.groupOpeningApplications(group, application.opening_id.toNumber());
-      })
+      myGroupApplications.map(([id, groupApplication]) => (
+        this.groupOpeningApplications(group, groupApplication.opening_id.toNumber())
+      ))
     ));
 
     return await Promise.all(
       openings.map(async (o, key) => {
         return {
-          id: myAppIds[key].toNumber(),
-          hired: isApplicationHired(hiringApps[key]),
-          cancelledReason: classifyApplicationCancellation(hiringApps[key]),
-          rank: await this.myApplicationRank(hiringApps[key], allAppsByOpening[key].map(a => a.hiringModule)),
+          id: myGroupApplications[key][0].toNumber(),
+          hired: isApplicationHired(myHiringApplications[key]),
+          cancelledReason: classifyApplicationCancellation(myHiringApplications[key]),
+          rank: await this.myApplicationRank(myHiringApplications[key], allAppsByOpening[key].map(a => a.hiringModule)),
           capacity: o.applications.maxNumberOfApplications,
           stage: o.stage,
           opening: o.opening,
@@ -696,30 +626,22 @@ export class Transport extends TransportBase implements ITransport {
   }
 
   async myRolesByGroup (group: WorkingGroups, roleKeyId: string): Promise<ActiveRole[]> {
-    const workers = new MultipleLinkedMapEntry<GroupWorkerId, GroupWorker>(
-      ActorId,
-      workingGroupsApiMapping[group].workerType,
-      await this.cachedApiMethodByGroup(group, 'workerById')()
+    const workers = await this.entriesByIds<GroupWorkerId, GroupWorker>(
+      this.apiMethodByGroup(group, 'workerById')
     );
 
     const groupLead = (await this.groupLeadStatus(group)).lead;
 
     return Promise.all(
       workers
-        .linked_values
-        .toArray()
-        // We need to associate worker ids with workers BEFORE filtering the array
-        .map((worker, index) => ({ worker, id: workers.linked_keys[index] }))
-        .filter(({ worker }) => worker.role_account_id.eq(roleKeyId) && worker.is_active)
-        .map(async workerWithId => {
-          const { worker, id } = workerWithId;
-
-          let stakeValue: Balance = new u128(0);
+        .filter(([id, worker]) => worker.role_account_id.eq(roleKeyId) && worker.is_active)
+        .map(async ([id, worker]) => {
+          let stakeValue: Balance = this.api.createType('u128', 0);
           if (worker.role_stake_profile && worker.role_stake_profile.isSome) {
             stakeValue = await this.workerStake(worker.role_stake_profile.unwrap());
           }
 
-          let earnedValue: Balance = new u128(0);
+          let earnedValue: Balance = this.api.createType('u128', 0);
           if (worker.reward_relationship && worker.reward_relationship.isSome) {
             earnedValue = await this.workerTotalReward(worker.reward_relationship.unwrap());
           }
@@ -768,7 +690,7 @@ export class Transport extends TransportBase implements ITransport {
     roleStake: Balance,
     applicationText: string): Promise<number> {
     return new Promise<number>((resolve, reject) => {
-      (this.cachedApi.query.members.memberIdsByControllerAccountId(sourceAccount) as Promise<Vec<MemberId>>)
+      (this.cacheApi.query.members.memberIdsByControllerAccountId(sourceAccount) as Promise<Vec<MemberId>>)
         .then(membershipIds => {
           if (membershipIds.length === 0) {
             reject(new Error('No membship ID associated with this address'));
@@ -786,7 +708,7 @@ export class Transport extends TransportBase implements ITransport {
             roleStake.eq(Zero) ? null : roleStake, // Role stake
             appStake.eq(Zero) ? null : appStake, // Application stake
             applicationText // Human readable text
-          ) as unknown as SubmittableExtrinsic;
+          );
 
           const txFailedCb = () => {
             reject(new Error('transaction failed'));
@@ -806,26 +728,28 @@ export class Transport extends TransportBase implements ITransport {
     });
   }
 
-  leaveRole (group: WorkingGroups, sourceAccount: string, id: number, rationale: string) {
+  leaveRole (group: WorkingGroups, sourceAccount: string, id: number, rationale: string, txSuccessCb?: () => void) {
     const tx = this.apiExtrinsicByGroup(group, 'leaveRole')(
       id,
       rationale
-    ) as unknown as SubmittableExtrinsic;
+    );
 
     this.queueExtrinsic({
       accountId: sourceAccount,
-      extrinsic: tx
+      extrinsic: tx,
+      txSuccessCb
     });
   }
 
-  withdrawApplication (group: WorkingGroups, sourceAccount: string, id: number) {
+  withdrawApplication (group: WorkingGroups, sourceAccount: string, id: number, txSuccessCb?: () => void) {
     const tx = this.apiExtrinsicByGroup(group, 'withdrawApplication')(
       id
-    ) as unknown as SubmittableExtrinsic;
+    );
 
     this.queueExtrinsic({
       accountId: sourceAccount,
-      extrinsic: tx
+      extrinsic: tx,
+      txSuccessCb
     });
   }
 }
diff --git a/pioneer/packages/joy-roles/src/transport.ts b/pioneer/packages/joy-roles/src/transport.ts
index 66c5bb0429..b3ad7ab15a 100644
--- a/pioneer/packages/joy-roles/src/transport.ts
+++ b/pioneer/packages/joy-roles/src/transport.ts
@@ -1,4 +1,4 @@
-import { Subscribable } from '@polkadot/joy-utils/index';
+import { Subscribable } from '@polkadot/joy-utils/react/helpers';
 import { Balance } from '@polkadot/types/interfaces';
 
 import { WorkingGroupMembership, GroupLeadStatus } from './tabs/WorkingGroup';
@@ -14,10 +14,9 @@ export interface ITransport {
   currentOpportunities: () => Promise<Array<WorkingGroupOpening>>;
   groupOpening: (group: WorkingGroups, id: number) => Promise<WorkingGroupOpening>;
   openingApplicationRanks: (group: WorkingGroups, openingId: number) => Promise<Balance[]>;
-  expectedBlockTime: () => Promise<number>;
+  expectedBlockTime: () => number;
   blockHash: (height: number) => Promise<string>;
   blockTimestamp: (height: number) => Promise<Date>;
-  transactionFee: () => Promise<Balance>;
   accounts: () => Subscribable<keyPairDetails[]>;
   openingApplicationsByAddress: (address: string) => Promise<OpeningApplication[]>;
   myRoles: (address: string) => Promise<ActiveRole[]>;
@@ -30,6 +29,6 @@ export interface ITransport {
     roleStake: Balance,
     applicationText: string
   ) => Promise<number>;
-  leaveRole: (group: WorkingGroups, sourceAccount: string, id: number, rationale: string) => void;
-  withdrawApplication: (group: WorkingGroups, sourceAccount: string, id: number) => void;
+  leaveRole: (group: WorkingGroups, sourceAccount: string, id: number, rationale: string, successCb?: () => void) => void;
+  withdrawApplication: (group: WorkingGroups, sourceAccount: string, id: number, successCb?: () => void) => void;
 }
diff --git a/pioneer/packages/joy-utils-old/src/Loadable.tsx b/pioneer/packages/joy-utils-old/src/Loadable.tsx
deleted file mode 100644
index 3f3f78d875..0000000000
--- a/pioneer/packages/joy-utils-old/src/Loadable.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-
-export function Loadable<P extends {[index: string]: any}> (required: string[], f: (props: P) => React.ReactNode | void): (props: P) => any {
-  const loading = <div className="spinner"></div>;
-
-  return (props: P) => {
-    if (!props) {
-      return loading;
-    }
-
-    for (const requirement of required) {
-      if (typeof props[requirement] === 'undefined') {
-        return loading;
-      }
-    }
-    return f(props);
-  };
-}
diff --git a/pioneer/packages/joy-utils-old/src/View.tsx b/pioneer/packages/joy-utils-old/src/View.tsx
deleted file mode 100644
index bd56d5df2d..0000000000
--- a/pioneer/packages/joy-utils-old/src/View.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import React, { useState, useEffect, useMemo } from 'react';
-
-import { Controller } from './Controller';
-
-export type Params = Map<string, string>
-
-const newParams = (): Params => {
-  return new Map<string, string>();
-};
-
-type viewProps = {
-  params?: Params;
-}
-
-type renderFn<C, S> = (state: S, controller: C, params: Params) => React.ReactElement | null
-
-export type ViewComponent<C, P = any, S = any> = React.FC<viewProps>
-export type ViewComponentFactory<C, P = any, S = any> = (controller: C) => React.FC<viewProps>
-
-type ViewPropsExplicit<C, S> = {
-  errorComponent?: React.ComponentType;
-  render: renderFn<C, S>;
-}
-
-type ViewProps<C, S> = ViewPropsExplicit<C, S> | renderFn<C, S>
-
-function DefaultError () {
-  return <p>There has been an error</p>;
-}
-
-export function View<C extends Controller<S, any>, S> (args: ViewProps<C, S>): ViewComponentFactory<C, S> {
-  return (controller: C) => {
-    return (props: viewProps, ctx: any): React.ReactElement | null => {
-      const [state, setState] = useState<S>(controller.state);
-
-      const onUpdate = (newState: S) => {
-        setState({ ...newState });
-      };
-
-      useEffect(() => {
-        controller.subscribe(onUpdate);
-        controller.dispatch(); // Dispatch on first subscription (in case there's was a re-render of the View)
-
-        return () => {
-          controller.unsubscribe(onUpdate);
-        };
-      }, []);
-
-      let context: Params;
-      if (typeof props.params !== 'undefined') {
-        context = props.params;
-      } else {
-        context = newParams();
-      }
-
-      let renderFn: renderFn<C, S>;
-      let Err: React.ComponentType = DefaultError;
-      if (typeof args === 'function') {
-        renderFn = args;
-      } else {
-        renderFn = args.render;
-
-        if (typeof args.errorComponent !== 'undefined') {
-          Err = args.errorComponent;
-        }
-      }
-
-      return useMemo(() => {
-        if (controller.hasError()) {
-          return Err ? <Err /> : null;
-        }
-        return renderFn(state, controller, context);
-      }, [state]);
-    };
-  };
-}
diff --git a/pioneer/packages/joy-utils-old/src/accounts.ts b/pioneer/packages/joy-utils/src/functions/accounts.ts
similarity index 78%
rename from pioneer/packages/joy-utils-old/src/accounts.ts
rename to pioneer/packages/joy-utils/src/functions/accounts.ts
index ece7d35c8c..09e40e00db 100644
--- a/pioneer/packages/joy-utils-old/src/accounts.ts
+++ b/pioneer/packages/joy-utils/src/functions/accounts.ts
@@ -4,16 +4,10 @@ import { KeypairType } from '@polkadot/util-crypto/types';
 
 import FileSaver from 'file-saver';
 import { DEV_PHRASE } from '@polkadot/keyring/defaults';
-import { InputAddress } from '@polkadot/react-components';
 import keyring from '@polkadot/ui-keyring';
 import { isHex, u8aToHex } from '@polkadot/util';
 import { keyExtractSuri, mnemonicGenerate, mnemonicValidate, randomAsU8a } from '@polkadot/util-crypto';
 
-import { ApiPromise } from '@polkadot/api';
-import { MemberId, Membership } from '@joystream/types/members';
-import { AccountId } from '@polkadot/types/interfaces';
-import { Vec } from '@polkadot/types/codec';
-
 export type SeedType = 'bip' | 'raw' | 'dev';
 
 export interface AddressState {
@@ -113,7 +107,6 @@ export function downloadAccount ({ json, pair }: CreateResult): void {
   const blob = new Blob([JSON.stringify(json)], { type: 'application/json; charset=utf-8' });
 
   FileSaver.saveAs(blob, `${pair.address}.json`);
-  InputAddress.setLastValue('account', pair.address);
 }
 
 export function createAccount (suri: string, pairType: KeypairType, name: string, password: string, success: string): ActionStatus {
@@ -140,19 +133,3 @@ export function createAccount (suri: string, pairType: KeypairType, name: string
 export function isPasswordValid (password: string): boolean {
   return password.length === 0 || keyring.isPassValid(password);
 }
-
-export type MemberFromAccount = { account: string; id: number; profile?: Membership };
-
-// TODO: Use transport instead (now that it's available in joy-utils)
-export async function memberFromAccount (api: ApiPromise, accountId: AccountId | string): Promise<MemberFromAccount> {
-  const [memberId] =
-    ((await api.query.members.memberIdsByRootAccountId(accountId)) as Vec<MemberId>)
-      .concat((await api.query.members.memberIdsByControllerAccountId(accountId)) as Vec<MemberId>);
-  const member = (await api.query.members.membershipById(memberId)) as Membership;
-
-  return {
-    account: accountId.toString(),
-    id: memberId.toNumber(),
-    profile: member.handle.isEmpty ? undefined : member
-  };
-}
diff --git a/pioneer/packages/joy-utils/src/react/components/index.tsx b/pioneer/packages/joy-utils/src/react/components/index.tsx
index 0ead2f86e7..abd71b9a2c 100644
--- a/pioneer/packages/joy-utils/src/react/components/index.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/index.tsx
@@ -2,3 +2,10 @@ export { default as Section } from './Section';
 export { default as TxButton } from './TxButton';
 export { MutedSpan, MutedDiv } from './MutedText';
 export { FlexCenter } from './FlexCenter';
+export { default as PromiseComponent } from './PromiseComponent';
+export { default as MemberByAccountPreview } from './MemberByAccountPreview';
+export { default as MemberProfilePreview } from './MemberProfilePreview';
+export { default as MembersDropdown } from './MembersDropdown';
+export { default as InputStake } from './InputStake';
+export { ApplicationsDetails, ApplicationsDetailsByIds } from './working-groups/ApplicationDetails';
+export { LeadInfo, LeadInfoFromId } from './working-groups/LeadInfo';
diff --git a/pioneer/packages/joy-utils-old/src/Controller.tsx b/pioneer/packages/joy-utils/src/react/helpers/Controller.tsx
similarity index 92%
rename from pioneer/packages/joy-utils-old/src/Controller.tsx
rename to pioneer/packages/joy-utils/src/react/helpers/Controller.tsx
index 42de82b760..ba0a1bcbe0 100644
--- a/pioneer/packages/joy-utils-old/src/Controller.tsx
+++ b/pioneer/packages/joy-utils/src/react/helpers/Controller.tsx
@@ -7,7 +7,7 @@ type errorProps = {
 export class Controller<S, T> extends Observable<S & errorProps, T> {
   onError (desc: any) {
     this.state._hasError = true;
-    console.log(desc);
+    console.error(desc);
     this.dispatch();
   }
 
diff --git a/pioneer/packages/joy-utils-old/src/Observable.ts b/pioneer/packages/joy-utils/src/react/helpers/Observable.ts
similarity index 87%
rename from pioneer/packages/joy-utils-old/src/Observable.ts
rename to pioneer/packages/joy-utils/src/react/helpers/Observable.ts
index 2a948b55ff..e3a6ba1c4b 100644
--- a/pioneer/packages/joy-utils-old/src/Observable.ts
+++ b/pioneer/packages/joy-utils/src/react/helpers/Observable.ts
@@ -4,9 +4,11 @@ export abstract class Observable<S extends { [key: string ]: any }, T> implement
   state: S
   protected transport: T
   protected observers: Observer<S>[] = []
+  protected initialState: S
 
   constructor (transport: T, initialState: S) {
-    this.state = initialState;
+    this.initialState = initialState;
+    this.state = { ...initialState };
     this.transport = transport;
   }
 
@@ -31,4 +33,6 @@ export abstract class Observable<S extends { [key: string ]: any }, T> implement
     }
     this.dispatch();
   }
+
+  public refreshState() { }
 }
diff --git a/pioneer/packages/joy-utils-old/src/Subscribable.ts b/pioneer/packages/joy-utils/src/react/helpers/Subscribable.ts
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/Subscribable.ts
rename to pioneer/packages/joy-utils/src/react/helpers/Subscribable.ts
diff --git a/pioneer/packages/joy-utils/src/react/helpers/index.ts b/pioneer/packages/joy-utils/src/react/helpers/index.ts
index f919989560..c4ced4c115 100644
--- a/pioneer/packages/joy-utils/src/react/helpers/index.ts
+++ b/pioneer/packages/joy-utils/src/react/helpers/index.ts
@@ -3,3 +3,8 @@ import React from 'react';
 export function componentName (WrappedComponent: React.ComponentType<any>) {
   return WrappedComponent.displayName || WrappedComponent.name || 'Component';
 }
+
+export { Controller } from './Controller';
+export { Observable } from './Observable';
+export { memoize } from './memoize';
+export { Subscribable } from './Subscribable';
diff --git a/pioneer/packages/joy-utils-old/src/memoize.ts b/pioneer/packages/joy-utils/src/react/helpers/memoize.ts
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/memoize.ts
rename to pioneer/packages/joy-utils/src/react/helpers/memoize.ts
diff --git a/pioneer/packages/joy-utils/src/react/hocs/Loadable.tsx b/pioneer/packages/joy-utils/src/react/hocs/Loadable.tsx
new file mode 100644
index 0000000000..7545cc9c81
--- /dev/null
+++ b/pioneer/packages/joy-utils/src/react/hocs/Loadable.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { componentName } from '../helpers';
+
+export function Loadable<P extends {[index: string]: any}>
+  (required: string[], Component: React.FC<P>): React.FC<P> {
+
+  const ResultComponent: React.FunctionComponent<P> = (props: P) => {
+    if (!props) {
+      return <div className="spinner"></div>;
+    }
+
+    for (const requirement of required) {
+      if (typeof props[requirement] === 'undefined') {
+        return <div className="spinner"></div>;
+      }
+    }
+    return <Component {...props} />;
+  };
+  ResultComponent.displayName = `Loadable(${componentName(Component)})`;
+
+  return ResultComponent;
+}
diff --git a/pioneer/packages/joy-utils/src/react/hocs/View.tsx b/pioneer/packages/joy-utils/src/react/hocs/View.tsx
new file mode 100644
index 0000000000..10eab1db11
--- /dev/null
+++ b/pioneer/packages/joy-utils/src/react/hocs/View.tsx
@@ -0,0 +1,71 @@
+import React, { useState, useEffect } from 'react';
+
+import { Controller } from '../helpers';
+
+export type ParamsMap = Map<string, string | undefined>
+
+type ViewRendererProps<C> = {
+  params?: Record<string, string | undefined>;
+  controller: C;
+}
+
+type RenderComponentProps<C, S> = {
+  state: S,
+  controller: C,
+  params: ParamsMap
+}
+type RenderComponent<C, S> = React.ComponentType<RenderComponentProps<C, S>>
+
+export type ViewRenderer<C> = React.FC<ViewRendererProps<C>>
+
+type ViewArgsExplicit<C, S> = {
+  errorComponent?: React.ComponentType;
+  renderComponent: RenderComponent<C, S>;
+}
+
+type ViewArgs<C, S> = ViewArgsExplicit<C, S> | RenderComponent<C, S>
+
+function DefaultError () {
+  return <p>There has been an error</p>;
+}
+
+export function View<C extends Controller<S, any>, S> (args: ViewArgs<C, S>): ViewRenderer<C> {
+    return (props: ViewRendererProps<C>): React.ReactElement | null => {
+      const { controller } = props;
+      const [state, setState] = useState<S>(controller.state);
+
+      const onUpdate = (newState: S) => {
+        setState({ ...newState });
+      };
+
+      useEffect(() => {
+        controller.subscribe(onUpdate);
+        controller.refreshState(); // Refresh controller state on View mount
+
+        return () => {
+          controller.unsubscribe(onUpdate);
+        };
+      }, []);
+
+      const params = props.params ? new Map(Object.entries(props.params)) : new Map<string, string | undefined>();
+
+      let RenderComponent: RenderComponent<C, S>;
+      let Err: React.ComponentType = DefaultError;
+      if (typeof args === 'function') {
+        RenderComponent = args;
+      } else {
+        RenderComponent = args.renderComponent;
+
+        if (typeof args.errorComponent !== 'undefined') {
+          Err = args.errorComponent;
+        }
+      }
+
+      if (controller.hasError()) {
+        return Err ? <Err /> : null;
+      }
+      else {
+        return <RenderComponent { ...{state, controller, params} } />;
+      }
+    };
+}
diff --git a/pioneer/packages/joy-utils/src/react/hocs/index.ts b/pioneer/packages/joy-utils/src/react/hocs/index.ts
new file mode 100644
index 0000000000..96a9ce4c92
--- /dev/null
+++ b/pioneer/packages/joy-utils/src/react/hocs/index.ts
@@ -0,0 +1,2 @@
+export { Loadable } from './Loadable';
+export { View } from './View';
diff --git a/pioneer/packages/joy-utils-old/src/Transport.ts b/pioneer/packages/joy-utils/src/transport/mock/base.ts
similarity index 51%
rename from pioneer/packages/joy-utils-old/src/Transport.ts
rename to pioneer/packages/joy-utils/src/transport/mock/base.ts
index fa212fe350..a6b590729d 100644
--- a/pioneer/packages/joy-utils-old/src/Transport.ts
+++ b/pioneer/packages/joy-utils/src/transport/mock/base.ts
@@ -1,4 +1,4 @@
-export abstract class Transport {
+export default abstract class BaseTransport {
   protected promise<T> (value: T, timeout?: number): Promise<T> {
     return new Promise<T>((resolve, reject) => {
       if (timeout) {
@@ -8,4 +8,12 @@ export abstract class Transport {
       }
     });
   }
+
+  protected simulateApiResponse<T> (value: T): Promise<T> {
+    return this.promise<T>(value, this.randomTimeout());
+  }
+
+  protected randomTimeout (min = 1, max = 20): number {
+    return Math.random() * (max - min) + min;
+  }
 }
diff --git a/pioneer/packages/react-components/src/styles/joystream.ts b/pioneer/packages/react-components/src/styles/joystream.ts
index 8f79fa4993..fecfcaf7a5 100644
--- a/pioneer/packages/react-components/src/styles/joystream.ts
+++ b/pioneer/packages/react-components/src/styles/joystream.ts
@@ -177,4 +177,10 @@ export default css`
       max-width: 10em;
     }
   }
+
+  /* Fix options inside struct UI bug */
+  .ui--Params-Struct + .ui--Param-Option-toggle {
+    bottom: auto;
+    top: 0;
+  }
 `;
diff --git a/pioneer/tsconfig.json b/pioneer/tsconfig.json
index 032ae0f2e3..c7da998ee4 100644
--- a/pioneer/tsconfig.json
+++ b/pioneer/tsconfig.json
@@ -7,7 +7,6 @@
     "packages/joy-forum/**/*",
     "packages/joy-help/**/*",
     "packages/joy-media/**/*",
-    "packages/joy-roles/**/*",
     "packages/joy-settings/**/*",
     "packages/joy-utils-old/**/*"
   ],
@@ -18,27 +17,17 @@
     "resolveJsonModule": true,
     "baseUrl": ".",
     "paths": {
-      "@polkadot/types/augment": [ "../types/src/definitions/augment-types.ts" ],
-      // "@joystream/types/": [ "../types/src/" ],
-      // "@joystream/types/*": [ "../types/src/*" ],
+      "@polkadot/types/augment": [ "../types/augment-codec/augment-types.ts" ],
       "@polkadot/joy-election/": [ "packages/joy-election/src/" ],
       "@polkadot/joy-election/*": [ "packages/joy-election/src/*" ],
-      // "@polkadot/joy-forum/": [ "packages/joy-forum/src/" ],
-      // "@polkadot/joy-forum/*": [ "packages/joy-forum/src/*" ],
-      // "@polkadot/joy-help/": [ "packages/joy-help/src/" ],
-      // "@polkadot/joy-help/*": [ "packages/joy-help/src/*" ],
-      // "@polkadot/joy-media/": [ "packages/joy-media/src/" ],
-      // "@polkadot/joy-media/*": [ "packages/joy-media/src/*" ],
       "@polkadot/joy-members/": [ "packages/joy-members/src/" ],
       "@polkadot/joy-members/*": [ "packages/joy-members/src/*" ],
       "@polkadot/joy-pages/": [ "packages/joy-pages/src/" ],
       "@polkadot/joy-pages/*": [ "packages/joy-pages/src/*" ],
       "@polkadot/joy-proposals/": [ "packages/joy-proposals/src/" ],
       "@polkadot/joy-proposals/*": [ "packages/joy-proposals/src/*" ],
-      // "@polkadot/joy-roles/": [ "packages/joy-roles/src/" ],
-      // "@polkadot/joy-roles/*": [ "packages/joy-roles/src/*" ],
-      // "@polkadot/joy-settings/": [ "packages/joy-settings/src/" ],
-      // "@polkadot/joy-settings/*": [ "packages/joy-settings/src/*" ],
+      "@polkadot/joy-roles/": [ "packages/joy-roles/src/" ],
+      "@polkadot/joy-roles/*": [ "packages/joy-roles/src/*" ],
       "@polkadot/joy-utils/": [ "packages/joy-utils/src/" ],
       "@polkadot/joy-utils/*": [ "packages/joy-utils/src/*" ],
       "@polkadot/apps/*": ["packages/apps/src/*"],
diff --git a/yarn.lock b/yarn.lock
index f109c1935a..8ec6fbf007 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1381,7 +1381,7 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.1", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2", "@babel/runtime@^7.9.6":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.1", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2", "@babel/runtime@^7.9.6":
   version "7.11.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
   integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
@@ -1839,6 +1839,18 @@
     jest-util "^26.2.0"
     slash "^3.0.0"
 
+"@jest/console@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.3.0.tgz#ed04063efb280c88ba87388b6f16427c0a85c856"
+  integrity sha512-/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    jest-message-util "^26.3.0"
+    jest-util "^26.3.0"
+    slash "^3.0.0"
+
 "@jest/core@^26.2.2":
   version "26.2.2"
   resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.2.2.tgz#63de01ffce967618003dd7a0164b05c8041b81a9"
@@ -1873,6 +1885,40 @@
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
+"@jest/core@^26.4.1":
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.4.1.tgz#04af2e4d985e035e13ef94d61d302a8458f587e9"
+  integrity sha512-EFziH1tJC5N8xb8OjUcQgyWdezJh6+zBX5p+9S7HR1jzBVeG8jCE/Edp7yqxW/cToLG/QKj8qrpox+HV9Qw1rw==
+  dependencies:
+    "@jest/console" "^26.3.0"
+    "@jest/reporters" "^26.4.1"
+    "@jest/test-result" "^26.3.0"
+    "@jest/transform" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.4"
+    jest-changed-files "^26.3.0"
+    jest-config "^26.4.1"
+    jest-haste-map "^26.3.0"
+    jest-message-util "^26.3.0"
+    jest-regex-util "^26.0.0"
+    jest-resolve "^26.4.0"
+    jest-resolve-dependencies "^26.4.1"
+    jest-runner "^26.4.1"
+    jest-runtime "^26.4.1"
+    jest-snapshot "^26.4.1"
+    jest-util "^26.3.0"
+    jest-validate "^26.4.0"
+    jest-watcher "^26.3.0"
+    micromatch "^4.0.2"
+    p-each-series "^2.1.0"
+    rimraf "^3.0.0"
+    slash "^3.0.0"
+    strip-ansi "^6.0.0"
+
 "@jest/environment@^26.2.0":
   version "26.2.0"
   resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.2.0.tgz#f6faee1630fcc2fad208953164bccb31dbe0e45f"
@@ -1883,6 +1929,16 @@
     "@types/node" "*"
     jest-mock "^26.2.0"
 
+"@jest/environment@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.3.0.tgz#e6953ab711ae3e44754a025f838bde1a7fd236a0"
+  integrity sha512-EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA==
+  dependencies:
+    "@jest/fake-timers" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    jest-mock "^26.3.0"
+
 "@jest/fake-timers@^26.2.0":
   version "26.2.0"
   resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.2.0.tgz#b485c57dc4c74d61406a339807a9af4bac74b75a"
@@ -1895,6 +1951,18 @@
     jest-mock "^26.2.0"
     jest-util "^26.2.0"
 
+"@jest/fake-timers@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.3.0.tgz#f515d4667a6770f60ae06ae050f4e001126c666a"
+  integrity sha512-ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    "@sinonjs/fake-timers" "^6.0.1"
+    "@types/node" "*"
+    jest-message-util "^26.3.0"
+    jest-mock "^26.3.0"
+    jest-util "^26.3.0"
+
 "@jest/globals@^26.2.0":
   version "26.2.0"
   resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.2.0.tgz#ad78f1104f250c1a4bf5184a2ba51facc59b23f6"
@@ -1904,6 +1972,15 @@
     "@jest/types" "^26.2.0"
     expect "^26.2.0"
 
+"@jest/globals@^26.4.1":
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.4.1.tgz#4e8f6721f081444eda86a7c3e4ceefcf2baa5de1"
+  integrity sha512-gdsHefnwjck+AwDUwW+6rmctmKEcZEEZ4F3PB5kKnub7r0dUoN1KVSyNRXtB5qpZgRYESnxgDXhpw/XYKIsAeg==
+  dependencies:
+    "@jest/environment" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    expect "^26.4.1"
+
 "@jest/reporters@^26.2.2":
   version "26.2.2"
   resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.2.2.tgz#5a8632ab410f4fc57782bc05dcf115e91818e869"
@@ -1936,6 +2013,38 @@
   optionalDependencies:
     node-notifier "^7.0.0"
 
+"@jest/reporters@^26.4.1":
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.4.1.tgz#3b4d6faf28650f3965f8b97bc3d114077fb71795"
+  integrity sha512-aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ==
+  dependencies:
+    "@bcoe/v8-coverage" "^0.2.3"
+    "@jest/console" "^26.3.0"
+    "@jest/test-result" "^26.3.0"
+    "@jest/transform" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    chalk "^4.0.0"
+    collect-v8-coverage "^1.0.0"
+    exit "^0.1.2"
+    glob "^7.1.2"
+    graceful-fs "^4.2.4"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-instrument "^4.0.3"
+    istanbul-lib-report "^3.0.0"
+    istanbul-lib-source-maps "^4.0.0"
+    istanbul-reports "^3.0.2"
+    jest-haste-map "^26.3.0"
+    jest-resolve "^26.4.0"
+    jest-util "^26.3.0"
+    jest-worker "^26.3.0"
+    slash "^3.0.0"
+    source-map "^0.6.0"
+    string-length "^4.0.1"
+    terminal-link "^2.0.0"
+    v8-to-istanbul "^5.0.1"
+  optionalDependencies:
+    node-notifier "^8.0.0"
+
 "@jest/source-map@^26.1.0":
   version "26.1.0"
   resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.1.0.tgz#a6a020d00e7d9478f4b690167c5e8b77e63adb26"
@@ -1945,6 +2054,15 @@
     graceful-fs "^4.2.4"
     source-map "^0.6.0"
 
+"@jest/source-map@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.3.0.tgz#0e646e519883c14c551f7b5ae4ff5f1bfe4fc3d9"
+  integrity sha512-hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ==
+  dependencies:
+    callsites "^3.0.0"
+    graceful-fs "^4.2.4"
+    source-map "^0.6.0"
+
 "@jest/test-result@^26.2.0":
   version "26.2.0"
   resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.2.0.tgz#51c9b165c8851cfcf7a3466019114785e154f76b"
@@ -1955,6 +2073,16 @@
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
+"@jest/test-result@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.3.0.tgz#46cde01fa10c0aaeb7431bf71e4a20d885bc7fdb"
+  integrity sha512-a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg==
+  dependencies:
+    "@jest/console" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    collect-v8-coverage "^1.0.0"
+
 "@jest/test-sequencer@^26.2.2":
   version "26.2.2"
   resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.2.2.tgz#5e8091f2e6c61fdf242af566cb820a4eadc6c4af"
@@ -1966,6 +2094,17 @@
     jest-runner "^26.2.2"
     jest-runtime "^26.2.2"
 
+"@jest/test-sequencer@^26.4.1":
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.4.1.tgz#b7cd13fedf4c1c20364bd40c134876b003f742e1"
+  integrity sha512-YR4PNPu1RVHxyv/HSQMjc+pBEWa6wuM7xbEX/u5M5FFg6ZM6m00m7Jf0fjRxGN6hZlY5vECmNhJu/kvJLrxR8w==
+  dependencies:
+    "@jest/test-result" "^26.3.0"
+    graceful-fs "^4.2.4"
+    jest-haste-map "^26.3.0"
+    jest-runner "^26.4.1"
+    jest-runtime "^26.4.1"
+
 "@jest/transform@^26.2.2":
   version "26.2.2"
   resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.2.2.tgz#86c005c8d5d749ac54d8df53ea58675fffe7a97e"
@@ -1987,6 +2126,27 @@
     source-map "^0.6.1"
     write-file-atomic "^3.0.0"
 
+"@jest/transform@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.3.0.tgz#c393e0e01459da8a8bfc6d2a7c2ece1a13e8ba55"
+  integrity sha512-Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^26.3.0"
+    babel-plugin-istanbul "^6.0.0"
+    chalk "^4.0.0"
+    convert-source-map "^1.4.0"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.2.4"
+    jest-haste-map "^26.3.0"
+    jest-regex-util "^26.0.0"
+    jest-util "^26.3.0"
+    micromatch "^4.0.2"
+    pirates "^4.0.1"
+    slash "^3.0.0"
+    source-map "^0.6.1"
+    write-file-atomic "^3.0.0"
+
 "@jest/types@^25.5.0":
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d"
@@ -2008,6 +2168,17 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
+"@jest/types@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.3.0.tgz#97627bf4bdb72c55346eef98e3b3f7ddc4941f71"
+  integrity sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^15.0.0"
+    chalk "^4.0.0"
+
 "@joystream/types@^0.12.0", "@nicaea/types@npm:@joystream/types@^0.12.0":
   name "@nicaea/types"
   version "0.12.0"
@@ -4212,6 +4383,11 @@
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
+"@types/faker@^4.1.8":
+  version "4.1.12"
+  resolved "https://registry.yarnpkg.com/@types/faker/-/faker-4.1.12.tgz#065d37343677df1aa757c622650bd14666c42602"
+  integrity sha512-0MEyzJrLLs1WaOCx9ULK6FzdCSj2EuxdSP9kvuxxdBEGujZYUOZ4vkPXdgu3dhyg/pOdn7VCatelYX7k0YShlA==
+
 "@types/file-saver@^2.0.1":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/file-saver/-/file-saver-2.0.1.tgz#e18eb8b069e442f7b956d313f4fadd3ef887354e"
@@ -4322,10 +4498,17 @@
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@^26.0.7":
-  version "26.0.9"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.9.tgz#0543b57da5f0cd949c5f423a00c56c492289c989"
-  integrity sha512-k4qFfJ5AUKrWok5KYXp2EPm89b0P/KZpl7Vg4XuOTVVQEhLDBDBU3iBFrjjdgd8fLw96aAtmnwhXHl63bWeBQQ==
+"@types/istanbul-reports@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
+  integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
+  dependencies:
+    "@types/istanbul-lib-report" "*"
+
+"@types/jest@26.x", "@types/jest@^26.0.10":
+  version "26.0.10"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.10.tgz#8faf7e9756c033c39014ae76a7329efea00ea607"
+  integrity sha512-i2m0oyh8w/Lum7wWK/YOZJakYF8Mx08UaKA1CtbmFeDquVhAEdA7znacsVSf2hJ1OQ/OfVMGN90pw/AtzF8s/Q==
   dependencies:
     jest-diff "^25.2.1"
     pretty-format "^25.2.1"
@@ -6231,6 +6414,20 @@ babel-jest@^26.2.2:
     graceful-fs "^4.2.4"
     slash "^3.0.0"
 
+babel-jest@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.3.0.tgz#10d0ca4b529ca3e7d1417855ef7d7bd6fc0c3463"
+  integrity sha512-sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g==
+  dependencies:
+    "@jest/transform" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/babel__core" "^7.1.7"
+    babel-plugin-istanbul "^6.0.0"
+    babel-preset-jest "^26.3.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    slash "^3.0.0"
+
 babel-loader@^8.0.4, babel-loader@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
@@ -6475,7 +6672,7 @@ babel-plugin-transform-undefined-to-void@^6.9.4:
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz#be241ca81404030678b748717322b89d0c8fe280"
   integrity sha1-viQcqBQEAwZ4t0hxcyK4nQyP4oA=
 
-babel-preset-current-node-syntax@^0.1.2:
+babel-preset-current-node-syntax@^0.1.2, babel-preset-current-node-syntax@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz#b4b547acddbf963cba555ba9f9cbbb70bfd044da"
   integrity sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ==
@@ -6500,6 +6697,14 @@ babel-preset-jest@^26.2.0:
     babel-plugin-jest-hoist "^26.2.0"
     babel-preset-current-node-syntax "^0.1.2"
 
+babel-preset-jest@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz#ed6344506225c065fd8a0b53e191986f74890776"
+  integrity sha512-5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw==
+  dependencies:
+    babel-plugin-jest-hoist "^26.2.0"
+    babel-preset-current-node-syntax "^0.1.3"
+
 "babel-preset-minify@^0.5.0 || 0.6.0-alpha.5":
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.5.1.tgz#25f5d0bce36ec818be80338d0e594106e21eaa9f"
@@ -6983,6 +7188,13 @@ browserslist@^4.12.0, browserslist@^4.13.0, browserslist@^4.8.5:
     escalade "^3.0.1"
     node-releases "^1.1.58"
 
+bs-logger@0.x:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
+  integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
+  dependencies:
+    fast-json-stable-stringify "2.x"
+
 bs58@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a"
@@ -7035,7 +7247,7 @@ buffer-fill@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
   integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
 
-buffer-from@^1.0.0:
+buffer-from@1.x, buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
@@ -8175,6 +8387,11 @@ commander@~2.19.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
+commandpost@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/commandpost/-/commandpost-1.4.0.tgz#89218012089dfc9b67a337ba162f15c88e0f1048"
+  integrity sha512-aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -9067,6 +9284,11 @@ cyclist@^1.0.1:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
+d3-array@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
+  integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==
+
 d@1, d@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
@@ -9613,6 +9835,11 @@ diff-sequences@^26.0.0:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.0.0.tgz#0760059a5c287637b842bd7085311db7060e88a6"
   integrity sha512-JC/eHYEC3aSS0vZGjuoc4vHA0yAQTzhQQldXMeMF+JlxLGJlCO38Gma82NV9gk1jGFz8mDzUMeaKXvjRRdJ2dg==
 
+diff-sequences@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.3.0.tgz#62a59b1b29ab7fd27cef2a33ae52abe73042d0a2"
+  integrity sha512-5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig==
+
 diff@3.5.0, diff@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
@@ -9945,6 +10172,16 @@ editions@^2.2.0:
     errlop "^1.1.2"
     semver "^6.3.0"
 
+editorconfig@^0.15.0:
+  version "0.15.3"
+  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
+  integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
+  dependencies:
+    commander "^2.19.0"
+    lru-cache "^4.1.5"
+    semver "^5.6.0"
+    sigmund "^1.0.1"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -11101,6 +11338,18 @@ expect@^26.2.0:
     jest-message-util "^26.2.0"
     jest-regex-util "^26.0.0"
 
+expect@^26.4.1:
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-26.4.1.tgz#6ed3dc218e6a9ffce16c15edc518f44bad9a6731"
+  integrity sha512-PnsyF/VmPRH/HAWELjrIAgQ5h+4JLTiomA1A2djx+jXrCQzQ/4egZYBOEx9hShoX+mQLS4enYk6Ouxk8b4kcEw==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    ansi-styles "^4.0.0"
+    jest-get-type "^26.3.0"
+    jest-matcher-utils "^26.4.1"
+    jest-message-util "^26.3.0"
+    jest-regex-util "^26.0.0"
+
 express-normalize-query-params-middleware@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/express-normalize-query-params-middleware/-/express-normalize-query-params-middleware-0.5.1.tgz#dbe1e8139aecb234fb6adb5c0059c75db9733d2a"
@@ -11233,6 +11482,11 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
+faker@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f"
+  integrity sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=
+
 fancy-test@^1.4.3:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/fancy-test/-/fancy-test-1.4.8.tgz#995c3d684f045149b399ee16784a80fbb50298db"
@@ -11297,6 +11551,11 @@ fast-glob@^3.1.1, fast-glob@^3.2.4:
     micromatch "^4.0.2"
     picomatch "^2.2.1"
 
+fast-json-stable-stringify@2.x:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
@@ -15004,6 +15263,15 @@ jest-changed-files@^26.2.0:
     execa "^4.0.0"
     throat "^5.0.0"
 
+jest-changed-files@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.3.0.tgz#68fb2a7eb125f50839dab1f5a17db3607fe195b1"
+  integrity sha512-1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    execa "^4.0.0"
+    throat "^5.0.0"
+
 jest-cli@^26.2.2:
   version "26.2.2"
   resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.2.2.tgz#4c273e5474baafac1eb15fd25aaafb4703f5ffbc"
@@ -15023,6 +15291,25 @@ jest-cli@^26.2.2:
     prompts "^2.0.1"
     yargs "^15.3.1"
 
+jest-cli@^26.4.1:
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.4.1.tgz#877fff1c17661c7bbd8e7df56711ee489091236f"
+  integrity sha512-c6px+IOO0OsZ7X/uSr65wcjZnd7NYNUDWFT5OETyCnJRkkwoTER7gneRDrwgr3Ex5+gCGO7D/IMWxUHB/L624A==
+  dependencies:
+    "@jest/core" "^26.4.1"
+    "@jest/test-result" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    chalk "^4.0.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.4"
+    import-local "^3.0.2"
+    is-ci "^2.0.0"
+    jest-config "^26.4.1"
+    jest-util "^26.3.0"
+    jest-validate "^26.4.0"
+    prompts "^2.0.1"
+    yargs "^15.3.1"
+
 jest-config@^26.2.2:
   version "26.2.2"
   resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.2.2.tgz#f3ebc7e2bc3f49de8ed3f8007152f345bb111917"
@@ -15047,6 +15334,30 @@ jest-config@^26.2.2:
     micromatch "^4.0.2"
     pretty-format "^26.2.0"
 
+jest-config@^26.4.1:
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.4.1.tgz#16b5a8e25c43279025718b1678115e39607f914f"
+  integrity sha512-0kUnVceEax0sYN+wdkNYF7fxjYKbsvmKmjVWwJvsSYA2p94bIL6wSy3oehewev7L9Dp/FDZFhmc9dyOoavdT6A==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/test-sequencer" "^26.4.1"
+    "@jest/types" "^26.3.0"
+    babel-jest "^26.3.0"
+    chalk "^4.0.0"
+    deepmerge "^4.2.2"
+    glob "^7.1.1"
+    graceful-fs "^4.2.4"
+    jest-environment-jsdom "^26.3.0"
+    jest-environment-node "^26.3.0"
+    jest-get-type "^26.3.0"
+    jest-jasmine2 "^26.4.1"
+    jest-regex-util "^26.0.0"
+    jest-resolve "^26.4.0"
+    jest-util "^26.3.0"
+    jest-validate "^26.4.0"
+    micromatch "^4.0.2"
+    pretty-format "^26.4.0"
+
 jest-diff@^25.2.1:
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9"
@@ -15067,6 +15378,16 @@ jest-diff@^26.2.0:
     jest-get-type "^26.0.0"
     pretty-format "^26.2.0"
 
+jest-diff@^26.4.0:
+  version "26.4.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.4.0.tgz#d073a0a11952b5bd9f1ff39bb9ad24304a0c55f7"
+  integrity sha512-wwC38HlOW+iTq6j5tkj/ZamHn6/nrdcEOc/fKaVILNtN2NLWGdkfRaHWwfNYr5ehaLvuoG2LfCZIcWByVj0gjg==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^26.3.0"
+    jest-get-type "^26.3.0"
+    pretty-format "^26.4.0"
+
 jest-docblock@^26.0.0:
   version "26.0.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5"
@@ -15085,6 +15406,17 @@ jest-each@^26.2.0:
     jest-util "^26.2.0"
     pretty-format "^26.2.0"
 
+jest-each@^26.4.0:
+  version "26.4.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.4.0.tgz#c53605b20e7a0a58d6dcf4d8b2f309e607d35d5a"
+  integrity sha512-+cyBh1ehs6thVT/bsZVG+WwmRn2ix4Q4noS9yLZgM10yGWPW12/TDvwuOV2VZXn1gi09/ZwJKJWql6YW1C9zNw==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    chalk "^4.0.0"
+    jest-get-type "^26.3.0"
+    jest-util "^26.3.0"
+    pretty-format "^26.4.0"
+
 jest-environment-jsdom@^26.2.0:
   version "26.2.0"
   resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.2.0.tgz#6443a6f3569297dcaa4371dddf93acaf167302dc"
@@ -15098,6 +15430,19 @@ jest-environment-jsdom@^26.2.0:
     jest-util "^26.2.0"
     jsdom "^16.2.2"
 
+jest-environment-jsdom@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz#3b749ba0f3a78e92ba2c9ce519e16e5dd515220c"
+  integrity sha512-zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA==
+  dependencies:
+    "@jest/environment" "^26.3.0"
+    "@jest/fake-timers" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    jest-mock "^26.3.0"
+    jest-util "^26.3.0"
+    jsdom "^16.2.2"
+
 jest-environment-node@^26.2.0:
   version "26.2.0"
   resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.2.0.tgz#fee89e06bdd4bed3f75ee2978d73ede9bb57a681"
@@ -15110,6 +15455,18 @@ jest-environment-node@^26.2.0:
     jest-mock "^26.2.0"
     jest-util "^26.2.0"
 
+jest-environment-node@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.3.0.tgz#56c6cfb506d1597f94ee8d717072bda7228df849"
+  integrity sha512-c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw==
+  dependencies:
+    "@jest/environment" "^26.3.0"
+    "@jest/fake-timers" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    jest-mock "^26.3.0"
+    jest-util "^26.3.0"
+
 jest-get-type@^25.2.6:
   version "25.2.6"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877"
@@ -15120,6 +15477,11 @@ jest-get-type@^26.0.0:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.0.0.tgz#381e986a718998dbfafcd5ec05934be538db4039"
   integrity sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==
 
+jest-get-type@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
+  integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
+
 jest-haste-map@^26.2.2:
   version "26.2.2"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.2.2.tgz#6d4267b1903854bfdf6a871419f35a82f03ae71e"
@@ -15141,6 +15503,27 @@ jest-haste-map@^26.2.2:
   optionalDependencies:
     fsevents "^2.1.2"
 
+jest-haste-map@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.3.0.tgz#c51a3b40100d53ab777bfdad382d2e7a00e5c726"
+  integrity sha512-DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    "@types/graceful-fs" "^4.1.2"
+    "@types/node" "*"
+    anymatch "^3.0.3"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.2.4"
+    jest-regex-util "^26.0.0"
+    jest-serializer "^26.3.0"
+    jest-util "^26.3.0"
+    jest-worker "^26.3.0"
+    micromatch "^4.0.2"
+    sane "^4.0.3"
+    walker "^1.0.7"
+  optionalDependencies:
+    fsevents "^2.1.2"
+
 jest-jasmine2@^26.2.2:
   version "26.2.2"
   resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.2.2.tgz#d82b1721fac2b153a4f8b3f0c95e81e702812de2"
@@ -15165,6 +15548,30 @@ jest-jasmine2@^26.2.2:
     pretty-format "^26.2.0"
     throat "^5.0.0"
 
+jest-jasmine2@^26.4.1:
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.4.1.tgz#85f5997720332bedaa64b65b1e7b01074d8485c1"
+  integrity sha512-GMPqJXyAWpohCg4wfA82lwac65lmgANH4/rOhNNaAN9yjInMAeMExQcWE1xb3fcCgLwibqeAuqVrV83oQl+szg==
+  dependencies:
+    "@babel/traverse" "^7.1.0"
+    "@jest/environment" "^26.3.0"
+    "@jest/source-map" "^26.3.0"
+    "@jest/test-result" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    co "^4.6.0"
+    expect "^26.4.1"
+    is-generator-fn "^2.0.0"
+    jest-each "^26.4.0"
+    jest-matcher-utils "^26.4.1"
+    jest-message-util "^26.3.0"
+    jest-runtime "^26.4.1"
+    jest-snapshot "^26.4.1"
+    jest-util "^26.3.0"
+    pretty-format "^26.4.0"
+    throat "^5.0.0"
+
 jest-leak-detector@^26.2.0:
   version "26.2.0"
   resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.2.0.tgz#073ee6d8db7a9af043e7ce99d8eea17a4fb0cc50"
@@ -15173,6 +15580,14 @@ jest-leak-detector@^26.2.0:
     jest-get-type "^26.0.0"
     pretty-format "^26.2.0"
 
+jest-leak-detector@^26.4.0:
+  version "26.4.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.4.0.tgz#1efeeef693af3c9332062876add5ac5f25cb0a70"
+  integrity sha512-7EXKKEKnAWUPyiVtGZzJflbPOtYUdlNoevNVOkAcPpdR8xWiYKPGNGA6sz25S+8YhZq3rmkQJYAh3/P0VnoRwA==
+  dependencies:
+    jest-get-type "^26.3.0"
+    pretty-format "^26.4.0"
+
 jest-matcher-utils@^26.2.0:
   version "26.2.0"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.2.0.tgz#b107af98c2b8c557ffd46c1adf06f794aa52d622"
@@ -15183,6 +15598,16 @@ jest-matcher-utils@^26.2.0:
     jest-get-type "^26.0.0"
     pretty-format "^26.2.0"
 
+jest-matcher-utils@^26.4.1:
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.4.1.tgz#f9f2d1d37d301e328eb22e9df09e7343d6cc1b25"
+  integrity sha512-nmHWaOz54R/w6zJju5tuW0bw6+m38Rb1jnDKehKM/bOngDDL0UwtN634cRxpFoUNVRUrX8Wa0Z34xq/f8iuP5A==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^26.4.0"
+    jest-get-type "^26.3.0"
+    pretty-format "^26.4.0"
+
 jest-message-util@^26.2.0:
   version "26.2.0"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.2.0.tgz#757fbc1323992297092bb9016a71a2eb12fd22ea"
@@ -15197,6 +15622,20 @@ jest-message-util@^26.2.0:
     slash "^3.0.0"
     stack-utils "^2.0.2"
 
+jest-message-util@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.3.0.tgz#3bdb538af27bb417f2d4d16557606fd082d5841a"
+  integrity sha512-xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@jest/types" "^26.3.0"
+    "@types/stack-utils" "^1.0.1"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    micromatch "^4.0.2"
+    slash "^3.0.0"
+    stack-utils "^2.0.2"
+
 jest-mock@^26.2.0:
   version "26.2.0"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.2.0.tgz#a1b3303ab38c34aa1dbbc16ab57cdc1a59ed50d1"
@@ -15205,6 +15644,14 @@ jest-mock@^26.2.0:
     "@jest/types" "^26.2.0"
     "@types/node" "*"
 
+jest-mock@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.3.0.tgz#ee62207c3c5ebe5f35b760e1267fee19a1cfdeba"
+  integrity sha512-PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+
 jest-pnp-resolver@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
@@ -15224,6 +15671,15 @@ jest-resolve-dependencies@^26.2.2:
     jest-regex-util "^26.0.0"
     jest-snapshot "^26.2.2"
 
+jest-resolve-dependencies@^26.4.1:
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.1.tgz#8e7cd28a1774cfdd64bb79b77ef8cd07e0f35598"
+  integrity sha512-Gx4JfQ1k/hGb4lqVOOx8TPOkNtyJIQSHcJU68pB+sdyDJi9rbMxD1XXiYyaEq9WXufiZo90k9GTK6z6a5m0SQw==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    jest-regex-util "^26.0.0"
+    jest-snapshot "^26.4.1"
+
 jest-resolve@^26.2.2:
   version "26.2.2"
   resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.2.2.tgz#324a20a516148d61bffa0058ed0c77c510ecfd3e"
@@ -15238,6 +15694,20 @@ jest-resolve@^26.2.2:
     resolve "^1.17.0"
     slash "^3.0.0"
 
+jest-resolve@^26.4.0:
+  version "26.4.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.4.0.tgz#6dc0af7fb93e65b73fec0368ca2b76f3eb59a6d7"
+  integrity sha512-bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    jest-pnp-resolver "^1.2.2"
+    jest-util "^26.3.0"
+    read-pkg-up "^7.0.1"
+    resolve "^1.17.0"
+    slash "^3.0.0"
+
 jest-runner@^26.2.2:
   version "26.2.2"
   resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.2.2.tgz#6d03d057886e9c782e10b2cf37443f902fe0e39e"
@@ -15264,6 +15734,32 @@ jest-runner@^26.2.2:
     source-map-support "^0.5.6"
     throat "^5.0.0"
 
+jest-runner@^26.4.1:
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.4.1.tgz#5a98c87b558aacf88e761d5ee83e98bfb0a59839"
+  integrity sha512-QcKwn1YNlzFumTtFsocETgIm13KNt2X8sae4wcqsF3JnxGUcYYUGBstCQhtAG4fKD/TKThHkgE/ZgQVKipj7oA==
+  dependencies:
+    "@jest/console" "^26.3.0"
+    "@jest/environment" "^26.3.0"
+    "@jest/test-result" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    emittery "^0.7.1"
+    exit "^0.1.2"
+    graceful-fs "^4.2.4"
+    jest-config "^26.4.1"
+    jest-docblock "^26.0.0"
+    jest-haste-map "^26.3.0"
+    jest-leak-detector "^26.4.0"
+    jest-message-util "^26.3.0"
+    jest-resolve "^26.4.0"
+    jest-runtime "^26.4.1"
+    jest-util "^26.3.0"
+    jest-worker "^26.3.0"
+    source-map-support "^0.5.6"
+    throat "^5.0.0"
+
 jest-runtime@^26.2.2:
   version "26.2.2"
   resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.2.2.tgz#2480ff79320680a643031dd21998d7c63d83ab68"
@@ -15296,6 +15792,38 @@ jest-runtime@^26.2.2:
     strip-bom "^4.0.0"
     yargs "^15.3.1"
 
+jest-runtime@^26.4.1:
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.4.1.tgz#9a6ffefc7167b0f244e0907f4820ab38d825cdd2"
+  integrity sha512-zXPQBS4iL/CEZtDfX+rDz+oZ/inQK/EYOeVt3uDWu8kwSdP/Cw4yOZtCTPApeNsGtZy6X5WQ1U+fyagN1B/Qkw==
+  dependencies:
+    "@jest/console" "^26.3.0"
+    "@jest/environment" "^26.3.0"
+    "@jest/fake-timers" "^26.3.0"
+    "@jest/globals" "^26.4.1"
+    "@jest/source-map" "^26.3.0"
+    "@jest/test-result" "^26.3.0"
+    "@jest/transform" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/yargs" "^15.0.0"
+    chalk "^4.0.0"
+    collect-v8-coverage "^1.0.0"
+    exit "^0.1.2"
+    glob "^7.1.3"
+    graceful-fs "^4.2.4"
+    jest-config "^26.4.1"
+    jest-haste-map "^26.3.0"
+    jest-message-util "^26.3.0"
+    jest-mock "^26.3.0"
+    jest-regex-util "^26.0.0"
+    jest-resolve "^26.4.0"
+    jest-snapshot "^26.4.1"
+    jest-util "^26.3.0"
+    jest-validate "^26.4.0"
+    slash "^3.0.0"
+    strip-bom "^4.0.0"
+    yargs "^15.3.1"
+
 jest-serializer@^26.2.0:
   version "26.2.0"
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.2.0.tgz#92dcae5666322410f4bf50211dd749274959ddac"
@@ -15304,6 +15832,14 @@ jest-serializer@^26.2.0:
     "@types/node" "*"
     graceful-fs "^4.2.4"
 
+jest-serializer@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.3.0.tgz#1c9d5e1b74d6e5f7e7f9627080fa205d976c33ef"
+  integrity sha512-IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow==
+  dependencies:
+    "@types/node" "*"
+    graceful-fs "^4.2.4"
+
 jest-snapshot@^26.2.2:
   version "26.2.2"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.2.2.tgz#9d2eda083a4a1017b157e351868749bd63211799"
@@ -15325,6 +15861,39 @@ jest-snapshot@^26.2.2:
     pretty-format "^26.2.0"
     semver "^7.3.2"
 
+jest-snapshot@^26.4.1:
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.4.1.tgz#41dd85c41dbb76ac874e36c18dcfe722c88d22c4"
+  integrity sha512-5DsxbSSuYA8rZ/ynO+l5J65wSIyzDB2AXjuIvep90YmtslrROqDtba2hBgq1Cj6L6A0j/jv6h8JydEe2WYPM/g==
+  dependencies:
+    "@babel/types" "^7.0.0"
+    "@jest/types" "^26.3.0"
+    "@types/prettier" "^2.0.0"
+    chalk "^4.0.0"
+    expect "^26.4.1"
+    graceful-fs "^4.2.4"
+    jest-diff "^26.4.0"
+    jest-get-type "^26.3.0"
+    jest-haste-map "^26.3.0"
+    jest-matcher-utils "^26.4.1"
+    jest-message-util "^26.3.0"
+    jest-resolve "^26.4.0"
+    natural-compare "^1.4.0"
+    pretty-format "^26.4.0"
+    semver "^7.3.2"
+
+jest-util@26.x, jest-util@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.3.0.tgz#a8974b191df30e2bf523ebbfdbaeb8efca535b3e"
+  integrity sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    is-ci "^2.0.0"
+    micromatch "^4.0.2"
+
 jest-util@^26.2.0:
   version "26.2.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.2.0.tgz#0597d2a27c559340957609f106c408c17c1d88ac"
@@ -15349,6 +15918,18 @@ jest-validate@^26.2.0:
     leven "^3.1.0"
     pretty-format "^26.2.0"
 
+jest-validate@^26.4.0:
+  version "26.4.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.4.0.tgz#3874a7cc9e27328afac88899ee9e2fae5e3a4293"
+  integrity sha512-t56Z/FRMrLP6mpmje7/YgHy0wOzcuc6i3LBXz6kjmsUWYN62OuMdC86Vg9/dX59SvyitSqqegOrx+h7BkNXeaQ==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    camelcase "^6.0.0"
+    chalk "^4.0.0"
+    jest-get-type "^26.3.0"
+    leven "^3.1.0"
+    pretty-format "^26.4.0"
+
 jest-watcher@^26.2.0:
   version "26.2.0"
   resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.2.0.tgz#45bdf2fecadd19c0a501f3b071a474dca636825b"
@@ -15362,6 +15943,19 @@ jest-watcher@^26.2.0:
     jest-util "^26.2.0"
     string-length "^4.0.1"
 
+jest-watcher@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.3.0.tgz#f8ef3068ddb8af160ef868400318dc4a898eed08"
+  integrity sha512-XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ==
+  dependencies:
+    "@jest/test-result" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    jest-util "^26.3.0"
+    string-length "^4.0.1"
+
 jest-worker@^25.4.0:
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz#2611d071b79cea0f43ee57a3d118593ac1547db1"
@@ -15379,6 +15973,15 @@ jest-worker@^26.2.1:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
+jest-worker@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f"
+  integrity sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^7.0.0"
+
 jest@^26.2.2:
   version "26.2.2"
   resolved "https://registry.yarnpkg.com/jest/-/jest-26.2.2.tgz#a022303887b145147204c5f66e6a5c832333c7e7"
@@ -15388,6 +15991,15 @@ jest@^26.2.2:
     import-local "^3.0.2"
     jest-cli "^26.2.2"
 
+jest@^26.4.1:
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-26.4.1.tgz#4c187999c9af761eba862d720f66f43e80b8d12f"
+  integrity sha512-q+az+ZXFOTxTlD6BRIMcZC+a33O9lsryV4Wo9gU4D/AI+Y6KKgVRCmyzpc4H2gWv0rn45lACukmMS2uSB7e1LA==
+  dependencies:
+    "@jest/core" "^26.4.1"
+    import-local "^3.0.2"
+    jest-cli "^26.4.1"
+
 jquery@x.*:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
@@ -15544,6 +16156,13 @@ json3@^3.3.2:
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
   integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
 
+json5@2.x, json5@^2.1.0, json5@^2.1.1, json5@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+  dependencies:
+    minimist "^1.2.5"
+
 json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
@@ -15556,13 +16175,6 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.0, json5@^2.1.1, json5@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
-  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
-  dependencies:
-    minimist "^1.2.5"
-
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -16263,7 +16875,7 @@ lodash.kebabcase@^4.0.1, lodash.kebabcase@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
   integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY=
 
-lodash.memoize@^4.1.2:
+lodash.memoize@4.x, lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
@@ -16450,7 +17062,7 @@ lowlight@~1.11.0:
     fault "^1.0.2"
     highlight.js "~9.13.0"
 
-lru-cache@^4.0.1, lru-cache@^4.1.2:
+lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -16566,7 +17178,7 @@ make-dir@^3.0.2:
   dependencies:
     semver "^6.0.0"
 
-make-error@^1.1.1:
+make-error@1.x, make-error@^1.1.1:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
@@ -17244,7 +17856,7 @@ mkdirp-promise@^5.0.1:
   dependencies:
     mkdirp "*"
 
-mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
+mkdirp@*, mkdirp@1.x, mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -17848,6 +18460,18 @@ node-notifier@^7.0.0:
     uuid "^8.2.0"
     which "^2.0.2"
 
+node-notifier@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz#a7eee2d51da6d0f7ff5094bc7108c911240c1620"
+  integrity sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==
+  dependencies:
+    growly "^1.3.0"
+    is-wsl "^2.2.0"
+    semver "^7.3.2"
+    shellwords "^0.1.1"
+    uuid "^8.3.0"
+    which "^2.0.2"
+
 node-pre-gyp@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
@@ -19816,6 +20440,16 @@ pretty-format@^26.2.0:
     ansi-styles "^4.0.0"
     react-is "^16.12.0"
 
+pretty-format@^26.4.0:
+  version "26.4.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.4.0.tgz#c08073f531429e9e5024049446f42ecc9f933a3b"
+  integrity sha512-mEEwwpCseqrUtuMbrJG4b824877pM5xald3AkilJ47Po2YLr97/siejYQHqj2oDQBeJNbu+Q0qUuekJ8F0NAPg==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    ansi-regex "^5.0.0"
+    ansi-styles "^4.0.0"
+    react-is "^16.12.0"
+
 pretty-hrtime@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
@@ -20415,6 +21049,16 @@ react-color@^2.17.0:
     reactcss "^1.2.0"
     tinycolor2 "^1.4.1"
 
+react-compound-slider@^2.4.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/react-compound-slider/-/react-compound-slider-2.5.0.tgz#99771a3397f4ab00aa2a37f8410da87e6ca2449b"
+  integrity sha512-T84FtSI0bkQPmH5GaaHbL+2McOyIR6M5sqS80dqw/bHc5r2UKLYY64BWTbsL+XO0jlx7REuJJnZUBqo4eSRl7g==
+  dependencies:
+    "@babel/runtime" "^7.7.7"
+    d3-array "^1.2.4"
+    prop-types "^15.7.2"
+    warning "^3.0.0"
+
 react-copy-to-clipboard@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.2.tgz#d82a437e081e68dfca3761fbd57dbf2abdda1316"
@@ -20593,6 +21237,18 @@ react-markdown@^4.0.6, react-markdown@^4.3.1:
     unist-util-visit "^1.3.0"
     xtend "^4.0.1"
 
+react-moment@^0.9.6:
+  version "0.9.7"
+  resolved "https://registry.yarnpkg.com/react-moment/-/react-moment-0.9.7.tgz#ca570466595b1aa4f7619e62da18b3bb2de8b6f3"
+  integrity sha512-ifzUrUGF6KRsUN2pRG5k56kO0mJBr8kRkWb0wNvtFIsBIxOuPxhUpL1YlXwpbQCbHq23hUu6A0VEk64HsFxk9g==
+
+react-number-format@^4.3.1:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/react-number-format/-/react-number-format-4.4.1.tgz#d5614dd25edfc21ed48b97356213440081437a94"
+  integrity sha512-ZGFMXZ0U7DcmQ3bSZY3FULOA1mfqreT9NIMYZNoa/ouiSgiTQiYA95Uj2KN8ge6BRr+ghA5vraozqWqsHZQw3Q==
+  dependencies:
+    prop-types "^15.7.2"
+
 react-popper-tooltip@^2.8.3:
   version "2.11.1"
   resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-2.11.1.tgz#3c4bdfd8bc10d1c2b9a162e859bab8958f5b2644"
@@ -20687,6 +21343,11 @@ react-select@^3.0.8:
     react-input-autosize "^2.2.2"
     react-transition-group "^4.3.0"
 
+react-semantic-ui-range@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/react-semantic-ui-range/-/react-semantic-ui-range-0.7.0.tgz#54054eaddfe6e45b21863ef02f62022338db66fb"
+  integrity sha512-1Y0GakHM+9gvEpPDbzRFvwHsmPtTRH0lLEAx2Ho2rhH9q7S+goTjgHlEUXlvXS/WbBtwVDqfpzXSj+JO8p0nmQ==
+
 react-sizeme@^2.6.7:
   version "2.6.12"
   resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-2.6.12.tgz#ed207be5476f4a85bf364e92042520499455453e"
@@ -22030,16 +22691,16 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
+semver@7.x, semver@^7.2.1, semver@^7.3.2:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+
 semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
-  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
-
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -22260,6 +22921,11 @@ side-channel@^1.0.2:
     es-abstract "^1.17.0-next.1"
     object-inspect "^1.7.0"
 
+sigmund@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -24214,6 +24880,23 @@ ts-dedent@^1.1.0:
   resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-1.1.1.tgz#68fad040d7dbd53a90f545b450702340e17d18f3"
   integrity sha512-UGTRZu1evMw4uTPyYF66/KFd22XiU+jMaIuHrkIHQ2GivAXVlLV0v/vHrpOuTRf9BmpNHi/SO7Vd0rLu0y57jg==
 
+ts-jest@^26.2.0:
+  version "26.2.0"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.2.0.tgz#7ec22faceb05ee1467fdb5265d1b33c27441f163"
+  integrity sha512-9+y2qwzXdAImgLSYLXAb/Rhq9+K4rbt0417b8ai987V60g2uoNWBBmMkYgutI7D8Zhu+IbCSHbBtrHxB9d7xyA==
+  dependencies:
+    "@types/jest" "26.x"
+    bs-logger "0.x"
+    buffer-from "1.x"
+    fast-json-stable-stringify "2.x"
+    jest-util "26.x"
+    json5 "2.x"
+    lodash.memoize "4.x"
+    make-error "1.x"
+    mkdirp "1.x"
+    semver "7.x"
+    yargs-parser "18.x"
+
 ts-log@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-2.1.4.tgz#063c5ad1cbab5d49d258d18015963489fb6fb59a"
@@ -24420,6 +25103,14 @@ typedoc@^0.17.8:
     shelljs "^0.8.4"
     typedoc-default-themes "^0.10.2"
 
+typescript-formatter@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/typescript-formatter/-/typescript-formatter-7.2.2.tgz#a147181839b7bb09c2377b072f20f6336547c00a"
+  integrity sha512-V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ==
+  dependencies:
+    commandpost "^1.0.0"
+    editorconfig "^0.15.0"
+
 typescript@^3.0.3, typescript@^3.7.2, typescript@^3.7.5, typescript@^3.8.3, typescript@^3.9.5, typescript@^3.9.6, typescript@^3.9.7:
   version "3.9.7"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
@@ -24983,7 +25674,7 @@ uuid@^7.0.3:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
   integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
 
-uuid@^8.2.0:
+uuid@^8.2.0, uuid@^8.3.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
   integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==
@@ -25007,6 +25698,15 @@ v8-to-istanbul@^4.1.3:
     convert-source-map "^1.6.0"
     source-map "^0.7.3"
 
+v8-to-istanbul@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz#0608f5b49a481458625edb058488607f25498ba5"
+  integrity sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.1"
+    convert-source-map "^1.6.0"
+    source-map "^0.7.3"
+
 validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -25309,6 +26009,13 @@ walker@^1.0.7, walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
+warning@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
+  integrity sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=
+  dependencies:
+    loose-envify "^1.0.0"
+
 warning@^4.0.2, warning@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
@@ -25961,6 +26668,14 @@ yapool@^1.0.0:
   resolved "https://registry.yarnpkg.com/yapool/-/yapool-1.0.0.tgz#f693f29a315b50d9a9da2646a7a6645c96985b6a"
   integrity sha1-9pPymjFbUNmp2iZGp6ZkXJaYW2o=
 
+yargs-parser@18.x, yargs-parser@^18.1.2, yargs-parser@^18.1.3:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^10.0.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
@@ -25992,14 +26707,6 @@ yargs-parser@^15.0.0:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^18.1.2, yargs-parser@^18.1.3:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"

From c68011f10124b9b93e4c00577618e69aca703a3d Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Fri, 21 Aug 2020 12:51:23 +0200
Subject: [PATCH 12/17] Lint autofix

---
 .../joy-roles/src/StakeRequirement.tsx        |   1 +
 .../packages/joy-roles/src/balances.spec.ts   |   5 +
 pioneer/packages/joy-roles/src/balances.ts    |   3 +
 .../joy-roles/src/classifiers.spec.ts         |   6 +-
 pioneer/packages/joy-roles/src/classifiers.ts |  17 +-
 pioneer/packages/joy-roles/src/elements.tsx   |  27 ++-
 .../joy-roles/src/flows/apply.controller.tsx  |  12 +-
 .../src/flows/apply.elements.stories.tsx      |  42 ++--
 .../joy-roles/src/flows/apply.stories.tsx     |   8 +-
 .../packages/joy-roles/src/flows/apply.tsx    | 209 ++++++++++--------
 .../packages/joy-roles/src/tabs.stories.tsx   |   2 +-
 .../joy-roles/src/tabs/Admin.controller.tsx   | 154 ++++++-------
 .../joy-roles/src/tabs/MyRoles.controller.tsx |  16 +-
 .../src/tabs/MyRoles.elements.stories.tsx     |  35 ++-
 .../joy-roles/src/tabs/MyRoles.stories.tsx    |  12 +-
 .../packages/joy-roles/src/tabs/MyRoles.tsx   |  53 +++--
 .../src/tabs/Opportunities.controller.tsx     |  10 +-
 .../tabs/Opportunities.elements.stories.tsx   |  26 +--
 .../src/tabs/Opportunities.stories.tsx        |  16 +-
 .../joy-roles/src/tabs/Opportunities.tsx      | 119 +++++-----
 .../src/tabs/Opportunity.controller.tsx       |   9 +-
 .../src/tabs/WorkingGroup.controller.tsx      |   8 +-
 .../joy-roles/src/tabs/WorkingGroup.tsx       |   4 +-
 .../packages/joy-roles/src/transport.mock.ts  |   3 +-
 .../joy-roles/src/transport.substrate.ts      |  73 +++---
 .../joy-utils/src/react/helpers/Observable.ts |   8 +-
 .../src/react/helpers/Subscribable.ts         |   6 +-
 .../joy-utils/src/react/helpers/memoize.ts    |   1 +
 .../joy-utils/src/react/hocs/Loadable.tsx     |   9 +-
 .../joy-utils/src/react/hocs/View.tsx         |  60 ++---
 .../joy-utils/src/transport/mock/base.ts      |   2 +-
 31 files changed, 514 insertions(+), 442 deletions(-)

diff --git a/pioneer/packages/joy-roles/src/StakeRequirement.tsx b/pioneer/packages/joy-roles/src/StakeRequirement.tsx
index 31a025295c..2a766e645f 100644
--- a/pioneer/packages/joy-roles/src/StakeRequirement.tsx
+++ b/pioneer/packages/joy-roles/src/StakeRequirement.tsx
@@ -34,6 +34,7 @@ export abstract class StakeRequirement {
     if (this.type === StakeType.AtLeast) {
       return 'at least';
     }
+
     return null;
   }
 
diff --git a/pioneer/packages/joy-roles/src/balances.spec.ts b/pioneer/packages/joy-roles/src/balances.spec.ts
index e586587408..c919490130 100644
--- a/pioneer/packages/joy-roles/src/balances.spec.ts
+++ b/pioneer/packages/joy-roles/src/balances.spec.ts
@@ -5,6 +5,7 @@ import { Avg, AvgDelta, Min, Step, Sum } from './balances';
 describe('Balance arithmetic', (): void => {
   it('Can calculate a sum', (): void => {
     const input: Balance[] = [];
+
     for (let i = 0; i < 10; i++) {
       input.push(createMock('u128', i));
     }
@@ -14,6 +15,7 @@ describe('Balance arithmetic', (): void => {
 
   it('Can calculate an average', (): void => {
     const input: Balance[] = [];
+
     for (let i = 0; i < 10; i++) {
       input.push(createMock('u128', i));
     }
@@ -23,6 +25,7 @@ describe('Balance arithmetic', (): void => {
 
   it('Can calculate an average delta', (): void => {
     const input: Balance[] = [];
+
     for (let i = 0; i < 10; i++) {
       input.push(createMock('u128', i));
     }
@@ -32,6 +35,7 @@ describe('Balance arithmetic', (): void => {
 
   it('Can calculate a step value with large numbers', (): void => {
     const input: Balance[] = [];
+
     for (let i = 0; i < 10; i++) {
       input.push(createMock('u128', i * 10));
     }
@@ -41,6 +45,7 @@ describe('Balance arithmetic', (): void => {
 
   it('Can calculate a step value with small numbers', (): void => {
     const input: Balance[] = [];
+
     for (let i = 0; i < 10; i++) {
       input.push(createMock('u128', i));
     }
diff --git a/pioneer/packages/joy-roles/src/balances.ts b/pioneer/packages/joy-roles/src/balances.ts
index 5846c7fb0f..d174544005 100644
--- a/pioneer/packages/joy-roles/src/balances.ts
+++ b/pioneer/packages/joy-roles/src/balances.ts
@@ -30,6 +30,7 @@ export const AvgDelta = (xs: Balance[]): Balance => {
 // An average value to 'step' up balances, like on the nudge controls for a slider
 export const Step = (xs: Balance[], ticks = 10): Balance => createMock('Balance', Avg(xs).divn(ticks));
 export const Min = (x: Balance, min: Balance = One): Balance => x.gte(min) ? x : min;
+
 export const Sort = (xs: Balance[]): Balance[] => {
   xs.sort((a, b): number => {
     if (a.eq(b)) {
@@ -37,7 +38,9 @@ export const Sort = (xs: Balance[]): Balance[] => {
     } else if (a.gt(b)) {
       return 1;
     }
+
     return -1;
   });
+
   return xs;
 };
diff --git a/pioneer/packages/joy-roles/src/classifiers.spec.ts b/pioneer/packages/joy-roles/src/classifiers.spec.ts
index 5919ebe246..2a91191a1c 100644
--- a/pioneer/packages/joy-roles/src/classifiers.spec.ts
+++ b/pioneer/packages/joy-roles/src/classifiers.spec.ts
@@ -1,10 +1,8 @@
 import { Opening } from '@joystream/types/hiring';
 
-import {
-  OpeningState,
+import { OpeningState,
   IBlockQueryer,
-  classifyOpeningStage, OpeningStageClassification
-} from './classifiers';
+  classifyOpeningStage, OpeningStageClassification } from './classifiers';
 import { createMock } from '@joystream/types';
 
 class MockBlockQueryer {
diff --git a/pioneer/packages/joy-roles/src/classifiers.ts b/pioneer/packages/joy-roles/src/classifiers.ts
index 4bc2dd7ce4..fe3b4a427d 100644
--- a/pioneer/packages/joy-roles/src/classifiers.ts
+++ b/pioneer/packages/joy-roles/src/classifiers.ts
@@ -3,8 +3,7 @@ import moment from 'moment';
 import { Option } from '@polkadot/types';
 import { Balance } from '@polkadot/types/interfaces';
 
-import {
-  Application,
+import { Application,
   AcceptingApplications, ReviewPeriod,
   WaitingToBeingOpeningStageVariant,
   ActiveOpeningStageVariant,
@@ -16,15 +15,12 @@ import {
   ApplicationStageKeys,
   ApplicationDeactivationCause, ApplicationDeactivationCauseKeys,
   UnstakingApplicationStage,
-  InactiveApplicationStage
-} from '@joystream/types/hiring';
+  InactiveApplicationStage } from '@joystream/types/hiring';
 
-import {
-  StakeRequirement,
+import { StakeRequirement,
   ApplicationStakeRequirement,
   RoleStakeRequirement,
-  StakeType
-} from './StakeRequirement';
+  StakeType } from './StakeRequirement';
 import { createMock } from '@joystream/types';
 
 export enum CancelledReason {
@@ -62,6 +58,7 @@ async function classifyActiveOpeningStageAcceptingApplications (
   stage: AcceptingApplications
 ): Promise<OpeningStageClassification> {
   const blockNumber = stage.started_accepting_applicants_at_block.toNumber();
+
   return {
     state: OpeningState.AcceptingApplications,
     starting_block: blockNumber,
@@ -138,6 +135,7 @@ async function classifyActiveOpeningStage (
       stage.stage.asType('AcceptingApplications')
     );
   }
+
   if (stage.stage.isOfType('ReviewPeriod')) {
     return classifyActiveOpeningStageReviewPeriod(
       opening,
@@ -145,6 +143,7 @@ async function classifyActiveOpeningStage (
       stage.stage.asType('ReviewPeriod')
     );
   }
+
   if (stage.stage.isOfType('Deactivated')) {
     return classifyActiveOpeningStageDeactivated(
       queryer,
@@ -161,6 +160,7 @@ async function classifyWaitingToBeginStage (
   stage: WaitingToBeingOpeningStageVariant
 ): Promise<OpeningStageClassification> {
   const blockNumber = opening.created.toNumber();
+
   return {
     state: OpeningState.WaitingToBegin,
     starting_block: blockNumber,
@@ -241,6 +241,7 @@ export function classifyOpeningStakes (opening: Opening): StakeRequirementSetCla
 
 function classifyApplicationCancellationFromCause (cause: ApplicationDeactivationCause): CancelledReason | undefined {
   console.log(cause.type);
+
   switch (cause.type) {
     case ApplicationDeactivationCauseKeys.External:
       return CancelledReason.ApplicantCancelled;
diff --git a/pioneer/packages/joy-roles/src/elements.tsx b/pioneer/packages/joy-roles/src/elements.tsx
index 5af9089c51..bf3dfeb772 100644
--- a/pioneer/packages/joy-roles/src/elements.tsx
+++ b/pioneer/packages/joy-roles/src/elements.tsx
@@ -21,7 +21,7 @@ type BalanceProps = {
 
 export function BalanceView (props: BalanceProps) {
   return (
-    <div className="balance">
+    <div className='balance'>
       <span>Balance:</span> {formatBalance(props.balance)}
     </div>
   );
@@ -65,6 +65,7 @@ export type GroupLead = {
 
 export function GroupLeadView (props: GroupLead) {
   let avatar = <Identicon value={props.roleAccount.toString()} size={50} />;
+
   if (typeof props.profile.avatar_uri !== 'undefined' && props.profile.avatar_uri.toString() !== '') {
     avatar = <Image src={props.profile.avatar_uri.toString()} circular className='avatar' />;
   }
@@ -72,7 +73,7 @@ export function GroupLeadView (props: GroupLead) {
   const { stake, rewardRelationship } = props;
 
   return (
-    <Card color='grey' className="staked-card">
+    <Card color='grey' className='staked-card'>
       <Card.Content>
         <Image floated='right'>
           {avatar}
@@ -86,7 +87,7 @@ export function GroupLeadView (props: GroupLead) {
         </Card.Meta>
         <Card.Description>
           <Label color='teal'>
-            <Icon name="shield" />
+            <Icon name='shield' />
             { props.title }
             <Label.Detail>{/* ... */}</Label.Detail>
           </Label>
@@ -115,8 +116,8 @@ export function GroupMemberDetails (props: GroupMemberDetailsProps) {
 
   if (props.stake && props.stake.toNumber() > 0) {
     details.push(
-      <Label color="green">
-        <Icon name="shield" />
+      <Label color='green'>
+        <Icon name='shield' />
         Staked
         <Label.Detail>{formatBalance(props.stake)}</Label.Detail>
       </Label>
@@ -129,6 +130,7 @@ export function GroupMemberDetails (props: GroupMemberDetailsProps) {
 
   if (props.rewardRelationship) {
     const reward = props.rewardRelationship;
+
     details.push(
       <Label>Reward <Label.Detail>{formatReward(reward)}</Label.Detail></Label>
     );
@@ -159,7 +161,7 @@ export function GroupMemberDetails (props: GroupMemberDetailsProps) {
           </StakeAndReward>
         </Card.Description>
       ) }
-      <Button onClick={ () => setShowDetails(v => !v) } size="tiny" fluid>
+      <Button onClick={ () => setShowDetails((v) => !v) } size='tiny' fluid>
         { showDetails ? 'Hide' : 'Show'} details
       </Button>
     </Card.Content>
@@ -168,6 +170,7 @@ export function GroupMemberDetails (props: GroupMemberDetailsProps) {
 
 export function GroupMemberView (props: GroupMember) {
   let avatar = <Identicon value={props.roleAccount.toString()} size={50} />;
+
   if (typeof props.profile.avatar_uri !== 'undefined' && props.profile.avatar_uri.toString() !== '') {
     avatar = <Image src={props.profile.avatar_uri.toString()} circular className='avatar' />;
   }
@@ -175,7 +178,7 @@ export function GroupMemberView (props: GroupMember) {
   const { stake, rewardRelationship } = props;
 
   return (
-    <Card color='grey' className="staked-card">
+    <Card color='grey' className='staked-card'>
       <Card.Content>
         <Image floated='right'>
           {avatar}
@@ -209,6 +212,7 @@ export function Countdown (props: CountdownProps) {
     const then = moment(props.end);
     const now = moment();
     const d = moment.duration(then.diff(now));
+
     setDays(d.days());
     setHours(d.hours());
     setMinutes(d.minutes());
@@ -219,6 +223,7 @@ export function Countdown (props: CountdownProps) {
 
   useEffect(() => {
     update();
+
     return () => {
       clearInterval(interval);
     };
@@ -230,19 +235,19 @@ export function Countdown (props: CountdownProps) {
 
   return (
     <div className='countdown wrapper'>
-      <Statistic size="tiny">
+      <Statistic size='tiny'>
         <Statistic.Value>{days}</Statistic.Value>
         <Statistic.Label>Days</Statistic.Label>
       </Statistic>
-      <Statistic size="tiny">
+      <Statistic size='tiny'>
         <Statistic.Value>{hours}</Statistic.Value>
         <Statistic.Label>hours</Statistic.Label>
       </Statistic>
-      <Statistic size="tiny">
+      <Statistic size='tiny'>
         <Statistic.Value>{minutes}</Statistic.Value>
         <Statistic.Label>minutes</Statistic.Label>
       </Statistic>
-      <Statistic size="tiny">
+      <Statistic size='tiny'>
         <Statistic.Value>{seconds}</Statistic.Value>
         <Statistic.Label>seconds</Statistic.Label>
       </Statistic>
diff --git a/pioneer/packages/joy-roles/src/flows/apply.controller.tsx b/pioneer/packages/joy-roles/src/flows/apply.controller.tsx
index 88aa5e2dbd..e1330fe23b 100644
--- a/pioneer/packages/joy-roles/src/flows/apply.controller.tsx
+++ b/pioneer/packages/joy-roles/src/flows/apply.controller.tsx
@@ -75,7 +75,7 @@ export class ApplyController extends Controller<State, ITransport> {
   }
 
   protected parseGroup (group: string | undefined): WorkingGroups | undefined {
-    return AvailableGroups.find(availableGroup => availableGroup === group);
+    return AvailableGroups.find((availableGroup) => availableGroup === group);
   }
 
   protected updateAccounts (keys: keyPairDetails[]) {
@@ -87,6 +87,7 @@ export class ApplyController extends Controller<State, ITransport> {
     if (!rawId) {
       return this.onError('ApplyController: no ID provided in params');
     }
+
     const id = parseInt(rawId);
     const group = this.parseGroup(rawGroup);
 
@@ -194,14 +195,16 @@ export class ApplyController extends Controller<State, ITransport> {
     this.state.transactionDetails.set('Total commitment', formatBalance(totalCommitment));
 
     this.dispatch();
+
     return true;
   }
 
   private updateRoleKeyName () {
     let roleKeyNamePrefix = 0;
+
     do {
       this.state.roleKeyName = `${this.state.roleKeyNameBase}${(++roleKeyNamePrefix > 1 ? ` ${roleKeyNamePrefix}` : '')}`;
-    } while (this.state.keypairs?.some(k => (
+    } while (this.state.keypairs?.some((k) => (
       k.shortName.toLowerCase() === this.state.roleKeyName.toLowerCase()
     )));
   }
@@ -210,7 +213,9 @@ export class ApplyController extends Controller<State, ITransport> {
     if (!this.currentGroup || this.currentOpeningId < 0) {
       throw new Error('Trying to apply to unfetched opening');
     }
+
     this.updateRoleKeyName();
+
     return this.transport.applyToOpening(
       this.currentGroup,
       this.currentOpeningId,
@@ -227,7 +232,8 @@ export const ApplyView = View<ApplyController, State>(
   ({ state, controller, params }) => {
     useEffect(() => {
       controller.findOpening(params.get('id'), params.get('group'));
-    }, [params.get('id'), params.get('group')])
+    }, [params.get('id'), params.get('group')]);
+
     return (
       <FlowModal
         role={state.role!}
diff --git a/pioneer/packages/joy-roles/src/flows/apply.elements.stories.tsx b/pioneer/packages/joy-roles/src/flows/apply.elements.stories.tsx
index 916876029d..1c00257b9d 100644
--- a/pioneer/packages/joy-roles/src/flows/apply.elements.stories.tsx
+++ b/pioneer/packages/joy-roles/src/flows/apply.elements.stories.tsx
@@ -8,27 +8,19 @@ import { Card, Container, Message } from 'semantic-ui-react';
 import { u128, GenericAccountId } from '@polkadot/types';
 import { Balance } from '@polkadot/types/interfaces';
 
-import {
-  ApplicationDetails
-} from '@joystream/types/schemas/role.schema';
-import {
-  ConfirmStakesStage, ConfirmStakesStageProps,
+import { ApplicationDetails } from '@joystream/types/schemas/role.schema';
+import { ConfirmStakesStage, ConfirmStakesStageProps,
   ProgressStepsView, ProgressStepsProps, ProgressSteps,
   ApplicationDetailsStage, ApplicationDetailsStageProps,
   SubmitApplicationStage, SubmitApplicationStageProps,
   DoneStage, DoneStageProps,
   FundSourceSelector,
   StakeRankSelector, StakeRankSelectorProps,
-  ConfirmStakes2Up, ConfirmStakes2UpProps
-} from './apply';
-import {
-  OpeningStakeAndApplicationStatus
-} from '../tabs/Opportunities';
-import {
-  ApplicationStakeRequirement,
+  ConfirmStakes2Up, ConfirmStakes2UpProps } from './apply';
+import { OpeningStakeAndApplicationStatus } from '../tabs/Opportunities';
+import { ApplicationStakeRequirement,
   RoleStakeRequirement,
-  StakeType
-} from '../StakeRequirement';
+  StakeType } from '../StakeRequirement';
 
 import 'semantic-ui-css/semantic.min.css';
 import '@polkadot/joy-roles/index.sass';
@@ -89,7 +81,7 @@ export function ProgressIndicator () {
   return (
     <Container>
       {permutations.map((permutation, key) => (
-        <Container className="outer" key={key}>
+        <Container className='outer' key={key}>
           <h4>{permutation._description}</h4>
           <Card fluid>
             <ProgressStepsView {...permutation} />
@@ -126,7 +118,7 @@ export function FundSourceSelectorFragment () {
   };
 
   return (
-    <Container className="apply-flow">
+    <Container className='apply-flow'>
       <Card fluid>
         <Card.Content>
           <FundSourceSelector {...props}
@@ -148,6 +140,7 @@ export function StakeRankSelectorFragment () {
 
   // List of the minimum stake required to beat each rank
   const slots: Balance[] = [];
+
   for (let i = 0; i < 10; i++) {
     slots.push(new u128((i * 100) + 10 + i + 1));
   }
@@ -160,7 +153,7 @@ export function StakeRankSelectorFragment () {
   };
 
   return (
-    <Container className="apply-flow">
+    <Container className='apply-flow'>
       <Card fluid>
         <Message info>
           <StakeRankSelector {...props} />
@@ -180,6 +173,7 @@ export function SelectTwoMinimumStakes () {
 
   // List of the minimum stake required to beat each rank
   const slots: Balance[] = [];
+
   for (let i = 0; i < 20; i++) {
     slots.push(new u128((i * 100) + 10 + i + 1));
   }
@@ -202,7 +196,7 @@ export function SelectTwoMinimumStakes () {
   };
 
   return (
-    <Container className="apply-flow">
+    <Container className='apply-flow'>
       <Card fluid>
         <Card.Content>
           <ConfirmStakes2Up {...props} />
@@ -392,11 +386,13 @@ export function StageAConfirmStakes () {
 
   // List of the minimum stake required to beat each rank
   const slots: Balance[] = [];
+
   for (let i = 0; i < 20; i++) {
     slots.push(new u128((i * 100) + 10 + i + 1));
   }
 
   const renders = [];
+
   permutations.map((permutation, key) => {
     const [applicationStake, setApplicationStake] = useState(new u128(0));
     const [roleStake, setRoleStake] = useState<Balance>(new u128(0));
@@ -411,7 +407,7 @@ export function StageAConfirmStakes () {
 
     renders.push(
       (
-        <Container className="outer" key={key}>
+        <Container className='outer' key={key}>
           <h4>{key}. {permutation._description}</h4>
           <Card fluid>
             <ConfirmStakesStage {...permutation}
@@ -436,7 +432,7 @@ export function StageAConfirmStakes () {
   });
 
   return (
-    <Container className="apply-flow">
+    <Container className='apply-flow'>
       {renders.map((render, key) => (
         <div key={key}>{render}</div>
       ))}
@@ -484,7 +480,7 @@ export function StageBApplicationDetails () {
   };
 
   return (
-    <Container className="apply-flow">
+    <Container className='apply-flow'>
       <Card fluid>
         <Card.Content>
           <ApplicationDetailsStage {...props} />
@@ -526,7 +522,7 @@ export function StageCSubmitApplication () {
   };
 
   return (
-    <Container className="apply-flow">
+    <Container className='apply-flow'>
       <Card fluid>
         <Card.Content>
           <SubmitApplicationStage {...props} />
@@ -543,7 +539,7 @@ export function StageDDone () {
   };
 
   return (
-    <Container className="apply-flow">
+    <Container className='apply-flow'>
       <Card fluid>
         <DoneStage {...props} />
       </Card>
diff --git a/pioneer/packages/joy-roles/src/flows/apply.stories.tsx b/pioneer/packages/joy-roles/src/flows/apply.stories.tsx
index 16c8d5d303..963388421e 100644
--- a/pioneer/packages/joy-roles/src/flows/apply.stories.tsx
+++ b/pioneer/packages/joy-roles/src/flows/apply.stories.tsx
@@ -9,10 +9,8 @@ import { u128, GenericAccountId } from '@polkadot/types';
 import { Balance } from '@polkadot/types/interfaces';
 
 import { FlowModal } from './apply';
-import {
-  ApplicationStakeRequirement, RoleStakeRequirement,
-  StakeType
-} from '../StakeRequirement';
+import { ApplicationStakeRequirement, RoleStakeRequirement,
+  StakeType } from '../StakeRequirement';
 
 import 'semantic-ui-css/semantic.min.css';
 import '@polkadot/joy-roles/index.sass';
@@ -50,9 +48,11 @@ function mockPromise<T = any> (): () => Promise<T> {
 export const ApplicationSandbox = () => {
   // List of the minimum stake required to beat each rank
   const slots: Balance[] = [];
+
   for (let i = 0; i < 20; i++) {
     slots.push(new u128((i * 100) + 10 + i + 1));
   }
+
   const props = {
     role: {
       version: 1,
diff --git a/pioneer/packages/joy-roles/src/flows/apply.tsx b/pioneer/packages/joy-roles/src/flows/apply.tsx
index 5a17addfcf..5ec1f16847 100644
--- a/pioneer/packages/joy-roles/src/flows/apply.tsx
+++ b/pioneer/packages/joy-roles/src/flows/apply.tsx
@@ -6,8 +6,7 @@ import { Balance } from '@polkadot/types/interfaces';
 
 import { useMyAccount } from '@polkadot/joy-utils/react/hooks';
 
-import {
-  Accordion,
+import { Accordion,
   Button,
   Container,
   Form,
@@ -20,24 +19,19 @@ import {
   Segment,
   SemanticICONS,
   Step,
-  Table
-} from 'semantic-ui-react';
+  Table } from 'semantic-ui-react';
 
 import Identicon from '@polkadot/react-identicon';
 import AccountId from '@polkadot/types/generic/AccountId';
 
-import {
-  GenericJoyStreamRoleSchema,
+import { GenericJoyStreamRoleSchema,
   ApplicationDetails,
   QuestionField,
-  QuestionSection
-} from '@joystream/types/hiring/schemas/role.schema.typings';
+  QuestionSection } from '@joystream/types/hiring/schemas/role.schema.typings';
 
-import {
-  OpeningBodyApplicationsStatus, OpeningStakeAndApplicationStatus,
+import { OpeningBodyApplicationsStatus, OpeningStakeAndApplicationStatus,
   ApplicationCount,
-  StakeRequirementProps
-} from '../tabs/Opportunities';
+  StakeRequirementProps } from '../tabs/Opportunities';
 import { IStakeRequirement } from '../StakeRequirement';
 
 import { Loadable } from '@polkadot/joy-utils/react/hocs';
@@ -50,6 +44,7 @@ type accordionProps = {
 
 function ModalAccordion (props: React.PropsWithChildren<accordionProps>) {
   const [open, setOpen] = useState(false);
+
   return (
     <Accordion>
       <Accordion.Title index={0} active={open} onClick={() => { setOpen(!open); }} >
@@ -133,12 +128,13 @@ export function FundSourceSelector (props: FundSourceSelectorProps & FundSourceC
   });
 
   let passphraseCallback = null;
+
   if (props.passphraseCallback) {
     passphraseCallback = (
       <Form.Field>
         <label>Unlock key with passphrase</label>
         <Input placeholder='Passphrase'
-          type="password"
+          type='password'
           onChange={onChangeInput}
         />
       </Form.Field>
@@ -146,7 +142,7 @@ export function FundSourceSelector (props: FundSourceSelectorProps & FundSourceC
   }
 
   return (
-    <Form className="fund-source-selector">
+    <Form className='fund-source-selector'>
       <Form.Field>
         <label>Select source of funds</label>
         <Form.Dropdown
@@ -173,6 +169,7 @@ function rankIcon (estimatedSlot: number, slots: number): SemanticICONS {
   } else if (estimatedSlot <= slots) { // Places 67-100 if slotsCount == 100
     return 'thermometer quarter';
   }
+
   return 'thermometer empty'; // Places >100 for slotsCount == 100
 }
 
@@ -194,27 +191,31 @@ export function StakeRankSelector (props: StakeRankSelectorProps) {
   const stakeSufficient = props.stake.gte(minStake);
 
   const ticks = [];
+
   for (let i = 0; i < slotCount; i++) {
-    ticks.push(<div key={i} className="tick" style={{ width: (100 / slotCount) + '%' }}>{slotCount - i}</div>);
+    ticks.push(<div key={i} className='tick' style={{ width: (100 / slotCount) + '%' }}>{slotCount - i}</div>);
   }
 
   let estimatedSlot = slotCount + 1;
-  props.slots.forEach(slotStake => props.stake.gt(slotStake.sub(props.otherStake)) && --estimatedSlot);
+
+  props.slots.forEach((slotStake) => props.stake.gt(slotStake.sub(props.otherStake)) && --estimatedSlot);
 
   const changeValue = (e: any, { value }: any) => {
     const newStake = createMock('Balance', value);
+
     props.setStake(newStake);
   };
 
   const slider = null;
+
   return (
-    <Container className="stake-rank-selector">
+    <Container className='stake-rank-selector'>
       <h4>Choose a stake</h4>
-      <Container className="controls">
-        <Input label="JOY"
-          labelPosition="right"
+      <Container className='controls'>
+        <Input label='JOY'
+          labelPosition='right'
           onChange={changeValue}
-          type="number"
+          type='number'
           step={slotCount > 1 ? props.step.toNumber() : 1}
           value={props.stake.toNumber() > 0 ? props.stake.toNumber() : 0}
           min={minStake}
@@ -228,14 +229,14 @@ export function StakeRankSelector (props: StakeRankSelectorProps) {
           </Label>
         ) }
         <Label size='large' color={stakeSufficient ? 'green' : 'red'}>
-          <Icon name="shield" />
+          <Icon name='shield' />
           Your stake
           <Label.Detail>{formatBalance(props.stake)}</Label.Detail>
         </Label>
       </Container>
       {slider}
       { !stakeSufficient && (
-        <Label color="red">Currently you need to stake at least {formatBalance(minStake)} to be considered for this position!</Label>
+        <Label color='red'>Currently you need to stake at least {formatBalance(minStake)} to be considered for this position!</Label>
       ) }
     </Container>
   );
@@ -295,6 +296,7 @@ export function ProgressStepsView (props: ProgressStepsProps) {
       display: true
     }
   ];
+
   return (
     <Step.Group stackable='tablet'>
       {steps.map((step, key) => (
@@ -322,7 +324,7 @@ type CTAProps = {
 
 function CTA (props: CTAProps) {
   return (
-    <Container className="cta">
+    <Container className='cta'>
       <Button
         content={props.negativeLabel}
         icon={props.negativeIcon}
@@ -348,6 +350,7 @@ function stakeCount (props: StakeRequirementProps): number {
 
 function zeroOrTwoStakes (props: StakeRequirementProps): boolean {
   const count = stakeCount(props);
+
   return (count === 0 || count === 2);
 }
 
@@ -389,7 +392,7 @@ export function ConfirmStakesStage (props: ConfirmStakesStageProps & StageTransi
   };
 
   return (
-    <Container className="content">
+    <Container className='content'>
       <ConfirmStakes {...props} />
       <CTA
         negativeLabel='Cancel'
@@ -415,11 +418,12 @@ function ConfirmStakes (props: StakeSelectorProps) {
 
 function ConfirmStakes1Up (props: StakeSelectorProps) {
   let applicationStake = null;
+
   if (props.applications.requiredApplicationStake.anyRequirement()) {
     applicationStake = <CaptureStake1Up
-      name="application stake"
-      stakeReturnPolicy="after the opening is resolved or your application ends"
-      colour="yellow"
+      name='application stake'
+      stakeReturnPolicy='after the opening is resolved or your application ends'
+      colour='yellow'
       requirement={props.applications.requiredApplicationStake}
       value={props.selectedApplicationStake}
       setValue={props.setSelectedApplicationStake}
@@ -431,11 +435,12 @@ function ConfirmStakes1Up (props: StakeSelectorProps) {
   }
 
   let roleStake = null;
+
   if (props.applications.requiredRoleStake.anyRequirement()) {
     roleStake = <CaptureStake1Up
-      name="role stake"
-      stakeReturnPolicy="after the opening is resolved or your application ends"
-      colour="red"
+      name='role stake'
+      stakeReturnPolicy='after the opening is resolved or your application ends'
+      colour='red'
       requirement={props.applications.requiredRoleStake}
       value={props.selectedRoleStake}
       setValue={props.setSelectedRoleStake}
@@ -447,7 +452,7 @@ function ConfirmStakes1Up (props: StakeSelectorProps) {
   }
 
   return (
-    <Container className="stakes 1-up">
+    <Container className='stakes 1-up'>
       {applicationStake}
       {roleStake}
     </Container>
@@ -474,24 +479,27 @@ export function ConfirmStakes2Up (props: ConfirmStakes2UpProps) {
   const valid = combined.gte(minStake);
 
   let estimatedSlot = slotCount + 1;
-  props.slots.forEach(slotStake => combined.gt(slotStake) && --estimatedSlot);
+
+  props.slots.forEach((slotStake) => combined.gt(slotStake) && --estimatedSlot);
 
   const ticks = [];
+
   for (let i = 0; i < slotCount; i++) {
-    ticks.push(<div key={i} className="tick" style={{ width: (100 / slotCount) + '%' }}>{i + 1}</div>);
+    ticks.push(<div key={i} className='tick' style={{ width: (100 / slotCount) + '%' }}>{i + 1}</div>);
   }
 
-  const tickLabel = <div className="ui pointing below label" style={{ left: ((100 / slotCount) * (estimatedSlot - 1)) + '%' }}>
+  const tickLabel = <div className='ui pointing below label' style={{ left: ((100 / slotCount) * (estimatedSlot - 1)) + '%' }}>
     Your rank
-    <div className="detail">{estimatedSlot}/{props.applications.maxNumberOfApplications}</div>
+    <div className='detail'>{estimatedSlot}/{props.applications.maxNumberOfApplications}</div>
   </div>;
 
   let tickContainer = null;
+
   if (slotCount > 3) {
     tickContainer = (
-      <div className="ticks">
+      <div className='ticks'>
         {tickLabel}
-        <div className="scale">
+        <div className='scale'>
           {ticks}
         </div>
       </div>
@@ -499,6 +507,7 @@ export function ConfirmStakes2Up (props: ConfirmStakes2UpProps) {
   }
 
   let defactoMinStakeMessage = null;
+
   if (props.applications.numberOfApplications >= props.applications.maxNumberOfApplications) {
     defactoMinStakeMessage = (
       <span>However, in order to be in the top {props.applications.maxNumberOfApplications} applications, you wil need to stake a combined total of more than <strong>{formatBalance(minStake)}</strong>.</span>
@@ -506,6 +515,7 @@ export function ConfirmStakes2Up (props: ConfirmStakes2UpProps) {
   }
 
   let rankExplanation = <p>This role requires a combined stake (application stake plus role stake) of {formatBalance(minStake)}.</p>;
+
   if (props.applications.maxNumberOfApplications > 0) {
     rankExplanation = (
       <Container>
@@ -521,12 +531,12 @@ export function ConfirmStakes2Up (props: ConfirmStakes2UpProps) {
   }
 
   return (
-    <Container className="confirm-stakes-2up">
+    <Container className='confirm-stakes-2up'>
       <Message info>
-        <Message.Header><Icon name="shield" /> This role requires a minimum combined stake</Message.Header>
+        <Message.Header><Icon name='shield' /> This role requires a minimum combined stake</Message.Header>
         <Message.Content>
           {rankExplanation}
-          <Grid stackable className="two-up">
+          <Grid stackable className='two-up'>
             <Grid.Row columns={2}>
               <Grid.Column>
                 <h5>Application stake</h5>
@@ -566,7 +576,7 @@ export function ConfirmStakes2Up (props: ConfirmStakes2UpProps) {
               </Grid.Column>
             </Grid.Row>
             <Grid.Row columns={1}>
-              <Grid.Column className="center">
+              <Grid.Column className='center'>
                 <Label color='teal'>
                   <Icon name='shield' />
                   Minimum required stake
@@ -605,18 +615,21 @@ function StakeRankMiniSelector (props: StakeRankMiniSelectorProps) {
   const changeValue = (e: any, { value }: any) => {
     if (value < 0) {
       props.setValue(createMock('Balance', 0));
+
       return;
     }
+
     const newStake = createMock('Balance', value);
+
     props.setValue(newStake);
   };
 
   return (
-    <Container className="controls">
-      <Input label="JOY" fluid
-        labelPosition="right"
+    <Container className='controls'>
+      <Input label='JOY' fluid
+        labelPosition='right'
         onChange={changeValue}
-        type="number"
+        type='number'
         min={props.min.toNumber()}
         step={props.step.toNumber()}
         value={props.value.toNumber() > 0 ? props.value.toNumber() : null}
@@ -646,11 +659,13 @@ type CaptureStake1UpProps = {
 // this context, so let's just go with it.
 function indefiniteArticle (noun: string): 'a' | 'an' {
   const startsWithVowel = /^([aeiou])/i;
+
   return startsWithVowel.test(noun) ? 'an' : 'a';
 }
 
 function CaptureStake1Up (props: CaptureStake1UpProps) {
   let limit = null;
+
   if (props.maxNumberOfApplications > 0) {
     limit = (
       <p>
@@ -662,6 +677,7 @@ function CaptureStake1Up (props: CaptureStake1UpProps) {
 
   let slider = null;
   let atLeast = null;
+
   if (props.requirement.atLeast()) {
     slider = <StakeRankSelector
       {...props}
@@ -673,7 +689,7 @@ function CaptureStake1Up (props: CaptureStake1UpProps) {
 
   return (
     <Message info={props.colour === 'yellow'} warning={props.colour === 'red'} className={props.name}>
-      <Message.Header><Icon name="shield" /> {props.name}</Message.Header>
+      <Message.Header><Icon name='shield' /> {props.name}</Message.Header>
       <Message.Content>
         <p>
           <span>This role requires {indefiniteArticle(props.name)} <strong>{props.name}</strong> of {atLeast}<strong>{formatBalance(props.requirement.value)}</strong>.</span>
@@ -698,18 +714,23 @@ interface FinalDataMap {
 
 function applicationDetailsToObject (input: ApplicationDetails, data: FinalDataMap): any {
   const output: any = {};
+
   if (!input.sections) {
     return {};
   }
+
   input.sections.map((section) => {
     section.questions.map((question) => {
       let value: any = '';
+
       if (data[section.title] && data[section.title][question.title]) {
         value = data[section.title][question.title];
       }
+
       output[questionHash(section, question)] = value;
     });
   });
+
   return output;
 }
 
@@ -719,16 +740,20 @@ interface QuestionDataMap {
 
 function applicationDetailsToDataObject (input: ApplicationDetails, data: QuestionDataMap): any {
   const output: any = {};
+
   if (!input.sections) {
     return {};
   }
+
   input.sections.map((section) => {
     output[section.title] = {};
     section.questions.map((question) => {
       const hash = questionHash(section, question);
+
       output[section.title][question.title] = data[hash];
     });
   });
+
   return output;
 }
 
@@ -834,10 +859,10 @@ export function ApplicationDetailsStage (props: ApplicationDetailsStageProps & S
   };
 
   return (
-    <Container className="content application-questions">
+    <Container className='content application-questions'>
       <Form error={completed && !valid}>
         {props.applicationDetails && props.applicationDetails.sections && props.applicationDetails.sections.map((section, key) => (
-          <Segment padded className="section" key={key}>
+          <Segment padded className='section' key={key}>
             <h4><Label attached='top'>{section.title}</Label></h4>
             {section.questions.map((question, key) =>
               questionField(section, question, key)
@@ -878,14 +903,16 @@ export const SubmitApplicationStage = (props: SubmitApplicationStageProps) => {
     }
 
     const idx = props.keypairs.findIndex((a: keyPairDetails) => a.accountId.eq(props.keyAddress));
+
     if (idx === -1) {
       return false;
     }
+
     return props.keypairs[idx].balance.gte(props.totalStake);
   };
 
   return (
-    <Container className="content">
+    <Container className='content'>
       <p>
         You need to make a transaction to apply for this role.
       </p>
@@ -893,7 +920,7 @@ export const SubmitApplicationStage = (props: SubmitApplicationStageProps) => {
         Before the transaction, a new account key, called a <em>role key</em>, will be generated and downloaded automatically.
         You will need this role key to perform any duties in the role, so be sure to keep a backup.
       </p>
-      <ModalAccordion title="Transaction details">
+      <ModalAccordion title='Transaction details'>
         <Table basic='very'>
           <Table.Body>
             {[...props.transactionDetails].map((v, k) => (
@@ -934,7 +961,7 @@ export type DoneStageProps = {
 
 export function DoneStage (props: DoneStageProps) {
   return (
-    <Container className="content">
+    <Container className='content'>
       <h4>Application submitted!</h4>
       <p>
         Your application is <strong>#<ApplicationCount {...props.applications} applied={true} /></strong>.
@@ -942,8 +969,8 @@ export function DoneStage (props: DoneStageProps) {
       </p>
       <p>
         You can track the progress of your
-        application in the <Link to="#working-group/my-roles">My roles and applications</Link> section. Note that your application is attached
-        to your role key (see below).  If you have any issues, you can message the group lead in in the <Link to="#forum">Forum</Link> or contact them directly.
+        application in the <Link to='#working-group/my-roles'>My roles and applications</Link> section. Note that your application is attached
+        to your role key (see below).  If you have any issues, you can message the group lead in in the <Link to='#forum'>Forum</Link> or contact them directly.
       </p>
 
       <h4>Your new role key</h4>
@@ -953,7 +980,7 @@ export function DoneStage (props: DoneStageProps) {
       <p>
         {'We\'ve generated a new role key, '}<strong>{props.roleKeyName}</strong>, automatically.
         A copy of the backup file should have been downloaded, or you can
-        get a backup from the <Link to="/accounts">My account</Link> section.
+        get a backup from the <Link to='/accounts'>My account</Link> section.
       </p>
       <p>
         You can also switch your role key using the Accounts selector in the top right of the screen. It works like
@@ -969,7 +996,7 @@ export function DoneStage (props: DoneStageProps) {
         <Icon name='unlock' />
         <strong>
           This role key has been generated with no password!
-          We strongly recommend that you set a password for it in the <Link to="/accounts">My account</Link> section.
+          We strongly recommend that you set a password for it in the <Link to='/accounts'>My account</Link> section.
         </strong>
       </Message>
     </Container>
@@ -1014,7 +1041,7 @@ export const FlowModal = Loadable<FlowModalProps>(
     'keypairs',
     'slots'
   ],
-  props => {
+  (props) => {
     const {
       applicationStake, setApplicationStake,
       roleStake, setRoleStake,
@@ -1026,6 +1053,7 @@ export const FlowModal = Loadable<FlowModalProps>(
     } = props;
 
     const accContext = useMyAccount();
+
     useEffect(() => {
       if (txKeyAddress.isEmpty) {
         setTxKeyAddress(createMock('AccountId', accContext.state.address));
@@ -1033,11 +1061,14 @@ export const FlowModal = Loadable<FlowModalProps>(
     }, [txKeyAddress]);
 
     const history = useHistory();
+
     const cancel = () => {
       if (history.length > 1) {
         history.goBack();
+
         return;
       }
+
       history.push('/working-groups/');
     };
 
@@ -1092,56 +1123,56 @@ export const FlowModal = Loadable<FlowModalProps>(
     const cancelText = complete ? 'Close' : 'Cancel application';
 
     return (
-      <Container className="apply-flow">
-        <div className="dimmer"></div>
-        <Container className="content">
-          <Grid columns="equal">
-            <Grid.Column width={11} className="title">
+      <Container className='apply-flow'>
+        <div className='dimmer'></div>
+        <Container className='content'>
+          <Grid columns='equal'>
+            <Grid.Column width={11} className='title'>
               <Label as='h1' color='green' size='huge' ribbon>
                 <Icon name='heart' />
                 Applying for
                 <Label.Detail>{props.role.job.title}</Label.Detail>
               </Label>
             </Grid.Column>
-            <Grid.Column width={5} className="cancel">
+            <Grid.Column width={5} className='cancel'>
               <a onClick={() => cancel()}>
                 <Icon name='cancel' /> {cancelText}
               </a>
             </Grid.Column>
           </Grid>
-          <Grid columns="equal">
-            <Grid.Column width={11} className="main">
+          <Grid columns='equal'>
+            <Grid.Column width={11} className='main'>
               <ProgressStepsView activeStep={activeStep} hasConfirmStep={props.hasConfirmStep} />
               { activeStep === ProgressSteps.ConfirmStakes && (<ConfirmStakesStage
-                  {...props}
-                  nextTransition={enterApplicationDetailsState}
-                  prevTransition={cancel}
-                  {...setStakeProps}
-                />
+                {...props}
+                nextTransition={enterApplicationDetailsState}
+                prevTransition={cancel}
+                {...setStakeProps}
+              />
               ) }
               { activeStep === ProgressSteps.ApplicationDetails && (<ApplicationDetailsStage
-                  setData={setAppDetails}
-                  data={appDetails}
-                  applicationDetails={props.role.application}
-                  nextTransition={enterSubmitApplicationState}
-                  prevTransition={() => { props.hasConfirmStep ? enterConfirmStakeState() : cancel(); }}
-                />
+                setData={setAppDetails}
+                data={appDetails}
+                applicationDetails={props.role.application}
+                nextTransition={enterSubmitApplicationState}
+                prevTransition={() => { props.hasConfirmStep ? enterConfirmStakeState() : cancel(); }}
+              />
               ) }
               { activeStep === ProgressSteps.SubmitApplication && (<SubmitApplicationStage
-                  {...props}
-                  nextTransition={enterDoneState}
-                  prevTransition={enterApplicationDetailsState}
-                  keyAddress={txKeyAddress}
-                  setKeyAddress={setTxKeyAddress}
-                  transactionDetails={props.transactionDetails}
-                  totalStake={Add(applicationStake, roleStake)}
-                />
-               ) }
+                {...props}
+                nextTransition={enterDoneState}
+                prevTransition={enterApplicationDetailsState}
+                keyAddress={txKeyAddress}
+                setKeyAddress={setTxKeyAddress}
+                transactionDetails={props.transactionDetails}
+                totalStake={Add(applicationStake, roleStake)}
+              />
+              ) }
               { activeStep === ProgressSteps.Done && (<DoneStage {...props} roleKeyName={props.roleKeyName} />) }
             </Grid.Column>
-            <Grid.Column width={5} className="summary">
+            <Grid.Column width={5} className='summary'>
               <Header as='h3'>{props.role.headline}</Header>
-              <Label as='h1' size='large' ribbon='right' className="fluid standout">
+              <Label as='h1' size='large' ribbon='right' className='fluid standout'>
                 Reward
                 <Label.Detail>{props.role.reward}</Label.Detail>
               </Label>
@@ -1150,8 +1181,8 @@ export const FlowModal = Loadable<FlowModalProps>(
           </Grid>
         </Container>
         {txInProgress &&
-          <div className="loading">
-            <div className="spinner"></div>
+          <div className='loading'>
+            <div className='spinner'></div>
           </div>
         }
       </Container>
diff --git a/pioneer/packages/joy-roles/src/tabs.stories.tsx b/pioneer/packages/joy-roles/src/tabs.stories.tsx
index 03c5640628..fa6a546449 100644
--- a/pioneer/packages/joy-roles/src/tabs.stories.tsx
+++ b/pioneer/packages/joy-roles/src/tabs.stories.tsx
@@ -14,7 +14,7 @@ export default {
 export const RolesPage = () => {
   const tab = (
     <Container>
-      <Container className="outer">
+      <Container className='outer'>
         <ContentCuratorsSection />
       </Container>
     </Container>
diff --git a/pioneer/packages/joy-roles/src/tabs/Admin.controller.tsx b/pioneer/packages/joy-roles/src/tabs/Admin.controller.tsx
index 92f530f081..9e159c48db 100644
--- a/pioneer/packages/joy-roles/src/tabs/Admin.controller.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Admin.controller.tsx
@@ -11,8 +11,7 @@ import { View } from '@polkadot/joy-utils/react/hocs';
 import { useMyAccount } from '@polkadot/joy-utils/react/hooks';
 import { QueueTxExtrinsicAdd } from '@polkadot/react-components/Status/types';
 
-import {
-  Accordion,
+import { Accordion,
   Button,
   Card,
   Checkbox,
@@ -26,44 +25,33 @@ import {
   Message,
   Modal,
   Table,
-  TextArea
-} from 'semantic-ui-react';
+  TextArea } from 'semantic-ui-react';
 
 import { ITransport } from '../transport';
 
-import {
-  Application,
+import { Application,
   ApplicationStage,
   ActivateOpeningAt,
   Opening,
   OpeningStage,
   StakingPolicy,
   StakingAmountLimitModeKeys,
-  StakingAmountLimitMode
-} from '@joystream/types/hiring';
+  StakingAmountLimitMode } from '@joystream/types/hiring';
 
-import {
-  Membership,
-  MemberId
-} from '@joystream/types/members';
+import { Membership,
+  MemberId } from '@joystream/types/members';
 
 import { Stake, StakeId } from '@joystream/types/stake';
 
-import {
-  CuratorApplication, CuratorApplicationId,
+import { CuratorApplication, CuratorApplicationId,
   CuratorOpening,
-  IOpeningPolicyCommitment, CuratorOpeningId
-} from '@joystream/types/content-working-group';
+  IOpeningPolicyCommitment, CuratorOpeningId } from '@joystream/types/content-working-group';
 
-import {
-  classifyOpeningStage,
+import { classifyOpeningStage,
   OpeningStageClassification,
-  OpeningState
-} from '../classifiers';
+  OpeningState } from '../classifiers';
 
-import {
-  openingDescription
-} from '../openingStateMarkup';
+import { openingDescription } from '../openingStateMarkup';
 
 import { Add, Zero } from '../balances';
 import { createMock } from '@joystream/types';
@@ -110,46 +98,46 @@ type State = {
 
 function newHRT (title: string): Text {
   return createMock('Text', JSON.stringify({
-      version: 1,
-      headline: 'some headline',
-      job: {
-        title: title,
-        description: 'some job description'
-      },
-      application: {
-        sections: [
-          {
-            title: 'About you',
-            questions: [
-              {
-                title: 'your name',
-                type: 'text'
-              }
-            ]
-          },
-          {
-            title: 'Something else',
-            questions: [
-              {
-                title: 'another thing',
-                type: 'text area'
-              }
-            ]
-          }
-        ]
-      },
-      reward: '10 JOY per block',
-      creator: {
-        membership: {
-          handle: 'ben'
+    version: 1,
+    headline: 'some headline',
+    job: {
+      title: title,
+      description: 'some job description'
+    },
+    application: {
+      sections: [
+        {
+          title: 'About you',
+          questions: [
+            {
+              title: 'your name',
+              type: 'text'
+            }
+          ]
+        },
+        {
+          title: 'Something else',
+          questions: [
+            {
+              title: 'another thing',
+              type: 'text area'
+            }
+          ]
         }
-      },
-      process: {
-        details: [
-          'Some custom detail'
-        ]
+      ]
+    },
+    reward: '10 JOY per block',
+    creator: {
+      membership: {
+        handle: 'ben'
       }
-    })
+    },
+    process: {
+      details: [
+        'Some custom detail'
+      ]
+    }
+  })
   );
 }
 
@@ -379,15 +367,19 @@ export class AdminController extends Controller<State, ITransport> {
 
   startAcceptingApplications (accountId: string, id = 0) {
     const tx = this.api.tx.contentWorkingGroup.acceptCuratorApplications(id);
+
     this.queueExtrinsic({ extrinsic: tx, txSuccessCb: this.onTxSuccess, accountId });
   }
 
   async applyAsACurator (creatorAddress: string, openingId: number) {
     const membershipIds = (await this.api.query.members.memberIdsByControllerAccountId(creatorAddress)) as Vec<MemberId>;
+
     if (membershipIds.length === 0) {
       console.error('No membship ID associated with this address');
+
       return;
     }
+
     const tx = this.api.tx.contentWorkingGroup.applyOnCuratorOpening(
       membershipIds[0],
       openingId,
@@ -396,11 +388,13 @@ export class AdminController extends Controller<State, ITransport> {
       400,
       'This is my application'
     );
+
     this.queueExtrinsic({ extrinsic: tx, txSuccessCb: this.onTxSuccess, accountId: creatorAddress });
   }
 
   beginApplicantReview (accountId: string, openingId: number) {
     const tx = this.api.tx.contentWorkingGroup.beginCuratorApplicantReview(openingId);
+
     this.queueExtrinsic({ extrinsic: tx, txSuccessCb: this.onTxSuccess, accountId });
   }
 
@@ -410,19 +404,23 @@ export class AdminController extends Controller<State, ITransport> {
       applications,
       null
     );
+
     this.queueExtrinsic({ extrinsic: tx, txSuccessCb: this.onTxSuccess, accountId });
   }
 
   protected async profile (id: MemberId): Promise<Membership> {
     const member = (await this.api.query.members.membershipById(id)) as Membership;
+
     if (member.isEmpty) {
       throw new Error(`Expected member profile not found! (id: ${id.toString()}`);
     }
+
     return member;
   }
 
   protected async stakeValue (stakeId: StakeId): Promise<Balance> {
     const stake = await this.api.query.stake.stakes(stakeId) as Stake;
+
     return stake.value;
   }
 
@@ -446,6 +444,7 @@ export class AdminController extends Controller<State, ITransport> {
     this.state.openings = new Map<number, opening>();
 
     const nextOpeningId = await this.api.query.contentWorkingGroup.nextCuratorOpeningId() as CuratorOpeningId;
+
     for (let i = nextOpeningId.toNumber() - 1; i >= 0; i--) {
       const curatorOpening = await this.api.query.contentWorkingGroup.curatorOpeningById(i) as CuratorOpening;
 
@@ -467,6 +466,7 @@ export class AdminController extends Controller<State, ITransport> {
     }
 
     const nextAppid = await this.api.query.contentWorkingGroup.nextCuratorApplicationId() as CuratorApplicationId;
+
     for (let i = 0; i < nextAppid.toNumber(); i++) {
       const cApplication = await this.api.query.contentWorkingGroup.curatorApplicationById(i) as CuratorApplication;
 
@@ -507,12 +507,14 @@ type AdminContainerProps = {
   state: State;
   controller: AdminController;
 }
+
 const AdminContainer = ({ state, controller }: AdminContainerProps) => {
   const address = useMyAccount().state.address;
   const containerRef = useRef<HTMLDivElement>(null);
+
   return (
     <div ref={containerRef}>
-      <Container className="admin">
+      <Container className='admin'>
         <Card fluid color='orange'>
           <Card.Content>
             <Dropdown text='Create new opening...'>
@@ -544,7 +546,7 @@ const AdminContainer = ({ state, controller }: AdminContainerProps) => {
           </Card.Content>
         </Card>
         {
-          [...state.openings.keys()].map(key => <OpeningView key={key} opening={state.openings.get(key) as opening} controller={controller} />)
+          [...state.openings.keys()].map((key) => <OpeningView key={key} opening={state.openings.get(key) as opening} controller={controller} />)
         }
         <br />
       </Container>
@@ -606,6 +608,7 @@ const NewOpening = (props: NewOpeningProps) => {
 
   const onChangePolicyField = <PolicyKey extends keyof policyDescriptor>(fieldName: PolicyKey, value: policyDescriptor[PolicyKey]) => {
     const newState = { ...policy };
+
     newState[fieldName] = value;
     setPolicy(newState);
   };
@@ -642,14 +645,17 @@ const NewOpening = (props: NewOpeningProps) => {
   ) => {
     if (mode === '') {
       const policyField = policy[fieldName];
+
       mode = policyField && policyField.isSome
         ? (policyField.unwrap().amount_mode.type as StakingAmountLimitModeKeys)
         : StakingAmountLimitModeKeys.Exact; // Default
     }
+
     const value = createStakingPolicyOpt(
       stakeValue,
       mode === StakingAmountLimitModeKeys.Exact ? STAKING_MODE_EXACT : STAKING_MODE_AT_LEAST
     );
+
     onChangePolicyField(fieldName, value);
   };
 
@@ -686,7 +692,7 @@ const NewOpening = (props: NewOpeningProps) => {
         />
         {showExactBlock === true &&
           <Input
-            type="number"
+            type='number'
             value={exactBlock}
             onChange={onChangeExactBlock}
           />
@@ -696,7 +702,7 @@ const NewOpening = (props: NewOpeningProps) => {
       <Form.Field>
         <label>Max review period length (in blocks)</label>
         <Input
-          type="number"
+          type='number'
           value={policy.max_review_period_length.toNumber()}
           onChange={(e: any, { value }: any) => onChangePolicyField('max_review_period_length', createMock('u32', value))}
         />
@@ -704,7 +710,7 @@ const NewOpening = (props: NewOpeningProps) => {
 
       <Form.Field>
         <label>Application staking policy</label>
-        <Checkbox label="Require an application stake" checked={requireAppStakingPolicy} onChange={(e, { checked }: any) => onStakeModeCheckboxChange(setRequireAppStakingPolicy, 'application_staking_policy', checked, 0)} />
+        <Checkbox label='Require an application stake' checked={requireAppStakingPolicy} onChange={(e, { checked }: any) => onStakeModeCheckboxChange(setRequireAppStakingPolicy, 'application_staking_policy', checked, 0)} />
         {requireAppStakingPolicy && (
           <Message>
             <label>Stake mode</label>
@@ -717,7 +723,7 @@ const NewOpening = (props: NewOpeningProps) => {
 
             <label>Stake value</label>
             <Input
-              type="number"
+              type='number'
               value={policy.application_staking_policy?.unwrap().amount.toNumber()}
               onChange={(e: any, { value }: any) => changeStakingMode('application_staking_policy', '', value)}
             />
@@ -727,7 +733,7 @@ const NewOpening = (props: NewOpeningProps) => {
 
       <Form.Field>
         <label>Role staking policy</label>
-        <Checkbox label="Require a role stake" checked={requireRoleStakingPolicy} onChange={(e, { checked }: any) => onStakeModeCheckboxChange(setRequireRoleStakingPolicy, 'role_staking_policy', checked, 0)} />
+        <Checkbox label='Require a role stake' checked={requireRoleStakingPolicy} onChange={(e, { checked }: any) => onStakeModeCheckboxChange(setRequireRoleStakingPolicy, 'role_staking_policy', checked, 0)} />
         {requireRoleStakingPolicy && (
           <Message>
             <label>Stake mode</label>
@@ -740,7 +746,7 @@ const NewOpening = (props: NewOpeningProps) => {
 
             <label>Stake value</label>
             <Input
-              type="number"
+              type='number'
               value={policy.role_staking_policy?.unwrap().amount.toNumber()}
               onChange={(e: any, { value }: any) => changeStakingMode('role_staking_policy', '', value)}
             />
@@ -752,7 +758,7 @@ const NewOpening = (props: NewOpeningProps) => {
         <TextArea value={text} rows={10} onChange={(e: any, { value }: any) => setText(value)} />
       </Form.Field>
 
-      <Form.Field align="right">
+      <Form.Field align='right'>
         <Button positive onClick={() => submit()}>Create opening</Button>
       </Form.Field>
     </Form>
@@ -771,7 +777,7 @@ const OpeningView = (props: OpeningViewProps) => {
 
   const toggleApplication = (id: number) => {
     if (selected.includes(id)) {
-      setSelected(selected.filter(v => v !== id));
+      setSelected(selected.filter((v) => v !== id));
     } else {
       setSelected([...selected, id]);
     }
@@ -782,7 +788,7 @@ const OpeningView = (props: OpeningViewProps) => {
   switch (props.opening.classification.state) {
     case OpeningState.InReview:
       CTAs = (
-        <Container align="right">
+        <Container align='right'>
           <Button onClick={() => { props.controller.acceptCuratorApplications(address, props.opening.curatorId, selected.sort()); }}>Accept curator applications</Button>
         </Container>
       );
@@ -792,7 +798,7 @@ const OpeningView = (props: OpeningViewProps) => {
     <Card fluid>
       <Card.Content>
         <Card.Header>
-          <Label attached="top right">Opening</Label>
+          <Label attached='top right'>Opening</Label>
           <Link to={'/working-groups/opportunities/curators/' + props.opening.curatorId}>
             {props.opening.title}
           </Link>
@@ -890,7 +896,7 @@ const OpeningView = (props: OpeningViewProps) => {
                 </Dropdown.Menu>
               </Dropdown>
             </Grid.Column>
-            <Grid.Column align="right">
+            <Grid.Column align='right'>
             </Grid.Column>
           </Grid.Row>
         </Grid>
diff --git a/pioneer/packages/joy-roles/src/tabs/MyRoles.controller.tsx b/pioneer/packages/joy-roles/src/tabs/MyRoles.controller.tsx
index feeffcc603..6376aeb12f 100644
--- a/pioneer/packages/joy-roles/src/tabs/MyRoles.controller.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/MyRoles.controller.tsx
@@ -4,10 +4,8 @@ import { Container } from 'semantic-ui-react';
 import { Controller } from '@polkadot/joy-utils/react/helpers';
 import { View } from '@polkadot/joy-utils/react/hocs';
 import { ITransport } from '../transport';
-import {
-  Applications, OpeningApplication,
-  CurrentRoles, ActiveRole, ActiveRoleWithCTAs
-} from './MyRoles';
+import { Applications, OpeningApplication,
+  CurrentRoles, ActiveRole, ActiveRoleWithCTAs } from './MyRoles';
 
 type State = {
   applications: OpeningApplication[];
@@ -28,10 +26,11 @@ export class MyRolesController extends Controller<State, ITransport> {
     super(transport, initialState);
   }
 
-  refreshState() {
+  refreshState () {
     if (!this.state.myAddress) {
       return;
     }
+
     // Set actual data
     this.updateCurationGroupRoles(this.state.myAddress);
     this.updateApplications(this.state.myAddress);
@@ -51,7 +50,8 @@ export class MyRolesController extends Controller<State, ITransport> {
 
   protected async updateCurationGroupRoles (myAddress: string) {
     const roles = await this.transport.myRoles(myAddress);
-    this.state.currentRoles = roles.map(role => ({
+
+    this.state.currentRoles = roles.map((role) => ({
       ...role,
       CTAs: [
         {
@@ -66,18 +66,20 @@ export class MyRolesController extends Controller<State, ITransport> {
 
   leaveRole (role: ActiveRole, rationale: string) {
     const successCb = this.refreshState.bind(this);
+
     this.transport.leaveRole(role.group, this.state.myAddress, role.workerId.toNumber(), rationale, successCb);
   }
 
   cancelApplication (application: OpeningApplication) {
     const successCb = this.refreshState.bind(this);
+
     this.transport.withdrawApplication(application.meta.group, this.state.myAddress, application.id, successCb);
   }
 }
 
 export const MyRolesView = View<MyRolesController, State>(
   ({ state, controller }) => (
-    <Container className="my-roles">
+    <Container className='my-roles'>
       <CurrentRoles currentRoles={state.currentRoles} />
       <Applications applications={state.applications} cancelCallback={(a) => controller.cancelApplication(a)} />
     </Container>
diff --git a/pioneer/packages/joy-roles/src/tabs/MyRoles.elements.stories.tsx b/pioneer/packages/joy-roles/src/tabs/MyRoles.elements.stories.tsx
index 23abdd3346..b0cf5c21cf 100644
--- a/pioneer/packages/joy-roles/src/tabs/MyRoles.elements.stories.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/MyRoles.elements.stories.tsx
@@ -2,31 +2,22 @@ import React from 'react';
 import { withKnobs } from '@storybook/addon-knobs';
 import { createMock } from '@joystream/types';
 
-import {
-  Container
-} from 'semantic-ui-react';
+import { Container } from 'semantic-ui-react';
 
-
-import {
-  CurrentRoles, CurrentRolesProps,
+import { CurrentRoles, CurrentRolesProps,
   Application, ApplicationProps,
   ApplicationStatus, ApplicationStatusProps,
-  Applications
-} from './MyRoles';
+  Applications } from './MyRoles';
 
-import {
-  CancelledReason
-  , OpeningState
-} from '../classifiers';
+import { CancelledReason
+  , OpeningState } from '../classifiers';
 
 import 'semantic-ui-css/semantic.min.css';
 import '@polkadot/joy-roles/index.sass';
 
-import {
-  opening,
+import { opening,
   tomorrow,
-  yesterday
-} from './Opportunities.stories';
+  yesterday } from './Opportunities.stories';
 
 import { WorkingGroups, workerRoleNameByGroup } from '../working_groups';
 
@@ -72,6 +63,7 @@ export function CurrentRolesFragment () {
 
     ]
   };
+
   return (
     <CurrentRoles {...props} />
   );
@@ -147,9 +139,9 @@ export function ApplicationStatusFragment () {
   ];
 
   return (
-    <Container className="outer">
+    <Container className='outer'>
       {permutations.map((permutation, key) => (
-        <Container key={key} className="current-applications outer">
+        <Container key={key} className='current-applications outer'>
           <h4>{permutation._description}</h4>
           <ApplicationStatus {...permutation} />
         </Container>
@@ -288,9 +280,9 @@ const permutations: (ApplicationProps & TestProps)[] = [
 
 export function ApplicationFragment () {
   return (
-    <Container className="outer my-roles">
+    <Container className='outer my-roles'>
       {permutations.map((permutation, key) => (
-        <Container key={key} className="current-applications outer">
+        <Container key={key} className='current-applications outer'>
           <h4>{permutation._description}</h4>
           <Application {...permutation} />
         </Container>
@@ -301,8 +293,9 @@ export function ApplicationFragment () {
 
 export function ApplicationsFragment () {
   const cancelCallback = () => { /* do nothing */ };
+
   return (
-    <Container className="outer my-roles">
+    <Container className='outer my-roles'>
       <Applications applications={permutations} cancelCallback={cancelCallback} />
     </Container>
   );
diff --git a/pioneer/packages/joy-roles/src/tabs/MyRoles.stories.tsx b/pioneer/packages/joy-roles/src/tabs/MyRoles.stories.tsx
index a8cafac226..382c7ccee0 100644
--- a/pioneer/packages/joy-roles/src/tabs/MyRoles.stories.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/MyRoles.stories.tsx
@@ -1,17 +1,13 @@
 import React from 'react';
 import { withKnobs } from '@storybook/addon-knobs';
 
-import {
-  Container
-} from 'semantic-ui-react';
+import { Container } from 'semantic-ui-react';
 
 import 'semantic-ui-css/semantic.min.css';
 import '@polkadot/joy-roles/index.sass';
 
-import {
-  ApplicationsFragment,
-  CurrentRolesFragment
-} from './MyRoles.elements.stories';
+import { ApplicationsFragment,
+  CurrentRolesFragment } from './MyRoles.elements.stories';
 
 export default {
   title: 'Roles / Components / My roles tab',
@@ -20,7 +16,7 @@ export default {
 
 export function MyRolesSandbox () {
   return (
-    <Container className="my-roles">
+    <Container className='my-roles'>
       <CurrentRolesFragment />
       <ApplicationsFragment />
     </Container>
diff --git a/pioneer/packages/joy-roles/src/tabs/MyRoles.tsx b/pioneer/packages/joy-roles/src/tabs/MyRoles.tsx
index 70bd6d28ec..fa5eeb8142 100644
--- a/pioneer/packages/joy-roles/src/tabs/MyRoles.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/MyRoles.tsx
@@ -1,7 +1,6 @@
 import React, { useState } from 'react';
 import { Link } from 'react-router-dom';
-import {
-  Button,
+import { Button,
   Container,
   Icon,
   Form,
@@ -13,8 +12,7 @@ import {
   Segment,
   Statistic,
   Table,
-  SemanticICONS
-} from 'semantic-ui-react';
+  SemanticICONS } from 'semantic-ui-react';
 
 import { formatBalance } from '@polkadot/util';
 import { Balance } from '@polkadot/types/interfaces';
@@ -22,13 +20,9 @@ import { Balance } from '@polkadot/types/interfaces';
 import { Loadable } from '@polkadot/joy-utils/react/hocs';
 import { Opening } from '@joystream/types/hiring';
 
-import {
-  OpeningBodyReviewInProgress
-} from './Opportunities';
-import {
-  openingIcon,
-  openingDescription
-} from '../openingStateMarkup';
+import { OpeningBodyReviewInProgress } from './Opportunities';
+import { openingIcon,
+  openingDescription } from '../openingStateMarkup';
 import { CancelledReason, OpeningStageClassification, OpeningState } from '../classifiers';
 import { OpeningMetadata } from '../OpeningMetadata';
 import { CuratorId } from '@joystream/types/content-working-group';
@@ -49,10 +43,12 @@ function CTAButton (props: CTA) {
   const [rationale, setRationale] = useState<string>('');
   const handleOpen = () => setOpen(true);
   const handleClose = () => setOpen(false);
+
   const leaveRole = () => {
     props.callback(rationale);
     handleClose();
   };
+
   const handleChange = (e: any, value: any) => setRationale(value.value);
 
   return (
@@ -99,6 +95,7 @@ function RoleName (props: NameAndURL) {
   if (typeof props.url !== 'undefined') {
     return <Link to={props.url}>{props.name}</Link>;
   }
+
   return <span>{props.name}</span>;
 }
 
@@ -119,9 +116,9 @@ export type CurrentRolesProps = {
 
 export const CurrentRoles = Loadable<CurrentRolesProps>(
   ['currentRoles'],
-  props => {
+  (props) => {
     return (
-      <Container className="current-roles">
+      <Container className='current-roles'>
         <h2>Current roles</h2>
         {props.currentRoles.length > 0 &&
           <Table basic='very'>
@@ -173,14 +170,17 @@ type RankAndCapacityProps = {
 
 function RankAndCapacity (props: RankAndCapacityProps) {
   let capacity = null;
+
   if (props.capacity > 0) {
     capacity = '/ ' + props.capacity;
   }
 
   let iconName: SemanticICONS = 'check circle';
+
   if (props.capacity > 0 && props.rank > props.capacity) {
     iconName = 'times circle';
   }
+
   return (
     <span>
       <Icon name={iconName} />
@@ -213,6 +213,7 @@ function ApplicationCancelledStatus (props: ApplicationStatusProps) {
     </Message>
   );
 }
+
 type statusRenderer = (p: ApplicationStatusProps) => any
 
 function ApplicationStatusAcceptingApplications (props: ApplicationStatusProps): any {
@@ -227,6 +228,7 @@ function ApplicationStatusAcceptingApplications (props: ApplicationStatusProps):
       <p>You have been crowded out of this role, and will not be considered.</p>
     );
   }
+
   return (
     <Message positive={positive} negative={!positive}>
       <Message.Header>
@@ -249,6 +251,7 @@ function ApplicationStatusInReview (props: ApplicationStatusProps): any {
       <p>You have been crowded out of this role, and will not be considered.</p>
     );
   }
+
   return (
     <Message positive={positive} negative={!positive}>
       <Message.Header>
@@ -317,6 +320,7 @@ function applicationState (props: OpeningApplication): ApplicationState {
   } else if (props.capacity > 0 && props.rank > props.capacity) {
     return ApplicationState.Negative;
   }
+
   return ApplicationState.Positive;
 }
 
@@ -345,6 +349,7 @@ function CancelButton (props: ApplicationProps) {
   const [open, setOpen] = useState<boolean>(false);
   const handleOpen = () => setOpen(true);
   const handleClose = () => setOpen(false);
+
   const cancelApplication = () => {
     props.cancelCallback(props);
     handleClose();
@@ -392,6 +397,7 @@ const ApplicationLabel = styled(Label)`
 
 export function Application (props: ApplicationProps) {
   let countdown = null;
+
   if (props.stage.state === OpeningState.InReview) {
     countdown = <OpeningBodyReviewInProgress {...props.stage} />;
   }
@@ -401,6 +407,7 @@ export function Application (props: ApplicationProps) {
   const isLeadApplication = props.meta.type?.isOfType('Leader');
 
   let CTA = null;
+
   if (appState === ApplicationState.Positive && props.stage.state !== OpeningState.Complete) {
     CTA = <CancelButton {...props} />;
   }
@@ -409,25 +416,25 @@ export function Application (props: ApplicationProps) {
     <Segment className={'application status-' + applicationClass.get(appState)}>
       <Label attached='top'>
         {application.job.title}
-        <Label.Detail className="right">
+        <Label.Detail className='right'>
           {openingIcon(props.stage.state)}
           {openingDescription(props.stage.state)}
-          <Icon name="hashtag" style={{ marginLeft: '0.75em' }}/>
+          <Icon name='hashtag' style={{ marginLeft: '0.75em' }}/>
           { props.id }
           <ApplicationLabel>
             {_.startCase(props.meta.group) + (isLeadApplication ? ' Lead' : '')}
           </ApplicationLabel>
         </Label.Detail>
       </Label>
-      <Grid columns="equal">
+      <Grid columns='equal'>
         <Grid.Column width={10}>
-          <Label ribbon className="masthead">
+          <Label ribbon className='masthead'>
             <Statistic size='tiny'>
               <Statistic.Label>Reward</Statistic.Label>
               <Statistic.Value>{application.reward}</Statistic.Value>
             </Statistic>
           </Label>
-          <div className="summary">
+          <div className='summary'>
             <p>{application.headline}</p>
           </div>
 
@@ -450,7 +457,7 @@ export function Application (props: ApplicationProps) {
                   {formatBalance(props.roleStake)}
                 </Table.Cell>
               </Table.Row>
-              <Table.Row className="sum">
+              <Table.Row className='sum'>
                 <Table.Cell>
                   Total stake
                 </Table.Cell>
@@ -464,14 +471,14 @@ export function Application (props: ApplicationProps) {
           <List bulleted>
             {application.process && application.process.details.map((detail: string, key: any) => (
               <List.Item key={key}>
-                <List.Icon name="info circle" />
+                <List.Icon name='info circle' />
                 <List.Content>{detail}</List.Content>
               </List.Item>
             ))}
           </List>
 
         </Grid.Column>
-        <Grid.Column width={6} className="details">
+        <Grid.Column width={6} className='details'>
           <ApplicationStatus
             openingStatus={props.stage.state}
             rank={props.rank}
@@ -494,8 +501,8 @@ export type ApplicationsProps = CancelCallback & {
 
 export const Applications = Loadable<ApplicationsProps>(
   ['applications'],
-  props => (
-    <Container className="current-applications">
+  (props) => (
+    <Container className='current-applications'>
       <h2>Applications</h2>
       {props.applications.map((app, key) => (
         <Application key={key} cancelCallback={props.cancelCallback} {...app} />
diff --git a/pioneer/packages/joy-roles/src/tabs/Opportunities.controller.tsx b/pioneer/packages/joy-roles/src/tabs/Opportunities.controller.tsx
index dce9802c57..881fb65b64 100644
--- a/pioneer/packages/joy-roles/src/tabs/Opportunities.controller.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Opportunities.controller.tsx
@@ -7,10 +7,8 @@ import { ITransport } from '../transport';
 
 import { MemberId } from '@joystream/types/members';
 
-import {
-  WorkingGroupOpening,
-  OpeningsView
-} from './Opportunities';
+import { WorkingGroupOpening,
+  OpeningsView } from './Opportunities';
 
 import { AvailableGroups, WorkingGroups } from '../working_groups';
 
@@ -25,12 +23,12 @@ export class OpportunitiesController extends Controller<State, ITransport> {
     super(transport, initialState);
   }
 
-  refreshState() {
+  refreshState () {
     this.getOpportunities();
     this.getBlocktime();
   }
 
-  async setMemberId(memberId?: MemberId) {
+  async setMemberId (memberId?: MemberId) {
     this.state.memberId = memberId;
     this.dispatch();
   }
diff --git a/pioneer/packages/joy-roles/src/tabs/Opportunities.elements.stories.tsx b/pioneer/packages/joy-roles/src/tabs/Opportunities.elements.stories.tsx
index f2f5fffdd0..93e2ec6fd4 100644
--- a/pioneer/packages/joy-roles/src/tabs/Opportunities.elements.stories.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Opportunities.elements.stories.tsx
@@ -2,15 +2,11 @@ import React from 'react';
 import { withKnobs } from '@storybook/addon-knobs';
 import { Card, Container } from 'semantic-ui-react';
 
-import {
-  OpeningBodyApplicationsStatus, OpeningStakeAndApplicationStatus,
+import { OpeningBodyApplicationsStatus, OpeningStakeAndApplicationStatus,
   OpeningBodyReviewInProgress,
   OpeningBodyStakeRequirement, StakeRequirementProps,
-  OpeningHeader
-} from './Opportunities';
-import {
-  openingClass
-} from '../openingStateMarkup';
+  OpeningHeader } from './Opportunities';
+import { openingClass } from '../openingStateMarkup';
 import { ApplicationStakeRequirement, RoleStakeRequirement, StakeType } from '../StakeRequirement';
 
 import { tomorrow, yesterday } from './Opportunities.stories';
@@ -75,8 +71,8 @@ export function OpeningHeaderByState () {
     <Container>
       {stages.map((stage, key) => (
         <Container className={'inner opening ' + openingClass(stage.state)} key={key}>
-          <Card fluid className="container">
-            <Card.Content className="header">
+          <Card fluid className='container'>
+            <Card.Content className='header'>
               <OpeningHeader stage={stage} meta={meta} />
             </Card.Content>
           </Card>
@@ -173,9 +169,9 @@ export function OpeningApplicationsStatusByState () {
   return (
     <Container>
       {permutations.map((permutation, key) => (
-        <Container className="outer opening" key={key}>
+        <Container className='outer opening' key={key}>
           <h4>{permutation._description}</h4>
-          <Container className="main">
+          <Container className='main'>
             <OpeningBodyApplicationsStatus {...permutation} />
           </Container>
         </Container>
@@ -240,11 +236,11 @@ export function OpeningApplicationsStakeRequirementByStake () {
   return (
     <Container>
       {permutations.map((permutation, key) => (
-        <Container className="outer opening" key={key}>
+        <Container className='outer opening' key={key}>
           <h4>{permutation._description}</h4>
           <Card fluid>
             <Card.Content>
-              <Container className="main">
+              <Container className='main'>
                 <OpeningBodyStakeRequirement {...permutation} />
               </Container>
             </Card.Content>
@@ -271,11 +267,11 @@ export function ReviewInProgress () {
   return (
     <Container>
       {permutations.map((permutation, key) => (
-        <Container className="outer opening" key={key}>
+        <Container className='outer opening' key={key}>
           <h4>{permutation._description}</h4>
           <Card fluid>
             <Card.Content>
-              <Container className="main">
+              <Container className='main'>
                 <OpeningBodyReviewInProgress {...permutation} />
               </Container>
             </Card.Content>
diff --git a/pioneer/packages/joy-roles/src/tabs/Opportunities.stories.tsx b/pioneer/packages/joy-roles/src/tabs/Opportunities.stories.tsx
index 7905afefdb..0b3386ad6c 100644
--- a/pioneer/packages/joy-roles/src/tabs/Opportunities.stories.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Opportunities.stories.tsx
@@ -5,14 +5,10 @@ import * as faker from 'faker';
 import { Balance } from '@polkadot/types/interfaces';
 
 import { mockStage } from '../mocks';
-import {
-  OpeningView,
-  OpeningStakeAndApplicationStatus
-} from './Opportunities';
+import { OpeningView,
+  OpeningStakeAndApplicationStatus } from './Opportunities';
 
-import {
-  stateMarkup
-} from '../openingStateMarkup';
+import { stateMarkup } from '../openingStateMarkup';
 
 import { ApplicationStakeRequirement, RoleStakeRequirement } from '../StakeRequirement';
 import { OpeningStageClassification, OpeningState } from '../classifiers';
@@ -37,13 +33,17 @@ export default {
 
 export function tomorrow (): Date {
   const d = new Date();
+
   d.setDate(d.getDate() + 1);
+
   return d;
 }
 
 export function yesterday (): Date {
   const d = new Date();
+
   d.setDate(d.getDate() - 1);
+
   return d;
 }
 
@@ -95,9 +95,11 @@ export const opening = createMock('Opening', {
 
 const stateOptions: any = (function () {
   const options: any = {};
+
   stateMarkup.forEach((value, key) => {
     options[value.description] = key;
   });
+
   return options;
 }());
 
diff --git a/pioneer/packages/joy-roles/src/tabs/Opportunities.tsx b/pioneer/packages/joy-roles/src/tabs/Opportunities.tsx
index ab46fa12b6..ef8af8fd42 100644
--- a/pioneer/packages/joy-roles/src/tabs/Opportunities.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Opportunities.tsx
@@ -5,8 +5,7 @@ import marked from 'marked';
 import CopyToClipboard from 'react-copy-to-clipboard';
 
 import { Link, useHistory, useLocation } from 'react-router-dom';
-import {
-  Button,
+import { Button,
   Card,
   Container,
   Grid,
@@ -16,8 +15,7 @@ import {
   Message,
   Statistic,
   Dropdown,
-  DropdownProps
-} from 'semantic-ui-react';
+  DropdownProps } from 'semantic-ui-react';
 
 import { formatBalance } from '@polkadot/util';
 import { Balance } from '@polkadot/types/interfaces';
@@ -32,11 +30,9 @@ import { MemberId } from '@joystream/types/members';
 
 import { OpeningStageClassification, OpeningState } from '../classifiers';
 import { OpeningMetadataProps } from '../OpeningMetadata';
-import {
-  openingIcon,
+import { openingIcon,
   openingClass,
-  openingDescription
-} from '../openingStateMarkup';
+  openingDescription } from '../openingStateMarkup';
 
 import { Loadable } from '@polkadot/joy-utils/react/hocs';
 import styled from 'styled-components';
@@ -65,38 +61,40 @@ function classificationDescription (state: OpeningState): string {
 
 export function OpeningHeader (props: OpeningStage) {
   let time = null;
+
   if (props.stage.starting_time.getTime() > 0) {
-    time = <Moment unix format="DD/MM/YYYY, hh:mm A">{props.stage.starting_time.getTime() / 1000}</Moment>;
+    time = <Moment unix format='DD/MM/YYYY, hh:mm A'>{props.stage.starting_time.getTime() / 1000}</Moment>;
   }
+
   return (
-    <Grid columns="equal">
-      <Grid.Column className="status">
-        <Label ribbon size="large">
+    <Grid columns='equal'>
+      <Grid.Column className='status'>
+        <Label ribbon size='large'>
           {openingIcon(props.stage.state)}
           {openingDescription(props.stage.state)}
         </Label>
       </Grid.Column>
-      <Grid.Column className="meta" textAlign="right">
+      <Grid.Column className='meta' textAlign='right'>
         <Label>
-          <Icon name="history" /> {classificationDescription(props.stage.state)}&nbsp;
+          <Icon name='history' /> {classificationDescription(props.stage.state)}&nbsp;
           {time}
           <Label.Detail>
             <Link to={`/explorer/query/${props.stage.starting_block_hash}`}>
-              <Icon name="cube" />
+              <Icon name='cube' />
               <NumberFormat value={props.stage.starting_block}
-                displayType="text"
+                displayType='text'
                 thousandSeparator={true}
               />
             </Link>
           </Label.Detail>
           <Label.Detail>
-            <Icon name="hashtag" /> {props.meta.id}
+            <Icon name='hashtag' /> {props.meta.id}
           </Label.Detail>
         </Label>
         <a>
           <CopyToClipboard text={window.location.origin + '/#/working-groups/opportunities/' + props.meta.group + '/' + props.meta.id}>
             <Label>
-              <Icon name="copy" /> Copy link
+              <Icon name='copy' /> Copy link
             </Label>
           </CopyToClipboard>
         </a>
@@ -153,11 +151,11 @@ export function OpeningBodyStakeRequirement (props: StakeRequirementProps) {
   }
 
   const plural = (props.requiredApplicationStake.anyRequirement() && props.requiredRoleStake.anyRequirement()) ? 's' : null;
-  let title = <Message.Header color="orange" as='h5'><Icon name="shield" /> Stake{plural} required!</Message.Header>;
+  let title = <Message.Header color='orange' as='h5'><Icon name='shield' /> Stake{plural} required!</Message.Header>;
   let explanation = null;
 
   if (!props.defactoMinimumStake.isZero()) {
-    title = <Message.Header color="orange" as='h5'><Icon name="shield" /> Increased stake{plural} required!</Message.Header>;
+    title = <Message.Header color='orange' as='h5'><Icon name='shield' /> Increased stake{plural} required!</Message.Header>;
     explanation = (
       <p>
         However, in order to be in the top {props.maxNumberOfApplications} candidates, you wil need to stake at least <strong>{formatBalance(props.defactoMinimumStake)} in total</strong>.
@@ -166,7 +164,7 @@ export function OpeningBodyStakeRequirement (props: StakeRequirementProps) {
   }
 
   return (
-    <Message className="stake-requirements" warning>
+    <Message className='stake-requirements' warning>
       {title}
       {props.requiredApplicationStake.describe()}
       {props.requiredRoleStake.describe()}
@@ -197,12 +195,13 @@ function applicationPossibleWithIncresedStake (props: OpeningStakeAndApplication
 
 export function ApplicationCount (props: ApplicationCountProps) {
   let max_applications = null;
+
   if (props.maxNumberOfApplications > 0) {
     max_applications = (
       <span>
         /
         <NumberFormat value={props.maxNumberOfApplications}
-          displayType="text"
+          displayType='text'
           thousandSeparator={true}
         />
       </span>
@@ -212,7 +211,7 @@ export function ApplicationCount (props: ApplicationCountProps) {
   return (
     <span>
       <NumberFormat value={props.numberOfApplications + (props.applied ? 1 : 0)}
-        displayType="text"
+        displayType='text'
         thousandSeparator={true}
       />
       {max_applications}
@@ -229,16 +228,17 @@ function OpeningBodyCTAView (props: OpeningBodyCTAProps) {
 
   let message = (
     <Message positive>
-      <Icon name="check circle" /> No stake required
+      <Icon name='check circle' /> No stake required
     </Message>
   );
 
   if (hasAnyStake(props)) {
     const balance = !props.defactoMinimumStake.isZero() ? props.defactoMinimumStake : props.requiredApplicationStake.hard.add(props.requiredRoleStake.hard);
     const plural = (props.requiredApplicationStake.anyRequirement() && props.requiredRoleStake.anyRequirement()) ? 's totalling' : ' of';
+
     message = (
       <Message warning icon>
-        <Icon name="warning sign" />
+        <Icon name='warning sign' />
         <Message.Content>
           Stake{plural} at least <strong>{formatBalance(balance)}</strong> required!
         </Message.Content>
@@ -248,20 +248,21 @@ function OpeningBodyCTAView (props: OpeningBodyCTAProps) {
 
   let applyButton = (
     <Link to={'/working-groups/opportunities/' + props.meta.group + '/' + props.meta.id + '/apply'}>
-      <Button icon fluid positive size="huge">
+      <Button icon fluid positive size='huge'>
         APPLY NOW
-        <Icon name="angle right" />
+        <Icon name='angle right' />
       </Button>
     </Link>
   );
 
   const accountCtx = useMyAccount();
+
   if (!accountCtx.state.address) {
     applyButton = (
       <Message error icon>
-        <Icon name="info circle" />
+        <Icon name='info circle' />
         <Message.Content>
-          You will need an account to apply for this role. You can generate one in the <Link to="/accounts">Accounts</Link> section.
+          You will need an account to apply for this role. You can generate one in the <Link to='/accounts'>Accounts</Link> section.
         </Message.Content>
       </Message>
     );
@@ -269,9 +270,9 @@ function OpeningBodyCTAView (props: OpeningBodyCTAProps) {
   } else if (!props.member_id) {
     applyButton = (
       <Message error icon>
-        <Icon name="info circle" />
+        <Icon name='info circle' />
         <Message.Content>
-          You will need a membership to apply for this role. You can sign up in the <Link to="/members">Membership</Link> section.
+          You will need a membership to apply for this role. You can sign up in the <Link to='/members'>Membership</Link> section.
         </Message.Content>
       </Message>
     );
@@ -289,6 +290,7 @@ function OpeningBodyCTAView (props: OpeningBodyCTAProps) {
 export function OpeningBodyApplicationsStatus (props: OpeningStakeAndApplicationStatus) {
   const impossible = applicationImpossible(props);
   const msg = new MessageState();
+
   if (impossible) {
     msg.setNegative();
   } else if (applicationPossibleWithIncresedStake(props)) {
@@ -296,6 +298,7 @@ export function OpeningBodyApplicationsStatus (props: OpeningStakeAndApplication
   }
 
   let order = null;
+
   if (hasAnyStake(props)) {
     order = ', ordered by total stake,';
   }
@@ -308,13 +311,14 @@ export function OpeningBodyApplicationsStatus (props: OpeningStakeAndApplication
       <span>
         /
         <NumberFormat value={props.maxNumberOfApplications}
-          displayType="text"
+          displayType='text'
           thousandSeparator={true}
         />
       </span>
     );
 
     let disclaimer = null;
+
     if (impossible) {
       disclaimer = 'No futher applications will be considered.';
     }
@@ -326,10 +330,10 @@ export function OpeningBodyApplicationsStatus (props: OpeningStakeAndApplication
 
   return (
     <Message positive={msg.positive} warning={msg.warning} negative={msg.negative}>
-      <Statistic size="small">
+      <Statistic size='small'>
         <Statistic.Value>
           <NumberFormat value={props.numberOfApplications + (props.applied ? 1 : 0)}
-            displayType="text"
+            displayType='text'
             thousandSeparator={true}
           />
           {max_applications}
@@ -344,13 +348,14 @@ export function OpeningBodyApplicationsStatus (props: OpeningStakeAndApplication
 export function OpeningBodyReviewInProgress (props: OpeningStageClassification) {
   let countdown = null;
   let expected = null;
+
   if (props.review_end_time && props.starting_time.getTime() > 0) {
     countdown = <Countdown end={props.review_end_time} />;
     expected = (
       <span>
         &nbsp;(expected on&nbsp;
         <strong>
-          <Moment format="MMM DD, YYYY  HH:mm:ss" date={props.review_end_time} interval={0} />
+          <Moment format='MMM DD, YYYY  HH:mm:ss' date={props.review_end_time} interval={0} />
         </strong>
         )
       </span>
@@ -358,7 +363,7 @@ export function OpeningBodyReviewInProgress (props: OpeningStageClassification)
   }
 
   return (
-    <Message info className="countdown">
+    <Message info className='countdown'>
       <h4>Review process has begun</h4>
       {countdown}
 
@@ -366,7 +371,7 @@ export function OpeningBodyReviewInProgress (props: OpeningStageClassification)
         <span>Candidates will be selected by block&nbsp;
           <strong>
             <NumberFormat value={props.review_end_block}
-              displayType="text"
+              displayType='text'
               thousandSeparator={true}
             />
           </strong>
@@ -385,7 +390,9 @@ type BlockTimeProps = {
 function timeInHumanFormat (block_time_in_seconds: number, blocks: number) {
   const d1 = new Date();
   const d2 = new Date(d1.getTime());
+
   d2.setSeconds(d2.getSeconds() + (block_time_in_seconds * blocks));
+
   return <Moment duration={d1} date={d2} interval={0} />;
 }
 
@@ -399,10 +406,11 @@ export type OpeningBodyProps = DefactoMinimumStake & StakeRequirementProps & Blo
 export function OpeningBody (props: OpeningBodyProps) {
   const jobDesc = marked(props.text.job.description || '');
   const blockNumber = <NumberFormat value={props.opening.max_review_period_length.toNumber()}
-    displayType="text"
+    displayType='text'
     thousandSeparator={true} />;
 
   let stakeRequirements = null;
+
   switch (props.stage.state) {
     case OpeningState.WaitingToBegin:
     case OpeningState.AcceptingApplications:
@@ -415,31 +423,31 @@ export function OpeningBody (props: OpeningBodyProps) {
   }
 
   return (
-    <Grid columns="equal">
-      <Grid.Column width={10} className="summary">
+    <Grid columns='equal'>
+      <Grid.Column width={10} className='summary'>
         <Card.Header>
           <OpeningReward text={props.text.reward} />
         </Card.Header>
-        <h4 className="headline">{props.text.headline}</h4>
+        <h4 className='headline'>{props.text.headline}</h4>
         <h5>Role description</h5>
         <div dangerouslySetInnerHTML={{ __html: jobDesc }} />
         <h5>Hiring process details</h5>
         <List>
           <List.Item>
-            <List.Icon name="clock" />
+            <List.Icon name='clock' />
             <List.Content>
               The maximum review period for this opening is <strong>{blockNumber} blocks</strong> (approximately <strong>{timeInHumanFormat(props.block_time_in_seconds, props.opening.max_review_period_length.toNumber())}</strong>).
             </List.Content>
           </List.Item>
           {props.text.process && props.text.process.details.map((detail, key) => (
             <List.Item key={key}>
-              <List.Icon name="info circle" />
+              <List.Icon name='info circle' />
               <List.Content>{detail}</List.Content>
             </List.Item>
           ))}
         </List>
       </Grid.Column>
-      <Grid.Column width={6} className="details">
+      <Grid.Column width={6} className='details'>
         <OpeningBodyApplicationsStatus {...props.applications} />
         {stakeRequirements}
         <OpeningBodyCTAView {...props} {...props.applications} />
@@ -454,7 +462,7 @@ type OpeningRewardProps = {
 
 function OpeningReward (props: OpeningRewardProps) {
   return (
-    <Statistic size="small">
+    <Statistic size='small'>
       <Statistic.Label>Reward</Statistic.Label>
       <Statistic.Value>{props.text}</Statistic.Value>
     </Statistic>
@@ -478,7 +486,7 @@ type OpeningViewProps = WorkingGroupOpening & BlockTimeProps & MemberIdProps
 
 export const OpeningView = Loadable<OpeningViewProps>(
   ['opening', 'block_time_in_seconds'],
-  props => {
+  (props) => {
     const text = props.opening.parse_human_readable_text_with_fallback();
     const isLeadOpening = props.meta.type?.isOfType('Leader');
 
@@ -490,11 +498,11 @@ export const OpeningView = Loadable<OpeningViewProps>(
             { _.startCase(props.meta.group) }{ isLeadOpening ? ' Lead' : '' }
           </OpeningLabel>
         </OpeningTitle>
-        <Card fluid className="container">
-          <Card.Content className="header">
+        <Card fluid className='container'>
+          <Card.Content className='header'>
             <OpeningHeader stage={props.stage} meta={props.meta} />
           </Card.Content>
-          <Card.Content className="main">
+          <Card.Content className='main'>
             <OpeningBody
               {...props.applications}
               text={text}
@@ -532,21 +540,24 @@ export type OpeningsViewProps = MemberIdProps & {
 
 export const OpeningsView = Loadable<OpeningsViewProps>(
   ['openings', 'block_time_in_seconds'],
-  props => {
+  (props) => {
     const history = useHistory();
     const location = useLocation();
     const basePath = '/working-groups/opportunities';
     const { group = null, lead = false } = props;
+
     const onFilterChange: DropdownProps['onChange'] = (e, data) => {
       const newPath = data.value || basePath;
+
       if (newPath !== location.pathname) { history.push(newPath as string); }
     };
+
     const groupOption = (group: WorkingGroups | null, lead = false) => ({
       value: `${basePath}${group ? `/${group}` : ''}${lead ? '/lead' : ''}`,
       text: _.startCase(`${group || 'All opportunities'}`) + (lead ? ' (Lead)' : '')
     });
     // Can assert "props.openings!" because we're using "Loadable" which prevents them from beeing undefined
-    const filteredOpenings = props.openings!.filter(o =>
+    const filteredOpenings = props.openings!.filter((o) =>
       (!group || o.meta.group === group) &&
       (!group || !o.meta.type || (lead === o.meta.type.isOfType('Leader')))
     );
@@ -555,12 +566,12 @@ export const OpeningsView = Loadable<OpeningsViewProps>(
       <Container>
         <FilterOpportunities>
           <FilterOpportunitiesDropdown
-            placeholder="All opportunities"
+            placeholder='All opportunities'
             options={
               [groupOption(null, false)]
-                .concat(AvailableGroups.map(g => groupOption(g)))
+                .concat(AvailableGroups.map((g) => groupOption(g)))
                 // Currently we filter-out content curators, because they don't use the new working-group module yet
-                .concat(AvailableGroups.filter(g => g !== WorkingGroups.ContentCurators).map(g => groupOption(g, true)))
+                .concat(AvailableGroups.filter((g) => g !== WorkingGroups.ContentCurators).map((g) => groupOption(g, true)))
             }
             value={groupOption(group, lead).value}
             onChange={onFilterChange}
diff --git a/pioneer/packages/joy-roles/src/tabs/Opportunity.controller.tsx b/pioneer/packages/joy-roles/src/tabs/Opportunity.controller.tsx
index 1d3f850fa6..ebb85bc249 100644
--- a/pioneer/packages/joy-roles/src/tabs/Opportunity.controller.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Opportunity.controller.tsx
@@ -7,11 +7,9 @@ import { ITransport } from '../transport';
 
 import { MemberId } from '@joystream/types/members';
 
-import {
-  WorkingGroupOpening,
+import { WorkingGroupOpening,
   OpeningError,
-  OpeningView
-} from './Opportunities';
+  OpeningView } from './Opportunities';
 
 import { WorkingGroups, AvailableGroups } from '../working_groups';
 
@@ -27,7 +25,7 @@ export class OpportunityController extends Controller<State, ITransport> {
     this.getBlocktime();
   }
 
-  async setMemberId(memberId?: MemberId) {
+  async setMemberId (memberId?: MemberId) {
     this.state.memberId = memberId;
     this.dispatch();
   }
@@ -58,6 +56,7 @@ export const OpportunityView = View<OpportunityController, State>({
     useEffect(() => {
       controller.getOpportunity(params.get('group'), params.get('id'));
     }, [params.get('group'), params.get('id')]);
+
     return (
       <OpeningView {...state.opportunity!} block_time_in_seconds={state.blockTime!} member_id={state.memberId} />
     );
diff --git a/pioneer/packages/joy-roles/src/tabs/WorkingGroup.controller.tsx b/pioneer/packages/joy-roles/src/tabs/WorkingGroup.controller.tsx
index f59a5dafde..632b55377c 100644
--- a/pioneer/packages/joy-roles/src/tabs/WorkingGroup.controller.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/WorkingGroup.controller.tsx
@@ -5,11 +5,9 @@ import { View } from '@polkadot/joy-utils/react/hocs';
 
 import { ITransport } from '../transport';
 
-import {
-  ContentCurators,
+import { ContentCurators,
   WorkingGroupMembership,
-  StorageProviders
-} from './WorkingGroup';
+  StorageProviders } from './WorkingGroup';
 
 import styled from 'styled-components';
 
@@ -23,7 +21,7 @@ export class WorkingGroupsController extends Controller<State, ITransport> {
     super(transport, {});
   }
 
-  refreshState() {
+  refreshState () {
     this.getCurationGroup();
     this.getStorageGroup();
   }
diff --git a/pioneer/packages/joy-roles/src/tabs/WorkingGroup.tsx b/pioneer/packages/joy-roles/src/tabs/WorkingGroup.tsx
index 59758b4a52..14f765426f 100644
--- a/pioneer/packages/joy-roles/src/tabs/WorkingGroup.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/WorkingGroup.tsx
@@ -35,7 +35,7 @@ const JoinRole = ({ group, lead = false, title, description }: JoinRoleProps) =>
     <Message.Header>{title}</Message.Header>
     <p>{description}</p>
     <Link to={`/working-groups/opportunities/${group}${lead ? '/lead' : ''}`}>
-      <Button icon labelPosition="right" color="green" positive>
+      <Button icon labelPosition='right' color='green' positive>
         Find out more
         <Icon name={'right arrow' as SemanticICONS} />
       </Button>
@@ -93,6 +93,7 @@ const GroupOverview = Loadable<GroupOverviewProps>(
     const joinDesc = customJoinDesc || `There are openings for new ${groupName}. This is a great way to support Joystream!`;
     const becomeLeadTitle = customBecomeLeadTitle || `Become ${groupName} Lead!`;
     const becomeLeadDesc = customBecomeLeadDesc || `An opportunity to become ${groupName} Leader is currently available! This is a great way to support Joystream!`;
+
     return (
       <GroupOverviewSection>
         <h2>{ groupName }</h2>
@@ -151,6 +152,7 @@ export const CurrentLead = Loadable<CurrentLeadProps>(
   ['loaded'],
   ({ customLeadDesc, groupName, lead }: CurrentLeadProps) => {
     const leadDesc = customLeadDesc || `This role is responsible for hiring ${groupName}.`;
+
     return (
       <LeadSection>
         <Message>
diff --git a/pioneer/packages/joy-roles/src/transport.mock.ts b/pioneer/packages/joy-roles/src/transport.mock.ts
index eb8ecda9fa..03ecefbde0 100644
--- a/pioneer/packages/joy-roles/src/transport.mock.ts
+++ b/pioneer/packages/joy-roles/src/transport.mock.ts
@@ -271,6 +271,7 @@ export class Transport extends MockTransportBase implements ITransport {
 
   openingApplicationRanks (group: WorkingGroups, openingId: number): Promise<Balance[]> {
     const slots: Balance[] = [];
+
     for (let i = 0; i < 20; i++) {
       slots.push(createMock('u128', (i * 100) + 10 + i + 1));
     }
@@ -291,7 +292,7 @@ export class Transport extends MockTransportBase implements ITransport {
   }
 
   accounts (): Subscribable<keyPairDetails[]> {
-    return new Observable<keyPairDetails[]>(observer => {
+    return new Observable<keyPairDetails[]>((observer) => {
       observer.next(
         [
           {
diff --git a/pioneer/packages/joy-roles/src/transport.substrate.ts b/pioneer/packages/joy-roles/src/transport.substrate.ts
index 4025cd7246..7005e13821 100644
--- a/pioneer/packages/joy-roles/src/transport.substrate.ts
+++ b/pioneer/packages/joy-roles/src/transport.substrate.ts
@@ -15,20 +15,16 @@ import BaseTransport from '@polkadot/joy-utils/transport/base';
 import { ITransport } from './transport';
 import { GroupMember } from './elements';
 
-import {
-  Curator, CuratorId,
+import { Curator, CuratorId,
   CuratorApplication, CuratorApplicationId,
   CuratorRoleStakeProfile,
   CuratorOpening, CuratorOpeningId,
-  Lead, LeadId
-} from '@joystream/types/content-working-group';
+  Lead, LeadId } from '@joystream/types/content-working-group';
 
-import {
-  Application as WGApplication,
+import { Application as WGApplication,
   Opening as WGOpening,
   Worker, WorkerId,
-  RoleStakeProfile
-} from '@joystream/types/working-group';
+  RoleStakeProfile } from '@joystream/types/working-group';
 
 import { Application, Opening, OpeningId, ApplicationId, ActiveApplicationStage } from '@joystream/types/hiring';
 import { Stake, StakeId } from '@joystream/types/stake';
@@ -42,12 +38,10 @@ import { ActiveRole, OpeningApplication } from './tabs/MyRoles';
 
 import { keyPairDetails } from './flows/apply';
 
-import {
-  classifyApplicationCancellation,
+import { classifyApplicationCancellation,
   classifyOpeningStage,
   classifyOpeningStakes,
-  isApplicationHired
-} from './classifiers';
+  isApplicationHired } from './classifiers';
 import { WorkingGroups, AvailableGroups, workerRoleNameByGroup } from './working_groups';
 import { Sort, Sum, Zero } from './balances';
 import _ from 'lodash';
@@ -155,7 +149,7 @@ export class Transport extends BaseTransport implements ITransport {
     this.queueExtrinsic = queueExtrinsic;
   }
 
-  apiMethodByGroup(group: WorkingGroups, method: WGApiMethodType) {
+  apiMethodByGroup (group: WorkingGroups, method: WGApiMethodType) {
     const apiModule = workingGroupsApiMapping[group].module;
     const apiMethod = workingGroupsApiMapping[group].methods.query[method];
 
@@ -182,6 +176,7 @@ export class Transport extends BaseTransport implements ITransport {
 
   protected async stakeValue (stakeId: StakeId): Promise<Balance> {
     const stake = await this.cacheApi.query.stake.stakes(stakeId) as Stake;
+
     return stake.value;
   }
 
@@ -197,6 +192,7 @@ export class Transport extends BaseTransport implements ITransport {
 
   protected async workerTotalReward (relationshipId: RewardRelationshipId): Promise<Balance> {
     const relationship = await this.rewardRelationshipById(relationshipId);
+
     return relationship?.total_reward_received || this.api.createType('Balance', 0);
   }
 
@@ -212,6 +208,7 @@ export class Transport extends BaseTransport implements ITransport {
     const rewardRelationship = worker.reward_relationship.isSome
       ? await this.rewardRelationshipById(worker.reward_relationship.unwrap())
       : undefined;
+
     return rewardRelationship;
   }
 
@@ -226,11 +223,13 @@ export class Transport extends BaseTransport implements ITransport {
       : (worker as Worker).member_id;
 
     const profile = await this.cacheApi.query.members.membershipById(memberId) as Membership;
+
     if (profile.handle.isEmpty) {
       throw new Error('No group member profile found!');
     }
 
     let stakeValue: Balance = this.api.createType('Balance', 0);
+
     if (worker.role_stake_profile && worker.role_stake_profile.isSome) {
       stakeValue = await this.workerStake(worker.role_stake_profile.unwrap());
     }
@@ -256,6 +255,7 @@ export class Transport extends BaseTransport implements ITransport {
 
     for (const [/* id */, groupOpening] of groupOpenings) {
       const opening = await this.opening(groupOpening.hiring_opening_id.toNumber());
+
       if (
         opening.is_active &&
         (
@@ -357,8 +357,8 @@ export class Transport extends BaseTransport implements ITransport {
     const leadStatus = await this.groupLeadStatus(group);
 
     const workers = (await this.entriesByIds<GroupWorkerId, GroupWorker>(
-        this.apiMethodByGroup(group, 'workerById')
-      ))
+      this.apiMethodByGroup(group, 'workerById')
+    ))
       .filter(([id, worker]) => worker.is_active && (!leadStatus.lead?.workerId || !id.eq(leadStatus.lead.workerId)));
 
     return {
@@ -431,6 +431,7 @@ export class Transport extends BaseTransport implements ITransport {
 
   async groupOpening (group: WorkingGroups, id: number): Promise<WorkingGroupOpening> {
     const nextId = (await this.cachedApiMethodByGroup(group, 'nextOpeningId')() as GroupOpeningId).toNumber();
+
     if (id < 0 || id >= nextId) {
       throw new Error('invalid id');
     }
@@ -479,11 +480,12 @@ export class Transport extends BaseTransport implements ITransport {
 
   async openingApplicationRanks (group: WorkingGroups, openingId: number): Promise<Balance[]> {
     const applications = await this.groupOpeningApplications(group, openingId);
+
     return Sort(
       (await Promise.all(
         applications
-          .filter(a => a.hiringModule.stage.value instanceof ActiveApplicationStage)
-          .map(application => this.openingApplicationTotalStake(application.hiringModule))
+          .filter((a) => a.hiringModule.stage.value instanceof ActiveApplicationStage)
+          .map((application) => this.openingApplicationTotalStake(application.hiringModule))
       ))
     );
   }
@@ -494,22 +496,23 @@ export class Transport extends BaseTransport implements ITransport {
 
   async blockHash (height: number): Promise<string> {
     const blockHash = await this.api.rpc.chain.getBlockHash(height);
+
     return blockHash.toString();
   }
 
   async blockTimestamp (height: number): Promise<Date> {
     const blockTime = await this.api.query.timestamp.now.at(
       await this.blockHash(height)
-    ) as Moment;
+    );
 
     return new Date(blockTime.toNumber());
   }
 
   accounts (): Subscribable<keyPairDetails[]> {
     return keyringOption.optionsSubject.pipe(
-      map(accounts => {
+      map((accounts) => {
         return accounts.all
-          .filter(x => x.value)
+          .filter((x) => x.value)
           .map(async (result, k) => {
             return {
               shortName: result.name,
@@ -518,7 +521,7 @@ export class Transport extends BaseTransport implements ITransport {
             };
           });
       }),
-      switchMap(async x => Promise.all(x))
+      switchMap(async (x) => Promise.all(x))
     ) as Subscribable<keyPairDetails[]>;
   }
 
@@ -529,11 +532,13 @@ export class Transport extends BaseTransport implements ITransport {
     };
 
     const appStake = app.active_application_staking_id;
+
     if (appStake.isSome) {
       stakes.application = await this.stakeValue(appStake.unwrap());
     }
 
     const roleStake = app.active_role_staking_id;
+
     if (roleStake.isSome) {
       stakes.role = await this.stakeValue(roleStake.unwrap());
     }
@@ -542,9 +547,9 @@ export class Transport extends BaseTransport implements ITransport {
   }
 
   protected async myApplicationRank (myApp: Application, applications: Array<Application>): Promise<number> {
-    const activeApplications = applications.filter(app => app.stage.value instanceof ActiveApplicationStage);
+    const activeApplications = applications.filter((app) => app.stage.value instanceof ActiveApplicationStage);
     const stakes = await Promise.all(
-      activeApplications.map(app => this.openingApplicationTotalStake(app))
+      activeApplications.map((app) => this.openingApplicationTotalStake(app))
     );
 
     const appvalues = activeApplications.map((app, key) => {
@@ -564,14 +569,14 @@ export class Transport extends BaseTransport implements ITransport {
       return 1;
     });
 
-    return appvalues.findIndex(v => v.app.eq(myApp)) + 1;
+    return appvalues.findIndex((v) => v.app.eq(myApp)) + 1;
   }
 
   async openingApplicationsByAddressAndGroup (group: WorkingGroups, roleKey: string): Promise<OpeningApplication[]> {
     const myGroupApplications = (await this.entriesByIds<GroupApplicationId, GroupApplication>(
-        await this.apiMethodByGroup(group, 'applicationById')
-      ))
-      .filter(([id, groupApplication]) => groupApplication.role_account_id.eq(roleKey))
+      await this.apiMethodByGroup(group, 'applicationById')
+    ))
+      .filter(([id, groupApplication]) => groupApplication.role_account_id.eq(roleKey));
 
     const myHiringApplications = await Promise.all(
       myGroupApplications.map(
@@ -580,7 +585,7 @@ export class Transport extends BaseTransport implements ITransport {
     ) as Application[];
 
     const stakes = await Promise.all(
-      myHiringApplications.map(app => this.applicationStakes(app))
+      myHiringApplications.map((app) => this.applicationStakes(app))
     );
 
     const openings = await Promise.all(
@@ -601,7 +606,7 @@ export class Transport extends BaseTransport implements ITransport {
           id: myGroupApplications[key][0].toNumber(),
           hired: isApplicationHired(myHiringApplications[key]),
           cancelledReason: classifyApplicationCancellation(myHiringApplications[key]),
-          rank: await this.myApplicationRank(myHiringApplications[key], allAppsByOpening[key].map(a => a.hiringModule)),
+          rank: await this.myApplicationRank(myHiringApplications[key], allAppsByOpening[key].map((a) => a.hiringModule)),
           capacity: o.applications.maxNumberOfApplications,
           stage: o.stage,
           opening: o.opening,
@@ -618,6 +623,7 @@ export class Transport extends BaseTransport implements ITransport {
   // Get opening applications for all groups by address
   async openingApplicationsByAddress (roleKey: string): Promise<OpeningApplication[]> {
     let applications: OpeningApplication[] = [];
+
     for (const group of AvailableGroups) {
       applications = applications.concat(await this.openingApplicationsByAddressAndGroup(group, roleKey));
     }
@@ -637,11 +643,13 @@ export class Transport extends BaseTransport implements ITransport {
         .filter(([id, worker]) => worker.role_account_id.eq(roleKeyId) && worker.is_active)
         .map(async ([id, worker]) => {
           let stakeValue: Balance = this.api.createType('u128', 0);
+
           if (worker.role_stake_profile && worker.role_stake_profile.isSome) {
             stakeValue = await this.workerStake(worker.role_stake_profile.unwrap());
           }
 
           let earnedValue: Balance = this.api.createType('u128', 0);
+
           if (worker.reward_relationship && worker.reward_relationship.isSome) {
             earnedValue = await this.workerTotalReward(worker.reward_relationship.unwrap());
           }
@@ -662,6 +670,7 @@ export class Transport extends BaseTransport implements ITransport {
   // All groups roles by key
   async myRoles (roleKey: string): Promise<ActiveRole[]> {
     let roles: ActiveRole[] = [];
+
     for (const group of AvailableGroups) {
       roles = roles.concat(await this.myRolesByGroup(group, roleKey));
     }
@@ -673,11 +682,13 @@ export class Transport extends BaseTransport implements ITransport {
     const { address, deriveError, derivePath, isSeedValid, pairType, seed } = generateSeed(null, '', 'bip');
 
     const isValid = !!address && !deriveError && isSeedValid;
+
     if (!isValid) {
       return null;
     }
 
     const status = createAccount(`${seed}${derivePath}`, pairType, name, password, 'created account');
+
     return status.account as string;
   }
 
@@ -691,15 +702,17 @@ export class Transport extends BaseTransport implements ITransport {
     applicationText: string): Promise<number> {
     return new Promise<number>((resolve, reject) => {
       (this.cacheApi.query.members.memberIdsByControllerAccountId(sourceAccount) as Promise<Vec<MemberId>>)
-        .then(membershipIds => {
+        .then((membershipIds) => {
           if (membershipIds.length === 0) {
             reject(new Error('No membship ID associated with this address'));
           }
 
           const roleAccount = this.generateRoleAccount(roleAccountName);
+
           if (!roleAccount) {
             reject(new Error('failed to create role account'));
           }
+
           const tx = this.apiExtrinsicByGroup(group, 'applyOnOpening')(
             membershipIds[0], // Member id
             id, // Worker/Curator opening id
diff --git a/pioneer/packages/joy-utils/src/react/helpers/Observable.ts b/pioneer/packages/joy-utils/src/react/helpers/Observable.ts
index e3a6ba1c4b..417f9ab44c 100644
--- a/pioneer/packages/joy-utils/src/react/helpers/Observable.ts
+++ b/pioneer/packages/joy-utils/src/react/helpers/Observable.ts
@@ -14,15 +14,16 @@ export abstract class Observable<S extends { [key: string ]: any }, T> implement
 
   public subscribe (observer: Observer<S>): IUnsubscribable<S> {
     this.observers.push(observer);
+
     return this;
   }
 
   public unsubscribe (observerToRemove: Observer<S>) {
-    this.observers = this.observers.filter(observer => observerToRemove !== observer);
+    this.observers = this.observers.filter((observer) => observerToRemove !== observer);
   }
 
   public dispatch () {
-    this.observers.forEach(observer => observer(this.state));
+    this.observers.forEach((observer) => observer(this.state));
   }
 
   public setState (updatedState: Partial<S>) {
@@ -31,8 +32,9 @@ export abstract class Observable<S extends { [key: string ]: any }, T> implement
     } else {
       this.state = updatedState as S;
     }
+
     this.dispatch();
   }
 
-  public refreshState() { }
+  public refreshState () { }
 }
diff --git a/pioneer/packages/joy-utils/src/react/helpers/Subscribable.ts b/pioneer/packages/joy-utils/src/react/helpers/Subscribable.ts
index 966cbfac12..f7e776dee5 100644
--- a/pioneer/packages/joy-utils/src/react/helpers/Subscribable.ts
+++ b/pioneer/packages/joy-utils/src/react/helpers/Subscribable.ts
@@ -1,7 +1,5 @@
-import {
-  Subscribable as RxjsSubscribable,
-  Unsubscribable as RxjsUnsubscribable
-} from 'rxjs';
+import { Subscribable as RxjsSubscribable,
+  Unsubscribable as RxjsUnsubscribable } from 'rxjs';
 
 export type Observer<S> = (v: S) => void
 
diff --git a/pioneer/packages/joy-utils/src/react/helpers/memoize.ts b/pioneer/packages/joy-utils/src/react/helpers/memoize.ts
index 480a4b6197..c6e10b2308 100644
--- a/pioneer/packages/joy-utils/src/react/helpers/memoize.ts
+++ b/pioneer/packages/joy-utils/src/react/helpers/memoize.ts
@@ -18,6 +18,7 @@ function getNewFunction (originalMethod: () => void) {
           value: new Map<any, any>()
         });
       }
+
       const myMap: Map<any, any> = this[propMapName];
       const hashKey = args[0];
 
diff --git a/pioneer/packages/joy-utils/src/react/hocs/Loadable.tsx b/pioneer/packages/joy-utils/src/react/hocs/Loadable.tsx
index 7545cc9c81..fc779628c6 100644
--- a/pioneer/packages/joy-utils/src/react/hocs/Loadable.tsx
+++ b/pioneer/packages/joy-utils/src/react/hocs/Loadable.tsx
@@ -2,20 +2,21 @@ import React from 'react';
 import { componentName } from '../helpers';
 
 export function Loadable<P extends {[index: string]: any}>
-  (required: string[], Component: React.FC<P>): React.FC<P> {
-
+(required: string[], Component: React.FC<P>): React.FC<P> {
   const ResultComponent: React.FunctionComponent<P> = (props: P) => {
     if (!props) {
-      return <div className="spinner"></div>;
+      return <div className='spinner'></div>;
     }
 
     for (const requirement of required) {
       if (typeof props[requirement] === 'undefined') {
-        return <div className="spinner"></div>;
+        return <div className='spinner'></div>;
       }
     }
+
     return <Component {...props} />;
   };
+
   ResultComponent.displayName = `Loadable(${componentName(Component)})`;
 
   return ResultComponent;
diff --git a/pioneer/packages/joy-utils/src/react/hocs/View.tsx b/pioneer/packages/joy-utils/src/react/hocs/View.tsx
index 10eab1db11..70c7a68f3e 100644
--- a/pioneer/packages/joy-utils/src/react/hocs/View.tsx
+++ b/pioneer/packages/joy-utils/src/react/hocs/View.tsx
@@ -30,42 +30,42 @@ function DefaultError () {
 }
 
 export function View<C extends Controller<S, any>, S> (args: ViewArgs<C, S>): ViewRenderer<C> {
-    return (props: ViewRendererProps<C>): React.ReactElement | null => {
-      const { controller } = props;
-      const [state, setState] = useState<S>(controller.state);
+  return (props: ViewRendererProps<C>): React.ReactElement | null => {
+    const { controller } = props;
+    const [state, setState] = useState<S>(controller.state);
 
-      const onUpdate = (newState: S) => {
-        setState({ ...newState });
-      };
+    const onUpdate = (newState: S) => {
+      setState({ ...newState });
+    };
 
-      useEffect(() => {
-        controller.subscribe(onUpdate);
-        controller.refreshState(); // Refresh controller state on View mount
+    useEffect(() => {
+      controller.subscribe(onUpdate);
+      controller.refreshState(); // Refresh controller state on View mount
 
-        return () => {
-          controller.unsubscribe(onUpdate);
-        };
-      }, []);
+      return () => {
+        controller.unsubscribe(onUpdate);
+      };
+    }, []);
 
-      const params = props.params ? new Map(Object.entries(props.params)) : new Map<string, string | undefined>();
+    const params = props.params ? new Map(Object.entries(props.params)) : new Map<string, string | undefined>();
 
-      let RenderComponent: RenderComponent<C, S>;
-      let Err: React.ComponentType = DefaultError;
-      if (typeof args === 'function') {
-        RenderComponent = args;
-      } else {
-        RenderComponent = args.renderComponent;
+    let RenderComponent: RenderComponent<C, S>;
+    let Err: React.ComponentType = DefaultError;
 
-        if (typeof args.errorComponent !== 'undefined') {
-          Err = args.errorComponent;
-        }
-      }
+    if (typeof args === 'function') {
+      RenderComponent = args;
+    } else {
+      RenderComponent = args.renderComponent;
 
-      if (controller.hasError()) {
-        return Err ? <Err /> : null;
-      }
-      else {
-        return <RenderComponent { ...{state, controller, params} } />;
+      if (typeof args.errorComponent !== 'undefined') {
+        Err = args.errorComponent;
       }
-    };
+    }
+
+    if (controller.hasError()) {
+      return Err ? <Err /> : null;
+    } else {
+      return <RenderComponent { ...{ state, controller, params } } />;
+    }
+  };
 }
diff --git a/pioneer/packages/joy-utils/src/transport/mock/base.ts b/pioneer/packages/joy-utils/src/transport/mock/base.ts
index a6b590729d..eab968e35f 100644
--- a/pioneer/packages/joy-utils/src/transport/mock/base.ts
+++ b/pioneer/packages/joy-utils/src/transport/mock/base.ts
@@ -2,7 +2,7 @@ export default abstract class BaseTransport {
   protected promise<T> (value: T, timeout?: number): Promise<T> {
     return new Promise<T>((resolve, reject) => {
       if (timeout) {
-        (new Promise(resolve => setTimeout(resolve, timeout))).then(() => resolve(value));
+        (new Promise((resolve) => setTimeout(resolve, timeout))).then(() => resolve(value));
       } else {
         resolve(value);
       }

From 6d90afa9984a3da2f49f7a1c6f131f6f04630318 Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Fri, 21 Aug 2020 17:12:40 +0200
Subject: [PATCH 13/17] Linter: Manual fixes

---
 pioneer/.eslintrc.js                          |   2 +
 pioneer/package.json                          |   2 -
 pioneer/packages/joy-roles/src/elements.tsx   |   6 +-
 .../joy-roles/src/flows/apply.controller.tsx  |   9 +-
 .../src/flows/apply.elements.stories.tsx      |   4 +-
 .../joy-roles/src/flows/apply.stories.tsx     |   6 +-
 .../packages/joy-roles/src/flows/apply.tsx    | 101 +++++++++---------
 pioneer/packages/joy-roles/src/index.tsx      |  18 ++--
 .../joy-roles/src/openingStateMarkup.tsx      |  42 ++++----
 .../joy-roles/src/tabs/Admin.controller.tsx   |  15 +--
 .../joy-roles/src/tabs/MyRoles.controller.tsx |   4 +-
 .../packages/joy-roles/src/tabs/MyRoles.tsx   |  19 ++--
 .../src/tabs/Opportunities.controller.tsx     |  11 +-
 .../src/tabs/Opportunities.stories.tsx        |   6 +-
 .../joy-roles/src/tabs/Opportunities.tsx      |   4 +-
 .../src/tabs/Opportunity.controller.tsx       |  32 +++---
 .../src/tabs/WorkingGroup.controller.tsx      |  21 ++--
 .../joy-roles/src/transport.substrate.ts      |   5 +-
 .../joy-utils/src/functions/accounts.ts       |   5 +-
 .../packages/joy-utils/src/functions/misc.ts  |   2 +
 .../joy-utils/src/react/helpers/Observable.ts |   4 +-
 .../joy-utils/src/react/helpers/index.ts      |   1 -
 .../joy-utils/src/react/helpers/memoize.ts    |  53 ---------
 .../joy-utils/src/react/hocs/View.tsx         |  38 ++++---
 .../joy-utils/src/transport/mock/base.ts      |   4 +-
 .../joy-utils/src/types/workingGroups.ts      |   3 +
 types/.prettierignore                         |   1 +
 types/package.json                            |   6 +-
 types/src/hiring/schemas/role.schema.json     |   6 +-
 .../src/hiring/schemas/role.schema.typings.ts |  73 ++++++-------
 types/src/index.ts                            |  11 +-
 yarn.lock                                     |  90 ++++++++--------
 32 files changed, 287 insertions(+), 317 deletions(-)
 delete mode 100644 pioneer/packages/joy-utils/src/react/helpers/memoize.ts

diff --git a/pioneer/.eslintrc.js b/pioneer/.eslintrc.js
index a909f51bfc..4b3de541bd 100644
--- a/pioneer/.eslintrc.js
+++ b/pioneer/.eslintrc.js
@@ -27,6 +27,8 @@ module.exports = {
     'react/jsx-max-props-per-line': 'off',
     'sort-destructure-keys/sort-destructure-keys': 'off',
     '@typescript-eslint/unbound-method': 'warn', // Doesn't work well with our version of Formik, see: https://github.com/formium/formik/issues/2589
+    'react-hooks/exhaustive-deps': 'warn', // Causes more issues than it solves currently
+    'no-void': 'off' // Otherwise we cannot mark unhandles promises
   },
   // isolate pioneer from monorepo eslint rules
   root: true
diff --git a/pioneer/package.json b/pioneer/package.json
index 290ee51883..6979cc7c05 100644
--- a/pioneer/package.json
+++ b/pioneer/package.json
@@ -25,7 +25,6 @@
     "test": "echo \"skipping tests\"",
     "vanitygen": "node packages/app-accounts/scripts/vanitygen.js",
     "start": "yarn clean && cd packages/apps && webpack --config webpack.config.js",
-    "generate-schemas": "json2ts -i packages/joy-types/src/schemas/role.schema.json -o packages/joy-types/src/schemas/role.schema.ts",
     "build-storybook": "build-storybook -c .storybook",
     "storybook": "start-storybook -s ./packages/apps/public -p 3001"
   },
@@ -74,7 +73,6 @@
     "@storybook/addon-actions": "^5.2.5",
     "@storybook/addon-console": "^1.2.1",
     "@storybook/react": "^5.2.5",
-    "json-schema-to-typescript": "^7.1.0",
     "storybook-react-router": "^1.0.8",
     "typescript": "^3.9.7",
     "eslint-plugin-header": "^3.0.0",
diff --git a/pioneer/packages/joy-roles/src/elements.tsx b/pioneer/packages/joy-roles/src/elements.tsx
index bf3dfeb772..66a3b9e54a 100644
--- a/pioneer/packages/joy-roles/src/elements.tsx
+++ b/pioneer/packages/joy-roles/src/elements.tsx
@@ -201,8 +201,6 @@ type CountdownProps = {
 }
 
 export function Countdown (props: CountdownProps) {
-  let interval = -1;
-
   const [days, setDays] = useState<number | undefined>(undefined);
   const [hours, setHours] = useState<number | undefined>(undefined);
   const [minutes, setMinutes] = useState<number | undefined>(undefined);
@@ -219,9 +217,9 @@ export function Countdown (props: CountdownProps) {
     setSeconds(d.seconds());
   };
 
-  interval = window.setInterval(update, 1000);
-
   useEffect(() => {
+    const interval = window.setInterval(update, 1000);
+
     update();
 
     return () => {
diff --git a/pioneer/packages/joy-roles/src/flows/apply.controller.tsx b/pioneer/packages/joy-roles/src/flows/apply.controller.tsx
index e1330fe23b..5b3208efba 100644
--- a/pioneer/packages/joy-roles/src/flows/apply.controller.tsx
+++ b/pioneer/packages/joy-roles/src/flows/apply.controller.tsx
@@ -17,6 +17,7 @@ import { OpeningStakeAndApplicationStatus } from '../tabs/Opportunities';
 import { Min, Step, Sum } from '../balances';
 import { WorkingGroups, AvailableGroups } from '../working_groups';
 import { createMock } from '@joystream/types';
+import { ApplicationDetailsData } from '@polkadot/joy-utils/types/workingGroups';
 
 type State = {
   // Input data from state
@@ -30,7 +31,7 @@ type State = {
   // Data captured from form
   applicationStake: Balance;
   roleStake: Balance;
-  appDetails: any;
+  appDetails: ApplicationDetailsData;
   txKeyAddress: AccountId;
   activeStep: ProgressSteps;
   txInProgress: boolean;
@@ -153,12 +154,12 @@ export class ApplyController extends Controller<State, ITransport> {
     this.dispatch();
   }
 
-  setAppDetails (v: any): void {
+  setAppDetails (v: ApplicationDetailsData): void {
     this.state.appDetails = v;
     this.dispatch();
   }
 
-  setTxKeyAddress (v: any): void {
+  setTxKeyAddress (v: AccountId): void {
     this.state.txKeyAddress = v;
     this.dispatch();
   }
@@ -232,7 +233,7 @@ export const ApplyView = View<ApplyController, State>(
   ({ state, controller, params }) => {
     useEffect(() => {
       controller.findOpening(params.get('id'), params.get('group'));
-    }, [params.get('id'), params.get('group')]);
+    }, [params]);
 
     return (
       <FlowModal
diff --git a/pioneer/packages/joy-roles/src/flows/apply.elements.stories.tsx b/pioneer/packages/joy-roles/src/flows/apply.elements.stories.tsx
index 1c00257b9d..0af5a914a5 100644
--- a/pioneer/packages/joy-roles/src/flows/apply.elements.stories.tsx
+++ b/pioneer/packages/joy-roles/src/flows/apply.elements.stories.tsx
@@ -1,5 +1,5 @@
-// TODO: FIXME: Remove the ts-nocheck and fix errors!
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// TODO: FIXME: Remove those and fix errors!
+/* eslint-disable */
 // @ts-nocheck
 import React, { useState } from 'react';
 import { number, object, withKnobs } from '@storybook/addon-knobs';
diff --git a/pioneer/packages/joy-roles/src/flows/apply.stories.tsx b/pioneer/packages/joy-roles/src/flows/apply.stories.tsx
index 963388421e..d12e128468 100644
--- a/pioneer/packages/joy-roles/src/flows/apply.stories.tsx
+++ b/pioneer/packages/joy-roles/src/flows/apply.stories.tsx
@@ -112,7 +112,11 @@ export const ApplicationSandbox = () => {
       ),
       defactoMinimumStake: new u128(0)
     },
-    creator: creator,
+    creator: {
+      membership: {
+        handle: text('Creator handle', 'ben', 'Role')
+      }
+    },
     transactionFee: new u128(number('Transaction fee', 499, moneySliderOptions, 'Application Tx')),
     keypairs: [
       {
diff --git a/pioneer/packages/joy-roles/src/flows/apply.tsx b/pioneer/packages/joy-roles/src/flows/apply.tsx
index 5ec1f16847..04c6712799 100644
--- a/pioneer/packages/joy-roles/src/flows/apply.tsx
+++ b/pioneer/packages/joy-roles/src/flows/apply.tsx
@@ -19,7 +19,9 @@ import { Accordion,
   Segment,
   SemanticICONS,
   Step,
-  Table } from 'semantic-ui-react';
+  Table,
+  InputOnChangeData,
+  TextAreaProps } from 'semantic-ui-react';
 
 import Identicon from '@polkadot/react-identicon';
 import AccountId from '@polkadot/types/generic/AccountId';
@@ -37,6 +39,7 @@ import { IStakeRequirement } from '../StakeRequirement';
 import { Loadable } from '@polkadot/joy-utils/react/hocs';
 import { Add } from '../balances';
 import { createMock } from '@joystream/types';
+import { ApplicationDetailsData, ApplicationQuestionAnswers } from '@polkadot/joy-utils/types/workingGroups';
 
 type accordionProps = {
   title: string;
@@ -56,7 +59,16 @@ function ModalAccordion (props: React.PropsWithChildren<accordionProps>) {
   );
 }
 
-function KeyPair ({ address, className, style, isUppercase, name, balance }: any): any {
+type KeyPairProps = {
+  address: string;
+  className?: string;
+  style?: React.CSSProperties;
+  isUppercase: boolean;
+  name: string;
+  balance: Balance;
+}
+
+function KeyPair ({ address, className, style, isUppercase, name, balance }: KeyPairProps) {
   return (
     <div
       className={['keypair', className].join(' ')}
@@ -193,7 +205,7 @@ export function StakeRankSelector (props: StakeRankSelectorProps) {
   const ticks = [];
 
   for (let i = 0; i < slotCount; i++) {
-    ticks.push(<div key={i} className='tick' style={{ width: (100 / slotCount) + '%' }}>{slotCount - i}</div>);
+    ticks.push(<div key={i} className='tick' style={{ width: `${(100 / slotCount)}%` }}>{slotCount - i}</div>);
   }
 
   let estimatedSlot = slotCount + 1;
@@ -485,10 +497,10 @@ export function ConfirmStakes2Up (props: ConfirmStakes2UpProps) {
   const ticks = [];
 
   for (let i = 0; i < slotCount; i++) {
-    ticks.push(<div key={i} className='tick' style={{ width: (100 / slotCount) + '%' }}>{i + 1}</div>);
+    ticks.push(<div key={i} className='tick' style={{ width: `${(100 / slotCount)}%` }}>{i + 1}</div>);
   }
 
-  const tickLabel = <div className='ui pointing below label' style={{ left: ((100 / slotCount) * (estimatedSlot - 1)) + '%' }}>
+  const tickLabel = <div className='ui pointing below label' style={{ left: `${((100 / slotCount) * (estimatedSlot - 1))}%` }}>
     Your rank
     <div className='detail'>{estimatedSlot}/{props.applications.maxNumberOfApplications}</div>
   </div>;
@@ -708,12 +720,10 @@ function questionHash (section: QuestionSection, question: QuestionField): strin
   return section.title + '|' + question.title;
 }
 
-interface FinalDataMap {
-  [k: string]: FinalDataMap;
-}
+interface AnswersByHash { [hash: string]: string; }
 
-function applicationDetailsToObject (input: ApplicationDetails, data: FinalDataMap): any {
-  const output: any = {};
+function applicationDetailsDataToAnswersByHash (input: ApplicationDetails, data: ApplicationDetailsData): AnswersByHash {
+  const output: AnswersByHash = {};
 
   if (!input.sections) {
     return {};
@@ -721,47 +731,42 @@ function applicationDetailsToObject (input: ApplicationDetails, data: FinalDataM
 
   input.sections.map((section) => {
     section.questions.map((question) => {
-      let value: any = '';
-
-      if (data[section.title] && data[section.title][question.title]) {
-        value = data[section.title][question.title];
-      }
+      const sectionAnswers = data[section.title];
+      const answer = (sectionAnswers && sectionAnswers[question.title]) || '';
 
-      output[questionHash(section, question)] = value;
+      output[questionHash(section, question)] = answer;
     });
   });
 
   return output;
 }
 
-interface QuestionDataMap {
-  [k: string]: any;
-}
-
-function applicationDetailsToDataObject (input: ApplicationDetails, data: QuestionDataMap): any {
-  const output: any = {};
+function answersByHashToApplicationDetailsData (input: ApplicationDetails, data: AnswersByHash): ApplicationDetailsData {
+  const output: ApplicationDetailsData = {};
 
   if (!input.sections) {
     return {};
   }
 
   input.sections.map((section) => {
-    output[section.title] = {};
+    const sectionAnswers: ApplicationQuestionAnswers = {};
+
     section.questions.map((question) => {
       const hash = questionHash(section, question);
 
-      output[section.title][question.title] = data[hash];
+      sectionAnswers[question.title] = data[hash];
     });
+    output[section.title] = sectionAnswers;
   });
 
   return output;
 }
 
-function questionReducer (state: any, action: any) {
+function answersReducer (state: AnswersByHash, action: { key: string, value: string }) {
   return { ...state, [action.key]: action.value };
 }
 
-function questionFieldValueIsValid (question: QuestionField, value: any): boolean {
+function questionFieldValueIsValid (question: QuestionField, value: string): boolean {
   switch (question.type) {
     case 'text':
     case 'text area':
@@ -773,42 +778,42 @@ function questionFieldValueIsValid (question: QuestionField, value: any): boolea
 
 export type ApplicationDetailsStageProps = {
   applicationDetails: ApplicationDetails;
-  data: object;
-  setData: (o: object) => void;
+  data: ApplicationDetailsData;
+  setData: (o: ApplicationDetailsData) => void;
 }
 
 export function ApplicationDetailsStage (props: ApplicationDetailsStageProps & StageTransitionProps) {
-  const initialForm = applicationDetailsToObject(props.applicationDetails, props.data as FinalDataMap);
+  const initialForm = applicationDetailsDataToAnswersByHash(props.applicationDetails, props.data);
 
-  const [data, setData] = useReducer(questionReducer, initialForm);
+  const [answers, updateAnswers] = useReducer(answersReducer, initialForm);
   const [completed, setCompleted] = useState(false);
   const [valid, setValid] = useState(false);
 
-  const handleChange = (e: any, { name, value }: any) => {
+  const handleChange = (e: any, { name, value }: InputOnChangeData | TextAreaProps) => {
     setCompleted(false);
-    setData({ key: name, value: value });
+    updateAnswers({ key: name as string, value: value?.toString() || '' });
   };
 
-  const questionField = (section: QuestionSection, question: QuestionField, key: any) => {
+  const questionField = (section: QuestionSection, question: QuestionField) => {
     switch (question.type) {
       case 'text':
-        return <Form.Input value={data[questionHash(section, question)]}
+        return <Form.Input value={answers[questionHash(section, question)]}
           name={questionHash(section, question)}
           label={question.title}
           onChange={handleChange}
           required
-          error={completed && !questionFieldValueIsValid(question, data[questionHash(section, question)])}
-          key={key}
+          error={completed && !questionFieldValueIsValid(question, answers[questionHash(section, question)])}
+          key={questionHash(section, question)}
         />;
 
       case 'text area':
-        return <Form.TextArea value={data[questionHash(section, question)]}
+        return <Form.TextArea value={answers[questionHash(section, question)]}
           name={questionHash(section, question)}
           label={question.title}
           onChange={handleChange}
           required
-          error={completed && !questionFieldValueIsValid(question, data[questionHash(section, question)])}
-          key={key}
+          error={completed && !questionFieldValueIsValid(question, answers[questionHash(section, question)])}
+          key={questionHash(section, question)}
         />;
     }
 
@@ -824,7 +829,7 @@ export function ApplicationDetailsStage (props: ApplicationDetailsStageProps & S
 
     props.applicationDetails.sections.map((section) => {
       section.questions.map((question) => {
-        if (!questionFieldValueIsValid(question, data[questionHash(section, question)])) {
+        if (!questionFieldValueIsValid(question, answers[questionHash(section, question)])) {
           valid = false;
         }
       });
@@ -835,13 +840,13 @@ export function ApplicationDetailsStage (props: ApplicationDetailsStageProps & S
 
   useEffect(() => {
     setValid(isFormValid());
-  }, [data]);
+  }, [answers]);
 
   useEffect(() => {
     if (completed === true && valid === true) {
       props.nextTransition();
     }
-  }, [completed]);
+  }, [completed, valid]);
 
   const onSubmit = (): void => {
     setCompleted(true);
@@ -850,11 +855,11 @@ export function ApplicationDetailsStage (props: ApplicationDetailsStageProps & S
       return;
     }
 
-    props.setData(applicationDetailsToDataObject(props.applicationDetails, data));
+    props.setData(answersByHashToApplicationDetailsData(props.applicationDetails, answers));
   };
 
   const onCancel = () => {
-    props.setData(applicationDetailsToDataObject(props.applicationDetails, data));
+    props.setData(answersByHashToApplicationDetailsData(props.applicationDetails, answers));
     props.prevTransition();
   };
 
@@ -864,8 +869,8 @@ export function ApplicationDetailsStage (props: ApplicationDetailsStageProps & S
         {props.applicationDetails && props.applicationDetails.sections && props.applicationDetails.sections.map((section, key) => (
           <Segment padded className='section' key={key}>
             <h4><Label attached='top'>{section.title}</Label></h4>
-            {section.questions.map((question, key) =>
-              questionField(section, question, key)
+            {section.questions.map((question) =>
+              questionField(section, question)
             )}
           </Segment>
         ))}
@@ -1022,8 +1027,8 @@ export type FlowModalProps = Pick<StakeRankSelectorProps, 'slots' | 'step'> & Fu
   setApplicationStake: (b: Balance) => void;
   roleStake: Balance;
   setRoleStake: (b: Balance) => void;
-  appDetails: any;
-  setAppDetails: (v: any) => void;
+  appDetails: ApplicationDetailsData;
+  setAppDetails: (v: ApplicationDetailsData) => void;
   txKeyAddress: AccountId;
   setTxKeyAddress: (v: AccountId) => void;
   activeStep: ProgressSteps;
diff --git a/pioneer/packages/joy-roles/src/index.tsx b/pioneer/packages/joy-roles/src/index.tsx
index f5c5de89a8..e231d2d5eb 100644
--- a/pioneer/packages/joy-roles/src/index.tsx
+++ b/pioneer/packages/joy-roles/src/index.tsx
@@ -4,7 +4,7 @@ import { ApiContext } from '@polkadot/react-api';
 import { AppProps, I18nProps } from '@polkadot/react-components/types';
 import { ApiProps } from '@polkadot/react-api/types';
 
-import { Route, Switch } from 'react-router';
+import { Route, Switch, RouteComponentProps } from 'react-router';
 import Tabs from '@polkadot/react-components/Tabs';
 import { withMulti } from '@polkadot/react-api/index';
 import QueueContext from '@polkadot/react-components/Status/Context';
@@ -25,6 +25,8 @@ import translate from './translate';
 
 type Props = AppProps & ApiProps & I18nProps & MyAccountProps
 
+type DefaultRouteProps = RouteComponentProps<Record<string, string | undefined>>;
+
 export const App: React.FC<Props> = (props: Props) => {
   const { t } = props;
   const tabs: Array<any> = [
@@ -83,24 +85,24 @@ export const App: React.FC<Props> = (props: Props) => {
       <Switch>
         <Route
           path={`${basePath}/opportunities/:group/:id([0-9]+)/apply`}
-          render={(props) => <ApplyView controller={applyCtrl} params={props.match.params}/>} />
+          render={(props: DefaultRouteProps) => <ApplyView controller={applyCtrl} params={props.match.params}/>} />
         <Route
           path={`${basePath}/opportunities/:group/:id([0-9]+)`}
-          render={(props) => <OpportunityView controller={oppCtrl} params={props.match.params}/>} />
+          render={(props: DefaultRouteProps) => <OpportunityView controller={oppCtrl} params={props.match.params}/>} />
         <Route
           path={`${basePath}/opportunities/:group/:lead(lead)?`}
-          render={(props) => <OpportunitiesView controller={oppsCtrl} params={props.match.params}/>} />
+          render={(props: DefaultRouteProps) => <OpportunitiesView controller={oppsCtrl} params={props.match.params}/>} />
         <Route
           path={`${basePath}/opportunities`}
-          render={(props) => <OpportunitiesView controller={oppsCtrl} params={props.match.params}/>} />
+          render={(props: DefaultRouteProps) => <OpportunitiesView controller={oppsCtrl} params={props.match.params}/>} />
         <Route
           path={`${basePath}/my-roles`}
-          render={(props) => <MyRolesView controller={myRolesCtrl} params={props.match.params}/>} />
+          render={(props: DefaultRouteProps) => <MyRolesView controller={myRolesCtrl} params={props.match.params}/>} />
         <Route
           path={`${basePath}/admin`}
-          render={(props) => <AdminView controller={adminCtrl} params={props.match.params}/>} />
+          render={(props: DefaultRouteProps) => <AdminView controller={adminCtrl} params={props.match.params}/>} />
         <Route
-          render={(props) => <WorkingGroupsView controller={wgCtrl} params={props.match.params}/> } />
+          render={(props: DefaultRouteProps) => <WorkingGroupsView controller={wgCtrl} params={props.match.params}/> } />
       </Switch>
     </main>
   );
diff --git a/pioneer/packages/joy-roles/src/openingStateMarkup.tsx b/pioneer/packages/joy-roles/src/openingStateMarkup.tsx
index 9a2fb9912e..3136049179 100644
--- a/pioneer/packages/joy-roles/src/openingStateMarkup.tsx
+++ b/pioneer/packages/joy-roles/src/openingStateMarkup.tsx
@@ -10,56 +10,52 @@ export type headerMarkup = {
   iconSpin?: boolean;
 }
 
-export const stateMarkup = new Map<OpeningState, headerMarkup>([
-  [OpeningState.WaitingToBegin, {
+export const stateMarkup: Record<OpeningState, headerMarkup> = {
+  [OpeningState.WaitingToBegin]: {
     class: 'waiting-to-begin',
     description: 'Waiting to begin',
     icon: 'spinner',
     iconSpin: true
-  }],
-  [OpeningState.AcceptingApplications, {
+  },
+  [OpeningState.AcceptingApplications]: {
     class: 'active',
     description: 'Accepting applications',
     icon: 'heart'
-  }],
-  [OpeningState.InReview, {
+  },
+  [OpeningState.InReview]: {
     class: 'in-review',
     description: 'Applications in review',
     icon: 'hourglass half'
-  }],
-  [OpeningState.Complete, {
+  },
+  [OpeningState.Complete]: {
     class: 'complete',
     description: 'Hiring complete',
     icon: 'thumbs up'
-  }],
-  [OpeningState.Cancelled, {
+  },
+  [OpeningState.Cancelled]: {
     class: 'cancelled',
     description: 'Cancelled',
     icon: 'ban'
-  }]
-]);
-
-export function openingStateMarkup<T> (state: OpeningState, key: string): T {
-  const markup = stateMarkup.get(state);
-
-  if (typeof markup === 'undefined') {
-    return null as unknown as T;
   }
+};
+
+export function openingStateMarkup<K extends keyof headerMarkup> (state: OpeningState, key: K): headerMarkup[K] {
+  const markup = stateMarkup[state];
 
-  return (markup as any)[key];
+  return markup[key];
 }
 
 export function openingClass (state: OpeningState): string {
-  return 'status-' + openingStateMarkup<string>(state, 'class');
+  return `status-${openingStateMarkup(state, 'class') || ''}`;
 }
 
 export function openingDescription (state: OpeningState): string {
-  return openingStateMarkup<string>(state, 'description');
+  return openingStateMarkup(state, 'description') || '';
 }
 
 export function openingIcon (state: OpeningState) {
-  const icon = openingStateMarkup<SemanticICONS>(state, 'icon');
-  const spin = openingStateMarkup<boolean>(state, 'iconSpin');
+  const icon = openingStateMarkup(state, 'icon');
+  const spin = openingStateMarkup(state, 'iconSpin');
 
   return <Icon name={icon} loading={spin} />;
 }
diff --git a/pioneer/packages/joy-roles/src/tabs/Admin.controller.tsx b/pioneer/packages/joy-roles/src/tabs/Admin.controller.tsx
index 9e159c48db..b1b73d8a17 100644
--- a/pioneer/packages/joy-roles/src/tabs/Admin.controller.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Admin.controller.tsx
@@ -25,7 +25,8 @@ import { Accordion,
   Message,
   Modal,
   Table,
-  TextArea } from 'semantic-ui-react';
+  TextArea,
+  InputOnChangeData } from 'semantic-ui-react';
 
 import { ITransport } from '../transport';
 
@@ -350,10 +351,10 @@ export class AdminController extends Controller<State, ITransport> {
     this.api = api;
     this.queueExtrinsic = queueExtrinsic;
     this.state.currentDescriptor = stockOpenings[0];
-    this.refreshState();
+    void this.refreshState();
   }
 
-  onTxSuccess = () => { this.closeModal(); this.refreshState(); }
+  onTxSuccess = () => { this.closeModal(); void this.refreshState(); }
 
   newOpening (accountId: string, desc: openingDescriptor) {
     const tx = this.api.tx.contentWorkingGroup.addCuratorOpening(
@@ -599,8 +600,8 @@ const NewOpening = (props: NewOpeningProps) => {
     }
   };
 
-  const onChangeExactBlock = (e: any, { value }: any) => {
-    setExactBlock(value);
+  const onChangeExactBlock = (e: any, { value }: InputOnChangeData) => {
+    setExactBlock(typeof value === 'number' ? value : (parseInt(value) || 0));
     setStart(createMock('ActivateOpeningAt', { ExactBlock: value }));
   };
 
@@ -799,7 +800,7 @@ const OpeningView = (props: OpeningViewProps) => {
       <Card.Content>
         <Card.Header>
           <Label attached='top right'>Opening</Label>
-          <Link to={'/working-groups/opportunities/curators/' + props.opening.curatorId}>
+          <Link to={`/working-groups/opportunities/curators/${props.opening.curatorId}`}>
             {props.opening.title}
           </Link>
 
@@ -842,7 +843,7 @@ const OpeningView = (props: OpeningViewProps) => {
                     <Table.Cell>{app.curatorId}</Table.Cell>
                     <Table.Cell>{app.openingId}</Table.Cell>
                     <Table.Cell>
-                      <Link to={'/members/' + app.profile.handle}>
+                      <Link to={`/members/${app.profile.handle.toString()}`}>
                         {app.profile.handle}
                       </Link>
                     </Table.Cell>
diff --git a/pioneer/packages/joy-roles/src/tabs/MyRoles.controller.tsx b/pioneer/packages/joy-roles/src/tabs/MyRoles.controller.tsx
index 6376aeb12f..b8c0e14324 100644
--- a/pioneer/packages/joy-roles/src/tabs/MyRoles.controller.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/MyRoles.controller.tsx
@@ -32,8 +32,8 @@ export class MyRolesController extends Controller<State, ITransport> {
     }
 
     // Set actual data
-    this.updateCurationGroupRoles(this.state.myAddress);
-    this.updateApplications(this.state.myAddress);
+    void this.updateCurationGroupRoles(this.state.myAddress);
+    void this.updateApplications(this.state.myAddress);
   }
 
   setMyAddress (myAddress: string | undefined) {
diff --git a/pioneer/packages/joy-roles/src/tabs/MyRoles.tsx b/pioneer/packages/joy-roles/src/tabs/MyRoles.tsx
index fa5eeb8142..79b499be59 100644
--- a/pioneer/packages/joy-roles/src/tabs/MyRoles.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/MyRoles.tsx
@@ -12,7 +12,8 @@ import { Button,
   Segment,
   Statistic,
   Table,
-  SemanticICONS } from 'semantic-ui-react';
+  SemanticICONS,
+  TextAreaProps } from 'semantic-ui-react';
 
 import { formatBalance } from '@polkadot/util';
 import { Balance } from '@polkadot/types/interfaces';
@@ -49,7 +50,7 @@ function CTAButton (props: CTA) {
     handleClose();
   };
 
-  const handleChange = (e: any, value: any) => setRationale(value.value);
+  const handleChange = (e: any, { value }: TextAreaProps) => setRationale(value?.toString() || '');
 
   return (
     <Modal trigger={
@@ -169,10 +170,10 @@ type RankAndCapacityProps = {
 }
 
 function RankAndCapacity (props: RankAndCapacityProps) {
-  let capacity = null;
+  let capacity = '';
 
   if (props.capacity > 0) {
-    capacity = '/ ' + props.capacity;
+    capacity = `/${props.capacity}`;
   }
 
   let iconName: SemanticICONS = 'check circle';
@@ -214,7 +215,7 @@ function ApplicationCancelledStatus (props: ApplicationStatusProps) {
   );
 }
 
-type statusRenderer = (p: ApplicationStatusProps) => any
+type statusRenderer = React.ComponentType<ApplicationStatusProps>
 
 function ApplicationStatusAcceptingApplications (props: ApplicationStatusProps): any {
   let positive = true;
@@ -299,7 +300,9 @@ export function ApplicationStatus (props: ApplicationStatusProps) {
     return ApplicationCancelledStatus(props);
   }
 
-  return (applicationStatusRenderers.get(props.openingStatus) as statusRenderer)(props);
+  const StatusRenderer = (applicationStatusRenderers.get(props.openingStatus) as statusRenderer);
+
+  return <StatusRenderer {...props} />;
 }
 
 enum ApplicationState {
@@ -413,7 +416,7 @@ export function Application (props: ApplicationProps) {
   }
 
   return (
-    <Segment className={'application status-' + applicationClass.get(appState)}>
+    <Segment className={`application status-${applicationClass.get(appState) || ''}`}>
       <Label attached='top'>
         {application.job.title}
         <Label.Detail className='right'>
@@ -469,7 +472,7 @@ export function Application (props: ApplicationProps) {
           </Table>
           <h4>Hiring process details</h4>
           <List bulleted>
-            {application.process && application.process.details.map((detail: string, key: any) => (
+            {application.process && application.process.details.map((detail, key) => (
               <List.Item key={key}>
                 <List.Icon name='info circle' />
                 <List.Content>{detail}</List.Content>
diff --git a/pioneer/packages/joy-roles/src/tabs/Opportunities.controller.tsx b/pioneer/packages/joy-roles/src/tabs/Opportunities.controller.tsx
index 881fb65b64..25a2daecef 100644
--- a/pioneer/packages/joy-roles/src/tabs/Opportunities.controller.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Opportunities.controller.tsx
@@ -21,14 +21,14 @@ type State = {
 export class OpportunitiesController extends Controller<State, ITransport> {
   constructor (transport: ITransport, initialState: State = {}) {
     super(transport, initialState);
+    this.state.blockTime = this.transport.expectedBlockTime();
   }
 
   refreshState () {
-    this.getOpportunities();
-    this.getBlocktime();
+    void this.getOpportunities();
   }
 
-  async setMemberId (memberId?: MemberId) {
+  setMemberId (memberId?: MemberId) {
     this.state.memberId = memberId;
     this.dispatch();
   }
@@ -37,11 +37,6 @@ export class OpportunitiesController extends Controller<State, ITransport> {
     this.state.opportunities = await this.transport.currentOpportunities();
     this.dispatch();
   }
-
-  async getBlocktime () {
-    this.state.blockTime = await this.transport.expectedBlockTime();
-    this.dispatch();
-  }
 }
 
 export const OpportunitiesView = View<OpportunitiesController, State>(
diff --git a/pioneer/packages/joy-roles/src/tabs/Opportunities.stories.tsx b/pioneer/packages/joy-roles/src/tabs/Opportunities.stories.tsx
index 0b3386ad6c..014a29d273 100644
--- a/pioneer/packages/joy-roles/src/tabs/Opportunities.stories.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Opportunities.stories.tsx
@@ -94,10 +94,10 @@ export const opening = createMock('Opening', {
 });
 
 const stateOptions: any = (function () {
-  const options: any = {};
+  const options: Record<string, OpeningState> = {};
 
-  stateMarkup.forEach((value, key) => {
-    options[value.description] = key;
+  Object.entries(stateMarkup).forEach(([key, value]) => {
+    options[value.description] = parseInt(key) as OpeningState;
   });
 
   return options;
diff --git a/pioneer/packages/joy-roles/src/tabs/Opportunities.tsx b/pioneer/packages/joy-roles/src/tabs/Opportunities.tsx
index ef8af8fd42..fcec5b6bf2 100644
--- a/pioneer/packages/joy-roles/src/tabs/Opportunities.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Opportunities.tsx
@@ -222,6 +222,8 @@ export function ApplicationCount (props: ApplicationCountProps) {
 type OpeningBodyCTAProps = OpeningStakeAndApplicationStatus & OpeningStage & OpeningBodyProps & MemberIdProps
 
 function OpeningBodyCTAView (props: OpeningBodyCTAProps) {
+  const accountCtx = useMyAccount();
+
   if (props.stage.state !== OpeningState.AcceptingApplications || applicationImpossible(props.applications)) {
     return null;
   }
@@ -255,8 +257,6 @@ function OpeningBodyCTAView (props: OpeningBodyCTAProps) {
     </Link>
   );
 
-  const accountCtx = useMyAccount();
-
   if (!accountCtx.state.address) {
     applyButton = (
       <Message error icon>
diff --git a/pioneer/packages/joy-roles/src/tabs/Opportunity.controller.tsx b/pioneer/packages/joy-roles/src/tabs/Opportunity.controller.tsx
index ebb85bc249..e7d60b2a0e 100644
--- a/pioneer/packages/joy-roles/src/tabs/Opportunity.controller.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/Opportunity.controller.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 
-import { Controller, memoize } from '@polkadot/joy-utils/react/helpers';
-import { View } from '@polkadot/joy-utils/react/hocs';
+import { Controller } from '@polkadot/joy-utils/react/helpers';
+import { View, RenderComponentProps } from '@polkadot/joy-utils/react/hocs/View';
 
 import { ITransport } from '../transport';
 
@@ -22,15 +22,14 @@ type State = {
 export class OpportunityController extends Controller<State, ITransport> {
   constructor (transport: ITransport, initialState: State = {}) {
     super(transport, initialState);
-    this.getBlocktime();
+    this.state.blockTime = this.transport.expectedBlockTime();
   }
 
-  async setMemberId (memberId?: MemberId) {
+  setMemberId (memberId?: MemberId) {
     this.state.memberId = memberId;
     this.dispatch();
   }
 
-  @memoize()
   async getOpportunity (group: string | undefined, id: string | undefined) {
     if (!id || !group) {
       return;
@@ -43,22 +42,19 @@ export class OpportunityController extends Controller<State, ITransport> {
     this.state.opportunity = await this.transport.groupOpening(group as WorkingGroups, parseInt(id));
     this.dispatch();
   }
+}
 
-  async getBlocktime () {
-    this.state.blockTime = await this.transport.expectedBlockTime();
-    this.dispatch();
-  }
+function OpportunityRenderer ({ state, controller, params }: RenderComponentProps<OpportunityController, State>) {
+  useEffect(() => {
+    void controller.getOpportunity(params.get('group'), params.get('id'));
+  }, [params]);
+
+  return (
+    <OpeningView {...state.opportunity!} block_time_in_seconds={state.blockTime!} member_id={state.memberId} />
+  );
 }
 
 export const OpportunityView = View<OpportunityController, State>({
   errorComponent: OpeningError,
-  renderComponent: ({ state, controller, params }) => {
-    useEffect(() => {
-      controller.getOpportunity(params.get('group'), params.get('id'));
-    }, [params.get('group'), params.get('id')]);
-
-    return (
-      <OpeningView {...state.opportunity!} block_time_in_seconds={state.blockTime!} member_id={state.memberId} />
-    );
-  }
+  renderComponent: OpportunityRenderer
 });
diff --git a/pioneer/packages/joy-roles/src/tabs/WorkingGroup.controller.tsx b/pioneer/packages/joy-roles/src/tabs/WorkingGroup.controller.tsx
index 632b55377c..66a0b08193 100644
--- a/pioneer/packages/joy-roles/src/tabs/WorkingGroup.controller.tsx
+++ b/pioneer/packages/joy-roles/src/tabs/WorkingGroup.controller.tsx
@@ -10,6 +10,7 @@ import { ContentCurators,
   StorageProviders } from './WorkingGroup';
 
 import styled from 'styled-components';
+import { normalizeError } from '@polkadot/joy-utils/functions/misc';
 
 type State = {
   contentCurators?: WorkingGroupMembership;
@@ -27,17 +28,21 @@ export class WorkingGroupsController extends Controller<State, ITransport> {
   }
 
   getCurationGroup () {
-    this.transport.curationGroup().then((value: WorkingGroupMembership) => {
-      this.setState({ contentCurators: value });
-      this.dispatch();
-    });
+    this.transport.curationGroup()
+      .then((value: WorkingGroupMembership) => {
+        this.setState({ contentCurators: value });
+        this.dispatch();
+      })
+      .catch((e) => this.onError(normalizeError(e)));
   }
 
   getStorageGroup () {
-    this.transport.storageGroup().then((value: WorkingGroupMembership) => {
-      this.setState({ storageProviders: value });
-      this.dispatch();
-    });
+    this.transport.storageGroup()
+      .then((value: WorkingGroupMembership) => {
+        this.setState({ storageProviders: value });
+        this.dispatch();
+      })
+      .catch((e) => this.onError(normalizeError(e)));
   }
 }
 
diff --git a/pioneer/packages/joy-roles/src/transport.substrate.ts b/pioneer/packages/joy-roles/src/transport.substrate.ts
index 7005e13821..89028fefa5 100644
--- a/pioneer/packages/joy-roles/src/transport.substrate.ts
+++ b/pioneer/packages/joy-roles/src/transport.substrate.ts
@@ -574,7 +574,7 @@ export class Transport extends BaseTransport implements ITransport {
 
   async openingApplicationsByAddressAndGroup (group: WorkingGroups, roleKey: string): Promise<OpeningApplication[]> {
     const myGroupApplications = (await this.entriesByIds<GroupApplicationId, GroupApplication>(
-      await this.apiMethodByGroup(group, 'applicationById')
+      this.apiMethodByGroup(group, 'applicationById')
     ))
       .filter(([id, groupApplication]) => groupApplication.role_account_id.eq(roleKey));
 
@@ -737,7 +737,8 @@ export class Transport extends BaseTransport implements ITransport {
             txFailedCb,
             txSuccessCb
           });
-        });
+        })
+        .catch((e) => { reject(e); });
     });
   }
 
diff --git a/pioneer/packages/joy-utils/src/functions/accounts.ts b/pioneer/packages/joy-utils/src/functions/accounts.ts
index 09e40e00db..a446efe76a 100644
--- a/pioneer/packages/joy-utils/src/functions/accounts.ts
+++ b/pioneer/packages/joy-utils/src/functions/accounts.ts
@@ -7,6 +7,7 @@ import { DEV_PHRASE } from '@polkadot/keyring/defaults';
 import keyring from '@polkadot/ui-keyring';
 import { isHex, u8aToHex } from '@polkadot/util';
 import { keyExtractSuri, mnemonicGenerate, mnemonicValidate, randomAsU8a } from '@polkadot/util-crypto';
+import { normalizeError } from './misc';
 
 export type SeedType = 'bip' | 'raw' | 'dev';
 
@@ -31,7 +32,7 @@ function deriveValidate (seed: string, derivePath: string, pairType: KeypairType
       return 'Soft derivation paths are not allowed on ed25519';
     }
   } catch (error) {
-    return error.message;
+    return normalizeError(error);
   }
 
   return null;
@@ -124,7 +125,7 @@ export function createAccount (suri: string, pairType: KeypairType, name: string
     downloadAccount(result);
   } catch (error) {
     status.status = 'error';
-    status.message = error.message;
+    status.message = normalizeError(error);
   }
 
   return status;
diff --git a/pioneer/packages/joy-utils/src/functions/misc.ts b/pioneer/packages/joy-utils/src/functions/misc.ts
index 5f96730c33..6dc018d650 100644
--- a/pioneer/packages/joy-utils/src/functions/misc.ts
+++ b/pioneer/packages/joy-utils/src/functions/misc.ts
@@ -172,6 +172,8 @@ export function normalizeError (e: any): string {
 
   if (e instanceof Error) {
     message = e.message;
+  } else if (typeof e === 'string') {
+    return e;
   } else {
     message = JSON.stringify(e);
   }
diff --git a/pioneer/packages/joy-utils/src/react/helpers/Observable.ts b/pioneer/packages/joy-utils/src/react/helpers/Observable.ts
index 417f9ab44c..735e6647c1 100644
--- a/pioneer/packages/joy-utils/src/react/helpers/Observable.ts
+++ b/pioneer/packages/joy-utils/src/react/helpers/Observable.ts
@@ -36,5 +36,7 @@ export abstract class Observable<S extends { [key: string ]: any }, T> implement
     this.dispatch();
   }
 
-  public refreshState () { }
+  public refreshState () {
+    this.dispatch();
+  }
 }
diff --git a/pioneer/packages/joy-utils/src/react/helpers/index.ts b/pioneer/packages/joy-utils/src/react/helpers/index.ts
index c4ced4c115..b38b7cf26c 100644
--- a/pioneer/packages/joy-utils/src/react/helpers/index.ts
+++ b/pioneer/packages/joy-utils/src/react/helpers/index.ts
@@ -6,5 +6,4 @@ export function componentName (WrappedComponent: React.ComponentType<any>) {
 
 export { Controller } from './Controller';
 export { Observable } from './Observable';
-export { memoize } from './memoize';
 export { Subscribable } from './Subscribable';
diff --git a/pioneer/packages/joy-utils/src/react/helpers/memoize.ts b/pioneer/packages/joy-utils/src/react/helpers/memoize.ts
deleted file mode 100644
index c6e10b2308..0000000000
--- a/pioneer/packages/joy-utils/src/react/helpers/memoize.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-let counter = 0;
-
-function getNewFunction (originalMethod: () => void) {
-  const identifier = ++counter;
-
-  return function (this: any, ...args: any[]) {
-    const propValName = `__memoized_value_${identifier}`;
-    const propMapName = `__memoized_map_${identifier}`;
-
-    let returnedValue: any;
-
-    if (args.length > 0) {
-      if (!Object.prototype.hasOwnProperty.call(this, propMapName)) {
-        Object.defineProperty(this, propMapName, {
-          configurable: false,
-          enumerable: false,
-          writable: false,
-          value: new Map<any, any>()
-        });
-      }
-
-      const myMap: Map<any, any> = this[propMapName];
-      const hashKey = args[0];
-
-      if (myMap.has(hashKey)) {
-        returnedValue = myMap.get(hashKey);
-      } else {
-        returnedValue = originalMethod.apply(this, args as []);
-        myMap.set(hashKey, returnedValue);
-      }
-    } else {
-      if (Object.prototype.hasOwnProperty.call(this, propValName)) {
-        returnedValue = this[propValName];
-      } else {
-        returnedValue = originalMethod.apply(this, args as []);
-        Object.defineProperty(this, propValName, {
-          configurable: false,
-          enumerable: false,
-          writable: false,
-          value: returnedValue
-        });
-      }
-    }
-
-    return returnedValue;
-  };
-}
-
-export function memoize () {
-  return (target: Record<string, any>, propertyKey: string, descriptor: TypedPropertyDescriptor<any>) => {
-    descriptor.value = getNewFunction(descriptor.value);
-  };
-}
diff --git a/pioneer/packages/joy-utils/src/react/hocs/View.tsx b/pioneer/packages/joy-utils/src/react/hocs/View.tsx
index 70c7a68f3e..aca0b0d76a 100644
--- a/pioneer/packages/joy-utils/src/react/hocs/View.tsx
+++ b/pioneer/packages/joy-utils/src/react/hocs/View.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 
-import { Controller } from '../helpers';
+import { Controller, componentName } from '../helpers';
 
 export type ParamsMap = Map<string, string | undefined>
 
@@ -9,7 +9,7 @@ type ViewRendererProps<C> = {
   controller: C;
 }
 
-type RenderComponentProps<C, S> = {
+export type RenderComponentProps<C, S> = {
   state: S,
   controller: C,
   params: ParamsMap
@@ -30,7 +30,20 @@ function DefaultError () {
 }
 
 export function View<C extends Controller<S, any>, S> (args: ViewArgs<C, S>): ViewRenderer<C> {
-  return (props: ViewRendererProps<C>): React.ReactElement | null => {
+  let RenderComponent: RenderComponent<C, S>;
+  let ErrorComponent: React.ComponentType = DefaultError;
+
+  if (typeof args === 'function') {
+    RenderComponent = args;
+  } else {
+    RenderComponent = args.renderComponent;
+
+    if (typeof args.errorComponent !== 'undefined') {
+      ErrorComponent = args.errorComponent;
+    }
+  }
+
+  const ResultComponent: React.FunctionComponent<ViewRendererProps<C>> = (props) => {
     const { controller } = props;
     const [state, setState] = useState<S>(controller.state);
 
@@ -49,23 +62,14 @@ export function View<C extends Controller<S, any>, S> (args: ViewArgs<C, S>): Vi
 
     const params = props.params ? new Map(Object.entries(props.params)) : new Map<string, string | undefined>();
 
-    let RenderComponent: RenderComponent<C, S>;
-    let Err: React.ComponentType = DefaultError;
-
-    if (typeof args === 'function') {
-      RenderComponent = args;
-    } else {
-      RenderComponent = args.renderComponent;
-
-      if (typeof args.errorComponent !== 'undefined') {
-        Err = args.errorComponent;
-      }
-    }
-
     if (controller.hasError()) {
-      return Err ? <Err /> : null;
+      return ErrorComponent ? <ErrorComponent /> : null;
     } else {
       return <RenderComponent { ...{ state, controller, params } } />;
     }
   };
+
+  ResultComponent.displayName = `View(${componentName(RenderComponent)})`;
+
+  return ResultComponent;
 }
diff --git a/pioneer/packages/joy-utils/src/transport/mock/base.ts b/pioneer/packages/joy-utils/src/transport/mock/base.ts
index eab968e35f..41a9f48eae 100644
--- a/pioneer/packages/joy-utils/src/transport/mock/base.ts
+++ b/pioneer/packages/joy-utils/src/transport/mock/base.ts
@@ -2,7 +2,9 @@ export default abstract class BaseTransport {
   protected promise<T> (value: T, timeout?: number): Promise<T> {
     return new Promise<T>((resolve, reject) => {
       if (timeout) {
-        (new Promise((resolve) => setTimeout(resolve, timeout))).then(() => resolve(value));
+        (new Promise((resolve) => setTimeout(resolve, timeout)))
+          .then(() => resolve(value))
+          .catch((e) => { throw e; });
       } else {
         resolve(value);
       }
diff --git a/pioneer/packages/joy-utils/src/types/workingGroups.ts b/pioneer/packages/joy-utils/src/types/workingGroups.ts
index 25f0cfbf82..cbab4a9c30 100644
--- a/pioneer/packages/joy-utils/src/types/workingGroups.ts
+++ b/pioneer/packages/joy-utils/src/types/workingGroups.ts
@@ -32,3 +32,6 @@ export type ParsedApplication = {
   humanReadableText: string;
   stage: ApplicationStage;
 }
+
+export type ApplicationQuestionAnswers = { [questionTitle: string]: string | undefined };
+export type ApplicationDetailsData = { [sectionTitle: string]: ApplicationQuestionAnswers | undefined };
diff --git a/types/.prettierignore b/types/.prettierignore
index cf97865545..0c4be1abbd 100644
--- a/types/.prettierignore
+++ b/types/.prettierignore
@@ -6,3 +6,4 @@ lib/
 build/
 augment/
 augment-codec/
+src/hiring/schemas/role.schema.typings.ts
diff --git a/types/package.json b/types/package.json
index 4836d49dbd..db38d51810 100644
--- a/types/package.json
+++ b/types/package.json
@@ -16,7 +16,8 @@
     "generate:codec-defs": "ts-node ./src/scripts/generateCodecDefs.ts",
     "generate:registry-json": "ts-node ./src/scripts/generateRegistryJson.ts",
     "generate:augment": "yarn generate:registry-json && yarn generate:defs && yarn generate:meta",
-    "generate:all": "yarn generate:augment && yarn generate:codec-defs"
+    "generate:all": "yarn generate:augment && yarn generate:codec-defs",
+    "generate:json-schemas": "json2ts -i ./src/hiring/schemas/role.schema.json -o ./src/hiring/schemas/role.schema.typings.ts"
   },
   "author": "Joystream contributors",
   "maintainers": [],
@@ -34,7 +35,8 @@
     "@polkadot/typegen": "1.26.1",
     "ts-node": "^8.6.2",
     "typescript": "^3.7.2",
-    "madge": "^3.9.2"
+    "madge": "^3.9.2",
+    "json-schema-to-typescript": "^9.1.1"
   },
   "engines": {
     "node": ">=12.18.0",
diff --git a/types/src/hiring/schemas/role.schema.json b/types/src/hiring/schemas/role.schema.json
index 245fea1998..37cb0b64b1 100644
--- a/types/src/hiring/schemas/role.schema.json
+++ b/types/src/hiring/schemas/role.schema.json
@@ -5,7 +5,7 @@
   "title": "Generic JoyStream role schema",
   "definitions": {
     "title": {
-      "$id": "#/properties/application/title",
+      "$id": "#/definitions/title",
       "type": "string",
       "title": "Field title",
       "default": "",
@@ -69,7 +69,7 @@
             "required": ["title", "questions"],
             "properties": {
               "title": {
-                "$ref": "#/properties/application/title"
+                "$ref": "#/definitions/title"
               },
               "questions": {
                 "$id": "#/properties/application/properties/sections/items/properties/questions",
@@ -82,7 +82,7 @@
                   "required": ["title", "type"],
                   "properties": {
                     "title": {
-                      "$ref": "#/properties/application/title"
+                      "$ref": "#/definitions/title"
                     },
                     "type": {
                       "$id": "#/properties/application/properties/questions/items/type",
diff --git a/types/src/hiring/schemas/role.schema.typings.ts b/types/src/hiring/schemas/role.schema.typings.ts
index e2b2847e79..117f694348 100644
--- a/types/src/hiring/schemas/role.schema.typings.ts
+++ b/types/src/hiring/schemas/role.schema.typings.ts
@@ -5,56 +5,57 @@
  * and run json-schema-to-typescript to regenerate this file.
  */
 
-export type SchemaVersion = number
-export type Headline = string
-export type JobTitle = string
-export type JobDescriptionExpectsHTML = string
-export type QuestionFieldType = string
-export type QuestionsFields = QuestionField[]
-export type QuestionSections = QuestionSection[]
-export type TheRewardSchema = string
-export type HandleOrUsername = string
-export type TheItemsSchema = string
-export type AdditionalRolehiringProcessDetails = TheItemsSchema[]
+export type SchemaVersion = number;
+export type Headline = string;
+export type JobTitle = string;
+export type JobDescriptionExpectsHTML = string;
+export type FieldTitle = string;
+export type QuestionFieldType = string;
+export type QuestionsFields = QuestionField[];
+export type QuestionSections = QuestionSection[];
+export type TheRewardSchema = string;
+export type HandleOrUsername = string;
+export type TheItemsSchema = string;
+export type AdditionalRolehiringProcessDetails = TheItemsSchema[];
 
 export interface GenericJoyStreamRoleSchema {
-  version: SchemaVersion
-  headline: Headline
-  job: JobSpecifics
-  application: ApplicationDetails
-  reward: TheRewardSchema
-  creator: CreatorDetails
-  process?: HiringProcess
-  [k: string]: any
+  version: SchemaVersion;
+  headline: Headline;
+  job: JobSpecifics;
+  application: ApplicationDetails;
+  reward: TheRewardSchema;
+  creator: CreatorDetails;
+  process?: HiringProcess;
+  [k: string]: unknown;
 }
 export interface JobSpecifics {
-  title: JobTitle
-  description: JobDescriptionExpectsHTML
-  [k: string]: any
+  title: JobTitle;
+  description: JobDescriptionExpectsHTML;
+  [k: string]: unknown;
 }
 export interface ApplicationDetails {
-  sections?: QuestionSections
-  [k: string]: any
+  sections?: QuestionSections;
+  [k: string]: unknown;
 }
 export interface QuestionSection {
-  title: any
-  questions: QuestionsFields
-  [k: string]: any
+  title: FieldTitle;
+  questions: QuestionsFields;
+  [k: string]: unknown;
 }
 export interface QuestionField {
-  title: any
-  type: QuestionFieldType
-  [k: string]: any
+  title: FieldTitle;
+  type: QuestionFieldType;
+  [k: string]: unknown;
 }
 export interface CreatorDetails {
-  membership: EntryInMembershipModuke
-  [k: string]: any
+  membership: EntryInMembershipModuke;
+  [k: string]: unknown;
 }
 export interface EntryInMembershipModuke {
-  handle: HandleOrUsername
-  [k: string]: any
+  handle: HandleOrUsername;
+  [k: string]: unknown;
 }
 export interface HiringProcess {
-  details: AdditionalRolehiringProcessDetails
-  [k: string]: any
+  details: AdditionalRolehiringProcessDetails;
+  [k: string]: unknown;
 }
diff --git a/types/src/index.ts b/types/src/index.ts
index 4413d28294..c234094e87 100644
--- a/types/src/index.ts
+++ b/types/src/index.ts
@@ -62,9 +62,12 @@ export const types: RegistryTypes = {
 }
 
 // Allows creating types without api instance (it's not a recommended way though, so should be used just for mocks)
-const mockRegistry = new TypeRegistry();
-mockRegistry.register(types);
+const mockRegistry = new TypeRegistry()
+mockRegistry.register(types)
 
-export function createMock<TypeName extends keyof InterfaceTypes>(type: TypeName, value: any): InterfaceTypes[TypeName] {
-  return createType(mockRegistry, type, value);
+export function createMock<TypeName extends keyof InterfaceTypes>(
+  type: TypeName,
+  value: any
+): InterfaceTypes[TypeName] {
+  return createType(mockRegistry, type, value)
 }
diff --git a/yarn.lock b/yarn.lock
index 8ec6fbf007..c2476d1ac9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18,6 +18,15 @@
   version "0.0.0"
   uid ""
 
+"@apidevtools/json-schema-ref-parser@9.0.6":
+  version "9.0.6"
+  resolved "https://registry.yarnpkg.com/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz#5d9000a3ac1fd25404da886da6b266adcd99cf1c"
+  integrity sha512-M3YgsLjI0lZxvrpeGVk9Ap032W6TPQkH6pRAZz81Ac3WUNF79VQooAFnp8umjvVzUmD93NkogxEwbSce7qMsUg==
+  dependencies:
+    "@jsdevtools/ono" "^7.1.3"
+    call-me-maybe "^1.0.1"
+    js-yaml "^3.13.1"
+
 "@babel/cli@^7.10.5":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.10.5.tgz#57df2987c8cf89d0fc7d4b157ec59d7619f1b77a"
@@ -2205,6 +2214,11 @@
     lodash "^4.17.15"
     moment "^2.24.0"
 
+"@jsdevtools/ono@^7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
+  integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==
+
 "@ledgerhq/devices@^5.21.0":
   version "5.21.0"
   resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-5.21.0.tgz#b6dc274536e70513a3ae7df7a9f956ea87adcc49"
@@ -4573,7 +4587,7 @@
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea"
   integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==
 
-"@types/node@*", "@types/node@>= 8", "@types/node@>=4.5.0":
+"@types/node@*", "@types/node@>= 8":
   version "12.12.14"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.14.tgz#1c1d6e3c75dba466e0326948d56e8bd72a1903d2"
   integrity sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA==
@@ -4608,11 +4622,6 @@
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
-"@types/prettier@^1.16.1":
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.19.0.tgz#a2502fb7ce9b6626fdbfc2e2a496f472de1bdd05"
-  integrity sha512-gDE8JJEygpay7IjA/u3JiIURvwZW08f0cZSZLAzFoX/ZmeqvS0Sqv+97aKuHpNsalAMMhwPe+iAS6fQbfmbt7A==
-
 "@types/prettier@^2.0.0":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.2.tgz#5bb52ee68d0f8efa9cc0099920e56be6cc4e37f3"
@@ -7994,17 +8003,17 @@ cli-boxes@^2.2.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"
   integrity sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==
 
-cli-color@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-1.4.0.tgz#7d10738f48526824f8fe7da51857cb0f572fe01f"
-  integrity sha512-xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w==
+cli-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.0.tgz#11ecfb58a79278cf6035a60c54e338f9d837897c"
+  integrity sha512-a0VZ8LeraW0jTuCkuAGMNufareGHhyZU9z8OGsW0gXd1hZGi1SRuNRXdbGkraBBKnhyUhyebFWnRbp+dIn0f0A==
   dependencies:
     ansi-regex "^2.1.1"
-    d "1"
-    es5-ext "^0.10.46"
+    d "^1.0.1"
+    es5-ext "^0.10.51"
     es6-iterator "^2.0.3"
     memoizee "^0.4.14"
-    timers-ext "^0.1.5"
+    timers-ext "^0.1.7"
 
 cli-cursor@^2.1.0:
   version "2.1.0"
@@ -10572,7 +10581,7 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
+es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.51, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
   version "0.10.53"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
   integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
@@ -12057,11 +12066,6 @@ form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-format-util@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.3.tgz#032dca4a116262a12c43f4c3ec8566416c5b2d95"
-  integrity sha1-Ay3KShFiYqEsQ/TD7IVmQWxbLZU=
-
 format@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
@@ -16033,7 +16037,7 @@ js-yaml@^3.10.0, js-yaml@^3.14.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.11.0, js-yaml@^3.12.1, js-yaml@^3.13.1:
+js-yaml@^3.11.0, js-yaml@^3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -16098,30 +16102,29 @@ json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-bet
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-schema-ref-parser@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz#30af34aeab5bee0431da805dac0eb21b574bf63d"
-  integrity sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==
+json-schema-ref-parser@^9.0.1:
+  version "9.0.6"
+  resolved "https://registry.yarnpkg.com/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz#fc89a5e6b853f2abe8c0af30d3874196526adb60"
+  integrity sha512-z0JGv7rRD3CnJbZY/qCpscyArdtLJhr/wRBmFUdoZ8xMjsFyNdILSprG2degqRLjBjyhZHAEBpGOxniO9rKTxA==
   dependencies:
-    call-me-maybe "^1.0.1"
-    js-yaml "^3.12.1"
-    ono "^4.0.11"
+    "@apidevtools/json-schema-ref-parser" "9.0.6"
 
-json-schema-to-typescript@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/json-schema-to-typescript/-/json-schema-to-typescript-7.1.0.tgz#c98a8647718551a40f324448f53508d73c087911"
-  integrity sha512-7tQyQzR+0NyI2iPjkqLLe4ncaxov1oIAFRM+BI8DDs7wxVIXsd0GWoZJIPsNQePIDr7N/LCkYtkEEDvY7dhGzA==
+json-schema-to-typescript@^9.1.1:
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/json-schema-to-typescript/-/json-schema-to-typescript-9.1.1.tgz#572c1eb8b7ca82d6534c023c4651f3fe925171c0"
+  integrity sha512-VrdxmwQROjPBRlHxXwGUa2xzhOMPiNZIVsxZrZjMYtbI7suRFMiEktqaD/gqhfSya7Djy+x8dnJT+H0/0sZO0Q==
   dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@types/node" ">=4.5.0"
-    "@types/prettier" "^1.16.1"
-    cli-color "^1.4.0"
-    json-schema-ref-parser "^6.1.0"
+    "@types/json-schema" "^7.0.4"
+    cli-color "^2.0.0"
+    glob "^7.1.6"
+    is-glob "^4.0.1"
+    json-schema-ref-parser "^9.0.1"
     json-stringify-safe "^5.0.1"
-    lodash "^4.17.11"
-    minimist "^1.2.0"
+    lodash "^4.17.15"
+    minimist "^1.2.5"
+    mkdirp "^1.0.4"
     mz "^2.7.0"
-    prettier "^1.18.2"
+    prettier "^2.0.5"
     stdin "0.0.1"
 
 json-schema-traverse@^0.4.1:
@@ -18984,13 +18987,6 @@ only@~0.0.2:
   resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4"
   integrity sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q=
 
-ono@^4.0.11:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/ono/-/ono-4.0.11.tgz#c7f4209b3e396e8a44ef43b9cedc7f5d791d221d"
-  integrity sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==
-  dependencies:
-    format-util "^1.0.3"
-
 open@^6.3.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
@@ -24578,7 +24574,7 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
-timers-ext@^0.1.5:
+timers-ext@^0.1.5, timers-ext@^0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
   integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==

From 1babd8d9b2b706eeecaeeec612f8bff0b14a68c8 Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Fri, 21 Aug 2020 17:52:43 +0200
Subject: [PATCH 14/17] Preparing storybook

---
 pioneer/.storybook/webpack.config.js |  2 +-
 pioneer/package.json                 |  3 ++-
 yarn.lock                            | 27 ++++++++++++++++++---------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/pioneer/.storybook/webpack.config.js b/pioneer/.storybook/webpack.config.js
index 6c02952773..f32af8608d 100644
--- a/pioneer/.storybook/webpack.config.js
+++ b/pioneer/.storybook/webpack.config.js
@@ -37,7 +37,7 @@ config.module.rules.push({
   use: [
     {
       loader: require.resolve('babel-loader'),
-      options: require('@polkadot/dev-react/config/babel')
+      options: require('@polkadot/dev/config/babel')
     },
   ],
 });
diff --git a/pioneer/package.json b/pioneer/package.json
index 6979cc7c05..91a97d68d7 100644
--- a/pioneer/package.json
+++ b/pioneer/package.json
@@ -78,7 +78,8 @@
     "eslint-plugin-header": "^3.0.0",
     "eslint-plugin-sort-destructure-keys": "^1.3.5",
     "jest": "^26.4.1",
-    "ts-jest": "^26.2.0"
+    "ts-jest": "^26.2.0",
+    "tsconfig-paths-webpack-plugin": "^3.2.0"
   },
   "dependencies": {
     "@types/lodash": "^4.14.138",
diff --git a/yarn.lock b/yarn.lock
index c2476d1ac9..e7b0b263df 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10409,19 +10409,19 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
-  integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
+enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.1, enhanced-resolve@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
+  integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
-enhanced-resolve@^4.1.1, enhanced-resolve@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
-  integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
+enhanced-resolve@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
+  integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.5.0"
@@ -24925,7 +24925,16 @@ ts-pnp@^1.1.2:
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
   integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
 
-tsconfig-paths@^3.9.0:
+tsconfig-paths-webpack-plugin@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.3.0.tgz#a7461723c20623ca9148621a5ce36532682ad2ff"
+  integrity sha512-MpQeZpwPY4gYASCUjY4yt2Zj8yv86O8f++3Ai4o0yI0fUC6G1syvnL9VuY71PBgimRYDQU47f12BEmJq9wRaSw==
+  dependencies:
+    chalk "^2.3.0"
+    enhanced-resolve "^4.0.0"
+    tsconfig-paths "^3.4.0"
+
+tsconfig-paths@^3.4.0, tsconfig-paths@^3.9.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
   integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==

From 03bd123c9a00be2434dfddfc0059c4385db50c71 Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Tue, 25 Aug 2020 18:08:56 +0200
Subject: [PATCH 15/17] joy-media upgrade

---
 package.json                                  |   4 +-
 pioneer/.eslintignore                         |   1 -
 pioneer/packages/apps-routing/src/index.ts    |   3 +
 .../packages/apps-routing/src/joy-media.ts    |  15 +
 .../apps/public/images/default-thumbnail.png  | Bin
 .../apps/public/locales/en/index.json         |   1 +
 .../apps/public/locales/en/joy-utils.json     |   5 +-
 pioneer/packages/apps/src/Content/index.tsx   |   1 -
 pioneer/packages/apps/webpack.base.config.js  |   3 +
 pioneer/packages/joy-media/.skip-build        |   0
 pioneer/packages/joy-media/aplayer.d.ts       |   2 +
 pioneer/packages/joy-media/dplayer.d.ts       |   2 +
 pioneer/packages/joy-media/package.json       |   8 +-
 .../joy-media/src/DiscoveryProvider.tsx       |   2 +-
 pioneer/packages/joy-media/src/MediaView.tsx  |  12 +-
 pioneer/packages/joy-media/src/Upload.tsx     |  36 ++-
 .../joy-media/src/channels/ChannelAvatar.tsx  |   2 +-
 .../joy-media/src/channels/ChannelPreview.tsx |   8 +-
 .../src/channels/ChannelsByOwner.view.tsx     |   7 +-
 .../joy-media/src/channels/CurationPanel.tsx  |  40 +--
 .../joy-media/src/channels/EditChannel.tsx    |  48 ++-
 .../src/channels/EditChannel.view.tsx         |   7 +-
 .../joy-media/src/channels/ViewChannel.tsx    |   2 +-
 .../src/channels/ViewChannel.view.tsx         |   7 +-
 .../src/channels/ViewMusicChannel.tsx         |   2 +-
 .../src/channels/ViewVideoChannel.tsx         |   2 +-
 .../joy-media/src/common/MediaForms.tsx       |   4 +-
 .../joy-media/src/common/MediaPlayerView.tsx  |   6 +-
 .../src/common/MediaPlayerWithResolver.tsx    |  27 +-
 .../joy-media/src/common/TypeHelpers.ts       |   7 +-
 .../src/common/images.tsx}                    |   2 +
 .../src/common/{index.css => index.scss}      |   0
 .../joy-media/src/explore/AllChannels.tsx     |   2 +-
 .../joy-media/src/explore/AllVideos.tsx       |   2 +-
 .../joy-media/src/explore/ExploreContent.tsx  |   2 +-
 .../joy-media/src/explore/PlayContent.tsx     |   2 +-
 .../joy-media/src/{index.css => index.scss}   |   8 +-
 pioneer/packages/joy-media/src/index.tsx      |  11 +-
 .../joy-media/src/music/EditMusicAlbum.tsx    |   5 +-
 .../joy-media/src/music/MusicAlbumPreview.tsx |   2 +-
 .../joy-media/src/music/MusicAlbumTracks.tsx  |   2 +-
 .../joy-media/src/music/MyMusicTracks.tsx     |   4 +-
 .../joy-media/src/schemas/channel/Channel.ts  |  28 +-
 .../src/stories/ExploreContent.stories.tsx    |   2 +-
 .../src/stories/MusicAlbumTracks.stories.tsx  |   6 +-
 .../src/stories/MusicChannel.stories.tsx      |   2 +-
 .../src/stories/MyChannels.stories.tsx        |   9 +-
 .../src/stories/MyMusicAlbums.stories.tsx     |   2 +-
 .../src/stories/Playback.stories.tsx          |   6 +-
 .../src/stories/UploadAudio.stories.tsx       |   6 +-
 .../src/stories/UploadVideo.stories.tsx       |   6 +-
 .../src/stories/data/AccountIdSamples.ts      |   8 +-
 .../src/stories/data/ChannelSamples.ts        |  16 +-
 .../packages/joy-media/src/transport.mock.ts  |  29 +-
 .../joy-media/src/transport.substrate.ts      |  23 +-
 pioneer/packages/joy-media/src/transport.ts   |  12 +-
 .../joy-media/src/upload/EditVideo.view.tsx   |  11 +-
 .../joy-media/src/upload/UploadAudio.tsx      |   5 +-
 .../joy-media/src/upload/UploadVideo.tsx      |  50 +--
 .../joy-media/src/video/PlayVideo.tsx         |   6 +-
 .../joy-media/src/video/PlayVideo.view.tsx    |  12 +-
 .../joy-media/src/video/VideoPreview.tsx      |   4 +-
 .../src/react/components}/InputFileAsync.tsx  |   8 +-
 .../src/react/components}/JoyStatus.tsx       |   2 +-
 .../src/react/components}/Pluralize.tsx       |   0
 .../joy-utils/src/react/components/index.tsx  |   5 +-
 .../joy-utils/src/react/hocs/accounts.tsx     | 117 +++++++-
 .../joy-utils/src/react/hocs/guards.tsx       |  31 +-
 .../proposals/useProposalSubscription.tsx     |   2 +-
 .../src/transport}/SimpleCache.ts             |   5 +-
 .../packages/joy-utils/src/transport/base.ts  |  30 +-
 .../joy-utils/src/transport/mock/base.ts      |  26 +-
 .../joy-utils/src/transport/workingGroups.ts  |   4 +
 .../src/types}/ValidationConstraint.ts        |   0
 .../old-apps/apps-routing/src/joy-media.ts    |  17 --
 .../packages/old-apps/apps/src/aplayer.d.ts   |   1 -
 .../packages/old-apps/apps/src/dplayer.d.ts   |   1 -
 .../react-components/src/styles/joystream.ts  |   5 +
 pioneer/tsconfig.json                         |   5 +-
 types/augment-codec/augment-types.ts          |  52 ++--
 types/augment/all/defs.json                   |  40 +--
 types/augment/all/types.ts                    |  40 +--
 types/augment/augment-api-consts.ts           |  50 ---
 types/augment/augment-api-query.ts            |  33 +-
 types/augment/augment-api-tx.ts               |  49 +--
 types/src/content-working-group/index.ts      |  12 +-
 types/src/index.ts                            |   2 +-
 types/src/versioned-store/index.ts            |   4 +-
 yarn.lock                                     | 284 ++++++++++++++++--
 89 files changed, 801 insertions(+), 573 deletions(-)
 create mode 100644 pioneer/packages/apps-routing/src/joy-media.ts
 rename pioneer/packages/{old-apps => }/apps/public/images/default-thumbnail.png (100%)
 delete mode 100644 pioneer/packages/joy-media/.skip-build
 create mode 100644 pioneer/packages/joy-media/aplayer.d.ts
 create mode 100644 pioneer/packages/joy-media/dplayer.d.ts
 rename pioneer/packages/{joy-utils-old/src/images.ts => joy-media/src/common/images.tsx} (94%)
 rename pioneer/packages/joy-media/src/common/{index.css => index.scss} (100%)
 rename pioneer/packages/joy-media/src/{index.css => index.scss} (96%)
 rename pioneer/packages/{old-apps/react-components/src => joy-utils/src/react/components}/InputFileAsync.tsx (92%)
 rename pioneer/packages/{joy-utils-old/src => joy-utils/src/react/components}/JoyStatus.tsx (94%)
 rename pioneer/packages/{joy-utils-old/src => joy-utils/src/react/components}/Pluralize.tsx (100%)
 rename pioneer/packages/{joy-utils-old/src => joy-utils/src/transport}/SimpleCache.ts (94%)
 rename pioneer/packages/{joy-utils-old/src => joy-utils/src/types}/ValidationConstraint.ts (100%)
 delete mode 100644 pioneer/packages/old-apps/apps-routing/src/joy-media.ts
 delete mode 100644 pioneer/packages/old-apps/apps/src/aplayer.d.ts
 delete mode 100644 pioneer/packages/old-apps/apps/src/dplayer.d.ts

diff --git a/package.json b/package.json
index e47f75a4f1..d9905c6fc6 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "pioneer/packages/joy-election",
     "pioneer/packages/joy-proposals",
     "pioneer/packages/joy-roles",
+    "pioneer/packages/joy-media",
     "utils/api-examples"
   ],
   "resolutions": {
@@ -40,7 +41,8 @@
     "@polkadot/util-crypto": "3.0.1",
     "@polkadot/wasm-crypto": "1.2.1",
     "babel-core": "^7.0.0-bridge.0",
-    "typescript": "^3.9.7"
+    "typescript": "^3.9.7",
+    "bn.js": "^5.1.2"
   },
   "devDependencies": {
     "husky": "^4.2.5",
diff --git a/pioneer/.eslintignore b/pioneer/.eslintignore
index 293b8583b2..e975aac9b9 100644
--- a/pioneer/.eslintignore
+++ b/pioneer/.eslintignore
@@ -4,7 +4,6 @@
 packages/old-apps/*
 packages/joy-forum/*
 packages/joy-help/*
-packages/joy-media/*
 packages/joy-settings/*
 packages/joy-utils-old/*
 .eslintrc.js
diff --git a/pioneer/packages/apps-routing/src/index.ts b/pioneer/packages/apps-routing/src/index.ts
index 55ad59d500..66b9fbb0ee 100644
--- a/pioneer/packages/apps-routing/src/index.ts
+++ b/pioneer/packages/apps-routing/src/index.ts
@@ -23,10 +23,12 @@ import { terms, privacyPolicy } from './joy-pages';
 import election from './joy-election';
 import proposals from './joy-proposals';
 import roles from './joy-roles';
+import media from './joy-media';
 
 export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Routes {
   return appSettings.uiMode === 'light'
     ? [
+      media(t),
       members(t),
       roles(t),
       election(t),
@@ -37,6 +39,7 @@ export default function create (t: <T = string> (key: string, text: string, opti
       settings(t)
     ]
     : [
+      media(t),
       members(t),
       roles(t),
       election(t),
diff --git a/pioneer/packages/apps-routing/src/joy-media.ts b/pioneer/packages/apps-routing/src/joy-media.ts
new file mode 100644
index 0000000000..befff152ad
--- /dev/null
+++ b/pioneer/packages/apps-routing/src/joy-media.ts
@@ -0,0 +1,15 @@
+import Media from '@polkadot/joy-media/index';
+
+import { Route } from './types';
+
+export default function create (t: <T = string> (key: string, text: string, options: { ns: string }) => T): Route {
+  return {
+    Component: Media,
+    display: {
+      needsApi: ['query.storageWorkingGroup.workerById', 'query.dataObjectStorageRegistry.relationshipsByContentId']
+    },
+    text: t<string>('nav.media', 'Media', { ns: 'apps-routing' }),
+    icon: 'play-circle',
+    name: 'media'
+  };
+}
diff --git a/pioneer/packages/old-apps/apps/public/images/default-thumbnail.png b/pioneer/packages/apps/public/images/default-thumbnail.png
similarity index 100%
rename from pioneer/packages/old-apps/apps/public/images/default-thumbnail.png
rename to pioneer/packages/apps/public/images/default-thumbnail.png
diff --git a/pioneer/packages/apps/public/locales/en/index.json b/pioneer/packages/apps/public/locales/en/index.json
index 962b58bcc3..eec63e3079 100644
--- a/pioneer/packages/apps/public/locales/en/index.json
+++ b/pioneer/packages/apps/public/locales/en/index.json
@@ -25,6 +25,7 @@
   "joy-media.json",
   "joy-members.json",
   "joy-roles.json",
+  "joy-utils.json",
   "react-components.json",
   "react-params.json",
   "react-query.json",
diff --git a/pioneer/packages/apps/public/locales/en/joy-utils.json b/pioneer/packages/apps/public/locales/en/joy-utils.json
index 9e26dfeeb6..d094e35b91 100644
--- a/pioneer/packages/apps/public/locales/en/joy-utils.json
+++ b/pioneer/packages/apps/public/locales/en/joy-utils.json
@@ -1 +1,4 @@
-{}
\ No newline at end of file
+{
+  "click to select or drag and drop the file here": "click to select or drag and drop the file here",
+  "{{name}} ({{size}} bytes)": "{{name}} ({{size}} bytes)"
+}
\ No newline at end of file
diff --git a/pioneer/packages/apps/src/Content/index.tsx b/pioneer/packages/apps/src/Content/index.tsx
index cf2dc00224..a375b8b91c 100644
--- a/pioneer/packages/apps/src/Content/index.tsx
+++ b/pioneer/packages/apps/src/Content/index.tsx
@@ -97,7 +97,6 @@ function Content ({ className }: Props): React.ReactElement<Props> {
 }
 
 export default React.memo(styled(Content)`
-  background: rgba(250, 250, 250);
   padding: 0 1.5rem;
   position: relative;
   width: 100%;
diff --git a/pioneer/packages/apps/webpack.base.config.js b/pioneer/packages/apps/webpack.base.config.js
index 14d96e3999..cf4a3ee028 100644
--- a/pioneer/packages/apps/webpack.base.config.js
+++ b/pioneer/packages/apps/webpack.base.config.js
@@ -48,6 +48,9 @@ function createWebpack (ENV, context) {
     return alias;
   }, {});
 
+  // Add @joystream/types as alias to automatically process any changes:
+  alias['@joystream/types'] = path.resolve(context, `../../../types/src`);
+
   return {
     context,
     entry: ['@babel/polyfill', './src/index.tsx'],
diff --git a/pioneer/packages/joy-media/.skip-build b/pioneer/packages/joy-media/.skip-build
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/pioneer/packages/joy-media/aplayer.d.ts b/pioneer/packages/joy-media/aplayer.d.ts
new file mode 100644
index 0000000000..87c1fa0b95
--- /dev/null
+++ b/pioneer/packages/joy-media/aplayer.d.ts
@@ -0,0 +1,2 @@
+// No offical definitions available
+declare module 'react-aplayer';
diff --git a/pioneer/packages/joy-media/dplayer.d.ts b/pioneer/packages/joy-media/dplayer.d.ts
new file mode 100644
index 0000000000..675b3837c3
--- /dev/null
+++ b/pioneer/packages/joy-media/dplayer.d.ts
@@ -0,0 +1,2 @@
+// No offical definitions available
+declare module 'react-dplayer';
diff --git a/pioneer/packages/joy-media/package.json b/pioneer/packages/joy-media/package.json
index 45056f41c3..d4d5541bba 100644
--- a/pioneer/packages/joy-media/package.json
+++ b/pioneer/packages/joy-media/package.json
@@ -7,14 +7,14 @@
   "author": "Joystream contributors",
   "maintainers": [],
   "dependencies": {
-    "@babel/runtime": "^7.7.1",
+    "@babel/runtime": "^7.10.5",
     "@polkadot/joy-utils": "^0.1.1",
-    "@polkadot/react-components": "0.37.0-beta.63",
-    "@polkadot/react-query": "0.37.0-beta.63",
+    "@polkadot/react-components": "0.51.1",
+    "@polkadot/react-query": "0.51.1",
     "@types/mime-types": "^2.1.0",
     "@types/react-beautiful-dnd": "^11.0.3",
     "aplayer": "^1.10.1",
-    "dplayer": "^1.25.0",
+    "dplayer": "1.25.0",
     "ipfs-only-hash": "^1.0.2",
     "iso-639-1": "^2.1.0",
     "lodash": "^4.17.11",
diff --git a/pioneer/packages/joy-media/src/DiscoveryProvider.tsx b/pioneer/packages/joy-media/src/DiscoveryProvider.tsx
index 35ea333c42..dfe2be538a 100644
--- a/pioneer/packages/joy-media/src/DiscoveryProvider.tsx
+++ b/pioneer/packages/joy-media/src/DiscoveryProvider.tsx
@@ -7,7 +7,7 @@ import { Vec } from '@polkadot/types';
 import { Url } from '@joystream/types/discovery';
 import ApiContext from '@polkadot/react-api/ApiContext';
 import { ApiProps } from '@polkadot/react-api/types';
-import { JoyInfo } from '@polkadot/joy-utils/JoyStatus';
+import { JoyInfo } from '@polkadot/joy-utils/react/components';
 import { componentName } from '@polkadot/joy-utils/react/helpers';
 
 export type BootstrapNodes = {
diff --git a/pioneer/packages/joy-media/src/MediaView.tsx b/pioneer/packages/joy-media/src/MediaView.tsx
index d5968d2326..a96f5a2c92 100644
--- a/pioneer/packages/joy-media/src/MediaView.tsx
+++ b/pioneer/packages/joy-media/src/MediaView.tsx
@@ -1,9 +1,11 @@
 import React, { useState, useEffect } from 'react';
 import { MediaTransport } from './transport';
 import { MemberId } from '@joystream/types/members';
-import { useMyMembership } from '@polkadot/joy-utils/MyMembershipContext';
+import { useMyMembership } from '@polkadot/joy-utils/react/hooks';
 import { useTransportContext } from './TransportContext';
-import { withMembershipRequired } from '@polkadot/joy-utils/MyAccount';
+import { withMembershipRequired } from '@polkadot/joy-utils/react/hocs/guards';
+import { useApi } from '@polkadot/react-hooks';
+import { ApiPromise } from '@polkadot/api';
 
 type InitialPropsWithMembership<A> = A & {
   myAddress?: string;
@@ -12,6 +14,7 @@ type InitialPropsWithMembership<A> = A & {
 
 type ResolverProps<A> = InitialPropsWithMembership<A> & {
   transport: MediaTransport;
+  api: ApiPromise;
 }
 
 type BaseProps<A, B> = {
@@ -39,13 +42,14 @@ function serializeTrigger (val: any): any {
   }
 }
 
-export function MediaView<A = {}, B = {}> (baseProps: BaseProps<A, B>) {
+export function MediaView<A extends Record<string, unknown> = Record<string, unknown>, B extends Record<string, unknown> = Record<string, unknown>> (baseProps: BaseProps<A, B>) {
   function InnerView (initialProps: A & B) {
     const { component: Component, resolveProps, triggers = [], unresolvedView = null } = baseProps;
 
     const transport = useTransportContext();
     const { myAddress, myMemberId } = useMyMembership();
-    const resolverProps = { ...initialProps, transport, myAddress, myMemberId };
+    const { api } = useApi();
+    const resolverProps = { ...initialProps, transport, api, myAddress, myMemberId };
 
     const [resolvedProps, setResolvedProps] = useState({} as B);
     const [propsResolved, setPropsResolved] = useState(false);
diff --git a/pioneer/packages/joy-media/src/Upload.tsx b/pioneer/packages/joy-media/src/Upload.tsx
index b2b91b0a49..0c1b0fcc39 100644
--- a/pioneer/packages/joy-media/src/Upload.tsx
+++ b/pioneer/packages/joy-media/src/Upload.tsx
@@ -4,7 +4,8 @@ import axios, { CancelTokenSource } from 'axios';
 import { History } from 'history';
 import { Progress, Message } from 'semantic-ui-react';
 
-import { InputFileAsync } from '@polkadot/react-components/index';
+import { mockRegistry } from '@joystream/types';
+import { InputFileAsync } from '@polkadot/joy-utils/react/components';
 import { ApiProps } from '@polkadot/react-api/types';
 import { I18nProps } from '@polkadot/react-components/types';
 import { SubmittableResult } from '@polkadot/api';
@@ -15,15 +16,17 @@ import { formatNumber } from '@polkadot/util';
 import translate from './translate';
 import { fileNameWoExt } from './utils';
 import { ContentId, DataObject } from '@joystream/types/media';
-import { withOnlyMembers, MyAccountProps } from '@polkadot/joy-utils/MyAccount';
+import { MyAccountProps } from '@polkadot/joy-utils/react/hocs/accounts';
+import { withOnlyMembers } from '@polkadot/joy-utils/react/hocs/guards';
 import { DiscoveryProviderProps, withDiscoveryProvider } from './DiscoveryProvider';
-import TxButton from '@polkadot/joy-utils/TxButton';
+import { TxButton } from '@polkadot/joy-utils/react/components';
 import IpfsHash from 'ipfs-only-hash';
 import { ChannelId } from '@joystream/types/content-working-group';
 import { EditVideoView } from './upload/EditVideo.view';
-import { JoyInfo } from '@polkadot/joy-utils/JoyStatus';
+import { JoyInfo } from '@polkadot/joy-utils/react/components';
 import { IterableFile } from './IterableFile';
 import { StorageProviderId } from '@joystream/types/working-group';
+import { Loading } from '@polkadot/joy-utils/react/components';
 
 const MAX_FILE_SIZE_MB = 500;
 const MAX_FILE_SIZE_BYTES = MAX_FILE_SIZE_MB * 1024 * 1024;
@@ -46,6 +49,7 @@ type State = {
   newContentId: ContentId;
   discovering: boolean;
   uploading: boolean;
+  sendingTx: boolean;
   progress: number;
   cancelSource: CancelTokenSource;
 };
@@ -55,9 +59,10 @@ const defaultState = (): State => ({
   file: undefined,
   computingHash: false,
   ipfs_cid: undefined,
-  newContentId: ContentId.generate(),
+  newContentId: ContentId.generate(mockRegistry),
   discovering: false,
   uploading: false,
+  sendingTx: false,
   progress: 0,
   cancelSource: axios.CancelToken.source()
 });
@@ -84,12 +89,13 @@ class Upload extends React.PureComponent<Props, State> {
   }
 
   private renderContent () {
-    const { error, uploading, discovering, computingHash } = this.state;
+    const { error, uploading, discovering, computingHash, sendingTx } = this.state;
 
     if (error) return this.renderError();
     else if (discovering) return this.renderDiscovering();
     else if (uploading) return this.renderUploading();
     else if (computingHash) return this.renderComputingHash();
+    else if (sendingTx) return this.renderSendingTx();
     else return this.renderFileInput();
   }
 
@@ -117,13 +123,13 @@ class Upload extends React.PureComponent<Props, State> {
     if (!file || !file.name) return <JoyInfo title='Loading...' />;
 
     const success = !error && progress >= 100;
-    const { history, match: { params: { channelId } } } = this.props;
+    const { history, match: { params: { channelId } }, api } = this.props;
 
     return <div style={{ width: '100%' }}>
       {this.renderProgress()}
       {success &&
         <EditVideoView
-          channelId={new ChannelId(channelId)}
+          channelId={api.createType('ChannelId', channelId)}
           contentId={newContentId}
           fileName={fileNameWoExt(file.name)}
           history={history}
@@ -132,6 +138,10 @@ class Upload extends React.PureComponent<Props, State> {
     </div>;
   }
 
+  private renderSendingTx () {
+    return <JoyInfo title="Please wait..."><Loading text="Waiting for the transaction confirmation..." /></JoyInfo>
+  }
+
   private renderDiscovering () {
     return <JoyInfo title={'Please wait...'}>Contacting storage provider.</JoyInfo>;
   }
@@ -184,12 +194,16 @@ class Upload extends React.PureComponent<Props, State> {
       />
       {file_name && <div className='UploadButtonBox'>
         <TxButton
-          size='large'
           label={'Upload'}
           isDisabled={!file_name}
           tx={'dataDirectory.addContent'}
           params={this.buildTxParams()}
-          txSuccessCb={this.onDataObjectCreated}
+          onClick={(sendTx) => {
+            this.setState({ sendingTx: true });
+            sendTx();
+          }}
+          txSuccessCb={ this.onDataObjectCreated }
+          txFailedCb={() => { this.setState({ sendingTx: false }) }}
         />
       </div>}
     </div>;
@@ -253,7 +267,7 @@ class Upload extends React.PureComponent<Props, State> {
   }
 
   private onDataObjectCreated = async (_txResult: SubmittableResult) => {
-    this.setState({ discovering: true });
+    this.setState({ sendingTx: false, discovering: true });
 
     const { api } = this.props;
     const { newContentId } = this.state;
diff --git a/pioneer/packages/joy-media/src/channels/ChannelAvatar.tsx b/pioneer/packages/joy-media/src/channels/ChannelAvatar.tsx
index f1416df962..48d3d59f35 100644
--- a/pioneer/packages/joy-media/src/channels/ChannelAvatar.tsx
+++ b/pioneer/packages/joy-media/src/channels/ChannelAvatar.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { ChannelEntity } from '../entities/ChannelEntity';
 import { BgImg } from '../common/BgImg';
-import { DEFAULT_THUMBNAIL_URL } from '@polkadot/joy-utils/images';
+import { DEFAULT_THUMBNAIL_URL } from '../common/images';
 
 const defaultSizePx = 75;
 
diff --git a/pioneer/packages/joy-media/src/channels/ChannelPreview.tsx b/pioneer/packages/joy-media/src/channels/ChannelPreview.tsx
index 7c0e19372a..98e0369e37 100644
--- a/pioneer/packages/joy-media/src/channels/ChannelPreview.tsx
+++ b/pioneer/packages/joy-media/src/channels/ChannelPreview.tsx
@@ -6,8 +6,8 @@ import { ChannelEntity } from '../entities/ChannelEntity';
 import { ChannelAvatar, ChannelAvatarSize } from './ChannelAvatar';
 import { isPublicChannel, isMusicChannel, isVideoChannel, isAccountAChannelOwner, isVerifiedChannel } from './ChannelHelpers';
 
-import { useMyMembership } from '@polkadot/joy-utils/MyMembershipContext';
-import { nonEmptyStr } from '@polkadot/joy-utils/index';
+import { useMyMembership } from '@polkadot/joy-utils/react/hooks';
+import { nonEmptyStr } from '@polkadot/joy-utils/functions/misc';
 import { CurationPanel } from './CurationPanel';
 import { ChannelNameAsLink } from './ChannelNameAsLink';
 
@@ -52,8 +52,6 @@ export const ChannelPreview = (props: ChannelPreviewProps) => {
         <h3 className='ChannelTitle' style={{ display: 'block' }}>
           <ChannelNameAsLink channel={channel} style={{ marginRight: '1rem' }} />
 
-          <CurationPanel channel={channel} />
-
           {isAccountAChannelOwner(channel, myAccountId) &&
             <div style={{ float: 'right' }}>
 
@@ -101,6 +99,8 @@ export const ChannelPreview = (props: ChannelPreviewProps) => {
           }
         </div>
 
+        <CurationPanel channel={channel} />
+
         {withDescription && nonEmptyStr(channel.description) &&
           <ReactMarkdown className='JoyMemo--full ChannelDesc' source={channel.description} linkTarget='_blank' />
         }
diff --git a/pioneer/packages/joy-media/src/channels/ChannelsByOwner.view.tsx b/pioneer/packages/joy-media/src/channels/ChannelsByOwner.view.tsx
index 9200d6d778..897ab0defe 100644
--- a/pioneer/packages/joy-media/src/channels/ChannelsByOwner.view.tsx
+++ b/pioneer/packages/joy-media/src/channels/ChannelsByOwner.view.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import { RouteComponentProps } from 'react-router';
 
-import { GenericAccountId } from '@polkadot/types';
 import { MediaView } from '../MediaView';
 import { ChannelsByOwnerProps, ChannelsByOwner } from './ChannelsByOwner';
-import { JoyError } from '@polkadot/joy-utils/JoyStatus';
+import { JoyError } from '@polkadot/joy-utils/react/components';
+import { useApi } from '@polkadot/react-hooks';
 
 type Props = ChannelsByOwnerProps;
 
@@ -19,10 +19,11 @@ export const ChannelsByOwnerView = MediaView<Props>({
 
 export const ChannelsByOwnerWithRouter = (props: Props & RouteComponentProps<any>) => {
   const { match: { params: { account } } } = props;
+  const { api } = useApi();
 
   if (account) {
     try {
-      return <ChannelsByOwnerView {...props} accountId={new GenericAccountId(account)} />;
+      return <ChannelsByOwnerView {...props} accountId={api.createType('AccountId', account)} />;
     } catch (err) {
       console.log('ChannelsByOwnerWithRouter failed:', err);
     }
diff --git a/pioneer/packages/joy-media/src/channels/CurationPanel.tsx b/pioneer/packages/joy-media/src/channels/CurationPanel.tsx
index ce2279a537..145341b799 100644
--- a/pioneer/packages/joy-media/src/channels/CurationPanel.tsx
+++ b/pioneer/packages/joy-media/src/channels/CurationPanel.tsx
@@ -1,16 +1,18 @@
 import React from 'react';
 import { ChannelEntity } from '../entities/ChannelEntity';
 import { isVerifiedChannel, isCensoredChannel } from './ChannelHelpers';
-import { useMyMembership } from '@polkadot/joy-utils/MyMembershipContext';
-import TxButton from '@polkadot/joy-utils/TxButton';
-import { ChannelCurationStatus } from '@joystream/types/content-working-group';
+import { useMyMembership } from '@polkadot/joy-utils/react/hooks';
+import { SemanticTxButton } from '@polkadot/joy-utils/react/components/TxButton';
 import { AccountId } from '@polkadot/types/interfaces';
+import { useApi } from '@polkadot/react-hooks';
+import { Icon } from 'semantic-ui-react';
 
 type ChannelCurationPanelProps = {
   channel: ChannelEntity;
 };
 
 export const CurationPanel = (props: ChannelCurationPanelProps) => {
+  const { api } = useApi();
   const { curationActor, allAccounts } = useMyMembership();
   const { channel } = props;
 
@@ -34,17 +36,16 @@ export const CurationPanel = (props: ChannelCurationPanelProps) => {
 
     const isCensored = isCensoredChannel(channel);
 
-    const new_curation_status = new ChannelCurationStatus(
+    const new_curation_status = api.createType('ChannelCurationStatus',
       isCensored ? 'Normal' : 'Censored'
     );
 
-    return <TxButton
+    return <SemanticTxButton
       accountId={role_account.toString()}
       type='submit'
-      size='medium'
-      icon={isCensored ? 'x' : 'warning'}
-      isDisabled={!accountAvailable}
-      label={isCensored ? 'Un-Censor' : 'Censor'}
+      size='small'
+      color={isCensored ? undefined : 'red'}
+      disabled={!accountAvailable}
       params={[
         curation_actor,
         channel.id,
@@ -52,7 +53,10 @@ export const CurationPanel = (props: ChannelCurationPanelProps) => {
         new_curation_status // toggled curation status
       ]}
       tx={'contentWorkingGroup.updateChannelAsCurationActor'}
-    />;
+    >
+      <Icon name={isCensored ? 'x' : 'warning'}/>
+      { isCensored ? 'Un-Censor' : 'Censor' }
+    </SemanticTxButton>;
   };
 
   const renderToggleVerifiedButton = () => {
@@ -62,13 +66,12 @@ export const CurationPanel = (props: ChannelCurationPanelProps) => {
     const accountAvailable = canUseAccount(role_account);
     const isVerified = isVerifiedChannel(channel);
 
-    return <TxButton
+    return <SemanticTxButton
       accountId={role_account.toString()}
       type='submit'
-      size='medium'
-      icon={isVerified ? 'x' : 'checkmark'}
-      isDisabled={!accountAvailable}
-      label={isVerified ? 'Remove Verification' : 'Verify'}
+      size='small'
+      color={isVerified ? undefined : 'green'}
+      disabled={!accountAvailable}
       params={[
         curation_actor,
         channel.id,
@@ -76,11 +79,14 @@ export const CurationPanel = (props: ChannelCurationPanelProps) => {
         null // not changing curation status
       ]}
       tx={'contentWorkingGroup.updateChannelAsCurationActor'}
-    />;
+    >
+      <Icon name={isVerified ? 'x' : 'checkmark'}/>
+      { isVerified ? 'Remove Verification' : 'Verify' }
+    </SemanticTxButton>;
   };
 
   return <>
-    <div style={{ float: 'right' }}>
+    <div style={{ display: 'flex', float: 'right', margin: '0.5em', marginRight: 0 }}>
       {renderToggleCensorshipButton()}
       {renderToggleVerifiedButton()}
     </div>
diff --git a/pioneer/packages/joy-media/src/channels/EditChannel.tsx b/pioneer/packages/joy-media/src/channels/EditChannel.tsx
index b0f1b4f068..e701f5afc5 100644
--- a/pioneer/packages/joy-media/src/channels/EditChannel.tsx
+++ b/pioneer/packages/joy-media/src/channels/EditChannel.tsx
@@ -3,21 +3,22 @@ import { Button } from 'semantic-ui-react';
 import { Form, withFormik } from 'formik';
 import { History } from 'history';
 
-import { Text, Option } from '@polkadot/types';
-import TxButton from '@polkadot/joy-utils/TxButton';
-import { onImageError } from '@polkadot/joy-utils/images';
+import { Option } from '@polkadot/types';
+import { TxButton } from '@polkadot/joy-utils/react/components';
+import { onImageError } from '../common/images';
 import { withMediaForm, MediaFormProps } from '../common/MediaForms';
 import { ChannelType, ChannelClass as Fields, buildChannelValidationSchema, ChannelFormValues, ChannelToFormValues, ChannelGenericProp } from '../schemas/channel/Channel';
 import { MediaDropdownOptions } from '../common/MediaDropdownOptions';
-import { ChannelId, ChannelContentType, ChannelPublicationStatus, OptionalText } from '@joystream/types/content-working-group';
-import { newOptionalText, findFirstParamOfSubstrateEvent } from '@polkadot/joy-utils/index';
-import { useMyMembership } from '@polkadot/joy-utils/MyMembershipContext';
+import { ChannelId, OptionalText } from '@joystream/types/content-working-group';
+import { findFirstParamOfSubstrateEvent } from '@polkadot/joy-utils/functions/misc';
+import { useMyMembership } from '@polkadot/joy-utils/react/hooks';
 import { ChannelPublicationStatusDropdownOptions, isAccountAChannelOwner } from './ChannelHelpers';
 import { TxCallback } from '@polkadot/react-components/Status/types';
 import { SubmittableResult } from '@polkadot/api';
 import { ChannelValidationConstraints } from '../transport';
-import { JoyError } from '@polkadot/joy-utils/JoyStatus';
-import Section from '@polkadot/joy-utils/Section';
+import { JoyError } from '@polkadot/joy-utils/react/components';
+import { Section } from '@polkadot/joy-utils/react/components';
+import { useApi } from '@polkadot/react-hooks';
 
 export type OuterProps = {
   history?: History;
@@ -56,6 +57,7 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
   } = props;
 
   const { myAccountId, myMemberId } = useMyMembership();
+  const { api } = useApi();
 
   if (entity && !isAccountAChannelOwner(entity, myAccountId)) {
     return <JoyError title={'Only owner can edit channel'} />;
@@ -83,52 +85,49 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
   const buildTxParams = () => {
     if (!isValid) return [];
 
-    // TODO get value from the form:
-    const publicationStatus = new ChannelPublicationStatus('Public');
-
     if (!entity) {
       // Create a new channel
 
       const channelOwner = myMemberId;
       const roleAccount = myAccountId;
-      const contentType = new ChannelContentType(values.content);
+      const contentType = api.createType('ChannelContentType', values.content);
 
       return [
         channelOwner,
         roleAccount,
         contentType,
-        new Text(values.handle),
-        newOptionalText(values.title),
-        newOptionalText(values.description),
-        newOptionalText(values.avatar),
-        newOptionalText(values.banner),
-        publicationStatus
+        values.handle,
+        values.title || null,
+        values.description || null,
+        values.avatar || null,
+        values.banner || null,
+        values.publicationStatus
       ];
     } else {
       // Update an existing channel
 
       const updOptText = (field: ChannelGenericProp): Option<OptionalText> => {
-        return new Option(OptionalText,
+        return api.createType('Option<OptionalText>',
           isFieldChanged(field)
-            ? newOptionalText(values[field.id])
+            ? api.createType('Option<Text>', values[field.id])
             : null
         );
       };
 
-      const updHandle = new Option(Text,
+      const updHandle = api.createType('Option<Text>',
         isFieldChanged(Fields.handle)
           ? values[Fields.handle.id]
           : null
       );
 
-      const updPublicationStatus = new Option(ChannelPublicationStatus,
+      const updPublicationStatus = api.createType('Option<ChannelPublicationStatus>',
         isFieldChanged(Fields.publicationStatus)
-          ? new ChannelPublicationStatus(values[Fields.publicationStatus.id] as any)
+          ? api.createType('ChannelPublicationStatus', values[Fields.publicationStatus.id])
           : null
       );
 
       return [
-        new ChannelId(entity.id),
+        entity.id,
         updHandle,
         updOptText(Fields.title),
         updOptText(Fields.description),
@@ -156,7 +155,6 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
   const renderMainButton = () =>
     <TxButton
       type='submit'
-      size='large'
       isDisabled={!dirty || isSubmitting}
       label={isNew
         ? 'Create channel'
diff --git a/pioneer/packages/joy-media/src/channels/EditChannel.view.tsx b/pioneer/packages/joy-media/src/channels/EditChannel.view.tsx
index b05582a965..3fcaa55696 100644
--- a/pioneer/packages/joy-media/src/channels/EditChannel.view.tsx
+++ b/pioneer/packages/joy-media/src/channels/EditChannel.view.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { MediaView } from '../MediaView';
 import { OuterProps, EditForm } from './EditChannel';
-import { ChannelId } from '@joystream/types/content-working-group';
-import { JoyError } from '@polkadot/joy-utils/JoyStatus';
+import { JoyError } from '@polkadot/joy-utils/react/components';
+import { useApi } from '@polkadot/react-hooks';
 
 type Props = OuterProps;
 
@@ -23,10 +23,11 @@ type WithRouterProps = Props & RouteComponentProps<any>
 
 export const EditChannelWithRouter = (props: WithRouterProps) => {
   const { match: { params: { id } } } = props;
+  const { api } = useApi();
 
   if (id) {
     try {
-      return <EditChannelView {...props} id={new ChannelId(id)} />;
+      return <EditChannelView {...props} id={api.createType('ChannelId', id)} />;
     } catch (err) {
       console.log('EditChannelWithRouter failed:', err);
     }
diff --git a/pioneer/packages/joy-media/src/channels/ViewChannel.tsx b/pioneer/packages/joy-media/src/channels/ViewChannel.tsx
index f55af16abf..aafabb9c0d 100644
--- a/pioneer/packages/joy-media/src/channels/ViewChannel.tsx
+++ b/pioneer/packages/joy-media/src/channels/ViewChannel.tsx
@@ -8,7 +8,7 @@ import { ViewVideoChannel } from './ViewVideoChannel';
 import { ViewMusicChannel } from './ViewMusicChannel';
 import { toVideoPreviews } from '../video/VideoPreview';
 import { isVideoChannel, isMusicChannel } from './ChannelHelpers';
-import { JoyError } from '@polkadot/joy-utils/JoyStatus';
+import { JoyError } from '@polkadot/joy-utils/react/components';
 
 export type ViewChannelProps = {
   id: ChannelId;
diff --git a/pioneer/packages/joy-media/src/channels/ViewChannel.view.tsx b/pioneer/packages/joy-media/src/channels/ViewChannel.view.tsx
index d44432c73a..453c4481a1 100644
--- a/pioneer/packages/joy-media/src/channels/ViewChannel.view.tsx
+++ b/pioneer/packages/joy-media/src/channels/ViewChannel.view.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { MediaView } from '../MediaView';
 import { ViewChannelProps, ViewChannel } from './ViewChannel';
-import { ChannelId } from '@joystream/types/content-working-group';
-import { JoyError } from '@polkadot/joy-utils/JoyStatus';
+import { JoyError } from '@polkadot/joy-utils/react/components';
+import { useApi } from '@polkadot/react-hooks';
 
 type Props = ViewChannelProps;
 
@@ -20,10 +20,11 @@ export const ViewChannelView = MediaView<Props>({
 
 export const ViewChannelWithRouter = (props: Props & RouteComponentProps<any>) => {
   const { match: { params: { id } } } = props;
+  const { api } = useApi();
 
   if (id) {
     try {
-      return <ViewChannelView {...props} id={new ChannelId(id)} />;
+      return <ViewChannelView {...props} id={api.createType('ChannelId', id)} />;
     } catch (err) {
       console.log('ViewChannelWithRouter failed:', err);
     }
diff --git a/pioneer/packages/joy-media/src/channels/ViewMusicChannel.tsx b/pioneer/packages/joy-media/src/channels/ViewMusicChannel.tsx
index f3526e7b49..75836704e8 100644
--- a/pioneer/packages/joy-media/src/channels/ViewMusicChannel.tsx
+++ b/pioneer/packages/joy-media/src/channels/ViewMusicChannel.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { ChannelEntity } from '../entities/ChannelEntity';
-import Section from '@polkadot/joy-utils/Section';
+import { Section } from '@polkadot/joy-utils/react/components';
 import { ChannelHeader } from './ChannelHeader';
 import { MusicAlbumPreviewProps, MusicAlbumPreview } from '../music/MusicAlbumPreview';
 import { MusicTrackReaderPreview, MusicTrackReaderPreviewProps } from '../music/MusicTrackReaderPreview';
diff --git a/pioneer/packages/joy-media/src/channels/ViewVideoChannel.tsx b/pioneer/packages/joy-media/src/channels/ViewVideoChannel.tsx
index 0d330f7810..ad089ed4c0 100644
--- a/pioneer/packages/joy-media/src/channels/ViewVideoChannel.tsx
+++ b/pioneer/packages/joy-media/src/channels/ViewVideoChannel.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import Section from '@polkadot/joy-utils/Section';
+import { Section } from '@polkadot/joy-utils/react/components';
 import { ChannelEntity } from '../entities/ChannelEntity';
 import { ChannelHeader } from './ChannelHeader';
 import { VideoPreview, VideoPreviewProps } from '../video/VideoPreview';
diff --git a/pioneer/packages/joy-media/src/common/MediaForms.tsx b/pioneer/packages/joy-media/src/common/MediaForms.tsx
index 0607e27095..45fbb8f0d7 100644
--- a/pioneer/packages/joy-media/src/common/MediaForms.tsx
+++ b/pioneer/packages/joy-media/src/common/MediaForms.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import { Dropdown, DropdownItemProps, DropdownProps } from 'semantic-ui-react';
 import { FormikProps, Field } from 'formik';
-import * as JoyForms from '@polkadot/joy-utils/forms';
+import * as JoyForms from '@polkadot/joy-utils/react/components/forms';
 import { SubmittableResult } from '@polkadot/api';
 import { TxFailedCallback, TxCallback } from '@polkadot/react-components/Status/types';
 import { MediaDropdownOptions } from './MediaDropdownOptions';
-import { OnTxButtonClick } from '@polkadot/joy-utils/TxButton';
+import { OnTxButtonClick } from '@polkadot/joy-utils/react/components/TxButton';
 import isEqual from 'lodash/isEqual';
 import { componentName } from '@polkadot/joy-utils/react/helpers';
 
diff --git a/pioneer/packages/joy-media/src/common/MediaPlayerView.tsx b/pioneer/packages/joy-media/src/common/MediaPlayerView.tsx
index ff0d7a2193..4f748d28c7 100644
--- a/pioneer/packages/joy-media/src/common/MediaPlayerView.tsx
+++ b/pioneer/packages/joy-media/src/common/MediaPlayerView.tsx
@@ -5,7 +5,7 @@ import APlayer from 'react-aplayer';
 
 import { ApiProps } from '@polkadot/react-api/types';
 import { I18nProps } from '@polkadot/react-components/types';
-import { withCalls, withMulti } from '@polkadot/react-api/with';
+import { withCalls, withMulti } from '@polkadot/react-api/hoc';
 import { Option } from '@polkadot/types/codec';
 
 import translate from '../translate';
@@ -14,8 +14,8 @@ import { DataObject, ContentId } from '@joystream/types/media';
 import { VideoType } from '../schemas/video/Video';
 import { isAccountAChannelOwner } from '../channels/ChannelHelpers';
 import { ChannelEntity } from '../entities/ChannelEntity';
-import { useMyMembership } from '@polkadot/joy-utils/MyMembershipContext';
-import { JoyError } from '@polkadot/joy-utils/JoyStatus';
+import { useMyMembership } from '@polkadot/joy-utils/react/hooks';
+import { JoyError } from '@polkadot/joy-utils/react/components';
 
 const PLAYER_COMMON_PARAMS = {
   lang: 'en',
diff --git a/pioneer/packages/joy-media/src/common/MediaPlayerWithResolver.tsx b/pioneer/packages/joy-media/src/common/MediaPlayerWithResolver.tsx
index 73c32612ff..af10f02f7c 100644
--- a/pioneer/packages/joy-media/src/common/MediaPlayerWithResolver.tsx
+++ b/pioneer/packages/joy-media/src/common/MediaPlayerWithResolver.tsx
@@ -4,17 +4,16 @@ import _ from 'lodash';
 
 import { ApiProps } from '@polkadot/react-api/types';
 import { I18nProps } from '@polkadot/react-components/types';
-import { withMulti } from '@polkadot/react-api/with';
+import { withMulti } from '@polkadot/react-api/hoc';
 import { Option } from '@polkadot/types/codec';
-import { StorageProviderId, Worker } from '@joystream/types/working-group';
 
 import translate from '../translate';
 import { DiscoveryProviderProps, withDiscoveryProvider } from '../DiscoveryProvider';
 import { DataObjectStorageRelationshipId, DataObjectStorageRelationship } from '@joystream/types/media';
 import { Message } from 'semantic-ui-react';
 import { MediaPlayerView, RequiredMediaPlayerProps } from './MediaPlayerView';
-import { JoyInfo } from '@polkadot/joy-utils/JoyStatus';
-import { MultipleLinkedMapEntry } from '@polkadot/joy-utils/index';
+import { JoyInfo } from '@polkadot/joy-utils/react/components';
+import { useTransport } from '@polkadot/joy-utils/react/hooks';
 
 type Props = ApiProps & I18nProps & DiscoveryProviderProps & RequiredMediaPlayerProps;
 
@@ -24,29 +23,13 @@ function newCancelSource (): CancelTokenSource {
 
 function InnerComponent (props: Props) {
   const { contentId, api, discoveryProvider } = props;
+  const transport = useTransport();
 
   const [error, setError] = useState<Error>();
   const [resolvedAssetUrl, setResolvedAssetUrl] = useState<string>();
   const [contentType, setContentType] = useState<string>();
   const [cancelSource, setCancelSource] = useState<CancelTokenSource>(newCancelSource());
 
-  const getActiveStorageProviderIds = async (): Promise<StorageProviderId[]> => {
-    const nextId = await api.query.storageWorkingGroup.nextWorkerId() as StorageProviderId;
-    // This is chain specfic, but if next id is still 0, it means no workers have been added,
-    // so the workerById is empty
-    if (nextId.eq(0)) {
-      return [];
-    }
-
-    const workers = new MultipleLinkedMapEntry<StorageProviderId, Worker>(
-      StorageProviderId,
-      Worker,
-      await api.query.storageWorkingGroup.workerById()
-    );
-
-    return workers.linked_keys;
-  };
-
   const resolveAsset = async () => {
     setError(undefined);
     setCancelSource(newCancelSource());
@@ -68,9 +51,9 @@ function InnerComponent (props: Props) {
       return;
     }
 
+    const activeProviders = (await transport.workingGroups.allWorkers('Storage')).map(([id]) => id);
     // filter out providers no longer active - relationships of providers that have left
     // are not pruned onchain.
-    const activeProviders = await getActiveStorageProviderIds();
     readyProviders = _.intersectionBy(activeProviders, readyProviders, provider => provider.toString());
 
     console.log(`Found ${readyProviders.length} providers ready to serve content: ${readyProviders}`);
diff --git a/pioneer/packages/joy-media/src/common/TypeHelpers.ts b/pioneer/packages/joy-media/src/common/TypeHelpers.ts
index 4feaa33d92..b546a851a8 100644
--- a/pioneer/packages/joy-media/src/common/TypeHelpers.ts
+++ b/pioneer/packages/joy-media/src/common/TypeHelpers.ts
@@ -1,4 +1,5 @@
 import BN from 'bn.js';
+import { createMock } from '@joystream/types';
 import { ChannelId } from '@joystream/types/content-working-group';
 import { EntityId, ClassId } from '@joystream/types/versioned-store';
 
@@ -16,7 +17,7 @@ export function asChannelId (id: AnyChannelId): ChannelId {
   if (id instanceof ChannelId) {
     return id;
   } else if (canBeId(id)) {
-    return new ChannelId(id);
+    return createMock('ChannelId', id);
   } else {
     throw new Error(`Not supported format for Channel id: ${id}`);
   }
@@ -26,7 +27,7 @@ export function asEntityId (id: AnyEntityId): EntityId {
   if (id instanceof EntityId) {
     return id;
   } else if (canBeId(id)) {
-    return new EntityId(id);
+    return createMock('EntityId', id);
   } else {
     throw new Error(`Not supported format for Entity id: ${id}`);
   }
@@ -36,7 +37,7 @@ export function asClassId (id: AnyClassId): ClassId {
   if (id instanceof ClassId) {
     return id;
   } else if (canBeId(id)) {
-    return new ClassId(id);
+    return createMock('ClassId', id);
   } else {
     throw new Error(`Not supported format for Class id: ${id}`);
   }
diff --git a/pioneer/packages/joy-utils-old/src/images.ts b/pioneer/packages/joy-media/src/common/images.tsx
similarity index 94%
rename from pioneer/packages/joy-utils-old/src/images.ts
rename to pioneer/packages/joy-media/src/common/images.tsx
index c246b7bbd5..801fafa4df 100644
--- a/pioneer/packages/joy-utils-old/src/images.ts
+++ b/pioneer/packages/joy-media/src/common/images.tsx
@@ -1,3 +1,5 @@
+import React from 'react';
+
 export const DEFAULT_THUMBNAIL_URL = 'images/default-thumbnail.png';
 
 // This is a hack to just satisfy TypeScript compiler.
diff --git a/pioneer/packages/joy-media/src/common/index.css b/pioneer/packages/joy-media/src/common/index.scss
similarity index 100%
rename from pioneer/packages/joy-media/src/common/index.css
rename to pioneer/packages/joy-media/src/common/index.scss
diff --git a/pioneer/packages/joy-media/src/explore/AllChannels.tsx b/pioneer/packages/joy-media/src/explore/AllChannels.tsx
index 86a3cf5046..dffbf7d14d 100644
--- a/pioneer/packages/joy-media/src/explore/AllChannels.tsx
+++ b/pioneer/packages/joy-media/src/explore/AllChannels.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import Section from '@polkadot/joy-utils/Section';
+import { Section } from '@polkadot/joy-utils/react/components';
 import { MediaView } from '../MediaView';
 import { ChannelEntity } from '../entities/ChannelEntity';
 import { ChannelPreview } from '../channels/ChannelPreview';
diff --git a/pioneer/packages/joy-media/src/explore/AllVideos.tsx b/pioneer/packages/joy-media/src/explore/AllVideos.tsx
index 588981f2d5..83fdda698d 100644
--- a/pioneer/packages/joy-media/src/explore/AllVideos.tsx
+++ b/pioneer/packages/joy-media/src/explore/AllVideos.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import Section from '@polkadot/joy-utils/Section';
+import { Section } from '@polkadot/joy-utils/react/components';
 import { VideoPreviewProps, VideoPreview } from '../video/VideoPreview';
 import { MediaView } from '../MediaView';
 
diff --git a/pioneer/packages/joy-media/src/explore/ExploreContent.tsx b/pioneer/packages/joy-media/src/explore/ExploreContent.tsx
index b8a1aba49e..286d92e828 100644
--- a/pioneer/packages/joy-media/src/explore/ExploreContent.tsx
+++ b/pioneer/packages/joy-media/src/explore/ExploreContent.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import Section from '@polkadot/joy-utils/Section';
+import { Section } from '@polkadot/joy-utils/react/components';
 import { VideoPreviewProps, VideoPreview } from '../video/VideoPreview';
 import { ChannelEntity } from '../entities/ChannelEntity';
 import { ChannelPreview } from '../channels/ChannelPreview';
diff --git a/pioneer/packages/joy-media/src/explore/PlayContent.tsx b/pioneer/packages/joy-media/src/explore/PlayContent.tsx
index 96f28b7cf3..83defcd126 100644
--- a/pioneer/packages/joy-media/src/explore/PlayContent.tsx
+++ b/pioneer/packages/joy-media/src/explore/PlayContent.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { MusicAlbumPreviewProps, MusicAlbumPreview } from '../music/MusicAlbumPreview';
 import { MusicTrackReaderPreviewProps, MusicTrackReaderPreview } from '../music/MusicTrackReaderPreview';
-import { Pluralize } from '@polkadot/joy-utils/Pluralize';
+import { Pluralize } from '@polkadot/joy-utils/react/components';
 import { Table } from 'semantic-ui-react';
 import { ChannelEntity } from '../entities/ChannelEntity';
 import { ChannelPreview } from '../channels/ChannelPreview';
diff --git a/pioneer/packages/joy-media/src/index.css b/pioneer/packages/joy-media/src/index.scss
similarity index 96%
rename from pioneer/packages/joy-media/src/index.css
rename to pioneer/packages/joy-media/src/index.scss
index 2b7395c214..6b4a55e972 100644
--- a/pioneer/packages/joy-media/src/index.css
+++ b/pioneer/packages/joy-media/src/index.scss
@@ -41,6 +41,11 @@
     width: 100%;
     max-width: 600px;
   }
+
+  .EditMetaForm {
+    flex-grow: 1;
+    max-width: 600px;
+  }
 }
 
 .PlayBox {
@@ -72,9 +77,6 @@
   .MediaCell {
     width: 25%;
 
-    &.MyContent {
-      /* background-color: #fff8e1; */
-    }
     &:hover {
       background-color: #deeffc;
     }
diff --git a/pioneer/packages/joy-media/src/index.tsx b/pioneer/packages/joy-media/src/index.tsx
index c499fa2529..ecb13ba134 100644
--- a/pioneer/packages/joy-media/src/index.tsx
+++ b/pioneer/packages/joy-media/src/index.tsx
@@ -3,15 +3,16 @@ import React from 'react';
 import { Route, Switch } from 'react-router';
 
 import { AppProps, I18nProps } from '@polkadot/react-components/types';
-import Tabs, { TabItem } from '@polkadot/react-components/Tabs';
+import Tabs from '@polkadot/react-components/Tabs';
+import { TabItem } from '@polkadot/react-components/Tabs/types';
 import { ApiProps } from '@polkadot/react-api/types';
-import { withMulti } from '@polkadot/react-api/with';
+import { withMulti } from '@polkadot/react-api/hoc';
 
-import './index.css';
-import './common/index.css';
+import './index.scss';
+import './common/index.scss';
 
 import translate from './translate';
-import { useMyAccount } from '@polkadot/joy-utils/MyAccountContext';
+import { useMyAccount } from '@polkadot/joy-utils/react/hooks';
 import { UploadWithRouter } from './Upload';
 import { DiscoveryProviderProps, DiscoveryProviderProvider } from './DiscoveryProvider';
 import { SubstrateTransportProvider } from './TransportContext';
diff --git a/pioneer/packages/joy-media/src/music/EditMusicAlbum.tsx b/pioneer/packages/joy-media/src/music/EditMusicAlbum.tsx
index 4d8cd00f27..7bb7374add 100644
--- a/pioneer/packages/joy-media/src/music/EditMusicAlbum.tsx
+++ b/pioneer/packages/joy-media/src/music/EditMusicAlbum.tsx
@@ -3,8 +3,8 @@ import { Button, Tab } from 'semantic-ui-react';
 import { Form, withFormik } from 'formik';
 import { History } from 'history';
 
-import TxButton from '@polkadot/joy-utils/TxButton';
-import { onImageError } from '@polkadot/joy-utils/images';
+import { TxButton } from '@polkadot/joy-utils/react/components';
+import { onImageError } from '../common/images';
 import { ReorderableTracks } from './ReorderableTracks';
 import { MusicAlbumValidationSchema, MusicAlbumType, MusicAlbumClass as Fields, MusicAlbumFormValues, MusicAlbumToFormValues } from '../schemas/music/MusicAlbum';
 import { withMediaForm, MediaFormProps, datePlaceholder } from '../common/MediaForms';
@@ -123,7 +123,6 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
   const renderMainButton = () =>
     <TxButton
       type='submit'
-      size='large'
       isDisabled={!dirty || isSubmitting}
       label={isNew
         ? 'Publish'
diff --git a/pioneer/packages/joy-media/src/music/MusicAlbumPreview.tsx b/pioneer/packages/joy-media/src/music/MusicAlbumPreview.tsx
index 3281bdf322..0acc51fc0f 100644
--- a/pioneer/packages/joy-media/src/music/MusicAlbumPreview.tsx
+++ b/pioneer/packages/joy-media/src/music/MusicAlbumPreview.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Button } from 'semantic-ui-react';
-import { Pluralize } from '@polkadot/joy-utils/Pluralize';
+import { Pluralize } from '@polkadot/joy-utils/react/components';
 import { BgImg } from '../common/BgImg';
 import { ChannelEntity } from '../entities/ChannelEntity';
 
diff --git a/pioneer/packages/joy-media/src/music/MusicAlbumTracks.tsx b/pioneer/packages/joy-media/src/music/MusicAlbumTracks.tsx
index ff48a86e2e..e72af097dc 100644
--- a/pioneer/packages/joy-media/src/music/MusicAlbumTracks.tsx
+++ b/pioneer/packages/joy-media/src/music/MusicAlbumTracks.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { Button, CheckboxProps } from 'semantic-ui-react';
-import { Pluralize } from '@polkadot/joy-utils/Pluralize';
+import { Pluralize } from '@polkadot/joy-utils/react/components';
 import { EditableMusicTrackPreviewProps, MusicTrackPreview } from './MusicTrackPreview';
 import { MusicAlbumPreviewProps, MusicAlbumPreview } from './MusicAlbumPreview';
 
diff --git a/pioneer/packages/joy-media/src/music/MyMusicTracks.tsx b/pioneer/packages/joy-media/src/music/MyMusicTracks.tsx
index 2f5a964617..927d507004 100644
--- a/pioneer/packages/joy-media/src/music/MyMusicTracks.tsx
+++ b/pioneer/packages/joy-media/src/music/MyMusicTracks.tsx
@@ -1,8 +1,8 @@
 import React, { useState } from 'react';
 import { Button, CheckboxProps, Dropdown, Message } from 'semantic-ui-react';
 
-import { Pluralize } from '@polkadot/joy-utils/Pluralize';
-import Section from '@polkadot/joy-utils/Section';
+import { Pluralize } from '@polkadot/joy-utils/react/components';
+import { Section } from '@polkadot/joy-utils/react/components';
 import { EditableMusicTrackPreviewProps, MusicTrackPreview } from './MusicTrackPreview';
 import { ReorderableTracks } from './ReorderableTracks';
 import { MusicAlbumPreviewProps } from './MusicAlbumPreview';
diff --git a/pioneer/packages/joy-media/src/schemas/channel/Channel.ts b/pioneer/packages/joy-media/src/schemas/channel/Channel.ts
index 26820320fa..013d946acf 100644
--- a/pioneer/packages/joy-media/src/schemas/channel/Channel.ts
+++ b/pioneer/packages/joy-media/src/schemas/channel/Channel.ts
@@ -4,7 +4,7 @@ import { BlockNumber, AccountId } from '@polkadot/types/interfaces';
 import { ChannelContentTypeValue, PrincipalId, Channel, ChannelId, ChannelPublicationStatusValue, ChannelCurationStatusValue } from '@joystream/types/content-working-group';
 import { MemberId } from '@joystream/types/members';
 import { ChannelValidationConstraints } from '@polkadot/joy-media/transport';
-import { ValidationConstraint } from '@polkadot/joy-utils/ValidationConstraint';
+import { ValidationConstraint } from '@polkadot/joy-utils/types/ValidationConstraint';
 
 function textValidation (constraint?: ValidationConstraint) {
   if (!constraint) {
@@ -56,19 +56,19 @@ export class ChannelCodec {
   static fromSubstrate (id: ChannelId, sub: Channel): ChannelType {
     return {
       id: id.toNumber(),
-      verified: sub.getBoolean('verified'),
-      handle: sub.getString('handle'),
-      title: sub.getOptionalString('title'),
-      description: sub.getOptionalString('description'),
-      avatar: sub.getOptionalString('avatar'),
-      banner: sub.getOptionalString('banner'),
-      content: sub.getEnumAsString<ChannelContentTypeValue>('content'),
-      owner: sub.getField('owner'),
-      roleAccount: sub.getField('role_account'),
-      publicationStatus: sub.getEnumAsString<ChannelPublicationStatusValue>('publication_status'),
-      curationStatus: sub.getEnumAsString<ChannelCurationStatusValue>('curation_status'),
-      created: sub.getField('created'),
-      principalId: sub.getField('principal_id')
+      verified: sub.verified.valueOf(),
+      handle: sub.handle.toString(),
+      title: sub.title.unwrapOr(undefined)?.toString(),
+      description: sub.description.unwrapOr(undefined)?.toString(),
+      avatar: sub.avatar.unwrapOr(undefined)?.toString(),
+      banner: sub.banner.unwrapOr(undefined)?.toString(),
+      content: sub.content.type,
+      owner: sub.owner,
+      roleAccount: sub.role_account,
+      publicationStatus: sub.publication_status.type,
+      curationStatus: sub.curation_status.type,
+      created: sub.created,
+      principalId: sub.principal_id
     };
   }
 }
diff --git a/pioneer/packages/joy-media/src/stories/ExploreContent.stories.tsx b/pioneer/packages/joy-media/src/stories/ExploreContent.stories.tsx
index f446771f75..6a7cf9bc6a 100644
--- a/pioneer/packages/joy-media/src/stories/ExploreContent.stories.tsx
+++ b/pioneer/packages/joy-media/src/stories/ExploreContent.stories.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import '../common/index.css';
+import '../common/index.scss';
 
 import { ExploreContent } from '../explore/ExploreContent';
 import { withMockTransport } from './withMockTransport';
diff --git a/pioneer/packages/joy-media/src/stories/MusicAlbumTracks.stories.tsx b/pioneer/packages/joy-media/src/stories/MusicAlbumTracks.stories.tsx
index f45d00a1c6..f50cdbd617 100644
--- a/pioneer/packages/joy-media/src/stories/MusicAlbumTracks.stories.tsx
+++ b/pioneer/packages/joy-media/src/stories/MusicAlbumTracks.stories.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import '../common/index.css';
+import '../common/index.scss';
 
 import { EditForm } from '../music/EditMusicAlbum';
 import { MyMusicTracks } from '../music/MyMusicTracks';
@@ -7,7 +7,7 @@ import { MusicAlbumSamples } from './data/MusicAlbumSamples';
 import { albumTracks, AllMusicTrackSamples } from './data/MusicTrackSamples';
 import { withMockTransport } from './withMockTransport';
 import { EditMusicAlbumView } from '../music/EditMusicAlbum.view';
-import EntityId from '@joystream/types/versioned-store/EntityId';
+import { createMock } from '@joystream/types';
 
 export default {
   title: 'Media | My music tracks',
@@ -19,7 +19,7 @@ export const DefaultState = () =>
 
 export const MockEditAlbumView = () =>
   <EditMusicAlbumView
-    id={new EntityId(1)}
+    id={createMock('EntityId', 1)}
     tracks={albumTracks}
   />;
 
diff --git a/pioneer/packages/joy-media/src/stories/MusicChannel.stories.tsx b/pioneer/packages/joy-media/src/stories/MusicChannel.stories.tsx
index eff4f344e7..d7004e7879 100644
--- a/pioneer/packages/joy-media/src/stories/MusicChannel.stories.tsx
+++ b/pioneer/packages/joy-media/src/stories/MusicChannel.stories.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import '../common/index.css';
+import '../common/index.scss';
 
 import { MockMusicChannel } from './data/ChannelSamples';
 import { ViewMusicChannel } from '../channels/ViewMusicChannel';
diff --git a/pioneer/packages/joy-media/src/stories/MyChannels.stories.tsx b/pioneer/packages/joy-media/src/stories/MyChannels.stories.tsx
index d3ab3fe063..f5a15228bb 100644
--- a/pioneer/packages/joy-media/src/stories/MyChannels.stories.tsx
+++ b/pioneer/packages/joy-media/src/stories/MyChannels.stories.tsx
@@ -1,14 +1,13 @@
 import React from 'react';
-import '../common/index.css';
+import '../common/index.scss';
 
-import { GenericAccountId } from '@polkadot/types';
 import { ChannelsByOwner } from '../channels/ChannelsByOwner';
 import { AllMockChannels } from './data/ChannelSamples';
 import { withMockTransport } from './withMockTransport';
 import EditForm from '../channels/EditChannel';
 import { EditChannelView } from '../channels/EditChannel.view';
-import { ChannelId } from '@joystream/types/content-working-group';
 import { AccountIdSamples } from './data/AccountIdSamples';
+import { createMock } from '@joystream/types';
 
 export default {
   title: 'Media | My channels',
@@ -16,7 +15,7 @@ export default {
 };
 
 // TODO pass to mocked MyMembershipContext provider via Stories decorators:
-const accountId = new GenericAccountId(AccountIdSamples.Alice);
+const accountId = createMock('AccountId', AccountIdSamples.Alice);
 
 export const DefaultState = () =>
   <ChannelsByOwner accountId={accountId} />;
@@ -31,4 +30,4 @@ export const DefaultEditForm = () =>
   <EditForm />;
 
 export const MockEditFormView = () =>
-  <EditChannelView id={new ChannelId(1)} />;
+  <EditChannelView id={createMock('ChannelId', 1)} />;
diff --git a/pioneer/packages/joy-media/src/stories/MyMusicAlbums.stories.tsx b/pioneer/packages/joy-media/src/stories/MyMusicAlbums.stories.tsx
index 90e711f10e..1c8dee2751 100644
--- a/pioneer/packages/joy-media/src/stories/MyMusicAlbums.stories.tsx
+++ b/pioneer/packages/joy-media/src/stories/MyMusicAlbums.stories.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import '../common/index.css';
+import '../common/index.scss';
 
 import { MyMusicAlbums } from '../music/MyMusicAlbums';
 import { MusicAlbumSamples } from './data/MusicAlbumSamples';
diff --git a/pioneer/packages/joy-media/src/stories/Playback.stories.tsx b/pioneer/packages/joy-media/src/stories/Playback.stories.tsx
index d6f2efe5bd..75c4353da2 100644
--- a/pioneer/packages/joy-media/src/stories/Playback.stories.tsx
+++ b/pioneer/packages/joy-media/src/stories/Playback.stories.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import '../common/index.css';
+import '../common/index.scss';
 
 import { PlayContent } from '../explore/PlayContent';
 import { PlayVideo } from '../video/PlayVideo';
@@ -8,7 +8,7 @@ import { Album1TrackSamples } from './data/MusicTrackSamples';
 import { MockMusicChannel, MockVideoChannel } from './data/ChannelSamples';
 import { withMockTransport } from './withMockTransport';
 import { Video } from '../mocks';
-import { EntityId } from '@joystream/types/versioned-store';
+import { createMock } from '@joystream/types';
 
 export default {
   title: 'Media | Playback',
@@ -17,7 +17,7 @@ export default {
 
 export const PlayVideoStory = () =>
   <PlayVideo
-    id={new EntityId(Video.id)}
+    id={createMock('EntityId', Video.id)}
     video={Video}
     channel={MockVideoChannel}
   />;
diff --git a/pioneer/packages/joy-media/src/stories/UploadAudio.stories.tsx b/pioneer/packages/joy-media/src/stories/UploadAudio.stories.tsx
index a770d2d711..736773758a 100644
--- a/pioneer/packages/joy-media/src/stories/UploadAudio.stories.tsx
+++ b/pioneer/packages/joy-media/src/stories/UploadAudio.stories.tsx
@@ -3,16 +3,16 @@ import { EditForm } from '../upload/UploadAudio';
 import '../index.css';
 
 import { ContentId } from '@joystream/types/media';
-import EntityId from '@joystream/types/versioned-store/EntityId';
 import { UploadAudioView } from '../upload/UploadAudio.view';
 import { withMockTransport } from './withMockTransport';
+import { mockRegistry, createMock } from '@joystream/types';
 
 export default {
   title: 'Media | Upload audio',
   decorators: [withMockTransport]
 };
 
-const contentId = ContentId.generate();
+const contentId = ContentId.generate(mockRegistry);
 
 export const DefaultState = () =>
   <EditForm
@@ -22,5 +22,5 @@ export const DefaultState = () =>
 export const MockEditFormView = () =>
   <UploadAudioView
     contentId={contentId}
-    id={new EntityId(1)}
+    id={createMock('EntityId', 1)}
   />;
diff --git a/pioneer/packages/joy-media/src/stories/UploadVideo.stories.tsx b/pioneer/packages/joy-media/src/stories/UploadVideo.stories.tsx
index 5c2913b575..e15e2be3d3 100644
--- a/pioneer/packages/joy-media/src/stories/UploadVideo.stories.tsx
+++ b/pioneer/packages/joy-media/src/stories/UploadVideo.stories.tsx
@@ -5,14 +5,14 @@ import '../index.css';
 import { ContentId } from '@joystream/types/media';
 import { withMockTransport } from './withMockTransport';
 import EditVideoView from '../upload/EditVideo.view';
-import EntityId from '@joystream/types/versioned-store/EntityId';
+import { createMock, mockRegistry } from '@joystream/types';
 
 export default {
   title: 'Media | Upload video',
   decorators: [withMockTransport]
 };
 
-const contentId = ContentId.generate();
+const contentId = ContentId.generate(mockRegistry);
 
 export const DefaultState = () =>
   <EditForm
@@ -22,5 +22,5 @@ export const DefaultState = () =>
 export const MockEditFormView = () =>
   <EditVideoView
     contentId={contentId}
-    id={new EntityId(1)}
+    id={createMock('EntityId', 1)}
   />;
diff --git a/pioneer/packages/joy-media/src/stories/data/AccountIdSamples.ts b/pioneer/packages/joy-media/src/stories/data/AccountIdSamples.ts
index d10e2a4fdd..03d78c4062 100644
--- a/pioneer/packages/joy-media/src/stories/data/AccountIdSamples.ts
+++ b/pioneer/packages/joy-media/src/stories/data/AccountIdSamples.ts
@@ -1,7 +1,7 @@
-import { GenericAccountId } from '@polkadot/types';
+import { createMock } from '@joystream/types';
 
 export const AccountIdSamples = {
-  Alice: new GenericAccountId('5GNJqTPyNqANBkUVMN1LPPrxXnFouWXoe2wNSmmEoLctxiZY'),
-  Bob: new GenericAccountId('5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty'),
-  Charlie: new GenericAccountId('5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y')
+  Alice: createMock('AccountId', '5GNJqTPyNqANBkUVMN1LPPrxXnFouWXoe2wNSmmEoLctxiZY'),
+  Bob: createMock('AccountId', '5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty'),
+  Charlie: createMock('AccountId', '5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y')
 };
diff --git a/pioneer/packages/joy-media/src/stories/data/ChannelSamples.ts b/pioneer/packages/joy-media/src/stories/data/ChannelSamples.ts
index 8afa50661d..b2373eeaa8 100644
--- a/pioneer/packages/joy-media/src/stories/data/ChannelSamples.ts
+++ b/pioneer/packages/joy-media/src/stories/data/ChannelSamples.ts
@@ -1,9 +1,7 @@
 import BN from 'bn.js';
 import { ChannelEntity } from '@polkadot/joy-media/entities/ChannelEntity';
-import { u32 } from '@polkadot/types';
 import { AccountIdSamples } from './AccountIdSamples';
-import { MemberId } from '@joystream/types/members';
-import { PrincipalId } from '@joystream/types/content-working-group';
+import { createMock } from '@joystream/types';
 
 let id = 0;
 const nextId = () => ++id;
@@ -22,10 +20,10 @@ export const MockMusicChannel: ChannelEntity =
 
   publicationStatus: 'Unlisted',
   curationStatus: 'Censored',
-  owner: new MemberId(1),
+  owner: createMock('MemberId', 1),
   roleAccount: AccountIdSamples.Alice,
-  principalId: new PrincipalId(1),
-  created: new u32(123456),
+  principalId: createMock('PrincipalId', 1),
+  created: createMock('u32', 123456),
 
   rewardEarned: new BN('4587'),
   contentItemsCount: 57
@@ -45,10 +43,10 @@ export const MockVideoChannel: ChannelEntity =
 
   publicationStatus: 'Public',
   curationStatus: 'Normal',
-  owner: new MemberId(1),
+  owner: createMock('MemberId', 1),
   roleAccount: AccountIdSamples.Alice,
-  principalId: new PrincipalId(1),
-  created: new u32(123456),
+  principalId: createMock('PrincipalId', 1),
+  created: createMock('u32', 123456),
 
   rewardEarned: new BN('1820021'),
   contentItemsCount: 1529
diff --git a/pioneer/packages/joy-media/src/transport.mock.ts b/pioneer/packages/joy-media/src/transport.mock.ts
index a79f776ea5..febefef6e9 100644
--- a/pioneer/packages/joy-media/src/transport.mock.ts
+++ b/pioneer/packages/joy-media/src/transport.mock.ts
@@ -17,6 +17,7 @@ import { PublicationStatusType } from './schemas/general/PublicationStatus';
 import { VideoCategoryType } from './schemas/video/VideoCategory';
 import { ChannelEntity } from './entities/ChannelEntity';
 import { AllMockChannels } from './stories/data/ChannelSamples';
+import { mockPromise } from '@polkadot/joy-utils/transport/mock/base';
 
 export class MockTransport extends MediaTransport {
   constructor () {
@@ -29,7 +30,7 @@ export class MockTransport extends MediaTransport {
   }
 
   allChannels (): Promise<ChannelEntity[]> {
-    return this.promise(AllMockChannels);
+    return mockPromise(AllMockChannels);
   }
 
   channelValidationConstraints (): Promise<ChannelValidationConstraints> {
@@ -45,54 +46,54 @@ export class MockTransport extends MediaTransport {
   }
 
   allVideos (): Promise<VideoType[]> {
-    return this.promise(mocks.AllVideos);
+    return mockPromise(mocks.AllVideos);
   }
 
   allMusicTracks (): Promise<MusicTrackType[]> {
-    return this.promise(mocks.AllMusicTracks);
+    return mockPromise(mocks.AllMusicTracks);
   }
 
   allMusicAlbums (): Promise<MusicAlbumType[]> {
-    return this.promise(mocks.AllMusicAlbums);
+    return mockPromise(mocks.AllMusicAlbums);
   }
 
   featuredContent (): Promise<FeaturedContentType | undefined> {
-    return this.promise(mocks.FeaturedContent);
+    return mockPromise(mocks.FeaturedContent);
   }
 
   allContentLicenses (): Promise<ContentLicenseType[]> {
-    return this.promise(mocks.AllContentLicenses);
+    return mockPromise(mocks.AllContentLicenses);
   }
 
   allCurationStatuses (): Promise<CurationStatusType[]> {
-    return this.promise(mocks.AllCurationStatuses);
+    return mockPromise(mocks.AllCurationStatuses);
   }
 
   allLanguages (): Promise<LanguageType[]> {
-    return this.promise(mocks.AllLanguages);
+    return mockPromise(mocks.AllLanguages);
   }
 
   allMediaObjects (): Promise<MediaObjectType[]> {
-    return this.promise(mocks.AllMediaObjects);
+    return mockPromise(mocks.AllMediaObjects);
   }
 
   allMusicGenres (): Promise<MusicGenreType[]> {
-    return this.promise(mocks.AllMusicGenres);
+    return mockPromise(mocks.AllMusicGenres);
   }
 
   allMusicMoods (): Promise<MusicMoodType[]> {
-    return this.promise(mocks.AllMusicMoods);
+    return mockPromise(mocks.AllMusicMoods);
   }
 
   allMusicThemes (): Promise<MusicThemeType[]> {
-    return this.promise(mocks.AllMusicThemes);
+    return mockPromise(mocks.AllMusicThemes);
   }
 
   allPublicationStatuses (): Promise<PublicationStatusType[]> {
-    return this.promise(mocks.AllPublicationStatuses);
+    return mockPromise(mocks.AllPublicationStatuses);
   }
 
   allVideoCategories (): Promise<VideoCategoryType[]> {
-    return this.promise(mocks.AllVideoCategories);
+    return mockPromise(mocks.AllVideoCategories);
   }
 }
diff --git a/pioneer/packages/joy-media/src/transport.substrate.ts b/pioneer/packages/joy-media/src/transport.substrate.ts
index 64396c35f6..170a0abaff 100644
--- a/pioneer/packages/joy-media/src/transport.substrate.ts
+++ b/pioneer/packages/joy-media/src/transport.substrate.ts
@@ -19,13 +19,11 @@ import { ChannelEntity } from './entities/ChannelEntity';
 import { ChannelId, Channel } from '@joystream/types/content-working-group';
 import { ApiPromise } from '@polkadot/api/index';
 import { ApiProps } from '@polkadot/react-api/types';
-import { Vec } from '@polkadot/types';
-import { LinkageResult } from '@polkadot/types/codec/Linkage';
 import { ChannelCodec } from './schemas/channel/Channel';
 import { FeaturedContentType } from './schemas/general/FeaturedContent';
-import { AnyChannelId, asChannelId, AnyClassId, AnyEntityId } from './common/TypeHelpers';
-import { SimpleCache } from '@polkadot/joy-utils/SimpleCache';
-import { ValidationConstraint } from '@polkadot/joy-utils/ValidationConstraint';
+import { AnyChannelId, AnyClassId, AnyEntityId, asChannelId } from './common/TypeHelpers';
+import { SimpleCache } from '@polkadot/joy-utils/transport/SimpleCache';
+import { ValidationConstraint } from '@polkadot/joy-utils/types/ValidationConstraint';
 
 const FIRST_CHANNEL_ID = 1;
 const FIRST_CLASS_ID = 1;
@@ -130,17 +128,16 @@ export class SubstrateTransport extends MediaTransport {
 
     const allIds: ChannelId[] = [];
     for (let id = FIRST_CHANNEL_ID; id < nextId; id++) {
-      allIds.push(new ChannelId(id));
+      allIds.push(this.api.createType('ChannelId', id));
     }
 
     return allIds;
   }
 
   async loadChannelsByIds (ids: AnyChannelId[]): Promise<ChannelEntity[]> {
-    const channelTuples = await this.cwgQuery().channelById.multi<LinkageResult>(ids);
+    const channels = await this.cwgQuery().channelById.multi<Channel>(ids);
 
-    return channelTuples.map((tuple, i) => {
-      const channel = tuple[0] as Channel;
+    return channels.map((channel, i) => {
       const id = asChannelId(ids[i]);
       const plain = ChannelCodec.fromSubstrate(id, channel);
 
@@ -200,14 +197,14 @@ export class SubstrateTransport extends MediaTransport {
 
     const allIds: ClassId[] = [];
     for (let id = FIRST_CLASS_ID; id < nextId; id++) {
-      allIds.push(new ClassId(id));
+      allIds.push(this.api.createType('ClassId', id));
     }
 
     return allIds;
   }
 
   async loadClassesByIds (ids: AnyClassId[]): Promise<Class[]> {
-    return await this.vsQuery().classById.multi<Vec<Class>>(ids) as unknown as Class[];
+    return await this.vsQuery().classById.multi<Class>(ids);
   }
 
   async allClasses (): Promise<Class[]> {
@@ -246,7 +243,7 @@ export class SubstrateTransport extends MediaTransport {
 
     const allIds: EntityId[] = [];
     for (let id = FIRST_ENTITY_ID; id < nextId; id++) {
-      allIds.push(new EntityId(id));
+      allIds.push(this.api.createType('EntityId', id));
     }
 
     return allIds;
@@ -255,7 +252,7 @@ export class SubstrateTransport extends MediaTransport {
   private async loadEntitiesByIds (ids: AnyEntityId[]): Promise<Entity[]> {
     if (!ids || ids.length === 0) return [];
 
-    return await this.vsQuery().entityById.multi<Vec<Entity>>(ids) as unknown as Entity[];
+    return await this.vsQuery().entityById.multi<Entity>(ids);
   }
 
   // TODO try to cache this func
diff --git a/pioneer/packages/joy-media/src/transport.ts b/pioneer/packages/joy-media/src/transport.ts
index 788a4c7562..2172e4f532 100644
--- a/pioneer/packages/joy-media/src/transport.ts
+++ b/pioneer/packages/joy-media/src/transport.ts
@@ -1,4 +1,3 @@
-import { Transport } from '@polkadot/joy-utils/index';
 import { AccountId } from '@polkadot/types/interfaces';
 import { EntityId, Class, ClassName, unifyClassName, ClassIdByNameMap } from '@joystream/types/versioned-store';
 import { MusicTrackType, MusicTrackCodec } from './schemas/music/MusicTrack';
@@ -18,7 +17,8 @@ import { MediaDropdownOptions } from './common/MediaDropdownOptions';
 import { ChannelEntity } from './entities/ChannelEntity';
 import { ChannelId } from '@joystream/types/content-working-group';
 import { isVideoChannel, isPublicChannel } from './channels/ChannelHelpers';
-import { ValidationConstraint } from '@polkadot/joy-utils/ValidationConstraint';
+import { ValidationConstraint } from '@polkadot/joy-utils/types/ValidationConstraint';
+import { createMock } from '@joystream/types';
 
 export interface ChannelValidationConstraints {
   handle: ValidationConstraint;
@@ -60,7 +60,7 @@ function insensitiveEq (text1: string, text2: string): boolean {
   return prepare(text1) === prepare(text2);
 }
 
-export abstract class MediaTransport extends Transport {
+export abstract class MediaTransport {
   protected cachedClassIdByNameMap: ClassIdByNameMap | undefined
 
   protected sessionId = 0
@@ -128,14 +128,14 @@ export abstract class MediaTransport extends Transport {
   async topVideo (): Promise<VideoType | undefined> {
     const content = await this.featuredContent();
     const topVideoId = content?.topVideo as unknown as number | undefined;
-    return !topVideoId ? undefined : await this.videoById(new EntityId(topVideoId));
+    return !topVideoId ? undefined : await this.videoById(createMock('EntityId', topVideoId));
   }
 
   async featuredVideos (): Promise<VideoType[]> {
     const content = await this.featuredContent();
     const videoIds = (content?.featuredVideos || []) as unknown as number[];
     const videos = await Promise.all(videoIds.map((id) =>
-      this.videoById(new EntityId(id))));
+      this.videoById(createMock('EntityId', id))));
     return videos.filter(x => x !== undefined) as VideoType[];
   }
 
@@ -143,7 +143,7 @@ export abstract class MediaTransport extends Transport {
     const content = await this.featuredContent();
     const albumIds = (content?.featuredAlbums || []) as unknown as EntityId[];
     const albums = await Promise.all(albumIds.map((id) =>
-      this.musicAlbumById(new EntityId(id))));
+      this.musicAlbumById(createMock('EntityId', id))));
     return albums.filter(x => x !== undefined) as MusicAlbumType[];
   }
 
diff --git a/pioneer/packages/joy-media/src/upload/EditVideo.view.tsx b/pioneer/packages/joy-media/src/upload/EditVideo.view.tsx
index 4bcba0a122..defe8c19de 100644
--- a/pioneer/packages/joy-media/src/upload/EditVideo.view.tsx
+++ b/pioneer/packages/joy-media/src/upload/EditVideo.view.tsx
@@ -2,9 +2,8 @@ import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { MediaView } from '../MediaView';
 import { OuterProps, EditForm } from './UploadVideo';
-import EntityId from '@joystream/types/versioned-store/EntityId';
-import { ChannelId } from '@joystream/types/content-working-group';
-import { JoyError } from '@polkadot/joy-utils/JoyStatus';
+import { JoyError } from '@polkadot/joy-utils/react/components';
+import { useApi } from '@polkadot/react-hooks';
 
 type Props = OuterProps;
 
@@ -27,10 +26,11 @@ type WithRouterProps = Props & RouteComponentProps<any>
 
 export const UploadVideoWithRouter = (props: WithRouterProps) => {
   const { match: { params: { channelId } } } = props;
+  const { api } = useApi();
 
   if (channelId) {
     try {
-      return <EditVideoView {...props} channelId={new ChannelId(channelId)} />;
+      return <EditVideoView {...props} channelId={api.createType('ChannelId', channelId)} />;
     } catch (err) {
       console.log('UploadVideoWithRouter failed:', err);
     }
@@ -41,10 +41,11 @@ export const UploadVideoWithRouter = (props: WithRouterProps) => {
 
 export const EditVideoWithRouter = (props: WithRouterProps) => {
   const { match: { params: { id } } } = props;
+  const { api } = useApi();
 
   if (id) {
     try {
-      return <EditVideoView {...props} id={new EntityId(id)} />;
+      return <EditVideoView {...props} id={api.createType('EntityId', id)} />;
     } catch (err) {
       console.log('EditVideoWithRouter failed:', err);
     }
diff --git a/pioneer/packages/joy-media/src/upload/UploadAudio.tsx b/pioneer/packages/joy-media/src/upload/UploadAudio.tsx
index 331ad77f5f..ea0d9a8b5f 100644
--- a/pioneer/packages/joy-media/src/upload/UploadAudio.tsx
+++ b/pioneer/packages/joy-media/src/upload/UploadAudio.tsx
@@ -3,9 +3,9 @@ import { Button, Tab } from 'semantic-ui-react';
 import { Form, withFormik } from 'formik';
 import { History } from 'history';
 
-import TxButton from '@polkadot/joy-utils/TxButton';
+import { TxButton } from '@polkadot/joy-utils/react/components';
 import { ContentId } from '@joystream/types/media';
-import { onImageError } from '@polkadot/joy-utils/images';
+import { onImageError } from '../common/images';
 import { MusicTrackValidationSchema, MusicTrackType, MusicTrackClass as Fields, MusicTrackFormValues, MusicTrackToFormValues } from '../schemas/music/MusicTrack';
 import { withMediaForm, MediaFormProps, datePlaceholder } from '../common/MediaForms';
 import EntityId from '@joystream/types/versioned-store/EntityId';
@@ -113,7 +113,6 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
   const renderMainButton = () =>
     <TxButton
       type='submit'
-      size='large'
       isDisabled={!dirty || isSubmitting}
       label={isNew
         ? 'Publish'
diff --git a/pioneer/packages/joy-media/src/upload/UploadVideo.tsx b/pioneer/packages/joy-media/src/upload/UploadVideo.tsx
index ad0bfceb58..cc6c84ba50 100644
--- a/pioneer/packages/joy-media/src/upload/UploadVideo.tsx
+++ b/pioneer/packages/joy-media/src/upload/UploadVideo.tsx
@@ -4,9 +4,10 @@ import { Form, withFormik } from 'formik';
 import { History } from 'history';
 import moment from 'moment';
 
-import TxButton, { OnTxButtonClick } from '@polkadot/joy-utils/TxButton';
+import TxButton, { OnTxButtonClick } from '@polkadot/joy-utils/react/components/TxButton';
 import { ContentId } from '@joystream/types/media';
-import { onImageError } from '@polkadot/joy-utils/images';
+import { onImageError } from '../common/images';
+import { nonEmptyStr, filterSubstrateEventsAndExtractData } from '@polkadot/joy-utils/functions/misc';
 import { VideoValidationSchema, VideoType, VideoClass as Fields, VideoFormValues, VideoToFormValues, VideoCodec, VideoPropId } from '../schemas/video/Video';
 import { MediaFormProps, withMediaForm, datePlaceholder } from '../common/MediaForms';
 import EntityId from '@joystream/types/versioned-store/EntityId';
@@ -14,23 +15,20 @@ import { MediaDropdownOptions } from '../common/MediaDropdownOptions';
 import { FormTabs } from '../common/FormTabs';
 import { ChannelId } from '@joystream/types/content-working-group';
 import { ChannelEntity } from '../entities/ChannelEntity';
-import { Credential } from '@joystream/types/common';
 import { Class, VecClassPropertyValue } from '@joystream/types/versioned-store';
 import { TxCallback } from '@polkadot/react-components/Status/types';
 import { SubmittableResult } from '@polkadot/api';
-import { nonEmptyStr, filterSubstrateEventsAndExtractData } from '@polkadot/joy-utils/index';
-import { u16, u32, bool, Option, Vec } from '@polkadot/types';
 import { isInternalProp } from '@joystream/types/versioned-store/EntityCodec';
 import { MediaObjectCodec } from '../schemas/general/MediaObject';
-import { Operation } from '@joystream/types/versioned-store/permissions/batching';
 import { OperationType } from '@joystream/types/versioned-store/permissions/batching/operation-types';
 import { ParametrizedEntity } from '@joystream/types/versioned-store/permissions/batching/parametrized-entity';
 import ParametrizedClassPropertyValue from '@joystream/types/versioned-store/permissions/batching/ParametrizedClassPropertyValue';
 import { ParametrizedPropertyValue } from '@joystream/types/versioned-store/permissions/batching/parametrized-property-value';
 import { ParameterizedClassPropertyValues } from '@joystream/types/versioned-store/permissions/batching/operations';
-import { useMyMembership } from '@polkadot/joy-utils/MyMembershipContext';
+import { useMyMembership } from '@polkadot/joy-utils/react/hooks';
 import { isAccountAChannelOwner } from '../channels/ChannelHelpers';
-import { JoyError } from '@polkadot/joy-utils/JoyStatus';
+import { JoyError } from '@polkadot/joy-utils/react/components';
+import { useApi } from '@polkadot/react-hooks';
 
 /** Example: "2019-01-23" -> 1548201600 */
 function humanDateToUnixTs (humanFriendlyDate: string): number | undefined {
@@ -87,6 +85,7 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
   } = props;
 
   const { myAccountId } = useMyMembership();
+  const { api } = useApi();
 
   const { thumbnail } = values;
 
@@ -103,9 +102,9 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
   }
 
   // Next consts are used in tx params:
-  const with_credential = new Option<Credential>(Credential, new Credential(2));
-  const as_entity_maintainer = new bool(false);
-  const schema_id = new u16(0);
+  const with_credential = api.createType('Option<Credential>', 2);
+  const as_entity_maintainer = api.createType('bool', false);
+  const schema_id = api.createType('u16', 0);
 
   const entityCodec = new VideoCodec(entityClass);
   const mediaObjectCodec = new MediaObjectCodec(mediaObjectClass);
@@ -155,15 +154,15 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
     return res;
   };
 
-  const indexOfCreateMediaObjectOperation = new u32(0);
+  const indexOfCreateMediaObjectOperation = api.createType('u32', 0);
 
-  const indexOfCreateVideoEntityOperation = new u32(2);
+  const indexOfCreateVideoEntityOperation = api.createType('u32', 2);
 
   const referToIdOfCreatedMediaObjectEntity = () =>
-    ParametrizedEntity.InternalEntityJustAdded(indexOfCreateMediaObjectOperation);
+    ParametrizedEntity.InternalEntityJustAdded(api.registry, indexOfCreateMediaObjectOperation);
 
   const referToIdOfCreatedVideoEntity = () =>
-    ParametrizedEntity.InternalEntityJustAdded(indexOfCreateVideoEntityOperation);
+    ParametrizedEntity.InternalEntityJustAdded(api.registry, indexOfCreateVideoEntityOperation);
 
   const newlyCreatedMediaObjectProp = () => {
     const inClassIndexOfMediaObject = entityCodec.inClassIndexOfProp(Fields.object.id);
@@ -171,9 +170,10 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
       throw new Error('Cannot not find an in-class index of "object" prop on Video entity.');
     }
 
-    return new ParametrizedClassPropertyValue({
-      in_class_index: new u16(inClassIndexOfMediaObject),
+    return api.createType('ParametrizedClassPropertyValue', {
+      in_class_index: inClassIndexOfMediaObject,
       value: ParametrizedPropertyValue.InternalEntityJustAdded(
+        api.registry,
         indexOfCreateMediaObjectOperation
       )
     });
@@ -185,9 +185,9 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
   ): ParameterizedClassPropertyValues => {
     const parametrizedProps = props.map(p => {
       const { in_class_index, value } = p;
-      return new ParametrizedClassPropertyValue({
+      return api.createType('ParametrizedClassPropertyValue', {
         in_class_index,
-        value: new ParametrizedPropertyValue({ PropertyValue: value })
+        value: api.createType('ParametrizedPropertyValue', { PropertyValue: value })
       });
     });
 
@@ -195,11 +195,11 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
       extra.forEach(x => parametrizedProps.push(x));
     }
 
-    return new ParameterizedClassPropertyValues(parametrizedProps);
+    return api.createType('Vec<ParametrizedClassPropertyValue>', parametrizedProps);
   };
 
   const newEntityOperation = (operation_type: OperationType) => {
-    return new Operation({
+    return api.createType('Operation', {
       with_credential,
       as_entity_maintainer,
       operation_type
@@ -209,6 +209,7 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
   const prepareTxParamsForCreateMediaObject = () => {
     return newEntityOperation(
       OperationType.CreateEntity(
+        api.registry,
         mediaObjectClass.id
       )
     );
@@ -224,6 +225,7 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
 
     return newEntityOperation(
       OperationType.AddSchemaSupportToEntity(
+        api.registry,
         referToIdOfCreatedMediaObjectEntity(),
         schema_id,
         propValues
@@ -234,6 +236,7 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
   const prepareTxParamsForCreateEntity = () => {
     return newEntityOperation(
       OperationType.CreateEntity(
+        api.registry,
         entityClass.id
       )
     );
@@ -249,6 +252,7 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
 
     return newEntityOperation(
       OperationType.AddSchemaSupportToEntity(
+        api.registry,
         referToIdOfCreatedVideoEntity(),
         schema_id,
         propValues
@@ -272,7 +276,7 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
     // Use for debug:
     // console.log('Batch entity operations:', ops)
 
-    return [new Vec(Operation, ops)];
+    return [api.createType('Vec<Operation>', ops)];
   };
 
   const buildUpdateEntityTxParams = () => {
@@ -376,7 +380,6 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
   const renderTransactionButton = () =>
     <TxButton
       type='submit'
-      size='large'
       isDisabled={!canSubmitTx()}
       label='Publish video'
       tx='versionedStorePermissions.transaction'
@@ -389,7 +392,6 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
   const renderUpdateEntityButton = () =>
     <TxButton
       type='submit'
-      size='large'
       isDisabled={!canSubmitTx()}
       label='Update video'
       tx='versionedStorePermissions.updateEntityPropertyValues'
diff --git a/pioneer/packages/joy-media/src/video/PlayVideo.tsx b/pioneer/packages/joy-media/src/video/PlayVideo.tsx
index 757b2b6dd7..b1ef51dcc8 100644
--- a/pioneer/packages/joy-media/src/video/PlayVideo.tsx
+++ b/pioneer/packages/joy-media/src/video/PlayVideo.tsx
@@ -12,7 +12,8 @@ import { printExplicit, printReleaseDate, printLanguage } from '../entities/Enti
 import { MediaObjectType } from '../schemas/general/MediaObject';
 import { MediaPlayerWithResolver } from '../common/MediaPlayerWithResolver';
 import { ContentId } from '@joystream/types/media';
-import { JoyError } from '@polkadot/joy-utils/JoyStatus';
+import { JoyError } from '@polkadot/joy-utils/react/components';
+import { useApi } from '@polkadot/react-hooks';
 
 export type PlayVideoProps = {
   channel?: ChannelEntity;
@@ -36,6 +37,7 @@ function VertialListOfVideoPreviews (props: ListOfVideoPreviewProps) {
 
 export function PlayVideo (props: PlayVideoProps) {
   const { channel, mediaObject, video, moreChannelVideos = [], featuredVideos = [] } = props;
+  const { api } = useApi();
 
   if (!mediaObject || !video) {
     return <JoyError title={'Video was not found'} />;
@@ -80,7 +82,7 @@ export function PlayVideo (props: PlayVideoProps) {
   // TODO show video only to its owner, if the video is not public.
   // see isPublicVideo() function.
 
-  const contentId = ContentId.decode(mediaObject.value);
+  const contentId = ContentId.decode(api.registry, mediaObject.value);
 
   // console.log('PlayVideo: props', props)
 
diff --git a/pioneer/packages/joy-media/src/video/PlayVideo.view.tsx b/pioneer/packages/joy-media/src/video/PlayVideo.view.tsx
index 501abcd8ae..0f352dd25b 100644
--- a/pioneer/packages/joy-media/src/video/PlayVideo.view.tsx
+++ b/pioneer/packages/joy-media/src/video/PlayVideo.view.tsx
@@ -2,9 +2,8 @@ import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { MediaView } from '../MediaView';
 import { PlayVideoProps, PlayVideo } from './PlayVideo';
-import { ChannelId } from '@joystream/types/content-working-group';
-import { EntityId } from '@joystream/types/versioned-store';
-import { JoyError } from '@polkadot/joy-utils/JoyStatus';
+import { JoyError } from '@polkadot/joy-utils/react/components';
+import { useApi } from '@polkadot/react-hooks';
 
 type Props = PlayVideoProps;
 
@@ -12,12 +11,12 @@ export const PlayVideoView = MediaView<Props>({
   component: PlayVideo,
   triggers: ['id'],
   resolveProps: async (props) => {
-    const { transport, id } = props;
+    const { transport, api, id } = props;
 
     const video = await transport.videoById(id);
     if (!video) return {};
 
-    const channelId = new ChannelId(video.channelId);
+    const channelId = api.createType('ChannelId', video.channelId);
     const channel = await transport.channelById(channelId);
     const moreChannelVideos = (await transport.videosByChannelId(channelId, 5, x => x.id !== video.id));
     const featuredVideos = await transport.featuredVideos();
@@ -29,10 +28,11 @@ export const PlayVideoView = MediaView<Props>({
 
 export const PlayVideoWithRouter = (props: Props & RouteComponentProps<any>) => {
   const { match: { params: { id } } } = props;
+  const { api } = useApi();
 
   if (id) {
     try {
-      return <PlayVideoView {...props} id={new EntityId(id)} />;
+      return <PlayVideoView {...props} id={api.createType('EntityId', id)} />;
     } catch (err) {
       console.log('PlayVideoWithRouter failed:', err);
     }
diff --git a/pioneer/packages/joy-media/src/video/VideoPreview.tsx b/pioneer/packages/joy-media/src/video/VideoPreview.tsx
index f07a559696..8c29ca8019 100644
--- a/pioneer/packages/joy-media/src/video/VideoPreview.tsx
+++ b/pioneer/packages/joy-media/src/video/VideoPreview.tsx
@@ -2,7 +2,7 @@ import React, { CSSProperties } from 'react';
 import { Link } from 'react-router-dom';
 import { BgImg } from '../common/BgImg';
 import { VideoType } from '../schemas/video/Video';
-import { useMyMembership } from '@polkadot/joy-utils/MyMembershipContext';
+import { useMyMembership } from '@polkadot/joy-utils/react/hooks';
 import { ChannelEntity } from '../entities/ChannelEntity';
 import { isAccountAChannelOwner } from '../channels/ChannelHelpers';
 import { ChannelAvatarAndName } from '../channels/ChannelAvatarAndName';
@@ -64,7 +64,7 @@ export function VideoPreview (props: VideoPreviewProps) {
         }
 
         {iAmOwner &&
-          <div>
+          <div style={{ marginTop: '0.5em' }}>
             <Link to={`/media/videos/${id}/edit`} className='ui button basic small'>
               <i className='icon pencil' />
               Edit
diff --git a/pioneer/packages/old-apps/react-components/src/InputFileAsync.tsx b/pioneer/packages/joy-utils/src/react/components/InputFileAsync.tsx
similarity index 92%
rename from pioneer/packages/old-apps/react-components/src/InputFileAsync.tsx
rename to pioneer/packages/joy-utils/src/react/components/InputFileAsync.tsx
index 4ab3437c10..cceb9a19a7 100644
--- a/pioneer/packages/old-apps/react-components/src/InputFileAsync.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/InputFileAsync.tsx
@@ -3,16 +3,16 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { WithTranslation } from 'react-i18next';
-import { BareProps } from './types';
+import { BareProps } from '@polkadot/react-components/types';
 
 import React, { useState, createRef } from 'react';
 import Dropzone, { DropzoneRef } from 'react-dropzone';
 import styled from 'styled-components';
 import { formatNumber } from '@polkadot/util';
 
-import { classes } from './util';
-import Labelled from './Labelled';
-import translate from './translate';
+import { classes } from '@polkadot/react-components/util';
+import Labelled from '@polkadot/react-components/Labelled';
+import translate from '@polkadot/react-components/translate';
 
 interface Props extends BareProps, WithTranslation {
   // Reference Example Usage: https://github.com/react-dropzone/react-dropzone/tree/master/examples/Accept
diff --git a/pioneer/packages/joy-utils-old/src/JoyStatus.tsx b/pioneer/packages/joy-utils/src/react/components/JoyStatus.tsx
similarity index 94%
rename from pioneer/packages/joy-utils-old/src/JoyStatus.tsx
rename to pioneer/packages/joy-utils/src/react/components/JoyStatus.tsx
index 1429f30449..e6457429fb 100644
--- a/pioneer/packages/joy-utils-old/src/JoyStatus.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/JoyStatus.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Message } from 'semantic-ui-react';
-import { nonEmptyStr } from '.';
+import { nonEmptyStr } from '../../functions/misc';
 
 type BaseProps = {
   title?: React.ReactNode;
diff --git a/pioneer/packages/joy-utils-old/src/Pluralize.tsx b/pioneer/packages/joy-utils/src/react/components/Pluralize.tsx
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/Pluralize.tsx
rename to pioneer/packages/joy-utils/src/react/components/Pluralize.tsx
diff --git a/pioneer/packages/joy-utils/src/react/components/index.tsx b/pioneer/packages/joy-utils/src/react/components/index.tsx
index abd71b9a2c..4343820508 100644
--- a/pioneer/packages/joy-utils/src/react/components/index.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/index.tsx
@@ -2,10 +2,13 @@ export { default as Section } from './Section';
 export { default as TxButton } from './TxButton';
 export { MutedSpan, MutedDiv } from './MutedText';
 export { FlexCenter } from './FlexCenter';
-export { default as PromiseComponent } from './PromiseComponent';
+export { default as PromiseComponent, Error, Loading } from './PromiseComponent';
 export { default as MemberByAccountPreview } from './MemberByAccountPreview';
 export { default as MemberProfilePreview } from './MemberProfilePreview';
 export { default as MembersDropdown } from './MembersDropdown';
 export { default as InputStake } from './InputStake';
 export { ApplicationsDetails, ApplicationsDetailsByIds } from './working-groups/ApplicationDetails';
 export { LeadInfo, LeadInfoFromId } from './working-groups/LeadInfo';
+export { JoyStatus, JoyError, JoyInfo, JoySuccess, JoyWarn } from './JoyStatus';
+export { Pluralize } from './Pluralize';
+export { default as InputFileAsync } from './InputFileAsync';
diff --git a/pioneer/packages/joy-utils/src/react/hocs/accounts.tsx b/pioneer/packages/joy-utils/src/react/hocs/accounts.tsx
index 96a4363e40..cc793004a7 100644
--- a/pioneer/packages/joy-utils/src/react/hocs/accounts.tsx
+++ b/pioneer/packages/joy-utils/src/react/hocs/accounts.tsx
@@ -7,11 +7,17 @@ import { withCalls, withMulti, withObservable, ApiContext } from '@polkadot/reac
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 
 import { MemberId, Membership } from '@joystream/types/members';
-import { LeadId } from '@joystream/types/content-working-group';
+import { LeadId, Lead } from '@joystream/types/content-working-group';
 
 import { queryMembershipToProp } from '@polkadot/joy-members/utils';
 import useMyAccount from '../hooks/useMyAccount';
 import { componentName } from '../helpers';
+import { queryToProp } from '@polkadot/joy-utils/functions/misc';
+import { entriesByIds } from '@polkadot/joy-utils/transport/base';
+import { CuratorId, Curator } from '@joystream/types/content-working-group';
+import { useApi } from '@polkadot/react-hooks';
+import usePromise from '../hooks/usePromise';
+import { Error } from '../components/PromiseComponent';
 
 export type MyAddressProps = {
   myAddress?: string;
@@ -27,10 +33,9 @@ export type MyAccountProps = MyAddressProps & {
   myMembership?: Membership | null;
 
   // Content Working Group
-  curatorEntries?: any; // entire linked_map: CuratorId => Curator
   isLeadSet?: Option<LeadId>;
   contentLeadId?: LeadId;
-  contentLeadEntry?: any; // linked_map value
+  contentLead?: Lead; // linked_map value
 
   curationActor?: any;
   allAccounts?: SubjectInfo;
@@ -103,6 +108,106 @@ function resolveMyProfile<P extends { myMembership?: Membership | null }> (Compo
   return ResultComponent;
 }
 
+/* Content Working Group */
+function resolveLead<P extends MyAccountProps> (Component: React.ComponentType<P>) {
+  const ResultComponent: React.FunctionComponent<P> = (props: P) => {
+    const { isLeadSet } = props;
+
+    const newProps = {
+      contentLeadId: isLeadSet?.unwrapOr(undefined)
+    };
+
+    return <Component {...props} {...newProps} />;
+  };
+  ResultComponent.displayName = `resolveLead(${componentName(Component)})`;
+  return ResultComponent;
+}
+
+const resolveLeadEntry = withCalls<MyAccountProps>(
+  queryToProp('query.contentWorkingGroup.leadById', { propName: 'contentLead', paramName: 'contentLeadId' })
+);
+
+const withContentWorkingGroupDetails = withCalls<MyAccountProps>(
+  queryToProp('query.contentWorkingGroup.currentLeadId', { propName: 'isLeadSet' })
+);
+
+const withContentWorkingGroup = <P extends MyAccountProps>(Component: React.ComponentType<P>) =>
+  withMulti(Component, withContentWorkingGroupDetails, resolveLead, resolveLeadEntry);
+
+
+function withCurationActor<P extends MyAccountProps> (Component: React.ComponentType<P>) {
+  const ResultComponent: React.FunctionComponent<P> = (props: P) => {
+    const {
+      myAccountId,
+      isLeadSet,
+      contentLead,
+      allAccounts
+    } = props;
+    const { isApiReady, api } = useApi();
+    const [ curatorEntries, curatorsError, curatorsLoading ] = usePromise<[CuratorId, Curator][]>(
+      () => isApiReady
+        ? entriesByIds<CuratorId, Curator>(api.query.contentWorkingGroup.curatorById)
+        : new Promise(resolve => resolve([])),
+      [],
+      [isApiReady]
+    );
+
+    if (curatorsError) {
+      return <Error error={curatorsError} />;
+    }
+
+    if (!isApiReady || curatorsLoading || !myAccountId || !isLeadSet || !allAccounts) {
+      return <Component {...props} />;
+    }
+
+    const lead = isLeadSet.isSome && contentLead?.stage.isOfType('Active') ? contentLead : null;
+
+    const curationActorByAccount = (accountId: AccountId | string) => {
+      if (lead && lead.role_account.toString() === accountId.toString()) {
+        return api.createType('CurationActor', { Lead: null });
+      }
+
+      const matchingCuratorEntry = curatorEntries.find(([id, curator]) =>
+        curator.is_active && accountId.toString() === curator.role_account.toString()
+      );
+
+      return matchingCuratorEntry
+        ? api.createType('CurationActor', {
+          Curator: matchingCuratorEntry[0]
+        })
+        : null;
+    };
+
+    // First priority - currently selected account
+    let actor = curationActorByAccount(myAccountId);
+    let actorKey: AccountId | null = myAccountId;
+    // Second priority - check other keys and find best role
+    // TODO: Prioritize current member?
+    // TODO: Perhaps just don't do that at all and force the user to select the correct key to avoid confision?
+    if (!actor) {
+      const allActorsWithKeys = Object.keys(allAccounts).map(accKey => ({
+        actor: curationActorByAccount(allAccounts[accKey].json.address),
+        key: api.createType('AccountId', allAccounts[accKey].json.address)
+      }));
+      let actorWithKey = allActorsWithKeys.find(({ actor }) => actor?.isOfType('Lead'));
+      if (!actorWithKey) {
+        actorWithKey = allActorsWithKeys.find(({ actor }) => actor?.isOfType('Curator'));
+      }
+      actor = actorWithKey?.actor || null;
+      actorKey = actorWithKey?.key || null;
+    }
+
+    if (actor && actorKey) {
+      return <Component {...props} curationActor={[actor, actorKey]} />;
+    } else {
+      // we don't have any key that can fulfill a curation action
+      return <Component {...props} />;
+    }
+  };
+  ResultComponent.displayName = `withCurationActor(${componentName(Component)})`;
+  return ResultComponent;
+}
+
 const withMyProfileCall = withCalls<MyAccountProps>(queryMembershipToProp('membershipById', {
   paramName: 'myMemberId',
   propName: 'myMembership'
@@ -118,7 +223,7 @@ export const withMyAccount = <P extends MyAccountProps>(Component: React.Compone
     withMyAddress,
     withMyMemberIds,
     withMyMembership,
-    withMyProfile
-    // withContentWorkingGroup,
-    // withCurationActor
+    withMyProfile,
+    withContentWorkingGroup,
+    withCurationActor
   );
diff --git a/pioneer/packages/joy-utils/src/react/hocs/guards.tsx b/pioneer/packages/joy-utils/src/react/hocs/guards.tsx
index 399052167f..d404fc680d 100644
--- a/pioneer/packages/joy-utils/src/react/hocs/guards.tsx
+++ b/pioneer/packages/joy-utils/src/react/hocs/guards.tsx
@@ -2,39 +2,10 @@ import React from 'react';
 import { Message } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
 
-import { AccountId } from '@polkadot/types/interfaces';
-import { Vec, Option } from '@polkadot/types';
 import { withMulti } from '@polkadot/react-api/index';
-import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
-
-import { MemberId, Membership } from '@joystream/types/members';
-import { LeadId } from '@joystream/types/content-working-group';
 import { useMyMembership } from '../hooks';
 import { componentName } from '../helpers';
-import { withMyAccount } from './accounts';
-
-export type MyAddressProps = {
-  myAddress?: string;
-};
-
-export type MyAccountProps = MyAddressProps & {
-  myAccountId?: AccountId;
-  myMemberId?: MemberId;
-  memberIdsByRootAccountId?: Vec<MemberId>;
-  memberIdsByControllerAccountId?: Vec<MemberId>;
-  myMemberIdChecked?: boolean;
-  iAmMember?: boolean;
-  myMembership?: Membership | null;
-
-  // Content Working Group
-  curatorEntries?: any; // entire linked_map: CuratorId => Curator
-  isLeadSet?: Option<LeadId>;
-  contentLeadId?: LeadId;
-  contentLeadEntry?: any; // linked_map value
-
-  curationActor?: any;
-  allAccounts?: SubjectInfo;
-};
+import { withMyAccount, MyAccountProps } from './accounts';
 
 export function MembershipRequired<P extends Record<string, unknown>> (Component: React.ComponentType<P>): React.ComponentType<P> {
   const ResultComponent: React.FunctionComponent<P> = (props: P) => {
diff --git a/pioneer/packages/joy-utils/src/react/hooks/proposals/useProposalSubscription.tsx b/pioneer/packages/joy-utils/src/react/hooks/proposals/useProposalSubscription.tsx
index 3a7b32c5df..8be148a3ae 100644
--- a/pioneer/packages/joy-utils/src/react/hooks/proposals/useProposalSubscription.tsx
+++ b/pioneer/packages/joy-utils/src/react/hooks/proposals/useProposalSubscription.tsx
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import { useTransport } from '../';
+import useTransport from '../useTransport';
 import { ProposalId } from '@joystream/types/proposals';
 import { ParsedProposal } from '@polkadot/joy-utils/types/proposals';
 import { normalizeError } from '@polkadot/joy-utils/functions/misc';
diff --git a/pioneer/packages/joy-utils-old/src/SimpleCache.ts b/pioneer/packages/joy-utils/src/transport/SimpleCache.ts
similarity index 94%
rename from pioneer/packages/joy-utils-old/src/SimpleCache.ts
rename to pioneer/packages/joy-utils/src/transport/SimpleCache.ts
index 5abf3fec9c..7f724c1b03 100644
--- a/pioneer/packages/joy-utils-old/src/SimpleCache.ts
+++ b/pioneer/packages/joy-utils/src/transport/SimpleCache.ts
@@ -1,5 +1,8 @@
 import BN from 'bn.js';
-import { IdLike, HasId } from './IdLike';
+
+export type IdLike = { toString: () => string } | number
+export type HasId = { id: IdLike }
+export type MayHaveId = { id?: IdLike }
 
 type LoadObjectsByIdsFn<Id extends IdLike, Obj extends HasId> =
   (ids: Id[]) => Promise<Obj[]>
diff --git a/pioneer/packages/joy-utils/src/transport/base.ts b/pioneer/packages/joy-utils/src/transport/base.ts
index 90384bf27f..65cb125126 100644
--- a/pioneer/packages/joy-utils/src/transport/base.ts
+++ b/pioneer/packages/joy-utils/src/transport/base.ts
@@ -4,7 +4,21 @@ import { Codec, CodecArg } from '@polkadot/types/types';
 import { QueryableStorageEntry } from '@polkadot/api/types/storage';
 import { APIQueryCache } from './APIQueryCache';
 
-export default abstract class BaseTransport {
+export async function entriesByIds<IDType extends UInt, ValueType extends Codec> (
+  apiMethod: QueryableStorageEntry<'promise'>,
+  firstKey?: CodecArg // First key in case of double maps
+): Promise<[IDType, ValueType][]> {
+  const entries: [IDType, ValueType][] = (await apiMethod.entries<ValueType>(firstKey))
+    .map(([storageKey, value]) => ([
+      // If double-map (first key is provided), we map entries by second key
+      storageKey.args[firstKey !== undefined ? 1 : 0] as IDType,
+      value
+    ]));
+
+  return entries.sort((a, b) => a[0].toNumber() - b[0].toNumber());
+}
+
+export default class BaseTransport {
   protected api: ApiPromise;
   protected cacheApi: APIQueryCache;
 
@@ -67,17 +81,5 @@ export default abstract class BaseTransport {
     return this.api.query[module][method];
   }
 
-  protected async entriesByIds<IDType extends UInt, ValueType extends Codec> (
-    apiMethod: QueryableStorageEntry<'promise'>,
-    firstKey?: CodecArg // First key in case of double maps
-  ): Promise<[IDType, ValueType][]> {
-    const entries: [IDType, ValueType][] = (await apiMethod.entries<ValueType>(firstKey))
-      .map(([storageKey, value]) => ([
-        // If double-map (first key is provided), we map entries by second key
-        storageKey.args[firstKey !== undefined ? 1 : 0] as IDType,
-        value
-      ]));
-
-    return entries.sort((a, b) => a[0].toNumber() - b[0].toNumber());
-  }
+  protected entriesByIds = entriesByIds
 }
diff --git a/pioneer/packages/joy-utils/src/transport/mock/base.ts b/pioneer/packages/joy-utils/src/transport/mock/base.ts
index 41a9f48eae..24ea40fc38 100644
--- a/pioneer/packages/joy-utils/src/transport/mock/base.ts
+++ b/pioneer/packages/joy-utils/src/transport/mock/base.ts
@@ -1,15 +1,17 @@
-export default abstract class BaseTransport {
-  protected promise<T> (value: T, timeout?: number): Promise<T> {
-    return new Promise<T>((resolve, reject) => {
-      if (timeout) {
-        (new Promise((resolve) => setTimeout(resolve, timeout)))
-          .then(() => resolve(value))
-          .catch((e) => { throw e; });
-      } else {
-        resolve(value);
-      }
-    });
-  }
+export function mockPromise<T> (value: T, timeout?: number): Promise<T> {
+  return new Promise<T>((resolve, reject) => {
+    if (timeout) {
+      (new Promise((resolve) => setTimeout(resolve, timeout)))
+        .then(() => resolve(value))
+        .catch((e) => { throw e; });
+    } else {
+      resolve(value);
+    }
+  });
+}
+
+export default class BaseTransport {
+  protected promise = mockPromise
 
   protected simulateApiResponse<T> (value: T): Promise<T> {
     return this.promise<T>(value, this.randomTimeout());
diff --git a/pioneer/packages/joy-utils/src/transport/workingGroups.ts b/pioneer/packages/joy-utils/src/transport/workingGroups.ts
index 5818410376..7731ffd0b7 100644
--- a/pioneer/packages/joy-utils/src/transport/workingGroups.ts
+++ b/pioneer/packages/joy-utils/src/transport/workingGroups.ts
@@ -153,4 +153,8 @@ export default class WorkingGroupsTransport extends BaseTransport {
     return (await this.openingApplications(group, wgOpeningId))
       .filter((a) => a.stage.isOfType('Active'));
   }
+
+  async allWorkers (group: WorkingGroupKey) {
+    return this.entriesByIds<WorkerId, Worker>(this.apiQueryByGroup(group).workerById);
+  }
 }
diff --git a/pioneer/packages/joy-utils-old/src/ValidationConstraint.ts b/pioneer/packages/joy-utils/src/types/ValidationConstraint.ts
similarity index 100%
rename from pioneer/packages/joy-utils-old/src/ValidationConstraint.ts
rename to pioneer/packages/joy-utils/src/types/ValidationConstraint.ts
diff --git a/pioneer/packages/old-apps/apps-routing/src/joy-media.ts b/pioneer/packages/old-apps/apps-routing/src/joy-media.ts
deleted file mode 100644
index 81e8b234bc..0000000000
--- a/pioneer/packages/old-apps/apps-routing/src/joy-media.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Routes } from './types';
-
-import Media from '@polkadot/joy-media/index';
-
-export default ([
-  {
-    Component: Media,
-    display: {
-      needsApi: []
-    },
-    i18n: {
-      defaultValue: 'Media'
-    },
-    icon: 'play circle outline',
-    name: 'media'
-  }
-] as Routes);
diff --git a/pioneer/packages/old-apps/apps/src/aplayer.d.ts b/pioneer/packages/old-apps/apps/src/aplayer.d.ts
deleted file mode 100644
index 3c0ef94d4f..0000000000
--- a/pioneer/packages/old-apps/apps/src/aplayer.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'react-aplayer';
diff --git a/pioneer/packages/old-apps/apps/src/dplayer.d.ts b/pioneer/packages/old-apps/apps/src/dplayer.d.ts
deleted file mode 100644
index 216068f628..0000000000
--- a/pioneer/packages/old-apps/apps/src/dplayer.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'react-dplayer';
diff --git a/pioneer/packages/react-components/src/styles/joystream.ts b/pioneer/packages/react-components/src/styles/joystream.ts
index fecfcaf7a5..cadb672ce8 100644
--- a/pioneer/packages/react-components/src/styles/joystream.ts
+++ b/pioneer/packages/react-components/src/styles/joystream.ts
@@ -131,6 +131,11 @@ export default css`
     color: #3b83c0;
   }
 
+  /* Main apps bg */
+  .apps-Main {
+    background: rgba(250,250,250);
+  }
+
   /* Remove IdentityIcon border (not working well for members list) */
   .ui--IdentityIcon {
     border: none !important;
diff --git a/pioneer/tsconfig.json b/pioneer/tsconfig.json
index c7da998ee4..a515741643 100644
--- a/pioneer/tsconfig.json
+++ b/pioneer/tsconfig.json
@@ -6,7 +6,6 @@
     "packages/old-apps/**",
     "packages/joy-forum/**/*",
     "packages/joy-help/**/*",
-    "packages/joy-media/**/*",
     "packages/joy-settings/**/*",
     "packages/joy-utils-old/**/*"
   ],
@@ -17,6 +16,8 @@
     "resolveJsonModule": true,
     "baseUrl": ".",
     "paths": {
+      "@joystream/types/": [ "../types/src/" ],
+      "@joystream/types/*": [ "../types/src/*" ],
       "@polkadot/types/augment": [ "../types/augment-codec/augment-types.ts" ],
       "@polkadot/joy-election/": [ "packages/joy-election/src/" ],
       "@polkadot/joy-election/*": [ "packages/joy-election/src/*" ],
@@ -30,6 +31,8 @@
       "@polkadot/joy-roles/*": [ "packages/joy-roles/src/*" ],
       "@polkadot/joy-utils/": [ "packages/joy-utils/src/" ],
       "@polkadot/joy-utils/*": [ "packages/joy-utils/src/*" ],
+      "@polkadot/joy-media/": [ "packages/joy-media/src/" ],
+      "@polkadot/joy-media/*": [ "packages/joy-media/src/*" ],
       "@polkadot/apps/*": ["packages/apps/src/*"],
       "@polkadot/apps": ["packages/apps/src"],
       "@polkadot/apps-config/*": [ "packages/apps-config/src/*" ],
diff --git a/types/augment-codec/augment-types.ts b/types/augment-codec/augment-types.ts
index 26253c5c36..ac34e4a214 100644
--- a/types/augment-codec/augment-types.ts
+++ b/types/augment-codec/augment-types.ts
@@ -11,9 +11,9 @@ import { Stake as Stake, StakingStatus as StakingStatus, Staked as Staked, Stake
 import { Mint as Mint, NextAdjustment as NextAdjustment, AdjustOnInterval as AdjustOnInterval, AdjustCapacityBy as AdjustCapacityBy } from '../mint'
 import { Recipient as Recipient, RewardRelationship as RewardRelationship } from '../recurring-rewards'
 import { Application as Application, ApplicationStage as ApplicationStage, ActivateOpeningAt as ActivateOpeningAt, ApplicationRationingPolicy as ApplicationRationingPolicy, OpeningStage as OpeningStage, StakingPolicy as StakingPolicy, Opening as Opening, WaitingToBeingOpeningStageVariant as WaitingToBeingOpeningStageVariant, ActiveOpeningStageVariant as ActiveOpeningStageVariant, ActiveOpeningStage as ActiveOpeningStage, AcceptingApplications as AcceptingApplications, ReviewPeriod as ReviewPeriod, Deactivated as Deactivated, OpeningDeactivationCause as OpeningDeactivationCause, InactiveApplicationStage as InactiveApplicationStage, UnstakingApplicationStage as UnstakingApplicationStage, ApplicationDeactivationCause as ApplicationDeactivationCause, StakingAmountLimitMode as StakingAmountLimitMode } from '../hiring'
-import { Class as Class, Entity as Entity, ClassSchema as ClassSchema, Property as Property, PropertyType as PropertyType, PropertyValue as PropertyValue, ClassPropertyValue as ClassPropertyValue } from '../versioned-store'
+import { ClassId as ClassId, EntityId as EntityId, Class as Class, Entity as Entity, ClassSchema as ClassSchema, Property as Property, PropertyType as PropertyType, PropertyValue as PropertyValue, ClassPropertyValue as ClassPropertyValue } from '../versioned-store'
 import { EntityPermissions as EntityPermissions, ReferenceConstraint as ReferenceConstraint, ClassPermissionsType as ClassPermissionsType, Operation as Operation, OperationType as OperationType, CreateEntity as CreateEntity, UpdatePropertyValues as UpdatePropertyValues, AddSchemaSupportToEntity as AddSchemaSupportToEntity, ParametrizedEntity as ParametrizedEntity, ParametrizedClassPropertyValue as ParametrizedClassPropertyValue, ParametrizedPropertyValue as ParametrizedPropertyValue, PropertyOfClass as PropertyOfClass } from '../versioned-store/permissions'
-import { OptionalText as OptionalText, Channel as Channel, ChannelContentType as ChannelContentType, ChannelCurationStatus as ChannelCurationStatus, ChannelPublicationStatus as ChannelPublicationStatus, CurationActor as CurationActor, Curator as Curator, CuratorApplication as CuratorApplication, CuratorOpening as CuratorOpening, Lead as Lead, OpeningPolicyCommitment as OpeningPolicyCommitment, Principal as Principal, WorkingGroupUnstaker as WorkingGroupUnstaker, CuratorApplicationIdToCuratorIdMap as CuratorApplicationIdToCuratorIdMap, CuratorApplicationIdSet as CuratorApplicationIdSet, CuratorRoleStakeProfile as CuratorRoleStakeProfile, CuratorRoleStage as CuratorRoleStage, CuratorExitSummary as CuratorExitSummary, CuratorExitInitiationOrigin as CuratorExitInitiationOrigin, LeadRoleState as LeadRoleState, ExitedLeadRole as ExitedLeadRole, CuratorInduction as CuratorInduction } from '../content-working-group'
+import { ChannelId as ChannelId, CuratorId as CuratorId, CuratorOpeningId as CuratorOpeningId, CuratorApplicationId as CuratorApplicationId, LeadId as LeadId, PrincipalId as PrincipalId, OptionalText as OptionalText, Channel as Channel, ChannelContentType as ChannelContentType, ChannelCurationStatus as ChannelCurationStatus, ChannelPublicationStatus as ChannelPublicationStatus, CurationActor as CurationActor, Curator as Curator, CuratorApplication as CuratorApplication, CuratorOpening as CuratorOpening, Lead as Lead, OpeningPolicyCommitment as OpeningPolicyCommitment, Principal as Principal, WorkingGroupUnstaker as WorkingGroupUnstaker, CuratorApplicationIdToCuratorIdMap as CuratorApplicationIdToCuratorIdMap, CuratorApplicationIdSet as CuratorApplicationIdSet, CuratorRoleStakeProfile as CuratorRoleStakeProfile, CuratorRoleStage as CuratorRoleStage, CuratorExitSummary as CuratorExitSummary, CuratorExitInitiationOrigin as CuratorExitInitiationOrigin, LeadRoleState as LeadRoleState, ExitedLeadRole as ExitedLeadRole, CuratorInduction as CuratorInduction } from '../content-working-group'
 import { RationaleText as RationaleText, Application as ApplicationOf, ApplicationIdSet as ApplicationIdSet, ApplicationIdToWorkerIdMap as ApplicationIdToWorkerIdMap, WorkerId as WorkerId, Worker as WorkerOf, Opening as OpeningOf, StorageProviderId as StorageProviderId, OpeningType as OpeningType, ApplicationId as HiringApplicationId, RewardPolicy as RewardPolicy, WorkingGroupOpeningPolicyCommitment as WorkingGroupOpeningPolicyCommitment, RoleStakeProfile as RoleStakeProfile } from '../working-group'
 import { Url as Url, IPNSIdentity as IPNSIdentity, ServiceProviderRecord as ServiceProviderRecord } from '../discovery'
 import { ContentId as ContentId, LiaisonJudgement as LiaisonJudgement, DataObject as DataObject, DataObjectStorageRelationshipId as DataObjectStorageRelationshipId, DataObjectStorageRelationship as DataObjectStorageRelationship, DataObjectTypeId as DataObjectTypeId, DataObjectType as DataObjectType, DataObjectsMap as DataObjectsMap } from '../media'
@@ -286,12 +286,12 @@ declare module '@polkadot/types/types/registry' {
     "StakingAmountLimitMode": StakingAmountLimitMode;
     "Option<StakingAmountLimitMode>": Option<StakingAmountLimitMode>;
     "Vec<StakingAmountLimitMode>": Vec<StakingAmountLimitMode>;
-    "ClassId": u64;
-    "Option<ClassId>": Option<u64>;
-    "Vec<ClassId>": Vec<u64>;
-    "EntityId": u64;
-    "Option<EntityId>": Option<u64>;
-    "Vec<EntityId>": Vec<u64>;
+    "ClassId": ClassId;
+    "Option<ClassId>": Option<ClassId>;
+    "Vec<ClassId>": Vec<ClassId>;
+    "EntityId": EntityId;
+    "Option<EntityId>": Option<EntityId>;
+    "Vec<EntityId>": Vec<EntityId>;
     "Class": Class;
     "Option<Class>": Option<Class>;
     "Vec<Class>": Vec<Class>;
@@ -349,24 +349,24 @@ declare module '@polkadot/types/types/registry' {
     "PropertyOfClass": PropertyOfClass;
     "Option<PropertyOfClass>": Option<PropertyOfClass>;
     "Vec<PropertyOfClass>": Vec<PropertyOfClass>;
-    "ChannelId": u64;
-    "Option<ChannelId>": Option<u64>;
-    "Vec<ChannelId>": Vec<u64>;
-    "CuratorId": u64;
-    "Option<CuratorId>": Option<u64>;
-    "Vec<CuratorId>": Vec<u64>;
-    "CuratorOpeningId": u64;
-    "Option<CuratorOpeningId>": Option<u64>;
-    "Vec<CuratorOpeningId>": Vec<u64>;
-    "CuratorApplicationId": u64;
-    "Option<CuratorApplicationId>": Option<u64>;
-    "Vec<CuratorApplicationId>": Vec<u64>;
-    "LeadId": u64;
-    "Option<LeadId>": Option<u64>;
-    "Vec<LeadId>": Vec<u64>;
-    "PrincipalId": u64;
-    "Option<PrincipalId>": Option<u64>;
-    "Vec<PrincipalId>": Vec<u64>;
+    "ChannelId": ChannelId;
+    "Option<ChannelId>": Option<ChannelId>;
+    "Vec<ChannelId>": Vec<ChannelId>;
+    "CuratorId": CuratorId;
+    "Option<CuratorId>": Option<CuratorId>;
+    "Vec<CuratorId>": Vec<CuratorId>;
+    "CuratorOpeningId": CuratorOpeningId;
+    "Option<CuratorOpeningId>": Option<CuratorOpeningId>;
+    "Vec<CuratorOpeningId>": Vec<CuratorOpeningId>;
+    "CuratorApplicationId": CuratorApplicationId;
+    "Option<CuratorApplicationId>": Option<CuratorApplicationId>;
+    "Vec<CuratorApplicationId>": Vec<CuratorApplicationId>;
+    "LeadId": LeadId;
+    "Option<LeadId>": Option<LeadId>;
+    "Vec<LeadId>": Vec<LeadId>;
+    "PrincipalId": PrincipalId;
+    "Option<PrincipalId>": Option<PrincipalId>;
+    "Vec<PrincipalId>": Vec<PrincipalId>;
     "OptionalText": OptionalText;
     "Option<OptionalText>": Option<OptionalText>;
     "Vec<OptionalText>": Vec<OptionalText>;
diff --git a/types/augment/all/defs.json b/types/augment/all/defs.json
index cfc58e020e..7b4c6f48bf 100644
--- a/types/augment/all/defs.json
+++ b/types/augment/all/defs.json
@@ -353,15 +353,15 @@
     "ClassId": "u64",
     "EntityId": "u64",
     "Class": {
-        "id": "u64",
+        "id": "ClassId",
         "properties": "Vec<Property>",
         "schemas": "Vec<ClassSchema>",
         "name": "Text",
         "description": "Text"
     },
     "Entity": {
-        "id": "u64",
-        "class_id": "u64",
+        "id": "EntityId",
+        "class_id": "ClassId",
         "in_class_schema_indexes": "Vec<u16>"
     },
     "ClassSchema": {
@@ -393,7 +393,7 @@
             "Int32Vec": "u16",
             "Int64Vec": "u16",
             "TextVec": "(u16,u16)",
-            "InternalVec": "(u16,u64)"
+            "InternalVec": "(u16,ClassId)"
         }
     },
     "PropertyValue": {
@@ -416,7 +416,7 @@
             "Int32Vec": "Vec<i32>",
             "Int64Vec": "Vec<i64>",
             "TextVec": "Vec<Text>",
-            "InternalVec": "Vec<u64>"
+            "InternalVec": "Vec<EntityId>"
         }
     },
     "ClassPropertyValue": {
@@ -456,7 +456,7 @@
         }
     },
     "CreateEntity": {
-        "class_id": "u64"
+        "class_id": "ClassId"
     },
     "UpdatePropertyValues": {
         "entity_id": "ParametrizedEntity",
@@ -485,7 +485,7 @@
         }
     },
     "PropertyOfClass": {
-        "class_id": "u64",
+        "class_id": "ClassId",
         "property_index": "u16"
     },
     "ChannelId": "u64",
@@ -508,7 +508,7 @@
         "publication_status": "ChannelPublicationStatus",
         "curation_status": "ChannelCurationStatus",
         "created": "u32",
-        "principal_id": "u64"
+        "principal_id": "PrincipalId"
     },
     "ChannelContentType": {
         "_enum": [
@@ -532,7 +532,7 @@
     "CurationActor": {
         "_enum": {
             "Lead": "Null",
-            "Curator": "u64"
+            "Curator": "CuratorId"
         }
     },
     "Curator": {
@@ -541,17 +541,17 @@
         "role_stake_profile": "Option<CuratorRoleStakeProfile>",
         "stage": "CuratorRoleStage",
         "induction": "CuratorInduction",
-        "principal_id": "u64"
+        "principal_id": "PrincipalId"
     },
     "CuratorApplication": {
         "role_account": "GenericAccountId",
-        "curator_opening_id": "u64",
+        "curator_opening_id": "CuratorOpeningId",
         "member_id": "MemberId",
         "application_id": "HiringApplicationId"
     },
     "CuratorOpening": {
         "opening_id": "u64",
-        "curator_applications": "Vec<u64>",
+        "curator_applications": "Vec<CuratorApplicationId>",
         "policy_commitment": "OpeningPolicyCommitment"
     },
     "Lead": {
@@ -578,18 +578,18 @@
     "Principal": {
         "_enum": {
             "Lead": "Null",
-            "Curator": "u64",
-            "ChannelOwner": "u64"
+            "Curator": "CuratorId",
+            "ChannelOwner": "ChannelId"
         }
     },
     "WorkingGroupUnstaker": {
         "_enum": {
-            "Lead": "u64",
-            "Curator": "u64"
+            "Lead": "LeadId",
+            "Curator": "CuratorId"
         }
     },
-    "CuratorApplicationIdToCuratorIdMap": "BTreeMap<HiringApplicationId,u64>",
-    "CuratorApplicationIdSet": "Vec<u64>",
+    "CuratorApplicationIdToCuratorIdMap": "BTreeMap<HiringApplicationId,CuratorId>",
+    "CuratorApplicationIdSet": "Vec<CuratorApplicationId>",
     "CuratorRoleStakeProfile": {
         "stake_id": "u64",
         "termination_unstaking_period": "Option<u32>",
@@ -623,8 +623,8 @@
         "initiated_at_block_number": "u32"
     },
     "CuratorInduction": {
-        "lead": "u64",
-        "curator_application_id": "u64",
+        "lead": "LeadId",
+        "curator_application_id": "CuratorApplicationId",
         "at_block": "u32"
     },
     "RationaleText": "Bytes",
diff --git a/types/augment/all/types.ts b/types/augment/all/types.ts
index 7182bcdfc3..0e402d2cc4 100644
--- a/types/augment/all/types.ts
+++ b/types/augment/all/types.ts
@@ -192,7 +192,7 @@ export interface Channel extends Struct {
   readonly publication_status: ChannelPublicationStatus;
   readonly curation_status: ChannelCurationStatus;
   readonly created: u32;
-  readonly principal_id: u64;
+  readonly principal_id: PrincipalId;
 }
 
 /** @name ChannelContentType */
@@ -225,7 +225,7 @@ export interface ChildPositionInParentCategory extends Struct {
 
 /** @name Class */
 export interface Class extends Struct {
-  readonly id: u64;
+  readonly id: ClassId;
   readonly properties: Vec<Property>;
   readonly schemas: Vec<ClassSchema>;
   readonly name: Text;
@@ -262,7 +262,7 @@ export interface ContentId extends U8aFixed {}
 
 /** @name CreateEntity */
 export interface CreateEntity extends Struct {
-  readonly class_id: u64;
+  readonly class_id: ClassId;
 }
 
 /** @name Credential */
@@ -275,7 +275,7 @@ export interface CredentialSet extends Vec<Credential> {}
 export interface CurationActor extends Enum {
   readonly isLead: boolean;
   readonly isCurator: boolean;
-  readonly asCurator: u64;
+  readonly asCurator: CuratorId;
 }
 
 /** @name Curator */
@@ -285,13 +285,13 @@ export interface Curator extends Struct {
   readonly role_stake_profile: Option<CuratorRoleStakeProfile>;
   readonly stage: CuratorRoleStage;
   readonly induction: CuratorInduction;
-  readonly principal_id: u64;
+  readonly principal_id: PrincipalId;
 }
 
 /** @name CuratorApplication */
 export interface CuratorApplication extends Struct {
   readonly role_account: GenericAccountId;
-  readonly curator_opening_id: u64;
+  readonly curator_opening_id: CuratorOpeningId;
   readonly member_id: MemberId;
   readonly application_id: HiringApplicationId;
 }
@@ -300,10 +300,10 @@ export interface CuratorApplication extends Struct {
 export interface CuratorApplicationId extends u64 {}
 
 /** @name CuratorApplicationIdSet */
-export interface CuratorApplicationIdSet extends Vec<u64> {}
+export interface CuratorApplicationIdSet extends Vec<CuratorApplicationId> {}
 
 /** @name CuratorApplicationIdToCuratorIdMap */
-export interface CuratorApplicationIdToCuratorIdMap extends BTreeMap<HiringApplicationId, u64> {}
+export interface CuratorApplicationIdToCuratorIdMap extends BTreeMap<HiringApplicationId, CuratorId> {}
 
 /** @name CuratorExitInitiationOrigin */
 export interface CuratorExitInitiationOrigin extends Enum {
@@ -323,15 +323,15 @@ export interface CuratorId extends u64 {}
 
 /** @name CuratorInduction */
 export interface CuratorInduction extends Struct {
-  readonly lead: u64;
-  readonly curator_application_id: u64;
+  readonly lead: LeadId;
+  readonly curator_application_id: CuratorApplicationId;
   readonly at_block: u32;
 }
 
 /** @name CuratorOpening */
 export interface CuratorOpening extends Struct {
   readonly opening_id: u64;
-  readonly curator_applications: Vec<u64>;
+  readonly curator_applications: Vec<CuratorApplicationId>;
   readonly policy_commitment: OpeningPolicyCommitment;
 }
 
@@ -441,8 +441,8 @@ export interface ElectionStake extends Struct {
 
 /** @name Entity */
 export interface Entity extends Struct {
-  readonly id: u64;
-  readonly class_id: u64;
+  readonly id: EntityId;
+  readonly class_id: ClassId;
   readonly in_class_schema_indexes: Vec<u16>;
 }
 
@@ -724,9 +724,9 @@ export interface PostTextChange extends Struct {
 export interface Principal extends Enum {
   readonly isLead: boolean;
   readonly isCurator: boolean;
-  readonly asCurator: u64;
+  readonly asCurator: CuratorId;
   readonly isChannelOwner: boolean;
-  readonly asChannelOwner: u64;
+  readonly asChannelOwner: ChannelId;
 }
 
 /** @name PrincipalId */
@@ -742,7 +742,7 @@ export interface Property extends Struct {
 
 /** @name PropertyOfClass */
 export interface PropertyOfClass extends Struct {
-  readonly class_id: u64;
+  readonly class_id: ClassId;
   readonly property_index: u16;
 }
 
@@ -777,7 +777,7 @@ export interface PropertyType extends Enum {
   readonly isTextVec: boolean;
   readonly asTextVec: ITuple<[u16, u16]>;
   readonly isInternalVec: boolean;
-  readonly asInternalVec: ITuple<[u16, u64]>;
+  readonly asInternalVec: ITuple<[u16, ClassId]>;
 }
 
 /** @name PropertyValue */
@@ -818,7 +818,7 @@ export interface PropertyValue extends Enum {
   readonly isTextVec: boolean;
   readonly asTextVec: Vec<Text>;
   readonly isInternalVec: boolean;
-  readonly asInternalVec: Vec<u64>;
+  readonly asInternalVec: Vec<EntityId>;
 }
 
 /** @name ProposalDecisionStatus */
@@ -1234,9 +1234,9 @@ export interface WorkingGroupOpeningPolicyCommitment extends Struct {
 /** @name WorkingGroupUnstaker */
 export interface WorkingGroupUnstaker extends Enum {
   readonly isLead: boolean;
-  readonly asLead: u64;
+  readonly asLead: LeadId;
   readonly isCurator: boolean;
-  readonly asCurator: u64;
+  readonly asCurator: CuratorId;
 }
 
 export type PHANTOM_ALL = 'all';
diff --git a/types/augment/augment-api-consts.ts b/types/augment/augment-api-consts.ts
index 5dc1fc5a0e..0e7f33ac72 100644
--- a/types/augment/augment-api-consts.ts
+++ b/types/augment/augment-api-consts.ts
@@ -31,56 +31,6 @@ declare module '@polkadot/metadata/Decorated/consts/types' {
        **/
       existentialDeposit: AugmentedConst<Balance>;
     };
-    contracts: {
-      /**
-       * The maximum nesting level of a call/instantiate stack. A reasonable default
-       * value is 100.
-       **/
-      maxDepth: AugmentedConst<u32>;
-      /**
-       * The maximum size of a storage value in bytes. A reasonable default is 16 KiB.
-       **/
-      maxValueSize: AugmentedConst<u32>;
-      /**
-       * Price of a byte of storage per one block interval. Should be greater than 0.
-       **/
-      rentByteFee: AugmentedConst<BalanceOf>;
-      /**
-       * The amount of funds a contract should deposit in order to offset
-       * the cost of one byte.
-       * 
-       * Let's suppose the deposit is 1,000 BU (balance units)/byte and the rent is 1 BU/byte/day,
-       * then a contract with 1,000,000 BU that uses 1,000 bytes of storage would pay no rent.
-       * But if the balance reduced to 500,000 BU and the storage stayed the same at 1,000,
-       * then it would pay 500 BU/day.
-       **/
-      rentDepositOffset: AugmentedConst<BalanceOf>;
-      /**
-       * Number of block delay an extrinsic claim surcharge has.
-       * 
-       * When claim surcharge is called by an extrinsic the rent is checked
-       * for current_block - delay
-       **/
-      signedClaimHandicap: AugmentedConst<BlockNumber>;
-      /**
-       * A size offset for an contract. A just created account with untouched storage will have that
-       * much of storage from the perspective of the state rent.
-       * 
-       * This is a simple way to ensure that contracts with empty storage eventually get deleted
-       * by making them pay rent. This creates an incentive to remove them early in order to save
-       * rent.
-       **/
-      storageSizeOffset: AugmentedConst<u32>;
-      /**
-       * Reward that is received by the party whose touch has led
-       * to removal of a contract.
-       **/
-      surchargeReward: AugmentedConst<BalanceOf>;
-      /**
-       * The minimum amount required to generate a tombstone.
-       **/
-      tombstoneDeposit: AugmentedConst<BalanceOf>;
-    };
     dataDirectory: {
       /**
        * Maximum objects allowed per inject_data_objects() transaction
diff --git a/types/augment/augment-api-query.ts b/types/augment/augment-api-query.ts
index 1d0a570fbb..34a34091c7 100644
--- a/types/augment/augment-api-query.ts
+++ b/types/augment/augment-api-query.ts
@@ -4,12 +4,11 @@
 import { AnyNumber, ITuple, Observable } from '@polkadot/types/types';
 import { Option, Vec } from '@polkadot/types/codec';
 import { Bytes, bool, u32, u64 } from '@polkadot/types/primitive';
-import { Application, ApplicationId, ApplicationOf, Category, CategoryId, Channel, ChannelId, Class, ClassId, ClassPermissionsType, ContentId, Credential, Curator, CuratorApplication, CuratorApplicationId, CuratorId, CuratorOpening, CuratorOpeningId, DataObject, DataObjectStorageRelationship, DataObjectStorageRelationshipId, DataObjectType, DataObjectTypeId, DiscussionPost, DiscussionThread, ElectionStage, ElectionStake, Entity, EntityId, HiringApplicationId, InputValidationLengthConstraint, Lead, LeadId, MemberId, Membership, MemoText, Mint, MintId, Opening, OpeningId, OpeningOf, PaidMembershipTerms, PaidTermId, Post, PostId, Principal, PrincipalId, ProposalDetailsOf, ProposalId, ProposalOf, Recipient, RecipientId, RewardRelationship, RewardRelationshipId, SealedVote, Seats, Stake, StakeId, StorageProviderId, Thread, ThreadCounter, ThreadId, TransferableStake, Url, VoteKind, WorkerId, WorkerOf, WorkingGroupUnstaker } from './all';
+import { Application, ApplicationId, ApplicationOf, Category, CategoryId, Channel, ChannelId, Class, ClassId, ClassPermissionsType, ContentId, Credential, Curator, CuratorApplication, CuratorApplicationId, CuratorId, CuratorOpening, CuratorOpeningId, DataObject, DataObjectStorageRelationship, DataObjectStorageRelationshipId, DataObjectType, DataObjectTypeId, DiscussionPost, DiscussionThread, ElectionStage, ElectionStake, Entity, EntityId, HiringApplicationId, InputValidationLengthConstraint, Lead, LeadId, MemberId, Membership, MemoText, Mint, MintId, Opening, OpeningId, OpeningOf, PaidMembershipTerms, PaidTermId, Post, PostId, Principal, PrincipalId, ProposalDetailsOf, ProposalId, ProposalOf, Recipient, RecipientId, RewardRelationship, RewardRelationshipId, SealedVote, Seats, ServiceProviderRecord, Stake, StakeId, StorageProviderId, Thread, ThreadCounter, ThreadId, TransferableStake, Url, VoteKind, WorkerId, WorkerOf, WorkingGroupUnstaker } from './all';
 import { UncleEntryItem } from '@polkadot/types/interfaces/authorship';
 import { BabeAuthorityWeight, MaybeRandomness, NextConfigDescriptor, Randomness } from '@polkadot/types/interfaces/babe';
 import { AccountData, BalanceLock } from '@polkadot/types/interfaces/balances';
 import { AuthorityId } from '@polkadot/types/interfaces/consensus';
-import { CodeHash, ContractInfo, PrefabWasmModule, Schedule } from '@polkadot/types/interfaces/contracts';
 import { SetId, StoredPendingChange, StoredState } from '@polkadot/types/interfaces/grandpa';
 import { AuthIndex } from '@polkadot/types/interfaces/imOnline';
 import { DeferredOffenceOf, Kind, OffenceDetails, OpaqueTimeSlot, ReportIdOf } from '@polkadot/types/interfaces/offences';
@@ -208,30 +207,6 @@ declare module '@polkadot/api/types/storage' {
        **/
       unstakerByStakeId: AugmentedQuery<ApiType, (arg: StakeId | AnyNumber | Uint8Array) => Observable<WorkingGroupUnstaker>>;
     };
-    contracts: {
-      /**
-       * The subtrie counter.
-       **/
-      accountCounter: AugmentedQuery<ApiType, () => Observable<u64>>;
-      /**
-       * A mapping between an original code hash and instrumented wasm code, ready for execution.
-       **/
-      codeStorage: AugmentedQuery<ApiType, (arg: CodeHash | string | Uint8Array) => Observable<Option<PrefabWasmModule>>>;
-      /**
-       * The code associated with a given account.
-       * 
-       * TWOX-NOTE: SAFE since `AccountId` is a secure hash.
-       **/
-      contractInfoOf: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<Option<ContractInfo>>>;
-      /**
-       * Current cost schedule for contracts.
-       **/
-      currentSchedule: AugmentedQuery<ApiType, () => Observable<Schedule>>;
-      /**
-       * A mapping from an original code hash to the original code, untouched by instrumentation.
-       **/
-      pristineCode: AugmentedQuery<ApiType, (arg: CodeHash | string | Uint8Array) => Observable<Option<Bytes>>>;
-    };
     council: {
       activeCouncil: AugmentedQuery<ApiType, () => Observable<Seats>>;
       /**
@@ -323,15 +298,15 @@ declare module '@polkadot/api/types/storage' {
     };
     discovery: {
       /**
-       * Mapping of service providers' storage provider id to their AccountInfo
+       * Mapping of service providers' storage provider id to their ServiceProviderRecord
        **/
-      accountInfoByStorageProviderId: AugmentedQuery<ApiType, (arg: StorageProviderId | AnyNumber | Uint8Array) => Observable<AccountInfo>>;
+      accountInfoByStorageProviderId: AugmentedQuery<ApiType, (arg: StorageProviderId | AnyNumber | Uint8Array) => Observable<ServiceProviderRecord>>;
       /**
        * Bootstrap endpoints maintained by root
        **/
       bootstrapEndpoints: AugmentedQuery<ApiType, () => Observable<Vec<Url>>>;
       /**
-       * Lifetime of an AccountInfo record in AccountInfoByAccountId map
+       * Lifetime of an ServiceProviderRecord record in AccountInfoByAccountId map
        **/
       defaultLifetime: AugmentedQuery<ApiType, () => Observable<BlockNumber>>;
     };
diff --git a/types/augment/augment-api-tx.ts b/types/augment/augment-api-tx.ts
index df6f28a9e8..a6e99c6b10 100644
--- a/types/augment/augment-api-tx.ts
+++ b/types/augment/augment-api-tx.ts
@@ -5,7 +5,6 @@ import { AnyNumber, ITuple } from '@polkadot/types/types';
 import { Compact, Option, Vec } from '@polkadot/types/codec';
 import { Bytes, bool, u16, u32, u64 } from '@polkadot/types/primitive';
 import { ActivateOpeningAt, AddOpeningParameters, ApplicationId, ApplicationIdSet, BalanceOfMint, CategoryId, ChannelContentType, ChannelCurationStatus, ChannelId, ChannelPublicationStatus, ClassId, ClassPermissionsType, ClassPropertyValue, ContentId, Credential, CredentialSet, CurationActor, CuratorApplicationId, CuratorApplicationIdSet, CuratorId, CuratorOpeningId, DataObjectStorageRelationshipId, DataObjectType, DataObjectTypeId, DataObjectsMap, ElectionParameters, EntityId, EntityPermissions, FillOpeningParameters, MemberId, MemoText, OpeningId, OpeningPolicyCommitment, OpeningType, Operation, OptionalText, PaidTermId, PostId, Property, ProposalId, ReferenceConstraint, RewardPolicy, StorageProviderId, TerminateRoleParameters, ThreadId, Url, VoteKind, WorkerId, WorkingGroup } from './all';
-import { CodeHash, Gas, Schedule } from '@polkadot/types/interfaces/contracts';
 import { Extrinsic, Signature } from '@polkadot/types/interfaces/extrinsics';
 import { GrandpaEquivocationProof, KeyOwnerProof } from '@polkadot/types/interfaces/grandpa';
 import { Heartbeat } from '@polkadot/types/interfaces/imOnline';
@@ -186,50 +185,6 @@ declare module '@polkadot/api/types/submittable' {
       updateCuratorRoleAccount: AugmentedSubmittable<(memberId: MemberId | AnyNumber | Uint8Array, curatorId: CuratorId | AnyNumber | Uint8Array, newRoleAccount: AccountId | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
       withdrawCuratorApplication: AugmentedSubmittable<(curatorApplicationId: CuratorApplicationId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
     };
-    contracts: {
-      /**
-       * Makes a call to an account, optionally transferring some balance.
-       * 
-       * * If the account is a smart-contract account, the associated code will be
-       * executed and any value will be transferred.
-       * * If the account is a regular account, any value will be transferred.
-       * * If no account exists and the call value is not less than `existential_deposit`,
-       * a regular account will be created and any value will be transferred.
-       **/
-      call: AugmentedSubmittable<(dest: LookupSource | string | Uint8Array, value: Compact<BalanceOf> | AnyNumber | Uint8Array, gasLimit: Compact<Gas> | AnyNumber | Uint8Array, data: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
-      /**
-       * Allows block producers to claim a small reward for evicting a contract. If a block producer
-       * fails to do so, a regular users will be allowed to claim the reward.
-       * 
-       * If contract is not evicted as a result of this call, no actions are taken and
-       * the sender is not eligible for the reward.
-       **/
-      claimSurcharge: AugmentedSubmittable<(dest: AccountId | string | Uint8Array, auxSender: Option<AccountId> | null | object | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
-      /**
-       * Instantiates a new contract from the `codehash` generated by `put_code`, optionally transferring some balance.
-       * 
-       * Instantiation is executed as follows:
-       * 
-       * - The destination address is computed based on the sender and hash of the code.
-       * - The smart-contract account is created at the computed address.
-       * - The `ctor_code` is executed in the context of the newly-created account. Buffer returned
-       * after the execution is saved as the `code` of the account. That code will be invoked
-       * upon any call received by this account.
-       * - The contract is initialized.
-       **/
-      instantiate: AugmentedSubmittable<(endowment: Compact<BalanceOf> | AnyNumber | Uint8Array, gasLimit: Compact<Gas> | AnyNumber | Uint8Array, codeHash: CodeHash | string | Uint8Array, data: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
-      /**
-       * Stores the given binary Wasm code into the chain's storage and returns its `codehash`.
-       * You can instantiate contracts only with stored code.
-       **/
-      putCode: AugmentedSubmittable<(code: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
-      /**
-       * Updates the schedule for metering contracts.
-       * 
-       * The schedule must have a greater version than the stored schedule.
-       **/
-      updateSchedule: AugmentedSubmittable<(schedule: Schedule | { version?: any; putCodePerByteCost?: any; growMemCost?: any; regularOpCost?: any; returnDataPerByteCost?: any; eventDataPerByteCost?: any; eventPerTopicCost?: any; eventBaseCost?: any; sandboxDataReadCost?: any; sandboxDataWriteCost?: any; transferCost?: any; maxEventTopics?: any; maxStackHeight?: any; maxMemoryPages?: any; enablePrintln?: any; maxSubjectLen?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
-    };
     council: {
       /**
        * Adds a zero staked council member. A member added in this way does not get a recurring reward.
@@ -357,12 +312,12 @@ declare module '@polkadot/api/types/submittable' {
        **/
       setDefaultLifetime: AugmentedSubmittable<(lifetime: BlockNumber | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
       /**
-       * Creates the AccountInfo to save an IPNS identity for the storage provider.
+       * Creates the ServiceProviderRecord to save an IPNS identity for the storage provider.
        * Requires signed storage provider credentials.
        **/
       setIpnsId: AugmentedSubmittable<(storageProviderId: StorageProviderId | AnyNumber | Uint8Array, id: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>>;
       /**
-       * Deletes the AccountInfo with the IPNS identity for the storage provider.
+       * Deletes the ServiceProviderRecord with the IPNS identity for the storage provider.
        * Requires signed storage provider credentials.
        **/
       unsetIpnsId: AugmentedSubmittable<(storageProviderId: StorageProviderId | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>>;
diff --git a/types/src/content-working-group/index.ts b/types/src/content-working-group/index.ts
index eaddb032b9..ff2278623c 100644
--- a/types/src/content-working-group/index.ts
+++ b/types/src/content-working-group/index.ts
@@ -300,12 +300,12 @@ export class CuratorApplicationIdToCuratorIdMap extends BTreeMap.with(Applicatio
 export class CuratorApplicationIdSet extends Vec.with(CuratorApplicationId) {}
 
 export const contentWorkingGroupTypes = {
-  ChannelId: 'u64',
-  CuratorId: 'u64',
-  CuratorOpeningId: 'u64',
-  CuratorApplicationId: 'u64',
-  LeadId: 'u64',
-  PrincipalId: 'u64',
+  ChannelId,
+  CuratorId,
+  CuratorOpeningId,
+  CuratorApplicationId,
+  LeadId,
+  PrincipalId,
   OptionalText,
   Channel,
   ChannelContentType,
diff --git a/types/src/index.ts b/types/src/index.ts
index c234094e87..a70817712d 100644
--- a/types/src/index.ts
+++ b/types/src/index.ts
@@ -62,7 +62,7 @@ export const types: RegistryTypes = {
 }
 
 // Allows creating types without api instance (it's not a recommended way though, so should be used just for mocks)
-const mockRegistry = new TypeRegistry()
+export const mockRegistry = new TypeRegistry()
 mockRegistry.register(types)
 
 export function createMock<TypeName extends keyof InterfaceTypes>(
diff --git a/types/src/versioned-store/index.ts b/types/src/versioned-store/index.ts
index 23d3646003..3ad26d1afd 100644
--- a/types/src/versioned-store/index.ts
+++ b/types/src/versioned-store/index.ts
@@ -156,8 +156,8 @@ export function unifyPropName(propName: string): string {
 }
 
 export const versionedStoreTypes: RegistryTypes = {
-  ClassId: 'u64',
-  EntityId: 'u64',
+  ClassId,
+  EntityId,
   Class,
   Entity,
   ClassSchema,
diff --git a/yarn.lock b/yarn.lock
index c9813a1761..c6dd41b530 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1383,6 +1383,14 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
+"@babel/runtime-corejs2@^7.6.3":
+  version "7.11.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.11.2.tgz#700a03945ebad0d31ba6690fc8a6bcc9040faa47"
+  integrity sha512-AC/ciV28adSSpEkBglONBWq4/Lvm6GAZuxIoyVtsnUpZMl0bxLtoChEnYAkP+47KyOCayZanojtflUEUJtR/6Q==
+  dependencies:
+    core-js "^2.6.5"
+    regenerator-runtime "^0.13.4"
+
 "@babel/runtime@7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c"
@@ -4567,6 +4575,11 @@
   resolved "https://registry.yarnpkg.com/@types/memoizee/-/memoizee-0.4.4.tgz#a8a5e917ef70c79523b8b8d57f529e49616a760c"
   integrity sha512-c9+1g6+6vEqcw5UuM0RbfQV0mssmZcoG9+hNC5ptDCsv4G+XJW1Z4pE13wV5zbc9e0+YrDydALBTiD3nWG1a3g==
 
+"@types/mime-types@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.0.tgz#9ca52cda363f699c69466c2a6ccdaad913ea7a73"
+  integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=
+
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -4664,6 +4677,13 @@
     "@types/history" "*"
     "@types/react" "*"
 
+"@types/react-beautiful-dnd@^11.0.3":
+  version "11.0.5"
+  resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-11.0.5.tgz#2f5bc733dd46da28312c8ee0c126ab7202b90247"
+  integrity sha512-idvycolYX3IxwIln8yahzQj3EBgYq4KimPHSP0a2lNHiz2OZSskGg2dLmq1VxTGvvTtdG+Za8p596D/dalRlrA==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react-beautiful-dnd@^13.0.0":
   version "13.0.0"
   resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-13.0.0.tgz#e60d3d965312fcf1516894af92dc3e9249587db4"
@@ -5884,6 +5904,15 @@ anymatch@^3.0.3, anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+aplayer@^1.10.0, aplayer@^1.10.1:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/aplayer/-/aplayer-1.10.1.tgz#318289206107452cc39e8f552fa6cc6cb459a90c"
+  integrity sha512-HAfyxgCUTLAqtYlxzzK9Fyqg6y+kZ9CqT1WfeWE8FSzwspT6oBqWOZHANPHF3RGTtC33IsyEgrfthPDzU5r9kQ==
+  dependencies:
+    balloon-css "^0.5.0"
+    promise-polyfill "7.1.0"
+    smoothscroll "0.4.0"
+
 app-builder-bin@3.5.9:
   version "3.5.9"
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.9.tgz#a3ac0c25286bac68357321cb2eaf7128b0bc0a4f"
@@ -6333,21 +6362,29 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz#24390e6ad61386b0a747265754d2a17219de862c"
   integrity sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==
 
-axios@^0.18.0, axios@^0.18.1:
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3"
-  integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==
+axios@0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
+  integrity sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=
   dependencies:
-    follow-redirects "1.5.10"
-    is-buffer "^2.0.2"
+    follow-redirects "^1.3.0"
+    is-buffer "^1.1.5"
 
-axios@^0.19.0, axios@^0.19.2:
+axios@0.19.2, axios@^0.19.0, axios@^0.19.2:
   version "0.19.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
   integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
   dependencies:
     follow-redirects "1.5.10"
 
+axios@^0.18.0, axios@^0.18.1:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3"
+  integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==
+  dependencies:
+    follow-redirects "1.5.10"
+    is-buffer "^2.0.2"
+
 babel-code-frame@^6.22.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -6761,6 +6798,16 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
+balloon-css@^0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/balloon-css/-/balloon-css-0.5.2.tgz#9e2163565a136c9d4aa20e8400772ce3b738d3ff"
+  integrity sha512-zheJpzwyNrG4t39vusA67v3BYg1HTVXOF8cErPEHzWK88PEOFwgo6Ea9VHOgOWNMgeuOtFVtB73NE2NWl9uDyQ==
+
+balloon-css@^1.0.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/balloon-css/-/balloon-css-1.2.0.tgz#53d3fb4051264a278a58713bed6865845dbcaf4b"
+  integrity sha512-urXwkHgwp6GsXVF+it01485Z2Cj4pnW02ICnM0TemOlkKmCNnDLmyy+ZZiRXBpwldUXO+aRNr7Hdia4CBvXJ5A==
+
 base-path-converter@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/base-path-converter/-/base-path-converter-1.0.2.tgz#e80b4b4f31c7b1561e632158e00774b6f2f27978"
@@ -6951,17 +6998,7 @@ bluebird@^3.1.1, bluebird@^3.3.5, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-bn.js@^4.0.0, bn.js@^4.11.8, bn.js@^4.4.0:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
-
-bn.js@^4.1.0, bn.js@^4.1.1:
-  version "4.11.9"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
-  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
-
-bn.js@^5.1.2:
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.8, bn.js@^4.4.0, bn.js@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.2.tgz#c9686902d3c9a27729f43ab10f9d79c2004da7b0"
   integrity sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==
@@ -10124,6 +10161,26 @@ dotenv@^8.0.0, dotenv@^8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
   integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
+dplayer@1.25.0:
+  version "1.25.0"
+  resolved "https://registry.yarnpkg.com/dplayer/-/dplayer-1.25.0.tgz#10afb3416b42125b8926d9b157aae594c84945fb"
+  integrity sha512-TG2IKT4IXH5trE3DKeeOqmGlewheHT5R30ya4jhMrjysc1rrCPMJYnmsBfiTS8h6613YZeriFIDHZHEEi/rs3Q==
+  dependencies:
+    axios "0.18.0"
+    balloon-css "^0.5.0"
+    mini-css-extract-plugin "0.4.0"
+    promise-polyfill "8.0.0"
+    webpack-cli "3.0.4"
+
+dplayer@^1.24.0:
+  version "1.26.0"
+  resolved "https://registry.yarnpkg.com/dplayer/-/dplayer-1.26.0.tgz#d366200b1962bd09e91226066f2aadea6f35c71b"
+  integrity sha512-uOE0w/WdlX7N9d0ppIEcAYrcnUjY52TMX+MBL4lj9Mj+JMljVuaEc5w88HkZp5Q11VqvN/jxnM8ktx2Dr7/MgA==
+  dependencies:
+    axios "0.19.2"
+    balloon-css "^1.0.3"
+    promise-polyfill "8.1.3"
+
 drbg.js@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/drbg.js/-/drbg.js-1.0.1.tgz#3e36b6c42b37043823cdbc332d58f31e2445480b"
@@ -11999,6 +12056,11 @@ follow-redirects@^1.0.0:
   dependencies:
     debug "^3.0.0"
 
+follow-redirects@^1.3.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
+  integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
+
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
@@ -12664,6 +12726,11 @@ global-dirs@^2.0.1:
   dependencies:
     ini "^1.3.5"
 
+global-modules-path@^2.1.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.1.tgz#e541f4c800a1a8514a990477b267ac67525b9931"
+  integrity sha512-y+shkf4InI7mPRHSo2b/k6ix6+NLDtyccYv86whhxrSGX9wjPX1VMITmrDbE1eh7zkzhiWtW2sHklJYoQ62Cxg==
+
 global-modules@2.0.0, global-modules@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
@@ -13816,6 +13883,14 @@ import-lazy@^4.0.0:
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
   integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
 
+import-local@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+  integrity sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==
+  dependencies:
+    pkg-dir "^2.0.0"
+    resolve-cwd "^2.0.0"
+
 import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
@@ -13959,7 +14034,7 @@ inquirer@6.5.0:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-inquirer@^6.2.0:
+inquirer@^6.0.0, inquirer@^6.2.0:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
   integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
@@ -14050,7 +14125,7 @@ interpret@^1.0.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
   integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
 
-interpret@^1.4.0:
+interpret@^1.1.0, interpret@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
@@ -14072,6 +14147,11 @@ invert-kv@^1.0.0:
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
   integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
 
+invert-kv@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
+
 ip-regex@^2.0.0, ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -15049,6 +15129,11 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
+iso-639-1@^2.1.0:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/iso-639-1/-/iso-639-1-2.1.4.tgz#c08b3d43a1c18945b05e26a257991ae6e36693ee"
+  integrity sha512-pwJRHnpz1sCR5saQ+Hm1E2YESw2eLGKP5TzsYKXuQ7SIfvKWMRb9CHhptqunYpCIcRCpq3LgLuhYG5hiLPRbFQ==
+
 iso-random-stream@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/iso-random-stream/-/iso-random-stream-1.1.1.tgz#83824bba77fbb3480dd6b35fbb06de7f9e93e80f"
@@ -16500,6 +16585,13 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
+lcid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
+  dependencies:
+    invert-kv "^2.0.0"
+
 lcov-parse@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0"
@@ -17210,6 +17302,13 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
+map-age-cleaner@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
+  dependencies:
+    p-defer "^1.0.0"
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -17397,6 +17496,15 @@ mem@^1.1.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+mem@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
+  dependencies:
+    map-age-cleaner "^0.1.1"
+    mimic-fn "^2.0.0"
+    p-is-promise "^2.0.0"
+
 memoize-one@^5.0.0, memoize-one@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0"
@@ -17623,7 +17731,7 @@ mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24:
   dependencies:
     mime-db "1.42.0"
 
-mime-types@^2.1.18, mime-types@^2.1.26, mime-types@~2.1.17:
+mime-types@^2.1.18, mime-types@^2.1.22, mime-types@^2.1.26, mime-types@~2.1.17:
   version "2.1.27"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
   integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
@@ -17645,7 +17753,7 @@ mimic-fn@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-mimic-fn@^2.1.0:
+mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
@@ -17680,6 +17788,14 @@ mini-create-react-context@^0.4.0:
     "@babel/runtime" "^7.5.5"
     tiny-warning "^1.0.3"
 
+mini-css-extract-plugin@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.0.tgz#ff3bf08bee96e618e177c16ca6131bfecef707f9"
+  integrity sha512-2Zik6PhUZ/MbiboG6SDS9UTPL4XXy4qnyGjSdCIWRrr8xb6PwLtHE+AYOjkXJWdF0OG8vo/yrJ8CgS5WbMpzIg==
+  dependencies:
+    loader-utils "^1.1.0"
+    webpack-sources "^1.1.0"
+
 mini-css-extract-plugin@0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"
@@ -19199,6 +19315,15 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
+os-locale@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
+  dependencies:
+    execa "^1.0.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
+
 os-name@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
@@ -19237,6 +19362,11 @@ p-cancelable@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
   integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
+
 p-defer@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83"
@@ -19257,6 +19387,11 @@ p-finally@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
   integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
 
+p-is-promise@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
+
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -20515,6 +20650,21 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
+promise-polyfill@7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-7.1.0.tgz#4d749485b44577c14137591c6f36e5d7e2dd3378"
+  integrity sha512-P6NJ2wU/8fac44ENORsuqT8TiolKGB2u0fEClPtXezn7w5cmLIjM/7mhPlTebke2EPr6tmqZbXvnX0TxwykGrg==
+
+promise-polyfill@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.0.0.tgz#b47c7fc74052cc5b2132b703cca144f1a5eb56ef"
+  integrity sha512-QGmPnw2hDEaRS6freHynJ7nfS1nDg0/P0c/CGglA43utoJjYQMiY9ojEpK0HaJ4wbUztdmwqQRlEfGWdsEQ5uQ==
+
+promise-polyfill@8.1.3:
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.3.tgz#8c99b3cf53f3a91c68226ffde7bde81d7f904116"
+  integrity sha512-MG5r82wBzh7pSKDRa9y+vllNHz3e3d4CNj1PQE4BQYxLme0gKYYBm9YENq+UkEikyZ0XbiGWxYlVw3Rl9O/U8g==
+
 promise-retry@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
@@ -21005,6 +21155,28 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+react-aplayer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/react-aplayer/-/react-aplayer-1.0.0.tgz#ff8bae803c01d479126b072980783242294fae94"
+  integrity sha512-jGoNhjT8cEieakK5fwXVn2J849RAa4JAx+subEtrAr/34DWpEF8KZohedceyAzsJygSmBWVjX3plNoOMBbPlhA==
+  dependencies:
+    aplayer "^1.10.0"
+    prop-types "^15.6.1"
+    react "^16.2.0"
+
+react-beautiful-dnd@^12.0.0:
+  version "12.2.0"
+  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-12.2.0.tgz#e5f6222f9e7934c6ed4ee09024547f9e353ae423"
+  integrity sha512-s5UrOXNDgeEC+sx65IgbeFlqKKgK3c0UfbrJLWufP34WBheyu5kJ741DtJbsSgPKyNLkqfswpMYr0P8lRj42cA==
+  dependencies:
+    "@babel/runtime-corejs2" "^7.6.3"
+    css-box-model "^1.2.0"
+    memoize-one "^5.1.1"
+    raf-schd "^4.0.2"
+    react-redux "^7.1.1"
+    redux "^4.0.4"
+    use-memo-one "^1.1.1"
+
 react-beautiful-dnd@^13.0.0:
   version "13.0.0"
   resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.0.0.tgz#f70cc8ff82b84bc718f8af157c9f95757a6c3b40"
@@ -21118,6 +21290,15 @@ react-dom@^16.13.1, react-dom@^16.8.3:
     prop-types "^15.6.2"
     scheduler "^0.19.1"
 
+react-dplayer@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/react-dplayer/-/react-dplayer-0.2.3.tgz#45d46ef256df4e69f642a900e8f607c98cb1b8cf"
+  integrity sha512-CcZCeolaGqxfiKF+Fnb8sUYt2gauxXpivZkr3X0Um9l5c/qMsZ2K0fQEV5nGBdTWMQEz2dh01c9vHk5pN3klGg==
+  dependencies:
+    classnames "^2.2.6"
+    dplayer "^1.24.0"
+    prop-types "^15.6.2"
+
 react-draggable@^4.0.3:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3"
@@ -21400,7 +21581,7 @@ react@^16.12.0:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
 
-react@^16.13.1, react@^16.8.3:
+react@^16.13.1, react@^16.2.0, react@^16.8.3:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
   integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
@@ -23062,6 +23243,11 @@ smoothscroll-polyfill@^0.4.3:
   resolved "https://registry.yarnpkg.com/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz#3a259131dc6930e6ca80003e1cb03b603b69abf8"
   integrity sha512-TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg==
 
+smoothscroll@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/smoothscroll/-/smoothscroll-0.4.0.tgz#40e507b46461408ba1b787d0081e1e883c4124a5"
+  integrity sha512-sggQ3U2Un38b3+q/j1P4Y4fCboCtoUIaBYoge+Lb6Xg1H8RTIif/hugVr+ErMtIDpvBbhQfTjtiTeYAfbw1ZGQ==
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -25684,16 +25870,16 @@ uuid@^8.2.0, uuid@^8.3.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
   integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==
 
+v8-compile-cache@^2.0.0, v8-compile-cache@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
+  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
+
 v8-compile-cache@^2.0.3:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
   integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
 
-v8-compile-cache@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
-  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
-
 v8-to-istanbul@^4.1.3:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz#b97936f21c0e2d9996d4985e5c5156e9d4e49cd6"
@@ -26091,6 +26277,23 @@ webpack-chain@^6.0.0:
     deepmerge "^1.5.2"
     javascript-stringify "^2.0.1"
 
+webpack-cli@3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.0.4.tgz#55d6ad2cdd608de8c0f757dde5bc4bf5bd2dec68"
+  integrity sha512-r5R0hMck4GxUS6a3TXClwi1KhQfnHZRtIfXqsSytQZG4kawKMhTtd5//uNZGoGks/h61Zv5jMnR6jwx15Qf8dA==
+  dependencies:
+    chalk "^2.4.1"
+    cross-spawn "^6.0.5"
+    enhanced-resolve "^4.0.0"
+    global-modules-path "^2.1.0"
+    import-local "^1.0.0"
+    inquirer "^6.0.0"
+    interpret "^1.1.0"
+    loader-utils "^1.1.0"
+    supports-color "^5.4.0"
+    v8-compile-cache "^2.0.0"
+    yargs "^11.1.0"
+
 webpack-cli@^3.3.12:
   version "3.3.12"
   resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz#94e9ada081453cd0aa609c99e500012fd3ad2d4a"
@@ -26719,6 +26922,13 @@ yargs-parser@^8.1.0:
   dependencies:
     camelcase "^4.1.0"
 
+yargs-parser@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
+  integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs@^10.0.3:
   version "10.1.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5"
@@ -26737,6 +26947,24 @@ yargs@^10.0.3:
     y18n "^3.2.1"
     yargs-parser "^8.1.0"
 
+yargs@^11.1.0:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766"
+  integrity sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.1.1"
+    find-up "^2.1.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.1.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^9.0.2"
+
 yargs@^13.2.2, yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"

From 51f382b9f58f1d934b01ef474f5066d6d33af3ef Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Tue, 25 Aug 2020 18:29:07 +0200
Subject: [PATCH 16/17] Linter autofix

---
 pioneer/packages/apps/webpack.base.config.js  |  2 +-
 .../joy-media/src/DiscoveryProvider.tsx       |  9 ++++
 .../packages/joy-media/src/IterableFile.ts    |  1 +
 pioneer/packages/joy-media/src/MediaView.tsx  |  2 +-
 pioneer/packages/joy-media/src/Upload.tsx     | 29 +++++++++---
 .../src/channels/ChannelAvatarAndName.tsx     |  1 +
 .../joy-media/src/channels/ChannelHelpers.ts  |  2 +-
 .../src/channels/ChannelNameAsLink.tsx        |  1 +
 .../src/channels/ChannelPreviewStats.tsx      |  1 +
 .../src/channels/ChannelsByOwner.tsx          |  4 +-
 .../src/channels/ChannelsByOwner.view.tsx     |  1 +
 .../joy-media/src/channels/EditChannel.tsx    |  7 +--
 .../src/channels/EditChannel.view.tsx         |  1 +
 .../joy-media/src/channels/ViewChannel.tsx    |  1 +
 .../src/channels/ViewChannel.view.tsx         |  1 +
 .../src/channels/ViewMusicChannel.tsx         |  4 +-
 .../joy-media/src/common/FormTabs.tsx         |  6 ++-
 .../src/common/MediaDropdownOptions.tsx       |  4 +-
 .../joy-media/src/common/MediaForms.tsx       |  5 ++
 .../joy-media/src/common/MediaPlayerView.tsx  |  3 ++
 .../src/common/MediaPlayerWithResolver.tsx    | 15 ++++--
 .../packages/joy-media/src/common/images.tsx  |  1 +
 .../joy-media/src/explore/PlayContent.tsx     |  2 +-
 pioneer/packages/joy-media/src/index.tsx      |  2 +-
 .../src/mocks/ContentLicense.mock.ts          |  2 +-
 .../joy-media/src/mocks/Language.mock.ts      |  2 +-
 .../joy-media/src/mocks/MediaObject.mock.ts   |  2 +-
 .../joy-media/src/mocks/MusicGenre.mock.ts    |  2 +-
 .../joy-media/src/mocks/MusicMood.mock.ts     |  2 +-
 .../joy-media/src/mocks/MusicTheme.mock.ts    |  2 +-
 .../joy-media/src/mocks/VideoCategory.mock.ts |  2 +-
 .../joy-media/src/music/EditMusicAlbum.tsx    |  1 +
 .../src/music/EditMusicAlbum.view.tsx         |  1 +
 .../joy-media/src/music/MusicAlbumTracks.tsx  |  1 +
 .../joy-media/src/music/MusicTrackPreview.tsx |  1 +
 .../src/music/MusicTrackReaderPreview.tsx     |  1 +
 .../joy-media/src/music/MyMusicTracks.tsx     | 18 +++++---
 .../joy-media/src/music/ReorderableTracks.tsx |  4 +-
 .../joy-media/src/schemas/channel/Channel.ts  |  2 +
 .../src/schemas/general/FeaturedContent.ts    |  4 +-
 .../joy-media/src/schemas/music/MusicAlbum.ts |  2 +-
 .../joy-media/src/transport.substrate.ts      | 26 +++++++++--
 pioneer/packages/joy-media/src/transport.ts   | 46 ++++++++++++-------
 .../joy-media/src/upload/EditVideo.view.tsx   |  1 +
 .../joy-media/src/upload/UploadAudio.tsx      |  2 +
 .../joy-media/src/upload/UploadAudio.view.tsx |  1 +
 .../joy-media/src/upload/UploadVideo.tsx      | 14 +++++-
 pioneer/packages/joy-media/src/utils.ts       |  1 +
 .../joy-media/src/video/PlayVideo.tsx         |  1 +
 .../joy-media/src/video/PlayVideo.view.tsx    |  3 +-
 .../joy-media/src/video/VideoPreview.tsx      |  2 +-
 .../src/react/components/InputFileAsync.tsx   |  1 +
 .../joy-utils/src/react/hocs/accounts.tsx     | 18 +++++---
 .../joy-utils/src/transport/SimpleCache.ts    | 12 +++--
 54 files changed, 203 insertions(+), 79 deletions(-)

diff --git a/pioneer/packages/apps/webpack.base.config.js b/pioneer/packages/apps/webpack.base.config.js
index cf4a3ee028..c033fa6565 100644
--- a/pioneer/packages/apps/webpack.base.config.js
+++ b/pioneer/packages/apps/webpack.base.config.js
@@ -49,7 +49,7 @@ function createWebpack (ENV, context) {
   }, {});
 
   // Add @joystream/types as alias to automatically process any changes:
-  alias['@joystream/types'] = path.resolve(context, `../../../types/src`);
+  alias['@joystream/types'] = path.resolve(context, '../../../types/src');
 
   return {
     context,
diff --git a/pioneer/packages/joy-media/src/DiscoveryProvider.tsx b/pioneer/packages/joy-media/src/DiscoveryProvider.tsx
index dfe2be538a..50e0054c3f 100644
--- a/pioneer/packages/joy-media/src/DiscoveryProvider.tsx
+++ b/pioneer/packages/joy-media/src/DiscoveryProvider.tsx
@@ -26,9 +26,11 @@ export type DiscoveryProviderProps = {
 // return string Url with last `/` removed
 function normalizeUrl (url: string | Url): string {
   const st: string = url.toString();
+
   if (st.endsWith('/')) {
     return st.substring(0, st.length - 1);
   }
+
   return st.toString();
 }
 
@@ -79,9 +81,11 @@ function newDiscoveryProvider ({ bootstrapNodes }: BootstrapNodes): DiscoveryPro
           break;
         } catch (err) {
           console.log(err);
+
           if (axios.isCancel(err)) {
             throw err;
           }
+
           continue;
         }
       }
@@ -101,6 +105,7 @@ function newDiscoveryProvider ({ bootstrapNodes }: BootstrapNodes): DiscoveryPro
   const reportUnreachable = (provider: StorageProviderId) => {
     const key = provider.toString();
     const stat = stats.get(key);
+
     if (stat) {
       stat.unreachableReports = stat.unreachableReports + 1;
     }
@@ -122,6 +127,7 @@ export const DiscoveryProviderProvider = (props: React.PropsWithChildren<{}>) =>
 
       console.log('Discovery Provider: Loading bootstrap node from Substrate...');
       const bootstrapNodes = await api.api.query.discovery.bootstrapEndpoints() as Vec<Url>;
+
       setProvider(newDiscoveryProvider({ bootstrapNodes }));
       setLoaded(true);
       console.log('Discovery Provider: Initialized');
@@ -159,6 +165,7 @@ export const useDiscoveryProvider = () =>
 export function withDiscoveryProvider (Component: React.ComponentType<DiscoveryProviderProps>) {
   const ResultComponent: React.FunctionComponent<{}> = (props: React.PropsWithChildren<{}>) => {
     const discoveryProvider = useDiscoveryProvider();
+
     if (!discoveryProvider) {
       return <JoyInfo title={'Please wait...'}>Loading discovery provider.</JoyInfo>;
     }
@@ -169,6 +176,8 @@ export function withDiscoveryProvider (Component: React.ComponentType<DiscoveryP
       </Component>
     );
   };
+
   ResultComponent.displayName = `withDiscoveryProvider(${componentName(Component)})`;
+
   return ResultComponent;
 }
diff --git a/pioneer/packages/joy-media/src/IterableFile.ts b/pioneer/packages/joy-media/src/IterableFile.ts
index 5b7885fd60..65fe272a92 100644
--- a/pioneer/packages/joy-media/src/IterableFile.ts
+++ b/pioneer/packages/joy-media/src/IterableFile.ts
@@ -36,6 +36,7 @@ export class IterableFile implements AsyncIterable<Buffer> {
         e.target.result && resolve(Buffer.from(e.target.result));
         e.target.error && reject(e.target.error);
       };
+
       this.reader.readAsArrayBuffer(blob);
     });
   }
diff --git a/pioneer/packages/joy-media/src/MediaView.tsx b/pioneer/packages/joy-media/src/MediaView.tsx
index a96f5a2c92..ebe2cb18a6 100644
--- a/pioneer/packages/joy-media/src/MediaView.tsx
+++ b/pioneer/packages/joy-media/src/MediaView.tsx
@@ -54,7 +54,7 @@ export function MediaView<A extends Record<string, unknown> = Record<string, unk
     const [resolvedProps, setResolvedProps] = useState({} as B);
     const [propsResolved, setPropsResolved] = useState(false);
 
-    const initialDeps = triggers.map(propName => serializeTrigger(initialProps[propName]));
+    const initialDeps = triggers.map((propName) => serializeTrigger(initialProps[propName]));
     const rerenderDeps = [...initialDeps, myAddress];
 
     useEffect(() => {
diff --git a/pioneer/packages/joy-media/src/Upload.tsx b/pioneer/packages/joy-media/src/Upload.tsx
index 0c1b0fcc39..5da8ffde76 100644
--- a/pioneer/packages/joy-media/src/Upload.tsx
+++ b/pioneer/packages/joy-media/src/Upload.tsx
@@ -5,7 +5,7 @@ import { History } from 'history';
 import { Progress, Message } from 'semantic-ui-react';
 
 import { mockRegistry } from '@joystream/types';
-import { InputFileAsync } from '@polkadot/joy-utils/react/components';
+import { InputFileAsync, TxButton, JoyInfo, Loading } from '@polkadot/joy-utils/react/components';
 import { ApiProps } from '@polkadot/react-api/types';
 import { I18nProps } from '@polkadot/react-components/types';
 import { SubmittableResult } from '@polkadot/api';
@@ -19,14 +19,13 @@ import { ContentId, DataObject } from '@joystream/types/media';
 import { MyAccountProps } from '@polkadot/joy-utils/react/hocs/accounts';
 import { withOnlyMembers } from '@polkadot/joy-utils/react/hocs/guards';
 import { DiscoveryProviderProps, withDiscoveryProvider } from './DiscoveryProvider';
-import { TxButton } from '@polkadot/joy-utils/react/components';
+
 import IpfsHash from 'ipfs-only-hash';
 import { ChannelId } from '@joystream/types/content-working-group';
 import { EditVideoView } from './upload/EditVideo.view';
-import { JoyInfo } from '@polkadot/joy-utils/react/components';
+
 import { IterableFile } from './IterableFile';
 import { StorageProviderId } from '@joystream/types/working-group';
-import { Loading } from '@polkadot/joy-utils/react/components';
 
 const MAX_FILE_SIZE_MB = 500;
 const MAX_FILE_SIZE_BYTES = MAX_FILE_SIZE_MB * 1024 * 1024;
@@ -77,6 +76,7 @@ class Upload extends React.PureComponent<Props, State> {
     });
 
     const { cancelSource } = this.state;
+
     cancelSource.cancel('unmounting');
   }
 
@@ -101,6 +101,7 @@ class Upload extends React.PureComponent<Props, State> {
 
   private renderError () {
     const { error } = this.state;
+
     return (
       <Message error className='JoyMainStatus'>
         <Message.Header>Failed to upload your file</Message.Header>
@@ -112,6 +113,7 @@ class Upload extends React.PureComponent<Props, State> {
 
   private resetForm = () => {
     const { cancelSource } = this.state;
+
     this.setState({
       ...defaultState(),
       cancelSource
@@ -120,6 +122,7 @@ class Upload extends React.PureComponent<Props, State> {
 
   private renderUploading () {
     const { file, newContentId, progress, error } = this.state;
+
     if (!file || !file.name) return <JoyInfo title='Loading...' />;
 
     const success = !error && progress >= 100;
@@ -139,7 +142,7 @@ class Upload extends React.PureComponent<Props, State> {
   }
 
   private renderSendingTx () {
-    return <JoyInfo title="Please wait..."><Loading text="Waiting for the transaction confirmation..." /></JoyInfo>
+    return <JoyInfo title='Please wait...'><Loading text='Waiting for the transaction confirmation...' /></JoyInfo>;
   }
 
   private renderDiscovering () {
@@ -152,6 +155,7 @@ class Upload extends React.PureComponent<Props, State> {
     const success = !error && progress >= 100;
 
     let label = '';
+
     if (active) {
       label = 'Your file is uploading. Please keep this page open until it\'s done.';
     } else if (success) {
@@ -175,7 +179,7 @@ class Upload extends React.PureComponent<Props, State> {
 
     return <div className='UploadSelectForm'>
       <InputFileAsync
-        label=""
+        label=''
         withLabel={false}
         className={`UploadInputFile ${file_name ? 'FileSelected' : ''}`}
         placeholder={
@@ -203,7 +207,7 @@ class Upload extends React.PureComponent<Props, State> {
             sendTx();
           }}
           txSuccessCb={ this.onDataObjectCreated }
-          txFailedCb={() => { this.setState({ sendingTx: false }) }}
+          txFailedCb={() => { this.setState({ sendingTx: false }); }}
         />
       </div>}
     </div>;
@@ -258,11 +262,13 @@ class Upload extends React.PureComponent<Props, State> {
 
   private buildTxParams = () => {
     const { file, newContentId, ipfs_cid } = this.state;
+
     if (!file || !ipfs_cid) return [];
 
     // TODO get corresponding data type id based on file content
     const dataObjectTypeId = new BN(1);
     const { myMemberId } = this.props;
+
     return [myMemberId, newContentId, dataObjectTypeId, new BN(file.size), ipfs_cid];
   }
 
@@ -272,6 +278,7 @@ class Upload extends React.PureComponent<Props, State> {
     const { api } = this.props;
     const { newContentId } = this.state;
     let dataObject: Option<DataObject>;
+
     try {
       dataObject = await api.query.dataDirectory.dataObjectByContentId(newContentId) as Option<DataObject>;
     } catch (err) {
@@ -279,6 +286,7 @@ class Upload extends React.PureComponent<Props, State> {
         error: err,
         discovering: false
       });
+
       return;
     }
 
@@ -290,6 +298,7 @@ class Upload extends React.PureComponent<Props, State> {
 
     if (dataObject.isSome) {
       const storageProvider = dataObject.unwrap().liaison;
+
       this.uploadFileTo(storageProvider);
     } else {
       this.setState({
@@ -301,11 +310,13 @@ class Upload extends React.PureComponent<Props, State> {
 
   private uploadFileTo = async (storageProvider: StorageProviderId) => {
     const { file, newContentId, cancelSource } = this.state;
+
     if (!file || !file.size) {
       this.setState({
         error: new Error('No file to upload!'),
         discovering: false
       });
+
       return;
     }
 
@@ -320,6 +331,7 @@ class Upload extends React.PureComponent<Props, State> {
       cancelToken: cancelSource.token,
       onUploadProgress: (progressEvent: any) => {
         const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total);
+
         this.setState({
           progress: percentCompleted
         });
@@ -328,6 +340,7 @@ class Upload extends React.PureComponent<Props, State> {
 
     const { discoveryProvider } = this.props;
     let url: string;
+
     try {
       url = await discoveryProvider.resolveAssetEndpoint(storageProvider, contentId, cancelSource.token);
     } catch (err) {
@@ -351,9 +364,11 @@ class Upload extends React.PureComponent<Props, State> {
       await axios.put<{ message: string }>(url, file, config);
     } catch (err) {
       this.setState({ progress: 0, error: err, uploading: false });
+
       if (axios.isCancel(err)) {
         return;
       }
+
       if (!err.response || (err.response.status >= 500 && err.response.status <= 504)) {
         // network connection error
         discoveryProvider.reportUnreachable(storageProvider);
diff --git a/pioneer/packages/joy-media/src/channels/ChannelAvatarAndName.tsx b/pioneer/packages/joy-media/src/channels/ChannelAvatarAndName.tsx
index ca553c6b1f..16f9f06aac 100644
--- a/pioneer/packages/joy-media/src/channels/ChannelAvatarAndName.tsx
+++ b/pioneer/packages/joy-media/src/channels/ChannelAvatarAndName.tsx
@@ -9,6 +9,7 @@ type Props = {
 
 export const ChannelAvatarAndName = (props: Props) => {
   const { channel } = props;
+
   return (
     <div className={'ChannelPreview small'}>
       <ChannelAvatar channel={channel} size='small' />
diff --git a/pioneer/packages/joy-media/src/channels/ChannelHelpers.ts b/pioneer/packages/joy-media/src/channels/ChannelHelpers.ts
index 9e3558e5bf..6ea47c8253 100644
--- a/pioneer/packages/joy-media/src/channels/ChannelHelpers.ts
+++ b/pioneer/packages/joy-media/src/channels/ChannelHelpers.ts
@@ -4,7 +4,7 @@ import { ChannelPublicationStatusAllValues } from '@joystream/types/content-work
 
 export const ChannelPublicationStatusDropdownOptions =
   ChannelPublicationStatusAllValues
-    .map(x => ({ key: x, value: x, text: x }));
+    .map((x) => ({ key: x, value: x, text: x }));
 
 export const isVideoChannel = (channel: ChannelType) => {
   return channel.content === 'Video';
diff --git a/pioneer/packages/joy-media/src/channels/ChannelNameAsLink.tsx b/pioneer/packages/joy-media/src/channels/ChannelNameAsLink.tsx
index d794b57602..884516a00d 100644
--- a/pioneer/packages/joy-media/src/channels/ChannelNameAsLink.tsx
+++ b/pioneer/packages/joy-media/src/channels/ChannelNameAsLink.tsx
@@ -10,6 +10,7 @@ type Props = {
 
 export const ChannelNameAsLink = (props: Props) => {
   const { channel, className, style } = props;
+
   return (
     <Link to={`/media/channels/${channel.id}`} className={className} style={style}>
       {channel.title || channel.handle}
diff --git a/pioneer/packages/joy-media/src/channels/ChannelPreviewStats.tsx b/pioneer/packages/joy-media/src/channels/ChannelPreviewStats.tsx
index cee1016479..12835cd3b8 100644
--- a/pioneer/packages/joy-media/src/channels/ChannelPreviewStats.tsx
+++ b/pioneer/packages/joy-media/src/channels/ChannelPreviewStats.tsx
@@ -13,6 +13,7 @@ export const ChannelPreviewStats = (props: Props) => {
   const statSize = 'tiny';
 
   let itemsPublishedLabel = '';
+
   if (channel.content === 'Video') {
     itemsPublishedLabel = 'Videos';
   } else if (channel.content === 'Music') {
diff --git a/pioneer/packages/joy-media/src/channels/ChannelsByOwner.tsx b/pioneer/packages/joy-media/src/channels/ChannelsByOwner.tsx
index 4e29d3420f..08d1d60a0d 100644
--- a/pioneer/packages/joy-media/src/channels/ChannelsByOwner.tsx
+++ b/pioneer/packages/joy-media/src/channels/ChannelsByOwner.tsx
@@ -19,7 +19,8 @@ const TabsAndChannels = (props: ChannelsByOwnerProps) => {
 
   let videoChannelsCount = 0;
   let musicChannelsCount = 0;
-  allChannels.forEach(x => {
+
+  allChannels.forEach((x) => {
     if (x.content === 'Video') {
       videoChannelsCount++;
     } else if (x.content === 'Music') {
@@ -38,6 +39,7 @@ const TabsAndChannels = (props: ChannelsByOwnerProps) => {
 
   const switchTab = (activeIndex: number) => {
     const activeContentType = contentTypeByTabIndex[activeIndex];
+
     if (activeContentType === undefined) {
       setChannels(allChannels);
     } else {
diff --git a/pioneer/packages/joy-media/src/channels/ChannelsByOwner.view.tsx b/pioneer/packages/joy-media/src/channels/ChannelsByOwner.view.tsx
index 897ab0defe..07992e8884 100644
--- a/pioneer/packages/joy-media/src/channels/ChannelsByOwner.view.tsx
+++ b/pioneer/packages/joy-media/src/channels/ChannelsByOwner.view.tsx
@@ -13,6 +13,7 @@ export const ChannelsByOwnerView = MediaView<Props>({
   resolveProps: async (props) => {
     const { transport, accountId } = props;
     const channels = await transport.channelsByAccount(accountId);
+
     return { channels };
   }
 });
diff --git a/pioneer/packages/joy-media/src/channels/EditChannel.tsx b/pioneer/packages/joy-media/src/channels/EditChannel.tsx
index e701f5afc5..d7c8eed135 100644
--- a/pioneer/packages/joy-media/src/channels/EditChannel.tsx
+++ b/pioneer/packages/joy-media/src/channels/EditChannel.tsx
@@ -4,7 +4,7 @@ import { Form, withFormik } from 'formik';
 import { History } from 'history';
 
 import { Option } from '@polkadot/types';
-import { TxButton } from '@polkadot/joy-utils/react/components';
+import { TxButton, JoyError, Section } from '@polkadot/joy-utils/react/components';
 import { onImageError } from '../common/images';
 import { withMediaForm, MediaFormProps } from '../common/MediaForms';
 import { ChannelType, ChannelClass as Fields, buildChannelValidationSchema, ChannelFormValues, ChannelToFormValues, ChannelGenericProp } from '../schemas/channel/Channel';
@@ -16,8 +16,7 @@ import { ChannelPublicationStatusDropdownOptions, isAccountAChannelOwner } from
 import { TxCallback } from '@polkadot/react-components/Status/types';
 import { SubmittableResult } from '@polkadot/api';
 import { ChannelValidationConstraints } from '../transport';
-import { JoyError } from '@polkadot/joy-utils/react/components';
-import { Section } from '@polkadot/joy-utils/react/components';
+
 import { useApi } from '@polkadot/react-hooks';
 
 export type OuterProps = {
@@ -200,11 +199,13 @@ export const EditForm = withFormik<OuterProps, FormValues>({
   // Transform outer props into form values
   mapPropsToValues: (props): FormValues => {
     const { entity } = props;
+
     return ChannelToFormValues(entity);
   },
 
   validationSchema: (props: OuterProps): any => {
     const { constraints } = props;
+
     if (!constraints) return null;
 
     return buildChannelValidationSchema(constraints);
diff --git a/pioneer/packages/joy-media/src/channels/EditChannel.view.tsx b/pioneer/packages/joy-media/src/channels/EditChannel.view.tsx
index 3fcaa55696..6ea43c8cc8 100644
--- a/pioneer/packages/joy-media/src/channels/EditChannel.view.tsx
+++ b/pioneer/packages/joy-media/src/channels/EditChannel.view.tsx
@@ -15,6 +15,7 @@ export const EditChannelView = MediaView<Props>({
     const { transport, id } = props;
     const entity = id && await transport.channelById(id);
     const constraints = await transport.channelValidationConstraints();
+
     return { entity, constraints };
   }
 });
diff --git a/pioneer/packages/joy-media/src/channels/ViewChannel.tsx b/pioneer/packages/joy-media/src/channels/ViewChannel.tsx
index aafabb9c0d..7f35b05331 100644
--- a/pioneer/packages/joy-media/src/channels/ViewChannel.tsx
+++ b/pioneer/packages/joy-media/src/channels/ViewChannel.tsx
@@ -31,6 +31,7 @@ export function ViewChannel (props: ViewChannelProps) {
 
   if (isVideoChannel(channel)) {
     const previews = toVideoPreviews(videos);
+
     return <ViewVideoChannel channel={channel} videos={previews} />;
   } else if (isMusicChannel(channel)) {
     return <ViewMusicChannel channel={channel} albums={albums} tracks={tracks} />;
diff --git a/pioneer/packages/joy-media/src/channels/ViewChannel.view.tsx b/pioneer/packages/joy-media/src/channels/ViewChannel.view.tsx
index 453c4481a1..7bd52b9b56 100644
--- a/pioneer/packages/joy-media/src/channels/ViewChannel.view.tsx
+++ b/pioneer/packages/joy-media/src/channels/ViewChannel.view.tsx
@@ -14,6 +14,7 @@ export const ViewChannelView = MediaView<Props>({
     const { transport, id } = props;
     const channel = await transport.channelById(id);
     const videos = await transport.videosByChannelId(id);
+
     return { channel, videos };
   }
 });
diff --git a/pioneer/packages/joy-media/src/channels/ViewMusicChannel.tsx b/pioneer/packages/joy-media/src/channels/ViewMusicChannel.tsx
index 75836704e8..3fd24d1c1c 100644
--- a/pioneer/packages/joy-media/src/channels/ViewMusicChannel.tsx
+++ b/pioneer/packages/joy-media/src/channels/ViewMusicChannel.tsx
@@ -27,7 +27,7 @@ export function ViewMusicChannel (props: Props) {
     !albums.length
       ? <NoAlbums />
       : <Section title={'Music albums'}>
-        {albums.map(x => <MusicAlbumPreview key={x.id} {...x} />)}
+        {albums.map((x) => <MusicAlbumPreview key={x.id} {...x} />)}
       </Section>
   );
 
@@ -35,7 +35,7 @@ export function ViewMusicChannel (props: Props) {
     !tracks.length
       ? <NoTracks />
       : <Section title={'Music tracks'}>
-        {tracks.map(x => <MusicTrackReaderPreview key={x.id} {...x} />)}
+        {tracks.map((x) => <MusicTrackReaderPreview key={x.id} {...x} />)}
       </Section>
   );
 
diff --git a/pioneer/packages/joy-media/src/common/FormTabs.tsx b/pioneer/packages/joy-media/src/common/FormTabs.tsx
index 1d1b32c1df..01610afb20 100644
--- a/pioneer/packages/joy-media/src/common/FormTabs.tsx
+++ b/pioneer/packages/joy-media/src/common/FormTabs.tsx
@@ -20,7 +20,7 @@ export function FormTabs <FormValues> (props: FormTabsProps<FormValues>) {
 
   return <Tab
     menu={{ secondary: true, pointing: true, color: 'blue' }}
-    panes={panes.map(tab => {
+    panes={panes.map((tab) => {
       const {
         id,
         fields = [],
@@ -29,8 +29,10 @@ export function FormTabs <FormValues> (props: FormTabsProps<FormValues>) {
       } = tab;
 
       const tabErrors: any[] = [];
-      fields.forEach(f => {
+
+      fields.forEach((f) => {
         const err = errors[f.id];
+
         if (err) {
           tabErrors.push(err);
         }
diff --git a/pioneer/packages/joy-media/src/common/MediaDropdownOptions.tsx b/pioneer/packages/joy-media/src/common/MediaDropdownOptions.tsx
index 0fd9b77b0b..a9ec671ba0 100644
--- a/pioneer/packages/joy-media/src/common/MediaDropdownOptions.tsx
+++ b/pioneer/packages/joy-media/src/common/MediaDropdownOptions.tsx
@@ -5,10 +5,10 @@ import { TextValueEntity } from '@joystream/types/versioned-store/EntityCodec';
 import { InternalEntities } from '../transport';
 
 const buildOptions = (entities: TextValueEntity[]): DropdownItemProps[] =>
-  entities.map(x => ({ key: x.id, value: x.id, text: x.value }));
+  entities.map((x) => ({ key: x.id, value: x.id, text: x.value }));
 
 const buildLanguageOptions = (entities: LanguageType[]): DropdownItemProps[] =>
-  entities.map(x => ({ key: x.id, value: x.id, text: ISO6391.getName(x.value) }));
+  entities.map((x) => ({ key: x.id, value: x.id, text: ISO6391.getName(x.value) }));
 
 export class MediaDropdownOptions {
   public languageOptions: DropdownItemProps[]
diff --git a/pioneer/packages/joy-media/src/common/MediaForms.tsx b/pioneer/packages/joy-media/src/common/MediaForms.tsx
index 45fbb8f0d7..eca2b05a26 100644
--- a/pioneer/packages/joy-media/src/common/MediaForms.tsx
+++ b/pioneer/packages/joy-media/src/common/MediaForms.tsx
@@ -78,6 +78,7 @@ export function withMediaForm<OuterProps, FormValues>
 
   function MediaText (props: MediaTextProps<OuterProps, FormValues>) {
     const { field: f } = props;
+
     return !f ? null : <LabelledText name={f.id} label={f.name} tooltip={f.description} required={f.required} {...props} />;
   }
 
@@ -138,6 +139,7 @@ export function withMediaForm<OuterProps, FormValues>
 
       const isFieldChanged = (field: FieldName | FieldObject): boolean => {
         const fieldName = typeof field === 'string' ? field : (field as FieldObject).id;
+
         return (
           dirty &&
           touched[fieldName] === true &&
@@ -159,6 +161,7 @@ export function withMediaForm<OuterProps, FormValues>
 
       const onTxFailed: TxFailedCallback = (txResult: SubmittableResult | null) => {
         setSubmitting(false);
+
         if (txResult === null) {
           // Tx cancelled
 
@@ -187,6 +190,8 @@ export function withMediaForm<OuterProps, FormValues>
 
       return <Component {...allProps} />;
     };
+
   ResultComponent.displayName = `withMediaForm(${componentName(Component)})`;
+
   return ResultComponent;
 }
diff --git a/pioneer/packages/joy-media/src/common/MediaPlayerView.tsx b/pioneer/packages/joy-media/src/common/MediaPlayerView.tsx
index 4f748d28c7..bb65346c13 100644
--- a/pioneer/packages/joy-media/src/common/MediaPlayerView.tsx
+++ b/pioneer/packages/joy-media/src/common/MediaPlayerView.tsx
@@ -78,6 +78,7 @@ function Player (props: PlayerProps) {
 
   if (prefix === 'video') {
     const video = { url, name, pic: cover };
+
     return <DPlayer
       video={video}
       {...PLAYER_COMMON_PARAMS}
@@ -86,6 +87,7 @@ function Player (props: PlayerProps) {
     />;
   } else if (prefix === 'audio') {
     const audio = { url, name, cover };
+
     return <APlayer
       audio={audio}
       {...PLAYER_COMMON_PARAMS}
@@ -101,6 +103,7 @@ function InnerComponent (props: MediaPlayerViewProps) {
   const { video, resolvedAssetUrl: url } = props;
 
   const { dataObjectOpt, channel } = props;
+
   if (!dataObjectOpt || dataObjectOpt.isNone) {
     return null;
   }
diff --git a/pioneer/packages/joy-media/src/common/MediaPlayerWithResolver.tsx b/pioneer/packages/joy-media/src/common/MediaPlayerWithResolver.tsx
index af10f02f7c..fa6473fd84 100644
--- a/pioneer/packages/joy-media/src/common/MediaPlayerWithResolver.tsx
+++ b/pioneer/packages/joy-media/src/common/MediaPlayerWithResolver.tsx
@@ -39,22 +39,24 @@ function InnerComponent (props: Props) {
     const allRelationships: Option<DataObjectStorageRelationship>[] = await Promise.all(rids.map((id) => api.query.dataObjectStorageRegistry.relationships(id))) as any;
 
     // Providers that have signalled onchain that they have the asset
-    let readyProviders = allRelationships.filter(r => r.isSome).map(r => r.unwrap())
-      .filter(r => r.ready)
-      .map(r => r.storage_provider);
+    let readyProviders = allRelationships.filter((r) => r.isSome).map((r) => r.unwrap())
+      .filter((r) => r.ready)
+      .map((r) => r.storage_provider);
 
     // runtime doesn't currently guarantee unique set
-    readyProviders = _.uniqBy(readyProviders, provider => provider.toString());
+    readyProviders = _.uniqBy(readyProviders, (provider) => provider.toString());
 
     if (!readyProviders.length) {
       setError(new Error('No Storage Providers found storing this content'));
+
       return;
     }
 
     const activeProviders = (await transport.workingGroups.allWorkers('Storage')).map(([id]) => id);
+
     // filter out providers no longer active - relationships of providers that have left
     // are not pruned onchain.
-    readyProviders = _.intersectionBy(activeProviders, readyProviders, provider => provider.toString());
+    readyProviders = _.intersectionBy(activeProviders, readyProviders, (provider) => provider.toString());
 
     console.log(`Found ${readyProviders.length} providers ready to serve content: ${readyProviders}`);
 
@@ -67,9 +69,11 @@ function InnerComponent (props: Props) {
     // loop over providers until we find one that responds
     while (readyProviders.length) {
       const provider = readyProviders.shift();
+
       if (!provider) continue;
 
       let assetUrl: string | undefined;
+
       try {
         assetUrl = await discoveryProvider.resolveAssetEndpoint(provider, contentId.encode(), cancelSource.token);
       } catch (err) {
@@ -132,6 +136,7 @@ function InnerComponent (props: Props) {
   }
 
   const playerProps = { ...props, contentType, resolvedAssetUrl };
+
   return <MediaPlayerView {...playerProps} />;
 }
 
diff --git a/pioneer/packages/joy-media/src/common/images.tsx b/pioneer/packages/joy-media/src/common/images.tsx
index 801fafa4df..859dedbe78 100644
--- a/pioneer/packages/joy-media/src/common/images.tsx
+++ b/pioneer/packages/joy-media/src/common/images.tsx
@@ -10,6 +10,7 @@ type ImageOnErrorEvent = EventTarget & {
 
 export function onImageError (event: React.SyntheticEvent<HTMLImageElement, Event>) {
   const target = event.target as ImageOnErrorEvent;
+
   // Set onerror callback to undefined to prevent infinite callbacks when image src path fails:
   target.onerror = undefined;
   target.src = DEFAULT_THUMBNAIL_URL;
diff --git a/pioneer/packages/joy-media/src/explore/PlayContent.tsx b/pioneer/packages/joy-media/src/explore/PlayContent.tsx
index 83defcd126..dd5e86225b 100644
--- a/pioneer/packages/joy-media/src/explore/PlayContent.tsx
+++ b/pioneer/packages/joy-media/src/explore/PlayContent.tsx
@@ -85,7 +85,7 @@ export function PlayContent (props: Props) {
     {featuredAlbums.length > 0 &&
       <div className='JoyPlayAlbum_RightSidePanel'>
         <h3>Featured albums</h3>
-        {featuredAlbums.map(x => <MusicAlbumPreview key={x.id} {...x} size={170} />)}
+        {featuredAlbums.map((x) => <MusicAlbumPreview key={x.id} {...x} size={170} />)}
       </div>
     }
   </div>;
diff --git a/pioneer/packages/joy-media/src/index.tsx b/pioneer/packages/joy-media/src/index.tsx
index ecb13ba134..acda86b3fb 100644
--- a/pioneer/packages/joy-media/src/index.tsx
+++ b/pioneer/packages/joy-media/src/index.tsx
@@ -46,7 +46,7 @@ function App (props: Props) {
     //   name: `account/${myAddress}/videos`,
     //   text: t('My videos')
     // }
-  ].filter(x => x !== undefined) as TabItem[];
+  ].filter((x) => x !== undefined) as TabItem[];
 
   return (
     <SubstrateTransportProvider>
diff --git a/pioneer/packages/joy-media/src/mocks/ContentLicense.mock.ts b/pioneer/packages/joy-media/src/mocks/ContentLicense.mock.ts
index e9c5ffc99d..09eb0f4525 100644
--- a/pioneer/packages/joy-media/src/mocks/ContentLicense.mock.ts
+++ b/pioneer/packages/joy-media/src/mocks/ContentLicense.mock.ts
@@ -9,6 +9,6 @@ const values = [
 ];
 
 export const AllContentLicenses: ContentLicenseType[] =
-  values.map(value => ({ id: newEntityId(), value })) as unknown as ContentLicenseType[]; // A hack to fix TS compilation.
+  values.map((value) => ({ id: newEntityId(), value })) as unknown as ContentLicenseType[]; // A hack to fix TS compilation.
 
 export const ContentLicense = AllContentLicenses[0];
diff --git a/pioneer/packages/joy-media/src/mocks/Language.mock.ts b/pioneer/packages/joy-media/src/mocks/Language.mock.ts
index 70ebd051fe..c4ecfc380f 100644
--- a/pioneer/packages/joy-media/src/mocks/Language.mock.ts
+++ b/pioneer/packages/joy-media/src/mocks/Language.mock.ts
@@ -6,6 +6,6 @@ const values = [
 ];
 
 export const AllLanguages: LanguageType[] =
-  values.map(value => ({ id: newEntityId(), value })) as unknown as LanguageType[]; // A hack to fix TS compilation.
+  values.map((value) => ({ id: newEntityId(), value })) as unknown as LanguageType[]; // A hack to fix TS compilation.
 
 export const Language = AllLanguages[0];
diff --git a/pioneer/packages/joy-media/src/mocks/MediaObject.mock.ts b/pioneer/packages/joy-media/src/mocks/MediaObject.mock.ts
index 7fce1ed0ee..bfd0cac211 100644
--- a/pioneer/packages/joy-media/src/mocks/MediaObject.mock.ts
+++ b/pioneer/packages/joy-media/src/mocks/MediaObject.mock.ts
@@ -12,6 +12,6 @@ const values = [
 ];
 
 export const AllMediaObjects: MediaObjectType[] =
-  values.map(value => ({ id: newEntityId(), value })) as unknown as MediaObjectType[]; // A hack to fix TS compilation.
+  values.map((value) => ({ id: newEntityId(), value })) as unknown as MediaObjectType[]; // A hack to fix TS compilation.
 
 export const MediaObject = AllMediaObjects[0];
diff --git a/pioneer/packages/joy-media/src/mocks/MusicGenre.mock.ts b/pioneer/packages/joy-media/src/mocks/MusicGenre.mock.ts
index 9c005ed01d..c412d95ed9 100644
--- a/pioneer/packages/joy-media/src/mocks/MusicGenre.mock.ts
+++ b/pioneer/packages/joy-media/src/mocks/MusicGenre.mock.ts
@@ -26,6 +26,6 @@ const values = [
 ];
 
 export const AllMusicGenres: MusicGenreType[] =
-  values.map(value => ({ id: newEntityId(), value })) as unknown as MusicGenreType[]; // A hack to fix TS compilation.
+  values.map((value) => ({ id: newEntityId(), value })) as unknown as MusicGenreType[]; // A hack to fix TS compilation.
 
 export const MusicGenre = AllMusicGenres[0];
diff --git a/pioneer/packages/joy-media/src/mocks/MusicMood.mock.ts b/pioneer/packages/joy-media/src/mocks/MusicMood.mock.ts
index b2624c0176..b7c871ad61 100644
--- a/pioneer/packages/joy-media/src/mocks/MusicMood.mock.ts
+++ b/pioneer/packages/joy-media/src/mocks/MusicMood.mock.ts
@@ -294,6 +294,6 @@ const values = [
 ];
 
 export const AllMusicMoods: MusicMoodType[] =
-  values.map(value => ({ id: newEntityId(), value })) as unknown as MusicMoodType[]; // A hack to fix TS compilation.
+  values.map((value) => ({ id: newEntityId(), value })) as unknown as MusicMoodType[]; // A hack to fix TS compilation.
 
 export const MusicMood = AllMusicMoods[0];
diff --git a/pioneer/packages/joy-media/src/mocks/MusicTheme.mock.ts b/pioneer/packages/joy-media/src/mocks/MusicTheme.mock.ts
index 20373fb812..af1db48ad6 100644
--- a/pioneer/packages/joy-media/src/mocks/MusicTheme.mock.ts
+++ b/pioneer/packages/joy-media/src/mocks/MusicTheme.mock.ts
@@ -187,6 +187,6 @@ const values = [
 ];
 
 export const AllMusicThemes: MusicThemeType[] =
-  values.map(value => ({ id: newEntityId(), value })) as unknown as MusicThemeType[]; // A hack to fix TS compilation.
+  values.map((value) => ({ id: newEntityId(), value })) as unknown as MusicThemeType[]; // A hack to fix TS compilation.
 
 export const MusicTheme = AllMusicThemes[0];
diff --git a/pioneer/packages/joy-media/src/mocks/VideoCategory.mock.ts b/pioneer/packages/joy-media/src/mocks/VideoCategory.mock.ts
index d235004232..8eada98733 100644
--- a/pioneer/packages/joy-media/src/mocks/VideoCategory.mock.ts
+++ b/pioneer/packages/joy-media/src/mocks/VideoCategory.mock.ts
@@ -20,6 +20,6 @@ const values = [
 ];
 
 export const AllVideoCategories: VideoCategoryType[] =
-  values.map(value => ({ id: newEntityId(), value })) as unknown as VideoCategoryType[]; // A hack to fix TS compilation.
+  values.map((value) => ({ id: newEntityId(), value })) as unknown as VideoCategoryType[]; // A hack to fix TS compilation.
 
 export const VideoCategory = AllVideoCategories[0];
diff --git a/pioneer/packages/joy-media/src/music/EditMusicAlbum.tsx b/pioneer/packages/joy-media/src/music/EditMusicAlbum.tsx
index 7bb7374add..1ed8210af1 100644
--- a/pioneer/packages/joy-media/src/music/EditMusicAlbum.tsx
+++ b/pioneer/packages/joy-media/src/music/EditMusicAlbum.tsx
@@ -166,6 +166,7 @@ export const EditForm = withFormik<OuterProps, FormValues>({
   // Transform outer props into form values
   mapPropsToValues: (props): FormValues => {
     const { entity } = props;
+
     return MusicAlbumToFormValues(entity);
   },
 
diff --git a/pioneer/packages/joy-media/src/music/EditMusicAlbum.view.tsx b/pioneer/packages/joy-media/src/music/EditMusicAlbum.view.tsx
index 4e52b8657c..7ba8eb9154 100644
--- a/pioneer/packages/joy-media/src/music/EditMusicAlbum.view.tsx
+++ b/pioneer/packages/joy-media/src/music/EditMusicAlbum.view.tsx
@@ -8,6 +8,7 @@ export const EditMusicAlbumView = MediaView<OuterProps>({
     const { transport, id } = props;
     const entity = id ? await transport.musicAlbumById(id) : undefined;
     const opts = await transport.dropdownOptions();
+
     return { entity, opts };
   }
 });
diff --git a/pioneer/packages/joy-media/src/music/MusicAlbumTracks.tsx b/pioneer/packages/joy-media/src/music/MusicAlbumTracks.tsx
index e72af097dc..9fa63c7a27 100644
--- a/pioneer/packages/joy-media/src/music/MusicAlbumTracks.tsx
+++ b/pioneer/packages/joy-media/src/music/MusicAlbumTracks.tsx
@@ -21,6 +21,7 @@ export function TracksOfMyMusicAlbum (props: TracksOfMyMusicAlbumProps) {
     data: CheckboxProps
   ) => {
     const set = new Set(idxsOfSelectedTracks);
+
     data.checked
       ? set.add(trackIdx)
       : set.delete(trackIdx)
diff --git a/pioneer/packages/joy-media/src/music/MusicTrackPreview.tsx b/pioneer/packages/joy-media/src/music/MusicTrackPreview.tsx
index 09b980fe71..6d8e433f69 100644
--- a/pioneer/packages/joy-media/src/music/MusicTrackPreview.tsx
+++ b/pioneer/packages/joy-media/src/music/MusicTrackPreview.tsx
@@ -35,6 +35,7 @@ export function MusicTrackPreview (props: EditableMusicTrackPreviewProps) {
     } catch (err) {
       console.log('Error during checkbox change:', err);
     }
+
     setChecked(d.checked || false);
   };
 
diff --git a/pioneer/packages/joy-media/src/music/MusicTrackReaderPreview.tsx b/pioneer/packages/joy-media/src/music/MusicTrackReaderPreview.tsx
index caccabf532..9a834a5423 100644
--- a/pioneer/packages/joy-media/src/music/MusicTrackReaderPreview.tsx
+++ b/pioneer/packages/joy-media/src/music/MusicTrackReaderPreview.tsx
@@ -14,6 +14,7 @@ export function MusicTrackReaderPreview (props: MusicTrackReaderPreviewProps) {
   const { size = 200, orientation = 'vertical' } = props;
 
   const descStyle: CSSProperties = {};
+
   if (orientation === 'vertical') {
     descStyle.maxWidth = size;
   }
diff --git a/pioneer/packages/joy-media/src/music/MyMusicTracks.tsx b/pioneer/packages/joy-media/src/music/MyMusicTracks.tsx
index 927d507004..cbaaeab857 100644
--- a/pioneer/packages/joy-media/src/music/MyMusicTracks.tsx
+++ b/pioneer/packages/joy-media/src/music/MyMusicTracks.tsx
@@ -1,8 +1,8 @@
 import React, { useState } from 'react';
 import { Button, CheckboxProps, Dropdown, Message } from 'semantic-ui-react';
 
-import { Pluralize } from '@polkadot/joy-utils/react/components';
-import { Section } from '@polkadot/joy-utils/react/components';
+import { Pluralize, Section } from '@polkadot/joy-utils/react/components';
+
 import { EditableMusicTrackPreviewProps, MusicTrackPreview } from './MusicTrackPreview';
 import { ReorderableTracks } from './ReorderableTracks';
 import { MusicAlbumPreviewProps } from './MusicAlbumPreview';
@@ -36,14 +36,16 @@ export function MyMusicTracks (props: MyMusicTracksProps) {
   const selectedCount = idsOfSelectedTracks.size;
 
   let longestAlbumName = '';
-  albums.forEach(x => {
+
+  albums.forEach((x) => {
     if (longestAlbumName.length < x.title.length) {
       longestAlbumName = x.title;
     }
   });
 
-  const albumsDropdownOptions = albums.map(x => {
+  const albumsDropdownOptions = albums.map((x) => {
     const { id } = x;
+
     return {
       key: id,
       value: id,
@@ -67,7 +69,8 @@ export function MyMusicTracks (props: MyMusicTracksProps) {
     return <div style={style}>
       <Dropdown
         onChange={(_e, { value: id }) => {
-          const selectedAlbum = albums.find(x => x.id === id);
+          const selectedAlbum = albums.find((x) => x.id === id);
+
           if (selectedAlbum) {
             setAlbumName(selectedAlbum.title);
             setShowSecondScreen(true);
@@ -125,7 +128,7 @@ export function MyMusicTracks (props: MyMusicTracksProps) {
     </Section>;
   };
 
-  const selectedTracks = tracks.filter(track => idsOfSelectedTracks.has(track.id));
+  const selectedTracks = tracks.filter((track) => idsOfSelectedTracks.has(track.id));
 
   const renderReorderTracks = () => {
     return <Section title={`Add tracks to album "${albumName}"`}>
@@ -138,8 +141,9 @@ export function MyMusicTracks (props: MyMusicTracksProps) {
 
       <ReorderableTracks
         tracks={selectedTracks}
-        onRemove={track => {
+        onRemove={(track) => {
           const set = new Set(idsOfSelectedTracks);
+
           set.delete(track.id);
           setIdsOfSelectedTracks(set);
         }}
diff --git a/pioneer/packages/joy-media/src/music/ReorderableTracks.tsx b/pioneer/packages/joy-media/src/music/ReorderableTracks.tsx
index 258885b955..717b2765d6 100644
--- a/pioneer/packages/joy-media/src/music/ReorderableTracks.tsx
+++ b/pioneer/packages/joy-media/src/music/ReorderableTracks.tsx
@@ -6,6 +6,7 @@ import { EditableMusicTrackPreviewProps, MusicTrackPreview } from './MusicTrackP
 const reorder = (list: OrderableItem[], startIndex: number, endIndex: number) => {
   const result = Array.from(list);
   const [removed] = result.splice(startIndex, 1);
+
   result.splice(endIndex, 0, removed);
 
   return result;
@@ -72,7 +73,8 @@ export const ReorderableTracks = (props: Props) => {
                       withRemoveButton
                       onRemove={() => {
                         onRemove(item);
-                        const lessItems = items.filter(x => x.id !== item.id);
+                        const lessItems = items.filter((x) => x.id !== item.id);
+
                         setItems(lessItems);
                       }}
                     />
diff --git a/pioneer/packages/joy-media/src/schemas/channel/Channel.ts b/pioneer/packages/joy-media/src/schemas/channel/Channel.ts
index 013d946acf..d66922de8c 100644
--- a/pioneer/packages/joy-media/src/schemas/channel/Channel.ts
+++ b/pioneer/packages/joy-media/src/schemas/channel/Channel.ts
@@ -12,10 +12,12 @@ function textValidation (constraint?: ValidationConstraint) {
   }
 
   const { min, max } = constraint;
+
   return Yup.string()
     .min(min, `Text is too short. Minimum length is ${min} chars.`)
     .max(max, `Text is too long. Maximum length is ${max} chars.`);
 }
+
 export const buildChannelValidationSchema = (constraints?: ChannelValidationConstraints) =>
   Yup.object().shape({
     handle: textValidation(constraints?.handle).required('This field is required'),
diff --git a/pioneer/packages/joy-media/src/schemas/general/FeaturedContent.ts b/pioneer/packages/joy-media/src/schemas/general/FeaturedContent.ts
index a6e55ca28c..0712605dc0 100644
--- a/pioneer/packages/joy-media/src/schemas/general/FeaturedContent.ts
+++ b/pioneer/packages/joy-media/src/schemas/general/FeaturedContent.ts
@@ -30,8 +30,8 @@ export class FeaturedContentCodec extends EntityCodec<FeaturedContentType> { }
 export function FeaturedContentToFormValues (entity?: FeaturedContentType): FeaturedContentFormValues {
   return {
     topVideo: (entity && entity.topVideo?.id) || 0,
-    featuredVideos: (entity && entity.featuredVideos?.map(x => x.id)) || [],
-    featuredAlbums: (entity && entity.featuredAlbums?.map(x => x.id)) || []
+    featuredVideos: (entity && entity.featuredVideos?.map((x) => x.id)) || [],
+    featuredAlbums: (entity && entity.featuredAlbums?.map((x) => x.id)) || []
   };
 }
 
diff --git a/pioneer/packages/joy-media/src/schemas/music/MusicAlbum.ts b/pioneer/packages/joy-media/src/schemas/music/MusicAlbum.ts
index 78f8881a18..8780a6937e 100644
--- a/pioneer/packages/joy-media/src/schemas/music/MusicAlbum.ts
+++ b/pioneer/packages/joy-media/src/schemas/music/MusicAlbum.ts
@@ -102,7 +102,7 @@ export function MusicAlbumToFormValues (entity?: MusicAlbumType): MusicAlbumForm
     genre: (entity && entity.genre?.id) || 0,
     mood: (entity && entity.mood?.id) || 0,
     theme: (entity && entity.theme?.id) || 0,
-    tracks: (entity && entity.tracks?.map(x => x.id)) || [],
+    tracks: (entity && entity.tracks?.map((x) => x.id)) || [],
     language: (entity && entity.language?.id) || 0,
     links: (entity && entity.links) || [],
     lyrics: (entity && entity.lyrics) || '',
diff --git a/pioneer/packages/joy-media/src/transport.substrate.ts b/pioneer/packages/joy-media/src/transport.substrate.ts
index 170a0abaff..16e695c205 100644
--- a/pioneer/packages/joy-media/src/transport.substrate.ts
+++ b/pioneer/packages/joy-media/src/transport.substrate.ts
@@ -124,9 +124,11 @@ export class SubstrateTransport extends MediaTransport {
 
   async allChannelIds (): Promise<ChannelId[]> {
     let nextId = (await this.nextChannelId()).toNumber();
+
     if (nextId < 1) nextId = 1;
 
     const allIds: ChannelId[] = [];
+
     for (let id = FIRST_CHANNEL_ID; id < nextId; id++) {
       allIds.push(this.api.createType('ChannelId', id));
     }
@@ -151,11 +153,13 @@ export class SubstrateTransport extends MediaTransport {
 
   async allChannels (): Promise<ChannelEntity[]> {
     const ids = await this.allChannelIds();
+
     return await this.channelCache.getOrLoadByIds(ids);
   }
 
   protected async getValidationConstraint (constraintName: string): Promise<ValidationConstraint> {
     const constraint = await this.cwgQuery()[constraintName]<InputValidationLengthConstraint>();
+
     return {
       min: constraint.min.toNumber(),
       max: constraint.max.toNumber()
@@ -176,6 +180,7 @@ export class SubstrateTransport extends MediaTransport {
       this.getValidationConstraint('channelAvatarConstraint'),
       this.getValidationConstraint('channelBannerConstraint')
     ]);
+
     return {
       handle,
       title,
@@ -196,6 +201,7 @@ export class SubstrateTransport extends MediaTransport {
     const nextId = (await this.nextClassId()).toNumber();
 
     const allIds: ClassId[] = [];
+
     for (let id = FIRST_CLASS_ID; id < nextId; id++) {
       allIds.push(this.api.createType('ClassId', id));
     }
@@ -209,25 +215,30 @@ export class SubstrateTransport extends MediaTransport {
 
   async allClasses (): Promise<Class[]> {
     const ids = await this.allClassIds();
+
     return await this.classCache.getOrLoadByIds(ids);
   }
 
   async getEntityCodecResolver (): Promise<EntityCodecResolver> {
     if (!this.entityCodecResolver) {
       const classes = await this.allClasses();
+
       this.entityCodecResolver = new EntityCodecResolver(classes);
     }
+
     return this.entityCodecResolver;
   }
 
   async classNamesToIdSet (classNames: ClassName[]): Promise<Set<string>> {
     const classNameToIdMap = await this.classIdByNameMap();
+
     return new Set(classNames
-      .map(name => {
+      .map((name) => {
         const classId = classNameToIdMap[name];
+
         return classId ? classId.toString() : undefined;
       })
-      .filter(classId => typeof classId !== 'undefined') as string[]
+      .filter((classId) => typeof classId !== 'undefined') as string[]
     );
   }
 
@@ -242,6 +253,7 @@ export class SubstrateTransport extends MediaTransport {
     const nextId = (await this.nextEntityId()).toNumber();
 
     const allIds: EntityId[] = [];
+
     for (let id = FIRST_ENTITY_ID; id < nextId; id++) {
       allIds.push(this.api.createType('EntityId', id));
     }
@@ -259,7 +271,8 @@ export class SubstrateTransport extends MediaTransport {
   private async loadPlainEntitiesByIds (ids: AnyEntityId[]): Promise<PlainEntity[]> {
     const entities = await this.loadEntitiesByIds(ids);
     const cacheClassIds = await this.classNamesToIdSet(ClassNamesThatCanBeCached);
-    entities.forEach(e => {
+
+    entities.forEach((e) => {
       if (cacheClassIds.has(e.class_id.toString())) {
         this.idsOfEntitiesToKeepInCache.add(e.id.toString());
       }
@@ -274,20 +287,23 @@ export class SubstrateTransport extends MediaTransport {
 
   async allPlainEntities (): Promise<PlainEntity[]> {
     const ids = await this.allEntityIds();
+
     return await this.entityCache.getOrLoadByIds(ids);
   }
 
   async findPlainEntitiesByClassName<T extends PlainEntity> (className: ClassName): Promise<T[]> {
     const res: T[] = [];
     const clazz = await this.classByName(className);
+
     if (!clazz) {
       console.warn(`No class found by name '${className}'`);
+
       return res;
     }
 
     const allIds = await this.allEntityIds();
     const filteredEntities = (await this.entityCache.getOrLoadByIds(allIds))
-      .filter(entity => clazz.id.eq(entity.classId)) as T[];
+      .filter((entity) => clazz.id.eq(entity.classId)) as T[];
 
     console.log(`Found ${filteredEntities.length} plain entities by class name '${className}'`);
 
@@ -302,6 +318,7 @@ export class SubstrateTransport extends MediaTransport {
     const loadableClassIds = await this.classNamesToIdSet(ClassNamesThatRequireLoadingInternals);
 
     const converted: PlainEntity[] = [];
+
     for (const entity of entities) {
       const classIdStr = entity.class_id.toString();
       const codec = entityCodecResolver.getCodecByClassId(entity.class_id);
@@ -334,6 +351,7 @@ export class SubstrateTransport extends MediaTransport {
 
   async featuredContent (): Promise<FeaturedContentType | undefined> {
     const arr = await this.findPlainEntitiesByClassName('FeaturedContent');
+
     return arr && arr.length ? arr[0] : undefined;
   }
 
diff --git a/pioneer/packages/joy-media/src/transport.ts b/pioneer/packages/joy-media/src/transport.ts
index 2172e4f532..faefba1cc5 100644
--- a/pioneer/packages/joy-media/src/transport.ts
+++ b/pioneer/packages/joy-media/src/transport.ts
@@ -57,6 +57,7 @@ export const EntityCodecByClassNameMap = {
 
 function insensitiveEq (text1: string, text2: string): boolean {
   const prepare = (txt: string) => txt.replace(/[\s]+/mg, '').toLowerCase();
+
   return prepare(text1) === prepare(text2);
 }
 
@@ -83,9 +84,12 @@ export abstract class MediaTransport {
     if (typeof operation !== 'function') {
       throw new Error('Operation is not a function');
     }
+
     this.openSession();
     const res = await operation();
+
     this.closeSession();
+
     return res;
   }
 
@@ -93,12 +97,12 @@ export abstract class MediaTransport {
 
   async channelById (id: ChannelId): Promise<ChannelEntity | undefined> {
     return (await this.allChannels())
-      .find(x => id && id.eq(x.id));
+      .find((x) => id && id.eq(x.id));
   }
 
   async channelsByAccount (accountId: AccountId): Promise<ChannelEntity[]> {
     return (await this.allChannels())
-      .filter(x => accountId && accountId.eq(x.roleAccount));
+      .filter((x) => accountId && accountId.eq(x.roleAccount));
   }
 
   abstract channelValidationConstraints(): Promise<ChannelValidationConstraints>
@@ -114,12 +118,15 @@ export abstract class MediaTransport {
     if (!this.cachedClassIdByNameMap) {
       const map: ClassIdByNameMap = {};
       const classes = await this.allClasses();
+
       classes.forEach((c) => {
         const className = unifyClassName(c.name);
+
         map[className] = c.id;
       });
       this.cachedClassIdByNameMap = map;
     }
+
     return this.cachedClassIdByNameMap;
   }
 
@@ -128,6 +135,7 @@ export abstract class MediaTransport {
   async topVideo (): Promise<VideoType | undefined> {
     const content = await this.featuredContent();
     const topVideoId = content?.topVideo as unknown as number | undefined;
+
     return !topVideoId ? undefined : await this.videoById(createMock('EntityId', topVideoId));
   }
 
@@ -136,7 +144,8 @@ export abstract class MediaTransport {
     const videoIds = (content?.featuredVideos || []) as unknown as number[];
     const videos = await Promise.all(videoIds.map((id) =>
       this.videoById(createMock('EntityId', id))));
-    return videos.filter(x => x !== undefined) as VideoType[];
+
+    return videos.filter((x) => x !== undefined) as VideoType[];
   }
 
   async featuredAlbums (): Promise<MusicAlbumType[]> {
@@ -144,7 +153,8 @@ export abstract class MediaTransport {
     const albumIds = (content?.featuredAlbums || []) as unknown as EntityId[];
     const albums = await Promise.all(albumIds.map((id) =>
       this.musicAlbumById(createMock('EntityId', id))));
-    return albums.filter(x => x !== undefined) as MusicAlbumType[];
+
+    return albums.filter((x) => x !== undefined) as MusicAlbumType[];
   }
 
   abstract allMediaObjects(): Promise<MediaObjectType[]>
@@ -157,8 +167,8 @@ export abstract class MediaTransport {
 
   async videosByChannelId (channelId: ChannelId, limit?: number, additionalFilter?: (x: VideoType) => boolean): Promise<VideoType[]> {
     let videos = (await this.allVideos())
-      .filter(x => channelId && channelId.eq(x.channelId) && (additionalFilter || (() => true))(x))
-      .sort(x => -1 * x.id);
+      .filter((x) => channelId && channelId.eq(x.channelId) && (additionalFilter || (() => true))(x))
+      .sort((x) => -1 * x.id);
 
     if (limit && limit > 0) {
       videos = videos.slice(0, limit);
@@ -169,30 +179,30 @@ export abstract class MediaTransport {
 
   async videosByAccount (accountId: AccountId): Promise<VideoType[]> {
     const accountChannels = await this.channelsByAccount(accountId);
-    const accountChannelIds = new Set(accountChannels.map(x => x.id));
+    const accountChannelIds = new Set(accountChannels.map((x) => x.id));
 
     return (await this.allVideos())
-      .filter(x => x.channelId && accountChannelIds.has(x.channelId));
+      .filter((x) => x.channelId && accountChannelIds.has(x.channelId));
   }
 
   async mediaObjectById (id: EntityId): Promise<MediaObjectType | undefined> {
     return (await this.allMediaObjects())
-      .find(x => id && id.eq(x.id));
+      .find((x) => id && id.eq(x.id));
   }
 
   async videoById (id: EntityId): Promise<VideoType | undefined> {
     return (await this.allVideos())
-      .find(x => id && id.eq(x.id));
+      .find((x) => id && id.eq(x.id));
   }
 
   async musicTrackById (id: EntityId): Promise<MusicTrackType | undefined> {
     return (await this.allMusicTracks())
-      .find(x => id && id.eq(x.id));
+      .find((x) => id && id.eq(x.id));
   }
 
   async musicAlbumById (id: EntityId): Promise<MusicAlbumType | undefined> {
     return (await this.allMusicAlbums())
-      .find(x => id && id.eq(x.id));
+      .find((x) => id && id.eq(x.id));
   }
 
   async allPublicChannels (): Promise<ChannelEntity[]> {
@@ -208,7 +218,7 @@ export abstract class MediaTransport {
   async allPublicVideoChannels (): Promise<ChannelEntity[]> {
     return (await this.allVideoChannels())
       .filter(isPublicChannel)
-      .sort(x => -1 * x.id);
+      .sort((x) => -1 * x.id);
   }
 
   async latestPublicVideoChannels (limit = 6): Promise<ChannelEntity[]> {
@@ -217,26 +227,27 @@ export abstract class MediaTransport {
 
   async allPublicVideos (): Promise<VideoType[]> {
     const idOfPublicPS = (await this.allPublicationStatuses())
-      .find(x =>
+      .find((x) =>
         insensitiveEq(x.value, 'Public')
       )?.id;
 
     const idsOfCuratedCS = (await this.allCurationStatuses())
-      .filter(x =>
+      .filter((x) =>
         insensitiveEq(x.value, 'Under review') ||
         insensitiveEq(x.value, 'Removed')
-      ).map(x => x.id);
+      ).map((x) => x.id);
 
     const isPublicAndNotCurated = (video: VideoType) => {
       const isPublic = video.publicationStatus.id === idOfPublicPS;
       const isNotCurated = !idsOfCuratedCS.includes(video.curationStatus?.id || -1);
       const isPubChannel = video.channel ? isPublicChannel(video.channel) : true;
+
       return isPublic && isNotCurated && isPubChannel;
     };
 
     return (await this.allVideos())
       .filter(isPublicAndNotCurated)
-      .sort(x => -1 * x.id);
+      .sort((x) => -1 * x.id);
   }
 
   async latestPublicVideos (limit = 12): Promise<VideoType[]> {
@@ -285,6 +296,7 @@ export abstract class MediaTransport {
     const res = new MediaDropdownOptions(
       await this.allInternalEntities()
     );
+
     // console.log('Transport.dropdownOptions', res)
     return res;
   }
diff --git a/pioneer/packages/joy-media/src/upload/EditVideo.view.tsx b/pioneer/packages/joy-media/src/upload/EditVideo.view.tsx
index defe8c19de..9058e6bd77 100644
--- a/pioneer/packages/joy-media/src/upload/EditVideo.view.tsx
+++ b/pioneer/packages/joy-media/src/upload/EditVideo.view.tsx
@@ -18,6 +18,7 @@ export const EditVideoView = MediaView<Props>({
     const entityClass = await transport.videoClass();
     const entity = id && await transport.videoById(id);
     const opts = await transport.dropdownOptions();
+
     return { channel, mediaObjectClass, entityClass, entity, opts };
   }
 });
diff --git a/pioneer/packages/joy-media/src/upload/UploadAudio.tsx b/pioneer/packages/joy-media/src/upload/UploadAudio.tsx
index ea0d9a8b5f..f74ab1a28f 100644
--- a/pioneer/packages/joy-media/src/upload/UploadAudio.tsx
+++ b/pioneer/packages/joy-media/src/upload/UploadAudio.tsx
@@ -157,9 +157,11 @@ export const EditForm = withFormik<OuterProps, FormValues>({
   mapPropsToValues: (props): FormValues => {
     const { entity, fileName } = props;
     const res = MusicTrackToFormValues(entity);
+
     if (!res.title && fileName) {
       res.title = fileName;
     }
+
     return res;
   },
 
diff --git a/pioneer/packages/joy-media/src/upload/UploadAudio.view.tsx b/pioneer/packages/joy-media/src/upload/UploadAudio.view.tsx
index b83a3e4a76..592c1186a3 100644
--- a/pioneer/packages/joy-media/src/upload/UploadAudio.view.tsx
+++ b/pioneer/packages/joy-media/src/upload/UploadAudio.view.tsx
@@ -7,6 +7,7 @@ export const UploadAudioView = MediaView<OuterProps>({
     const { transport, id } = props;
     const entity = id ? await transport.musicTrackById(id) : undefined;
     const opts = await transport.dropdownOptions();
+
     return { entity, opts };
   }
 });
diff --git a/pioneer/packages/joy-media/src/upload/UploadVideo.tsx b/pioneer/packages/joy-media/src/upload/UploadVideo.tsx
index cc6c84ba50..9fd2de55d9 100644
--- a/pioneer/packages/joy-media/src/upload/UploadVideo.tsx
+++ b/pioneer/packages/joy-media/src/upload/UploadVideo.tsx
@@ -118,6 +118,7 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
       let fieldValue = values[fieldName] as any;
 
       let shouldIncludeValue = true;
+
       if (entity) {
         // If we updating existing entity, then update only changed props:
         shouldIncludeValue = isFieldChanged(fieldName);
@@ -144,9 +145,11 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
         if (typeof fieldValue === 'string') {
           fieldValue = fieldValue.trim();
         }
+
         if (isDateField(fieldName)) {
           fieldValue = humanDateToUnixTs(fieldValue);
         }
+
         res[fieldName] = fieldValue;
       }
     });
@@ -166,6 +169,7 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
 
   const newlyCreatedMediaObjectProp = () => {
     const inClassIndexOfMediaObject = entityCodec.inClassIndexOfProp(Fields.object.id);
+
     if (!inClassIndexOfMediaObject) {
       throw new Error('Cannot not find an in-class index of "object" prop on Video entity.');
     }
@@ -183,8 +187,9 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
     props: VecClassPropertyValue,
     extra: ParametrizedClassPropertyValue[] = []
   ): ParameterizedClassPropertyValues => {
-    const parametrizedProps = props.map(p => {
+    const parametrizedProps = props.map((p) => {
       const { in_class_index, value } = p;
+
       return api.createType('ParametrizedClassPropertyValue', {
         in_class_index,
         value: api.createType('ParametrizedPropertyValue', { PropertyValue: value })
@@ -192,7 +197,7 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
     });
 
     if (extra && extra.length) {
-      extra.forEach(x => parametrizedProps.push(x));
+      extra.forEach((x) => parametrizedProps.push(x));
     }
 
     return api.createType('Vec<ParametrizedClassPropertyValue>', parametrizedProps);
@@ -296,6 +301,7 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
 
   const redirectToPlaybackPage = (newEntityId?: EntityId) => {
     const entityId = newEntityId || id;
+
     if (history && entityId) {
       history.push('/media/videos/' + entityId.toString());
     }
@@ -316,6 +322,7 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
 
     // Extract id from from event:
     const newId = videoEntityCreatedEvent[0] as EntityId;
+
     console.log('New video entity id:', newId && newId.toString());
 
     redirectToPlaybackPage(newId);
@@ -431,12 +438,15 @@ export const EditForm = withFormik<OuterProps, FormValues>({
   mapPropsToValues: (props): FormValues => {
     const { entity, channelId, fileName } = props;
     const res = VideoToFormValues(entity);
+
     if (!res.title && fileName) {
       res.title = fileName;
     }
+
     if (channelId) {
       res.channelId = channelId.toNumber();
     }
+
     return res;
   },
 
diff --git a/pioneer/packages/joy-media/src/utils.ts b/pioneer/packages/joy-media/src/utils.ts
index 91d876568f..c2d4935742 100644
--- a/pioneer/packages/joy-media/src/utils.ts
+++ b/pioneer/packages/joy-media/src/utils.ts
@@ -1,4 +1,5 @@
 export function fileNameWoExt (fileName: string): string {
   const lastDotIdx = fileName.lastIndexOf('.');
+
   return fileName.substring(0, lastDotIdx);
 }
diff --git a/pioneer/packages/joy-media/src/video/PlayVideo.tsx b/pioneer/packages/joy-media/src/video/PlayVideo.tsx
index b1ef51dcc8..d1dd34357f 100644
--- a/pioneer/packages/joy-media/src/video/PlayVideo.tsx
+++ b/pioneer/packages/joy-media/src/video/PlayVideo.tsx
@@ -30,6 +30,7 @@ type ListOfVideoPreviewProps = {
 
 function VertialListOfVideoPreviews (props: ListOfVideoPreviewProps) {
   const { videos = [] } = props;
+
   return <>{videos.map((video) =>
     <VideoPreview key={`VideoPreview-${video.id}`} {...video} size='small' orientation='horizontal' withChannel />
   )}</>;
diff --git a/pioneer/packages/joy-media/src/video/PlayVideo.view.tsx b/pioneer/packages/joy-media/src/video/PlayVideo.view.tsx
index 0f352dd25b..c07ef604de 100644
--- a/pioneer/packages/joy-media/src/video/PlayVideo.view.tsx
+++ b/pioneer/packages/joy-media/src/video/PlayVideo.view.tsx
@@ -14,11 +14,12 @@ export const PlayVideoView = MediaView<Props>({
     const { transport, api, id } = props;
 
     const video = await transport.videoById(id);
+
     if (!video) return {};
 
     const channelId = api.createType('ChannelId', video.channelId);
     const channel = await transport.channelById(channelId);
-    const moreChannelVideos = (await transport.videosByChannelId(channelId, 5, x => x.id !== video.id));
+    const moreChannelVideos = (await transport.videosByChannelId(channelId, 5, (x) => x.id !== video.id));
     const featuredVideos = await transport.featuredVideos();
     const mediaObject = video.object;
 
diff --git a/pioneer/packages/joy-media/src/video/VideoPreview.tsx b/pioneer/packages/joy-media/src/video/VideoPreview.tsx
index 8c29ca8019..53f723c115 100644
--- a/pioneer/packages/joy-media/src/video/VideoPreview.tsx
+++ b/pioneer/packages/joy-media/src/video/VideoPreview.tsx
@@ -77,7 +77,7 @@ export function VideoPreview (props: VideoPreviewProps) {
 }
 
 export function toVideoPreviews (items: VideoType[]): VideoPreviewProps[] {
-  return items.map(x => ({
+  return items.map((x) => ({
     id: x.id,
     title: x.title,
     thumbnail: x.thumbnail
diff --git a/pioneer/packages/joy-utils/src/react/components/InputFileAsync.tsx b/pioneer/packages/joy-utils/src/react/components/InputFileAsync.tsx
index cceb9a19a7..3343abe6e8 100644
--- a/pioneer/packages/joy-utils/src/react/components/InputFileAsync.tsx
+++ b/pioneer/packages/joy-utils/src/react/components/InputFileAsync.tsx
@@ -42,6 +42,7 @@ function InputFileAsync ({ accept, className, clearContent, help, isDisabled, is
   const _onDrop = (files: File[]): void => {
     if (!files.length) return;
     const blob = files[0];
+
     onChange && onChange(blob);
     dropRef && setFile({
       ...blob
diff --git a/pioneer/packages/joy-utils/src/react/hocs/accounts.tsx b/pioneer/packages/joy-utils/src/react/hocs/accounts.tsx
index cc793004a7..d97b102968 100644
--- a/pioneer/packages/joy-utils/src/react/hocs/accounts.tsx
+++ b/pioneer/packages/joy-utils/src/react/hocs/accounts.tsx
@@ -7,14 +7,14 @@ import { withCalls, withMulti, withObservable, ApiContext } from '@polkadot/reac
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 
 import { MemberId, Membership } from '@joystream/types/members';
-import { LeadId, Lead } from '@joystream/types/content-working-group';
+import { LeadId, Lead, CuratorId, Curator } from '@joystream/types/content-working-group';
 
 import { queryMembershipToProp } from '@polkadot/joy-members/utils';
 import useMyAccount from '../hooks/useMyAccount';
 import { componentName } from '../helpers';
 import { queryToProp } from '@polkadot/joy-utils/functions/misc';
 import { entriesByIds } from '@polkadot/joy-utils/transport/base';
-import { CuratorId, Curator } from '@joystream/types/content-working-group';
+
 import { useApi } from '@polkadot/react-hooks';
 import usePromise from '../hooks/usePromise';
 import { Error } from '../components/PromiseComponent';
@@ -119,7 +119,9 @@ function resolveLead<P extends MyAccountProps> (Component: React.ComponentType<P
 
     return <Component {...props} {...newProps} />;
   };
+
   ResultComponent.displayName = `resolveLead(${componentName(Component)})`;
+
   return ResultComponent;
 }
 
@@ -134,7 +136,6 @@ const withContentWorkingGroupDetails = withCalls<MyAccountProps>(
 const withContentWorkingGroup = <P extends MyAccountProps>(Component: React.ComponentType<P>) =>
   withMulti(Component, withContentWorkingGroupDetails, resolveLead, resolveLeadEntry);
 
-
 function withCurationActor<P extends MyAccountProps> (Component: React.ComponentType<P>) {
   const ResultComponent: React.FunctionComponent<P> = (props: P) => {
     const {
@@ -144,10 +145,10 @@ function withCurationActor<P extends MyAccountProps> (Component: React.Component
       allAccounts
     } = props;
     const { isApiReady, api } = useApi();
-    const [ curatorEntries, curatorsError, curatorsLoading ] = usePromise<[CuratorId, Curator][]>(
+    const [curatorEntries, curatorsError, curatorsLoading] = usePromise<[CuratorId, Curator][]>(
       () => isApiReady
         ? entriesByIds<CuratorId, Curator>(api.query.contentWorkingGroup.curatorById)
-        : new Promise(resolve => resolve([])),
+        : new Promise((resolve) => resolve([])),
       [],
       [isApiReady]
     );
@@ -181,18 +182,21 @@ function withCurationActor<P extends MyAccountProps> (Component: React.Component
     // First priority - currently selected account
     let actor = curationActorByAccount(myAccountId);
     let actorKey: AccountId | null = myAccountId;
+
     // Second priority - check other keys and find best role
     // TODO: Prioritize current member?
     // TODO: Perhaps just don't do that at all and force the user to select the correct key to avoid confision?
     if (!actor) {
-      const allActorsWithKeys = Object.keys(allAccounts).map(accKey => ({
+      const allActorsWithKeys = Object.keys(allAccounts).map((accKey) => ({
         actor: curationActorByAccount(allAccounts[accKey].json.address),
         key: api.createType('AccountId', allAccounts[accKey].json.address)
       }));
       let actorWithKey = allActorsWithKeys.find(({ actor }) => actor?.isOfType('Lead'));
+
       if (!actorWithKey) {
         actorWithKey = allActorsWithKeys.find(({ actor }) => actor?.isOfType('Curator'));
       }
+
       actor = actorWithKey?.actor || null;
       actorKey = actorWithKey?.key || null;
     }
@@ -204,7 +208,9 @@ function withCurationActor<P extends MyAccountProps> (Component: React.Component
       return <Component {...props} />;
     }
   };
+
   ResultComponent.displayName = `withCurationActor(${componentName(Component)})`;
+
   return ResultComponent;
 }
 
diff --git a/pioneer/packages/joy-utils/src/transport/SimpleCache.ts b/pioneer/packages/joy-utils/src/transport/SimpleCache.ts
index 7f724c1b03..b49992d285 100644
--- a/pioneer/packages/joy-utils/src/transport/SimpleCache.ts
+++ b/pioneer/packages/joy-utils/src/transport/SimpleCache.ts
@@ -29,6 +29,7 @@ export class SimpleCache<Id extends IdLike, Obj extends HasId> {
 
   clear (): void {
     const prevCacheSize = this.cache.size;
+
     this.cache = new Map();
     console.info(`Removed all ${prevCacheSize} entries from ${this.cacheName}`);
   }
@@ -37,14 +38,16 @@ export class SimpleCache<Id extends IdLike, Obj extends HasId> {
     const prevCacheSize = this.cache.size;
     const keepIdsSet = keepIds instanceof Set
       ? keepIds
-      : new Set(keepIds.map(id => id.toString()));
+      : new Set(keepIds.map((id) => id.toString()));
 
     const newCache: Map<string, Obj> = new Map();
+
     for (const [id, o] of this.cache.entries()) {
       if (keepIdsSet.has(id)) {
         newCache.set(id, o);
       }
     }
+
     this.cache = newCache;
     console.info(`Removed ${prevCacheSize - newCache.size} entries out of ${prevCacheSize} from ${this.cacheName}`);
   }
@@ -57,8 +60,9 @@ export class SimpleCache<Id extends IdLike, Obj extends HasId> {
     const idsNoFoundInCache: Id[] = [];
     const cachedObjects: Obj[] = [];
 
-    ids.map(id => {
+    ids.map((id) => {
       const fromCache = this.cache.get(id.toString());
+
       if (fromCache) {
         cachedObjects.push(fromCache);
       } else {
@@ -67,10 +71,12 @@ export class SimpleCache<Id extends IdLike, Obj extends HasId> {
     });
 
     let loadedObjects: Obj[] = [];
+
     if (idsNoFoundInCache.length > 0) {
       loadedObjects = await this.loadByIds(idsNoFoundInCache);
-      loadedObjects.map(o => {
+      loadedObjects.map((o) => {
         const id = anyIdToString(o.id);
+
         this.cache.set(id, o);
       });
     }

From a09a6c51faa7210a4c5b8169d08ed305602666e5 Mon Sep 17 00:00:00 2001
From: Leszek Wiesner <l.wiesner@adawards.pl>
Date: Wed, 26 Aug 2020 12:15:45 +0200
Subject: [PATCH 17/17] Linter: manual fixes

---
 .../joy-media/src/DiscoveryProvider.tsx       | 29 ++++++++---
 .../packages/joy-media/src/IterableFile.ts    |  6 +--
 pioneer/packages/joy-media/src/MediaView.tsx  | 11 ++--
 .../joy-media/src/TransportContext.tsx        |  4 +-
 pioneer/packages/joy-media/src/Upload.tsx     | 52 ++++++++++++-------
 .../src/channels/ChannelsByOwner.view.tsx     |  2 +-
 .../src/channels/EditChannel.view.tsx         |  2 +-
 .../src/channels/ViewChannel.view.tsx         |  2 +-
 .../packages/joy-media/src/common/BgImg.tsx   |  2 +-
 .../joy-media/src/common/MediaForms.tsx       | 10 ++--
 .../joy-media/src/common/MediaPlayerView.tsx  |  5 +-
 .../src/common/MediaPlayerWithResolver.tsx    | 30 +++++++----
 .../joy-media/src/common/TypeHelpers.ts       |  6 +--
 pioneer/packages/joy-media/src/index.tsx      |  2 +-
 .../joy-media/src/music/MusicTrackPreview.tsx |  2 +-
 .../joy-media/src/music/MyMusicTracks.tsx     |  2 +-
 .../joy-media/src/upload/EditVideo.view.tsx   |  2 +-
 .../joy-media/src/upload/UploadVideo.tsx      |  8 +--
 .../joy-media/src/video/PlayVideo.view.tsx    |  2 +-
 .../packages/joy-utils/src/functions/misc.ts  | 11 +++-
 .../joy-utils/src/react/hocs/accounts.tsx     |  6 +--
 .../joy-utils/src/transport/SimpleCache.ts    |  6 +--
 22 files changed, 127 insertions(+), 75 deletions(-)

diff --git a/pioneer/packages/joy-media/src/DiscoveryProvider.tsx b/pioneer/packages/joy-media/src/DiscoveryProvider.tsx
index 50e0054c3f..0b4c165e21 100644
--- a/pioneer/packages/joy-media/src/DiscoveryProvider.tsx
+++ b/pioneer/packages/joy-media/src/DiscoveryProvider.tsx
@@ -9,6 +9,7 @@ import ApiContext from '@polkadot/react-api/ApiContext';
 import { ApiProps } from '@polkadot/react-api/types';
 import { JoyInfo } from '@polkadot/joy-utils/react/components';
 import { componentName } from '@polkadot/joy-utils/react/helpers';
+import { isObjectWithProperties } from '@polkadot/joy-utils/functions/misc';
 
 export type BootstrapNodes = {
   bootstrapNodes?: Url[];
@@ -41,7 +42,7 @@ type ProviderStats = {
 }
 
 function newDiscoveryProvider ({ bootstrapNodes }: BootstrapNodes): DiscoveryProvider {
-  const stats: Map<string, ProviderStats> = new Map();
+  const stats = new Map<string, ProviderStats>();
 
   const resolveAssetEndpoint = async (storageProvider: StorageProviderId, contentId?: string, cancelToken?: CancelToken) => {
     const providerKey = storageProvider.toString();
@@ -67,14 +68,30 @@ function newDiscoveryProvider ({ bootstrapNodes }: BootstrapNodes): DiscoveryPro
         try {
           console.log(`Resolving ${providerKey} using ${discoveryUrl}`);
 
-          const serviceInfo = await axios.get(serviceInfoQuery, { cancelToken }) as any;
+          const serviceInfo = await axios.get<unknown>(serviceInfoQuery, { cancelToken });
 
           if (!serviceInfo) {
             continue;
           }
 
+          const { data } = serviceInfo;
+
+          if (!isObjectWithProperties(data, 'serialized') || typeof data.serialized !== 'string') {
+            continue;
+          }
+
+          const dataParsed = JSON.parse(data.serialized) as unknown;
+
+          if (
+            !isObjectWithProperties(dataParsed, 'asset') ||
+            !isObjectWithProperties(dataParsed.asset, 'endpoint') ||
+            typeof dataParsed.asset.endpoint !== 'string'
+          ) {
+            continue;
+          }
+
           stats.set(providerKey, {
-            assetApiEndpoint: normalizeUrl(JSON.parse(serviceInfo.data.serialized).asset.endpoint),
+            assetApiEndpoint: normalizeUrl(dataParsed.asset.endpoint),
             unreachableReports: 0,
             resolvedAt: Date.now()
           });
@@ -116,7 +133,7 @@ function newDiscoveryProvider ({ bootstrapNodes }: BootstrapNodes): DiscoveryPro
 
 const DiscoveryProviderContext = createContext<DiscoveryProvider>(undefined as unknown as DiscoveryProvider);
 
-export const DiscoveryProviderProvider = (props: React.PropsWithChildren<{}>) => {
+export const DiscoveryProviderProvider = (props: React.PropsWithChildren<Record<any, unknown>>) => {
   const api: ApiProps = useContext(ApiContext);
   const [provider, setProvider] = useState<DiscoveryProvider | undefined>();
   const [loaded, setLoaded] = useState<boolean | undefined>();
@@ -133,7 +150,7 @@ export const DiscoveryProviderProvider = (props: React.PropsWithChildren<{}>) =>
       console.log('Discovery Provider: Initialized');
     };
 
-    load();
+    void load();
   }, [loaded]);
 
   if (!api || !api.isApiReady) {
@@ -163,7 +180,7 @@ export const useDiscoveryProvider = () =>
   useContext(DiscoveryProviderContext);
 
 export function withDiscoveryProvider (Component: React.ComponentType<DiscoveryProviderProps>) {
-  const ResultComponent: React.FunctionComponent<{}> = (props: React.PropsWithChildren<{}>) => {
+  const ResultComponent: React.FunctionComponent<Record<any, unknown>> = (props: React.PropsWithChildren<Record<any, unknown>>) => {
     const discoveryProvider = useDiscoveryProvider();
 
     if (!discoveryProvider) {
diff --git a/pioneer/packages/joy-media/src/IterableFile.ts b/pioneer/packages/joy-media/src/IterableFile.ts
index 65fe272a92..6d9c4cd2e2 100644
--- a/pioneer/packages/joy-media/src/IterableFile.ts
+++ b/pioneer/packages/joy-media/src/IterableFile.ts
@@ -32,9 +32,9 @@ export class IterableFile implements AsyncIterable<Buffer> {
 
   readBlobAsBuffer (blob: Blob): Promise<Buffer> {
     return new Promise((resolve, reject) => {
-      this.reader.onload = (e: any) => {
-        e.target.result && resolve(Buffer.from(e.target.result));
-        e.target.error && reject(e.target.error);
+      this.reader.onload = (e) => {
+        e.target?.result && resolve(typeof e.target.result === 'string' ? Buffer.from(e.target.result) : Buffer.from(e.target.result));
+        e.target?.error && reject(e.target.error);
       };
 
       this.reader.readAsArrayBuffer(blob);
diff --git a/pioneer/packages/joy-media/src/MediaView.tsx b/pioneer/packages/joy-media/src/MediaView.tsx
index ebe2cb18a6..31c4932500 100644
--- a/pioneer/packages/joy-media/src/MediaView.tsx
+++ b/pioneer/packages/joy-media/src/MediaView.tsx
@@ -6,6 +6,7 @@ import { useTransportContext } from './TransportContext';
 import { withMembershipRequired } from '@polkadot/joy-utils/react/hocs/guards';
 import { useApi } from '@polkadot/react-hooks';
 import { ApiPromise } from '@polkadot/api';
+import { isObjectWithProperties } from '@polkadot/joy-utils/functions/misc';
 
 type InitialPropsWithMembership<A> = A & {
   myAddress?: string;
@@ -32,11 +33,11 @@ type BaseProps<A, B> = {
   membersOnly?: boolean;
 }
 
-function serializeTrigger (val: any): any {
+function serializeTrigger (val: unknown): number | boolean | string | undefined {
   if (['number', 'boolean', 'string'].includes(typeof val)) {
-    return val;
-  } else if (typeof val === 'object' && typeof val.toString === 'function') {
-    return val.toString();
+    return val as number | boolean | string;
+  } else if (isObjectWithProperties(val, 'toString') && typeof val.toString === 'function') {
+    return val.toString() as string;
   } else {
     return undefined;
   }
@@ -74,7 +75,7 @@ export function MediaView<A extends Record<string, unknown> = Record<string, unk
       if (!transport) {
         console.error('Transport is not defined');
       } else {
-        doResolveProps();
+        void doResolveProps();
       }
     }, rerenderDeps);
 
diff --git a/pioneer/packages/joy-media/src/TransportContext.tsx b/pioneer/packages/joy-media/src/TransportContext.tsx
index aed0b34fed..ad628c4aa2 100644
--- a/pioneer/packages/joy-media/src/TransportContext.tsx
+++ b/pioneer/packages/joy-media/src/TransportContext.tsx
@@ -10,12 +10,12 @@ export const TransportContext = createContext<MediaTransport>(undefined as unkno
 export const useTransportContext = () =>
   useContext(TransportContext);
 
-export const MockTransportProvider = (props: React.PropsWithChildren<{}>) =>
+export const MockTransportProvider = (props: React.PropsWithChildren<Record<any, unknown>>) =>
   <TransportContext.Provider value={new MockTransport()}>
     {props.children}
   </TransportContext.Provider>;
 
-export const SubstrateTransportProvider = (props: React.PropsWithChildren<{}>) => {
+export const SubstrateTransportProvider = (props: React.PropsWithChildren<Record<any, unknown>>) => {
   const api: ApiProps = useContext(ApiContext);
   const [transport, setTransport] = useState<SubstrateTransport>();
   const [loaded, setLoaded] = useState<boolean>();
diff --git a/pioneer/packages/joy-media/src/Upload.tsx b/pioneer/packages/joy-media/src/Upload.tsx
index 5da8ffde76..10f34a6c2b 100644
--- a/pioneer/packages/joy-media/src/Upload.tsx
+++ b/pioneer/packages/joy-media/src/Upload.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import BN from 'bn.js';
-import axios, { CancelTokenSource } from 'axios';
+import axios, { CancelTokenSource, AxiosError, AxiosRequestConfig } from 'axios';
 import { History } from 'history';
 import { Progress, Message } from 'semantic-ui-react';
 
@@ -26,6 +26,7 @@ import { EditVideoView } from './upload/EditVideo.view';
 
 import { IterableFile } from './IterableFile';
 import { StorageProviderId } from '@joystream/types/working-group';
+import { normalizeError, isObjectWithProperties } from '@polkadot/joy-utils/functions/misc';
 
 const MAX_FILE_SIZE_MB = 500;
 const MAX_FILE_SIZE_BYTES = MAX_FILE_SIZE_MB * 1024 * 1024;
@@ -41,7 +42,7 @@ type Props = ApiProps & I18nProps & DiscoveryProviderProps & MyAccountProps & {
 };
 
 type State = {
-  error?: any;
+  error?: string;
   file?: File;
   computingHash: boolean;
   ipfs_cid?: string;
@@ -91,7 +92,7 @@ class Upload extends React.PureComponent<Props, State> {
   private renderContent () {
     const { error, uploading, discovering, computingHash, sendingTx } = this.state;
 
-    if (error) return this.renderError();
+    if (error) return this.renderError(error);
     else if (discovering) return this.renderDiscovering();
     else if (uploading) return this.renderUploading();
     else if (computingHash) return this.renderComputingHash();
@@ -99,13 +100,11 @@ class Upload extends React.PureComponent<Props, State> {
     else return this.renderFileInput();
   }
 
-  private renderError () {
-    const { error } = this.state;
-
+  private renderError (error: string) {
     return (
       <Message error className='JoyMainStatus'>
         <Message.Header>Failed to upload your file</Message.Header>
-        <p>{error.toString()}</p>
+        <p>{error}</p>
         <button className='ui button' onClick={this.resetForm}>Start over</button>
       </Message>
     );
@@ -223,7 +222,7 @@ class Upload extends React.PureComponent<Props, State> {
       });
     } else {
       this.setState({ file, computingHash: true });
-      this.startComputingHash();
+      void this.startComputingHash();
     }
   }
 
@@ -236,7 +235,8 @@ class Upload extends React.PureComponent<Props, State> {
 
     try {
       const iterableFile = new IterableFile(file, { chunkSize: 65535 });
-      const ipfs_cid = await IpfsHash.of(iterableFile);
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-call
+      const ipfs_cid = (await IpfsHash.of(iterableFile)) as string;
 
       this.hashComputationComplete(ipfs_cid);
     } catch (err) {
@@ -283,7 +283,7 @@ class Upload extends React.PureComponent<Props, State> {
       dataObject = await api.query.dataDirectory.dataObjectByContentId(newContentId) as Option<DataObject>;
     } catch (err) {
       this.setState({
-        error: err,
+        error: normalizeError(err),
         discovering: false
       });
 
@@ -299,10 +299,10 @@ class Upload extends React.PureComponent<Props, State> {
     if (dataObject.isSome) {
       const storageProvider = dataObject.unwrap().liaison;
 
-      this.uploadFileTo(storageProvider);
+      void this.uploadFileTo(storageProvider);
     } else {
       this.setState({
-        error: new Error('No Storage Provider assigned to process upload'),
+        error: 'No Storage Provider assigned to process upload',
         discovering: false
       });
     }
@@ -313,7 +313,7 @@ class Upload extends React.PureComponent<Props, State> {
 
     if (!file || !file.size) {
       this.setState({
-        error: new Error('No file to upload!'),
+        error: 'No file to upload!',
         discovering: false
       });
 
@@ -321,7 +321,7 @@ class Upload extends React.PureComponent<Props, State> {
     }
 
     const contentId = newContentId.encode();
-    const config = {
+    const config: AxiosRequestConfig = {
       headers: {
         // TODO uncomment this once the issue fixed:
         // https://github.com/Joystream/storage-node-joystream/issues/16
@@ -329,7 +329,15 @@ class Upload extends React.PureComponent<Props, State> {
         'Content-Type': '' // <-- this is a temporary hack
       },
       cancelToken: cancelSource.token,
-      onUploadProgress: (progressEvent: any) => {
+      onUploadProgress: (progressEvent: unknown) => {
+        if (
+          !isObjectWithProperties(progressEvent, 'loaded', 'total') ||
+          typeof progressEvent.loaded !== 'number' ||
+          typeof progressEvent.total !== 'number'
+        ) {
+          return;
+        }
+
         const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total);
 
         this.setState({
@@ -345,7 +353,7 @@ class Upload extends React.PureComponent<Props, State> {
       url = await discoveryProvider.resolveAssetEndpoint(storageProvider, contentId, cancelSource.token);
     } catch (err) {
       return this.setState({
-        error: new Error(`Failed to contact storage provider: ${err.message}`),
+        error: `Failed to contact storage provider: ${normalizeError(err)}`,
         discovering: false
       });
     }
@@ -362,14 +370,20 @@ class Upload extends React.PureComponent<Props, State> {
 
     try {
       await axios.put<{ message: string }>(url, file, config);
-    } catch (err) {
-      this.setState({ progress: 0, error: err, uploading: false });
+    } catch (e) {
+      const err = e as unknown;
+
+      this.setState({ progress: 0, error: normalizeError(err), uploading: false });
 
       if (axios.isCancel(err)) {
         return;
       }
 
-      if (!err.response || (err.response.status >= 500 && err.response.status <= 504)) {
+      const response = isObjectWithProperties(err, 'response')
+        ? (err as AxiosError).response
+        : undefined;
+
+      if (!response || (response.status >= 500 && response.status <= 504)) {
         // network connection error
         discoveryProvider.reportUnreachable(storageProvider);
       }
diff --git a/pioneer/packages/joy-media/src/channels/ChannelsByOwner.view.tsx b/pioneer/packages/joy-media/src/channels/ChannelsByOwner.view.tsx
index 07992e8884..a60863e7ef 100644
--- a/pioneer/packages/joy-media/src/channels/ChannelsByOwner.view.tsx
+++ b/pioneer/packages/joy-media/src/channels/ChannelsByOwner.view.tsx
@@ -18,7 +18,7 @@ export const ChannelsByOwnerView = MediaView<Props>({
   }
 });
 
-export const ChannelsByOwnerWithRouter = (props: Props & RouteComponentProps<any>) => {
+export const ChannelsByOwnerWithRouter = (props: Props & RouteComponentProps<Record<string, string | undefined>>) => {
   const { match: { params: { account } } } = props;
   const { api } = useApi();
 
diff --git a/pioneer/packages/joy-media/src/channels/EditChannel.view.tsx b/pioneer/packages/joy-media/src/channels/EditChannel.view.tsx
index 6ea43c8cc8..3776a0155a 100644
--- a/pioneer/packages/joy-media/src/channels/EditChannel.view.tsx
+++ b/pioneer/packages/joy-media/src/channels/EditChannel.view.tsx
@@ -20,7 +20,7 @@ export const EditChannelView = MediaView<Props>({
   }
 });
 
-type WithRouterProps = Props & RouteComponentProps<any>
+type WithRouterProps = Props & RouteComponentProps<Record<string, string | undefined>>
 
 export const EditChannelWithRouter = (props: WithRouterProps) => {
   const { match: { params: { id } } } = props;
diff --git a/pioneer/packages/joy-media/src/channels/ViewChannel.view.tsx b/pioneer/packages/joy-media/src/channels/ViewChannel.view.tsx
index 7bd52b9b56..8a05504706 100644
--- a/pioneer/packages/joy-media/src/channels/ViewChannel.view.tsx
+++ b/pioneer/packages/joy-media/src/channels/ViewChannel.view.tsx
@@ -19,7 +19,7 @@ export const ViewChannelView = MediaView<Props>({
   }
 });
 
-export const ViewChannelWithRouter = (props: Props & RouteComponentProps<any>) => {
+export const ViewChannelWithRouter = (props: Props & RouteComponentProps<Record<string, string | undefined>>) => {
   const { match: { params: { id } } } = props;
   const { api } = useApi();
 
diff --git a/pioneer/packages/joy-media/src/common/BgImg.tsx b/pioneer/packages/joy-media/src/common/BgImg.tsx
index 6913c7e2ec..9b73866f22 100644
--- a/pioneer/packages/joy-media/src/common/BgImg.tsx
+++ b/pioneer/packages/joy-media/src/common/BgImg.tsx
@@ -13,7 +13,7 @@ type Props = {
 export function BgImg (props: Props) {
   let { url, width, height, size, circle, className, style } = props;
 
-  const fullClass = 'JoyBgImg ' + className;
+  const fullClass = `JoyBgImg ${className || ''}`;
 
   let fullStyle: CSSProperties = {
     backgroundImage: `url(${url})`
diff --git a/pioneer/packages/joy-media/src/common/MediaForms.tsx b/pioneer/packages/joy-media/src/common/MediaForms.tsx
index eca2b05a26..c61cd94c20 100644
--- a/pioneer/packages/joy-media/src/common/MediaForms.tsx
+++ b/pioneer/packages/joy-media/src/common/MediaForms.tsx
@@ -40,7 +40,7 @@ type MediaTextProps<OuterProps, FormValues> =
 type MediaFieldProps<OuterProps, FormValues> =
   BaseFieldProps<OuterProps, FormValues> &
   JoyForms.LabelledProps<FormValues> & {
-    fieldProps: any;
+    fieldProps: Record<string, unknown>;
   }
 
 type MediaDropdownProps<OuterProps, FormValues> =
@@ -106,8 +106,8 @@ export function withMediaForm<OuterProps, FormValues>
 
   const MediaDropdown = (props: MediaDropdownProps<OuterProps, FormValues>) => {
     const { field: f, options = [] } = props;
-    const id = f.id as string;
-    const value = (props.values as any)[id] || '';
+    const id = f.id;
+    const value = props.values[id] || '';
 
     return <MediaField {...props} fieldProps={{
       component: Dropdown,
@@ -116,10 +116,10 @@ export function withMediaForm<OuterProps, FormValues>
       options,
       value,
       onBlur: (_event: any, _data: DropdownProps) => {
-        props.setFieldTouched(id, true);
+        props.setFieldTouched(id as string, true);
       },
       onChange: (_event: any, data: DropdownProps) => {
-        props.setFieldValue(id, data.value);
+        props.setFieldValue(id as string, data.value);
       }
     }} />;
   };
diff --git a/pioneer/packages/joy-media/src/common/MediaPlayerView.tsx b/pioneer/packages/joy-media/src/common/MediaPlayerView.tsx
index bb65346c13..959b18f1fc 100644
--- a/pioneer/packages/joy-media/src/common/MediaPlayerView.tsx
+++ b/pioneer/packages/joy-media/src/common/MediaPlayerView.tsx
@@ -41,7 +41,7 @@ export type RequiredMediaPlayerProps = {
 type ContentProps = {
   contentType?: string;
   dataObjectOpt?: Option<DataObject>;
-  resolvedAssetUrl?: string;
+  resolvedAssetUrl: string;
 }
 
 type MediaPlayerViewProps = ApiProps & I18nProps &
@@ -103,6 +103,7 @@ function InnerComponent (props: MediaPlayerViewProps) {
   const { video, resolvedAssetUrl: url } = props;
 
   const { dataObjectOpt, channel } = props;
+  const { myAccountId } = useMyMembership();
 
   if (!dataObjectOpt || dataObjectOpt.isNone) {
     return null;
@@ -110,8 +111,6 @@ function InnerComponent (props: MediaPlayerViewProps) {
 
   // TODO extract and show the next info from dataObject:
   // {"owner":"5GSMNn8Sy8k64mGUWPDafjMZu9bQNX26GujbBQ1LeJpNbrfg","added_at":{"block":2781,"time":1582750854000},"type_id":1,"size":3664485,"liaison":"5HN528fspu4Jg3KXWm7Pu7aUK64RSBz2ZSbwo1XKR9iz3hdY","liaison_judgement":1,"ipfs_content_id":"QmNk4QczoJyPTAKdfoQna6KhAz3FwfjpKyRBXAZHG5djYZ"}
-
-  const { myAccountId } = useMyMembership();
   const iAmOwner = isAccountAChannelOwner(channel, myAccountId);
 
   return (
diff --git a/pioneer/packages/joy-media/src/common/MediaPlayerWithResolver.tsx b/pioneer/packages/joy-media/src/common/MediaPlayerWithResolver.tsx
index fa6473fd84..101f305322 100644
--- a/pioneer/packages/joy-media/src/common/MediaPlayerWithResolver.tsx
+++ b/pioneer/packages/joy-media/src/common/MediaPlayerWithResolver.tsx
@@ -1,11 +1,11 @@
 import React, { useState, useEffect } from 'react';
-import axios, { CancelTokenSource } from 'axios';
+import axios, { CancelTokenSource, AxiosError } from 'axios';
 import _ from 'lodash';
 
 import { ApiProps } from '@polkadot/react-api/types';
 import { I18nProps } from '@polkadot/react-components/types';
 import { withMulti } from '@polkadot/react-api/hoc';
-import { Option } from '@polkadot/types/codec';
+import { Option, Vec } from '@polkadot/types/codec';
 
 import translate from '../translate';
 import { DiscoveryProviderProps, withDiscoveryProvider } from '../DiscoveryProvider';
@@ -14,6 +14,7 @@ import { Message } from 'semantic-ui-react';
 import { MediaPlayerView, RequiredMediaPlayerProps } from './MediaPlayerView';
 import { JoyInfo } from '@polkadot/joy-utils/react/components';
 import { useTransport } from '@polkadot/joy-utils/react/hooks';
+import { isObjectWithProperties } from '@polkadot/joy-utils/functions/misc';
 
 type Props = ApiProps & I18nProps & DiscoveryProviderProps & RequiredMediaPlayerProps;
 
@@ -34,9 +35,13 @@ function InnerComponent (props: Props) {
     setError(undefined);
     setCancelSource(newCancelSource());
 
-    const rids: DataObjectStorageRelationshipId[] = await api.query.dataObjectStorageRegistry.relationshipsByContentId(contentId) as any;
+    const rids = await api.query.dataObjectStorageRegistry.relationshipsByContentId<Vec<DataObjectStorageRelationshipId>>(contentId);
 
-    const allRelationships: Option<DataObjectStorageRelationship>[] = await Promise.all(rids.map((id) => api.query.dataObjectStorageRegistry.relationships(id))) as any;
+    const allRelationships = await Promise.all(
+      rids.map((id) =>
+        api.query.dataObjectStorageRegistry.relationships<Option<DataObjectStorageRelationship>>(id)
+      )
+    );
 
     // Providers that have signalled onchain that they have the asset
     let readyProviders = allRelationships.filter((r) => r.isSome).map((r) => r.unwrap())
@@ -58,7 +63,7 @@ function InnerComponent (props: Props) {
     // are not pruned onchain.
     readyProviders = _.intersectionBy(activeProviders, readyProviders, (provider) => provider.toString());
 
-    console.log(`Found ${readyProviders.length} providers ready to serve content: ${readyProviders}`);
+    console.log(`Found ${readyProviders.length} providers ready to serve content: ${readyProviders.join(', ')}`);
 
     // shuffle to spread the load
     readyProviders = _.shuffle(readyProviders);
@@ -87,16 +92,23 @@ function InnerComponent (props: Props) {
       try {
         console.log('Check URL of resolved asset:', assetUrl);
         const response = await axios.head(assetUrl, { cancelToken: cancelSource.token });
+        const headers = response.headers as Record<string, string | undefined>;
 
-        setContentType(response.headers['content-type'] || 'video/video');
+        setContentType(headers['content-type'] || 'video/video');
         setResolvedAssetUrl(assetUrl);
 
         return;
-      } catch (err) {
+      } catch (e) {
+        const err = e as unknown;
+
         if (axios.isCancel(err)) {
           return;
         } else {
-          if (!err.response || (err.response.status >= 500 && err.response.status <= 504)) {
+          const response = isObjectWithProperties(err, 'response')
+            ? (err as AxiosError).response
+            : undefined;
+
+          if (!response || (response.status >= 500 && response.status <= 504)) {
             // network connection error
             discoveryProvider.reportUnreachable(provider);
           }
@@ -111,7 +123,7 @@ function InnerComponent (props: Props) {
   };
 
   useEffect(() => {
-    resolveAsset();
+    void resolveAsset();
 
     return () => {
       cancelSource.cancel();
diff --git a/pioneer/packages/joy-media/src/common/TypeHelpers.ts b/pioneer/packages/joy-media/src/common/TypeHelpers.ts
index b546a851a8..893c2e08b4 100644
--- a/pioneer/packages/joy-media/src/common/TypeHelpers.ts
+++ b/pioneer/packages/joy-media/src/common/TypeHelpers.ts
@@ -19,7 +19,7 @@ export function asChannelId (id: AnyChannelId): ChannelId {
   } else if (canBeId(id)) {
     return createMock('ChannelId', id);
   } else {
-    throw new Error(`Not supported format for Channel id: ${id}`);
+    throw new Error(`Not supported format for Channel id: ${typeof id === 'object' ? id.constructor.name : id}`);
   }
 }
 
@@ -29,7 +29,7 @@ export function asEntityId (id: AnyEntityId): EntityId {
   } else if (canBeId(id)) {
     return createMock('EntityId', id);
   } else {
-    throw new Error(`Not supported format for Entity id: ${id}`);
+    throw new Error(`Not supported format for Entity id: ${typeof id === 'object' ? id.constructor.name : id}`);
   }
 }
 
@@ -39,6 +39,6 @@ export function asClassId (id: AnyClassId): ClassId {
   } else if (canBeId(id)) {
     return createMock('ClassId', id);
   } else {
-    throw new Error(`Not supported format for Class id: ${id}`);
+    throw new Error(`Not supported format for Class id: ${typeof id === 'object' ? id.constructor.name : id}`);
   }
 }
diff --git a/pioneer/packages/joy-media/src/index.tsx b/pioneer/packages/joy-media/src/index.tsx
index acda86b3fb..5a2fd2b17e 100644
--- a/pioneer/packages/joy-media/src/index.tsx
+++ b/pioneer/packages/joy-media/src/index.tsx
@@ -26,7 +26,7 @@ import { AllVideosView } from './explore/AllVideos';
 import { AllChannelsView } from './explore/AllChannels';
 // import { VideosByOwner } from './video/VideosByOwner';
 
-type Props = AppProps & I18nProps & ApiProps & DiscoveryProviderProps & {};
+type Props = AppProps & I18nProps & ApiProps & DiscoveryProviderProps;
 
 function App (props: Props) {
   const { t, basePath } = props;
diff --git a/pioneer/packages/joy-media/src/music/MusicTrackPreview.tsx b/pioneer/packages/joy-media/src/music/MusicTrackPreview.tsx
index 6d8e433f69..200374860e 100644
--- a/pioneer/packages/joy-media/src/music/MusicTrackPreview.tsx
+++ b/pioneer/packages/joy-media/src/music/MusicTrackPreview.tsx
@@ -39,7 +39,7 @@ export function MusicTrackPreview (props: EditableMusicTrackPreviewProps) {
     setChecked(d.checked || false);
   };
 
-  return <div className={`JoyMusicTrackPreview ${checked && 'SelectedItem'} ${props.isDraggable && 'DraggableItem'}`}>
+  return <div className={`JoyMusicTrackPreview ${checked ? 'SelectedItem' : ''} ${props.isDraggable ? 'DraggableItem' : ''}`}>
     {props.onSelect && <div className='CheckboxCell'>
       <Checkbox checked={checked} onChange={onChange} />
     </div>}
diff --git a/pioneer/packages/joy-media/src/music/MyMusicTracks.tsx b/pioneer/packages/joy-media/src/music/MyMusicTracks.tsx
index cbaaeab857..ecd6f1b1ac 100644
--- a/pioneer/packages/joy-media/src/music/MyMusicTracks.tsx
+++ b/pioneer/packages/joy-media/src/music/MyMusicTracks.tsx
@@ -131,7 +131,7 @@ export function MyMusicTracks (props: MyMusicTracksProps) {
   const selectedTracks = tracks.filter((track) => idsOfSelectedTracks.has(track.id));
 
   const renderReorderTracks = () => {
-    return <Section title={`Add tracks to album "${albumName}"`}>
+    return <Section title={`Add tracks to album "${albumName || ''}"`}>
 
       <Message
         info
diff --git a/pioneer/packages/joy-media/src/upload/EditVideo.view.tsx b/pioneer/packages/joy-media/src/upload/EditVideo.view.tsx
index 9058e6bd77..f58c793402 100644
--- a/pioneer/packages/joy-media/src/upload/EditVideo.view.tsx
+++ b/pioneer/packages/joy-media/src/upload/EditVideo.view.tsx
@@ -23,7 +23,7 @@ export const EditVideoView = MediaView<Props>({
   }
 });
 
-type WithRouterProps = Props & RouteComponentProps<any>
+type WithRouterProps = Props & RouteComponentProps<Record<string, string | undefined>>
 
 export const UploadVideoWithRouter = (props: WithRouterProps) => {
   const { match: { params: { channelId } } } = props;
diff --git a/pioneer/packages/joy-media/src/upload/UploadVideo.tsx b/pioneer/packages/joy-media/src/upload/UploadVideo.tsx
index 9fd2de55d9..3aae159461 100644
--- a/pioneer/packages/joy-media/src/upload/UploadVideo.tsx
+++ b/pioneer/packages/joy-media/src/upload/UploadVideo.tsx
@@ -115,7 +115,7 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
     Object.keys(values).forEach((prop) => {
       const fieldName = prop as VideoPropId;
       const field = Fields[fieldName];
-      let fieldValue = values[fieldName] as any;
+      let fieldValue = values[fieldName];
 
       let shouldIncludeValue = true;
 
@@ -147,10 +147,12 @@ const InnerForm = (props: MediaFormProps<OuterProps, FormValues>) => {
         }
 
         if (isDateField(fieldName)) {
-          fieldValue = humanDateToUnixTs(fieldValue);
+          fieldValue = typeof fieldValue === 'string' ? (humanDateToUnixTs(fieldValue) || '') : '';
         }
 
-        res[fieldName] = fieldValue;
+        // FIXME: Temporary solution, since fixing this would require a bigger refactorization
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        res[fieldName] = fieldValue as any;
       }
     });
 
diff --git a/pioneer/packages/joy-media/src/video/PlayVideo.view.tsx b/pioneer/packages/joy-media/src/video/PlayVideo.view.tsx
index c07ef604de..84ba65408d 100644
--- a/pioneer/packages/joy-media/src/video/PlayVideo.view.tsx
+++ b/pioneer/packages/joy-media/src/video/PlayVideo.view.tsx
@@ -27,7 +27,7 @@ export const PlayVideoView = MediaView<Props>({
   }
 });
 
-export const PlayVideoWithRouter = (props: Props & RouteComponentProps<any>) => {
+export const PlayVideoWithRouter = (props: Props & RouteComponentProps<Record<string, string | undefined>>) => {
   const { match: { params: { id } } } = props;
   const { api } = useApi();
 
diff --git a/pioneer/packages/joy-utils/src/functions/misc.ts b/pioneer/packages/joy-utils/src/functions/misc.ts
index 6dc018d650..0a6761fcb7 100644
--- a/pioneer/packages/joy-utils/src/functions/misc.ts
+++ b/pioneer/packages/joy-utils/src/functions/misc.ts
@@ -167,13 +167,20 @@ export function bytesToString (bytes: Bytes) {
   return Buffer.from(bytes.toString().substr(2), 'hex').toString();
 }
 
-export function normalizeError (e: any): string {
+// Based on: https://fettblog.eu/typescript-hasownproperty/
+export function isObjectWithProperties<X extends unknown, Y extends PropertyKey[]> (input: X, ...props: Y): input is X & Record<Y[number], unknown> {
+  return typeof input === 'object' && input !== null && props.every((prop) => prop in input);
+}
+
+export function normalizeError (e: unknown): string {
   let message: string;
 
   if (e instanceof Error) {
     message = e.message;
+  } else if (isObjectWithProperties(e, 'toString') && typeof e.toString === 'function') {
+    message = e.toString() as string;
   } else if (typeof e === 'string') {
-    return e;
+    message = e;
   } else {
     message = JSON.stringify(e);
   }
diff --git a/pioneer/packages/joy-utils/src/react/hocs/accounts.tsx b/pioneer/packages/joy-utils/src/react/hocs/accounts.tsx
index d97b102968..9c1955ba20 100644
--- a/pioneer/packages/joy-utils/src/react/hocs/accounts.tsx
+++ b/pioneer/packages/joy-utils/src/react/hocs/accounts.tsx
@@ -7,7 +7,7 @@ import { withCalls, withMulti, withObservable, ApiContext } from '@polkadot/reac
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 
 import { MemberId, Membership } from '@joystream/types/members';
-import { LeadId, Lead, CuratorId, Curator } from '@joystream/types/content-working-group';
+import { LeadId, Lead, CuratorId, Curator, CurationActor } from '@joystream/types/content-working-group';
 
 import { queryMembershipToProp } from '@polkadot/joy-members/utils';
 import useMyAccount from '../hooks/useMyAccount';
@@ -35,9 +35,9 @@ export type MyAccountProps = MyAddressProps & {
   // Content Working Group
   isLeadSet?: Option<LeadId>;
   contentLeadId?: LeadId;
-  contentLead?: Lead; // linked_map value
+  contentLead?: Lead;
 
-  curationActor?: any;
+  curationActor?: [CurationActor, AccountId];
   allAccounts?: SubjectInfo;
 };
 
diff --git a/pioneer/packages/joy-utils/src/transport/SimpleCache.ts b/pioneer/packages/joy-utils/src/transport/SimpleCache.ts
index b49992d285..7754d8e462 100644
--- a/pioneer/packages/joy-utils/src/transport/SimpleCache.ts
+++ b/pioneer/packages/joy-utils/src/transport/SimpleCache.ts
@@ -16,7 +16,7 @@ function anyIdToString (id: IdLike): string {
 export class SimpleCache<Id extends IdLike, Obj extends HasId> {
   private cacheName: string
   private loadByIds: LoadObjectsByIdsFn<Id, Obj>
-  private cache: Map<string, Obj> = new Map()
+  private cache = new Map<string, Obj>()
 
   constructor (cacheName: string, loadByIds: LoadObjectsByIdsFn<Id, Obj>) {
     this.cacheName = cacheName;
@@ -30,7 +30,7 @@ export class SimpleCache<Id extends IdLike, Obj extends HasId> {
   clear (): void {
     const prevCacheSize = this.cache.size;
 
-    this.cache = new Map();
+    this.cache = new Map<string, Obj>();
     console.info(`Removed all ${prevCacheSize} entries from ${this.cacheName}`);
   }
 
@@ -40,7 +40,7 @@ export class SimpleCache<Id extends IdLike, Obj extends HasId> {
       ? keepIds
       : new Set(keepIds.map((id) => id.toString()));
 
-    const newCache: Map<string, Obj> = new Map();
+    const newCache = new Map<string, Obj>();
 
     for (const [id, o] of this.cache.entries()) {
       if (keepIdsSet.has(id)) {