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

Updates to price algorithm #2292

Merged
merged 4 commits into from
Oct 7, 2024
Merged

Updates to price algorithm #2292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3b5e56
Minor renames for clarity
rafal-ch Oct 4, 2024
b646d6b
`sum()` first, then `mul()` once
rafal-ch Oct 4, 2024
087df6c
Fold with `saturating_add()` instead of using `sum()` which can panic
rafal-ch Oct 4, 2024
2dba972
Merge branch 'master' into updates_to_price_algorithm
rafal-ch Oct 7, 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
2 changes: 1 addition & 1 deletion crates/fuel-gas-price-algorithm/gas-price-analysis/src/simulation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ impl Simulator {
let bytes_and_costs: Vec<_> = bytes
.iter()
.zip(self.da_cost_per_byte.iter())
.map(|(bytes, cost_per_byte)| (*bytes, (*bytes * cost_per_byte) as u64))
.map(|(bytes, da_cost_per_byte)| (*bytes, (*bytes * da_cost_per_byte) as u64))
.collect();

let actual_profit: Vec<i128> = actual_costs
Expand Down
19 changes: 9 additions & 10 deletions crates/fuel-gas-price-algorithm/src/v1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,11 @@ impl AlgorithmUpdaterV1 {
self.l2_block_height = height;

// rewards
self.update_rewards(fee_wei);
self.update_da_rewards(fee_wei);
let rewards = self.clamped_rewards_as_i128();

// costs
self.update_projected_cost(block_bytes);
self.update_projected_da_cost(block_bytes);
let projected_total_da_cost = self.clamped_projected_cost_as_i128();

// profit
Expand All @@ -238,13 +238,13 @@ impl AlgorithmUpdaterV1 {
}
}

fn update_rewards(&mut self, fee_wei: u128) {
fn update_da_rewards(&mut self, fee_wei: u128) {
let block_da_reward = self.da_portion_of_fee(fee_wei);
self.total_da_rewards_excess =
self.total_da_rewards_excess.saturating_add(block_da_reward);
}

fn update_projected_cost(&mut self, block_bytes: u64) {
fn update_projected_da_cost(&mut self, block_bytes: u64) {
let block_projected_da_cost =
(block_bytes as u128).saturating_mul(self.latest_da_cost_per_byte);
self.projected_total_da_cost = self
Expand Down Expand Up @@ -388,10 +388,10 @@ impl AlgorithmUpdaterV1 {
},
)?;
self.da_recorded_block_height = last;
let new_block_cost = self
let new_da_block_cost = self
.latest_known_total_da_cost_excess
.saturating_add(range_cost);
self.latest_known_total_da_cost_excess = new_block_cost;
self.latest_known_total_da_cost_excess = new_da_block_cost;
self.latest_da_cost_per_byte = new_cost_per_byte;
Ok(())
}
Expand Down Expand Up @@ -420,10 +420,9 @@ impl AlgorithmUpdaterV1 {
let projection_portion: u128 = self
.unrecorded_blocks
.iter()
.map(|(_, &bytes)| {
(bytes as u128).saturating_mul(self.latest_da_cost_per_byte)
})
.sum();
.map(|(_, &bytes)| (bytes as u128))
.fold(0_u128, |acc, n| acc.saturating_add(n))
.saturating_mul(self.latest_da_cost_per_byte);
self.projected_total_da_cost = self
.latest_known_total_da_cost_excess
.saturating_add(projection_portion);
Expand Down
Loading