Merge pull request #11 from step-finance/SF-5242-index-in-block

SF-5242: index in block
step-finance · Aug 26, 2024 · 387d208 · 387d208
2 parents de855b7 + adbde40
commit 387d208
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/cli/src/cluster_query.rs b/cli/src/cluster_query.rs
@@ -2103,6 +2103,7 @@ pub fn process_transaction_history(
                             block_time,
                             slot,
                             transaction: transaction_with_meta,
+                            index_in_block: _,
                         } = confirmed_transaction;
 
                         let decoded_transaction =

diff --git a/cli/src/wallet.rs b/cli/src/wallet.rs
@@ -776,6 +776,7 @@ pub fn process_confirm(
                                 block_time,
                                 slot,
                                 transaction: transaction_with_meta,
+                                index_in_block: _,
                             } = confirmed_transaction;
 
                             let decoded_transaction =

diff --git a/rpc-client/src/mock_sender.rs b/rpc-client/src/mock_sender.rs
@@ -240,6 +240,7 @@ impl RpcSender for MockSender {
                         }),
                 },
                 block_time: Some(1628633791),
+                index_in_block: 0,
             })?,
             "getTransactionCount" => json![1234],
             "getSlot" => json![0],

diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs
@@ -1502,7 +1502,7 @@ impl JsonRpcRequestProcessor {
 
             let encode_transaction =
                 |confirmed_tx_with_meta: ConfirmedTransactionWithStatusMeta| -> Result<EncodedConfirmedTransactionWithStatusMeta> {
-                    Ok(confirmed_tx_with_meta.encode(encoding, max_supported_transaction_version).map_err(RpcCustomError::from)?)
+                    Ok(confirmed_tx_with_meta.encode(encoding, max_supported_transaction_version, 0).map_err(RpcCustomError::from)?)
                 };
 
             match confirmed_transaction.unwrap_or(None) {

diff --git a/transaction-status/src/lib.rs b/transaction-status/src/lib.rs
@@ -1103,6 +1103,7 @@ impl ConfirmedTransactionWithStatusMeta {
         self,
         encoding: UiTransactionEncoding,
         max_supported_transaction_version: Option<u8>,
+        index_in_block: usize,
     ) -> Result<EncodedConfirmedTransactionWithStatusMeta, EncodeError> {
         Ok(EncodedConfirmedTransactionWithStatusMeta {
             slot: self.slot,
@@ -1112,6 +1113,7 @@ impl ConfirmedTransactionWithStatusMeta {
                 true,
             )?,
             block_time: self.block_time,
+            index_in_block,
         })
     }
 
@@ -1127,6 +1129,7 @@ pub struct EncodedConfirmedTransactionWithStatusMeta {
     #[serde(flatten)]
     pub transaction: EncodedTransactionWithStatusMeta,
     pub block_time: Option<UnixTimestamp>,
+    pub index_in_block: usize,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]