KILTprotocol · ntn-x2 · Mar 4, 2022 · Mar 3, 2022 · Mar 3, 2022 · Mar 3, 2022
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -107,7 +107,7 @@ jobs:
 
     strategy:
       matrix:
-        image: ['latest-rc']
+        image: ['latest-master']
         required: ['optional']
         include:
           - image: 'latest-develop'
@@ -153,7 +153,7 @@ jobs:
 
     strategy:
       matrix:
-        image: ['latest-rc']
+        image: ['latest-master']
         required: ['required']
         include:
           - image: 'latest-develop'

diff --git a/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
diff --git a/packages/chain-helpers/package.json b/packages/chain-helpers/package.json
@@ -38,10 +38,11 @@
     "@kiltprotocol/config": "workspace:*",
     "@kiltprotocol/types": "workspace:*",
     "@kiltprotocol/utils": "workspace:*",
-    "@polkadot/api": "^6.11.1",
-    "@polkadot/keyring": "^8.1.2",
-    "@polkadot/types": "^6.11.1",
-    "@polkadot/util": "^8.1.2",
+    "@polkadot/api": "^7.10.1",
+    "@polkadot/api-augment": "^7.10.1",
+    "@polkadot/keyring": "^8.4.1",
+    "@polkadot/types": "^7.10.1",
+    "@polkadot/util": "^8.4.1",
     "typescript-logging": "^0.6.4"
   }
 }
diff --git a/packages/chain-helpers/src/blockchain/Blockchain.utils.ts b/packages/chain-helpers/src/blockchain/Blockchain.utils.ts
@@ -103,6 +103,7 @@ export async function submitSignedTx(
       status:
         latestResult.status ||
         api.registry.createType('ExtrinsicStatus', 'future'),
+      txHash: api.registry.createType('Hash'),
     })
     subscription(result)
   }

diff --git a/packages/chain-helpers/src/index.ts b/packages/chain-helpers/src/index.ts
@@ -5,6 +5,8 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
+import '@polkadot/api-augment'
+
 export { ErrorHandler } from './errorhandling/index.js'
 export { BlockchainApiConnection } from './blockchainApiConnection/index.js'
 export {

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -35,6 +35,7 @@
   },
   "dependencies": {
     "@kiltprotocol/utils": "workspace:*",
+    "@polkadot/api-augment": "^7.10.1",
     "typescript-logging": "^0.6.4"
   }
 }
diff --git a/packages/config/src/index.ts b/packages/config/src/index.ts
@@ -5,4 +5,6 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
+import '@polkadot/api-augment'
+
 export * as ConfigService from './ConfigService.js'
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -41,12 +41,13 @@
     "@kiltprotocol/did": "workspace:*",
     "@kiltprotocol/types": "workspace:*",
     "@kiltprotocol/utils": "workspace:*",
-    "@polkadot/api": "^6.11.1",
-    "@polkadot/keyring": "^8.1.2",
-    "@polkadot/types": "^6.11.1",
-    "@polkadot/types-known": "^6.11.1",
-    "@polkadot/util": "^8.1.2",
-    "@polkadot/util-crypto": "^8.1.2",
+    "@polkadot/api": "^7.10.1",
+    "@polkadot/api-augment": "^7.10.1",
+    "@polkadot/keyring": "^8.4.1",
+    "@polkadot/types": "^7.10.1",
+    "@polkadot/types-known": "^7.10.1",
+    "@polkadot/util": "^8.4.1",
+    "@polkadot/util-crypto": "^8.4.1",
     "tweetnacl": "^1.0.3",
     "typescript-logging": "^0.6.4"
   }

