From c16818fd3ef44760499a8c5165478dbc5342dc04 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Fri, 7 Jun 2019 11:02:20 +0200
Subject: [PATCH] Pull RawPayload and ExtensionStore from deps (#55)

* Pull RawPayload and ExtensionStore from deps

* Use {method,section}Name from Method

* Cleanup method display (known) with meta
---
 package.json                                  |   4 +-
 packages/extension-ui/package.json            |   2 +-
 .../src/Popup/Authorize/Request.tsx           |  22 +-
 .../src/Popup/Signing/Details.tsx             |  46 +-
 packages/extension/package.json               |   4 +-
 .../extension/src/background/ChromeStore.ts   |  58 ---
 .../extension/src/background/RawPayload.ts    |  38 --
 .../src/background/handlers/Extension.ts      |  24 +-
 .../extension/src/background/handlers/Tabs.ts |   8 +-
 .../src/background/handlers/index.ts          |   8 +-
 packages/extension/src/background/index.ts    |   5 +-
 packages/extension/src/extensionizer.d.ts     |  15 -
 yarn.lock                                     | 395 ++++++++++--------
 13 files changed, 308 insertions(+), 321 deletions(-)
 delete mode 100644 packages/extension/src/background/ChromeStore.ts
 delete mode 100644 packages/extension/src/background/RawPayload.ts
 delete mode 100644 packages/extension/src/extensionizer.d.ts

diff --git a/package.json b/package.json
index 34f9bbdc207..04a2c6a0131 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.4.5",
-    "@polkadot/dev-react": "^0.30.0-beta.8",
-    "@polkadot/ts": "^0.1.58"
+    "@polkadot/dev-react": "^0.30.0-beta.10",
+    "@polkadot/ts": "^0.1.59"
   }
 }
