Skip to content

Commit 9c3b2b8

Browse files
prestwichclaude
andauthored
refactor(types): replace migrated types with SDK re-exports (#31)
Remove local definitions of TxLocation, ConfirmationMeta, Confirmed, Receipt, Account, EthereumHardfork, and genesis_header from signet-storage-types. These are now re-exported from signet-types and signet-evm (0.16.0-rc.10). Bump workspace version to 0.6.1. Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent f9ccf3a commit 9c3b2b8

File tree

9 files changed

+17
-386
lines changed

9 files changed

+17
-386
lines changed

Cargo.toml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ members = ["crates/*"]
33
resolver = "2"
44

55
[workspace.package]
6-
version = "0.6.0"
6+
version = "0.6.1"
77
edition = "2024"
88
rust-version = "1.92"
99
authors = ["init4"]
@@ -35,18 +35,20 @@ incremental = false
3535

3636
[workspace.dependencies]
3737
# internal
38-
signet-hot = { version = "0.6.0", path = "./crates/hot" }
39-
signet-hot-mdbx = { version = "0.6.0", path = "./crates/hot-mdbx" }
40-
signet-cold = { version = "0.6.0", path = "./crates/cold" }
41-
signet-cold-mdbx = { version = "0.6.0", path = "./crates/cold-mdbx" }
42-
signet-cold-sql = { version = "0.6.0", path = "./crates/cold-sql" }
43-
signet-storage = { version = "0.6.0", path = "./crates/storage" }
44-
signet-storage-types = { version = "0.6.0", path = "./crates/types" }
38+
signet-hot = { version = "0.6.1", path = "./crates/hot" }
39+
signet-hot-mdbx = { version = "0.6.1", path = "./crates/hot-mdbx" }
40+
signet-cold = { version = "0.6.1", path = "./crates/cold" }
41+
signet-cold-mdbx = { version = "0.6.1", path = "./crates/cold-mdbx" }
42+
signet-cold-sql = { version = "0.6.1", path = "./crates/cold-sql" }
43+
signet-storage = { version = "0.6.1", path = "./crates/storage" }
44+
signet-storage-types = { version = "0.6.1", path = "./crates/types" }
4545

4646
# External, in-house
4747
signet-libmdbx = { version = "0.8.0" }
4848

49-
signet-zenith = "0.16.0-rc.8"
49+
signet-evm = "0.16.0-rc.10"
50+
signet-types = "0.16.0-rc.10"
51+
signet-zenith = "0.16.0-rc.10"
5052

5153
# trevm
5254
trevm = { version = "0.34.0", features = ["full_env_cfg"] }

crates/types/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ rustdoc-args = ["--cfg", "docsrs"]
1717

1818
[dependencies]
1919
alloy.workspace = true
20-
bitflags = "2.10.0"
2120
bytes.workspace = true
2221
roaring = "0.11.3"
2322
serde.workspace = true
23+
signet-evm.workspace = true
24+
signet-types.workspace = true
2425
signet-zenith.workspace = true
2526
thiserror.workspace = true
2627
trevm.workspace = true

crates/types/src/account.rs

Lines changed: 0 additions & 70 deletions
This file was deleted.

crates/types/src/alloy.rs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
1-
use alloy::consensus::{EthereumTxEnvelope, Receipt as AlloyReceipt, TxEip4844, TxType};
1+
use alloy::consensus::{EthereumTxEnvelope, TxEip4844};
22

33
/// Signed transaction.
44
pub type TransactionSigned = EthereumTxEnvelope<TxEip4844>;
5-
6-
/// Typed ethereum transaction receipt.
7-
/// Receipt containing result of transaction execution.
8-
#[derive(Clone, Debug, PartialEq, Eq, Default)]
9-
pub struct Receipt {
10-
/// Receipt type.
11-
pub tx_type: TxType,
12-
13-
/// The actual receipt data.
14-
pub inner: AlloyReceipt,
15-
}

crates/types/src/confirmation.rs

Lines changed: 0 additions & 80 deletions
This file was deleted.

crates/types/src/confirmed.rs

Lines changed: 0 additions & 62 deletions
This file was deleted.

crates/types/src/lib.rs

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,12 @@
1515
#![deny(unused_must_use, rust_2018_idioms)]
1616
#![cfg_attr(docsrs, feature(doc_cfg))]
1717

18-
mod account;
19-
pub use account::Account;
20-
mod confirmed;
21-
pub use confirmed::Confirmed;
2218
mod execution;
2319
pub use ::alloy::consensus::transaction::Recovered;
2420
pub use execution::{ExecutedBlock, ExecutedBlockBuilder, MissingFieldError};
2521

2622
mod alloy;
27-
pub use alloy::{Receipt, TransactionSigned};
28-
mod confirmation;
29-
pub use confirmation::ConfirmationMeta;
30-
23+
pub use alloy::TransactionSigned;
3124
mod events;
3225
pub use events::{DbSignetEvent, DbZenithHeader};
3326
mod indexed_receipt;
@@ -36,12 +29,8 @@ mod int_list;
3629
pub use int_list::{BlockNumberList, IntegerList, IntegerListError};
3730
mod sharded;
3831
pub use sharded::ShardedKey;
39-
40-
mod tx_location;
41-
pub use tx_location::TxLocation;
42-
43-
mod util;
44-
pub use util::{EthereumHardfork, genesis_header};
32+
pub use signet_evm::{Account, EthereumHardfork, genesis_header};
33+
pub use signet_types::{ConfirmationMeta, Confirmed, Receipt, TxLocation};
4534

4635
use ::alloy::consensus::{Header, Sealed};
4736

crates/types/src/tx_location.rs

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)