Skip to content

Breaking: Rename gas price parameters - only strk/fri #784

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

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Breaking: Rename gas price parameters - only strk/fri #784

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1735625
Rename gas prices; remove wei [skip ci]
FabijanC Apr 29, 2025
1dcb36e
Finish code replacement; docs remaining
FabijanC May 12, 2025
e60a062
Fix gas tests; simplify price assignment; rely on util methods
FabijanC May 13, 2025
e3b5106
Apply fixes of coderabbit's nitpick comments
FabijanC May 13, 2025
d7eebaa
Use devnet default gas prices instead of max for eth
FabijanC May 13, 2025
3aa301d
Modify default eth prices; update messaging test
FabijanC May 14, 2025
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
12 changes: 11 additions & 1 deletion crates/starknet-devnet-core/src/blocks/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::collections::HashMap;

use indexmap::IndexMap;
use starknet_api::block::{
BlockHeader, BlockHeaderWithoutHash, BlockNumber, BlockStatus, BlockTimestamp,
BlockHeader, BlockHeaderWithoutHash, BlockNumber, BlockStatus, BlockTimestamp, GasPrice,
};
use starknet_api::data_availability::L1DataAvailabilityMode;
use starknet_api::felt;
Expand All @@ -12,6 +12,7 @@ use starknet_types::felt::{BlockHash, TransactionHash};
use starknet_types::rpc::block::{
BlockHeader as TypesBlockHeader, PendingBlockHeader as TypesPendingBlockHeader, ResourcePrice,
};
use starknet_types::rpc::gas_modification::GasModification;
use starknet_types::traits::HashProducer;
use starknet_types_core::hash::{Pedersen, StarkHash};

Expand Down Expand Up @@ -393,6 +394,15 @@ impl StarknetBlock {
pub(crate) fn set_timestamp(&mut self, timestamp: BlockTimestamp) {
self.header.block_header_without_hash.timestamp = timestamp;
}

pub(crate) fn apply_gas_modification(&mut self, gas_modification: &GasModification) {
self.header.block_header_without_hash.l1_gas_price.price_in_fri =
GasPrice(gas_modification.l1_gas_price.get());
self.header.block_header_without_hash.l1_data_gas_price.price_in_fri =
GasPrice(gas_modification.l1_data_gas_price.get());
self.header.block_header_without_hash.l2_gas_price.price_in_fri =
GasPrice(gas_modification.l2_gas_price.get());
}
}

