Skip to content

Commit 669cfd4

Browse files
blowcowbeerblowcowbeer
authored
opt: add tx hash in response. (#20)
1 parent 62c8fc0 commit 669cfd4

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

‎indexer/src/delegate.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ pub async fn get_delegator_delegate_records(
2828
(
2929
format!("SELECT count(block_num) FROM evm_delegations WHERE delegator='{}'", delegator)
3030
,
31-
format!("SELECT block_id,validator,delegator,tm,amount FROM evm_delegations WHERE delegator='{}' ORDER BY tm DESC LIMIT {} OFFSET {}", delegator, page_size, (page-1)*page_size)
31+
format!("SELECT tx_id,block_id,validator,delegator,tm,amount FROM evm_delegations WHERE delegator='{}' ORDER BY tm DESC LIMIT {} OFFSET {}", delegator, page_size, (page-1)*page_size)
3232
)
3333
} else {
3434
(
3535
"SELECT count(block_num) FROM evm_delegations".to_string()
3636
,
37-
format!("SELECT block_id,validator,delegator,tm,amount FROM evm_delegations ORDER BY tm DESC LIMIT {} OFFSET {}", page_size, (page-1)*page_size))
37+
format!("SELECT tx_id,block_id,validator,delegator,tm,amount FROM evm_delegations ORDER BY tm DESC LIMIT {} OFFSET {}", page_size, (page-1)*page_size))
3838
};
3939

