From 736fd536f9b4a17ce9df3b8c3b27efeb58b7571e Mon Sep 17 00:00:00 2001 From: Jaco Date: Tue, 14 Dec 2021 11:04:50 +0100 Subject: [PATCH] Use tsconfig references (#4328) * Use tsconfig references * Move types-known (temp until lower-level split) * Sources * Adjust * tesconfig.eslint.json * Bumps * AdjustAdjust * Linting passing... a start... * Adjust * Merge derive * Merge * api-contract-support * It builds? * compare locations --- .eslintrc.js | 10 +- jest.config.cjs | 3 +- package.json | 10 +- packages/api-contract-support/LICENSE | 201 +++ packages/api-contract-support/README.md | 3 + packages/api-contract-support/package.json | 28 + .../src}/compare/ink_v0_delegator.test.json | 0 .../src}/compare/ink_v0_dns.test.json | 0 .../src}/compare/ink_v0_erc20.test.json | 0 .../src}/compare/ink_v0_erc721.test.json | 0 .../src}/compare/ink_v0_flipper.test.json | 0 .../compare/ink_v0_flipperBundle.test.json | 0 .../src}/compare/ink_v0_incrementer.test.json | 0 .../compare/ink_v0_multisigPlain.test.json | 0 .../src}/compare/ink_v1_flipper.test.json | 0 .../src}/compare/ink_v2_erc20.test.json | 0 .../src}/compare/ink_v2_flipper.test.json | 0 .../src}/compare/solang_v0_ints256.test.json | 0 .../compare/user_v0_assetTransfer.test.json | 0 .../compare/user_v0_enumExample.test.json | 0 .../src}/compare/user_v0_recursive.test.json | 0 .../src}/compare/user_v0_withString.test.json | 0 .../src}/contracts/index.ts | 0 .../src}/contracts/ink/index.ts | 0 .../src}/contracts/ink/v0/accumulator.wasm | Bin .../src}/contracts/ink/v0/adder.wasm | Bin .../src}/contracts/ink/v0/delegator.json | 0 .../src}/contracts/ink/v0/delegator.wasm | Bin .../src}/contracts/ink/v0/dns.json | 0 .../src}/contracts/ink/v0/dns.wasm | Bin .../src}/contracts/ink/v0/erc20.json | 0 .../src}/contracts/ink/v0/erc20.wasm | Bin .../src}/contracts/ink/v0/erc721.json | 0 .../src}/contracts/ink/v0/erc721.wasm | Bin .../contracts/ink/v0/flipper.contract.json | 0 .../src}/contracts/ink/v0/flipper.json | 0 .../src}/contracts/ink/v0/flipper.wasm | Bin .../src}/contracts/ink/v0/incrementer.json | 0 .../src}/contracts/ink/v0/incrementer.wasm | Bin .../src}/contracts/ink/v0/index.ts | 0 .../src}/contracts/ink/v0/multisig_plain.json | 0 .../src}/contracts/ink/v0/multisig_plain.wasm | Bin .../src}/contracts/ink/v0/subber.wasm | Bin .../src}/contracts/ink/v0/trait-flipper.json | 0 .../src}/contracts/ink/v0/trait-flipper.wasm | Bin .../contracts/ink/v1/flipper.contract.json | 0 .../src}/contracts/ink/v1/index.ts | 0 .../src}/contracts/ink/v2/erc20.contract.json | 0 .../contracts/ink/v2/flipper.contract.json | 0 .../src}/contracts/ink/v2/index.ts | 0 .../src}/contracts/solang/index.ts | 0 .../src}/contracts/solang/v0/index.ts | 0 .../src}/contracts/solang/v0/ints256.json | 0 .../src}/contracts/solang/v0/ints256.sol | 0 .../src}/contracts/solang/v0/ints256.wasm | Bin .../src}/contracts/user/index.ts | 0 .../src}/contracts/user/v0/assetTransfer.json | 0 .../src}/contracts/user/v0/assetTransfer.wasm | Bin .../src}/contracts/user/v0/enumExample.json | 0 .../src}/contracts/user/v0/enumExample.wasm | Bin .../src}/contracts/user/v0/index.ts | 0 .../contracts/user/v0/recursive.contract.json | 0 .../src}/contracts/user/v0/withString.json | 0 .../src}/contracts/util.ts | 0 .../api-contract-support/src/detectPackage.ts | 8 + packages/api-contract-support/src/index.ts | 6 + .../api-contract-support/src/packageInfo.ts | 6 + packages/api-contract-support/tsconfig.json | 11 + packages/api-contract/package.json | 5 +- packages/api-contract/src/Abi/Abi.spec.ts | 4 +- .../api-contract/src/Abi/toLatest.spec.ts | 2 +- packages/api-contract/src/base/Code.spec.ts | 8 +- .../api-contract/src/checkTypes.manual.ts | 2 +- packages/api-contract/test/README.md | 9 - packages/api-contract/tsconfig.json | 14 + packages/api-derive/package.json | 13 +- packages/api-derive/src/bundle.ts | 160 +- packages/api-derive/src/detectPackage.ts | 4 +- packages/api-derive/src/types.ts | 88 +- packages/api-derive/tsconfig.json | 11 + packages/api/package.json | 3 +- packages/api/src/augment/rpc.ts | 2 +- packages/api/src/base/Decorate.ts | 4 +- packages/api/src/base/Init.ts | 2 +- packages/api/src/checkTypes.manual.ts | 2 +- .../src/derive}/accounts/accountId.ts | 2 +- .../src => api/src/derive}/accounts/flags.ts | 2 +- .../src/derive}/accounts/idAndIndex.ts | 2 +- .../src/derive}/accounts/idToIndex.ts | 2 +- .../src/derive}/accounts/identity.ts | 2 +- .../src => api/src/derive}/accounts/index.ts | 0 .../src/derive}/accounts/indexToId.ts | 2 +- .../src/derive}/accounts/indexes.ts | 2 +- .../src => api/src/derive}/accounts/info.ts | 2 +- .../src => api/src/derive}/accounts/types.ts | 0 .../src/derive}/balances/account.ts | 2 +- .../src => api/src/derive}/balances/all.ts | 2 +- .../src => api/src/derive}/balances/fees.ts | 2 +- .../src => api/src/derive}/balances/index.ts | 0 .../src => api/src/derive}/balances/types.ts | 0 .../src/derive}/balances/votingBalances.ts | 2 +- .../src/derive}/bounties/bounties.spec.ts | 18 +- .../src/derive}/bounties/bounties.ts | 2 +- .../bounties/helpers/filterBountyProposals.ts | 4 +- .../src => api/src/derive}/bounties/index.ts | 0 .../src/derive}/chain/bestNumber.ts | 2 +- .../src/derive}/chain/bestNumberFinalized.ts | 2 +- .../src/derive}/chain/bestNumberLag.ts | 2 +- .../src => api/src/derive}/chain/getBlock.ts | 2 +- .../src => api/src/derive}/chain/getHeader.ts | 2 +- .../src => api/src/derive}/chain/index.ts | 0 .../src/derive}/chain/subscribeNewBlocks.ts | 2 +- .../src/derive}/chain/subscribeNewHeads.ts | 2 +- .../src => api/src/derive}/chain/util.ts | 3 +- .../src/derive}/collective/helpers.ts | 5 +- .../src/derive}/collective/index.ts | 0 .../src/derive}/collective/members.ts | 0 .../src/derive}/collective/prime.ts | 3 +- .../src/derive}/collective/proposals.ts | 3 +- .../src/derive}/collective/types.ts | 0 .../src => api/src/derive}/contracts/fees.ts | 2 +- .../src => api/src/derive}/contracts/index.ts | 0 .../src => api/src/derive}/council/index.ts | 0 .../src => api/src/derive}/council/types.ts | 0 .../src => api/src/derive}/council/votes.ts | 2 +- .../src => api/src/derive}/council/votesOf.ts | 2 +- .../src/derive}/crowdloan/childKey.ts | 2 +- .../src/derive}/crowdloan/contributions.ts | 2 +- .../src => api/src/derive}/crowdloan/index.ts | 0 .../src/derive}/crowdloan/onwContributions.ts | 2 +- .../src => api/src/derive}/crowdloan/types.ts | 0 .../src => api/src/derive}/crowdloan/util.ts | 0 .../src/derive}/democracy/dispatchQueue.ts | 2 +- .../src => api/src/derive}/democracy/index.ts | 0 .../src => api/src/derive}/democracy/locks.ts | 2 +- .../src/derive}/democracy/nextExternal.ts | 2 +- .../src/derive}/democracy/preimage.ts | 2 +- .../src/derive}/democracy/preimages.ts | 2 +- .../src/derive}/democracy/proposals.ts | 2 +- .../src/derive}/democracy/referendumIds.ts | 2 +- .../src/derive}/democracy/referendums.ts | 2 +- .../derive}/democracy/referendumsActive.ts | 2 +- .../derive}/democracy/referendumsFinished.ts | 2 +- .../src/derive}/democracy/referendumsInfo.ts | 2 +- .../src/derive}/democracy/sqrtElectorate.ts | 2 +- .../src => api/src/derive}/democracy/types.ts | 0 .../src => api/src/derive}/democracy/util.ts | 2 +- packages/api/src/derive/derive.ts | 42 + .../src => api/src/derive}/elections/index.ts | 0 .../src => api/src/derive}/elections/info.ts | 2 +- .../src => api/src/derive}/elections/types.ts | 0 .../src => api/src/derive}/imOnline/index.ts | 0 .../derive}/imOnline/receivedHeartbeats.ts | 2 +- .../src => api/src/derive}/index.spec.ts | 2 +- packages/api/src/derive/index.ts | 130 ++ .../src/derive}/membership/index.ts | 0 .../src/derive}/parachains/index.ts | 0 .../src => api/src/derive}/parachains/info.ts | 2 +- .../src/derive}/parachains/overview.ts | 2 +- .../src/derive}/parachains/types.ts | 0 .../src => api/src/derive}/parachains/util.ts | 0 .../src => api/src/derive}/session/index.ts | 0 .../src => api/src/derive}/session/indexes.ts | 2 +- .../src => api/src/derive}/session/info.ts | 2 +- .../src/derive}/session/progress.ts | 2 +- .../src => api/src/derive}/session/types.ts | 0 .../src/derive}/society/candidates.ts | 2 +- .../src => api/src/derive}/society/index.ts | 0 .../src => api/src/derive}/society/info.ts | 2 +- .../src => api/src/derive}/society/member.ts | 2 +- .../src => api/src/derive}/society/members.ts | 2 +- .../src => api/src/derive}/society/types.ts | 0 .../src => api/src/derive}/staking/account.ts | 2 +- .../src => api/src/derive}/staking/cache.ts | 0 .../src/derive}/staking/currentPoints.ts | 2 +- .../src/derive}/staking/electedInfo.ts | 2 +- .../src/derive}/staking/erasExposure.ts | 2 +- .../src/derive}/staking/erasHistoric.ts | 2 +- .../src/derive}/staking/erasPoints.ts | 2 +- .../src/derive}/staking/erasPrefs.ts | 2 +- .../src/derive}/staking/erasRewards.ts | 2 +- .../src/derive}/staking/erasSlashes.ts | 2 +- .../src => api/src/derive}/staking/index.ts | 0 .../src => api/src/derive}/staking/keys.ts | 2 +- .../src/derive}/staking/overview.ts | 2 +- .../src/derive}/staking/ownExposure.ts | 2 +- .../src/derive}/staking/ownSlashes.ts | 2 +- .../src => api/src/derive}/staking/query.ts | 2 +- .../src/derive}/staking/stakerExposure.ts | 4 +- .../src/derive}/staking/stakerPoints.ts | 2 +- .../src/derive}/staking/stakerPrefs.ts | 2 +- .../src/derive}/staking/stakerRewards.ts | 2 +- .../src/derive}/staking/stakerSlashes.ts | 2 +- .../src => api/src/derive}/staking/stashes.ts | 2 +- .../src => api/src/derive}/staking/types.ts | 0 .../src => api/src/derive}/staking/util.ts | 4 +- .../src/derive}/staking/validators.ts | 2 +- .../src/derive}/staking/waitingInfo.ts | 2 +- .../src/derive}/technicalCommittee/index.ts | 0 .../src/derive}/test/bountyFactory.ts | 3 +- .../src/derive}/test/bytesFactory.ts | 0 .../src/derive}/test/helpers.ts | 3 +- .../src/derive}/test/proposalFactory.ts | 6 +- .../src => api/src/derive}/treasury/index.ts | 0 .../src/derive}/treasury/proposals.ts | 2 +- .../src => api/src/derive}/tx/constants.ts | 0 .../src => api/src/derive}/tx/events.ts | 2 +- .../src => api/src/derive}/tx/index.ts | 0 .../src => api/src/derive}/tx/signingInfo.ts | 2 +- .../src/derive}/type/HeaderExtended.ts | 0 .../src/derive}/type/SignedBlockExtended.ts | 0 .../src => api/src/derive}/type/index.ts | 0 .../src => api/src/derive}/type/types.ts | 0 .../src => api/src/derive}/type/util.ts | 0 packages/api/src/derive/types.ts | 90 ++ .../derive}/util/approvalFlagToBools.spec.ts | 0 .../src/derive}/util/approvalFlagsToBools.ts | 0 .../src => api/src/derive}/util/cache.ts | 0 .../src => api/src/derive}/util/cacheImpl.ts | 0 .../src => api/src/derive}/util/first.ts | 5 +- .../src => api/src/derive}/util/index.ts | 0 .../src => api/src/derive}/util/lazy.ts | 0 .../src => api/src/derive}/util/types.ts | 0 packages/api/src/detectPackage.ts | 4 +- packages/api/src/promise/index.spec.ts | 2 +- packages/api/{ => src}/test/api.spec.ts | 0 .../{ => src}/test/typesBundleDerive.spec.ts | 0 .../test/util/SingleAccountSigner.ts | 0 packages/api/{ => src}/test/util/index.ts | 0 packages/api/{ => src}/test/util/logEvents.ts | 2 +- packages/api/src/types/index.ts | 2 +- packages/api/src/types/rpc.ts | 7 +- packages/api/src/util/decorate.ts | 2 +- packages/api/tsconfig.json | 13 + packages/rpc-core/package.json | 2 +- packages/rpc-core/src/cached.spec.ts | 2 +- packages/rpc-core/src/types.jsonrpc.ts | 8 + packages/rpc-core/src/types.ts | 7 +- packages/rpc-core/tsconfig.json | 11 + packages/rpc-provider/package.json | 2 +- packages/rpc-provider/src/http/index.spec.ts | 3 +- packages/rpc-provider/src/http/send.spec.ts | 5 +- .../{test => src/mock}/mockHttp.ts | 0 .../rpc-provider/{test => src/mock}/mockWs.ts | 0 packages/rpc-provider/src/ws/connect.spec.ts | 4 +- packages/rpc-provider/src/ws/index.spec.ts | 6 +- packages/rpc-provider/src/ws/send.spec.ts | 6 +- .../rpc-provider/src/ws/subscribe.spec.ts | 8 +- .../rpc-provider/src/ws/unsubscribe.spec.ts | 6 +- packages/rpc-provider/tsconfig.json | 12 + packages/typegen/package.json | 6 +- packages/typegen/src/generate/rpc.ts | 2 +- packages/typegen/tsconfig.json | 13 + packages/types-known/package.json | 2 +- packages/types-known/src/bundle.ts | 130 +- packages/types-known/tsconfig.json | 11 + packages/types-support/package.json | 2 +- packages/types-support/tsconfig.json | 11 + packages/types/package.json | 2 +- packages/types/src/detectPackage.ts | 3 +- packages/types/src/generic/Block.ts | 2 +- .../types/src/interfaces/xcm/definitions.ts | 2 +- .../src => types/src/known}/chain/index.ts | 2 +- .../src => types/src/known}/index.spec.ts | 5 +- packages/types/src/known/index.ts | 133 ++ .../src => types/src/known}/knownOrigins.ts | 0 .../src => types/src/known}/modules.ts | 2 +- .../src/known}/spec/centrifuge-chain.ts | 2 +- .../src => types/src/known}/spec/index.ts | 2 +- .../src => types/src/known}/spec/kusama.ts | 2 +- .../src/known}/spec/node-template.ts | 2 +- .../src => types/src/known}/spec/node.ts | 2 +- .../src => types/src/known}/spec/polkadot.ts | 2 +- .../src => types/src/known}/spec/rococo.ts | 2 +- .../src => types/src/known}/spec/shell.ts | 2 +- .../src => types/src/known}/spec/statemint.ts | 2 +- .../src => types/src/known}/spec/westend.ts | 2 +- .../src/known}/upgrades/index.spec.ts | 0 .../src => types/src/known}/upgrades/index.ts | 2 +- .../src/known}/upgrades/kusama.ts | 0 .../src/known}/upgrades/polkadot.ts | 0 .../src => types/src/known}/upgrades/types.ts | 0 .../src/known}/upgrades/westend.ts | 0 .../src => types/src/known}/xcm.ts | 0 packages/types/src/metadata/util/types.ts | 2 +- packages/types/src/metadata/v13/toV14.ts | 3 +- .../types/src/metadata/v14/Metadata.spec.ts | 6 +- packages/types/tsconfig.json | 12 + tsconfig.base.json | 9 +- tsconfig.eslint.json | 8 + tsconfig.json | 22 +- yarn.lock | 1330 +++++++++-------- 292 files changed, 1675 insertions(+), 1273 deletions(-) create mode 100644 packages/api-contract-support/LICENSE create mode 100644 packages/api-contract-support/README.md create mode 100644 packages/api-contract-support/package.json rename packages/{api-contract/test => api-contract-support/src}/compare/ink_v0_delegator.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/compare/ink_v0_dns.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/compare/ink_v0_erc20.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/compare/ink_v0_erc721.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/compare/ink_v0_flipper.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/compare/ink_v0_flipperBundle.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/compare/ink_v0_incrementer.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/compare/ink_v0_multisigPlain.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/compare/ink_v1_flipper.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/compare/ink_v2_erc20.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/compare/ink_v2_flipper.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/compare/solang_v0_ints256.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/compare/user_v0_assetTransfer.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/compare/user_v0_enumExample.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/compare/user_v0_recursive.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/compare/user_v0_withString.test.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/index.ts (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/index.ts (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/accumulator.wasm (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/adder.wasm (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/delegator.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/delegator.wasm (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/dns.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/dns.wasm (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/erc20.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/erc20.wasm (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/erc721.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/erc721.wasm (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/flipper.contract.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/flipper.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/flipper.wasm (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/incrementer.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/incrementer.wasm (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/index.ts (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/multisig_plain.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/multisig_plain.wasm (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/subber.wasm (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/trait-flipper.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v0/trait-flipper.wasm (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v1/flipper.contract.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v1/index.ts (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v2/erc20.contract.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v2/flipper.contract.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/ink/v2/index.ts (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/solang/index.ts (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/solang/v0/index.ts (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/solang/v0/ints256.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/solang/v0/ints256.sol (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/solang/v0/ints256.wasm (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/user/index.ts (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/user/v0/assetTransfer.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/user/v0/assetTransfer.wasm (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/user/v0/enumExample.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/user/v0/enumExample.wasm (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/user/v0/index.ts (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/user/v0/recursive.contract.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/user/v0/withString.json (100%) rename packages/{api-contract/test => api-contract-support/src}/contracts/util.ts (100%) create mode 100644 packages/api-contract-support/src/detectPackage.ts create mode 100644 packages/api-contract-support/src/index.ts create mode 100644 packages/api-contract-support/src/packageInfo.ts create mode 100644 packages/api-contract-support/tsconfig.json delete mode 100644 packages/api-contract/test/README.md create mode 100644 packages/api-contract/tsconfig.json create mode 100644 packages/api-derive/tsconfig.json rename packages/{api-derive/src => api/src/derive}/accounts/accountId.ts (95%) rename packages/{api-derive/src => api/src/derive}/accounts/flags.ts (97%) rename packages/{api-derive/src => api/src/derive}/accounts/idAndIndex.ts (97%) rename packages/{api-derive/src => api/src/derive}/accounts/idToIndex.ts (95%) rename packages/{api-derive/src => api/src/derive}/accounts/identity.ts (98%) rename packages/{api-derive/src => api/src/derive}/accounts/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/accounts/indexToId.ts (95%) rename packages/{api-derive/src => api/src/derive}/accounts/indexes.ts (96%) rename packages/{api-derive/src => api/src/derive}/accounts/info.ts (97%) rename packages/{api-derive/src => api/src/derive}/accounts/types.ts (100%) rename packages/{api-derive/src => api/src/derive}/balances/account.ts (98%) rename packages/{api-derive/src => api/src/derive}/balances/all.ts (99%) rename packages/{api-derive/src => api/src/derive}/balances/fees.ts (96%) rename packages/{api-derive/src => api/src/derive}/balances/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/balances/types.ts (100%) rename packages/{api-derive/src => api/src/derive}/balances/votingBalances.ts (93%) rename packages/{api-derive/src => api/src/derive}/bounties/bounties.spec.ts (90%) rename packages/{api-derive/src => api/src/derive}/bounties/bounties.ts (97%) rename packages/{api-derive/src => api/src/derive}/bounties/helpers/filterBountyProposals.ts (82%) rename packages/{api-derive/src => api/src/derive}/bounties/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/chain/bestNumber.ts (89%) rename packages/{api-derive/src => api/src/derive}/chain/bestNumberFinalized.ts (90%) rename packages/{api-derive/src => api/src/derive}/chain/bestNumberLag.ts (94%) rename packages/{api-derive/src => api/src/derive}/chain/getBlock.ts (96%) rename packages/{api-derive/src => api/src/derive}/chain/getHeader.ts (96%) rename packages/{api-derive/src => api/src/derive}/chain/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/chain/subscribeNewBlocks.ts (95%) rename packages/{api-derive/src => api/src/derive}/chain/subscribeNewHeads.ts (95%) rename packages/{api-derive/src => api/src/derive}/chain/util.ts (88%) rename packages/{api-derive/src => api/src/derive}/collective/helpers.ts (87%) rename packages/{api-derive/src => api/src/derive}/collective/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/collective/members.ts (100%) rename packages/{api-derive/src => api/src/derive}/collective/prime.ts (89%) rename packages/{api-derive/src => api/src/derive}/collective/proposals.ts (96%) rename packages/{api-derive/src => api/src/derive}/collective/types.ts (100%) rename packages/{api-derive/src => api/src/derive}/contracts/fees.ts (97%) rename packages/{api-derive/src => api/src/derive}/contracts/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/council/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/council/types.ts (100%) rename packages/{api-derive/src => api/src/derive}/council/votes.ts (97%) rename packages/{api-derive/src => api/src/derive}/council/votesOf.ts (93%) rename packages/{api-derive/src => api/src/derive}/crowdloan/childKey.ts (95%) rename packages/{api-derive/src => api/src/derive}/crowdloan/contributions.ts (98%) rename packages/{api-derive/src => api/src/derive}/crowdloan/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/crowdloan/onwContributions.ts (97%) rename packages/{api-derive/src => api/src/derive}/crowdloan/types.ts (100%) rename packages/{api-derive/src => api/src/derive}/crowdloan/util.ts (100%) rename packages/{api-derive/src => api/src/derive}/democracy/dispatchQueue.ts (98%) rename packages/{api-derive/src => api/src/derive}/democracy/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/democracy/locks.ts (98%) rename packages/{api-derive/src => api/src/derive}/democracy/nextExternal.ts (95%) rename packages/{api-derive/src => api/src/derive}/democracy/preimage.ts (92%) rename packages/{api-derive/src => api/src/derive}/democracy/preimages.ts (93%) rename packages/{api-derive/src => api/src/derive}/democracy/proposals.ts (97%) rename packages/{api-derive/src => api/src/derive}/democracy/referendumIds.ts (94%) rename packages/{api-derive/src => api/src/derive}/democracy/referendums.ts (94%) rename packages/{api-derive/src => api/src/derive}/democracy/referendumsActive.ts (91%) rename packages/{api-derive/src => api/src/derive}/democracy/referendumsFinished.ts (94%) rename packages/{api-derive/src => api/src/derive}/democracy/referendumsInfo.ts (99%) rename packages/{api-derive/src => api/src/derive}/democracy/sqrtElectorate.ts (90%) rename packages/{api-derive/src => api/src/derive}/democracy/types.ts (100%) rename packages/{api-derive/src => api/src/derive}/democracy/util.ts (98%) create mode 100644 packages/api/src/derive/derive.ts rename packages/{api-derive/src => api/src/derive}/elections/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/elections/info.ts (98%) rename packages/{api-derive/src => api/src/derive}/elections/types.ts (100%) rename packages/{api-derive/src => api/src/derive}/imOnline/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/imOnline/receivedHeartbeats.ts (97%) rename packages/{api-derive/src => api/src/derive}/index.spec.ts (98%) create mode 100644 packages/api/src/derive/index.ts rename packages/{api-derive/src => api/src/derive}/membership/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/parachains/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/parachains/info.ts (98%) rename packages/{api-derive/src => api/src/derive}/parachains/overview.ts (96%) rename packages/{api-derive/src => api/src/derive}/parachains/types.ts (100%) rename packages/{api-derive/src => api/src/derive}/parachains/util.ts (100%) rename packages/{api-derive/src => api/src/derive}/session/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/session/indexes.ts (97%) rename packages/{api-derive/src => api/src/derive}/session/info.ts (94%) rename packages/{api-derive/src => api/src/derive}/session/progress.ts (98%) rename packages/{api-derive/src => api/src/derive}/session/types.ts (100%) rename packages/{api-derive/src => api/src/derive}/society/candidates.ts (96%) rename packages/{api-derive/src => api/src/derive}/society/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/society/info.ts (95%) rename packages/{api-derive/src => api/src/derive}/society/member.ts (92%) rename packages/{api-derive/src => api/src/derive}/society/members.ts (96%) rename packages/{api-derive/src => api/src/derive}/society/types.ts (100%) rename packages/{api-derive/src => api/src/derive}/staking/account.ts (98%) rename packages/{api-derive/src => api/src/derive}/staking/cache.ts (100%) rename packages/{api-derive/src => api/src/derive}/staking/currentPoints.ts (92%) rename packages/{api-derive/src => api/src/derive}/staking/electedInfo.ts (95%) rename packages/{api-derive/src => api/src/derive}/staking/erasExposure.ts (97%) rename packages/{api-derive/src => api/src/derive}/staking/erasHistoric.ts (95%) rename packages/{api-derive/src => api/src/derive}/staking/erasPoints.ts (97%) rename packages/{api-derive/src => api/src/derive}/staking/erasPrefs.ts (96%) rename packages/{api-derive/src => api/src/derive}/staking/erasRewards.ts (96%) rename packages/{api-derive/src => api/src/derive}/staking/erasSlashes.ts (97%) rename packages/{api-derive/src => api/src/derive}/staking/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/staking/keys.ts (97%) rename packages/{api-derive/src => api/src/derive}/staking/overview.ts (93%) rename packages/{api-derive/src => api/src/derive}/staking/ownExposure.ts (94%) rename packages/{api-derive/src => api/src/derive}/staking/ownSlashes.ts (95%) rename packages/{api-derive/src => api/src/derive}/staking/query.ts (98%) rename packages/{api-derive/src => api/src/derive}/staking/stakerExposure.ts (96%) rename packages/{api-derive/src => api/src/derive}/staking/stakerPoints.ts (95%) rename packages/{api-derive/src => api/src/derive}/staking/stakerPrefs.ts (94%) rename packages/{api-derive/src => api/src/derive}/staking/stakerRewards.ts (99%) rename packages/{api-derive/src => api/src/derive}/staking/stakerSlashes.ts (95%) rename packages/{api-derive/src => api/src/derive}/staking/stashes.ts (95%) rename packages/{api-derive/src => api/src/derive}/staking/types.ts (100%) rename packages/{api-derive/src => api/src/derive}/staking/util.ts (96%) rename packages/{api-derive/src => api/src/derive}/staking/validators.ts (96%) rename packages/{api-derive/src => api/src/derive}/staking/waitingInfo.ts (95%) rename packages/{api-derive/src => api/src/derive}/technicalCommittee/index.ts (100%) rename packages/{api-derive => api/src/derive}/test/bountyFactory.ts (96%) rename packages/{api-derive => api/src/derive}/test/bytesFactory.ts (100%) rename packages/{api-derive => api/src/derive}/test/helpers.ts (91%) rename packages/{api-derive => api/src/derive}/test/proposalFactory.ts (86%) rename packages/{api-derive/src => api/src/derive}/treasury/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/treasury/proposals.ts (98%) rename packages/{api-derive/src => api/src/derive}/tx/constants.ts (100%) rename packages/{api-derive/src => api/src/derive}/tx/events.ts (93%) rename packages/{api-derive/src => api/src/derive}/tx/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/tx/signingInfo.ts (98%) rename packages/{api-derive/src => api/src/derive}/type/HeaderExtended.ts (100%) rename packages/{api-derive/src => api/src/derive}/type/SignedBlockExtended.ts (100%) rename packages/{api-derive/src => api/src/derive}/type/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/type/types.ts (100%) rename packages/{api-derive/src => api/src/derive}/type/util.ts (100%) create mode 100644 packages/api/src/derive/types.ts rename packages/{api-derive/src => api/src/derive}/util/approvalFlagToBools.spec.ts (100%) rename packages/{api-derive/src => api/src/derive}/util/approvalFlagsToBools.ts (100%) rename packages/{api-derive/src => api/src/derive}/util/cache.ts (100%) rename packages/{api-derive/src => api/src/derive}/util/cacheImpl.ts (100%) rename packages/{api-derive/src => api/src/derive}/util/first.ts (76%) rename packages/{api-derive/src => api/src/derive}/util/index.ts (100%) rename packages/{api-derive/src => api/src/derive}/util/lazy.ts (100%) rename packages/{api-derive/src => api/src/derive}/util/types.ts (100%) rename packages/api/{ => src}/test/api.spec.ts (100%) rename packages/api/{ => src}/test/typesBundleDerive.spec.ts (100%) rename packages/api/{ => src}/test/util/SingleAccountSigner.ts (100%) rename packages/api/{ => src}/test/util/index.ts (100%) rename packages/api/{ => src}/test/util/logEvents.ts (94%) create mode 100644 packages/api/tsconfig.json create mode 100644 packages/rpc-core/tsconfig.json rename packages/rpc-provider/{test => src/mock}/mockHttp.ts (100%) rename packages/rpc-provider/{test => src/mock}/mockWs.ts (100%) create mode 100644 packages/rpc-provider/tsconfig.json create mode 100644 packages/typegen/tsconfig.json create mode 100644 packages/types-known/tsconfig.json create mode 100644 packages/types-support/tsconfig.json rename packages/{types-known/src => types/src/known}/chain/index.ts (78%) rename packages/{types-known/src => types/src/known}/index.spec.ts (91%) create mode 100644 packages/types/src/known/index.ts rename packages/{types-known/src => types/src/known}/knownOrigins.ts (100%) rename packages/{types-known/src => types/src/known}/modules.ts (97%) rename packages/{types-known/src => types/src/known}/spec/centrifuge-chain.ts (96%) rename packages/{types-known/src => types/src/known}/spec/index.ts (92%) rename packages/{types-known/src => types/src/known}/spec/kusama.ts (98%) rename packages/{types-known/src => types/src/known}/spec/node-template.ts (81%) rename packages/{types-known/src => types/src/known}/spec/node.ts (81%) rename packages/{types-known/src => types/src/known}/spec/polkadot.ts (96%) rename packages/{types-known/src => types/src/known}/spec/rococo.ts (94%) rename packages/{types-known/src => types/src/known}/spec/shell.ts (81%) rename packages/{types-known/src => types/src/known}/spec/statemint.ts (92%) rename packages/{types-known/src => types/src/known}/spec/westend.ts (97%) rename packages/{types-known/src => types/src/known}/upgrades/index.spec.ts (100%) rename packages/{types-known/src => types/src/known}/upgrades/index.ts (96%) rename packages/{types-known/src => types/src/known}/upgrades/kusama.ts (100%) rename packages/{types-known/src => types/src/known}/upgrades/polkadot.ts (100%) rename packages/{types-known/src => types/src/known}/upgrades/types.ts (100%) rename packages/{types-known/src => types/src/known}/upgrades/westend.ts (100%) rename packages/{types-known/src => types/src/known}/xcm.ts (100%) create mode 100644 packages/types/tsconfig.json create mode 100644 tsconfig.eslint.json diff --git a/.eslintrc.js b/.eslintrc.js index f050b757d3..cfca3692b6 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -6,18 +6,12 @@ const base = require('@polkadot/dev/config/eslint.cjs'); module.exports = { ...base, ignorePatterns: [ - '.eslintrc.js', - '.github/**', - '.vscode/**', - '.yarn/**', - '**/build/*', - '**/coverage/*', - '**/node_modules/*' + ...base.ignorePatterns ], parserOptions: { ...base.parserOptions, project: [ - './tsconfig.json' + './tsconfig.eslint.json' ] }, rules: { diff --git a/jest.config.cjs b/jest.config.cjs index 8367f9e62e..6bc232f1ce 100644 --- a/jest.config.cjs +++ b/jest.config.cjs @@ -6,10 +6,9 @@ const config = require('@polkadot/dev/config/jest.cjs'); module.exports = { ...config, moduleNameMapper: { - '@polkadot/api-(contract|derive)(.*)$': '/packages/api-$1/src/$2', + '@polkadot/api-(contract-support|contract|derive)(.*)$': '/packages/api-$1/src/$2', // eslint-disable-next-line sort-keys '@polkadot/api(.*)$': '/packages/api/src/$1', - '@polkadot/metadata(.*)$': '/packages/metadata/src/$1', '@polkadot/rpc-(core|provider)(.*)$': '/packages/rpc-$1/src/$2', '@polkadot/typegen(.*)$': '/packages/typegen/src/$1', '@polkadot/types-(known|support)(.*)$': '/packages/types-$1/src/$2', diff --git a/package.json b/package.json index 96c6fd507b..98c3415873 100644 --- a/package.json +++ b/package.json @@ -31,11 +31,11 @@ "test:watch": "polkadot-dev-run-test --watch" }, "devDependencies": { - "@babel/core": "^7.16.0", - "@babel/register": "^7.16.0", - "@babel/runtime": "^7.16.3", - "@polkadot/dev": "^0.63.39", - "@polkadot/ts": "^0.4.18", + "@babel/core": "^7.16.5", + "@babel/register": "^7.16.5", + "@babel/runtime": "^7.16.5", + "@polkadot/dev": "^0.64.3", + "@polkadot/ts": "^0.4.20", "@polkadot/typegen": "workspace:packages/typegen", "@types/jest": "^27.0.3", "copyfiles": "^2.4.1" diff --git a/packages/api-contract-support/LICENSE b/packages/api-contract-support/LICENSE new file mode 100644 index 0000000000..0d381b2e97 --- /dev/null +++ b/packages/api-contract-support/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/packages/api-contract-support/README.md b/packages/api-contract-support/README.md new file mode 100644 index 0000000000..e703235bb1 --- /dev/null +++ b/packages/api-contract-support/README.md @@ -0,0 +1,3 @@ +# @polkadot/api-contract-support + +Test contracts diff --git a/packages/api-contract-support/package.json b/packages/api-contract-support/package.json new file mode 100644 index 0000000000..fa0ef9bed9 --- /dev/null +++ b/packages/api-contract-support/package.json @@ -0,0 +1,28 @@ +{ + "author": "Jaco Greeff ", + "bugs": "https://github.com/polkadot-js/api/issues", + "contributors": [], + "description": "Sample contracts as development support", + "engines": { + "node": ">=14.0.0" + }, + "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract-support#readme", + "license": "Apache-2.0", + "maintainers": [], + "name": "@polkadot/api-contract-support", + "repository": { + "directory": "packages/api-contract-support", + "type": "git", + "url": "https://github.com/polkadot-js/api.git" + }, + "sideEffects": [ + "./detectPackage.js", + "./detectPackage.cjs" + ], + "type": "module", + "version": "6.12.1", + "main": "index.js", + "dependencies": { + "@babel/runtime": "^7.16.5" + } +} diff --git a/packages/api-contract/test/compare/ink_v0_delegator.test.json b/packages/api-contract-support/src/compare/ink_v0_delegator.test.json similarity index 100% rename from packages/api-contract/test/compare/ink_v0_delegator.test.json rename to packages/api-contract-support/src/compare/ink_v0_delegator.test.json diff --git a/packages/api-contract/test/compare/ink_v0_dns.test.json b/packages/api-contract-support/src/compare/ink_v0_dns.test.json similarity index 100% rename from packages/api-contract/test/compare/ink_v0_dns.test.json rename to packages/api-contract-support/src/compare/ink_v0_dns.test.json diff --git a/packages/api-contract/test/compare/ink_v0_erc20.test.json b/packages/api-contract-support/src/compare/ink_v0_erc20.test.json similarity index 100% rename from packages/api-contract/test/compare/ink_v0_erc20.test.json rename to packages/api-contract-support/src/compare/ink_v0_erc20.test.json diff --git a/packages/api-contract/test/compare/ink_v0_erc721.test.json b/packages/api-contract-support/src/compare/ink_v0_erc721.test.json similarity index 100% rename from packages/api-contract/test/compare/ink_v0_erc721.test.json rename to packages/api-contract-support/src/compare/ink_v0_erc721.test.json diff --git a/packages/api-contract/test/compare/ink_v0_flipper.test.json b/packages/api-contract-support/src/compare/ink_v0_flipper.test.json similarity index 100% rename from packages/api-contract/test/compare/ink_v0_flipper.test.json rename to packages/api-contract-support/src/compare/ink_v0_flipper.test.json diff --git a/packages/api-contract/test/compare/ink_v0_flipperBundle.test.json b/packages/api-contract-support/src/compare/ink_v0_flipperBundle.test.json similarity index 100% rename from packages/api-contract/test/compare/ink_v0_flipperBundle.test.json rename to packages/api-contract-support/src/compare/ink_v0_flipperBundle.test.json diff --git a/packages/api-contract/test/compare/ink_v0_incrementer.test.json b/packages/api-contract-support/src/compare/ink_v0_incrementer.test.json similarity index 100% rename from packages/api-contract/test/compare/ink_v0_incrementer.test.json rename to packages/api-contract-support/src/compare/ink_v0_incrementer.test.json diff --git a/packages/api-contract/test/compare/ink_v0_multisigPlain.test.json b/packages/api-contract-support/src/compare/ink_v0_multisigPlain.test.json similarity index 100% rename from packages/api-contract/test/compare/ink_v0_multisigPlain.test.json rename to packages/api-contract-support/src/compare/ink_v0_multisigPlain.test.json diff --git a/packages/api-contract/test/compare/ink_v1_flipper.test.json b/packages/api-contract-support/src/compare/ink_v1_flipper.test.json similarity index 100% rename from packages/api-contract/test/compare/ink_v1_flipper.test.json rename to packages/api-contract-support/src/compare/ink_v1_flipper.test.json diff --git a/packages/api-contract/test/compare/ink_v2_erc20.test.json b/packages/api-contract-support/src/compare/ink_v2_erc20.test.json similarity index 100% rename from packages/api-contract/test/compare/ink_v2_erc20.test.json rename to packages/api-contract-support/src/compare/ink_v2_erc20.test.json diff --git a/packages/api-contract/test/compare/ink_v2_flipper.test.json b/packages/api-contract-support/src/compare/ink_v2_flipper.test.json similarity index 100% rename from packages/api-contract/test/compare/ink_v2_flipper.test.json rename to packages/api-contract-support/src/compare/ink_v2_flipper.test.json diff --git a/packages/api-contract/test/compare/solang_v0_ints256.test.json b/packages/api-contract-support/src/compare/solang_v0_ints256.test.json similarity index 100% rename from packages/api-contract/test/compare/solang_v0_ints256.test.json rename to packages/api-contract-support/src/compare/solang_v0_ints256.test.json diff --git a/packages/api-contract/test/compare/user_v0_assetTransfer.test.json b/packages/api-contract-support/src/compare/user_v0_assetTransfer.test.json similarity index 100% rename from packages/api-contract/test/compare/user_v0_assetTransfer.test.json rename to packages/api-contract-support/src/compare/user_v0_assetTransfer.test.json diff --git a/packages/api-contract/test/compare/user_v0_enumExample.test.json b/packages/api-contract-support/src/compare/user_v0_enumExample.test.json similarity index 100% rename from packages/api-contract/test/compare/user_v0_enumExample.test.json rename to packages/api-contract-support/src/compare/user_v0_enumExample.test.json diff --git a/packages/api-contract/test/compare/user_v0_recursive.test.json b/packages/api-contract-support/src/compare/user_v0_recursive.test.json similarity index 100% rename from packages/api-contract/test/compare/user_v0_recursive.test.json rename to packages/api-contract-support/src/compare/user_v0_recursive.test.json diff --git a/packages/api-contract/test/compare/user_v0_withString.test.json b/packages/api-contract-support/src/compare/user_v0_withString.test.json similarity index 100% rename from packages/api-contract/test/compare/user_v0_withString.test.json rename to packages/api-contract-support/src/compare/user_v0_withString.test.json diff --git a/packages/api-contract/test/contracts/index.ts b/packages/api-contract-support/src/contracts/index.ts similarity index 100% rename from packages/api-contract/test/contracts/index.ts rename to packages/api-contract-support/src/contracts/index.ts diff --git a/packages/api-contract/test/contracts/ink/index.ts b/packages/api-contract-support/src/contracts/ink/index.ts similarity index 100% rename from packages/api-contract/test/contracts/ink/index.ts rename to packages/api-contract-support/src/contracts/ink/index.ts diff --git a/packages/api-contract/test/contracts/ink/v0/accumulator.wasm b/packages/api-contract-support/src/contracts/ink/v0/accumulator.wasm similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/accumulator.wasm rename to packages/api-contract-support/src/contracts/ink/v0/accumulator.wasm diff --git a/packages/api-contract/test/contracts/ink/v0/adder.wasm b/packages/api-contract-support/src/contracts/ink/v0/adder.wasm similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/adder.wasm rename to packages/api-contract-support/src/contracts/ink/v0/adder.wasm diff --git a/packages/api-contract/test/contracts/ink/v0/delegator.json b/packages/api-contract-support/src/contracts/ink/v0/delegator.json similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/delegator.json rename to packages/api-contract-support/src/contracts/ink/v0/delegator.json diff --git a/packages/api-contract/test/contracts/ink/v0/delegator.wasm b/packages/api-contract-support/src/contracts/ink/v0/delegator.wasm similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/delegator.wasm rename to packages/api-contract-support/src/contracts/ink/v0/delegator.wasm diff --git a/packages/api-contract/test/contracts/ink/v0/dns.json b/packages/api-contract-support/src/contracts/ink/v0/dns.json similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/dns.json rename to packages/api-contract-support/src/contracts/ink/v0/dns.json diff --git a/packages/api-contract/test/contracts/ink/v0/dns.wasm b/packages/api-contract-support/src/contracts/ink/v0/dns.wasm similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/dns.wasm rename to packages/api-contract-support/src/contracts/ink/v0/dns.wasm diff --git a/packages/api-contract/test/contracts/ink/v0/erc20.json b/packages/api-contract-support/src/contracts/ink/v0/erc20.json similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/erc20.json rename to packages/api-contract-support/src/contracts/ink/v0/erc20.json diff --git a/packages/api-contract/test/contracts/ink/v0/erc20.wasm b/packages/api-contract-support/src/contracts/ink/v0/erc20.wasm similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/erc20.wasm rename to packages/api-contract-support/src/contracts/ink/v0/erc20.wasm diff --git a/packages/api-contract/test/contracts/ink/v0/erc721.json b/packages/api-contract-support/src/contracts/ink/v0/erc721.json similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/erc721.json rename to packages/api-contract-support/src/contracts/ink/v0/erc721.json diff --git a/packages/api-contract/test/contracts/ink/v0/erc721.wasm b/packages/api-contract-support/src/contracts/ink/v0/erc721.wasm similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/erc721.wasm rename to packages/api-contract-support/src/contracts/ink/v0/erc721.wasm diff --git a/packages/api-contract/test/contracts/ink/v0/flipper.contract.json b/packages/api-contract-support/src/contracts/ink/v0/flipper.contract.json similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/flipper.contract.json rename to packages/api-contract-support/src/contracts/ink/v0/flipper.contract.json diff --git a/packages/api-contract/test/contracts/ink/v0/flipper.json b/packages/api-contract-support/src/contracts/ink/v0/flipper.json similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/flipper.json rename to packages/api-contract-support/src/contracts/ink/v0/flipper.json diff --git a/packages/api-contract/test/contracts/ink/v0/flipper.wasm b/packages/api-contract-support/src/contracts/ink/v0/flipper.wasm similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/flipper.wasm rename to packages/api-contract-support/src/contracts/ink/v0/flipper.wasm diff --git a/packages/api-contract/test/contracts/ink/v0/incrementer.json b/packages/api-contract-support/src/contracts/ink/v0/incrementer.json similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/incrementer.json rename to packages/api-contract-support/src/contracts/ink/v0/incrementer.json diff --git a/packages/api-contract/test/contracts/ink/v0/incrementer.wasm b/packages/api-contract-support/src/contracts/ink/v0/incrementer.wasm similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/incrementer.wasm rename to packages/api-contract-support/src/contracts/ink/v0/incrementer.wasm diff --git a/packages/api-contract/test/contracts/ink/v0/index.ts b/packages/api-contract-support/src/contracts/ink/v0/index.ts similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/index.ts rename to packages/api-contract-support/src/contracts/ink/v0/index.ts diff --git a/packages/api-contract/test/contracts/ink/v0/multisig_plain.json b/packages/api-contract-support/src/contracts/ink/v0/multisig_plain.json similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/multisig_plain.json rename to packages/api-contract-support/src/contracts/ink/v0/multisig_plain.json diff --git a/packages/api-contract/test/contracts/ink/v0/multisig_plain.wasm b/packages/api-contract-support/src/contracts/ink/v0/multisig_plain.wasm similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/multisig_plain.wasm rename to packages/api-contract-support/src/contracts/ink/v0/multisig_plain.wasm diff --git a/packages/api-contract/test/contracts/ink/v0/subber.wasm b/packages/api-contract-support/src/contracts/ink/v0/subber.wasm similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/subber.wasm rename to packages/api-contract-support/src/contracts/ink/v0/subber.wasm diff --git a/packages/api-contract/test/contracts/ink/v0/trait-flipper.json b/packages/api-contract-support/src/contracts/ink/v0/trait-flipper.json similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/trait-flipper.json rename to packages/api-contract-support/src/contracts/ink/v0/trait-flipper.json diff --git a/packages/api-contract/test/contracts/ink/v0/trait-flipper.wasm b/packages/api-contract-support/src/contracts/ink/v0/trait-flipper.wasm similarity index 100% rename from packages/api-contract/test/contracts/ink/v0/trait-flipper.wasm rename to packages/api-contract-support/src/contracts/ink/v0/trait-flipper.wasm diff --git a/packages/api-contract/test/contracts/ink/v1/flipper.contract.json b/packages/api-contract-support/src/contracts/ink/v1/flipper.contract.json similarity index 100% rename from packages/api-contract/test/contracts/ink/v1/flipper.contract.json rename to packages/api-contract-support/src/contracts/ink/v1/flipper.contract.json diff --git a/packages/api-contract/test/contracts/ink/v1/index.ts b/packages/api-contract-support/src/contracts/ink/v1/index.ts similarity index 100% rename from packages/api-contract/test/contracts/ink/v1/index.ts rename to packages/api-contract-support/src/contracts/ink/v1/index.ts diff --git a/packages/api-contract/test/contracts/ink/v2/erc20.contract.json b/packages/api-contract-support/src/contracts/ink/v2/erc20.contract.json similarity index 100% rename from packages/api-contract/test/contracts/ink/v2/erc20.contract.json rename to packages/api-contract-support/src/contracts/ink/v2/erc20.contract.json diff --git a/packages/api-contract/test/contracts/ink/v2/flipper.contract.json b/packages/api-contract-support/src/contracts/ink/v2/flipper.contract.json similarity index 100% rename from packages/api-contract/test/contracts/ink/v2/flipper.contract.json rename to packages/api-contract-support/src/contracts/ink/v2/flipper.contract.json diff --git a/packages/api-contract/test/contracts/ink/v2/index.ts b/packages/api-contract-support/src/contracts/ink/v2/index.ts similarity index 100% rename from packages/api-contract/test/contracts/ink/v2/index.ts rename to packages/api-contract-support/src/contracts/ink/v2/index.ts diff --git a/packages/api-contract/test/contracts/solang/index.ts b/packages/api-contract-support/src/contracts/solang/index.ts similarity index 100% rename from packages/api-contract/test/contracts/solang/index.ts rename to packages/api-contract-support/src/contracts/solang/index.ts diff --git a/packages/api-contract/test/contracts/solang/v0/index.ts b/packages/api-contract-support/src/contracts/solang/v0/index.ts similarity index 100% rename from packages/api-contract/test/contracts/solang/v0/index.ts rename to packages/api-contract-support/src/contracts/solang/v0/index.ts diff --git a/packages/api-contract/test/contracts/solang/v0/ints256.json b/packages/api-contract-support/src/contracts/solang/v0/ints256.json similarity index 100% rename from packages/api-contract/test/contracts/solang/v0/ints256.json rename to packages/api-contract-support/src/contracts/solang/v0/ints256.json diff --git a/packages/api-contract/test/contracts/solang/v0/ints256.sol b/packages/api-contract-support/src/contracts/solang/v0/ints256.sol similarity index 100% rename from packages/api-contract/test/contracts/solang/v0/ints256.sol rename to packages/api-contract-support/src/contracts/solang/v0/ints256.sol diff --git a/packages/api-contract/test/contracts/solang/v0/ints256.wasm b/packages/api-contract-support/src/contracts/solang/v0/ints256.wasm similarity index 100% rename from packages/api-contract/test/contracts/solang/v0/ints256.wasm rename to packages/api-contract-support/src/contracts/solang/v0/ints256.wasm diff --git a/packages/api-contract/test/contracts/user/index.ts b/packages/api-contract-support/src/contracts/user/index.ts similarity index 100% rename from packages/api-contract/test/contracts/user/index.ts rename to packages/api-contract-support/src/contracts/user/index.ts diff --git a/packages/api-contract/test/contracts/user/v0/assetTransfer.json b/packages/api-contract-support/src/contracts/user/v0/assetTransfer.json similarity index 100% rename from packages/api-contract/test/contracts/user/v0/assetTransfer.json rename to packages/api-contract-support/src/contracts/user/v0/assetTransfer.json diff --git a/packages/api-contract/test/contracts/user/v0/assetTransfer.wasm b/packages/api-contract-support/src/contracts/user/v0/assetTransfer.wasm similarity index 100% rename from packages/api-contract/test/contracts/user/v0/assetTransfer.wasm rename to packages/api-contract-support/src/contracts/user/v0/assetTransfer.wasm diff --git a/packages/api-contract/test/contracts/user/v0/enumExample.json b/packages/api-contract-support/src/contracts/user/v0/enumExample.json similarity index 100% rename from packages/api-contract/test/contracts/user/v0/enumExample.json rename to packages/api-contract-support/src/contracts/user/v0/enumExample.json diff --git a/packages/api-contract/test/contracts/user/v0/enumExample.wasm b/packages/api-contract-support/src/contracts/user/v0/enumExample.wasm similarity index 100% rename from packages/api-contract/test/contracts/user/v0/enumExample.wasm rename to packages/api-contract-support/src/contracts/user/v0/enumExample.wasm diff --git a/packages/api-contract/test/contracts/user/v0/index.ts b/packages/api-contract-support/src/contracts/user/v0/index.ts similarity index 100% rename from packages/api-contract/test/contracts/user/v0/index.ts rename to packages/api-contract-support/src/contracts/user/v0/index.ts diff --git a/packages/api-contract/test/contracts/user/v0/recursive.contract.json b/packages/api-contract-support/src/contracts/user/v0/recursive.contract.json similarity index 100% rename from packages/api-contract/test/contracts/user/v0/recursive.contract.json rename to packages/api-contract-support/src/contracts/user/v0/recursive.contract.json diff --git a/packages/api-contract/test/contracts/user/v0/withString.json b/packages/api-contract-support/src/contracts/user/v0/withString.json similarity index 100% rename from packages/api-contract/test/contracts/user/v0/withString.json rename to packages/api-contract-support/src/contracts/user/v0/withString.json diff --git a/packages/api-contract/test/contracts/util.ts b/packages/api-contract-support/src/contracts/util.ts similarity index 100% rename from packages/api-contract/test/contracts/util.ts rename to packages/api-contract-support/src/contracts/util.ts diff --git a/packages/api-contract-support/src/detectPackage.ts b/packages/api-contract-support/src/detectPackage.ts new file mode 100644 index 0000000000..b50450e423 --- /dev/null +++ b/packages/api-contract-support/src/detectPackage.ts @@ -0,0 +1,8 @@ +// Copyright 2017-2021 @polkadot/types-support authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import { detectPackage } from '@polkadot/util'; + +import { packageInfo } from './packageInfo'; + +detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, []); diff --git a/packages/api-contract-support/src/index.ts b/packages/api-contract-support/src/index.ts new file mode 100644 index 0000000000..46aa6edd33 --- /dev/null +++ b/packages/api-contract-support/src/index.ts @@ -0,0 +1,6 @@ +// Copyright 2017-2021 @polkadot/types-support authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import './detectPackage'; + +export { packageInfo } from './packageInfo'; diff --git a/packages/api-contract-support/src/packageInfo.ts b/packages/api-contract-support/src/packageInfo.ts new file mode 100644 index 0000000000..f268fd5b9f --- /dev/null +++ b/packages/api-contract-support/src/packageInfo.ts @@ -0,0 +1,6 @@ +// Copyright 2017-2021 @polkadot/api-contract-support authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +// Auto-generated by @polkadot/dev, do not edit + +export const packageInfo = { name: '@polkadot/api-contract-support', version: '6.12.1' }; diff --git a/packages/api-contract-support/tsconfig.json b/packages/api-contract-support/tsconfig.json new file mode 100644 index 0000000000..b6d2709520 --- /dev/null +++ b/packages/api-contract-support/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "baseUrl": "..", + "outDir": "./build", + "rootDir": "./src", + "resolveJsonModule": true + }, + "include": ["src/**/*.json", "src/**/*.ts"], + "references": [] +} diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json index fbfb4677dc..b7f323b5ce 100644 --- a/packages/api-contract/package.json +++ b/packages/api-contract/package.json @@ -23,10 +23,13 @@ "version": "6.12.1", "main": "index.js", "dependencies": { - "@babel/runtime": "^7.16.3", + "@babel/runtime": "^7.16.5", "@polkadot/api": "6.12.1", "@polkadot/types": "6.12.1", "@polkadot/util": "^8.1.2", "rxjs": "^7.4.0" + }, + "devDependencies": { + "@polkadot/api-contract-support": "6.12.1" } } diff --git a/packages/api-contract/src/Abi/Abi.spec.ts b/packages/api-contract/src/Abi/Abi.spec.ts index 2bc004f984..95ccaed497 100644 --- a/packages/api-contract/src/Abi/Abi.spec.ts +++ b/packages/api-contract/src/Abi/Abi.spec.ts @@ -6,10 +6,10 @@ import type { Registry } from '@polkadot/types/types'; import fs from 'fs'; import path from 'path'; +import abis from '@polkadot/api-contract-support/contracts'; import { TypeDefInfo } from '@polkadot/types/types'; import { blake2AsHex } from '@polkadot/util-crypto'; -import abis from '../../test/contracts'; import { Abi } from '.'; interface SpecDef { @@ -80,7 +80,7 @@ describe('Abi', (): void => { it(`initializes from a contract ABI (${abiName})`, (): void => { const abi = new Abi(abis[abiName]); const json = stringifyJson(abi.registry); - const cmpPath = path.join(__dirname, `../../test/compare/${abiName}.test.json`); + const cmpPath = path.join(__dirname, `../../../api-contract-support/src/compare/${abiName}.test.json`); try { // eslint-disable-next-line @typescript-eslint/no-var-requires diff --git a/packages/api-contract/src/Abi/toLatest.spec.ts b/packages/api-contract/src/Abi/toLatest.spec.ts index 1e5a95e358..e0145211ec 100644 --- a/packages/api-contract/src/Abi/toLatest.spec.ts +++ b/packages/api-contract/src/Abi/toLatest.spec.ts @@ -1,9 +1,9 @@ // Copyright 2017-2021 @polkadot/api-contract authors & contributors // SPDX-License-Identifier: Apache-2.0 +import abis from '@polkadot/api-contract-support/contracts'; import { TypeRegistry } from '@polkadot/types'; -import abis from '../../test/contracts'; import { v0ToLatest, v1ToLatest } from './toLatest'; describe('v0ToLatest', (): void => { diff --git a/packages/api-contract/src/base/Code.spec.ts b/packages/api-contract/src/base/Code.spec.ts index 04c3c54c14..a2c70fc29e 100644 --- a/packages/api-contract/src/base/Code.spec.ts +++ b/packages/api-contract/src/base/Code.spec.ts @@ -5,14 +5,14 @@ import fs from 'fs'; import path from 'path'; import { toPromiseMethod } from '@polkadot/api'; +import v0contractFlipper from '@polkadot/api-contract-support/contracts/ink/v0/flipper.contract.json'; +import v0abiFlipper from '@polkadot/api-contract-support/contracts/ink/v0/flipper.json'; +import v1contractFlipper from '@polkadot/api-contract-support/contracts/ink/v1/flipper.contract.json'; -import v0contractFlipper from '../../test/contracts/ink/v0/flipper.contract.json'; -import v0abiFlipper from '../../test/contracts/ink/v0/flipper.json'; -import v1contractFlipper from '../../test/contracts/ink/v1/flipper.contract.json'; import { Code } from './Code'; import { mockApi } from './mock'; -const v0wasmFlipper = fs.readFileSync(path.join(__dirname, '../../test/contracts/ink/v0/flipper.wasm')); +const v0wasmFlipper = fs.readFileSync(path.join(__dirname, '../../../api-contract-support/src/contracts/ink/v0/flipper.wasm')); describe('Code', (): void => { it('can construct with an individual ABI/WASM combo', (): void => { diff --git a/packages/api-contract/src/checkTypes.manual.ts b/packages/api-contract/src/checkTypes.manual.ts index f289e75cdd..9914326ab8 100644 --- a/packages/api-contract/src/checkTypes.manual.ts +++ b/packages/api-contract/src/checkTypes.manual.ts @@ -4,9 +4,9 @@ // Simple non-runnable checks to test type definitions in the editor itself import { ApiPromise } from '@polkadot/api'; +import abiIncrementer from '@polkadot/api-contract-support/contracts/ink/v0/incrementer.json'; import { createTestPairs, TestKeyringMap } from '@polkadot/keyring/testingPairs'; -import abiIncrementer from '../test/contracts/ink/incrementer.json'; import { BlueprintPromise, ContractPromise } from '.'; async function checkBlueprint (api: ApiPromise, pairs: TestKeyringMap): Promise { diff --git a/packages/api-contract/test/README.md b/packages/api-contract/test/README.md deleted file mode 100644 index ae09e41a6f..0000000000 --- a/packages/api-contract/test/README.md +++ /dev/null @@ -1,9 +0,0 @@ -A breaking change was introduced by substrate runtime spec_version 97. https://github.com/paritytech/substrate/pull/2911/files - -The change had to be implemented in ink! which changed the structure of the Wasm files. - -The Polkadot JS API is only supporting srml-contract and ink! versions after than spec_version 97. - -**Compatibility** -If the substrate version is older than this https://github.com/paritytech/substrate/pull/2911 it will only work -with contracts generated by an ink! version prior to https://github.com/paritytech/ink/pull/129 and vice versa. diff --git a/packages/api-contract/tsconfig.json b/packages/api-contract/tsconfig.json new file mode 100644 index 0000000000..773942d4c4 --- /dev/null +++ b/packages/api-contract/tsconfig.json @@ -0,0 +1,14 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "baseUrl": "..", + "outDir": "./build", + "rootDir": "./src", + "resolveJsonModule": true + }, + "references": [ + { "path": "../api" }, + { "path": "../api-contract-support" }, + { "path": "../types" } + ] +} diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json index 770c09ecc8..9bbabe2a9f 100644 --- a/packages/api-derive/package.json +++ b/packages/api-derive/package.json @@ -23,16 +23,7 @@ "version": "6.12.1", "main": "index.js", "dependencies": { - "@babel/runtime": "^7.16.3", - "@polkadot/api": "6.12.1", - "@polkadot/rpc-core": "6.12.1", - "@polkadot/types": "6.12.1", - "@polkadot/util": "^8.1.2", - "@polkadot/util-crypto": "^8.1.2", - "rxjs": "^7.4.0" - }, - "devDependencies": { - "@polkadot/keyring": "^8.1.2", - "@polkadot/rpc-provider": "6.12.1" + "@babel/runtime": "^7.16.5", + "@polkadot/api": "6.12.1" } } diff --git a/packages/api-derive/src/bundle.ts b/packages/api-derive/src/bundle.ts index 39032a1b32..fed8dcd11e 100644 --- a/packages/api-derive/src/bundle.ts +++ b/packages/api-derive/src/bundle.ts @@ -1,164 +1,6 @@ // Copyright 2017-2021 @polkadot/api-derive authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; -import type { AnyFunction } from '@polkadot/types/types'; - -import { lazyDeriveSection } from './util/lazy'; -import * as accounts from './accounts'; -import * as balances from './balances'; -import * as bounties from './bounties'; -import * as chain from './chain'; -import * as contracts from './contracts'; -import * as council from './council'; -import * as crowdloan from './crowdloan'; -import * as democracy from './democracy'; -import * as elections from './elections'; -import * as imOnline from './imOnline'; -import * as membership from './membership'; -import * as parachains from './parachains'; -import * as session from './session'; -import * as society from './society'; -import * as staking from './staking'; -import * as technicalCommittee from './technicalCommittee'; -import * as treasury from './treasury'; -import * as tx from './tx'; +export * from '@polkadot/api/derive'; export { packageInfo } from './packageInfo'; -export * from './type'; - -interface Avail { - instances: string[]; - methods: string[]; - withDetect?: boolean; -} - -export { lazyDeriveSection }; - -export const derive = { accounts, balances, bounties, chain, contracts, council, crowdloan, democracy, elections, imOnline, membership, parachains, session, society, staking, technicalCommittee, treasury, tx }; - -type DeriveSection
= { - [M in keyof Section]: Section[M] extends AnyFunction - ? ReturnType // ReturnType will be the inner function, i.e. without (api) argument - : never; -}; -type DeriveAllSections = { - [S in keyof AllSections]: DeriveSection -}; - -type DeriveCreator = (instanceId: string, api: ApiInterfaceRx) => (...args: unknown[]) => Observable; - -export type DeriveCustom = Record>; - -export type ExactDerive = DeriveAllSections; - -// Enable derive only if some of these modules are available -const checks: Record = { - contracts: { - instances: ['contracts'], - methods: [] - }, - council: { - instances: ['council'], - methods: [], - withDetect: true - }, - crowdloan: { - instances: ['crowdloan'], - methods: [] - }, - democracy: { - instances: ['democracy'], - methods: [] - }, - elections: { - instances: ['phragmenElection', 'electionsPhragmen', 'elections', 'council'], - methods: [], - withDetect: true - }, - imOnline: { - instances: ['imOnline'], - methods: [] - }, - membership: { - instances: ['membership'], - methods: [] - }, - parachains: { - instances: ['parachains', 'registrar'], - methods: [] - }, - session: { - instances: ['session'], - methods: [] - }, - society: { - instances: ['society'], - methods: [] - }, - staking: { - instances: ['staking'], - methods: ['erasRewardPoints'] - }, - technicalCommittee: { - instances: ['technicalCommittee'], - methods: [], - withDetect: true - }, - treasury: { - instances: ['treasury'], - methods: [] - } -}; - -function getModuleInstances (api: ApiInterfaceRx, specName: string, moduleName: string): string[] { - return api.registry.getModuleInstances(specName, moduleName) || []; -} - -/** - * Returns an object that will inject `api` into all the functions inside - * `allSections`, and keep the object architecture of `allSections`. - */ -/** @internal */ -function injectFunctions (instanceId: string, api: ApiInterfaceRx, derives: DeriveCustom): ExactDerive { - const result: Record> = {}; - const names = Object.keys(derives); - const keys = Object.keys(api.query); - const specName = api.runtimeVersion.specName.toString(); - - const filterKeys = (q: string) => keys.includes(q); - const filterInstances = (q: string) => getModuleInstances(api, specName, q).some(filterKeys); - const filterMethods = (all: string[]) => (m: string) => all.some((q) => keys.includes(q) && api.query[q][m]); - const getKeys = (s: string) => Object.keys(derives[s]); - const creator = (s: string, m: string) => derives[s][m](instanceId, api); - const isIncluded = (c: string) => (!checks[c] || ( - (checks[c].instances.some(filterKeys) && ( - !checks[c].methods.length || - checks[c].methods.every(filterMethods(checks[c].instances)) - )) || - ( - checks[c].withDetect && - checks[c].instances.some(filterInstances) - ) - )); - - for (let i = 0; i < names.length; i++) { - const name = names[i]; - - isIncluded(name) && - lazyDeriveSection(result, name, getKeys, creator); - } - - return result as ExactDerive; -} - -// FIXME The return type of this function should be {...ExactDerive, ...DeriveCustom} -// For now we just drop the custom derive typings -/** @internal */ -export function getAvailableDerives (instanceId: string, api: ApiInterfaceRx, custom: DeriveCustom = {}): ExactDerive { - return { - ...injectFunctions(instanceId, api, derive as DeriveCustom), - ...injectFunctions(instanceId, api, custom) - }; -} diff --git a/packages/api-derive/src/detectPackage.ts b/packages/api-derive/src/detectPackage.ts index 408d5f45f9..d52fdd0b61 100644 --- a/packages/api-derive/src/detectPackage.ts +++ b/packages/api-derive/src/detectPackage.ts @@ -2,10 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import { packageInfo as apiInfo } from '@polkadot/api/packageInfo'; -import { packageInfo as coreInfo } from '@polkadot/rpc-core/packageInfo'; -import { packageInfo as typesInfo } from '@polkadot/types/packageInfo'; import { detectPackage } from '@polkadot/util'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [apiInfo, coreInfo, typesInfo]); +detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [apiInfo]); diff --git a/packages/api-derive/src/types.ts b/packages/api-derive/src/types.ts index ce3b648a55..89cabdfa62 100644 --- a/packages/api-derive/src/types.ts +++ b/packages/api-derive/src/types.ts @@ -1,90 +1,4 @@ // Copyright 2017-2021 @polkadot/api-derive authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { u32 } from '@polkadot/types'; -import type { Balance, BlockNumber, BountyIndex, Hash, Proposal, ProposalIndex, SetIndex, Votes } from '@polkadot/types/interfaces'; -import type { PalletBountiesBounty, PalletTreasuryProposal } from '@polkadot/types/lookup'; -import type { BN } from '@polkadot/util'; - -export * from './accounts/types'; -export * from './balances/types'; -export * from './council/types'; -export * from './crowdloan/types'; -export * from './democracy/types'; -export * from './elections/types'; -export * from './parachains/types'; -export * from './session/types'; -export * from './society/types'; -export * from './staking/types'; -export * from './type/types'; - -export interface DeriveContractFees { - callBaseFee: BN; - contractFee: BN; - creationFee: BN; - rentByteFee: BN; - rentDepositOffset: BN; - surchargeReward: BN; - tombstoneDeposit: BN; - transactionBaseFee: BN; - transactionByteFee: BN; - transferFee: BN; -} - -export interface DeriveCollectiveProposal { - hash: Hash; - proposal: Proposal; - votes: Votes | null; -} - -export interface DeriveFees { - creationFee: Balance; - existentialDeposit: Balance; - transactionBaseFee: Balance; - transactionByteFee: Balance; - transferFee: Balance; -} - -export interface DeriveHeartbeatAuthor { - blockCount: u32; - hasMessage: boolean; - isOnline: boolean; -} - -export type DeriveHeartbeats = Record; - -export interface RecentlyOffline { - blockNumber: BlockNumber; - count: BN; -} - -export type DeriveRecentlyOffline = Record; - -export interface DeriveTreasuryProposal { - council: DeriveCollectiveProposal[]; - id: ProposalIndex; - proposal: PalletTreasuryProposal; -} - -export interface DeriveTreasuryProposals { - approvals: DeriveTreasuryProposal[]; - proposalCount: ProposalIndex; - proposals: DeriveTreasuryProposal[]; -} - -export interface VoterPosition { - globalIndex: BN; - index: BN; - setIndex: SetIndex; -} - -export type DeriveVoterPositions = Record; - -export interface DeriveBounty { - bounty: PalletBountiesBounty; - description: string; - index: BountyIndex; - proposals: DeriveCollectiveProposal[]; -} - -export type DeriveBounties = DeriveBounty[]; +export * from '@polkadot/api/derive/types'; diff --git a/packages/api-derive/tsconfig.json b/packages/api-derive/tsconfig.json new file mode 100644 index 0000000000..d54281408d --- /dev/null +++ b/packages/api-derive/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "baseUrl": "..", + "outDir": "./build", + "rootDir": "./src" + }, + "references": [ + { "path": "../api" } + ] +} diff --git a/packages/api/package.json b/packages/api/package.json index a63bd66e8d..e0d1c112fe 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -23,13 +23,12 @@ "version": "6.12.1", "main": "index.js", "dependencies": { - "@babel/runtime": "^7.16.3", + "@babel/runtime": "^7.16.5", "@polkadot/api-derive": "6.12.1", "@polkadot/keyring": "^8.1.2", "@polkadot/rpc-core": "6.12.1", "@polkadot/rpc-provider": "6.12.1", "@polkadot/types": "6.12.1", - "@polkadot/types-known": "6.12.1", "@polkadot/util": "^8.1.2", "@polkadot/util-crypto": "^8.1.2", "eventemitter3": "^4.0.7", diff --git a/packages/api/src/augment/rpc.ts b/packages/api/src/augment/rpc.ts index 773cd29b76..8638bebb8c 100644 --- a/packages/api/src/augment/rpc.ts +++ b/packages/api/src/augment/rpc.ts @@ -2,7 +2,7 @@ /* eslint-disable */ declare module '@polkadot/rpc-core/types.jsonrpc' { - import type { AugmentedRpc } from '@polkadot/api/types'; + import type { AugmentedRpc } from '@polkadot/rpc-core/types'; import type { Bytes, HashMap, Json, Metadata, Null, Option, StorageKey, Text, U256, U64, Vec, bool, u32, u64 } from '@polkadot/types'; import type { ExtrinsicOrHash, ExtrinsicStatus } from '@polkadot/types/interfaces/author'; import type { EpochAuthorship } from '@polkadot/types/interfaces/babe'; diff --git a/packages/api/src/base/Decorate.ts b/packages/api/src/base/Decorate.ts index 41db52bcd0..f453a8f044 100644 --- a/packages/api/src/base/Decorate.ts +++ b/packages/api/src/base/Decorate.ts @@ -2,25 +2,25 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { DeriveCustom } from '@polkadot/api-derive'; import type { RpcInterface } from '@polkadot/rpc-core/types'; import type { Option, Raw, StorageKey, Text, u64 } from '@polkadot/types'; import type { Call, Hash, RuntimeVersion } from '@polkadot/types/interfaces'; import type { DecoratedMeta } from '@polkadot/types/metadata/decorate/types'; import type { StorageEntry } from '@polkadot/types/primitive/types'; import type { AnyFunction, AnyTuple, CallFunction, Codec, DefinitionRpc, DefinitionRpcSub, DetectCodec, IMethod, IStorageKey, Registry, RegistryError, RegistryTypes } from '@polkadot/types/types'; +import type { DeriveCustom } from '../derive'; import type { SubmittableExtrinsic } from '../submittable/types'; import type { ApiDecoration, ApiInterfaceRx, ApiOptions, ApiTypes, AugmentedQuery, DecoratedErrors, DecoratedEvents, DecoratedRpc, DecorateMethod, GenericStorageEntryFunction, PaginationOptions, QueryableConsts, QueryableStorage, QueryableStorageEntry, QueryableStorageEntryAt, QueryableStorageMulti, QueryableStorageMultiArg, SubmittableExtrinsicFunction, SubmittableExtrinsics } from '../types'; import type { VersionedRegistry } from './types'; import { BehaviorSubject, combineLatest, from, map, of, switchMap, tap, toArray } from 'rxjs'; -import { ExactDerive, getAvailableDerives } from '@polkadot/api-derive'; import { memo, RpcCore } from '@polkadot/rpc-core'; import { WsProvider } from '@polkadot/rpc-provider'; import { expandMetadata, Metadata, TypeRegistry, unwrapStorageType } from '@polkadot/types'; import { arrayChunk, arrayFlatten, assert, BN, BN_ZERO, compactStripLength, lazyMethod, lazyMethods, logger, objectSpread, u8aToHex } from '@polkadot/util'; +import { ExactDerive, getAvailableDerives } from '../derive'; import { createSubmittable } from '../submittable'; import { augmentObject } from '../util/augmentObject'; import { decorateDeriveSections, DeriveAllSections } from '../util/decorate'; diff --git a/packages/api/src/base/Init.ts b/packages/api/src/base/Init.ts index 98b05b0874..3118c611e8 100644 --- a/packages/api/src/base/Init.ts +++ b/packages/api/src/base/Init.ts @@ -14,7 +14,7 @@ import type { VersionedRegistry } from './types'; import { firstValueFrom, map, of, switchMap } from 'rxjs'; import { Metadata, TypeRegistry } from '@polkadot/types'; -import { getSpecAlias, getSpecExtensions, getSpecHasher, getSpecRpc, getSpecTypes, getUpgradeVersion } from '@polkadot/types-known'; +import { getSpecAlias, getSpecExtensions, getSpecHasher, getSpecRpc, getSpecTypes, getUpgradeVersion } from '@polkadot/types/known'; import { assert, BN_ZERO, isUndefined, logger, objectSpread, u8aEq, u8aToHex, u8aToU8a } from '@polkadot/util'; import { cryptoWaitReady } from '@polkadot/util-crypto'; diff --git a/packages/api/src/checkTypes.manual.ts b/packages/api/src/checkTypes.manual.ts index 3b85925a17..0fcae3e267 100644 --- a/packages/api/src/checkTypes.manual.ts +++ b/packages/api/src/checkTypes.manual.ts @@ -3,10 +3,10 @@ // Simple non-runnable checks to test type definitions in the editor itself -import type { HeaderExtended } from '@polkadot/api-derive/types'; import type { StorageKey } from '@polkadot/types'; import type { AccountId, Balance, DispatchErrorModule, Event, Header, Index } from '@polkadot/types/interfaces'; import type { AnyTuple, IExtrinsic, IMethod } from '@polkadot/types/types'; +import type { HeaderExtended } from './derive/types'; import { ApiPromise } from '@polkadot/api'; import { createTestPairs, TestKeyringMap } from '@polkadot/keyring/testingPairs'; diff --git a/packages/api-derive/src/accounts/accountId.ts b/packages/api/src/derive/accounts/accountId.ts similarity index 95% rename from packages/api-derive/src/accounts/accountId.ts rename to packages/api/src/derive/accounts/accountId.ts index 1035d6785e..c9952e83b9 100644 --- a/packages/api-derive/src/accounts/accountId.ts +++ b/packages/api/src/derive/accounts/accountId.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import { map, of } from 'rxjs'; diff --git a/packages/api-derive/src/accounts/flags.ts b/packages/api/src/derive/accounts/flags.ts similarity index 97% rename from packages/api-derive/src/accounts/flags.ts rename to packages/api/src/derive/accounts/flags.ts index ad5c149802..4cc8d47a27 100644 --- a/packages/api-derive/src/accounts/flags.ts +++ b/packages/api/src/derive/accounts/flags.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Vec } from '@polkadot/types'; import type { AccountId, Address, Balance } from '@polkadot/types/interfaces'; import type { ITuple } from '@polkadot/types/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveAccountFlags } from '../types'; import { combineLatest, map, of } from 'rxjs'; diff --git a/packages/api-derive/src/accounts/idAndIndex.ts b/packages/api/src/derive/accounts/idAndIndex.ts similarity index 97% rename from packages/api-derive/src/accounts/idAndIndex.ts rename to packages/api/src/derive/accounts/idAndIndex.ts index 3d23f50f31..f29aaeb358 100644 --- a/packages/api-derive/src/accounts/idAndIndex.ts +++ b/packages/api/src/derive/accounts/idAndIndex.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { AccountIdAndIndex } from '../types'; import { map, of } from 'rxjs'; diff --git a/packages/api-derive/src/accounts/idToIndex.ts b/packages/api/src/derive/accounts/idToIndex.ts similarity index 95% rename from packages/api-derive/src/accounts/idToIndex.ts rename to packages/api/src/derive/accounts/idToIndex.ts index 16a3814a81..57cb636e57 100644 --- a/packages/api-derive/src/accounts/idToIndex.ts +++ b/packages/api/src/derive/accounts/idToIndex.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { AccountId, AccountIndex } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { AccountIndexes } from '../types'; import { map } from 'rxjs'; diff --git a/packages/api-derive/src/accounts/identity.ts b/packages/api/src/derive/accounts/identity.ts similarity index 98% rename from packages/api-derive/src/accounts/identity.ts rename to packages/api/src/derive/accounts/identity.ts index caacc62d81..1a3ee0c331 100644 --- a/packages/api-derive/src/accounts/identity.ts +++ b/packages/api/src/derive/accounts/identity.ts @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Data, Option } from '@polkadot/types'; import type { AccountId } from '@polkadot/types/interfaces'; import type { PalletIdentityIdentityInfo, PalletIdentityRegistration } from '@polkadot/types/lookup'; import type { ITuple } from '@polkadot/types/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveAccountRegistration, DeriveHasIdentity } from '../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/accounts/index.ts b/packages/api/src/derive/accounts/index.ts similarity index 100% rename from packages/api-derive/src/accounts/index.ts rename to packages/api/src/derive/accounts/index.ts diff --git a/packages/api-derive/src/accounts/indexToId.ts b/packages/api/src/derive/accounts/indexToId.ts similarity index 95% rename from packages/api-derive/src/accounts/indexToId.ts rename to packages/api/src/derive/accounts/indexToId.ts index 4e7f8c5f59..37950da194 100644 --- a/packages/api-derive/src/accounts/indexToId.ts +++ b/packages/api/src/derive/accounts/indexToId.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option } from '@polkadot/types'; import type { AccountId, AccountIndex, BalanceOf } from '@polkadot/types/interfaces'; import type { ITuple } from '@polkadot/types/types'; +import type { ApiInterfaceRx } from '../../types'; import { map, of } from 'rxjs'; diff --git a/packages/api-derive/src/accounts/indexes.ts b/packages/api/src/derive/accounts/indexes.ts similarity index 96% rename from packages/api-derive/src/accounts/indexes.ts rename to packages/api/src/derive/accounts/indexes.ts index 90b6159d1e..6c61a83676 100644 --- a/packages/api-derive/src/accounts/indexes.ts +++ b/packages/api/src/derive/accounts/indexes.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; +import type { ApiInterfaceRx } from '../../types'; import type { AccountIndexes } from '../types'; import { map, of, startWith } from 'rxjs'; diff --git a/packages/api-derive/src/accounts/info.ts b/packages/api/src/derive/accounts/info.ts similarity index 97% rename from packages/api-derive/src/accounts/info.ts rename to packages/api/src/derive/accounts/info.ts index b348f1e1bd..b558cbbf29 100644 --- a/packages/api-derive/src/accounts/info.ts +++ b/packages/api/src/derive/accounts/info.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Bytes, Option, u32 } from '@polkadot/types'; import type { AccountId, AccountIndex, Address, Balance } from '@polkadot/types/interfaces'; import type { ITuple } from '@polkadot/types/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveAccountInfo, DeriveAccountRegistration } from '../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/accounts/types.ts b/packages/api/src/derive/accounts/types.ts similarity index 100% rename from packages/api-derive/src/accounts/types.ts rename to packages/api/src/derive/accounts/types.ts diff --git a/packages/api-derive/src/balances/account.ts b/packages/api/src/derive/balances/account.ts similarity index 98% rename from packages/api-derive/src/balances/account.ts rename to packages/api/src/derive/balances/account.ts index 97ef07ad95..beb740202e 100644 --- a/packages/api-derive/src/balances/account.ts +++ b/packages/api/src/derive/balances/account.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx, QueryableStorageEntry } from '@polkadot/api/types'; import type { AccountData, AccountId, AccountIndex, AccountInfo, Address, Balance, Index } from '@polkadot/types/interfaces'; import type { ITuple } from '@polkadot/types/types'; +import type { ApiInterfaceRx, QueryableStorageEntry } from '../../types'; import type { DeriveBalancesAccount, DeriveBalancesAccountData } from '../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/balances/all.ts b/packages/api/src/derive/balances/all.ts similarity index 99% rename from packages/api-derive/src/balances/all.ts rename to packages/api/src/derive/balances/all.ts index 9fa1dc7695..60a3b06f22 100644 --- a/packages/api-derive/src/balances/all.ts +++ b/packages/api/src/derive/balances/all.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx, QueryableStorageMultiArg } from '@polkadot/api/types'; import type { Option, Vec } from '@polkadot/types'; import type { AccountId, AccountIndex, Address, Balance, BalanceLockTo212, BlockNumber, VestingSchedule } from '@polkadot/types/interfaces'; import type { PalletBalancesBalanceLock, PalletVestingVestingInfo } from '@polkadot/types/lookup'; +import type { ApiInterfaceRx, QueryableStorageMultiArg } from '../../types'; import type { DeriveBalancesAccount, DeriveBalancesAccountData, DeriveBalancesAll, DeriveBalancesAllAccountData, DeriveBalancesAllVesting } from '../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/balances/fees.ts b/packages/api/src/derive/balances/fees.ts similarity index 96% rename from packages/api-derive/src/balances/fees.ts rename to packages/api/src/derive/balances/fees.ts index d6cc421dcd..875133a5cc 100644 --- a/packages/api-derive/src/balances/fees.ts +++ b/packages/api/src/derive/balances/fees.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Balance } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveFees } from '../types'; import { map, of } from 'rxjs'; diff --git a/packages/api-derive/src/balances/index.ts b/packages/api/src/derive/balances/index.ts similarity index 100% rename from packages/api-derive/src/balances/index.ts rename to packages/api/src/derive/balances/index.ts diff --git a/packages/api-derive/src/balances/types.ts b/packages/api/src/derive/balances/types.ts similarity index 100% rename from packages/api-derive/src/balances/types.ts rename to packages/api/src/derive/balances/types.ts diff --git a/packages/api-derive/src/balances/votingBalances.ts b/packages/api/src/derive/balances/votingBalances.ts similarity index 93% rename from packages/api-derive/src/balances/votingBalances.ts rename to packages/api/src/derive/balances/votingBalances.ts index 463bd876c6..7d82a02bae 100644 --- a/packages/api-derive/src/balances/votingBalances.ts +++ b/packages/api/src/derive/balances/votingBalances.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveBalancesAccount } from '../types'; import { combineLatest, of } from 'rxjs'; diff --git a/packages/api-derive/src/bounties/bounties.spec.ts b/packages/api/src/derive/bounties/bounties.spec.ts similarity index 90% rename from packages/api-derive/src/bounties/bounties.spec.ts rename to packages/api/src/derive/bounties/bounties.spec.ts index 3f5d6940bf..486f5a2c12 100644 --- a/packages/api-derive/src/bounties/bounties.spec.ts +++ b/packages/api/src/derive/bounties/bounties.spec.ts @@ -1,21 +1,19 @@ // Copyright 2017-2021 @polkadot/api-derive authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { ApiInterfaceRx, SubmittableExtrinsic } from '@polkadot/api/types'; import type { Bytes, Option, StorageKey } from '@polkadot/types'; -import type { Bounty, BountyIndex, ProposalIndex } from '@polkadot/types/interfaces'; +import type { Bounty, BountyIndex, Proposal, ProposalIndex } from '@polkadot/types/interfaces'; import type { Codec, InterfaceTypes } from '@polkadot/types/types'; +import type { ApiInterfaceRx, SubmittableExtrinsic } from '../../types'; +import type { DeriveCollectiveProposal } from '../types'; import { firstValueFrom, of } from 'rxjs'; -import { ApiPromise } from '@polkadot/api'; -import { DeriveCollectiveProposal } from '@polkadot/api-derive/types'; -import { Proposal } from '@polkadot/types/interfaces'; - -import { BountyFactory } from '../../test/bountyFactory'; -import { BytesFactory } from '../../test/bytesFactory'; -import { createApiWithAugmentations } from '../../test/helpers'; -import { ProposalFactory } from '../../test/proposalFactory'; +import { ApiPromise } from '../../promise'; +import { BountyFactory } from '../test/bountyFactory'; +import { BytesFactory } from '../test/bytesFactory'; +import { createApiWithAugmentations } from '../test/helpers'; +import { ProposalFactory } from '../test/proposalFactory'; import { bounties } from '.'; const DEFAULT_PROPOSER = '5C4hrfjw9DjXZTzV3MwzrrAr9P1MJhSrvWGWqi1eSuyUpnhM'; diff --git a/packages/api-derive/src/bounties/bounties.ts b/packages/api/src/derive/bounties/bounties.ts similarity index 97% rename from packages/api-derive/src/bounties/bounties.ts rename to packages/api/src/derive/bounties/bounties.ts index d513fd82c0..64833bd435 100644 --- a/packages/api-derive/src/bounties/bounties.ts +++ b/packages/api/src/derive/bounties/bounties.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Bytes, Option } from '@polkadot/types'; import type { BountyIndex, ProposalIndex } from '@polkadot/types/interfaces'; import type { PalletBountiesBounty } from '@polkadot/types/lookup'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveBounties, DeriveCollectiveProposal } from '../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/bounties/helpers/filterBountyProposals.ts b/packages/api/src/derive/bounties/helpers/filterBountyProposals.ts similarity index 82% rename from packages/api-derive/src/bounties/helpers/filterBountyProposals.ts rename to packages/api/src/derive/bounties/helpers/filterBountyProposals.ts index 375b53a4cf..c762cef7d2 100644 --- a/packages/api-derive/src/bounties/helpers/filterBountyProposals.ts +++ b/packages/api/src/derive/bounties/helpers/filterBountyProposals.ts @@ -1,8 +1,8 @@ // Copyright 2017-2021 @polkadot/api-derive authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { ApiInterfaceRx } from '@polkadot/api/types'; -import { DeriveCollectiveProposal } from '@polkadot/api-derive/types'; +import type { ApiInterfaceRx } from '../../../types'; +import type { DeriveCollectiveProposal } from '../../types'; export function filterBountiesProposals (api: ApiInterfaceRx, allProposals: DeriveCollectiveProposal[]): DeriveCollectiveProposal[] { const bountyTxBase = api.tx.bounties ? api.tx.bounties : api.tx.treasury; diff --git a/packages/api-derive/src/bounties/index.ts b/packages/api/src/derive/bounties/index.ts similarity index 100% rename from packages/api-derive/src/bounties/index.ts rename to packages/api/src/derive/bounties/index.ts diff --git a/packages/api-derive/src/chain/bestNumber.ts b/packages/api/src/derive/chain/bestNumber.ts similarity index 89% rename from packages/api-derive/src/chain/bestNumber.ts rename to packages/api/src/derive/chain/bestNumber.ts index 8c0d07a3d3..a95d7fc806 100644 --- a/packages/api-derive/src/chain/bestNumber.ts +++ b/packages/api/src/derive/chain/bestNumber.ts @@ -1,7 +1,7 @@ // Copyright 2017-2021 @polkadot/api-derive authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { ApiInterfaceRx } from '@polkadot/api/types'; +import type { ApiInterfaceRx } from '../../types'; import { unwrapBlockNumber } from './util'; diff --git a/packages/api-derive/src/chain/bestNumberFinalized.ts b/packages/api/src/derive/chain/bestNumberFinalized.ts similarity index 90% rename from packages/api-derive/src/chain/bestNumberFinalized.ts rename to packages/api/src/derive/chain/bestNumberFinalized.ts index a382115175..43cf9c8fd0 100644 --- a/packages/api-derive/src/chain/bestNumberFinalized.ts +++ b/packages/api/src/derive/chain/bestNumberFinalized.ts @@ -1,7 +1,7 @@ // Copyright 2017-2021 @polkadot/api-derive authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { ApiInterfaceRx } from '@polkadot/api/types'; +import type { ApiInterfaceRx } from '../../types'; import { unwrapBlockNumber } from './util'; diff --git a/packages/api-derive/src/chain/bestNumberLag.ts b/packages/api/src/derive/chain/bestNumberLag.ts similarity index 94% rename from packages/api-derive/src/chain/bestNumberLag.ts rename to packages/api/src/derive/chain/bestNumberLag.ts index b57aef5ac4..8ed53598cf 100644 --- a/packages/api-derive/src/chain/bestNumberLag.ts +++ b/packages/api/src/derive/chain/bestNumberLag.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { BlockNumber } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import { combineLatest, map } from 'rxjs'; diff --git a/packages/api-derive/src/chain/getBlock.ts b/packages/api/src/derive/chain/getBlock.ts similarity index 96% rename from packages/api-derive/src/chain/getBlock.ts rename to packages/api/src/derive/chain/getBlock.ts index 436e6fa4cf..4b10dac04f 100644 --- a/packages/api-derive/src/chain/getBlock.ts +++ b/packages/api/src/derive/chain/getBlock.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; +import type { ApiInterfaceRx } from '../../types'; import type { SignedBlockExtended } from '../type/types'; import { catchError, combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/chain/getHeader.ts b/packages/api/src/derive/chain/getHeader.ts similarity index 96% rename from packages/api-derive/src/chain/getHeader.ts rename to packages/api/src/derive/chain/getHeader.ts index f890da2c91..e1664eb4e1 100644 --- a/packages/api-derive/src/chain/getHeader.ts +++ b/packages/api/src/derive/chain/getHeader.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { AccountId } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { HeaderExtended } from '../type/types'; import { catchError, combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/chain/index.ts b/packages/api/src/derive/chain/index.ts similarity index 100% rename from packages/api-derive/src/chain/index.ts rename to packages/api/src/derive/chain/index.ts diff --git a/packages/api-derive/src/chain/subscribeNewBlocks.ts b/packages/api/src/derive/chain/subscribeNewBlocks.ts similarity index 95% rename from packages/api-derive/src/chain/subscribeNewBlocks.ts rename to packages/api/src/derive/chain/subscribeNewBlocks.ts index 914c103638..5fa38cbc2f 100644 --- a/packages/api-derive/src/chain/subscribeNewBlocks.ts +++ b/packages/api/src/derive/chain/subscribeNewBlocks.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; +import type { ApiInterfaceRx } from '../../types'; import type { SignedBlockExtended } from '../type/types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/chain/subscribeNewHeads.ts b/packages/api/src/derive/chain/subscribeNewHeads.ts similarity index 95% rename from packages/api-derive/src/chain/subscribeNewHeads.ts rename to packages/api/src/derive/chain/subscribeNewHeads.ts index 4b1778c6f6..6b27257bbb 100644 --- a/packages/api-derive/src/chain/subscribeNewHeads.ts +++ b/packages/api/src/derive/chain/subscribeNewHeads.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; +import type { ApiInterfaceRx } from '../../types'; import type { HeaderExtended } from '../type/types'; import { combineLatest, map, of } from 'rxjs'; diff --git a/packages/api-derive/src/chain/util.ts b/packages/api/src/derive/chain/util.ts similarity index 88% rename from packages/api-derive/src/chain/util.ts rename to packages/api/src/derive/chain/util.ts index af76685653..f40ca20a00 100644 --- a/packages/api-derive/src/chain/util.ts +++ b/packages/api/src/derive/chain/util.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Compact } from '@polkadot/types'; import type { BlockNumber } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import { map } from 'rxjs'; @@ -12,7 +12,6 @@ import { memo } from '../util'; // re-export these - since these needs to be resolvable from api-derive, i.e. without this // we would emit code with ..//src embedded in the *.d.ts files -export type { ApiInterfaceRx } from '@polkadot/api/types'; export type { BlockNumber } from '@polkadot/types/interfaces'; export function unwrapBlockNumber }> (fn: (api: ApiInterfaceRx) => Observable): (instanceId: string, api: ApiInterfaceRx) => () => Observable { diff --git a/packages/api-derive/src/collective/helpers.ts b/packages/api/src/derive/collective/helpers.ts similarity index 87% rename from packages/api-derive/src/collective/helpers.ts rename to packages/api/src/derive/collective/helpers.ts index 0f89f3e585..81169c8d41 100644 --- a/packages/api-derive/src/collective/helpers.ts +++ b/packages/api/src/derive/collective/helpers.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; +import type { ApiInterfaceRx } from '../../types'; import type { Collective } from './types'; import { of } from 'rxjs'; @@ -11,9 +11,6 @@ import { isFunction } from '@polkadot/util'; import { memo } from '../util'; -// We are re-exporting these from here to ensure that *.d.ts generation is correct -export type { ApiInterfaceRx } from '@polkadot/api/types'; - export function getInstance (api: ApiInterfaceRx, section: string): string { const instances = api.registry.getModuleInstances(api.runtimeVersion.specName.toString(), section); diff --git a/packages/api-derive/src/collective/index.ts b/packages/api/src/derive/collective/index.ts similarity index 100% rename from packages/api-derive/src/collective/index.ts rename to packages/api/src/derive/collective/index.ts diff --git a/packages/api-derive/src/collective/members.ts b/packages/api/src/derive/collective/members.ts similarity index 100% rename from packages/api-derive/src/collective/members.ts rename to packages/api/src/derive/collective/members.ts diff --git a/packages/api-derive/src/collective/prime.ts b/packages/api/src/derive/collective/prime.ts similarity index 89% rename from packages/api-derive/src/collective/prime.ts rename to packages/api/src/derive/collective/prime.ts index 4c84214753..a98d124824 100644 --- a/packages/api-derive/src/collective/prime.ts +++ b/packages/api/src/derive/collective/prime.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option } from '@polkadot/types'; import type { AccountId } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { Collective } from './types'; import { map, of } from 'rxjs'; @@ -14,7 +14,6 @@ import { isFunction } from '@polkadot/util'; import { withSection } from './helpers'; // We are re-exporting these from here to ensure that *.d.ts generation is correct -export type { ApiInterfaceRx } from '@polkadot/api/types'; export type { AccountId } from '@polkadot/types/interfaces'; export function prime (_section: Collective): (instanceId: string, api: ApiInterfaceRx) => () => Observable { diff --git a/packages/api-derive/src/collective/proposals.ts b/packages/api/src/derive/collective/proposals.ts similarity index 96% rename from packages/api-derive/src/collective/proposals.ts rename to packages/api/src/derive/collective/proposals.ts index 3ff58305b7..26505cd1da 100644 --- a/packages/api-derive/src/collective/proposals.ts +++ b/packages/api/src/derive/collective/proposals.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option, u32 } from '@polkadot/types'; import type { Hash, Proposal, Votes } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveCollectiveProposal } from '../types'; import type { Collective } from './types'; @@ -16,7 +16,6 @@ import { firstObservable } from '../util'; import { callMethod, withSection } from './helpers'; // We are re-exporting these from here to ensure that *.d.ts generation is correct -export type { ApiInterfaceRx } from '@polkadot/api/types'; export type { Option, u32 } from '@polkadot/types'; export type { Hash, Proposal, Votes } from '@polkadot/types/interfaces'; diff --git a/packages/api-derive/src/collective/types.ts b/packages/api/src/derive/collective/types.ts similarity index 100% rename from packages/api-derive/src/collective/types.ts rename to packages/api/src/derive/collective/types.ts diff --git a/packages/api-derive/src/contracts/fees.ts b/packages/api/src/derive/contracts/fees.ts similarity index 97% rename from packages/api-derive/src/contracts/fees.ts rename to packages/api/src/derive/contracts/fees.ts index f3da3b7e68..cff791bdb5 100644 --- a/packages/api-derive/src/contracts/fees.ts +++ b/packages/api/src/derive/contracts/fees.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { BN } from '@polkadot/util'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveContractFees } from '../types'; import { map, of } from 'rxjs'; diff --git a/packages/api-derive/src/contracts/index.ts b/packages/api/src/derive/contracts/index.ts similarity index 100% rename from packages/api-derive/src/contracts/index.ts rename to packages/api/src/derive/contracts/index.ts diff --git a/packages/api-derive/src/council/index.ts b/packages/api/src/derive/council/index.ts similarity index 100% rename from packages/api-derive/src/council/index.ts rename to packages/api/src/derive/council/index.ts diff --git a/packages/api-derive/src/council/types.ts b/packages/api/src/derive/council/types.ts similarity index 100% rename from packages/api-derive/src/council/types.ts rename to packages/api/src/derive/council/types.ts diff --git a/packages/api-derive/src/council/votes.ts b/packages/api/src/derive/council/votes.ts similarity index 97% rename from packages/api-derive/src/council/votes.ts rename to packages/api/src/derive/council/votes.ts index f3e0190f32..54f7356a75 100644 --- a/packages/api-derive/src/council/votes.ts +++ b/packages/api/src/derive/council/votes.ts @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx, QueryableModuleStorage } from '@polkadot/api/types'; import type { Vec } from '@polkadot/types'; import type { AccountId, Balance } from '@polkadot/types/interfaces'; import type { PalletElectionsPhragmenVoter } from '@polkadot/types/lookup'; import type { ITuple } from '@polkadot/types/types'; +import type { ApiInterfaceRx, QueryableModuleStorage } from '../../types'; import type { DeriveCouncilVote, DeriveCouncilVotes } from '../types'; import { combineLatest, map, of } from 'rxjs'; diff --git a/packages/api-derive/src/council/votesOf.ts b/packages/api/src/derive/council/votesOf.ts similarity index 93% rename from packages/api-derive/src/council/votesOf.ts rename to packages/api/src/derive/council/votesOf.ts index b006211520..63002c05f4 100644 --- a/packages/api-derive/src/council/votesOf.ts +++ b/packages/api/src/derive/council/votesOf.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { AccountId } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveCouncilVote } from '../types'; import { map } from 'rxjs'; diff --git a/packages/api-derive/src/crowdloan/childKey.ts b/packages/api/src/derive/crowdloan/childKey.ts similarity index 95% rename from packages/api-derive/src/crowdloan/childKey.ts rename to packages/api/src/derive/crowdloan/childKey.ts index 0c7247cf53..9eb32135ae 100644 --- a/packages/api-derive/src/crowdloan/childKey.ts +++ b/packages/api/src/derive/crowdloan/childKey.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option } from '@polkadot/types'; import type { PolkadotRuntimeCommonCrowdloanFundInfo } from '@polkadot/types/lookup'; import type { BN } from '@polkadot/util'; +import type { ApiInterfaceRx } from '../../types'; import { map } from 'rxjs'; diff --git a/packages/api-derive/src/crowdloan/contributions.ts b/packages/api/src/derive/crowdloan/contributions.ts similarity index 98% rename from packages/api-derive/src/crowdloan/contributions.ts rename to packages/api/src/derive/crowdloan/contributions.ts index d75c621edd..61b66c4800 100644 --- a/packages/api-derive/src/crowdloan/contributions.ts +++ b/packages/api/src/derive/crowdloan/contributions.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { StorageKey } from '@polkadot/types'; import type { BN } from '@polkadot/util'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveContributions } from '../types'; import { BehaviorSubject, combineLatest, EMPTY, map, of, startWith, switchMap, tap, toArray } from 'rxjs'; diff --git a/packages/api-derive/src/crowdloan/index.ts b/packages/api/src/derive/crowdloan/index.ts similarity index 100% rename from packages/api-derive/src/crowdloan/index.ts rename to packages/api/src/derive/crowdloan/index.ts diff --git a/packages/api-derive/src/crowdloan/onwContributions.ts b/packages/api/src/derive/crowdloan/onwContributions.ts similarity index 97% rename from packages/api-derive/src/crowdloan/onwContributions.ts rename to packages/api/src/derive/crowdloan/onwContributions.ts index 9b4fe55ebf..2131e1d764 100644 --- a/packages/api-derive/src/crowdloan/onwContributions.ts +++ b/packages/api/src/derive/crowdloan/onwContributions.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { BN } from '@polkadot/util'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveOwnContributions } from '../types'; import { combineLatest, EMPTY, map, of, startWith, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/crowdloan/types.ts b/packages/api/src/derive/crowdloan/types.ts similarity index 100% rename from packages/api-derive/src/crowdloan/types.ts rename to packages/api/src/derive/crowdloan/types.ts diff --git a/packages/api-derive/src/crowdloan/util.ts b/packages/api/src/derive/crowdloan/util.ts similarity index 100% rename from packages/api-derive/src/crowdloan/util.ts rename to packages/api/src/derive/crowdloan/util.ts diff --git a/packages/api-derive/src/democracy/dispatchQueue.ts b/packages/api/src/derive/democracy/dispatchQueue.ts similarity index 98% rename from packages/api-derive/src/democracy/dispatchQueue.ts rename to packages/api/src/derive/democracy/dispatchQueue.ts index 6faebd8f10..1a86675dc1 100644 --- a/packages/api-derive/src/democracy/dispatchQueue.ts +++ b/packages/api/src/derive/democracy/dispatchQueue.ts @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option, Vec } from '@polkadot/types'; import type { BlockNumber, Hash, ReferendumIndex } from '@polkadot/types/interfaces'; import type { PalletSchedulerScheduledV2 } from '@polkadot/types/lookup'; import type { ITuple } from '@polkadot/types/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveDispatch, DeriveProposalImage } from '../types'; import { catchError, combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/democracy/index.ts b/packages/api/src/derive/democracy/index.ts similarity index 100% rename from packages/api-derive/src/democracy/index.ts rename to packages/api/src/derive/democracy/index.ts diff --git a/packages/api-derive/src/democracy/locks.ts b/packages/api/src/derive/democracy/locks.ts similarity index 98% rename from packages/api-derive/src/democracy/locks.ts rename to packages/api/src/derive/democracy/locks.ts index 53fd597335..8faaa7a567 100644 --- a/packages/api-derive/src/democracy/locks.ts +++ b/packages/api/src/derive/democracy/locks.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { AccountId, ReferendumInfoTo239, Vote } from '@polkadot/types/interfaces'; import type { PalletDemocracyReferendumInfo, PalletDemocracyVoteVoting } from '@polkadot/types/lookup'; import type { BN } from '@polkadot/util'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveDemocracyLock } from '../types'; import { map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/democracy/nextExternal.ts b/packages/api/src/derive/democracy/nextExternal.ts similarity index 95% rename from packages/api-derive/src/democracy/nextExternal.ts rename to packages/api/src/derive/democracy/nextExternal.ts index 66d8e459ed..a4d6e40c8c 100644 --- a/packages/api-derive/src/democracy/nextExternal.ts +++ b/packages/api/src/derive/democracy/nextExternal.ts @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option } from '@polkadot/types'; import type { H256 } from '@polkadot/types/interfaces'; import type { PalletDemocracyVoteThreshold } from '@polkadot/types/lookup'; import type { ITuple } from '@polkadot/types/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveProposalExternal } from '../types'; import { map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/democracy/preimage.ts b/packages/api/src/derive/democracy/preimage.ts similarity index 92% rename from packages/api-derive/src/democracy/preimage.ts rename to packages/api/src/derive/democracy/preimage.ts index 9b91e72af1..1c73fa3474 100644 --- a/packages/api-derive/src/democracy/preimage.ts +++ b/packages/api/src/derive/democracy/preimage.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Hash } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveProposalImage } from '../types'; import { map } from 'rxjs'; diff --git a/packages/api-derive/src/democracy/preimages.ts b/packages/api/src/derive/democracy/preimages.ts similarity index 93% rename from packages/api-derive/src/democracy/preimages.ts rename to packages/api/src/derive/democracy/preimages.ts index 506bbb96cd..db2c639842 100644 --- a/packages/api-derive/src/democracy/preimages.ts +++ b/packages/api/src/derive/democracy/preimages.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Hash } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveProposalImage } from '../types'; import { map, of } from 'rxjs'; diff --git a/packages/api-derive/src/democracy/proposals.ts b/packages/api/src/derive/democracy/proposals.ts similarity index 97% rename from packages/api-derive/src/democracy/proposals.ts rename to packages/api/src/derive/democracy/proposals.ts index c84f6a4ae3..94082025b5 100644 --- a/packages/api-derive/src/democracy/proposals.ts +++ b/packages/api/src/derive/democracy/proposals.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option, Vec } from '@polkadot/types'; import type { AccountId, Balance, Hash, PropIndex } from '@polkadot/types/interfaces'; import type { ITuple } from '@polkadot/types/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveProposal, DeriveProposalImage } from '../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/democracy/referendumIds.ts b/packages/api/src/derive/democracy/referendumIds.ts similarity index 94% rename from packages/api-derive/src/democracy/referendumIds.ts rename to packages/api/src/derive/democracy/referendumIds.ts index 0a528debe8..f086af5c76 100644 --- a/packages/api-derive/src/democracy/referendumIds.ts +++ b/packages/api/src/derive/democracy/referendumIds.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { ReferendumIndex } from '@polkadot/types/interfaces'; import type { BN } from '@polkadot/util'; +import type { ApiInterfaceRx } from '../../types'; import { map, of } from 'rxjs'; diff --git a/packages/api-derive/src/democracy/referendums.ts b/packages/api/src/derive/democracy/referendums.ts similarity index 94% rename from packages/api-derive/src/democracy/referendums.ts rename to packages/api/src/derive/democracy/referendums.ts index 674373df18..e756a39e04 100644 --- a/packages/api-derive/src/democracy/referendums.ts +++ b/packages/api/src/derive/democracy/referendums.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveReferendumExt } from '../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/democracy/referendumsActive.ts b/packages/api/src/derive/democracy/referendumsActive.ts similarity index 91% rename from packages/api-derive/src/democracy/referendumsActive.ts rename to packages/api/src/derive/democracy/referendumsActive.ts index 1b19f24d63..622224bcb7 100644 --- a/packages/api-derive/src/democracy/referendumsActive.ts +++ b/packages/api/src/derive/democracy/referendumsActive.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveReferendum } from '../types'; import { of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/democracy/referendumsFinished.ts b/packages/api/src/derive/democracy/referendumsFinished.ts similarity index 94% rename from packages/api-derive/src/democracy/referendumsFinished.ts rename to packages/api/src/derive/democracy/referendumsFinished.ts index 813e1d7656..a4bfa474f2 100644 --- a/packages/api-derive/src/democracy/referendumsFinished.ts +++ b/packages/api/src/derive/democracy/referendumsFinished.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { PalletDemocracyReferendumInfo } from '@polkadot/types/lookup'; +import type { ApiInterfaceRx } from '../../types'; import { map, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/democracy/referendumsInfo.ts b/packages/api/src/derive/democracy/referendumsInfo.ts similarity index 99% rename from packages/api-derive/src/democracy/referendumsInfo.ts rename to packages/api/src/derive/democracy/referendumsInfo.ts index 305637488a..a1b06cd6cc 100644 --- a/packages/api-derive/src/democracy/referendumsInfo.ts +++ b/packages/api/src/derive/democracy/referendumsInfo.ts @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option, Vec } from '@polkadot/types'; import type { AccountId, ReferendumInfoTo239, Vote } from '@polkadot/types/interfaces'; import type { PalletDemocracyReferendumInfo, PalletDemocracyVoteVoting } from '@polkadot/types/lookup'; import type { BN } from '@polkadot/util'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveBalancesAccount, DeriveReferendum, DeriveReferendumVote, DeriveReferendumVotes } from '../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/democracy/sqrtElectorate.ts b/packages/api/src/derive/democracy/sqrtElectorate.ts similarity index 90% rename from packages/api-derive/src/democracy/sqrtElectorate.ts rename to packages/api/src/derive/democracy/sqrtElectorate.ts index 80175e8cce..36c25f7f8f 100644 --- a/packages/api-derive/src/democracy/sqrtElectorate.ts +++ b/packages/api/src/derive/democracy/sqrtElectorate.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { BN } from '@polkadot/util'; +import type { ApiInterfaceRx } from '../../types'; import { map } from 'rxjs'; diff --git a/packages/api-derive/src/democracy/types.ts b/packages/api/src/derive/democracy/types.ts similarity index 100% rename from packages/api-derive/src/democracy/types.ts rename to packages/api/src/derive/democracy/types.ts diff --git a/packages/api-derive/src/democracy/util.ts b/packages/api/src/derive/democracy/util.ts similarity index 98% rename from packages/api-derive/src/democracy/util.ts rename to packages/api/src/derive/democracy/util.ts index ff64ef09d7..4843f38bab 100644 --- a/packages/api-derive/src/democracy/util.ts +++ b/packages/api/src/derive/democracy/util.ts @@ -1,11 +1,11 @@ // Copyright 2017-2021 @polkadot/api-derive authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Bytes, Option } from '@polkadot/types'; import type { AccountId, Balance, BlockNumber, PreimageStatus, Proposal, ReferendumInfoTo239, Tally } from '@polkadot/types/interfaces'; import type { PalletDemocracyReferendumInfo, PalletDemocracyReferendumStatus, PalletDemocracyVoteThreshold } from '@polkadot/types/lookup'; import type { ITuple } from '@polkadot/types/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveProposalImage, DeriveReferendum, DeriveReferendumVote, DeriveReferendumVotes, DeriveReferendumVoteState } from '../types'; import { BN, bnSqrt } from '@polkadot/util'; diff --git a/packages/api/src/derive/derive.ts b/packages/api/src/derive/derive.ts new file mode 100644 index 0000000000..88471fb0de --- /dev/null +++ b/packages/api/src/derive/derive.ts @@ -0,0 +1,42 @@ +// Copyright 2017-2021 @polkadot/api-derive authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { Observable } from 'rxjs'; +import type { AnyFunction } from '@polkadot/types/types'; +import type { ApiInterfaceRx } from '../types'; + +import * as accounts from './accounts'; +import * as balances from './balances'; +import * as bounties from './bounties'; +import * as chain from './chain'; +import * as contracts from './contracts'; +import * as council from './council'; +import * as crowdloan from './crowdloan'; +import * as democracy from './democracy'; +import * as elections from './elections'; +import * as imOnline from './imOnline'; +import * as membership from './membership'; +import * as parachains from './parachains'; +import * as session from './session'; +import * as society from './society'; +import * as staking from './staking'; +import * as technicalCommittee from './technicalCommittee'; +import * as treasury from './treasury'; +import * as tx from './tx'; + +export const derive = { accounts, balances, bounties, chain, contracts, council, crowdloan, democracy, elections, imOnline, membership, parachains, session, society, staking, technicalCommittee, treasury, tx }; + +type DeriveSection
= { + [M in keyof Section]: Section[M] extends AnyFunction + ? ReturnType // ReturnType will be the inner function, i.e. without (api) argument + : never; +}; +type DeriveAllSections = { + [S in keyof AllSections]: DeriveSection +}; + +type DeriveCreator = (instanceId: string, api: ApiInterfaceRx) => (...args: unknown[]) => Observable; + +export type DeriveCustom = Record>; + +export type ExactDerive = DeriveAllSections; diff --git a/packages/api-derive/src/elections/index.ts b/packages/api/src/derive/elections/index.ts similarity index 100% rename from packages/api-derive/src/elections/index.ts rename to packages/api/src/derive/elections/index.ts diff --git a/packages/api-derive/src/elections/info.ts b/packages/api/src/derive/elections/info.ts similarity index 98% rename from packages/api-derive/src/elections/info.ts rename to packages/api/src/derive/elections/info.ts index 747a127b68..0edc0825ea 100644 --- a/packages/api-derive/src/elections/info.ts +++ b/packages/api/src/derive/elections/info.ts @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { u32, Vec } from '@polkadot/types'; import type { AccountId, Balance, BlockNumber } from '@polkadot/types/interfaces'; import type { PalletElectionsPhragmenSeatHolder } from '@polkadot/types/lookup'; import type { ITuple } from '@polkadot/types/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveElectionsInfo } from './types'; import { combineLatest, map, of } from 'rxjs'; diff --git a/packages/api-derive/src/elections/types.ts b/packages/api/src/derive/elections/types.ts similarity index 100% rename from packages/api-derive/src/elections/types.ts rename to packages/api/src/derive/elections/types.ts diff --git a/packages/api-derive/src/imOnline/index.ts b/packages/api/src/derive/imOnline/index.ts similarity index 100% rename from packages/api-derive/src/imOnline/index.ts rename to packages/api/src/derive/imOnline/index.ts diff --git a/packages/api-derive/src/imOnline/receivedHeartbeats.ts b/packages/api/src/derive/imOnline/receivedHeartbeats.ts similarity index 97% rename from packages/api-derive/src/imOnline/receivedHeartbeats.ts rename to packages/api/src/derive/imOnline/receivedHeartbeats.ts index 03ee53826f..48ed15e68b 100644 --- a/packages/api-derive/src/imOnline/receivedHeartbeats.ts +++ b/packages/api/src/derive/imOnline/receivedHeartbeats.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option, u32, WrapperOpaque } from '@polkadot/types'; import type { AccountId } from '@polkadot/types/interfaces'; import type { PalletImOnlineBoundedOpaqueNetworkState } from '@polkadot/types/lookup'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveHeartbeats } from '../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/index.spec.ts b/packages/api/src/derive/index.spec.ts similarity index 98% rename from packages/api-derive/src/index.spec.ts rename to packages/api/src/derive/index.spec.ts index 39048de08d..db9176f710 100644 --- a/packages/api-derive/src/index.spec.ts +++ b/packages/api/src/derive/index.spec.ts @@ -7,10 +7,10 @@ import { from, Observable } from 'rxjs'; -import { ApiRx } from '@polkadot/api/rx'; import { MockProvider } from '@polkadot/rpc-provider/mock'; import { TypeRegistry } from '@polkadot/types/create'; +import { ApiRx } from '../rx'; import { ExactDerive } from '.'; const testFunction = (api: ApiRx): any => { diff --git a/packages/api/src/derive/index.ts b/packages/api/src/derive/index.ts new file mode 100644 index 0000000000..a28ea8534b --- /dev/null +++ b/packages/api/src/derive/index.ts @@ -0,0 +1,130 @@ +// Copyright 2017-2021 @polkadot/api-derive authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { AnyFunction } from '@polkadot/types/types'; +import type { ApiInterfaceRx } from '../types'; +import type { DeriveCustom, ExactDerive } from './derive'; + +import { lazyDeriveSection } from './util/lazy'; +import { derive } from './derive'; + +export * from './derive'; +export * from './type'; + +interface Avail { + instances: string[]; + methods: string[]; + withDetect?: boolean; +} + +export { lazyDeriveSection }; + +// Enable derive only if some of these modules are available +const checks: Record = { + contracts: { + instances: ['contracts'], + methods: [] + }, + council: { + instances: ['council'], + methods: [], + withDetect: true + }, + crowdloan: { + instances: ['crowdloan'], + methods: [] + }, + democracy: { + instances: ['democracy'], + methods: [] + }, + elections: { + instances: ['phragmenElection', 'electionsPhragmen', 'elections', 'council'], + methods: [], + withDetect: true + }, + imOnline: { + instances: ['imOnline'], + methods: [] + }, + membership: { + instances: ['membership'], + methods: [] + }, + parachains: { + instances: ['parachains', 'registrar'], + methods: [] + }, + session: { + instances: ['session'], + methods: [] + }, + society: { + instances: ['society'], + methods: [] + }, + staking: { + instances: ['staking'], + methods: ['erasRewardPoints'] + }, + technicalCommittee: { + instances: ['technicalCommittee'], + methods: [], + withDetect: true + }, + treasury: { + instances: ['treasury'], + methods: [] + } +}; + +function getModuleInstances (api: ApiInterfaceRx, specName: string, moduleName: string): string[] { + return api.registry.getModuleInstances(specName, moduleName) || []; +} + +/** + * Returns an object that will inject `api` into all the functions inside + * `allSections`, and keep the object architecture of `allSections`. + */ +/** @internal */ +function injectFunctions (instanceId: string, api: ApiInterfaceRx, derives: DeriveCustom): ExactDerive { + const result: Record> = {}; + const names = Object.keys(derives); + const keys = Object.keys(api.query); + const specName = api.runtimeVersion.specName.toString(); + + const filterKeys = (q: string) => keys.includes(q); + const filterInstances = (q: string) => getModuleInstances(api, specName, q).some(filterKeys); + const filterMethods = (all: string[]) => (m: string) => all.some((q) => keys.includes(q) && api.query[q][m]); + const getKeys = (s: string) => Object.keys(derives[s]); + const creator = (s: string, m: string) => derives[s][m](instanceId, api); + const isIncluded = (c: string) => (!checks[c] || ( + (checks[c].instances.some(filterKeys) && ( + !checks[c].methods.length || + checks[c].methods.every(filterMethods(checks[c].instances)) + )) || + ( + checks[c].withDetect && + checks[c].instances.some(filterInstances) + ) + )); + + for (let i = 0; i < names.length; i++) { + const name = names[i]; + + isIncluded(name) && + lazyDeriveSection(result, name, getKeys, creator); + } + + return result as ExactDerive; +} + +// FIXME The return type of this function should be {...ExactDerive, ...DeriveCustom} +// For now we just drop the custom derive typings +/** @internal */ +export function getAvailableDerives (instanceId: string, api: ApiInterfaceRx, custom: DeriveCustom = {}): ExactDerive { + return { + ...injectFunctions(instanceId, api, derive as DeriveCustom), + ...injectFunctions(instanceId, api, custom) + }; +} diff --git a/packages/api-derive/src/membership/index.ts b/packages/api/src/derive/membership/index.ts similarity index 100% rename from packages/api-derive/src/membership/index.ts rename to packages/api/src/derive/membership/index.ts diff --git a/packages/api-derive/src/parachains/index.ts b/packages/api/src/derive/parachains/index.ts similarity index 100% rename from packages/api-derive/src/parachains/index.ts rename to packages/api/src/derive/parachains/index.ts diff --git a/packages/api-derive/src/parachains/info.ts b/packages/api/src/derive/parachains/info.ts similarity index 98% rename from packages/api-derive/src/parachains/info.ts rename to packages/api/src/derive/parachains/info.ts index 528367ac46..d347118a22 100644 --- a/packages/api-derive/src/parachains/info.ts +++ b/packages/api/src/derive/parachains/info.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { CollatorId, ParaId } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveParachainActive, DeriveParachainFull, DeriveParachainInfo } from '../types'; import type { Active, DidUpdate, Heads, ParaInfoResult, PendingSwap, RelayDispatchQueue, RetryQueue, SelectedThreads } from './types'; diff --git a/packages/api-derive/src/parachains/overview.ts b/packages/api/src/derive/parachains/overview.ts similarity index 96% rename from packages/api-derive/src/parachains/overview.ts rename to packages/api/src/derive/parachains/overview.ts index 4ceb3c3606..bd570cfec1 100644 --- a/packages/api-derive/src/parachains/overview.ts +++ b/packages/api/src/derive/parachains/overview.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { ParaId } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveParachain, DeriveParachainInfo } from '../types'; import type { DidUpdate, ParaInfoResult, PendingSwap, RelayDispatchQueueSize } from './types'; diff --git a/packages/api-derive/src/parachains/types.ts b/packages/api/src/derive/parachains/types.ts similarity index 100% rename from packages/api-derive/src/parachains/types.ts rename to packages/api/src/derive/parachains/types.ts diff --git a/packages/api-derive/src/parachains/util.ts b/packages/api/src/derive/parachains/util.ts similarity index 100% rename from packages/api-derive/src/parachains/util.ts rename to packages/api/src/derive/parachains/util.ts diff --git a/packages/api-derive/src/session/index.ts b/packages/api/src/derive/session/index.ts similarity index 100% rename from packages/api-derive/src/session/index.ts rename to packages/api/src/derive/session/index.ts diff --git a/packages/api-derive/src/session/indexes.ts b/packages/api/src/derive/session/indexes.ts similarity index 97% rename from packages/api-derive/src/session/indexes.ts rename to packages/api/src/derive/session/indexes.ts index 7c0e3a2fa3..6abf3f2ab7 100644 --- a/packages/api-derive/src/session/indexes.ts +++ b/packages/api/src/derive/session/indexes.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option, u32 } from '@polkadot/types'; import type { ActiveEraInfo, EraIndex, Moment, SessionIndex } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveSessionIndexes } from '../types'; import { map, of } from 'rxjs'; diff --git a/packages/api-derive/src/session/info.ts b/packages/api/src/derive/session/info.ts similarity index 94% rename from packages/api-derive/src/session/info.ts rename to packages/api/src/derive/session/info.ts index 6b0e3bc24a..cc1e9274f3 100644 --- a/packages/api-derive/src/session/info.ts +++ b/packages/api/src/derive/session/info.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveSessionInfo } from '../types'; import { map } from 'rxjs'; diff --git a/packages/api-derive/src/session/progress.ts b/packages/api/src/derive/session/progress.ts similarity index 98% rename from packages/api-derive/src/session/progress.ts rename to packages/api/src/derive/session/progress.ts index 13258005dc..5547e4fafd 100644 --- a/packages/api-derive/src/session/progress.ts +++ b/packages/api/src/derive/session/progress.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option, u64 } from '@polkadot/types'; import type { BlockNumber, SessionIndex } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveSessionInfo, DeriveSessionProgress } from '../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/session/types.ts b/packages/api/src/derive/session/types.ts similarity index 100% rename from packages/api-derive/src/session/types.ts rename to packages/api/src/derive/session/types.ts diff --git a/packages/api-derive/src/society/candidates.ts b/packages/api/src/derive/society/candidates.ts similarity index 96% rename from packages/api-derive/src/society/candidates.ts rename to packages/api/src/derive/society/candidates.ts index c639119824..01bb063cda 100644 --- a/packages/api-derive/src/society/candidates.ts +++ b/packages/api/src/derive/society/candidates.ts @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option } from '@polkadot/types'; import type { BalanceOf } from '@polkadot/types/interfaces'; import type { PalletSocietyBid, PalletSocietyBidKind } from '@polkadot/types/lookup'; import type { ITuple } from '@polkadot/types/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveSocietyCandidate } from '../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/society/index.ts b/packages/api/src/derive/society/index.ts similarity index 100% rename from packages/api-derive/src/society/index.ts rename to packages/api/src/derive/society/index.ts diff --git a/packages/api-derive/src/society/info.ts b/packages/api/src/derive/society/info.ts similarity index 95% rename from packages/api-derive/src/society/info.ts rename to packages/api/src/derive/society/info.ts index fc55c8bfe3..a67d0eb909 100644 --- a/packages/api-derive/src/society/info.ts +++ b/packages/api/src/derive/society/info.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option, u32, Vec } from '@polkadot/types'; import type { AccountId, BalanceOf } from '@polkadot/types/interfaces'; import type { PalletSocietyBid } from '@polkadot/types/lookup'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveSociety } from '../types'; import { map } from 'rxjs'; diff --git a/packages/api-derive/src/society/member.ts b/packages/api/src/derive/society/member.ts similarity index 92% rename from packages/api-derive/src/society/member.ts rename to packages/api/src/derive/society/member.ts index f3f0f698e2..1bece7ba0e 100644 --- a/packages/api-derive/src/society/member.ts +++ b/packages/api/src/derive/society/member.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { AccountId } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveSocietyMember } from '../types'; import { map } from 'rxjs'; diff --git a/packages/api-derive/src/society/members.ts b/packages/api/src/derive/society/members.ts similarity index 96% rename from packages/api-derive/src/society/members.ts rename to packages/api/src/derive/society/members.ts index d0fdb481d4..a2830772ef 100644 --- a/packages/api-derive/src/society/members.ts +++ b/packages/api/src/derive/society/members.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { AccountId } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveSocietyMember } from '../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/society/types.ts b/packages/api/src/derive/society/types.ts similarity index 100% rename from packages/api-derive/src/society/types.ts rename to packages/api/src/derive/society/types.ts diff --git a/packages/api-derive/src/staking/account.ts b/packages/api/src/derive/staking/account.ts similarity index 98% rename from packages/api-derive/src/staking/account.ts rename to packages/api/src/derive/staking/account.ts index 4979dc4a8d..61852a5b89 100644 --- a/packages/api-derive/src/staking/account.ts +++ b/packages/api/src/derive/staking/account.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Balance } from '@polkadot/types/interfaces'; import type { PalletStakingStakingLedger, PalletStakingUnlockChunk } from '@polkadot/types/lookup'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveSessionInfo, DeriveStakingAccount, DeriveStakingKeys, DeriveStakingQuery, DeriveUnlocking } from '../types'; import { combineLatest, map, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/staking/cache.ts b/packages/api/src/derive/staking/cache.ts similarity index 100% rename from packages/api-derive/src/staking/cache.ts rename to packages/api/src/derive/staking/cache.ts diff --git a/packages/api-derive/src/staking/currentPoints.ts b/packages/api/src/derive/staking/currentPoints.ts similarity index 92% rename from packages/api-derive/src/staking/currentPoints.ts rename to packages/api/src/derive/staking/currentPoints.ts index 7971c4884f..2697acf62e 100644 --- a/packages/api-derive/src/staking/currentPoints.ts +++ b/packages/api/src/derive/staking/currentPoints.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { PalletStakingEraRewardPoints } from '@polkadot/types/lookup'; +import type { ApiInterfaceRx } from '../../types'; import { switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/staking/electedInfo.ts b/packages/api/src/derive/staking/electedInfo.ts similarity index 95% rename from packages/api-derive/src/staking/electedInfo.ts rename to packages/api/src/derive/staking/electedInfo.ts index 6e1fb4cdb4..425a34c6df 100644 --- a/packages/api-derive/src/staking/electedInfo.ts +++ b/packages/api/src/derive/staking/electedInfo.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { AccountId } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveStakingElected, StakingQueryFlags } from '../types'; import { map, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/staking/erasExposure.ts b/packages/api/src/derive/staking/erasExposure.ts similarity index 97% rename from packages/api-derive/src/staking/erasExposure.ts rename to packages/api/src/derive/staking/erasExposure.ts index d556767c8c..081e279a80 100644 --- a/packages/api-derive/src/staking/erasExposure.ts +++ b/packages/api/src/derive/staking/erasExposure.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { StorageKey } from '@polkadot/types'; import type { AccountId, EraIndex } from '@polkadot/types/interfaces'; import type { PalletStakingExposure } from '@polkadot/types/lookup'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveEraExposure, DeriveEraNominatorExposure, DeriveEraValidatorExposure } from '../types'; import { map, of } from 'rxjs'; diff --git a/packages/api-derive/src/staking/erasHistoric.ts b/packages/api/src/derive/staking/erasHistoric.ts similarity index 95% rename from packages/api-derive/src/staking/erasHistoric.ts rename to packages/api/src/derive/staking/erasHistoric.ts index 2e942e83dc..40ff4140f4 100644 --- a/packages/api-derive/src/staking/erasHistoric.ts +++ b/packages/api/src/derive/staking/erasHistoric.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option, u32 } from '@polkadot/types'; import type { ActiveEraInfo, EraIndex } from '@polkadot/types/interfaces'; import type { BN } from '@polkadot/util'; +import type { ApiInterfaceRx } from '../../types'; import { map } from 'rxjs'; diff --git a/packages/api-derive/src/staking/erasPoints.ts b/packages/api/src/derive/staking/erasPoints.ts similarity index 97% rename from packages/api-derive/src/staking/erasPoints.ts rename to packages/api/src/derive/staking/erasPoints.ts index 7e662ea12b..23bff45a3e 100644 --- a/packages/api-derive/src/staking/erasPoints.ts +++ b/packages/api/src/derive/staking/erasPoints.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { EraIndex } from '@polkadot/types/interfaces'; import type { PalletStakingEraRewardPoints } from '@polkadot/types/lookup'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveEraPoints, DeriveEraValPoints } from '../types'; import { map, of } from 'rxjs'; diff --git a/packages/api-derive/src/staking/erasPrefs.ts b/packages/api/src/derive/staking/erasPrefs.ts similarity index 96% rename from packages/api-derive/src/staking/erasPrefs.ts rename to packages/api/src/derive/staking/erasPrefs.ts index 310be3eecc..7af072da75 100644 --- a/packages/api-derive/src/staking/erasPrefs.ts +++ b/packages/api/src/derive/staking/erasPrefs.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { StorageKey } from '@polkadot/types'; import type { EraIndex } from '@polkadot/types/interfaces'; import type { PalletStakingValidatorPrefs } from '@polkadot/types/lookup'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveEraPrefs, DeriveEraValPrefs } from '../types'; import { map, of } from 'rxjs'; diff --git a/packages/api-derive/src/staking/erasRewards.ts b/packages/api/src/derive/staking/erasRewards.ts similarity index 96% rename from packages/api-derive/src/staking/erasRewards.ts rename to packages/api/src/derive/staking/erasRewards.ts index 6daaad4cdf..2444193abb 100644 --- a/packages/api-derive/src/staking/erasRewards.ts +++ b/packages/api/src/derive/staking/erasRewards.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option } from '@polkadot/types'; import type { Balance, EraIndex } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveEraRewards } from '../types'; import { map, of } from 'rxjs'; diff --git a/packages/api-derive/src/staking/erasSlashes.ts b/packages/api/src/derive/staking/erasSlashes.ts similarity index 97% rename from packages/api-derive/src/staking/erasSlashes.ts rename to packages/api/src/derive/staking/erasSlashes.ts index 848ea1749b..3e036ad214 100644 --- a/packages/api-derive/src/staking/erasSlashes.ts +++ b/packages/api/src/derive/staking/erasSlashes.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option, StorageKey } from '@polkadot/types'; import type { BalanceOf, EraIndex, Perbill } from '@polkadot/types/interfaces'; import type { ITuple } from '@polkadot/types/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveEraSlashes, DeriveEraValSlash } from '../types'; import { combineLatest, map, of } from 'rxjs'; diff --git a/packages/api-derive/src/staking/index.ts b/packages/api/src/derive/staking/index.ts similarity index 100% rename from packages/api-derive/src/staking/index.ts rename to packages/api/src/derive/staking/index.ts diff --git a/packages/api-derive/src/staking/keys.ts b/packages/api/src/derive/staking/keys.ts similarity index 97% rename from packages/api-derive/src/staking/keys.ts rename to packages/api/src/derive/staking/keys.ts index a8242fbef2..d0a2338843 100644 --- a/packages/api-derive/src/staking/keys.ts +++ b/packages/api/src/derive/staking/keys.ts @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option, Vec } from '@polkadot/types'; import type { AccountId } from '@polkadot/types/interfaces'; import type { NodeRuntimeSessionKeys } from '@polkadot/types/lookup'; import type { ITuple } from '@polkadot/types/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveStakingKeys } from './types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/staking/overview.ts b/packages/api/src/derive/staking/overview.ts similarity index 93% rename from packages/api-derive/src/staking/overview.ts rename to packages/api/src/derive/staking/overview.ts index 5d4f90418a..5e802cd2ab 100644 --- a/packages/api-derive/src/staking/overview.ts +++ b/packages/api/src/derive/staking/overview.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveStakingOverview } from '../types'; import { combineLatest, map } from 'rxjs'; diff --git a/packages/api-derive/src/staking/ownExposure.ts b/packages/api/src/derive/staking/ownExposure.ts similarity index 94% rename from packages/api-derive/src/staking/ownExposure.ts rename to packages/api/src/derive/staking/ownExposure.ts index 246223b5bf..469874b595 100644 --- a/packages/api-derive/src/staking/ownExposure.ts +++ b/packages/api/src/derive/staking/ownExposure.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx, QueryableStorageMultiArg } from '@polkadot/api/types'; import type { EraIndex } from '@polkadot/types/interfaces'; import type { PalletStakingExposure } from '@polkadot/types/lookup'; +import type { ApiInterfaceRx, QueryableStorageMultiArg } from '../../types'; import type { DeriveOwnExposure } from '../types'; import { map, of } from 'rxjs'; diff --git a/packages/api-derive/src/staking/ownSlashes.ts b/packages/api/src/derive/staking/ownSlashes.ts similarity index 95% rename from packages/api-derive/src/staking/ownSlashes.ts rename to packages/api/src/derive/staking/ownSlashes.ts index 9a131bab0d..5554e1a652 100644 --- a/packages/api-derive/src/staking/ownSlashes.ts +++ b/packages/api/src/derive/staking/ownSlashes.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx, QueryableStorageMultiArg } from '@polkadot/api/types'; import type { Option } from '@polkadot/types'; import type { BalanceOf, EraIndex, Perbill } from '@polkadot/types/interfaces'; import type { ITuple } from '@polkadot/types/types'; +import type { ApiInterfaceRx, QueryableStorageMultiArg } from '../../types'; import type { DeriveStakerSlashes } from '../types'; import { map, of } from 'rxjs'; diff --git a/packages/api-derive/src/staking/query.ts b/packages/api/src/derive/staking/query.ts similarity index 98% rename from packages/api-derive/src/staking/query.ts rename to packages/api/src/derive/staking/query.ts index bdd443ccbf..2ef39359bd 100644 --- a/packages/api-derive/src/staking/query.ts +++ b/packages/api/src/derive/staking/query.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option } from '@polkadot/types'; import type { AccountId, EraIndex } from '@polkadot/types/interfaces'; import type { PalletStakingExposure, PalletStakingNominations, PalletStakingRewardDestination, PalletStakingStakingLedger, PalletStakingValidatorPrefs } from '@polkadot/types/lookup'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveStakingQuery, StakingQueryFlags } from '../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/staking/stakerExposure.ts b/packages/api/src/derive/staking/stakerExposure.ts similarity index 96% rename from packages/api-derive/src/staking/stakerExposure.ts rename to packages/api/src/derive/staking/stakerExposure.ts index 92840f978a..81c1fa445a 100644 --- a/packages/api-derive/src/staking/stakerExposure.ts +++ b/packages/api/src/derive/staking/stakerExposure.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { EraIndex } from '@polkadot/types/interfaces'; -import type { DeriveEraValidatorExposure, DeriveStakerExposure } from '../types'; +import type { ApiInterfaceRx } from '../../types'; +import type { DeriveEraValidatorExposure, DeriveStakerExposure } from './types'; import { map, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/staking/stakerPoints.ts b/packages/api/src/derive/staking/stakerPoints.ts similarity index 95% rename from packages/api-derive/src/staking/stakerPoints.ts rename to packages/api/src/derive/staking/stakerPoints.ts index 24444cfc0c..db24abc3e6 100644 --- a/packages/api-derive/src/staking/stakerPoints.ts +++ b/packages/api/src/derive/staking/stakerPoints.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { EraIndex } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveStakerPoints } from '../types'; import { map } from 'rxjs'; diff --git a/packages/api-derive/src/staking/stakerPrefs.ts b/packages/api/src/derive/staking/stakerPrefs.ts similarity index 94% rename from packages/api-derive/src/staking/stakerPrefs.ts rename to packages/api/src/derive/staking/stakerPrefs.ts index 778293a1ad..4a1ac9ec26 100644 --- a/packages/api-derive/src/staking/stakerPrefs.ts +++ b/packages/api/src/derive/staking/stakerPrefs.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { EraIndex } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveStakerPrefs } from '../types'; import { map } from 'rxjs'; diff --git a/packages/api-derive/src/staking/stakerRewards.ts b/packages/api/src/derive/staking/stakerRewards.ts similarity index 99% rename from packages/api-derive/src/staking/stakerRewards.ts rename to packages/api/src/derive/staking/stakerRewards.ts index 8607dfe15c..a0e32c820f 100644 --- a/packages/api-derive/src/staking/stakerRewards.ts +++ b/packages/api/src/derive/staking/stakerRewards.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { AccountId, EraIndex } from '@polkadot/types/interfaces'; import type { PalletStakingStakingLedger } from '@polkadot/types/lookup'; import type { BN } from '@polkadot/util'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveEraPoints, DeriveEraPrefs, DeriveEraRewards, DeriveEraValPrefs, DeriveStakerExposure, DeriveStakerReward, DeriveStakerRewardValidator } from '../types'; import type { DeriveStakingQuery } from './types'; diff --git a/packages/api-derive/src/staking/stakerSlashes.ts b/packages/api/src/derive/staking/stakerSlashes.ts similarity index 95% rename from packages/api-derive/src/staking/stakerSlashes.ts rename to packages/api/src/derive/staking/stakerSlashes.ts index 4731a5a918..178fe6c437 100644 --- a/packages/api-derive/src/staking/stakerSlashes.ts +++ b/packages/api/src/derive/staking/stakerSlashes.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { EraIndex } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveStakerSlashes } from '../types'; import { map } from 'rxjs'; diff --git a/packages/api-derive/src/staking/stashes.ts b/packages/api/src/derive/staking/stashes.ts similarity index 95% rename from packages/api-derive/src/staking/stashes.ts rename to packages/api/src/derive/staking/stashes.ts index a08c15c5d7..7576dffa35 100644 --- a/packages/api-derive/src/staking/stashes.ts +++ b/packages/api/src/derive/staking/stashes.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { AccountId } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import { map, startWith, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/staking/types.ts b/packages/api/src/derive/staking/types.ts similarity index 100% rename from packages/api-derive/src/staking/types.ts rename to packages/api/src/derive/staking/types.ts diff --git a/packages/api-derive/src/staking/util.ts b/packages/api/src/derive/staking/util.ts similarity index 96% rename from packages/api-derive/src/staking/util.ts rename to packages/api/src/derive/staking/util.ts index 02c39978c8..33b2d1b509 100644 --- a/packages/api-derive/src/staking/util.ts +++ b/packages/api/src/derive/staking/util.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx, ObsInnerType } from '@polkadot/api/types'; import type { EraIndex } from '@polkadot/types/interfaces'; -import type { ExactDerive } from '../bundle'; +import type { ApiInterfaceRx, ObsInnerType } from '../../types'; +import type { ExactDerive } from '../derive'; import { combineLatest, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/staking/validators.ts b/packages/api/src/derive/staking/validators.ts similarity index 96% rename from packages/api-derive/src/staking/validators.ts rename to packages/api/src/derive/staking/validators.ts index eddae637bb..2f048492e4 100644 --- a/packages/api-derive/src/staking/validators.ts +++ b/packages/api/src/derive/staking/validators.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { AccountId } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveStakingValidators } from '../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/staking/waitingInfo.ts b/packages/api/src/derive/staking/waitingInfo.ts similarity index 95% rename from packages/api-derive/src/staking/waitingInfo.ts rename to packages/api/src/derive/staking/waitingInfo.ts index cb677dc4a8..125cbc84b5 100644 --- a/packages/api-derive/src/staking/waitingInfo.ts +++ b/packages/api/src/derive/staking/waitingInfo.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveStakingWaiting, StakingQueryFlags } from '../types'; import { combineLatest, map, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/technicalCommittee/index.ts b/packages/api/src/derive/technicalCommittee/index.ts similarity index 100% rename from packages/api-derive/src/technicalCommittee/index.ts rename to packages/api/src/derive/technicalCommittee/index.ts diff --git a/packages/api-derive/test/bountyFactory.ts b/packages/api/src/derive/test/bountyFactory.ts similarity index 96% rename from packages/api-derive/test/bountyFactory.ts rename to packages/api/src/derive/test/bountyFactory.ts index 4f24db4979..c1a019b576 100644 --- a/packages/api-derive/test/bountyFactory.ts +++ b/packages/api/src/derive/test/bountyFactory.ts @@ -1,11 +1,12 @@ // Copyright 2017-2021 @polkadot/api authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { ApiPromise } from '@polkadot/api'; import { Option, StorageKey } from '@polkadot/types'; import { Bounty, BountyIndex } from '@polkadot/types/interfaces'; import { Codec, Constructor, InterfaceTypes, Registry } from '@polkadot/types/types'; +import { ApiPromise } from '../../promise'; + export class BountyFactory { readonly #api: ApiPromise; readonly #registry: Registry; diff --git a/packages/api-derive/test/bytesFactory.ts b/packages/api/src/derive/test/bytesFactory.ts similarity index 100% rename from packages/api-derive/test/bytesFactory.ts rename to packages/api/src/derive/test/bytesFactory.ts diff --git a/packages/api-derive/test/helpers.ts b/packages/api/src/derive/test/helpers.ts similarity index 91% rename from packages/api-derive/test/helpers.ts rename to packages/api/src/derive/test/helpers.ts index c8fe1a85c3..1ad82465c1 100644 --- a/packages/api-derive/test/helpers.ts +++ b/packages/api/src/derive/test/helpers.ts @@ -1,10 +1,11 @@ // Copyright 2017-2021 @polkadot/api authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { ApiPromise, WsProvider } from '@polkadot/api'; import { Metadata, TypeRegistry } from '@polkadot/types'; import metaStatic from '@polkadot/types-support/metadata/static-substrate'; +import { ApiPromise, WsProvider } from '../..'; + export function createApiWithAugmentations (): ApiPromise { const registry = new TypeRegistry(); const metadata = new Metadata(registry, metaStatic); diff --git a/packages/api-derive/test/proposalFactory.ts b/packages/api/src/derive/test/proposalFactory.ts similarity index 86% rename from packages/api-derive/test/proposalFactory.ts rename to packages/api/src/derive/test/proposalFactory.ts index 42391625db..8f3d301d7e 100644 --- a/packages/api-derive/test/proposalFactory.ts +++ b/packages/api/src/derive/test/proposalFactory.ts @@ -1,11 +1,13 @@ // Copyright 2017-2021 @polkadot/api authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { ApiPromise } from '@polkadot/api'; -import { SubmittableExtrinsic } from '@polkadot/api/types'; +import type { SubmittableExtrinsic } from '../../types'; + import { Proposal, ProposalIndex } from '@polkadot/types/interfaces'; import { Registry } from '@polkadot/types/types'; +import { ApiPromise } from '../..'; + export class ProposalFactory { readonly #api: ApiPromise; readonly #registry: Registry; diff --git a/packages/api-derive/src/treasury/index.ts b/packages/api/src/derive/treasury/index.ts similarity index 100% rename from packages/api-derive/src/treasury/index.ts rename to packages/api/src/derive/treasury/index.ts diff --git a/packages/api-derive/src/treasury/proposals.ts b/packages/api/src/derive/treasury/proposals.ts similarity index 98% rename from packages/api-derive/src/treasury/proposals.ts rename to packages/api/src/derive/treasury/proposals.ts index 237cbd4fdc..be9a2daffa 100644 --- a/packages/api-derive/src/treasury/proposals.ts +++ b/packages/api/src/derive/treasury/proposals.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Option } from '@polkadot/types'; import type { ProposalIndex } from '@polkadot/types/interfaces'; import type { PalletTreasuryProposal } from '@polkadot/types/lookup'; +import type { ApiInterfaceRx } from '../../types'; import type { DeriveCollectiveProposal, DeriveTreasuryProposal, DeriveTreasuryProposals } from '../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/tx/constants.ts b/packages/api/src/derive/tx/constants.ts similarity index 100% rename from packages/api-derive/src/tx/constants.ts rename to packages/api/src/derive/tx/constants.ts diff --git a/packages/api-derive/src/tx/events.ts b/packages/api/src/derive/tx/events.ts similarity index 93% rename from packages/api-derive/src/tx/events.ts rename to packages/api/src/derive/tx/events.ts index 039ffdf67b..6c91d5ad0e 100644 --- a/packages/api-derive/src/tx/events.ts +++ b/packages/api/src/derive/tx/events.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { EventRecord, Hash, SignedBlock } from '@polkadot/types/interfaces'; +import type { ApiInterfaceRx } from '../../types'; import { combineLatest, map, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/tx/index.ts b/packages/api/src/derive/tx/index.ts similarity index 100% rename from packages/api-derive/src/tx/index.ts rename to packages/api/src/derive/tx/index.ts diff --git a/packages/api-derive/src/tx/signingInfo.ts b/packages/api/src/derive/tx/signingInfo.ts similarity index 98% rename from packages/api-derive/src/tx/signingInfo.ts rename to packages/api/src/derive/tx/signingInfo.ts index e72f05536a..abdf485281 100644 --- a/packages/api-derive/src/tx/signingInfo.ts +++ b/packages/api/src/derive/tx/signingInfo.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; import type { Header, Index } from '@polkadot/types/interfaces'; import type { AnyNumber, Codec, IExtrinsicEra } from '@polkadot/types/types'; +import type { ApiInterfaceRx } from '../../types'; import { combineLatest, map, of, switchMap } from 'rxjs'; diff --git a/packages/api-derive/src/type/HeaderExtended.ts b/packages/api/src/derive/type/HeaderExtended.ts similarity index 100% rename from packages/api-derive/src/type/HeaderExtended.ts rename to packages/api/src/derive/type/HeaderExtended.ts diff --git a/packages/api-derive/src/type/SignedBlockExtended.ts b/packages/api/src/derive/type/SignedBlockExtended.ts similarity index 100% rename from packages/api-derive/src/type/SignedBlockExtended.ts rename to packages/api/src/derive/type/SignedBlockExtended.ts diff --git a/packages/api-derive/src/type/index.ts b/packages/api/src/derive/type/index.ts similarity index 100% rename from packages/api-derive/src/type/index.ts rename to packages/api/src/derive/type/index.ts diff --git a/packages/api-derive/src/type/types.ts b/packages/api/src/derive/type/types.ts similarity index 100% rename from packages/api-derive/src/type/types.ts rename to packages/api/src/derive/type/types.ts diff --git a/packages/api-derive/src/type/util.ts b/packages/api/src/derive/type/util.ts similarity index 100% rename from packages/api-derive/src/type/util.ts rename to packages/api/src/derive/type/util.ts diff --git a/packages/api/src/derive/types.ts b/packages/api/src/derive/types.ts new file mode 100644 index 0000000000..ce3b648a55 --- /dev/null +++ b/packages/api/src/derive/types.ts @@ -0,0 +1,90 @@ +// Copyright 2017-2021 @polkadot/api-derive authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { u32 } from '@polkadot/types'; +import type { Balance, BlockNumber, BountyIndex, Hash, Proposal, ProposalIndex, SetIndex, Votes } from '@polkadot/types/interfaces'; +import type { PalletBountiesBounty, PalletTreasuryProposal } from '@polkadot/types/lookup'; +import type { BN } from '@polkadot/util'; + +export * from './accounts/types'; +export * from './balances/types'; +export * from './council/types'; +export * from './crowdloan/types'; +export * from './democracy/types'; +export * from './elections/types'; +export * from './parachains/types'; +export * from './session/types'; +export * from './society/types'; +export * from './staking/types'; +export * from './type/types'; + +export interface DeriveContractFees { + callBaseFee: BN; + contractFee: BN; + creationFee: BN; + rentByteFee: BN; + rentDepositOffset: BN; + surchargeReward: BN; + tombstoneDeposit: BN; + transactionBaseFee: BN; + transactionByteFee: BN; + transferFee: BN; +} + +export interface DeriveCollectiveProposal { + hash: Hash; + proposal: Proposal; + votes: Votes | null; +} + +export interface DeriveFees { + creationFee: Balance; + existentialDeposit: Balance; + transactionBaseFee: Balance; + transactionByteFee: Balance; + transferFee: Balance; +} + +export interface DeriveHeartbeatAuthor { + blockCount: u32; + hasMessage: boolean; + isOnline: boolean; +} + +export type DeriveHeartbeats = Record; + +export interface RecentlyOffline { + blockNumber: BlockNumber; + count: BN; +} + +export type DeriveRecentlyOffline = Record; + +export interface DeriveTreasuryProposal { + council: DeriveCollectiveProposal[]; + id: ProposalIndex; + proposal: PalletTreasuryProposal; +} + +export interface DeriveTreasuryProposals { + approvals: DeriveTreasuryProposal[]; + proposalCount: ProposalIndex; + proposals: DeriveTreasuryProposal[]; +} + +export interface VoterPosition { + globalIndex: BN; + index: BN; + setIndex: SetIndex; +} + +export type DeriveVoterPositions = Record; + +export interface DeriveBounty { + bounty: PalletBountiesBounty; + description: string; + index: BountyIndex; + proposals: DeriveCollectiveProposal[]; +} + +export type DeriveBounties = DeriveBounty[]; diff --git a/packages/api-derive/src/util/approvalFlagToBools.spec.ts b/packages/api/src/derive/util/approvalFlagToBools.spec.ts similarity index 100% rename from packages/api-derive/src/util/approvalFlagToBools.spec.ts rename to packages/api/src/derive/util/approvalFlagToBools.spec.ts diff --git a/packages/api-derive/src/util/approvalFlagsToBools.ts b/packages/api/src/derive/util/approvalFlagsToBools.ts similarity index 100% rename from packages/api-derive/src/util/approvalFlagsToBools.ts rename to packages/api/src/derive/util/approvalFlagsToBools.ts diff --git a/packages/api-derive/src/util/cache.ts b/packages/api/src/derive/util/cache.ts similarity index 100% rename from packages/api-derive/src/util/cache.ts rename to packages/api/src/derive/util/cache.ts diff --git a/packages/api-derive/src/util/cacheImpl.ts b/packages/api/src/derive/util/cacheImpl.ts similarity index 100% rename from packages/api-derive/src/util/cacheImpl.ts rename to packages/api/src/derive/util/cacheImpl.ts diff --git a/packages/api-derive/src/util/first.ts b/packages/api/src/derive/util/first.ts similarity index 76% rename from packages/api-derive/src/util/first.ts rename to packages/api/src/derive/util/first.ts index acc7a383a2..f7f539590f 100644 --- a/packages/api-derive/src/util/first.ts +++ b/packages/api/src/derive/util/first.ts @@ -2,15 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { ApiInterfaceRx } from '@polkadot/api/types'; +import type { ApiInterfaceRx } from '../../types'; import { map } from 'rxjs'; import { memo } from '@polkadot/rpc-core'; -// We are re-exporting these from here to ensure that *.d.ts generation is correct -export type { ApiInterfaceRx } from '@polkadot/api/types'; - export function firstObservable (obs: Observable): Observable { return obs.pipe(map(([a]) => a)); } diff --git a/packages/api-derive/src/util/index.ts b/packages/api/src/derive/util/index.ts similarity index 100% rename from packages/api-derive/src/util/index.ts rename to packages/api/src/derive/util/index.ts diff --git a/packages/api-derive/src/util/lazy.ts b/packages/api/src/derive/util/lazy.ts similarity index 100% rename from packages/api-derive/src/util/lazy.ts rename to packages/api/src/derive/util/lazy.ts diff --git a/packages/api-derive/src/util/types.ts b/packages/api/src/derive/util/types.ts similarity index 100% rename from packages/api-derive/src/util/types.ts rename to packages/api/src/derive/util/types.ts diff --git a/packages/api/src/detectPackage.ts b/packages/api/src/detectPackage.ts index 089990e1c6..216c395822 100644 --- a/packages/api/src/detectPackage.ts +++ b/packages/api/src/detectPackage.ts @@ -1,13 +1,11 @@ // Copyright 2017-2021 @polkadot/api authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { packageInfo as deriveInfo } from '@polkadot/api-derive/packageInfo'; import { packageInfo as coreInfo } from '@polkadot/rpc-core/packageInfo'; import { packageInfo as providerInfo } from '@polkadot/rpc-provider/packageInfo'; import { packageInfo as typesInfo } from '@polkadot/types/packageInfo'; -import { packageInfo as knownInfo } from '@polkadot/types-known/packageInfo'; import { detectPackage } from '@polkadot/util'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [deriveInfo, coreInfo, providerInfo, typesInfo, knownInfo]); +detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [coreInfo, providerInfo, typesInfo]); diff --git a/packages/api/src/promise/index.spec.ts b/packages/api/src/promise/index.spec.ts index 8feab88c51..1095cdb891 100644 --- a/packages/api/src/promise/index.spec.ts +++ b/packages/api/src/promise/index.spec.ts @@ -12,7 +12,7 @@ import { MockProvider } from '@polkadot/rpc-provider/mock'; import { TypeRegistry } from '@polkadot/types'; import { hexToU8a } from '@polkadot/util'; -import { SingleAccountSigner } from '../../test/util'; +import { SingleAccountSigner } from '../test/util'; import { ApiPromise } from '.'; const TRANSFER_SIG = '0xcc277eb341d3801c08f149508221583fa3185cc3944e6cb376cd061640305edd7dc24dfd754adb24768f1d8547389b7720e6f626bc81f5593fba1141e7f7ba07'; diff --git a/packages/api/test/api.spec.ts b/packages/api/src/test/api.spec.ts similarity index 100% rename from packages/api/test/api.spec.ts rename to packages/api/src/test/api.spec.ts diff --git a/packages/api/test/typesBundleDerive.spec.ts b/packages/api/src/test/typesBundleDerive.spec.ts similarity index 100% rename from packages/api/test/typesBundleDerive.spec.ts rename to packages/api/src/test/typesBundleDerive.spec.ts diff --git a/packages/api/test/util/SingleAccountSigner.ts b/packages/api/src/test/util/SingleAccountSigner.ts similarity index 100% rename from packages/api/test/util/SingleAccountSigner.ts rename to packages/api/src/test/util/SingleAccountSigner.ts diff --git a/packages/api/test/util/index.ts b/packages/api/src/test/util/index.ts similarity index 100% rename from packages/api/test/util/index.ts rename to packages/api/src/test/util/index.ts diff --git a/packages/api/test/util/logEvents.ts b/packages/api/src/test/util/logEvents.ts similarity index 94% rename from packages/api/test/util/logEvents.ts rename to packages/api/src/test/util/logEvents.ts index 56f28c38a5..a5c3cec128 100644 --- a/packages/api/test/util/logEvents.ts +++ b/packages/api/src/test/util/logEvents.ts @@ -3,7 +3,7 @@ import type { EventRecord } from '@polkadot/types/interfaces'; -import { SubmittableResult } from '../../src'; +import { SubmittableResult } from '../..'; // log all events for the transfers, calling done() when finalized export const logEvents = (done: () => Record): (r: SubmittableResult) => void => diff --git a/packages/api/src/types/index.ts b/packages/api/src/types/index.ts index b0de37a33a..5ab97e8bf0 100644 --- a/packages/api/src/types/index.ts +++ b/packages/api/src/types/index.ts @@ -9,7 +9,6 @@ import type { DecoratedErrors } from '@polkadot/api/types/errors'; import type { DecoratedEvents } from '@polkadot/api/types/events'; import type { QueryableStorage } from '@polkadot/api/types/storage'; import type { SubmittableExtrinsics } from '@polkadot/api/types/submittable'; -import type { DeriveCustom, ExactDerive } from '@polkadot/api-derive'; import type { RpcInterface } from '@polkadot/rpc-core/types'; import type { ProviderInterface, ProviderInterfaceEmitted } from '@polkadot/rpc-provider/types'; import type { ExtDef } from '@polkadot/types/extrinsic/signedExtensions/types'; @@ -19,6 +18,7 @@ import type { CallFunction, DefinitionRpc, DefinitionRpcSub, RegisteredTypes, Re import type { BN } from '@polkadot/util'; import type { HexString } from '@polkadot/util/types'; import type { ApiBase } from '../base'; +import type { DeriveCustom, ExactDerive } from '../derive'; import type { DeriveAllSections } from '../util/decorate'; import type { ApiTypes } from './base'; import type { DecoratedRpc } from './rpc'; diff --git a/packages/api/src/types/rpc.ts b/packages/api/src/types/rpc.ts index a5162c7469..231e266521 100644 --- a/packages/api/src/types/rpc.ts +++ b/packages/api/src/types/rpc.ts @@ -6,6 +6,8 @@ import type { AnyFunction, Callback, DefinitionRpc } from '@polkadot/types/types import { ApiTypes, PromiseResult, Push, RxResult, UnsubscribePromise } from './base'; +export type { AugmentedRpc } from '@polkadot/rpc-core/types'; + export interface RxRpcResult extends RxResult { raw (...args: Parameters): Observable; meta: DefinitionRpc; @@ -30,8 +32,3 @@ export type DecoratedRpcSection = { export type DecoratedRpc = { [S in keyof AllSections]: DecoratedRpcSection } - -export type AugmentedRpc = F & { - raw: (...params: Parameters) => Observable; - meta: DefinitionRpc; -}; diff --git a/packages/api/src/util/decorate.ts b/packages/api/src/util/decorate.ts index d92bd55ff7..1fc0e38c3c 100644 --- a/packages/api/src/util/decorate.ts +++ b/packages/api/src/util/decorate.ts @@ -4,7 +4,7 @@ import type { AnyFunction } from '@polkadot/types/types'; import type { ApiTypes, DecorateMethod, MethodResult } from '../types'; -import { lazyDeriveSection } from '@polkadot/api-derive'; +import { lazyDeriveSection } from '../derive'; type AnyDeriveSection = Record; diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json new file mode 100644 index 0000000000..7e5cda531f --- /dev/null +++ b/packages/api/tsconfig.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "baseUrl": "..", + "outDir": "./build", + "rootDir": "./src" + }, + "references": [ + { "path": "../rpc-core" }, + { "path": "../rpc-provider" }, + { "path": "../types" } + ] +} diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json index 98c5d6a84a..7277576ab5 100644 --- a/packages/rpc-core/package.json +++ b/packages/rpc-core/package.json @@ -23,7 +23,7 @@ "version": "6.12.1", "main": "index.js", "dependencies": { - "@babel/runtime": "^7.16.3", + "@babel/runtime": "^7.16.5", "@polkadot/rpc-provider": "6.12.1", "@polkadot/types": "6.12.1", "@polkadot/util": "^8.1.2", diff --git a/packages/rpc-core/src/cached.spec.ts b/packages/rpc-core/src/cached.spec.ts index b97df08220..4bbdcc9fea 100644 --- a/packages/rpc-core/src/cached.spec.ts +++ b/packages/rpc-core/src/cached.spec.ts @@ -92,7 +92,7 @@ describe('Cached Observables', (): void => { it('creates different observables for different methods but same arguments', (): void => { // params do not match here // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access - const observable1 = (rpc.chain as any).subscribeNewHeads([123]); + const observable1 = (rpc.chain).subscribeNewHeads([123]); const observable2 = rpc.state.subscribeStorage([123]); expect(observable2).not.toBe(observable1); diff --git a/packages/rpc-core/src/types.jsonrpc.ts b/packages/rpc-core/src/types.jsonrpc.ts index 68a627164f..fef32f27bf 100644 --- a/packages/rpc-core/src/types.jsonrpc.ts +++ b/packages/rpc-core/src/types.jsonrpc.ts @@ -1,4 +1,12 @@ // Copyright 2017-2021 @polkadot/rpc-core authors & contributors // SPDX-License-Identifier: Apache-2.0 +import type { AugmentedRpc } from './types'; + +export interface RpcInterface { + [section: string]: { + [method: string]: AugmentedRpc<(...params: any[]) => any>; + } +} + export const __PHANTOM_RPC = 'phantom-rpc'; diff --git a/packages/rpc-core/src/types.ts b/packages/rpc-core/src/types.ts index 9c703bce8a..071e232b5d 100644 --- a/packages/rpc-core/src/types.ts +++ b/packages/rpc-core/src/types.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import type { Observable } from 'rxjs'; -import type { Codec, DefinitionRpc } from '@polkadot/types/types'; +import type { AnyFunction, Codec, DefinitionRpc } from '@polkadot/types/types'; export * from '@polkadot/rpc-core/types.jsonrpc'; @@ -11,3 +11,8 @@ export interface RpcInterfaceMethod { raw (...params: unknown[]): Observable; meta: DefinitionRpc; } + +export type AugmentedRpc = F & { + raw: (...params: Parameters) => Observable; + meta: DefinitionRpc; +}; diff --git a/packages/rpc-core/tsconfig.json b/packages/rpc-core/tsconfig.json new file mode 100644 index 0000000000..4c160b0abd --- /dev/null +++ b/packages/rpc-core/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "baseUrl": "..", + "outDir": "./build", + "rootDir": "./src" + }, + "references": [ + { "path": "../rpc-provider" } + ] +} diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json index eba13a3d7d..7642130578 100644 --- a/packages/rpc-provider/package.json +++ b/packages/rpc-provider/package.json @@ -23,7 +23,7 @@ "version": "6.12.1", "main": "index.js", "dependencies": { - "@babel/runtime": "^7.16.3", + "@babel/runtime": "^7.16.5", "@polkadot/types": "6.12.1", "@polkadot/util": "^8.1.2", "@polkadot/util-crypto": "^8.1.2", diff --git a/packages/rpc-provider/src/http/index.spec.ts b/packages/rpc-provider/src/http/index.spec.ts index 1ca1880dd4..8f492d728b 100644 --- a/packages/rpc-provider/src/http/index.spec.ts +++ b/packages/rpc-provider/src/http/index.spec.ts @@ -1,7 +1,8 @@ // Copyright 2017-2021 @polkadot/rpc-provider authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TEST_HTTP_URL } from '../../test/mockHttp'; +import { TEST_HTTP_URL } from '@polkadot/rpc-provider/mock/mockHttp'; + import { HttpProvider } from './'; describe('Http', (): void => { diff --git a/packages/rpc-provider/src/http/send.spec.ts b/packages/rpc-provider/src/http/send.spec.ts index e9214ffa60..d9fe4d7ca8 100644 --- a/packages/rpc-provider/src/http/send.spec.ts +++ b/packages/rpc-provider/src/http/send.spec.ts @@ -1,9 +1,10 @@ // Copyright 2017-2021 @polkadot/rpc-provider authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { Mock } from './../mock/types'; +import type { Mock } from '../mock/types'; + +import { mockHttp, TEST_HTTP_URL } from '@polkadot/rpc-provider/mock/mockHttp'; -import { mockHttp, TEST_HTTP_URL } from '../../test/mockHttp'; import { HttpProvider } from './'; describe('send', (): void => { diff --git a/packages/rpc-provider/test/mockHttp.ts b/packages/rpc-provider/src/mock/mockHttp.ts similarity index 100% rename from packages/rpc-provider/test/mockHttp.ts rename to packages/rpc-provider/src/mock/mockHttp.ts diff --git a/packages/rpc-provider/test/mockWs.ts b/packages/rpc-provider/src/mock/mockWs.ts similarity index 100% rename from packages/rpc-provider/test/mockWs.ts rename to packages/rpc-provider/src/mock/mockWs.ts diff --git a/packages/rpc-provider/src/ws/connect.spec.ts b/packages/rpc-provider/src/ws/connect.spec.ts index 87082d51bd..926c42a2f4 100644 --- a/packages/rpc-provider/src/ws/connect.spec.ts +++ b/packages/rpc-provider/src/ws/connect.spec.ts @@ -1,11 +1,11 @@ // Copyright 2017-2021 @polkadot/rpc-provider authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { Mock } from './../mock/types'; +import type { Mock } from '../mock/types'; import { jest } from '@jest/globals'; -import { mockWs } from '../../test/mockWs'; +import { mockWs } from '../mock/mockWs'; import { WsProvider } from './'; const TEST_WS_URL = 'ws://localhost-connect.spec.ts:9988'; diff --git a/packages/rpc-provider/src/ws/index.spec.ts b/packages/rpc-provider/src/ws/index.spec.ts index e7bc6cb730..4728087abd 100644 --- a/packages/rpc-provider/src/ws/index.spec.ts +++ b/packages/rpc-provider/src/ws/index.spec.ts @@ -1,10 +1,10 @@ // Copyright 2017-2021 @polkadot/rpc-provider authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { Request } from '../../test/mockWs'; +import type { Request } from '../mock/mockWs'; -import { mockWs } from '../../test/mockWs'; -import { Mock } from './../mock/types'; +import { mockWs } from '../mock/mockWs'; +import { Mock } from '../mock/types'; import { WsProvider } from './'; const TEST_WS_URL = 'ws://localhost-index.spec.ts:9977'; diff --git a/packages/rpc-provider/src/ws/send.spec.ts b/packages/rpc-provider/src/ws/send.spec.ts index 7ac0df14c7..f26bb87758 100644 --- a/packages/rpc-provider/src/ws/send.spec.ts +++ b/packages/rpc-provider/src/ws/send.spec.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Constructor } from '@polkadot/types/types'; -import type { Request } from '../../test/mockWs'; +import type { Request } from '../mock/mockWs'; -import { mockWs } from '../../test/mockWs'; -import { Global, Mock } from './../mock/types'; +import { mockWs } from '../mock/mockWs'; +import { Global, Mock } from '../mock/types'; import { WsProvider } from './'; declare const global: Global; diff --git a/packages/rpc-provider/src/ws/subscribe.spec.ts b/packages/rpc-provider/src/ws/subscribe.spec.ts index 0b1a29fd29..c491c4d49f 100644 --- a/packages/rpc-provider/src/ws/subscribe.spec.ts +++ b/packages/rpc-provider/src/ws/subscribe.spec.ts @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 import type { Constructor } from '@polkadot/types/types'; -import type { Request } from '../../test/mockWs'; +import type { Request } from '../mock/mockWs'; +import type { Global, Mock } from './../mock/types'; -import { mockWs } from '../../test/mockWs'; -import { Global, Mock } from './../mock/types'; -import { WsProvider } from './'; +import { mockWs } from '../mock/mockWs'; +import { WsProvider } from '.'; declare const global: Global; diff --git a/packages/rpc-provider/src/ws/unsubscribe.spec.ts b/packages/rpc-provider/src/ws/unsubscribe.spec.ts index 1bce0140aa..81569d8c13 100644 --- a/packages/rpc-provider/src/ws/unsubscribe.spec.ts +++ b/packages/rpc-provider/src/ws/unsubscribe.spec.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import type { Constructor } from '@polkadot/types/types'; -import type { Request } from '../../test/mockWs'; +import type { Request } from '../mock/mockWs'; +import type { Global, Mock } from './../mock/types'; -import { mockWs } from '../../test/mockWs'; -import { Global, Mock } from './../mock/types'; +import { mockWs } from '../mock/mockWs'; import { WsProvider } from './'; declare const global: Global; diff --git a/packages/rpc-provider/tsconfig.json b/packages/rpc-provider/tsconfig.json new file mode 100644 index 0000000000..b0b6d5071f --- /dev/null +++ b/packages/rpc-provider/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "baseUrl": "..", + "outDir": "./build", + "rootDir": "./src", + "resolveJsonModule": true + }, + "references": [ + { "path": "../types" } + ] +} diff --git a/packages/typegen/package.json b/packages/typegen/package.json index bce21ae68c..eacadc93ad 100644 --- a/packages/typegen/package.json +++ b/packages/typegen/package.json @@ -30,9 +30,9 @@ "polkadot-types-internal-metadata": "./scripts/polkadot-types-internal-metadata.cjs" }, "dependencies": { - "@babel/core": "^7.16.0", - "@babel/register": "^7.16.0", - "@babel/runtime": "^7.16.3", + "@babel/core": "^7.16.5", + "@babel/register": "^7.16.5", + "@babel/runtime": "^7.16.5", "@polkadot/api": "6.12.1", "@polkadot/rpc-provider": "6.12.1", "@polkadot/types": "6.12.1", diff --git a/packages/typegen/src/generate/rpc.ts b/packages/typegen/src/generate/rpc.ts index 7629f297e0..03d3a932b0 100644 --- a/packages/typegen/src/generate/rpc.ts +++ b/packages/typegen/src/generate/rpc.ts @@ -135,7 +135,7 @@ export function generateRpcTypes (registry: TypeRegistry, importDefinitions: Rec types: Object.keys(imports.localTypes[packagePath]) })), { - file: '@polkadot/api/types', + file: '@polkadot/rpc-core/types', types: ['AugmentedRpc'] } ] diff --git a/packages/typegen/tsconfig.json b/packages/typegen/tsconfig.json new file mode 100644 index 0000000000..9294375970 --- /dev/null +++ b/packages/typegen/tsconfig.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "baseUrl": "..", + "outDir": "./build", + "rootDir": "./src" + }, + "references": [ + { "path": "../api" }, + { "path": "../rpc-provider" }, + { "path": "../types-support" } + ] +} diff --git a/packages/types-known/package.json b/packages/types-known/package.json index 7984d50307..36df81594a 100644 --- a/packages/types-known/package.json +++ b/packages/types-known/package.json @@ -23,7 +23,7 @@ "version": "6.12.1", "main": "index.js", "dependencies": { - "@babel/runtime": "^7.16.3", + "@babel/runtime": "^7.16.5", "@polkadot/networks": "^8.1.2", "@polkadot/types": "6.12.1", "@polkadot/util": "^8.1.2" diff --git a/packages/types-known/src/bundle.ts b/packages/types-known/src/bundle.ts index 7fc699b9db..b06ef0f4b6 100644 --- a/packages/types-known/src/bundle.ts +++ b/packages/types-known/src/bundle.ts @@ -1,134 +1,6 @@ // Copyright 2017-2021 @polkadot/types-known authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { Text } from '@polkadot/types'; -import type { ExtDef } from '@polkadot/types/extrinsic/signedExtensions/types'; -import type { Hash } from '@polkadot/types/interfaces'; -import type { ChainUpgradeVersion, CodecHasher, DefinitionRpc, DefinitionRpcSub, OverrideModuleType, OverrideVersionedType, Registry, RegistryTypes } from '@polkadot/types/types'; -import type { BN } from '@polkadot/util'; +export * from '@polkadot/types/known'; -import { bnToBn, isNull, isUndefined, objectSpread } from '@polkadot/util'; - -import typesChain from './chain'; -import typesModules from './modules'; -import typesSpec from './spec'; -import upgrades from './upgrades'; - -export { knownOrigins } from './knownOrigins'; export { packageInfo } from './packageInfo'; -export { mapXcmTypes } from './xcm'; - -function withNames (chainName: Text | string, specName: Text | string, fn: (c: string, s: string) => T): T { - return fn(chainName.toString(), specName.toString()); -} - -// flatten a VersionedType[] into a Record -/** @internal */ -function filterVersions (versions: OverrideVersionedType[] = [], specVersion: number): RegistryTypes { - return versions - .filter(({ minmax: [min, max] }) => - (isUndefined(min) || isNull(min) || specVersion >= min) && - (isUndefined(max) || isNull(max) || specVersion <= max) - ) - .reduce((result: RegistryTypes, { types }): RegistryTypes => - objectSpread(result, types), {} - ); -} - -/** - * @description Get types for specific modules (metadata override) - */ -export function getModuleTypes ({ knownTypes }: Registry, section: string): OverrideModuleType { - return objectSpread({}, - typesModules[section], - knownTypes.typesAlias?.[section] - ); -} - -/** - * @description Based on the chain and runtimeVersion, get the applicable signed extensions (ready for registration) - */ -export function getSpecExtensions ({ knownTypes }: Registry, chainName: Text | string, specName: Text | string): ExtDef { - return withNames(chainName, specName, (c, s) => - objectSpread({}, - knownTypes.typesBundle?.spec?.[s]?.signedExtensions, - knownTypes.typesBundle?.chain?.[c]?.signedExtensions - ) - ); -} - -/** - * @description Based on the chain and runtimeVersion, get the applicable types (ready for registration) - */ -export function getSpecTypes ({ knownTypes }: Registry, chainName: Text | string, specName: Text | string, specVersion: bigint | BN | number): RegistryTypes { - const _specVersion = bnToBn(specVersion).toNumber(); - - return withNames(chainName, specName, (c, s) => - // The order here is always, based on - - // - spec then chain - // - typesBundle takes higher precedence - // - types is the final catch-all override - objectSpread({}, - filterVersions(typesSpec[s], _specVersion), - filterVersions(typesChain[c], _specVersion), - filterVersions(knownTypes.typesBundle?.spec?.[s]?.types, _specVersion), - filterVersions(knownTypes.typesBundle?.chain?.[c]?.types, _specVersion), - knownTypes.typesSpec?.[s], - knownTypes.typesChain?.[c], - knownTypes.types - ) - ); -} - -export function getSpecHasher ({ knownTypes }: Registry, chainName: Text | string, specName: Text | string): CodecHasher | null { - return withNames(chainName, specName, (c, s) => - knownTypes.hasher || - knownTypes.typesBundle?.chain?.[c]?.hasher || - knownTypes.typesBundle?.spec?.[s]?.hasher || - null - ); -} - -/** - * @description Based on the chain and runtimeVersion, get the applicable rpc definitions (ready for registration) - */ -export function getSpecRpc ({ knownTypes }: Registry, chainName: Text | string, specName: Text | string): Record> { - return withNames(chainName, specName, (c, s) => - objectSpread({}, - knownTypes.typesBundle?.spec?.[s]?.rpc, - knownTypes.typesBundle?.chain?.[c]?.rpc - ) - ); -} - -/** - * @description Based on the chain and runtimeVersion, get the applicable alias definitions (ready for registration) - */ -export function getSpecAlias ({ knownTypes }: Registry, chainName: Text | string, specName: Text | string): Record { - return withNames(chainName, specName, (c, s) => - // as per versions, first spec, then chain then finally non-versioned - objectSpread({}, - knownTypes.typesBundle?.spec?.[s]?.alias, - knownTypes.typesBundle?.chain?.[c]?.alias, - knownTypes.typesAlias - ) - ); -} - -/** - * @description Returns a version record for known chains where upgrades are being tracked - */ -export function getUpgradeVersion (genesisHash: Hash, blockNumber: BN): [ChainUpgradeVersion | undefined, ChainUpgradeVersion | undefined] { - const known = upgrades.find((u) => genesisHash.eq(u.genesisHash)); - - return known - ? [ - known.versions.reduce((last, version) => { - return blockNumber.gt(version.blockNumber) - ? version - : last; - }, undefined), - known.versions.find((version) => blockNumber.lte(version.blockNumber)) - ] - : [undefined, undefined]; -} diff --git a/packages/types-known/tsconfig.json b/packages/types-known/tsconfig.json new file mode 100644 index 0000000000..062eb84f27 --- /dev/null +++ b/packages/types-known/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "baseUrl": "..", + "outDir": "./build", + "rootDir": "./src" + }, + "references": [ + { "path": "../types" } + ] +} diff --git a/packages/types-support/package.json b/packages/types-support/package.json index 0298292dcd..4df19ca84f 100644 --- a/packages/types-support/package.json +++ b/packages/types-support/package.json @@ -23,7 +23,7 @@ "version": "6.12.1", "main": "index.js", "dependencies": { - "@babel/runtime": "^7.16.3", + "@babel/runtime": "^7.16.5", "@polkadot/util": "^8.1.2" } } diff --git a/packages/types-support/tsconfig.json b/packages/types-support/tsconfig.json new file mode 100644 index 0000000000..b6d2709520 --- /dev/null +++ b/packages/types-support/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "baseUrl": "..", + "outDir": "./build", + "rootDir": "./src", + "resolveJsonModule": true + }, + "include": ["src/**/*.json", "src/**/*.ts"], + "references": [] +} diff --git a/packages/types/package.json b/packages/types/package.json index 0377e0c333..ed53e84db6 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -23,7 +23,7 @@ "version": "6.12.1", "main": "index.js", "dependencies": { - "@babel/runtime": "^7.16.3", + "@babel/runtime": "^7.16.5", "@polkadot/types-known": "6.12.1", "@polkadot/util": "^8.1.2", "@polkadot/util-crypto": "^8.1.2", diff --git a/packages/types/src/detectPackage.ts b/packages/types/src/detectPackage.ts index 51a03bc9e6..694b75baae 100644 --- a/packages/types/src/detectPackage.ts +++ b/packages/types/src/detectPackage.ts @@ -1,9 +1,8 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { packageInfo as knownInfo } from '@polkadot/types-known/packageInfo'; import { detectPackage } from '@polkadot/util'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [knownInfo]); +detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, []); diff --git a/packages/types/src/generic/Block.ts b/packages/types/src/generic/Block.ts index 647f86432e..8a4b73b7a9 100644 --- a/packages/types/src/generic/Block.ts +++ b/packages/types/src/generic/Block.ts @@ -9,7 +9,7 @@ import type { AnyNumber, AnyU8a, Registry } from '../types'; import { Struct } from '../codec/Struct'; export interface HeaderValue { - digest?: Digest | { logs: DigestItem[] }; + digest?: Digest | { logs: DigestItem[] | string[] }; extrinsicsRoot?: AnyU8a; number?: AnyNumber; parentHash?: AnyU8a; diff --git a/packages/types/src/interfaces/xcm/definitions.ts b/packages/types/src/interfaces/xcm/definitions.ts index ae0597abea..e701c5a3c4 100644 --- a/packages/types/src/interfaces/xcm/definitions.ts +++ b/packages/types/src/interfaces/xcm/definitions.ts @@ -6,9 +6,9 @@ import type { Definitions } from '../../types'; -import { mapXcmTypes } from '@polkadot/types-known'; import { objectSpread } from '@polkadot/util'; +import { mapXcmTypes } from '../../known'; import { v0 } from './v0'; import { v1 } from './v1'; import { v2 } from './v2'; diff --git a/packages/types-known/src/chain/index.ts b/packages/types/src/known/chain/index.ts similarity index 78% rename from packages/types-known/src/chain/index.ts rename to packages/types/src/known/chain/index.ts index 2fb923c89b..45ce685cbd 100644 --- a/packages/types-known/src/chain/index.ts +++ b/packages/types/src/known/chain/index.ts @@ -1,7 +1,7 @@ // Copyright 2017-2021 @polkadot/types-known authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { OverrideVersionedType } from '@polkadot/types/types'; +import type { OverrideVersionedType } from '../../types'; // Type overrides based on specific nodes const typesChain: Record = {}; diff --git a/packages/types-known/src/index.spec.ts b/packages/types/src/known/index.spec.ts similarity index 91% rename from packages/types-known/src/index.spec.ts rename to packages/types/src/known/index.spec.ts index 299515b1b3..34acda6e5d 100644 --- a/packages/types-known/src/index.spec.ts +++ b/packages/types/src/known/index.spec.ts @@ -1,9 +1,8 @@ // Copyright 2017-2021 @polkadot/types-known authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TypeRegistry } from '@polkadot/types/create/registry'; - -import { getModuleTypes } from './'; +import { TypeRegistry } from '../create/registry'; +import { getModuleTypes } from '.'; const registry = new TypeRegistry(); diff --git a/packages/types/src/known/index.ts b/packages/types/src/known/index.ts new file mode 100644 index 0000000000..f143ab9592 --- /dev/null +++ b/packages/types/src/known/index.ts @@ -0,0 +1,133 @@ +// Copyright 2017-2021 @polkadot/types-known authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { BN } from '@polkadot/util'; +import type { ExtDef } from '../extrinsic/signedExtensions/types'; +import type { Hash } from '../interfaces'; +import type { Text } from '../primitive'; +import type { ChainUpgradeVersion, CodecHasher, DefinitionRpc, DefinitionRpcSub, OverrideModuleType, OverrideVersionedType, Registry, RegistryTypes } from '../types'; + +import { bnToBn, isNull, isUndefined, objectSpread } from '@polkadot/util'; + +import typesChain from './chain'; +import typesModules from './modules'; +import typesSpec from './spec'; +import upgrades from './upgrades'; + +export { knownOrigins } from './knownOrigins'; +export { mapXcmTypes } from './xcm'; + +function withNames (chainName: Text | string, specName: Text | string, fn: (c: string, s: string) => T): T { + return fn(chainName.toString(), specName.toString()); +} + +// flatten a VersionedType[] into a Record +/** @internal */ +function filterVersions (versions: OverrideVersionedType[] = [], specVersion: number): RegistryTypes { + return versions + .filter(({ minmax: [min, max] }) => + (isUndefined(min) || isNull(min) || specVersion >= min) && + (isUndefined(max) || isNull(max) || specVersion <= max) + ) + .reduce((result: RegistryTypes, { types }): RegistryTypes => + objectSpread(result, types), {} + ); +} + +/** + * @description Get types for specific modules (metadata override) + */ +export function getModuleTypes ({ knownTypes }: Registry, section: string): OverrideModuleType { + return objectSpread({}, + typesModules[section], + knownTypes.typesAlias?.[section] + ); +} + +/** + * @description Based on the chain and runtimeVersion, get the applicable signed extensions (ready for registration) + */ +export function getSpecExtensions ({ knownTypes }: Registry, chainName: Text | string, specName: Text | string): ExtDef { + return withNames(chainName, specName, (c, s) => + objectSpread({}, + knownTypes.typesBundle?.spec?.[s]?.signedExtensions, + knownTypes.typesBundle?.chain?.[c]?.signedExtensions + ) + ); +} + +/** + * @description Based on the chain and runtimeVersion, get the applicable types (ready for registration) + */ +export function getSpecTypes ({ knownTypes }: Registry, chainName: Text | string, specName: Text | string, specVersion: bigint | BN | number): RegistryTypes { + const _specVersion = bnToBn(specVersion).toNumber(); + + return withNames(chainName, specName, (c, s) => + // The order here is always, based on - + // - spec then chain + // - typesBundle takes higher precedence + // - types is the final catch-all override + objectSpread({}, + filterVersions(typesSpec[s], _specVersion), + filterVersions(typesChain[c], _specVersion), + filterVersions(knownTypes.typesBundle?.spec?.[s]?.types, _specVersion), + filterVersions(knownTypes.typesBundle?.chain?.[c]?.types, _specVersion), + knownTypes.typesSpec?.[s], + knownTypes.typesChain?.[c], + knownTypes.types + ) + ); +} + +export function getSpecHasher ({ knownTypes }: Registry, chainName: Text | string, specName: Text | string): CodecHasher | null { + return withNames(chainName, specName, (c, s) => + knownTypes.hasher || + knownTypes.typesBundle?.chain?.[c]?.hasher || + knownTypes.typesBundle?.spec?.[s]?.hasher || + null + ); +} + +/** + * @description Based on the chain and runtimeVersion, get the applicable rpc definitions (ready for registration) + */ +export function getSpecRpc ({ knownTypes }: Registry, chainName: Text | string, specName: Text | string): Record> { + return withNames(chainName, specName, (c, s) => + objectSpread({}, + knownTypes.typesBundle?.spec?.[s]?.rpc, + knownTypes.typesBundle?.chain?.[c]?.rpc + ) + ); +} + +/** + * @description Based on the chain and runtimeVersion, get the applicable alias definitions (ready for registration) + */ +export function getSpecAlias ({ knownTypes }: Registry, chainName: Text | string, specName: Text | string): Record { + return withNames(chainName, specName, (c, s) => + // as per versions, first spec, then chain then finally non-versioned + objectSpread({}, + knownTypes.typesBundle?.spec?.[s]?.alias, + knownTypes.typesBundle?.chain?.[c]?.alias, + knownTypes.typesAlias + ) + ); +} + +/** + * @description Returns a version record for known chains where upgrades are being tracked + */ +export function getUpgradeVersion (genesisHash: Hash, blockNumber: BN): [ChainUpgradeVersion | undefined, ChainUpgradeVersion | undefined] { + const known = upgrades.find((u) => genesisHash.eq(u.genesisHash)); + + return known + ? [ + known.versions.reduce((last, version) => { + return blockNumber.gt(version.blockNumber) + ? version + : last; + }, undefined), + known.versions.find((version) => blockNumber.lte(version.blockNumber)) + ] + : [undefined, undefined]; +} diff --git a/packages/types-known/src/knownOrigins.ts b/packages/types/src/known/knownOrigins.ts similarity index 100% rename from packages/types-known/src/knownOrigins.ts rename to packages/types/src/known/knownOrigins.ts diff --git a/packages/types-known/src/modules.ts b/packages/types/src/known/modules.ts similarity index 97% rename from packages/types-known/src/modules.ts rename to packages/types/src/known/modules.ts index efffe7de37..148ba37b40 100644 --- a/packages/types-known/src/modules.ts +++ b/packages/types/src/known/modules.ts @@ -1,7 +1,7 @@ // Copyright 2017-2021 @polkadot/types-known authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { OverrideModuleType } from '@polkadot/types/types'; +import type { OverrideModuleType } from '../types'; // type overrides for modules (where duplication between modules exist) const typesModules: Record = { diff --git a/packages/types-known/src/spec/centrifuge-chain.ts b/packages/types/src/known/spec/centrifuge-chain.ts similarity index 96% rename from packages/types-known/src/spec/centrifuge-chain.ts rename to packages/types/src/known/spec/centrifuge-chain.ts index 21b17e2a28..bb3948462f 100644 --- a/packages/types-known/src/spec/centrifuge-chain.ts +++ b/packages/types/src/known/spec/centrifuge-chain.ts @@ -3,7 +3,7 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '@polkadot/types/types'; +import type { OverrideVersionedType } from '../../types'; import { objectSpread } from '@polkadot/util'; diff --git a/packages/types-known/src/spec/index.ts b/packages/types/src/known/spec/index.ts similarity index 92% rename from packages/types-known/src/spec/index.ts rename to packages/types/src/known/spec/index.ts index 941029435a..1ee47d5584 100644 --- a/packages/types-known/src/spec/index.ts +++ b/packages/types/src/known/spec/index.ts @@ -1,7 +1,7 @@ // Copyright 2017-2021 @polkadot/types-known authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { OverrideVersionedType } from '@polkadot/types/types'; +import type { OverrideVersionedType } from '../../types'; import centrifugeChain from './centrifuge-chain'; import kusama from './kusama'; diff --git a/packages/types-known/src/spec/kusama.ts b/packages/types/src/known/spec/kusama.ts similarity index 98% rename from packages/types-known/src/spec/kusama.ts rename to packages/types/src/known/spec/kusama.ts index bcbfbe64e3..336bd232d9 100644 --- a/packages/types-known/src/spec/kusama.ts +++ b/packages/types/src/known/spec/kusama.ts @@ -3,7 +3,7 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '@polkadot/types/types'; +import type { OverrideVersionedType } from '../../types'; import { objectSpread } from '@polkadot/util'; diff --git a/packages/types-known/src/spec/node-template.ts b/packages/types/src/known/spec/node-template.ts similarity index 81% rename from packages/types-known/src/spec/node-template.ts rename to packages/types/src/known/spec/node-template.ts index 1f55f46b10..86c525d213 100644 --- a/packages/types-known/src/spec/node-template.ts +++ b/packages/types/src/known/spec/node-template.ts @@ -3,7 +3,7 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '@polkadot/types/types'; +import type { OverrideVersionedType } from '../../types'; const versioned: OverrideVersionedType[] = [ { diff --git a/packages/types-known/src/spec/node.ts b/packages/types/src/known/spec/node.ts similarity index 81% rename from packages/types-known/src/spec/node.ts rename to packages/types/src/known/spec/node.ts index 1f55f46b10..86c525d213 100644 --- a/packages/types-known/src/spec/node.ts +++ b/packages/types/src/known/spec/node.ts @@ -3,7 +3,7 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '@polkadot/types/types'; +import type { OverrideVersionedType } from '../../types'; const versioned: OverrideVersionedType[] = [ { diff --git a/packages/types-known/src/spec/polkadot.ts b/packages/types/src/known/spec/polkadot.ts similarity index 96% rename from packages/types-known/src/spec/polkadot.ts rename to packages/types/src/known/spec/polkadot.ts index 91a626025e..d588f5a03f 100644 --- a/packages/types-known/src/spec/polkadot.ts +++ b/packages/types/src/known/spec/polkadot.ts @@ -3,7 +3,7 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '@polkadot/types/types'; +import type { OverrideVersionedType } from '../../types'; import { objectSpread } from '@polkadot/util'; diff --git a/packages/types-known/src/spec/rococo.ts b/packages/types/src/known/spec/rococo.ts similarity index 94% rename from packages/types-known/src/spec/rococo.ts rename to packages/types/src/known/spec/rococo.ts index f8f5eae824..607e96b3e0 100644 --- a/packages/types-known/src/spec/rococo.ts +++ b/packages/types/src/known/spec/rococo.ts @@ -3,7 +3,7 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '@polkadot/types/types'; +import type { OverrideVersionedType } from '../../types'; import { objectSpread } from '@polkadot/util'; diff --git a/packages/types-known/src/spec/shell.ts b/packages/types/src/known/spec/shell.ts similarity index 81% rename from packages/types-known/src/spec/shell.ts rename to packages/types/src/known/spec/shell.ts index c394430099..a6f24146a7 100644 --- a/packages/types-known/src/spec/shell.ts +++ b/packages/types/src/known/spec/shell.ts @@ -3,7 +3,7 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '@polkadot/types/types'; +import type { OverrideVersionedType } from '../../types'; const versioned: OverrideVersionedType[] = [ { diff --git a/packages/types-known/src/spec/statemint.ts b/packages/types/src/known/spec/statemint.ts similarity index 92% rename from packages/types-known/src/spec/statemint.ts rename to packages/types/src/known/spec/statemint.ts index 1ce62229a0..118a93ec2b 100644 --- a/packages/types-known/src/spec/statemint.ts +++ b/packages/types/src/known/spec/statemint.ts @@ -3,7 +3,7 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '@polkadot/types/types'; +import type { OverrideVersionedType } from '../../types'; import { objectSpread } from '@polkadot/util'; diff --git a/packages/types-known/src/spec/westend.ts b/packages/types/src/known/spec/westend.ts similarity index 97% rename from packages/types-known/src/spec/westend.ts rename to packages/types/src/known/spec/westend.ts index ad19d5e28a..8ca872291a 100644 --- a/packages/types-known/src/spec/westend.ts +++ b/packages/types/src/known/spec/westend.ts @@ -3,7 +3,7 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '@polkadot/types/types'; +import type { OverrideVersionedType } from '../../types'; import { objectSpread } from '@polkadot/util'; diff --git a/packages/types-known/src/upgrades/index.spec.ts b/packages/types/src/known/upgrades/index.spec.ts similarity index 100% rename from packages/types-known/src/upgrades/index.spec.ts rename to packages/types/src/known/upgrades/index.spec.ts diff --git a/packages/types-known/src/upgrades/index.ts b/packages/types/src/known/upgrades/index.ts similarity index 96% rename from packages/types-known/src/upgrades/index.ts rename to packages/types/src/known/upgrades/index.ts index 6cf0db3f8d..056baa3175 100644 --- a/packages/types-known/src/upgrades/index.ts +++ b/packages/types/src/known/upgrades/index.ts @@ -1,7 +1,7 @@ // Copyright 2017-2021 @polkadot/types-known authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { ChainUpgrades } from '@polkadot/types/types'; +import type { ChainUpgrades } from '../../types'; import type { ChainUpgradesRaw } from './types'; import { selectableNetworks } from '@polkadot/networks'; diff --git a/packages/types-known/src/upgrades/kusama.ts b/packages/types/src/known/upgrades/kusama.ts similarity index 100% rename from packages/types-known/src/upgrades/kusama.ts rename to packages/types/src/known/upgrades/kusama.ts diff --git a/packages/types-known/src/upgrades/polkadot.ts b/packages/types/src/known/upgrades/polkadot.ts similarity index 100% rename from packages/types-known/src/upgrades/polkadot.ts rename to packages/types/src/known/upgrades/polkadot.ts diff --git a/packages/types-known/src/upgrades/types.ts b/packages/types/src/known/upgrades/types.ts similarity index 100% rename from packages/types-known/src/upgrades/types.ts rename to packages/types/src/known/upgrades/types.ts diff --git a/packages/types-known/src/upgrades/westend.ts b/packages/types/src/known/upgrades/westend.ts similarity index 100% rename from packages/types-known/src/upgrades/westend.ts rename to packages/types/src/known/upgrades/westend.ts diff --git a/packages/types-known/src/xcm.ts b/packages/types/src/known/xcm.ts similarity index 100% rename from packages/types-known/src/xcm.ts rename to packages/types/src/known/xcm.ts diff --git a/packages/types/src/metadata/util/types.ts b/packages/types/src/metadata/util/types.ts index 32b4be51ba..090ecf010b 100644 --- a/packages/types/src/metadata/util/types.ts +++ b/packages/types/src/metadata/util/types.ts @@ -7,5 +7,5 @@ export interface Check { compare: Record; data: HexString; fails?: string[]; - types?: Record; + types?: unknown[]; } diff --git a/packages/types/src/metadata/v13/toV14.ts b/packages/types/src/metadata/v13/toV14.ts index 0df599d448..ad95706fea 100644 --- a/packages/types/src/metadata/v13/toV14.ts +++ b/packages/types/src/metadata/v13/toV14.ts @@ -7,9 +7,10 @@ import type { Text } from '../../primitive/Text'; import type { Type } from '../../primitive/Type'; import type { OverrideModuleType, Registry } from '../../types'; -import { getModuleTypes, knownOrigins } from '@polkadot/types-known'; import { stringCamelCase } from '@polkadot/util'; +import { getModuleTypes, knownOrigins } from '../../known'; + interface MapDef { hashers: StorageHasherV13[]; keys: Type[]; diff --git a/packages/types/src/metadata/v14/Metadata.spec.ts b/packages/types/src/metadata/v14/Metadata.spec.ts index 0e02b9f076..5dc2d8c271 100644 --- a/packages/types/src/metadata/v14/Metadata.spec.ts +++ b/packages/types/src/metadata/v14/Metadata.spec.ts @@ -17,16 +17,16 @@ testMeta(14, { kusama: { compare: kusamaJson as Record, data: kusamaData, - types: kusamaTypes as Record + types: kusamaTypes as unknown[] }, polkadot: { compare: polkadotJson as Record, data: polkadotData, - types: polkadotTypes as Record + types: polkadotTypes as unknown[] }, substrate: { compare: substrateJson as Record, data: substrateData, - types: substrateTypes as Record + types: substrateTypes as unknown[] } }); diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json new file mode 100644 index 0000000000..1cd55b8c03 --- /dev/null +++ b/packages/types/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "baseUrl": "..", + "outDir": "./build", + "rootDir": "./src", + "resolveJsonModule": true + }, + "references": [ + { "path": "../types-support" } + ] +} diff --git a/tsconfig.base.json b/tsconfig.base.json index 972f5d5697..08d5671eae 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1,12 +1,13 @@ { "extends": "@polkadot/dev/config/tsconfig.json", - "compilerOptions": { - "composite": true, - "paths": { + "compilerOptions": { + "composite": true, + "paths": { "@polkadot/api": ["api/src"], "@polkadot/api/*": ["api/src/*"], "@polkadot/api-contract": ["api-contract/src"], "@polkadot/api-contract/*": ["api-contract/src/*"], + "@polkadot/api-contract-support/*": ["api-contract-support/src/*"], "@polkadot/api-derive": ["api-derive/src"], "@polkadot/api-derive/*": ["api-derive/src/*"], "@polkadot/rpc-core": ["rpc-core/src"], @@ -25,5 +26,5 @@ "./node_modules/@polkadot/ts", "./node_modules/@types" ] - } + } } diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json new file mode 100644 index 0000000000..57e508f8bb --- /dev/null +++ b/tsconfig.eslint.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.base.json", + "compilerOptions": { + "baseUrl": "./packages" + }, + "include": ["packages/**/src/**/*", "packages/**/scripts/**/*", "packages/**/test/**/*"], + "exclue": ["**/node_modules/**/*"] +} diff --git a/tsconfig.json b/tsconfig.json index f8dbc9fff9..90110b83ed 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,10 +1,18 @@ { - "extends": "./tsconfig.base.json", - "exclude": [ - "build/**/*", - "**/build/**/*" - ], "compilerOptions": { - "baseUrl": "./packages" - } + "composite": true + }, + "files": [], + "references": [ + { "path": "./packages/api" }, + { "path": "./packages/api-contract" }, + { "path": "./packages/api-contract-support" }, + { "path": "./packages/api-derive" }, + { "path": "./packages/rpc-core" }, + { "path": "./packages/rpc-provider" }, + { "path": "./packages/typegen" }, + { "path": "./packages/types" }, + { "path": "./packages/types-known" }, + { "path": "./packages/types-support" } + ] } diff --git a/yarn.lock b/yarn.lock index 8dfa3d0ef7..8f7a49ffaa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -48,18 +48,18 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:7.16.0, @babel/core@npm:^7.1.0, @babel/core@npm:^7.16.0, @babel/core@npm:^7.7.2, @babel/core@npm:^7.7.5": - version: 7.16.0 - resolution: "@babel/core@npm:7.16.0" +"@babel/core@npm:7.16.5, @babel/core@npm:^7.1.0, @babel/core@npm:^7.16.5, @babel/core@npm:^7.7.2, @babel/core@npm:^7.7.5": + version: 7.16.5 + resolution: "@babel/core@npm:7.16.5" dependencies: "@babel/code-frame": ^7.16.0 - "@babel/generator": ^7.16.0 - "@babel/helper-compilation-targets": ^7.16.0 - "@babel/helper-module-transforms": ^7.16.0 - "@babel/helpers": ^7.16.0 - "@babel/parser": ^7.16.0 + "@babel/generator": ^7.16.5 + "@babel/helper-compilation-targets": ^7.16.3 + "@babel/helper-module-transforms": ^7.16.5 + "@babel/helpers": ^7.16.5 + "@babel/parser": ^7.16.5 "@babel/template": ^7.16.0 - "@babel/traverse": ^7.16.0 + "@babel/traverse": ^7.16.5 "@babel/types": ^7.16.0 convert-source-map: ^1.7.0 debug: ^4.1.0 @@ -67,18 +67,18 @@ __metadata: json5: ^2.1.2 semver: ^6.3.0 source-map: ^0.5.0 - checksum: a140f669daa90c774016a76b1f85641975333c1c219ae0a8e65d8b4c316836e918276e0dfd55613b14f8e578406a92393d4368a63bdd5d0708122976ee2ee8e3 + checksum: e5b76c6be95ab56a441772173463a56f824b39eba5fd3efe4b9784863922a1cb8abde6331d894854ed563b5ffe4be76d52524ecd07963660bb146f49a3cb3556 languageName: node linkType: hard -"@babel/generator@npm:^7.16.0, @babel/generator@npm:^7.7.2": - version: 7.16.0 - resolution: "@babel/generator@npm:7.16.0" +"@babel/generator@npm:^7.16.5, @babel/generator@npm:^7.7.2": + version: 7.16.5 + resolution: "@babel/generator@npm:7.16.5" dependencies: "@babel/types": ^7.16.0 jsesc: ^2.5.1 source-map: ^0.5.0 - checksum: 9ff53e0db72a225c8783c4a277698b4efcead750542ebb9cff31732ba62d092090715a772df10a323446924712f6928ad60c03db4e7051bed3a9701b552d51fb + checksum: 621fa2da21a5397a4739f03af1eda76140f0da9f962071640a479c0cf1859edc576aa8881b5771be9274238f048bf9024c94d826003659f64eee29c48f2fe470 languageName: node linkType: hard @@ -91,17 +91,17 @@ __metadata: languageName: node linkType: hard -"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.16.0" +"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.16.5" dependencies: "@babel/helper-explode-assignable-expression": ^7.16.0 "@babel/types": ^7.16.0 - checksum: 01beb9f3f2285b7b170cc167ec79b2fd657202cb25be9cb111951f94a04c97c5b446dd1498ede32f0052d67fc9f2f2ac2b7862351b364fe94f9b4de98488d863 + checksum: c351f534205aba6eff063692bb410d8484d568947b94df3f6f86396a1bd009156692e448cbee747442df29c53ac2f444d7a324861579762833665f5de04c9c62 languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.16.0, @babel/helper-compilation-targets@npm:^7.16.3": +"@babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.16.3": version: 7.16.3 resolution: "@babel/helper-compilation-targets@npm:7.16.3" dependencies: @@ -115,19 +115,20 @@ __metadata: languageName: node linkType: hard -"@babel/helper-create-class-features-plugin@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/helper-create-class-features-plugin@npm:7.16.0" +"@babel/helper-create-class-features-plugin@npm:^7.16.0, @babel/helper-create-class-features-plugin@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/helper-create-class-features-plugin@npm:7.16.5" dependencies: "@babel/helper-annotate-as-pure": ^7.16.0 + "@babel/helper-environment-visitor": ^7.16.5 "@babel/helper-function-name": ^7.16.0 - "@babel/helper-member-expression-to-functions": ^7.16.0 + "@babel/helper-member-expression-to-functions": ^7.16.5 "@babel/helper-optimise-call-expression": ^7.16.0 - "@babel/helper-replace-supers": ^7.16.0 + "@babel/helper-replace-supers": ^7.16.5 "@babel/helper-split-export-declaration": ^7.16.0 peerDependencies: "@babel/core": ^7.0.0 - checksum: 0f7d1b8d413e5fbd719c95e22e3b59749b4c6c652f20e0fa1fa954112145a134c22709f1325574632d7262aeeeaaf4fc7c2eb8117e0d521e42b36d05c3e5a885 + checksum: f558098f8297c1fb4d824bffd099f285af35bb6ca3080701e1da3f88b21ab9a94fd444603175ba186762eb2c2ef8197416faafeacd2a82aab1b7c4a233c765a8 languageName: node linkType: hard @@ -161,6 +162,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-environment-visitor@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/helper-environment-visitor@npm:7.16.5" + dependencies: + "@babel/types": ^7.16.0 + checksum: f57da613f2fb9ca0b85cb4a9131cb688555e78ba8b0047ac0e73551b247eb71bf8fa075e6408064e8ab71ec230f24b4e06367efc9ccd1dcfcea0efe0086f02f3 + languageName: node + linkType: hard + "@babel/helper-explode-assignable-expression@npm:^7.16.0": version: 7.16.0 resolution: "@babel/helper-explode-assignable-expression@npm:7.16.0" @@ -199,12 +209,12 @@ __metadata: languageName: node linkType: hard -"@babel/helper-member-expression-to-functions@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/helper-member-expression-to-functions@npm:7.16.0" +"@babel/helper-member-expression-to-functions@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/helper-member-expression-to-functions@npm:7.16.5" dependencies: "@babel/types": ^7.16.0 - checksum: 58ef8e3a4af0c1dc43a2011f43f25502877ac1c5aa9a4a6586f0265ab857b65831f60560044bc9380df43c91ac21cad39a84095b91764b433d1acf18d27e38d6 + checksum: 54d061e0f77fc7b4c338aca4c53104f5074126c23a702e6320dac39c4f99ee7ea07962824256b6b18f1202ea3c23d4e388b23a846df65550896398f65675d397 languageName: node linkType: hard @@ -217,19 +227,19 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/helper-module-transforms@npm:7.16.0" +"@babel/helper-module-transforms@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/helper-module-transforms@npm:7.16.5" dependencies: + "@babel/helper-environment-visitor": ^7.16.5 "@babel/helper-module-imports": ^7.16.0 - "@babel/helper-replace-supers": ^7.16.0 "@babel/helper-simple-access": ^7.16.0 "@babel/helper-split-export-declaration": ^7.16.0 "@babel/helper-validator-identifier": ^7.15.7 "@babel/template": ^7.16.0 - "@babel/traverse": ^7.16.0 + "@babel/traverse": ^7.16.5 "@babel/types": ^7.16.0 - checksum: a3d0e5556f26ebdf2ae422af3b9a1ba1848fead891f46bcd1c6a4be88ad8e9f348140f81d1843a3481574be1643a9c79b01469231f5b5801f5d5e691efdd11f3 + checksum: 0463e7198e5540cbb90981f769c89ec302001b211c33df1a6790a1eaee678ec418cee40ef3cf0fe159d40787214fbba129582f6b07e79244dc8cbcd5e791dd18 languageName: node linkType: hard @@ -242,33 +252,34 @@ __metadata: languageName: node linkType: hard -"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.13.0, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3": - version: 7.14.5 - resolution: "@babel/helper-plugin-utils@npm:7.14.5" - checksum: fe20e90a24d02770a60ebe80ab9f0dfd7258503cea8006c71709ac9af1aa3e47b0de569499673f11ea6c99597f8c0e4880ae1d505986e61101b69716820972fe +"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.13.0, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3": + version: 7.16.5 + resolution: "@babel/helper-plugin-utils@npm:7.16.5" + checksum: 3ff605f879a9ed287952b538a8334bb16e6cf7cf441f205713b1cf8043b047a965773b66e50575018504f349e16368acfe4702a2f376e16263733e2c7c6c3e39 languageName: node linkType: hard -"@babel/helper-remap-async-to-generator@npm:^7.16.0, @babel/helper-remap-async-to-generator@npm:^7.16.4": - version: 7.16.4 - resolution: "@babel/helper-remap-async-to-generator@npm:7.16.4" +"@babel/helper-remap-async-to-generator@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/helper-remap-async-to-generator@npm:7.16.5" dependencies: "@babel/helper-annotate-as-pure": ^7.16.0 - "@babel/helper-wrap-function": ^7.16.0 + "@babel/helper-wrap-function": ^7.16.5 "@babel/types": ^7.16.0 - checksum: debe997695fe2c11813e88b2fa4afc89d4543f72457dda00c7296a728cd5eeb81d4ef8607a5fef7823da410a8579407c631a430e5bfc78290172ff6fc430355c + checksum: 85195707465fc9fe87b1ce67490c7e7a58ea980444f8a34d156a0e09bf3148a66b245b1425e4f4fa13d3a6eb09395943cae52df57bc4296d7eb6d3bc3cb0c3ff languageName: node linkType: hard -"@babel/helper-replace-supers@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/helper-replace-supers@npm:7.16.0" +"@babel/helper-replace-supers@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/helper-replace-supers@npm:7.16.5" dependencies: - "@babel/helper-member-expression-to-functions": ^7.16.0 + "@babel/helper-environment-visitor": ^7.16.5 + "@babel/helper-member-expression-to-functions": ^7.16.5 "@babel/helper-optimise-call-expression": ^7.16.0 - "@babel/traverse": ^7.16.0 + "@babel/traverse": ^7.16.5 "@babel/types": ^7.16.0 - checksum: 61f04bbe05ff0987d5a8d5253cb101d47004a27951d6c5cd95457e30fcb3adaca85f0bcaa7f31f4d934f22386b935ac7281398c68982d4a4768769d95c028460 + checksum: 7eb2cba87a6c4d9c7a8d0951b70eb19007e37bfbba61e1087f847fb263b21e13cc659d6ce29c0ccd00f9870e26131c1e09a0f01afcd10f6cb792dc9d8db147bc languageName: node linkType: hard @@ -313,26 +324,26 @@ __metadata: languageName: node linkType: hard -"@babel/helper-wrap-function@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/helper-wrap-function@npm:7.16.0" +"@babel/helper-wrap-function@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/helper-wrap-function@npm:7.16.5" dependencies: "@babel/helper-function-name": ^7.16.0 "@babel/template": ^7.16.0 - "@babel/traverse": ^7.16.0 + "@babel/traverse": ^7.16.5 "@babel/types": ^7.16.0 - checksum: 2bb4e05f49cf217cc5890581284a051245ba0ddaccbe3ddd662010d7a6969f52d2027e310d26db2e030273c5fe9341448c7845fcb4795ad8eb56bdeabec148b8 + checksum: fd53491bb27b9939604f1a1d2b7ef64aff582257e77991406b42ef1656e0e3bd8368e63413af3115fb0308ed5919c8d06f39deea430eaeef36b3802416cd4aa7 languageName: node linkType: hard -"@babel/helpers@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/helpers@npm:7.16.0" +"@babel/helpers@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/helpers@npm:7.16.5" dependencies: "@babel/template": ^7.16.0 - "@babel/traverse": ^7.16.0 + "@babel/traverse": ^7.16.5 "@babel/types": ^7.16.0 - checksum: 88d37c414dfb8815d5966774f9d65c9378fe9fd2e7e70f5c1c13e0611eca41b7114e9ffa8b37a69682c1a31a83dc7302e92e759b515220fea16c8e642282375a + checksum: 960d938a4359b7f9ff7b753e33b6f600e269aec0ef6030c8026ac37525103da8cde5f1c04ce7de1ad6fc37707aa6178eae938d6fc82544aa25c9fd602c62e0a8 languageName: node linkType: hard @@ -347,12 +358,12 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.0.0, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.16.0, @babel/parser@npm:^7.7.2": - version: 7.16.2 - resolution: "@babel/parser@npm:7.16.2" +"@babel/parser@npm:^7.0.0, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.16.0, @babel/parser@npm:^7.16.5, @babel/parser@npm:^7.7.2": + version: 7.16.5 + resolution: "@babel/parser@npm:7.16.5" bin: parser: ./bin/babel-parser.js - checksum: e8ceef8214adf55beaae80fff1647ae6535e17af592749a6f3fd3ed1081bbb1474fd88bf4d3470ec8bc0082843a6d23445e9e08b03e91831458acc6fd37d7bc9 + checksum: 107230485fafbf215cec86ea8ae6a7e5f7f9d6ac0e63019008560f536511e7830fb2fece3052bd99a6d9e19f78fca332522beba2fde9453fffdafa37fa59baef languageName: node linkType: hard @@ -380,191 +391,191 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-async-generator-functions@npm:^7.16.4": - version: 7.16.4 - resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.16.4" +"@babel/plugin-proposal-async-generator-functions@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 - "@babel/helper-remap-async-to-generator": ^7.16.4 + "@babel/helper-plugin-utils": ^7.16.5 + "@babel/helper-remap-async-to-generator": ^7.16.5 "@babel/plugin-syntax-async-generators": ^7.8.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: dcd5a76ee12eacee93440e021a7e4a8e53b5d13d26c8fd7d412fc83341a1633a949bef1ef94301ae753164d39d303cb01b59234e6b48205377ca1d041f670ba5 + checksum: b57649dd33174a13b8e379b70dc6f2c2cc42d8d97befbc8c3eeed211f9060479d4f48ae096826fcd0b247497c18efb97672760b3b4c04fa1ae086fbb15c1fe7e languageName: node linkType: hard -"@babel/plugin-proposal-class-properties@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-proposal-class-properties@npm:7.16.0" +"@babel/plugin-proposal-class-properties@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-proposal-class-properties@npm:7.16.5" dependencies: - "@babel/helper-create-class-features-plugin": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-create-class-features-plugin": ^7.16.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: b1665ced553e5cdb95eec2fda321cb226c5f255edd1a94b226b9d81e97e026472184b6898af26f2bb9ee64101fad1afe215b6fc469d3103dec78c55e732e49aa + checksum: 2a58b1a43e2625f1345c45f3cc8a4976d80f67c00a95933c692512d9d3b18cd1323ab3676a3562f4afa70be93dccacb5276da1cf209f5ebc8b46bf63aba36d27 languageName: node linkType: hard -"@babel/plugin-proposal-class-static-block@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-proposal-class-static-block@npm:7.16.0" +"@babel/plugin-proposal-class-static-block@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-proposal-class-static-block@npm:7.16.5" dependencies: - "@babel/helper-create-class-features-plugin": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-create-class-features-plugin": ^7.16.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/plugin-syntax-class-static-block": ^7.14.5 peerDependencies: "@babel/core": ^7.12.0 - checksum: 59c4bb3d6ad4828e7773fe1c63730c68bf646c3a8d042b9ed4062fd98a26c1656b7ee108c5f144fd8b24ff567baf3b2efa644be29c6c8bcfe60e09e485e22116 + checksum: 461dbd90c232ecd11d5b6fc67c7c50285a4762eec27463928e871918660c28b3f5558aa675cdfd52ccfaadeb3feda1c8f2e539fca60225dd21b6bca003442f3a languageName: node linkType: hard -"@babel/plugin-proposal-dynamic-import@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-proposal-dynamic-import@npm:7.16.0" +"@babel/plugin-proposal-dynamic-import@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-proposal-dynamic-import@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/plugin-syntax-dynamic-import": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 4027da640443d8fd4a20637d1dd67cce1c13207b8c19fa77796a08b9eec9881b95322c1a5c489128adf3a12e9bbc02b31de9ddd536c909d072577a74a2a70b67 + checksum: e08d1e2dac8c44c094e50e38d9fe7b0008f0a2ff3a9ccff7beb6f15c53b06edbadd6bfc2aa6ab5923bb480608bbc85a2126602cf2abe358d7302c89d2372e143 languageName: node linkType: hard -"@babel/plugin-proposal-export-namespace-from@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.16.0" +"@babel/plugin-proposal-export-namespace-from@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/plugin-syntax-export-namespace-from": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 0bdc166ac44d9a0579e6d14d07ed1364932b4b7852626f4ba0c0011464097ed23bec43a3e93793d888c2854918ce9937ac251a945abbe0d283eaa1df206e0b05 + checksum: 9f52177482b4ef8858b8c6386e2d136384796bbcc24ac84622943b84579371168ce9cbb4cc438e1120d6c4d8789ca5b43a5fd05c694bddccad5c553a2afc7883 languageName: node linkType: hard -"@babel/plugin-proposal-json-strings@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-proposal-json-strings@npm:7.16.0" +"@babel/plugin-proposal-json-strings@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-proposal-json-strings@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/plugin-syntax-json-strings": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: fa93be8eff22ced96a68c9db8c0e930414a4ffb44cf68b473717309c06a4feee2bac6e41415a699c829f29928653d67b4b7d29a45861784d235264d829055a1e + checksum: 31c8d80d597c3072d204a8cb9323127ecdf9bf17c286755325de836692985dc5579a53642f3db1dd22ad0d8c20d802a21488d84f73ffe825eb1e2f1ddd4555dc languageName: node linkType: hard -"@babel/plugin-proposal-logical-assignment-operators@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-proposal-logical-assignment-operators@npm:7.16.0" +"@babel/plugin-proposal-logical-assignment-operators@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-proposal-logical-assignment-operators@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 7e6cd10248803f0c5801805ef1a357314940c3204c3d2f00994711f272c21276f181d0e83ada5bce6185ae2c97c4417e778331505ffc2e71a2b9c4425a5dcc6d + checksum: 453f8b89c77c423ca710394c4409a337e5ecc4ac58ecb32fe5392dcd0db122d86b3eeec0578e1ae4ddf09515d0201e511021b7c1c7f4c6a27c5e91afe4ed0c5c languageName: node linkType: hard -"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.16.0" +"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: e50f94929970cdc5c6ee22ec4c95c46ae25cdd8c391baf601f7f3d3a3cec417efc663a3fafa9ae5bca82a6815d49687b07cab9857f5a10e9ea862438ecb81e4a + checksum: 035a5a8f4d892ead797ce5c39b59c5fd91ef14f20cc9bfeafbbe7179ef05bd6ae311b73a5f36472cc278e3d282a1d025b0326ff7cf0bbfb63173cae469ff823b languageName: node linkType: hard -"@babel/plugin-proposal-numeric-separator@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-proposal-numeric-separator@npm:7.16.0" +"@babel/plugin-proposal-numeric-separator@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-proposal-numeric-separator@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/plugin-syntax-numeric-separator": ^7.10.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: eb7895a4f38263df644a0ded7042991190f23bdec4b53f3e2c8b40b82d2dbc537a6ca9afbfd490d1aa5dd33244e7a51bf1ae0c4c6890d9978bc1adc325b7e795 + checksum: 38dfbca1a3b8dfdb8a90d8f4b6767dcbca4987de9a748416c980ca243dcaac460f044999644118be277f80d4b08161c6df8b2835c7134efde3601f949b75e3ef languageName: node linkType: hard -"@babel/plugin-proposal-object-rest-spread@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.16.0" +"@babel/plugin-proposal-object-rest-spread@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.16.5" dependencies: - "@babel/compat-data": ^7.16.0 - "@babel/helper-compilation-targets": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/compat-data": ^7.16.4 + "@babel/helper-compilation-targets": ^7.16.3 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/plugin-syntax-object-rest-spread": ^7.8.3 - "@babel/plugin-transform-parameters": ^7.16.0 + "@babel/plugin-transform-parameters": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: c7716ba50e65aae613e553dd568d3f4b4c42fa8d9f1c3aca6cc227670fc792b600cd5a5c710451490f3d7d5916e77607cba45033e199534ca71feed451f63820 + checksum: 8632cf389ce153c31f57d4bb8b69314ba93732bb469b6b5923ba53ee48e4d506bbba614c4d0748e21790e0780612d60c2f6db7477ef98f6757b35eb7a03508da languageName: node linkType: hard -"@babel/plugin-proposal-optional-catch-binding@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-proposal-optional-catch-binding@npm:7.16.0" +"@babel/plugin-proposal-optional-catch-binding@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-proposal-optional-catch-binding@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/plugin-syntax-optional-catch-binding": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 5003a1d48fb6bac1661b481681baf7941de518f1f773d9745e65a650e750b715cb69181a4b723e28f4e43b94143b7b0fe5d12ff1ceceda9731f073cd6bf4e195 + checksum: 38a2c0c677eedd198617e156aa29f6adbd17f9b5cf9f9a79fe5950d68a0ea8e99225965e20f65ca03502a513cd09f28083875a924cc0dd0e6fb3cb0ec2a22317 languageName: node linkType: hard -"@babel/plugin-proposal-optional-chaining@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-proposal-optional-chaining@npm:7.16.0" +"@babel/plugin-proposal-optional-chaining@npm:^7.16.0, @babel/plugin-proposal-optional-chaining@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-proposal-optional-chaining@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0 "@babel/plugin-syntax-optional-chaining": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 8301e0829220327c8b969b711c5c4ee5aef88b391e5fb7838381bd18c0fd0cf360d3a307ad5c6113414470ae920504dc2c41983af0ddf3762f5c88957e0c3a94 + checksum: 4eaf5d4bd1438e1aece5d50fe6ef3b67277161103010eb4b2d45124ab6354fe1083752cf3e9422d72afd439e2a42b61ebdb4e2a10b2d10fcaf9696ee691003e4 languageName: node linkType: hard -"@babel/plugin-proposal-private-methods@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-proposal-private-methods@npm:7.16.0" +"@babel/plugin-proposal-private-methods@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-proposal-private-methods@npm:7.16.5" dependencies: - "@babel/helper-create-class-features-plugin": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-create-class-features-plugin": ^7.16.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 6f648f54ea1219262b7a05f86f94de7cb466dc81ffd86e4f37ba536037762457ef13408083eb4325d44d2a5aae27c097756efe1067f5c1fbddb8078b923580f5 + checksum: 93326582f848f3a0771803b3e835b2c981560f23a417ec1e0c2180b6cc5294ed7a8dfdef35939ede8c9a96e2b5f34dce9e5cc8d3f848d66f1f3a25f7b7b0240f languageName: node linkType: hard -"@babel/plugin-proposal-private-property-in-object@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.16.0" +"@babel/plugin-proposal-private-property-in-object@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.16.5" dependencies: "@babel/helper-annotate-as-pure": ^7.16.0 - "@babel/helper-create-class-features-plugin": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-create-class-features-plugin": ^7.16.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/plugin-syntax-private-property-in-object": ^7.14.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 9098fb34f4abac376ec5823bf6aaedacd46e6925a6fc62559a8086a110bf39310ee308bfbbed052f047ad803b7148b87e43b6d83a759be0aeab1149efd4b8eeb + checksum: 649d5e799e55001dd96ffd02e2aeb0ada31cca682d3e25e63552c91ac0ef6fff352f7fa8465fbb4b6751c2e08eb98fa54ad6014a7e586996846912449edb22d1 languageName: node linkType: hard -"@babel/plugin-proposal-unicode-property-regex@npm:^7.16.0, @babel/plugin-proposal-unicode-property-regex@npm:^7.4.4": - version: 7.16.0 - resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.16.0" +"@babel/plugin-proposal-unicode-property-regex@npm:^7.16.5, @babel/plugin-proposal-unicode-property-regex@npm:^7.4.4": + version: 7.16.5 + resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.16.5" dependencies: "@babel/helper-create-regexp-features-plugin": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: f26b76c9aa680820fe693f768a36e3a2c4d969e72d7a362059fffad7c874eed8a89bde2be5bde650283a685bd879415f8937fb37a9a1397b287a81df0c6f7c23 + checksum: 884109813dc054afae7ffc0804851a0091a2ae5473243c5a2e3c7a8b00bc24803597298301d407a8c5a80bd7e0e5f82fe737f1889a508880b073787ab7c9b4b4 languageName: node linkType: hard @@ -656,14 +667,14 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-jsx@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-syntax-jsx@npm:7.16.0" +"@babel/plugin-syntax-jsx@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-syntax-jsx@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 34afe4030c249ed5a559c7d164b317a6209f3fca2db7dee7ecb8413af84167381d82f23517bf8e41d359da07da9b0fd2c0472e81c4389e5cc9d1997a308d49de + checksum: 2f90d83924084b2677dc8b6a66360afae6cec8aa16f00f203e96293c2ad0bdf77f0ea8e9119c50cbaeb39508c793fe12f6fe7dad70207897fcb419b7deab698e languageName: node linkType: hard @@ -766,425 +777,426 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-arrow-functions@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-arrow-functions@npm:7.16.0" +"@babel/plugin-transform-arrow-functions@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-arrow-functions@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: ff647300424968d1cd6c6b015fd72d332042a94c7b08f3e785f32d22364bfad49258a41c53675de08573af98da1a623efa03da13a653f06988f79a9d571f7030 + checksum: 5e84ff27f0eca46a1519c2cbc35d2e5afbb75d744cc3ff32ae060bfe5b6f1de9f7326b2fbbf589be4b8072d99325c9836cf73fd12b9ecd6e80028440ee768c47 languageName: node linkType: hard -"@babel/plugin-transform-async-to-generator@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-async-to-generator@npm:7.16.0" +"@babel/plugin-transform-async-to-generator@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-async-to-generator@npm:7.16.5" dependencies: "@babel/helper-module-imports": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 - "@babel/helper-remap-async-to-generator": ^7.16.0 + "@babel/helper-plugin-utils": ^7.16.5 + "@babel/helper-remap-async-to-generator": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 2ebf505f43350d246007d754577477ddb0132c4ab39c9fd420d36ebb6e489b2b3eb48f27fe58f7ad0c742946a1e81e3b150666507abab03fe6bd649ff585ed45 + checksum: e50fcf1fc72aeff66a621c8c0e4bdfb77c5bd023a8a013900db7f5cc23c3474681cd0508bcf4306cbe872a98d6cfc945249c1aa3f7fcea6c26242f9b9e99609c languageName: node linkType: hard -"@babel/plugin-transform-block-scoped-functions@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.16.0" +"@babel/plugin-transform-block-scoped-functions@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: f7efc5d8ce9242e11c94c82d9c940d4c534a751ff3679839d2f7d7a300c29ac4c4a3c26c238b5f2828201cac8a848bfb6342c285460f6ce5bc267cbdc1bb070b + checksum: c4c13997a5b491d60f69ded97ba899d898472275315c91d87729360e6bf57da948356ea7a4b2bdf52cf9ea9a97582ec551f9eb7b759202b950acb5cab8e4cbdb languageName: node linkType: hard -"@babel/plugin-transform-block-scoping@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-block-scoping@npm:7.16.0" +"@babel/plugin-transform-block-scoping@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-block-scoping@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: e5bcb9eeed7974ee6dd14c360c21ad2465f81342001e5468bbec5db483fffc78bb0e7f84155be6c32588bc0b43a6ca0050c7962400b33d134f6298c31c8073d4 + checksum: 1aa74a77cd69613a8f8ccbedfcf44587f49361d42f27201f52b2b6c3cc08639d553171ae2ed31c4af449e49574d0a796241e66fddc381606ed1185af11d17c6d languageName: node linkType: hard -"@babel/plugin-transform-classes@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-classes@npm:7.16.0" +"@babel/plugin-transform-classes@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-classes@npm:7.16.5" dependencies: "@babel/helper-annotate-as-pure": ^7.16.0 + "@babel/helper-environment-visitor": ^7.16.5 "@babel/helper-function-name": ^7.16.0 "@babel/helper-optimise-call-expression": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 - "@babel/helper-replace-supers": ^7.16.0 + "@babel/helper-plugin-utils": ^7.16.5 + "@babel/helper-replace-supers": ^7.16.5 "@babel/helper-split-export-declaration": ^7.16.0 globals: ^11.1.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 7db47296045761b3f35a9075b4bcce99ad5aa93714cca235961fa596983ba6cfd4d84b29fa6745e4752bd2a60ac299b0dee3231ce20061b6798ae16a147e4992 + checksum: a142a4c2c46d7946cb7b7d0d1ae62bd52629dbf68056bfaa3739ecc3d252292d20a93daeff100b9a7acd89e5abc4bf4f45417a142a0e3fb1eebf707bd92c711b languageName: node linkType: hard -"@babel/plugin-transform-computed-properties@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-computed-properties@npm:7.16.0" +"@babel/plugin-transform-computed-properties@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-computed-properties@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 0f86de419cf5daf28b01c5b2feafa426e5b0ec776290e731de3d7a6ec4ec742400e13436d67292e500ecd50e21ddab9ae34da79357a85a443d30dc94f2a4f6a3 + checksum: 57b829e737e1f69f02bd1c10a8835b30e1a7c77b1c1c9dffecaf30101a4d4c7a37851f36e225bc02d4dec8032e1cc503c6bc46592700bf69611455b8d34d4df4 languageName: node linkType: hard -"@babel/plugin-transform-destructuring@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-destructuring@npm:7.16.0" +"@babel/plugin-transform-destructuring@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-destructuring@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 0a499c9abd6b50d4da6a3c8416e3cdf305f8002fddb3bd9ddd0774ba17ab1b10134f79fe8edc495c94344e5ab387626fb0ee124d31810758968a92d573ff9034 + checksum: bdc5c4b52800c5c49e63d839231937259ea4ec555b07ea735d1eb2fdec2c9a4d43c9fca79771bafa79c06ebf10e902e531092dee0d493e2aee4aa1a101dca40c languageName: node linkType: hard -"@babel/plugin-transform-dotall-regex@npm:^7.16.0, @babel/plugin-transform-dotall-regex@npm:^7.4.4": - version: 7.16.0 - resolution: "@babel/plugin-transform-dotall-regex@npm:7.16.0" +"@babel/plugin-transform-dotall-regex@npm:^7.16.5, @babel/plugin-transform-dotall-regex@npm:^7.4.4": + version: 7.16.5 + resolution: "@babel/plugin-transform-dotall-regex@npm:7.16.5" dependencies: "@babel/helper-create-regexp-features-plugin": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: c1f381f0d44a1b33714a68ffd60f2b9efac1be95caf3c21192cc8233afde2fae1da268e26b3cb40764736f090793b66946574c3310cfdd4906a7e72310239ff9 + checksum: f14e5ec1e7795d356435875256da0f6e4c9d2930a7dc2a5818439ced23161d1a664506654ffcd86d25e23e7ed8346e719e6a13cd2d6b262629d2fea7699aead4 languageName: node linkType: hard -"@babel/plugin-transform-duplicate-keys@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-duplicate-keys@npm:7.16.0" +"@babel/plugin-transform-duplicate-keys@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-duplicate-keys@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 66f09487fdf737aa280c780a609bafc9a771b34b5f9a8dccf69752c22110893763f6c105062776f084ed872a55d1656b3f14e2a9c2031f3dbdf31da20d9c827b + checksum: c897998b8dddae4cd6fb4451cbc9954468cdd7a04087f3f064a43741feb4e74dde8d69772af540fa7869c0484a15a23f89356f845f508bcfd8c7bec1e4670807 languageName: node linkType: hard -"@babel/plugin-transform-exponentiation-operator@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.16.0" +"@babel/plugin-transform-exponentiation-operator@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.16.5" dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-builder-binary-assignment-operator-visitor": ^7.16.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 22e1d4804a5fc522744a1cc13e2c35c5d81c2e303a634822fee59829477b3748dcf897a020c3083084350ab1d3b76752157b216971157763394021e2f2184094 + checksum: 8eb96d043af3ef72091b11f9e05e01d0bc0eb71c9adac36e2750b9f34d8ac1198a070139d404beaf07b5665bcb612ba52146f5cb82fb85daec88b43a22482cf6 languageName: node linkType: hard -"@babel/plugin-transform-for-of@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-for-of@npm:7.16.0" +"@babel/plugin-transform-for-of@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-for-of@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 504d967b30b00d3e1a2784f6a215963fc0036871f8fd6ca61e41e67cdb3319511e9148164428144469416b35b0e02c896c144402ace7cd7a6c45b0d1e8746ae6 + checksum: 203fbbf9101d14d756c564df9e219eb7c134bb42a8a5f083148110493a89a40c08aa2f412e11b6253bb48db885ca1869f36e0d0cfc65532a8e0a5ce793948618 languageName: node linkType: hard -"@babel/plugin-transform-function-name@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-function-name@npm:7.16.0" +"@babel/plugin-transform-function-name@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-function-name@npm:7.16.5" dependencies: "@babel/helper-function-name": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 289f4fce26e8b3a81fcae752cecdb78b363eb29e400aa4dc8318484156d908ddc6dd5b274b8fbcdb80ea59a362834554c4a5d3454e974957dbd2b30c3d00ad3f + checksum: 3b933eb0650d00c3bef51e06ec8f106e8ba97960b111e6723e1ff4818c6a0c4f02547336446366a4d8b5f8b5f08fef1e7e014e3d1264dbd665c85f1b47dd99a3 languageName: node linkType: hard -"@babel/plugin-transform-literals@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-literals@npm:7.16.0" +"@babel/plugin-transform-literals@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-literals@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 7291771c7626a27684053ceefc4e2e3e480a6ceab9f3c8abbdd9c90fcea63f035ace397e53bfc4b7311b835f7c79449be03226affa69e2e2a96c14b6da4d5db9 + checksum: 81066d35cb212f759cbc00e682b661c2ff77425d7c725a45679d2bee17d9aed28c240deb3f5063faa81c794e892e31269633433a5abdca0f6735cc153673b10e languageName: node linkType: hard -"@babel/plugin-transform-member-expression-literals@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-member-expression-literals@npm:7.16.0" +"@babel/plugin-transform-member-expression-literals@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-member-expression-literals@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: d5ed6cf840b9fd8b88f719dea46dc26a1778f10aeab6878b3eabf2350cfa813bfeff09d91c6afc93dd3536a48bc892a0afcf9f99f3bad6b54b41638f3ae80fa9 + checksum: ce491530a413538e9024f78e550faf043023fb57b3f4584f59c3d7632c0d0d5f1065b2d0ffe6d2c1035124e79d8f47db1e0b0b08b97bb50817cec7fe77580925 languageName: node linkType: hard -"@babel/plugin-transform-modules-amd@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-modules-amd@npm:7.16.0" +"@babel/plugin-transform-modules-amd@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-modules-amd@npm:7.16.5" dependencies: - "@babel/helper-module-transforms": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-module-transforms": ^7.16.5 + "@babel/helper-plugin-utils": ^7.16.5 babel-plugin-dynamic-import-node: ^2.3.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: c37ccb8cd7a301123fb5590712d957bf9f82bb0d89a83441b570a9f9793af76b99449c93f1079ad187fb598a5eeb5571561ff4d71af9192c7d6e407a464d6aff + checksum: 5587a9efd84e4ed9a36362b92dcfceff274267fee93e9b6c499a16bc3e6b54807917171b1852b7201abafbd6baf4ac624c72410a08344b19d1672c5285c8ee15 languageName: node linkType: hard -"@babel/plugin-transform-modules-commonjs@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-modules-commonjs@npm:7.16.0" +"@babel/plugin-transform-modules-commonjs@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-modules-commonjs@npm:7.16.5" dependencies: - "@babel/helper-module-transforms": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-module-transforms": ^7.16.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/helper-simple-access": ^7.16.0 babel-plugin-dynamic-import-node: ^2.3.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: a7e43670f503b31d6ad42977ddefb7bffc23f700a24252859652aa03efd666698567b0817060dd6f84a6cd23e7aac7464bc0dc7f7f929cad212263abcac9d470 + checksum: 5b5c23e492d60ccddf2b0fcca150965818c33892f8301633404861d0aab6c78d8d0110cf7f91b669e2842eb3815d1e629af5b4c5d801df6100be0bc5f50e8c49 languageName: node linkType: hard -"@babel/plugin-transform-modules-systemjs@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-modules-systemjs@npm:7.16.0" +"@babel/plugin-transform-modules-systemjs@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-modules-systemjs@npm:7.16.5" dependencies: "@babel/helper-hoist-variables": ^7.16.0 - "@babel/helper-module-transforms": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-module-transforms": ^7.16.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/helper-validator-identifier": ^7.15.7 babel-plugin-dynamic-import-node: ^2.3.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 4aa9bd45a4c1f79a4abd92482b4f9ac6492b5e727ee34316c80a30b6524281d39959a2d556b231eae4b1031f35e0133e60270f9e4bfa5f25a8cb68ef145dfcd2 + checksum: fc7937fa417848c8cfc4ffe590ab5b13ee881a527c6a6c11eb146fe335f01b2d679c68dfed6b95a586e83841f5aac54b5a6a818d6733ff4cc1f0ac3d54c23eba languageName: node linkType: hard -"@babel/plugin-transform-modules-umd@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-modules-umd@npm:7.16.0" +"@babel/plugin-transform-modules-umd@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-modules-umd@npm:7.16.5" dependencies: - "@babel/helper-module-transforms": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-module-transforms": ^7.16.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: b07d41eae3a1163fdb2dca4bffb0de880981e6581163948a88b7665709e860612932f5a73e54d70057e834d3968e3b5f86222f1d302c9e1d34d95a764584af54 + checksum: ce9ec8e928528bb193007a56e0619d5e7defec84d8df795239a7fdcfc87d08b3b029b059cfad1bb560e4083f03170b469ae6a7272016e6cce57f5541598260be languageName: node linkType: hard -"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.16.0" +"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.16.5" dependencies: "@babel/helper-create-regexp-features-plugin": ^7.16.0 peerDependencies: "@babel/core": ^7.0.0 - checksum: 758a87aca66ea7944c5f94ed7a798220c3b2986da4c38dc3f63221065ec96534bf39b3b043dd9759dbdff4026d340bbe51082d5ad4505c19b08893663130675b + checksum: b34e89fa86c81ae618a2ffd036a383aba5718e1a389d4844519b7f064450d18221f3d3f6a298d89d3b806623f0be522abac88f0fa06010b870bb8c3a033b79c3 languageName: node linkType: hard -"@babel/plugin-transform-new-target@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-new-target@npm:7.16.0" +"@babel/plugin-transform-new-target@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-new-target@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: c741ba3e84c182f1af3174cb7f00c4e434080ff882e72c7b2743d1d636eebcf12c865772be051a323c823bd4ebdfbae19cb78e95218d6b14c338f27a64608e31 + checksum: bbb3769cc47ce082e98f2e0a4df02fc56a771f74b23a1ca7a8912f642c9d98d1a89b54c40c3fe678a6af40e001119d490e06045094c5e66fd755c0a770e3c219 languageName: node linkType: hard -"@babel/plugin-transform-object-super@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-object-super@npm:7.16.0" +"@babel/plugin-transform-object-super@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-object-super@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 - "@babel/helper-replace-supers": ^7.16.0 + "@babel/helper-plugin-utils": ^7.16.5 + "@babel/helper-replace-supers": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: b6ed0a8f5a1231b4dadb5edb2cef8fba7957cbad943c0018002719d066fda93b805da961e42b38d625e43e7c79f5c07d5719d6d63f9cf178501882a4aa5d30da + checksum: 003a065b99faeb9b749fa37a9077addb98468f9ea72052fd16090643feb8b6c429ce9bf0d3480c79393c3ea0ba0ffdf9daaf8952850ac39d1fee23e2201ca1cf languageName: node linkType: hard -"@babel/plugin-transform-parameters@npm:^7.16.0, @babel/plugin-transform-parameters@npm:^7.16.3": - version: 7.16.3 - resolution: "@babel/plugin-transform-parameters@npm:7.16.3" +"@babel/plugin-transform-parameters@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-parameters@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 7c0154fa66f03f69f6767adc01e72ef00d50cae8eb87c65506adccccc1cf776730ecbb96a5de0127910554cc0e86e375bc437fa085f619783d368936736a4f58 + checksum: d9057796dd27502e9f23bb4e393002bd4b75f34fc33bfb0c55ac8d9b74fd0480f037cf836cafc6014e32ea1f21a857b8ccb8175620adada9c89a675c950678f2 languageName: node linkType: hard -"@babel/plugin-transform-property-literals@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-property-literals@npm:7.16.0" +"@babel/plugin-transform-property-literals@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-property-literals@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: e9eb9355db4cf18dc82879174fc2de6590521afea04f1c80c5805d3f759bfa25946bcac1095b5fe0e4ad3f5eb330cd7e308467626a0212f07b9f41b9f00affa8 + checksum: fab2c628e40f9fc5c02d9558c556b5730b0c5d80aaed71f64544108595aa3b7168cc8ffda89ddf8b75fcf03f14d9679a657bd55e17ea4495736499f0b3393dc6 languageName: node linkType: hard -"@babel/plugin-transform-react-display-name@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-react-display-name@npm:7.16.0" +"@babel/plugin-transform-react-display-name@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-react-display-name@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 82ca59676ccf5179585828c64b5703aec597d78fe4adf788579529d02b071b0fc6c2df69aa033118b7ac1c12e1dc418046fe7e9c6a593e1005beacc2846f4281 + checksum: f56b11e585038342ed9b7e5cd734b297aeff038207ec075469e4798ee2601236c35fa398dd82da0f3b4b042726d657d5d851ca41355954c4f556481a24022de4 languageName: node linkType: hard -"@babel/plugin-transform-react-jsx-development@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-react-jsx-development@npm:7.16.0" +"@babel/plugin-transform-react-jsx-development@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-react-jsx-development@npm:7.16.5" dependencies: - "@babel/plugin-transform-react-jsx": ^7.16.0 + "@babel/plugin-transform-react-jsx": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 2724db0d24779107a6e019f4be17e894e26dc23e33f797b3cd750afc0db33d477db27d6aafb63eb459e3514fdd9f408b9487c7db3d7c6858129382e9c26352dc + checksum: d709c372c1b4ce131cfda3cc27cf1b8c588d1436e3dbf260cc5fb3e1014230f5e23d6dfccc769f8fdafa2ecae77e99fc86c68742323a633fe7cc3830bf39d0c7 languageName: node linkType: hard -"@babel/plugin-transform-react-jsx@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-react-jsx@npm:7.16.0" +"@babel/plugin-transform-react-jsx@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-react-jsx@npm:7.16.5" dependencies: "@babel/helper-annotate-as-pure": ^7.16.0 "@babel/helper-module-imports": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 - "@babel/plugin-syntax-jsx": ^7.16.0 + "@babel/helper-plugin-utils": ^7.16.5 + "@babel/plugin-syntax-jsx": ^7.16.5 "@babel/types": ^7.16.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: c4fd2307750f3903ce1ff83e3eac5ebc3ef38838c542ff92676332d98292cacb60b91c19f49e30c9442494937c692992160101ae28175af0e1b1c7b40936e8c0 + checksum: 07a8b2443df86bd7ef51849fc097f9c5f72205ad47c8e41462f08b49a00c16fbd96f60a9f18a9ce741d9852fa1516bb65d91fbe7437f69a2e1852a20f89261f7 languageName: node linkType: hard -"@babel/plugin-transform-react-pure-annotations@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.16.0" +"@babel/plugin-transform-react-pure-annotations@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.16.5" dependencies: "@babel/helper-annotate-as-pure": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: b06c0f5efd7bc6118d43ad1e3a8cb94ebe01b19cff6fbeab0941801d1013b7bc372d2db9742b1ed746a89828a955f8dab9eb460d21fc3af352038de4cb0c6184 + checksum: 6411611c23ab4a0d9210ab181128b99521d072a1c404b521065f486e33044b68e512ebcb271c4765f21fc3ec77afba2a4cae0c45423c47aa737c293f227987f0 languageName: node linkType: hard -"@babel/plugin-transform-regenerator@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-regenerator@npm:7.16.0" +"@babel/plugin-transform-regenerator@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-regenerator@npm:7.16.5" dependencies: regenerator-transform: ^0.14.2 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 32b1b43f8d55d9e78e87bbc6a19b0bb0ff968220e215e9a3984c0de140048c54c62cf46889bee16f987221eab112909318de391426df33cdbe3fd710480068f7 + checksum: db6f0278bbe6119546a7d3023b3e8c7536e3bf1b601d18e1e26ad53ece1b51f196ae4a6731ef9c09b8558c834a57855a406ccea46e3286aad5b99a4788fb3fbc languageName: node linkType: hard -"@babel/plugin-transform-reserved-words@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-reserved-words@npm:7.16.0" +"@babel/plugin-transform-reserved-words@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-reserved-words@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 7a8288cfe2375e43579d3786d5f6654b36d8344b1be3df4fbafe81ae49bf634f85f68fe5a1a280f56aa7d626deaaa6ba89e586422b3d8b13f7d4b0e0617362d6 + checksum: 96a24ee8e43118110ccdfdfc1e085ad24e475cce279508b755f6121d99f1fdca22b0e79cf2a9cd7534201e999943190ffe03036694680846108bb94fbdf3e1f1 languageName: node linkType: hard -"@babel/plugin-transform-runtime@npm:^7.16.4": - version: 7.16.4 - resolution: "@babel/plugin-transform-runtime@npm:7.16.4" +"@babel/plugin-transform-runtime@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-runtime@npm:7.16.5" dependencies: "@babel/helper-module-imports": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 babel-plugin-polyfill-corejs2: ^0.3.0 babel-plugin-polyfill-corejs3: ^0.4.0 babel-plugin-polyfill-regenerator: ^0.3.0 semver: ^6.3.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 3586fb1035a8233162c0dfb28f3466c3129b430bd351d7271894dc7dc29956cc2e6e348f5e21ae91f8b59ceddce02b32140e4bb629fdbbacad2ab04f6cec2ff5 + checksum: f46443fd79d29120e97a3494633eb857990c7222c6bde91c4940f835f5e2a19df3cae3660884bbc4138719b66fbd203b26f68b761062cefabfd68700734164cc languageName: node linkType: hard -"@babel/plugin-transform-shorthand-properties@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-shorthand-properties@npm:7.16.0" +"@babel/plugin-transform-shorthand-properties@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-shorthand-properties@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 7ae0f218aaccd2f7e8b0027c558fbbc291f7df7c83749826075776de780d1ac421f9056c760c5eb2e486b7b1983a41cd8dc00589504904b833c810fdb80b3868 + checksum: 5af07bf0ed697506da25846177a732e1b44c98308a4420e21a5f6532019160ddce073fa38daeba9ebb73d6fc34c0f43c7b5202e8dd70d2cba4b37e349c4cce58 languageName: node linkType: hard -"@babel/plugin-transform-spread@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-spread@npm:7.16.0" +"@babel/plugin-transform-spread@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-spread@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: c295ef5e329fc31bd78e0aac3d6d848475a26e40cffff207dfd450416a25478bedb03402a0cc569bc5b7d3e92c22bff8a7cf76f1a9d896070e3cdeae1aee0316 + checksum: 06b22ca770a841299789c46e6f580303d875efa4c0ffcea8d0c2b6c3ddb4e65490d9a7696aac2276cc5b4a9a6a77077ec6fbeec3b75335fa8f99b8536a7bb1f1 languageName: node linkType: hard -"@babel/plugin-transform-sticky-regex@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-sticky-regex@npm:7.16.0" +"@babel/plugin-transform-sticky-regex@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-sticky-regex@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 80c7ccb797e4d31f112ace4614e8259ad0707eab3ed1c5a900ac0799dc23fded8bad57142ceb29222d6f0645f7b0d6a74fa133c945b8611d5db137b13ee68882 + checksum: 184b6c08234644fe1b201943aa9141bbf9646d43963eaaa91129c0dfa0cea8659855b2218c0a20ee8a1cff691341a3169bcdeaa9a7868adf26247384fede6abf languageName: node linkType: hard -"@babel/plugin-transform-template-literals@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-template-literals@npm:7.16.0" +"@babel/plugin-transform-template-literals@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-template-literals@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 230638ee56bbe8c4237d2c3366d700eca1f66f93c37935f6d775f699c5d2593e3f176e81010cfb2d46f89e340c6c042649263c3b913ce269182fadfb4db01369 + checksum: 4297a7615ba634a39b0573301f2f36ca67f126c27516b29bc2640d1b407444989a55e1b4478c9f77accc396c9062d089a5a13ebc9ce52921749adce54d887e8c languageName: node linkType: hard -"@babel/plugin-transform-typeof-symbol@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-typeof-symbol@npm:7.16.0" +"@babel/plugin-transform-typeof-symbol@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-typeof-symbol@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 60e91d57b3e5a5ca02cebbf9f6dacd06e8a3b7c92c54fd60616f01ac1c79b3ec5fd2e8c5fa5c86ffcd9da6fa811e6de8dc7602cf1e05da17def0ea06f1e8548e + checksum: f5cee6f93eb79aaf00a963de19a454ef2315424258d6b34769074101acb98e7e005b3c330386b0394d482f3bb666f79824c8217fee2defbb19d0132506a4cdf0 languageName: node linkType: hard -"@babel/plugin-transform-typescript@npm:^7.16.0": +"@babel/plugin-transform-typescript@npm:^7.16.1": version: 7.16.1 resolution: "@babel/plugin-transform-typescript@npm:7.16.1" dependencies: @@ -1197,54 +1209,54 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-unicode-escapes@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-unicode-escapes@npm:7.16.0" +"@babel/plugin-transform-unicode-escapes@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-unicode-escapes@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 63ac80d6b7592a7a038cde0b7b8fd7fc8f478de107543fb20c0ee47e00c5cd4c12be936501f55e2fd9370056603d9c4e4c57cdf335674837475865f80b4ae734 + checksum: 7c42417fb8addc5964687af9d7414046b9962da07b3cb4d4b0455408fa5462dad7efb10a42244a99180f4367a8c02feeaea45b998bc644d34f5af634290e1b7c languageName: node linkType: hard -"@babel/plugin-transform-unicode-regex@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/plugin-transform-unicode-regex@npm:7.16.0" +"@babel/plugin-transform-unicode-regex@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/plugin-transform-unicode-regex@npm:7.16.5" dependencies: "@babel/helper-create-regexp-features-plugin": ^7.16.0 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 61e498425fb44951067e1d17cd66e97777a340118c06943cee9d1032a8bfec661f262738a9b2a00a498b0ad5ba56551ea81e76f0d6afe46c0301abc3a86bee22 + checksum: 61ce38563348060d5f092af717b4b7a266865cc08af62433c58031cdf73156d853ead8c57b1dcca11e5c86b732a42bc5f35a3996635c940c90838133fc995506 languageName: node linkType: hard -"@babel/preset-env@npm:^7.16.4": - version: 7.16.4 - resolution: "@babel/preset-env@npm:7.16.4" +"@babel/preset-env@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/preset-env@npm:7.16.5" dependencies: "@babel/compat-data": ^7.16.4 "@babel/helper-compilation-targets": ^7.16.3 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/helper-validator-option": ^7.14.5 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.16.2 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.16.0 - "@babel/plugin-proposal-async-generator-functions": ^7.16.4 - "@babel/plugin-proposal-class-properties": ^7.16.0 - "@babel/plugin-proposal-class-static-block": ^7.16.0 - "@babel/plugin-proposal-dynamic-import": ^7.16.0 - "@babel/plugin-proposal-export-namespace-from": ^7.16.0 - "@babel/plugin-proposal-json-strings": ^7.16.0 - "@babel/plugin-proposal-logical-assignment-operators": ^7.16.0 - "@babel/plugin-proposal-nullish-coalescing-operator": ^7.16.0 - "@babel/plugin-proposal-numeric-separator": ^7.16.0 - "@babel/plugin-proposal-object-rest-spread": ^7.16.0 - "@babel/plugin-proposal-optional-catch-binding": ^7.16.0 - "@babel/plugin-proposal-optional-chaining": ^7.16.0 - "@babel/plugin-proposal-private-methods": ^7.16.0 - "@babel/plugin-proposal-private-property-in-object": ^7.16.0 - "@babel/plugin-proposal-unicode-property-regex": ^7.16.0 + "@babel/plugin-proposal-async-generator-functions": ^7.16.5 + "@babel/plugin-proposal-class-properties": ^7.16.5 + "@babel/plugin-proposal-class-static-block": ^7.16.5 + "@babel/plugin-proposal-dynamic-import": ^7.16.5 + "@babel/plugin-proposal-export-namespace-from": ^7.16.5 + "@babel/plugin-proposal-json-strings": ^7.16.5 + "@babel/plugin-proposal-logical-assignment-operators": ^7.16.5 + "@babel/plugin-proposal-nullish-coalescing-operator": ^7.16.5 + "@babel/plugin-proposal-numeric-separator": ^7.16.5 + "@babel/plugin-proposal-object-rest-spread": ^7.16.5 + "@babel/plugin-proposal-optional-catch-binding": ^7.16.5 + "@babel/plugin-proposal-optional-chaining": ^7.16.5 + "@babel/plugin-proposal-private-methods": ^7.16.5 + "@babel/plugin-proposal-private-property-in-object": ^7.16.5 + "@babel/plugin-proposal-unicode-property-regex": ^7.16.5 "@babel/plugin-syntax-async-generators": ^7.8.4 "@babel/plugin-syntax-class-properties": ^7.12.13 "@babel/plugin-syntax-class-static-block": ^7.14.5 @@ -1259,38 +1271,38 @@ __metadata: "@babel/plugin-syntax-optional-chaining": ^7.8.3 "@babel/plugin-syntax-private-property-in-object": ^7.14.5 "@babel/plugin-syntax-top-level-await": ^7.14.5 - "@babel/plugin-transform-arrow-functions": ^7.16.0 - "@babel/plugin-transform-async-to-generator": ^7.16.0 - "@babel/plugin-transform-block-scoped-functions": ^7.16.0 - "@babel/plugin-transform-block-scoping": ^7.16.0 - "@babel/plugin-transform-classes": ^7.16.0 - "@babel/plugin-transform-computed-properties": ^7.16.0 - "@babel/plugin-transform-destructuring": ^7.16.0 - "@babel/plugin-transform-dotall-regex": ^7.16.0 - "@babel/plugin-transform-duplicate-keys": ^7.16.0 - "@babel/plugin-transform-exponentiation-operator": ^7.16.0 - "@babel/plugin-transform-for-of": ^7.16.0 - "@babel/plugin-transform-function-name": ^7.16.0 - "@babel/plugin-transform-literals": ^7.16.0 - "@babel/plugin-transform-member-expression-literals": ^7.16.0 - "@babel/plugin-transform-modules-amd": ^7.16.0 - "@babel/plugin-transform-modules-commonjs": ^7.16.0 - "@babel/plugin-transform-modules-systemjs": ^7.16.0 - "@babel/plugin-transform-modules-umd": ^7.16.0 - "@babel/plugin-transform-named-capturing-groups-regex": ^7.16.0 - "@babel/plugin-transform-new-target": ^7.16.0 - "@babel/plugin-transform-object-super": ^7.16.0 - "@babel/plugin-transform-parameters": ^7.16.3 - "@babel/plugin-transform-property-literals": ^7.16.0 - "@babel/plugin-transform-regenerator": ^7.16.0 - "@babel/plugin-transform-reserved-words": ^7.16.0 - "@babel/plugin-transform-shorthand-properties": ^7.16.0 - "@babel/plugin-transform-spread": ^7.16.0 - "@babel/plugin-transform-sticky-regex": ^7.16.0 - "@babel/plugin-transform-template-literals": ^7.16.0 - "@babel/plugin-transform-typeof-symbol": ^7.16.0 - "@babel/plugin-transform-unicode-escapes": ^7.16.0 - "@babel/plugin-transform-unicode-regex": ^7.16.0 + "@babel/plugin-transform-arrow-functions": ^7.16.5 + "@babel/plugin-transform-async-to-generator": ^7.16.5 + "@babel/plugin-transform-block-scoped-functions": ^7.16.5 + "@babel/plugin-transform-block-scoping": ^7.16.5 + "@babel/plugin-transform-classes": ^7.16.5 + "@babel/plugin-transform-computed-properties": ^7.16.5 + "@babel/plugin-transform-destructuring": ^7.16.5 + "@babel/plugin-transform-dotall-regex": ^7.16.5 + "@babel/plugin-transform-duplicate-keys": ^7.16.5 + "@babel/plugin-transform-exponentiation-operator": ^7.16.5 + "@babel/plugin-transform-for-of": ^7.16.5 + "@babel/plugin-transform-function-name": ^7.16.5 + "@babel/plugin-transform-literals": ^7.16.5 + "@babel/plugin-transform-member-expression-literals": ^7.16.5 + "@babel/plugin-transform-modules-amd": ^7.16.5 + "@babel/plugin-transform-modules-commonjs": ^7.16.5 + "@babel/plugin-transform-modules-systemjs": ^7.16.5 + "@babel/plugin-transform-modules-umd": ^7.16.5 + "@babel/plugin-transform-named-capturing-groups-regex": ^7.16.5 + "@babel/plugin-transform-new-target": ^7.16.5 + "@babel/plugin-transform-object-super": ^7.16.5 + "@babel/plugin-transform-parameters": ^7.16.5 + "@babel/plugin-transform-property-literals": ^7.16.5 + "@babel/plugin-transform-regenerator": ^7.16.5 + "@babel/plugin-transform-reserved-words": ^7.16.5 + "@babel/plugin-transform-shorthand-properties": ^7.16.5 + "@babel/plugin-transform-spread": ^7.16.5 + "@babel/plugin-transform-sticky-regex": ^7.16.5 + "@babel/plugin-transform-template-literals": ^7.16.5 + "@babel/plugin-transform-typeof-symbol": ^7.16.5 + "@babel/plugin-transform-unicode-escapes": ^7.16.5 + "@babel/plugin-transform-unicode-regex": ^7.16.5 "@babel/preset-modules": ^0.1.5 "@babel/types": ^7.16.0 babel-plugin-polyfill-corejs2: ^0.3.0 @@ -1300,7 +1312,7 @@ __metadata: semver: ^6.3.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 72a5d7e460fbaa2a90d6e341d8c33dcc2d742421fb983b61695ce46637e479808d09bec58a123a5e11732734a477cea8cb957aeefb101bb5723fca460566f034 + checksum: b3887f816743e09d7d144ee11804123f6a31ef38cd6734d3e6165e99fb85644579b1ba28ef27d8afd6a6288081c9a9b12a6887d98dfd37f8b8add90511648929 languageName: node linkType: hard @@ -1319,38 +1331,38 @@ __metadata: languageName: node linkType: hard -"@babel/preset-react@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/preset-react@npm:7.16.0" +"@babel/preset-react@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/preset-react@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/helper-validator-option": ^7.14.5 - "@babel/plugin-transform-react-display-name": ^7.16.0 - "@babel/plugin-transform-react-jsx": ^7.16.0 - "@babel/plugin-transform-react-jsx-development": ^7.16.0 - "@babel/plugin-transform-react-pure-annotations": ^7.16.0 + "@babel/plugin-transform-react-display-name": ^7.16.5 + "@babel/plugin-transform-react-jsx": ^7.16.5 + "@babel/plugin-transform-react-jsx-development": ^7.16.5 + "@babel/plugin-transform-react-pure-annotations": ^7.16.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 88b0aab22129a57a30edcfec7f308bf09091d6129c4a9a280fe96557ebec442d8dded893a03fecd236a41832fc755a0ca1b2c89776377822050b0cd1d2551355 + checksum: e2295bb31a818eacf4c1e2a532970a5f6f3ba2aac7ea7fefb6593e38e8cb9f42f449f46eeec297dfde210151f23972cf31969c597e744f1251bf27c550089771 languageName: node linkType: hard -"@babel/preset-typescript@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/preset-typescript@npm:7.16.0" +"@babel/preset-typescript@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/preset-typescript@npm:7.16.5" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.16.5 "@babel/helper-validator-option": ^7.14.5 - "@babel/plugin-transform-typescript": ^7.16.0 + "@babel/plugin-transform-typescript": ^7.16.1 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 9b22316e96a34836c113f60c49d58023c8ba4219bcb0843a7685c04511486cf7c610e0d30551a1417809e2fd039884c847f6ede46abe2b8d520140e15fb36aaf + checksum: 56274462ea7c43245f88e412b60c676f472f70d851bb896bed8f4ef14eb8defc3e7d01097db8461a18c4aa8ce2b7004b61cdf021f7bd0eb23e4e832a893550ca languageName: node linkType: hard -"@babel/register@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/register@npm:7.16.0" +"@babel/register@npm:^7.16.5": + version: 7.16.5 + resolution: "@babel/register@npm:7.16.5" dependencies: clone-deep: ^4.0.1 find-cache-dir: ^2.0.0 @@ -1359,16 +1371,16 @@ __metadata: source-map-support: ^0.5.16 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 85f661da2692ec9afd156f880ebb941e17337e33f5eb387d8bf8071e37b77647b2be7e08871887622b139db24f560ba8e9eb8b5fcaa9a8138b27714f05548254 + checksum: 8aa73bc0c6c526f258b72e806d95e36dbdf1c91d4f868bb5b00460dd8ced4273bd90f684dcccd411d998ef09fa910343bfde3b2fd599700672c041ed36d85ddf languageName: node linkType: hard -"@babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.8.4": - version: 7.16.3 - resolution: "@babel/runtime@npm:7.16.3" +"@babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.16.5, @babel/runtime@npm:^7.8.4": + version: 7.16.5 + resolution: "@babel/runtime@npm:7.16.5" dependencies: regenerator-runtime: ^0.13.4 - checksum: ab8ac887096d76185ddbf291d28fb976cd32473696dc497ad4905b784acbd5aa462533ad83a5c5104e10ead28c2e0e119840ee28ed8eff90dcdde9d57f916eda + checksum: b96e67280efe581c6147b4fe984dfe08a8fbea048934a092f3cbf4dcf61725f6b221cb0c879b6e6e98671f83a104c9e8cfbd24c683e5ebcc886a731aa8984ad0 languageName: node linkType: hard @@ -1383,20 +1395,21 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.16.0, @babel/traverse@npm:^7.7.2": - version: 7.16.0 - resolution: "@babel/traverse@npm:7.16.0" +"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.16.5, @babel/traverse@npm:^7.7.2": + version: 7.16.5 + resolution: "@babel/traverse@npm:7.16.5" dependencies: "@babel/code-frame": ^7.16.0 - "@babel/generator": ^7.16.0 + "@babel/generator": ^7.16.5 + "@babel/helper-environment-visitor": ^7.16.5 "@babel/helper-function-name": ^7.16.0 "@babel/helper-hoist-variables": ^7.16.0 "@babel/helper-split-export-declaration": ^7.16.0 - "@babel/parser": ^7.16.0 + "@babel/parser": ^7.16.5 "@babel/types": ^7.16.0 debug: ^4.1.0 globals: ^11.1.0 - checksum: 83f634019a705d7ecd5c0f89a7c2cbd292c98a2ecc8a61faeeb48507bf23d81a79c808eb9d50337b48ed51a26929a75601d006cd4e537b1ec090d0ea2502b317 + checksum: 6bc31311b641ac0a1c6c854cad3faa172f54d987f9a28d7d75ed64ecbcc74983f60acd51bdd792f77e451fd5385c10ce9955f9d1d60162bd32748cc42dc7eef9 languageName: node linkType: hard @@ -1486,14 +1499,14 @@ __metadata: languageName: node linkType: hard -"@jest/core@npm:^27.4.4": - version: 27.4.4 - resolution: "@jest/core@npm:27.4.4" +"@jest/core@npm:^27.4.5": + version: 27.4.5 + resolution: "@jest/core@npm:27.4.5" dependencies: "@jest/console": ^27.4.2 - "@jest/reporters": ^27.4.4 + "@jest/reporters": ^27.4.5 "@jest/test-result": ^27.4.2 - "@jest/transform": ^27.4.4 + "@jest/transform": ^27.4.5 "@jest/types": ^27.4.2 "@types/node": "*" ansi-escapes: ^4.2.1 @@ -1502,15 +1515,15 @@ __metadata: exit: ^0.1.2 graceful-fs: ^4.2.4 jest-changed-files: ^27.4.2 - jest-config: ^27.4.4 - jest-haste-map: ^27.4.4 + jest-config: ^27.4.5 + jest-haste-map: ^27.4.5 jest-message-util: ^27.4.2 jest-regex-util: ^27.4.0 - jest-resolve: ^27.4.4 - jest-resolve-dependencies: ^27.4.4 - jest-runner: ^27.4.4 - jest-runtime: ^27.4.4 - jest-snapshot: ^27.4.4 + jest-resolve: ^27.4.5 + jest-resolve-dependencies: ^27.4.5 + jest-runner: ^27.4.5 + jest-runtime: ^27.4.5 + jest-snapshot: ^27.4.5 jest-util: ^27.4.2 jest-validate: ^27.4.2 jest-watcher: ^27.4.2 @@ -1523,7 +1536,7 @@ __metadata: peerDependenciesMeta: node-notifier: optional: true - checksum: 2eac488307b19ba6751a03a8b07a1464913aacc4b4a5fcb28cea84555d76dcb77c6831574bc7aa477f396915813f303441b6f9392fe0c229d93634a1fb6d41a8 + checksum: d9332952196018abfc0b5cbbc9062f71872859bbe7a55b98788fc7b2f30fec1286d2dd882d8aa75fa14f5aeea8401a3eaacfed88dc86b159934dc35e06a2cadd languageName: node linkType: hard @@ -1564,14 +1577,14 @@ __metadata: languageName: node linkType: hard -"@jest/reporters@npm:^27.4.4": - version: 27.4.4 - resolution: "@jest/reporters@npm:27.4.4" +"@jest/reporters@npm:^27.4.5": + version: 27.4.5 + resolution: "@jest/reporters@npm:27.4.5" dependencies: "@bcoe/v8-coverage": ^0.2.3 "@jest/console": ^27.4.2 "@jest/test-result": ^27.4.2 - "@jest/transform": ^27.4.4 + "@jest/transform": ^27.4.5 "@jest/types": ^27.4.2 "@types/node": "*" chalk: ^4.0.0 @@ -1584,10 +1597,10 @@ __metadata: istanbul-lib-report: ^3.0.0 istanbul-lib-source-maps: ^4.0.0 istanbul-reports: ^3.0.2 - jest-haste-map: ^27.4.4 - jest-resolve: ^27.4.4 + jest-haste-map: ^27.4.5 + jest-resolve: ^27.4.5 jest-util: ^27.4.2 - jest-worker: ^27.4.4 + jest-worker: ^27.4.5 slash: ^3.0.0 source-map: ^0.6.0 string-length: ^4.0.1 @@ -1598,7 +1611,7 @@ __metadata: peerDependenciesMeta: node-notifier: optional: true - checksum: 67a6bf9ec4ac9a8ea68e3a1d0702ec3cb6daf5f51c95f17563e98bab9f49b016a61d5b2e2c483aac690fe63b33038a12944a3551c35cdb1ae81ecadffa64cb36 + checksum: d053edae6906171f29c50c6129a600dd10d00320adf6df57938efc651ddd98aecdf7e3f82c3778e77311e8358e57e337d21c391aa867c9c289366e7bd4d6cf2b languageName: node linkType: hard @@ -1625,21 +1638,21 @@ __metadata: languageName: node linkType: hard -"@jest/test-sequencer@npm:^27.4.4": - version: 27.4.4 - resolution: "@jest/test-sequencer@npm:27.4.4" +"@jest/test-sequencer@npm:^27.4.5": + version: 27.4.5 + resolution: "@jest/test-sequencer@npm:27.4.5" dependencies: "@jest/test-result": ^27.4.2 graceful-fs: ^4.2.4 - jest-haste-map: ^27.4.4 - jest-runtime: ^27.4.4 - checksum: 37e3df089fe15e7f7c2070c915267d89aae1dfe72f97ea210ee974f48a2797637276c46fa5481a09614c8107529578aea9e498f54e2b3ed3aa9f888d0f9e3460 + jest-haste-map: ^27.4.5 + jest-runtime: ^27.4.5 + checksum: b78376fe4b964f2fd7e71083c220e5f0a8f59f079dc88783c60fce969b09ea38eebabc32c50a4637c20679a8bfa8220abb814cd232d241ee385d4df3d93f7d21 languageName: node linkType: hard -"@jest/transform@npm:^27.4.4": - version: 27.4.4 - resolution: "@jest/transform@npm:27.4.4" +"@jest/transform@npm:^27.4.5": + version: 27.4.5 + resolution: "@jest/transform@npm:27.4.5" dependencies: "@babel/core": ^7.1.0 "@jest/types": ^27.4.2 @@ -1648,7 +1661,7 @@ __metadata: convert-source-map: ^1.4.0 fast-json-stable-stringify: ^2.0.0 graceful-fs: ^4.2.4 - jest-haste-map: ^27.4.4 + jest-haste-map: ^27.4.5 jest-regex-util: ^27.4.0 jest-util: ^27.4.2 micromatch: ^4.0.4 @@ -1656,7 +1669,7 @@ __metadata: slash: ^3.0.0 source-map: ^0.6.1 write-file-atomic: ^3.0.0 - checksum: 931e323b7dc390ab6205f97b69d0e35e5efeec44a55a536bc5e4d2dab4a07955e9d2f6f6bce7b54112d83e4659c81b1c680602642fcf32dce405f26f3bb1a1b3 + checksum: f7a479545969d327a253ff1963c20260cffdee50cbc1345205f06e206df09871dd3f62dd4ba5358a087587ef5fa320b2e32efe1166192d8da835065e99d6bce7 languageName: node linkType: hard @@ -1854,12 +1867,21 @@ __metadata: languageName: node linkType: hard +"@polkadot/api-contract-support@6.12.1, @polkadot/api-contract-support@workspace:packages/api-contract-support": + version: 0.0.0-use.local + resolution: "@polkadot/api-contract-support@workspace:packages/api-contract-support" + dependencies: + "@babel/runtime": ^7.16.5 + languageName: unknown + linkType: soft + "@polkadot/api-contract@workspace:packages/api-contract": version: 0.0.0-use.local resolution: "@polkadot/api-contract@workspace:packages/api-contract" dependencies: - "@babel/runtime": ^7.16.3 + "@babel/runtime": ^7.16.5 "@polkadot/api": 6.12.1 + "@polkadot/api-contract-support": 6.12.1 "@polkadot/types": 6.12.1 "@polkadot/util": ^8.1.2 rxjs: ^7.4.0 @@ -1870,15 +1892,8 @@ __metadata: version: 0.0.0-use.local resolution: "@polkadot/api-derive@workspace:packages/api-derive" dependencies: - "@babel/runtime": ^7.16.3 + "@babel/runtime": ^7.16.5 "@polkadot/api": 6.12.1 - "@polkadot/keyring": ^8.1.2 - "@polkadot/rpc-core": 6.12.1 - "@polkadot/rpc-provider": 6.12.1 - "@polkadot/types": 6.12.1 - "@polkadot/util": ^8.1.2 - "@polkadot/util-crypto": ^8.1.2 - rxjs: ^7.4.0 languageName: unknown linkType: soft @@ -1886,13 +1901,12 @@ __metadata: version: 0.0.0-use.local resolution: "@polkadot/api@workspace:packages/api" dependencies: - "@babel/runtime": ^7.16.3 + "@babel/runtime": ^7.16.5 "@polkadot/api-derive": 6.12.1 "@polkadot/keyring": ^8.1.2 "@polkadot/rpc-core": 6.12.1 "@polkadot/rpc-provider": 6.12.1 "@polkadot/types": 6.12.1 - "@polkadot/types-known": 6.12.1 "@polkadot/util": ^8.1.2 "@polkadot/util-crypto": ^8.1.2 eventemitter3: ^4.0.7 @@ -1900,40 +1914,40 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/dev@npm:^0.63.39": - version: 0.63.39 - resolution: "@polkadot/dev@npm:0.63.39" +"@polkadot/dev@npm:^0.64.3": + version: 0.64.3 + resolution: "@polkadot/dev@npm:0.64.3" dependencies: "@babel/cli": ^7.16.0 - "@babel/core": ^7.16.0 - "@babel/plugin-proposal-nullish-coalescing-operator": ^7.16.0 - "@babel/plugin-proposal-numeric-separator": ^7.16.0 - "@babel/plugin-proposal-optional-chaining": ^7.16.0 + "@babel/core": ^7.16.5 + "@babel/plugin-proposal-nullish-coalescing-operator": ^7.16.5 + "@babel/plugin-proposal-numeric-separator": ^7.16.5 + "@babel/plugin-proposal-optional-chaining": ^7.16.5 "@babel/plugin-syntax-bigint": ^7.8.3 "@babel/plugin-syntax-dynamic-import": ^7.8.3 "@babel/plugin-syntax-import-meta": ^7.10.4 "@babel/plugin-syntax-top-level-await": ^7.14.5 - "@babel/plugin-transform-regenerator": ^7.16.0 - "@babel/plugin-transform-runtime": ^7.16.4 - "@babel/preset-env": ^7.16.4 - "@babel/preset-react": ^7.16.0 - "@babel/preset-typescript": ^7.16.0 - "@babel/register": ^7.16.0 - "@babel/runtime": ^7.16.3 + "@babel/plugin-transform-regenerator": ^7.16.5 + "@babel/plugin-transform-runtime": ^7.16.5 + "@babel/preset-env": ^7.16.5 + "@babel/preset-react": ^7.16.5 + "@babel/preset-typescript": ^7.16.5 + "@babel/register": ^7.16.5 + "@babel/runtime": ^7.16.5 "@rollup/plugin-alias": ^3.1.8 "@rollup/plugin-commonjs": ^21.0.1 "@rollup/plugin-inject": ^4.0.3 "@rollup/plugin-json": ^4.1.0 - "@rollup/plugin-node-resolve": ^13.0.6 + "@rollup/plugin-node-resolve": ^13.1.1 "@rushstack/eslint-patch": ^1.1.0 - "@typescript-eslint/eslint-plugin": 5.6.0 - "@typescript-eslint/parser": 5.6.0 + "@typescript-eslint/eslint-plugin": 5.7.0 + "@typescript-eslint/parser": 5.7.0 "@vue/component-compiler-utils": ^3.3.0 - babel-jest: ^27.4.4 + babel-jest: ^27.4.5 babel-plugin-module-extension-resolver: ^1.0.0-rc.2 babel-plugin-module-resolver: ^4.1.0 babel-plugin-styled-components: ^2.0.2 - browserslist: ^4.18.1 + browserslist: ^4.19.0 coveralls: ^3.1.1 eslint: ^8.4.1 eslint-config-standard: ^16.0.3 @@ -1952,11 +1966,11 @@ __metadata: gh-release: ^6.0.1 glob: ^7.2.0 glob2base: ^0.0.12 - jest: ^27.4.4 - jest-cli: ^27.4.4 - jest-config: ^27.4.4 - jest-haste-map: ^27.4.4 - jest-resolve: ^27.4.4 + jest: ^27.4.5 + jest-cli: ^27.4.5 + jest-config: ^27.4.5 + jest-haste-map: ^27.4.5 + jest-resolve: ^27.4.5 madge: ^5.0.1 minimatch: ^3.0.4 mkdirp: ^1.0.4 @@ -1964,7 +1978,7 @@ __metadata: rimraf: ^3.0.2 rollup: ^2.61.1 rollup-plugin-cleanup: ^3.2.1 - typescript: ^4.5.3 + typescript: ^4.5.4 yargs: ^17.3.0 bin: polkadot-ci-ghact-build: scripts/polkadot-ci-ghact-build.mjs @@ -1987,7 +2001,7 @@ __metadata: polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs - checksum: f3017438493d20c0528ef4f1e28a4b34f81fe21375a53a76c9303a6fd01e68b792233ebecf54c66eaa75dba6d12d3c25bf9c4807d285b63550b1f74b50807b0e + checksum: 16acf8c81a737ebef019d966658f68ec463660a734e364242cfc0970b912945049eb4db4cb3590075c6211d2ae7a6659feb4f5c90de4d485f651552f5364da63 languageName: node linkType: hard @@ -2018,7 +2032,7 @@ __metadata: version: 0.0.0-use.local resolution: "@polkadot/rpc-core@workspace:packages/rpc-core" dependencies: - "@babel/runtime": ^7.16.3 + "@babel/runtime": ^7.16.5 "@polkadot/keyring": ^8.1.2 "@polkadot/rpc-provider": 6.12.1 "@polkadot/types": 6.12.1 @@ -2031,7 +2045,7 @@ __metadata: version: 0.0.0-use.local resolution: "@polkadot/rpc-provider@workspace:packages/rpc-provider" dependencies: - "@babel/runtime": ^7.16.3 + "@babel/runtime": ^7.16.5 "@polkadot/keyring": ^8.1.2 "@polkadot/types": 6.12.1 "@polkadot/util": ^8.1.2 @@ -2045,12 +2059,12 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/ts@npm:^0.4.18": - version: 0.4.18 - resolution: "@polkadot/ts@npm:0.4.18" +"@polkadot/ts@npm:^0.4.20": + version: 0.4.20 + resolution: "@polkadot/ts@npm:0.4.20" dependencies: - "@types/chrome": ^0.0.170 - checksum: 2bb4ef94b0be9a5b3be2883c9d18d767f2a4d10fb4598f881b539382b975d03f55731ace6d2335ea59fd82cfd9518614e53216b1b0d99d3af4343a034887c77f + "@types/chrome": ^0.0.171 + checksum: 07d72e24d1df54831fa9832afd2d6d2f2eba73b37a8d8906da6decf8e1a2bedd37b37ee2da78988b152adb0727428b37c230e7eb1b687d1f2d0ba49ae0839fc5 languageName: node linkType: hard @@ -2058,9 +2072,9 @@ __metadata: version: 0.0.0-use.local resolution: "@polkadot/typegen@workspace:packages/typegen" dependencies: - "@babel/core": ^7.16.0 - "@babel/register": ^7.16.0 - "@babel/runtime": ^7.16.3 + "@babel/core": ^7.16.5 + "@babel/register": ^7.16.5 + "@babel/runtime": ^7.16.5 "@polkadot/api": 6.12.1 "@polkadot/rpc-provider": 6.12.1 "@polkadot/types": 6.12.1 @@ -2084,7 +2098,7 @@ __metadata: version: 0.0.0-use.local resolution: "@polkadot/types-known@workspace:packages/types-known" dependencies: - "@babel/runtime": ^7.16.3 + "@babel/runtime": ^7.16.5 "@polkadot/networks": ^8.1.2 "@polkadot/types": 6.12.1 "@polkadot/util": ^8.1.2 @@ -2095,7 +2109,7 @@ __metadata: version: 0.0.0-use.local resolution: "@polkadot/types-support@workspace:packages/types-support" dependencies: - "@babel/runtime": ^7.16.3 + "@babel/runtime": ^7.16.5 "@polkadot/util": ^8.1.2 languageName: unknown linkType: soft @@ -2104,7 +2118,7 @@ __metadata: version: 0.0.0-use.local resolution: "@polkadot/types@workspace:packages/types" dependencies: - "@babel/runtime": ^7.16.3 + "@babel/runtime": ^7.16.5 "@polkadot/keyring": ^8.1.2 "@polkadot/types-known": 6.12.1 "@polkadot/types-support": 6.12.1 @@ -2330,9 +2344,9 @@ __metadata: languageName: node linkType: hard -"@rollup/plugin-node-resolve@npm:^13.0.6": - version: 13.0.6 - resolution: "@rollup/plugin-node-resolve@npm:13.0.6" +"@rollup/plugin-node-resolve@npm:^13.1.1": + version: 13.1.1 + resolution: "@rollup/plugin-node-resolve@npm:13.1.1" dependencies: "@rollup/pluginutils": ^3.1.0 "@types/resolve": 1.17.1 @@ -2342,7 +2356,7 @@ __metadata: resolve: ^1.19.0 peerDependencies: rollup: ^2.42.0 - checksum: da304025ca898f3ad70e3a24d788634298f2ca6e139517adff43f27ea9cf821af3ee3530ca6f8abaf7e697294b59803837cd8f0ec22e3b1d34d3411c39e9a32c + checksum: 28f917b2af2051b987173438ccfa6848acb8323eef0fa0bc0d4d9b962b853dbc885849875867e9a29c076098fb4452664663242303b69f5999df5df5f475863f languageName: node linkType: hard @@ -2457,13 +2471,13 @@ __metadata: languageName: node linkType: hard -"@types/chrome@npm:^0.0.170": - version: 0.0.170 - resolution: "@types/chrome@npm:0.0.170" +"@types/chrome@npm:^0.0.171": + version: 0.0.171 + resolution: "@types/chrome@npm:0.0.171" dependencies: "@types/filesystem": "*" "@types/har-format": "*" - checksum: 2399ead76a74c334473ad2d0f2b03056d21969bc0e5e0b03a04867ab9905007428664f1f0d63876c32f4e969c24a5eac8a2e8295c0d04b8e40eac0208c40db0b + checksum: 657bd2a82b2550bc70a24f43e15121eaf2ee56e52e7a7a904375cded6ffd2e7a1dc27f2456719f5272454a88c483727b99deec1b7244c0cab815f8946c8a3a73 languageName: node linkType: hard @@ -2654,12 +2668,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:5.6.0": - version: 5.6.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.6.0" +"@typescript-eslint/eslint-plugin@npm:5.7.0": + version: 5.7.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.7.0" dependencies: - "@typescript-eslint/experimental-utils": 5.6.0 - "@typescript-eslint/scope-manager": 5.6.0 + "@typescript-eslint/experimental-utils": 5.7.0 + "@typescript-eslint/scope-manager": 5.7.0 debug: ^4.3.2 functional-red-black-tree: ^1.0.1 ignore: ^5.1.8 @@ -2672,50 +2686,50 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: aeae8c2de535cad6032c0b27fbb86baccd07788319efd5a97d828bc03a85eae5e635aff794a1d7a2b3ee2a84d6d6d7e68c42438fee62af42fead89f381df7bca + checksum: e3674ee680e5dffecdb5d243d6c958ea8003021919d1b2068a3bebfde8e5303b3cecbc28cd144e1bacececb638b3d90fd3e16cd9e1f2e397c0eac8f148b9d3ac languageName: node linkType: hard -"@typescript-eslint/experimental-utils@npm:5.6.0": - version: 5.6.0 - resolution: "@typescript-eslint/experimental-utils@npm:5.6.0" +"@typescript-eslint/experimental-utils@npm:5.7.0": + version: 5.7.0 + resolution: "@typescript-eslint/experimental-utils@npm:5.7.0" dependencies: "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.6.0 - "@typescript-eslint/types": 5.6.0 - "@typescript-eslint/typescript-estree": 5.6.0 + "@typescript-eslint/scope-manager": 5.7.0 + "@typescript-eslint/types": 5.7.0 + "@typescript-eslint/typescript-estree": 5.7.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: "*" - checksum: f708f38be41a3cb4c8c2c8573a660ce7de88f50becf53bea6679fcc8a56ba73c59f2e1a94f5a7773c8cccaf0c2e4dda679564c67764c989f8137594d6589aa4c + checksum: 5e9ca434d834059632bf6f227c9d7f13f143f5a42d8518df6e54db242e971bae09038d9abcc5ff3debab8ecf17c742544ff66778f6bcbc90e94d92ee358d8315 languageName: node linkType: hard -"@typescript-eslint/parser@npm:5.6.0": - version: 5.6.0 - resolution: "@typescript-eslint/parser@npm:5.6.0" +"@typescript-eslint/parser@npm:5.7.0": + version: 5.7.0 + resolution: "@typescript-eslint/parser@npm:5.7.0" dependencies: - "@typescript-eslint/scope-manager": 5.6.0 - "@typescript-eslint/types": 5.6.0 - "@typescript-eslint/typescript-estree": 5.6.0 + "@typescript-eslint/scope-manager": 5.7.0 + "@typescript-eslint/types": 5.7.0 + "@typescript-eslint/typescript-estree": 5.7.0 debug: ^4.3.2 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 7d703cfe6b0a33b35139f509bcc16065f234a11603244cee4f55e193112d93ed9cd4a6db4bcf57c6b766e8a4d602b4f2400cb8d52ea02b3fc2cdfb64e5b88a3e + checksum: c57f9ab2001d3fd61776eb8ae7f05d0f5beed9d78fdc1bedaf24bf5f17049b909cbcea79ad58d0059000e29716b04d536ff1522c29441d1865229a3490a95bb2 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.6.0": - version: 5.6.0 - resolution: "@typescript-eslint/scope-manager@npm:5.6.0" +"@typescript-eslint/scope-manager@npm:5.7.0": + version: 5.7.0 + resolution: "@typescript-eslint/scope-manager@npm:5.7.0" dependencies: - "@typescript-eslint/types": 5.6.0 - "@typescript-eslint/visitor-keys": 5.6.0 - checksum: 6fea574f6e911eb25258e75fc738a36099678ba96cd447d18da28209bfa5326ba4e97aa7f254ccd0415aec15ea70d0b6fb860dd985d4f9042df57d4a227ae9d1 + "@typescript-eslint/types": 5.7.0 + "@typescript-eslint/visitor-keys": 5.7.0 + checksum: 8323e9787cb21c2e6c3de6bef2eb56e7e37c04f9c19413ad54964545dacc27a59ce6c19d660f4a20c0c6a368eee264d231436e9e8f221ed551abdcaf78596e12 languageName: node linkType: hard @@ -2726,19 +2740,19 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.6.0": - version: 5.6.0 - resolution: "@typescript-eslint/types@npm:5.6.0" - checksum: 63abd287a265cb1bed06067117c11bf1c69c5db1a14ea59e13564dcd9d513ae2dac67969541f21381500139d40bbea67b269c32607d3204ab24ea8900c449293 +"@typescript-eslint/types@npm:5.7.0": + version: 5.7.0 + resolution: "@typescript-eslint/types@npm:5.7.0" + checksum: 4573250e59ea9e0b163c3e05e44ffb4b1ba4cdcfd6081c1f0b532e4c4bbbc5eb34ff4286c81c815115a1a1690cc8b1ad7b3ed79f3798773bf494b6ed82d0396b languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.6.0": - version: 5.6.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.6.0" +"@typescript-eslint/typescript-estree@npm:5.7.0": + version: 5.7.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.7.0" dependencies: - "@typescript-eslint/types": 5.6.0 - "@typescript-eslint/visitor-keys": 5.6.0 + "@typescript-eslint/types": 5.7.0 + "@typescript-eslint/visitor-keys": 5.7.0 debug: ^4.3.2 globby: ^11.0.4 is-glob: ^4.0.3 @@ -2747,7 +2761,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: eb5cc53ddad6fe7772677798bcb682e859ac82674cf0adcdd7105814ddecdbb9d58a4a27f87caa68eb9f40dcc5ce1b0ce87db3cf50deffa5f7fa6c354c8bee68 + checksum: 0a63186e7b89dc3a1607d2b838ee7b44b4471654f3e77d62687242e5cb9d2a2385312f438dcfdcb70dadcb3638a141e1660483f7bb5d2cf3563cc9a43b0b2d94 languageName: node linkType: hard @@ -2779,13 +2793,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.6.0": - version: 5.6.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.6.0" +"@typescript-eslint/visitor-keys@npm:5.7.0": + version: 5.7.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.7.0" dependencies: - "@typescript-eslint/types": 5.6.0 + "@typescript-eslint/types": 5.7.0 eslint-visitor-keys: ^3.0.0 - checksum: c1d9e2596ff4f03b52857a77ff373ca82e66c1883ea818f28c3a18e5c4877c4ac6367874f4681223e9134bcebd6560f95b9a3d12c411060d567a17d10113e9e5 + checksum: 59f7468c37cfcb92eb0de15b7ece47dd64a56c4d03d13167140c980399a4f12f20c1df52534f486cefc46bab65e717689b81decb327d2677063c47c0a26ae875 languageName: node linkType: hard @@ -3159,11 +3173,11 @@ __metadata: languageName: node linkType: hard -"babel-jest@npm:^27.4.4": - version: 27.4.4 - resolution: "babel-jest@npm:27.4.4" +"babel-jest@npm:^27.4.5": + version: 27.4.5 + resolution: "babel-jest@npm:27.4.5" dependencies: - "@jest/transform": ^27.4.4 + "@jest/transform": ^27.4.5 "@jest/types": ^27.4.2 "@types/babel__core": ^7.1.14 babel-plugin-istanbul: ^6.0.0 @@ -3173,7 +3187,7 @@ __metadata: slash: ^3.0.0 peerDependencies: "@babel/core": ^7.8.0 - checksum: 2d9de4f050f5c976a88f2afe5f7c9c53a5a1420320c70e46186d05dfe53eddccbcded80ef4ade80f4a1cacd940f6c934357e229b1f9666b00776c0d358d95fa6 + checksum: 986601fd143e6bdd9b9c176ade5c1f93a63e38beba511527183fec5f1041920f1262fcb3f87e8660c85fc6cc731d5d49570b35d54c31427644c6849caa137d89 languageName: node linkType: hard @@ -3426,18 +3440,18 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.17.5, browserslist@npm:^4.17.6, browserslist@npm:^4.18.1": - version: 4.18.1 - resolution: "browserslist@npm:4.18.1" +"browserslist@npm:^4.17.5, browserslist@npm:^4.17.6, browserslist@npm:^4.19.0": + version: 4.19.0 + resolution: "browserslist@npm:4.19.0" dependencies: - caniuse-lite: ^1.0.30001280 - electron-to-chromium: ^1.3.896 + caniuse-lite: ^1.0.30001286 + electron-to-chromium: ^1.4.17 escalade: ^3.1.1 node-releases: ^2.0.1 picocolors: ^1.0.0 bin: browserslist: cli.js - checksum: ae58322deef15960fc2e601d71bc081b571cfab6705999a3d24db5325b9cfadf5f676615f4460207a93e600549c33d60d37b4502007fe9e737b3cc19e20575d5 + checksum: 17f23eca9c56c726532f199797fa11a48c41b271d36f7ab565c10c952c83d83368487ae415d435419da7443f660d4bb8b024c303f3c49d0aa7f3e1dadb4fe3b1 languageName: node linkType: hard @@ -3530,10 +3544,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001280": - version: 1.0.30001282 - resolution: "caniuse-lite@npm:1.0.30001282" - checksum: 62797fd756e88bfa01f0f983bea9de7814293b209456e8f0b20596b03d2880246f63dc90f947a1fa63f92806ebefbb86fc7811dbecb7839927886d07996938be +"caniuse-lite@npm:^1.0.30001286": + version: 1.0.30001286 + resolution: "caniuse-lite@npm:1.0.30001286" + checksum: 04de4742552d4aeb713677b40693d9ac1fbd259573e0ff739565278bcecb6f398f3227546a4e930f4d5cf95b61458f4a53c9c1f90f5b0c4f6063b32e4c54b89e languageName: node linkType: hard @@ -4364,10 +4378,10 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.3.896": - version: 1.3.901 - resolution: "electron-to-chromium@npm:1.3.901" - checksum: a28c2817e4260c4b85cce56682b92e9e4f83ff89de26ace7ee0ec646e538db683e502444014b57d09cac051db6822800f9fd483ceb1455a140a520c5b4c9ed49 +"electron-to-chromium@npm:^1.4.17": + version: 1.4.17 + resolution: "electron-to-chromium@npm:1.4.17" + checksum: d0bafe96ea345167c1a4c5d4626a26a3bd7f75d3fe48bdc1a1dc53fad226b08245fa700f06c28d2366913ec506eba0e57f7fd9a630cc5669a08f27614c8e63a9 languageName: node linkType: hard @@ -6421,9 +6435,9 @@ fsevents@~2.1.2: languageName: node linkType: hard -"jest-circus@npm:^27.4.4": - version: 27.4.4 - resolution: "jest-circus@npm:27.4.4" +"jest-circus@npm:^27.4.5": + version: 27.4.5 + resolution: "jest-circus@npm:27.4.5" dependencies: "@jest/environment": ^27.4.4 "@jest/test-result": ^27.4.2 @@ -6437,29 +6451,29 @@ fsevents@~2.1.2: jest-each: ^27.4.2 jest-matcher-utils: ^27.4.2 jest-message-util: ^27.4.2 - jest-runtime: ^27.4.4 - jest-snapshot: ^27.4.4 + jest-runtime: ^27.4.5 + jest-snapshot: ^27.4.5 jest-util: ^27.4.2 pretty-format: ^27.4.2 slash: ^3.0.0 stack-utils: ^2.0.3 throat: ^6.0.1 - checksum: e85698bedc0650deacd6f3a03022f25e786b6dafd0285311303afb933b48ac9c54039138ddcd540513035e335c136695b71cfff9fb4a95116e173e0221edaaf9 + checksum: 0d9ba909fb73ab17d127208a44e0cd1064ed3fcce3208b7c181b684b00e3504f1edc84119cd14d9c4c8df8957904875bf68e3151303bd06e42345a8635112eb0 languageName: node linkType: hard -"jest-cli@npm:^27.4.4": - version: 27.4.4 - resolution: "jest-cli@npm:27.4.4" +"jest-cli@npm:^27.4.5": + version: 27.4.5 + resolution: "jest-cli@npm:27.4.5" dependencies: - "@jest/core": ^27.4.4 + "@jest/core": ^27.4.5 "@jest/test-result": ^27.4.2 "@jest/types": ^27.4.2 chalk: ^4.0.0 exit: ^0.1.2 graceful-fs: ^4.2.4 import-local: ^3.0.2 - jest-config: ^27.4.4 + jest-config: ^27.4.5 jest-util: ^27.4.2 jest-validate: ^27.4.2 prompts: ^2.0.1 @@ -6471,31 +6485,31 @@ fsevents@~2.1.2: optional: true bin: jest: bin/jest.js - checksum: bb19871a076fa23d1a3e198b7537f7a817b57ed8664202ec02a5f6cfab7c2d9cb7a84ba000406e931c29ffea2374d91d88b96f8b1bbf4fefdd51f31ee688f6f3 + checksum: 8c430614ab058fd612eae402620c784e583477520598aa4f68e9115d5f475a50d6897cdad4c832777ec8964446c5a9f02047cf74bed7e0f090220758eac1cc41 languageName: node linkType: hard -"jest-config@npm:^27.4.4": - version: 27.4.4 - resolution: "jest-config@npm:27.4.4" +"jest-config@npm:^27.4.5": + version: 27.4.5 + resolution: "jest-config@npm:27.4.5" dependencies: "@babel/core": ^7.1.0 - "@jest/test-sequencer": ^27.4.4 + "@jest/test-sequencer": ^27.4.5 "@jest/types": ^27.4.2 - babel-jest: ^27.4.4 + babel-jest: ^27.4.5 chalk: ^4.0.0 ci-info: ^3.2.0 deepmerge: ^4.2.2 glob: ^7.1.1 graceful-fs: ^4.2.4 - jest-circus: ^27.4.4 + jest-circus: ^27.4.5 jest-environment-jsdom: ^27.4.4 jest-environment-node: ^27.4.4 jest-get-type: ^27.4.0 - jest-jasmine2: ^27.4.4 + jest-jasmine2: ^27.4.5 jest-regex-util: ^27.4.0 - jest-resolve: ^27.4.4 - jest-runner: ^27.4.4 + jest-resolve: ^27.4.5 + jest-runner: ^27.4.5 jest-util: ^27.4.2 jest-validate: ^27.4.2 micromatch: ^4.0.4 @@ -6506,7 +6520,7 @@ fsevents@~2.1.2: peerDependenciesMeta: ts-node: optional: true - checksum: 4460edc2e42530722030edd883db5955a6899c1e9e6df9de74bd684b2a945c97a978d82dc406acc8fc026103c870c884f1d0e460cffceab00df444c54ae134c8 + checksum: 8b166404959d368c49573b8d3e9ff5537557413a96aa41e05824f01147db1525168489ae3f1f028525a587bd724f718f9c77f1256351c48cf0e3c766a86292cb languageName: node linkType: hard @@ -6580,9 +6594,9 @@ fsevents@~2.1.2: languageName: node linkType: hard -"jest-haste-map@npm:^27.4.4": - version: 27.4.4 - resolution: "jest-haste-map@npm:27.4.4" +"jest-haste-map@npm:^27.4.5": + version: 27.4.5 + resolution: "jest-haste-map@npm:27.4.5" dependencies: "@jest/types": ^27.4.2 "@types/graceful-fs": ^4.1.2 @@ -6594,19 +6608,19 @@ fsevents@~2.1.2: jest-regex-util: ^27.4.0 jest-serializer: ^27.4.0 jest-util: ^27.4.2 - jest-worker: ^27.4.4 + jest-worker: ^27.4.5 micromatch: ^4.0.4 walker: ^1.0.7 dependenciesMeta: fsevents: optional: true - checksum: ebd8e00672aadeb7a42ca5c2070f0240f7892b87c769ba203fe09528b7ca0892e04a60252131ccbdb8746476e07fed67f95c144961ff8ad2cc2dd708cf07e39c + checksum: acd593ec33b028169c7bf753a5c92eabdb05f87ba9f14e33fe24a4adc1e0a1ff4be0c4757a57a82413263ebbb6b567708b4f3019cb4df899d2d07fcec64bd75a languageName: node linkType: hard -"jest-jasmine2@npm:^27.4.4": - version: 27.4.4 - resolution: "jest-jasmine2@npm:27.4.4" +"jest-jasmine2@npm:^27.4.5": + version: 27.4.5 + resolution: "jest-jasmine2@npm:27.4.5" dependencies: "@babel/traverse": ^7.1.0 "@jest/environment": ^27.4.4 @@ -6621,12 +6635,12 @@ fsevents@~2.1.2: jest-each: ^27.4.2 jest-matcher-utils: ^27.4.2 jest-message-util: ^27.4.2 - jest-runtime: ^27.4.4 - jest-snapshot: ^27.4.4 + jest-runtime: ^27.4.5 + jest-snapshot: ^27.4.5 jest-util: ^27.4.2 pretty-format: ^27.4.2 throat: ^6.0.1 - checksum: ddd9edf6ac0b0fcc40b2dbcc29f58fed47310fea2a31094592567e1c06eaee6d2680049775b6eb26152e514149d898b5a3c19e0a30d671cf0ae3d8f1fb3f0088 + checksum: 9759e865f39390f71c83a3cabb3196c2655df2bf3771b71d9c2f2db400cec96ab7eff1b44e8b582280c07db985538bacb408dd6a42aff83984b0a27b2968fa36 languageName: node linkType: hard @@ -6698,43 +6712,43 @@ fsevents@~2.1.2: languageName: node linkType: hard -"jest-resolve-dependencies@npm:^27.4.4": - version: 27.4.4 - resolution: "jest-resolve-dependencies@npm:27.4.4" +"jest-resolve-dependencies@npm:^27.4.5": + version: 27.4.5 + resolution: "jest-resolve-dependencies@npm:27.4.5" dependencies: "@jest/types": ^27.4.2 jest-regex-util: ^27.4.0 - jest-snapshot: ^27.4.4 - checksum: be76bb7d85e8a5f8c44e13798a916240b9d5b5ff3ace56acbac45c2f90d3314ea5171c0b9a6ed1b71e593578930a6bdcfe5035de18d392b095b46d31e971c8fd + jest-snapshot: ^27.4.5 + checksum: 1fc16cb7c8df130420732184cd87a2c8ae6bf6cbb37d61dd69fddf69ab5ab2be50774962ce4b477b915fa1cc3dc69cb1830b6a18bd1b33c3c1a9c40e43cb11ce languageName: node linkType: hard -"jest-resolve@npm:27.4.4, jest-resolve@npm:^27.4.4": - version: 27.4.4 - resolution: "jest-resolve@npm:27.4.4" +"jest-resolve@npm:27.4.5, jest-resolve@npm:^27.4.5": + version: 27.4.5 + resolution: "jest-resolve@npm:27.4.5" dependencies: "@jest/types": ^27.4.2 chalk: ^4.0.0 graceful-fs: ^4.2.4 - jest-haste-map: ^27.4.4 + jest-haste-map: ^27.4.5 jest-pnp-resolver: ^1.2.2 jest-util: ^27.4.2 jest-validate: ^27.4.2 resolve: ^1.20.0 resolve.exports: ^1.1.0 slash: ^3.0.0 - checksum: 2dd3b27cc018adb754ac059c0f90eae5d8a92b3b2e0a24f16a22c448456c2f025cebd324f2408a7db229f251da76526592bde81c5cf4a408f1403571a592b7b0 + checksum: 57d619ed1ab4ba5d1b079f9ca3e93c7d9bcc9faa195b617fda6155cbce6eb48c234a957f41f7feee43740b4a5b50ebec8aea61023f766ac4b2eb6ff946c76025 languageName: node linkType: hard -"jest-runner@npm:^27.4.4": - version: 27.4.4 - resolution: "jest-runner@npm:27.4.4" +"jest-runner@npm:^27.4.5": + version: 27.4.5 + resolution: "jest-runner@npm:27.4.5" dependencies: "@jest/console": ^27.4.2 "@jest/environment": ^27.4.4 "@jest/test-result": ^27.4.2 - "@jest/transform": ^27.4.4 + "@jest/transform": ^27.4.5 "@jest/types": ^27.4.2 "@types/node": "*" chalk: ^4.0.0 @@ -6744,29 +6758,29 @@ fsevents@~2.1.2: jest-docblock: ^27.4.0 jest-environment-jsdom: ^27.4.4 jest-environment-node: ^27.4.4 - jest-haste-map: ^27.4.4 + jest-haste-map: ^27.4.5 jest-leak-detector: ^27.4.2 jest-message-util: ^27.4.2 - jest-resolve: ^27.4.4 - jest-runtime: ^27.4.4 + jest-resolve: ^27.4.5 + jest-runtime: ^27.4.5 jest-util: ^27.4.2 - jest-worker: ^27.4.4 + jest-worker: ^27.4.5 source-map-support: ^0.5.6 throat: ^6.0.1 - checksum: fe9764e43e02e79d600446cca01664cc4c9957993c7c4ee8795af251f765b378f0da8748fae190cce0916eedd408b9601c452df666c18aece1ac70c5d6fd4019 + checksum: 456f5e3c55dfd0fdad21703a26aa2ff729bbcea173a4ac6a6a99f65d77c564ace13a0e53c33b074020d3594dbff831b7f6424f27d99485120c691ee129a6b6f4 languageName: node linkType: hard -"jest-runtime@npm:^27.4.4": - version: 27.4.4 - resolution: "jest-runtime@npm:27.4.4" +"jest-runtime@npm:^27.4.5": + version: 27.4.5 + resolution: "jest-runtime@npm:27.4.5" dependencies: "@jest/console": ^27.4.2 "@jest/environment": ^27.4.4 "@jest/globals": ^27.4.4 "@jest/source-map": ^27.4.0 "@jest/test-result": ^27.4.2 - "@jest/transform": ^27.4.4 + "@jest/transform": ^27.4.5 "@jest/types": ^27.4.2 "@types/yargs": ^16.0.0 chalk: ^4.0.0 @@ -6776,18 +6790,18 @@ fsevents@~2.1.2: exit: ^0.1.2 glob: ^7.1.3 graceful-fs: ^4.2.4 - jest-haste-map: ^27.4.4 + jest-haste-map: ^27.4.5 jest-message-util: ^27.4.2 jest-mock: ^27.4.2 jest-regex-util: ^27.4.0 - jest-resolve: ^27.4.4 - jest-snapshot: ^27.4.4 + jest-resolve: ^27.4.5 + jest-snapshot: ^27.4.5 jest-util: ^27.4.2 jest-validate: ^27.4.2 slash: ^3.0.0 strip-bom: ^4.0.0 yargs: ^16.2.0 - checksum: f12cfcd7db91d1f36613a884493e68f255fff529504c25e77af0c60fea71fa526ebe401f27aaf05b8e563e365339829f6c39b2196159be4da6ea3445408d5d7b + checksum: 3fddd950504e2eee83f13237d8e2321c91237881a04e71cfd5457064eb970a91de3b8560b15ed6dbfc8843aa06151907510842f5f2f8e93b5a172a1d282ae26e languageName: node linkType: hard @@ -6801,9 +6815,9 @@ fsevents@~2.1.2: languageName: node linkType: hard -"jest-snapshot@npm:^27.4.4": - version: 27.4.4 - resolution: "jest-snapshot@npm:27.4.4" +"jest-snapshot@npm:^27.4.5": + version: 27.4.5 + resolution: "jest-snapshot@npm:27.4.5" dependencies: "@babel/core": ^7.7.2 "@babel/generator": ^7.7.2 @@ -6811,7 +6825,7 @@ fsevents@~2.1.2: "@babel/plugin-syntax-typescript": ^7.7.2 "@babel/traverse": ^7.7.2 "@babel/types": ^7.0.0 - "@jest/transform": ^27.4.4 + "@jest/transform": ^27.4.5 "@jest/types": ^27.4.2 "@types/babel__traverse": ^7.0.4 "@types/prettier": ^2.1.5 @@ -6821,15 +6835,15 @@ fsevents@~2.1.2: graceful-fs: ^4.2.4 jest-diff: ^27.4.2 jest-get-type: ^27.4.0 - jest-haste-map: ^27.4.4 + jest-haste-map: ^27.4.5 jest-matcher-utils: ^27.4.2 jest-message-util: ^27.4.2 - jest-resolve: ^27.4.4 + jest-resolve: ^27.4.5 jest-util: ^27.4.2 natural-compare: ^1.4.0 pretty-format: ^27.4.2 semver: ^7.3.2 - checksum: 4339cfa7725a0eb0b368af7e348dba07a03fc418c931d127843f8a933287c01cc880c5e32272a736c4c5ad1ba53fd96b789c30f9809258f515c77f3c140f91de + checksum: c5dcb1ccb95feb8773fc64b6d21d28fc8e8d2cf53bfde74247b3d34a83936a9b92492416d447d4e559e7b2ce39e442e4ee4a266d2f54c9ab8ab686eb16d1c8f4 languageName: node linkType: hard @@ -6876,24 +6890,24 @@ fsevents@~2.1.2: languageName: node linkType: hard -"jest-worker@npm:^27.4.4": - version: 27.4.4 - resolution: "jest-worker@npm:27.4.4" +"jest-worker@npm:^27.4.5": + version: 27.4.5 + resolution: "jest-worker@npm:27.4.5" dependencies: "@types/node": "*" merge-stream: ^2.0.0 supports-color: ^8.0.0 - checksum: e4a383d587f9e0fbe247a6c2e3a0dbe7b5cc0f9fe8583d6ffdc9257591563e62ecd6ef4c987dc44ca43a97d430395e36221427325bc839312a7ea62a4b1baedd + checksum: eb0b6be412103299c3d8643ad26daf862826ca841bd2a3ff47d2d931804ab7d7f0db2fcdea7dbf47ce8eacb7742b3f2586c2d6ebdaa8d0ac77c65f7b698e7683 languageName: node linkType: hard -"jest@npm:^27.4.4": - version: 27.4.4 - resolution: "jest@npm:27.4.4" +"jest@npm:^27.4.5": + version: 27.4.5 + resolution: "jest@npm:27.4.5" dependencies: - "@jest/core": ^27.4.4 + "@jest/core": ^27.4.5 import-local: ^3.0.2 - jest-cli: ^27.4.4 + jest-cli: ^27.4.5 peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 peerDependenciesMeta: @@ -6901,7 +6915,7 @@ fsevents@~2.1.2: optional: true bin: jest: bin/jest.js - checksum: 0af09bd42c1ecef555dbc4a8cdd2b77b4bfff9ab3d7d2ee01e343067f443eb5743c7acdf2f28e8d2d268c8e058b129c79b1eda99d7c8b06a6a0e9e1fd04cb741 + checksum: 57ee4be68650dd1f89e077cca48813d824779a07626e84178c672727ace1ef3cd489f124a27dc02b88601774413330e6d35080b11919efa6460ee61d378c6610 languageName: node linkType: hard @@ -8899,11 +8913,11 @@ resolve@^2.0.0-next.3: version: 0.0.0-use.local resolution: "root-workspace-0b6124@workspace:." dependencies: - "@babel/core": ^7.16.0 - "@babel/register": ^7.16.0 - "@babel/runtime": ^7.16.3 - "@polkadot/dev": ^0.63.39 - "@polkadot/ts": ^0.4.18 + "@babel/core": ^7.16.5 + "@babel/register": ^7.16.5 + "@babel/runtime": ^7.16.5 + "@polkadot/dev": ^0.64.3 + "@polkadot/ts": ^0.4.20 "@polkadot/typegen": "workspace:packages/typegen" "@types/jest": ^27.0.3 copyfiles: ^2.4.1