impl HashProducer for StarknetBlock {
Expand Down
3 changes: 0 additions & 3 deletions crates/starknet-devnet-core/src/starknet/add_deploy_account_transaction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,6 @@ mod tests {
.declare_contract_class(class_hash, None, contract_class.into())
.unwrap();
starknet.block_context = Starknet::init_block_context(
nonzero!(GAS_PRICE),
nonzero!(GAS_PRICE),
nonzero!(GAS_PRICE),
nonzero!(GAS_PRICE),
nonzero!(GAS_PRICE),
nonzero!(GAS_PRICE),
Expand Down
12 changes: 3 additions & 9 deletions crates/starknet-devnet-core/src/starknet/add_invoke_transaction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,9 +418,6 @@ mod tests {
// change storage of dummy contract

starknet.block_context = Starknet::init_block_context(
nonzero!(1u128),
nonzero!(1u128),
nonzero!(1u128),
nonzero!(1u128),
nonzero!(1u128),
nonzero!(1u128),
Expand All @@ -430,12 +427,9 @@ mod tests {
DEVNET_DEFAULT_STARTING_BLOCK_NUMBER,
);
starknet.next_block_gas = GasModification {
gas_price_wei: nonzero!(1u128),
data_gas_price_wei: nonzero!(1u128),
l2_gas_price_wei: nonzero!(1u128),
gas_price_fri: nonzero!(1u128),
data_gas_price_fri: nonzero!(1u128),
l2_gas_price_fri: nonzero!(1u128),
l1_gas_price: nonzero!(1u128),
l1_data_gas_price: nonzero!(1u128),
l2_gas_price: nonzero!(1u128),
};

starknet.restart_pending_block().unwrap();
Expand Down
3 changes: 0 additions & 3 deletions crates/starknet-devnet-core/src/starknet/add_l1_handler_transaction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,6 @@ mod tests {
.predeploy_contract(dummy_contract_address, dummy_contract_class_hash)
.unwrap();
starknet.block_context = Starknet::init_block_context(
nonzero!(1u128),
nonzero!(1u128),
nonzero!(1u128),
nonzero!(1u128),
nonzero!(1u128),
nonzero!(1u128),
Expand Down
162 changes: 49 additions & 113 deletions crates/starknet-devnet-core/src/starknet/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
use ethers::types::H256;
use parking_lot::RwLock;
use starknet_api::block::{
BlockInfo, BlockNumber, BlockStatus, BlockTimestamp, FeeType, GasPrice, GasPricePerToken,
GasPriceVector, GasPrices,
BlockInfo, BlockNumber, BlockStatus, BlockTimestamp, FeeType, GasPricePerToken, GasPriceVector,
GasPrices, NonzeroGasPrice,
};
use starknet_api::core::SequencerContractAddress;
use starknet_api::data_availability::DataAvailabilityMode;
Expand Down Expand Up @@ -97,6 +97,12 @@ pub mod starknet_config;
mod state_update;
pub(crate) mod transaction_trace;

const DUMMY_GAS_PRICE_VECTOR: GasPriceVector = GasPriceVector {
l1_gas_price: NonzeroGasPrice::MIN,
l1_data_gas_price: NonzeroGasPrice::MIN,
l2_gas_price: NonzeroGasPrice::MIN,
};

pub struct Starknet {
pub latest_state: StarknetState,
pub pending_state: StarknetState,
Expand All @@ -122,11 +128,8 @@ impl Default for Starknet {
Self {
block_context: Self::init_block_context(
DEVNET_DEFAULT_L1_GAS_PRICE,
DEVNET_DEFAULT_L1_GAS_PRICE,
DEVNET_DEFAULT_L1_DATA_GAS_PRICE,
DEVNET_DEFAULT_L1_DATA_GAS_PRICE,
DEVNET_DEFAULT_L2_GAS_PRICE,
DEVNET_DEFAULT_L2_GAS_PRICE,
ETH_ERC20_CONTRACT_ADDRESS,
STRK_ERC20_CONTRACT_ADDRESS,
DEVNET_DEFAULT_CHAIN_ID,
Expand All @@ -142,12 +145,9 @@ impl Default for Starknet {
pending_block_timestamp_shift: 0,
next_block_timestamp: None,
next_block_gas: GasModification {
gas_price_wei: DEVNET_DEFAULT_L1_GAS_PRICE,
data_gas_price_wei: DEVNET_DEFAULT_L1_DATA_GAS_PRICE,
gas_price_fri: DEVNET_DEFAULT_L1_GAS_PRICE,
data_gas_price_fri: DEVNET_DEFAULT_L1_DATA_GAS_PRICE,
l2_gas_price_fri: DEVNET_DEFAULT_L2_GAS_PRICE,
l2_gas_price_wei: DEVNET_DEFAULT_L2_GAS_PRICE,
l1_gas_price: DEVNET_DEFAULT_L1_GAS_PRICE,
l1_data_gas_price: DEVNET_DEFAULT_L1_DATA_GAS_PRICE,
l2_gas_price: DEVNET_DEFAULT_L2_GAS_PRICE,
},
messaging: Default::default(),
rpc_contract_classes: Default::default(),
Expand Down Expand Up @@ -253,12 +253,9 @@ impl Starknet {
pending_state_diff,
predeployed_accounts,
block_context: Self::init_block_context(
config.gas_price_wei,
config.gas_price_fri,
config.data_gas_price_wei,
config.data_gas_price_fri,
config.l2_gas_price_wei,
config.l2_gas_price_fri,
config.l1_gas_price,
config.l1_data_gas_price,
config.l2_gas_price,
ETH_ERC20_CONTRACT_ADDRESS,
STRK_ERC20_CONTRACT_ADDRESS,
config.chain_id,
Expand All @@ -270,12 +267,9 @@ impl Starknet {
pending_block_timestamp_shift: 0,
next_block_timestamp: None,
next_block_gas: GasModification {
gas_price_wei: config.gas_price_wei,
data_gas_price_wei: config.data_gas_price_wei,
gas_price_fri: config.gas_price_fri,
data_gas_price_fri: config.data_gas_price_fri,
l2_gas_price_wei: config.l2_gas_price_wei,
l2_gas_price_fri: config.l2_gas_price_fri,
l1_gas_price: config.l1_gas_price,
l1_data_gas_price: config.l1_data_gas_price,
l2_gas_price: config.l2_gas_price,
},
messaging: Default::default(),
rpc_contract_classes,
Expand Down Expand Up @@ -318,20 +312,7 @@ impl Starknet {
Self::advance_block_context_block_number(&mut self.block_context);

Self::set_block_context_gas(&mut self.block_context, &self.next_block_gas);

// Pending block header gas data needs to be set
self.blocks.pending_block.header.block_header_without_hash.l1_gas_price.price_in_wei =
GasPrice(self.next_block_gas.gas_price_wei.get());
self.blocks.pending_block.header.block_header_without_hash.l1_data_gas_price.price_in_wei =
GasPrice(self.next_block_gas.data_gas_price_wei.get());
self.blocks.pending_block.header.block_header_without_hash.l2_gas_price.price_in_wei =
GasPrice(self.next_block_gas.l2_gas_price_wei.get());
self.blocks.pending_block.header.block_header_without_hash.l1_gas_price.price_in_fri =
GasPrice(self.next_block_gas.gas_price_fri.get());
self.blocks.pending_block.header.block_header_without_hash.l1_data_gas_price.price_in_fri =
GasPrice(self.next_block_gas.data_gas_price_fri.get());
self.blocks.pending_block.header.block_header_without_hash.l2_gas_price.price_in_fri =
GasPrice(self.next_block_gas.l2_gas_price_fri.get());
self.blocks.pending_block.apply_gas_modification(&self.next_block_gas);

self.restart_pending_block()?;

Expand All @@ -356,20 +337,7 @@ impl Starknet {
pub(crate) fn generate_new_block_and_state(&mut self) -> DevnetResult<Felt> {
let mut new_block = self.pending_block().clone();

// Set new block header
// TODO why not store the whole next block header instead of storing separate properties?
new_block.header.block_header_without_hash.l1_gas_price.price_in_fri =
GasPrice(self.next_block_gas.gas_price_fri.get());
new_block.header.block_header_without_hash.l1_gas_price.price_in_wei =
GasPrice(self.next_block_gas.gas_price_wei.get());
new_block.header.block_header_without_hash.l1_data_gas_price.price_in_fri =
GasPrice(self.next_block_gas.data_gas_price_fri.get());
new_block.header.block_header_without_hash.l1_data_gas_price.price_in_wei =
GasPrice(self.next_block_gas.data_gas_price_wei.get());
new_block.header.block_header_without_hash.l2_gas_price.price_in_fri =
GasPrice(self.next_block_gas.l2_gas_price_fri.get());
new_block.header.block_header_without_hash.l2_gas_price.price_in_wei =
GasPrice(self.next_block_gas.l2_gas_price_wei.get());
new_block.apply_gas_modification(&self.next_block_gas);

let new_block_number = self.blocks.next_block_number();
new_block.set_block_hash(if self.config.lite_mode {
Expand Down Expand Up @@ -464,12 +432,9 @@ impl Starknet {
#[allow(clippy::too_many_arguments)]
/// Create a BlockContext based on BlockContext::create_for_testing()
fn init_block_context(
gas_price_wei: NonZeroU128,
gas_price_fri: NonZeroU128,
data_gas_price_wei: NonZeroU128,
data_gas_price_fri: NonZeroU128,
l2_gas_price_wei: NonZeroU128,
l2_gas_price_fri: NonZeroU128,
l1_gas_price: NonZeroU128,
l1_data_gas_price: NonZeroU128,
l2_gas_price: NonZeroU128,
eth_fee_token_address: Felt,
strk_fee_token_address: Felt,
chain_id: ChainId,
Expand All @@ -480,15 +445,11 @@ impl Starknet {
block_timestamp: BlockTimestamp(0),
sequencer_address: starknet_api::contract_address!("0x1000"),
gas_prices: GasPrices {
eth_gas_prices: GasPriceVector {
l1_gas_price: nonzero_gas_price!(gas_price_wei),
l1_data_gas_price: nonzero_gas_price!(data_gas_price_wei),
l2_gas_price: nonzero_gas_price!(l2_gas_price_wei),
},
eth_gas_prices: DUMMY_GAS_PRICE_VECTOR,
strk_gas_prices: GasPriceVector {
l1_gas_price: nonzero_gas_price!(gas_price_fri),
l1_data_gas_price: nonzero_gas_price!(data_gas_price_fri),
l2_gas_price: nonzero_gas_price!(l2_gas_price_fri),
l1_gas_price: nonzero_gas_price!(l1_gas_price),
l1_data_gas_price: nonzero_gas_price!(l1_data_gas_price),
l2_gas_price: nonzero_gas_price!(l2_gas_price),
},
},
use_kzg_da: USE_KZG_DA,
Expand Down Expand Up @@ -534,15 +495,11 @@ impl Starknet {

// Block info gas needs to be set here
block_info.gas_prices = GasPrices {
eth_gas_prices: GasPriceVector {
l1_gas_price: nonzero_gas_price!(gas_modification.gas_price_wei),
l1_data_gas_price: nonzero_gas_price!(gas_modification.data_gas_price_wei),
l2_gas_price: nonzero_gas_price!(gas_modification.l2_gas_price_wei),
},
eth_gas_prices: DUMMY_GAS_PRICE_VECTOR,
strk_gas_prices: GasPriceVector {
l1_gas_price: nonzero_gas_price!(gas_modification.gas_price_fri),
l1_data_gas_price: nonzero_gas_price!(gas_modification.data_gas_price_fri),
l2_gas_price: nonzero_gas_price!(gas_modification.l2_gas_price_fri),
l1_gas_price: nonzero_gas_price!(gas_modification.l1_gas_price),
l1_data_gas_price: nonzero_gas_price!(gas_modification.l1_data_gas_price),
l2_gas_price: nonzero_gas_price!(gas_modification.l2_gas_price),
},
};

Expand Down Expand Up @@ -860,11 +817,11 @@ impl Starknet {
nonce: nonce.0,
resource_bounds: ResourceBoundsWrapper::new(
1_000_000,
self.config.gas_price_fri.get(),
self.config.l1_gas_price.get(),
1_000_000,
self.config.data_gas_price_fri.get(),
self.config.l1_data_gas_price.get(),
1_000_000_000,
self.config.l2_gas_price_fri.get(),
self.config.l2_gas_price.get(),
),
tip: Tip(0),
paymaster_data: vec![],
Expand Down Expand Up @@ -1547,12 +1504,9 @@ mod tests {
state_archive: StateArchiveCapacity,
) -> (Starknet, Account) {
let mut starknet = Starknet::new(&StarknetConfig {
gas_price_wei: nonzero!(1u128),
gas_price_fri: nonzero!(1u128),
data_gas_price_wei: nonzero!(1u128),
data_gas_price_fri: nonzero!(1u128),
l2_gas_price_wei: nonzero!(1u128),
l2_gas_price_fri: nonzero!(1u128),
l1_gas_price: nonzero!(1u128),
l1_data_gas_price: nonzero!(1u128),
l2_gas_price: nonzero!(1u128),
state_archive,
..Default::default()
})
Expand Down Expand Up @@ -1612,19 +1566,18 @@ mod tests {
ContractAddress::new(felt_from_prefixed_hex("0xAA").unwrap()).unwrap();
let block_ctx = Starknet::init_block_context(
nonzero!(10u128),
nonzero!(10u128),
nonzero!(10u128),
nonzero!(10u128),
nonzero!(10u128),
nonzero!(10u128),
nonzero!(11u128),
nonzero!(12u128),
felt_from_prefixed_hex("0xAA").unwrap(),
STRK_ERC20_CONTRACT_ADDRESS,
DEVNET_DEFAULT_CHAIN_ID,
DEVNET_DEFAULT_STARTING_BLOCK_NUMBER,
);
assert_eq!(block_ctx.block_info().block_number, BlockNumber(0));
assert_eq!(block_ctx.block_info().block_timestamp, BlockTimestamp(0));
assert_eq!(block_ctx.block_info().gas_prices.l1_gas_price(&FeeType::Eth).get().0, 10);
assert_eq!(block_ctx.block_info().gas_prices.l1_gas_price(&FeeType::Strk).get().0, 10);
assert_eq!(block_ctx.block_info().gas_prices.l1_data_gas_price(&FeeType::Strk).get().0, 11);
assert_eq!(block_ctx.block_info().gas_prices.l2_gas_price(&FeeType::Strk).get().0, 12);
assert_eq!(
ContractAddress::from(block_ctx.chain_info().fee_token_addresses.eth_fee_token_address),
fee_token_address
Expand Down Expand Up @@ -1677,14 +1630,13 @@ mod tests {
let mut starknet = Starknet::new(&config).unwrap();

let initial_block_number = starknet.block_context.block_info().block_number;
let initial_gas_price_wei =
starknet.block_context.block_info().gas_prices.l1_gas_price(&FeeType::Eth);
let initial_gas_price_fri =
let initial_l1_gas_price =
starknet.block_context.block_info().gas_prices.l1_gas_price(&FeeType::Strk);
let initial_data_gas_price_wei =
starknet.block_context.block_info().gas_prices.l1_gas_price(&FeeType::Eth);
let initial_data_gas_price_fri =
let initial_l1_data_gas_price =
starknet.block_context.block_info().gas_prices.l1_data_gas_price(&FeeType::Strk);
let initial_l2_gas_price =
starknet.block_context.block_info().gas_prices.l2_gas_price(&FeeType::Strk);

let initial_block_timestamp = starknet.block_context.block_info().block_timestamp;
let initial_sequencer = starknet.block_context.block_info().sequencer_address;

Expand Down Expand Up @@ -1715,22 +1667,9 @@ mod tests {
starknet.pending_block().header.block_header_without_hash.parent_hash,
BlockHash::default()
);
assert_eq!(
starknet.pending_block().header.block_header_without_hash.l1_gas_price.price_in_wei,
initial_gas_price_wei.get()
);
assert_eq!(
starknet.pending_block().header.block_header_without_hash.l1_gas_price.price_in_fri,
initial_gas_price_fri.get()
);
assert_eq!(
starknet
.pending_block()
.header
.block_header_without_hash
.l1_data_gas_price
.price_in_wei,
initial_data_gas_price_wei.get()
initial_l1_gas_price.get()
);
assert_eq!(
starknet
Expand All @@ -1739,11 +1678,11 @@ mod tests {
.block_header_without_hash
.l1_data_gas_price
.price_in_fri,
initial_data_gas_price_fri.get()
initial_l1_data_gas_price.get()
);
assert_eq!(
starknet.pending_block().header.block_header_without_hash.l2_gas_price.price_in_fri,
initial_data_gas_price_fri.get()
initial_l2_gas_price.get()
);
assert_eq!(
starknet.pending_block().header.block_header_without_hash.sequencer.0,
Expand All @@ -1754,9 +1693,6 @@ mod tests {
#[test]
fn correct_block_context_update() {
let mut block_ctx = Starknet::init_block_context(
nonzero!(1u128),
nonzero!(1u128),
nonzero!(1u128),
nonzero!(1u128),
nonzero!(1u128),
nonzero!(1u128),
Expand Down
Loading