From e3ef24dc5eb7ba0f361c1f91c9a9c419b3a2b1a8 Mon Sep 17 00:00:00 2001 From: AlphaX-Qortal <67390536+AlphaX-Qortal@users.noreply.github.com> Date: Wed, 26 Feb 2025 09:37:46 +0100 Subject: [PATCH 1/4] Fix parsing use-embed --- plugins/plugins/core/components/qdn-action-constants.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/plugins/core/components/qdn-action-constants.js b/plugins/plugins/core/components/qdn-action-constants.js index 498388a8..626b333a 100644 --- a/plugins/plugins/core/components/qdn-action-constants.js +++ b/plugins/plugins/core/components/qdn-action-constants.js @@ -122,8 +122,9 @@ export const extensionToPointer = (repString) => { const replace36 = replace35.split('.7z').join('.7z') const replace37 = replace36.split('.gz').join('.gz') const replace38 = replace37.split('.bz2').join('.bz2') + const replace39 = replace38.split('service=QCHAT_IMAGE

').join('service=QCHAT_IMAGE

') - return replace38 + return replace39 } export const encodedToChar = (encodedString) => { From 7ca9acaf3a59dfa234805e75d500a6a5be3f9665 Mon Sep 17 00:00:00 2001 From: AlphaX-Qortal <67390536+AlphaX-Qortal@users.noreply.github.com> Date: Tue, 18 Mar 2025 17:20:46 +0100 Subject: [PATCH 2/4] Added qortal requests --- core/src/components/login-view/login-view.js | 8 +- .../components/settings-view/security-view.js | 18 +- core/src/redux/app/actions/app-core.js | 18 +- core/src/redux/app/app-action-types.js | 2 + core/src/redux/app/app-reducer.js | 21 +- .../core/components/qdn-action-types.js | 12 ++ .../plugins/core/qdn/browser/browser.src.js | 179 +++++++++++++++++- plugins/plugins/utils/classes.js | 96 ++++++++++ 8 files changed, 346 insertions(+), 8 deletions(-) diff --git a/core/src/components/login-view/login-view.js b/core/src/components/login-view/login-view.js index 74eb66c2..8a50801f 100644 --- a/core/src/components/login-view/login-view.js +++ b/core/src/components/login-view/login-view.js @@ -20,7 +20,9 @@ import { setSideEffectAction, setTabNotifications, allowQAPPAutoBalance, - removeQAPPAutoBalance + removeQAPPAutoBalance, + allowQAPPAutoTransactions, + removeQAPPAutoTransactions } from '../../redux/app/app-actions' import settings from '../../functional-components/settings-page' import './welcome-page' @@ -56,7 +58,9 @@ window.reduxAction = { allowShowSyncIndicator: allowShowSyncIndicator, removeShowSyncIndicator: removeShowSyncIndicator, allowQAPPAutoBalance: allowQAPPAutoBalance, - removeQAPPAutoBalance: removeQAPPAutoBalance + removeQAPPAutoBalance: removeQAPPAutoBalance, + allowQAPPAutoTransactions: allowQAPPAutoTransactions, + removeQAPPAutoTransactions: removeQAPPAutoTransactions } const animationDuration = 0.7 // Seconds diff --git a/core/src/components/settings-view/security-view.js b/core/src/components/settings-view/security-view.js index 4f8fd51a..c0e529fb 100644 --- a/core/src/components/settings-view/security-view.js +++ b/core/src/components/settings-view/security-view.js @@ -10,7 +10,9 @@ import { removeQAPPAutoLists, setIsOpenDevDialog, allowQAPPAutoBalance, - removeQAPPAutoBalance + removeQAPPAutoBalance, + allowQAPPAutoTransactions, + removeQAPPAutoTransactions } from '../../redux/app/app-actions' import { securityViewStyles } from '../../styles/core-css' import FileSaver from 'file-saver' @@ -87,6 +89,12 @@ class SecurityView extends connect(store)(LitElement) { this.checkForBalance(e)} ?checked=${store.getState().app.qAPPAutoBalance}> +
+ + this.checkForTransactions(e)} ?checked=${store.getState().app.qAPPAutoTransactions}> +
@@ -5365,7 +5520,7 @@ async function showModalAndWait(type, data) { }) } - const checkbox1 = modal.querySelector('#abalanceButton') + const checkbox1 = modal.querySelector('#balanceButton') if (checkbox1) { checkbox1.addEventListener('click', (e) => { if (e.target.checked) { @@ -5394,6 +5549,24 @@ async function showModalAndWait(type, data) { }) } + const labelButton3 = modal.querySelector('#transactionsButtonLabel') + if (labelButton3) { + labelButton1.addEventListener('click', () => { + this.shadowRoot.getElementById('transactionsButton').click() + }) + } + + const checkbox3 = modal.querySelector('#transactionsButton') + if (checkbox3) { + checkbox1.addEventListener('click', (e) => { + if (e.target.checked) { + window.parent.reduxStore.dispatch(window.parent.reduxAction.removeQAPPAutoTransacions(false)) + return + } + window.parent.reduxStore.dispatch(window.parent.reduxAction.allowQAPPAutoTransacions(true)) + }) + } + const labelButtonFriendsList = modal.querySelector('#friendsListLabel') if (labelButtonFriendsList) { labelButtonFriendsList.addEventListener('click', () => { diff --git a/plugins/plugins/utils/classes.js b/plugins/plugins/utils/classes.js index 751c7194..4a2dcf1d 100644 --- a/plugins/plugins/utils/classes.js +++ b/plugins/plugins/utils/classes.js @@ -1552,3 +1552,99 @@ export const cancelTradeOfferTradeBot = async (body, keyPair) => { throw new Error("Failed to Cancel Sell Order. Try again!") } } + +export const getArrrSyncStatus = async () => { + 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 myApiKey = myNode.apiKey + const url = `${nodeUrl}/crosschain/arrr/syncstatus?apiKey=${myApiKey}` + const arrrSeed = window.parent.reduxStore.getState().app.selectedAddress.arrrWallet.seed58 + + try { + const response = await fetch(url, { + method: "POST", + headers: { + Accept: "*/*" + }, + body: arrrSeed + }) + + let res + + try { + res = await response.clone().json() + } catch (e) { + res = await response.text() + } + + return res + } catch (error) { + console.error(error.message || "Error in retrieving arrr sync status") + } +} + +export const getNodeInfo = async () => { + 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}/admin/info` + + try { + const response = await fetch(url, { + method: "GET", + headers: { + Accept: "*/*" + } + }) + + if (!response.ok) console.error("Failed to retrieve node info") + + let res + + try { + res = await response.clone().json() + } catch (e) { + res = await response.text() + } + + if (res.error && res.message) { + console.error(res.message) + } + + return res + } catch (error) { + console.error(error.message || "Error in retrieving node info") + } +} + + export const getNodeStatus = async () => { + 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}/admin/status` + + try { + const response = await fetch(url, { + method: "GET", + headers: { + Accept: "*/*" + } + }) + + if (!response.ok) console.error("Failed to retrieve node status") + + let res + + try { + res = await response.clone().json() + } catch (e) { + res = await response.text() + } + + if (res.error && res.message) { + console.error(res.message) + } + + return res + } catch (error) { + console.error(error.message || "Error in retrieving node status") + } +} From 9dbc4b085be609b487bded1744146a6338d8f4a0 Mon Sep 17 00:00:00 2001 From: AlphaX Date: Tue, 18 Mar 2025 19:19:00 +0100 Subject: [PATCH 3/4] Fix typo --- plugins/plugins/core/qdn/browser/browser.src.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/plugins/core/qdn/browser/browser.src.js b/plugins/plugins/core/qdn/browser/browser.src.js index b44bce1f..eaaa4741 100644 --- a/plugins/plugins/core/qdn/browser/browser.src.js +++ b/plugins/plugins/core/qdn/browser/browser.src.js @@ -5551,14 +5551,14 @@ async function showModalAndWait(type, data) { const labelButton3 = modal.querySelector('#transactionsButtonLabel') if (labelButton3) { - labelButton1.addEventListener('click', () => { + labelButton3.addEventListener('click', () => { this.shadowRoot.getElementById('transactionsButton').click() }) } const checkbox3 = modal.querySelector('#transactionsButton') if (checkbox3) { - checkbox1.addEventListener('click', (e) => { + checkbox3.addEventListener('click', (e) => { if (e.target.checked) { window.parent.reduxStore.dispatch(window.parent.reduxAction.removeQAPPAutoTransacions(false)) return From e4eede5087078d6fb80c08bef51ef037149849b5 Mon Sep 17 00:00:00 2001 From: AlphaX-Qortal <67390536+AlphaX-Qortal@users.noreply.github.com> Date: Wed, 19 Mar 2025 09:19:54 +0100 Subject: [PATCH 4/4] Fix response --- .../plugins/core/qdn/browser/browser.src.js | 85 +++++++------------ 1 file changed, 31 insertions(+), 54 deletions(-) diff --git a/plugins/plugins/core/qdn/browser/browser.src.js b/plugins/plugins/core/qdn/browser/browser.src.js index eaaa4741..0cb5309c 100644 --- a/plugins/plugins/core/qdn/browser/browser.src.js +++ b/plugins/plugins/core/qdn/browser/browser.src.js @@ -2703,6 +2703,7 @@ class WebBrowser extends LitElement { break case 'ARRR': userWallet['address'] = arrrAddress + userWallet['publicKey'] = window.parent.reduxStore.getState().app.selectedAddress.arrrWallet.seed58 break default: break @@ -2723,8 +2724,8 @@ class WebBrowser extends LitElement { const requiredFields = ['coin'] const missingFields = [] let dataSentBack = {} - let skip = false - let res3 + let skipWalletTransactions = false + let resSkipWalletTransactions requiredFields.forEach((field) => { if (!data[field]) { missingFields.push(field) @@ -2745,32 +2746,30 @@ class WebBrowser extends LitElement { break } if (window.parent.reduxStore.getState().app.qAPPAutoTransactions) { - skip = true + skipWalletTransactions = true } - if (!skip) { - res3 = await showModalAndWait( + if (!skipWalletTransactions) { + resSkipWalletTransactions = await showModalAndWait( actions.GET_USER_WALLET_TRANSACTIONS ) } - if ((res3 && res3.action === 'accept') || skip) { + if ((resSkipWalletTransactions && resSkipWalletTransactions.action === 'accept') || skipWalletTransactions) { let coin = data.coin if (coin === "QORT") { let qortAddress = window.parent.reduxStore.getState().app.selectedAddress.address try { - this.loader.show() response = await parentEpml.request('apiCall', { url: `/transactions/address/${qortAddress}?limit=0&reverse=true` }) - this.loader.hide() break } catch (error) { - this.loader.hide() let myMsg1 = get("browserpage.bchange21") let myMsg2 = get("walletpage.wchange44") await showErrorAndWait("ACTION_FAILED", {id1: myMsg1, id2: myMsg2}) const data = {} data['error'] = error.message ? error.message : get("browserpage.bchange21") response = JSON.stringify(data) + break } } else { let _url = `` @@ -2804,28 +2803,13 @@ class WebBrowser extends LitElement { break } try { - this.loader.show() - const res = await parentEpml.request('apiCall', { + response = await parentEpml.request('apiCall', { url: _url, method: 'POST', body: _body }) - if (!res.ok) { - this.loader.hide() - let myMsg1 = get("browserpage.bchange21") - let myMsg2 = get("walletpage.wchange44") - await showErrorAndWait("ACTION_FAILED", { id1: myMsg1, id2: myMsg2 }) - const data = {} - data['error'] = get("browserpage.bchange21") - response = JSON.stringify(data) - break - } else { - this.loader.hide() - response = res - break - } + break } catch (error) { - this.loader.hide() let myMsg1 = get("browserpage.bchange21") let myMsg2 = get("walletpage.wchange44") await showErrorAndWait("ACTION_FAILED", { id1: myMsg1, id2: myMsg2 }) @@ -2835,7 +2819,7 @@ class WebBrowser extends LitElement { break } } - } else if (res3.action === 'reject') { + } else if (resSkipWalletTransactions.action === 'reject') { let myMsg1 = get("transactions.declined") let myMsg2 = get("walletpage.wchange44") await showErrorAndWait("DECLINED_REQUEST", { id1: myMsg1, id2: myMsg2 }) @@ -2849,8 +2833,8 @@ class WebBrowser extends LitElement { const requiredFields = ['coin'] const missingFields = [] let dataSentBack = {} - let skip = false - let res3 + let skipWalletBalance = false + let resSkipWalletBalance requiredFields.forEach((field) => { if (!data[field]) { missingFields.push(field) @@ -2875,32 +2859,30 @@ class WebBrowser extends LitElement { // then set the response string from the core to the `response` variable (defined above) // If they decline, send back JSON that includes an `error` key, such as `{"error": "User declined request"}` if (window.parent.reduxStore.getState().app.qAPPAutoBalance) { - skip = true + skipWalletBalance = true } - if (!skip) { - res3 = await showModalAndWait( + if (!skipWalletBalance) { + resSkipWalletBalance = await showModalAndWait( actions.GET_WALLET_BALANCE ) } - if ((res3 && res3.action === 'accept') || skip) { + if ((resSkipWalletBalance && resSkipWalletBalance.action === 'accept') || skipWalletBalance) { let coin = data.coin if (coin === "QORT") { let qortAddress = window.parent.reduxStore.getState().app.selectedAddress.address try { - this.loader.show() response = await parentEpml.request('apiCall', { url: `/addresses/balance/${qortAddress}?apiKey=${this.getApiKey()}` }) - this.loader.hide() break } catch (error) { - this.loader.hide() let myMsg1 = get("browserpage.bchange21") let myMsg2 = get("walletpage.wchange44") await showErrorAndWait("ACTION_FAILED", {id1: myMsg1, id2: myMsg2}) const data = {} data['error'] = error.message ? error.message : get("browserpage.bchange21") response = JSON.stringify(data) + break } } else { let _url = `` @@ -2934,14 +2916,12 @@ class WebBrowser extends LitElement { break } try { - this.loader.show() const res = await parentEpml.request('apiCall', { url: _url, method: 'POST', body: _body }) if (isNaN(Number(res))) { - this.loader.hide() let myMsg1 = get("browserpage.bchange21") let myMsg2 = get("walletpage.wchange44") await showErrorAndWait("ACTION_FAILED", { id1: myMsg1, id2: myMsg2 }) @@ -2950,12 +2930,10 @@ class WebBrowser extends LitElement { response = JSON.stringify(data) break } else { - this.loader.hide() response = (Number(res) / 1e8).toFixed(8) break } } catch (error) { - this.loader.hide() let myMsg1 = get("browserpage.bchange21") let myMsg2 = get("walletpage.wchange44") await showErrorAndWait("ACTION_FAILED", { id1: myMsg1, id2: myMsg2 }) @@ -2965,7 +2943,7 @@ class WebBrowser extends LitElement { break } } - } else if (res3.action === 'reject') { + } else if (resSkipWalletBalance.action === 'reject') { let myMsg1 = get("transactions.declined") let myMsg2 = get("walletpage.wchange44") await showErrorAndWait("DECLINED_REQUEST", { id1: myMsg1, id2: myMsg2 }) @@ -2978,7 +2956,9 @@ class WebBrowser extends LitElement { case actions.GET_USER_WALLET_INFO: { const requiredFields = ['coin'] const missingFields = [] + let skipUserWalletInfo = false let dataSentBack = {} + let resSkipUserWalletInfo requiredFields.forEach((field) => { if (!data[field]) { missingFields.push(field) @@ -2998,16 +2978,20 @@ class WebBrowser extends LitElement { response = JSON.stringify(dataSentBack) break } - const userWallet = await showModalAndWait( - actions.GET_USER_WALLET - ) - if (userWallet.action === 'accept') { + if (window.parent.reduxStore.getState().app.qAPPAutoAuth) { + skipUserWalletInfo = true + } + if (!skipUserWalletInfo) { + resSkipUserWalletInfo = await showModalAndWait( + actions.GET_USER_WALLET + ) + } + if ((resSkipUserWalletInfo && resSkipUserWalletInfo.action === 'accept') || skipUserWalletInfo) { let coin = data.coin let walletKeys = this.getUserWallet(coin) let _url = `/crosschain/` + data.coin.toLowerCase() + `/addressinfos?apiKey=${this.getApiKey()}` let _body = { xpub58: walletKeys['publicKey'] } try { - this.loader.show() const bodyToString = JSON.stringify(_body) const res = await parentEpml.request('apiCall', { url: _url, @@ -3020,7 +3004,6 @@ class WebBrowser extends LitElement { }) response = JSON.stringify(res) } catch (error) { - this.loader.hide() let myMsg1 = get("browserpage.bchange21") let myMsg2 = get("walletpage.wchange44") await showErrorAndWait("ACTION_FAILED", { id1: myMsg1, id2: myMsg2 }) @@ -3028,10 +3011,8 @@ class WebBrowser extends LitElement { data['error'] = error.message ? error.message : get("browserpage.bchange21") response = JSON.stringify(data) return - } finally { - this.loader.hide() } - } else if (userWallet.action === 'reject') { + } else if (resSkipUserWalletInfo.action === 'reject') { let myMsg1 = get("transactions.declined") let myMsg2 = get("walletpage.wchange44") await showErrorAndWait("DECLINED_REQUEST", { id1: myMsg1, id2: myMsg2 }) @@ -3065,7 +3046,6 @@ class WebBrowser extends LitElement { } let _url = `/crosschain/` + data.coin.toLowerCase() + `/serverinfos` try { - this.loader.show() const res = await parentEpml.request('apiCall', { url: _url, method: 'GET', @@ -3075,7 +3055,6 @@ class WebBrowser extends LitElement { }) response = JSON.stringify(res.servers) } catch (error) { - this.loader.hide() let myMsg1 = get("modals.mpchange55") let myMsg2 = get("walletpage.wchange44") await showErrorAndWait("ACTION_FAILED", { id1: myMsg1, id2: myMsg2 }) @@ -3083,8 +3062,6 @@ class WebBrowser extends LitElement { data['error'] = error.message ? error.message : get("modals.mpchange55") response = JSON.stringify(data) return - } finally { - this.loader.hide() } } break