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

[gas] initial gas parameters for table operations #4659

Merged
merged 1 commit into from
Sep 30, 2022
Merged

[gas] initial gas parameters for table operations #4659

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
9 changes: 8 additions & 1 deletion aptos-move/aptos-gas/src/gas_meter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,14 @@ use move_vm_types::{
};
use std::collections::BTreeMap;

pub const LATEST_GAS_FEATURE_VERSION: u64 = 1;
// Change log:
// - V2
// - Table
// - Fix the gas formula for loading resources so that they are consistent with other
// global operations.
// - V1
// - TBA
pub const LATEST_GAS_FEATURE_VERSION: u64 = 2;

/// A trait for converting from a map representation of the on-chain gas schedule.
pub trait FromOnChainGasSchedule: Sized {
Expand Down
28 changes: 14 additions & 14 deletions aptos-move/aptos-gas/src/table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
use move_table_extension::GasParameters;

crate::natives::define_gas_parameters_for_natives!(GasParameters, "table", [
[.common.load_base, "common.load.base", 1],
[.common.load_per_byte, "common.load.per_byte", 1],
[.common.load_failure, "common.load.failure", 1],
[.common.load_base, "common.load.base", 8000],
[.common.load_per_byte, "common.load.per_byte", 1000],
[.common.load_failure, "common.load.failure", 0],

[.new_table_handle.base, "new_table_handle.base", 1],
[.new_table_handle.base, "new_table_handle.base", 1000],

[.add_box.base, "add_box.base", 1],
[.add_box.per_byte_serialized, "add_box.per_byte_serialized", 1],
[.add_box.base, "add_box.base", 1200],
[.add_box.per_byte_serialized, "add_box.per_byte_serialized", 10],

[.borrow_box.base, "borrow_box.base", 1],
[.borrow_box.per_byte_serialized, "borrow_box.per_byte_serialized", 1],
[.borrow_box.base, "borrow_box.base", 1200],
[.borrow_box.per_byte_serialized, "borrow_box.per_byte_serialized", 10],

[.contains_box.base, "contains_box.base", 1],
[.contains_box.per_byte_serialized, "contains_box.per_byte_serialized", 1],
[.contains_box.base, "contains_box.base", 1200],
[.contains_box.per_byte_serialized, "contains_box.per_byte_serialized", 10],

[.remove_box.base, "remove_box.base", 1],
[.remove_box.per_byte_serialized, "remove_box.per_byte_serialized", 1],
[.remove_box.base, "remove_box.base", 1200],
[.remove_box.per_byte_serialized, "remove_box.per_byte_serialized", 10],

[.destroy_empty_box.base, "destroy_empty_box.base", 1],
[.destroy_empty_box.base, "destroy_empty_box.base", 1200],

[.drop_unchecked_box.base, "drop_unchecked_box.base", 1],
[.drop_unchecked_box.base, "drop_unchecked_box.base", 100],
]);
16 changes: 14 additions & 2 deletions aptos-move/aptos-vm/src/aptos_vm_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ impl AptosVMImpl {
let storage = StorageAdapter::new(state);

// Get the gas parameters
let (gas_params, gas_feature_version): (Option<AptosGasParameters>, u64) =
let (mut gas_params, gas_feature_version): (Option<AptosGasParameters>, u64) =
match GasScheduleV2::fetch_config(&storage) {
Some(gas_schedule) => {
let feature_version = gas_schedule.feature_version;
Expand All @@ -81,12 +81,24 @@ impl AptosVMImpl {
},
};

let storage_gas_params = match gas_feature_version {
let storage_gas_params: Option<StorageGasParameters> = match gas_feature_version {
0 => None,
_ => StorageGasSchedule::fetch_config(&storage)
.map(|storage_gas_schedule| storage_gas_schedule.into()),
};

if gas_feature_version >= 2 {
if let (Some(gas_params), Some(storage_gas_params)) =
(&mut gas_params, &storage_gas_params)
{
gas_params.natives.table.common.load_base =
u64::from(storage_gas_params.per_item_read).into();
gas_params.natives.table.common.load_per_byte =
u64::from(storage_gas_params.per_byte_read).into();
gas_params.natives.table.common.load_failure = 0.into();
}
}

// TODO(Gas): Right now, we have to use some dummy values for gas parameters if they are not found on-chain.
// This only happens in a edge case that is probably related to write set transactions or genesis,
// which logically speaking, shouldn't be handled by the VM at all.
Expand Down
2 changes: 0 additions & 2 deletions aptos-move/framework/cached-packages/src/aptos_token_sdk_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ pub enum EntryFunctionCall {
amount: u64,
},

/// Deprecated function call
TokenInitializeTokenScript {},

/// Mint more token from an existing token_data. Mint only adds more token to property_version 0
Expand Down Expand Up @@ -482,7 +481,6 @@ pub fn token_direct_transfer_script(
))
}

/// Deprecated function call
pub fn token_initialize_token_script() -> TransactionPayload {
TransactionPayload::EntryFunction(EntryFunction::new(
ModuleId::new(
Expand Down