@cheqd/sdk 1.5.0-develop.1 → 1.5.0-develop.2

package/src/utils.ts

@@ -1,8 +1,3 @@
-import {
-    MsgCreateDidDocPayload,
-    MsgUpdateDidDocPayload,
-    VerificationMethod 
-} from "@cheqd/ts-proto/cheqd/did/v2"
 import { 
     IKeyPair, 
     IKeyValuePair, 
@@ -13,7 +8,10 @@ import {
     TVerificationKey, 
     TVerificationKeyPrefix, 
     CheqdNetwork, 
-    IVerificationKeys 
+    IVerificationKeys, 
+    MsgCreateDidPayload,
+    VerificationMethodPayload,
+    MsgUpdateDidPayload
 } from "./types"
 import { fromString, toString } from 'uint8arrays'
 import { bases } from "multiformats/basics"
@@ -32,22 +30,31 @@ export type TImportableEd25519Key = {
 // multicodec ed25519-pub header as varint
 const MULTICODEC_ED25519_PUB_HEADER = new Uint8Array([0xed, 0x01]);
 
-export type IdentifierPayload = Partial<MsgCreateDidDocPayload> | Partial<MsgUpdateDidDocPayload>
+export type IdentifierPayload = Partial<MsgCreateDidPayload> | Partial<MsgUpdateDidPayload>
 
 export function isEqualKeyValuePair(kv1: IKeyValuePair[], kv2: IKeyValuePair[]): boolean {
     return kv1.every((item, index) => item.key === kv2[index].key && item.value === kv2[index].value)
 }
 
-export function createSignInputsFromImportableEd25519Key(key: TImportableEd25519Key, verificationMethod: VerificationMethod[]): ISignInputs {
+export function createSignInputsFromImportableEd25519Key(key: TImportableEd25519Key, verificationMethod: VerificationMethodPayload[]): ISignInputs {
     if (verificationMethod?.length === 0) throw new Error('No verification methods provided')
 
     const publicKey = fromString(key.publicKeyHex, 'hex')
 
     for(const method of verificationMethod) {
         switch (method?.type) {
-            case VerificationMethods.Base58:
-                const publicKeyMultibase = bases['base58btc'].encode(publicKey)
-                if ((JSON.parse(method.verificationMaterial)).publicKeyMultibase === publicKeyMultibase) {
+            case VerificationMethods.Ed255192020:
+                const publicKeyMultibase = _encodeMbKey(MULTICODEC_ED25519_PUB_HEADER, publicKey)
+                if (method.publicKeyMultibase === publicKeyMultibase) {
+                    return {
+                        verificationMethodId: method.id,
+                        privateKeyHex: key.privateKeyHex
+                    }
+                }
+            
+            case VerificationMethods.Ed255192018:
+                const publicKeyBase58 = bases['base58btc'].encode(publicKey).slice(1)
+                if (method.publicKeyBase58 === publicKeyBase58) {
                     return {
                         verificationMethodId: method.id,
                         privateKeyHex: key.privateKeyHex
@@ -55,16 +62,18 @@ export function createSignInputsFromImportableEd25519Key(key: TImportableEd25519
                 }
 
             case VerificationMethods.JWK:
-                const publicKeyJWK = {
+                const publicKeyJWK: any = {
                     crv: 'Ed25519',
                     kty: 'OKP',
                     x: toString( publicKey, 'base64url' )
                 }
-                if ((JSON.parse(method.verificationMaterial)).publicKeyJwk, 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}`)
                 }
         }
     }
@@ -92,71 +101,77 @@ export function createKeyPairHex(seed?: string): IKeyPair {
     }
 }
 
-export function createVerificationKeys(keyPair: IKeyPair, algo: MethodSpecificIdAlgo, key: TVerificationKey<TVerificationKeyPrefix, number>, length: number = 32, network: CheqdNetwork = CheqdNetwork.Testnet): IVerificationKeys {
+export function createVerificationKeys(publicKey: string, algo: MethodSpecificIdAlgo, key: TVerificationKey<TVerificationKeyPrefix, number>, network: CheqdNetwork = CheqdNetwork.Testnet): IVerificationKeys {
     let methodSpecificId: TMethodSpecificId
     let didUrl: IVerificationKeys['didUrl']
+    
+    publicKey = isBase64(publicKey) ? publicKey : toString(fromString(publicKey, 'hex'), 'base64')
     switch (algo) {
         case MethodSpecificIdAlgo.Base58:
-            methodSpecificId = bases['base58btc'].encode(base64ToBytes(keyPair.publicKey))
-            didUrl = `did:cheqd:${network}:${(bases['base58btc'].encode((fromString(sha256(keyPair.publicKey))).slice(0,16))).slice(1)}`
+            methodSpecificId = bases['base58btc'].encode(base64ToBytes(publicKey))
+            didUrl = `did:cheqd:${network}:${(bases['base58btc'].encode((fromString(sha256(publicKey))).slice(0,16))).slice(1)}`
             return {
                 methodSpecificId,
                 didUrl,
                 keyId: `${didUrl}#${key}`,
-                publicKey: keyPair.publicKey,
+                publicKey,
             }
         case MethodSpecificIdAlgo.Uuid:
-            methodSpecificId = bases['base58btc'].encode(base64ToBytes(keyPair.publicKey))
+            methodSpecificId = bases['base58btc'].encode(base64ToBytes(publicKey))
             didUrl = `did:cheqd:${network}:${v4()}`
             return {
                 methodSpecificId,
                 didUrl,
                 keyId: `${didUrl}#${key}`,
-                publicKey: keyPair.publicKey,
+                publicKey,
             }
     }
 }
 
-export function createDidVerificationMethod(verificationMethodTypes: VerificationMethods[], verificationKeys: IVerificationKeys[]): VerificationMethod[] {
+const isBase64 = (value: string) => /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{4})$/.test(value);
+
+export function createDidVerificationMethod(verificationMethodTypes: VerificationMethods[], verificationKeys: IVerificationKeys[]): VerificationMethodPayload[] {
     return verificationMethodTypes.map((type, _) => {
         switch (type) {
-            case VerificationMethods.Base58:
+            case VerificationMethods.Ed255192020:
                 return {
                     id: verificationKeys[_].keyId,
-                    type: type,
+                    type,
                     controller: verificationKeys[_].didUrl,
-                    verificationMaterial: JSON.stringify({
-                        publicKeyMultibase: verificationKeys[_].methodSpecificId,
-                        publicKeyJwk: []
-                    })
+                    publicKeyMultibase: _encodeMbKey(MULTICODEC_ED25519_PUB_HEADER, base64ToBytes(verificationKeys[_].publicKey))
+                }
+            
+            case VerificationMethods.Ed255192018:
+                return {
+                    id: verificationKeys[_].keyId,
+                    type,
+                    controller: verificationKeys[_].didUrl,
+                    publicKeyBase58: verificationKeys[_].methodSpecificId.slice(1)
                 }
 
             case VerificationMethods.JWK:
                 return {
                     id: verificationKeys[_].keyId,
-                    type: type,
+                    type,
                     controller: verificationKeys[_].didUrl,
-                    verificationMaterial: JSON.stringify({
-                        publicKeyJwk: {
-                            crv: 'Ed25519',
-                            kty: 'OKP',
-                            x: toString( fromString( verificationKeys[_].publicKey, 'base64pad' ), 'base64url' )
-                        },
-                        publicKeyMultibase: ''
-                    })
+                    publicKeyJWK: {
+                        crv: 'Ed25519',
+                        kty: 'OKP',
+                        x: toString( fromString( verificationKeys[_].publicKey, 'base64pad' ), 'base64url' )
+                    }
                 }
         }
     }) ?? []
 }
 
-export function createDidPayload(verificationMethods: VerificationMethod[], verificationKeys: IVerificationKeys[]): MsgCreateDidDocPayload {
+export function createDidPayload(verificationMethods: VerificationMethodPayload[], verificationKeys: IVerificationKeys[]): MsgCreateDidPayload {
     if (!verificationMethods || verificationMethods.length === 0)
         throw new Error('No verification methods provided')
     if (!verificationKeys || verificationKeys.length === 0)
         throw new Error('No verification keys provided')
 
     const did = verificationKeys[0].didUrl
-    return MsgCreateDidDocPayload.fromPartial(
+    return MsgCreateDidPayload.fromPartial(
         {
             id: did,
             controller: verificationKeys.map(key => key.didUrl),
@@ -167,56 +182,17 @@ export function createDidPayload(verificationMethods: VerificationMethod[], veri
     )
 }
 
-export function createDidPayloadWithSignInputs(seed?: string, keys?: IKeyPair[]) {
-    if(seed && keys) throw new Error ('Only one of seed or keys should be passed as an argument')
-    
-    if(!keys) {
-        keys = [seed ? createKeyPairBase64(seed) : createKeyPairBase64()]
-    }
-
-    const verificationMethodTypes = keys.map((key) => !key.algo || key.algo == MethodSpecificIdAlgo.Base58 ? VerificationMethods.Base58 : VerificationMethods.JWK)
-    const verificationKeys = keys.map((key, i) => createVerificationKeys(key, key.algo || MethodSpecificIdAlgo.Base58, `key-${i}`))
-    const verificationMethod = createDidVerificationMethod(verificationMethodTypes, verificationKeys)
-    
-    let payload : Partial<MsgCreateDidDocPayload> = {
-        id: verificationKeys[0].didUrl,
-        controller: verificationKeys.map(key => key.didUrl),
-        verificationMethod: verificationMethod,
-        authentication: verificationKeys.map(key => key.keyId),
-    }
-
-    const keyHexs = keys.map((key)=>convertKeyPairtoTImportableEd25519Key(key))
-    const signInputs = keyHexs.map((key)=>createSignInputsFromImportableEd25519Key(key, verificationMethod))
-
-    return { didPayload: MsgCreateDidDocPayload.fromPartial(payload), keys, signInputs }
-}
-
-export function convertKeyPairtoTImportableEd25519Key(keyPair: IKeyPair) : TImportableEd25519Key {
-    return {
-        type: 'Ed25519',
-        privateKeyHex: toString(fromString(keyPair.privateKey, 'base64'), 'hex'),
-        kid: 'kid',
-        publicKeyHex: toString(fromString(keyPair.publicKey, 'base64'), 'hex')
-    }
-}
-
-export function createSignInputsFromKeyPair(didDocument: IdentifierPayload, keys: IKeyPair[]) {
-    const keyHexs = keys.map((key)=>convertKeyPairtoTImportableEd25519Key(key))
-    const signInputs = keyHexs.map((key)=>createSignInputsFromImportableEd25519Key(key, didDocument.verificationMethod!))
-    return signInputs
-}
-
 function sha256(message: string) {
     return createHash('sha256').update(message).digest('hex')
 }
 
 // encode a multibase base58-btc multicodec key
-// function _encodeMbKey(header: any, key: any) {
-//     const mbKey = new Uint8Array(header.length + key.length);
+function _encodeMbKey(header: any, key: Uint8Array) {
+    const mbKey = new Uint8Array(header.length + key.length);
   
-//     mbKey.set(header);
-//     mbKey.set(key, header.length);
+    mbKey.set(header);
+    mbKey.set(key, header.length);
   
-//     return bases['base58btc'].encode(mbKey);
-//   }
+    return bases['base58btc'].encode(mbKey);
+}
   

package/tests/modules/did.test.ts

@@ -6,7 +6,7 @@ import { v4 } from "uuid"
 import { DIDModule } from "../../src"
 import { createDefaultCheqdRegistry } from "../../src/registry"
 import { CheqdSigningStargateClient } from "../../src/signer"
-import { DidStdFee, ISignInputs, MethodSpecificIdAlgo, VerificationMethods } from "../../src/types"
+import { DidStdFee, ISignInputs, MethodSpecificIdAlgo, MsgCreateDidPayload, MsgDeactivateDidPayload, VerificationMethods } from "../../src/types"
 import { createDidPayload, createDidVerificationMethod, createKeyPairBase64, createVerificationKeys, exampleCheqdNetwork, faucet } from "../testutils.test"
 
 const defaultAsyncTxTimeout = 30000
@@ -29,7 +29,7 @@ describe('DIDModule', () => {
             const didModule = new DIDModule(signer)
             const keyPair = createKeyPairBase64()
             const verificationKeys = createVerificationKeys(keyPair, MethodSpecificIdAlgo.Base58, 'key-1', 16)
-            const verificationMethods = createDidVerificationMethod([VerificationMethods.Base58], [verificationKeys])
+            const verificationMethods = createDidVerificationMethod([VerificationMethods.JWK], [verificationKeys])
             const didPayload = createDidPayload(verificationMethods, [verificationKeys])
 
             const signInputs: ISignInputs[] = [
@@ -42,7 +42,7 @@ describe('DIDModule', () => {
                 amount: [
                     {
                         denom: 'ncheq',
-                        amount: '5000000000'
+                        amount: '5000000'
                     }
                 ],
                 gas: '200000',
@@ -68,7 +68,7 @@ describe('DIDModule', () => {
             const didModule = new DIDModule(signer)
             const keyPair = createKeyPairBase64()
             const verificationKeys = createVerificationKeys(keyPair, MethodSpecificIdAlgo.Uuid, 'key-1', 16)
-            const verificationMethods = createDidVerificationMethod([VerificationMethods.Base58], [verificationKeys])
+            const verificationMethods = createDidVerificationMethod([VerificationMethods.Ed255192020], [verificationKeys])
             const didPayload = createDidPayload(verificationMethods, [verificationKeys])
             didPayload.versionId = v4()
             const signInputs: ISignInputs[] = [
@@ -81,7 +81,7 @@ describe('DIDModule', () => {
                 amount: [
                     {
                         denom: 'ncheq',
-                        amount: '5000000000'
+                        amount: '5000000'
                     }
                 ],
                 gas: '200000',
@@ -110,7 +110,7 @@ describe('DIDModule', () => {
             
             const keyPair = createKeyPairBase64()
             const verificationKeys = createVerificationKeys(keyPair, MethodSpecificIdAlgo.Base58, 'key-1', 16)
-            const verificationMethods = createDidVerificationMethod([VerificationMethods.Base58], [verificationKeys])
+            const verificationMethods = createDidVerificationMethod([VerificationMethods.Ed255192020], [verificationKeys])
             const didPayload = createDidPayload(verificationMethods, [verificationKeys])
             const signInputs: ISignInputs[] = [
                 {
@@ -122,7 +122,7 @@ describe('DIDModule', () => {
                 amount: [
                     {
                         denom: 'ncheq',
-                        amount: '5000000000'
+                        amount: '5000000'
                     }
                 ],
                 gas: '200000',
@@ -141,7 +141,7 @@ describe('DIDModule', () => {
             expect(didTx.code).toBe(0)
 
             // Update the DID
-            const updateDidPayload = MsgUpdateDidDocPayload.fromPartial({
+            const updateDidPayload = MsgCreateDidPayload.fromPartial({
                 context: didPayload.context,
                 id: didPayload.id,
                 controller: didPayload.controller,
@@ -162,4 +162,62 @@ describe('DIDModule', () => {
             expect(updateDidTx.code).toBe(0)
         }, defaultAsyncTxTimeout)
     })
+
+    describe('deactivateDidTx', () => {
+        it('should deactivate a DID', async () => {
+            const wallet = await DirectSecp256k1HdWallet.fromMnemonic(faucet.mnemonic, {prefix: faucet.prefix})
+            const registry = createDefaultCheqdRegistry(DIDModule.registryTypes)
+            const signer = await CheqdSigningStargateClient.connectWithSigner(exampleCheqdNetwork.rpcUrl, wallet, { registry })
+            const didModule = new DIDModule(signer)
+            
+            const keyPair = createKeyPairBase64()
+            const verificationKeys = createVerificationKeys(keyPair, MethodSpecificIdAlgo.Base58, 'key-1', 16)
+            const verificationMethods = createDidVerificationMethod([VerificationMethods.Ed255192020], [verificationKeys])
+            const didPayload = createDidPayload(verificationMethods, [verificationKeys])
+            const signInputs: ISignInputs[] = [
+                {
+                    verificationMethodId: didPayload.verificationMethod[0].id,
+                    privateKeyHex: toString(fromString(keyPair.privateKey, 'base64'), 'hex')
+                }
+            ]
+            const fee: DidStdFee = {
+                amount: [
+                    {
+                        denom: 'ncheq',
+                        amount: '5000000'
+                    }
+                ],
+                gas: '200000',
+                payer: (await wallet.getAccounts())[0].address
+            } 
+            const didTx: DeliverTxResponse = await didModule.createDidTx(
+                signInputs,
+                didPayload,
+                (await wallet.getAccounts())[0].address,
+                fee
+            )
+
+            console.warn(`Using payload: ${JSON.stringify(didPayload)}`)
+            console.warn(`DID Tx: ${JSON.stringify(didTx)}`)
+
+            expect(didTx.code).toBe(0)
+
+            // Update the DID
+            const deactivateDidPayload: MsgDeactivateDidPayload = {
+                id: didPayload.id,
+                verificationMethod: didPayload.verificationMethod,
+                versionId: v4()
+            }
+
+            const deactivateDidTx: DeliverTxResponse = await didModule.deactivateDidTx(
+                signInputs,
+                deactivateDidPayload,
+                (await wallet.getAccounts())[0].address,
+                fee
+            )
+
+            console.warn(deactivateDidTx)
+            expect(deactivateDidTx.code).toBe(0)
+        }, defaultAsyncTxTimeout)
+    })
 })

package/tests/modules/resource.test.ts

@@ -34,7 +34,7 @@ describe('ResourceModule', () => {
 
             const keyPair = createKeyPairBase64()
             const verificationKeys = createVerificationKeys(keyPair, MethodSpecificIdAlgo.Base58, 'key-1', 16)
-            const verificationMethods = createDidVerificationMethod([VerificationMethods.Base58], [verificationKeys])
+            const verificationMethods = createDidVerificationMethod([VerificationMethods.Ed255192020], [verificationKeys])
             const didPayload = createDidPayload(verificationMethods, [verificationKeys])
 
             const signInputs: ISignInputs[] = [

package/tests/signer.test.ts

@@ -3,7 +3,7 @@ import { DirectSecp256k1HdWallet, Registry } from "@cosmjs/proto-signing"
 import { EdDSASigner } from "did-jwt"
 import { typeUrlMsgCreateDidDoc } from '../src/modules/did'
 import { CheqdSigningStargateClient } from "../src/signer"
-import { ISignInputs, MethodSpecificIdAlgo, VerificationMethods } from "../src/types"
+import { ISignInputs, MethodSpecificIdAlgo, MsgCreateDidPayload, VerificationMethods } from "../src/types"
 import { fromString, toString } from 'uint8arrays'
 import { createDidPayload, createDidVerificationMethod, createKeyPairBase64, createVerificationKeys, exampleCheqdNetwork, faucet } from "./testutils.test"
 import { verify } from "@stablelib/ed25519"
@@ -53,8 +53,8 @@ describe('CheqdSigningStargateClient', () => {
             const signer = await CheqdSigningStargateClient.connectWithSigner(exampleCheqdNetwork.rpcUrl, wallet)
             const keyPair = createKeyPairBase64()
             const verificationKeys = createVerificationKeys(keyPair, MethodSpecificIdAlgo.Base58, 'key-1', 16)
-            const verificationMethods = createDidVerificationMethod([VerificationMethods.Base58], [verificationKeys])
-            const didPayload = createDidPayload(verificationMethods, [verificationKeys])
+            const verificationMethods = createDidVerificationMethod([VerificationMethods.Ed255192020], [verificationKeys])
+            const didPayload = MsgCreateDidPayload.transformPayload(createDidPayload(verificationMethods, [verificationKeys]))
             const didSigner = await signer.getDidSigner(didPayload.verificationMethod[0].id, didPayload.verificationMethod)
 
             expect(didSigner).toBe(EdDSASigner)
@@ -72,7 +72,7 @@ describe('CheqdSigningStargateClient', () => {
             const signer = await CheqdSigningStargateClient.connectWithSigner(exampleCheqdNetwork.rpcUrl, wallet)
             const keyPair = createKeyPairBase64()
             const verificationKeys = createVerificationKeys(keyPair, MethodSpecificIdAlgo.Base58, 'key-1', 16)
-            const verificationMethods = createDidVerificationMethod([VerificationMethods.Base58], [verificationKeys])
+            const verificationMethods = createDidVerificationMethod([VerificationMethods.Ed255192020], [verificationKeys])
             const didPayload = createDidPayload(verificationMethods, [verificationKeys])
             await expect(signer.getDidSigner(nonExistingKeyId, didPayload.verificationMethod)).rejects.toThrow()
         })
@@ -84,12 +84,12 @@ describe('CheqdSigningStargateClient', () => {
             const signer = await CheqdSigningStargateClient.connectWithSigner(exampleCheqdNetwork.rpcUrl, wallet)
             const keyPair = createKeyPairBase64()
             const verificationKeys = createVerificationKeys(keyPair, MethodSpecificIdAlgo.Base58, 'key-1', 16)
-            const verificationMethods = createDidVerificationMethod([VerificationMethods.Base58], [verificationKeys])
-            const didPayload = createDidPayload(verificationMethods, [verificationKeys])
+            const verificationMethods = createDidVerificationMethod([VerificationMethods.Ed255192020], [verificationKeys])
+            const didPayload = MsgCreateDidPayload.transformPayload(createDidPayload(verificationMethods, [verificationKeys]))
 
             const didSigners = await signer.checkDidSigners(didPayload.verificationMethod)
 
-            expect(didSigners[VerificationMethods.Base58]).toBe(EdDSASigner)
+            expect(didSigners[VerificationMethods.Ed255192020]).toBe(EdDSASigner)
         })
 
         it('should instantiate multiple signers for a did with multiple verification methods', async () => {
@@ -97,15 +97,18 @@ describe('CheqdSigningStargateClient', () => {
             const signer = await CheqdSigningStargateClient.connectWithSigner(exampleCheqdNetwork.rpcUrl, wallet)
             const keyPair1 = createKeyPairBase64()
             const keyPair2 = createKeyPairBase64()
+            const keyPair3 = createKeyPairBase64()
             const verificationKeys1 = createVerificationKeys(keyPair1, MethodSpecificIdAlgo.Base58, 'key-1', 16)
             const verificationKeys2 = createVerificationKeys(keyPair2, MethodSpecificIdAlgo.Base58, 'key-2', 16)
-            const verificationMethods = createDidVerificationMethod([VerificationMethods.Base58, VerificationMethods.JWK], [verificationKeys1, verificationKeys2])
-            const didPayload = createDidPayload(verificationMethods, [verificationKeys1, verificationKeys2])
+            const verificationKeys3 = createVerificationKeys(keyPair3, MethodSpecificIdAlgo.Base58, 'key-3', 16)
+            const verificationMethods = createDidVerificationMethod([VerificationMethods.Ed255192020, VerificationMethods.JWK, VerificationMethods.Ed255192018], [verificationKeys1, verificationKeys2, verificationKeys3])
+            const didPayload = MsgCreateDidPayload.transformPayload(createDidPayload(verificationMethods, [verificationKeys1, verificationKeys2, verificationKeys3]))
 
             const didSigners = await signer.checkDidSigners(didPayload.verificationMethod)
 
-            expect(didSigners[VerificationMethods.Base58]).toBe(EdDSASigner)
+            expect(didSigners[VerificationMethods.Ed255192020]).toBe(EdDSASigner)
             expect(didSigners[VerificationMethods.JWK]).toBe(EdDSASigner)
+            expect(didSigners[VerificationMethods.Ed255192018]).toBe(EdDSASigner)
         })
 
         it('should throw for non-supported verification method', async () => {
@@ -113,7 +116,7 @@ describe('CheqdSigningStargateClient', () => {
             const signer = await CheqdSigningStargateClient.connectWithSigner(exampleCheqdNetwork.rpcUrl, wallet)
             const verificationMethod: Partial<VerificationMethod> = {
                 id: nonExistingKeyId,
-                type: nonExistingVerificationMethod,
+                verificationMethodType: nonExistingVerificationMethod,
                 controller: nonExistingDid,
                 verificationMaterial: JSON.stringify({publicKeyMultibase: nonExistingPublicKeyMultibase})
             }
@@ -128,8 +131,8 @@ describe('CheqdSigningStargateClient', () => {
             const signer = await CheqdSigningStargateClient.connectWithSigner(exampleCheqdNetwork.rpcUrl, wallet)
             const keyPair = createKeyPairBase64()
             const verificationKeys = createVerificationKeys(keyPair, MethodSpecificIdAlgo.Base58, 'key-1', 16)
-            const verificationMethods = createDidVerificationMethod([VerificationMethods.Base58], [verificationKeys])
-            const didPayload = createDidPayload(verificationMethods, [verificationKeys])
+            const verificationMethods = createDidVerificationMethod([VerificationMethods.Ed255192020], [verificationKeys])
+            const didPayload = MsgCreateDidPayload.transformPayload(MsgCreateDidPayload.fromPartial(createDidPayload(verificationMethods, [verificationKeys])))
             const signInputs: ISignInputs[] = [
                 {
                     verificationMethodId: didPayload.verificationMethod[0].id,

package/tests/testutils.test.ts

@@ -1,13 +1,11 @@
-import { MsgCreateDidDocPayload, VerificationMethod } from "@cheqd/ts-proto/cheqd/did/v2"
-import { CheqdNetwork, IKeyPair, IVerificationKeys, MethodSpecificIdAlgo, TMethodSpecificId, TVerificationKey, TVerificationKeyPrefix, VerificationMethods } from "../src/types"
+import { CheqdNetwork, IKeyPair, IVerificationKeys, MethodSpecificIdAlgo, MsgCreateDidPayload, TMethodSpecificId, TVerificationKey, TVerificationKeyPrefix, VerificationMethodPayload, VerificationMethods } from "../src/types"
 import { bases } from 'multiformats/basics'
-import { base58ToBytes, base64ToBytes } from "did-jwt"
+import { base64ToBytes } from "did-jwt"
 import { fromString, toString } from 'uint8arrays'
 import { generateKeyPair, KeyPair } from '@stablelib/ed25519'
 import { GasPrice } from "@cosmjs/stargate"
 import { v4 } from 'uuid'
 import { createHash } from 'crypto'
-import { convertKeyPairtoTImportableEd25519Key } from "../src/utils"
 
 export const faucet = {
     prefix: 'cheqd',
@@ -22,6 +20,9 @@ export const exampleCheqdNetwork = {
     gasPrice: GasPrice.fromString( `50${faucet.minimalDenom}` )
 }
 
+// multicodec ed25519-pub header as varint
+const MULTICODEC_ED25519_PUB_HEADER = new Uint8Array([0xed, 0x01]);
+
 /**
  *? General test utils. Look for src/utils.ts for stable utils exports.
  *? Used for testing purposes.
@@ -92,33 +93,35 @@ export function createVerificationKeys(keyPair: IKeyPair, algo: MethodSpecificId
  *? Used for testing purposes.
  ** NOTE: The following utils are stable but subject to change at any given moment.
  */
-export function createDidVerificationMethod(verificationMethodTypes: VerificationMethods[], verificationKeys: IVerificationKeys[]): VerificationMethod[] {
+ export function createDidVerificationMethod(verificationMethodTypes: VerificationMethods[], verificationKeys: IVerificationKeys[]): VerificationMethodPayload[] {
     return verificationMethodTypes.map((type, _) => {
         switch (type) {
-            case VerificationMethods.Base58:
+            case VerificationMethods.Ed255192020:
                 return {
                     id: verificationKeys[_].keyId,
-                    type: type,
+                    type,
                     controller: verificationKeys[_].didUrl,
-                    verificationMaterial: JSON.stringify({
-                        publicKeyMultibase: verificationKeys[_].methodSpecificId,
-                        publicKeyJwk: []
-                    })
+                    publicKeyMultibase: _encodeMbKey(MULTICODEC_ED25519_PUB_HEADER, base64ToBytes(verificationKeys[_].publicKey))
+                }
+            
+            case VerificationMethods.Ed255192018:
+                return {
+                    id: verificationKeys[_].keyId,
+                    type,
+                    controller: verificationKeys[_].didUrl,
+                    publicKeyBase58: verificationKeys[_].methodSpecificId.slice(1)
                 }
 
             case VerificationMethods.JWK:
                 return {
                     id: verificationKeys[_].keyId,
-                    type: type,
+                    type,
                     controller: verificationKeys[_].didUrl,
-                    verificationMaterial: JSON.stringify({
-                        publicKeyJwk: {
-                            crv: 'Ed25519',
-                            kty: 'OKP',
-                            x: toString( fromString( verificationKeys[_].publicKey, 'base64pad' ), 'base64url' )
-                        },
-                        publicKeyMultibase: ''
-                    })
+                    publicKeyJWK: {
+                        crv: 'Ed25519',
+                        kty: 'OKP',
+                        x: toString( fromString( verificationKeys[_].publicKey, 'base64pad' ), 'base64url' )
+                    }
                 }
         }
     }) ?? []
@@ -129,13 +132,13 @@ export function createDidVerificationMethod(verificationMethodTypes: Verificatio
  *? Used for testing purposes.
  ** NOTE: The following utils are stable but subject to change at any given moment.
  */
-export function createDidPayload(verificationMethods: VerificationMethod[], verificationKeys: IVerificationKeys[]): MsgCreateDidDocPayload {
+export function createDidPayload(verificationMethods: VerificationMethodPayload[], verificationKeys: IVerificationKeys[]): MsgCreateDidPayload {
     if (!verificationMethods || verificationMethods.length === 0)
         throw new Error('No verification methods provided')
     if (!verificationKeys || verificationKeys.length === 0)
         throw new Error('No verification keys provided')
     const did = verificationKeys[0].didUrl
-    return MsgCreateDidDocPayload.fromPartial(
+    return MsgCreateDidPayload.fromPartial(
         {
             id: did,
             controller: verificationKeys.map(key => key.didUrl),
@@ -149,3 +152,12 @@ export function createDidPayload(verificationMethods: VerificationMethod[], veri
 function sha256(message: string) {
     return createHash('sha256').update(message).digest('hex')
   }
+
+  function _encodeMbKey(header: any, key: Uint8Array) {
+    const mbKey = new Uint8Array(header.length + key.length);
+  
+    mbKey.set(header);
+    mbKey.set(key, header.length);
+  
+    return bases['base58btc'].encode(mbKey);
+  }

package/tests/utils.test.ts

@@ -4,7 +4,7 @@ import { toString } from 'uint8arrays'
 import { IKeyPair, MethodSpecificIdAlgo, VerificationMethods } from '../src/types'
 
 describe('createSignInputsFromImportableEd25519Key', () => {
-    it('should create a sign input from an importable ed25519 key', async () => {
+    it('should create a sign input from an importable ed25519 key 2020', async () => {
         const keyPair = createKeyPairRaw()
         const importableEd25519Key: TImportableEd25519Key = {
             publicKeyHex: toString(keyPair.publicKey, 'hex'),
@@ -18,7 +18,27 @@ describe('createSignInputsFromImportableEd25519Key', () => {
         }
 
         const verificationKeys = createVerificationKeys(keyPairBase64, MethodSpecificIdAlgo.Base58, 'key-1', 16)
-        const verificationMethod = createDidVerificationMethod([VerificationMethods.Base58], [verificationKeys])
+        const verificationMethod = createDidVerificationMethod([VerificationMethods.Ed255192020], [verificationKeys])
+        const signInput = createSignInputsFromImportableEd25519Key(importableEd25519Key, verificationMethod)
+
+        expect(signInput).toEqual({ verificationMethodId: verificationKeys.keyId, privateKeyHex: importableEd25519Key.privateKeyHex })
+    })
+
+    it('should create a sign input from an importable ed25519 key 2018', async () => {
+        const keyPair = createKeyPairRaw()
+        const importableEd25519Key: TImportableEd25519Key = {
+            publicKeyHex: toString(keyPair.publicKey, 'hex'),
+            privateKeyHex: toString(keyPair.secretKey, 'hex'),
+            kid: toString(keyPair.publicKey, 'hex'),
+            type: 'Ed25519'
+        }
+        const keyPairBase64: IKeyPair = {
+            publicKey: toString(keyPair.publicKey, 'base64'),
+            privateKey: toString(keyPair.secretKey, 'base64'),
+        }
+
+        const verificationKeys = createVerificationKeys(keyPairBase64, MethodSpecificIdAlgo.Base58, 'key-1', 16)
+        const verificationMethod = createDidVerificationMethod([VerificationMethods.Ed255192018], [verificationKeys])
         const signInput = createSignInputsFromImportableEd25519Key(importableEd25519Key, verificationMethod)
 
         expect(signInput).toEqual({ verificationMethodId: verificationKeys.keyId, privateKeyHex: importableEd25519Key.privateKeyHex })