From 8fcc925655d3bb61689ae9bb17f609e2c67bf834 Mon Sep 17 00:00:00 2001
From: Max Conway <conway.max1@gmail.com>
Date: Mon, 25 Nov 2024 12:48:13 +0000
Subject: [PATCH 1/2] Fix for receipt format from GetTxnBodiesForTxBlock(Ex)

- closes #1883
---
 zilliqa/src/api/types/zil.rs |  2 +-
 zilliqa/src/api/zil.rs       | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/zilliqa/src/api/types/zil.rs b/zilliqa/src/api/types/zil.rs
index 84571ddc3..189b75a3d 100644
--- a/zilliqa/src/api/types/zil.rs
+++ b/zilliqa/src/api/types/zil.rs
@@ -671,7 +671,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,
diff --git a/zilliqa/src/api/zil.rs b/zilliqa/src/api/zil.rs
index 874ea154e..2e49d0f2a 100644
--- a/zilliqa/src/api/zil.rs
+++ b/zilliqa/src/api/zil.rs
@@ -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::{
@@ -1036,6 +1037,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(receipt.cumulative_gas_used.0).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,
@@ -1090,7 +1096,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(),

From 16486b0ef25c36c46b62e0a78103e3ff5c4e9f4b Mon Sep 17 00:00:00 2001
From: Max Conway <conway.max1@gmail.com>
Date: Mon, 25 Nov 2024 14:07:43 +0000
Subject: [PATCH 2/2] Fix for conversion from EVM gas to Scilla gas

---
 zilliqa/src/api/types/zil.rs | 2 +-
 zilliqa/src/api/zil.rs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zilliqa/src/api/types/zil.rs b/zilliqa/src/api/types/zil.rs
index 189b75a3d..5c581b245 100644
--- a/zilliqa/src/api/types/zil.rs
+++ b/zilliqa/src/api/types/zil.rs
@@ -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
diff --git a/zilliqa/src/api/zil.rs b/zilliqa/src/api/zil.rs
index 2e49d0f2a..393c1fbc9 100644
--- a/zilliqa/src/api/zil.rs
+++ b/zilliqa/src/api/zil.rs
@@ -1038,7 +1038,7 @@ fn extract_transaction_bodies(block: &Block, node: &Node) -> Result<Vec<Transact
             .get_transaction_receipt(*hash)?
             .ok_or(anyhow!("Transaction receipt missing"))?;
         let receipt_response = TransactionReceiptResponse {
-            cumulative_gas: ScillaGas(receipt.cumulative_gas_used.0).to_string(),
+            cumulative_gas: ScillaGas::from(receipt.cumulative_gas_used).to_string(),
             epoch_num: block.number().to_string(),
             success: receipt.success,
         };