release: switch to apache fastrlp (#1803)

* release: switch to apache fastrlp https://github.com/gakonst/open-fastrlp * s/fastrlp/open_fastrlp
gakonst · Oct 23, 2022 · 3d9c329 · 3d9c329
1 parent 50973b9
commit 3d9c329
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 35 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ethers-core/Cargo.toml b/ethers-core/Cargo.toml
@@ -11,7 +11,8 @@ repository = "https://github.com/gakonst/ethers-rs"
 keywords = ["ethereum", "web3", "celo", "ethers"]
 
 [dependencies]
-fastrlp = { version = "0.1.3", features = ["std", "derive", "ethereum-types"] }
+# Pin FastRLP to 0.1.2 when it was still Apache.
+open-fastrlp = { version = "=0.1.2", features = ["std", "derive", "ethereum-types"] }
 rlp = { version = "0.5.0", default-features = false, features = ["std"] }
 ethabi = { version = "17.2.0", default-features = false, features = ["full-serde", "rlp"] }
 arrayvec = { version = "0.7.2", default-features = false }

diff --git a/ethers-core/src/types/bytes.rs b/ethers-core/src/types/bytes.rs
@@ -1,4 +1,4 @@
-use fastrlp::{Decodable, Encodable};
+use open_fastrlp::{Decodable, Encodable};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::{
     borrow::Borrow,
@@ -147,7 +147,7 @@ impl Encodable for Bytes {
 }
 
 impl Decodable for Bytes {
-    fn decode(buf: &mut &[u8]) -> Result<Self, fastrlp::DecodeError> {
+    fn decode(buf: &mut &[u8]) -> Result<Self, open_fastrlp::DecodeError> {
         Ok(Self(bytes::Bytes::decode(buf)?))
     }
 }

diff --git a/ethers-core/src/types/signature.rs b/ethers-core/src/types/signature.rs
@@ -4,7 +4,6 @@ use crate::{
     utils::hash_message,
 };
 use elliptic_curve::{consts::U32, sec1::ToEncodedPoint};
-use fastrlp::Decodable;
 use generic_array::GenericArray;
 use k256::{
     ecdsa::{
@@ -13,6 +12,7 @@ use k256::{
     },
     PublicKey as K256PublicKey,
 };
+use open_fastrlp::Decodable;
 use serde::{Deserialize, Serialize};
 use std::{convert::TryFrom, fmt, str::FromStr};
 use thiserror::Error;
@@ -141,19 +141,19 @@ impl Signature {
     }
 
     /// Decodes a signature from RLP bytes, assuming no RLP header
-    pub(crate) fn decode_signature(buf: &mut &[u8]) -> Result<Self, fastrlp::DecodeError> {
+    pub(crate) fn decode_signature(buf: &mut &[u8]) -> Result<Self, open_fastrlp::DecodeError> {
         let v = u64::decode(buf)?;
         Ok(Self { r: U256::decode(buf)?, s: U256::decode(buf)?, v })
     }
 }
 
-impl fastrlp::Decodable for Signature {
-    fn decode(buf: &mut &[u8]) -> Result<Self, fastrlp::DecodeError> {
+impl open_fastrlp::Decodable for Signature {
+    fn decode(buf: &mut &[u8]) -> Result<Self, open_fastrlp::DecodeError> {
         Self::decode_signature(buf)
     }
 }
 
-impl fastrlp::Encodable for Signature {
+impl open_fastrlp::Encodable for Signature {
     fn length(&self) -> usize {
         self.r.length() + self.s.length() + self.v.length()
     }

diff --git a/ethers-core/src/types/transaction/eip2930.rs b/ethers-core/src/types/transaction/eip2930.rs
@@ -2,7 +2,7 @@ use super::{eip2718::TypedTransaction, normalize_v};
 use crate::types::{
     Address, Bytes, Signature, SignatureError, Transaction, TransactionRequest, H256, U256, U64,
 };
-use fastrlp::{
+use open_fastrlp::{
     RlpDecodable as FastRlpDecodable, RlpDecodableWrapper as FastRlpDecodableWrapper,
     RlpEncodable as FastRlpEncodable, RlpEncodableWrapper as FastRlpEncodableWrapper,
 };