fix: Bugfix creating eth transactions

Sphereon-Opensource · Apr 12, 2024 · 1d2e04d · 1d2e04d
1 parent 3c1ef0d
commit 1d2e04d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/packages/did-provider-ebsi/__tests__/EbsiDidProvider.test.ts b/packages/did-provider-ebsi/__tests__/EbsiDidProvider.test.ts
@@ -12,6 +12,14 @@ const ebsiDidProvider = new EbsiDidProvider({
   defaultKms: 'mem',
 })
 
+jest.mock('../src/services/EbsiRPCService', () => ({
+  ...jest.requireActual('../src/services/EbsiRPCService'),
+  insertDidDocument: jest.fn().mockResolvedValue({ result: { r: '', s: '', v: '' } }),
+  addVerificationMethod: jest.fn().mockResolvedValue({ result: { r: '', s: '', v: '' } }),
+  addVerificationMethodRelationship: jest.fn().mockResolvedValue({ result: { r: '', s: '', v: '' } }),
+  sendSignedTransaction: jest.fn().mockResolvedValue({ result: { r: '', s: '', v: '' } }),
+}))
+
 const agent = createAgent<IKeyManager & IDIDManager>({
   plugins: [
     new SphereonKeyManager({

diff --git a/packages/did-provider-ebsi/src/EbsiDidProvider.ts b/packages/did-provider-ebsi/src/EbsiDidProvider.ts
@@ -100,12 +100,12 @@ export class EbsiDidProvider extends AbstractIdentifierProvider {
       id: args.id,
     })
 
-    await this.sendTransaction({ docTransactionResponse: insertDidDocTransaction, kid: args.secp256r1ManagedKeyInfo.kid, id: args.id }, context)
+    await this.sendTransaction({ docTransactionResponse: insertDidDocTransaction, kid: args.secp256k1ManagedKeyInfo.kid, id: args.id }, context)
 
     const addVerificationMethodTransaction = await addVerificationMethod({
       params: [
         {
-          from: args.from, // required
+          from: args.from,
           did: args.identifier.did,
           isSecp256k1: true,
           vMethoddId: await calculateJwkThumbprint(toJwk(args.secp256k1ManagedKeyInfo.publicKeyHex, 'Secp256k1')),
@@ -116,7 +116,7 @@ export class EbsiDidProvider extends AbstractIdentifierProvider {
     })
 
     await this.sendTransaction(
-      { docTransactionResponse: addVerificationMethodTransaction, kid: args.secp256r1ManagedKeyInfo.kid, id: args.id },
+      { docTransactionResponse: addVerificationMethodTransaction, kid: args.secp256k1ManagedKeyInfo.kid, id: args.id },
       context
     )
 
@@ -135,7 +135,7 @@ export class EbsiDidProvider extends AbstractIdentifierProvider {
     })
 
     await this.sendTransaction(
-      { docTransactionResponse: addVerificationMethodRelationshipTransaction, kid: args.secp256r1ManagedKeyInfo.kid, id: args.id },
+      { docTransactionResponse: addVerificationMethodRelationshipTransaction, kid: args.secp256k1ManagedKeyInfo.kid, id: args.id },
       context
     )
   }

diff --git a/packages/did-provider-ebsi/src/functions.ts b/packages/did-provider-ebsi/src/functions.ts
@@ -49,7 +49,7 @@ export function generateEbsiPrivateKeyHex(specInfo?: EbsiDidSpecInfo, privateKey
  */
 export const formatEbsiPublicKey = (args: { key: IKey; type: EbsiKeyType }): string => {
   const { key, type } = args
-  let bytes = getBytes(key.publicKeyHex, 'key')
+  let bytes = getBytes('0x' + key.publicKeyHex, 'key')
   switch (type) {
     case 'Secp256k1': {
       return SigningKey.computePublicKey(bytes, false)