From 8e6c5f693da251789e3fe3e2daf9f0ad58c92382 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 2 Apr 2019 21:21:00 +0200 Subject: [PATCH] Contracts attachment (#818) * WIP... just getting ti to work * Export ContractAbi from types * e2e testing * Add selector encoding (calls) * Linting * Exapnd e2e tests * TODO comments * Add ABI types & isConstant flag * Updated with actual steps (progress) * Linting * Cleanup event code * Bump deps * Bump deps (keyring mnemonic fix) --- CHANGELOG.md | 1 + packages/api/package.json | 2 +- packages/api/src/Base.ts | 9 +- packages/api/src/SubmittableExtrinsic.ts | 37 +++-- packages/api/src/types.ts | 8 +- packages/api/src/util/filterEvents.ts | 2 +- packages/api/test/data/erc20.json | 100 ++++++++++++ packages/api/test/data/erc20.wasm | Bin 0 -> 31213 bytes .../api/test/e2e/promise-contract.spec.js | 92 +++++++++++ packages/rpc-core/package.json | 2 +- packages/rpc-provider/package.json | 6 +- packages/type-extrinsics/package.json | 2 +- packages/type-storage/package.json | 6 +- packages/types/package.json | 4 +- packages/types/src/ContractAbi.ts | 148 ++++++++++++++++++ packages/types/src/codec/createType.ts | 4 +- packages/types/src/index.ts | 1 + packages/types/src/type/EventRecord.ts | 14 ++ yarn.lock | 30 ++-- 19 files changed, 415 insertions(+), 53 deletions(-) create mode 100644 packages/api/test/data/erc20.json create mode 100644 packages/api/test/data/erc20.wasm create mode 100644 packages/api/test/e2e/promise-contract.spec.js create mode 100644 packages/types/src/ContractAbi.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e157f9821..2c2a904843 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # 0.76.1 +- Experimental contract API - Update @polkadot/keyring to enable Alice's stash account on dev chains - Update @polkadot/util-crypto with smaller footprint diff --git a/packages/api/package.json b/packages/api/package.json index ec4a96a26f..3be6b16a86 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -36,6 +36,6 @@ "@polkadot/rpc-rx": "^0.76.0-beta.2", "@polkadot/storage": "^0.76.0-beta.2", "@polkadot/types": "^0.76.0-beta.2", - "@polkadot/util-crypto": "^0.76.0-beta.4" + "@polkadot/util-crypto": "^0.76.0-beta.6" } } diff --git a/packages/api/src/Base.ts b/packages/api/src/Base.ts index 17b5e190ec..974f313552 100644 --- a/packages/api/src/Base.ts +++ b/packages/api/src/Base.ts @@ -9,8 +9,7 @@ import { RxResult } from './rx/types'; import { ApiBaseInterface, ApiInterface$Rx, ApiInterface$Events, ApiOptions, ApiType, DecoratedRpc, DecoratedRpc$Method, DecoratedRpc$Section, - Derive, DeriveSection, - HashResult, U64Result, + Derive, DeriveSection, HashResult, U64Result, OnCallDefinition, OnCallFunction, QueryableModuleStorage, QueryableStorage, QueryableStorageFunction, SubmittableExtrinsicFunction, SubmittableExtrinsics, SubmittableModuleExtrinsics, Signer @@ -31,7 +30,7 @@ import { StorageFunction } from '@polkadot/types/primitive/StorageKey'; import { assert, compactStripLength, isFunction, isObject, isUndefined, logger, u8aToHex } from '@polkadot/util'; import { cryptoWaitReady } from '@polkadot/util-crypto'; -import { createSubmittableExtrinsic, SubmittableExtrinsic } from './SubmittableExtrinsic'; +import createSubmittable, { SubmittableExtrinsic } from './SubmittableExtrinsic'; type MetaDecoration = { callIndex?: Uint8Array, @@ -68,8 +67,8 @@ function rxOnCall ( } export default abstract class ApiBase implements ApiBaseInterface { - private _eventemitter: EventEmitter; private _derive?: Derive; + private _eventemitter: EventEmitter; private _extrinsics?: SubmittableExtrinsics; private _genesisHash?: Hash; private _isReady: boolean = false; @@ -474,7 +473,7 @@ export default abstract class ApiBase implement private decorateExtrinsicEntry (method: MethodFunction, onCall: OnCallDefinition): SubmittableExtrinsicFunction { const decorated: any = (...params: Array): SubmittableExtrinsic => - createSubmittableExtrinsic(this.type, this._rx as ApiInterface$Rx, onCall, method(...params)); + createSubmittable(this.type, this._rx as ApiInterface$Rx, onCall, method(...params)); return this.decorateFunctionMeta(method, decorated) as SubmittableExtrinsicFunction; } diff --git a/packages/api/src/SubmittableExtrinsic.ts b/packages/api/src/SubmittableExtrinsic.ts index 971b250a38..447866ee73 100644 --- a/packages/api/src/SubmittableExtrinsic.ts +++ b/packages/api/src/SubmittableExtrinsic.ts @@ -46,6 +46,15 @@ export class SubmittableResult extends Struct { get status (): ExtrinsicStatus { return this.get('status') as ExtrinsicStatus; } + + /** + * @description Finds an EventRecord for the specified method & section + */ + findRecord (section: string, method: string): EventRecord | undefined { + return this.events.find(({ event }) => + event.section === section && event.method === method + ); + } } export interface SubmittableExtrinsic extends IExtrinsic { @@ -60,7 +69,7 @@ export interface SubmittableExtrinsic extends I signAndSend (account: KeyringPair | string | AccountId | Address, statusCb: StatusCb): SumbitableResultSubscription; } -export function createSubmittableExtrinsic (type: ApiType, api: ApiInterface$Rx, onCall: OnCallDefinition, extrinsic: Method): SubmittableExtrinsic { +export default function createSubmittableExtrinsic (type: ApiType, api: ApiInterface$Rx, onCall: OnCallDefinition, extrinsic: Method, trackingCb?: (result: SubmittableResult) => any): SubmittableExtrinsic { const _extrinsic = new (getTypeRegistry().getOrThrow('Extrinsic'))(extrinsic) as SubmittableExtrinsic; const _noStatusCb = type === 'rxjs'; @@ -72,12 +81,11 @@ export function createSubmittableExtrinsic (typ function statusObservable (status: ExtrinsicStatus): Observable { if (!status.isFinalized) { - return of( - new SubmittableResult({ - status, - type: status.type - }) - ); + const result = new SubmittableResult({ status }); + + trackingCb && trackingCb(result); + + return of(result); } const blockHash = status.asFinalized; @@ -86,13 +94,16 @@ export function createSubmittableExtrinsic (typ api.rpc.chain.getBlock(blockHash) as Observable, api.query.system.events.at(blockHash) as Observable> ).pipe( - map(([signedBlock, allEvents]) => - new SubmittableResult({ + map(([signedBlock, allEvents]) => { + const result = new SubmittableResult({ events: filterEvents(_extrinsic.hash, signedBlock, allEvents), - status, - type: status.type - }) - ) + status + }); + + trackingCb && trackingCb(result); + + return result; + }) ); } diff --git a/packages/api/src/types.ts b/packages/api/src/types.ts index e84e8343e4..f32cab0fde 100644 --- a/packages/api/src/types.ts +++ b/packages/api/src/types.ts @@ -7,13 +7,7 @@ import { DeriveCustom } from '@polkadot/api-derive'; import { ProviderInterface } from '@polkadot/rpc-provider/types'; import { RpcRxInterface$Events } from '@polkadot/rpc-rx/types'; import { Hash, Metadata, RuntimeVersion, u64 as U64 } from '@polkadot/types'; -import { - CodecArg, - CodecCallback, - IExtrinsic, - RegistryTypes, - SignatureOptions -} from '@polkadot/types/types'; +import { CodecArg, CodecCallback, IExtrinsic, RegistryTypes, SignatureOptions } from '@polkadot/types/types'; import { MethodFunction } from '@polkadot/types/primitive/Method'; import { StorageFunction } from '@polkadot/types/primitive/StorageKey'; diff --git a/packages/api/src/util/filterEvents.ts b/packages/api/src/util/filterEvents.ts index 26044a9825..0f2963157a 100644 --- a/packages/api/src/util/filterEvents.ts +++ b/packages/api/src/util/filterEvents.ts @@ -22,6 +22,6 @@ export default function filterEvents (extHash: U8a, { block: { extrinsics, heade return allEvents.filter(({ phase }) => // only ApplyExtrinsic has the extrinsic index - phase.type === 'ApplyExtrinsic' && phase.asApplyExtrinsic.eqn(index) + phase.isApplyExtrinsic && phase.asApplyExtrinsic.eqn(index) ); } diff --git a/packages/api/test/data/erc20.json b/packages/api/test/data/erc20.json new file mode 100644 index 0000000000..f3cca08069 --- /dev/null +++ b/packages/api/test/data/erc20.json @@ -0,0 +1,100 @@ +{ + "name": "Erc20", + "deploy": { + "args": [ + { + "name": "init_value", + "type": "Balance" + } + ] + }, + "messages": [ + { + "name": "total_supply", + "selector": 949181842, + "mutates": false, + "args": [], + "return_type": "Balance" + }, + { + "name": "balance_of", + "selector": 3827153702, + "mutates": false, + "args": [ + { + "name": "owner", + "type": "Address" + } + ], + "return_type": "Balance" + }, + { + "name": "allowance", + "selector": 3057219184, + "mutates": false, + "args": [ + { + "name": "owner", + "type": "Address" + }, + { + "name": "spender", + "type": "Address" + } + ], + "return_type": "Balance" + }, + { + "name": "transfer", + "selector": 3374842663, + "mutates": true, + "args": [ + { + "name": "to", + "type": "Address" + }, + { + "name": "value", + "type": "Balance" + } + ], + "return_type": "bool" + }, + { + "name": "approve", + "selector": 431186122, + "mutates": true, + "args": [ + { + "name": "spender", + "type": "Address" + }, + { + "name": "value", + "type": "Balance" + } + ], + "return_type": "bool" + }, + { + "name": "transfer_from", + "selector": 197482595, + "mutates": true, + "args": [ + { + "name": "from", + "type": "Address" + }, + { + "name": "to", + "type": "Address" + }, + { + "name": "value", + "type": "Balance" + } + ], + "return_type": "bool" + } + ] +} diff --git a/packages/api/test/data/erc20.wasm b/packages/api/test/data/erc20.wasm new file mode 100644 index 0000000000000000000000000000000000000000..dcf4ee018b10887593a2af0b74a04249e1e567c4 GIT binary patch literal 31213 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 literal 0 HcmV?d00001 diff --git a/packages/api/test/e2e/promise-contract.spec.js b/packages/api/test/e2e/promise-contract.spec.js new file mode 100644 index 0000000000..3583325a00 --- /dev/null +++ b/packages/api/test/e2e/promise-contract.spec.js @@ -0,0 +1,92 @@ +// Copyright 2017-2019 @polkadot/api 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 fs from 'fs'; +import path from 'path'; + +import { ContractAbi } from '@polkadot/types'; +import testingPairs from '@polkadot/keyring/testingPairs'; + +import json from '../data/erc20.json'; +import Api from '../../src/promise'; + +describe.skip('e2e contracts', () => { + let address; + let codeHash; + let keyring; + let abi; + let api; + + beforeEach(async (done) => { + if (!api) { + api = await Api.create(); + + abi = new ContractAbi(json); + keyring = testingPairs({ type: 'sr25519' }); + } + + jest.setTimeout(10000); + done(); + }); + + it('has the attached methods', () => { + expect(Object.keys(abi.messages)).toEqual( + ['totalSupply', 'balanceOf', 'allowance', 'transfer', 'approve', 'transferFrom'] + ); + }); + + it('allows putCode', (done) => { + const code = fs.readFileSync(path.join(__dirname, '../data/erc20.wasm')).toString('hex'); + + api.tx.contract + .putCode(200000, `0x${code}`) + .signAndSend(keyring.eve, (result) => { + console.error('putCode', JSON.stringify(result)); + + if (result.status.isFinalized) { + const record = result.findRecord('contract', 'CodeStored'); + + if (record) { + codeHash = record.event.data[0]; + + done(); + } + } + }); + }); + + it('allows contract create', (done) => { + expect(codeHash).toBeDefined(); + + api.tx.contract + .create(1234, 12345, codeHash, abi.deploy(12345)) + .signAndSend(keyring.bob, (result) => { + console.error('create', JSON.stringify(result)); + + if (result.status.isFinalized) { + const record = result.findRecord('contract', 'Instantiated'); + + if (record) { + address = record.event.data[1]; + + done(); + } + } + }); + }); + + it('allows contract call', (done) => { + expect(address).toBeDefined(); + + api.tx.contract + .call(address, 123, 12345, abi.messages.balanceOf(keyring.alice.address())) + .signAndSend(keyring.bob, (result) => { + console.error('call', JSON.stringify(result)); + + if (result.status.isFinalized && result.findRecord('system', 'ExtrinsicSuccess')) { + done(); + } + }); + }); +}); diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json index ff0c9f0427..c00ab51aa1 100644 --- a/packages/rpc-core/package.json +++ b/packages/rpc-core/package.json @@ -33,6 +33,6 @@ "@polkadot/jsonrpc": "^0.76.0-beta.2", "@polkadot/rpc-provider": "^0.76.0-beta.2", "@polkadot/types": "^0.76.0-beta.2", - "@polkadot/util": "^0.76.0-beta.4" + "@polkadot/util": "^0.76.0-beta.6" } } diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json index 907c5889b2..5460f6fe19 100644 --- a/packages/rpc-provider/package.json +++ b/packages/rpc-provider/package.json @@ -30,10 +30,10 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-provider#readme", "dependencies": { "@babel/runtime": "^7.4.2", - "@polkadot/keyring": "^0.76.0-beta.4", + "@polkadot/keyring": "^0.76.0-beta.6", "@polkadot/storage": "^0.76.0-beta.2", - "@polkadot/util": "^0.76.0-beta.4", - "@polkadot/util-crypto": "^0.76.0-beta.4", + "@polkadot/util": "^0.76.0-beta.6", + "@polkadot/util-crypto": "^0.76.0-beta.6", "@types/nock": "^9.3.1", "eventemitter3": "^3.1.0", "isomorphic-fetch": "^2.2.1", diff --git a/packages/type-extrinsics/package.json b/packages/type-extrinsics/package.json index 59674c6536..5577196507 100644 --- a/packages/type-extrinsics/package.json +++ b/packages/type-extrinsics/package.json @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.4.2", "@polkadot/types": "^0.76.0-beta.2", - "@polkadot/util": "^0.76.0-beta.4" + "@polkadot/util": "^0.76.0-beta.6" } } diff --git a/packages/type-storage/package.json b/packages/type-storage/package.json index e716d09fab..1c072c2683 100644 --- a/packages/type-storage/package.json +++ b/packages/type-storage/package.json @@ -30,9 +30,9 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/type-storage#readme", "dependencies": { "@babel/runtime": "^7.4.2", - "@polkadot/keyring": "^0.76.0-beta.4", + "@polkadot/keyring": "^0.76.0-beta.6", "@polkadot/types": "^0.76.0-beta.2", - "@polkadot/util": "^0.76.0-beta.4", - "@polkadot/util-crypto": "^0.76.0-beta.4" + "@polkadot/util": "^0.76.0-beta.6", + "@polkadot/util-crypto": "^0.76.0-beta.6" } } diff --git a/packages/types/package.json b/packages/types/package.json index cc6f176e9e..e9a211666e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -30,7 +30,7 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types#readme", "dependencies": { "@babel/runtime": "^7.4.2", - "@polkadot/keyring": "^0.76.0-beta.4", - "@polkadot/util": "^0.76.0-beta.4" + "@polkadot/keyring": "^0.76.0-beta.6", + "@polkadot/util": "^0.76.0-beta.6" } } diff --git a/packages/types/src/ContractAbi.ts b/packages/types/src/ContractAbi.ts new file mode 100644 index 0000000000..b1208af12e --- /dev/null +++ b/packages/types/src/ContractAbi.ts @@ -0,0 +1,148 @@ +// 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 { CodecArg, Constructor } from './types'; + +import { assert, isNumber, isNull, isString, isUndefined, stringCamelCase } from '@polkadot/util'; + +import Compact from './codec/Compact'; +import { createClass } from './codec/createType'; + +export type ContractABIArgs = Array<{ + name: string, + type: string +}>; + +export type ContractABIMethodBase = { + args: ContractABIArgs +}; + +export type ContractABIMethod = ContractABIMethodBase & { + mutates?: boolean, + name: string, + selector: number, + return_type: string | null +}; + +export type ContractABI = { + deploy: ContractABIMethodBase, + messages: Array, + name: string +}; + +export interface ContractABIFn { + (...args: Array): Uint8Array; + args: ContractABIArgs; + isConstant: boolean; + type: string | null; +} + +export interface Contract { + abi: ContractABI; + deploy: ContractABIFn; + messages: { + [index: string]: ContractABIFn + }; +} + +export function validateArgs (name: string, args: ContractABIArgs): void { + assert(Array.isArray(args), `Expected 'args' to exist on ${name}`); + + args.forEach((arg) => { + const unknownKeys = Object.keys(arg).filter((key) => !['name', 'type'].includes(key)); + + assert(unknownKeys.length === 0, `Unknown keys ${unknownKeys.join(', ')} found in ABI args for ${name}`); + assert(isString(arg.name) && isString(arg.type), `${name} args should have valid name & type values`); + }); +} + +export function validateDeploy ({ deploy }: ContractABI): void { + const unknownKeys = Object.keys(deploy).filter((key) => !['args'].includes(key)); + + assert(unknownKeys.length === 0, `Unknown keys ${unknownKeys.join(', ')} found in ABI deploy`); + + validateArgs('deploy', deploy.args); +} + +export function validateMethods ({ messages }: ContractABI): void { + messages.forEach((method) => { + const unknownKeys = Object.keys(method).filter((key) => !['args', 'mutates', 'name', 'selector', 'return_type'].includes(key)); + + assert(unknownKeys.length === 0, `Unknown keys ${unknownKeys.join(', ')} found in ABI args for messages.${name}`); + assert(isString(method.name) && isNumber(method.selector) && (isNull(method.return_type) || isString(method.return_type)), `Expected name, selector & return_type specified for messages.${method.name}`); + + validateArgs(`messages.${method.name}`, method.args); + }); +} + +export function validateAbi (abi: ContractABI): void { + const unknownKeys = Object.keys(abi).filter((key) => !['deploy', 'messages', 'name'].includes(key)); + + assert(unknownKeys.length === 0, `Unknown fields ${unknownKeys.join(', ')} found in ABI`); + assert(abi.deploy && abi.messages && isString(abi.name), 'ABI should have deploy, messages & name sections'); + + validateDeploy(abi); + validateMethods(abi); +} + +export default class ContractAbi implements Contract { + abi: ContractABI; + deploy: ContractABIFn; + messages: { [index: string]: ContractABIFn } = {}; + + constructor (abi: ContractABI) { + validateAbi(abi); + + this.abi = abi; + this.deploy = this._createEncoded('deploy', abi.deploy); + + abi.messages.forEach((method) => { + const name = stringCamelCase(method.name); + + this.messages[name] = this._createEncoded(`messages.${name}`, method); + }); + } + + private _createClazz (args: ContractABIArgs, isDeploy: boolean): Constructor { + return createClass( + JSON.stringify( + args.reduce((base: { [index: string]: string }, { name, type }) => { + base[name] = type; + + return base; + }, isDeploy ? {} : { __selector: 'u32' }) + ) + ); + } + + private _createEncoded (name: string, method: Partial & ContractABIMethodBase): ContractABIFn { + const args = method.args.map(({ name, type }) => ({ + name: stringCamelCase(name), + type + })); + const Clazz = this._createClazz(args, isUndefined(method.selector)); + const base: { [index: string]: any } = { __selector: method.selector }; + const encoder = (...params: Array): Uint8Array => { + assert(params.length === args.length, `Expected ${args.length} arguments to contract ${name}, found ${params.length}`); + + return Compact.addLengthPrefix( + new Clazz( + args.reduce((mapped, { name }, index) => { + mapped[name] = params[index]; + + return mapped; + }, { ...base }) + ).toU8a() + ); + }; + + const fn = (encoder as ContractABIFn); + + fn.args = args; + fn.isConstant = !(method.mutates || false); + fn.type = method.return_type || null; + + return fn; + } +} diff --git a/packages/types/src/codec/createType.ts b/packages/types/src/codec/createType.ts index 2ddc862c45..ae8fb8ecbc 100644 --- a/packages/types/src/codec/createType.ts +++ b/packages/types/src/codec/createType.ts @@ -143,9 +143,11 @@ export function getTypeDef (_type: Text | string, name?: string): TypeDef { // Returns the type Class for construction export function getTypeClass (value: TypeDef): Constructor { const Type = getRegistry().get(value.type); + if (Type) { return Type; } + switch (value.info) { case TypeDefInfo.Compact: assert(value.sub && !Array.isArray(value.sub), 'Expected subtype for Compact'); @@ -201,7 +203,7 @@ export function getTypeClass (value: TypeDef): Constructor { throw new Error(`Unable to determine type from '${value.type}'`); } -export function createClass (type: Text | string, value?: any): Constructor { +export function createClass (type: Text | string): Constructor { return getTypeClass( getTypeDef(type) ); diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index b88317cd24..4369cf4f41 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -9,5 +9,6 @@ import { assertSingletonPackage } from '@polkadot/util'; assertSingletonPackage('@polkadot/types'); +export { default as ContractAbi } from './ContractAbi'; export * from './codec'; export * from './index.types'; diff --git a/packages/types/src/type/EventRecord.ts b/packages/types/src/type/EventRecord.ts index 17ab05277a..7d8e83d16d 100644 --- a/packages/types/src/type/EventRecord.ts +++ b/packages/types/src/type/EventRecord.ts @@ -50,6 +50,20 @@ export class Phase extends EnumType { get asFinalization (): Finalization { return this.value as Finalization; } + + /** + * @description true when this is a ApplyExtrinsic + */ + get isApplyExtrinsic (): boolean { + return this.type === 'ApplyExtrinsic'; + } + + /** + * @description true when this is a ApplyExtrinsic + */ + get isFinalization (): boolean { + return this.type === 'Finalization'; + } } /** diff --git a/yarn.lock b/yarn.lock index 898cbffc41..4f788e93e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1630,14 +1630,14 @@ typescript "^3.4.1" vuepress "^1.0.0-alpha.44" -"@polkadot/keyring@^0.76.0-beta.4": - version "0.76.0-beta.4" - resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.76.0-beta.4.tgz#9942c60a9a5e9795b40280b6b0a08d5f463c33dd" - integrity sha512-VeunqSVe/JPKC7/WQGOTdLfOV0Fv3B+IinBE7zdxqaEOP74VJ4+uXAynjcF1FPiUoJwzlvj+Wu20eRX8fozapg== +"@polkadot/keyring@^0.76.0-beta.6": + version "0.76.0-beta.6" + resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.76.0-beta.6.tgz#55cff504896340dcdfce9758dedd78275b08e402" + integrity sha512-v+TqsxlxfwWdbDjkyWpl3l3z9khJtfH0G0e4NFOmRL+Ym4FHqWmp/e9aRYFEztPe2WlP1htO6+f7teUQlroBKA== dependencies: "@babel/runtime" "^7.4.2" - "@polkadot/util" "^0.76.0-beta.4" - "@polkadot/util-crypto" "^0.76.0-beta.4" + "@polkadot/util" "^0.76.0-beta.6" + "@polkadot/util-crypto" "^0.76.0-beta.6" "@types/bs58" "^4.0.0" bs58 "^4.0.1" @@ -1646,13 +1646,13 @@ resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.1.56.tgz#ffd6e9c95704a7fb90b918193b9dc5c440114b27" integrity sha512-wnt4zXxZXyz6WaubTO/I+nUElwV2DogFzdl6CrKfVn2PTWp8uHN06W9s40FH57ORtmQfDr9rLRP8Nq+oIyElbg== -"@polkadot/util-crypto@^0.76.0-beta.4": - version "0.76.0-beta.4" - resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.76.0-beta.4.tgz#dc96bd4d76ddbe4edf2ddad9b4e330ba45b29831" - integrity sha512-pPjrSoT1HZm7LYLCgYP0rfGoZU13DfohyQVztMl1dWZG7c8KEXkE6hkIslt279sv2rnros4TAISHnOOMVBp2Vg== +"@polkadot/util-crypto@^0.76.0-beta.6": + version "0.76.0-beta.6" + resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.76.0-beta.6.tgz#b7d72b1b9e895c7e81287daf3a149aba1d9ef68f" + integrity sha512-GLY+GL8U/9AhFk2wCUhMynDVH2U1ozVcS9hgzWyw/OWM/5O6Lr1f+zFFhF+GYEyj1Xy2iqBQ8qJAdSHaLJJS3A== dependencies: "@babel/runtime" "^7.4.2" - "@polkadot/util" "^0.76.0-beta.4" + "@polkadot/util" "^0.76.0-beta.6" "@polkadot/wasm-crypto" "^0.8.1" "@types/bip39" "^2.4.2" "@types/pbkdf2" "^3.0.0" @@ -1666,10 +1666,10 @@ tweetnacl "^1.0.1" xxhashjs "^0.2.2" -"@polkadot/util@^0.76.0-beta.4": - version "0.76.0-beta.4" - resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.76.0-beta.4.tgz#7186f63206ece1c8b5b4e4d87666cf92be04ae60" - integrity sha512-azVxRClnSXEqwqLL+VnddAq5LhZa4lU1mKVxLVrg0OhLiT5HzodG6e64m5/y0T+BRrLC0lNVkH+Y8CMCaw5XmQ== +"@polkadot/util@^0.76.0-beta.6": + version "0.76.0-beta.6" + resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.76.0-beta.6.tgz#bcb83810dc9c0f9b6316844b888e1c115a3e7541" + integrity sha512-kTPsF3QGFkgtxF1X/LjXQ04gRGMgaYLYopdy80C7Bcm/eSUkidgxw928FC6v319ZGaFYGiwwxHsKTlmFDWKBJQ== dependencies: "@babel/runtime" "^7.4.2" "@types/bn.js" "^4.11.4"