From 786c558a1fe8133894a3f2a309017810a0f5038c Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Mon, 17 Oct 2022 09:55:24 -0400
Subject: [PATCH] Bump sbf-tools to v1.30

---
 sdk/bpf/scripts/install.sh          | 2 +-
 sdk/cargo-build-sbf/src/main.rs     | 2 +-
 sdk/cargo-build-sbf/tests/crates.rs | 4 ++--
 sdk/sbf/scripts/install.sh          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index 205d98407f..3c3a4e4e38 100755
--- a/sdk/bpf/scripts/install.sh
+++ b/sdk/bpf/scripts/install.sh
@@ -102,7 +102,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
 fi
 
 # Install Rust-BPF
-version=v1.29
+version=v1.30
 if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then
   (
     set -e
diff --git a/sdk/cargo-build-sbf/src/main.rs b/sdk/cargo-build-sbf/src/main.rs
index 3dcf5df2b3..2f7e6a6c9c 100644
--- a/sdk/cargo-build-sbf/src/main.rs
+++ b/sdk/cargo-build-sbf/src/main.rs
@@ -830,7 +830,7 @@ fn main() {
 
     // The following line is scanned by CI configuration script to
     // separate cargo caches according to the version of sbf-tools.
-    let sbf_tools_version = "v1.29";
+    let sbf_tools_version = "v1.30";
     let version = format!("{}\nsbf-tools {}", crate_version!(), sbf_tools_version);
     let matches = clap::Command::new(crate_name!())
         .about(crate_description!())
diff --git a/sdk/cargo-build-sbf/tests/crates.rs b/sdk/cargo-build-sbf/tests/crates.rs
index 941ff56d1b..8c8b59ae1b 100644
--- a/sdk/cargo-build-sbf/tests/crates.rs
+++ b/sdk/cargo-build-sbf/tests/crates.rs
@@ -14,7 +14,7 @@ fn run_cargo_build(crate_name: &str, extra_args: &[&str], fail: bool) {
         .join(crate_name)
         .join("Cargo.toml");
     let toml = format!("{}", toml.display());
-    let mut args = vec!["-v", "--sbf-sdk", "../bpf", "--manifest-path", &toml];
+    let mut args = vec!["-v", "--sbf-sdk", "../sbf", "--manifest-path", &toml];
     for arg in extra_args {
         args.push(arg);
     }
@@ -113,7 +113,7 @@ fn test_sbfv2() {
         .expect("Unable to get ../.. of current working dir");
     let readelf = root
         .join("sdk")
-        .join("bpf")
+        .join("sbf")
         .join("dependencies")
         .join("sbf-tools")
         .join("llvm")
diff --git a/sdk/sbf/scripts/install.sh b/sdk/sbf/scripts/install.sh
index d91164c92e..baaff0af96 100755
--- a/sdk/sbf/scripts/install.sh
+++ b/sdk/sbf/scripts/install.sh
@@ -102,7 +102,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
 fi
 
 # Install Rust-SBF
-version=v1.29
+version=v1.30
 if [[ ! -e sbf-tools-$version.md || ! -e sbf-tools ]]; then
   (
     set -e