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

refactor: make optional BlockId params required in provider functions #516

Merged
merged 2 commits into from
Apr 16, 2024
Merged

refactor: make optional BlockId params required in provider functions #516

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd3cdaa
refactor: make blockId optional in getCode and getUncle
EmperorOrokuSaki Apr 12, 2024
a4fd0da
feat: change all Option<BlockId> types to BlockId
EmperorOrokuSaki Apr 15, 2024
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
29 changes: 16 additions & 13 deletions crates/provider/src/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,8 +766,8 @@ pub trait Provider<T: Transport + Clone = BoxTransport, N: Network = Ethereum>:
}

/// Gets the bytecode located at the corresponding [Address].
async fn get_code_at(&self, address: Address, tag: BlockId) -> TransportResult<Bytes> {
self.client().request("eth_getCode", (address, tag)).await
async fn get_code_at(&self, address: Address, tag: Option<BlockId>) -> TransportResult<Bytes> {
self.client().request("eth_getCode", (address, tag.unwrap_or_default())).await
}

/// Gets a transaction by its [TxHash].
Expand Down Expand Up @@ -824,14 +824,20 @@ pub trait Provider<T: Transport + Clone = BoxTransport, N: Network = Ethereum>:
}

/// Gets an uncle block through the tag [BlockId] and index [U64].
async fn get_uncle(&self, tag: BlockId, idx: U64) -> TransportResult<Option<Block>> {
match tag {
BlockId::Hash(hash) => {
self.client().request("eth_getUncleByBlockHashAndIndex", (hash, idx)).await
}
BlockId::Number(number) => {
self.client().request("eth_getUncleByBlockNumberAndIndex", (number, idx)).await
async fn get_uncle(&self, tag: Option<BlockId>, idx: U64) -> TransportResult<Option<Block>> {
if let Some(tag) = tag {
match tag {
BlockId::Hash(hash) => {
self.client().request("eth_getUncleByBlockHashAndIndex", (hash, idx)).await
}
BlockId::Number(number) => {
self.client().request("eth_getUncleByBlockNumberAndIndex", (number, idx)).await
}
}
} else {
self.client()
.request("eth_getUncleByBlockNumberAndIndex", (tag.unwrap_or_default(), idx))
.await
}
}

Expand Down Expand Up @@ -1385,10 +1391,7 @@ mod tests {
// Set the code
let addr = Address::with_last_byte(16);
provider.set_code(addr, "0xbeef").await.unwrap();
let _code = provider
.get_code_at(addr, BlockId::Number(alloy_rpc_types::BlockNumberOrTag::Latest))
.await
.unwrap();
let _code = provider.get_code_at(addr, None).await.unwrap();
}

#[tokio::test]
Expand Down
Loading