Use fees to calculate DA reward and avoid issues with Gwei/Wei conversions #2229

MitchTurner · 2024-09-20T10:11:45Z

Linked Issues/PRs

Closes #2165
Closes #2243

Description

Modify the calculation of rewards to use the block fee instead of block gas.
Update the charts to be displayed in Gwei rather than Wei to reduce noise and more closely resemble what we will see as an outside observer of the Fuel L2 gas prices.

Checklist

New behavior is reflected in tests

Before requesting review

I have reviewed the code myself

…or_algorithm_v1

…ns resolvers (#2222) ## Linked Issues/PRs  - fixes #2221 ## Description  Some dns resolvers `nslookup` etc, suffix dns lookups with the local domain if they are not fully-qualified. This PR makes the dns lookup FQDN, with a dot at the end. ## Checklist - [x] Breaking changes are clearly marked as such in the PR description and changelog - [x] New behavior is reflected in tests - [ ] [The specification](https://github.com/FuelLabs/fuel-specs/) matches the implemented behavior (link update PR if changes are needed) ### Before requesting review - [x] I have reviewed the code myself - [ ] I have created follow-up issues caused by this PR and linked them here ### After merging, notify other teams [Add or remove entries as needed] - [ ] [Rust SDK](https://github.com/FuelLabs/fuels-rs/) - [ ] [Sway compiler](https://github.com/FuelLabs/sway/) - [ ] [Platform documentation](https://github.com/FuelLabs/devrel-requests/issues/new?assignees=&labels=new+request&projects=&template=NEW-REQUEST.yml&title=%5BRequest%5D%3A+) (for out-of-organization contributors, the person merging the PR will do this) - [ ] Someone else?

…ed (#2182) ## Linked Issues/PRs  Part of #2114 ## Description - Add a new argument `transactions_limit: u16` to the function `TxSource::next()`. - Changes the logic of the block production to never exceed `u16::MAX` transactions (included FTI transactions and mint transactions) when selecting L2 transacitons. The number of transactions can still exceed `u16::MAX` when selecting transactions from L1. This is addressed in #2189. - Changes the implementation of all TxSource adapters to fetch a number of transactions below or equal to the `transaction_limit`. - Introduces a new WASM host function to peek the next transactions size for a number of transactions below a specified limit. Breaks forward compatibility of the genesis transition function. See https://github.com/FuelLabs/fuel-core/blob/8eeae5d6730d34ae06390b7797478bb98fd07987/version-compatibility/forkless-upgrade/README.md ## TODO: - [x] Check that requirements are met - [x] Implementation for the WasmTxSource is missing (only the argument has been added) - [ ] Integration Tests ## Checklist - [ x] Breaking changes are clearly marked as such in the PR description and changelog - [x] New behavior is reflected in tests - [ ] [The specification](https://github.com/FuelLabs/fuel-specs/) matches the implemented behavior (link update PR if changes are needed) ### Before requesting review - [x] I have reviewed the code myself - [ ] I have created follow-up issues caused by this PR and linked them here ### After merging, notify other teams [Add or remove entries as needed] - [ ] [Rust SDK](https://github.com/FuelLabs/fuels-rs/) - [ ] [Sway compiler](https://github.com/FuelLabs/sway/) - [ ] [Platform documentation](https://github.com/FuelLabs/devrel-requests/issues/new?assignees=&labels=new+request&projects=&template=NEW-REQUEST.yml&title=%5BRequest%5D%3A+) (for out-of-organization contributors, the person merging the PR will do this) - [ ] Someone else?

> [!NOTE] > This is PR 1/n in cleaning up the gas price service. This PR is first of few that moves the `algorithm_updater` from the `sub_services` module of `fuel-core` to `fuel-core-gas-price-service`. > > To do so, we have to cut dependencies on `fuel-core`, which means we have to remove the direct dependency on `Database`, `ConsensusParametersProvider` etc. ## Linked Issues/PRs  ## Description  We define a new port in the `fuel-core-gas-price-service` crate that is meant to cut the dependency of `algorithm_updater` from `fuel-core`. ## Checklist - [x] Breaking changes are clearly marked as such in the PR description and changelog - [x] New behavior is reflected in tests (existing tests already work) - [x] [The specification](https://github.com/FuelLabs/fuel-specs/) matches the implemented behavior (link update PR if changes are needed) ### Before requesting review - [x] I have reviewed the code myself - [ ] I have created follow-up issues caused by this PR and linked them here ### After merging, notify other teams [Add or remove entries as needed] - [ ] [Rust SDK](https://github.com/FuelLabs/fuels-rs/) - [ ] [Sway compiler](https://github.com/FuelLabs/sway/) - [ ] [Platform documentation](https://github.com/FuelLabs/devrel-requests/issues/new?assignees=&labels=new+request&projects=&template=NEW-REQUEST.yml&title=%5BRequest%5D%3A+) (for out-of-organization contributors, the person merging the PR will do this) - [ ] Someone else? --------- Co-authored-by: Green Baneling <[email protected]>

…tions from L1 (#2189) ## Linked Issues/PRs  Part of #2114 ## Description When producing a block, we want to make sure that we never include more than 65_536 transactions. To this end, we select the DA height for including Forced transactions so that no more than 65_535 transactions will ever be included. Changes: - A new function for the RelayerPort to get the number of forced transactions at a given level - Refactor the function `select_new_da_height` to return early if more than 65_535 transactions will be included. - Test the changes to the `select_new_da_height` function. - ## Checklist - [x] Breaking changes are clearly marked as such in the PR description and changelog - [x] New behavior is reflected in tests - [ ] [The specification](https://github.com/FuelLabs/fuel-specs/) matches the implemented behavior (link update PR if changes are needed) ### Before requesting review - [x] I have reviewed the code myself - [ ] I have created follow-up issues caused by this PR and linked them here ### After merging, notify other teams [Add or remove entries as needed] - [ ] [Rust SDK](https://github.com/FuelLabs/fuels-rs/) - [ ] [Sway compiler](https://github.com/FuelLabs/sway/) - [ ] [Platform documentation](https://github.com/FuelLabs/devrel-requests/issues/new?assignees=&labels=new+request&projects=&template=NEW-REQUEST.yml&title=%5BRequest%5D%3A+) (for out-of-organization contributors, the person merging the PR will do this) - [ ] Someone else? --------- Co-authored-by: Green Baneling <[email protected]>

xgreenx · 2024-09-25T06:32:00Z

crates/fuel-gas-price-algorithm/src/v1.rs

@@ -208,7 +208,7 @@ impl AlgorithmUpdaterV1 {
        used: u64,
        capacity: NonZeroU64,
        block_bytes: u64,
-        _gas_price: u64,
+        fee_wei: u64,


The fee that comes from the block is in Gwei

Yeah. But we don't need to know that here. The caller can convert it for us. In the spirit of what you said:

I think the algorithm should work with Wei, and all logic around gas price should work with Wei. We always can convert L2 gas price into Wei by using gas price and gas price factor.

It really doesn't matter either way (either wei :P), we just need to pick one and be clear to the caller which one it is.

Then I think we need to introduce two new types GWei and Wei into our codebase and use it everywhere for fee and gas price(Even in state transition function).

In this case, we can be sure that we haven't forgotten to do the conversion.

It is a separate concern for a separate issue=) Could you create an issue please for it?

Maybe? Fuel can be an L2 for other chains than Ethereum. I hesitated to put wei in the param name fee_wei, but I didn't know how else to specify--and it's much easier to change the one param name here than everywhere in our code. "This is just the Ethereum algorithm" 😬

xgreenx · 2024-09-25T06:32:51Z

crates/fuel-gas-price-algorithm/src/v1.rs

+    }
+
+    // Take the `fee_wei` and return the portion of the fee that should be used for paying DA costs
+    fn da_portion_of_fee(&self, fee_wei: u64) -> u64 {


Do we need to add the same function for execution price?

The execution price uses the gas fullness to adjust. I don't know what part of the algorithm would be interested in the gathered fee from exec.

It would be nice to know just total execution profit for statistic, plus later we can transfer part of the execution profit to the da profit.

When we add any sort of metric that will consume the method, then we can add it.

rafal-ch

LGTM 👍

crates/fuel-gas-price-algorithm/gas-price-analysis/src/charts.rs

crates/fuel-gas-price-algorithm/src/v1.rs

crates/fuel-gas-price-algorithm/gas-price-analysis/src/charts.rs

xgreenx · 2024-09-25T08:55:06Z

crates/fuel-gas-price-algorithm/src/v1.rs

+    }
+
+    // Take the `fee_wei` and return the portion of the fee that should be used for paying DA costs
+    fn da_portion_of_fee(&self, fee_wei: u64) -> u64 {


It would be nice to know just total execution profit for statistic, plus later we can transfer part of the execution profit to the da profit.

xgreenx · 2024-09-25T08:57:48Z

crates/fuel-gas-price-algorithm/src/v1.rs

@@ -208,7 +208,7 @@ impl AlgorithmUpdaterV1 {
        used: u64,
        capacity: NonZeroU64,
        block_bytes: u64,
-        _gas_price: u64,
+        fee_wei: u64,


Then I think we need to introduce two new types GWei and Wei into our codebase and use it everywhere for fee and gas price(Even in state transition function).

In this case, we can be sure that we haven't forgotten to do the conversion.

It is a separate concern for a separate issue=) Could you create an issue please for it?

@rymnc

## Version v0.37.0 ### Added - [1609](#1609): Add DA compression support. Compressed blocks are stored in the offchain database when blocks are produced, and can be fetched using the GraphQL API. - [2290](#2290): Added a new CLI argument `--graphql-max-directives`. The default value is `10`. - [2195](#2195): Added enforcement of the limit on the size of the L2 transactions per block according to the `block_transaction_size_limit` parameter. - [2131](#2131): Add flow in TxPool in order to ask to newly connected peers to share their transaction pool - [2182](#2151): Limit number of transactions that can be fetched via TxSource::next - [2189](#2151): Select next DA height to never include more than u16::MAX -1 transactions from L1. - [2162](#2162): Pool structure with dependencies, etc.. for the next transaction pool module. Also adds insertion/verification process in PoolV2 and tests refactoring - [2265](#2265): Integrate Block Committer API for DA Block Costs. - [2280](#2280): Allow comma separated relayer addresses in cli - [2299](#2299): Support blobs in the predicates. - [2300](#2300): Added new function to `fuel-core-client` for checking whether a blob exists. ### Changed #### Breaking - [2299](#2299): Anyone who wants to participate in the transaction broadcasting via p2p must upgrade to support new predicates on the TxPool level. - [2299](#2299): Upgraded `fuel-vm` to `0.58.0`. More information in the [release](https://github.com/FuelLabs/fuel-vm/releases/tag/v0.58.0). - [2276](#2276): Changed how complexity for blocks is calculated. The default complexity now is 80_000. All queries that somehow touch the block header now are more expensive. - [2290](#2290): Added a new GraphQL limit on number of `directives`. The default value is `10`. - [2206](#2206): Use timestamp of last block when dry running transactions. - [2153](#2153): Updated default gas costs for the local testnet configuration to match `fuel-core 0.35.0`. ## What's Changed * fix: use core-test.fuellabs.net for dnsaddr resolution by @rymnc in #2214 * Removed state transition bytecode from the local testnet by @xgreenx in #2215 * Send whole transaction pool upon subscription to gossip by @AurelienFT in #2131 * Update default gas costs based on 0.35.0 benchmarks by @xgreenx in #2153 * feat: Use timestamp of last block when dry running transactions by @netrome in #2206 * fix(dnsaddr_resolution): use fqdn separator to prevent suffixing by dns resolvers by @rymnc in #2222 * TransactionSource: specify maximum number of transactions to be fetched by @acerone85 in #2182 * Implement worst case scenario for price algorithm v1 by @rafal-ch in #2219 * chore(gas_price_service): define port for L2 data by @rymnc in #2224 * Block producer selects da height to never exceed u64::MAX - 1 transactions from L1 by @acerone85 in #2189 * Weekly `cargo update` by @github-actions in #2236 * Use fees to calculate DA reward and avoid issues with Gwei/Wei conversions by @MitchTurner in #2229 * Protect against passing `i128::MIN` to `abs()` which causes overflow by @rafal-ch in #2241 * Acquire `da_finalization_period` from the command line by @rafal-ch in #2240 * Executor: test Tx_count limit with incorrect tx source by @acerone85 in #2242 * Minor updates to docs + a few typos fixed by @rafal-ch in #2250 * chore(gas_price_service): move algorithm_updater to fuel-core-gas-price-service by @rymnc in #2246 * Use single heavy input in the `transaction_throughput.rs` benchmarks by @xgreenx in #2205 * Enforce the block size limit by @rafal-ch in #2195 * feat: build ARM and AMD in parallel by @mchristopher in #2130 * Weekly `cargo update` by @github-actions in #2268 * chore(gas_price_service): split into v0 and v1 and squash FuelGasPriceUpdater type into GasPriceService by @rymnc in #2256 * feat(gas_price_service): update block committer da source with established contract by @rymnc in #2265 * Use bytes from `unrecorded_blocks` rather from the block from DA by @MitchTurner in #2252 * TxPool v2 General architecture by @AurelienFT in #2162 * Add value delimiter and tests args by @AurelienFT in #2280 * fix(da_block_costs): remove Arc<Mutex<>> on shared_state and expose channel by @rymnc in #2278 * fix(combined_database): syncing auxiliary databases on startup with custom behaviour by @rymnc in #2272 * fix: Manually encode Authorization header for eventsource_client by @Br1ght0ne in #2284 * Address `async-graphql` vulnerability by @MitchTurner in #2290 * Update the WASM compatibility tests for `0.36` release by @rafal-ch in #2271 * DA compression by @Dentosal in #1609 * Use different port for every version compatibility test by @rafal-ch in #2301 * Fix block query complexity by @xgreenx in #2297 * Support blobs in predicates by @Voxelot in #2299 **Full Changelog**: v0.36.0...v0.37.0

rafal-ch and others added 12 commits September 18, 2024 14:42

Extract 'cumulative_percentage()' from algorithm V0

dc3a670

Implement worst_case() for Algorithm V1

7693ecd

Use worst_case in impl of GasPriceAlgorithm for Algorithm

334bd3f

Satisfy Clippy

3db5157

Rename 'cumulative_percentage()' to 'cumulative_percentage_change()'

adffd99

Merge branch 'master' into 2203_worst_case_for_algorithm_v1

dd6bf4d

Merge branch 'master' into 2203_worst_case_for_algorithm_v1

512613a

Use more clear variable names in cumulative_percentage_change

4337b14

Add utils module and move cumulative_percentage_change inside

d1672d3

Add additional tests to Algorithm V1

6cb3161

Merge remote-tracking branch 'upstream/master' into 2203_worst_case_f…

8875466

…or_algorithm_v1

Use Gwei instead of Wei in charts

6dde38e

MitchTurner changed the base branch from master to 2203_worst_case_for_algorithm_v1 September 20, 2024 10:12

Base automatically changed from 2203_worst_case_for_algorithm_v1 to master September 20, 2024 10:15

MitchTurner self-assigned this Sep 20, 2024

rafal-ch and others added 7 commits September 24, 2024 10:13

Update price algorithm test names

4a0f4a4

Modify test to be a little more precise

d562f81

Merge branch 'master' into improvement/use-gwei-not-wei

3a3fc91

MitchTurner added the no changelog Skip the CI check of the changelog modification label Sep 24, 2024

Use fee to calculate the proportional allocation for da reward

efb4a8e

MitchTurner changed the title ~~View fees in Gwei instead of Wei~~ Use fees to calculate DA reward to avoid issues with Gwei/Wei conversions Sep 24, 2024

MitchTurner added 2 commits September 24, 2024 16:27

Fix analyzer

da65156

Merge branch 'master' into improvement/use-gwei-not-wei

f62015b

MitchTurner marked this pull request as ready for review September 24, 2024 14:29

MitchTurner requested review from xgreenx and Dentosal as code owners September 24, 2024 14:29

MitchTurner requested a review from a team September 24, 2024 14:29

MitchTurner changed the title ~~Use fees to calculate DA reward to avoid issues with Gwei/Wei conversions~~ Use fees to calculate DA reward and avoid issues with Gwei/Wei conversions Sep 24, 2024

Dentosal previously approved these changes Sep 24, 2024

View reviewed changes

xgreenx reviewed Sep 25, 2024

View reviewed changes

rafal-ch previously approved these changes Sep 25, 2024

View reviewed changes

rymnc reviewed Sep 25, 2024

View reviewed changes

crates/fuel-gas-price-algorithm/gas-price-analysis/src/charts.rs Outdated Show resolved Hide resolved

crates/fuel-gas-price-algorithm/src/v1.rs Show resolved Hide resolved

crates/fuel-gas-price-algorithm/gas-price-analysis/src/charts.rs Outdated Show resolved Hide resolved

Fix capitalization, use const for Gwei conversion

3ec54a2

MitchTurner dismissed stale reviews from rafal-ch and Dentosal via 3ec54a2 September 25, 2024 08:54

Rename conversion functions

6f7aa56

xgreenx approved these changes Sep 25, 2024

View reviewed changes

MitchTurner requested a review from rymnc September 25, 2024 09:13

rymnc approved these changes Sep 25, 2024

View reviewed changes

MitchTurner merged commit 1e2bcdc into master Sep 25, 2024
36 checks passed

MitchTurner deleted the improvement/use-gwei-not-wei branch September 25, 2024 09:59

xgreenx mentioned this pull request Oct 5, 2024

Release v0.37.0 #2302

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use fees to calculate DA reward and avoid issues with Gwei/Wei conversions #2229

Use fees to calculate DA reward and avoid issues with Gwei/Wei conversions #2229

MitchTurner commented Sep 20, 2024 •

edited

Loading

xgreenx Sep 25, 2024

MitchTurner Sep 25, 2024

xgreenx Sep 25, 2024

MitchTurner Sep 25, 2024

MitchTurner Sep 25, 2024

xgreenx Sep 25, 2024

MitchTurner Sep 25, 2024

xgreenx Sep 25, 2024

MitchTurner Sep 25, 2024

rafal-ch left a comment

xgreenx Sep 25, 2024

xgreenx Sep 25, 2024

Use fees to calculate DA reward and avoid issues with Gwei/Wei conversions #2229

Use fees to calculate DA reward and avoid issues with Gwei/Wei conversions #2229

Conversation

MitchTurner commented Sep 20, 2024 • edited Loading

Linked Issues/PRs

Description

Checklist

Before requesting review

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rafal-ch left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MitchTurner commented Sep 20, 2024 •

edited

Loading