refactor!: credentials package

jest.config.js

@@ -33,7 +33,7 @@ const common = {
     'packages/types/',
     'packages/augment-api/',
     'packages/type-definitions/',
-    'packages/core/src/kilt/',
+    'packages/sdk-js/src/kilt/',
     'index.ts',
     'types.ts',
     '.chain.ts',

packages/asset-credentials/package.json

@@ -31,7 +31,7 @@
   "homepage": "https://github.com/KILTprotocol/sdk-js#readme",
   "dependencies": {
     "@kiltprotocol/config": "workspace:*",
-    "@kiltprotocol/core": "workspace:*",
+    "@kiltprotocol/credentials": "workspace:*",
     "@kiltprotocol/did": "workspace:*",
     "@kiltprotocol/types": "workspace:*",
     "@kiltprotocol/utils": "workspace:*",

packages/asset-credentials/src/credentials/PublicCredential.spec.ts

@@ -8,7 +8,7 @@
 import { BN } from '@polkadot/util'
 
 import { ConfigService } from '@kiltprotocol/config'
-import { CType } from '@kiltprotocol/core'
+import { CType } from '@kiltprotocol/credentials'
 import * as Did from '@kiltprotocol/did'
 import type {
   AssetDidUri,

packages/asset-credentials/src/credentials/PublicCredential.ts

@@ -18,7 +18,7 @@ import type {
   PartialAssetClaim,
 } from '@kiltprotocol/types'
 
-import { CType } from '@kiltprotocol/core'
+import { CType } from '@kiltprotocol/credentials'
 import { blake2AsHex } from '@polkadot/util-crypto'
 import { ConfigService } from '@kiltprotocol/config'
 import * as Did from '@kiltprotocol/did'

packages/core/README.md → packages/credentials/README.md

@@ -3,10 +3,10 @@
 
 ![Lint and Test](https://github.com/KILTprotocol/sdk-js/workflows/Lint%20and%20Test/badge.svg)
 
-# KILT Core
+# KILT Credentials
 
 This package provides the KILT credential core features and objects to make claims, build credentials and make attestations.
-It also includes ctypes, quotes, delegations and balance utilities.
+It also includes ctypes and delegations utilities.
 
 For more information, please visit our [official SDK documentation](https://docs.kilt.io/docs/sdk/introduction).
 
@@ -15,11 +15,11 @@ For more information, please visit our [official SDK documentation](https://docs
 NPM:
 
 ```
-npm install @kiltprotocol/core
+npm install @kiltprotocol/credentials
 ```
 
 YARN:
 
 ```
-yarn add @kiltprotocol/core
+yarn add @kiltprotocol/credentials
 ```

packages/core/package.json → packages/credentials/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@kiltprotocol/core",
+  "name": "@kiltprotocol/credentials",
   "version": "0.33.2-6",
   "description": "",
   "main": "./lib/cjs/index.js",

packages/core/src/credential/Credential.spec.ts → packages/credentials/src/credential/Credential.spec.ts

@@ -36,7 +36,6 @@ import {
 import * as Attestation from '../attestation'
 import * as Claim from '../claim'
 import * as CType from '../ctype'
-import { init } from '../kilt'
 import * as Credential from './Credential'
 
 const testCType = CType.fromProperties('Credential', {
@@ -75,7 +74,7 @@ beforeAll(async () => {
       } as any)
     ),
   } as any
-  await init({ api })
+  ConfigService.set({ api })
 })
 
 describe('Credential', () => {

packages/core/src/index.ts → packages/credentials/src/index.ts

@@ -6,15 +6,13 @@
  */
 
 /**
- * @module @kiltprotocol/core
+ * @module @kiltprotocol/credentials
  */
 
 export * as Attestation from './attestation/index.js'
 export * as Credential from './credential/index.js'
-export { BalanceUtils } from './balance/index.js'
 export * as Claim from './claim/index.js'
 export * as CType from './ctype/index.js'
 export { DelegationNode, DelegationNodeUtils } from './delegation/index.js'
 
-export { connect, disconnect, init } from './kilt/index.js'
 export { SDKErrors } from '@kiltprotocol/utils'

packages/sdk-js/package.json

@@ -41,9 +41,13 @@
   "dependencies": {
     "@kiltprotocol/chain-helpers": "workspace:*",
     "@kiltprotocol/config": "workspace:*",
-    "@kiltprotocol/core": "workspace:*",
+    "@kiltprotocol/credentials": "workspace:*",
     "@kiltprotocol/did": "workspace:*",
+    "@kiltprotocol/type-definitions": "workspace:*",
     "@kiltprotocol/types": "workspace:*",
-    "@kiltprotocol/utils": "workspace:*"
+    "@kiltprotocol/utils": "workspace:*",
+    "@polkadot/api": "^10.4.0",
+    "@polkadot/util": "^12.0.0",
+    "@polkadot/util-crypto": "^12.0.0"
   }
 }

packages/sdk-js/src/index.ts

@@ -9,9 +9,11 @@
  * @module @kiltprotocol/sdk-js
  */
 
-export * from '@kiltprotocol/core'
+export * from '@kiltprotocol/credentials'
 export { ConfigService } from '@kiltprotocol/config'
 export { Blockchain } from '@kiltprotocol/chain-helpers'
+export * from './balance/index.js'
+export * from './kilt/index.js'
 export * as ChainHelpers from '@kiltprotocol/chain-helpers'
 export * as Did from '@kiltprotocol/did'
 export * as Utils from '@kiltprotocol/utils'

packages/vc-export/package.json

@@ -38,7 +38,7 @@
   "dependencies": {
     "@kiltprotocol/chain-helpers": "workspace:*",
     "@kiltprotocol/config": "workspace:*",
-    "@kiltprotocol/core": "workspace:*",
+    "@kiltprotocol/credentials": "workspace:*",
     "@kiltprotocol/did": "workspace:*",
     "@kiltprotocol/types": "workspace:*",
     "@kiltprotocol/utils": "workspace:*",

packages/vc-export/src/CTypeVerification.spec.ts

@@ -5,7 +5,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-import { CType } from '@kiltprotocol/core'
+import { CType } from '@kiltprotocol/credentials'
 import { randomAsHex, randomAsU8a } from '@polkadot/util-crypto'
 import {
   attestation,

packages/vc-export/src/DidJwt.spec.ts

@@ -9,7 +9,6 @@ import { hexToU8a } from '@polkadot/util'
 import { ed25519PairFromSeed } from '@polkadot/util-crypto'
 import type { Keypair } from '@polkadot/util-crypto/types'
 
-import { init } from '@kiltprotocol/core'
 import {
   exportToDidDocument,
   getFullDidUriFromKey,
@@ -22,8 +21,8 @@ import type {
 } from '@kiltprotocol/types'
 
 import * as JWT from './DidJwt'
-import * as Presentation from './Presentation'
 import { credentialSchema } from './KiltCredentialV1'
+import * as Presentation from './Presentation'
 import type { KiltCredentialV1 } from './types'
 
 jest.mock('@kiltprotocol/did', () => ({
@@ -73,10 +72,6 @@ jest.mocked(resolveCompliant).mockImplementation(async (d) => {
   }
 })
 
-beforeAll(async () => {
-  await init({})
-})
-
 it('produces and reverses JWT payload representations of a credential and presentation', () => {
   const credential = {
     '@context': [

packages/vc-export/src/KiltAttestationProofV1.spec.ts

@@ -8,7 +8,7 @@
 import { encodeAddress, randomAsHex, randomAsU8a } from '@polkadot/util-crypto'
 import { u8aToHex, u8aToU8a } from '@polkadot/util'
 
-import { Credential } from '@kiltprotocol/core'
+import { Credential } from '@kiltprotocol/credentials'
 import { parse } from '@kiltprotocol/did'
 import type { DidUri } from '@kiltprotocol/types'
 

packages/vc-export/src/KiltAttestationProofV1.ts

@@ -30,7 +30,7 @@ import type {
 } from '@polkadot/types/interfaces/types.js'
 import type { IEventData, Signer } from '@polkadot/types/types'
 
-import { CType } from '@kiltprotocol/core'
+import { CType } from '@kiltprotocol/credentials'
 import {
   authorizeTx,
   getFullDidUri,

packages/vc-export/src/KiltCredentialV1.ts

@@ -9,7 +9,7 @@ import { hexToU8a } from '@polkadot/util'
 import { base58Encode } from '@polkadot/util-crypto'
 
 import { JsonSchema } from '@kiltprotocol/utils'
-import { CType } from '@kiltprotocol/core'
+import { CType } from '@kiltprotocol/credentials'
 import type {
   ICType,
   ICredential,

packages/vc-export/src/KiltRevocationStatusV1.ts

@@ -11,7 +11,7 @@ import type { ApiPromise } from '@polkadot/api'
 import type { U8aLike } from '@polkadot/util/types'
 
 import { ConfigService } from '@kiltprotocol/config'
-import { Attestation, CType, SDKErrors } from '@kiltprotocol/core'
+import { Attestation, CType, SDKErrors } from '@kiltprotocol/credentials'
 import type { Caip2ChainId } from '@kiltprotocol/types'
 
 import { Caip2 } from './CAIP/index.js'

packages/vc-export/src/Presentation.spec.ts

@@ -16,7 +16,7 @@ import {
 } from '@polkadot/util-crypto'
 import type { Keypair } from '@polkadot/util-crypto/types'
 
-import { init } from '@kiltprotocol/core'
+import { ConfigService } from '@kiltprotocol/config'
 import { getFullDidUri, getFullDidUriFromKey } from '@kiltprotocol/did'
 import type {
   DidDocument,
@@ -114,7 +114,7 @@ beforeAll(async () => {
   api.query.did = {
     didBlacklist: jest.fn().mockResolvedValue(api.createType('Option<Null>')),
   } as any
-  await init({ api })
+  ConfigService.set({ api })
 })
 
 it('verifies a presentation signed by an ecdsa key', async () => {

packages/vc-export/src/exportToVerifiableCredential.spec.ts

@@ -8,7 +8,7 @@
 import { hexToU8a, u8aConcat, u8aToU8a } from '@polkadot/util'
 import { randomAsU8a } from '@polkadot/util-crypto'
 
-import { Credential } from '@kiltprotocol/core'
+import { Credential } from '@kiltprotocol/credentials'
 import type { IAttestation, ICType, ICredential } from '@kiltprotocol/types'
 
 import { ApiMocks } from '../../../tests/testUtils'

packages/vc-export/src/vc-js/suites/KiltAttestationProofV1.spec.ts

@@ -18,7 +18,7 @@ import jsigs from 'jsonld-signatures' // cjs module
 // @ts-expect-error not a typescript module
 import jsonld from 'jsonld' // cjs module
 
-import { Credential } from '@kiltprotocol/core'
+import { Credential } from '@kiltprotocol/credentials'
 import { ConfigService } from '@kiltprotocol/config'
 import * as Did from '@kiltprotocol/did'
 import { Crypto } from '@kiltprotocol/utils'

packages/vc-export/src/vc-js/suites/KiltAttestationProofV1.ts

@@ -12,7 +12,7 @@
 import jsigs from 'jsonld-signatures' // cjs module
 
 import { ConfigService } from '@kiltprotocol/config'
-import { CType } from '@kiltprotocol/core'
+import { CType } from '@kiltprotocol/credentials'
 import type { ICType } from '@kiltprotocol/types'
 
 import { chainIdFromGenesis } from '../../CAIP/caip2.js'

packages/vc-export/src/vc-js/suites/Sr25519Signature2020.spec.ts

@@ -8,25 +8,24 @@
 // @ts-expect-error not a typescript module
 import * as vcjs from '@digitalbazaar/vc'
 
-import { init } from '@kiltprotocol/core'
 import * as Did from '@kiltprotocol/did'
-import { Crypto } from '@kiltprotocol/utils'
 import type {
   ConformingDidDocument,
   DidUri,
   KiltKeyringPair,
 } from '@kiltprotocol/types'
+import { Crypto } from '@kiltprotocol/utils'
 
+import { W3C_CREDENTIAL_CONTEXT_URL } from '../../constants.js'
+import type { VerifiableCredential } from '../../types.js'
 import {
   combineDocumentLoaders,
   kiltContextsLoader,
   kiltDidLoader,
 } from '../documentLoader.js'
-import { W3C_CREDENTIAL_CONTEXT_URL } from '../../constants.js'
+import ingosCredential from '../examples/ICredentialExample.json'
 import { Sr25519Signature2020 } from './Sr25519Signature2020.js'
 import { Sr25519VerificationKey2020 } from './Sr25519VerificationKey.js'
-import ingosCredential from '../examples/ICredentialExample.json'
-import type { VerifiableCredential } from '../../types.js'
 
 // is not needed and imports a dependency that does not work in node 18
 jest.mock('@digitalbazaar/http-client', () => ({}))
@@ -43,7 +42,6 @@ const documentLoader = combineDocumentLoaders([
 ])
 
 export async function makeFakeDid() {
-  await init()
   const keypair = Crypto.makeKeypairFromUri('//Ingo', 'sr25519')
   const didDocument = Did.exportToDidDocument(
     {

tests/integration/AccountLinking.spec.ts

@@ -10,8 +10,7 @@ import { Keyring } from '@polkadot/keyring'
 import { BN } from '@polkadot/util'
 import { mnemonicGenerate } from '@polkadot/util-crypto'
 
-import { BalanceUtils, disconnect } from '@kiltprotocol/core'
-import * as Did from '@kiltprotocol/did'
+import { BalanceUtils, Did, disconnect } from '@kiltprotocol/sdk-js'
 import type {
   DidDocument,
   KeyringPair,

tests/integration/Attestation.spec.ts

@@ -12,9 +12,9 @@ import {
   Claim,
   Credential,
   CType,
+  Did,
   disconnect,
-} from '@kiltprotocol/core'
-import * as Did from '@kiltprotocol/did'
+} from '@kiltprotocol/sdk-js'
 import type {
   DidDocument,
   IAttestation,

tests/integration/Balance.spec.ts

@@ -10,7 +10,7 @@ import { jest } from '@jest/globals'
 import { ApiPromise } from '@polkadot/api'
 import { BN } from '@polkadot/util'
 
-import { disconnect } from '@kiltprotocol/core'
+import { disconnect } from '@kiltprotocol/sdk-js'
 import type { KeyringPair } from '@kiltprotocol/types'
 
 import { makeSigningKeyTool } from '../testUtils/index.js'

tests/integration/Blockchain.spec.ts

@@ -8,8 +8,7 @@
 import type { ApiPromise } from '@polkadot/api'
 import { BN } from '@polkadot/util'
 
-import { Blockchain } from '@kiltprotocol/chain-helpers'
-import { BalanceUtils, disconnect } from '@kiltprotocol/core'
+import { Blockchain, BalanceUtils, disconnect } from '@kiltprotocol/sdk-js'
 import type { KeyringPair } from '@kiltprotocol/types'
 
 import { makeSigningKeyTool } from '../testUtils/index.js'

tests/integration/Ctypes.spec.ts

@@ -7,8 +7,7 @@
 
 import type { ApiPromise } from '@polkadot/api'
 
-import { CType, disconnect } from '@kiltprotocol/core'
-import * as Did from '@kiltprotocol/did'
+import { CType, Did, disconnect } from '@kiltprotocol/sdk-js'
 import type { DidDocument, ICType, KiltKeyringPair } from '@kiltprotocol/types'
 import { Crypto, UUID } from '@kiltprotocol/utils'
 

tests/integration/Delegation.spec.ts

@@ -14,17 +14,18 @@ import {
   Claim,
   Credential,
   DelegationNode,
+  Did,
   disconnect,
-} from '@kiltprotocol/core'
-import * as Did from '@kiltprotocol/did'
-import type {
+} from '@kiltprotocol/sdk-js'
+import {
   DidDocument,
   ICType,
   IDelegationNode,
   KiltKeyringPair,
+  Permission,
+  PermissionType,
   SignCallback,
 } from '@kiltprotocol/types'
-import { Permission, PermissionType } from '@kiltprotocol/types'
 
 import {
   KeyTool,

tests/integration/Deposit.spec.ts

@@ -13,9 +13,9 @@ import {
   Claim,
   Credential,
   CType,
+  Did,
   disconnect,
-} from '@kiltprotocol/core'
-import * as Did from '@kiltprotocol/did'
+} from '@kiltprotocol/sdk-js'
 import type {
   DidDocument,
   IAttestation,
@@ -25,6 +25,7 @@ import type {
   SignCallback,
   SubmittableExtrinsic,
 } from '@kiltprotocol/types'
+
 import {
   createFullDidFromLightDid,
   createFullDidFromSeed,