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

Remove wasm_gas_costs.json and used a constant value for wasm operator #4763

Merged
merged 3 commits into from
Oct 14, 2024
Merged

Remove wasm_gas_costs.json and used a constant value for wasm operator #4763

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a570716
Remove wasm_gas_costs.json and used a constant value for wasm operator
sydhds Oct 10, 2024
b355cc1
Cargo fmt pass
sydhds Oct 10, 2024
4ea7532
Update massa-sc-runtime dependency
sydhds Oct 11, 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
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ massa_wallet = { path = "./massa-wallet" }

# Massa projects dependencies
massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", branch = "mainnet_2_3" }
massa-sc-runtime = { git = "https://github.com/massalabs/massa-sc-runtime", "branch" = "feature/inconsistent_gas_entries" }
massa-sc-runtime = { git = "https://github.com/massalabs/massa-sc-runtime", "branch" = "feature/operator_gas_costs" }
peernet = { git = "https://github.com/massalabs/PeerNet", "rev" = "04b05ddd320fbe76cc858115af7b5fc28bdb8310" }
# Dev only - use local dependencies
# massa-proto-rs = { path = "../massa-proto-rs" }
Expand Down
5 changes: 0 additions & 5 deletions massa-execution-exports/src/test_exports/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@ impl Default for ExecutionConfig {
"/../massa-node/base_config/gas_costs/abi_gas_costs.json"
)
.into(),
concat!(
env!("CARGO_MANIFEST_DIR"),
"/../massa-node/base_config/gas_costs/wasm_gas_costs.json"
)
.into(),
)
.unwrap(),
base_operation_gas_cost: BASE_OPERATION_GAS_COST,
Expand Down
13 changes: 0 additions & 13 deletions massa-node/base_config/gas_costs/wasm_gas_costs.json
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions massa-node/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,11 +462,8 @@ async fn launch(
};

// gas costs
let gas_costs = GasCosts::new(
SETTINGS.execution.abi_gas_costs_file.clone(),
SETTINGS.execution.wasm_gas_costs_file.clone(),
)
.expect("Failed to load gas costs");
let gas_costs = GasCosts::new(SETTINGS.execution.abi_gas_costs_file.clone())
.expect("Failed to load gas costs");

// Limits imposed to wasm files so the compilation phase is smooth
let condom_limits = CondomLimits {
Expand Down
1 change: 0 additions & 1 deletion massa-node/src/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ pub struct ExecutionSettings {
pub stats_time_window_duration: MassaTime,
pub max_read_only_gas: u64,
pub abi_gas_costs_file: PathBuf,
pub wasm_gas_costs_file: PathBuf,
pub hd_cache_path: PathBuf,
pub lru_cache_size: u32,
pub hd_cache_size: usize,
Expand Down
1 change: 0 additions & 1 deletion massa-xtask/src/check_gas_cost_definitions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ pub(crate) fn check_gas_cost_definitions() -> Result<(), String> {
// SETTINGS.execution.abi_gas_costs_file.clone(),
// SETTINGS.execution.wasm_gas_costs_file.clone(),
"massa-node/base_config/gas_costs/abi_gas_costs.json".into(),
"massa-node/base_config/gas_costs/wasm_gas_costs.json".into(),
)
.expect("Failed to load gas costs");

Expand Down
Loading