4040
let row = sqlx::query(&sql_total).fetch_one(&mut *pool).await?;
@@ -43,13 +43,15 @@ pub async fn get_delegator_delegate_records(
4343
let mut delegates: Vec<DelegateResponse> = vec![];
4444
let rows = sqlx::query(&sql_query).fetch_all(&mut *pool).await?;
4545
for r in rows {
46+
let tx_hash: String = r.try_get("tx_id")?;
4647
let block_hash: String = r.try_get("block_id")?;
4748
let validator: String = r.try_get("validator")?;
4849
let delegator: String = r.try_get("delegator")?;
4950
let amount: BigDecimal = r.try_get("amount")?;
5051
let tm: NaiveDateTime = r.try_get("tm")?;
5152

5253
delegates.push(DelegateResponse {
54+
tx_hash,
5355
block_hash,
5456
validator,
5557
delegator,
@@ -85,13 +87,13 @@ pub async fn get_validator_delegate_records(
8587
(
8688
format!("SELECT count(block_num) FROM evm_delegations WHERE validator='{}'", validator)
8789
,
88-
format!("SELECT block_id,validator,delegator,tm,amount FROM evm_delegations WHERE validator='{}' ORDER BY tm DESC LIMIT {} OFFSET {}", validator, page_size, (page-1)*page_size)
90+
format!("SELECT tx_id,block_id,validator,delegator,tm,amount FROM evm_delegations WHERE validator='{}' ORDER BY tm DESC LIMIT {} OFFSET {}", validator, page_size, (page-1)*page_size)
8991
)
9092
} else {
9193
(
9294
"SELECT count(block_num) FROM evm_delegations".to_string()
9395
,
94-
format!("SELECT block_id,validator,delegator,tm,amount FROM evm_delegations ORDER BY tm DESC LIMIT {} OFFSET {}", page_size, (page-1)*page_size))
96+
format!("SELECT tx_id,block_id,validator,delegator,tm,amount FROM evm_delegations ORDER BY tm DESC LIMIT {} OFFSET {}", page_size, (page-1)*page_size))
9597
};
9698

9799
let row = sqlx::query(&sql_total).fetch_one(&mut *pool).await?;
@@ -100,13 +102,15 @@ pub async fn get_validator_delegate_records(
100102
let mut delegates: Vec<DelegateResponse> = vec![];
101103
let rows = sqlx::query(&sql_query).fetch_all(&mut *pool).await?;
102104
for r in rows {
105+
let tx_hash: String = r.try_get("tx_id")?;
103106
let block_hash: String = r.try_get("block_id")?;
104107
let validator: String = r.try_get("validator")?;
105108
let delegator: String = r.try_get("delegator")?;
106109
let amount: BigDecimal = r.try_get("amount")?;
107110
let tm: NaiveDateTime = r.try_get("tm")?;
108111

109112
delegates.push(DelegateResponse {
113+
tx_hash,
110114
block_hash,
111115
validator,
112116
delegator,

‎indexer/src/types.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ pub struct StakeResponse {
112112

113113
#[derive(Serialize, Deserialize)]
114114
pub struct DelegateResponse {
115+
pub tx_hash: String,
115116
pub block_hash: String,
116117
pub validator: String,
117118
pub delegator: String,
@@ -121,6 +122,7 @@ pub struct DelegateResponse {
121122

122123
#[derive(Serialize, Deserialize)]
123124
pub struct UndelegateResponse {
125+
pub tx_hash: String,
124126
pub block_hash: String,
125127
pub validator: String,
126128
pub delegator: String,

‎indexer/src/undelegate.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ pub async fn get_delegator_undelegate_records(
2828
(
2929
format!("SELECT count(block_num) FROM evm_undelegations WHERE delegator='{}'", delegator)
3030
,
31-
format!("SELECT block_id,validator,delegator,tm,amount FROM evm_undelegations WHERE delegator='{}' ORDER BY tm DESC LIMIT {} OFFSET {}", delegator, page_size, (page-1)*page_size)
31+
format!("SELECT tx_id,block_id,validator,delegator,tm,amount FROM evm_undelegations WHERE delegator='{}' ORDER BY tm DESC LIMIT {} OFFSET {}", delegator, page_size, (page-1)*page_size)
3232
)
3333
} else {
3434
(
3535
"SELECT count(block_num) FROM evm_undelegations".to_string()
3636
,
37-
format!("SELECT block_id,validator,delegator,tm,amount FROM evm_undelegations ORDER BY tm DESC LIMIT {} OFFSET {}", page_size, (page-1)*page_size))
37+
format!("SELECT tx_id,block_id,validator,delegator,tm,amount FROM evm_undelegations ORDER BY tm DESC LIMIT {} OFFSET {}", page_size, (page-1)*page_size))
3838
};
3939

4040
let row = sqlx::query(&sql_total).fetch_one(&mut *pool).await?;
@@ -43,13 +43,15 @@ pub async fn get_delegator_undelegate_records(
4343
let mut delegates: Vec<UndelegateResponse> = vec![];
4444
let rows = sqlx::query(&sql_query).fetch_all(&mut *pool).await?;
4545
for r in rows {
46+
let tx_hash: String = r.try_get("tx_id")?;
4647
let block_hash: String = r.try_get("block_id")?;
4748
let validator: String = r.try_get("validator")?;
4849
let delegator: String = r.try_get("delegator")?;
4950
let amount: BigDecimal = r.try_get("amount")?;
5051
let tm: NaiveDateTime = r.try_get("tm")?;
5152

5253
delegates.push(UndelegateResponse {
54+
tx_hash,
5355
block_hash,
5456
validator,
5557
delegator,
@@ -85,13 +87,13 @@ pub async fn get_validator_undelegate_records(
8587
(
8688
format!("SELECT count(block_num) FROM evm_undelegations WHERE validator='{}'", validator)
8789
,
88-
format!("SELECT block_id,validator,delegator,tm,amount FROM evm_undelegations WHERE validator='{}' ORDER BY tm DESC LIMIT {} OFFSET {}", validator, page_size, (page-1)*page_size)
90+
format!("SELECT tx_id,block_id,validator,delegator,tm,amount FROM evm_undelegations WHERE validator='{}' ORDER BY tm DESC LIMIT {} OFFSET {}", validator, page_size, (page-1)*page_size)
8991
)
9092
} else {
9193
(
9294
"SELECT count(block_num) FROM evm_undelegations".to_string()
9395
,
94-
format!("SELECT block_id,validator,delegator,tm,amount FROM evm_undelegations ORDER BY tm DESC LIMIT {} OFFSET {}", page_size, (page-1)*page_size))
96+
format!("SELECT tx_id,block_id,validator,delegator,tm,amount FROM evm_undelegations ORDER BY tm DESC LIMIT {} OFFSET {}", page_size, (page-1)*page_size))
9597
};
9698

9799
let row = sqlx::query(&sql_total).fetch_one(&mut *pool).await?;
@@ -100,13 +102,15 @@ pub async fn get_validator_undelegate_records(
100102
let mut delegates: Vec<UndelegateResponse> = vec![];
101103
let rows = sqlx::query(&sql_query).fetch_all(&mut *pool).await?;
102104
for r in rows {
105+
let tx_hash: String = r.try_get("tx_id")?;
103106
let block_hash: String = r.try_get("block_id")?;
104107
let validator: String = r.try_get("validator")?;
105108
let delegator: String = r.try_get("delegator")?;
106109
let amount: BigDecimal = r.try_get("amount")?;
107110
let tm: NaiveDateTime = r.try_get("tm")?;
108111

109112
delegates.push(UndelegateResponse {
113+
tx_hash,
110114
block_hash,
111115
validator,
112116
delegator,

0 commit comments

Comments
 (0)