Skip to content

Commit edff82c

Browse files
ananas-blockananas-block
committed
chore: bump commit hash
1 parent 0341197 commit edff82c

File tree

8 files changed

+60
-58
lines changed

8 files changed

+60
-58
lines changed

‎Cargo.lock

Lines changed: 20 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ solana-program = "1.18.0"
7777
solana-sdk = "1.18.0"
7878
solana-transaction-status = "1.18.0"
7979

80-
light-batched-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
81-
light-compressed-account = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
82-
light-concurrent-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
83-
light-hasher = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
84-
light-indexed-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
85-
light-merkle-tree-metadata = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
86-
light-merkle-tree-reference = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
87-
light-prover-client = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
88-
light-sdk = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
80+
light-batched-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
81+
light-compressed-account = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
82+
light-concurrent-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
83+
light-hasher = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
84+
light-indexed-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
85+
light-merkle-tree-metadata = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
86+
light-merkle-tree-reference = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
87+
light-prover-client = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
88+
light-sdk = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
8989

9090
sqlx = { version = "0.6.2", features = [
9191
"macros",
@@ -129,7 +129,7 @@ rust-s3 = "0.34.0"
129129
[dev-dependencies]
130130
function_name = "0.3.0"
131131
serial_test = "2.0.0"
132-
light-hasher = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
132+
light-hasher = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
133133

134134
[profile.dev]
135135
# Do not produce debug info for ~40% faster incremental compilation.

‎src/api/method/get_multiple_new_address_proofs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ pub async fn get_multiple_new_address_proofs_helper(
8080
})?
8181
.clone();
8282
let (model, proof) = match tree_and_queue.tree_type {
83-
TreeType::Address => {
83+
TreeType::AddressV1 => {
8484
let address = address.to_bytes_vec();
8585
let tree = tree.to_bytes_vec();
8686
get_exclusion_range_with_proof_legacy(txn, tree, tree_and_queue.height + 1, address)
8787
.await?
8888
}
89-
TreeType::BatchedAddress => {
89+
TreeType::AddressV2 => {
9090
get_exclusion_range_with_proof(
9191
txn,
9292
tree.to_bytes_vec(),

‎src/api/method/get_queue_elements.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ pub async fn get_queue_elements(
7272
Condition::all().add(accounts::Column::Tree.eq(request.tree.to_vec()));
7373

7474
match queue_type {
75-
QueueType::BatchedInput => {
75+
QueueType::InputStateV2 => {
7676
query_condition =
7777
query_condition.add(accounts::Column::NullifierQueueIndex.is_not_null());
7878
if let Some(start_offset) = request.start_offset {
7979
query_condition = query_condition
8080
.add(accounts::Column::NullifierQueueIndex.gte(start_offset as i64));
8181
}
8282
}
83-
QueueType::BatchedOutput => {
83+
QueueType::OutputStateV2 => {
8484
query_condition = query_condition.add(accounts::Column::InOutputQueue.eq(true));
8585
if let Some(start_offset) = request.start_offset {
8686
query_condition =
@@ -96,10 +96,10 @@ pub async fn get_queue_elements(
9696
}
9797

9898
let query = match queue_type {
99-
QueueType::BatchedInput => accounts::Entity::find()
99+
QueueType::InputStateV2 => accounts::Entity::find()
100100
.filter(query_condition)
101101
.order_by_asc(accounts::Column::NullifierQueueIndex),
102-
QueueType::BatchedOutput => accounts::Entity::find()
102+
QueueType::OutputStateV2 => accounts::Entity::find()
103103
.filter(query_condition)
104104
.order_by_asc(accounts::Column::LeafIndex),
105105
_ => {
@@ -121,10 +121,10 @@ pub async fn get_queue_elements(
121121
let indices: Vec<u64> = queue_elements.iter().map(|e| e.leaf_index as u64).collect();
122122
let (proofs, first_value_queue_index) = if !indices.is_empty() {
123123
let first_value_queue_index = match queue_type {
124-
QueueType::BatchedInput => Ok(queue_elements[0].nullifier_queue_index.ok_or(
124+
QueueType::InputStateV2 => Ok(queue_elements[0].nullifier_queue_index.ok_or(
125125
PhotonApiError::ValidationError("Nullifier queue index is missing".to_string()),
126126
)? as u64),
127-
QueueType::BatchedOutput => Ok(queue_elements[0].leaf_index as u64),
127+
QueueType::OutputStateV2 => Ok(queue_elements[0].leaf_index as u64),
128128
_ => Err(PhotonApiError::ValidationError(format!(
129129
"Invalid queue type: {:?}",
130130
queue_type

‎src/ingester/parser/tree_info.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ lazy_static! {
182182
tree: *legacy_tree,
183183
queue: *legacy_queue,
184184
height: 26,
185-
tree_type: TreeType::State,
185+
tree_type: TreeType::StateV1,
186186
},
187187
);
188188

@@ -192,7 +192,7 @@ lazy_static! {
192192
tree: *legacy_tree,
193193
queue: *legacy_queue,
194194
height: 26,
195-
tree_type: TreeType::State,
195+
tree_type: TreeType::StateV1,
196196
},
197197
);
198198
}
@@ -204,7 +204,7 @@ lazy_static! {
204204
tree: *legacy_tree,
205205
queue: *legacy_queue,
206206
height: 26,
207-
tree_type: TreeType::Address,
207+
tree_type: TreeType::AddressV1,
208208
},
209209
);
210210

@@ -214,7 +214,7 @@ lazy_static! {
214214
tree: *legacy_tree,
215215
queue: *legacy_queue,
216216
height: 26,
217-
tree_type: TreeType::Address,
217+
tree_type: TreeType::AddressV1,
218218
},
219219
);
220220
}
@@ -225,7 +225,7 @@ lazy_static! {
225225
tree: pubkey!("HLKs5NJ8FXkJg8BrzJt56adFYYuwg5etzDtBbQYTsixu"),
226226
queue: pubkey!("6L7SzhYB3anwEQ9cphpJ1U7Scwj57bx2xueReg7R9cKU"),
227227
height: 32,
228-
tree_type: TreeType::BatchedState,
228+
tree_type: TreeType::StateV2,
229229
},
230230
);
231231

@@ -235,7 +235,7 @@ lazy_static! {
235235
tree: pubkey!("HLKs5NJ8FXkJg8BrzJt56adFYYuwg5etzDtBbQYTsixu"),
236236
queue: pubkey!("6L7SzhYB3anwEQ9cphpJ1U7Scwj57bx2xueReg7R9cKU"),
237237
height: 32,
238-
tree_type: TreeType::BatchedState,
238+
tree_type: TreeType::StateV2,
239239
},
240240
);
241241

@@ -245,7 +245,7 @@ lazy_static! {
245245
tree: pubkey!("EzKE84aVTkCUhDHLELqyJaq1Y7UVVmqxXqZjVHwHY3rK"),
246246
queue: pubkey!("EzKE84aVTkCUhDHLELqyJaq1Y7UVVmqxXqZjVHwHY3rK"),
247247
height: 40,
248-
tree_type: TreeType::BatchedAddress,
248+
tree_type: TreeType::AddressV2,
249249
},
250250
);
251251

‎src/ingester/parser/tx_event_parser.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pub fn create_state_update_v1(
7070
.clone();
7171

7272
let mut seq = None;
73-
if tree_and_queue.tree_type == TreeType::State {
73+
if tree_and_queue.tree_type == TreeType::StateV1 {
7474
seq = Some(*tree_to_seq_number.get(&tree).ok_or_else(|| {
7575
IngesterError::ParserError("Missing sequence number".to_string())
7676
})?);
@@ -81,7 +81,7 @@ pub fn create_state_update_v1(
8181
*seq += 1;
8282
}
8383

84-
let in_output_queue = tree_and_queue.tree_type == TreeType::BatchedState;
84+
let in_output_queue = tree_and_queue.tree_type == TreeType::StateV2;
8585
let enriched_account = AccountWithContext::new(
8686
out_account.compressed_account.clone(),
8787
&hash,

0 commit comments

Comments
 (0)