frank/market & oracle maps

Cargo.toml

@@ -54,3 +54,4 @@ spl-associated-token-account = "1.1.2"
 anchor-client = "0.27.0"
 anchor-lang = "*"
 bytes = "*"
+futures = "0.3.30"

README.md

@@ -1,7 +1,7 @@
 <div align="center">
   <img height="120x" src="https://uploads-ssl.webflow.com/611580035ad59b20437eb024/616f97a42f5637c4517d0193_Logo%20(1)%20(1).png" />
 
-  <h1 style="margin-top:20px;">Drift Protocol v2 (Rust SDK)</h1>
+  <h1 style="margin-top:20px;">drift-rs</h1>
 
   <p>
     <a href="https://crates.io/crates/drift-sdk"><img alt="Crates.io" src="https://img.shields.io/crates/v/drift-sdk.img" /></a>
@@ -11,9 +11,9 @@
   </p>
 </div>
 
-# Drift Protocol v2 (Rust SDK)
+# drift-rs
 
-Rust SDK for building off chain clients for interacting with the [Drift V2](https://github.com/drift-labs/protocol-v2) protocol.
+Experimental, high performance Rust SDK for building off chain clients for interacting with the [Drift V2](https://github.com/drift-labs/protocol-v2) protocol.
 
 ## Setup
 

src/dlob/dlob.rs

@@ -15,7 +15,7 @@ use crate::dlob::dlob_node::{
 use crate::dlob::market::{get_order_lists, Exchange, Market, OpenOrders, SubType};
 use crate::event_emitter::Event;
 use crate::math::order::is_resting_limit_order;
-use crate::usermap::Usermap;
+use crate::usermap::UserMap;
 use crate::utils::market_type_to_string;
 
 #[derive(Clone)]
@@ -44,7 +44,7 @@ impl DLOB {
         }
     }
 
-    pub fn build_from_usermap(&mut self, usermap: &Usermap, slot: u64) {
+    pub fn build_from_usermap(&mut self, usermap: &UserMap, slot: u64) {
         usermap.usermap.iter().par_bridge().for_each(|user_ref| {
             let user = user_ref.value();
             let user_key = user_ref.key();

src/dlob/dlob_builder.rs

@@ -2,13 +2,13 @@ use crate::{
     dlob::dlob::DLOB,
     event_emitter::{Event, EventEmitter},
     slot_subscriber::SlotSubscriber,
-    usermap::Usermap,
+    usermap::UserMap,
     SdkResult,
 };
 
 pub struct DLOBBuilder {
     slot_subscriber: SlotSubscriber,
-    usermap: Usermap,
+    usermap: UserMap,
     rebuild_frequency: u64,
     dlob: DLOB,
     event_emitter: EventEmitter,
@@ -17,7 +17,7 @@ pub struct DLOBBuilder {
 impl DLOBBuilder {
     pub fn new(
         slot_subscriber: SlotSubscriber,
-        usermap: Usermap,
+        usermap: UserMap,
         rebuild_frequency: u64,
     ) -> DLOBBuilder {
         DLOBBuilder {
@@ -56,6 +56,7 @@ impl DLOBBuilder {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::memcmp::get_user_with_order_filter;
     use crate::utils::get_ws_url;
     use solana_sdk::commitment_config::CommitmentConfig;
     use solana_sdk::commitment_config::CommitmentLevel;
@@ -70,7 +71,12 @@ mod tests {
         };
 
         let slot_subscriber = SlotSubscriber::new(get_ws_url(&endpoint.clone()).unwrap());
-        let usermap = Usermap::new(commitment, endpoint, true);
+        let mut usermap = UserMap::new(
+            commitment,
+            endpoint,
+            true,
+            Some(vec![get_user_with_order_filter()]),
+        );
         let mut dlob_builder = DLOBBuilder::new(slot_subscriber, usermap, 30);
 
         dlob_builder
@@ -90,13 +96,18 @@ mod tests {
     #[tokio::test]
     #[cfg(rpc_tests)]
     async fn test_build_time() {
-        let endpoint = "url".to_string();
+        let endpoint = "rpc".to_string();
         let commitment = CommitmentConfig {
             commitment: CommitmentLevel::Processed,
         };
 
         let mut slot_subscriber = SlotSubscriber::new(get_ws_url(&endpoint.clone()).unwrap());
-        let mut usermap = Usermap::new(commitment, endpoint, true);
+        let mut usermap = UserMap::new(
+            commitment,
+            endpoint,
+            true,
+            Some(vec![get_user_with_order_filter()]),
+        );
         let _ = slot_subscriber.subscribe().await;
         let _ = usermap.subscribe().await;