@cheqd/sdk 1.4.0-develop.3 → 1.4.0-develop.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  # Changelog
2
2
 
3
+ ## [1.4.0-develop.4](https://github.com/cheqd/sdk/compare/1.4.0-develop.3...1.4.0-develop.4) (2022-11-11)
4
+
5
+
6
+ ### Features
7
+
8
+ * Resolve review suggestions ([b984ef4](https://github.com/cheqd/sdk/commit/b984ef46e1815ffc2f11ab426359d81776f271a8))
9
+
3
10
  ## [1.4.0-develop.3](https://github.com/cheqd/sdk/compare/1.4.0-develop.2...1.4.0-develop.3) (2022-11-08)
4
11
 
5
12
  ## [1.4.0-develop.2](https://github.com/cheqd/sdk/compare/1.4.0-develop.1...1.4.0-develop.2) (2022-11-01)
package/build/utils.d.ts CHANGED
@@ -27,11 +27,4 @@ export declare function createDidPayloadWithSignInputs(seed?: string, keys?: IKe
27
27
  };
28
28
  export declare function convertKeyPairtoTImportableEd25519Key(keyPair: IKeyPair): TImportableEd25519Key;
29
29
  export declare function createSignInputsFromKeyPair(didDocument: IdentifierPayload, keys: IKeyPair[]): ISignInputs[];
30
- export declare enum DidDocumentOperation {
31
- Set = "setDidDocument",
32
- Add = "addToDidDocument",
33
- Remove = "removeFromDidDocument"
34
- }
35
- export declare function jsonConcat(o1: any, o2: any): any;
36
- export declare function jsonSubtract(o1: any, o2: any): void;
37
30
  //# sourceMappingURL=utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,EACH,QAAQ,EACR,aAAa,EACb,WAAW,EACX,mBAAmB,EAEnB,oBAAoB,EACpB,gBAAgB,EAChB,sBAAsB,EACtB,YAAY,EACZ,iBAAiB,EACpB,MAAM,SAAS,CAAA;AAIhB,OAAO,EAA4C,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAEtF,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAEtF,oBAAY,qBAAqB,GAAG;IAChC,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,oBAAY,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AAE3F,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,aAAa,EAAE,CAEnF;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,OAAO,CAEvF;AAED,wBAAgB,wCAAwC,CAAC,GAAG,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,GAAG,WAAW,CAgC1I;AAED,wBAAgB,gBAAgB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED,wBAAgB,mBAAmB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,QAAQ,CAM3D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,QAAQ,CAMxD;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,oBAAoB,EAAE,GAAG,EAAE,gBAAgB,CAAC,sBAAsB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAE,MAAW,EAAE,OAAO,GAAE,YAAmC,GAAG,iBAAiB,CAuBjO;AAED,wBAAgB,2BAA2B,CAAC,uBAAuB,EAAE,mBAAmB,EAAE,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,GAAG,kBAAkB,EAAE,CA4BvJ;AAED,wBAAgB,gBAAgB,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,GAAG,mBAAmB,CAetI;AAED,wBAAgB,8BAA8B,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE;;;;EAsB9E;AAED,wBAAgB,qCAAqC,CAAC,OAAO,EAAE,QAAQ,GAAI,qBAAqB,CAO/F;AAED,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAI3F;AAED,oBAAY,oBAAoB;IAC5B,GAAG,mBAAmB;IACtB,GAAG,qBAAqB;IACxB,MAAM,0BAA0B;CACnC;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAC,GAAG,OAQzC;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,QAM5C"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,EACH,QAAQ,EACR,aAAa,EACb,WAAW,EACX,mBAAmB,EAEnB,oBAAoB,EACpB,gBAAgB,EAChB,sBAAsB,EACtB,YAAY,EACZ,iBAAiB,EACpB,MAAM,SAAS,CAAA;AAIhB,OAAO,EAA4C,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAEtF,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAEtF,oBAAY,qBAAqB,GAAG;IAChC,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,oBAAY,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AAE3F,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,aAAa,EAAE,CAEnF;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,OAAO,CAEvF;AAED,wBAAgB,wCAAwC,CAAC,GAAG,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,GAAG,WAAW,CAgC1I;AAED,wBAAgB,gBAAgB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED,wBAAgB,mBAAmB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,QAAQ,CAM3D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,QAAQ,CAMxD;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,oBAAoB,EAAE,GAAG,EAAE,gBAAgB,CAAC,sBAAsB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAE,MAAW,EAAE,OAAO,GAAE,YAAmC,GAAG,iBAAiB,CAuBjO;AAED,wBAAgB,2BAA2B,CAAC,uBAAuB,EAAE,mBAAmB,EAAE,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,GAAG,kBAAkB,EAAE,CA4BvJ;AAED,wBAAgB,gBAAgB,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,GAAG,mBAAmB,CAetI;AAED,wBAAgB,8BAA8B,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE;;;;EAsB9E;AAED,wBAAgB,qCAAqC,CAAC,OAAO,EAAE,QAAQ,GAAI,qBAAqB,CAO/F;AAED,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAI3F"}
package/build/utils.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.jsonSubtract = exports.jsonConcat = exports.DidDocumentOperation = exports.createSignInputsFromKeyPair = exports.convertKeyPairtoTImportableEd25519Key = exports.createDidPayloadWithSignInputs = exports.createDidPayload = exports.createDidVerificationMethod = exports.createVerificationKeys = exports.createKeyPairHex = exports.createKeyPairBase64 = exports.createKeyPairRaw = exports.createSignInputsFromImportableEd25519Key = exports.isEqualKeyValuePair = exports.parseToKeyValuePair = void 0;
3
+ exports.createSignInputsFromKeyPair = exports.convertKeyPairtoTImportableEd25519Key = exports.createDidPayloadWithSignInputs = exports.createDidPayload = exports.createDidVerificationMethod = exports.createVerificationKeys = exports.createKeyPairHex = exports.createKeyPairBase64 = exports.createKeyPairRaw = exports.createSignInputsFromImportableEd25519Key = exports.isEqualKeyValuePair = exports.parseToKeyValuePair = void 0;
4
4
  const types_1 = require("./types");
5
5
  const uint8arrays_1 = require("uint8arrays");
6
6
  const basics_1 = require("multiformats/basics");
@@ -48,11 +48,11 @@ function createSignInputsFromImportableEd25519Key(key, verificationMethod) {
48
48
  }
49
49
  exports.createSignInputsFromImportableEd25519Key = createSignInputsFromImportableEd25519Key;
50
50
  function createKeyPairRaw(seed) {
51
- return seed ? (0, ed25519_1.generateKeyPairFromSeed)(Buffer.from(seed)) : (0, ed25519_1.generateKeyPair)();
51
+ return seed ? (0, ed25519_1.generateKeyPairFromSeed)((0, uint8arrays_1.fromString)(seed)) : (0, ed25519_1.generateKeyPair)();
52
52
  }
53
53
  exports.createKeyPairRaw = createKeyPairRaw;
54
54
  function createKeyPairBase64(seed) {
55
- const keyPair = seed ? (0, ed25519_1.generateKeyPairFromSeed)(Buffer.from(seed)) : (0, ed25519_1.generateKeyPair)();
55
+ const keyPair = seed ? (0, ed25519_1.generateKeyPairFromSeed)((0, uint8arrays_1.fromString)(seed)) : (0, ed25519_1.generateKeyPair)();
56
56
  return {
57
57
  publicKey: (0, uint8arrays_1.toString)(keyPair.publicKey, 'base64'),
58
58
  privateKey: (0, uint8arrays_1.toString)(keyPair.secretKey, 'base64'),
@@ -60,7 +60,7 @@ function createKeyPairBase64(seed) {
60
60
  }
61
61
  exports.createKeyPairBase64 = createKeyPairBase64;
62
62
  function createKeyPairHex(seed) {
63
- const keyPair = seed ? (0, ed25519_1.generateKeyPairFromSeed)(Buffer.from(seed)) : (0, ed25519_1.generateKeyPair)();
63
+ const keyPair = createKeyPairRaw(seed);
64
64
  return {
65
65
  publicKey: (0, uint8arrays_1.toString)(keyPair.publicKey, 'hex'),
66
66
  privateKey: (0, uint8arrays_1.toString)(keyPair.secretKey, 'hex'),
@@ -169,30 +169,4 @@ function createSignInputsFromKeyPair(didDocument, keys) {
169
169
  return signInputs;
170
170
  }
171
171
  exports.createSignInputsFromKeyPair = createSignInputsFromKeyPair;
172
- var DidDocumentOperation;
173
- (function (DidDocumentOperation) {
174
- DidDocumentOperation["Set"] = "setDidDocument";
175
- DidDocumentOperation["Add"] = "addToDidDocument";
176
- DidDocumentOperation["Remove"] = "removeFromDidDocument";
177
- })(DidDocumentOperation = exports.DidDocumentOperation || (exports.DidDocumentOperation = {}));
178
- function jsonConcat(o1, o2) {
179
- for (var key in o2) {
180
- if (Array.isArray(o1[key])) {
181
- o1[key].push(...o2[key]);
182
- }
183
- else {
184
- o1[key] = o2[key];
185
- }
186
- }
187
- return o1;
188
- }
189
- exports.jsonConcat = jsonConcat;
190
- function jsonSubtract(o1, o2) {
191
- for (var key in o2) {
192
- if (o2[key] == o1[key]) {
193
- delete (o1[key]);
194
- }
195
- }
196
- }
197
- exports.jsonSubtract = jsonSubtract;
198
172
  //# sourceMappingURL=utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cheqd/sdk",
3
- "version": "1.4.0-develop.3",
3
+ "version": "1.4.0-develop.4",
4
4
  "description": "A TypeScript SDK built with CosmJS to interact with cheqd network ledger",
5
5
  "license": "Apache-2.0",
6
6
  "author": "Cheqd Foundation Limited (https://github.com/cheqd)",
package/src/utils.ts CHANGED
@@ -70,11 +70,11 @@ export function createSignInputsFromImportableEd25519Key(key: TImportableEd25519
70
70
  }
71
71
 
72
72
  export function createKeyPairRaw(seed?: string): KeyPair {
73
- return seed ? generateKeyPairFromSeed(Buffer.from(seed)) : generateKeyPair()
73
+ return seed ? generateKeyPairFromSeed(fromString(seed)) : generateKeyPair()
74
74
  }
75
75
 
76
76
  export function createKeyPairBase64(seed?: string): IKeyPair {
77
- const keyPair = seed ? generateKeyPairFromSeed(Buffer.from(seed)) : generateKeyPair()
77
+ const keyPair = seed ? generateKeyPairFromSeed(fromString(seed)) : generateKeyPair()
78
78
  return {
79
79
  publicKey: toString(keyPair.publicKey, 'base64'),
80
80
  privateKey: toString(keyPair.secretKey, 'base64'),
@@ -82,7 +82,7 @@ export function createKeyPairBase64(seed?: string): IKeyPair {
82
82
  }
83
83
 
84
84
  export function createKeyPairHex(seed?: string): IKeyPair {
85
- const keyPair = seed ? generateKeyPairFromSeed(Buffer.from(seed)) : generateKeyPair()
85
+ const keyPair = createKeyPairRaw(seed)
86
86
  return {
87
87
  publicKey: toString(keyPair.publicKey, 'hex'),
88
88
  privateKey: toString(keyPair.secretKey, 'hex'),
@@ -199,27 +199,3 @@ export function createSignInputsFromKeyPair(didDocument: IdentifierPayload, keys
199
199
  const signInputs = keyHexs.map((key)=>createSignInputsFromImportableEd25519Key(key, didDocument.verificationMethod!))
200
200
  return signInputs
201
201
  }
202
-
203
- export enum DidDocumentOperation {
204
- Set = 'setDidDocument',
205
- Add = 'addToDidDocument',
206
- Remove = 'removeFromDidDocument'
207
- }
208
-
209
- export function jsonConcat(o1: any, o2:any) {
210
- for (var key in o2) {
211
- if(Array.isArray(o1[key])) {
212
- o1[key].push(...o2[key])
213
- } else {
214
- o1[key] = o2[key]
215
- }}
216
- return o1
217
- }
218
-
219
- export function jsonSubtract(o1: any, o2: any) {
220
- for (var key in o2) {
221
- if(o2[key] == o1[key]) {
222
- delete(o1[key])
223
- }
224
- }
225
- }