diff --git a/CHANGELOG.md b/CHANGELOG.md index d2f46b2788..170e684f8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ Changes: - Fix `isPedantic` decoding to correctly handle `Text` - Cater for new `phragmenElection` module naming - Add Kusama & Westend 9010 upgrade blocks +- Adjust `CompactSolution` for 24 nominators - Bump static metadata to latest Substrate diff --git a/package.json b/package.json index a24dc76c64..2d12ce2fc3 100644 --- a/package.json +++ b/package.json @@ -25,11 +25,11 @@ "test:watch": "polkadot-dev-run-test --watch" }, "devDependencies": { - "@babel/core": "^7.14.0", + "@babel/core": "^7.14.2", "@babel/register": "^7.13.16", "@babel/runtime": "^7.14.0", "@polkadot/dev": "^0.62.14", - "@polkadot/ts": "^0.3.65", + "@polkadot/ts": "^0.3.66", "@polkadot/typegen": "workspace:packages/typegen", "@types/jest": "^26.0.23", "copyfiles": "^2.4.1" diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json index 66ae3120f8..fe1116e382 100644 --- a/packages/api-contract/package.json +++ b/packages/api-contract/package.json @@ -22,8 +22,8 @@ "@babel/runtime": "^7.14.0", "@polkadot/api": "4.9.3-23", "@polkadot/types": "4.9.3-23", - "@polkadot/util": "^6.3.2-13", - "@polkadot/x-rxjs": "^6.3.2-13", + "@polkadot/util": "^6.4.1", + "@polkadot/x-rxjs": "^6.4.1", "bn.js": "^4.11.9" } } diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json index 4fe7919902..5ea107d1e4 100644 --- a/packages/api-derive/package.json +++ b/packages/api-derive/package.json @@ -23,13 +23,13 @@ "@polkadot/api": "4.9.3-23", "@polkadot/rpc-core": "4.9.3-23", "@polkadot/types": "4.9.3-23", - "@polkadot/util": "^6.3.2-13", - "@polkadot/util-crypto": "^6.3.2-13", - "@polkadot/x-rxjs": "^6.3.2-13", + "@polkadot/util": "^6.4.1", + "@polkadot/util-crypto": "^6.4.1", + "@polkadot/x-rxjs": "^6.4.1", "bn.js": "^4.11.9" }, "devDependencies": { - "@polkadot/keyring": "^6.3.2-13", + "@polkadot/keyring": "^6.4.1", "@polkadot/rpc-provider": "4.9.3-23" } } diff --git a/packages/api/package.json b/packages/api/package.json index f24ddeb512..a2da378c24 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -21,15 +21,15 @@ "dependencies": { "@babel/runtime": "^7.14.0", "@polkadot/api-derive": "4.9.3-23", - "@polkadot/keyring": "^6.3.2-13", + "@polkadot/keyring": "^6.4.1", "@polkadot/metadata": "4.9.3-23", "@polkadot/rpc-core": "4.9.3-23", "@polkadot/rpc-provider": "4.9.3-23", "@polkadot/types": "4.9.3-23", "@polkadot/types-known": "4.9.3-23", - "@polkadot/util": "^6.3.2-13", - "@polkadot/util-crypto": "^6.3.2-13", - "@polkadot/x-rxjs": "^6.3.2-13", + "@polkadot/util": "^6.4.1", + "@polkadot/util-crypto": "^6.4.1", + "@polkadot/x-rxjs": "^6.4.1", "bn.js": "^4.11.9", "eventemitter3": "^4.0.7" } diff --git a/packages/metadata/package.json b/packages/metadata/package.json index 45b0dee953..b6e732b865 100644 --- a/packages/metadata/package.json +++ b/packages/metadata/package.json @@ -22,11 +22,11 @@ "@babel/runtime": "^7.14.0", "@polkadot/types": "4.9.3-23", "@polkadot/types-known": "4.9.3-23", - "@polkadot/util": "^6.3.2-13", - "@polkadot/util-crypto": "^6.3.2-13", + "@polkadot/util": "^6.4.1", + "@polkadot/util-crypto": "^6.4.1", "bn.js": "^4.11.9" }, "devDependencies": { - "@polkadot/keyring": "^6.3.2-13" + "@polkadot/keyring": "^6.4.1" } } diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json index d89f83c740..d8baa9120c 100644 --- a/packages/rpc-core/package.json +++ b/packages/rpc-core/package.json @@ -23,10 +23,10 @@ "@polkadot/metadata": "4.9.3-23", "@polkadot/rpc-provider": "4.9.3-23", "@polkadot/types": "4.9.3-23", - "@polkadot/util": "^6.3.2-13", - "@polkadot/x-rxjs": "^6.3.2-13" + "@polkadot/util": "^6.4.1", + "@polkadot/x-rxjs": "^6.4.1" }, "devDependencies": { - "@polkadot/keyring": "^6.3.2-13" + "@polkadot/keyring": "^6.4.1" } } diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json index 443dfd1724..749ae2edd3 100644 --- a/packages/rpc-provider/package.json +++ b/packages/rpc-provider/package.json @@ -21,16 +21,16 @@ "dependencies": { "@babel/runtime": "^7.14.0", "@polkadot/types": "4.9.3-23", - "@polkadot/util": "^6.3.2-13", - "@polkadot/util-crypto": "^6.3.2-13", - "@polkadot/x-fetch": "^6.3.2-13", - "@polkadot/x-global": "^6.3.2-13", - "@polkadot/x-ws": "^6.3.2-13", + "@polkadot/util": "^6.4.1", + "@polkadot/util-crypto": "^6.4.1", + "@polkadot/x-fetch": "^6.4.1", + "@polkadot/x-global": "^6.4.1", + "@polkadot/x-ws": "^6.4.1", "bn.js": "^4.11.9", "eventemitter3": "^4.0.7" }, "devDependencies": { - "@polkadot/keyring": "^6.3.2-13", + "@polkadot/keyring": "^6.4.1", "@polkadot/metadata": "4.9.3-23", "mock-socket": "^9.0.3", "nock": "^13.0.11" diff --git a/packages/typegen/package.json b/packages/typegen/package.json index 407d1fd8e1..1b7ce0a3d7 100644 --- a/packages/typegen/package.json +++ b/packages/typegen/package.json @@ -26,14 +26,14 @@ "bugs": "https://github.com/polkadot-js/api/issues", "homepage": "https://github.com/polkadot-js/api/tree/master/packages/typegen#readme", "dependencies": { - "@babel/core": "^7.14.0", + "@babel/core": "^7.14.2", "@babel/register": "^7.13.16", "@babel/runtime": "^7.14.0", "@polkadot/api": "4.9.3-23", "@polkadot/metadata": "4.9.3-23", "@polkadot/rpc-provider": "4.9.3-23", "@polkadot/types": "4.9.3-23", - "@polkadot/util": "^6.3.2-13", + "@polkadot/util": "^6.4.1", "handlebars": "^4.7.7", "websocket": "^1.0.34", "yargs": "^17.0.1" diff --git a/packages/types-known/package.json b/packages/types-known/package.json index a86900b027..1f6283e444 100644 --- a/packages/types-known/package.json +++ b/packages/types-known/package.json @@ -20,9 +20,9 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types-known#readme", "dependencies": { "@babel/runtime": "^7.14.0", - "@polkadot/networks": "^6.3.2-13", + "@polkadot/networks": "^6.4.1", "@polkadot/types": "4.9.3-23", - "@polkadot/util": "^6.3.2-13", + "@polkadot/util": "^6.4.1", "bn.js": "^4.11.9" }, "devDependencies": { diff --git a/packages/types-known/src/spec/kusama.ts b/packages/types-known/src/spec/kusama.ts index 3cd4f66b86..5156d5417f 100644 --- a/packages/types-known/src/spec/kusama.ts +++ b/packages/types-known/src/spec/kusama.ts @@ -15,16 +15,20 @@ const sharedTypes = { const addrIndicesTypes = { AccountInfo: 'AccountInfoWithRefCount', Address: 'LookupSource', + CompactAssignments: 'CompactAssignmentsWith16', Keys: 'SessionKeys5', LookupSource: 'IndicesLookupSource', + RawSolution: 'RawSolutionWith16', ValidatorPrefs: 'ValidatorPrefsWithCommission' }; const addrAccountIdTypes = { AccountInfo: 'AccountInfoWithRefCount', Address: 'AccountId', + CompactAssignments: 'CompactAssignmentsWith16', Keys: 'SessionKeys5', LookupSource: 'AccountId', + RawSolution: 'RawSolutionWith16', ValidatorPrefs: 'ValidatorPrefsWithCommission' }; @@ -164,11 +168,21 @@ const versioned: OverrideVersionedType[] = [ minmax: [2028, 2029], types: { ...sharedTypes, - AccountInfo: 'AccountInfoWithDualRefCount' + AccountInfo: 'AccountInfoWithDualRefCount', + CompactAssignments: 'CompactAssignmentsWith16', + RawSolution: 'RawSolutionWith16' } }, { - minmax: [2030, undefined], + minmax: [2030, 9000], + types: { + ...sharedTypes, + CompactAssignments: 'CompactAssignmentsWith16', + RawSolution: 'RawSolutionWith16' + } + }, + { + minmax: [9010, undefined], types: { ...sharedTypes } diff --git a/packages/types-known/src/spec/polkadot.ts b/packages/types-known/src/spec/polkadot.ts index 84e9c35d0c..80418b1ee4 100644 --- a/packages/types-known/src/spec/polkadot.ts +++ b/packages/types-known/src/spec/polkadot.ts @@ -23,8 +23,10 @@ const sharedTypes = { const addrAccountIdTypes = { AccountInfo: 'AccountInfoWithRefCount', Address: 'AccountId', + CompactAssignments: 'CompactAssignmentsWith16', Keys: 'SessionKeys5', LookupSource: 'AccountId', + RawSolution: 'RawSolutionWith16', ValidatorPrefs: 'ValidatorPrefsWithCommission' }; @@ -68,11 +70,21 @@ const versioned: OverrideVersionedType[] = [ minmax: [28, 29], types: { ...sharedTypes, + CompactAssignments: 'CompactAssignmentsWith16', + RawSolution: 'RawSolutionWith16', AccountInfo: 'AccountInfoWithDualRefCount' } }, { - minmax: [30, undefined], + minmax: [30, 9000], + types: { + ...sharedTypes, + CompactAssignments: 'CompactAssignmentsWith16', + RawSolution: 'RawSolutionWith16' + } + }, + { + minmax: [9010, undefined], types: { ...sharedTypes } diff --git a/packages/types-known/src/spec/rococo.ts b/packages/types-known/src/spec/rococo.ts index 2c3c301659..eb7f18edc8 100644 --- a/packages/types-known/src/spec/rococo.ts +++ b/packages/types-known/src/spec/rococo.ts @@ -20,25 +20,39 @@ const versioned: OverrideVersionedType[] = [ ...sharedTypes, AccountInfo: 'AccountInfoWithDualRefCount', Address: 'AccountId', - LookupSource: 'AccountId' + CompactAssignments: 'CompactAssignmentsWith16', + LookupSource: 'AccountId', + RawSolution: 'RawSolutionWith16' } }, { minmax: [201, 214], types: { ...sharedTypes, - AccountInfo: 'AccountInfoWithDualRefCount' + AccountInfo: 'AccountInfoWithDualRefCount', + CompactAssignments: 'CompactAssignmentsWith16', + RawSolution: 'RawSolutionWith16' } }, { minmax: [215, 228], types: { ...sharedTypes, - Keys: 'SessionKeys6' + CompactAssignments: 'CompactAssignmentsWith16', + Keys: 'SessionKeys6', + RawSolution: 'RawSolutionWith16' } }, { - minmax: [229, undefined], + minmax: [229, 9000], + types: { + ...sharedTypes, + CompactAssignments: 'CompactAssignmentsWith16', + RawSolution: 'RawSolutionWith16' + } + }, + { + minmax: [9010, undefined], types: { ...sharedTypes } diff --git a/packages/types-known/src/spec/westend.ts b/packages/types-known/src/spec/westend.ts index 965933070c..6292d72183 100644 --- a/packages/types-known/src/spec/westend.ts +++ b/packages/types-known/src/spec/westend.ts @@ -15,8 +15,10 @@ const sharedTypes = { const addrAccountIdTypes = { AccountInfo: 'AccountInfoWithRefCount', Address: 'AccountId', + CompactAssignments: 'CompactAssignmentsWith16', LookupSource: 'AccountId', Keys: 'SessionKeys5', + RawSolution: 'RawSolutionWith16', ValidatorPrefs: 'ValidatorPrefsWithCommission' }; @@ -71,11 +73,21 @@ const versioned: OverrideVersionedType[] = [ minmax: [48, 49], types: { ...sharedTypes, - AccountInfo: 'AccountInfoWithDualRefCount' + AccountInfo: 'AccountInfoWithDualRefCount', + CompactAssignments: 'CompactAssignmentsWith16', + RawSolution: 'RawSolutionWith16' } }, { - minmax: [50, undefined], + minmax: [50, 9000], + types: { + ...sharedTypes, + CompactAssignments: 'CompactAssignmentsWith16', + RawSolution: 'RawSolutionWith16' + } + }, + { + minmax: [9010, undefined], types: { ...sharedTypes } diff --git a/packages/types/package.json b/packages/types/package.json index 6cc96bd9f4..d45f279a5a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -21,13 +21,13 @@ "dependencies": { "@babel/runtime": "^7.14.0", "@polkadot/metadata": "4.9.3-23", - "@polkadot/util": "^6.3.2-13", - "@polkadot/util-crypto": "^6.3.2-13", - "@polkadot/x-rxjs": "^6.3.2-13", + "@polkadot/util": "^6.4.1", + "@polkadot/util-crypto": "^6.4.1", + "@polkadot/x-rxjs": "^6.4.1", "@types/bn.js": "^4.11.6", "bn.js": "^4.11.9" }, "devDependencies": { - "@polkadot/keyring": "^6.3.2-13" + "@polkadot/keyring": "^6.4.1" } } diff --git a/packages/types/src/augment/registry.ts b/packages/types/src/augment/registry.ts index 6d39679b9c..f0e601f09a 100644 --- a/packages/types/src/augment/registry.ts +++ b/packages/types/src/augment/registry.ts @@ -47,7 +47,7 @@ import type { SiField, SiLookupTypeId, SiPath, SiType, SiTypeDef, SiTypeDefArray import type { Period, Priority, SchedulePeriod, SchedulePriority, Scheduled, ScheduledTo254, TaskAddress } from '@polkadot/types/interfaces/scheduler'; import type { BeefyKey, FullIdentification, IdentificationTuple, Keys, MembershipProof, SessionIndex, SessionKeys1, SessionKeys10, SessionKeys10B, SessionKeys2, SessionKeys3, SessionKeys4, SessionKeys5, SessionKeys6, SessionKeys6B, SessionKeys7, SessionKeys7B, SessionKeys8, SessionKeys8B, SessionKeys9, SessionKeys9B, ValidatorCount } from '@polkadot/types/interfaces/session'; import type { Bid, BidKind, SocietyJudgement, SocietyVote, StrikeCount, VouchingStatus } from '@polkadot/types/interfaces/society'; -import type { ActiveEraInfo, CompactAssignments, CompactAssignmentsTo257, CompactScore, CompactScoreCompact, ElectionCompute, ElectionPhase, ElectionResult, ElectionScore, ElectionSize, ElectionStatus, EraIndex, EraPoints, EraRewardPoints, EraRewards, Exposure, ExtendedBalance, Forcing, IndividualExposure, KeyType, MomentOf, Nominations, NominatorIndex, NominatorIndexCompact, OffchainAccuracy, OffchainAccuracyCompact, PhragmenScore, Points, RawSolution, ReadySolution, RewardDestination, RewardPoint, RoundSnapshot, SeatHolder, SlashJournalEntry, SlashingSpans, SlashingSpansTo204, SolutionOrSnapshotSize, SolutionSupport, SolutionSupports, SpanIndex, SpanRecord, StakingLedger, StakingLedgerTo223, StakingLedgerTo240, UnappliedSlash, UnappliedSlashOther, UnlockChunk, ValidatorIndex, ValidatorIndexCompact, ValidatorPrefs, ValidatorPrefsTo145, ValidatorPrefsTo196, ValidatorPrefsWithBlocked, ValidatorPrefsWithCommission, VoteWeight, Voter } from '@polkadot/types/interfaces/staking'; +import type { ActiveEraInfo, CompactAssignments, CompactAssignmentsTo257, CompactAssignmentsTo265, CompactAssignmentsWith16, CompactAssignmentsWith24, CompactScore, CompactScoreCompact, ElectionCompute, ElectionPhase, ElectionResult, ElectionScore, ElectionSize, ElectionStatus, EraIndex, EraPoints, EraRewardPoints, EraRewards, Exposure, ExtendedBalance, Forcing, IndividualExposure, KeyType, MomentOf, Nominations, NominatorIndex, NominatorIndexCompact, OffchainAccuracy, OffchainAccuracyCompact, PhragmenScore, Points, RawSolution, RawSolutionTo265, RawSolutionWith16, RawSolutionWith24, ReadySolution, RewardDestination, RewardPoint, RoundSnapshot, SeatHolder, SlashJournalEntry, SlashingSpans, SlashingSpansTo204, SolutionOrSnapshotSize, SolutionSupport, SolutionSupports, SpanIndex, SpanRecord, StakingLedger, StakingLedgerTo223, StakingLedgerTo240, UnappliedSlash, UnappliedSlashOther, UnlockChunk, ValidatorIndex, ValidatorIndexCompact, ValidatorPrefs, ValidatorPrefsTo145, ValidatorPrefsTo196, ValidatorPrefsWithBlocked, ValidatorPrefsWithCommission, VoteWeight, Voter } from '@polkadot/types/interfaces/staking'; import type { ApiId, BlockTrace, BlockTraceEvent, BlockTraceEventData, BlockTraceSpan, KeyValueOption, ReadProof, RuntimeVersion, RuntimeVersionApi, RuntimeVersionPartial, StorageChangeSet, TraceBlockResponse, TraceError } from '@polkadot/types/interfaces/state'; import type { WeightToFeeCoefficient } from '@polkadot/types/interfaces/support'; import type { AccountInfo, AccountInfoWithDualRefCount, AccountInfoWithProviders, AccountInfoWithRefCount, AccountInfoWithTripleRefCount, ApplyExtrinsicResult, ArithmeticError, BlockLength, BlockWeights, ChainProperties, ChainType, ConsumedWeight, DigestOf, DispatchClass, DispatchError, DispatchErrorModule, DispatchErrorTo198, DispatchInfo, DispatchInfoTo190, DispatchInfoTo244, DispatchOutcome, DispatchResult, DispatchResultOf, DispatchResultTo198, Event, EventId, EventIndex, EventRecord, Health, InvalidTransaction, Key, LastRuntimeUpgradeInfo, NetworkState, NetworkStatePeerset, NetworkStatePeersetInfo, NodeRole, NotConnectedPeer, Peer, PeerEndpoint, PeerEndpointAddr, PeerInfo, PeerPing, PerDispatchClassU32, PerDispatchClassWeight, PerDispatchClassWeightsPerClass, Phase, RawOrigin, RefCount, RefCountTo259, SyncState, SystemOrigin, TokenError, TransactionValidityError, UnknownTransaction, WeightPerClass } from '@polkadot/types/interfaces/system'; @@ -270,6 +270,9 @@ declare module '@polkadot/types/types/registry' { 'Option': Option; 'Option': Option; 'Option': Option; + 'Option': Option; + 'Option': Option; + 'Option': Option; 'Option': Option; 'Option': Option; 'Option': Option; @@ -719,6 +722,9 @@ declare module '@polkadot/types/types/registry' { 'Option': Option; 'Option': Option; 'Option': Option; + 'Option': Option; + 'Option': Option; + 'Option': Option; 'Option': Option; 'Option': Option; 'Option': Option; @@ -1107,6 +1113,9 @@ declare module '@polkadot/types/types/registry' { 'Vec': Vec; 'Vec': Vec; 'Vec': Vec; + 'Vec': Vec; + 'Vec': Vec; + 'Vec': Vec; 'Vec': Vec; 'Vec': Vec; 'Vec': Vec; @@ -1556,6 +1565,9 @@ declare module '@polkadot/types/types/registry' { 'Vec': Vec; 'Vec': Vec; 'Vec': Vec; + 'Vec': Vec; + 'Vec': Vec; + 'Vec': Vec; 'Vec': Vec; 'Vec': Vec; 'Vec': Vec; @@ -1944,6 +1956,9 @@ declare module '@polkadot/types/types/registry' { CommittedCandidateReceipt: CommittedCandidateReceipt; CompactAssignments: CompactAssignments; CompactAssignmentsTo257: CompactAssignmentsTo257; + CompactAssignmentsTo265: CompactAssignmentsTo265; + CompactAssignmentsWith16: CompactAssignmentsWith16; + CompactAssignmentsWith24: CompactAssignmentsWith24; CompactScore: CompactScore; CompactScoreCompact: CompactScoreCompact; ConfigData: ConfigData; @@ -2393,6 +2408,9 @@ declare module '@polkadot/types/types/registry' { RawBabePreDigestTo159: RawBabePreDigestTo159; RawOrigin: RawOrigin; RawSolution: RawSolution; + RawSolutionTo265: RawSolutionTo265; + RawSolutionWith16: RawSolutionWith16; + RawSolutionWith24: RawSolutionWith24; RawVRFOutput: RawVRFOutput; ReadProof: ReadProof; ReadySolution: ReadySolution; diff --git a/packages/types/src/interfaces/staking/CompactAssignments.spec.ts b/packages/types/src/interfaces/staking/CompactAssignments.spec.ts index c6a5c71fc3..678bacc1de 100644 --- a/packages/types/src/interfaces/staking/CompactAssignments.spec.ts +++ b/packages/types/src/interfaces/staking/CompactAssignments.spec.ts @@ -148,7 +148,7 @@ describe('CompactAssignmentSiNormal', (): void => { ]); const registry = new TypeRegistry(); - const compact = registry.createType('CompactAssignments', bytes); + const compact = registry.createType('CompactAssignmentsWith16', bytes); expect(compact.toJSON()).toEqual({ votes1: [[2, 20], [4, 40]], diff --git a/packages/types/src/interfaces/staking/definitions.ts b/packages/types/src/interfaces/staking/definitions.ts index 07cbc3cba6..636ed21c3a 100644 --- a/packages/types/src/interfaces/staking/definitions.ts +++ b/packages/types/src/interfaces/staking/definitions.ts @@ -15,7 +15,8 @@ const deprecated = { }; const phragmen = { - CompactAssignments: { + CompactAssignments: 'CompactAssignmentsWith24', + CompactAssignmentsWith16: { votes1: 'Vec<(NominatorIndexCompact, ValidatorIndexCompact)>', votes2: 'Vec<(NominatorIndexCompact, CompactScoreCompact, ValidatorIndexCompact)>', votes3: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 2], ValidatorIndexCompact)>', @@ -33,6 +34,33 @@ const phragmen = { votes15: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 14], ValidatorIndexCompact)>', votes16: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 15], ValidatorIndexCompact)>' }, + CompactAssignmentsWith24: { + votes1: 'Vec<(NominatorIndexCompact, ValidatorIndexCompact)>', + votes2: 'Vec<(NominatorIndexCompact, CompactScoreCompact, ValidatorIndexCompact)>', + votes3: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 2], ValidatorIndexCompact)>', + votes4: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 3], ValidatorIndexCompact)>', + votes5: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 4], ValidatorIndexCompact)>', + votes6: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 5], ValidatorIndexCompact)>', + votes7: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 6], ValidatorIndexCompact)>', + votes8: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 7], ValidatorIndexCompact)>', + votes9: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 8], ValidatorIndexCompact)>', + votes10: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 9], ValidatorIndexCompact)>', + votes11: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 10], ValidatorIndexCompact)>', + votes12: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 11], ValidatorIndexCompact)>', + votes13: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 12], ValidatorIndexCompact)>', + votes14: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 13], ValidatorIndexCompact)>', + votes15: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 14], ValidatorIndexCompact)>', + votes16: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 15], ValidatorIndexCompact)>', + votes17: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 16], ValidatorIndexCompact)>', + votes18: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 17], ValidatorIndexCompact)>', + votes19: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 18], ValidatorIndexCompact)>', + votes20: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 19], ValidatorIndexCompact)>', + votes21: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 20], ValidatorIndexCompact)>', + votes22: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 21], ValidatorIndexCompact)>', + votes23: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 22], ValidatorIndexCompact)>', + votes24: 'Vec<(NominatorIndexCompact, [CompactScoreCompact; 23], ValidatorIndexCompact)>' + }, + CompactAssignmentsTo265: 'CompactAssignmentsWith16', CompactAssignmentsTo257: { votes1: 'Vec<(NominatorIndex, [CompactScore; 0], ValidatorIndex)>', votes2: 'Vec<(NominatorIndex, [CompactScore; 1], ValidatorIndex)>', @@ -83,11 +111,18 @@ const phragmen = { } }, ExtendedBalance: 'u128', - RawSolution: { - compact: 'CompactAssignments', + RawSolution: 'RawSolutionWith24', + RawSolutionWith16: { + compact: 'CompactAssignmentsWith16', score: 'ElectionScore', round: 'u32' }, + RawSolutionWith24: { + compact: 'CompactAssignmentsWith24', + score: 'ElectionScore', + round: 'u32' + }, + RawSolutionTo265: 'RawSolutionWith16', ReadySolution: { supports: 'SolutionSupports', score: 'ElectionScore', diff --git a/packages/types/src/interfaces/staking/types.ts b/packages/types/src/interfaces/staking/types.ts index 91894849f6..3acb247c22 100644 --- a/packages/types/src/interfaces/staking/types.ts +++ b/packages/types/src/interfaces/staking/types.ts @@ -12,24 +12,7 @@ export interface ActiveEraInfo extends Struct { } /** @name CompactAssignments */ -export interface CompactAssignments extends Struct { - readonly votes1: Vec>; - readonly votes2: Vec>; - readonly votes3: Vec, ValidatorIndexCompact]>>; - readonly votes4: Vec, ValidatorIndexCompact]>>; - readonly votes5: Vec, ValidatorIndexCompact]>>; - readonly votes6: Vec, ValidatorIndexCompact]>>; - readonly votes7: Vec, ValidatorIndexCompact]>>; - readonly votes8: Vec, ValidatorIndexCompact]>>; - readonly votes9: Vec, ValidatorIndexCompact]>>; - readonly votes10: Vec, ValidatorIndexCompact]>>; - readonly votes11: Vec, ValidatorIndexCompact]>>; - readonly votes12: Vec, ValidatorIndexCompact]>>; - readonly votes13: Vec, ValidatorIndexCompact]>>; - readonly votes14: Vec, ValidatorIndexCompact]>>; - readonly votes15: Vec, ValidatorIndexCompact]>>; - readonly votes16: Vec, ValidatorIndexCompact]>>; -} +export interface CompactAssignments extends CompactAssignmentsWith24 {} /** @name CompactAssignmentsTo257 */ export interface CompactAssignmentsTo257 extends Struct { @@ -51,6 +34,57 @@ export interface CompactAssignmentsTo257 extends Struct { readonly votes16: Vec, ValidatorIndex]>>; } +/** @name CompactAssignmentsTo265 */ +export interface CompactAssignmentsTo265 extends CompactAssignmentsWith16 {} + +/** @name CompactAssignmentsWith16 */ +export interface CompactAssignmentsWith16 extends Struct { + readonly votes1: Vec>; + readonly votes2: Vec>; + readonly votes3: Vec, ValidatorIndexCompact]>>; + readonly votes4: Vec, ValidatorIndexCompact]>>; + readonly votes5: Vec, ValidatorIndexCompact]>>; + readonly votes6: Vec, ValidatorIndexCompact]>>; + readonly votes7: Vec, ValidatorIndexCompact]>>; + readonly votes8: Vec, ValidatorIndexCompact]>>; + readonly votes9: Vec, ValidatorIndexCompact]>>; + readonly votes10: Vec, ValidatorIndexCompact]>>; + readonly votes11: Vec, ValidatorIndexCompact]>>; + readonly votes12: Vec, ValidatorIndexCompact]>>; + readonly votes13: Vec, ValidatorIndexCompact]>>; + readonly votes14: Vec, ValidatorIndexCompact]>>; + readonly votes15: Vec, ValidatorIndexCompact]>>; + readonly votes16: Vec, ValidatorIndexCompact]>>; +} + +/** @name CompactAssignmentsWith24 */ +export interface CompactAssignmentsWith24 extends Struct { + readonly votes1: Vec>; + readonly votes2: Vec>; + readonly votes3: Vec, ValidatorIndexCompact]>>; + readonly votes4: Vec, ValidatorIndexCompact]>>; + readonly votes5: Vec, ValidatorIndexCompact]>>; + readonly votes6: Vec, ValidatorIndexCompact]>>; + readonly votes7: Vec, ValidatorIndexCompact]>>; + readonly votes8: Vec, ValidatorIndexCompact]>>; + readonly votes9: Vec, ValidatorIndexCompact]>>; + readonly votes10: Vec, ValidatorIndexCompact]>>; + readonly votes11: Vec, ValidatorIndexCompact]>>; + readonly votes12: Vec, ValidatorIndexCompact]>>; + readonly votes13: Vec, ValidatorIndexCompact]>>; + readonly votes14: Vec, ValidatorIndexCompact]>>; + readonly votes15: Vec, ValidatorIndexCompact]>>; + readonly votes16: Vec, ValidatorIndexCompact]>>; + readonly votes17: Vec, ValidatorIndexCompact]>>; + readonly votes18: Vec, ValidatorIndexCompact]>>; + readonly votes19: Vec, ValidatorIndexCompact]>>; + readonly votes20: Vec, ValidatorIndexCompact]>>; + readonly votes21: Vec, ValidatorIndexCompact]>>; + readonly votes22: Vec, ValidatorIndexCompact]>>; + readonly votes23: Vec, ValidatorIndexCompact]>>; + readonly votes24: Vec, ValidatorIndexCompact]>>; +} + /** @name CompactScore */ export interface CompactScore extends ITuple<[ValidatorIndex, OffchainAccuracy]> {} @@ -173,8 +207,21 @@ export interface PhragmenScore extends Vec {} export interface Points extends u32 {} /** @name RawSolution */ -export interface RawSolution extends Struct { - readonly compact: CompactAssignments; +export interface RawSolution extends RawSolutionWith24 {} + +/** @name RawSolutionTo265 */ +export interface RawSolutionTo265 extends RawSolutionWith16 {} + +/** @name RawSolutionWith16 */ +export interface RawSolutionWith16 extends Struct { + readonly compact: CompactAssignmentsWith16; + readonly score: ElectionScore; + readonly round: u32; +} + +/** @name RawSolutionWith24 */ +export interface RawSolutionWith24 extends Struct { + readonly compact: CompactAssignmentsWith24; readonly score: ElectionScore; readonly round: u32; } diff --git a/yarn.lock b/yarn.lock index c45a0adf99..68fc6a77be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -57,37 +57,37 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:7.14.0, @babel/core@npm:^7.1.0, @babel/core@npm:^7.14.0, @babel/core@npm:^7.7.5": - version: 7.14.0 - resolution: "@babel/core@npm:7.14.0" +"@babel/core@npm:7.14.2, @babel/core@npm:^7.1.0, @babel/core@npm:^7.14.0, @babel/core@npm:^7.14.2, @babel/core@npm:^7.7.5": + version: 7.14.2 + resolution: "@babel/core@npm:7.14.2" dependencies: "@babel/code-frame": ^7.12.13 - "@babel/generator": ^7.14.0 + "@babel/generator": ^7.14.2 "@babel/helper-compilation-targets": ^7.13.16 - "@babel/helper-module-transforms": ^7.14.0 + "@babel/helper-module-transforms": ^7.14.2 "@babel/helpers": ^7.14.0 - "@babel/parser": ^7.14.0 + "@babel/parser": ^7.14.2 "@babel/template": ^7.12.13 - "@babel/traverse": ^7.14.0 - "@babel/types": ^7.14.0 + "@babel/traverse": ^7.14.2 + "@babel/types": ^7.14.2 convert-source-map: ^1.7.0 debug: ^4.1.0 gensync: ^1.0.0-beta.2 json5: ^2.1.2 semver: ^6.3.0 source-map: ^0.5.0 - checksum: eccd8c6acf33a2782b9213bffc0e766857c9b690649512c3a525a02bb212301c6fdf314d6e7f7404479dc9631beb58a8f5e673ea9f3c1964853a3c65b045a382 + checksum: 16dc0a52484da794afc69ac7f13721b7cf2f7e17db6467a36f19fef24fa59a8cea1524faa260d0c05f5a99836fb65acf076cf15abf6846fc66f6c142a94a8327 languageName: node linkType: hard -"@babel/generator@npm:^7.14.0": - version: 7.14.0 - resolution: "@babel/generator@npm:7.14.0" +"@babel/generator@npm:^7.14.2": + version: 7.14.2 + resolution: "@babel/generator@npm:7.14.2" dependencies: - "@babel/types": ^7.14.0 + "@babel/types": ^7.14.2 jsesc: ^2.5.1 source-map: ^0.5.0 - checksum: ef47e0f9b7b78124e43e1cae8b46570c67022379e52b03f50e121c0cb5aaec9ca7063182417249786a53f4a18f9725bbd7532c31002be575f4b79c0f0d04430d + checksum: eacc93d3446dec6fac064cd884ac6e2ecbcfed65f8de069da72855a8124d33004a9dc9f06833e18fae2e352929c493b46035785f948549d2e9d503af0bef8a79 languageName: node linkType: hard @@ -179,14 +179,14 @@ __metadata: languageName: node linkType: hard -"@babel/helper-function-name@npm:^7.12.13": - version: 7.12.13 - resolution: "@babel/helper-function-name@npm:7.12.13" +"@babel/helper-function-name@npm:^7.12.13, @babel/helper-function-name@npm:^7.14.2": + version: 7.14.2 + resolution: "@babel/helper-function-name@npm:7.14.2" dependencies: "@babel/helper-get-function-arity": ^7.12.13 "@babel/template": ^7.12.13 - "@babel/types": ^7.12.13 - checksum: 25f03f303be790618437dc49c6df758d362112a564361d2eae66b58fda4f5ec09e62875473b18090b939c8d3d60b36aa7c9f688768b7fade511512d02ac9d3d0 + "@babel/types": ^7.14.2 + checksum: 36bf5e4126b5bdf7c7e686ca487f9a91857d723d457a2608645d10ed7b0ba3da0c0e0cd0b31efe71091ea80656bf98578e3bad50c6c7fab771fd5de439aeebad languageName: node linkType: hard @@ -227,9 +227,9 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.13.0, @babel/helper-module-transforms@npm:^7.14.0": - version: 7.14.0 - resolution: "@babel/helper-module-transforms@npm:7.14.0" +"@babel/helper-module-transforms@npm:^7.13.0, @babel/helper-module-transforms@npm:^7.14.0, @babel/helper-module-transforms@npm:^7.14.2": + version: 7.14.2 + resolution: "@babel/helper-module-transforms@npm:7.14.2" dependencies: "@babel/helper-module-imports": ^7.13.12 "@babel/helper-replace-supers": ^7.13.12 @@ -237,9 +237,9 @@ __metadata: "@babel/helper-split-export-declaration": ^7.12.13 "@babel/helper-validator-identifier": ^7.14.0 "@babel/template": ^7.12.13 - "@babel/traverse": ^7.14.0 - "@babel/types": ^7.14.0 - checksum: 1049a94cc74247c8ae4f5a804b4a0713ab4ad8f69eb412ea99ac1d03b4a9b9df3d1481286fa5e503239473ffb81dbb4f029d05cc681eff4d5380ae67161ac916 + "@babel/traverse": ^7.14.2 + "@babel/types": ^7.14.2 + checksum: c0a543a2149d15ad9c129f002cb01974c79a16ea10de9e3f9b7a296f2bbe3deaef9457acf6b9d2238e9629d5e98964539d28843cdd4d328b115f559871ccf533 languageName: node linkType: hard @@ -357,12 +357,12 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.0.0, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.13, @babel/parser@npm:^7.14.0": - version: 7.14.0 - resolution: "@babel/parser@npm:7.14.0" +"@babel/parser@npm:^7.0.0, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.13, @babel/parser@npm:^7.14.2": + version: 7.14.2 + resolution: "@babel/parser@npm:7.14.2" bin: parser: ./bin/babel-parser.js - checksum: ef6165f3038b9f8761a02768ab14034f4935baf2e050a2924aa093f54e3164732bce7fee81b3c8ff3be03048091e4ea208a72b23a3715debf7fd06b79495c9e9 + checksum: 18dffc18a2c15f8877988c9b5a46c87f1763e8a383c3210c9b5b651955b1ac46dc54da27acc09acd7fb917f37e0bd92b8985dc4c9d7f1e750dfccbcea730aa0e languageName: node linkType: hard @@ -1380,29 +1380,29 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.14.0": - version: 7.14.0 - resolution: "@babel/traverse@npm:7.14.0" +"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.14.2": + version: 7.14.2 + resolution: "@babel/traverse@npm:7.14.2" dependencies: "@babel/code-frame": ^7.12.13 - "@babel/generator": ^7.14.0 - "@babel/helper-function-name": ^7.12.13 + "@babel/generator": ^7.14.2 + "@babel/helper-function-name": ^7.14.2 "@babel/helper-split-export-declaration": ^7.12.13 - "@babel/parser": ^7.14.0 - "@babel/types": ^7.14.0 + "@babel/parser": ^7.14.2 + "@babel/types": ^7.14.2 debug: ^4.1.0 globals: ^11.1.0 - checksum: f2fb957d616c242d8ccd25fbebadebc25aa2df8ea82d7cacb2b09285743a682f72beb6fb2acef01a7a98f141c3e36d19300ebde2dd78c780c5e3dc7692c5f6f2 + checksum: 76f57f7a718c5ac17f72eb729e68d6135e37ee6201642d25c92d8add7b87eb492c7af40bd5193c27cca83cb60a649c9ccbe0f500e37569609e044b0560602cb7 languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.1, @babel/types@npm:^7.12.13, @babel/types@npm:^7.13.0, @babel/types@npm:^7.13.12, @babel/types@npm:^7.14.0, @babel/types@npm:^7.14.1, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": - version: 7.14.1 - resolution: "@babel/types@npm:7.14.1" +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.1, @babel/types@npm:^7.12.13, @babel/types@npm:^7.13.0, @babel/types@npm:^7.13.12, @babel/types@npm:^7.14.0, @babel/types@npm:^7.14.1, @babel/types@npm:^7.14.2, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": + version: 7.14.2 + resolution: "@babel/types@npm:7.14.2" dependencies: "@babel/helper-validator-identifier": ^7.14.0 to-fast-properties: ^2.0.0 - checksum: 27965ef192ded329d8ae28ccd5e5addd02dc477ec46e54145e5cf0d054ad65b2fc760736865295c1819d502ec9598883c17f25efdbe896ad77b400136a1aa971 + checksum: 34893ac415826cd2ddead0511be9c3cb876bf626148b00b0a471c4630b193939ba46a9bf9d8b2be88e46fceb3ae9204ed7488ceb6a08a67550211d40df65a7c7 languageName: node linkType: hard @@ -1843,8 +1843,8 @@ __metadata: "@babel/runtime": ^7.14.0 "@polkadot/api": 4.9.3-23 "@polkadot/types": 4.9.3-23 - "@polkadot/util": ^6.3.2-13 - "@polkadot/x-rxjs": ^6.3.2-13 + "@polkadot/util": ^6.4.1 + "@polkadot/x-rxjs": ^6.4.1 bn.js: ^4.11.9 languageName: unknown linkType: soft @@ -1855,13 +1855,13 @@ __metadata: dependencies: "@babel/runtime": ^7.14.0 "@polkadot/api": 4.9.3-23 - "@polkadot/keyring": ^6.3.2-13 + "@polkadot/keyring": ^6.4.1 "@polkadot/rpc-core": 4.9.3-23 "@polkadot/rpc-provider": 4.9.3-23 "@polkadot/types": 4.9.3-23 - "@polkadot/util": ^6.3.2-13 - "@polkadot/util-crypto": ^6.3.2-13 - "@polkadot/x-rxjs": ^6.3.2-13 + "@polkadot/util": ^6.4.1 + "@polkadot/util-crypto": ^6.4.1 + "@polkadot/x-rxjs": ^6.4.1 bn.js: ^4.11.9 languageName: unknown linkType: soft @@ -1872,15 +1872,15 @@ __metadata: dependencies: "@babel/runtime": ^7.14.0 "@polkadot/api-derive": 4.9.3-23 - "@polkadot/keyring": ^6.3.2-13 + "@polkadot/keyring": ^6.4.1 "@polkadot/metadata": 4.9.3-23 "@polkadot/rpc-core": 4.9.3-23 "@polkadot/rpc-provider": 4.9.3-23 "@polkadot/types": 4.9.3-23 "@polkadot/types-known": 4.9.3-23 - "@polkadot/util": ^6.3.2-13 - "@polkadot/util-crypto": ^6.3.2-13 - "@polkadot/x-rxjs": ^6.3.2-13 + "@polkadot/util": ^6.4.1 + "@polkadot/util-crypto": ^6.4.1 + "@polkadot/x-rxjs": ^6.4.1 bn.js: ^4.11.9 eventemitter3: ^4.0.7 languageName: unknown @@ -1972,17 +1972,17 @@ __metadata: languageName: node linkType: hard -"@polkadot/keyring@npm:^6.3.2-13": - version: 6.3.2-13 - resolution: "@polkadot/keyring@npm:6.3.2-13" +"@polkadot/keyring@npm:^6.4.1": + version: 6.4.1 + resolution: "@polkadot/keyring@npm:6.4.1" dependencies: "@babel/runtime": ^7.14.0 - "@polkadot/util": 6.3.2-13 - "@polkadot/util-crypto": 6.3.2-13 + "@polkadot/util": 6.4.1 + "@polkadot/util-crypto": 6.4.1 peerDependencies: - "@polkadot/util": 6.3.2-13 - "@polkadot/util-crypto": 6.3.2-13 - checksum: 2e8e49d285472e62a9b314e938f8d6bcf29c5e92aadfae536454e605258662aabfc819590379e8d314993560c91ab16b82da4c155b2c9ee0b929ab4a816f6ee8 + "@polkadot/util": 6.4.1 + "@polkadot/util-crypto": 6.4.1 + checksum: 40b2fdae19317fc3263f7c51690d8694589fb82e373ba8a74ecd3718bdfe2067fb96164e072c8600a89b1468dc9fd191c45540fe556799f6f3513ad6076da049 languageName: node linkType: hard @@ -1991,21 +1991,21 @@ __metadata: resolution: "@polkadot/metadata@workspace:packages/metadata" dependencies: "@babel/runtime": ^7.14.0 - "@polkadot/keyring": ^6.3.2-13 + "@polkadot/keyring": ^6.4.1 "@polkadot/types": 4.9.3-23 "@polkadot/types-known": 4.9.3-23 - "@polkadot/util": ^6.3.2-13 - "@polkadot/util-crypto": ^6.3.2-13 + "@polkadot/util": ^6.4.1 + "@polkadot/util-crypto": ^6.4.1 bn.js: ^4.11.9 languageName: unknown linkType: soft -"@polkadot/networks@npm:6.3.2-13, @polkadot/networks@npm:^6.3.2-13": - version: 6.3.2-13 - resolution: "@polkadot/networks@npm:6.3.2-13" +"@polkadot/networks@npm:6.4.1, @polkadot/networks@npm:^6.4.1": + version: 6.4.1 + resolution: "@polkadot/networks@npm:6.4.1" dependencies: "@babel/runtime": ^7.14.0 - checksum: c66aba68eac142ad5f955722d98f6672e21cfa7b8226a60012be8f508d3d37347b889aa1e5a2c46bf092316d94813b1b5c1151b046d60644be646b07f1b7a69f + checksum: 87acb72f006bf321e6d6b45942639708861f1922e05b7378b36bffbe1aa0d4549c7846e376ddcd6d0f5b05616d12bb21d65342b7a7dce78a78d2fab7effec3bb languageName: node linkType: hard @@ -2014,12 +2014,12 @@ __metadata: resolution: "@polkadot/rpc-core@workspace:packages/rpc-core" dependencies: "@babel/runtime": ^7.14.0 - "@polkadot/keyring": ^6.3.2-13 + "@polkadot/keyring": ^6.4.1 "@polkadot/metadata": 4.9.3-23 "@polkadot/rpc-provider": 4.9.3-23 "@polkadot/types": 4.9.3-23 - "@polkadot/util": ^6.3.2-13 - "@polkadot/x-rxjs": ^6.3.2-13 + "@polkadot/util": ^6.4.1 + "@polkadot/x-rxjs": ^6.4.1 languageName: unknown linkType: soft @@ -2028,14 +2028,14 @@ __metadata: resolution: "@polkadot/rpc-provider@workspace:packages/rpc-provider" dependencies: "@babel/runtime": ^7.14.0 - "@polkadot/keyring": ^6.3.2-13 + "@polkadot/keyring": ^6.4.1 "@polkadot/metadata": 4.9.3-23 "@polkadot/types": 4.9.3-23 - "@polkadot/util": ^6.3.2-13 - "@polkadot/util-crypto": ^6.3.2-13 - "@polkadot/x-fetch": ^6.3.2-13 - "@polkadot/x-global": ^6.3.2-13 - "@polkadot/x-ws": ^6.3.2-13 + "@polkadot/util": ^6.4.1 + "@polkadot/util-crypto": ^6.4.1 + "@polkadot/x-fetch": ^6.4.1 + "@polkadot/x-global": ^6.4.1 + "@polkadot/x-ws": ^6.4.1 bn.js: ^4.11.9 eventemitter3: ^4.0.7 mock-socket: ^9.0.3 @@ -2043,12 +2043,12 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/ts@npm:^0.3.65": - version: 0.3.65 - resolution: "@polkadot/ts@npm:0.3.65" +"@polkadot/ts@npm:^0.3.66": + version: 0.3.66 + resolution: "@polkadot/ts@npm:0.3.66" dependencies: - "@types/chrome": ^0.0.137 - checksum: 27e1bef72801ac2d2686d491b6f22cad40d0434c612aa2d95b616eb15175042bdfc2f4384e43081b9d5c11f40b8a5a9397889478bd9fde1e7790ccc079c72fa5 + "@types/chrome": ^0.0.140 + checksum: 87a6fffc9fbcad3d374d2ee2c7f06af89fcbff2d168e7df1d357ae4a74d584a4aabef48f9d9004f1e8843afddcc5304546362d4e35e36ff7cb56832ef0807d2c languageName: node linkType: hard @@ -2056,14 +2056,14 @@ __metadata: version: 0.0.0-use.local resolution: "@polkadot/typegen@workspace:packages/typegen" dependencies: - "@babel/core": ^7.14.0 + "@babel/core": ^7.14.2 "@babel/register": ^7.13.16 "@babel/runtime": ^7.14.0 "@polkadot/api": 4.9.3-23 "@polkadot/metadata": 4.9.3-23 "@polkadot/rpc-provider": 4.9.3-23 "@polkadot/types": 4.9.3-23 - "@polkadot/util": ^6.3.2-13 + "@polkadot/util": ^6.4.1 "@types/websocket": ^1.0.2 "@types/yargs": ^16.0.1 handlebars: ^4.7.7 @@ -2083,9 +2083,9 @@ __metadata: resolution: "@polkadot/types-known@workspace:packages/types-known" dependencies: "@babel/runtime": ^7.14.0 - "@polkadot/networks": ^6.3.2-13 + "@polkadot/networks": ^6.4.1 "@polkadot/types": 4.9.3-23 - "@polkadot/util": ^6.3.2-13 + "@polkadot/util": ^6.4.1 "@types/bn.js": ^4.11.6 bn.js: ^4.11.9 languageName: unknown @@ -2096,25 +2096,25 @@ __metadata: resolution: "@polkadot/types@workspace:packages/types" dependencies: "@babel/runtime": ^7.14.0 - "@polkadot/keyring": ^6.3.2-13 + "@polkadot/keyring": ^6.4.1 "@polkadot/metadata": 4.9.3-23 - "@polkadot/util": ^6.3.2-13 - "@polkadot/util-crypto": ^6.3.2-13 - "@polkadot/x-rxjs": ^6.3.2-13 + "@polkadot/util": ^6.4.1 + "@polkadot/util-crypto": ^6.4.1 + "@polkadot/x-rxjs": ^6.4.1 "@types/bn.js": ^4.11.6 bn.js: ^4.11.9 languageName: unknown linkType: soft -"@polkadot/util-crypto@npm:6.3.2-13, @polkadot/util-crypto@npm:^6.3.2-13": - version: 6.3.2-13 - resolution: "@polkadot/util-crypto@npm:6.3.2-13" +"@polkadot/util-crypto@npm:6.4.1, @polkadot/util-crypto@npm:^6.4.1": + version: 6.4.1 + resolution: "@polkadot/util-crypto@npm:6.4.1" dependencies: "@babel/runtime": ^7.14.0 - "@polkadot/networks": 6.3.2-13 - "@polkadot/util": 6.3.2-13 + "@polkadot/networks": 6.4.1 + "@polkadot/util": 6.4.1 "@polkadot/wasm-crypto": ^4.0.2 - "@polkadot/x-randomvalues": 6.3.2-13 + "@polkadot/x-randomvalues": 6.4.1 base-x: ^3.0.8 base64-js: ^1.5.1 blakejs: ^1.1.0 @@ -2127,23 +2127,23 @@ __metadata: tweetnacl: ^1.0.3 xxhashjs: ^0.2.2 peerDependencies: - "@polkadot/util": 6.3.2-13 - checksum: 8b0de15a3b898a7d621eaaae8c881c82a80524714ea3a03b4b3f49972b99c8ca76e6957e0c46d861aedd3d65a65acd50f585e0cd096be880c345f8c9af26d7fd + "@polkadot/util": 6.4.1 + checksum: eef9f8c73bbe8c7caefc905b09d175d4a0190d703bd4a8e65723dc2a5eadeb3646eac6b1a3c1034fe97bcf982aa0a3f7e4e4da01226d6993be488fa7c760684a languageName: node linkType: hard -"@polkadot/util@npm:6.3.2-13, @polkadot/util@npm:^6.3.2-13": - version: 6.3.2-13 - resolution: "@polkadot/util@npm:6.3.2-13" +"@polkadot/util@npm:6.4.1, @polkadot/util@npm:^6.4.1": + version: 6.4.1 + resolution: "@polkadot/util@npm:6.4.1" dependencies: "@babel/runtime": ^7.14.0 - "@polkadot/x-textdecoder": 6.3.2-13 - "@polkadot/x-textencoder": 6.3.2-13 + "@polkadot/x-textdecoder": 6.4.1 + "@polkadot/x-textencoder": 6.4.1 "@types/bn.js": ^4.11.6 bn.js: ^4.11.9 camelcase: ^5.3.1 ip-regex: ^4.3.0 - checksum: d2f8629cf7686a42b34f6fdc028b55bf85b01aec0e287f307d055547645bc8e05a9c207ce03ee5f6a57a2ae03a30b4e457e769884b32861ce9c43da8ce934dff + checksum: dce56aa96b60233cd72c7c7c615b972cdab069cbbd355c87ffbc32c292aff32e6b7bb35b1b365362eab454a876069c0006348282d9807f8846a2ecd9afc16c0d languageName: node linkType: hard @@ -2179,78 +2179,78 @@ __metadata: languageName: node linkType: hard -"@polkadot/x-fetch@npm:^6.3.2-13": - version: 6.3.2-13 - resolution: "@polkadot/x-fetch@npm:6.3.2-13" +"@polkadot/x-fetch@npm:^6.4.1": + version: 6.4.1 + resolution: "@polkadot/x-fetch@npm:6.4.1" dependencies: "@babel/runtime": ^7.14.0 - "@polkadot/x-global": 6.3.2-13 + "@polkadot/x-global": 6.4.1 "@types/node-fetch": ^2.5.10 node-fetch: ^2.6.1 - checksum: f9713fe746cc7ea0eb595364ff86d8bd7f130d4bc899bbb8419811138f6dda2bfaeddb77c3b7b949efb21fe1fe29faa4a60d9e7c9c18e9779632976e4a75edf8 + checksum: 0cfe81498eba0ba84602deb09de6c889d9dccc3df43c1ddbba2302264ef27de3d4f9a3d323985fc6b99d8a45851fa53c56e5929e143fd813e768fbb2140d93c6 languageName: node linkType: hard -"@polkadot/x-global@npm:6.3.2-13, @polkadot/x-global@npm:^6.3.2-13": - version: 6.3.2-13 - resolution: "@polkadot/x-global@npm:6.3.2-13" +"@polkadot/x-global@npm:6.4.1, @polkadot/x-global@npm:^6.4.1": + version: 6.4.1 + resolution: "@polkadot/x-global@npm:6.4.1" dependencies: "@babel/runtime": ^7.14.0 "@types/node-fetch": ^2.5.10 node-fetch: ^2.6.1 - checksum: 663d140ff1f8b6642905027e0b2be61c73af954ede0e17b11542c3ce1760397d4ebbfb5cb5bf11753e974280131c494ed73d551229e51b9a5b13581af1582656 + checksum: 396c051cf05fe9354ffa801b73f11617c10a72dc4f86950137b2db804d6a3229c7177b4747225a0685efa46090ee6652a471fadec50fb02f78c6c1700770c3ed languageName: node linkType: hard -"@polkadot/x-randomvalues@npm:6.3.2-13": - version: 6.3.2-13 - resolution: "@polkadot/x-randomvalues@npm:6.3.2-13" +"@polkadot/x-randomvalues@npm:6.4.1": + version: 6.4.1 + resolution: "@polkadot/x-randomvalues@npm:6.4.1" dependencies: "@babel/runtime": ^7.14.0 - "@polkadot/x-global": 6.3.2-13 - checksum: 49ab698ad771562b7118099de8cab2ffde7b5b266b056d2d450a4f5e901116e992af7de416b280713225cd76ffcf27c61d7027db7866789b024fa620f287b291 + "@polkadot/x-global": 6.4.1 + checksum: e16d39aa9d6765bb86a8a82cb6a596dea5303e153f505266b3b52b8f7febc7f9e84195fa5068b1fa4f13b33788fcbad0f30f0f5a3443803daea3d48d6eba330a languageName: node linkType: hard -"@polkadot/x-rxjs@npm:^6.3.2-13": - version: 6.3.2-13 - resolution: "@polkadot/x-rxjs@npm:6.3.2-13" +"@polkadot/x-rxjs@npm:^6.4.1": + version: 6.4.1 + resolution: "@polkadot/x-rxjs@npm:6.4.1" dependencies: "@babel/runtime": ^7.14.0 rxjs: ^6.6.7 - checksum: c13e5944f1db3fadbadabef76e7ba948c26f8d77ed2ce6f28aa2951d5fd99f31147b9b68d758185942dff36666fb0106a99f092f58883813e12cb18d043dcea9 + checksum: cd73834f610d8cd5d7a229a013afede97364775a66459d74662d66f13fcdab962493185645680083cca05dc973a65c276c061d58a4513d59a3b323e6ef9ca35f languageName: node linkType: hard -"@polkadot/x-textdecoder@npm:6.3.2-13": - version: 6.3.2-13 - resolution: "@polkadot/x-textdecoder@npm:6.3.2-13" +"@polkadot/x-textdecoder@npm:6.4.1": + version: 6.4.1 + resolution: "@polkadot/x-textdecoder@npm:6.4.1" dependencies: "@babel/runtime": ^7.14.0 - "@polkadot/x-global": 6.3.2-13 - checksum: 79bd47ebb23ff743ebad58359c09d54c397891d4d1b70559fd3133282c3975332e8e8697a01e3f5d1b25391b069827dac41f9f0e2f1c40f063a47309f1a80f54 + "@polkadot/x-global": 6.4.1 + checksum: f6d9c4c1c3292746f55d6898cd0668e35a92f18f55d3acaa8c3691c77b36affba2e05b8083c25130cd19cd83bd8a2a717d59e467cd94c352dc88c0e0237c5e65 languageName: node linkType: hard -"@polkadot/x-textencoder@npm:6.3.2-13": - version: 6.3.2-13 - resolution: "@polkadot/x-textencoder@npm:6.3.2-13" +"@polkadot/x-textencoder@npm:6.4.1": + version: 6.4.1 + resolution: "@polkadot/x-textencoder@npm:6.4.1" dependencies: "@babel/runtime": ^7.14.0 - "@polkadot/x-global": 6.3.2-13 - checksum: 9333e995572e5cce6045c2ee251700bc1085cb17afced4d61923f3f223fcbe4d25a8057fda09c301887e109958689fe700cd6bec497f46e5947626664c84095e + "@polkadot/x-global": 6.4.1 + checksum: f276956fed01935bf5453c89cecaecd48ef1ebd53537d2960f134b0eefccdad0183107dafbc4edf74f24e0b402d5e3f830c6e0a488b2c5857587d540e2f8550b languageName: node linkType: hard -"@polkadot/x-ws@npm:^6.3.2-13": - version: 6.3.2-13 - resolution: "@polkadot/x-ws@npm:6.3.2-13" +"@polkadot/x-ws@npm:^6.4.1": + version: 6.4.1 + resolution: "@polkadot/x-ws@npm:6.4.1" dependencies: "@babel/runtime": ^7.14.0 - "@polkadot/x-global": 6.3.2-13 + "@polkadot/x-global": 6.4.1 "@types/websocket": ^1.0.2 websocket: ^1.0.34 - checksum: 630897ae7c2a0600aa5ee47cc6fff3a23c68685254868321f3ebcdc7a8b8859adeda2ce486299c0b22160c33f681012b1e25e32580026f1d7d95c0f293888f6e + checksum: b2bba50723c67b4cb9d289c0c0aa2248f4510eaafe4a03cbd51676b2c2b7fc03c20d14f78192a0b4cf7be2ff095111997737ffccefab4db361f803b9dbbd10b8 languageName: node linkType: hard @@ -2345,13 +2345,13 @@ __metadata: languageName: node linkType: hard -"@types/chrome@npm:^0.0.137": - version: 0.0.137 - resolution: "@types/chrome@npm:0.0.137" +"@types/chrome@npm:^0.0.140": + version: 0.0.140 + resolution: "@types/chrome@npm:0.0.140" dependencies: "@types/filesystem": "*" "@types/har-format": "*" - checksum: 7f494ce6b32cfb8be80018de79dcc58fc1162d0af296045e5abc9997a10ca451e94ac19474a6c47baa9923e323f397dafa14aed51c28bb545ab84370aae36918 + checksum: 6f69793227b13a5988043f8fc649bc24269d5f62798c4b7b7f5efa036955ebafa274dfb3abdbfe25ed94ada03d44a74107601ec9cd408f8c8e23daf72049382b languageName: node linkType: hard @@ -9484,11 +9484,11 @@ resolve@^2.0.0-next.3: version: 0.0.0-use.local resolution: "root-workspace-0b6124@workspace:." dependencies: - "@babel/core": ^7.14.0 + "@babel/core": ^7.14.2 "@babel/register": ^7.13.16 "@babel/runtime": ^7.14.0 "@polkadot/dev": ^0.62.14 - "@polkadot/ts": ^0.3.65 + "@polkadot/ts": ^0.3.66 "@polkadot/typegen": "workspace:packages/typegen" "@types/jest": ^26.0.23 copyfiles: ^2.4.1