From e55bfaab7678db355365671a7f5ab0c09c795712 Mon Sep 17 00:00:00 2001
From: Brian Balser <brian.balser@gmail.com>
Date: Tue, 2 Jul 2024 13:36:58 -0400
Subject: [PATCH] Update to latest helium-lib (#834)

---
 Cargo.lock                   | 61 ++++++------------------------------
 price/src/price_generator.rs |  8 ++++-
 2 files changed, 16 insertions(+), 53 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5185df0d2..ab8eefdee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1823,7 +1823,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b"
 dependencies = [
  "borsh-derive 0.10.3",
- "hashbrown 0.11.2",
+ "hashbrown 0.13.1",
 ]
 
 [[package]]
@@ -3736,7 +3736,7 @@ dependencies = [
  "bs58 0.5.0",
  "byteorder",
  "ed25519-compact",
- "getrandom 0.1.16",
+ "getrandom 0.2.10",
  "k256",
  "lazy_static",
  "multihash",
@@ -3763,7 +3763,7 @@ dependencies = [
 [[package]]
 name = "helium-lib"
 version = "0.0.0"
-source = "git+https://github.com/helium/helium-wallet-rs.git?branch=master#094c5792eff2108c497679e0010d5cd6a0fa9a79"
+source = "git+https://github.com/helium/helium-wallet-rs.git?branch=master#a4db666b45a531d690e561c225ca23c503a08bd1"
 dependencies = [
  "anchor-client",
  "anchor-spl",
@@ -3792,7 +3792,7 @@ dependencies = [
  "solana-sdk",
  "solana-transaction-status",
  "spl-account-compression",
- "spl-associated-token-account 1.1.3",
+ "spl-associated-token-account 3.0.2",
  "thiserror",
  "tracing",
  "url",
@@ -5497,7 +5497,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
  "syn 2.0.58",
@@ -7890,7 +7890,7 @@ dependencies = [
  "solana-account-decoder",
  "solana-sdk",
  "spl-associated-token-account 2.3.0",
- "spl-memo 4.0.0",
+ "spl-memo",
  "spl-token 4.0.0",
  "spl-token-2022 1.0.0",
  "thiserror",
@@ -8034,22 +8034,6 @@ dependencies = [
  "spl-noop",
 ]
 
-[[package]]
-name = "spl-associated-token-account"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978dba3bcbe88d0c2c58366c254d9ea41c5f73357e72fc0bdee4d6b5fc99c8f4"
-dependencies = [
- "assert_matches",
- "borsh 0.9.3",
- "num-derive 0.3.3",
- "num-traits",
- "solana-program",
- "spl-token 3.5.0",
- "spl-token-2022 0.6.1",
- "thiserror",
-]
-
 [[package]]
 name = "spl-associated-token-account"
 version = "2.3.0"
@@ -8163,15 +8147,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "spl-memo"
-version = "3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325"
-dependencies = [
- "solana-program",
-]
-
 [[package]]
 name = "spl-memo"
 version = "4.0.0"
@@ -8324,24 +8299,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "spl-token-2022"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0043b590232c400bad5ee9eb983ced003d15163c4c5d56b090ac6d9a57457b47"
-dependencies = [
- "arrayref",
- "bytemuck",
- "num-derive 0.3.3",
- "num-traits",
- "num_enum 0.5.10",
- "solana-program",
- "solana-zk-token-sdk",
- "spl-memo 3.0.1",
- "spl-token 3.5.0",
- "thiserror",
-]
-
 [[package]]
 name = "spl-token-2022"
 version = "1.0.0"
@@ -8356,7 +8313,7 @@ dependencies = [
  "solana-program",
  "solana-security-txt",
  "solana-zk-token-sdk",
- "spl-memo 4.0.0",
+ "spl-memo",
  "spl-pod 0.1.1",
  "spl-token 4.0.0",
  "spl-token-group-interface 0.1.0",
@@ -8380,7 +8337,7 @@ dependencies = [
  "solana-program",
  "solana-security-txt",
  "solana-zk-token-sdk",
- "spl-memo 4.0.0",
+ "spl-memo",
  "spl-pod 0.2.2",
  "spl-token 4.0.0",
  "spl-token-group-interface 0.2.3",
@@ -9239,7 +9196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
  "cfg-if",
- "rand 0.7.3",
+ "rand 0.8.5",
  "static_assertions",
 ]
 
diff --git a/price/src/price_generator.rs b/price/src/price_generator.rs
index 7fd3fb2e7..abd887fd4 100644
--- a/price/src/price_generator.rs
+++ b/price/src/price_generator.rs
@@ -40,6 +40,12 @@ pub struct PriceGenerator {
     file_sink: file_sink::FileSinkClient,
 }
 
+impl AsRef<RpcClient> for PriceGenerator {
+    fn as_ref(&self) -> &RpcClient {
+        &self.client
+    }
+}
+
 impl ManagedTask for PriceGenerator {
     fn start_task(
         self: Box<Self>,
@@ -190,7 +196,7 @@ impl PriceGenerator {
     }
 
     async fn get_pyth_price(&self) -> Result<Price> {
-        helium_lib::token::price::get(&self.client, self.token)
+        helium_lib::token::price::get(self, self.token)
             .await
             .map_err(anyhow::Error::from)
             .and_then(|p| {