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

fix: wrong amount in token_event table #481

Closed
wants to merge 2 commits into from
Closed

fix: wrong amount in token_event table #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e16cb62
fix: wrong amount in token_event table
remiroyc Oct 8, 2024
30ace91
fix: broker_id
remiroyc Oct 8, 2024
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
16 changes: 12 additions & 4 deletions crates/diri/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use starknet::providers::{AnyProvider, Provider, ProviderError};
use std::collections::HashMap;
use std::sync::Arc;
use tracing::{error, trace, warn};
use types::to_hex_str;

use crate::orderbook::Event;

Expand Down Expand Up @@ -88,29 +89,36 @@ impl<S: Storage, E: EventHandler> Diri<S, E> {
}
};

// let broker_contract_address = to_hex_str(&any_event.from_address.clone());
// let broker_id: Option<String> =
// match self.storage.get_broker_id(&broker_contract_address).await {
// Ok(id) => id,
// Err(_) => None,
// };

match orderbook_event {
Event::OrderPlaced(ev) => {
trace!("OrderPlaced found: {:?}", ev);
self.storage
.register_placed(block_number, block_timestamp, &ev.into())
.register_placed(block_number, block_timestamp, &ev.into(), None)
.await?;
}
Event::OrderCancelled(ev) => {
trace!("OrderCancelled found: {:?}", ev);
self.storage
.register_cancelled(block_number, block_timestamp, &ev.into())
.register_cancelled(block_number, block_timestamp, &ev.into(), None)
.await?;
}
Event::OrderFulfilled(ev) => {
trace!("OrderFulfilled found: {:?}", ev);
self.storage
.register_fulfilled(block_number, block_timestamp, &ev.into())
.register_fulfilled(block_number, block_timestamp, &ev.into(), None)
.await?;
}
Event::OrderExecuted(ev) => {
trace!("OrderExecuted found: {:?}", ev);
self.storage
.register_executed(block_number, block_timestamp, &ev.into())
.register_executed(block_number, block_timestamp, &ev.into(), None)
.await?;
}
Event::RollbackStatus(ev) => {
Expand Down
6 changes: 6 additions & 0 deletions crates/diri/src/storage/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,31 @@ pub trait Storage {
block_id: u64,
block_timestamp: u64,
order: &PlacedData,
broker_id: Option<String>,
) -> StorageResult<()>;

async fn register_cancelled(
&self,
block_id: u64,
block_timestamp: u64,
order: &CancelledData,
broker_id: Option<String>,
) -> StorageResult<()>;

async fn register_fulfilled(
&self,
block_id: u64,
block_timestamp: u64,
order: &FulfilledData,
broker_id: Option<String>,
) -> StorageResult<()>;

async fn register_executed(
&self,
block_id: u64,
block_timestamp: u64,
order: &ExecutedData,
broker_id: Option<String>,
) -> StorageResult<()>;

async fn status_back_to_open(
Expand All @@ -49,4 +53,6 @@ pub trait Storage {
block_timestamp: u64,
order: &RollbackStatusData,
) -> StorageResult<()>;

async fn get_broker_id(&self, contract_address: &str) -> StorageResult<Option<String>>;
}
2 changes: 0 additions & 2 deletions crates/diri/src/storage/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ pub struct PlacedData {
pub end_amount: String,
pub start_date: u64,
pub end_date: u64,
pub broker_id: String,
}

impl From<OrderPlaced> for PlacedData {
Expand All @@ -51,7 +50,6 @@ impl From<OrderPlaced> for PlacedData {
end_amount: u256_to_hex(&value.order.end_amount),
start_date: value.order.start_date,
end_date: value.order.end_date,
broker_id: to_hex_str(&FieldElement::from(value.order.broker_id)),
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions crates/pontos/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ impl<S: Storage, C: StarknetClient, E: EventHandler + Send + Sync> Pontos<S, C,
) -> Result<()> {
let mut token_sale_event = self
.event_manager
.format_element_sale_event(&event, block_timestamp)
.format_element_sale_event(&event, block_timestamp, chain_id)
.await?;

let contract_addr = FieldElement::from_hex_be(
Expand Down Expand Up @@ -430,7 +430,7 @@ impl<S: Storage, C: StarknetClient, E: EventHandler + Send + Sync> Pontos<S, C,

let mut token_sale_event = self
.event_manager
.format_ventory_sale_or_accepted_offer_event(&event, block_timestamp)
.format_ventory_sale_or_accepted_offer_event(&event, block_timestamp, chain_id)
.await?;

let contract_addr = FieldElement::from_hex_be(
Expand Down
8 changes: 6 additions & 2 deletions crates/pontos/src/managers/event_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ impl<S: Storage> EventManager<S> {
&self,
event: &EmittedEvent,
block_timestamp: u64,
chain_id: &str,
) -> Result<TokenSaleEvent> {
let _listing_counter = event
.data
Expand Down Expand Up @@ -120,14 +121,16 @@ impl<S: Storage> EventManager<S> {
currency_address: None,
marketplace_contract_address: to_hex_str(&event.from_address),
marketplace_name: "Ventory".to_string(),
price: price.to_big_decimal(0).to_string(),
price: to_hex_str(price),
chain_id: chain_id.to_string(),
})
}

pub async fn format_element_sale_event(
&self,
event: &EmittedEvent,
block_timestamp: u64,
chain_id: &str,
) -> Result<TokenSaleEvent> {
if event.keys.len() < 4 {
return Err(anyhow!("Can't find event data into this event"));
Expand Down Expand Up @@ -231,7 +234,8 @@ impl<S: Storage> EventManager<S> {
currency_address: Some(to_hex_str(currency_address)),
marketplace_contract_address: to_hex_str(&event.from_address),
marketplace_name: "Element".to_string(),
price: price.to_big_decimal(0).to_string(),
price: to_hex_str(price),
chain_id: chain_id.to_string(),
})
}

Expand Down
6 changes: 4 additions & 2 deletions crates/pontos/src/storage/sqlx/default_storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,13 +219,15 @@ impl Storage for DefaultSqlxStorage {
)));
}

let q = "INSERT INTO token_event (block_timestamp, contract_address, from_address, to_address, transaction_hash, token_id, contract_type, event_type, event_id) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)";
let q = "INSERT INTO token_event (block_timestamp, contract_address, chain_id, broker_id, from_address, to_address, transaction_hash, token_id, contract_type, event_type, event_id) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)";

let _r = sqlx::query(q)
.bind(event.timestamp.to_string())
.bind(event.contract_address.clone())
.bind(event.chain_id.clone())
.bind(event.broker_id.clone())
.bind(event.from_address.clone())
.bind(event.to_address.clone())
.bind(event.contract_address.clone())
.bind(event.transaction_hash.clone())
.bind(event.token_id.clone())
.bind(event.contract_type.clone())
Expand Down
4 changes: 4 additions & 0 deletions crates/pontos/src/storage/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ pub struct TokenTransferEvent {
pub to_address: String,
pub contract_address: String,
pub chain_id: String,
pub broker_id: Option<String>,
pub contract_type: String,
pub transaction_hash: String,
pub token_id: String,
Expand Down Expand Up @@ -173,6 +174,7 @@ pub struct TokenSaleEvent {
pub quantity: u64,
pub currency_address: Option<String>,
pub price: String,
pub chain_id: String,
}

impl Default for TokenTransferEvent {
Expand All @@ -191,6 +193,7 @@ impl Default for TokenTransferEvent {
block_number: None,
updated_at: None,
chain_id: "0x534e5f4d41494e".to_string(),
broker_id: None,
}
}
}
Expand Down Expand Up @@ -344,6 +347,7 @@ mod tests {
block_number: Some(123),
updated_at: Some(1625101200),
chain_id: "0x534e5f4d41494e".to_string(),
broker_id: None,
});

let serialized = serde_json::to_string(&event).expect("Failed to serialize TokenEvent");
Expand Down
2 changes: 1 addition & 1 deletion crates/sana/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ impl<S: Storage, C: StarknetClient, E: EventHandler + Send + Sync> Sana<S, C, E>

let mut token_sale_event = self
.event_manager
.format_ventory_sale_event(&event, block_timestamp)
.format_ventory_sale_event(&event, block_timestamp, chain_id)
.await?;

let contract_addr = FieldElement::from_hex_be(
Expand Down
23 changes: 20 additions & 3 deletions crates/sana/src/managers/event_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,15 @@ impl<S: Storage> EventManager<S> {
&self,
event: &EmittedEvent,
block_timestamp: u64,
chain_id: &str,
) -> Result<TokenSaleEvent> {
let broker_contract_address: String = to_hex_str(&event.from_address);
let broker_id: Option<String> =
match self.storage.get_broker_id(&broker_contract_address).await {
Ok(id) => id,
Err(_) => None,
};

let _listing_counter = event
.data
.first()
Expand Down Expand Up @@ -113,8 +121,9 @@ impl<S: Storage> EventManager<S> {
currency_address: None,
marketplace_contract_address: to_hex_str(&event.from_address),
marketplace_name: "Ventory".to_string(),
price: price.to_big_decimal(0).to_string(),
chain_id: "0x534e5f4d41494e".to_string(),
price: to_hex_str(price),
chain_id: chain_id.to_string(),
broker_id,
})
}

Expand All @@ -128,6 +137,13 @@ impl<S: Storage> EventManager<S> {
return Err(anyhow!("Can't find event data into this event"));
}

let broker_contract_address: String = to_hex_str(&event.from_address);
let broker_id: Option<String> =
match self.storage.get_broker_id(&broker_contract_address).await {
Ok(id) => id,
Err(_) => None,
};

let maker_address = event
.keys
.get(3)
Expand Down Expand Up @@ -226,8 +242,9 @@ impl<S: Storage> EventManager<S> {
currency_address: Some(to_hex_str(currency_address)),
marketplace_contract_address: to_hex_str(&event.from_address),
marketplace_name: "Element".to_string(),
price: price.to_big_decimal(0).to_string(),
price: to_hex_str(price),
chain_id: chain_id.to_string(),
broker_id,
})
}