diff --git a/packages/extension-ui/package.json b/packages/extension-ui/package.json
index ecacd60b459..cbaeeea89f0 100644
--- a/packages/extension-ui/package.json
+++ b/packages/extension-ui/package.json
@@ -5,7 +5,7 @@
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "license": "Apache-2",
   "dependencies": {
-    "@polkadot/ui-identicon": "^0.40.1",
+    "@polkadot/ui-identicon": "^0.41.0-beta.3",
     "@types/react-router": "^5.0.0",
     "@types/react-router-dom": "^4.3.3",
     "react-router": "^5.0.0",
diff --git a/packages/extension-ui/src/Popup/Authorize/Request.tsx b/packages/extension-ui/src/Popup/Authorize/Request.tsx
index 5889b46174f..aee7b57b949 100644
--- a/packages/extension-ui/src/Popup/Authorize/Request.tsx
+++ b/packages/extension-ui/src/Popup/Authorize/Request.tsx
@@ -40,18 +40,20 @@ function Request ({ authId, className, isFirst, onAction, request: { origin }, u
         />
       }
       intro={
-        <div>An application, identified as <div className='tab-name'>{origin}</div> is requesting access from <div className='tab-url'>{url}</div>.</div>
+        <div className='tab-info'>An application, self-identifying as <span className='tab-name'>{origin}</span> is requesting access from <span className='tab-url'>{url}</span>.</div>
       }
     >
       <ActionBar>
         <Link isDanger onClick={onReject}>Reject</Link>
       </ActionBar>
-      <Tip header='access' type='warn'>Only approve this request if you trust the application. Approving gives the application access to the addresses of your accounts.</Tip>
       {isFirst && (
-        <Button
-          label='Yes, allow this application access'
-          onClick={onApprove}
-        />
+        <>
+          <Tip header='access' type='warn'>Only approve this request if you trust the application. Approving gives the application access to the addresses of your accounts.</Tip>
+          <Button
+            label='Yes, allow this application access'
+            onClick={onApprove}
+          />
+        </>
       )}
     </IconBox>
   );
@@ -63,9 +65,17 @@ export default withOnAction(styled(Request)`
     color: ${defaults.btnColorDanger};
   }
 
+  .tab-info {
+    overflow: hidden;
+  }
+
   .tab-name,
   .tab-url {
     color: ${defaults.linkColor};
     display: inline-block;
+    max-width: 20rem;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: top;
   }
 `);
diff --git a/packages/extension-ui/src/Popup/Signing/Details.tsx b/packages/extension-ui/src/Popup/Signing/Details.tsx
index 3b2ca018ec0..6ffc0872376 100644
--- a/packages/extension-ui/src/Popup/Signing/Details.tsx
+++ b/packages/extension-ui/src/Popup/Signing/Details.tsx
@@ -30,13 +30,28 @@ function renderMethod (data: string, meta?: Metadata | null) {
   Method.injectMethods(fromMetadata(meta));
 
   const method = new Method(data);
-  const methodfn = Method.findFunction(method.callIndex);
 
   return (
-    <tr>
-      <td className='label'>{methodfn.section}.{methodfn.method}</td>
-      <td className='data'><pre>{JSON.stringify(method.toJSON().args, null, 2)}</pre></td>
-    </tr>
+    <>
+      <tr>
+        <td className='label'>method</td>
+        <td className='data'>{method.sectionName}.{method.methodName}</td>
+      </tr>
+      <tr>
+        <td className='label'>&nbsp;</td>
+        <td className='data'><pre>{JSON.stringify(method.toJSON().args, null, 2)}</pre></td>
+      </tr>
+      {method.meta && (
+        <tr>
+          <td className='label'>info</td>
+          <td className='data'>
+            <details>
+              <summary>{method.meta.documentation.join(' ')}</summary>
+            </details>
+          </td>
+        </tr>
+      )}
+    </>
   );
 }
 
@@ -75,7 +90,7 @@ export default styled(Details)`
     overflow: hidden;
     text-align: left;
     text-overflow: ellipsis;
-    vertical-align: top;
+    vertical-align: middle;
     width: 100%;
 
     pre {
@@ -87,8 +102,25 @@ export default styled(Details)`
 
   td.label {
     opacity: 0.5;
+    padding: 0 0.5rem;
     text-align: right;
-    vertical-align: top;
+    vertical-align: middle;
     white-space: nowrap;
   }
+
+  details {
+    cursor: pointer;
+    max-width: 24rem;
+
+    &[open] summary {
+      white-space: normal;
+    }
+
+    summary {
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+      outline: 0;
+    }
+  }
 `;
diff --git a/packages/extension/package.json b/packages/extension/package.json
index 30a4db2d3ca..bdc2f0d6753 100644
--- a/packages/extension/package.json
+++ b/packages/extension/package.json
@@ -5,9 +5,9 @@
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "license": "Apache-2",
   "dependencies": {
-    "@polkadot/api": "^0.80.1",
+    "@polkadot/api": "^0.81.0-beta.1",
     "@polkadot/extension-ui": "^0.1.1-beta.23",
-    "@polkadot/ui-keyring": "^0.40.1"
+    "@polkadot/ui-keyring": "^0.41.0-beta.3"
   },
   "devDependencies": {
     "@types/chrome": "^0.0.86",
diff --git a/packages/extension/src/background/ChromeStore.ts b/packages/extension/src/background/ChromeStore.ts
deleted file mode 100644
index 72a38e4a0c1..00000000000
--- a/packages/extension/src/background/ChromeStore.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2019 @polkadot/extension authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-import { KeyringStore } from '@polkadot/ui-keyring/types';
-
-import extension from 'extensionizer';
-
-const lastError = (type: string): void => {
-  const error = extension.runtime.lastError;
-
-  if (error) {
-    console.error(`ChromeStore.${type}:: runtime.lastError:`, error);
-  }
-};
-
-export default class ChromeStore implements KeyringStore {
-  all (cb: (key: string, value: any) => void): void {
-    extension.storage.local.get(null, (result: { [index: string]: any }) => {
-      lastError('all');
-
-      Object.entries(result).forEach(([key, value]) =>
-        cb(key, value)
-      );
-    });
-  }
-
-  get (key: string, cb: (value: any) => void): void {
-    extension.storage.local.get([key], (result: { [index: string]: any }) => {
-      lastError('get');
-
-      cb(result[key]);
-    });
-  }
-
-  remove (key: string, cb?: () => void): void {
-    extension.storage.local.remove(key, () => {
-      lastError('remove');
-
-      cb && cb();
-    });
-  }
-
-  set (key: string, value: any, cb?: () => void): void {
-    // shortcut, don't save testing accounts in storage
-    if (key.indexOf('account:') === 0 && value.meta && value.meta.isTesting) {
-      cb && cb();
-
-      return;
-    }
-
-    extension.storage.local.set({ [key]: value }, () => {
-      lastError('set');
-
-      cb && cb();
-    });
-  }
-}
diff --git a/packages/extension/src/background/RawPayload.ts b/packages/extension/src/background/RawPayload.ts
deleted file mode 100644
index 3a45473c2ca..00000000000
--- a/packages/extension/src/background/RawPayload.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2017-2019 @polkadot/types authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-import { KeyringPair } from '@polkadot/keyring/types';
-
-import { ExtrinsicEra, Hash, IndexCompact, Struct, U8a } from '@polkadot/types';
-import { blake2AsU8a } from '@polkadot/util-crypto';
-
-// This is a copy of the signing in @polkadot/types with the method as a pure U8a
-// (without metadata, we cannot reliably parse the Method when we don not have
-// the actual chain metadata - this is for offline, non-connected signing)
-export default class SignaturePayloadRaw extends Struct {
-  protected _signature?: Uint8Array;
-
-  constructor (value?: any) {
-    super({
-      nonce: IndexCompact,
-      method: U8a,
-      era: ExtrinsicEra,
-      blockHash: Hash
-    }, value);
-  }
-
-  /**
-   * @description Sign the payload with the keypair
-   */
-  sign (signerPair: KeyringPair): Uint8Array {
-    const u8a = this.toU8a();
-    const encoded = u8a.length > 256
-      ? blake2AsU8a(u8a)
-      : u8a;
-
-    this._signature = signerPair.sign(encoded);
-
-    return this._signature;
-  }
-}
diff --git a/packages/extension/src/background/handlers/Extension.ts b/packages/extension/src/background/handlers/Extension.ts
index f5950d09eb1..425fd0c2384 100644
--- a/packages/extension/src/background/handlers/Extension.ts
+++ b/packages/extension/src/background/handlers/Extension.ts
@@ -8,10 +8,10 @@ import { AuthorizeRequest, MessageTypes, MessageAccountCreate, MessageAccountEdi
 
 import keyring from '@polkadot/ui-keyring';
 import accountsObservable from '@polkadot/ui-keyring/observable/accounts';
+import { SignaturePayloadRaw } from '@polkadot/types';
 import { mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';
 import { assert, u8aToHex } from '@polkadot/util';
 
-import RawPayload from '../RawPayload';
 import State from './State';
 import { createSubscription, unsubscribe } from './subscriptions';
 
@@ -23,10 +23,10 @@ function transformAccounts (accounts: SubjectInfo): Array<KeyringJson> {
 }
 
 export default class Extension {
-  private _state: State;
+  state: State;
 
   constructor (state: State) {
-    this._state = state;
+    this.state = state;
   }
 
   private accountsCreate ({ name, password, suri, type }: MessageAccountCreate): boolean {
@@ -71,7 +71,7 @@ export default class Extension {
   }
 
   private authorizeApprove ({ id }: MessageAuthorizeApprove): boolean {
-    const queued = this._state.getAuthRequest(id);
+    const queued = this.state.getAuthRequest(id);
 
     assert(queued, 'Unable to find request');
 
@@ -83,7 +83,7 @@ export default class Extension {
   }
 
   private authorizeReject ({ id }: MessageAuthorizeReject): boolean {
-    const queued = this._state.getAuthRequest(id);
+    const queued = this.state.getAuthRequest(id);
 
     assert(queued, 'Unable to find request');
 
@@ -95,13 +95,13 @@ export default class Extension {
   }
 
   private authorizeRequests (): Array<AuthorizeRequest> {
-    return this._state.allAuthRequests;
+    return this.state.allAuthRequests;
   }
 
   // FIXME This looks very much like what we have in accounts
   private authorizeSubscribe (id: string, port: chrome.runtime.Port): boolean {
     const cb = createSubscription(id, port);
-    const subscription = this._state.authSubject.subscribe((requests: Array<AuthorizeRequest>) =>
+    const subscription = this.state.authSubject.subscribe((requests: Array<AuthorizeRequest>) =>
       cb(requests)
     );
 
@@ -133,7 +133,7 @@ export default class Extension {
   }
 
   private signingApprove ({ id, password }: MessageExtrinsicSignApprove): boolean {
-    const queued = this._state.getSignRequest(id);
+    const queued = this.state.getSignRequest(id);
 
     assert(queued, 'Unable to find request');
 
@@ -148,7 +148,7 @@ export default class Extension {
 
     pair.decodePkcs8(password);
 
-    const payload = new RawPayload({ blockHash, method, nonce });
+    const payload = new SignaturePayloadRaw({ blockHash, method, nonce });
     const signature = u8aToHex(payload.sign(pair));
 
     pair.lock();
@@ -162,7 +162,7 @@ export default class Extension {
   }
 
   private signingCancel ({ id }: MessageExtrinsicSignCancel): boolean {
-    const queued = this._state.getSignRequest(id);
+    const queued = this.state.getSignRequest(id);
 
     assert(queued, 'Unable to find request');
 
@@ -174,13 +174,13 @@ export default class Extension {
   }
 
   private signingRequests (): Array<SigningRequest> {
-    return this._state.allSignRequests;
+    return this.state.allSignRequests;
   }
 
   // FIXME This looks very much like what we have in authorization
   private signingSubscribe (id: string, port: chrome.runtime.Port): boolean {
     const cb = createSubscription(id, port);
-    const subscription = this._state.signSubject.subscribe((requests: Array<SigningRequest>) =>
+    const subscription = this.state.signSubject.subscribe((requests: Array<SigningRequest>) =>
       cb(requests)
     );
 
diff --git a/packages/extension/src/background/handlers/Tabs.ts b/packages/extension/src/background/handlers/Tabs.ts
index c6ce4d165b2..bcc9dae4696 100644
--- a/packages/extension/src/background/handlers/Tabs.ts
+++ b/packages/extension/src/background/handlers/Tabs.ts
@@ -21,14 +21,14 @@ function transformAccounts (accounts: SubjectInfo): Accounts {
 }
 
 export default class Tabs {
-  private _state: State;
+  state: State;
 
   constructor (state: State) {
-    this._state = state;
+    this.state = state;
   }
 
   private authorize (url: string, request: MessageAuthorize) {
-    return this._state.authorizeUrl(url, request);
+    return this.state.authorizeUrl(url, request);
   }
 
   private accountsList (url: string): Accounts {
@@ -56,7 +56,7 @@ export default class Tabs {
 
     assert(pair, 'Unable to find keypair');
 
-    return this._state.signQueue(url, request);
+    return this.state.signQueue(url, request);
   }
 
   async handle (id: string, type: MessageTypes, request: any, url: string, port: chrome.runtime.Port): Promise<any> {
diff --git a/packages/extension/src/background/handlers/index.ts b/packages/extension/src/background/handlers/index.ts
index 2507fd3fd6f..6e69c6302e2 100644
--- a/packages/extension/src/background/handlers/index.ts
+++ b/packages/extension/src/background/handlers/index.ts
@@ -9,8 +9,6 @@ import Extension from './Extension';
 import State from './State';
 import Tabs from './Tabs';
 
-const FALLBACK_URL = '<unknown>';
-
 const state = new State();
 const extension = new Extension(state);
 const tabs = new Tabs(state);
@@ -20,14 +18,14 @@ export default function handler ({ id, message, request }: MessageRequest, port:
   const sender = port.sender as chrome.runtime.MessageSender;
   const from = isPopup
     ? 'popup'
-    : (sender.tab && sender.tab.url) || sender.url;
-  const source = `${from || FALLBACK_URL}: ${id}: ${message}`;
+    : (sender.tab && sender.tab.url) || sender.url || '<unknown>';
+  const source = `${from}: ${id}: ${message}`;
 
   console.log(` [in] ${source}`); // :: ${JSON.stringify(request)}`);
 
   const promise = isPopup
     ? extension.handle(id, message, request, port)
