@cheqd/sdk 1.5.0-develop.3 → 2.0.0-develop.1

package/build/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDidPayload = exports.createDidVerificationMethod = exports.createVerificationKeys = exports.createKeyPairHex = exports.createKeyPairBase64 = exports.createKeyPairRaw = exports.createSignInputsFromImportableEd25519Key = exports.isEqualKeyValuePair = void 0;
+exports.validateSpecCompliantPayload = exports.createDidPayload = exports.createDidVerificationMethod = exports.createVerificationKeys = exports.createKeyPairHex = exports.createKeyPairBase64 = exports.createKeyPairRaw = exports.createSignInputsFromImportableEd25519Key = exports.isEqualKeyValuePair = void 0;
 const types_1 = require("./types");
 const uint8arrays_1 = require("uint8arrays");
 const basics_1 = require("multiformats/basics");
@@ -8,8 +8,8 @@ const did_jwt_1 = require("did-jwt");
 const ed25519_1 = require("@stablelib/ed25519");
 const uuid_1 = require("uuid");
 const crypto_1 = require("crypto");
-// multicodec ed25519-pub header as varint
-const MULTICODEC_ED25519_PUB_HEADER = new Uint8Array([0xed, 0x01]);
+const v2_1 = require("@cheqd/ts-proto/cheqd/did/v2");
+const MULTICODEC_ED25519_HEADER = new Uint8Array([0xed, 0x01]);
 function isEqualKeyValuePair(kv1, kv2) {
     return kv1.every((item, index) => item.key === kv2[index].key && item.value === kv2[index].value);
 }
