perf: ⚡️ Use an actual queue instead of loading the vector in up (#346)

* perf: ⚡️ Use an actual queue instead of loading the vector in up

* Update contracts/account-history-contract/src/action/sudo/update_account.rs

Co-authored-by: Amit Yadav <amy29981@gmail.com>

* feat: 🎸 not reseting the flag for each migration

---------

Co-authored-by: Cosmic Vagabond <121588426+cosmic-vagabond@users.noreply.github.com>
Co-authored-by: Amit Yadav <amy29981@gmail.com>

Author: 3 people

Cargo.lock

@@ -16,7 +16,7 @@ cosmwasm-std = { version = "1.1.4", features = [
     "staking",
 ], default-features = false }
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
-cw-storage-plus = { version = "0.15.1", default-features = false, features = [
+cw-storage-plus = { version = "1.2.0", default-features = false, features = [
     "iterator",
 ] }
 thiserror = { version = "1", default-features = false }

contracts/account-history-contract/Cargo.toml

@@ -1,11 +1,9 @@
 use crate::states::USER_ADDRESS_QUEUE;
-use cosmwasm_std::{StdResult, Storage};
+use cosmwasm_std::{DepsMut, StdResult};
+use elys_bindings::ElysQuery;
 
-pub fn add_user_address_to_queue(storage: &mut dyn Storage, user_address: String) -> StdResult<()> {
-    let empty = ();
+pub fn add_user_address_to_queue(deps: DepsMut<ElysQuery>, user_address: String) -> StdResult<()> {
+    USER_ADDRESS_QUEUE.push_front(deps.storage, &user_address)?;
 
-    if USER_ADDRESS_QUEUE.has(storage, user_address.as_str()) == false {
-        USER_ADDRESS_QUEUE.save(storage, user_address.as_str(), &empty)?;
-    }
     Ok(())
 }

contracts/account-history-contract/src/action/execute/add_user_address_to_queue.rs

@@ -20,18 +20,9 @@ pub fn update_account(deps: DepsMut<ElysQuery>, env: Env) -> StdResult<Response<
     METADATA.save(deps.storage, &metadata)?;
 
     let today = get_today(&env.block);
-    let mut user_address_queue: Vec<String> = USER_ADDRESS_QUEUE
-        .prefix_range(deps.storage, None, None, cosmwasm_std::Order::Descending)
-        .filter_map(|res| res.ok().map(|(addr, _)| addr))
-        .collect();
 
     let processed_account_per_block: usize =
         PROCESSED_ACCOUNT_PER_BLOCK.load(deps.storage)? as usize;
-    let processed_account_per_block = if processed_account_per_block > user_address_queue.len() {
-        user_address_queue.len()
-    } else {
-        processed_account_per_block
-    };
 
     let mut today_snapshots = match HISTORY.may_load(deps.storage, &today)? {
         Some(snapshots) => snapshots,
@@ -41,14 +32,16 @@ pub fn update_account(deps: DepsMut<ElysQuery>, env: Env) -> StdResult<Response<
     let generator = AccountSnapshotGenerator::new(&deps.as_ref())?;
 
     for _ in 0..processed_account_per_block {
-        if user_address_queue.is_empty() == true {
+        if USER_ADDRESS_QUEUE.is_empty(deps.storage)? == true {
             break;
         }
 
         // remove the first element from the queue
-        let user_address = user_address_queue.remove(0);
-        // remove the user address from the queue
-        USER_ADDRESS_QUEUE.remove(deps.storage, &user_address);
+        let user_address = if let Some(addr) = USER_ADDRESS_QUEUE.pop_back(deps.storage)? {
+            addr.to_string()
+        } else {
+            break;
+        };
 
         if today_snapshots.get(&user_address).is_some() {
             // skip if the account has been updated today

contracts/account-history-contract/src/action/sudo/update_account.rs

@@ -24,7 +24,7 @@ pub fn execute(
             if trade_shield_address.as_str() != info.sender.as_str() {
                 return Err(StdError::generic_err("Unauthorized"));
             }
-            add_user_address_to_queue(deps.storage, user_address)?;
+            add_user_address_to_queue(deps, user_address)?;
             Ok(Response::new())
         }
         ExecuteMsg::ChangeParams {

contracts/account-history-contract/src/entry_point/execute.rs

@@ -5,10 +5,7 @@ use elys_bindings::account_history::msg::MigrationMsg;
 // use elys_bindings::account_history::types::Metadata;
 use elys_bindings::{ElysMsg, /*ElysQuerier,*/ ElysQuery};
 
-use crate::states::{
-    EXPIRATION, PARAMS_ADMIN, PROCESSED_ACCOUNT_PER_BLOCK, TRADE_SHIELD_ADDRESS,
-    UPDATE_ACCOUNT_ENABLED,
-};
+use crate::states::{EXPIRATION, PARAMS_ADMIN, PROCESSED_ACCOUNT_PER_BLOCK, TRADE_SHIELD_ADDRESS};
 
 use super::instantiate::{CONTRACT_NAME, CONTRACT_VERSION};
 
@@ -37,8 +34,6 @@ pub fn migrate(
 
     PROCESSED_ACCOUNT_PER_BLOCK.save(deps.storage, &limit)?;
 
-    UPDATE_ACCOUNT_ENABLED.save(deps.storage, &true)?;
-
     // METADATA
     // let querier = ElysQuerier::new(&deps.querier);
 

contracts/account-history-contract/src/entry_point/migrate.rs

@@ -16,7 +16,7 @@ use crate::action::query::{
     pool_asset_estimation, user_snapshots, user_value,
 };
 
-use cosmwasm_std::{entry_point, to_json_binary, Binary, Deps, Env, StdResult, Uint128};
+use cosmwasm_std::{entry_point, to_json_binary, Binary, Deps, Env, StdResult};
 use elys_bindings::{
     account_history::types::ElysDenom, query_resp::QueryAprResponse, ElysQuerier, ElysQuery,
 };
@@ -253,13 +253,9 @@ pub fn query(deps: Deps<ElysQuery>, env: Env, msg: QueryMsg) -> StdResult<Binary
             to_json_binary(&response)
         }
         AddressQueueSize {} => {
-            let user_address_queue: Vec<String> = USER_ADDRESS_QUEUE
-                .prefix_range(deps.storage, None, None, cosmwasm_std::Order::Descending)
-                .filter_map(|res| res.ok().map(|(addr, _)| addr))
-                .collect();
-            let size = Uint128::new(user_address_queue.len() as u128);
+            let user_address_queue_data_size = USER_ADDRESS_QUEUE.len(deps.storage)? as u128;
 
-            to_json_binary(&size)
+            to_json_binary(&user_address_queue_data_size)
         }
     }
 }

contracts/account-history-contract/src/entry_point/query.rs

@@ -1,3 +1,3 @@
-use cw_storage_plus::Map;
+use cw_storage_plus::Deque;
 
-pub const USER_ADDRESS_QUEUE: Map<&str, ()> = Map::new("user address queue");
+pub const USER_ADDRESS_QUEUE: Deque<String> = Deque::new("user address queue 1");

contracts/account-history-contract/src/states/user_address_queue.rs

@@ -11,7 +11,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 cosmwasm-std = { version = "1.1.4", features = ["staking"] }
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
-cw-storage-plus = "0.15.1"
+cw-storage-plus = "1.2.0"
 thiserror = "1"
 schemars = "0.8.1"
 cosmwasm-schema = "1.1.4"

contracts/financial-snapshot-contract/Cargo.toml

@@ -9,7 +9,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 cosmwasm-std = { version = "1.1.4", features = ["staking"] }
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
-cw-storage-plus = "0.15.1"
+cw-storage-plus = "1.2.0"
 thiserror = "1"
 schemars = "0.8.1"
 cosmwasm-schema = "1.1.4"