Api bump with rpc_methods call (#1616)

This commit is contained in:
Jaco Greeff 2019-09-16 16:39:01 +02:00 committed by GitHub
parent da6151af47
commit ad7506b83d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 76 additions and 72 deletions

View File

@ -10,10 +10,10 @@
"packages/*"
],
"resolutions": {
"@polkadot/api": "^0.93.0-beta.0",
"@polkadot/api-contract": "^0.93.0-beta.0",
"@polkadot/api": "^0.93.0-beta.2",
"@polkadot/api-contract": "^0.93.0-beta.2",
"@polkadot/keyring": "^1.4.1",
"@polkadot/types": "^0.93.0-beta.0",
"@polkadot/types": "^0.93.0-beta.2",
"@polkadot/util": "^1.4.1",
"@polkadot/util-crypto": "^1.4.1",
"@types/styled-components": "4.1.8",

View File

@ -11,7 +11,7 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.6.0",
"@polkadot/api-contract": "^0.93.0-beta.0",
"@polkadot/api-contract": "^0.93.0-beta.2",
"@polkadot/react-components": "^0.36.0-beta.9"
}
}

View File

@ -31,8 +31,8 @@
"homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme",
"dependencies": {
"@babel/runtime": "^7.6.0",
"@polkadot/api": "^0.93.0-beta.0",
"@polkadot/extension-dapp": "^0.11.0-beta.3",
"@polkadot/api": "^0.93.0-beta.2",
"@polkadot/extension-dapp": "^0.11.0-beta.4",
"edgeware-node-types": "^1.0.10",
"rxjs-compat": "^6.5.3"
}

View File

