Skip to content

Commit 3be0d8f

Browse files
authored
chore: upgrade crate ethereum-types and rlp (#59)
* chore: upgrade crate `ethereum-types` and `rlp` * chore: fix the clippy warnings
1 parent b160820 commit 3be0d8f

File tree

5 files changed

+11
-35
lines changed

5 files changed

+11
-35
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ edition = "2021"
1010

1111
[dependencies]
1212
bytes = { version = "1.0", default-features = false }
13-
ethereum-types = { version = "0.14", default-features = false, features = ["rlp", "codec"] }
13+
ethereum-types = { version = "0.15", default-features = false, features = ["rlp", "codec"] }
1414
hash-db = { version = "0.16", default-features = false }
1515
hash256-std-hasher = { version = "0.15", default-features = false }
16-
rlp = { version = "0.5.2", default-features = false, features = ["derive"] }
16+
rlp = { version = "0.6", default-features = false, features = ["derive"] }
1717
sha3 = { version = "0.10", default-features = false }
1818
trie-root = { version = "0.18", default-features = false }
1919

src/header.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl Header {
5353

5454
#[must_use]
5555
pub fn hash(&self) -> H256 {
56-
H256::from_slice(Keccak256::digest(&rlp::encode(self)).as_slice())
56+
H256::from_slice(Keccak256::digest(rlp::encode(self)).as_slice())
5757
}
5858
}
5959

src/transaction/eip1559.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,8 @@ impl rlp::Decodable for EIP1559Transaction {
8787
input: rlp.val_at(7)?,
8888
access_list: rlp.list_at(8)?,
8989
odd_y_parity: rlp.val_at(9)?,
90-
r: {
91-
let mut rarr = [0_u8; 32];
92-
rlp.val_at::<U256>(10)?.to_big_endian(&mut rarr);
93-
H256::from(rarr)
94-
},
95-
s: {
96-
let mut sarr = [0_u8; 32];
97-
rlp.val_at::<U256>(11)?.to_big_endian(&mut sarr);
98-
H256::from(sarr)
99-
},
90+
r: H256::from(rlp.val_at::<U256>(10)?.to_big_endian()),
91+
s: H256::from(rlp.val_at::<U256>(11)?.to_big_endian()),
10092
})
10193
}
10294
}

src/transaction/eip2930.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,8 @@ impl rlp::Decodable for EIP2930Transaction {
112112
input: rlp.val_at(6)?,
113113
access_list: rlp.list_at(7)?,
114114
odd_y_parity: rlp.val_at(8)?,
115-
r: {
116-
let mut rarr = [0_u8; 32];
117-
rlp.val_at::<U256>(9)?.to_big_endian(&mut rarr);
118-
H256::from(rarr)
119-
},
120-
s: {
121-
let mut sarr = [0_u8; 32];
122-
rlp.val_at::<U256>(10)?.to_big_endian(&mut sarr);
123-
H256::from(sarr)
124-
},
115+
r: H256::from(rlp.val_at::<U256>(9)?.to_big_endian()),
116+
s: H256::from(rlp.val_at::<U256>(10)?.to_big_endian()),
125117
})
126118
}
127119
}

src/transaction/legacy.rs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ pub struct LegacyTransaction {
186186

187187
impl LegacyTransaction {
188188
pub fn hash(&self) -> H256 {
189-
H256::from_slice(Keccak256::digest(&rlp::encode(self)).as_slice())
189+
H256::from_slice(Keccak256::digest(rlp::encode(self)).as_slice())
190190
}
191191

192192
pub fn to_message(self) -> LegacyTransactionMessage {
@@ -224,16 +224,8 @@ impl rlp::Decodable for LegacyTransaction {
224224
}
225225

226226
let v = rlp.val_at(6)?;
227-
let r = {
228-
let mut rarr = [0_u8; 32];
229-
rlp.val_at::<U256>(7)?.to_big_endian(&mut rarr);
230-
H256::from(rarr)
231-
};
232-
let s = {
233-
let mut sarr = [0_u8; 32];
234-
rlp.val_at::<U256>(8)?.to_big_endian(&mut sarr);
235-
H256::from(sarr)
236-
};
227+
let r = H256::from(rlp.val_at::<U256>(7)?.to_big_endian());
228+
let s = H256::from(rlp.val_at::<U256>(8)?.to_big_endian());
237229
let signature = TransactionSignature::new(v, r, s)
238230
.ok_or(DecoderError::Custom("Invalid transaction signature format"))?;
239231

@@ -262,7 +254,7 @@ pub struct LegacyTransactionMessage {
262254

263255
impl LegacyTransactionMessage {
264256
pub fn hash(&self) -> H256 {
265-
H256::from_slice(Keccak256::digest(&rlp::encode(self)).as_slice())
257+
H256::from_slice(Keccak256::digest(rlp::encode(self)).as_slice())
266258
}
267259
}
268260

0 commit comments

Comments
 (0)