From c74e84b873607adbac111b4aa95b50b4195c87a5 Mon Sep 17 00:00:00 2001 From: hichri-louay Date: Mon, 22 Apr 2024 10:55:29 +0100 Subject: [PATCH 1/3] add gas limit for arthera network --- web3/campaigns.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/web3/campaigns.js b/web3/campaigns.js index 28bebcd1..d68b94b2 100644 --- a/web3/campaigns.js +++ b/web3/campaigns.js @@ -512,7 +512,10 @@ exports.createPerformanceCampaign = async ( : await contract.getGasPrice() /** GET GAS LIMIT FROM .env */ - const gas = process.env.GAS_LIMIT + const gas = + network === 'ARTHERA' + ? process.env.GAS_LIMIT_ARTHERA + : process.env.GAS_LIMIT /** CALL METHOD CREATE PRICE FUND ALL FROM CONTRACT*/ const transactionReceipt = await contract.methods @@ -637,7 +640,10 @@ exports.createBountiesCampaign = async ( ? await credentials.Web3ARTHERA.eth.getGasPrice() : await ctr.getGasPrice() /** GET GAS LIMIT FROM .env */ - var gas = process.env.GAS_LIMIT + var gas = + network === 'ARTHERA' + ? process.env.GAS_LIMIT_ARTHERA + : process.env.GAS_LIMIT try { var receipt = await ctr.methods From bc87feec81a209a38e556a6af717dcff610b6b3b Mon Sep 17 00:00:00 2001 From: hichri-louay Date: Mon, 22 Apr 2024 10:56:28 +0100 Subject: [PATCH 2/3] add arthera network in validation ( Joi ) --- middleware/walletValidator.middleware.js | 1 + 1 file changed, 1 insertion(+) diff --git a/middleware/walletValidator.middleware.js b/middleware/walletValidator.middleware.js index bd747c11..93149bba 100644 --- a/middleware/walletValidator.middleware.js +++ b/middleware/walletValidator.middleware.js @@ -84,6 +84,7 @@ const schemas = { 'polygon', 'tron', 'bttc', + 'arthera', ]), }), From f48cd7833e206706d62ffb52a37d3288b777fc73 Mon Sep 17 00:00:00 2001 From: hichri-louay Date: Mon, 22 Apr 2024 11:20:31 +0100 Subject: [PATCH 3/3] wip correction for arthera unlock network --- web3/campaigns.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/web3/campaigns.js b/web3/campaigns.js index d68b94b2..5207234d 100644 --- a/web3/campaigns.js +++ b/web3/campaigns.js @@ -101,17 +101,16 @@ exports.unlockArthera = async (req, res) => { [account.walletV2?.keystore], pass ) + return { address: '0x' + account.walletV2?.keystore.address, Web3ARTHERA, } } catch (err) { - if (!!res && res.length > 0) { - res.status(500).send({ - code: 500, - error: err.message ? err.message : err.error, - }) - } + res.status(500).send({ + code: 500, + error: err.message ? err.message : err.error, + }) } } //unlock networks