@cheqd/sdk 1.4.0 → 1.5.0-develop.2

package/tests/testutils.test.ts

@@ -1,13 +1,11 @@
-import { MsgCreateDidPayload } from "@cheqd/ts-proto/cheqd/v1/tx"
-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 { 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 { VerificationMethod } from "@cheqd/ts-proto/cheqd/v1/did"
-import { parseToKeyValuePair } from '../src/utils'
+import { createHash } from 'crypto'
 
 export const faucet = {
     prefix: 'cheqd',
@@ -18,10 +16,13 @@ export const faucet = {
 
 export const exampleCheqdNetwork = {
     network: 'testnet',
-    rpcUrl: 'https://rpc.cheqd.network',
-    gasPrice: GasPrice.fromString( `25${faucet.minimalDenom}` )
+    rpcUrl: 'http://localhost:26657',
+    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.
@@ -68,7 +69,7 @@ export function createVerificationKeys(keyPair: IKeyPair, algo: MethodSpecificId
     switch (algo) {
         case MethodSpecificIdAlgo.Base58:
             methodSpecificId = bases['base58btc'].encode(base64ToBytes(keyPair.publicKey))
-            didUrl = `did:cheqd:${network}:${methodSpecificId.substring(0, length)}`
+            didUrl = `did:cheqd:${network}:${(bases['base58btc'].encode((fromString(sha256(keyPair.publicKey))).slice(0,16))).slice(1)}`
             return {
                 methodSpecificId,
                 didUrl,
@@ -92,31 +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,
+                    controller: verificationKeys[_].didUrl,
+                    publicKeyMultibase: _encodeMbKey(MULTICODEC_ED25519_PUB_HEADER, base64ToBytes(verificationKeys[_].publicKey))
+                }
+            
+            case VerificationMethods.Ed255192018:
                 return {
                     id: verificationKeys[_].keyId,
-                    type: type,
+                    type,
                     controller: verificationKeys[_].didUrl,
-                    publicKeyMultibase: verificationKeys[_].methodSpecificId,
-                    publicKeyJwk: []
+                    publicKeyBase58: verificationKeys[_].methodSpecificId.slice(1)
                 }
 
             case VerificationMethods.JWK:
                 return {
                     id: verificationKeys[_].keyId,
-                    type: type,
+                    type,
                     controller: verificationKeys[_].didUrl,
-                    publicKeyJwk: parseToKeyValuePair(
-                        {
-                            crv: 'Ed25519',
-                            kty: 'OKP',
-                            x: toString( fromString( verificationKeys[_].publicKey, 'base64pad' ), 'base64url' )
-                        }
-                    ),
-                    publicKeyMultibase: ''
+                    publicKeyJWK: {
+                        crv: 'Ed25519',
+                        kty: 'OKP',
+                        x: toString( fromString( verificationKeys[_].publicKey, 'base64pad' ), 'base64url' )
+                    }
                 }
         }
     }) ?? []
@@ -127,19 +132,32 @@ 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[]): MsgCreateDidPayload {
+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 MsgCreateDidPayload.fromPartial(
         {
             id: did,
             controller: verificationKeys.map(key => key.didUrl),
             verificationMethod: verificationMethods,
-            authentication: verificationKeys.map(key => key.keyId)
+            authentication: verificationKeys.map(key => key.keyId),
+            versionId: v4()
         }
     )
-}
+}
+
+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 })