conflict fixes

.gitleaksignore

@@ -17,3 +17,8 @@ daf41a143aa8c483db584ba1e7222e8eafec1d3b:backend/controller.py:generic-api-key:2
 af77e930289cbc87987567bff0efc25936484df2:backend/controller.py:generic-api-key:354b04972639d66053109596d3b73a1d91688964ebb:electron/constants/publishOptions.js:github-fine-grained-pat:3
 b04972639d66053109596d3b73a1d91688964ebb:electron/constants/publishOptions.js:github-fine-grained-pat:3
 af77e930289cbc87987567bff0efc25936484df2:backend/controller.py:generic-api-key:354
+e7de9ce0b902ed6d68f8c5b033d044f39b08f5a1:operate/data/contracts/service_staking_token/contract.yaml:generic-api-key:10
+d8149e9b5b7bd6a7ed7bc1039900702f1d4f287b:operate/services/manage.py:generic-api-key:405
+d8149e9b5b7bd6a7ed7bc1039900702f1d4f287b:operate/services/manage.py:generic-api-key:406
+d8149e9b5b7bd6a7ed7bc1039900702f1d4f287b:operate/services/manage.py:generic-api-key:454
+d8149e9b5b7bd6a7ed7bc1039900702f1d4f287b:operate/services/manage.py:generic-api-key:455

.pylintrc

@@ -20,7 +20,7 @@ E0611: no-name-in-module
 R0903: Too few public methods
 
 [IMPORTS]
-ignored-modules=os,io
+ignored-modules=os,io,psutil
 
 [DESIGN]
 # min-public-methods=1

electron/constants/publishOptions.js

@@ -5,7 +5,7 @@ const publishOptions = {
   releaseType: 'draft',
   token: process.env.GH_TOKEN,
   private: false,
-  publishAutoUpdate: true,
+  publishAutoUpdate: false,
 };
 
 module.exports = { publishOptions };

electron/install.js

@@ -1,15 +1,20 @@
 // Installation helpers.
 
+const https = require('https');
+const path = require('path');
 const fs = require('fs');
 const os = require('os');
 const sudo = require('sudo-prompt');
 const process = require('process');
-const { spawnSync } = require('child_process');
+const axios = require("axios")
+
 const Docker = require('dockerode');
+const { spawnSync } = require('child_process');
 
-const Version = '0.1.0rc26';
+const Version = '0.1.0rc34';
 const OperateDirectory = `${os.homedir()}/.operate`;
 const VenvDir = `${OperateDirectory}/venv`;
+const TempDir = `${OperateDirectory}/temp`;
 const VersionFile = `${OperateDirectory}/version.txt`;
 const LogFile = `${OperateDirectory}/logs.txt`;
 const OperateInstallationLog = `${os.homedir()}/operate.log`;
@@ -22,6 +27,20 @@ const SudoOptions = {
   name: 'Pearl',
   env: Env,
 };
+const TendermintUrls = {
+  darwin: {
+    x64: "https://github.com/tendermint/tendermint/releases/download/v0.34.19/tendermint_0.34.19_darwin_amd64.tar.gz",
+    arm64: "https://github.com/tendermint/tendermint/releases/download/v0.34.19/tendermint_0.34.19_darwin_arm64.tar.gz",
+  },
+  linux: {
+    x64: "https://github.com/tendermint/tendermint/releases/download/v0.34.19/tendermint_0.34.19_linux_amd64.tar.gz",
+    arm64: "https://github.com/tendermint/tendermint/releases/download/v0.34.19/tendermint_0.34.19_linux_arm64.tar.gz",
+  },
+  win32: {
+    x64: "https://github.com/tendermint/tendermint/releases/download/v0.34.19/tendermint_0.34.19_windows_amd64.tar.gz",
+    arm64: "https://github.com/tendermint/tendermint/releases/download/v0.34.19/tendermint_0.34.19_windows_arm64.tar.gz"
+  }
+}
 
 function getBinPath(command) {
   return spawnSync('/usr/bin/which', [command], { env: Env })
@@ -104,6 +123,46 @@ function installBrew() {
   ]);
 }
 
