From 85883d4166b847a56cd8e5903e1a02f80092e3c1 Mon Sep 17 00:00:00 2001 From: QuickMythril Date: Sat, 12 Aug 2023 07:46:15 -0400 Subject: [PATCH 1/3] Add dynamic fee to Trades --- .../core/trade-bot/trade-bot-portal.src.js | 15 +++++++++++++++ .../core/trade-portal/trade-portal.src.js | 17 ++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/plugins/plugins/core/trade-bot/trade-bot-portal.src.js b/plugins/plugins/core/trade-bot/trade-bot-portal.src.js index e34f1b66..8de96dc2 100644 --- a/plugins/plugins/core/trade-bot/trade-bot-portal.src.js +++ b/plugins/plugins/core/trade-bot/trade-bot-portal.src.js @@ -2104,6 +2104,7 @@ class TradeBotPortal extends LitElement { this.changeTheme() this.changeLanguage() + this.tradeFee() this.autoHelperMessage = this.renderAutoHelperPass() @@ -3736,6 +3737,20 @@ class TradeBotPortal extends LitElement { } } + async tradeFee() { + const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node] + const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port + const url = `${nodeUrl}/transactions/unitfee?txType=DEPLOY_AT` + await fetch(url).then((response) => { + if (response.ok) { + return response.json() + } + return Promise.reject(response) + }).then((json) => { + this.listedCoins.get("QORTAL").tradeFee = (Number(json) / 1e8).toFixed(2) + }) + } + getApiKey() { const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]; let apiKey = myNode.apiKey; diff --git a/plugins/plugins/core/trade-portal/trade-portal.src.js b/plugins/plugins/core/trade-portal/trade-portal.src.js index e74a5392..da47de5e 100644 --- a/plugins/plugins/core/trade-portal/trade-portal.src.js +++ b/plugins/plugins/core/trade-portal/trade-portal.src.js @@ -1421,6 +1421,7 @@ class TradePortal extends LitElement { this.changeTheme() this.changeLanguage() + this.tradeFee() this.tradeHelperMessage = this.renderTradeHelperPass() @@ -2758,7 +2759,7 @@ class TradePortal extends LitElement { } } - if (this.round(parseFloat(fundingQortAmount) + parseFloat(0.002)) > parseFloat(this.listedCoins.get("QORTAL").balance)) { + if (this.round(parseFloat(fundingQortAmount) + parseFloat(this.listedCoins.get("QORTAL").tradeFee)) > parseFloat(this.listedCoins.get("QORTAL").balance)) { this.isSellLoading = false this.sellBtnDisable = false let snack4string = get("tradepage.tchange22") @@ -3021,6 +3022,20 @@ class TradePortal extends LitElement { } } + async tradeFee() { + const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node] + const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port + const url = `${nodeUrl}/transactions/unitfee?txType=DEPLOY_AT` + await fetch(url).then((response) => { + if (response.ok) { + return response.json() + } + return Promise.reject(response) + }).then((json) => { + this.listedCoins.get("QORTAL").tradeFee = (Number(json) / 1e8).toFixed(2) + }) + } + getApiKey() { const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]; let apiKey = myNode.apiKey; From 3320d2f913e2522204e84385211fc804052c9dc2 Mon Sep 17 00:00:00 2001 From: QuickMythril Date: Sat, 12 Aug 2023 07:56:30 -0400 Subject: [PATCH 2/3] Add fee for AT execution --- plugins/plugins/core/trade-bot/trade-bot-portal.src.js | 2 +- plugins/plugins/core/trade-portal/trade-portal.src.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/plugins/core/trade-bot/trade-bot-portal.src.js b/plugins/plugins/core/trade-bot/trade-bot-portal.src.js index 8de96dc2..dd7b9b7e 100644 --- a/plugins/plugins/core/trade-bot/trade-bot-portal.src.js +++ b/plugins/plugins/core/trade-bot/trade-bot-portal.src.js @@ -3747,7 +3747,7 @@ class TradeBotPortal extends LitElement { } return Promise.reject(response) }).then((json) => { - this.listedCoins.get("QORTAL").tradeFee = (Number(json) / 1e8).toFixed(2) + this.listedCoins.get("QORTAL").tradeFee = (Number(json + 100000) / 1e8).toFixed(2) }) } diff --git a/plugins/plugins/core/trade-portal/trade-portal.src.js b/plugins/plugins/core/trade-portal/trade-portal.src.js index da47de5e..e486023d 100644 --- a/plugins/plugins/core/trade-portal/trade-portal.src.js +++ b/plugins/plugins/core/trade-portal/trade-portal.src.js @@ -3032,7 +3032,7 @@ class TradePortal extends LitElement { } return Promise.reject(response) }).then((json) => { - this.listedCoins.get("QORTAL").tradeFee = (Number(json) / 1e8).toFixed(2) + this.listedCoins.get("QORTAL").tradeFee = (Number(json + 100000) / 1e8).toFixed(2) }) } From 866eccda80268aeb844416ef28b6c1c681a6a9d7 Mon Sep 17 00:00:00 2001 From: QuickMythril Date: Sat, 12 Aug 2023 12:54:17 -0400 Subject: [PATCH 3/3] Fix dynamic Trade fee --- plugins/plugins/core/trade-bot/trade-bot-portal.src.js | 2 +- plugins/plugins/core/trade-portal/trade-portal.src.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/plugins/core/trade-bot/trade-bot-portal.src.js b/plugins/plugins/core/trade-bot/trade-bot-portal.src.js index dd7b9b7e..20e0e35e 100644 --- a/plugins/plugins/core/trade-bot/trade-bot-portal.src.js +++ b/plugins/plugins/core/trade-bot/trade-bot-portal.src.js @@ -3747,7 +3747,7 @@ class TradeBotPortal extends LitElement { } return Promise.reject(response) }).then((json) => { - this.listedCoins.get("QORTAL").tradeFee = (Number(json + 100000) / 1e8).toFixed(2) + this.listedCoins.get("QORTAL").tradeFee = (Number(json) + 100000) / 1e8 }) } diff --git a/plugins/plugins/core/trade-portal/trade-portal.src.js b/plugins/plugins/core/trade-portal/trade-portal.src.js index e486023d..8b33d5a0 100644 --- a/plugins/plugins/core/trade-portal/trade-portal.src.js +++ b/plugins/plugins/core/trade-portal/trade-portal.src.js @@ -3032,7 +3032,7 @@ class TradePortal extends LitElement { } return Promise.reject(response) }).then((json) => { - this.listedCoins.get("QORTAL").tradeFee = (Number(json + 100000) / 1e8).toFixed(2) + this.listedCoins.get("QORTAL").tradeFee = (Number(json) + 100000) / 1e8 }) }