From fddcd4ff134fc2914e31aca7693583583717c16a Mon Sep 17 00:00:00 2001 From: PhilReact Date: Sat, 4 Jan 2025 14:31:33 +0200 Subject: [PATCH] added processing to qortal request --- src/components/Apps/useQortalMessageListener.tsx | 2 +- src/qortalRequests.ts | 2 +- src/qortalRequests/get.ts | 11 +++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/components/Apps/useQortalMessageListener.tsx b/src/components/Apps/useQortalMessageListener.tsx index e25c1bb..63e5fe6 100644 --- a/src/components/Apps/useQortalMessageListener.tsx +++ b/src/components/Apps/useQortalMessageListener.tsx @@ -182,7 +182,7 @@ const UIQortalRequests = [ 'GET_WALLET_BALANCE', 'GET_USER_WALLET_INFO', 'GET_CROSSCHAIN_SERVER_INFO', 'GET_TX_ACTIVITY_SUMMARY', 'GET_FOREIGN_FEE', 'UPDATE_FOREIGN_FEE', 'GET_SERVER_CONNECTION_HISTORY', 'SET_CURRENT_FOREIGN_SERVER', - 'ADD_FOREIGN_SERVER', 'REMOVE_FOREIGN_SERVER', 'GET_DAY_SUMMARY', 'CREATE_TRADE_BUY_ORDER', 'CREATE_TRADE_SELL_ORDER', 'CANCEL_TRADE_SELL_ORDER', 'IS_USING_GATEWAY', 'ADMIN_ACTION', 'SIGN_TRANSACTION', 'OPEN_NEW_TAB', 'CREATE_AND_COPY_EMBED_LINK', 'DECRYPT_QORTAL_GROUP_DATA', 'DECRYPT_DATA_WITH_SHARING_KEY', 'DELETE_HOSTED_DATA', 'GET_HOSTED_DATA' + 'ADD_FOREIGN_SERVER', 'REMOVE_FOREIGN_SERVER', 'GET_DAY_SUMMARY', 'CREATE_TRADE_BUY_ORDER', 'CREATE_TRADE_SELL_ORDER', 'CANCEL_TRADE_SELL_ORDER', 'IS_USING_GATEWAY', 'ADMIN_ACTION', 'SIGN_AND_PROCESS_TRANSACTION', 'OPEN_NEW_TAB', 'CREATE_AND_COPY_EMBED_LINK', 'DECRYPT_QORTAL_GROUP_DATA', 'DECRYPT_DATA_WITH_SHARING_KEY', 'DELETE_HOSTED_DATA', 'GET_HOSTED_DATA' ]; diff --git a/src/qortalRequests.ts b/src/qortalRequests.ts index bd3e688..c752814 100644 --- a/src/qortalRequests.ts +++ b/src/qortalRequests.ts @@ -729,7 +729,7 @@ export const isRunningGateway = async ()=> { } break; } - case "SIGN_TRANSACTION": { + case "SIGN_AND_PROCESS_TRANSACTION": { try { const res = await signTransaction(request.payload, isFromExtension) event.source.postMessage({ diff --git a/src/qortalRequests/get.ts b/src/qortalRequests/get.ts index 0764722..a952a04 100644 --- a/src/qortalRequests/get.ts +++ b/src/qortalRequests/get.ts @@ -3423,7 +3423,7 @@ export const signTransaction = async (data, isFromExtension) => { const decodedData = await response.json(); const resPermission = await getUserPermission( { - text1: `Do you give this application permission to sign a transaction?`, + text1: `Do you give this application permission to SIGN and PROCESS a transaction?`, highlightedText: "Read the transaction carefully before accepting!", text2: `Tx type: ${decodedData.type}`, json: decodedData, @@ -3468,7 +3468,14 @@ export const signTransaction = async (data, isFromExtension) => { keyPair.privateKey ); const signedBytes = utils.appendBuffer(arbitraryBytesBuffer, signature); - return uint8ArrayToBase64(signedBytes); + const signedBytesToBase58 = Base58.encode(signedBytes); + + const res = await processTransactionVersion2(signedBytesToBase58); + if (!res?.signature) + throw new Error( + res?.message || "Transaction was not able to be processed" + ); + return res; } else { throw new Error("User declined request");