+function isTendermintInstalledUnix() {
+  return Boolean(getBinPath('tendermint'));
+}
+
+async function downloadFile(url, dest) {
+  const writer = fs.createWriteStream(dest);
+  try {
+    const response = await axios({
+      url,
+      method: 'GET',
+      responseType: 'stream'
+    });
+    response.data.pipe(writer);
+    return new Promise((resolve, reject) => {
+      writer.on('finish', resolve);
+      writer.on('error', reject);
+    });
+  } catch (err) {
+    fs.unlink(dest, () => { }); // Delete the file if there is an error
+    console.error('Error downloading the file:', err.message);
+  }
+}
+
+async function installTendermintUnix() {
+  const cwd = process.cwd()
+  process.chdir(TempDir)
+
+  console.log(appendLog(`Installing tendermint for ${os.platform()}-${process.arch}`))
+  const url = TendermintUrls[os.platform()][process.arch]
+
+  console.log(appendLog(`Downloading ${url}, might take a while...`))
+  await downloadFile(url, `${TempDir}/tendermint.tar.gz`)
+
+  console.log(appendLog(`Installing tendermint binary`))
+  await runCmdUnix("tar", ["-xvf", "tendermint.tar.gz"])
+  await runSudoUnix("install", "tendermint /usr/local/bin")
+  process.chdir(cwd)
+}
+
+
 function isDockerInstalledDarwin() {
   return Boolean(getBinPath('docker'));
 }
