chore: cherry-pick hotfix release 0.33.1 (#773)

rflechtner · rflechtner · commit 62c5fded50c6 · 2023-06-14T17:57:29.000+02:00
diff --git a/package.json b/package.json
@@ -70,6 +70,6 @@
     "typedoc": "^0.23.0",
     "typescript": "^4.8.3"
   },
-  "version": "0.33.1-4",
+  "version": "0.33.1",
   "packageManager": "yarn@3.3.1"
 }
diff --git a/packages/asset-did/package.json b/packages/asset-did/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kiltprotocol/asset-did",
-  "version": "0.33.1-4",
+  "version": "0.33.1",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
diff --git a/packages/augment-api/package.json b/packages/augment-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kiltprotocol/augment-api",
-  "version": "0.33.1-4",
+  "version": "0.33.1",
   "description": "",
   "types": "./lib/index.d.ts",
   "type": "module",
diff --git a/packages/chain-helpers/package.json b/packages/chain-helpers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kiltprotocol/chain-helpers",
-  "version": "0.33.1-4",
+  "version": "0.33.1",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
diff --git a/packages/config/package.json b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kiltprotocol/config",
-  "version": "0.33.1-4",
+  "version": "0.33.1",
   "description": "",
   "type": "commonjs",
   "main": "./lib/index.js",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kiltprotocol/core",
-  "version": "0.33.1-4",
+  "version": "0.33.1",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -49,7 +49,6 @@
     "@polkadot/keyring": "^12.0.0",
     "@polkadot/types": "^10.4.0",
     "@polkadot/util": "^12.0.0",
-    "@polkadot/util-crypto": "^12.0.0",
-    "cbor-web": "^9.0.0"
+    "@polkadot/util-crypto": "^12.0.0"
   }
 }
diff --git a/packages/core/src/publicCredential/PublicCredential.chain.ts b/packages/core/src/publicCredential/PublicCredential.chain.ts
@@ -23,12 +23,10 @@ import type {
   PublicCredentialsCredentialsCredentialEntry,
 } from '@kiltprotocol/augment-api'
 
-import * as cbor from 'cbor-web'
-
 import { ConfigService } from '@kiltprotocol/config'
 import { fromChain as didFromChain } from '@kiltprotocol/did'
 import { validateUri } from '@kiltprotocol/asset-did'
-import { SDKErrors } from '@kiltprotocol/utils'
+import { SDKErrors, cbor } from '@kiltprotocol/utils'
 
 import { getIdForCredential } from './PublicCredential.js'
 import { flattenCalls, isBatch, retrieveExtrinsicFromBlock } from '../utils.js'
diff --git a/packages/did/package.json b/packages/did/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kiltprotocol/did",
-  "version": "0.33.1-4",
+  "version": "0.33.1",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -45,7 +45,6 @@
     "@polkadot/types": "^10.4.0",
     "@polkadot/types-codec": "^10.4.0",
     "@polkadot/util": "^12.0.0",
-    "@polkadot/util-crypto": "^12.0.0",
-    "cbor-web": "^9.0.0"
+    "@polkadot/util-crypto": "^12.0.0"
   }
 }
diff --git a/packages/did/src/DidDetails/LightDidDetails.ts b/packages/did/src/DidDetails/LightDidDetails.ts
@@ -5,7 +5,6 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-import * as cbor from 'cbor-web'
 import {
   base58Decode,
   base58Encode,
@@ -22,7 +21,7 @@ import type {
 } from '@kiltprotocol/types'
 import { encryptionKeyTypes } from '@kiltprotocol/types'
 
-import { SDKErrors, ss58Format } from '@kiltprotocol/utils'
+import { SDKErrors, ss58Format, cbor } from '@kiltprotocol/utils'
 
 import { getAddressByKey, parse } from '../Did.utils.js'
 import { resourceIdToChain, validateService } from '../Did.chain.js'
diff --git a/packages/messaging/package.json b/packages/messaging/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kiltprotocol/messaging",
-  "version": "0.33.1-4",
+  "version": "0.33.1",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
diff --git a/packages/sdk-js/package.json b/packages/sdk-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kiltprotocol/sdk-js",
-  "version": "0.33.1-4",
+  "version": "0.33.1",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@kiltprotocol/testing",
   "private": true,
-  "version": "0.33.1-4",
+  "version": "0.33.1",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
diff --git a/packages/type-definitions/package.json b/packages/type-definitions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kiltprotocol/type-definitions",
-  "version": "0.33.1-4",
+  "version": "0.33.1",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kiltprotocol/types",
-  "version": "0.33.1-4",
+  "version": "0.33.1",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kiltprotocol/utils",
-  "version": "0.33.1-4",
+  "version": "0.33.1",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -39,6 +39,7 @@
     "@polkadot/keyring": "^12.0.0",
     "@polkadot/util": "^12.0.0",
     "@polkadot/util-crypto": "^12.0.0",
+    "cbor-web": "^9.0.0",
     "tweetnacl": "^1.0.3",
     "uuid": "^9.0.0"
   }
