chore: release v0.22.0 (#346)

* chore: upgrade kilt sdk * fix: new tx workflow * fix: balances * fix: new RequestClaimsForCtypes format * fix: filter out incompatible messages * chore: update sdk * feat: updating to the latest rc 4 * feat: updating to the latest rc 5 * feat: updating to the latest rc 7 * fix: display attestation status in claims list (#348) * fix: delegation revoke signandsend (#349) * chore: bump sdk rc * chore: upgrading to the latest sdk rc * chore: releasing newest version Co-authored-by: dudleyneedham <dudleyneedham1993@gmail.com> Co-authored-by: Raphael Flechtner <39338561+rflechtner@users.noreply.github.com> Co-authored-by: LeonFLK <51441505+LeonFLK@users.noreply.github.com> Co-authored-by: LeonFLK <leon@kilt.io>
KILTprotocol · Apr 30, 2021 · 03b257e · 03b257e
1 parent e529174
commit 03b257e
Show file tree

Hide file tree

Showing 14 changed files with 154 additions and 162 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kilt-demo-client",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "license": "BSD-4-Clause",
   "private": true,
   "scripts": {
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.10.4",
-    "@kiltprotocol/sdk-js": "^0.20.0",
+    "@kiltprotocol/sdk-js": "^0.21.0",
     "@polkadot/ui-identicon": "^0.33.1",
     "@types/react-select": "^2.0.11",
     "@types/reselect": "^2.2.0",

diff --git a/src/components/DelegationNode/DelegationNode.tsx b/src/components/DelegationNode/DelegationNode.tsx
@@ -318,13 +318,9 @@ class DelegationNode extends React.Component<Props, State> {
 
         blockUi.updateMessage(`Revoking ${index + 1} / ${hashes.length}`)
 
-        const tx = await Attestation.revoke(
-          attestation.claimHash,
-          selectedIdentity.identity,
-          steps + 1
-        )
+        const tx = await Attestation.revoke(attestation.claimHash, steps + 1)
 
-        const result = await BlockchainUtils.submitTxWithReSign(
+        const result = await BlockchainUtils.signAndSubmitTx(
           tx,
           selectedIdentity.identity,
           {

diff --git a/src/components/DevTools/DevTools.anticov.ts b/src/components/DevTools/DevTools.anticov.ts
@@ -72,8 +72,8 @@ async function newDelegation(delegate: IMyIdentity): Promise<void> {
     [Permission.ATTEST]
   )
   const signature = delegate.identity.signStr(delegationNode.generateHash())
-  const tx = await delegationNode.store(root, signature)
-  await BlockchainUtils.submitTxWithReSign(tx, root, { resolveOn: IS_IN_BLOCK })
+  const tx = await delegationNode.store(signature)
+  await BlockchainUtils.signAndSubmitTx(tx, root, { resolveOn: IS_IN_BLOCK })
   notifySuccess(`Delegation successfully created for ${delegate.metaData.name}`)
   await DelegationsService.importDelegation(
     delegationNode.id,
@@ -94,8 +94,8 @@ async function newDelegation(delegate: IMyIdentity): Promise<void> {
 async function verifyOrAddCtypeAndRoot(): Promise<void> {
   const { root, delegationRoot } = setup()
   if (!(await ctype.verifyStored())) {
-    const tx = await ctype.store(root)
-    await BlockchainUtils.submitTxWithReSign(tx, root, {
+    const tx = await ctype.store()
+    await BlockchainUtils.signAndSubmitTx(tx, root, {
       resolveOn: IS_IN_BLOCK,
     })
     CTypeRepository.register({
@@ -107,8 +107,8 @@ async function verifyOrAddCtypeAndRoot(): Promise<void> {
   // delegationRoot.verify() is unreliable when using the currently released mashnet-node &   // workaround is checking the ctype hash of the query result; it is 0x000... if it doesn't exist on chain
   const queriedRoot = await DelegationRootNode.query(delegationRoot.id)
   if (queriedRoot?.cTypeHash !== ctype.hash) {
-    const tx = await delegationRoot.store(root)
-    await BlockchainUtils.submitTxWithReSign(tx, root, {
+    const tx = await delegationRoot.store()
+    await BlockchainUtils.signAndSubmitTx(tx, root, {
       resolveOn: IS_IN_BLOCK,
     })
     const messageBody: MessageBody = {

diff --git a/src/components/DevTools/DevTools.ctypes.tsx b/src/components/DevTools/DevTools.ctypes.tsx
@@ -27,8 +27,8 @@ class BsCType {
     const ownerIdentity = (await BsIdentity.getByKey(bsCTypeData.owner))
       .identity
     const cType = CType.fromSchema(bsCTypeData.schema, ownerIdentity.address)
-    const tx = cType.store(ownerIdentity)
-    await BlockchainUtils.submitTxWithReSign(await tx, ownerIdentity, {
+    const tx = cType.store()
+    await BlockchainUtils.signAndSubmitTx(await tx, ownerIdentity, {
       resolveOn: BlockchainUtils.IS_IN_BLOCK,
     })
     return tx

diff --git a/src/components/MessageDetailView/MessageDetailView.tsx b/src/components/MessageDetailView/MessageDetailView.tsx
@@ -174,9 +174,9 @@ class MessageDetailView extends React.Component<Props, State> {
         return (
           <SubmitClaimsForCType
             receiverAddresses={[message.senderAddress]}
-            cTypeHashes={
-              (message.body as IRequestClaimsForCTypes).content.ctypes
-            }
+            cTypeHashes={(message.body as IRequestClaimsForCTypes).content.map(
+              val => val.cTypeHash
+            )}
             onCancel={this.handleCancel}
             onFinished={this.handleDelete}
           />

diff --git a/src/containers/CtypeCreate/CtypeCreate.tsx b/src/containers/CtypeCreate/CtypeCreate.tsx
@@ -99,8 +99,8 @@ class CTypeCreate extends React.Component<Props, State> {
         metaData,
       }
 
-      const tx = cType.store(selectedIdentity.identity)
-      await BlockchainUtils.submitTxWithReSign(
+      const tx = cType.store()
+      await BlockchainUtils.signAndSubmitTx(
         await tx,
         selectedIdentity.identity,
         {

diff --git a/src/containers/Tasks/RequestClaimsForCType/RequestClaimsForCType.tsx b/src/containers/Tasks/RequestClaimsForCType/RequestClaimsForCType.tsx
@@ -42,7 +42,7 @@ class RequestClaimsForCType extends React.Component<Props, State> {
     const { cTypeHashes, receiverAddresses, onFinished } = this.props
 
     const messageBody: IRequestClaimsForCTypes = {
-      content: { ctypes: cTypeHashes },
+      content: cTypeHashes.map(cTypeHash => ({ cTypeHash })),
       type: MessageBodyType.REQUEST_CLAIMS_FOR_CTYPES,
     }
 

diff --git a/src/services/AttestationService.ts b/src/services/AttestationService.ts
@@ -53,8 +53,8 @@ class AttestationService {
     }
 
     try {
-      const tx = await attestation.store(selectedIdentity)
-      await BlockchainUtils.submitTxWithReSign(tx, selectedIdentity, {
+      const tx = await attestation.store()
+      await BlockchainUtils.signAndSubmitTx(tx, selectedIdentity, {
         resolveOn: IS_IN_BLOCK,
       })
     } catch (error) {
@@ -84,12 +84,9 @@ class AttestationService {
       throw new Error('No identity selected')
     }
     try {
-      const tx = await attestation.revoke(
-        selectedIdentity,
-        delegationTreeTraversalSteps
-      )
+      const tx = await attestation.revoke(delegationTreeTraversalSteps)
 
-      await BlockchainUtils.submitTxWithReSign(tx, selectedIdentity, {
+      await BlockchainUtils.signAndSubmitTx(tx, selectedIdentity, {
         resolveOn: IS_IN_BLOCK,
       })
       notifySuccess('Attestation successfully revoked')
@@ -122,12 +119,9 @@ class AttestationService {
     )
 
     try {
-      const tx = await attestation.revoke(
-        selectedIdentity,
-        delegationTreeTraversalSteps
-      )
+      const tx = await attestation.revoke(delegationTreeTraversalSteps)
 
-      await BlockchainUtils.submitTxWithReSign(tx, selectedIdentity, {
+      await BlockchainUtils.signAndSubmitTx(tx, selectedIdentity, {
         resolveOn: IS_IN_BLOCK,
       })
 

diff --git a/src/services/BalanceUtilities.tsx b/src/services/BalanceUtilities.tsx
@@ -4,6 +4,7 @@ import {
   PublicIdentity,
   BlockchainUtils,
 } from '@kiltprotocol/sdk-js'
+import { Balances as KiltBalances } from '@kiltprotocol/types'
 import BN from 'bn.js'
 import React from 'react'
 import { Store } from 'redux'
@@ -46,8 +47,10 @@ class BalanceUtilities {
   }
 
   public static async getMyBalance(identity: IMyIdentity): Promise<BN> {
-    const balance: BN = await Balance.getBalance(identity.identity.address)
-    return balance
+    const balance: KiltBalances = await Balance.getBalances(
+      identity.identity.address
+    )
+    return balance.free
   }
 
   public static connectMyIdentities(
@@ -75,9 +78,9 @@ class BalanceUtilities {
         <ContactPresentation address={receiverAddress} inline /> initiated.
       </div>
     )
-    Balance.makeTransfer(myIdentity.identity, receiverAddress, transferAmount)
+    Balance.makeTransfer(receiverAddress, transferAmount)
       .then(tx =>
-        BlockchainUtils.submitTxWithReSign(tx, myIdentity.identity, {
+        BlockchainUtils.signAndSubmitTx(tx, myIdentity.identity, {
           resolveOn: BlockchainUtils.IS_IN_BLOCK,
         })
       )
@@ -117,21 +120,21 @@ class BalanceUtilities {
 
   private static listener(
     account: PublicIdentity['address'],
-    balance: BN,
-    change: BN
+    balance: KiltBalances,
+    change: KiltBalances
   ): void {
-    if (!change.isZero()) {
-      const inDeCreased = `${change.gtn(0) ? 'in' : 'de'}creased`
+    if (!change.free.isZero()) {
+      const inDeCreased = `${change.free.gtn(0) ? 'in' : 'de'}creased`
 
       notify(
         <div>
           Balance of <ContactPresentation address={account} /> {inDeCreased} by{' '}
-          <KiltToken amount={change} colored />.
+          <KiltToken amount={change.free} colored />.
         </div>
       )
     }
     persistentStoreInstance.store.dispatch(
-      Balances.Store.updateBalance(account, balance)
+      Balances.Store.updateBalance(account, balance.free)
     )
   }
 }

diff --git a/src/services/DelegationsService.ts b/src/services/DelegationsService.ts
@@ -50,8 +50,8 @@ class DelegationsService {
     if (!selectedIdentity) {
       throw new Error('No selected Identity')
     }
-    const tx = await delegation.store(selectedIdentity, signature)
-    return BlockchainUtils.submitTxWithReSign(tx, selectedIdentity, {
+    const tx = await delegation.store(signature)
+    return BlockchainUtils.signAndSubmitTx(tx, selectedIdentity, {
       resolveOn: BlockchainUtils.IS_IN_BLOCK,
     })
   }
@@ -138,7 +138,11 @@ class DelegationsService {
     node: DelegationBaseNode,
     identity: Identity
   ): Promise<void> {
-    await node.revoke(identity)
+    await BlockchainUtils.signAndSubmitTx(
+      await node.revoke(identity.address),
+      identity,
+      { resolveOn: BlockchainUtils.IS_IN_BLOCK }
+    )
     persistentStoreInstance.store.dispatch(
       Delegations.Store.revokeDelegationAction(node.id)
     )
@@ -169,8 +173,8 @@ class DelegationsService {
       throw new Error('No selected Identity')
     }
 
-    const tx = await delegation.store(selectedIdentity)
-    return BlockchainUtils.submitTxWithReSign(tx, selectedIdentity, {
+    const tx = await delegation.store()
+    return BlockchainUtils.signAndSubmitTx(tx, selectedIdentity, {
       resolveOn: BlockchainUtils.IS_IN_BLOCK,
     })
   }

diff --git a/src/services/DidService.ts b/src/services/DidService.ts
@@ -87,8 +87,8 @@ class DidService {
       publicIdentity: myIdentity.identity.getPublicIdentity(),
     } as IContact)
 
-    const tx = await did.store(myIdentity.identity)
-    const status = await BlockchainUtils.submitTxWithReSign(
+    const tx = await did.store()
+    const status = await BlockchainUtils.signAndSubmitTx(
       tx,
       myIdentity.identity,
       {
@@ -110,8 +110,8 @@ class DidService {
   }
 
   public static async deleteDid(myIdentity: IMyIdentity): Promise<void> {
-    const tx = await Did.remove(myIdentity.identity)
-    const status = await BlockchainUtils.submitTxWithReSign(
+    const tx = await Did.remove()
+    const status = await BlockchainUtils.signAndSubmitTx(
       tx,
       myIdentity.identity,
       {

diff --git a/src/services/MessageRepository.tsx b/src/services/MessageRepository.tsx
@@ -182,7 +182,17 @@ class MessageRepository {
             }
           }
         )
-        return decryptedMesssages.filter(filterArray)
+        return (
+          decryptedMesssages
+            .filter(filterArray)
+            // TODO: check message structure via SDK
+            .filter(
+              message =>
+                message.body.type !==
+                  MessageBodyType.REQUEST_CLAIMS_FOR_CTYPES ||
+                Array.isArray(message.body.content)
+            )
+        )
       })
   }
 
@@ -262,9 +272,9 @@ class MessageRepository {
         ]
 
       case MessageBodyType.REQUEST_CLAIMS_FOR_CTYPES:
-        return (message.body as IRequestClaimsForCTypes).content.ctypes.filter(
-          Boolean
-        )
+        return (message.body as IRequestClaimsForCTypes).content
+          .map(val => val.cTypeHash)
+          .filter(Boolean)
       case MessageBodyType.SUBMIT_CLAIMS_FOR_CTYPES: {
         const cTypeHashes = (message.body as ISubmitClaimsForCTypes).content.map(
           attestedClaim => attestedClaim.request.claim.cTypeHash

diff --git a/src/state/ducks/Claims.ts b/src/state/ducks/Claims.ts
@@ -220,7 +220,13 @@ class Store {
               (attestedClaim: IAttestedClaim, index: number) => {
                 if (attestedClaim.attestation.claimHash === revokedHash) {
                   // avoid changing claims while iterating
-                  setIns.push([myClaimHash, 'attestedClaims', index, 'revoked'])
+                  setIns.push([
+                    myClaimHash,
+                    'attestedClaims',
+                    index,
+                    'attestation',
+                    'revoked',
+                  ])
                 }
               }
             )