-    : tabs.handle(id, message, request, from || FALLBACK_URL, port);
+    : tabs.handle(id, message, request, from, port);
 
   promise
     .then((response) => {
diff --git a/packages/extension/src/background/index.ts b/packages/extension/src/background/index.ts
index cca31022002..6c43e91286a 100644
--- a/packages/extension/src/background/index.ts
+++ b/packages/extension/src/background/index.ts
@@ -6,12 +6,11 @@ import extension from 'extensionizer';
 
 // Runs in the extension background, handling all keyring access
 
-import keyring from '@polkadot/ui-keyring';
+import keyring, { ExtensionStore } from '@polkadot/ui-keyring';
 import { assert } from '@polkadot/util';
 import { cryptoWaitReady } from '@polkadot/util-crypto';
 
 import { PORT_CONTENT, PORT_POPUP } from '../defaults';
-import ChromeStore from './ChromeStore';
 import handlers from './handlers';
 
 // setup the notification (same a FF default background, white text)
@@ -33,7 +32,7 @@ cryptoWaitReady()
     console.log('crypto initialized');
 
     // load all the keyring data
-    keyring.loadAll({ store: new ChromeStore(), type: 'sr25519' });
+    keyring.loadAll({ store: new ExtensionStore(), type: 'sr25519' });
 
     console.log('initialization completed');
   })
diff --git a/packages/extension/src/extensionizer.d.ts b/packages/extension/src/extensionizer.d.ts
deleted file mode 100644
index df4244b2d0a..00000000000
--- a/packages/extension/src/extensionizer.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2019 @polkadot/extension authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-declare var gBrowser: undefined | {
-  selectedBrowser: {
-    contentDocument: Document
-  }
-};
-
-declare module 'extensionizer' {
-  const extensionizer: typeof chrome;
-
-  export default extensionizer;
-}
diff --git a/yarn.lock b/yarn.lock
index 59094781285..dfa84ddd6ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1751,41 +1751,41 @@
     universal-user-agent "^2.0.0"
     url-template "^2.0.8"
 
-"@polkadot/api-derive@^0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.80.1.tgz#bd2eab337e33be4239c232887c7cdc1190429532"
-  integrity sha512-lfkCQB1OoBzM4aLLzpM2yuhZNT/ozcb2fQa+JGqMg6FhVWoIfN3KW9ZUJg6siegBbwLjB+KT5+rF4U9fIqIEvA==
+"@polkadot/api-derive@^0.81.0-beta.1":
+  version "0.81.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.81.0-beta.1.tgz#61659625c496af2af33d391a7c5d8b0e8621f9ab"
+  integrity sha512-E3PmsMeX96gC2/5OdaxZ6meUwGXYTXTVZSHXtq3nfg9Hvz27B2eQlw5Qk0pGLD9YdTq3xF58gSZWhS+L0AmqZQ==
   dependencies:
     "@babel/runtime" "^7.4.5"
-    "@polkadot/api" "^0.80.1"
+    "@polkadot/api" "^0.81.0-beta.1"
     "@polkadot/keyring" "^0.92.1"
-    "@polkadot/types" "^0.80.1"
+    "@polkadot/types" "^0.81.0-beta.1"
     "@types/memoizee" "^0.4.2"
     memoizee "^0.4.14"
 
-"@polkadot/api@^0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.80.1.tgz#23970877b690667d7fed3424d638f4afdbfd9574"
-  integrity sha512-ipeB85jczdy7ka89plcUqElu4qqKmQ1Aoeu0O+Yzlpp4A42E8cv9dv5DKSkVdsd0Ack8aLXDFakcMJpo8o7MOQ==
+"@polkadot/api@^0.81.0-beta.1":
+  version "0.81.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.81.0-beta.1.tgz#d862136324a1250fcbc890f3c7a0b4343ba4c49e"
+  integrity sha512-khhvkcMaFNrQZ21N8LUMVmo95UeBflecN64V7Opq9RUjCjRp/CxY6OxhIfbMn5BQUHKhG1uciPRAiVP34O8JFw==
   dependencies:
     "@babel/runtime" "^7.4.5"
-    "@polkadot/api-derive" "^0.80.1"
-    "@polkadot/extrinsics" "^0.80.1"
-    "@polkadot/rpc-provider" "^0.80.1"
-    "@polkadot/rpc-rx" "^0.80.1"
-    "@polkadot/storage" "^0.80.1"
-    "@polkadot/types" "^0.80.1"
+    "@polkadot/api-derive" "^0.81.0-beta.1"
+    "@polkadot/extrinsics" "^0.81.0-beta.1"
+    "@polkadot/rpc-provider" "^0.81.0-beta.1"
+    "@polkadot/rpc-rx" "^0.81.0-beta.1"
+    "@polkadot/storage" "^0.81.0-beta.1"
+    "@polkadot/types" "^0.81.0-beta.1"
     "@polkadot/util-crypto" "^0.92.1"
 
-"@polkadot/dev-react@^0.30.0-beta.8":
-  version "0.30.0-beta.8"
-  resolved "https://registry.yarnpkg.com/@polkadot/dev-react/-/dev-react-0.30.0-beta.8.tgz#581e61e00c27719c9874a9f9d6d48ea45fe6839a"
-  integrity sha512-X1SiKC+S8GKH4wlq2PS+JCv8dfpV7AiYdfGYBGEhfYkPtOCset5jKxwSBiekkhBioumdTh8lxCcf32WSi4+3nQ==
+"@polkadot/dev-react@^0.30.0-beta.10":
+  version "0.30.0-beta.10"
+  resolved "https://registry.yarnpkg.com/@polkadot/dev-react/-/dev-react-0.30.0-beta.10.tgz#1a77fd0ca6244138b2cf2c633b425e37dd457598"
+  integrity sha512-mN/hPnQBYEhtx8C8q4Zp/0B89UnLlgdx/GoIy71JwSkUQW12+SMigAQ8WUqiNaLv3XMQRWyLkv0v8O42cyILeg==
   dependencies:
     "@babel/core" "^7.4.5"
     "@babel/plugin-syntax-dynamic-import" "^7.2.0"
     "@babel/preset-react" "^7.0.0"
-    "@polkadot/dev" "^0.30.0-beta.8"
+    "@polkadot/dev" "^0.30.0-beta.10"
     "@types/react" "^16.8.19"
     "@types/react-dom" "^16.8.4"
     "@types/styled-components" "4.1.8"
@@ -1794,29 +1794,29 @@
     browserslist "^4.6.1"
     copy-webpack-plugin "^5.0.3"
     css-loader "^2.1.1"
