Refactor: CType Utility and Split Metadata and Schema

src/components/AttestationStatus/AttestationStatus.tsx

@@ -107,7 +107,7 @@ class AttestationStatus extends React.Component<Props, State> {
         })
         if (isAttestedClaim(attestation)) {
           PersistentStore.store.dispatch(
-            Claims.Store.revokeAttestation(attestation.request.hash)
+            Claims.Store.revokeAttestation(attestation.request.rootHash)
           )
         } else {
           PersistentStore.store.dispatch(

src/components/AttestedClaimVerificationView/AttestedClaimVerificationView.tsx

@@ -70,7 +70,7 @@ class AttestedClaimVerificationView extends React.Component<Props, State> {
           inline={true}
         />
         <CTypePresentation
-          cTypeHash={attestedClaim.request.claim.cType}
+          cTypeHash={attestedClaim.request.claim.cTypeHash}
           interactive={true}
           linked={true}
           inline={true}

src/components/CTypePresentation/CTypePresentation.tsx

@@ -13,7 +13,7 @@ import { SubmitLegitimationsProps } from '../../containers/Tasks/SubmitLegitimat
 import CTypeRepository from '../../services/CtypeRepository'
 import * as UiState from '../../state/ducks/UiState'
 import PersistentStore from '../../state/PersistentStore'
-import { ICType } from '../../types/Ctype'
+import { CTypeMetadata, ICType } from '../../types/Ctype'
 import SelectAction, { Action } from '../SelectAction/SelectAction'
 
 import './CTypePresentation.scss'
@@ -30,7 +30,7 @@ type Props = RouteComponentProps<{}> & {
 }
 
 type State = {
-  cType?: ICType
+  cType?: CTypeMetadata
 }
 
 const DEFAULT_SIZE = 24
@@ -91,7 +91,7 @@ class CTypePresentation extends React.Component<Props, State> {
               size={size || DEFAULT_SIZE}
               theme="polkadot"
             />
-            {this.getLabel(cType.cType.metadata.title.default)}
+            {this.getLabel(cType.cType.schema.$id)}
           </>
         )}
         {!!actions.length && (
@@ -121,7 +121,7 @@ class CTypePresentation extends React.Component<Props, State> {
   private async setCType() {
     const { cTypeHash } = this.props
 
-    CTypeRepository.findByHash(cTypeHash).then((_cType: ICType) => {
+    CTypeRepository.findByHash(cTypeHash).then((_cType: CTypeMetadata) => {
       this.setState({ cType: _cType })
     })
   }
@@ -188,7 +188,7 @@ class CTypePresentation extends React.Component<Props, State> {
             UiState.Store.updateCurrentTaskAction({
               objective: sdk.MessageBodyType.SUBMIT_LEGITIMATIONS,
               props: {
-                claim: { cType: cTypeHash },
+                claim: { cTypeHash: cTypeHash },
               } as SubmitLegitimationsProps,
             })
           )

src/components/ClaimDetailView/ClaimDetailView.tsx

@@ -24,7 +24,7 @@ class ClaimDetailView extends Component<Props, State> {
           <label>Ctype</label>
           <div>
             <CTypePresentation
-              cTypeHash={claim.cType}
+              cTypeHash={claim.cTypeHash}
               linked={true}
               interactive={true}
             />

src/components/CtypeDetailView/CtypeDetailView.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import { Link } from 'react-router-dom'
 import CTypeRepository from '../../services/CtypeRepository'
 
-import { ICType } from '../../types/Ctype'
+import { ICType, CTypeMetadata } from '../../types/Ctype'
 import Code from '../Code/Code'
 import ContactPresentation from '../ContactPresentation/ContactPresentation'
 import CTypePresentation from '../CTypePresentation/CTypePresentation'
@@ -14,7 +14,7 @@ type Props = {
 }
 
 type State = {
-  cType?: ICType
+  cType?: CTypeMetadata
 }
 
 class CtypeDetailView extends React.Component<Props, State> {
@@ -25,7 +25,7 @@ class CtypeDetailView extends React.Component<Props, State> {
 
   public componentDidMount() {
     const { cTypeHash } = this.props
-    CTypeRepository.findByHash(cTypeHash).then((_cType: ICType) => {
+    CTypeRepository.findByHash(cTypeHash).then((_cType: CTypeMetadata) => {
       this.setState({ cType: _cType })
     })
   }
@@ -41,13 +41,13 @@ class CtypeDetailView extends React.Component<Props, State> {
             <div className="attributes">
               <div>
                 <label>Title</label>
-                <div>{cType.cType.metadata.title.default}</div>
+                <div>{cType.cType.schema.$id}</div>
               </div>
               <div>
                 <label>Author</label>
                 <div>
                   <ContactPresentation
-                    address={cType.metaData.author}
+                    address={cType.cType.owner!}
                     interactive={true}
                   />
                 </div>

src/components/CtypeListView/CtypeListView.tsx

@@ -5,16 +5,16 @@ import { Link, RouteComponentProps, withRouter } from 'react-router-dom'
 import CTypeRepository from '../../services/CtypeRepository'
 import * as CTypes from '../../state/ducks/CTypes'
 import { State as ReduxState } from '../../state/PersistentStore'
-import { ICType } from '../../types/Ctype'
+import { ICType, CTypeMetadata } from '../../types/Ctype'
 import ContactPresentation from '../ContactPresentation/ContactPresentation'
 import CTypePresentation from '../CTypePresentation/CTypePresentation'
 
 import './CtypeListView.scss'
 
 type Props = RouteComponentProps<{}> & {
-  onRequestLegitimation: (cType: ICType) => void
+  onRequestLegitimation: (cType: CTypeMetadata) => void
   // mapStateToProps
-  cTypes?: ICType[]
+  cTypes?: CTypeMetadata[]
 }
 
 type State = {
@@ -64,7 +64,7 @@ class CtypeListView extends React.Component<Props, State> {
                       right={true}
                     />
                     <ContactPresentation
-                      address={cType.metaData.author}
+                      address={cType.cType.owner!}
                       interactive={true}
                       right={true}
                     />
@@ -78,7 +78,7 @@ class CtypeListView extends React.Component<Props, State> {
                   </td>
                   <td className="author">
                     <ContactPresentation
-                      address={cType.metaData.author}
+                      address={cType.cType.owner!}
                       interactive={true}
                       right={true}
                     />

src/components/DevTools/DevTools.attestations.tsx

@@ -8,13 +8,14 @@ import * as Attestations from '../../state/ducks/Attestations'
 import { MyDelegation } from '../../state/ducks/Delegations'
 import PersistentStore from '../../state/PersistentStore'
 import { MyIdentity } from '../../types/Contact'
-import { ICType } from '../../types/Ctype'
+import { ICType, CTypeMetadata } from '../../types/Ctype'
 import { BsClaim, BsClaimsPool, BsClaimsPoolElement } from './DevTools.claims'
 import { BsCType } from './DevTools.ctypes'
 import { BsDelegation, BsDelegationsPool } from './DevTools.delegations'
 import { BsIdentitiesPool, BsIdentity } from './DevTools.wallet'
 
 import attestationsPool from './data/attestations.json'
+import { IPartialClaim } from '@kiltprotocol/sdk-js'
 
 type UpdateCallback = (bsAttestationKey: keyof BsAttestationsPool) => void
 
@@ -179,11 +180,11 @@ class BsAttestation {
       )
     }
 
-    return new sdk.RequestForAttestation(
+    return sdk.RequestForAttestation.fromClaimAndIdentity(
       claimToAttest.claim,
-      _legitimations,
       claimerIdentity.identity,
-      delegation ? delegation.id : undefined
+      _legitimations,
+      delegation ? delegation.id : null
     )
   }
 
@@ -220,7 +221,7 @@ class BsAttestation {
     // store attestation locally
     AttestationService.saveInStore({
       attestation: attestedClaim.attestation,
-      cTypeHash: attestedClaim.request.claim.cType,
+      cTypeHash: attestedClaim.request.claim.cTypeHash,
       claimerAddress: claimerIdentity.identity.address,
       claimerAlias: claimerIdentity.metaData.name,
       created: Date.now(),
@@ -240,10 +241,10 @@ class BsAttestation {
     const { attesterKey } = attest
 
     const attesterIdentity: MyIdentity = await BsIdentity.getByKey(attesterKey)
-    const cType: ICType = await BsCType.getByKey(bsClaim.cTypeKey)
+    const cType: CTypeMetadata = await BsCType.getByKey(bsClaim.cTypeKey)
 
-    const partialClaim = {
-      cType: cType.cType.hash as string,
+    const partialClaim: IPartialClaim = {
+      cTypeHash: cType.cType.hash as string,
       contents: bsClaim.data,
       owner: claimerIdentity.identity.address,
     }

src/components/DevTools/DevTools.claims.tsx

@@ -28,10 +28,10 @@ class BsClaim {
   ): Promise<void | sdk.Claim> {
     const identity = await BsIdentity.getByKey(BS_claimData.claimerKey)
     const cType = (await BsCType.getByKey(BS_claimData.cTypeKey)).cType
-    const claim = new sdk.Claim(
-      sdk.CType.fromObject(cType),
+    const claim = sdk.Claim.fromCTypeAndClaimContents(
+      sdk.CType.fromCType(cType),
       BS_claimData.data,
-      identity.identity
+      identity.identity.address
     )
 
     PersistentStore.store.dispatch(

src/components/DevTools/DevTools.ctypes.tsx

@@ -3,8 +3,8 @@ import * as sdk from '@kiltprotocol/sdk-js'
 import BlockchainService from '../../services/BlockchainService'
 import CTypeRepository from '../../services/CtypeRepository'
 import errorService from '../../services/ErrorService'
-import { notifySuccess } from '../../services/FeedbackService'
-import { ICType } from '../../types/Ctype'
+import { notifySuccess, notifyError } from '../../services/FeedbackService'
+import { CTypeMetadata } from '../../types/Ctype'
 import { BsIdentity } from './DevTools.wallet'
 
 import cTypesPool from './data/cTypes.json'
@@ -13,6 +13,7 @@ type UpdateCallback = (bsCTypeKey: keyof BsCTypesPool) => void
 
 interface BsCTypesPoolElement extends sdk.ICType {
   owner: string
+  metadata: sdk.ICTypeMetadata['metadata']
 }
 
 type BsCTypesPool = {
@@ -27,34 +28,38 @@ class BsCType {
     const ownerIdentity = (await BsIdentity.getByKey(bsCTypeData.owner))
       .identity
 
-    const cType = sdk.CType.fromObject({
-      ...bsCTypeData,
-      owner: ownerIdentity.address,
+    const cType = sdk.CType.fromCType({
+      schema: bsCTypeData.schema,
+      hash: bsCTypeData.hash,
+      owner: ownerIdentity.address
     })
 
-    return cType
+    cType
       .store(ownerIdentity)
-      .then((value: any) => {
-        const cTypeWrapper: ICType = {
+      .catch(error => {
+        errorService.log({
+          error,
+          message: 'Could not submit CTYPE to the Blockchain',
+          origin: 'CType.store()',
+        })
+      }).then(() => {
+        const cTypeWrapper: CTypeMetadata = {
           cType,
           metaData: {
-            author: ownerIdentity.address,
+            metadata: bsCTypeData.metadata,
+            ctypeHash: cType.hash
           },
         }
-        // TODO: add onrejected when sdk provides error handling
-        return CTypeRepository.register(cTypeWrapper)
-      })
-      .then(() => {
-        notifySuccess(
-          `CTYPE ${cType.metadata.title.default} successfully created.`
-        )
-      })
-      .catch(error => {
-        errorService.log({
-          error,
-          message: 'Could not submit CTYPE',
-          origin: 'CTypeCreate.submit()',
+        return CTypeRepository.register(cTypeWrapper).then(() => {
+          notifySuccess(`CTYPE ${cType.schema.$id} successfully created.`)
         })
+          .catch(error => {
+            errorService.log({
+              error,
+              message: 'Could not submit CTYPE to the Registry',
+              origin: 'CTypeRepository.register()',
+            })
+          })
       })
   }
 
@@ -71,21 +76,25 @@ class BsCType {
     return requests
   }
 
-  public static async getByHash(hash: sdk.ICType['hash']): Promise<ICType> {
+  public static async getByHash(
+    hash: sdk.ICType['hash']
+  ): Promise<CTypeMetadata> {
     const cType = await CTypeRepository.findByHash(hash)
     if (cType) {
       return cType
     }
     throw new Error(`Could not find cType with hash '${hash}'`)
   }
 
-  public static async get(bsCType: BsCTypesPoolElement): Promise<ICType> {
+  public static async get(
+    bsCType: BsCTypesPoolElement
+  ): Promise<CTypeMetadata> {
     return BsCType.getByHash(bsCType.hash)
   }
 
   public static async getByKey(
     bsCTypeKey: keyof BsCTypesPool
-  ): Promise<ICType> {
+  ): Promise<CTypeMetadata> {
     const { hash } = BsCType.pool[bsCTypeKey]
     return BsCType.getByHash(hash)
   }

src/components/DevTools/DevTools.delegations.tsx

@@ -7,7 +7,7 @@ import * as Delegations from '../../state/ducks/Delegations'
 import { DelegationType, MyDelegation } from '../../state/ducks/Delegations'
 import PersistentStore from '../../state/PersistentStore'
 import { MyIdentity } from '../../types/Contact'
-import { ICType } from '../../types/Ctype'
+import { CTypeMetadata } from '../../types/Ctype'
 import { BsCType, BsCTypesPool } from './DevTools.ctypes'
 import { BsIdentitiesPool, BsIdentity } from './DevTools.wallet'
 
@@ -172,7 +172,7 @@ class BsDelegation {
     }
     const ownerIdentity: MyIdentity = await BsIdentity.getByKey(ownerKey)
     await BsIdentity.selectIdentity(ownerIdentity)
-    const cType: ICType = await BsCType.getByKey(cTypeKey)
+    const cType: CTypeMetadata = await BsCType.getByKey(cTypeKey)
 
     if (updateCallback) {
       updateCallback(bsDelegationKey)

src/components/Modal/SelectCTypesModal.tsx

@@ -4,7 +4,7 @@ import Select from 'react-select'
 import CTypeRepository from '../../services/CtypeRepository'
 
 import ErrorService from '../../services/ErrorService'
-import { ICType } from '../../types/Ctype'
+import { CTypeMetadata } from '../../types/Ctype'
 import SelectCTypes from '../SelectCTypes/SelectCTypes'
 import Modal, { ModalType } from './Modal'
 
@@ -17,13 +17,13 @@ type Props = {
   showOnInit?: boolean
 
   onCancel?: () => void
-  onConfirm: (selectedCTypes: ICType[]) => void
+  onConfirm: (selectedCTypes: CTypeMetadata[]) => void
 }
 
 type State = {
-  cTypes?: ICType[]
+  cTypes?: CTypeMetadata[]
   isSelectCTypesOpen: boolean
-  selectedCTypes: ICType[]
+  selectedCTypes: CTypeMetadata[]
 }
 
 class SelectCTypesModal extends React.Component<Props, State> {
@@ -85,7 +85,7 @@ class SelectCTypesModal extends React.Component<Props, State> {
       >
         <div>
           <SelectCTypes
-            cTypes={cTypes as ICType[]}
+            cTypes={cTypes as CTypeMetadata[]}
             name={name as string}
             isMulti={isMulti}
             closeMenuOnSelect={closeMenuOnSelect}
@@ -111,7 +111,7 @@ class SelectCTypesModal extends React.Component<Props, State> {
     }
   }
 
-  private onSelectCTypes(selectedCTypes: ICType[]) {
+  private onSelectCTypes(selectedCTypes: CTypeMetadata[]) {
     this.setState({ selectedCTypes })
   }