fix: read rpc config when using fork cheatcodes #9547
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
anukul
requested review from
DaniPopes,
klkvr,
mattsse,
grandizzy,
yash-atreya and
zerosnacks
as code owners
anukul
changed the title
mattsse
requested changes
Dec 12, 2024
Comment on lines
+333
to
+337
| evm_opts.fork_retries = rpc_endpoint.config.retries; | ||
| evm_opts.fork_retry_backoff = rpc_endpoint.config.retry_backoff; | ||
| if let Some(Ok(auth)) = rpc_endpoint.auth { | ||
| evm_opts.fork_headers = Some(vec![format!("Authorization: {auth}")]); | ||
| } |
crates/cheatcodes/src/config.rs
Outdated
| Some(Err(err)) => { | ||
| pub fn rpc_endpoint(&self, url_or_alias: &str) -> Result<ResolvedRpcEndpoint> { | ||
| if let Some(endpoint) = self.rpc_endpoints.get(url_or_alias) { | ||
| let mut endpoint = endpoint.clone(); |
There was a problem hiding this comment.
do we need this clone here?
looks like we can return endpoint.try_resolve() instead if unresolved?
crates/config/src/endpoints.rs
Outdated
Comment on lines
443
to
450
| let mut new_endpoint = self.clone(); | ||
| if let Err(err) = self.endpoint { | ||
| new_endpoint.endpoint = err.try_resolve() | ||
| } | ||
| if let Some(Err(err)) = &new_endpoint.auth { | ||
| new_endpoint.auth = Some(err.try_resolve()) | ||
| } | ||
| new_endpoint |
There was a problem hiding this comment.
this looks slightly weird
this clone shouldn't be necessary here
crates/cheatcodes/src/config.rs
Outdated
| pub fn rpc_endpoint(&self, url_or_alias: &str) -> Result<ResolvedRpcEndpoint> { | ||
| if let Some(endpoint) = self.rpc_endpoints.get(url_or_alias) { | ||
| let mut endpoint = endpoint.clone(); | ||
| if endpoint.is_unresolved() { |
There was a problem hiding this comment.
isn't this check redundant because this is also called in try_resolve?
There was a problem hiding this comment.
thanks for catching that, pushed some fixes
|
Thanks @anukul! This looks great |
mattsse
approved these changes
Dec 14, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Closes #9162 - Set retry config (backoff, max retries) from rpc configuration when a fork is created using cheatcodes
Solution
Idea - #9162 (comment)
Implementation:
Use two structs
RpcEndpointandResolvedRpcEndpointthat both contain the same data, with the exception that environment variables are resolved to their values inResolvedRpcEndpoint.Extract shared fields out into a common struct field
RpcEndpointConfigthat doesn't need environment variable resolution.