-    enzyme "^3.9.0"
-    enzyme-adapter-react-16 "^1.13.2"
-    file-loader "^3.0.1"
+    enzyme "^3.10.0"
+    enzyme-adapter-react-16 "^1.14.0"
+    file-loader "^4.0.0"
     html-webpack-plugin "^3.2.0"
     mini-css-extract-plugin "^0.7.0"
     react "^16.8.6"
     react-dom "^16.8.6"
-    react-hot-loader "^4.8.8"
+    react-hot-loader "^4.9.0"
     style-loader "^0.23.0"
     styled-components "^4.2.1"
     thread-loader "^2.1.2"
     tslint "^5.17.0"
     tslint-react "^4.0.0"
-    url-loader "^1.1.1"
-    webpack "^4.32.2"
+    url-loader "^2.0.0"
+    webpack "^4.33.0"
     webpack-cli "^3.3.2"
     webpack-plugin-serve "^0.10.0"
     worker-loader "^2.0.0"
 
-"@polkadot/dev@^0.30.0-beta.8":
-  version "0.30.0-beta.8"
-  resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.30.0-beta.8.tgz#a70027e9e35eb63ba309abb06f6d68f703a64e4b"
-  integrity sha512-NPO94R9b9z7CIyZiXOedDPvNCuaJo0+MtKuA6wYWS2s+Lq3DCccfKFPm4/vxQhTGJzmXDKkMyvporo5gPHNC5g==
+"@polkadot/dev@^0.30.0-beta.10":
+  version "0.30.0-beta.10"
+  resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.30.0-beta.10.tgz#90346cf06a4fcdcac985d4bf7ecf707dbbd84f1d"
+  integrity sha512-ynX4DyFZME2BiDcYltewPIUpegHhhgHxC+qJSAXTkappB+3/ItFBH2T9hFWTHo3/d+DenSRBfXf0HjEdEWYQgQ==
   dependencies:
     "@babel/cli" "^7.4.4"
     "@babel/core" "^7.4.5"
@@ -1848,21 +1848,21 @@
     typedoc-plugin-markdown "^1.2.1"
     typedoc-plugin-no-inherit "^1.1.8"
     typescript "^3.5.1"
-    vuepress "^1.0.0-alpha.47"
+    vuepress "^1.0.0-beta.2"
 
-"@polkadot/extrinsics@^0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/extrinsics/-/extrinsics-0.80.1.tgz#a0c066c7507cf6ca0aa4d3da6edc654a113cd5dc"
-  integrity sha512-It5aumfM6yvayCMPijGimJkoSR2lt8Tg84XUxnQ6Lu4x+3xyfny2vvx8z6uVQmiCu6BybgFpHpkZEts9DzBttA==
+"@polkadot/extrinsics@^0.81.0-beta.1":
+  version "0.81.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/extrinsics/-/extrinsics-0.81.0-beta.1.tgz#f189af75f1f56b6e1876d2d9f8569b4f10102ab9"
+  integrity sha512-eKww561YZ507LFbhojevgI8N5fZ8niL33mgshCAY87N3Vv/8FK6RpsilYFAHX6WoP1gdbLdCSdxk2rmn9lIbhg==
   dependencies:
     "@babel/runtime" "^7.4.5"
-    "@polkadot/types" "^0.80.1"
+    "@polkadot/types" "^0.81.0-beta.1"
     "@polkadot/util" "^0.92.1"
 
-"@polkadot/jsonrpc@^0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.80.1.tgz#fe0324b92134d9f077b6fd0e00e7c56088099e06"
-  integrity sha512-Idi4lJJha7TT+UC/6kPdwsTTLEb7mCI3YhnlGGKlYvTMTWmTaJvk/izhSryFEz6+D86sv5pbHTiYKU1Kn/kROw==
+"@polkadot/jsonrpc@^0.81.0-beta.1":
+  version "0.81.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.81.0-beta.1.tgz#189df11869c66e61f2ae93f3a963d142d481eaeb"
+  integrity sha512-NKj4JBix4Tv0a4+ZBF1hNIq0qC+prf2nUEKcZkShFX92InfCwROjnOwZafp/VTYtTTZ9Uh/ioo+Zil1fwCu6RQ==
   dependencies:
     "@babel/runtime" "^7.4.5"
 
@@ -1877,24 +1877,24 @@
     "@types/bs58" "^4.0.0"
     bs58 "^4.0.1"
 
-"@polkadot/rpc-core@^0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.80.1.tgz#1da1b5f6c0fc2659e21654ad5b33eded8e7f2da7"
-  integrity sha512-Ok00yCFluRt45axSHuZZEcXTByiCAsSYKBp/GDKu0rOQ41P8Ke1vvtlRd1nohGLp75nu+6+nfpZUWS9KMbZmBg==
+"@polkadot/rpc-core@^0.81.0-beta.1":
+  version "0.81.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.81.0-beta.1.tgz#2e2537def9d8c03bfbb4b137d79cbcfbe9d3e384"
+  integrity sha512-anzeIm4GIWgppeRZ5Nq8O7sf/RiS6MAxIz0wxIMRoP1QAOej35RDM+Gz3sls/Kdh3ALAne9/38Wwnhw8XrpkNw==
   dependencies:
     "@babel/runtime" "^7.4.5"
-    "@polkadot/jsonrpc" "^0.80.1"
-    "@polkadot/rpc-provider" "^0.80.1"
-    "@polkadot/types" "^0.80.1"
+    "@polkadot/jsonrpc" "^0.81.0-beta.1"
+    "@polkadot/rpc-provider" "^0.81.0-beta.1"
+    "@polkadot/types" "^0.81.0-beta.1"
     "@polkadot/util" "^0.92.1"
 
-"@polkadot/rpc-provider@^0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.80.1.tgz#3bb9a98ac52251dc659ee3a731bb3815eaff3571"
-  integrity sha512-E6i13gyimkBBiE5aZpkIffPcc6jdJs4YaQ5NI+vsM/0SP1ackIUqPM0wlDWAg4SBQjcaqX13gBreKfrKS8NsxQ==
+"@polkadot/rpc-provider@^0.81.0-beta.1":
+  version "0.81.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.81.0-beta.1.tgz#77c480fa96a248bbfe4d72180e7084b40fb3f2bb"
+  integrity sha512-cQ/DgZilyhsQcj5dnklP8lVOU18Fbosz0P+fzWH30/rmC+EmL0BoYgldYiMHFsiJroM/L4IRDFg/qQKWg1f/1g==
   dependencies:
     "@babel/runtime" "^7.4.5"
-    "@polkadot/storage" "^0.80.1"
+    "@polkadot/storage" "^0.81.0-beta.1"
     "@polkadot/util" "^0.92.1"
     "@polkadot/util-crypto" "^0.92.1"
     "@types/nock" "^10.0.3"
@@ -1902,50 +1902,52 @@
     isomorphic-fetch "^2.2.1"
     websocket "^1.0.28"
 
-"@polkadot/rpc-rx@^0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-rx/-/rpc-rx-0.80.1.tgz#e9d103012ad05f3b083a303856a4b08b9f072658"
-  integrity sha512-4MZ0LXi+vzsIA5DtUM4zRmiq4T9xLOMh6EHv1kt8vxCmOVZ7CaLB5iWGKpeYesYf0cSGROqc7kMjwNjj8ykr4A==
+"@polkadot/rpc-rx@^0.81.0-beta.1":
+  version "0.81.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-rx/-/rpc-rx-0.81.0-beta.1.tgz#b9aa938ca14aea0b3756aefcdc92c4a9470ddaba"
+  integrity sha512-YS7UmQx+ZMBgBwYyPnfkgUiEGGyQ9k+8oQyaYsCH9fmCat0xvgCm/46Ll6RbB/R5u+LGeHc5h1rX+4Tzq2SVew==
   dependencies:
     "@babel/runtime" "^7.4.5"
