chore: convert buffer into uint8array

Signed-off-by: Berend Sliedrecht <berend@animo.id>
openwallet-foundation · Feb 3, 2025 · 3a5b77f · 3a5b77f
1 parent 6ed8a71
commit 3a5b77f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/packages/askar/src/wallet/AskarBaseWallet.ts b/packages/askar/src/wallet/AskarBaseWallet.ts
@@ -182,7 +182,7 @@ export abstract class AskarBaseWallet implements Wallet {
           // This will be fixed once we use the new 'using' syntax
           key = _key
 
-          const keyPublicBytes = key.publicBytes
+          const keyPublicBytes = expandIfPossible(key.publicBytes, keyType)
 
           // Store key
           await this.withSession((session) =>
@@ -352,7 +352,7 @@ export abstract class AskarBaseWallet implements Wallet {
       if (!isError(error)) {
         throw new CredoError('Attempted to throw error, but it was not of type Error', { cause: error })
       }
-      throw new WalletError(`Error signing data with verkey ${key.publicKeyBase58}. ${error.message}`, { cause: error })
+      throw new WalletError(`Error signing data with key associated with ${key.publicKeyBase58}. ${error.message}`, { cause: error })
     } finally {
       askarKey?.handle.free()
     }

diff --git a/packages/core/src/crypto/Key.ts b/packages/core/src/crypto/Key.ts
@@ -24,7 +24,7 @@ export class Key {
   }
 
   public static fromPublicKeyBase58(publicKey: string, keyType: KeyType) {
-    const publicKeyBytes = TypedArrayEncoder.fromBase58(publicKey)
+    const publicKeyBytes = Uint8Array.from(TypedArrayEncoder.fromBase58(publicKey))
 
     return Key.fromPublicKey(publicKeyBytes, keyType)
   }
@@ -70,7 +70,7 @@ export class Key {
 
   // We return an object structure based on the key, so that when this object is
   // serialized to JSON it will be nicely formatted instead of the bytes printed
-  public toJSON() {
+  private toJSON() {
     return {
       keyType: this.keyType,
       publicKeyBase58: this.publicKeyBase58,

diff --git a/packages/core/src/crypto/jose/jwk/__tests__/Ed25519Jwk.test.ts b/packages/core/src/crypto/jose/jwk/__tests__/Ed25519Jwk.test.ts
@@ -15,7 +15,7 @@ describe('Ed25519JWk', () => {
     expect(jwk.kty).toEqual('OKP')
     expect(jwk.crv).toEqual('Ed25519')
     expect(jwk.keyType).toEqual(KeyType.Ed25519)
-    expect(jwk.publicKey).toEqual(TypedArrayEncoder.fromBase64(jwkJson.x))
+    expect(jwk.publicKey).toEqual(Uint8Array.from(TypedArrayEncoder.fromBase64(jwkJson.x)))
     expect(jwk.supportedEncryptionAlgorithms).toEqual([])
     expect(jwk.supportedSignatureAlgorithms).toEqual(['EdDSA'])
     expect(jwk.key.keyType).toEqual(KeyType.Ed25519)
@@ -26,7 +26,7 @@ describe('Ed25519JWk', () => {
     const jwk = Ed25519Jwk.fromJson(jwkJson)
     expect(jwk.x).toEqual(jwkJson.x)
 
-    expect(() => Ed25519Jwk.fromJson({ ...jwkJson, kty: 'test' })).toThrowError("Invalid 'Ed25519' JWK.")
+    expect(() => Ed25519Jwk.fromJson({ ...jwkJson, kty: 'test' })).toThrow("Invalid 'Ed25519' JWK.")
   })
 
   test('fromPublicKey', () => {

diff --git a/packages/core/src/crypto/jose/jwk/__tests__/X25519Jwk.test.ts b/packages/core/src/crypto/jose/jwk/__tests__/X25519Jwk.test.ts
@@ -15,7 +15,7 @@ describe('X25519JWk', () => {
     expect(jwk.kty).toEqual('OKP')
     expect(jwk.crv).toEqual('X25519')
     expect(jwk.keyType).toEqual(KeyType.X25519)
-    expect(jwk.publicKey).toEqual(TypedArrayEncoder.fromBase64(jwkJson.x))
+    expect(jwk.publicKey).toEqual(Uint8Array.from(TypedArrayEncoder.fromBase64(jwkJson.x)))
     expect(jwk.supportedEncryptionAlgorithms).toEqual(['ECDH-ES+A128KW', 'ECDH-ES+A192KW', 'ECDH-ES+A256KW', 'ECDH-ES'])
     expect(jwk.supportedSignatureAlgorithms).toEqual([])
     expect(jwk.key.keyType).toEqual(KeyType.X25519)
@@ -26,7 +26,7 @@ describe('X25519JWk', () => {
     const jwk = X25519Jwk.fromJson(jwkJson)
     expect(jwk.x).toEqual(jwkJson.x)
 
-    expect(() => X25519Jwk.fromJson({ ...jwkJson, kty: 'test' })).toThrowError("Invalid 'X25519' JWK.")
+    expect(() => X25519Jwk.fromJson({ ...jwkJson, kty: 'test' })).toThrow("Invalid 'X25519' JWK.")
   })
 
   test('fromPublicKey', () => {

diff --git a/packages/core/src/wallet/Wallet.ts b/packages/core/src/wallet/Wallet.ts
@@ -97,8 +97,8 @@ export interface Wallet extends Disposable {
 
 export interface WalletCreateKeyOptions {
   keyType: KeyType
-  seed?: Uint8Array
-  privateKey?: Uint8Array
+  seed?: Buffer
+  privateKey?: Buffer
   keyBackend?: KeyBackend
   keyId?: string
 }

diff --git a/packages/didcomm/src/modules/routing/services/__tests__/MediationRecipientService.test.ts b/packages/didcomm/src/modules/routing/services/__tests__/MediationRecipientService.test.ts
@@ -223,7 +223,7 @@ describe('MediationRecipientService', () => {
 
       expect(extendedRouting).toMatchObject({
         endpoints: ['https://a-mediator-endpoint.com'],
-        routingKeys: [routingKey],
+        routingKeys: routing.routingKeys,
       })
       expect(mediationRepository.findSingleByQuery).toHaveBeenCalledWith(agentContext, { default: true })
     })