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

Jump to bottom

fix: wasmer1_default feature actually selects wasmer1 #4279

Closed
wants to merge 1 commit into from
Closed

fix: wasmer1_default feature actually selects wasmer1 #4279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions runtime/near-vm-logic/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ protocol_feature_evm = ["near-primitives-core/protocol_feature_evm"]
protocol_feature_alt_bn128 = ["bn", "near-primitives-core/protocol_feature_alt_bn128", "near-vm-errors/protocol_feature_alt_bn128"]
protocol_feature_allow_create_account_on_delete = []

wasmer0_default = []
wasmtime_default = []
wasmer1_default = []

# Use this feature to enable counting of fees and costs applied.
costs_counting = ["near-primitives-core/costs_counting"]

Expand Down
5 changes: 5 additions & 0 deletions runtime/near-vm-runner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ default = ["wasmer0_vm", "wasmtime_vm", "wasmer1_vm"]
wasmer0_vm = [ "wasmer-runtime" ]
wasmtime_vm = [ "wasmtime", "anyhow"]
wasmer1_vm = [ "wasmer", "wasmer-types", "wasmer-compiler-singlepass", "wasmer-compiler-cranelift", "wasmer-engine-native", ]

wasmer0_default = []
wasmtime_default = []
wasmer1_default = []

lightbeam = ["wasmtime/lightbeam"]
no_cpu_compatibility_checks = []
protocol_feature_evm = ["near-primitives/protocol_feature_evm", "near-evm-runner/protocol_feature_evm"]
Expand Down
2 changes: 1 addition & 1 deletion runtime/runtime-params-estimator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ costs_counting = ["near-vm-logic/costs_counting"]
# Required feature for proper config, but can't be enabled by default because it is leaked to other release crates.
required = ["costs_counting", "near-vm-runner/no_cpu_compatibility_checks", "no_cache"]
no_cache = ["node-runtime/no_cache", "near-store/no_cache"]
wasmtime = ["near-vm-logic/wasmtime_default"]
wasmtime = ["near-vm-runner/wasmtime_default"]
lightbeam = ["wasmtime", "near-vm-runner/lightbeam"]
nightly_protocol = ["near-primitives/nightly_protocol"]
nightly_protocol_features = ["protocol_feature_alt_bn128", "protocol_feature_evm"]
Expand Down
6 changes: 3 additions & 3 deletions runtime/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ protocol_feature_evm = ["near-evm-runner/protocol_feature_evm", "near-primitives
wasmer1_vm = ["near-vm-runner/wasmer1_vm"]
wasmer0_vm = ["near-vm-runner/wasmer0_vm"]
wasmtime_vm = ["near-vm-runner/wasmtime_vm"]
wasmer1_default = ["wasmer1_vm", "near-vm-logic/wasmer1_default"]
wasmer0_default = ["wasmer0_vm", "near-vm-logic/wasmer0_default"]
wasmtime_default = ["wasmtime_vm", "near-vm-logic/wasmtime_default"]
wasmer1_default = ["wasmer1_vm", "near-vm-runner/wasmer1_default"]
wasmer0_default = ["wasmer0_vm", "near-vm-runner/wasmer0_default"]
wasmtime_default = ["wasmtime_vm", "near-vm-runner/wasmtime_default"]

no_cpu_compatibility_checks = [ "near-vm-runner/no_cpu_compatibility_checks"]

Expand Down