Skip to content

Commit a776122

Browse files
authored
refactor: move L1Address to starknet-providers (#427)
The type `L1Address` is only used in the sequencer client, so it makes more sense to put it in the `starknet-providers` crate.
1 parent df81e5c commit a776122

File tree

10 files changed

+18
-17
lines changed

10 files changed

+18
-17
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

starknet-core/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ starknet-ff = { version = "0.3.4", path = "../starknet-ff", features = [
2121
"serde",
2222
] }
2323
base64 = "0.21.0"
24-
ethereum-types = "0.14.1"
2524
flate2 = "1.0.25"
2625
hex = "0.4.3"
2726
serde = { version = "1.0.160", features = ["derive"] }

starknet-core/src/types/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ use serde_with::serde_as;
33

44
use crate::serde::unsigned_field_element::UfeHex;
55

6-
// Re-export commonly used upstream types
7-
pub use ethereum_types::Address as L1Address;
8-
96
pub use starknet_ff::*;
107

118
mod conversions;

starknet-providers/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ keywords = ["ethereum", "starknet", "web3"]
1616
starknet-core = { version = "0.3.2", path = "../starknet-core" }
1717
async-trait = "0.1.68"
1818
auto_impl = "1.0.1"
19+
ethereum-types = "0.14.1"
1920
flate2 = "1.0.25"
2021
url = "2.3.1"
2122
reqwest = { version = "0.11.16", default-features = false, features = ["json", "rustls-tls"] }

starknet-providers/src/sequencer/models/contract_addresses.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use serde::Deserialize;
2-
use starknet_core::types::L1Address;
2+
3+
use super::L1Address;
34

45
#[derive(Debug, Deserialize)]
56
#[serde(rename_all = "PascalCase")]

starknet-providers/src/sequencer/models/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// migration to becoming jsonrpc-centric. This file, along with all other sequencer-related types,
33
// will be removed after the sequencer API is removed from the network.
44

5+
// Re-export commonly used upstream types
6+
pub use ethereum_types::Address as L1Address;
7+
58
pub(crate) mod conversions;
69

710
mod block;

starknet-providers/src/sequencer/models/trace.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
use serde::Deserialize;
22
use serde_with::serde_as;
3-
use starknet_core::{
4-
serde::unsigned_field_element::UfeHex,
5-
types::{FieldElement, L1Address},
6-
};
3+
use starknet_core::{serde::unsigned_field_element::UfeHex, types::FieldElement};
74

8-
use super::{EntryPointType, ExecutionResources};
5+
use super::{EntryPointType, ExecutionResources, L1Address};
96

107
#[serde_as]
118
#[derive(Debug, Deserialize)]

starknet-providers/src/sequencer/models/transaction_receipt.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ use serde::Deserialize;
22
use serde_with::serde_as;
33
use starknet_core::{
44
serde::unsigned_field_element::{UfeHex, UfePendingBlockHash},
5-
types::{FieldElement, L1Address},
5+
types::FieldElement,
66
};
77

8-
use super::TransactionFailureReason;
8+
use super::{L1Address, TransactionFailureReason};
99

1010
#[serde_as]
1111
#[derive(Debug, Deserialize)]

starknet-providers/src/sequencer/models/transaction_request.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ use serde::{Deserialize, Serialize, Serializer};
22
use serde_with::serde_as;
33
use starknet_core::{
44
serde::unsigned_field_element::{UfeHex, UfeHexOption},
5-
types::{FieldElement, L1Address},
5+
types::FieldElement,
66
};
77
use std::sync::Arc;
88

9-
use super::contract::{CompressedLegacyContractClass, CompressedSierraClass};
9+
use super::{
10+
contract::{CompressedLegacyContractClass, CompressedSierraClass},
11+
L1Address,
12+
};
1013

1114
#[serde_as]
1215
#[derive(Debug, Deserialize)]

starknet-providers/tests/sequencer_goerli.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
use std::str::FromStr;
44

5-
use starknet_core::types::{FieldElement, L1Address};
5+
use starknet_core::types::FieldElement;
66
use starknet_providers::{
77
sequencer::models::{
8-
AccountTransaction, BlockId, CallL1Handler, InvokeFunctionTransactionRequest,
8+
AccountTransaction, BlockId, CallL1Handler, InvokeFunctionTransactionRequest, L1Address,
99
},
1010
SequencerGatewayProvider,
1111
};

0 commit comments

Comments
 (0)