Expand Down
2 changes: 2 additions & 0 deletions crates/sana/src/storage/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ pub trait Storage {
block_timestamp: u64,
) -> Result<(), StorageError>;

async fn get_broker_id(&self, contract_address: &str) -> Result<Option<String>, StorageError>;

async fn register_sale_event(
&self,
event: &TokenSaleEvent,
Expand Down
25 changes: 21 additions & 4 deletions crates/sana/src/storage/sqlx/default_storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,21 @@ impl PostgresStorage {

#[async_trait]
impl Storage for PostgresStorage {
async fn get_broker_id(&self, contract_address: &str) -> Result<Option<String>, StorageError> {
let query = "
SELECT id
FROM broker
WHERE contract_address = $1
LIMIT 1;";

let res = sqlx::query_scalar::<_, String>(query)
.bind(contract_address)
.fetch_optional(&self.pool)
.await?;

Ok(res)
}

async fn register_mint(
&self,
contract_address: &str,
Expand Down Expand Up @@ -268,15 +283,16 @@ impl Storage for PostgresStorage {
return Ok(());
}

let q = "INSERT INTO token_event (token_event_id, contract_address, chain_id, token_id, token_id_hex, event_type, block_timestamp, transaction_hash, to_address, from_address, amount)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) ON CONFLICT (token_event_id) DO NOTHING";
let q = "INSERT INTO token_event (token_event_id, contract_address, chain_id, broker_id, token_id, token_id_hex, event_type, block_timestamp, transaction_hash, to_address, from_address, amount)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) ON CONFLICT (token_event_id) DO NOTHING";

let event_type = self.to_title_case(&event.event_type.to_string().to_lowercase());

let _r = sqlx::query(q)
.bind(event.token_event_id.clone())
.bind(event.nft_contract_address.clone())
.bind(event.chain_id.clone())
.bind(event.broker_id.clone())
.bind(event.token_id.clone())
.bind(event.token_id_hex.clone())
.bind(event_type)
Expand Down Expand Up @@ -312,8 +328,8 @@ impl Storage for PostgresStorage {
event.token_event_id
);
} else {
let insert_query = "INSERT INTO token_event (token_event_id, contract_address, chain_id, token_id, token_id_hex, event_type, block_timestamp, transaction_hash, to_address, from_address)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) ON CONFLICT (token_event_id) DO NOTHING";
let insert_query = "INSERT INTO token_event (token_event_id, contract_address, chain_id, broker_id, token_id, token_id_hex, event_type, block_timestamp, transaction_hash, to_address, from_address)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) ON CONFLICT (token_event_id) DO NOTHING";

let event_type = event.event_type.as_ref().map(|e| {
let res = self.to_title_case(&e.to_string().to_lowercase());
Expand All @@ -326,6 +342,7 @@ impl Storage for PostgresStorage {
.bind(event.token_event_id.clone())
.bind(event.contract_address.clone())
.bind(event.chain_id.clone())
.bind(event.broker_id.clone())
.bind(event.token_id.clone())
.bind(event.token_id_hex.clone())
.bind(event_type)
Expand Down
6 changes: 5 additions & 1 deletion crates/sana/src/storage/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ pub struct TokenTransferEvent {
pub to_address: String,
pub contract_address: String,
pub chain_id: String,
pub broker_id: Option<String>,
pub contract_type: String,
pub transaction_hash: String,
pub token_id: String,
Expand All @@ -183,7 +184,6 @@ pub struct TokenSaleEvent {
pub marketplace_contract_address: String,
pub marketplace_name: String,
pub transaction_hash: String,
pub chain_id: String,
pub token_id: String,
pub token_id_hex: String,
pub event_type: EventType,
Expand All @@ -193,6 +193,8 @@ pub struct TokenSaleEvent {
pub quantity: u64,
pub currency_address: Option<String>,
pub price: String,
pub chain_id: String,
pub broker_id: Option<String>,
}

impl Default for TokenTransferEvent {
Expand All @@ -211,6 +213,7 @@ impl Default for TokenTransferEvent {
block_number: None,
updated_at: None,
chain_id: "0x534e5f4d41494e".to_string(),
broker_id: None,
}
}
}
Expand Down Expand Up @@ -362,6 +365,7 @@ mod tests {
updated_at: Some(1625101200),
chain_id: "0x534e5f4d41494e".to_string(),
token_id_hex: "0x123".to_string(),
broker_id: None,
});

let serialized = serde_json::to_string(&event).expect("Failed to serialize TokenEvent");
Expand Down
Loading