fix: ensure tx forwarder is set #8664
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
mattsse
added
C-bug
mattsse
force-pushed
the
matt/fix-op-forwading
branch
from
6de035b to
5b7d2f5
Compare
joshieDo
reviewed
Jun 7, 2024
| @@ -490,5 +499,5 @@ struct EthApiInner<Provider, Pool, Network, EvmConfig> { | |||
| /// The type that defines how to configure the EVM | |||
| evm_config: EvmConfig, | |||
| /// Allows forwarding received raw transactions | |||
| raw_transaction_forwarder: Option<Arc<dyn RawTransactionForwarder>>, | |||
| raw_transaction_forwarder: parking_lot::RwLock<Option<Arc<dyn RawTransactionForwarder>>>, | |||
There was a problem hiding this comment.
couldnt this be an arc<rwlock<_>> instead? no need to check if ethapi has been init already
There was a problem hiding this comment.
this type is already behind an arc
joshieDo
approved these changes
Jun 7, 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.
closes #8661
there is something like a race condition when the ethapi is created and modified with the tx forwarder we use for OP.
By the time the forwarded is set via the extend_rpc function the EthApi instance is already created for the engine_ endpoint, so the forwarder is never used...
This includes a hotfix and wraps the forwarder in an rwlock so that we can always set it.
this is not great, but this feature will soon be replaced with rpc middleware.
the overhead to acquire the read lock barely exists.