validate link in arthera network (#426)

SaTT-Wallet · Feb 22, 2024 · c88a317 · c88a317
2 parents dd0ea21 + 4a64fd0
commit c88a317
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 13 deletions.
diff --git a/controllers/campaign.controller.js b/controllers/campaign.controller.js
@@ -1366,7 +1366,10 @@ exports.validateCampaign = async (req, res) => {
                 tronWeb.setAddress(walletAddr)
             } else {
                 req.body.network = campaign.token.type
-                cred = await unlockV2(req, res)
+                cred =
+                    req.body.network === 'ARTHERA'
+                        ? await unlockArthera(req, res)
+                        : await unlockV2(req, res)
                 if (
                     typeof campaignLink.userExternal !== 'undefined' &&
                     campaignLink.userExternal === true
@@ -1385,9 +1388,13 @@ exports.validateCampaign = async (req, res) => {
                     }
                 } else {
                     const recoveredSigner =
-                        await cred.WEB3.eth.accounts.recover(
-                            campaignLink.applyerSignature
-                        )
+                        req.body.network === 'ARTHERA'
+                            ? await cred.Web3ARTHERA.eth.accounts.recover(
+                                  campaignLink.applyerSignature
+                              )
+                            : await cred.WEB3.eth.accounts.recover(
+                                  campaignLink.applyerSignature
+                              )
                     if (
                         recoveredSigner.toLowerCase() !== campaignLink.id_wallet
                     ) {
@@ -1423,7 +1430,8 @@ exports.validateCampaign = async (req, res) => {
                     signature.r,
                     signature.s,
                     cred,
-                    tronWeb
+                    tronWeb,
+                    req.body.network
                 )
             }
 
@@ -1553,6 +1561,7 @@ exports.validateCampaign = async (req, res) => {
             return responseHandler.makeResponseError(res, 401, 'unothorized')
         }
     } catch (err) {
+        console.log({ err })
         return responseHandler.makeResponseError(
             res,
             500,

diff --git a/web3/campaigns.js b/web3/campaigns.js
@@ -1433,7 +1433,8 @@ exports.validateProm = async (
     r,
     s,
     credentials,
-    tronWeb
+    tronWeb,
+    network
 ) => {
     if (!!tronWeb) {
         let ctr = await tronWeb.contract(
@@ -1455,13 +1456,17 @@ exports.validateProm = async (
         } else return result
     }
     var gas = 1000000
-    // let ctr = await getPromContract(idProm, credentials)
-
-    let ctr = await getContractByNetwork(credentials)
-
-    // let ctr = await getPromContract(idProm, credentials)
-
-    var gasPrice = await ctr.getGasPrice()
+    let ctr
+    if (network === 'ARTHERA') {
+        ctr = new credentials.Web3ARTHERA.eth.Contract(
+            CampaignConstants[ArtheraNetworkConstant].abi,
+            CampaignConstants[ArtheraNetworkConstant].address
+        )
+    } else ctr = await getContractByNetwork(credentials)
+    var gasPrice =
+        network === 'ARTHERA'
+            ? await credentials.Web3ARTHERA.eth.getGasPrice()
+            : await contract.getGasPrice()
 
     var receipt = await ctr.methods
         .validateProm(