diff --git a/src/certificates/certificate-manager/CertificateManager.spec.ts b/src/certificates/certificate-manager/CertificateManager.spec.ts index fb76bbe..715576b 100644 --- a/src/certificates/certificate-manager/CertificateManager.spec.ts +++ b/src/certificates/certificate-manager/CertificateManager.spec.ts @@ -17,10 +17,10 @@ describe("CertificateManager", () => { now.setMilliseconds(0); const inOneYear = getTime1yearFrom(now); const pem = certificateManager.generatePEM(address); - const meta = certificateManager.parsePem(pem.certKey); + const meta = certificateManager.parsePem(pem.cert); expect(pem).toMatchObject({ - certKey: expect.stringMatching(/^-----BEGIN CERTIFICATE-----[\s\S]*-----END CERTIFICATE-----\r\n$/), + cert: expect.stringMatching(/^-----BEGIN CERTIFICATE-----[\s\S]*-----END CERTIFICATE-----\r\n$/), publicKey: expect.stringMatching(/^-----BEGIN EC PUBLIC KEY-----[\s\S]*-----END EC PUBLIC KEY-----\r\n$/), privateKey: expect.stringMatching(/^-----BEGIN PRIVATE KEY-----[\s\S]*-----END PRIVATE KEY-----\r\n$/) }); @@ -40,10 +40,10 @@ describe("CertificateManager", () => { validFrom: inOneMonth, validTo: inTwoMonths }); - const meta = certificateManager.parsePem(pem.certKey); + const meta = certificateManager.parsePem(pem.cert); expect(pem).toMatchObject({ - certKey: expect.stringMatching(/^-----BEGIN CERTIFICATE-----[\s\S]*-----END CERTIFICATE-----\r\n$/), + cert: expect.stringMatching(/^-----BEGIN CERTIFICATE-----[\s\S]*-----END CERTIFICATE-----\r\n$/), publicKey: expect.stringMatching(/^-----BEGIN EC PUBLIC KEY-----[\s\S]*-----END EC PUBLIC KEY-----\r\n$/), privateKey: expect.stringMatching(/^-----BEGIN PRIVATE KEY-----[\s\S]*-----END PRIVATE KEY-----\r\n$/) }); @@ -56,7 +56,7 @@ describe("CertificateManager", () => { describe("prototype.parsePem", () => { it("should extract certificate data", () => { - const cert = certificateManager.parsePem(certificateManager.generatePEM(address).certKey); + const cert = certificateManager.parsePem(certificateManager.generatePEM(address).cert); expect(cert).toMatchObject({ hSerial: expect.any(String), diff --git a/src/certificates/certificate-manager/CertificateManager.ts b/src/certificates/certificate-manager/CertificateManager.ts index 0f76ab6..89b9db1 100644 --- a/src/certificates/certificate-manager/CertificateManager.ts +++ b/src/certificates/certificate-manager/CertificateManager.ts @@ -3,7 +3,7 @@ import rs from "jsrsasign"; export interface CertificatePem { - certKey: string; + cert: string; publicKey: string; privateKey: string; } @@ -67,10 +67,10 @@ export class CertificateManager { cakey: prvKeyObj }); const publicKey: string = rs.KEYUTIL.getPEM(pubKeyObj, "PKCS8PUB").replaceAll("PUBLIC KEY", "EC PUBLIC KEY"); - const certKey: string = cert.getPEM(); + const certPEM: string = cert.getPEM(); return { - certKey, + cert: certPEM, publicKey, privateKey: rs.KEYUTIL.getPEM(prvKeyObj, "PKCS8PRV") }; diff --git a/src/certificates/index.ts b/src/certificates/index.ts index 4a4959e..9c659ba 100644 --- a/src/certificates/index.ts +++ b/src/certificates/index.ts @@ -17,20 +17,20 @@ const jrpc = JsonRPC.connect_xhr("https://bridge.testnet.akash.network/akashnetw export type { pems }; export async function broadcastCertificate( - pem: Pick, + pem: Pick, owner: string, client: SigningStargateClient ): Promise; export async function broadcastCertificate(pem: pems, owner: string, client: SigningStargateClient): Promise; export async function broadcastCertificate( - pem: Pick | pems, + pem: Pick | pems, owner: string, client: SigningStargateClient ): Promise { if ("csr" in pem) { - console.warn("The `csr` field is deprecated. Use `certKey` instead."); + console.warn("The `csr` field is deprecated. Use `cert` instead."); } - const certKey = "certKey" in pem ? pem.certKey : pem.csr; + const certKey = "cert" in pem ? pem.cert : pem.csr; const encodedCsr = base64ToUInt(toBase64(certKey)); const encdodedPublicKey = base64ToUInt(toBase64(pem.publicKey)); const message = createStarGateMessage(stargateMessages.MsgCreateCertificate, { @@ -46,13 +46,11 @@ export async function createCertificate(bech32Address: string) { const pem = certificateManager.generatePEM(bech32Address); return { + ...pem, get csr() { - console.warn("The `csr` field is deprecated. Use `certKey` instead."); - return pem.certKey; - }, - certKey: pem.certKey, - publicKey: pem.publicKey, - privateKey: pem.privateKey + console.warn("The `csr` field is deprecated. Use `cert` instead."); + return pem.cert; + } }; }