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.

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

Include tip in fee #682

Merged
merged 48 commits into from
Feb 26, 2024
Merged

Include tip in fee #682

merged 48 commits into from
Feb 26, 2024

Conversation

MitchTurner
Copy link
Member

Closes: #664

Base automatically changed from use-gas-price-in-fee-calc to master February 22, 2024 01:02
@MitchTurner MitchTurner changed the title MERGE TO MASTER Include tip in fee Include tip in fee Feb 22, 2024
@MitchTurner MitchTurner marked this pull request as ready for review February 22, 2024 20:03
@MitchTurner
Copy link
Member Author

I feel like I'm probably forgetting something.

@MitchTurner MitchTurner requested a review from a team February 22, 2024 23:11
fuel-tx/src/transaction/fee.rs Outdated Show resolved Hide resolved
fuel-tx/src/transaction/fee.rs Outdated Show resolved Hide resolved
@@ -166,12 +179,14 @@ pub trait Chargeable: field::Inputs + field::Witnesses + field::Policies {
gas_costs: &GasCosts,
fee: &FeeParameters,
gas_price: Word,
tip: Word,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe you want to get it from the policies

@@ -150,12 +161,14 @@ pub trait Chargeable: field::Inputs + field::Witnesses + field::Policies {
gas_costs: &GasCosts,
fee: &FeeParameters,
gas_price: Word,
tip: Word,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe you want to get it from the policies

fuel-tx/src/transaction/fee.rs Outdated Show resolved Hide resolved
MitchTurner and others added 5 commits February 23, 2024 12:49
Co-authored-by: Green Baneling <XgreenX9999@gmail.com>
Co-authored-by: Green Baneling <XgreenX9999@gmail.com>
Co-authored-by: Green Baneling <XgreenX9999@gmail.com>
Copy link
Collaborator

@xgreenx xgreenx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you also update the refund_when_used_gas_is_zero test please?=)

@MitchTurner MitchTurner self-assigned this Feb 26, 2024
@MitchTurner MitchTurner added this pull request to the merge queue Feb 26, 2024
Merged via the queue into master with commit a7dc1c0 Feb 26, 2024
37 checks passed
@MitchTurner MitchTurner deleted the include-tip-in-fee branch February 26, 2024 19:16
@xgreenx xgreenx mentioned this pull request Feb 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rename the GasPrice Policy to Tips and implement it accordingly.
2 participants