patch core

Cargo.toml

@@ -162,4 +162,9 @@ tempfile = "3.10"
 tower-http = "0.6.1"
 
 [patch.crates-io]
-alloy-eip7702 = { git = "https://github.com/alloy-rs/eips", rev = "c3ab112" }
+alloy-eip7702 = { git = "https://github.com/alloy-rs/eips", rev = "9e6fcee" }
+alloy-core = { git = "https://github.com/alloy-rs/core", rev = "237cfc4" }
+alloy-dyn-abi = { git = "https://github.com/alloy-rs/core", rev = "237cfc4" }
+alloy-json-abi = { git = "https://github.com/alloy-rs/core", rev = "237cfc4" }
+alloy-primitives = { git = "https://github.com/alloy-rs/core", rev = "237cfc4" }
+alloy-sol-types = { git = "https://github.com/alloy-rs/core", rev = "237cfc4" }

crates/consensus/src/signed.rs

@@ -1,6 +1,6 @@
 use crate::transaction::{RlpEcdsaTx, SignableTransaction};
 use alloy_eips::eip2718::Eip2718Result;
-use alloy_primitives::{PrimitiveSignature as Signature, B256};
+use alloy_primitives::{Signature, B256};
 use alloy_rlp::BufMut;
 
 /// A transaction with a signature and hash seal.

crates/consensus/src/transaction/eip1559.rs

@@ -1,6 +1,6 @@
 use crate::{transaction::RlpEcdsaTx, SignableTransaction, Signed, Transaction, TxType};
 use alloy_eips::{eip2930::AccessList, eip7702::SignedAuthorization};
-use alloy_primitives::{Bytes, ChainId, PrimitiveSignature as Signature, TxKind, B256, U256};
+use alloy_primitives::{Bytes, ChainId, Signature, TxKind, B256, U256};
 use alloy_rlp::{BufMut, Decodable, Encodable};
 use core::mem;
 
