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

bugfix: Improve the BlockCommitterHttpApi client to use url apis better #2599

Merged
merged 6 commits into from
Jan 21, 2025
Merged

bugfix: Improve the BlockCommitterHttpApi client to use url apis better #2599

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83bf21a
Use Url apis to build the full url path
MitchTurner Jan 18, 2025
b9977d4
Remove unused import
MitchTurner Jan 18, 2025
e8d72c8
Update CHANGELOG
MitchTurner Jan 18, 2025
968fd69
Make comment more inclusive
MitchTurner Jan 18, 2025
cdfec32
Apply fix to shared sequencer service
MitchTurner Jan 20, 2025
c57b645
Add missing api endpoints
MitchTurner Jan 20, 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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Added
- [2551](https://github.com/FuelLabs/fuel-core/pull/2551): Enhanced the DA compressed block header to include block id.

### Fixed
- [2599](https://github.com/FuelLabs/fuel-core/pull/2599): Use the proper `url` apis to construct full url path in `BlockCommitterHttpApi` client

## [Version 0.41.0]

### Added
Expand Down
7 changes: 4 additions & 3 deletions crates/services/gas_price_service/src/v1/da_source_service/block_committer_costs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,12 @@ impl BlockCommitterApi for BlockCommitterHttpApi {
&self,
l2_block_number: u32,
) -> DaBlockCostsResult<Vec<RawDaBlockCosts>> {
// Specific: http://localhost:8080/v1/costs?variant=specific&value=19098935&limit=5
// Specific: http://committer.url/v1/costs?variant=specific&value=19098935&limit=5
if let Some(url) = &self.url {
tracing::debug!("getting da costs by l2 block number: {l2_block_number}");
let formatted_url = format!("{url}/v1/costs?variant=specific&value={l2_block_number}&limit={NUMBER_OF_BUNDLES}");
let response = self.client.get(formatted_url).send().await?;
let path = format!("/v1/costs?variant=specific&value={l2_block_number}&limit={NUMBER_OF_BUNDLES}");
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think we have the same issue with SS service, could you also apply it there please?=D

let full_path = url.join(&path)?;
Comment on lines +134 to +135
Copy link
Member

Choose a reason for hiding this comment

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

what path was it constructing previously?

Copy link
Member Author

Choose a reason for hiding this comment

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

I was getting "//v1".

let response = self.client.get(full_path).send().await?;
let parsed = response.json::<Vec<RawDaBlockCosts>>().await?;
Ok(parsed)
} else {
Expand Down
Loading