refactor: make privateKeyEncrypted nullable

ubiquity · Oct 16, 2023 · 9c58746 · 9c58746
1 parent 0a26b93
commit 9c58746
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/bindings/config.ts b/src/bindings/config.ts
@@ -60,7 +60,7 @@ export const loadConfig = async (context: Context): Promise<BotConfig> => {
     payout: {
       networkId: networkId,
       rpc: rpc,
-      privateKeyEncrypted: privateKeyEncrypted || "",
+      privateKeyEncrypted: privateKeyEncrypted || null,
       paymentToken: paymentToken,
       permitBaseUrl: process.env.PERMIT_BASE_URL || permitBaseUrl,
     },
@@ -113,7 +113,7 @@ export const loadConfig = async (context: Context): Promise<BotConfig> => {
     newContributorGreeting: newContributorGreeting,
   };
 
-  if (botConfig.payout.privateKeyEncrypted == "") {
+  if (!botConfig.payout.privateKeyEncrypted) {
     botConfig.mode.paymentPermitMaxPrice = 0;
   }
 

diff --git a/src/handlers/payout/action.ts b/src/handlers/payout/action.ts
@@ -27,7 +27,7 @@ export interface IncentivesCalculationResult {
   paymentToken: string;
   rpc: string;
   networkId: number;
-  privateKeyEncrypted: string;
+  privateKeyEncrypted: string | null;
   paymentPermitMaxPrice: number;
   baseMultiplier: number;
   incentives: Incentives;
@@ -147,7 +147,7 @@ export const incentivesCalculation = async (): Promise<IncentivesCalculationResu
     throw new Error("No incentive mode. skipping to process");
   }
 
-  if (privateKeyEncrypted == "") {
+  if (!privateKeyEncrypted) {
     logger.info("Permit generation disabled because wallet private key is not set.");
     throw new Error("Permit generation disabled because wallet private key is not set.");
   }

diff --git a/src/types/config.ts b/src/types/config.ts
@@ -76,7 +76,7 @@ export type LogNotification = Static<typeof LogNotificationSchema>;
 export const PayoutConfigSchema = Type.Object({
   networkId: Type.Number(),
   rpc: Type.String(),
-  privateKeyEncrypted: Type.String(),
+  privateKeyEncrypted: Type.Union([Type.Null(), Type.String()]),
   paymentToken: Type.String(),
   permitBaseUrl: Type.String(),
 });

diff --git a/src/utils/private.ts b/src/utils/private.ts
@@ -64,8 +64,10 @@ export const getOrgAndRepoFromPath = (path: string) => {
   return { org, repo };
 };
 
-export const getPrivateKey = async (cipherText: string): Promise<string> => {
+export const getPrivateKey = async (cipherText: string | null): Promise<string> => {
   try {
+    if (!cipherText) throw new Error("Cipher text is empty");
+
     await _sodium.ready;
     const sodium = _sodium;