@@ -394,9 +394,7 @@ mod tests {
     use super::TxEip1559;
     use crate::{transaction::RlpEcdsaTx, SignableTransaction};
     use alloy_eips::eip2930::AccessList;
-    use alloy_primitives::{
-        address, b256, hex, Address, PrimitiveSignature as Signature, B256, U256,
-    };
+    use alloy_primitives::{address, b256, hex, Address, Signature, B256, U256};
 
     #[test]
     fn recover_signer_eip1559() {

crates/consensus/src/transaction/eip2930.rs

@@ -1,6 +1,6 @@
 use crate::{SignableTransaction, Signed, Transaction, TxType};
 use alloy_eips::{eip2930::AccessList, eip7702::SignedAuthorization};
-use alloy_primitives::{Bytes, ChainId, PrimitiveSignature as Signature, TxKind, B256, U256};
+use alloy_primitives::{Bytes, ChainId, Signature, TxKind, B256, U256};
 use alloy_rlp::{BufMut, Decodable, Encodable};
 use core::mem;
 
@@ -223,7 +223,7 @@ impl Decodable for TxEip2930 {
 mod tests {
     use super::TxEip2930;
     use crate::{transaction::RlpEcdsaTx, SignableTransaction, TxEnvelope};
-    use alloy_primitives::{Address, PrimitiveSignature as Signature, TxKind, U256};
+    use alloy_primitives::{Address, Signature, TxKind, U256};
     use alloy_rlp::{Decodable, Encodable};
 
     #[test]

crates/consensus/src/transaction/eip4844.rs

@@ -2,9 +2,7 @@ use crate::{SignableTransaction, Signed, Transaction, TxType};
 
 use alloc::vec::Vec;
 use alloy_eips::{eip2930::AccessList, eip4844::DATA_GAS_PER_BLOB, eip7702::SignedAuthorization};
-use alloy_primitives::{
-    Address, Bytes, ChainId, PrimitiveSignature as Signature, TxKind, B256, U256,
-};
+use alloy_primitives::{Address, Bytes, ChainId, Signature, TxKind, B256, U256};
 use alloy_rlp::{Buf, BufMut, Decodable, Encodable, Header};
 use core::mem;
 
@@ -897,7 +895,7 @@ mod tests {
     use super::{BlobTransactionSidecar, TxEip4844, TxEip4844WithSidecar};
     use crate::{transaction::eip4844::TxEip4844Variant, SignableTransaction, TxEnvelope};
     use alloy_eips::eip2930::AccessList;
-    use alloy_primitives::{address, b256, bytes, PrimitiveSignature as Signature, U256};
+    use alloy_primitives::{address, b256, bytes, Signature, U256};
     use alloy_rlp::{Decodable, Encodable};
 
     #[test]

crates/consensus/src/transaction/eip7702.rs

@@ -4,9 +4,7 @@ use alloy_eips::{
     eip2930::AccessList,
     eip7702::{constants::EIP7702_TX_TYPE_ID, SignedAuthorization},
 };
-use alloy_primitives::{
-    Address, Bytes, ChainId, PrimitiveSignature as Signature, TxKind, B256, U256,
-};
+use alloy_primitives::{Address, Bytes, ChainId, Signature, TxKind, B256, U256};
 use alloy_rlp::{BufMut, Decodable, Encodable};
 use core::mem;
 
@@ -395,7 +393,7 @@ mod tests {
     use super::*;
     use crate::SignableTransaction;
     use alloy_eips::eip2930::AccessList;
-    use alloy_primitives::{address, b256, hex, Address, PrimitiveSignature as Signature, U256};
+    use alloy_primitives::{address, b256, hex, Address, Signature, U256};
 
     #[test]
     fn encode_decode_eip7702() {

crates/consensus/src/transaction/envelope.rs

@@ -606,7 +606,7 @@ mod tests {
     };
     #[allow(unused_imports)]
     use alloy_primitives::{b256, Bytes, TxKind};
-    use alloy_primitives::{hex, Address, PrimitiveSignature as Signature, U256};
+    use alloy_primitives::{hex, Address, Signature, U256};
     use std::{fs, path::PathBuf, str::FromStr, vec};
 
     #[cfg(not(feature = "std"))]

crates/consensus/src/transaction/legacy.rs

@@ -1,9 +1,7 @@
 use crate::{transaction::RlpEcdsaTx, SignableTransaction, Signed, Transaction, TxType};
 use alloc::vec::Vec;
 use alloy_eips::{eip2930::AccessList, eip7702::SignedAuthorization};
-use alloy_primitives::{
-    keccak256, Bytes, ChainId, PrimitiveSignature as Signature, TxKind, B256, U256,
-};
+use alloy_primitives::{keccak256, Bytes, ChainId, Signature, TxKind, B256, U256};
 use alloy_rlp::{length_of_length, BufMut, Decodable, Encodable, Header, Result};
 use core::mem;
 
@@ -605,9 +603,7 @@ pub(super) mod serde_bincode_compat {
 #[cfg(all(test, feature = "k256"))]
 mod tests {
     use crate::{SignableTransaction, TxLegacy};
-    use alloy_primitives::{
-        address, b256, hex, Address, PrimitiveSignature as Signature, TxKind, B256, U256,
-    };
+    use alloy_primitives::{address, b256, hex, Address, Signature, TxKind, B256, U256};
 
     #[test]
     fn recover_signer_legacy() {

crates/consensus/src/transaction/rlp.rs

@@ -1,7 +1,7 @@
 use crate::{SignableTransaction, Signed};
 use alloc::vec::Vec;
 use alloy_eips::eip2718::{Eip2718Error, Eip2718Result};
-use alloy_primitives::{keccak256, PrimitiveSignature as Signature, TxHash};
+use alloy_primitives::{keccak256, Signature, TxHash};
 use alloy_rlp::{Buf, BufMut, Decodable, Encodable, Header};
 
 /// Helper trait for managing RLP encoding of transactions inside 2718

crates/network/src/ethereum/builder.rs

@@ -203,7 +203,7 @@ mod tests {
     };
     use alloy_consensus::{BlobTransactionSidecar, TxEip1559, TxType, TypedTransaction};
     use alloy_eips::eip7702::Authorization;
-    use alloy_primitives::{Address, PrimitiveSignature as Signature};
+    use alloy_primitives::{Address, Signature};
     use alloy_rpc_types_eth::{AccessList, TransactionRequest};
     use std::str::FromStr;
 

crates/rpc-types-eth/src/transaction/mod.rs

@@ -429,7 +429,7 @@ impl TransactionResponse for Transaction {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use alloy_primitives::PrimitiveSignature as AlloySignature;
+    use alloy_primitives::Signature as AlloySignature;
     use arbitrary::Arbitrary;
     use core::str::FromStr;
     use rand::Rng;

crates/rpc-types-eth/src/transaction/signature.rs

@@ -74,7 +74,7 @@ where
     }
 }
 
-impl TryFrom<Signature> for alloy_primitives::PrimitiveSignature {
+impl TryFrom<Signature> for alloy_primitives::Signature {
     type Error = alloy_primitives::SignatureError;
 
     fn try_from(value: Signature) -> Result<Self, Self::Error> {

crates/signer-local/src/lib.rs

@@ -8,7 +8,7 @@
 
 use alloy_consensus::SignableTransaction;
 use alloy_network::{TxSigner, TxSignerSync};
-use alloy_primitives::{Address, ChainId, PrimitiveSignature as Signature, B256};
+use alloy_primitives::{Address, ChainId, Signature, B256};
 use alloy_signer::{sign_transaction_with_chain_id, Result, Signer, SignerSync};
 use async_trait::async_trait;
 use k256::ecdsa::{self, signature::hazmat::PrehashSigner, RecoveryId};

crates/signer/src/lib.rs

@@ -14,7 +14,7 @@ pub use signer::{Signer, SignerSync};
 
 pub mod utils;
 
-pub use alloy_primitives::PrimitiveSignature as Signature;
+pub use alloy_primitives::Signature;
 pub use k256;
 
 /// Utility to get and set the chain ID on a transaction and the resulting signature within a

crates/signer/src/signer.rs

@@ -1,7 +1,5 @@
 use crate::Result;
-use alloy_primitives::{
-    eip191_hash_message, Address, ChainId, PrimitiveSignature as Signature, B256,
-};
+use alloy_primitives::{eip191_hash_message, Address, ChainId, Signature, B256};
 use async_trait::async_trait;
 use auto_impl::auto_impl;