From 54c461d4627766bcb33909a5240176b060cc10d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevecsek=20Bal=C3=A1zs?= Date: Tue, 17 Dec 2024 16:38:13 +0100 Subject: [PATCH 1/8] fix: coinbase padding (#1242) Description --- coinbase '=' padding character caused an issue where an alternative string was written to the blockchain Motivation and Context --- Invalid id written to the chain. How Has This Been Tested? --- On esmeralda with a local build. What process can a PR reviewer use to test or verify this change? --- Check the coinbase extra string that gets written to the block and compare that to what the merge mining proxy gets as an arg. Breaking Changes --- - [x] None - [ ] Requires data directory on base node to be deleted - [ ] Requires hard fork - [ ] Other - Please specify --- src-tauri/src/telemetry_manager.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src-tauri/src/telemetry_manager.rs b/src-tauri/src/telemetry_manager.rs index 56e5e6298..baf503f11 100644 --- a/src-tauri/src/telemetry_manager.rs +++ b/src-tauri/src/telemetry_manager.rs @@ -261,7 +261,8 @@ impl TelemetryManager { let mut sha256_hasher = sha2::Sha256::new(); sha2::Digest::update(&mut sha256_hasher, id_as_bytes); let id_sha256 = sha256_hasher.finalize(); - let id_base64_sha256 = BASE64_STANDARD.encode(id_sha256); + let id_base64_sha256 = BASE64_STANDARD_NO_PAD.encode(id_sha256); + let unique_string = format!( "v3,{},{},{}", buf.to_monero_base58(), From a4eff368453214377b5c58dc44b2e0fda1148636 Mon Sep 17 00:00:00 2001 From: Misieq01 <38589417+Misieq01@users.noreply.github.com> Date: Tue, 17 Dec 2024 17:52:16 +0100 Subject: [PATCH 2/8] feat: add-app-version-to-setup-screen (#1268) Fixes #1255 ### [ Summary ] - Added `AppVersion` component which uses tauri api to get version and displays it ![image](https://github.com/user-attachments/assets/ac734ce3-5a35-420a-84d9-ecc3909ad8c9) ![image](https://github.com/user-attachments/assets/8af878f1-3b64-456a-9f6d-364354007a10) --- src/containers/phase/Setup/Setup.tsx | 2 ++ .../phase/Setup/components/AppVersion.tsx | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 src/containers/phase/Setup/components/AppVersion.tsx diff --git a/src/containers/phase/Setup/Setup.tsx b/src/containers/phase/Setup/Setup.tsx index 2b10d56a8..5c87c4abb 100644 --- a/src/containers/phase/Setup/Setup.tsx +++ b/src/containers/phase/Setup/Setup.tsx @@ -4,6 +4,7 @@ import HeroText from './components/HeroText'; import InfoNav from './components/InfoNav/InfoNav'; import { SetupWrapper } from '@app/containers/phase/Setup/Setup.styles'; import grain from '/assets/img/grain.png'; +import AppVersion from './components/AppVersion'; export default function Setup() { useSetUp(); @@ -12,6 +13,7 @@ export default function Setup() {