Merge pull request #18 from ArslanKibria98/develop

Dynamic threshold and improvements
ferrumnet · Dec 25, 2023 · d69955e · d69955e
2 parents 08ee03a + 2cf0b81
commit d69955e
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 143 deletions.
diff --git a/src/controllers/index.ts b/src/controllers/index.ts
@@ -1,3 +0,0 @@
-export * as userController from "./user.controller";
-export * as securityKeyController from "./securityKey.controller";
-export * as jobController from "./job.controller";

diff --git a/src/controllers/job.controller.ts b/src/controllers/job.controller.ts
diff --git a/src/controllers/securityKey.controller.ts b/src/controllers/securityKey.controller.ts
diff --git a/src/controllers/user.controller.ts b/src/controllers/user.controller.ts
diff --git a/src/interfaces/job.interface.ts b/src/interfaces/job.interface.ts
@@ -1,4 +1,4 @@
-import { Transaction, TransactionReceipt } from '../interfaces';
+import { Transaction, TransactionReceipt } from "../interfaces";
 
 export interface JobRequestBody {
   name: string;
@@ -8,6 +8,7 @@ export interface JobRequestBody {
   isDestinationNonEVM: boolean;
   bridgeAmount: string;
   txId: string;
+  threshold: number;
 }
 
 export interface UpdateJobRequestBody {

diff --git a/src/middlewares/auth.middleware.ts b/src/middlewares/auth.middleware.ts
@@ -35,8 +35,10 @@ function validateAuth(token: string, req: any): boolean {
 function authSecurityKeyApis(token: string): boolean {
   if (
     token &&
-    decrypt(token, (global as any).AWS_ENVIRONMENT.API_KEY) ==
-      (global as any).AWS_ENVIRONMENT.API_KEY
+    decrypt(
+      token,
+      (global as any).AWS_ENVIRONMENT.SECURITY_ROUTER_AUTHORIZATION_KEY
+    ) == (global as any).AWS_ENVIRONMENT.SECURITY_ROUTER_AUTHORIZATION_KEY
   ) {
     return true;
   }

diff --git a/src/routes/index.ts b/src/routes/index.ts
@@ -1,28 +1 @@
-import { Router } from "express";
-import userRoute from "./user.route";
-import securityKeyRoute from "./securityKey.route";
-import jobRoute from "./job.route";
 
-const router = Router();
-
-const defaultRoutes = [
-  {
-    path: "/user",
-    route: userRoute,
-  },
-
-  {
-    path: "/securityKey",
-    route: securityKeyRoute,
-  },
-  {
-    path: "/jobs",
-    route: jobRoute,
-  },
-];
-
-defaultRoutes.forEach((route) => {
-  router.use(route.path, route.route);
-});
-
-export default router;
diff --git a/src/routes/job.route.ts b/src/routes/job.route.ts
diff --git a/src/routes/securityKey.route.ts b/src/routes/securityKey.route.ts
diff --git a/src/routes/user.route.ts b/src/routes/user.route.ts
diff --git a/src/services/cosmWasm.service.ts b/src/services/cosmWasm.service.ts
@@ -65,10 +65,7 @@ export const signedTransaction = async (
 
     return {
       ...txData,
-      signatures: [
-        { signature: payBySig.signatures, hash: payBySig.hash },
-        { signature: payBySig.signatures, hash: payBySig.hash },
-      ],
+      signatures: [{ signature: payBySig.signatures, hash: payBySig.hash }],
       hash: payBySig.hash,
       address: process.env.PUBLIC_KEY,
     };

diff --git a/src/services/index.ts b/src/services/index.ts
@@ -1,6 +1,3 @@
-export * as userService from "./user.service";
-export * as securityKeyService from "./securityKey.service";
 export * as web3Service from "./web3.service";
 export * as cosmWasmService from "./cosmWasm.service";
 export * as axiosService from "./axios.service";
-export * as jobService from "./job.service";
diff --git a/src/services/job.service.ts b/src/services/job.service.ts
diff --git a/src/services/securityKey.service.ts b/src/services/securityKey.service.ts
diff --git a/src/services/user.service.ts b/src/services/user.service.ts
diff --git a/src/services/web3.service.ts b/src/services/web3.service.ts
@@ -6,8 +6,8 @@ import {
   VERSION,
   NETWORKS,
   CUDOS_CHAIN_ID,
-  THRESHOLD,
   getPrivateKey,
+  delay,
 } from "../constants/constants";
 import {
   ecsign,
@@ -24,17 +24,19 @@ import { add } from "winston";
 export const getTransactionReceipt = async (
   txId: string,
   rpcURL: string,
+  threshold: number,
   tries = 0
 ): Promise<TransactionReceipt> => {
   const web3 = new Web3(rpcURL);
   const transaction: TransactionReceipt = await web3.eth.getTransactionReceipt(
     txId
   );
   console.log("transaction", transaction?.status, txId, tries);
-  if (tries < THRESHOLD) {
+  if (tries < threshold) {
     tries += 1;
     if (!transaction || transaction === null || transaction.status === null) {
-      await getTransactionReceipt(txId, rpcURL, tries);
+      await delay();
+      await getTransactionReceipt(txId, rpcURL, threshold, tries);
     }
   }
   return transaction;
@@ -61,7 +63,9 @@ export const signedTransaction = async (
       from: transaction.from,
       token: decodedData.sourceToken,
       amount: decodedData.sourceAmount,
-      contractAddress: getFundManagerAddress(decodedData.targetChainId),
+      fundManagerContractAddress: getFundManagerAddress(
+        decodedData.targetChainId
+      ),
       fiberRouterAddress: getFiberRouterAddress(decodedData.targetChainId),
       chainId: decodedData.sourceChainId,
       targetChainId: decodedData.targetChainId,
@@ -78,32 +82,20 @@ export const signedTransaction = async (
     txData.salt = Web3.utils.keccak256(
       txData.transactionHash.toLocaleLowerCase()
     );
-    const payBySig0 = createSignedPayment(
+    const payBySig = createSignedPayment(
       txData.targetChainId,
       txData.targetAddress,
       destinationAmountToMachine,
       txData.targetToken,
-      txData.contractAddress,
+      txData.fundManagerContractAddress,
       txData.salt,
       web3
     );
 
-    const payBySig1 = createSignedPayment(
-      txData.targetChainId,
-      txData.fiberRouterAddress,
-      destinationAmountToMachine,
-      txData.targetToken,
-      txData.contractAddress,
-      txData.salt,
-      web3
-    );
     return {
       ...txData,
-      signatures: [
-        { signature: payBySig0.signatures, hash: payBySig0.hash },
-        { signature: payBySig1.signatures, hash: payBySig1.hash },
-      ],
-      hash: payBySig0.hash,
+      signatures: [{ signature: payBySig.signatures, hash: payBySig.hash }],
+      hash: payBySig.hash,
       address: process.env.PUBLIC_KEY,
     };
   } catch (error) {

diff --git a/src/utils/crons/transactionsJob.ts b/src/utils/crons/transactionsJob.ts
@@ -7,6 +7,7 @@ import {
   cosmWasmService,
 } from "./../../services/index";
 import { JobRequestBody } from "./../../interfaces/index";
+import { getThreshold } from "../../constants/constants";
 let isProccessRunning = false;
 let localTransactionHashes: any = [];
 
@@ -65,6 +66,7 @@ async function workerForFetchChainDataFromNetwork(tx: any) {
       isDestinationNonEVM: destinationNetwork.isNonEVM,
       bridgeAmount: tx.bridgeAmount,
       txId: tx.receiveTransactionId,
+      threshold: sourceNetwork.threshold,
     };
 
     let job: any = { data: data, transaction: tx };
@@ -81,7 +83,8 @@ async function workerForFetchChainDataFromNetwork(tx: any) {
       console.log("source is EVM");
       job.returnvalue = await web3Service.getTransactionReceipt(
         job.data.txId,
-        job.data.sourceRpcURL
+        job.data.sourceRpcURL,
+        getThreshold(job.data.threshold)
       );
     }