Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c771226

Browse files
lutterlutter
committed
chain/ethereum: Avoid one clone of txn data in ABI conversion
1 parent 7e96a20 commit c771226

File tree

2 files changed

+83
-60
lines changed

2 files changed

+83
-60
lines changed

‎chain/ethereum/src/runtime/abi.rs‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -488,68 +488,68 @@ impl<'a> ToAscObj<AscEthereumBlock_0_0_6> for EthereumBlockData<'a> {
488488
}
489489
}
490490

491-
impl ToAscObj<AscEthereumTransaction_0_0_1> for EthereumTransactionData {
491+
impl<'a> ToAscObj<AscEthereumTransaction_0_0_1> for EthereumTransactionData<'a> {
492492
fn to_asc_obj<H: AscHeap + ?Sized>(
493493
&self,
494494
heap: &mut H,
495495
gas: &GasCounter,
496496
) -> Result<AscEthereumTransaction_0_0_1, HostExportError> {
497497
Ok(AscEthereumTransaction_0_0_1 {
498-
hash: asc_new(heap, &self.hash, gas)?,
499-
index: asc_new(heap, &BigInt::from_unsigned_u128(self.index), gas)?,
500-
from: asc_new(heap, &self.from, gas)?,
498+
hash: asc_new(heap, self.hash(), gas)?,
499+
index: asc_new(heap, &BigInt::from_unsigned_u128(self.index()), gas)?,
500+
from: asc_new(heap, self.from(), gas)?,
501501
to: self
502-
.to
502+
.to()
503503
.map(|to| asc_new(heap, &to, gas))
504504
.unwrap_or(Ok(AscPtr::null()))?,
505-
value: asc_new(heap, &BigInt::from_unsigned_u256(&self.value), gas)?,
506-
gas_limit: asc_new(heap, &BigInt::from_unsigned_u256(&self.gas_limit), gas)?,
507-
gas_price: asc_new(heap, &BigInt::from_unsigned_u256(&self.gas_price), gas)?,
505+
value: asc_new(heap, &BigInt::from_unsigned_u256(self.value()), gas)?,
506+
gas_limit: asc_new(heap, &BigInt::from_unsigned_u256(self.gas_limit()), gas)?,
507+
gas_price: asc_new(heap, &BigInt::from_unsigned_u256(self.gas_price()), gas)?,
508508
})
509509
}
510510
}
511511

512-
impl ToAscObj<AscEthereumTransaction_0_0_2> for EthereumTransactionData {
512+
impl<'a> ToAscObj<AscEthereumTransaction_0_0_2> for EthereumTransactionData<'a> {
513513
fn to_asc_obj<H: AscHeap + ?Sized>(
514514
&self,
515515
heap: &mut H,
516516
gas: &GasCounter,
517517
) -> Result<AscEthereumTransaction_0_0_2, HostExportError> {
518518
Ok(AscEthereumTransaction_0_0_2 {
519-
hash: asc_new(heap, &self.hash, gas)?,
520-
index: asc_new(heap, &BigInt::from_unsigned_u128(self.index), gas)?,
521-
from: asc_new(heap, &self.from, gas)?,
519+
hash: asc_new(heap, self.hash(), gas)?,
520+
index: asc_new(heap, &BigInt::from_unsigned_u128(self.index()), gas)?,
521+
from: asc_new(heap, self.from(), gas)?,
522522
to: self
523-
.to
523+
.to()
524524
.map(|to| asc_new(heap, &to, gas))
525525
.unwrap_or(Ok(AscPtr::null()))?,
526-
value: asc_new(heap, &BigInt::from_unsigned_u256(&self.value), gas)?,
527-
gas_limit: asc_new(heap, &BigInt::from_unsigned_u256(&self.gas_limit), gas)?,
528-
gas_price: asc_new(heap, &BigInt::from_unsigned_u256(&self.gas_price), gas)?,
529-
input: asc_new(heap, &*self.input, gas)?,
526+
value: asc_new(heap, &BigInt::from_unsigned_u256(self.value()), gas)?,
527+
gas_limit: asc_new(heap, &BigInt::from_unsigned_u256(self.gas_limit()), gas)?,
528+
gas_price: asc_new(heap, &BigInt::from_unsigned_u256(self.gas_price()), gas)?,
529+
input: asc_new(heap, self.input(), gas)?,
530530
})
531531
}
532532
}
533533

534-
impl ToAscObj<AscEthereumTransaction_0_0_6> for EthereumTransactionData {
534+
impl<'a> ToAscObj<AscEthereumTransaction_0_0_6> for EthereumTransactionData<'a> {
535535
fn to_asc_obj<H: AscHeap + ?Sized>(
536536
&self,
537537
heap: &mut H,
538538
gas: &GasCounter,
539539
) -> Result<AscEthereumTransaction_0_0_6, HostExportError> {
540540
Ok(AscEthereumTransaction_0_0_6 {
541-
hash: asc_new(heap, &self.hash, gas)?,
542-
index: asc_new(heap, &BigInt::from_unsigned_u128(self.index), gas)?,
543-
from: asc_new(heap, &self.from, gas)?,
541+
hash: asc_new(heap, self.hash(), gas)?,
542+
index: asc_new(heap, &BigInt::from_unsigned_u128(self.index()), gas)?,
543+
from: asc_new(heap, self.from(), gas)?,
544544
to: self
545-
.to
545+
.to()
546546
.map(|to| asc_new(heap, &to, gas))
547547
.unwrap_or(Ok(AscPtr::null()))?,
548-
value: asc_new(heap, &BigInt::from_unsigned_u256(&self.value), gas)?,
549-
gas_limit: asc_new(heap, &BigInt::from_unsigned_u256(&self.gas_limit), gas)?,
550-
gas_price: asc_new(heap, &BigInt::from_unsigned_u256(&self.gas_price), gas)?,
551-
input: asc_new(heap, &*self.input, gas)?,
552-
nonce: asc_new(heap, &BigInt::from_unsigned_u256(&self.nonce), gas)?,
548+
value: asc_new(heap, &BigInt::from_unsigned_u256(self.value()), gas)?,
549+
gas_limit: asc_new(heap, &BigInt::from_unsigned_u256(self.gas_limit()), gas)?,
550+
gas_price: asc_new(heap, &BigInt::from_unsigned_u256(self.gas_price()), gas)?,
551+
input: asc_new(heap, self.input(), gas)?,
552+
nonce: asc_new(heap, &BigInt::from_unsigned_u256(self.nonce()), gas)?,
553553
})
554554
}
555555
}
@@ -558,7 +558,7 @@ impl<'a, T, B> ToAscObj<AscEthereumEvent<T, B>> for EthereumEventData<'a>
558558
where
559559
T: AscType + AscIndexId,
560560
B: AscType + AscIndexId,
561-
EthereumTransactionData: ToAscObj<T>,
561+
EthereumTransactionData<'a>: ToAscObj<T>,
562562
EthereumBlockData<'a>: ToAscObj<B>,
563563
{
564564
fn to_asc_obj<H: AscHeap + ?Sized>(
@@ -591,7 +591,7 @@ impl<'a, T, B> ToAscObj<AscEthereumEvent_0_0_7<T, B>>
591591
where
592592
T: AscType + AscIndexId,
593593
B: AscType + AscIndexId,
594-
EthereumTransactionData: ToAscObj<T>,
594+
EthereumTransactionData<'a>: ToAscObj<T>,
595595
EthereumBlockData<'a>: ToAscObj<B>,
596596
{
597597
fn to_asc_obj<H: AscHeap + ?Sized>(

‎chain/ethereum/src/trigger.rs‎

Lines changed: 54 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use graph::prelude::ethabi::ethereum_types::U128;
1010
use graph::prelude::ethabi::ethereum_types::U256;
1111
use graph::prelude::ethabi::ethereum_types::U64;
1212
use graph::prelude::ethabi::Address;
13-
use graph::prelude::ethabi::Bytes;
1413
use graph::prelude::ethabi::LogParam;
1514
use graph::prelude::web3::types::Block;
1615
use graph::prelude::web3::types::Log;
@@ -42,6 +41,8 @@ use crate::runtime::abi::AscEthereumTransaction_0_0_6;
4241
// ETHDEP: This should be defined in only one place.
4342
type LightEthereumBlock = Block<Transaction>;
4443

44+
static U256_DEFAULT: U256 = U256::zero();
45+
4546
pub enum MappingTrigger {
4647
Log {
4748
block: Arc<LightEthereumBlock>,
@@ -147,7 +148,7 @@ impl ToAscPtr for MappingTrigger {
147148
let api_version = heap.api_version();
148149
let ethereum_event_data = EthereumEventData {
149150
block: EthereumBlockData::from(block.as_ref()),
150-
transaction: EthereumTransactionData::from(transaction.deref()),
151+
transaction: EthereumTransactionData::new(transaction.deref()),
151152
address: log.address,
152153
log_index: log.log_index.unwrap_or(U256::zero()),
153154
transaction_log_index: log.log_index.unwrap_or(U256::zero()),
@@ -198,7 +199,7 @@ impl ToAscPtr for MappingTrigger {
198199
to: call.to,
199200
from: call.from,
200201
block: EthereumBlockData::from(block.as_ref()),
201-
transaction: EthereumTransactionData::from(transaction.deref()),
202+
transaction: EthereumTransactionData::new(transaction.deref()),
202203
inputs,
203204
outputs,
204205
};
@@ -481,8 +482,10 @@ impl<'a> EthereumBlockData<'a> {
481482
}
482483

483484
pub fn total_difficulty(&self) -> &U256 {
484-
static DEFAULT: U256 = U256::zero();
485-
self.block.total_difficulty.as_ref().unwrap_or(&DEFAULT)
485+
self.block
486+
.total_difficulty
487+
.as_ref()
488+
.unwrap_or(&U256_DEFAULT)
486489
}
487490

488491
pub fn size(&self) -> &Option<U256> {
@@ -496,34 +499,54 @@ impl<'a> EthereumBlockData<'a> {
496499

497500
/// Ethereum transaction data.
498501
#[derive(Clone, Debug)]
499-
pub struct EthereumTransactionData {
500-
pub hash: H256,
501-
pub index: U128,
502-
pub from: H160,
503-
pub to: Option<H160>,
504-
pub value: U256,
505-
pub gas_limit: U256,
506-
pub gas_price: U256,
507-
pub input: Bytes,
508-
pub nonce: U256,
502+
pub struct EthereumTransactionData<'a> {
503+
tx: &'a Transaction,
509504
}
510505

511-
impl From<&'_ Transaction> for EthereumTransactionData {
512-
fn from(tx: &Transaction) -> EthereumTransactionData {
506+
impl<'a> EthereumTransactionData<'a> {
507+
// We don't implement `From` because it causes confusion with the `from`
508+
// accessor method
509+
fn new(tx: &'a Transaction) -> EthereumTransactionData<'a> {
510+
EthereumTransactionData { tx }
511+
}
512+
513+
pub fn hash(&self) -> &H256 {
514+
&self.tx.hash
515+
}
516+
517+
pub fn index(&self) -> U128 {
518+
self.tx.transaction_index.unwrap().as_u64().into()
519+
}
520+
521+
pub fn from(&self) -> &H160 {
513522
// unwrap: this is always `Some` for txns that have been mined
514523
// (see https://github.com/tomusdrw/rust-web3/pull/407)
515-
let from = tx.from.unwrap();
516-
EthereumTransactionData {
517-
hash: tx.hash,
518-
index: tx.transaction_index.unwrap().as_u64().into(),
519-
from,
520-
to: tx.to,
521-
value: tx.value,
522-
gas_limit: tx.gas,
523-
gas_price: tx.gas_price.unwrap_or(U256::zero()), // EIP-1559 made this optional.
524-
input: tx.input.0.clone(),
525-
nonce: tx.nonce,
526-
}
524+
self.tx.from.as_ref().unwrap()
525+
}
526+
527+
pub fn to(&self) -> &Option<H160> {
528+
&self.tx.to
529+
}
530+
531+
pub fn value(&self) -> &U256 {
532+
&self.tx.value
533+
}
534+
535+
pub fn gas_limit(&self) -> &U256 {
536+
&self.tx.gas
537+
}
538+
539+
pub fn gas_price(&self) -> &U256 {
540+
// EIP-1559 made this optional.
541+
self.tx.gas_price.as_ref().unwrap_or(&U256_DEFAULT)
542+
}
543+
544+
pub fn input(&self) -> &[u8] {
545+
&self.tx.input.0
546+
}
547+
548+
pub fn nonce(&self) -> &U256 {
549+
&self.tx.nonce
527550
}
528551
}
529552

@@ -535,7 +558,7 @@ pub struct EthereumEventData<'a> {
535558
pub transaction_log_index: U256,
536559
pub log_type: Option<String>,
537560
pub block: EthereumBlockData<'a>,
538-
pub transaction: EthereumTransactionData,
561+
pub transaction: EthereumTransactionData<'a>,
539562
pub params: Vec<LogParam>,
540563
}
541564

@@ -545,7 +568,7 @@ pub struct EthereumCallData<'a> {
545568
pub from: Address,
546569
pub to: Address,
547570
pub block: EthereumBlockData<'a>,
548-
pub transaction: EthereumTransactionData,
571+
pub transaction: EthereumTransactionData<'a>,
549572
pub inputs: Vec<LogParam>,
550573
pub outputs: Vec<LogParam>,
551574
}

0 commit comments

Comments
 (0)