@@ -21,7 +21,7 @@ function createSignInputsFromImportableEd25519Key(key, verificationMethod) {
     for (const method of verificationMethod) {
         switch (method === null || method === void 0 ? void 0 : method.type) {
             case types_1.VerificationMethods.Ed255192020:
-                const publicKeyMultibase = _encodeMbKey(MULTICODEC_ED25519_PUB_HEADER, publicKey);
+                const publicKeyMultibase = toMultibaseRaw(publicKey);
                 if (method.publicKeyMultibase === publicKeyMultibase) {
                     return {
                         verificationMethodId: method.id,
@@ -37,20 +37,17 @@ function createSignInputsFromImportableEd25519Key(key, verificationMethod) {
                     };
                 }
             case types_1.VerificationMethods.JWK:
-                const publicKeyJWK = {
+                const publicKeyJwk = {
                     crv: 'Ed25519',
                     kty: 'OKP',
                     x: (0, uint8arrays_1.toString)(publicKey, 'base64url')
                 };
-                if (JSON.stringify(method.publicKeyJWK) === JSON.stringify(publicKeyJWK)) {
+                if (JSON.stringify(method.publicKeyJwk) === JSON.stringify(publicKeyJwk)) {
                     return {
                         verificationMethodId: method.id,
                         privateKeyHex: key.privateKeyHex
                     };
                 }
-                else {
-                    throw new Error(`JWK not matching ${method.publicKeyJWK}, ${publicKeyJWK}`);
-                }
         }
     }
     throw new Error('No verification method type provided');
@@ -111,7 +108,7 @@ function createDidVerificationMethod(verificationMethodTypes, verificationKeys)
                     id: verificationKeys[_].keyId,
                     type,
                     controller: verificationKeys[_].didUrl,
-                    publicKeyMultibase: _encodeMbKey(MULTICODEC_ED25519_PUB_HEADER, (0, did_jwt_1.base64ToBytes)(verificationKeys[_].publicKey))
+                    publicKeyMultibase: toMultibaseRaw((0, did_jwt_1.base64ToBytes)(verificationKeys[_].publicKey))
                 };
             case types_1.VerificationMethods.Ed255192018:
                 return {
@@ -125,7 +122,7 @@ function createDidVerificationMethod(verificationMethodTypes, verificationKeys)
                     id: verificationKeys[_].keyId,
                     type,
                     controller: verificationKeys[_].didUrl,
-                    publicKeyJWK: {
+                    publicKeyJwk: {
                         crv: 'Ed25519',
                         kty: 'OKP',
                         x: (0, uint8arrays_1.toString)((0, uint8arrays_1.fromString)(verificationKeys[_].publicKey, 'base64pad'), 'base64url')
@@ -141,23 +138,76 @@ function createDidPayload(verificationMethods, verificationKeys) {
     if (!verificationKeys || verificationKeys.length === 0)
         throw new Error('No verification keys provided');
     const did = verificationKeys[0].didUrl;
-    return types_1.MsgCreateDidPayload.fromPartial({
+    return {
         id: did,
         controller: verificationKeys.map(key => key.didUrl),
         verificationMethod: verificationMethods,
         authentication: verificationKeys.map(key => key.keyId),
-        versionId: (0, uuid_1.v4)()
-    });
+    };
 }
 exports.createDidPayload = createDidPayload;
+function validateSpecCompliantPayload(didDocument) {
+    var _a;
+    // id is required, validated on both compile and runtime
+    if (!(didDocument === null || didDocument === void 0 ? void 0 : didDocument.id))
+        return { valid: false, error: 'id is required' };
+    // verificationMethod is required
+    if (!(didDocument === null || didDocument === void 0 ? void 0 : didDocument.verificationMethod))
+        return { valid: false, error: 'verificationMethod is required' };
+    // verificationMethod must be an array
+    if (!Array.isArray(didDocument === null || didDocument === void 0 ? void 0 : didDocument.verificationMethod))
+        return { valid: false, error: 'verificationMethod must be an array' };
+    // verificationMethod types must be supported
+    const protoVerificationMethod = didDocument.verificationMethod.map((vm) => {
+        switch (vm === null || vm === void 0 ? void 0 : vm.type) {
+            case types_1.VerificationMethods.Ed255192020:
+                if (!vm.publicKeyMultibase)
+                    throw new Error('publicKeyMultibase is required');
+                return v2_1.VerificationMethod.fromPartial({
+                    id: vm.id,
+                    controller: vm.controller,
+                    verificationMethodType: types_1.VerificationMethods.Ed255192020,
+                    verificationMaterial: vm.publicKeyMultibase,
+                });
+            case types_1.VerificationMethods.JWK:
+                if (!vm.publicKeyJwk)
+                    throw new Error('publicKeyJwk is required');
+                return v2_1.VerificationMethod.fromPartial({
+                    id: vm.id,
+                    controller: vm.controller,
+                    verificationMethodType: types_1.VerificationMethods.JWK,
+                    verificationMaterial: JSON.stringify(vm.publicKeyJwk),
+                });
+            case types_1.VerificationMethods.Ed255192018:
+                if (!vm.publicKeyBase58)
+                    throw new Error('publicKeyBase58 is required');
+                return v2_1.VerificationMethod.fromPartial({
+                    id: vm.id,
+                    controller: vm.controller,
+                    verificationMethodType: types_1.VerificationMethods.Ed255192018,
+                    verificationMaterial: vm.publicKeyBase58,
+                });
+            default:
+                throw new Error(`Unsupported verificationMethod type: ${vm === null || vm === void 0 ? void 0 : vm.type}`);
+        }
+    });
+    const protoService = (_a = didDocument === null || didDocument === void 0 ? void 0 : didDocument.service) === null || _a === void 0 ? void 0 : _a.map((s) => {
+        return v2_1.Service.fromPartial({
+            id: s === null || s === void 0 ? void 0 : s.id,
+            serviceType: s === null || s === void 0 ? void 0 : s.type,
+            serviceEndpoint: s === null || s === void 0 ? void 0 : s.serviceEndpoint,
+        });
+    });
+    return { valid: true, protobufVerificationMethod: protoVerificationMethod, protobufService: protoService };
+}
+exports.validateSpecCompliantPayload = validateSpecCompliantPayload;
 function sha256(message) {
     return (0, crypto_1.createHash)('sha256').update(message).digest('hex');
 }
-// encode a multibase base58-btc multicodec key
-function _encodeMbKey(header, key) {
-    const mbKey = new Uint8Array(header.length + key.length);
-    mbKey.set(header);
-    mbKey.set(key, header.length);
-    return basics_1.bases['base58btc'].encode(mbKey);
+function toMultibaseRaw(key) {
+    const multibase = new Uint8Array(MULTICODEC_ED25519_HEADER.length + key.length);
+    multibase.set(MULTICODEC_ED25519_HEADER);
+    multibase.set(key, MULTICODEC_ED25519_HEADER.length);
+    return basics_1.bases['base58btc'].encode(multibase);
 }
 //# sourceMappingURL=utils.js.map

package/build/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,mCAegB;AAChB,6CAAkD;AAClD,gDAA2C;AAC3C,qCAAuC;AACvC,gDAAsF;AACtF,+BAAyB;AACzB,mCAAmC;AACnC,qDAGqC;AASrC,MAAM,yBAAyB,GAAG,IAAI,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAE/D,SAAgB,mBAAmB,CAAC,GAAoB,EAAE,GAAoB;IAC1E,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAA;AACrG,CAAC;AAFD,kDAEC;AAED,SAAgB,wCAAwC,CAAC,GAA0B,EAAE,kBAAwC;IACzH,IAAI,CAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,MAAM,MAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;IAEzF,MAAM,SAAS,GAAG,IAAA,wBAAU,EAAC,GAAG,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;IAErD,KAAI,MAAM,MAAM,IAAI,kBAAkB,EAAE;QACpC,QAAQ,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,EAAE;YAClB,KAAK,2BAAmB,CAAC,WAAW;gBAChC,MAAM,kBAAkB,GAAG,cAAc,CAAC,SAAS,CAAC,CAAA;gBACpD,IAAI,MAAM,CAAC,kBAAkB,KAAK,kBAAkB,EAAE;oBAClD,OAAO;wBACH,oBAAoB,EAAE,MAAM,CAAC,EAAE;wBAC/B,aAAa,EAAE,GAAG,CAAC,aAAa;qBACnC,CAAA;iBACJ;YACL,KAAK,2BAAmB,CAAC,WAAW;gBAChC,MAAM,eAAe,GAAG,cAAK,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBACrE,IAAI,MAAM,CAAC,eAAe,KAAK,eAAe,EAAE;oBAC5C,OAAO;wBACH,oBAAoB,EAAE,MAAM,CAAC,EAAE;wBAC/B,aAAa,EAAE,GAAG,CAAC,aAAa;qBACnC,CAAA;iBACJ;YACL,KAAK,2BAAmB,CAAC,GAAG;gBACxB,MAAM,YAAY,GAAe;oBAC7B,GAAG,EAAE,SAAS;oBACd,GAAG,EAAE,KAAK;oBACV,CAAC,EAAE,IAAA,sBAAQ,EAAE,SAAS,EAAE,WAAW,CAAE;iBACxC,CAAA;gBACD,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;oBACtE,OAAO;wBACH,oBAAoB,EAAE,MAAM,CAAC,EAAE;wBAC/B,aAAa,EAAE,GAAG,CAAC,aAAa;qBACnC,CAAA;iBACJ;SACR;KACJ;IAED,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;AAC3D,CAAC;AAvCD,4FAuCC;AAED,SAAgB,gBAAgB,CAAC,IAAa;IAC1C,OAAO,IAAI,CAAC,CAAC,CAAC,IAAA,iCAAuB,EAAC,IAAA,wBAAU,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAe,GAAE,CAAA;AAC/E,CAAC;AAFD,4CAEC;AAED,SAAgB,mBAAmB,CAAC,IAAa;IAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,IAAA,iCAAuB,EAAC,IAAA,wBAAU,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAe,GAAE,CAAA;IACpF,OAAO;QACH,SAAS,EAAE,IAAA,sBAAQ,EAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC;QAChD,UAAU,EAAE,IAAA,sBAAQ,EAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC;KACpD,CAAA;AACL,CAAC;AAND,kDAMC;AAED,SAAgB,gBAAgB,CAAC,IAAa;IAC1C,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;IACtC,OAAO;QACH,SAAS,EAAE,IAAA,sBAAQ,EAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC;QAC7C,UAAU,EAAE,IAAA,sBAAQ,EAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC;KACjD,CAAA;AACL,CAAC;AAND,4CAMC;AAED,SAAgB,sBAAsB,CAAC,SAAiB,EAAE,IAA0B,EAAE,GAAqD,EAAE,UAAwB,oBAAY,CAAC,OAAO;IACrL,IAAI,gBAAmC,CAAA;IACvC,IAAI,MAAmC,CAAA;IAEvC,SAAS,GAAG,SAAS,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,sBAAQ,EAAC,IAAA,wBAAU,EAAC,SAAS,EAAE,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAA;IACjG,QAAQ,IAAI,EAAE;QACV,KAAK,4BAAoB,CAAC,MAAM;YAC5B,gBAAgB,GAAG,cAAK,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,IAAA,uBAAa,EAAC,SAAS,CAAC,CAAC,CAAA;YACtE,MAAM,GAAG,aAAa,OAAO,IAAI,CAAC,cAAK,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,IAAA,wBAAU,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;YACpH,OAAO;gBACH,gBAAgB;gBAChB,MAAM;gBACN,KAAK,EAAE,GAAG,MAAM,IAAI,GAAG,EAAE;gBACzB,SAAS;aACZ,CAAA;QACL,KAAK,4BAAoB,CAAC,IAAI;YAC1B,gBAAgB,GAAG,cAAK,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,IAAA,uBAAa,EAAC,SAAS,CAAC,CAAC,CAAA;YACtE,MAAM,GAAG,aAAa,OAAO,IAAI,IAAA,SAAE,GAAE,EAAE,CAAA;YACvC,OAAO;gBACH,gBAAgB;gBAChB,MAAM;gBACN,KAAK,EAAE,GAAG,MAAM,IAAI,GAAG,EAAE;gBACzB,SAAS;aACZ,CAAA;KACR;AACL,CAAC;AAzBD,wDAyBC;AAED,SAAgB,2BAA2B,CAAC,uBAA8C,EAAE,gBAAqC;;IAC7H,OAAO,MAAA,uBAAuB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QAC3C,QAAQ,IAAI,EAAE;YACV,KAAK,2BAAmB,CAAC,WAAW;gBAChC,OAAO;oBACH,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,KAAK;oBAC7B,IAAI;oBACJ,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,MAAM;oBACtC,kBAAkB,EAAE,cAAc,CAAC,IAAA,uBAAa,EAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;iBAC7D,CAAA;YAC3B,KAAK,2BAAmB,CAAC,WAAW;gBAChC,OAAO;oBACH,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,KAAK;oBAC7B,IAAI;oBACJ,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,MAAM;oBACtC,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;iBAC3C,CAAA;YAC3B,KAAK,2BAAmB,CAAC,GAAG;gBACxB,OAAO;oBACH,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,KAAK;oBAC7B,IAAI;oBACJ,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,MAAM;oBACtC,YAAY,EAAE;wBACV,GAAG,EAAE,SAAS;wBACd,GAAG,EAAE,KAAK;wBACV,CAAC,EAAE,IAAA,sBAAQ,EAAE,IAAA,wBAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,WAAW,CAAE,EAAE,WAAW,CAAE;qBACvF;iBACkB,CAAA;SAC9B;IACL,CAAC,CAAC,mCAAI,EAAE,CAAA;AACZ,CAAC;AA9BD,kEA8BC;AAED,SAAgB,gBAAgB,CAAC,mBAAyC,EAAE,gBAAqC;IAC7G,IAAI,CAAC,mBAAmB,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC;QACxD,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;IACvD,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;IAEpD,MAAM,GAAG,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;IACtC,OAAO;QACC,EAAE,EAAE,GAAG;QACP,UAAU,EAAE,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC;QACnD,kBAAkB,EAAE,mBAAmB;QACvC,cAAc,EAAE,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC;KAC9C,CAAA;AACpB,CAAC;AAbD,4CAaC;AAED,SAAgB,4BAA4B,CAAC,WAAwB;;IACjE,wDAAwD;IACxD,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,EAAE,CAAA;QAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAA;IAEtE,iCAAiC;IACjC,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,kBAAkB,CAAA;QAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,gCAAgC,EAAE,CAAA;IAEtG,sCAAsC;IACtC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,kBAAkB,CAAC;QAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,qCAAqC,EAAE,CAAA;IAE1H,6CAA6C;IAC7C,MAAM,uBAAuB,GAAG,WAAW,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;QACtE,QAAQ,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,IAAI,EAAE;YACd,KAAK,2BAAmB,CAAC,WAAW;gBAChC,IAAI,CAAC,EAAE,CAAC,kBAAkB;oBAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;gBAE7E,OAAO,uBAAuB,CAAC,WAAW,CAAC;oBACvC,EAAE,EAAE,EAAE,CAAC,EAAE;oBACT,UAAU,EAAE,EAAE,CAAC,UAAU;oBACzB,sBAAsB,EAAE,2BAAmB,CAAC,WAAW;oBACvD,oBAAoB,EAAE,EAAE,CAAC,kBAAkB;iBAC9C,CAAC,CAAA;YACN,KAAK,2BAAmB,CAAC,GAAG;gBACxB,IAAI,CAAC,EAAE,CAAC,YAAY;oBAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;gBAEjE,OAAO,uBAAuB,CAAC,WAAW,CAAC;oBACvC,EAAE,EAAE,EAAE,CAAC,EAAE;oBACT,UAAU,EAAE,EAAE,CAAC,UAAU;oBACzB,sBAAsB,EAAE,2BAAmB,CAAC,GAAG;oBAC/C,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC;iBACxD,CAAC,CAAA;YACN,KAAK,2BAAmB,CAAC,WAAW;gBAChC,IAAI,CAAC,EAAE,CAAC,eAAe;oBAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;gBAEvE,OAAO,uBAAuB,CAAC,WAAW,CAAC;oBACvC,EAAE,EAAE,EAAE,CAAC,EAAE;oBACT,UAAU,EAAE,EAAE,CAAC,UAAU;oBACzB,sBAAsB,EAAE,2BAAmB,CAAC,WAAW;oBACvD,oBAAoB,EAAE,EAAE,CAAC,eAAe;iBAC3C,CAAC,CAAA;YACN;gBACI,MAAM,IAAI,KAAK,CAAC,wCAAwC,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,IAAI,EAAE,CAAC,CAAA;SAC1E;IACL,CAAC,CAAC,CAAA;IAEF,MAAM,YAAY,GAAG,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACjD,OAAO,YAAY,CAAC,WAAW,CAAC;YAC5B,EAAE,EAAE,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,EAAE;YACT,WAAW,EAAE,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,IAAI;YACpB,eAAe,EAAY,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,eAAe;SAChD,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,eAAe,EAAE,YAAY,EAAE,CAAA;AAC9G,CAAC;AAtDD,oEAsDC;AAED,SAAS,MAAM,CAAC,OAAe;IAC3B,OAAO,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AAC7D,CAAC;AAED,SAAS,cAAc,CAAC,GAAe;IACnC,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,yBAAyB,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;IAEhF,SAAS,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACzC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAC;IAErD,OAAO,cAAK,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;AAChD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheqd/sdk",
-  "version": "1.5.0-develop.3",
+  "version": "2.0.0-develop.1",
   "description": "A TypeScript SDK built with CosmJS to interact with cheqd network ledger",
   "license": "Apache-2.0",
   "author": "Cheqd Foundation Limited (https://github.com/cheqd)",
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/cheqd/sdk#readme",
   "dependencies": {
-    "@cheqd/ts-proto": "^1.0.16-develop.3",
+    "@cheqd/ts-proto": "^2.0.0-develop.1",
     "@cosmjs/amino": "^0.29.4",
     "@cosmjs/encoding": "^0.29.4",
     "@cosmjs/math": "^0.29.4",
@@ -37,6 +37,7 @@
     "@stablelib/ed25519": "^1.0.3",
     "cosmjs-types": "^0.5.2",
     "did-jwt": "^6.9.0",
+    "did-resolver": "^4.0.1",
     "multiformats": "^9.9.0",
     "uuid": "^9.0.0"
   },

package/src/index.ts

@@ -6,12 +6,14 @@ import { createDefaultCheqdRegistry } from './registry'
 import { CheqdSigningStargateClient } from './signer'
 import { CheqdNetwork, IContext, IModuleMethodMap } from './types'
 import { createSignInputsFromImportableEd25519Key } from './utils'
+import { GasPrice } from '@cosmjs/stargate'
 
 export interface ICheqdSDKOptions {
 	modules: AbstractCheqdSDKModule[]
-	authorizedMethods?: string[]
-	network?: CheqdNetwork
 	rpcUrl: string
+	network?: CheqdNetwork
+	gasPrice?: GasPrice
+	authorizedMethods?: string[]
 	readonly wallet: OfflineSigner
 }
 
@@ -78,6 +80,7 @@ export class CheqdSDK {
 			this.options.wallet,
             {
                 registry,
+				gasPrice: this.options?.gasPrice,
             }
 		)
 

package/src/modules/did.ts

@@ -2,26 +2,41 @@ import { createProtobufRpcClient, DeliverTxResponse, QueryClient } from "@cosmjs
 /* import { QueryClientImpl } from '@cheqd/ts-proto/cheqd/did/v1/query' */
 import { CheqdExtension, AbstractCheqdSDKModule, MinimalImportableCheqdSDKModule } from "./_"
 import { CheqdSigningStargateClient } from "../signer"
-import { DidStdFee, IContext, ISignInputs, MsgCreateDidPayload, MsgDeactivateDidPayload, MsgUpdateDidPayload, VerificationMethodPayload } from "../types"
+import { DIDDocument, DidStdFee, IContext, ISignInputs, SpecValidationResult, VerificationMethods } from '../types';
 import { 
 	MsgCreateDidDoc, 
+	MsgCreateDidDocPayload, 
 	MsgCreateDidDocResponse, 
 	MsgDeactivateDidDoc, 
 	MsgDeactivateDidDocPayload, 
 	MsgDeactivateDidDocResponse, 
 	MsgUpdateDidDoc, 
+	MsgUpdateDidDocPayload, 
 	MsgUpdateDidDocResponse, 
 	protobufPackage, 
-	SignInfo
+	Service, 
+	SignInfo,
+	VerificationMethod
 } from "@cheqd/ts-proto/cheqd/did/v2"
 import { EncodeObject, GeneratedType } from "@cosmjs/proto-signing"
-
-export const typeUrlMsgCreateDidDoc = `/${protobufPackage}.MsgCreateDidDoc`
-export const typeUrlMsgCreateDidDocResponse = `/${protobufPackage}.MsgCreateDidDocResponse`
-export const typeUrlMsgUpdateDidDoc = `/${protobufPackage}.MsgUpdateDidDoc`
-export const typeUrlMsgUpdateDidDocResponse = `/${protobufPackage}.MsgUpdateDidDocResponse`
-export const typeUrlMsgDeactivateDidDoc = `/${protobufPackage}.MsgDeactivateDidDoc`
-export const typeUrlMsgDeactivateDidDocResponse = `/${protobufPackage}.MsgDeactivateDidDocResponse`
+import { v4 } from "uuid"
+import { Coin } from "cosmjs-types/cosmos/base/v1beta1/coin";
+import { Int53 } from "@cosmjs/math";
+
+export const protobufLiterals = {
+	MsgCreateDidDoc: "MsgCreateDidDoc",
+	MsgCreateDidDocResponse: "MsgCreateDidDocResponse",
+	MsgUpdateDidDoc: "MsgUpdateDidDoc",
+	MsgUpdateDidDocResponse: "MsgUpdateDidDocResponse",
+	MsgDeactivateDidDoc: "MsgDeactivateDidDoc",
+	MsgDeactivateDidDocResponse: "MsgDeactivateDidDocResponse",
+} as const
+export const typeUrlMsgCreateDidDoc = `/${protobufPackage}.${protobufLiterals.MsgCreateDidDoc}`
+export const typeUrlMsgCreateDidDocResponse = `/${protobufPackage}.${protobufLiterals.MsgCreateDidDocResponse}`
+export const typeUrlMsgUpdateDidDoc = `/${protobufPackage}.${protobufLiterals.MsgUpdateDidDoc}`
+export const typeUrlMsgUpdateDidDocResponse = `/${protobufPackage}.${protobufLiterals.MsgUpdateDidDocResponse}`
+export const typeUrlMsgDeactivateDidDoc = `/${protobufPackage}.${protobufLiterals.MsgDeactivateDidDoc}`
+export const typeUrlMsgDeactivateDidDocResponse = `/${protobufPackage}.${protobufLiterals.MsgDeactivateDidDocResponse}`
 
 export interface MsgCreateDidDocEncodeObject extends EncodeObject {
 	readonly typeUrl: typeof typeUrlMsgCreateDidDoc,
@@ -87,6 +102,14 @@ export class DIDModule extends AbstractCheqdSDKModule {
 		[typeUrlMsgDeactivateDidDocResponse, MsgDeactivateDidDocResponse],
     ]
 
+	static readonly baseMinimalDenom = 'ncheq' as const
+
+	static readonly fees = {
+		DefaultCreateDidFee: { amount: '50000000000', denom: DIDModule.baseMinimalDenom } as const,
+		DefaultUpdateDidFee: { amount: '25000000000', denom: DIDModule.baseMinimalDenom } as const,
+		DefaultDeactivateDidFee: { amount: '10000000000', denom: DIDModule.baseMinimalDenom } as const,
+	} as const
+
 	constructor(signer: CheqdSigningStargateClient) {
 		super(signer)
 		this.methods = {
@@ -100,12 +123,36 @@ export class DIDModule extends AbstractCheqdSDKModule {
         return DIDModule.registryTypes
     }
 
-	async createDidTx(signInputs: ISignInputs[] | SignInfo[], didPayload: Partial<MsgCreateDidPayload>, address: string, fee: DidStdFee | 'auto' | number, memo?: string, context?: IContext): Promise<DeliverTxResponse> {
+	async createDidTx(signInputs: ISignInputs[] | SignInfo[], didPayload: DIDDocument, address: string, fee: DidStdFee | 'auto' | number, memo?: string, versionId?: string, context?: IContext): Promise<DeliverTxResponse> {
 		if (!this._signer) {
 			this._signer = context!.sdk!.signer
 		}
 
-		const payload = MsgCreateDidPayload.transformPayload(didPayload)
+		if (!versionId || versionId === '') {
+			versionId = v4()
+		}
+
+		const { valid, error, protobufVerificationMethod, protobufService } = await DIDModule.validateSpecCompliantPayload(didPayload)
+
+		if (!valid) {
+			throw new Error(`DID payload is not spec compliant: ${error}`)
+		}
+
+		const payload = MsgCreateDidDocPayload.fromPartial({
+			context: <string[]>didPayload?.['@context'],
+			id: didPayload.id,
+			controller: <string[]>didPayload.controller,
+			verificationMethod: protobufVerificationMethod,
+			authentication: <string[]>didPayload.authentication,
+			assertionMethod: <string[]>didPayload.assertionMethod,
+			capabilityInvocation: <string[]>didPayload.capabilityInvocation,
+			capabilityDelegation: <string[]>didPayload.capabilityDelegation,
+			keyAgreement: <string[]>didPayload.keyAgreement,
+			service: protobufService,
+			alsoKnownAs: <string[]>didPayload.alsoKnownAs,
+			versionId: versionId
+		})
+
 		let signatures: SignInfo[]
 		if(ISignInputs.isSignInput(signInputs)) {
 			signatures = await this._signer.signCreateDidTx(signInputs, payload)
@@ -131,12 +178,35 @@ export class DIDModule extends AbstractCheqdSDKModule {
 		)
 	}
 
-	async updateDidTx(signInputs: ISignInputs[] | SignInfo[], didPayload: Partial<MsgUpdateDidPayload>, address: string, fee: DidStdFee | 'auto' | number, memo?: string, context?: IContext): Promise<DeliverTxResponse> {
+	async updateDidTx(signInputs: ISignInputs[] | SignInfo[], didPayload: DIDDocument, address: string, fee: DidStdFee | 'auto' | number, memo?: string, versionId?: string, context?: IContext): Promise<DeliverTxResponse> {
 		if (!this._signer) {
 			this._signer = context!.sdk!.signer
 		}
 
-		const payload = MsgCreateDidPayload.transformPayload(didPayload)
+		if (!versionId || versionId === '') {
+			versionId = v4()
+		}
+
+		const { valid, error, protobufVerificationMethod, protobufService } = await DIDModule.validateSpecCompliantPayload(didPayload)
+
+		if (!valid) {
+			throw new Error(`DID payload is not spec compliant: ${error}`)
+		}
+
+		const payload = MsgUpdateDidDocPayload.fromPartial({
+			context: <string[]>didPayload?.['@context'],
+			id: didPayload.id,
+			controller: <string[]>didPayload.controller,
+			verificationMethod: protobufVerificationMethod,
+			authentication: <string[]>didPayload.authentication,
+			assertionMethod: <string[]>didPayload.assertionMethod,
+			capabilityInvocation: <string[]>didPayload.capabilityInvocation,
+			capabilityDelegation: <string[]>didPayload.capabilityDelegation,
+			keyAgreement: <string[]>didPayload.keyAgreement,
+			service: protobufService,
+			alsoKnownAs: <string[]>didPayload.alsoKnownAs,
+			versionId: versionId
+		})
 		let signatures: SignInfo[]
 		if(ISignInputs.isSignInput(signInputs)) {
 			signatures = await this._signer.signUpdateDidTx(signInputs, payload)
@@ -162,15 +232,29 @@ export class DIDModule extends AbstractCheqdSDKModule {
 		)
 	}
 
-	async deactivateDidTx(signInputs: ISignInputs[] | SignInfo[], didPayload: MsgDeactivateDidPayload, address: string, fee: DidStdFee | 'auto' | number, memo?: string, context?: IContext): Promise<DeliverTxResponse> {
+	async deactivateDidTx(signInputs: ISignInputs[] | SignInfo[], didPayload: DIDDocument, address: string, fee: DidStdFee | 'auto' | number, memo?: string, versionId?: string, context?: IContext): Promise<DeliverTxResponse> {
 		if (!this._signer) {
 			this._signer = context!.sdk!.signer
 		}
 
-		const payload = MsgDeactivateDidDocPayload.fromPartial({id: didPayload.id, versionId: didPayload.versionId})
+		if (!versionId || versionId === '') {
+			versionId = v4()
+		}
+
+		const { valid, error, protobufVerificationMethod } = await DIDModule.validateSpecCompliantPayload(didPayload)
+
+		if (!valid) {
+			throw new Error(`DID payload is not spec compliant: ${error}`)
+		}
+
+		const payload = MsgDeactivateDidDocPayload.fromPartial({
+			id: didPayload.id,
+			versionId: versionId
+		})
+
 		let signatures: SignInfo[]
 		if(ISignInputs.isSignInput(signInputs)) {
-			signatures = await this._signer.signDeactivateDidTx(signInputs, payload, didPayload.verificationMethod.map((e)=>VerificationMethodPayload.transformPayload(e)))
+			signatures = await this._signer.signDeactivateDidTx(signInputs, payload, protobufVerificationMethod!)
 		} else {
 			signatures = signInputs
 		}
@@ -192,6 +276,95 @@ export class DIDModule extends AbstractCheqdSDKModule {
 			memo
 		)
 	}
+
+	static async validateSpecCompliantPayload(didDocument: DIDDocument): Promise<SpecValidationResult> {
+		// id is required, validated on both compile and runtime
+		if (!didDocument?.id) return { valid: false, error: 'id is required' }
+
+		// verificationMethod is required
+		if (!didDocument?.verificationMethod) return { valid: false, error: 'verificationMethod is required' }
+
+		// verificationMethod must be an array
+		if (!Array.isArray(didDocument?.verificationMethod)) return { valid: false, error: 'verificationMethod must be an array' }
+
+		// verificationMethod types must be supported
+		const protoVerificationMethod = didDocument.verificationMethod.map((vm) => {
+			switch (vm?.type) {
+				case VerificationMethods.Ed255192020:
+					if (!vm?.publicKeyMultibase) throw new Error('publicKeyMultibase is required')
+
+					return VerificationMethod.fromPartial({
+						id: vm.id,
+						controller: vm.controller,
+						verificationMethodType: VerificationMethods.Ed255192020,
+						verificationMaterial: vm.publicKeyMultibase,
+					})
+				case VerificationMethods.JWK:
+					if (!vm?.publicKeyJwk) throw new Error('publicKeyJwk is required')
+
+					return VerificationMethod.fromPartial({
+						id: vm.id,
+						controller: vm.controller,
+						verificationMethodType: VerificationMethods.JWK,
+						verificationMaterial: JSON.stringify(vm.publicKeyJwk),
+					})
+				case VerificationMethods.Ed255192018:
+					if (!vm?.publicKeyBase58) throw new Error('publicKeyBase58 is required')
+
+					return VerificationMethod.fromPartial({
+						id: vm.id,
+						controller: vm.controller,
+						verificationMethodType: VerificationMethods.Ed255192018,
+						verificationMaterial: vm.publicKeyBase58,
+					})
+				default:
+					throw new Error('Unsupported verificationMethod type')
+			}
+		})
+
+		const protoService = didDocument?.service?.map((s) => {
+			return Service.fromPartial({
+				id: s?.id,
+				serviceType: s?.type,
+				serviceEndpoint: <string[]>s?.serviceEndpoint,
+			})
+		})
+
+		return { valid: true, protobufVerificationMethod: protoVerificationMethod, protobufService: protoService } as SpecValidationResult
+	}
+
+	static async generateCreateDidDocFees(feePayer: string, granter?: string): Promise<DidStdFee> {
+		return {
+			amount: [
+				DIDModule.fees.DefaultCreateDidFee
+			],
+			gas: '360000',
+			payer: feePayer,
+			granter: granter
+		} as DidStdFee
+	}
+
+	static async generateUpdateDidDocFees(feePayer: string, granter?: string): Promise<DidStdFee> {
+		return {
+			amount: [
+				DIDModule.fees.DefaultUpdateDidFee
+			],
+			gas: '360000',
+			payer: feePayer,
+			granter: granter
+		} as DidStdFee
+	}
+
+	static async generateDeactivateDidDocFees(feePayer: string, granter?: string): Promise<DidStdFee> {
+		return {
+			amount: [
+				DIDModule.fees.DefaultDeactivateDidFee
+			],
+			gas: '360000',
+			payer: feePayer,
+			granter: granter
+		} as DidStdFee
+	}
 }
 
 export type MinimalImportableDIDModule = MinimalImportableCheqdSDKModule<DIDModule>

package/src/modules/resource.ts

@@ -6,8 +6,13 @@ import { MsgCreateResource, MsgCreateResourcePayload, MsgCreateResourceResponse,
 import { DeliverTxResponse } from "@cosmjs/stargate"
 import { SignInfo } from "@cheqd/ts-proto/cheqd/did/v2";
 
-export const typeUrlMsgCreateResource = `/${protobufPackage}.MsgCreateResource`
-export const typeUrlMsgCreateResourceResponse = `/${protobufPackage}.MsgCreateResourceResponse`
+export const protobufLiterals = {
+	MsgCreateResource: 'MsgCreateResource',
+	MsgCreateResourceResponse: 'MsgCreateResourceResponse'
+} as const
+
+export const typeUrlMsgCreateResource = `/${protobufPackage}.${protobufLiterals.MsgCreateResource}`
+export const typeUrlMsgCreateResourceResponse = `/${protobufPackage}.${protobufLiterals.MsgCreateResourceResponse}`
 
 export interface MsgCreateResourceEncodeObject extends EncodeObject {
 	readonly typeUrl: typeof typeUrlMsgCreateResource,
@@ -24,6 +29,14 @@ export class ResourceModule extends AbstractCheqdSDKModule {
 		[typeUrlMsgCreateResourceResponse, MsgCreateResourceResponse]
 	]
 
+	static readonly baseMinimalDenom = 'ncheq' as const
+
+	static readonly fees = {
+		DefaultCreateResourceImageFee: { amount: '10000000000', denom: ResourceModule.baseMinimalDenom } as const,
+		DefaultCreateResourceJsonFee: { amount: '2500000000', denom: ResourceModule.baseMinimalDenom } as const,
+		DefaultCreateResourceDefaultFee: { amount: '5000000000', denom: ResourceModule.baseMinimalDenom } as const,
+	} as const
+
 	constructor(signer: CheqdSigningStargateClient) {
 		super(signer)
 		this.methods = {
@@ -71,6 +84,39 @@ export class ResourceModule extends AbstractCheqdSDKModule {
 			memo
 		)
 	}
+
+	static async generateCreateResourceImageFees(feePayer: string, granter?: string): Promise<DidStdFee> {
+		return {
+			amount: [
+				ResourceModule.fees.DefaultCreateResourceImageFee
+			],
+			gas: '360000',
+			payer: feePayer,
+			granter: granter
+		} as DidStdFee
+	}
+
+	static async generateCreateResourceJsonFees(feePayer: string, granter?: string): Promise<DidStdFee> {
+		return {
+			amount: [
+				ResourceModule.fees.DefaultCreateResourceJsonFee
+			],
+			gas: '360000',
+			payer: feePayer,
+			granter: granter
+		} as DidStdFee
+	}
+
+	static async generateCreateResourceDefaultFees(feePayer: string, granter?: string): Promise<DidStdFee> {
+		return {
+			amount: [
+				ResourceModule.fees.DefaultCreateResourceDefaultFee
+			],
+			gas: '360000',
+			payer: feePayer,
+			granter: granter
+		} as DidStdFee
+	}
 }
 
 export type MinimalImportableResourcesModule = MinimalImportableCheqdSDKModule<ResourceModule>

package/src/signer.ts

@@ -1,10 +1,10 @@
 import { CheqdExtensions } from './modules/_'
 import { EncodeObject, isOfflineDirectSigner, OfflineSigner, encodePubkey, TxBodyEncodeObject, makeSignDoc } from "@cosmjs/proto-signing"
-import { DeliverTxResponse, GasPrice, HttpEndpoint, QueryClient, SigningStargateClient, SigningStargateClientOptions, calculateFee, SignerData } from "@cosmjs/stargate"
+import { DeliverTxResponse, GasPrice, HttpEndpoint, SigningStargateClient, SigningStargateClientOptions, calculateFee, SignerData } from "@cosmjs/stargate"
 import { Tendermint34Client } from "@cosmjs/tendermint-rpc"
 import { createDefaultCheqdRegistry } from "./registry"
 import { MsgCreateDidDocPayload, SignInfo, MsgUpdateDidDocPayload, MsgDeactivateDidDocPayload, VerificationMethod } from '@cheqd/ts-proto/cheqd/did/v2';
-import { DidStdFee, ISignInputs, TSignerAlgo, VerificationMethodPayload, VerificationMethods } from './types';
+import { DidStdFee, ISignInputs, TSignerAlgo, VerificationMethods } from './types';
 import { base64ToBytes, EdDSASigner, hexToBytes, Signer, ES256Signer, ES256KSigner } from 'did-jwt';
 import { assert, assertDefined } from '@cosmjs/utils'
 import { encodeSecp256k1Pubkey } from '@cosmjs/amino'
@@ -50,8 +50,6 @@ export function makeDidAuthInfoBytes(
 			payer: feePayer
 		}
 	}
-	//* There is a `Long` type incompatibility in the protobuf library that causes the following line to throw an error. No actual type mismatch is ever encountered.
-	// @ts-ignore
 	return AuthInfo.encode(AuthInfo.fromPartial(authInfo)).finish()
 }
 
@@ -78,11 +76,6 @@ export class CheqdSigningStargateClient extends SigningStargateClient {
 		super(tmClient, signer, options)
 		this._signer = signer
 		if (options.gasPrice) this._gasPrice = options.gasPrice
-		/** GRPC Connection */
-
-		/* if (tmClient) {
-			this.cheqdExtensions = QueryClient.withExtensions(tmClient, setupCheqdExtensions)
-		} */
 	}
 
 	async signAndBroadcast(
@@ -129,11 +122,6 @@ export class CheqdSigningStargateClient extends SigningStargateClient {
 		}
 
 		return this._signDirect(signerAddress, messages, fee, memo, signerData)
-
-		// TODO: override signAmino as well
-		/* return isOfflineDirectSigner(this._signer)
-			? this._signDirect(signerAddress, messages, fee, memo, signerData)
-			: this._signAmino(signerAddress, messages, fee, memo, signerData) */
 	}
 
 	private async _signDirect(
@@ -203,7 +191,6 @@ export class CheqdSigningStargateClient extends SigningStargateClient {
 		const signInfos: SignInfo[] = await Promise.all(signInputs.map(async (signInput) => {
 			return {
 				verificationMethodId: signInput.verificationMethodId,
-				// TODO: We can't rely on `payload.verificationMethod` here because `CreateResourceTx` doesn't have it
 				signature: base64ToBytes((await (await this.getDidSigner(signInput.verificationMethodId, payload.verificationMethod))(hexToBytes(signInput.privateKeyHex))(signBytes)) as string)
 			}
 		}))
@@ -218,7 +205,6 @@ export class CheqdSigningStargateClient extends SigningStargateClient {
 		const signInfos: SignInfo[] = await Promise.all(signInputs.map(async (signInput) => {
 			return {
 				verificationMethodId: signInput.verificationMethodId,
-				// TODO: We can't rely on `payload.verificationMethod` here because `CreateResourceTx` doesn't have it
 				signature: base64ToBytes((await (await this.getDidSigner(signInput.verificationMethodId, payload.verificationMethod))(hexToBytes(signInput.privateKeyHex))(signBytes)) as string)
 			}
 		}))
@@ -233,7 +219,6 @@ export class CheqdSigningStargateClient extends SigningStargateClient {
 		const signInfos: SignInfo[] = await Promise.all(signInputs.map(async (signInput) => {
 			return {
 				verificationMethodId: signInput.verificationMethodId,
-				// TODO: We can't rely on `payload.verificationMethod` here because `CreateResourceTx` doesn't have it
 				signature: base64ToBytes((await (await this.getDidSigner(signInput.verificationMethodId, verificationMethod))(hexToBytes(signInput.privateKeyHex))(signBytes)) as string)
 			}
 		}))