@@ -212,7 +271,7 @@ function versionBumpRequired() {
 }
 
 function removeLogFile() {
-  if (fs.existsSync()) {
+  if (fs.existsSync(LogFile)) {
     fs.rmSync(LogFile);
   }
 }
@@ -236,13 +295,6 @@ async function setupDarwin(ipcChannel) {
     installBrew();
   }
 
-  console.log(appendLog('Checking docker installation'));
-  if (!isDockerInstalledDarwin()) {
-    ipcChannel.send('response', 'Installing Pearl Daemon');
-    console.log(appendLog('Installing docker'));
-    installDockerDarwin();
-  }
-
   console.log(appendLog('Checking python installation'));
   if (!isPythonInstalledDarwin()) {
     ipcChannel.send('response', 'Installing Pearl Daemon');
@@ -254,6 +306,13 @@ async function setupDarwin(ipcChannel) {
   await createDirectory(`${OperateDirectory}`);
   await createDirectory(`${OperateDirectory}/temp`);
 
+  console.log(appendLog('Checking tendermint installation'));
+  if (!isTendermintInstalledUnix()) {
+    ipcChannel.send('response', 'Installing Pearl Daemon');
+    console.log(appendLog('Installing tendermint'));
+    await installTendermintUnix()
+  }
+
   if (!fs.existsSync(VenvDir)) {
     ipcChannel.send('response', 'Installing Pearl Daemon');
     console.log(appendLog('Creating virtual environment'));
@@ -279,14 +338,9 @@ async function setupDarwin(ipcChannel) {
   await installOperateCli('/opt/homebrew/bin/operate');
 }
 
+// TODO: Add Tendermint installation
 async function setupUbuntu(ipcChannel) {
   removeInstallationLogFile();
-  console.log(appendLog('Checking docker installation'));
-  if (!isDockerInstalledUbuntu()) {
-    ipcChannel.send('response', 'Installing Pearl Daemon');
-    console.log(appendLog('Installing docker'));
-    await installDockerUbuntu();
-  }
 
   console.log(appendLog('Checking python installation'));
   if (!isPythonInstalledUbuntu()) {
@@ -306,9 +360,11 @@ async function setupUbuntu(ipcChannel) {
   await createDirectory(`${OperateDirectory}`);
   await createDirectory(`${OperateDirectory}/temp`);
 
-  if (versionBumpRequired()) {
-    // removePreviousInstallation();
-    writeVersion();
+  console.log(appendLog('Checking tendermint installation'));
+  if (!isTendermintInstalledUnix()) {
+    ipcChannel.send('response', 'Installing Pearl Daemon');
+    console.log(appendLog('Installing tendermint'));
+    await installTendermintUnix()
   }
 
   if (!fs.existsSync(VenvDir)) {
@@ -370,4 +426,9 @@ module.exports = {
   OperateDirectory,
   OperateCmd,
   Env,
+  dirs: {
+    VersionFile,
+    LogFile,
+    OperateInstallationLog,
+  },
 };

electron/main.js

@@ -7,22 +7,25 @@ const {
   Menu,
   Notification,
   ipcMain,
+  dialog,
+  shell,
 } = require('electron');
 const { spawn } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
 const next = require('next');
 const http = require('http');
+const AdmZip = require('adm-zip');
 const { TRAY_ICONS, TRAY_ICONS_PATHS } = require('./icons');
 
 const {
   setupDarwin,
   setupUbuntu,
   OperateCmd,
   OperateDirectory,
-  startDocker,
   Env,
+  dirs,
 } = require('./install');
 const { killProcesses } = require('./processes');
 const { isPortAvailable, findAvailablePort } = require('./ports');
@@ -233,7 +236,7 @@ const createMainWindow = () => {
     mainWindow.setSize(width, height);
   });
 
-  ipcMain.on('show-notification', (title, description) => {
+  ipcMain.on('show-notification', (_event, title, description) => {
     showNotification(title, description || undefined);
   });
 
@@ -438,8 +441,6 @@ ipcMain.on('check', async function (event, _argument) {
       }
     }
 
-    startDocker(event.sender);
-
     if (isDev) {
       event.sender.send(
         'response',
@@ -544,3 +545,99 @@ process.on('uncaughtException', (error) => {
     });
   });
 });
+
+// OPEN PATH
+ipcMain.on('open-path', (_, filePath) => {
+  shell.openPath(filePath);
+});
+
+function getSanitizedLogs({ name, filePath, data }) {
+  const logs = filePath ? fs.readFileSync(filePath, 'utf-8') : data;
+  const tempDir = os.tmpdir();
+
+  const usernameRegex = /\/Users\/([^/]+)/g;
+  const sanitizedData = logs.replace(usernameRegex, '/Users/*****');
+
+  const sanitizedLogsFilePath = path.join(tempDir, name);
+  fs.writeFileSync(sanitizedLogsFilePath, sanitizedData);
+
+  return sanitizedLogsFilePath;
+}
+
+// EXPORT LOGS
+ipcMain.handle('save-logs', async (_, data) => {
+  // version.txt
+  const versionFile = dirs.VersionFile;
+  // logs.txt
+  const logFile = getSanitizedLogs({ name: 'log.txt', filePath: dirs.LogFile });
+  // operate.log
+  const installationLog = getSanitizedLogs({
+    name: 'installation_log.txt',
+    filePath: dirs.OperateInstallationLog,
+  });
+
+  const tempDir = os.tmpdir();
+
+  // OS info
+  const osInfo = `
+    OS Type: ${os.type()}
+    OS Platform: ${os.platform()}
+    OS Arch: ${os.arch()}
+    OS Release: ${os.release()}
+    Total Memory: ${os.totalmem()}
+    Free Memory: ${os.freemem()}
+  `;
+  const osInfoFilePath = path.join(tempDir, 'os_info.txt');
+  fs.writeFileSync(osInfoFilePath, osInfo);
+
+  // Persistent store
+  let storeFilePath;
+  if (data.store) {
+    storeFilePath = path.join(tempDir, 'store.txt');
+    fs.writeFileSync(storeFilePath, JSON.stringify(data.store, null, 2));
+  }
+
+  // Other debug data: balances, addresses, etc.
+  let debugDataFilePath;
+  if (data.debugData) {
+    debugDataFilePath = getSanitizedLogs({
+      name: 'debug_data.txt',
+      data: JSON.stringify(data.debugData, null, 2),
+    });
+  }
+
+  // Create a zip archive
+  const zip = new AdmZip();
+  zip.addLocalFile(versionFile);
+  zip.addLocalFile(logFile);
+  zip.addLocalFile(installationLog);
+  zip.addLocalFile(osInfoFilePath);
+  zip.addLocalFile(storeFilePath);
+  zip.addLocalFile(debugDataFilePath);
+
+  // Show save dialog
+  const { filePath } = await dialog.showSaveDialog({
+    title: 'Save Logs',
+    defaultPath: path.join(os.homedir(), 'pearl_logs.zip'),
+    filters: [{ name: 'Zip Files', extensions: ['zip'] }],
+  });
+
+  let result;
+
+  if (filePath) {
+    // Write the zip file to the selected path
+    zip.writeZip(filePath);
+    result = { success: true, dirPath: path.dirname(filePath) };
+  } else {
+    result = { success: false };
+  }
+
+  // Remove temporary files
+  fs.unlinkSync(logFile);
+  fs.unlinkSync(installationLog);
+  fs.unlinkSync(osInfoFilePath);
+  if (storeFilePath) fs.unlinkSync(storeFilePath);
+  if (debugDataFilePath) fs.unlinkSync(debugDataFilePath);
+
+  return result;
+});

electron/preload.js

@@ -20,4 +20,6 @@ contextBridge.exposeInMainWorld('electronAPI', {
   setAppHeight: (height) => ipcRenderer.send('set-height', height),
   showNotification: (title, description) =>
     ipcRenderer.send('show-notification', title, description),
+  saveLogs: (data) => ipcRenderer.invoke('save-logs', data),
+  openPath: (filePath) => ipcRenderer.send('open-path', filePath),
 });

frontend/client/types.ts

@@ -25,7 +25,7 @@ export type ChainData = {
 export type Service = {
   name: string;
   hash: string;
-  keys: ServiceKeys;
+  keys: ServiceKeys[];
   readme?: string;
   ledger: LedgerConfig;
   chain_data: ChainData;