Output as json

DeFiCh · Nov 13, 2024 · e611a4f · e611a4f
1 parent f246353
commit e611a4f
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 12 deletions.
diff --git a/lib/Cargo.lock b/lib/Cargo.lock
diff --git a/lib/ain-dftx/Cargo.toml b/lib/ain-dftx/Cargo.toml
@@ -11,3 +11,4 @@ bitcoin.workspace = true
 hex.workspace = true
 bitflags = "2.4.1"
 lazy_static.workspace = true
+serde.workspace = true
diff --git a/lib/ain-dftx/src/types/balance.rs b/lib/ain-dftx/src/types/balance.rs
@@ -1,5 +1,6 @@
 use ain_macros::ConsensusEncoding;
 use bitcoin::{io, ScriptBuf, VarInt};
+use serde::Serialize;
 
 use super::common::CompactVec;
 

diff --git a/lib/ain-dftx/src/types/common.rs b/lib/ain-dftx/src/types/common.rs
@@ -4,6 +4,7 @@ use bitcoin::{
     consensus::{Decodable, Encodable},
     io::{self, ErrorKind},
 };
+use serde::Serialize;
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub struct CompactVec<T>(Vec<T>);
@@ -110,7 +111,7 @@ impl Decodable for RawBytes {
 /// In the rust-bitcoin library, variable-length integers are implemented as CompactSize.
 /// See [issue #1016](https://github.com/rust-bitcoin/rust-bitcoin/issues/1016)
 
-#[derive(Debug, PartialEq, Eq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone, Serialize)]
 pub struct VarInt(pub u64);
 
 impl Encodable for VarInt {

diff --git a/lib/ain-dftx/src/types/price.rs b/lib/ain-dftx/src/types/price.rs
@@ -1,15 +1,15 @@
+use super::common::CompactVec;
 use ain_macros::ConsensusEncoding;
 use bitcoin::io;
-
-use super::common::CompactVec;
+use serde::Serialize;
 
 #[derive(ConsensusEncoding, Debug, PartialEq, Eq, Clone)]
 pub struct CurrencyPair {
     pub token: String,
     pub currency: String,
 }
 
-#[derive(ConsensusEncoding, Debug, PartialEq, Eq, Clone)]
+#[derive(ConsensusEncoding, Debug, PartialEq, Eq, Clone, Serialize)]
 pub struct TokenAmount {
     pub currency: String,
     pub amount: i64,

diff --git a/lib/parser/Cargo.toml b/lib/parser/Cargo.toml
@@ -6,5 +6,7 @@ edition = "2021"
 [dependencies]
 ain-macros.workspace = true
 ain-dftx.workspace = true
-bitcoin.workspace = true
+bitcoin = { workspace = true, features = ["serde"] }
 hex.workspace = true
+serde_json.workspace = true
+serde.workspace = true
diff --git a/lib/parser/src/main.rs b/lib/parser/src/main.rs
@@ -1,6 +1,10 @@
+use ain_dftx::balance::TokenBalanceVarInt;
+use ain_dftx::common::VarInt;
+use ain_dftx::price::TokenAmount;
 use ain_macros::ConsensusEncoding;
-use bitcoin::io;
 use bitcoin::{consensus::Decodable, ScriptBuf};
+use bitcoin::{io, Txid};
+use serde::Serialize;
 use std::io::BufRead;
 
 #[derive(Debug)]
@@ -26,19 +30,19 @@ impl RawDbEntry {
     }
 }
 
-#[derive(ConsensusEncoding, Debug, Clone, PartialEq, Eq)]
+#[derive(ConsensusEncoding, Debug, Clone, PartialEq, Eq, Serialize)]
 pub struct BalanceKey {
     pub owner: ScriptBuf,
-    pub token_id: u32,
+    pub token_id: VarInt,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
 pub struct PrefixedData<K, V> {
     pub key: K,
     pub value: V,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
 pub enum VMDomainEdge {
     DVMToEVM,
     EVMToDVM,
@@ -59,12 +63,24 @@ impl Decodable for VMDomainEdge {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
+struct UndoKey {
+    height: u32,
+    id: Txid,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
+struct Undo {
+    data: Vec<u8>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
 pub enum Prefix {
     ByBalance(PrefixedData<BalanceKey, i64>),
     ByHeight(PrefixedData<ScriptBuf, u32>),
     VMDomainTxEdge(PrefixedData<(VMDomainEdge, String), String>),
     VMDomainBlockEdge(PrefixedData<(VMDomainEdge, String), String>),
+    Undo(PrefixedData<UndoKey, Undo>),
 }
 
 impl TryFrom<RawDbEntry> for Prefix {
@@ -104,7 +120,7 @@ fn process_line(line: &str) -> Result<(), Box<dyn std::error::Error>> {
     let raw_entry = RawDbEntry::parse(line)?;
 
     match Prefix::try_from(raw_entry) {
-        Ok(entry) => println!("{entry:?}"),
+        Ok(entry) => println!("{}", serde_json::to_string(&entry)?),
         Err(_) => {}
     }