From c02ffe4a72c9a711b35143d72b9ed3cd4e2385c2 Mon Sep 17 00:00:00 2001 From: kennycud Date: Thu, 23 Nov 2023 14:28:08 -0800 Subject: [PATCH 1/3] user wallet info added in --- .../plugins/core/qdn/browser/browser.src.js | 130 ++++++++++++++++-- 1 file changed, 119 insertions(+), 11 deletions(-) diff --git a/plugins/plugins/core/qdn/browser/browser.src.js b/plugins/plugins/core/qdn/browser/browser.src.js index 6af9ba31..1459c3a8 100644 --- a/plugins/plugins/core/qdn/browser/browser.src.js +++ b/plugins/plugins/core/qdn/browser/browser.src.js @@ -271,7 +271,7 @@ class WebBrowser extends LitElement { const name = parts[0] parts.shift() let identifier - + let path if (parts.length > 0) { identifier = parts[0] // Do not shift yet // Check if a resource exists with this service, name and identifier combination @@ -1100,7 +1100,7 @@ class WebBrowser extends LitElement { try { let list = JSON.parse(localStorage.getItem('friends-my-friend-list') || "[]") - + list = list.map((friend)=> friend.name || "") response = JSON.stringify(list) } catch (error) { @@ -1108,7 +1108,7 @@ class WebBrowser extends LitElement { const errorMsg = "Error in retrieving friends list" data['error'] = errorMsg response = JSON.stringify(data) - } + } break @@ -1515,7 +1515,7 @@ class WebBrowser extends LitElement { const missingFields = [] requiredFields.forEach((field) => { - if (!data[field]) { + if (!data[field] && data[field] !== 0) { missingFields.push(field) } }) @@ -2289,7 +2289,7 @@ class WebBrowser extends LitElement { const errorMsg = error.message || 'Failed to open profile'; obj['error'] = errorMsg; response = JSON.stringify(obj); - } + } break; } @@ -2314,12 +2314,19 @@ class WebBrowser extends LitElement { } const res3 = await showModalAndWait( actions.GET_USER_WALLET - ); - - if (res3.action === 'accept') { - let coin = data.coin; - let userWallet = {}; + ); + if (res3.action === 'accept') { + let coin = data.coin; + let userWallet = {}; + let arrrAddress = ""; + if (coin === "ARRR") { + arrrAddress = await parentEpml.request('apiCall', { + url: `/crosschain/arrr/walletaddress?apiKey=${this.getApiKey()}`, + method: 'POST', + body: `${window.parent.reduxStore.getState().app.selectedAddress.arrrWallet.seed58}` + }) + } switch (coin) { case 'QORT': userWallet['address'] = window.parent.reduxStore.getState().app.selectedAddress.address @@ -2346,6 +2353,7 @@ class WebBrowser extends LitElement { userWallet['publickey'] = window.parent.reduxStore.getState().app.selectedAddress.rvnWallet.derivedMasterPublicKey break case 'ARRR': + userWallet['address'] = arrrAddress break default: break @@ -2472,6 +2480,70 @@ class WebBrowser extends LitElement { break } + case actions.GET_USER_WALLET_INFO: { + const requiredFields = ['coin'] + const missingFields = [] + + requiredFields.forEach((field) => { + if (!data[field]) { + missingFields.push(field) + } + }) + + if (missingFields.length > 0) { + const missingFieldsString = missingFields.join(', ') + const errorMsg = `Missing fields: ${missingFieldsString}` + let data = {} + data['error'] = errorMsg + response = JSON.stringify(data) + break + } + + const userWallet = await showModalAndWait( + actions.GET_USER_WALLET + ) + + if (userWallet.action === 'accept') { + let coin = data.coin; + let walletKeys = this.getUserWallet(coin); + + console.log( 'walletKeys print ... ' ); + console.log( 'walletKeys = ' + JSON.stringify(walletKeys) ); + 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, + method: 'POST', + headers: { + 'Accept': '*/*', + 'Content-Type': 'application/json' + }, + body: bodyToString, + }) + response = JSON.stringify(res); + } catch (error) { + console.error(error) + const data = {} + const errorMsg = error.message || get("browserpage.bchange21") + data['error'] = errorMsg + response = JSON.stringify(data) + return + } finally { + this.loader.hide() + } + } else if (userWallet.action === 'reject') { + response = '{"error": "User declined request"}' + } + + break + } + case actions.GET_DAY_SUMMARY: { try { const summary = await parentEpml.request('apiCall', { @@ -3398,6 +3470,42 @@ class WebBrowser extends LitElement { }, 60000) } + getUserWallet(coin) { + let userWallet = {}; + + switch (coin) { + case 'QORT': + userWallet['address'] = window.parent.reduxStore.getState().app.selectedAddress.address + userWallet['publickey'] = window.parent.reduxStore.getState().app.selectedAddress.base58PublicKey + break + case 'BTC': + userWallet['address'] = window.parent.reduxStore.getState().app.selectedAddress.btcWallet.address + userWallet['publickey'] = window.parent.reduxStore.getState().app.selectedAddress.btcWallet.derivedMasterPublicKey + break + case 'LTC': + userWallet['address'] = window.parent.reduxStore.getState().app.selectedAddress.ltcWallet.address + userWallet['publickey'] = window.parent.reduxStore.getState().app.selectedAddress.ltcWallet.derivedMasterPublicKey + break + case 'DOGE': + userWallet['address'] = window.parent.reduxStore.getState().app.selectedAddress.dogeWallet.address + userWallet['publickey'] = window.parent.reduxStore.getState().app.selectedAddress.dogeWallet.derivedMasterPublicKey + break + case 'DGB': + userWallet['address'] = window.parent.reduxStore.getState().app.selectedAddress.dgbWallet.address + userWallet['publickey'] = window.parent.reduxStore.getState().app.selectedAddress.dgbWallet.derivedMasterPublicKey + break + case 'RVN': + userWallet['address'] = window.parent.reduxStore.getState().app.selectedAddress.rvnWallet.address + userWallet['publickey'] = window.parent.reduxStore.getState().app.selectedAddress.rvnWallet.derivedMasterPublicKey + break + case 'ARRR': + break + default: + break + } + return userWallet; + } + clearConsole() { if (!isElectron()) { } else { @@ -3837,7 +3945,7 @@ async function showModalAndWait(type, data) { ${type === actions.GET_PROFILE_DATA ? `

${get("browserpage.bchange49")}: ${data.property}

- +
` : ''} ${type === actions.SET_PROFILE_DATA ? ` From fbb4dd3752719ee024d112d1e1ead1d3e113d4ee Mon Sep 17 00:00:00 2001 From: kennycud Date: Thu, 23 Nov 2023 14:28:53 -0800 Subject: [PATCH 2/3] user wallet info added in --- plugins/plugins/core/components/qdn-action-types.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/plugins/core/components/qdn-action-types.js b/plugins/plugins/core/components/qdn-action-types.js index b7f9f777..1cfa0f44 100644 --- a/plugins/plugins/core/components/qdn-action-types.js +++ b/plugins/plugins/core/components/qdn-action-types.js @@ -22,6 +22,9 @@ export const DEPLOY_AT = 'DEPLOY_AT'; // GET_USER_WALLET action export const GET_USER_WALLET = 'GET_USER_WALLET'; +// GET_USER_WALLET_INFO action +export const GET_USER_WALLET_INFO = 'GET_USER_WALLET_INFO'; + // GET_WALLET_BALANCE action export const GET_WALLET_BALANCE = 'GET_WALLET_BALANCE'; @@ -80,4 +83,4 @@ export const SET_PROFILE_DATA= 'SET_PROFILE_DATA' export const GET_DAY_SUMMARY = 'GET_DAY_SUMMARY' //GET_FRIENDS_LIST -export const GET_FRIENDS_LIST = 'GET_FRIENDS_LIST' \ No newline at end of file +export const GET_FRIENDS_LIST = 'GET_FRIENDS_LIST' From 5dafb4d491af7827ad61e2a7844288c86ba7779f Mon Sep 17 00:00:00 2001 From: kennycud Date: Thu, 23 Nov 2023 15:23:14 -0800 Subject: [PATCH 3/3] user wallet info added in --- .../plugins/core/qdn/browser/browser.src.js | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/plugins/plugins/core/qdn/browser/browser.src.js b/plugins/plugins/core/qdn/browser/browser.src.js index c5c3ac15..eb4e49fe 100644 --- a/plugins/plugins/core/qdn/browser/browser.src.js +++ b/plugins/plugins/core/qdn/browser/browser.src.js @@ -2479,6 +2479,67 @@ class WebBrowser extends LitElement { break } + case actions.GET_USER_WALLET_INFO: { + const requiredFields = ['coin'] + const missingFields = [] + + requiredFields.forEach((field) => { + if (!data[field]) { + missingFields.push(field) + } + }) + + if (missingFields.length > 0) { + const missingFieldsString = missingFields.join(', ') + const errorMsg = `Missing fields: ${missingFieldsString}` + let data = {} + data['error'] = errorMsg + response = JSON.stringify(data) + break + } + + const userWallet = await showModalAndWait( + actions.GET_USER_WALLET + ) + + if (userWallet.action === 'accept') { + 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, + method: 'POST', + headers: { + 'Accept': '*/*', + 'Content-Type': 'application/json' + }, + body: bodyToString, + }) + response = JSON.stringify(res); + } catch (error) { + console.error(error) + const data = {} + const errorMsg = error.message || get("browserpage.bchange21") + data['error'] = errorMsg + response = JSON.stringify(data) + return + } finally { + this.loader.hide() + } + } else if (userWallet.action === 'reject') { + response = '{"error": "User declined request"}' + } + + break + } case actions.GET_DAY_SUMMARY: { try { @@ -3406,6 +3467,42 @@ class WebBrowser extends LitElement { }, 60000) } + getUserWallet(coin) { + let userWallet = {}; + + switch (coin) { + case 'QORT': + userWallet['address'] = window.parent.reduxStore.getState().app.selectedAddress.address + userWallet['publickey'] = window.parent.reduxStore.getState().app.selectedAddress.base58PublicKey + break + case 'BTC': + userWallet['address'] = window.parent.reduxStore.getState().app.selectedAddress.btcWallet.address + userWallet['publickey'] = window.parent.reduxStore.getState().app.selectedAddress.btcWallet.derivedMasterPublicKey + break + case 'LTC': + userWallet['address'] = window.parent.reduxStore.getState().app.selectedAddress.ltcWallet.address + userWallet['publickey'] = window.parent.reduxStore.getState().app.selectedAddress.ltcWallet.derivedMasterPublicKey + break + case 'DOGE': + userWallet['address'] = window.parent.reduxStore.getState().app.selectedAddress.dogeWallet.address + userWallet['publickey'] = window.parent.reduxStore.getState().app.selectedAddress.dogeWallet.derivedMasterPublicKey + break + case 'DGB': + userWallet['address'] = window.parent.reduxStore.getState().app.selectedAddress.dgbWallet.address + userWallet['publickey'] = window.parent.reduxStore.getState().app.selectedAddress.dgbWallet.derivedMasterPublicKey + break + case 'RVN': + userWallet['address'] = window.parent.reduxStore.getState().app.selectedAddress.rvnWallet.address + userWallet['publickey'] = window.parent.reduxStore.getState().app.selectedAddress.rvnWallet.derivedMasterPublicKey + break + case 'ARRR': + break + default: + break + } + return userWallet; + } + clearConsole() { if (!isElectron()) { } else {