Step Finance Patch

Merge pull request #8 from step-finance/sf-3750-explicit-data-includes

SF-3750: Explicit Data Includes

.circleci/config.yml

@@ -0,0 +1,25 @@
+version: 2.1
+
+orbs:
+  aws-ecr: circleci/[email protected]
+
+executors:
+  custom:
+    machine:
+      image: ubuntu-2204:2022.04.2
+    resource_class: xlarge
+
+workflows:
+  run-pipeline:
+    jobs:
+      - aws-ecr/build-and-push-image:
+          executor: custom
+          dockerfile: _step-finance/Dockerfile
+          repo: step-solana
+          region: eu-north-1
+          tag: ${CIRCLE_BRANCH},${CIRCLE_BRANCH}-<< pipeline.number >>,${CIRCLE_BRANCH}-<< pipeline.number >>-${CIRCLE_SHA1}
+          context: aws-account
+          filters:
+            branches:
+              only:
+                - step-release

_step-finance/Dockerfile

@@ -0,0 +1,14 @@
+FROM rust:1.69-bullseye as builder
+RUN apt-get update
+RUN apt-get install -y libssl-dev libudev-dev pkg-config zlib1g-dev llvm clang cmake make libprotobuf-dev protobuf-compiler
+WORKDIR /solana-build
+COPY . .
+RUN cargo build --release
+
+FROM debian:bullseye-20230522 as runtime
+RUN apt-get update
+RUN apt-get install -y bzip2
+COPY --from=builder --chmod=700 /solana-build/target/release /usr/local/bin
+
+WORKDIR /solana
+ENTRYPOINT ["solana-test-validator"]

_step-finance/Dockerfile.dockerignore

@@ -0,0 +1,2 @@
+target/
+_step-finance/

core/src/banking_stage/committer.rs