-    "@polkadot/rpc-core" "^0.80.1"
-    "@polkadot/rpc-provider" "^0.80.1"
+    "@polkadot/rpc-core" "^0.81.0-beta.1"
+    "@polkadot/rpc-provider" "^0.81.0-beta.1"
     "@types/memoizee" "^0.4.2"
     "@types/rx" "^4.1.1"
     memoizee "^0.4.14"
     rxjs "^6.5.2"
 
-"@polkadot/storage@^0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/storage/-/storage-0.80.1.tgz#a196602d50f544551ddea7be3f07b918c2b66e44"
-  integrity sha512-97GmOmfIi3gQ27AUvDaZRBXjypnwO4sCYWUBTxRoa+LWGp/QDkF7IDq9uiFyBCqQLNoSCV5ZWAg0ZeDyq5c6FQ==
+"@polkadot/storage@^0.81.0-beta.1":
+  version "0.81.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/storage/-/storage-0.81.0-beta.1.tgz#3264aff606bbdd0e2d543dd9968ca148d077093e"
+  integrity sha512-qTMjEDvptVSn2+4drBTTBXR5itybZEvIJIzVAEbXk9YU0nsihBFIKqSqSlZCGfUuV3A+fW5SknHzwZvAUPXqeQ==
   dependencies:
     "@babel/runtime" "^7.4.5"
-    "@polkadot/types" "^0.80.1"
+    "@polkadot/types" "^0.81.0-beta.1"
     "@polkadot/util" "^0.92.1"
     "@polkadot/util-crypto" "^0.92.1"
 
-"@polkadot/ts@^0.1.58":
-  version "0.1.58"
-  resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.1.58.tgz#bd8883d590fc5be27e1db75c5c629e6bc8c4ce5c"
-  integrity sha512-+veSrr59SefA43RX034eef1T8qhO15Ye0BQ1+3FxjuFBnlCVmzj6iKGuzCtp4kGp3uFeotQ3m/2xMA+akSwq4Q==
+"@polkadot/ts@^0.1.59":
+  version "0.1.59"
+  resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.1.59.tgz#e7418db78ad50291a46d61a3ab34ab465c0c3bf0"
+  integrity sha512-+kiST4RjeuyMWu2HdqIA6Ph2AifjGvlQ5bLDe9mfuApH07h8fgtzu+xVE4FZvMkLtjyKD+FSbB/oVplq2R1WEw==
+  dependencies:
+    "@types/chrome" "^0.0.86"
 
-"@polkadot/types@^0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.80.1.tgz#2623f84f927b62e401c370cbb09a74d5bb223571"
-  integrity sha512-uqdJUbntbpo7YPBi7W26WYkkDnpHvaPB/0cRyDaDOQfLRfy4+ZWS6bsFkaf6uFaBA7fLWJwaUSlblqz6koIivg==
+"@polkadot/types@^0.81.0-beta.1":
+  version "0.81.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.81.0-beta.1.tgz#fa7d1fb1cd148283e8fc9a1336eafd6471a0cae2"
+  integrity sha512-4w/1JDiV8Gf0tKtiWFbp8NpxSrcjebz2QOgunWHfX+Q08KQhPoesI0fupfecA+0pO5BbF6HOQpT1qpCWs4RoaQ==
   dependencies:
     "@babel/runtime" "^7.4.5"
     "@polkadot/keyring" "^0.92.1"
     "@polkadot/util" "^0.92.1"
 
-"@polkadot/ui-identicon@^0.40.1":
-  version "0.40.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/ui-identicon/-/ui-identicon-0.40.1.tgz#9e0d2cd5bb7dc26498878ef90622a031639cb06f"
-  integrity sha512-2bwqL+rTsffuHT9llsWyqC3jGW1MJ3QudVNsFy0d+Itp2jiFIxD1BQG7QybXzbFSDBxLQM/il6EwQj4g4hI+mQ==
+"@polkadot/ui-identicon@^0.41.0-beta.3":
+  version "0.41.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@polkadot/ui-identicon/-/ui-identicon-0.41.0-beta.3.tgz#84ed47ea52d2f7074a0e41d899479ebcf3a35cb1"
+  integrity sha512-JOFte1OYjkXmauUh2xuvqgZbD804VF6aCQq/aN/BdgPf3adWWrD+kSq3e7BLaNmGrKZmmPApiMCi8uUU8E6Rkg==
   dependencies:
     "@babel/runtime" "^7.4.5"
-    "@polkadot/ui-settings" "^0.40.1"
+    "@polkadot/ui-settings" "^0.41.0-beta.3"
     "@types/color" "^3.0.0"
     "@types/react-copy-to-clipboard" "^4.2.6"
     color "^3.1.2"
@@ -1953,20 +1955,23 @@
     react-copy-to-clipboard "^5.0.1"
     styled-components "^4.2.0"
 
-"@polkadot/ui-keyring@^0.40.1":
-  version "0.40.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/ui-keyring/-/ui-keyring-0.40.1.tgz#7c8994454abb3fbd39a47c38aabd2f8362ce9ce1"
-  integrity sha512-L2CwljgXWg+SlSI/SUZ0lEOeXnaRAM2Tf2B8d9JVTfTmgobxb8ezbDAA++0nODjeczQFQybg3vrWYTVAt6zCBg==
+"@polkadot/ui-keyring@^0.41.0-beta.3":
+  version "0.41.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@polkadot/ui-keyring/-/ui-keyring-0.41.0-beta.3.tgz#0fa9fac779be63998b95e8ba9af62ce61ced9790"
+  integrity sha512-WcAbKnwNf1MKyQ6Uhch91ujWXNG0R4nVbmbjXEtINrslYnGSlnstUCg8aJbF68Y2ntZMHLmVSIzFYMPWF+XLMw==
   dependencies:
     "@babel/runtime" "^7.4.5"
+    "@types/mkdirp" "^0.5.2"
     "@types/store" "^2.0.2"
+    extensionizer "^1.0.1"
+    mkdirp "^0.5.1"
     store "^2.0.12"
     styled-components "^4.2.0"
 
-"@polkadot/ui-settings@^0.40.1":
-  version "0.40.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/ui-settings/-/ui-settings-0.40.1.tgz#0ee8dee7f0169dcba4e0a46cf1821bc81db79985"
-  integrity sha512-lryh4hm+89T0aEVIzLCGI8rDxO+aaqTZxB8R4jsvCbdBP8EtlCMEXlT8nYnaYi1/bdg2WP2jr0kyyq2f6Mxb7A==
+"@polkadot/ui-settings@^0.41.0-beta.3":
+  version "0.41.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@polkadot/ui-settings/-/ui-settings-0.41.0-beta.3.tgz#b2decde89b8832659f817d9380233d1568e61c82"
+  integrity sha512-L3yT6uqpi2v+MYCaC5opD0+zWCBFK59IJ7JrFUQxEM2vTOtUP6MTTQ+X1gmjs19JTSdZKUqGiQ+9266tfTcG8A==
   dependencies:
     "@babel/runtime" "^7.4.5"
     "@types/store" "^2.0.2"
@@ -2209,6 +2214,13 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
+"@types/mkdirp@^0.5.2":
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.5.2.tgz#503aacfe5cc2703d5484326b1b27efa67a339c1f"
+  integrity sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/nock@^10.0.3":
   version "10.0.3"
   resolved "https://registry.yarnpkg.com/@types/nock/-/nock-10.0.3.tgz#dab1d18ffbccfbf2db811dab9584304eeb6e1c4c"
@@ -2522,18 +2534,18 @@
     source-map "~0.6.1"
     vue-template-es2015-compiler "^1.9.0"
 