@ -5,6 +5,7 @@
// TODO: We have a lot shared between this and InputExtrinsic & InputStorage
import { RpcMethod } from '@polkadot/jsonrpc/types';
import { ApiProps } from '@polkadot/react-api/types';
import { DropdownOptions } from '../util/types';
import { I18nProps } from '../types';
@ -12,6 +13,7 @@ import '../InputExtrinsic/InputExtrinsic.css';
import React from 'react';
import map from '@polkadot/jsonrpc';
import { withApi } from '@polkadot/react-api';
import Labelled from '../Labelled';
import translate from '../translate';
@ -20,7 +22,7 @@ import SelectSection from './SelectSection';
import methodOptions from './options/method';
import sectionOptions from './options/section';
interface Props extends I18nProps {
interface Props extends ApiProps, I18nProps {
defaultValue: RpcMethod;
help?: React.ReactNode;
isError?: boolean;
@ -44,8 +46,8 @@ class InputRpc extends React.PureComponent<Props, State> {
const { section } = this.props.defaultValue;
this.state = {
optionsMethod: methodOptions(section),
optionsSection: sectionOptions(),
optionsMethod: methodOptions(props.api, section),
optionsSection: sectionOptions(props.api),
value: this.props.defaultValue
};
}
@ -97,13 +99,14 @@ class InputRpc extends React.PureComponent<Props, State> {
}
private onSectionChange = (newSection: string): void => {
const { api } = this.props;
const { value } = this.state;
if (newSection === value.section) {
return;
}
const optionsMethod = methodOptions(newSection);
const optionsMethod = methodOptions(api, newSection);
const newValue = map[newSection].methods[optionsMethod[0].value];
this.setState({ optionsMethod }, (): void =>
@ -112,4 +115,4 @@ class InputRpc extends React.PureComponent<Props, State> {
}
}
export default translate(InputRpc);
export default translate(withApi(InputRpc));

View File

@ -5,18 +5,18 @@
import { DropdownOption, DropdownOptions } from '../../util/types';
import React from 'react';
import ApiPromise from '@polkadot/api/promise';
import map from '@polkadot/jsonrpc';
export default function createOptions (sectionName: string): DropdownOptions {
export default function createOptions (api: ApiPromise, sectionName: string): DropdownOptions {
const section = map[sectionName];
if (!section) {
if (!section || Object.keys((api.rpc as any)[sectionName]).length === 0) {
return [];
}
return Object
.keys(section.methods)
.keys((api.rpc as any)[sectionName])
.sort()
.filter((value): boolean => {
const { isDeprecated, isHidden, isSubscription } = section.methods[value];

View File

@ -4,12 +4,13 @@
import { DropdownOptions } from '../../util/types';
import map from '@polkadot/jsonrpc';
import ApiPromise from '@polkadot/api/promise';
export default function createOptions (): DropdownOptions {
export default function createOptions (api: ApiPromise): DropdownOptions {
return Object
.keys(map)
.keys(api.rpc)
.sort()
.filter((section): boolean => Object.keys((api.rpc as any)[section]).length !== 0)
.map((name): { text: string; value: string } => ({
text: name,
value: name

108
yarn.lock
View File

@ -1931,45 +1931,45 @@
once "^1.4.0"
universal-user-agent "^4.0.0"
"@polkadot/api-contract@^0.93.0-beta.0":
version "0.93.0-beta.0"
resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.93.0-beta.0.tgz#214b3c2bc7c4afdde5f173a6eca8765a105b4c35"
integrity sha512-u4RPivhJIgfe3Je7kNOl7SNgsnAbR5zB2c2WAlP1L6+zBdbcWLS7qxWCS0sQGFdCVESav4gmryqYgAEUVR8jyw==
"@polkadot/api-contract@^0.93.0-beta.2":
version "0.93.0-beta.2"
resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.93.0-beta.2.tgz#60abfc9b73f3c64ec63c3643f55fe8e7b5aa91af"
integrity sha512-fnR0BUw8JV7ogFK2kqOr4ctPkPVvsKQYc+GpT4b2uGIhI5QxkO2OQv4AwCbKDMA3Zg9gdim16DuYExa5PGqZvQ==
dependencies:
"@babel/runtime" "^7.6.0"
"@polkadot/types" "^0.93.0-beta.0"
"@polkadot/types" "^0.93.0-beta.2"
"@polkadot/api-derive@^0.93.0-beta.0":
version "0.93.0-beta.0"
resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.93.0-beta.0.tgz#c608ad4312fbd561897a8cc668ab713ef97426ff"
integrity sha512-Pmzjxm9Hnz2/jG6unTjmz502WJhJQC1jTS4yFVX0HLJ4Y0FN+iyQP6pzwBZ20Q/lUU75sqq/xx1oj6ereovMmQ==
"@polkadot/api-derive@^0.93.0-beta.2":
version "0.93.0-beta.2"
resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.93.0-beta.2.tgz#8f2aa85ce01693d07d5f90c238136dbd3c9238ed"
integrity sha512-8hk6MYRMXGo7zeiZY4XuRH606KAMll0CMgtjjMhyOs0mkfw1dRrxe50ZzY/sM4gRv3Dqw8oakt1GXayg9uqKkQ==
dependencies:
"@babel/runtime" "^7.6.0"
"@polkadot/api" "^0.93.0-beta.0"
"@polkadot/types" "^0.93.0-beta.0"
"@polkadot/api" "^0.93.0-beta.2"
"@polkadot/types" "^0.93.0-beta.2"
"@polkadot/api-metadata@^0.93.0-beta.0":
version "0.93.0-beta.0"
resolved "https://registry.yarnpkg.com/@polkadot/api-metadata/-/api-metadata-0.93.0-beta.0.tgz#a46c627cf2c75724f1be91bd79c2a0a292af8d7a"
integrity sha512-QoqZ0sLtz849VyVqDnrQzdF5FJuBKsQ7xLeHLJE/CQqYMTUSjZxzXHipXa036I2447kLbk++3L25TOn5tZf1IQ==
"@polkadot/api-metadata@^0.93.0-beta.2":
version "0.93.0-beta.2"
resolved "https://registry.yarnpkg.com/@polkadot/api-metadata/-/api-metadata-0.93.0-beta.2.tgz#27dd5210e62630f2e86ad021550b759534310f06"
integrity sha512-ZFAu7NOQXWcB7hfUxtQuqlxJRHPdElLkDXVjkXSkoAXNu/GK71DW1S2n8pWuwnr/RuH4edsfpizW4wLq1KdNfQ==
dependencies:
"@babel/runtime" "^7.6.0"
"@polkadot/types" "^0.93.0-beta.0"
"@polkadot/types" "^0.93.0-beta.2"
"@polkadot/util" "^1.4.1"
"@polkadot/util-crypto" "^1.4.1"
"@polkadot/api@^0.93.0-beta.0":
version "0.93.0-beta.0"
resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.93.0-beta.0.tgz#e41e85c68a18620da25a2b82d971c575c72a3b2a"
integrity sha512-da2nCpmuNr0KCGrGyzj5zKrJOWdBNiokHMfN2h6S0j35u6uHfCBGJznkRgvoLbzDdnhKouadCzvO+JCLIQsjrQ==
"@polkadot/api@^0.93.0-beta.2":
version "0.93.0-beta.2"
resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.93.0-beta.2.tgz#0aef2bfdf092f17657ea8923ce40897f9c7c258c"
integrity sha512-N9fhu5pGwIrXSEJbxSnkx08IVfV7gRKnYKqR4jtoFVvl4/YQBps4/MAuKUnNdGANWD8eElRRQujG8mPaB0y65A==
dependencies:
"@babel/runtime" "^7.6.0"
"@polkadot/api-derive" "^0.93.0-beta.0"
"@polkadot/api-metadata" "^0.93.0-beta.0"
"@polkadot/api-derive" "^0.93.0-beta.2"
"@polkadot/api-metadata" "^0.93.0-beta.2"
"@polkadot/keyring" "^1.4.1"
"@polkadot/rpc-core" "^0.93.0-beta.0"
"@polkadot/rpc-provider" "^0.93.0-beta.0"
"@polkadot/types" "^0.93.0-beta.0"
"@polkadot/rpc-core" "^0.93.0-beta.2"
"@polkadot/rpc-provider" "^0.93.0-beta.2"
"@polkadot/types" "^0.93.0-beta.2"
"@polkadot/util-crypto" "^1.4.1"
"@polkadot/dev-react@^0.31.0-beta.8":
@ -2053,25 +2053,25 @@
typescript "^3.6.3"
vuepress "^1.0.4"
"@polkadot/extension-dapp@^0.11.0-beta.3":
version "0.11.0-beta.3"
resolved "https://registry.yarnpkg.com/@polkadot/extension-dapp/-/extension-dapp-0.11.0-beta.3.tgz#afb623d3c10b8085ae0ac5373c4c0a9164f8d22a"
integrity sha512-mqRjz42dmChQdYYMBTgRzCzS+/eZQku8MUbgPqAMlMErRHzLQmpJA2Xw90jsxgSl9+JH5jF2lGZmyWA/vKhKvA==
"@polkadot/extension-dapp@^0.11.0-beta.4":
version "0.11.0-beta.4"
resolved "https://registry.yarnpkg.com/@polkadot/extension-dapp/-/extension-dapp-0.11.0-beta.4.tgz#80fc30194c6ad150a991842c1fa8723ef9453563"
integrity sha512-9zJiFmuW9APO+jee9tTBBzIzTzsCiCS6CuZ+FxwDqnkZtMIqG857Wp+BkCj6qSxPGyXKbsC46nT0KhUdxXUxXA==
dependencies:
"@babel/runtime" "^7.6.0"
"@polkadot/extension-inject" "^0.11.0-beta.3"
"@polkadot/extension-inject" "^0.11.0-beta.4"
"@polkadot/extension-inject@^0.11.0-beta.3":
version "0.11.0-beta.3"
resolved "https://registry.yarnpkg.com/@polkadot/extension-inject/-/extension-inject-0.11.0-beta.3.tgz#03bbf4a32327de5518094f18e378b2f99f7421d9"
integrity sha512-xWJ6wnPOxi7V6m9oobFF0tWcvb/hTxY99LdJXXdELeEUFsfVHLVT5LMKySKxlfUtAmAZOfOWmn6iNuFWo2MoCQ==
"@polkadot/extension-inject@^0.11.0-beta.4":
version "0.11.0-beta.4"
resolved "https://registry.yarnpkg.com/@polkadot/extension-inject/-/extension-inject-0.11.0-beta.4.tgz#3e4d95270c04b34b92536a2f68609a054076e31c"
integrity sha512-r1KfWmxzPEW+37sfQOdeXPVn0tO4mpDNc3YRKfO+LKgMYW/y5f2QkrSRWvA97mXwcOjPnodxBN/LVRp1K5fP/Q==
dependencies:
"@babel/runtime" "^7.6.0"
"@polkadot/jsonrpc@^0.93.0-beta.0":
version "0.93.0-beta.0"
resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.93.0-beta.0.tgz#417b593379be1f94756a23bbfc60865a4edf0075"
integrity sha512-5nWb3UBMPuc4XLnHCz2Z5DP/SbcTS1fEwGgf0PcjYlpaGlV9joCm/GFx+RlHbOmsChjNQwuzlFdAd6uV4iYWWg==
"@polkadot/jsonrpc@^0.93.0-beta.2":
version "0.93.0-beta.2"
resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.93.0-beta.2.tgz#23eab8d9d452f0ab7d0cbf40c3ef11512492d3fc"
integrity sha512-DtpXvRUHpmiYBI4tEDIUzbclqKctpFuyg+l2FOmFYzrO+s/M80aLXCnFpABUts0JmNMqFfmPqkL0N+VWDPLQNw==
dependencies:
"@babel/runtime" "^7.6.0"
@ -2109,25 +2109,25 @@
qrcode-generator "^1.4.3"
react-qr-reader "^2.2.1"
"@polkadot/rpc-core@^0.93.0-beta.0":
version "0.93.0-beta.0"
resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.93.0-beta.0.tgz#f2da2af40a9f80b408beb315c592b8938067bc10"
integrity sha512-vCE7iYCMGIwy8tAY5qbcYKXJg+B1Jro7mrP/0Li662GpkhoZf7TP8Drzx1jQ9wJBeHyRNhWDq8CQkTqJmArBsA==
"@polkadot/rpc-core@^0.93.0-beta.2":
version "0.93.0-beta.2"
resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.93.0-beta.2.tgz#218191a8cc1fe90c61e9aad98407d9e073a7e6a2"
integrity sha512-oOkKDo+HyoKvjvfdoAO/hd+zeDWToFWuD0jW3Nxcw9+RaAsX0xZQWOFZZM25df4Zatn7yKh/pFpmkjKVO+57qA==
dependencies:
"@babel/runtime" "^7.6.0"
"@polkadot/jsonrpc" "^0.93.0-beta.0"
"@polkadot/rpc-provider" "^0.93.0-beta.0"
"@polkadot/types" "^0.93.0-beta.0"
"@polkadot/jsonrpc" "^0.93.0-beta.2"
"@polkadot/rpc-provider" "^0.93.0-beta.2"
"@polkadot/types" "^0.93.0-beta.2"
"@polkadot/util" "^1.4.1"
rxjs "^6.5.3"
"@polkadot/rpc-provider@^0.93.0-beta.0":
version "0.93.0-beta.0"
resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.93.0-beta.0.tgz#2c75eaf82f349f0ac78dd3684db585a80100a2ac"
integrity sha512-ZW4qGctfj/beNTCeVOVvuY7NF1rgUfFHvuDtzmD/11yehL2GsEDXEgzUV3IdW0pvIjX2po+TNcqFIJvSDKCNIw==
"@polkadot/rpc-provider@^0.93.0-beta.2":
version "0.93.0-beta.2"
resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.93.0-beta.2.tgz#63fdc36a1a470d198339d73eb4c30924c23d4fd3"
integrity sha512-2yg+Ba9SDmGxbQ0JTjeRTj4e0q6JWbSc2Z7kdnMTcYLxS2DS+5ZdXr/ZSyfKZm8jkyDYPPIMoE7LIj2nhDBpaQ==
dependencies:
"@babel/runtime" "^7.6.0"
"@polkadot/api-metadata" "^0.93.0-beta.0"
"@polkadot/api-metadata" "^0.93.0-beta.2"
"@polkadot/util" "^1.4.1"
"@polkadot/util-crypto" "^1.4.1"
"@types/nock" "^10.0.3"
@ -2142,10 +2142,10 @@
dependencies:
"@types/chrome" "^0.0.88"
"@polkadot/types@^0.93.0-beta.0":
version "0.93.0-beta.0"
resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.93.0-beta.0.tgz#e778020ccd5ca211901a7893f4b6dd34a966d618"
integrity sha512-tj4FdIq5HwTN3KfBHTz4U0WjxdD5TrYyxH2iulcubFV5sAgBuYyZy5fGdGmY/K87oUP/viBplMl94Yn67+aBZg==
"@polkadot/types@^0.93.0-beta.2":
version "0.93.0-beta.2"
resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.93.0-beta.2.tgz#107c803fe349854f6af6de48961d8461d3230204"
integrity sha512-05dWMROnjlFI3BG6PBc0YAOZQyTURQGtgAgGZYjOMrT/9CiuG64migc1GEUBkt/vWPUZ9Rgx6rt92HtANL4pwQ==
dependencies:
"@babel/runtime" "^7.6.0"
"@polkadot/util" "^1.4.1"