From f70139f7855e06c7650327792d6a50f528b40989 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Wed, 28 Aug 2024 13:55:55 -0300
Subject: [PATCH] Bump platform tools version (#2745)

* Bump platform tools version

* Remove unused struct

(cherry picked from commit ad6002f90ba8ed24ca2d7ca5e07c049498474e75)

# Conflicts:
#	sdk/program/Cargo.toml
---
 programs/sbf/rust/ro_modify/src/lib.rs | 16 ----------------
 sdk/cargo-build-sbf/src/main.rs        |  2 +-
 sdk/program/Cargo.toml                 |  4 ++++
 sdk/sbf/scripts/install.sh             |  2 +-
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/programs/sbf/rust/ro_modify/src/lib.rs b/programs/sbf/rust/ro_modify/src/lib.rs
index daa529f5370f19..25d99d67658724 100644
--- a/programs/sbf/rust/ro_modify/src/lib.rs
+++ b/programs/sbf/rust/ro_modify/src/lib.rs
@@ -39,22 +39,6 @@ struct SolAccountInfo {
     executable: bool,
 }
 
-/// Rust representation of C's SolSignerSeed
-#[derive(Debug)]
-#[repr(C)]
-struct SolSignerSeedC {
-    addr: u64,
-    len: u64,
-}
-
-/// Rust representation of C's SolSignerSeeds
-#[derive(Debug)]
-#[repr(C)]
-struct SolSignerSeedsC {
-    addr: u64,
-    len: u64,
-}
-
 const READONLY_ACCOUNTS: &[SolAccountInfo] = &[
     SolAccountInfo {
         is_signer: false,
diff --git a/sdk/cargo-build-sbf/src/main.rs b/sdk/cargo-build-sbf/src/main.rs
index 6d02499c8fbc6d..3c3c56a08d14bf 100644
--- a/sdk/cargo-build-sbf/src/main.rs
+++ b/sdk/cargo-build-sbf/src/main.rs
@@ -913,7 +913,7 @@ fn main() {
 
     // The following line is scanned by CI configuration script to
     // separate cargo caches according to the version of platform-tools.
-    let platform_tools_version = String::from("v1.42");
+    let platform_tools_version = String::from("v1.43");
     let rust_base_version = get_base_rust_version(platform_tools_version.as_str());
     let version = format!(
         "{}\nplatform-tools {}\n{}",
diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml
index c37cd182bbb869..f9aaf96c759219 100644
--- a/sdk/program/Cargo.toml
+++ b/sdk/program/Cargo.toml
@@ -9,7 +9,11 @@ repository = { workspace = true }
 homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
+<<<<<<< HEAD
 rust-version = "1.75.0" # solana platform-tools rust version
+=======
+rust-version = "1.79.0"                          # solana platform-tools rust version
+>>>>>>> ad6002f90b (Bump platform tools version (#2745))
 
 [dependencies]
 bincode = { workspace = true }
diff --git a/sdk/sbf/scripts/install.sh b/sdk/sbf/scripts/install.sh
index e51f46d58c418a..2b98ff6595eddd 100755
--- a/sdk/sbf/scripts/install.sh
+++ b/sdk/sbf/scripts/install.sh
@@ -109,7 +109,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
 fi
 
 # Install platform tools
-version=v1.42
+version=v1.43
 if [[ ! -e platform-tools-$version.md || ! -e platform-tools ]]; then
   (
     set -e