-"@vuepress/core@^1.0.0-alpha.48":
-  version "1.0.0-alpha.48"
-  resolved "https://registry.yarnpkg.com/@vuepress/core/-/core-1.0.0-alpha.48.tgz#1015318396e29a7690a21f4dada43f7957fea6f0"
-  integrity sha512-vGYudGsRNtA9ErKOQFSv9OzUGFG4R/ypemruT99bHqdVJ89bmJyil5hOF5tesT9kPrQV+lM9QPl4yH5Q7KOYmQ==
+"@vuepress/core@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@vuepress/core/-/core-1.0.0-beta.2.tgz#587b02ab23c1a45239477f7e38151dc8bee314fb"
+  integrity sha512-gJGOcZPCMkFLzM+jwuBC3SXGU1tqYdausjAS5d0oddAYogJWOJgDugY8f0bjRM2+LmpF445vPpOQjReWv+v2KA==
   dependencies:
     "@babel/core" "^7.0.0"
     "@vue/babel-preset-app" "^3.1.1"
-    "@vuepress/markdown" "^1.0.0-alpha.48"
-    "@vuepress/markdown-loader" "^1.0.0-alpha.48"
-    "@vuepress/plugin-last-updated" "^1.0.0-alpha.48"
-    "@vuepress/plugin-register-components" "^1.0.0-alpha.48"
-    "@vuepress/shared-utils" "^1.0.0-alpha.48"
+    "@vuepress/markdown" "^1.0.0-beta.2"
+    "@vuepress/markdown-loader" "^1.0.0-beta.2"
+    "@vuepress/plugin-last-updated" "^1.0.0-beta.2"
+    "@vuepress/plugin-register-components" "^1.0.0-beta.2"
+    "@vuepress/shared-utils" "^1.0.0-beta.2"
     autoprefixer "^9.5.1"
     babel-loader "^8.0.4"
     cache-loader "^3.0.0"
@@ -2561,25 +2573,25 @@
     vuepress-plugin-container "^2.0.0"
     webpack "^4.8.1"
     webpack-chain "^4.6.0"
-    webpack-dev-server "^3.1.14"
+    webpack-dev-server "^3.5.1"
     webpack-merge "^4.1.2"
     webpackbar "3.2.0"
 
-"@vuepress/markdown-loader@^1.0.0-alpha.48":
-  version "1.0.0-alpha.48"
-  resolved "https://registry.yarnpkg.com/@vuepress/markdown-loader/-/markdown-loader-1.0.0-alpha.48.tgz#21861f51586b20e7d6da6c8ca09417ddc92b5237"
-  integrity sha512-wIwB6pAgwz1Z5b+YKLZqTTq24bT4SQ1Q5CLC1za8Tv710kciYKET+ltqZSExQ9+ZnTzaGFJX2hvCFbJA4dKMvw==
+"@vuepress/markdown-loader@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@vuepress/markdown-loader/-/markdown-loader-1.0.0-beta.2.tgz#6a28a39cbd725cb74405b378261a2c3d5c5b0edb"
+  integrity sha512-O0LEql5DHPcnSmnpymcLTv1NlR+RREEYpfo6g7C6GSfJl1phGR78srF+4j7AklWJgZxpDXHmvnQpsTWs9TpUQA==
   dependencies:
-    "@vuepress/markdown" "^1.0.0-alpha.48"
+    "@vuepress/markdown" "^1.0.0-beta.2"
     loader-utils "^1.1.0"
     lru-cache "^5.1.1"
 
-"@vuepress/markdown@^1.0.0-alpha.48":
-  version "1.0.0-alpha.48"
-  resolved "https://registry.yarnpkg.com/@vuepress/markdown/-/markdown-1.0.0-alpha.48.tgz#b049fcd52aaa18896dce95cea71c0d9ac4bd6b8d"
-  integrity sha512-OT+mAjTp1BwlZhRd316VHN6dSoNPkBkWaCfuKDlVzOu5/HfoMpG1P8OJzhRpZO0w0I52HXe0nL0GFHybwOBxaA==
+"@vuepress/markdown@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@vuepress/markdown/-/markdown-1.0.0-beta.2.tgz#a78ccd9c13f876c2aee3d317baf431f4f396d2e2"
+  integrity sha512-bNNmPvuNtTLpywMGHlpy72I5Bw5sXnSToKJjGtCHI08+72Pn/KuHDnWcmWLIEGiZba8jmg6L9byo5u7njVncjA==
   dependencies:
-    "@vuepress/shared-utils" "^1.0.0-alpha.48"
+    "@vuepress/shared-utils" "^1.0.0-beta.2"
     markdown-it "^8.4.1"
     markdown-it-anchor "^5.0.2"
     markdown-it-chain "^1.3.0"
@@ -2587,43 +2599,43 @@
     markdown-it-table-of-contents "^0.4.0"
     prismjs "^1.13.0"
 
-"@vuepress/plugin-active-header-links@^1.0.0-alpha.48":
-  version "1.0.0-alpha.48"
-  resolved "https://registry.yarnpkg.com/@vuepress/plugin-active-header-links/-/plugin-active-header-links-1.0.0-alpha.48.tgz#f30772d4a83f12ade91019a62ac5ce3864f19d2c"
-  integrity sha512-wgSxa45JhY/Lkt2YJPPmmqH4dDFBtw0A3mhpUL78mvBi77MM7lkB4dFxZ0PTOoc4zKuOqB0gLhtwclcjG3haVw==
+"@vuepress/plugin-active-header-links@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@vuepress/plugin-active-header-links/-/plugin-active-header-links-1.0.0-beta.2.tgz#607d6aca029df009a9572a14bc5b1544a8e5c21f"
+  integrity sha512-4fDbOBqtuzKyr7Pj8/K3SixjMwJykJOp9XMqAa2wNQbRnYIRZwj+pHghZgyB4rw6eCQTcXk4OJklOnb6TljvfA==
   dependencies:
     lodash.throttle "^4.1.1"
 
-"@vuepress/plugin-last-updated@^1.0.0-alpha.48":
-  version "1.0.0-alpha.48"
-  resolved "https://registry.yarnpkg.com/@vuepress/plugin-last-updated/-/plugin-last-updated-1.0.0-alpha.48.tgz#dd9f5fdb2f4994f71bd47ae4dd4ca4885d346347"
-  integrity sha512-qJFEov3ff789Z+ZQeJ7mX++QYDykhfktq8jCum6ilrJhV5ni1TMvhYYCGlcDu3Z86VGmt0O4TmAUf9JYzV9wXQ==
+"@vuepress/plugin-last-updated@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@vuepress/plugin-last-updated/-/plugin-last-updated-1.0.0-beta.2.tgz#eff76a30cbf98190814d23aecef9c8ca408cd1de"
+  integrity sha512-7P13jy7g4LC9AGhwG1AXY6CZiRfr7nvLkiQGKHXo4KHejpoyv0c1kYwWINi9GWoCgDMeQeCiFiWursaAUybRGw==
   dependencies:
     cross-spawn "^6.0.5"
 
-"@vuepress/plugin-nprogress@^1.0.0-alpha.48":
-  version "1.0.0-alpha.48"
-  resolved "https://registry.yarnpkg.com/@vuepress/plugin-nprogress/-/plugin-nprogress-1.0.0-alpha.48.tgz#b0f8459d518b8f8b1fdd58b9e8e3aa195bb94604"
-  integrity sha512-18F1TToseOpukH8auniVI5rW1i8pUw6hCFj7RurUM2whgt9y4rF8qDVuZeBAhs3/cTmdvxZwpP+W1GyL+EXMiw==
+"@vuepress/plugin-nprogress@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@vuepress/plugin-nprogress/-/plugin-nprogress-1.0.0-beta.2.tgz#2a18b8a1e6323ee2166420f629023dbec5fe1b5b"
+  integrity sha512-1DX+4R0iwtpwDbXpT+FGZ1FfAnaWXLLvuryYuGQQXpWgkMduppbprGtsQLXcEUbmzfQteOpIwVbmxZOQ8a5jiQ==
   dependencies:
     nprogress "^0.2.0"
 
