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

feat(vm): Extract oneshot VM executor – environment types #2885

Merged
merged 13 commits into from
Sep 23, 2024
Merged

feat(vm): Extract oneshot VM executor – environment types #2885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6d39715
Move `MultiVMBaseSystemContracts` to executor
slowli Sep 11, 2024
ffc6cc5
Move block types to executor
slowli Sep 12, 2024
cc6acfb
Use oneshot executor in consensus
slowli Sep 12, 2024
dc5b570
Make API server work
slowli Sep 12, 2024
661d916
Brush up oneshot executor
slowli Sep 12, 2024
0cfb22f
Brush up env parameters
slowli Sep 16, 2024
58858c9
Fix formatting
slowli Sep 16, 2024
bc7ccac
Fix batch fee input for trace calls
slowli Sep 16, 2024
db013aa
Test batch fee input
slowli Sep 16, 2024
f77c695
Remove unnecessary provider wrapper
slowli Sep 16, 2024
b9b7f9d
Get fee input from Postgres
slowli Sep 20, 2024
9be0b17
Update FIXME for `DebugNamespace`
slowli Sep 20, 2024
adf4d7b
Update from upstream
slowli Sep 20, 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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions core/bin/external_node/src/node_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use zksync_config::{
PostgresConfig,
};
use zksync_metadata_calculator::{MetadataCalculatorConfig, MetadataCalculatorRecoveryConfig};
use zksync_node_api_server::{tx_sender::ApiContracts, web3::Namespace};
use zksync_node_api_server::web3::Namespace;
use zksync_node_framework::{
implementations::layers::{
batch_status_updater::BatchStatusUpdaterLayer,
Expand Down Expand Up @@ -380,12 +380,10 @@ impl ExternalNodeBuilder {
latest_values_cache_size: self.config.optional.latest_values_cache_size() as u64,
};
let max_vm_concurrency = self.config.optional.vm_concurrency_limit;
let api_contracts = ApiContracts::load_from_disk_blocking(); // TODO (BFT-138): Allow to dynamically reload API contracts;
let tx_sender_layer = TxSenderLayer::new(
(&self.config).into(),
postgres_storage_config,
max_vm_concurrency,
api_contracts,
)
.with_whitelisted_tokens_for_aa_cache(true);

Expand Down
3 changes: 1 addition & 2 deletions core/bin/zksync_server/src/node_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use zksync_config::{
use zksync_core_leftovers::Component;
use zksync_metadata_calculator::MetadataCalculatorConfig;
use zksync_node_api_server::{
tx_sender::{ApiContracts, TxSenderConfig},
tx_sender::TxSenderConfig,
web3::{state::InternalApiConfig, Namespace},
};
use zksync_node_framework::{
Expand Down Expand Up @@ -322,7 +322,6 @@ impl MainNodeBuilder {
),
postgres_storage_caches_config,
rpc_config.vm_concurrency_limit(),
ApiContracts::load_from_disk_blocking(), // TODO (BFT-138): Allow to dynamically reload API contracts
));
Ok(self)
}
Expand Down
Loading
Loading