Generate random paymentId

kryptokrona · Mar 11, 2024 · c24206c · c24206c
1 parent 0ea2ff3
commit c24206c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/backend/electron.cjs b/src/backend/electron.cjs
@@ -12,6 +12,7 @@ const Store = require("electron-store");
 const { autoUpdater } = require("electron-updater");
 const fs = require("fs");
 const { createSwarm, destroySwarm, sendMessage } = require("./hyper/index.cjs");
+const { error } = require("console");
 
 
 try {
@@ -631,6 +632,12 @@ ipcMain.handle('balance-subwallet', async (e) => {
 
 ipcMain.handle('prepare-transaction', async (e, address, amount, paymentID, sendAll) => {
   console.log(address, amount, paymentID, sendAll);
+  if (paymentID !== undefined) {
+    if (!WB.validatePaymentID(paymentID)) {
+      errorMessage('The paymentId is not correct')
+      return
+    }
+  }
   const result = await walletBackend.sendTransactionAdvanced(
     [[address, parseInt(parseFloat(amount).toFixed(5) * 100000)]],
     3,
@@ -661,7 +668,10 @@ ipcMain.handle('prepare-transaction', async (e, address, amount, paymentID, send
 
 ipcMain.handle('send-transaction', async (e, hash) => {
   const result = await walletBackend.sendPreparedTransaction(hash)
-  if (!result.success) errorMessage('Error: Could not send transaction')
+  if (!result.success) {
+    errorMessage('Error: Could not send transaction')
+    return
+  }
   successMessage('Transaction sent!')
   mainWindow.webContents.send("outgoing-tx")
   return result.success;
@@ -676,8 +686,8 @@ ipcMain.handle('validate-address', async (e, address) => {
   return await WB.validateAddress(address, true)
 })
 
-ipcMain.handle('generate-paymentId', async (e, paymentId) => {
-  return WB.validatePaymentID(paymentId);
+ipcMain.handle('generate-paymentId', async (e) => {
+  return (await crypto.generateKeys()).public_key
 })
 
 

diff --git a/src/backend/preload.cjs b/src/backend/preload.cjs
@@ -100,8 +100,6 @@ contextBridge.exposeInMainWorld("api", {
     return await ipcRenderer.invoke('import-contacts')
   },
 
-
-
   prepareTransaction: async (address, amount, paymentID, sendAll) => {
     return await ipcRenderer.invoke('prepare-transaction', address, amount, paymentID, sendAll)
   },
@@ -115,7 +113,7 @@ contextBridge.exposeInMainWorld("api", {
     return await ipcRenderer.invoke('validate-address', address)
   },
   generatePaymentId: async () => {
-    return await ipcRenderer.invoke('validate-paymentId')
+    return await ipcRenderer.invoke('generate-paymentId')
   },
   validatePaymentId: async (paymentId) => {
     return await ipcRenderer.invoke('validate-paymentId', paymentId)

diff --git a/src/routes/wallet/send/PrepareTransaction.svelte b/src/routes/wallet/send/PrepareTransaction.svelte
@@ -50,10 +50,13 @@
     if ($wallet.preparedTransaction) {
       address = '';
       amount = '';
+      paymentId = '';
     }
   };
 
-  const generatePaymentId = () => {};
+  const generatePaymentId = async () => {
+    paymentId = await window.api.generatePaymentId();
+  };
 
   //Validate and paste address
   const pasteAddress = async () => {