Skip to content

Commit 34887b6

Browse files
committed
pass state to execute block
1 parent 3ac17c1 commit 34887b6

File tree

1 file changed

+10
-7
lines changed
  • protocol-units/sov-modules/sov-aptos-vm/src/aptos

1 file changed

+10
-7
lines changed

protocol-units/sov-modules/sov-aptos-vm/src/aptos/executor.rs

+10-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use aptos_db::AptosDB;
44
use aptos_sdk::move_types::vm_status::StatusCode;
55
use aptos_types::block_executor::partitioner::TxnIndex;
66
use aptos_types::state_store::StateView;
7-
use aptos_types::transaction::{Transaction, TransactionOutput, WriteSetPayload};
7+
use aptos_types::transaction::{Transaction, TransactionOutput, Version, WriteSetPayload};
88
use aptos_types::vm_status::VMStatus;
99
use aptos_types::{
1010
chain_id::ChainId, transaction::signature_verified_transaction::SignatureVerifiedTransaction,
@@ -19,7 +19,7 @@ use aptos_vm_types::output::VMOutput;
1919
use aptos_language_e2e_tests::executor::FakeExecutor;
2020
use aptos_vm_types::resolver::{ExecutorView, ResourceGroupView};
2121
use fail::fail_point;
22-
use crate::aptos::db::AptosDb;
22+
use crate::aptos::db::{AptosDb, SovAptosDb};
2323

2424
pub(crate) struct AptosExecutor<'a, S> {
2525
vm: AptosVM,
@@ -107,12 +107,15 @@ impl<'a, S: 'a + StateView + Sync> ExecutorTask for AptosExecutor<'a, S> {
107107
}
108108
}
109109

110-
pub fn execute_block(
111-
db: StateValue<AptosDB>,
110+
pub fn execute_block<S>(
111+
db: SovAptosDb<S>,
112+
version: Version,
112113
transactions: &[SignatureVerifiedTransaction],
113114
onchain_config: BlockExecutorConfigFromOnchain,
114-
) {
115-
let db = db.get().unwrap();
115+
)
116+
where S: sov_modules_api::Spec
117+
{
118+
let state= db.state_view_at_version(Some(version)).expect("Failed to create state view");
116119

117-
let foo= AptosVM::execute_block(transactions, state_view, onchain_config);
120+
let foo= AptosVM::execute_block(transactions, &state, onchain_config);
118121
}

0 commit comments

Comments
 (0)