diff --git a/packages/utils/src/cbor.ts b/packages/utils/src/cbor.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) 2018-2023, BOTLabs GmbH.
+ *
+ * This source code is licensed under the BSD 4-Clause "Original" license
+ * found in the LICENSE file in the root directory of this source tree.
+ */
+
+// special import syntax as this is a pure cjs import
+import * as cborImp from 'cbor-web'
+// this is horrible but the only way to make this import work in both cjs & esm builds
+export const cbor: typeof cborImp = (cborImp as any)?.default ?? cborImp
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -17,4 +17,5 @@ export * as DataUtils from './DataUtils.js'
 export * as SDKErrors from './SDKErrors.js'
 export * as JsonSchema from './json-schema/index.js'
 export { ss58Format } from './ss58Format.js'
+export { cbor } from './cbor.js'
 export { Keyring } from '@polkadot/keyring'
diff --git a/packages/vc-export/package.json b/packages/vc-export/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kiltprotocol/vc-export",
-  "version": "0.33.1-4",
+  "version": "0.33.1",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
diff --git a/yarn.lock b/yarn.lock
@@ -1953,7 +1953,6 @@ __metadata:
     "@polkadot/util": ^12.0.0
     "@polkadot/util-crypto": ^12.0.0
     "@types/uuid": ^8.0.0
-    cbor-web: ^9.0.0
     rimraf: ^3.0.2
     testcontainers: ^9.0.0
     typescript: ^4.8.3
@@ -1976,7 +1975,6 @@ __metadata:
     "@polkadot/types-codec": ^10.4.0
     "@polkadot/util": ^12.0.0
     "@polkadot/util-crypto": ^12.0.0
-    cbor-web: ^9.0.0
     rimraf: ^3.0.2
     typescript: ^4.8.3
   languageName: unknown
@@ -2071,6 +2069,7 @@ __metadata:
     "@polkadot/keyring": ^12.0.0
     "@polkadot/util": ^12.0.0
     "@polkadot/util-crypto": ^12.0.0
+    cbor-web: ^9.0.0
     rimraf: ^3.0.2
     tweetnacl: ^1.0.3
     typescript: ^4.8.3

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,6 @@`
`70`	`70`	`"typedoc": "^0.23.0",`
`71`	`71`	`"typescript": "^4.8.3"`
`72`	`72`	`},`
`73`		`- "version": "0.33.1-4",`
	`73`	`+ "version": "0.33.1",`
`74`	`74`	`"packageManager": "[email protected]"`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@kiltprotocol/asset-did",`
`3`		`- "version": "0.33.1-4",`
	`3`	`+ "version": "0.33.1",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "./lib/cjs/index.js",`
`6`	`6`	`"module": "./lib/esm/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@kiltprotocol/augment-api",`
`3`		`- "version": "0.33.1-4",`
	`3`	`+ "version": "0.33.1",`
`4`	`4`	`"description": "",`
`5`	`5`	`"types": "./lib/index.d.ts",`
`6`	`6`	`"type": "module",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@kiltprotocol/chain-helpers",`
`3`		`- "version": "0.33.1-4",`
	`3`	`+ "version": "0.33.1",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "./lib/cjs/index.js",`
`6`	`6`	`"module": "./lib/esm/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@kiltprotocol/config",`
`3`		`- "version": "0.33.1-4",`
	`3`	`+ "version": "0.33.1",`
`4`	`4`	`"description": "",`
`5`	`5`	`"type": "commonjs",`
`6`	`6`	`"main": "./lib/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@kiltprotocol/core",`
`3`		`- "version": "0.33.1-4",`
	`3`	`+ "version": "0.33.1",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "./lib/cjs/index.js",`
`6`	`6`	`"module": "./lib/esm/index.js",`
`@@ -49,7 +49,6 @@`
`49`	`49`	`"@polkadot/keyring": "^12.0.0",`
`50`	`50`	`"@polkadot/types": "^10.4.0",`
`51`	`51`	`"@polkadot/util": "^12.0.0",`
`52`		`- "@polkadot/util-crypto": "^12.0.0",`
`53`		`- "cbor-web": "^9.0.0"`
	`52`	`+ "@polkadot/util-crypto": "^12.0.0"`
`54`	`53`	`}`
`55`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@kiltprotocol/did",`
`3`		`- "version": "0.33.1-4",`
	`3`	`+ "version": "0.33.1",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "./lib/cjs/index.js",`
`6`	`6`	`"module": "./lib/esm/index.js",`
`@@ -45,7 +45,6 @@`
`45`	`45`	`"@polkadot/types": "^10.4.0",`
`46`	`46`	`"@polkadot/types-codec": "^10.4.0",`
`47`	`47`	`"@polkadot/util": "^12.0.0",`
`48`		`- "@polkadot/util-crypto": "^12.0.0",`
`49`		`- "cbor-web": "^9.0.0"`
	`48`	`+ "@polkadot/util-crypto": "^12.0.0"`
`50`	`49`	`}`
`51`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@kiltprotocol/messaging",`
`3`		`- "version": "0.33.1-4",`
	`3`	`+ "version": "0.33.1",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "./lib/cjs/index.js",`
`6`	`6`	`"module": "./lib/esm/index.js",`