v.0.16_solana-2.0.15

.github/workflows/ci.yml

@@ -10,10 +10,13 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
+    - name: Install Linux Packages
+      run: |
+        sudo apt-get update -y
+        sudo apt-get install libssl-dev openssl protobuf-compiler -y
+
     - name: Checkout code
       uses: actions/checkout@v2
 

.gitignore

@@ -1 +1,2 @@
 /target
+.idea

Cargo.toml

@@ -18,15 +18,15 @@ repository = "https://github.com/blockworks-foundation/solana-lite-account-manag
 license = "AGPL"
 
 [workspace.dependencies]
-solana-sdk = "~1.18.23"
-solana-rpc-client = "~1.18.23"
-solana-account-decoder = "~1.18.23"
-solana-client = "~1.18.23"
-solana-program = "~1.18.23"
-solana-accounts-db = "~1.18.23"
-solana-frozen-abi-macro = "~1.18.23"
-solana-runtime = "1.18.23"
-solana-rpc-client-api = "~1.18.23"
+solana-sdk = "~2.0.15"
+solana-rpc-client = "~2.0.15"
+solana-account-decoder = "~2.0.15"
+solana-client = "~2.0.15"
+solana-program = "~2.0.15"
+solana-accounts-db = "~2.0.15"
+solana-frozen-abi-macro = "~2.0.15"
+solana-runtime = "~2.0.15"
+solana-rpc-client-api = "~2.0.15"
 
 dashmap = "5.4.0"
 serde = { version = "1.0.160", features = ["derive"] }
@@ -48,8 +48,8 @@ bitflags = "2.6.0"
 arrayref = "0.3.7"
 
 # spl token
-spl-token = "~4.0.0"
-spl-token-2022 = "~3.0.0"
+spl-token = "6.0.0"
+spl-token-2022 = "5.0.2"
 
 lite-account-manager-common = {path = "common", version="0.1.0"}
 lite-account-storage = {path = "account_storage", version="0.1.0"}

common/src/account_filter.rs

@@ -176,7 +176,7 @@ impl From<&RpcFilterType> for AccountFilterType {
             RpcFilterType::DataSize(size) => AccountFilterType::Datasize(*size),
             RpcFilterType::Memcmp(memcmp) => {
                 let bytes = memcmp.bytes().map(|x| (*x).clone()).unwrap_or_default();
-                let offset = memcmp.offset as u64;
+                let offset = memcmp.offset() as u64;
                 AccountFilterType::Memcmp(MemcmpFilter {
                     offset,
                     data: MemcmpFilterData::Bytes(bytes),

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.76.0"
+channel = "1.78.0"

simulate_from_snapshot/Cargo.toml

@@ -40,5 +40,5 @@ tower = "0.4.13"
 tower-http = { version = "0.4.0", features = ["full"] }
 
 
-quic-geyser-client = { git = "https://github.com/blockworks-foundation/quic_geyser_plugin.git", branch = "main" }
-quic-geyser-common = { git = "https://github.com/blockworks-foundation/quic_geyser_plugin.git", branch = "main" }
+quic-geyser-client = { git = "https://github.com/blockworks-foundation/quic_geyser_plugin.git", tag = "v0.1.6_solana+2.0.15" }
+quic-geyser-common = { git = "https://github.com/blockworks-foundation/quic_geyser_plugin.git", tag = "v0.1.6_solana+2.0.15" }

simulate_from_snapshot/src/snapshot_utils/solana.rs

@@ -14,6 +14,9 @@
 
 // This file contains code vendored from https://github.com/solana-labs/solana
 
+use std::collections::{HashMap, HashSet};
+use std::io::Read;
+
 use bincode::Options;
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
@@ -21,7 +24,6 @@ use solana_accounts_db::account_storage::meta::StoredMetaWriteVersion;
 use solana_accounts_db::accounts_db::BankHashStats;
 use solana_accounts_db::ancestors::AncestorsForSerialization;
 use solana_accounts_db::blockhash_queue::BlockhashQueue;
-use solana_accounts_db::rent_collector::RentCollector;
 use solana_frozen_abi_macro::AbiExample;
 use solana_runtime::epoch_stakes::EpochStakes;
 use solana_runtime::stakes::Stakes;
@@ -33,10 +35,9 @@ use solana_sdk::hard_forks::HardForks;
 use solana_sdk::hash::Hash;
 use solana_sdk::inflation::Inflation;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::rent_collector::RentCollector;
 use solana_sdk::slot_history::Slot;
 use solana_sdk::stake::state::Delegation;
-use std::collections::{HashMap, HashSet};
-use std::io::Read;
 
 const MAX_STREAM_SIZE: u64 = 32 * 1024 * 1024 * 1024;