-"@vuepress/plugin-register-components@^1.0.0-alpha.48":
-  version "1.0.0-alpha.48"
-  resolved "https://registry.yarnpkg.com/@vuepress/plugin-register-components/-/plugin-register-components-1.0.0-alpha.48.tgz#790a9d3dff8dce6691cac82d5778efa7ac8ca8bb"
-  integrity sha512-4FwiIdKQ4ZQtWnawxI597ezJr6iIRW8NRbHLZUV0dAIac4W6ktABV/wlBp9bhCL9jZBtnnn2OsMIrVePmamrUg==
+"@vuepress/plugin-register-components@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@vuepress/plugin-register-components/-/plugin-register-components-1.0.0-beta.2.tgz#e8df9c74775465b1a41de9ba270497e7411a24de"
+  integrity sha512-f5L75EkTDaM0KR8Rj+iSrwDHZM6873psHiABB6rupUra+HZ3cQLKm9iQ40Lg/8y/rE0vx0CGRHen2x60FdccQg==
   dependencies:
-    "@vuepress/shared-utils" "^1.0.0-alpha.48"
+    "@vuepress/shared-utils" "^1.0.0-beta.2"
 
-"@vuepress/plugin-search@^1.0.0-alpha.48":
-  version "1.0.0-alpha.48"
-  resolved "https://registry.yarnpkg.com/@vuepress/plugin-search/-/plugin-search-1.0.0-alpha.48.tgz#d373de4cb0f86a28cc83a026e19189de0b9e6461"
-  integrity sha512-pgaY4RPTbF/1vxLg2iZoHtzQZmybMvhDfmQcca1fOZp52cm23ZB+1uQaHYMVUAwbQJoaoGssUh4aQDaAT/GI5g==
+"@vuepress/plugin-search@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@vuepress/plugin-search/-/plugin-search-1.0.0-beta.2.tgz#6689234ba68da00845cbcc4512e1bf2d31916b11"
+  integrity sha512-l39ANikYzl5lvuLmCEy5UBrPZ1DtzitNCdf+O9lGvSUdRibL4fYclo6DIpRnyeIt4MYDRxVJ0C02Qv/9hD57Cw==
 
-"@vuepress/shared-utils@^1.0.0-alpha.48":
-  version "1.0.0-alpha.48"
-  resolved "https://registry.yarnpkg.com/@vuepress/shared-utils/-/shared-utils-1.0.0-alpha.48.tgz#c00edb82c58c2079be65149d917b8a4048041f60"
-  integrity sha512-nu30m2u9tNa5Owk24KOL/rf3kOgRxRYhksEWiAjtDsBynYB/6AkEt2ZGCu27kMgNxPCNc8XVm/6XNSRfGvbt7g==
+"@vuepress/shared-utils@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@vuepress/shared-utils/-/shared-utils-1.0.0-beta.2.tgz#9b14c2d62292c83250e0ca3619ef536a0bb4c034"
+  integrity sha512-1vxGXLrii1jb4nDH+cH8QYxC3kRJ7zTTkiVh6cPpLW5EjHUK4p6muSXJXZtrJU2dDcyRUS0VWtzoursHThwGqw==
   dependencies:
     chalk "^2.3.2"
     diacritics "^1.3.0"
@@ -2635,14 +2647,14 @@
     semver "^6.0.0"
     upath "^1.1.0"
 
-"@vuepress/theme-default@^1.0.0-alpha.48":
-  version "1.0.0-alpha.48"
-  resolved "https://registry.yarnpkg.com/@vuepress/theme-default/-/theme-default-1.0.0-alpha.48.tgz#6b140293422e97a2a53d69e610017c4f6cd3ab9a"
-  integrity sha512-FdC/2pOI46qT28EJ4zIlLD2EvltBX/Y6HZDoZvF+NxGi0kJX7s17/+z2yb+sVh5pQukp5avxCSwnAPoN4ZFRfw==
+"@vuepress/theme-default@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@vuepress/theme-default/-/theme-default-1.0.0-beta.2.tgz#de778d90740363eb9ba52174c930c4f385dec6ae"
+  integrity sha512-Zit7yUDGl4cLhm/SxDW5Z11czJUrh9m70+BXyncn8GFlPfm7KTLEJkPeXNfelHfCMr0pyJ1aPxWG1tu/fAeTKQ==
   dependencies:
-    "@vuepress/plugin-active-header-links" "^1.0.0-alpha.48"
-    "@vuepress/plugin-nprogress" "^1.0.0-alpha.48"
-    "@vuepress/plugin-search" "^1.0.0-alpha.48"
+    "@vuepress/plugin-active-header-links" "^1.0.0-beta.2"
+    "@vuepress/plugin-nprogress" "^1.0.0-beta.2"
+    "@vuepress/plugin-search" "^1.0.0-beta.2"
     docsearch.js "^2.5.2"
     stylus "^0.54.5"
     stylus-loader "^3.0.2"
@@ -5288,10 +5300,10 @@ envinfo@^7.2.0:
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.3.1.tgz#892e42f7bf858b3446d9414ad240dbaf8da52f09"
   integrity sha512-GvXiDTqLYrORVSCuJCsWHPXF5BFvoWMQA9xX4YVjPT1jyS3aZEHUBwjzxU/6LTPF9ReHgVEbX7IEN5UvSXHw/A==
 
-enzyme-adapter-react-16@^1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.13.2.tgz#8a574d7cbbef7ef0cab2022e9bfc12aeaebb7ae5"
-  integrity sha512-h0neTuAAFfQUgEZ+PPHVIMDFJ9+CGafI8AjojNlSVh4Fd1pLDgtl2OeVkm4yKF7RSgzrPAwugq4JW8Jjo2iRJA==
+enzyme-adapter-react-16@^1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.14.0.tgz#204722b769172bcf096cb250d33e6795c1f1858f"
+  integrity sha512-7PcOF7pb4hJUvjY7oAuPGpq3BmlCig3kxXGi2kFx0YzJHppqX1K8IIV9skT1IirxXlu8W7bneKi+oQ10QRnhcA==
   dependencies:
     enzyme-adapter-utils "^1.12.0"
     has "^1.0.3"
@@ -5314,10 +5326,10 @@ enzyme-adapter-utils@^1.12.0:
     prop-types "^15.7.2"
     semver "^5.6.0"
 
-enzyme@^3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.9.0.tgz#2b491f06ca966eb56b6510068c7894a7e0be3909"
-  integrity sha512-JqxI2BRFHbmiP7/UFqvsjxTirWoM1HfeaJrmVSZ9a1EADKkZgdPcAuISPMpoUiHlac9J4dYt81MC5BBIrbJGMg==
+enzyme@^3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.10.0.tgz#7218e347c4a7746e133f8e964aada4a3523452f6"
+  integrity sha512-p2yy9Y7t/PFbPoTvrWde7JIYB2ZyGC+NgTNbVEGvZ5/EyoYSr9aG/2rSbVvyNvMHEhw9/dmGUJHWtfQIEiX9pg==
   dependencies:
     array.prototype.flat "^1.2.1"
     cheerio "^1.0.0-rc.2"
@@ -5616,7 +5628,7 @@ expect@^24.8.0:
     jest-message-util "^24.8.0"
     jest-regex-util "^24.3.0"
 
-express@^4.17.0:
+express@^4.17.1:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
   integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