diff --git a/packages/core/src/__integrationtests__/Ctypes.spec.ts b/packages/core/src/__integrationtests__/Ctypes.spec.ts
@@ -38,7 +38,7 @@ describe('When there is an CtypeCreator and a verifier', () => {
     return CType.fromSchema({
       $id: `kilt:ctype:0x${ctypeCounter}`,
       $schema: 'http://kilt-protocol.org/draft-01/ctype#',
-      title: `ctype1${ctypeCounter}`,
+      title: `ctype${ctypeCounter}`,
       properties: {
         name: { type: 'string' },
       },

diff --git a/packages/core/src/__integrationtests__/Deposit.spec.ts b/packages/core/src/__integrationtests__/Deposit.spec.ts
@@ -488,7 +488,7 @@ describe('Different deposits scenarios', () => {
       )
     ).resolves.not.toThrow()
   }, 120_000)
-  it.only('Check if claiming and releasing a web3 name correctly handles deposits', async () => {
+  it('Check if claiming and releasing a web3 name correctly handles deposits', async () => {
     await expect(
       checkWeb3Deposit(testIdentities[9], testFullDidTen, keystore)
     ).resolves.toBeTruthy()

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -5,6 +5,8 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
+import '@polkadot/api-augment'
+
 export { Attestation, AttestationUtils } from './attestation/index.js'
 export { Credential, CredentialUtils } from './credential/index.js'
 export { Balance, BalanceUtils } from './balance/index.js'

diff --git a/packages/did/package.json b/packages/did/package.json
@@ -39,11 +39,12 @@
     "@kiltprotocol/config": "workspace:*",
     "@kiltprotocol/types": "workspace:*",
     "@kiltprotocol/utils": "workspace:*",
-    "@polkadot/api": "^6.11.1",
-    "@polkadot/keyring": "^8.1.2",
-    "@polkadot/types": "^6.11.1",
-    "@polkadot/util": "^8.1.2",
-    "@polkadot/util-crypto": "^8.1.2",
+    "@polkadot/api": "^7.10.1",
+    "@polkadot/api-augment": "^7.10.1",
+    "@polkadot/keyring": "^8.4.1",
+    "@polkadot/types": "^7.10.1",
+    "@polkadot/util": "^8.4.1",
+    "@polkadot/util-crypto": "^8.4.1",
     "cbor": "^8.0.2"
   }
 }
diff --git a/packages/did/src/index.ts b/packages/did/src/index.ts
@@ -5,6 +5,8 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
+import '@polkadot/api-augment'
+
 export * from './DemoKeystore/index.js'
 export * from './DidDetails/index.js'
 export * from './DidBatcher/index.js'

diff --git a/packages/messaging/package.json b/packages/messaging/package.json
@@ -38,6 +38,7 @@
     "@kiltprotocol/did": "workspace:*",
     "@kiltprotocol/types": "workspace:*",
     "@kiltprotocol/utils": "workspace:*",
-    "@polkadot/util": "^8.1.2"
+    "@polkadot/api-augment": "^7.10.1",
+    "@polkadot/util": "^8.4.1"
   }
 }
diff --git a/packages/messaging/src/index.ts b/packages/messaging/src/index.ts
@@ -5,5 +5,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
+import '@polkadot/api-augment'
+
 export * from './Message.js'
 export * from './Message.utils.js'
diff --git a/packages/sdk-js/package.json b/packages/sdk-js/package.json
@@ -50,6 +50,7 @@
     "@kiltprotocol/did": "workspace:*",
     "@kiltprotocol/messaging": "workspace:*",
     "@kiltprotocol/types": "workspace:*",
-    "@kiltprotocol/utils": "workspace:*"
+    "@kiltprotocol/utils": "workspace:*",
+    "@polkadot/api-augment": "^7.10.1"
   }
 }
diff --git a/packages/sdk-js/src/index.ts b/packages/sdk-js/src/index.ts
@@ -5,6 +5,8 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
+import '@polkadot/api-augment'
+
 export * from '@kiltprotocol/core'
 export { Message } from '@kiltprotocol/messaging'
 export * as Messaging from '@kiltprotocol/messaging'

diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -33,8 +33,9 @@
   "homepage": "https://github.com/KILTprotocol/sdk-js#readme",
   "dependencies": {
     "@kiltprotocol/types": "workspace:*",
-    "@polkadot/api": "^6.11.1",
-    "@polkadot/types": "^6.11.1"
+    "@polkadot/api": "^7.10.1",
+    "@polkadot/api-augment": "^7.10.1",
+    "@polkadot/types": "^7.10.1"
   },
   "devDependencies": {
     "rimraf": "^3.0.2",

diff --git a/packages/testing/src/index.ts b/packages/testing/src/index.ts
@@ -5,4 +5,6 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
+import '@polkadot/api-augment'
+
 export * as ApiMocks from './mocks/index.js'
diff --git a/packages/testing/src/mocks/mockedApi.ts b/packages/testing/src/mocks/mockedApi.ts
@@ -172,6 +172,7 @@ function makeSubmittableResult(
         },
       } as any,
     ],
+    txHash: registry.createType('Hash'),
   })
 }
 

diff --git a/packages/testing/src/mocks/mockedApi.utils.ts b/packages/testing/src/mocks/mockedApi.utils.ts
@@ -12,10 +12,7 @@ import { createRegistryFromMetadata } from './typeRegistry.js'
 
 const TYPE_REGISTRY = createRegistryFromMetadata()
 
