Merge pull request #1153 from Lezek123/account-info-rename

@joystream/types: Rename AccountInfo, make dependencies exact, add types required by new node

package.json

@@ -23,13 +23,13 @@
     "devops/prettier-config"
   ],
   "resolutions": {
-    "@polkadot/api": "^1.26.1",
-    "@polkadot/api-contract": "^1.26.1",
-    "@polkadot/keyring": "^3.0.1",
-    "@polkadot/types": "^1.26.1",
-    "@polkadot/util": "^3.0.1",
-    "@polkadot/util-crypto": "^3.0.1",
-    "@polkadot/wasm-crypto": "^1.2.1",
+    "@polkadot/api": "1.26.1",
+    "@polkadot/api-contract": "1.26.1",
+    "@polkadot/keyring": "3.0.1",
+    "@polkadot/types": "1.26.1",
+    "@polkadot/util": "3.0.1",
+    "@polkadot/util-crypto": "3.0.1",
+    "@polkadot/wasm-crypto": "1.2.1",
     "babel-core": "^7.0.0-bridge.0",
     "typescript": "^3.9.7"
   },

types/package.json

@@ -17,9 +17,9 @@
   "author": "Joystream contributors",
   "maintainers": [],
   "dependencies": {
-    "@polkadot/api": "^1.26.1",
-    "@polkadot/types": "^1.26.1",
-    "@polkadot/keyring": "^3.0.1",
+    "@polkadot/api": "1.26.1",
+    "@polkadot/types": "1.26.1",
+    "@polkadot/keyring": "3.0.1",
     "@types/lodash": "^4.14.157",
     "@types/vfile": "^4.0.0",
     "ajv": "^6.11.0",
@@ -27,7 +27,7 @@
     "moment": "^2.24.0"
   },
   "devDependencies": {
-    "@polkadot/typegen": "^1.26.1",
+    "@polkadot/typegen": "1.26.1",
     "ts-node": "^8.6.2",
     "typescript": "^3.7.2"
   },

types/src/definitions/augment-types.ts

@@ -59,7 +59,7 @@ import { Class as Class, Entity as Entity, ClassSchema as ClassSchema, Property
 import { EntityPermissions as EntityPermissions, ReferenceConstraint as ReferenceConstraint, ClassPermissionsType as ClassPermissionsType, Operation as Operation } from '../versioned-store/permissions'
 import { OptionalText as OptionalText, Channel as Channel, ChannelContentType as ChannelContentType, ChannelCurationStatus as ChannelCurationStatus, ChannelPublicationStatus as ChannelPublicationStatus, CurationActor as CurationActor, Curator as Curator, CuratorApplication as CuratorApplication, CuratorOpening as CuratorOpening, Lead as Lead, OpeningPolicyCommitment as OpeningPolicyCommitment, Principal as Principal, WorkingGroupUnstaker as WorkingGroupUnstaker, CuratorApplicationIdToCuratorIdMap as CuratorApplicationIdToCuratorIdMap, CuratorApplicationIdSet as CuratorApplicationIdSet } from '../content-working-group'
 import { RationaleText as RationaleText, Application as ApplicationOf, ApplicationIdSet as ApplicationIdSet, ApplicationIdToWorkerIdMap as ApplicationIdToWorkerIdMap, WorkerId as WorkerId, Worker as WorkerOf, Opening as OpeningOf, StorageProviderId as StorageProviderId, OpeningType as OpeningType, ApplicationId as HiringApplicationId, RewardPolicy as RewardPolicy, OpeningId as working_group__OpeningId, WorkerId as working_group__WorkerId } from '../working-group'
-import { Url as Url, IPNSIdentity as IPNSIdentity } from '../discovery'
+import { Url as Url, IPNSIdentity as IPNSIdentity, ServiceProviderRecord as ServiceProviderRecord } from '../discovery'
 import { ContentId as ContentId, LiaisonJudgement as LiaisonJudgement, DataObject as DataObject, DataObjectStorageRelationshipId as DataObjectStorageRelationshipId, DataObjectStorageRelationship as DataObjectStorageRelationship, DataObjectTypeId as DataObjectTypeId, DataObjectType as DataObjectType, DataObjectsMap as DataObjectsMap } from '../media'
 import { ProposalId as ProposalId, ProposalStatus as ProposalStatus, Proposal as ProposalOf, ProposalDetails as ProposalDetails, ProposalDetails as ProposalDetailsOf, VotingResults as VotingResults, ProposalParameters as ProposalParameters, VoteKind as VoteKind, ThreadCounter as ThreadCounter, DiscussionThread as DiscussionThread, DiscussionPost as DiscussionPost, AddOpeningParameters as AddOpeningParameters, FillOpeningParameters as FillOpeningParameters, TerminateRoleParameters as TerminateRoleParameters } from '../proposals'
 /** /CUSTOMIMPORTS **/
@@ -2177,6 +2177,9 @@ declare module '@polkadot/types/types/registry' {
     "IPNSIdentity": IPNSIdentity;
     "Option<IPNSIdentity>": Option<IPNSIdentity>;
     "Vec<IPNSIdentity>": Vec<IPNSIdentity>;
+    "ServiceProviderRecord": ServiceProviderRecord;
+    "Option<ServiceProviderRecord>": Option<ServiceProviderRecord>;
+    "Vec<ServiceProviderRecord>": Vec<ServiceProviderRecord>;
     "ContentId": ContentId;
     "Option<ContentId>": Option<ContentId>;
     "Vec<ContentId>": Vec<ContentId>;

types/src/discovery.ts

@@ -5,7 +5,7 @@ import { JoyStructDecorated } from './common'
 export class IPNSIdentity extends Text {}
 export class Url extends Text {}
 
-export class AccountInfo extends JoyStructDecorated({
+export class ServiceProviderRecord extends JoyStructDecorated({
   identity: IPNSIdentity,
   expires_at: u32, // BlockNumber
 }) {}
@@ -13,7 +13,7 @@ export class AccountInfo extends JoyStructDecorated({
 export const discoveryTypes: RegistryTypes = {
   Url,
   IPNSIdentity,
-  // AccountInfo, FIXME: This overrides core Substrate type
+  ServiceProviderRecord,
 }
 
 export default discoveryTypes

types/src/index.ts

@@ -53,4 +53,8 @@ export const types: RegistryTypes = {
   ...discovery,
   ...media,
   ...proposals,
+  // Required since migration to Substrate 2.0,
+  // see: https://polkadot.js.org/api/start/FAQ.html#the-node-returns-a-could-not-convert-error-on-send
+  Address: 'AccountId',
+  LookupSource: 'AccountId',
 }