Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 3 deletions aptos-move/aptos-gas-schedule-updator/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ use aptos_gas_schedule::{
use aptos_package_builder::PackageBuilder;
use aptos_types::on_chain_config::GasScheduleV2;
use clap::Parser;
use move_core_types::account_address::AccountAddress;
use move_model::{code_writer::CodeWriter, emit, emitln, model::Loc};
use std::path::{Path, PathBuf};

Expand Down Expand Up @@ -73,8 +72,11 @@ fn generate_script(gas_schedule: &GasScheduleV2) -> Result<String> {

emitln!(
writer,
"let framework_signer = supra_governance::supra_resolve(proposal_id, @{});\n",
AccountAddress::ONE,
"let framework_signer = supra_governance::resolve_supra_multi_step_proposal(
proposal_id,
@supra_framework,
vector::empty<u8>()
);\n"
);

emit!(writer, "let gas_schedule_blob: vector<u8> = ");
Expand Down
16 changes: 8 additions & 8 deletions aptos-move/aptos-gas-schedule/src/gas_schedule/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,34 +175,34 @@ crate::gas_schedule::macros::define_gas_parameters!(
[
legacy_storage_fee_per_state_slot_create: FeePerSlot,
{ 7..=13 => "storage_fee_per_state_slot_create", 14.. => "legacy_storage_fee_per_state_slot_create" },
50000,
50000000,
],
[
storage_fee_per_state_slot: FeePerSlot,
{ 14.. => "storage_fee_per_state_slot" },
// 0.8 million SUPRA for 2 billion state slots
40_000,
40_000_000,
],
[
legacy_storage_fee_per_excess_state_byte: FeePerByte,
{ 7..=13 => "storage_fee_per_excess_state_byte", 14.. => "legacy_storage_fee_per_excess_state_byte" },
50,
50_000,
],
[
storage_fee_per_state_byte: FeePerByte,
{ 14.. => "storage_fee_per_state_byte" },
// 0.8 million SUPRA for 2 TB state bytes
40,
40_000,
],
[
legacy_storage_fee_per_event_byte: FeePerByte,
{ 7..=13 => "storage_fee_per_event_byte", 14.. => "legacy_storage_fee_per_event_byte" },
20,
20_000,
],
[
legacy_storage_fee_per_transaction_byte: FeePerByte,
{ 7..=13 => "storage_fee_per_transaction_byte", 14.. => "legacy_storage_fee_per_transaction_byte" },
20,
20_000,
],
[
max_execution_gas: InternalGas,
Expand All @@ -227,12 +227,12 @@ crate::gas_schedule::macros::define_gas_parameters!(
[
max_storage_fee: Fee,
{ 7.. => "max_storage_fee" },
2_0000_0000, // 2 SUPRA
2_000_0000_0000, // 2000 SUPRA
],
[
max_storage_fee_gov: Fee,
{ RELEASE_V1_13.. => "max_storage_fee.gov" },
2_0000_0000,
2_000_0000_0000,
],
[
dependency_per_module: InternalGas,
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/e2e-move-tests/src/harness.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ pub enum BlockSplit {
}

impl MoveHarness {
const DEFAULT_MAX_GAS_PER_TXN: u64 = 2_000_000;
const DEFAULT_MAX_GAS_PER_TXN: u64 = 100_000_000;

/// Creates a new harness.
pub fn new() -> Self {
Expand Down
2 changes: 1 addition & 1 deletion config/global-constants/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub const GENESIS_WAYPOINT: &str = "genesis-waypoint";
#[cfg(any(test, feature = "testing"))]
pub const GAS_UNIT_PRICE: u64 = 0;
#[cfg(not(any(test, feature = "testing")))]
pub const GAS_UNIT_PRICE: u64 = 100;
pub const GAS_UNIT_PRICE: u64 = 100_000;

#[cfg(any(test, feature = "testing"))]
pub const MAX_GAS_AMOUNT: u64 = 100_000_000;
Expand Down
Loading