From 9f5be747e798a5ba96dee9deaaea58dce81933b5 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 29 Apr 2019 13:47:55 +0200 Subject: [PATCH] Bump deps (#861) * Bump deps * Align with published common * Fix rxjs to 6.4.0 (false deprecations on 6.5.1) --- package.json | 10 +++++----- packages/api-derive/package.json | 2 +- packages/api-derive/src/balances/fees.ts | 4 ++-- packages/api-derive/src/balances/validatingBalance.ts | 4 ++-- packages/api-derive/src/balances/votingBalance.ts | 4 ++-- packages/api-derive/src/balances/votingBalances.ts | 2 +- packages/api-derive/src/chain/bestNumberLag.ts | 4 ++-- packages/api-derive/src/chain/getHeader.ts | 4 ++-- packages/api-derive/src/chain/subscribeNewHead.ts | 4 ++-- .../api-derive/src/democracy/referendumVotesFor.ts | 4 ++-- packages/api-derive/src/democracy/referendums.ts | 4 ++-- packages/api-derive/src/session/eraLength.ts | 4 ++-- packages/api-derive/src/session/eraProgress.ts | 4 ++-- packages/api-derive/src/session/sessionProgress.ts | 4 ++-- packages/api-derive/src/staking/controllers.ts | 4 ++-- packages/api/package.json | 4 ++-- packages/api/src/SubmittableExtrinsic.ts | 4 ++-- packages/rpc-core/package.json | 4 ++-- packages/rpc-provider/package.json | 8 ++++---- packages/rpc-rx/package.json | 4 ++-- packages/type-extrinsics/package.json | 4 ++-- packages/type-jsonrpc/package.json | 2 +- packages/type-storage/package.json | 8 ++++---- packages/types/package.json | 6 +++--- 24 files changed, 53 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index 24a872848e..507c0157e0 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ ], "resolutions": { "babel-core": "^7.0.0-bridge.0", - "typescript": "^3.4.3" + "typescript": "^3.4.5" }, "scripts": { "build": "plugnet-dev-build-ts && yarn run build:methodsdoc", @@ -23,10 +23,10 @@ "test": "jest --coverage" }, "devDependencies": { - "@babel/core": "^7.4.3", - "@babel/register": "^7.4.0", - "@babel/runtime": "^7.4.3", - "@plugnet/dev": "^0.30.1", + "@babel/core": "^7.4.4", + "@babel/register": "^7.4.4", + "@babel/runtime": "^7.4.4", + "@plugnet/dev": "^0.30.4", "@polkadot/ts": "^0.1.56", "gh-pages": "^2.0.1" } diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json index 37fb072276..49a81346eb 100644 --- a/packages/api-derive/package.json +++ b/packages/api-derive/package.json @@ -30,7 +30,7 @@ }, "homepage": "https://github.com/plugblockchain/api.js/tree/master/packages/api-derive#readme", "dependencies": { - "@babel/runtime": "^7.4.3", + "@babel/runtime": "^7.4.4", "@plugnet/api": "^0.77.102", "@plugnet/types": "^0.77.102", "@types/memoizee": "^0.4.2", diff --git a/packages/api-derive/src/balances/fees.ts b/packages/api-derive/src/balances/fees.ts index a9478b65fe..91ecb6690d 100644 --- a/packages/api-derive/src/balances/fees.ts +++ b/packages/api-derive/src/balances/fees.ts @@ -12,7 +12,7 @@ import { drr } from '../util/drr'; export function fees (api: ApiInterface$Rx) { return (): Observable => { - return (combineLatest( + return (combineLatest([ api.query.balances.creationFee(), api.query.balances.existentialDeposit(), api.query.fees @@ -22,7 +22,7 @@ export function fees (api: ApiInterface$Rx) { ? api.query.fees.transactionByteFee() : api.query.balances.transactionByteFee(), api.query.balances.transferFee() - ) as any as Observable<[BN, BN, BN, BN, BN]>).pipe( + ]) as any as Observable<[BN, BN, BN, BN, BN]>).pipe( map(([creationFee, existentialDeposit, transactionBaseFee, transactionByteFee, transferFee]) => ({ creationFee, existentialDeposit, diff --git a/packages/api-derive/src/balances/validatingBalance.ts b/packages/api-derive/src/balances/validatingBalance.ts index ccb1e0fea1..17dbb2ac33 100644 --- a/packages/api-derive/src/balances/validatingBalance.ts +++ b/packages/api-derive/src/balances/validatingBalance.ts @@ -15,10 +15,10 @@ import { votingBalancesNominatorsFor } from './votingBalancesNominatorsFor'; export function validatingBalance (api: ApiInterface$Rx) { return (address: AccountId | AccountIndex | Address | string): Observable => { - return combineLatest( + return combineLatest([ votingBalance(api)(address), votingBalancesNominatorsFor(api)(address) - ).pipe( + ]).pipe( map(([balance, nominators]) => { const nominatedBalance = nominators.reduce( (total: BN, nominatorBalance: DerivedBalances) => diff --git a/packages/api-derive/src/balances/votingBalance.ts b/packages/api-derive/src/balances/votingBalance.ts index 317e63a6b7..285907b440 100644 --- a/packages/api-derive/src/balances/votingBalance.ts +++ b/packages/api-derive/src/balances/votingBalance.ts @@ -18,11 +18,11 @@ export function votingBalance (api: ApiInterface$Rx) { return idAndIndex(api)(address).pipe( switchMap(([accountId]) => (accountId - ? combineLatest( + ? combineLatest([ of(accountId), api.query.balances.freeBalance(accountId), api.query.balances.reservedBalance(accountId) - ) + ]) : of([undefined, undefined, undefined]) ) as Observable<[AccountId?, Balance?, Balance?]> ), diff --git a/packages/api-derive/src/balances/votingBalances.ts b/packages/api-derive/src/balances/votingBalances.ts index 800da9823d..d68b77c57f 100644 --- a/packages/api-derive/src/balances/votingBalances.ts +++ b/packages/api-derive/src/balances/votingBalances.ts @@ -14,6 +14,6 @@ export function votingBalances (api: ApiInterface$Rx) { return (addresses?: Array): Observable> => { return !addresses || !addresses.length ? of([]).pipe(drr()) - : combineLatest(...addresses.map(votingBalance(api))).pipe(drr()); + : combineLatest(addresses.map(votingBalance(api))).pipe(drr()); }; } diff --git a/packages/api-derive/src/chain/bestNumberLag.ts b/packages/api-derive/src/chain/bestNumberLag.ts index efecf2e6aa..67d7783267 100644 --- a/packages/api-derive/src/chain/bestNumberLag.ts +++ b/packages/api-derive/src/chain/bestNumberLag.ts @@ -24,10 +24,10 @@ import { bestNumberFinalized } from './bestNumberFinalized'; */ export function bestNumberLag (api: ApiInterface$Rx) { return (): Observable => - combineLatest( + combineLatest([ bestNumber(api)(), bestNumberFinalized(api)() - ).pipe( + ]).pipe( map(([bestNumber, bestNumberFinalized]) => new BlockNumber(bestNumber.sub(bestNumberFinalized)) ), diff --git a/packages/api-derive/src/chain/getHeader.ts b/packages/api-derive/src/chain/getHeader.ts index 9a6a9b7be4..782d957bd2 100644 --- a/packages/api-derive/src/chain/getHeader.ts +++ b/packages/api-derive/src/chain/getHeader.ts @@ -25,12 +25,12 @@ import { HeaderAndValidators } from './subscribeNewHead'; export function getHeader (api: ApiInterface$Rx) { return (hash: Uint8Array | string): Observable => // tslint:disable-next-line - (combineLatest( + (combineLatest([ api.rpc.chain.getHeader(hash) as Observable
, api.query.session ? api.query.session.validators.at(hash) : of([]) - ) as Observable).pipe( + ]) as Observable).pipe( map(([header, validators]) => new HeaderExtended(header, validators) ), diff --git a/packages/api-derive/src/chain/subscribeNewHead.ts b/packages/api-derive/src/chain/subscribeNewHead.ts index 94050ec4ec..6e5a50b4d7 100644 --- a/packages/api-derive/src/chain/subscribeNewHead.ts +++ b/packages/api-derive/src/chain/subscribeNewHead.ts @@ -30,7 +30,7 @@ export function subscribeNewHead (api: ApiInterface$Rx) { header && !!header.blockNumber ), switchMap((header: Header): Observable => - (combineLatest( + (combineLatest([ of(header), // theoretically we could combine at the first call with session.validators(), however // we make 100% sure we actually get the validators at a specific block so when these @@ -38,7 +38,7 @@ export function subscribeNewHead (api: ApiInterface$Rx) { api.query.session ? api.query.session.validators.at(header.hash) : of([]) - ) as Observable) + ]) as Observable) ), map(([header, validators]) => new HeaderExtended(header, validators) diff --git a/packages/api-derive/src/democracy/referendumVotesFor.ts b/packages/api-derive/src/democracy/referendumVotesFor.ts index eb9d63ee56..f6caf3035b 100644 --- a/packages/api-derive/src/democracy/referendumVotesFor.ts +++ b/packages/api-derive/src/democracy/referendumVotesFor.ts @@ -17,11 +17,11 @@ export function referendumVotesFor (api: ApiInterface$Rx) { return (referendumId: BN | number): Observable> => (api.query.democracy.votersFor(referendumId) as Observable>).pipe( switchMap((votersFor) => - combineLatest( + combineLatest([ of(votersFor), votes(api)(referendumId as BN, votersFor), votingBalances(api)(votersFor) - ) + ]) ), map(([votersFor, votes, balances]) => votersFor.map((accountId, index): DerivedReferendumVote => ({ diff --git a/packages/api-derive/src/democracy/referendums.ts b/packages/api-derive/src/democracy/referendums.ts index 8f554c656d..6bcb039560 100644 --- a/packages/api-derive/src/democracy/referendums.ts +++ b/packages/api-derive/src/democracy/referendums.ts @@ -13,10 +13,10 @@ import { referendumInfos } from './referendumInfos'; export function referendums (api: ApiInterface$Rx) { return (): Observable>> => - (combineLatest( + (combineLatest([ api.query.democracy.nextTally(), api.query.democracy.referendumCount() - ) as Observable<[ReferendumIndex?, ReferendumIndex?]>).pipe( + ]) as Observable<[ReferendumIndex?, ReferendumIndex?]>).pipe( switchMap(([nextTally, referendumCount]) => referendumCount && nextTally && referendumCount.gt(nextTally) && referendumCount.gtn(0) ? referendumInfos(api)( diff --git a/packages/api-derive/src/session/eraLength.ts b/packages/api-derive/src/session/eraLength.ts index c339edc206..9913019d0c 100644 --- a/packages/api-derive/src/session/eraLength.ts +++ b/packages/api-derive/src/session/eraLength.ts @@ -12,10 +12,10 @@ import { drr } from '../util/drr'; export function eraLength (api: ApiInterface$Rx) { return (): Observable => - (combineLatest( + (combineLatest([ api.query.session.sessionLength(), api.query.staking.sessionsPerEra() - ) as Observable<[BlockNumber?, BlockNumber?]>).pipe( + ]) as Observable<[BlockNumber?, BlockNumber?]>).pipe( map( ([sessionLength, sessionsPerEra]) => (sessionLength || new BN(1)).mul(sessionsPerEra || new BN(1)) diff --git a/packages/api-derive/src/session/eraProgress.ts b/packages/api-derive/src/session/eraProgress.ts index e2ec208fa7..d6eec242a9 100644 --- a/packages/api-derive/src/session/eraProgress.ts +++ b/packages/api-derive/src/session/eraProgress.ts @@ -13,13 +13,13 @@ import { drr } from '../util/drr'; export function eraProgress (api: ApiInterface$Rx) { return (): Observable => - (combineLatest( + (combineLatest([ sessionProgress(api)(), api.query.session.currentIndex(), api.query.session.sessionLength(), api.query.staking.lastEraLengthChange(), api.query.staking.sessionsPerEra() - ) as Observable<[BN, BlockNumber?, BlockNumber?, BlockNumber?, BlockNumber?]>).pipe( + ]) as Observable<[BN, BlockNumber?, BlockNumber?, BlockNumber?, BlockNumber?]>).pipe( map( ([sessionProgress, currentIndex, sessionLength, lastEraLengthChange, sessionsPerEra]) => (currentIndex || new BN(0)) diff --git a/packages/api-derive/src/session/sessionProgress.ts b/packages/api-derive/src/session/sessionProgress.ts index f8448df5d3..0f33a868f7 100644 --- a/packages/api-derive/src/session/sessionProgress.ts +++ b/packages/api-derive/src/session/sessionProgress.ts @@ -13,11 +13,11 @@ import { drr } from '../util/drr'; export function sessionProgress (api: ApiInterface$Rx) { return (): Observable => - combineLatest( + combineLatest([ bestNumber(api)(), api.query.session.sessionLength(), api.query.session.lastLengthChange() - ).pipe( + ]).pipe( map( ([bestNumber, sessionLength, lastLengthChange]) => (bestNumber || new BN(0)) diff --git a/packages/api-derive/src/staking/controllers.ts b/packages/api-derive/src/staking/controllers.ts index f7449d8340..77f7c4f231 100644 --- a/packages/api-derive/src/staking/controllers.ts +++ b/packages/api-derive/src/staking/controllers.ts @@ -25,10 +25,10 @@ export function controllers (api: ApiInterface$Rx) { (api.query.staking.validators() as any as Observable<[Array, any]>) .pipe( switchMap(([stashIds]) => - combineLatest( + combineLatest([ of(stashIds), allBonds(api, stashIds) - ) + ]) ), drr() ); diff --git a/packages/api/package.json b/packages/api/package.json index f4cea6c25d..b287d85bbe 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -29,13 +29,13 @@ }, "homepage": "https://github.com/plugblockchain/api.js/tree/master/packages/api#readme", "dependencies": { - "@babel/runtime": "^7.4.3", + "@babel/runtime": "^7.4.4", "@plugnet/api-derive": "^0.77.102", "@plugnet/extrinsics": "^0.77.102", "@plugnet/rpc-provider": "^0.77.102", "@plugnet/rpc-rx": "^0.77.102", "@plugnet/storage": "^0.77.102", "@plugnet/types": "^0.77.102", - "@plugnet/util-crypto": "^0.76.2-beta.0" + "@plugnet/util-crypto": "^0.90.100" } } diff --git a/packages/api/src/SubmittableExtrinsic.ts b/packages/api/src/SubmittableExtrinsic.ts index 6b03202f2d..e628914eaf 100644 --- a/packages/api/src/SubmittableExtrinsic.ts +++ b/packages/api/src/SubmittableExtrinsic.ts @@ -90,10 +90,10 @@ export default function createSubmittableExtrinsic, api.query.system.events.at(blockHash) as Observable> - ).pipe( + ]).pipe( map(([signedBlock, allEvents]) => { const result = new SubmittableResult({ events: filterEvents(_extrinsic.hash, signedBlock, allEvents), diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json index 43f540d1e1..95f4d3c2b2 100644 --- a/packages/rpc-core/package.json +++ b/packages/rpc-core/package.json @@ -29,10 +29,10 @@ }, "homepage": "https://github.com/plugblockchain/api.js/tree/master/packages/rpc-core#readme", "dependencies": { - "@babel/runtime": "^7.4.3", + "@babel/runtime": "^7.4.4", "@plugnet/jsonrpc": "^0.77.102", "@plugnet/rpc-provider": "^0.77.102", "@plugnet/types": "^0.77.102", - "@plugnet/util": "^0.76.2-beta.0" + "@plugnet/util": "^0.90.100" } } diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json index 6f05721c90..c811e0a942 100644 --- a/packages/rpc-provider/package.json +++ b/packages/rpc-provider/package.json @@ -29,11 +29,11 @@ }, "homepage": "https://github.com/plugblockchain/api.js/tree/master/packages/rpc-provider#readme", "dependencies": { - "@babel/runtime": "^7.4.3", - "@plugnet/keyring": "^0.76.2-beta.0", + "@babel/runtime": "^7.4.4", + "@plugnet/keyring": "^0.90.100", "@plugnet/storage": "^0.77.102", - "@plugnet/util": "^0.76.2-beta.0", - "@plugnet/util-crypto": "^0.76.2-beta.0", + "@plugnet/util": "^0.90.100", + "@plugnet/util-crypto": "^0.90.100", "@types/nock": "^9.3.1", "eventemitter3": "^3.1.0", "isomorphic-fetch": "^2.2.1", diff --git a/packages/rpc-rx/package.json b/packages/rpc-rx/package.json index 51057dd224..c317541b45 100644 --- a/packages/rpc-rx/package.json +++ b/packages/rpc-rx/package.json @@ -29,12 +29,12 @@ }, "homepage": "https://github.com/plugblockchain/api.js/tree/master/packages/rpc-rx#readme", "dependencies": { - "@babel/runtime": "^7.4.3", + "@babel/runtime": "^7.4.4", "@plugnet/rpc-core": "^0.77.102", "@plugnet/rpc-provider": "^0.77.102", "@types/memoizee": "^0.4.2", "@types/rx": "^4.1.1", "memoizee": "^0.4.14", - "rxjs": "^6.4.0" + "rxjs": "6.4.0" } } diff --git a/packages/type-extrinsics/package.json b/packages/type-extrinsics/package.json index 40cbf111e5..148f81c731 100644 --- a/packages/type-extrinsics/package.json +++ b/packages/type-extrinsics/package.json @@ -10,8 +10,8 @@ "contributors": [], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.4.3", + "@babel/runtime": "^7.4.4", "@plugnet/types": "^0.77.102", - "@plugnet/util": "^0.76.2-beta.0" + "@plugnet/util": "^0.90.100" } } diff --git a/packages/type-jsonrpc/package.json b/packages/type-jsonrpc/package.json index 72d23774c2..4fdfac386e 100644 --- a/packages/type-jsonrpc/package.json +++ b/packages/type-jsonrpc/package.json @@ -29,6 +29,6 @@ }, "homepage": "https://github.com/plugblockchain/api.js/tree/master/packages/type-jsonrpc#readme", "dependencies": { - "@babel/runtime": "^7.4.3" + "@babel/runtime": "^7.4.4" } } diff --git a/packages/type-storage/package.json b/packages/type-storage/package.json index 8d385d53e2..56d40751ca 100644 --- a/packages/type-storage/package.json +++ b/packages/type-storage/package.json @@ -29,10 +29,10 @@ }, "homepage": "https://github.com/plugblockchain/api.js/tree/master/packages/type-storage#readme", "dependencies": { - "@babel/runtime": "^7.4.3", - "@plugnet/keyring": "^0.76.2-beta.0", + "@babel/runtime": "^7.4.4", + "@plugnet/keyring": "^0.90.100", "@plugnet/types": "^0.77.102", - "@plugnet/util": "^0.76.2-beta.0", - "@plugnet/util-crypto": "^0.76.2-beta.0" + "@plugnet/util": "^0.90.100", + "@plugnet/util-crypto": "^0.90.100" } } diff --git a/packages/types/package.json b/packages/types/package.json index 5490bfd832..f4e02fa726 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -29,8 +29,8 @@ }, "homepage": "https://github.com/plugblockchain/api.js/tree/master/packages/types#readme", "dependencies": { - "@babel/runtime": "^7.4.3", - "@plugnet/keyring": "^0.76.2-beta.0", - "@plugnet/util": "^0.76.2-beta.0" + "@babel/runtime": "^7.4.4", + "@plugnet/keyring": "^0.90.100", + "@plugnet/util": "^0.90.100" } }