@@ -5820,6 +5832,14 @@ file-loader@^3.0.1:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
 
+file-loader@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.0.0.tgz#c3570783fefb6e1bc0978a856f4bf5825b966c2a"
+  integrity sha512-roAbL6IdSGczwfXxhMi6Zq+jD4IfUpL0jWHD7fvmjdOVb7xBfdRUHe4LpBgO23VtVK5AW1OlWZo0p34Jvx3iWg==
+  dependencies:
+    loader-utils "^1.2.2"
+    schema-utils "^1.0.0"
+
 file-uri-to-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
@@ -8178,7 +8198,7 @@ loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.0, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
+loader-utils@^1.0.0, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.2, loader-utils@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -8293,7 +8313,7 @@ log-driver@^1.2.7:
   resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
   integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==
 
-loglevel@^1.6.1:
+loglevel@^1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.2.tgz#668c77948a03dbd22502a3513ace1f62a80cc372"
   integrity sha512-Jt2MHrCNdtIe1W6co3tF5KXGRkzF+TYffiQstfXa04mrss9IKXzAAXYWak8LbZseAQY03sH2GzMCMU0ZOUc9bg==
@@ -10592,10 +10612,10 @@ react-dom@^16.8.6:
     prop-types "^15.6.2"
     scheduler "^0.13.6"
 
-react-hot-loader@^4.8.8:
-  version "4.8.8"
-  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.8.8.tgz#71e3c7ba301556aa24c52cef2f6ed0af82395eea"
-  integrity sha512-58bgeS7So8V93MhhnKogbraor8xdrTncil+b6IoIXkTIr3blJNAE7bU4tn/iJvy2J7rjxQmKFRaxKrWdKUZpqg==
+react-hot-loader@^4.9.0:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.9.0.tgz#498e5f76aae28bfd420efdabddf5af156745b4dd"
+  integrity sha512-1N6MWV9++qYWrrs41MRhxATwyx743tr8RpeyL1VOZ54zsU8fOx4slYreHZ8v2BDGVfy+dJ0myJZrJA9/26RlCA==
   dependencies:
     fast-levenshtein "^2.0.6"
     global "^4.3.0"
@@ -11264,7 +11284,7 @@ selfsigned@^1.10.4:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
-semver@^6.0.0, semver@^6.1.0:
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
   integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
@@ -12616,7 +12636,7 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-loader@^1.0.1, url-loader@^1.1.1:
+url-loader@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz#b971d191b83af693c5e3fea4064be9e1f2d7f8d8"
   integrity sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==
@@ -12625,6 +12645,15 @@ url-loader@^1.0.1, url-loader@^1.1.1:
     mime "^2.0.3"
     schema-utils "^1.0.0"
 
+url-loader@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.0.0.tgz#600ef36f463e21bd673ad70156d850619d9cd092"
+  integrity sha512-RT3cz+Lw+kFMCKLabMyogFrc/aRoAMJHmY5os1VDBlav+4t5vxUxKDn47zCSFAYAl+hM8YLg4TZwG4TkJaafkg==
+  dependencies:
+    loader-utils "^1.1.0"
+    mime "^2.0.3"
+    schema-utils "^1.0.0"
+
 url-parse@^1.4.3:
   version "1.4.7"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
@@ -12825,13 +12854,13 @@ vuepress-plugin-container@^2.0.0:
   dependencies:
     markdown-it-container "^2.0.0"
 
-vuepress@^1.0.0-alpha.47:
-  version "1.0.0-alpha.48"
-  resolved "https://registry.yarnpkg.com/vuepress/-/vuepress-1.0.0-alpha.48.tgz#485b908c246297d4210999d7a010105447a6c3f0"
-  integrity sha512-rvEh4xS1Jp7/dC1YsT0VRmn+cP2BLn4KXSKKt9LFnUPgDwi80zARaSIN0NrpaADPQqKb2OxUY1fNV9ectzZ+QA==
+vuepress@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/vuepress/-/vuepress-1.0.0-beta.2.tgz#3cc6f5de8ebfbeb5d60296903b9f1eaf10628f1f"
+  integrity sha512-U0qoLY3kfvow1kvpev8OndqXNDRg0g0YrwSA99BUa6Raf0RBxWQySD1U26klZiRS5AACi9wyvdC1hqKjUsQcBg==
   dependencies:
-    "@vuepress/core" "^1.0.0-alpha.48"
-    "@vuepress/theme-default" "^1.0.0-alpha.48"
+    "@vuepress/core" "^1.0.0-beta.2"
+    "@vuepress/theme-default" "^1.0.0-beta.2"
     cac "^6.3.9"
     envinfo "^7.2.0"
 
@@ -12912,10 +12941,10 @@ webpack-dev-middleware@^3.7.0:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@^3.1.14:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.4.1.tgz#a5fd8dec95dec410098e7d9a037ff9405395d51a"
-  integrity sha512-CRqZQX2ryMtrg0r3TXQPpNh76eM1HD3Wmu6zDBxIKi/d2y+4aa28Ia8weNT0bfgWpY6Vs3Oq/K8+DjfbR+tWYw==
+webpack-dev-server@^3.5.1:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.7.0.tgz#7da016e4f5abec61c7b4af95a264d623bde4df3c"
+  integrity sha512-B/c/aJoyOlhjgeGnxTWeJlDBvIEN/aBI2R6G1DiFHVluEs0KtuxylFcoDR2K6Um/edo4/BvZqMXS2tK+U7fsHw==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
@@ -12924,19 +12953,19 @@ webpack-dev-server@^3.1.14:
     connect-history-api-fallback "^1.6.0"
     debug "^4.1.1"
     del "^4.1.1"
-    express "^4.17.0"
+    express "^4.17.1"
     html-entities "^1.2.1"
     http-proxy-middleware "^0.19.1"
     import-local "^2.0.0"
     internal-ip "^4.3.0"
     ip "^1.1.5"
     killable "^1.0.1"
-    loglevel "^1.6.1"
+    loglevel "^1.6.2"
     opn "^5.5.0"
     portfinder "^1.0.20"
     schema-utils "^1.0.0"
     selfsigned "^1.10.4"
-    semver "^6.0.0"
+    semver "^6.1.1"
     serve-index "^1.9.1"
     sockjs "0.3.19"
     sockjs-client "1.3.0"
@@ -13003,7 +13032,37 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.32.2, webpack@^4.8.1:
+webpack@^4.33.0:
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.33.0.tgz#c30fc4307db432e5c5e3333aaa7c16a15a3b277e"
+  integrity sha512-ggWMb0B2QUuYso6FPZKUohOgfm+Z0sVFs8WwWuSH1IAvkWs428VDNmOlAxvHGTB9Dm/qOB/qtE5cRx5y01clxw==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    acorn "^6.0.5"
+    acorn-dynamic-import "^4.0.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+    chrome-trace-event "^1.0.0"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.0"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.3.0"
+    loader-utils "^1.1.0"
+    memory-fs "~0.4.1"
+    micromatch "^3.1.8"
+    mkdirp "~0.5.0"
+    neo-async "^2.5.0"
+    node-libs-browser "^2.0.0"
+    schema-utils "^1.0.0"
+    tapable "^1.1.0"
+    terser-webpack-plugin "^1.1.0"
+    watchpack "^1.5.0"
+    webpack-sources "^1.3.0"
+
+webpack@^4.8.1:
   version "4.32.2"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.32.2.tgz#3639375364a617e84b914ddb2c770aed511e5bc8"
   integrity sha512-F+H2Aa1TprTQrpodRAWUMJn7A8MgDx82yQiNvYMaj3d1nv3HetKU0oqEulL9huj8enirKi8KvEXQ3QtuHF89Zg==