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 for receipt format from GetTxnBodiesForTxBlock(Ex) #1896

Merged
merged 6 commits into from
Dec 20, 2024
Merged

Fix for receipt format from GetTxnBodiesForTxBlock(Ex) #1896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8fcc925
Fix for receipt format from GetTxnBodiesForTxBlock(Ex)
maxconway Nov 25, 2024
16486b0
Fix for conversion from EVM gas to Scilla gas
maxconway Nov 25, 2024
9267bc5
Merge branch 'main' into max/bugfix/transaction_body_receipts_format_…
maxconway Nov 25, 2024
0dc77f8
Merge branch 'main' into max/bugfix/transaction_body_receipts_format_…
maxconway Nov 26, 2024
1d11254
Merge branch 'main' into max/bugfix/transaction_body_receipts_format_…
maxconway Dec 3, 2024
a1d9a6a
Merge branch 'main' into max/bugfix/transaction_body_receipts_format_…
maxconway Dec 13, 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
4 changes: 2 additions & 2 deletions zilliqa/src/api/types/zil.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ impl GetTxResponse {
amount,
signature,
receipt: GetTxResponseReceipt {
cumulative_gas: ScillaGas(receipt.cumulative_gas_used.0),
cumulative_gas: receipt.cumulative_gas_used.into(),
epoch_num: block_number,
transitions: receipt
.transitions
Expand Down Expand Up @@ -659,7 +659,7 @@ pub struct TransactionBody {
#[serde(rename = "gasPrice")]
pub gas_price: String,
pub nonce: String,
pub receipt: TransactionReceipt,
pub receipt: TransactionReceiptResponse,
#[serde(rename = "senderPubKey")]
pub sender_pub_key: String,
pub signature: String,
Expand Down
12 changes: 9 additions & 3 deletions zilliqa/src/api/zilliqa.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ use super::{
self, BlockchainInfo, DSBlock, DSBlockHeaderVerbose, DSBlockListing, DSBlockListingResult,
DSBlockRateResult, DSBlockVerbose, GetCurrentDSCommResult, MinerInfo,
RecentTransactionsResponse, SWInfo, ShardingStructure, SmartContract, StateProofResponse,
TXBlockRateResult, TransactionBody, TransactionStatusResponse, TxBlockListing,
TxBlockListingResult, TxnBodiesForTxBlockExResponse, TxnsForTxBlockExResponse,
TXBlockRateResult, TransactionBody, TransactionReceiptResponse, TransactionStatusResponse,
TxBlockListing, TxBlockListingResult, TxnBodiesForTxBlockExResponse,
TxnsForTxBlockExResponse,
},
};
use crate::{
Expand Down Expand Up @@ -1068,6 +1069,11 @@ fn extract_transaction_bodies(block: &Block, node: &Node) -> Result<Vec<Transact
let receipt = node
.get_transaction_receipt(*hash)?
.ok_or(anyhow!("Transaction receipt missing"))?;
let receipt_response = TransactionReceiptResponse {
cumulative_gas: ScillaGas::from(receipt.cumulative_gas_used).to_string(),
epoch_num: block.number().to_string(),
success: receipt.success,
};
let (version, to_addr, sender_pub_key, signature, _code, _data) = match tx.tx {
SignedTransaction::Zilliqa { tx, sig, key } => (
((tx.chain_id as u32) << 16) | 1,
Expand Down Expand Up @@ -1122,7 +1128,7 @@ fn extract_transaction_bodies(block: &Block, node: &Node) -> Result<Vec<Transact
gas_limit: gas_limit.to_string(),
gas_price: gas_price.to_string(),
nonce: nonce.to_string(),
receipt,
receipt: receipt_response,
sender_pub_key,
signature,
to_addr: to_addr.to_string(),
Expand Down
Loading