-const chainProperties = TYPE_REGISTRY.createType('ChainProperties', {
-  ss58Format: 38,
-})
-TYPE_REGISTRY.setChainProperties(chainProperties)
+TYPE_REGISTRY.setChainProperties(TYPE_REGISTRY.getChainProperties())
 
 const AccountId = TYPE_REGISTRY.getOrThrow('AccountId')
 

diff --git a/packages/testing/src/mocks/typeRegistry.ts b/packages/testing/src/mocks/typeRegistry.ts
@@ -5,6 +5,8 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
+import type { HexString } from '@polkadot/util/types'
+
 import { ApiPromise, WsProvider } from '@polkadot/api'
 import { Metadata, TypeRegistry } from '@polkadot/types'
 
@@ -13,7 +15,7 @@ import metaStatic from './metadata/spiritnet.json'
 // adapted from https://github.com/polkadot-js/apps/blob/master/packages/test-support/src/api/createAugmentedApi.ts
 export type StaticMetadata =
   | Uint8Array
-  | string
+  | HexString
   | Map<string, unknown>
   | Record<string, unknown>
 

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -30,9 +30,10 @@
   "bugs": "https://github.com/KILTprotocol/sdk-js/issues",
   "homepage": "https://github.com/KILTprotocol/sdk-js#readme",
   "dependencies": {
-    "@polkadot/api": "^6.11.1",
-    "@polkadot/keyring": "^8.1.2",
-    "@polkadot/types": "^6.11.1",
+    "@polkadot/api": "^7.10.1",
+    "@polkadot/api-augment": "^7.10.1",
+    "@polkadot/keyring": "^8.4.1",
+    "@polkadot/types": "^7.10.1",
     "tweetnacl": "^1.0.3"
   },
   "devDependencies": {

diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
@@ -5,6 +5,8 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
+import '@polkadot/api-augment'
+
 export type { ISubmittableResult } from '@polkadot/types/types'
 export type { SubmittableExtrinsic } from '@polkadot/api/promise/types'
 export type { KeyringPair } from '@polkadot/keyring/types'

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -37,10 +37,11 @@
   },
   "dependencies": {
     "@kiltprotocol/types": "workspace:*",
-    "@polkadot/keyring": "^8.1.2",
-    "@polkadot/types": "^6.11.1",
-    "@polkadot/util": "^8.1.2",
-    "@polkadot/util-crypto": "^8.1.2",
+    "@polkadot/api-augment": "^7.10.1",
+    "@polkadot/keyring": "^8.4.1",
+    "@polkadot/types": "^7.10.1",
+    "@polkadot/util": "^8.4.1",
+    "@polkadot/util-crypto": "^8.4.1",
     "tweetnacl": "^1.0.3",
     "uuid": "^8.1.0"
   }

diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -5,6 +5,8 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
+import '@polkadot/api-augment'
+
 import * as jsonabcCjs from './jsonabc.cjs'
 
 export const jsonabc = jsonabcCjs

diff --git a/packages/vc-export/package.json b/packages/vc-export/package.json
@@ -42,10 +42,11 @@
     "@kiltprotocol/did": "workspace:*",
     "@kiltprotocol/types": "workspace:*",
     "@kiltprotocol/utils": "workspace:*",
-    "@polkadot/keyring": "^8.1.2",
-    "@polkadot/types": "^6.11.1",
-    "@polkadot/util": "^8.1.2",
-    "@polkadot/util-crypto": "^8.1.2",
+    "@polkadot/api-augment": "^7.10.1",
+    "@polkadot/keyring": "^8.4.1",
+    "@polkadot/types": "^7.10.1",
+    "@polkadot/util": "^8.4.1",
+    "@polkadot/util-crypto": "^8.4.1",
     "jsonld": "^2.0.2",
     "jsonld-signatures": "^5.0.0",
     "vc-js": "^0.6.4"

diff --git a/packages/vc-export/src/index.ts b/packages/vc-export/src/index.ts
@@ -5,6 +5,8 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
+import '@polkadot/api-augment'
+
 import type * as types from './types.js'
 
 export * as verification from './verificationUtils.js'
-Original file line number
+Diff line change
@@ Expand Up / @@ -172,6 +172,7 @@ function makeSubmittableResult( @@
             },
           } as any,
         ],
+        txHash: registry.createType('Hash'),
       })
     }
@@ Expand Down @@