mirror of
https://github.com/hl-archive-node/nanoreth.git
synced 2025-12-06 10:59:55 +00:00
Merge pull request #50 from Quertyy/feat/rpc-system-tx-receipts
chore(rpc): add eth_getEvmSystemTxsReceiptsByBlockHash and eth_getEvmSystemTxsReceiptsByBlockHash rpc method
This commit is contained in:
@ -74,7 +74,7 @@ impl<T> EthWrapper for T where
|
||||
|
||||
#[rpc(server, namespace = "eth")]
|
||||
#[async_trait]
|
||||
pub trait EthSystemTransactionApi<T: RpcObject> {
|
||||
pub trait EthSystemTransactionApi<T: RpcObject, R: RpcObject> {
|
||||
#[method(name = "getEvmSystemTxsByBlockHash")]
|
||||
async fn get_evm_system_txs_by_block_hash(&self, hash: B256) -> RpcResult<Option<Vec<T>>>;
|
||||
|
||||
@ -83,6 +83,18 @@ pub trait EthSystemTransactionApi<T: RpcObject> {
|
||||
&self,
|
||||
block_id: Option<BlockId>,
|
||||
) -> RpcResult<Option<Vec<T>>>;
|
||||
|
||||
#[method(name = "getEvmSystemTxsReceiptsByBlockHash")]
|
||||
async fn get_evm_system_txs_receipts_by_block_hash(
|
||||
&self,
|
||||
hash: B256,
|
||||
) -> RpcResult<Option<Vec<R>>>;
|
||||
|
||||
#[method(name = "getEvmSystemTxsReceiptsByBlockNumber")]
|
||||
async fn get_evm_system_txs_receipts_by_block_number(
|
||||
&self,
|
||||
block_id: Option<BlockId>,
|
||||
) -> RpcResult<Option<Vec<R>>>;
|
||||
}
|
||||
|
||||
pub struct HlSystemTransactionExt<Eth: EthWrapper> {
|
||||
@ -94,45 +106,15 @@ impl<Eth: EthWrapper> HlSystemTransactionExt<Eth> {
|
||||
pub fn new(eth_api: Eth) -> Self {
|
||||
Self { eth_api, _marker: PhantomData }
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl<Eth: EthWrapper> EthSystemTransactionApiServer<RpcTransaction<Eth::NetworkTypes>>
|
||||
for HlSystemTransactionExt<Eth>
|
||||
async fn get_system_txs_by_block_id(
|
||||
&self,
|
||||
block_id: BlockId,
|
||||
) -> RpcResult<Option<Vec<RpcTransaction<Eth::NetworkTypes>>>>
|
||||
where
|
||||
jsonrpsee_types::ErrorObject<'static>: From<<Eth as EthApiTypes>::Error>,
|
||||
{
|
||||
/// Returns the system transactions for a given block hash.
|
||||
/// Semi-compliance with the `eth_getSystemTxsByBlockHash` RPC method introduced by hl-node.
|
||||
/// https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/hyperevm/json-rpc
|
||||
///
|
||||
/// NOTE: Method name differs from hl-node because we retrieve transaction data from EVM
|
||||
/// (signature recovery for 'from' address, EVM hash calculation) rather than HyperCore.
|
||||
async fn get_evm_system_txs_by_block_hash(
|
||||
&self,
|
||||
hash: B256,
|
||||
) -> RpcResult<Option<Vec<RpcTransaction<Eth::NetworkTypes>>>> {
|
||||
trace!(target: "rpc::eth", ?hash, "Serving eth_getEvmSystemTxsByBlockHash");
|
||||
match self.get_evm_system_txs_by_block_number(Some(BlockId::Hash(hash.into()))).await {
|
||||
Ok(Some(txs)) => Ok(Some(txs)),
|
||||
// hl-node returns none if the block is not found
|
||||
_ => Ok(None),
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns the system transactions for a given block number, or the latest block if no block
|
||||
/// number is provided. Semi-compliance with the `eth_getSystemTxsByBlockNumber` RPC method
|
||||
/// introduced by hl-node. https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/hyperevm/json-rpc
|
||||
///
|
||||
/// NOTE: Method name differs from hl-node because we retrieve transaction data from EVM
|
||||
/// (signature recovery for 'from' address, EVM hash calculation) rather than HyperCore.
|
||||
async fn get_evm_system_txs_by_block_number(
|
||||
&self,
|
||||
id: Option<BlockId>,
|
||||
) -> RpcResult<Option<Vec<RpcTransaction<Eth::NetworkTypes>>>> {
|
||||
trace!(target: "rpc::eth", ?id, "Serving eth_getEvmSystemTxsByBlockNumber");
|
||||
|
||||
if let Some(block) = self.eth_api.recovered_block(id.unwrap_or_default()).await? {
|
||||
if let Some(block) = self.eth_api.recovered_block(block_id).await? {
|
||||
let block_hash = block.hash();
|
||||
let block_number = block.number();
|
||||
let base_fee_per_gas = block.base_fee_per_gas();
|
||||
@ -159,6 +141,107 @@ where
|
||||
.collect();
|
||||
Ok(Some(system_txs))
|
||||
} else {
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
|
||||
async fn get_system_txs_receipts_by_block_id(
|
||||
&self,
|
||||
block_id: BlockId,
|
||||
) -> RpcResult<Option<Vec<RpcReceipt<Eth::NetworkTypes>>>>
|
||||
where
|
||||
jsonrpsee_types::ErrorObject<'static>: From<<Eth as EthApiTypes>::Error>,
|
||||
{
|
||||
if let Some((block, receipts)) =
|
||||
EthBlocks::load_block_and_receipts(&self.eth_api, block_id).await?
|
||||
{
|
||||
let block_number = block.number;
|
||||
let base_fee = block.base_fee_per_gas;
|
||||
let block_hash = block.hash();
|
||||
let excess_blob_gas = block.excess_blob_gas;
|
||||
let timestamp = block.timestamp;
|
||||
let mut gas_used = 0;
|
||||
let mut next_log_index = 0;
|
||||
|
||||
let mut inputs = Vec::new();
|
||||
for (idx, (tx, receipt)) in
|
||||
block.transactions_recovered().zip(receipts.iter()).enumerate()
|
||||
{
|
||||
if receipt.cumulative_gas_used() != 0 {
|
||||
break;
|
||||
}
|
||||
|
||||
let meta = TransactionMeta {
|
||||
tx_hash: *tx.tx_hash(),
|
||||
index: idx as u64,
|
||||
block_hash,
|
||||
block_number,
|
||||
base_fee,
|
||||
excess_blob_gas,
|
||||
timestamp,
|
||||
};
|
||||
|
||||
let input = ConvertReceiptInput {
|
||||
receipt: Cow::Borrowed(receipt),
|
||||
tx,
|
||||
gas_used: receipt.cumulative_gas_used() - gas_used,
|
||||
next_log_index,
|
||||
meta,
|
||||
};
|
||||
|
||||
gas_used = receipt.cumulative_gas_used();
|
||||
next_log_index += receipt.logs().len();
|
||||
|
||||
inputs.push(input);
|
||||
}
|
||||
|
||||
let receipts = self.eth_api.tx_resp_builder().convert_receipts(inputs)?;
|
||||
Ok(Some(receipts))
|
||||
} else {
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl<Eth: EthWrapper>
|
||||
EthSystemTransactionApiServer<RpcTransaction<Eth::NetworkTypes>, RpcReceipt<Eth::NetworkTypes>>
|
||||
for HlSystemTransactionExt<Eth>
|
||||
where
|
||||
jsonrpsee_types::ErrorObject<'static>: From<<Eth as EthApiTypes>::Error>,
|
||||
{
|
||||
/// Returns the system transactions for a given block hash.
|
||||
/// Semi-compliance with the `eth_getSystemTxsByBlockHash` RPC method introduced by hl-node.
|
||||
/// https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/hyperevm/json-rpc
|
||||
///
|
||||
/// NOTE: Method name differs from hl-node because we retrieve transaction data from EVM
|
||||
/// (signature recovery for 'from' address, EVM hash calculation) rather than HyperCore.
|
||||
async fn get_evm_system_txs_by_block_hash(
|
||||
&self,
|
||||
hash: B256,
|
||||
) -> RpcResult<Option<Vec<RpcTransaction<Eth::NetworkTypes>>>> {
|
||||
trace!(target: "rpc::eth", ?hash, "Serving eth_getEvmSystemTxsByBlockHash");
|
||||
match self.get_system_txs_by_block_id(BlockId::Hash(hash.into())).await {
|
||||
Ok(txs) => Ok(txs),
|
||||
// hl-node returns none if the block is not found
|
||||
Err(_) => Ok(None),
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns the system transactions for a given block number, or the latest block if no block
|
||||
/// number is provided. Semi-compliance with the `eth_getSystemTxsByBlockNumber` RPC method
|
||||
/// introduced by hl-node. https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/hyperevm/json-rpc
|
||||
///
|
||||
/// NOTE: Method name differs from hl-node because we retrieve transaction data from EVM
|
||||
/// (signature recovery for 'from' address, EVM hash calculation) rather than HyperCore.
|
||||
async fn get_evm_system_txs_by_block_number(
|
||||
&self,
|
||||
id: Option<BlockId>,
|
||||
) -> RpcResult<Option<Vec<RpcTransaction<Eth::NetworkTypes>>>> {
|
||||
trace!(target: "rpc::eth", ?id, "Serving eth_getEvmSystemTxsByBlockNumber");
|
||||
match self.get_system_txs_by_block_id(id.unwrap_or_default()).await? {
|
||||
Some(txs) => Ok(Some(txs)),
|
||||
None => {
|
||||
// hl-node returns an error if the block is not found
|
||||
Err(ErrorObject::owned(
|
||||
INTERNAL_ERROR_CODE,
|
||||
@ -169,6 +252,37 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns the receipts for the system transactions for a given block hash.
|
||||
async fn get_evm_system_txs_receipts_by_block_hash(
|
||||
&self,
|
||||
hash: B256,
|
||||
) -> RpcResult<Option<Vec<RpcReceipt<Eth::NetworkTypes>>>> {
|
||||
trace!(target: "rpc::eth", ?hash, "Serving eth_getEvmSystemTxsReceiptsByBlockHash");
|
||||
match self.get_system_txs_receipts_by_block_id(BlockId::Hash(hash.into())).await {
|
||||
Ok(receipts) => Ok(receipts),
|
||||
// hl-node returns none if the block is not found
|
||||
Err(_) => Ok(None),
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns the receipts for the system transactions for a given block number, or the latest
|
||||
/// block if no block
|
||||
async fn get_evm_system_txs_receipts_by_block_number(
|
||||
&self,
|
||||
block_id: Option<BlockId>,
|
||||
) -> RpcResult<Option<Vec<RpcReceipt<Eth::NetworkTypes>>>> {
|
||||
trace!(target: "rpc::eth", ?block_id, "Serving eth_getEvmSystemTxsReceiptsByBlockNumber");
|
||||
match self.get_system_txs_receipts_by_block_id(block_id.unwrap_or_default()).await? {
|
||||
Some(receipts) => Ok(Some(receipts)),
|
||||
None => Err(ErrorObject::owned(
|
||||
INTERNAL_ERROR_CODE,
|
||||
format!("invalid block height: {block_id:?}"),
|
||||
Some(()),
|
||||
)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct HlNodeFilterHttp<Eth: EthWrapper> {
|
||||
filter: Arc<EthFilter<Eth>>,
|
||||
provider: Arc<Eth::Provider>,
|
||||
|
||||
Reference in New Issue
Block a user