Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ECO-780] Sanitize event type address #19

Merged
merged 5 commits into from
Nov 16, 2023
Merged

[ECO-780] Sanitize event type address #19

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6cc9795
sanitize event type address
CRBl69 Oct 24, 2023
5460e01
sanitize addresses for write changes
CRBl69 Nov 16, 2023
aa7c080
construct move tag str outside of loop
CRBl69 Nov 16, 2023
1eea557
fix compiler error
CRBl69 Nov 16, 2023
9a724ed
move type string declarations outside of for loops
CRBl69 Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 32 additions & 19 deletions rust/processor/src/processors/econia_processor.rs
View file
Open in desktop
alnoki marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use crate::{
};
use anyhow::anyhow;
use aptos_indexer_protos::transaction::v1::{
transaction::TxnData, write_set_change::Change, MoveStructTag, Transaction,
transaction::TxnData, write_set_change::Change, Transaction,
};
use async_trait::async_trait;
use bigdecimal::BigDecimal;
Expand Down Expand Up @@ -690,16 +690,12 @@ impl ProcessorTrait for EconiaTransactionProcessor {
}

let econia_address = strip_hex_number(self.config.econia_address.clone())?;
let market_accounts_type_string = format!("{econia_address}::user::MarketAccounts");
let market_account_type_string = format!("{econia_address}::user::MarketAccount");

let cancel_order_type = format!("{}::user::CancelOrderEvent", econia_address);
let change_order_size_type = format!("{}::user::ChangeOrderSizeEvent", econia_address);
let fill_type = format!("{}::user::FillEvent", econia_address);
let market_accounts_type = MoveStructTag {
address: econia_address.to_string(),
module: "user".to_string(),
name: "MarketAccounts".to_string(),
generic_type_params: vec![],
};
let market_registration_type =
format!("{}::registry::MarketRegistrationEvent", econia_address);
let place_limit_order_type = format!("{}::user::PlaceLimitOrderEvent", econia_address);
Expand Down Expand Up @@ -734,58 +730,66 @@ impl ProcessorTrait for EconiaTransactionProcessor {
};
let events = EventModel::from_events(raw_events, txn_version, block_height);
for (index, event) in events.iter().enumerate() {
let split = event.type_.split_once("::");
let (address, tail) = if let Some(e) = split {
e
} else {
continue;
};
let address = strip_hex_number(address.to_string())?;
let event_type = format!("{address}::{tail}");
let txn_version = BigDecimal::from(txn.version);
let event_idx = BigDecimal::from(index as u64);
if event.type_ == recognized_market_type {
if event_type == recognized_market_type {
recognized_market_events.push(event_data_to_recognized_market_event(
event,
txn_version,
event_idx,
time,
)?);
} else if event.type_ == cancel_order_type {
} else if event_type == cancel_order_type {
cancel_order_events.push(event_data_to_cancel_order_event(
event,
txn_version,
event_idx,
time,
)?);
} else if event.type_ == change_order_size_type {
} else if event_type == change_order_size_type {
change_order_size_events.push(event_data_to_change_order_size_event(
event,
txn_version,
event_idx,
time,
)?);
} else if event.type_ == fill_type {
} else if event_type == fill_type {
fill_events.push(event_data_to_fill_event(
event,
txn_version,
event_idx,
time,
)?);
} else if event.type_ == market_registration_type {
} else if event_type == market_registration_type {
market_registration_events.push(event_data_to_market_registration_event(
event,
txn_version,
event_idx,
time,
)?);
} else if event.type_ == place_limit_order_type {
} else if event_type == place_limit_order_type {
place_limit_order_events.push(event_data_to_place_limit_order_event(
event,
txn_version,
event_idx,
time,
)?);
} else if event.type_ == place_market_order_type {
} else if event_type == place_market_order_type {
place_market_order_events.push(event_data_to_place_market_order_event(
event,
txn_version,
event_idx,
time,
)?);
} else if event.type_ == place_swap_order_type {
} else if event_type == place_swap_order_type {
place_swap_order_events.push(event_data_to_place_swap_order_event(
event,
txn_version,
Expand All @@ -799,8 +803,10 @@ impl ProcessorTrait for EconiaTransactionProcessor {
for change in &info.changes {
match change.change.as_ref().expect("No transaction changes") {
Change::WriteResource(resource) => {
if resource.r#type.as_ref().expect("No resource type")
== &market_accounts_type
let resource_type = resource.r#type.as_ref().expect("No resource type");
let address = strip_hex_number(resource_type.address.to_string())?;
let resource_type = format!("{address}::{}::{}", resource_type.module, resource_type.name);
if resource_type == market_accounts_type_string
{
let data: serde_json::Value = serde_json::from_str(&resource.data)
.expect("Failed to parse MarketAccounts");
Expand All @@ -814,8 +820,15 @@ impl ProcessorTrait for EconiaTransactionProcessor {
},
Change::WriteTableItem(write) => {
let table_data = write.data.as_ref().expect("No WriteTableItem data");
if table_data.value_type
!= format!("{}::user::MarketAccount", econia_address)
let split = table_data.value_type.split_once("::");
let (address, tail) = if let Some(e) = split {
e
} else {
continue;
};
let address = strip_hex_number(address.to_string())?;
let value_type = format!("{address}::{tail}");
if value_type != market_account_type_string
{
continue;
}
Expand Down
Loading