Revert "feat: add signer in did registrar and schema manager" (#14)

* Revert "feat: add signer in did registrar and schema manager (#12)"

This reverts commit 029cb6b.

Signed-off-by: Sai Ranjit Tummalapalli <sairanjit.tummalapalli@ayanworks.com>

* docs(changeset): remove the signer and keep signing key as before

Signed-off-by: Sai Ranjit Tummalapalli <sairanjit.tummalapalli@ayanworks.com>

---------

Signed-off-by: Sai Ranjit Tummalapalli <sairanjit.tummalapalli@ayanworks.com>

Author: sairanjit

.changeset/sour-falcons-kick.md

@@ -0,0 +1,6 @@
+---
+"@ayanworks/polygon-schema-manager": minor
+"@ayanworks/polygon-did-registrar": minor
+---
+
+remove the signer and keep signing key as before

packages/did-registrar/src/index.ts

@@ -1,8 +1,5 @@
-export { KMSSigner } from './kms'
 export {
   PolygonDID,
   type PolygonDidInitOptions,
   type PolygonDidRegisterOptions,
 } from './registrar'
-export type { GenericSigner } from './signer'
-export { SignerError } from './signer'

packages/did-registrar/src/kms.ts

@@ -4,24 +4,14 @@ import { getResolver } from '@ayanworks/polygon-did-resolver'
 import { Base58 } from '@ethersproject/basex'
 import { computePublicKey } from '@ethersproject/signing-key'
 import { Resolver } from 'did-resolver'
-import { Contract, computeAddress, JsonRpcProvider, Network, Wallet } from 'ethers'
+import { Contract, computeAddress, JsonRpcProvider, Network, SigningKey, Wallet } from 'ethers'
 import { v4 as uuidv4 } from 'uuid'
-import { KMSSigner } from './kms'
-import type { GenericSigner } from './signer'
 import { parseDid, validateDid, validateResourcePayload } from './utils'
 
 export type PolygonDidInitOptions = {
   contractAddress: string
   rpcUrl: string
-  /**
-   * Generic signer interface for signing operations.
-   * it supports external signers like KMS, HSM, etc.
-   */
-  signer: GenericSigner
-  /**
-   * Signer address to be used for transaction
-   */
-  address: string
+  signingKey: SigningKey
 }
 
 export type DidDocument = Record<string, unknown>
@@ -61,13 +51,13 @@ export class PolygonDID {
   private rpcUrl: string
   public resolver: Resolver
 
-  public constructor({ contractAddress, rpcUrl, signer, address }: PolygonDidInitOptions) {
+  public constructor({ contractAddress, rpcUrl, signingKey }: PolygonDidInitOptions) {
     this.resolver = new Resolver(getResolver())
     this.contractAddress = contractAddress
     this.rpcUrl = rpcUrl
     const provider = new JsonRpcProvider(rpcUrl)
-    const kmsSigner = new KMSSigner(provider, signer, address)
-    this.registry = new Contract(contractAddress, DidRegistryContract.abi, kmsSigner)
+    const wallet = new Wallet(signingKey, provider)
+    this.registry = new Contract(contractAddress, DidRegistryContract.abi, wallet)
   }
 
   static createKeyPair(network: string) {

packages/did-registrar/src/registrar.ts

@@ -29,7 +29,7 @@ export const testResourceId = 'b5db4a5f-2f97-4449-a755-9af0b43119ae' // Add your
 export const testDidDetails = {
   address: '0x4487cB2567De2Ca6dc5F79A7f6ae944522C4b698',
   did: 'did:polygon:testnet:0x4487cB2567De2Ca6dc5F79A7f6ae944522C4b698',
-  privateKey: '0x6320c5bcc5edfb1f3324b94a67c0e69916d828d6374ddb1dfeae92c27e3098de', //test key
+  privateKey: '6320c5bcc5edfb1f3324b94a67c0e69916d828d6374ddb1dfeae92c27e3098de', //test key
   publicKeyBase58: '7Lnm1Zi2K75KVgHPrHADCpfa9cLAtRRocBgLsFVLw5NRPUgoLBBv1Se8ttjx4P7fXfNS5gazJmKqohNmwEqx8VjDYfPvw',
 }
 

packages/did-registrar/src/signer.ts

@@ -1,7 +1,6 @@
-import { computeAddress, SigningKey } from 'ethers'
+import { SigningKey } from 'ethers'
 import { assert, beforeAll, describe, it } from 'vitest'
 import { PolygonDID } from '../src/registrar'
-import type { GenericSigner } from '../src/signer'
 import { testContractDetails, testDidDetails } from './fixtures/test.data'
 import { buildTestDidDoc } from './utils/array'
 
@@ -35,25 +34,10 @@ describe('Polygon-did-registrar', () => {
       polygonDID = keyPair.did
     }
 
-    // Create GenericSigner from private key
-    const signingKey = new SigningKey(keyPair.privateKey)
-    const address = computeAddress(signingKey.publicKey)
-
-    const signer: GenericSigner = {
-      async sign(data: Uint8Array): Promise<string> {
-        // Use the sign method from SigningKey
-        const signature = signingKey.sign(data)
-        // Convert signature components to hex string (0x + r + s + v)
-        const v = signature.v < 27 ? signature.v + 27 : signature.v
-        return signature.r + signature.s.slice(2) + v.toString(16).padStart(2, '0')
-      },
-    }
-
     polygonDidRegistrar = new PolygonDID({
       contractAddress: CONTRACT_ADDRESS,
       rpcUrl: NETWORK_URL,
-      signer,
-      address,
+      signingKey: new SigningKey(`0x${keyPair.privateKey}`),
     })
   })
 

packages/did-registrar/tests/fixtures/test.data.ts

@@ -1,7 +1,6 @@
-import { computeAddress, SigningKey } from 'ethers'
+import { SigningKey } from 'ethers'
 import { assert, beforeAll, describe, it } from 'vitest'
 import { PolygonDID } from '../src/registrar'
-import type { GenericSigner } from '../src/signer'
 import { resourceJson, testContractDetails, testDidDetails, updateDidDocument } from './fixtures/test.data'
 import { arrayHasKeys, buildTestDidDoc } from './utils/array'
 
@@ -35,25 +34,10 @@ describe('Registrar', () => {
       polygonDID = keyPair.did
     }
 
-    // Create GenericSigner from private key
-    const signingKey = new SigningKey(keyPair.privateKey)
-    const address = computeAddress(signingKey.publicKey)
-
-    const signer: GenericSigner = {
-      async sign(data: Uint8Array): Promise<string> {
-        // Use the sign method from SigningKey
-        const signature = signingKey.sign(data)
-        // Convert signature components to hex string (0x + r + s + v)
-        const v = signature.v < 27 ? signature.v + 27 : signature.v
-        return signature.r + signature.s.slice(2) + v.toString(16).padStart(2, '0')
-      },
-    }
-
     polygonDidRegistrar = new PolygonDID({
       contractAddress: CONTRACT_ADDRESS,
       rpcUrl: NETWORK_URL,
-      signer,
-      address,
+      signingKey: new SigningKey(`0x${keyPair.privateKey}`),
     })
     await new Promise((r) => setTimeout(r, 5000))
   })

packages/did-registrar/tests/index.test.ts

@@ -1,4 +1 @@
-export { KMSSigner } from './kms'
 export * from './schema-manager'
-export type { GenericSigner } from './signer'
-export { SignerError } from './signer'