@@ -8,11 +8,12 @@ use {
     solana_runtime::{
         accounts::TransactionLoadResult,
         bank::{
-            Bank, CommitTransactionCounts, TransactionBalancesSet, TransactionExecutionResult,
-            TransactionResults,
+            Bank, CommitTransactionCounts, TransactionBalancesSet, TransactionDatumSet,
+            TransactionExecutionResult, TransactionResults,
         },
         bank_utils,
         prioritization_fee_cache::PrioritizationFeeCache,
+        program_inclusions::PreOrPostDatum,
         transaction_batch::TransactionBatch,
         vote_sender_types::ReplayVoteSender,
     },
@@ -32,6 +33,7 @@ pub enum CommitTransactionDetails {
 #[derive(Default)]
 pub(super) struct PreBalanceInfo {
     pub native: Vec<Vec<u64>>,
+    pub datum: Vec<Vec<Option<Vec<u8>>>>,
     pub token: Vec<Vec<TransactionTokenBalance>>,
     pub mint_decimals: HashMap<Pubkey, u8>,
 }
@@ -141,7 +143,8 @@ impl Committer {
     ) {
         if let Some(transaction_status_sender) = &self.transaction_status_sender {
             let txs = batch.sanitized_transactions().to_vec();
-            let post_balances = bank.collect_balances(batch);
+            let (post_balances, post_datum) =
+                bank.collect_balances_and_datum(batch, PreOrPostDatum::PostDatum);
             let post_token_balances =
                 collect_token_balances(bank, batch, &mut pre_balance_info.mint_decimals);
             let mut transaction_index = starting_transaction_index.unwrap_or_default();
@@ -166,6 +169,7 @@ impl Committer {
                     std::mem::take(&mut pre_balance_info.native),
                     post_balances,
                 ),
+                TransactionDatumSet::new(std::mem::take(&mut pre_balance_info.datum), post_datum),
                 TransactionTokenBalancesSet::new(
                     std::mem::take(&mut pre_balance_info.token),
                     post_token_balances,

core/src/banking_stage/consumer.rs

@@ -21,6 +21,7 @@ use {
     solana_program_runtime::timings::ExecuteTimings,
     solana_runtime::{
         bank::{Bank, LoadAndExecuteTransactionsOutput, TransactionCheckResult},
+        program_inclusions::PreOrPostDatum,
         transaction_batch::TransactionBatch,
         transaction_error_metrics::TransactionErrorMetrics,
     },
@@ -537,7 +538,8 @@ impl Consumer {
             // If the extra meta-data services are enabled for RPC, collect the
             // pre-balances for native and token programs.
             if transaction_status_sender_enabled {
-                pre_balance_info.native = bank.collect_balances(batch);
+                (pre_balance_info.native, pre_balance_info.datum) =
+                    bank.collect_balances_and_datum(batch, PreOrPostDatum::PreDatum);
                 pre_balance_info.token =
                     collect_token_balances(bank, batch, &mut pre_balance_info.mint_decimals)
             }

ledger/src/blockstore_processor.rs

@@ -28,8 +28,8 @@ use {
         accounts_index::AccountSecondaryIndexes,
         accounts_update_notifier_interface::AccountsUpdateNotifier,
         bank::{
-            Bank, TransactionBalancesSet, TransactionExecutionDetails, TransactionExecutionResult,
-            TransactionResults,
+            Bank, TransactionBalancesSet, TransactionDatumSet, TransactionExecutionDetails,
+            TransactionExecutionResult, TransactionResults,
         },
         bank_forks::BankForks,
         bank_utils,
@@ -155,7 +155,7 @@ fn execute_batch(
         vec![]
     };
 
-    let (tx_results, balances) = batch.bank().load_execute_and_commit_transactions(
+    let (tx_results, balances, datum) = batch.bank().load_execute_and_commit_transactions(
         batch,
         MAX_PROCESSING_AGE,
         transaction_status_sender.is_some(),
@@ -201,6 +201,7 @@ fn execute_batch(
             transactions,
             execution_results,
             balances,
+            datum,
             token_balances,
             rent_debits,
             transaction_indexes.to_vec(),
@@ -1744,6 +1745,7 @@ pub struct TransactionStatusBatch {
     pub transactions: Vec<SanitizedTransaction>,
     pub execution_results: Vec<Option<TransactionExecutionDetails>>,
     pub balances: TransactionBalancesSet,
+    pub datum: TransactionDatumSet,
     pub token_balances: TransactionTokenBalancesSet,
     pub rent_debits: Vec<RentDebits>,
     pub transaction_indexes: Vec<usize>,
@@ -1761,6 +1763,7 @@ impl TransactionStatusSender {
         transactions: Vec<SanitizedTransaction>,
         execution_results: Vec<TransactionExecutionResult>,
         balances: TransactionBalancesSet,
+        datum: TransactionDatumSet,
         token_balances: TransactionTokenBalancesSet,
         rent_debits: Vec<RentDebits>,
         transaction_indexes: Vec<usize>,
@@ -1780,6 +1783,7 @@ impl TransactionStatusSender {
                     })
                     .collect(),
                 balances,
+                datum,
                 token_balances,
                 rent_debits,
                 transaction_indexes,
@@ -3863,6 +3867,7 @@ pub mod tests {
                 ..
             },
             _balances,
+            _datums,
         ) = batch.bank().load_execute_and_commit_transactions(
             &batch,
             MAX_PROCESSING_AGE,

rpc-client/src/mock_sender.rs

@@ -226,6 +226,8 @@ impl RpcSender for MockSender {
                             fee: 0,
                             pre_balances: vec![499999999999999950, 50, 1],
                             post_balances: vec![499999999999999950, 50, 1],
+                            pre_datum: None,
+                            post_datum: None,
                             inner_instructions: OptionSerializer::None,
                             log_messages: OptionSerializer::None,
                             pre_token_balances: OptionSerializer::None,

rpc/src/transaction_status_service.rs

@@ -70,6 +70,7 @@ impl TransactionStatusService {
                 bank,
                 transactions,
                 execution_results,
+                datum,
                 balances,
                 token_balances,
                 rent_debits,
@@ -81,6 +82,8 @@ impl TransactionStatusService {
                     execution_result,
                     pre_balances,
                     post_balances,
+                    pre_datum,
+                    post_datum,
                     pre_token_balances,
                     post_token_balances,
                     rent_debits,
@@ -90,6 +93,8 @@ impl TransactionStatusService {
                     execution_results,
                     balances.pre_balances,
                     balances.post_balances,
+                    datum.pre_datum,
+                    datum.post_datum,
                     token_balances.pre_token_balances,
                     token_balances.post_token_balances,
                     rent_debits,
@@ -159,6 +164,8 @@ impl TransactionStatusService {
                             fee,
                             pre_balances,
                             post_balances,
+                            pre_datum: Some(pre_datum),
+                            post_datum: Some(post_datum),
                             inner_instructions,
                             log_messages,
                             pre_token_balances,
@@ -228,7 +235,7 @@ pub(crate) mod tests {
         solana_account_decoder::parse_token::token_amount_to_ui_amount,
         solana_ledger::{genesis_utils::create_genesis_config, get_tmp_ledger_path},
         solana_runtime::{
-            bank::{Bank, NonceFull, NoncePartial, TransactionBalancesSet},
+            bank::{Bank, NonceFull, NoncePartial, TransactionBalancesSet, TransactionDatumSet},
             rent_debits::RentDebits,
         },
         solana_sdk::{
@@ -424,6 +431,10 @@ pub(crate) mod tests {
         let transaction_index: usize = bank.transaction_count().try_into().unwrap();
         let transaction_status_batch = TransactionStatusBatch {
             bank,
+            datum: TransactionDatumSet {
+                post_datum: vec![vec![Some(vec![0x69])]],
+                pre_datum: vec![vec![Some(vec![0x04, 0x20])]],
+            },
             transactions: vec![transaction],
             execution_results: vec![transaction_result],
             balances,