fix: make queue field nullable in accounts table (helius-labs#280)

* Make queue field nullable in accounts table

* regenerate schema

Author: sergeytimoshin

src/api/method/get_compressed_account_proof/v2.rs

@@ -127,7 +127,7 @@ pub async fn get_compressed_account_proof_v2(
 
     // Enrich with account data if available
     if let Some(account) = account {
-        result.tree_context.tree_type = account.tree_type as u16;
+        result.tree_context.tree_type = account.tree_type.map(|t| t as u16).unwrap_or(0);
         result.tree_context.queue = SerializablePubkey::try_from(account.queue)?;
     }
 

src/api/method/get_multiple_compressed_account_proofs/v2.rs

@@ -146,7 +146,7 @@ pub async fn get_multiple_compressed_account_proofs_v2(
     for value in &mut result {
         if let Some(account) = account_map.get(&value.hash.to_vec()) {
             value.tree_context = TreeContextInfo {
-                tree_type: account.tree_type as u16,
+                tree_type: account.tree_type.map(|t| t as u16).unwrap_or(0),
                 tree: SerializablePubkey::try_from(account.tree.clone())?,
                 queue: SerializablePubkey::try_from(account.queue.clone())?,
                 cpi_context: None,

src/api/method/get_validity_proof/v2.rs

@@ -200,7 +200,7 @@ pub async fn get_validity_proof_v2(
                     root_index: None.into(), // prove_by_index = true
                     leaf_index: acc_model.leaf_index as u64,
                     merkle_context: MerkleContextV2 {
-                        tree_type: acc_model.tree_type as u16,
+                        tree_type: acc_model.tree_type.map(|t| t as u16).unwrap_or(0),
                         tree: SerializablePubkey::try_from_slice(&acc_model.tree)
                             .unwrap_or_default(),
                         queue: SerializablePubkey::try_from_slice(&acc_model.queue)

src/common/typedefs/account/context.rs

@@ -146,7 +146,7 @@ impl TryFrom<Model> for AccountWithContext {
                     .map(|index| UnsignedInteger(index as u64)),
                 nullifier: account.nullifier.map(Hash::try_from).transpose()?,
                 tx_hash: account.tx_hash.map(Hash::try_from).transpose()?,
-                tree_type: account.tree_type as u16,
+                tree_type: account.tree_type.map(|t| t as u16).unwrap_or(0),
             },
         })
     }

src/common/typedefs/account/v2.rs

@@ -68,7 +68,7 @@ impl TryFrom<Model> for AccountV2 {
             seq: account.seq.map(|seq| UnsignedInteger(seq as u64)),
             prove_by_index: account.in_output_queue,
             merkle_context: MerkleContextV2 {
-                tree_type: account.tree_type as u16,
+                tree_type: account.tree_type.map(|t| t as u16).unwrap_or(0),
                 tree: account.tree.try_into()?,
                 queue: account.queue.clone().try_into()?,
                 cpi_context: None,

src/dao/generated/accounts.rs

@@ -12,23 +12,22 @@ pub struct Model {
     pub address: Option<Vec<u8>>,
     pub owner: Vec<u8>,
     pub tree: Vec<u8>,
-    /// Queue pubkey, for batched trees output queue pubkey
-    pub queue: Vec<u8>,
     pub leaf_index: i64,
-    pub in_output_queue: bool,
-    pub nullifier_queue_index: Option<i64>,
-    pub nullified_in_tree: bool,
-    pub tree_type: i32,
-    pub nullifier: Option<Vec<u8>>,
-    pub tx_hash: Option<Vec<u8>>,
     pub seq: Option<i64>,
     pub slot_created: i64,
     pub spent: bool,
     pub prev_spent: Option<bool>,
-    #[sea_orm(column_type = "Decimal(Some((20, 0)))")]
+    #[sea_orm(column_type = "Decimal(Some((23, 0)))")]
     pub lamports: Decimal,
-    #[sea_orm(column_type = "Decimal(Some((20, 0)))", nullable)]
+    #[sea_orm(column_type = "Decimal(Some((23, 0)))", nullable)]
     pub discriminator: Option<Decimal>,
+    pub tree_type: Option<i32>,
+    pub nullified_in_tree: bool,
+    pub nullifier_queue_index: Option<i64>,
+    pub in_output_queue: bool,
+    pub queue: Vec<u8>,
+    pub nullifier: Option<Vec<u8>>,
+    pub tx_hash: Option<Vec<u8>>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

src/dao/generated/address_queue.rs src/dao/generated/address_queues.rssrc/dao/generated/address_queue.rs renamed to src/dao/generated/address_queues.rs

@@ -5,9 +5,9 @@ use sea_orm::entity::prelude::*;
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "address_queues")]
 pub struct Model {
+    pub tree: Vec<u8>,
     #[sea_orm(primary_key, auto_increment = false)]
     pub address: Vec<u8>,
-    pub tree: Vec<u8>,
     pub queue_index: i64,
 }
 

src/dao/generated/mod.rs

@@ -4,7 +4,7 @@ pub mod prelude;
 
 pub mod account_transactions;
 pub mod accounts;
-pub mod address_queue;
+pub mod address_queues;
 pub mod blocks;
 pub mod indexed_trees;
 pub mod owner_balances;

src/dao/generated/owner_balances.rs

@@ -7,7 +7,7 @@ use sea_orm::entity::prelude::*;
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub owner: Vec<u8>,
-    #[sea_orm(column_type = "Decimal(Some((20, 0)))")]
+    #[sea_orm(column_type = "Decimal(Some((23, 0)))")]
     pub lamports: Decimal,
 }
 

src/dao/generated/prelude.rs

@@ -2,6 +2,7 @@
 
 pub use super::account_transactions::Entity as AccountTransactions;
 pub use super::accounts::Entity as Accounts;
+pub use super::address_queues::Entity as AddressQueues;
 pub use super::blocks::Entity as Blocks;
 pub use super::indexed_trees::Entity as IndexedTrees;
 pub use super::owner_balances::Entity as OwnerBalances;