Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Frontier DB block mapping one-to-many #862

Merged
merged 17 commits into from
Oct 5, 2022
Merged

Frontier DB block mapping one-to-many #862

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c8e0e74
WIP Frontier DB block mapping one-to-many
tgmichel Sep 20, 2022
ca528e9
Fix
tgmichel Sep 20, 2022
eb9a4a0
fmt
tgmichel Sep 20, 2022
67ac004
Cleanup
tgmichel Sep 20, 2022
c30f567
Cleanup
tgmichel Sep 20, 2022
bc32db6
Cleanup
tgmichel Sep 20, 2022
ac54892
fmt skip
tgmichel Sep 20, 2022
dc97d30
parity db migration
tgmichel Sep 21, 2022
a9ef762
Cleanup + tests
tgmichel Sep 21, 2022
fccbcac
WIP retroactively fix non-canon mapped blocks
tgmichel Sep 21, 2022
1764784
Update tests
tgmichel Sep 22, 2022
95c20a6
Fix more tests
tgmichel Sep 22, 2022
51d77ef
clippy
tgmichel Sep 22, 2022
9f8dc62
taplo
tgmichel Sep 22, 2022
0bb8551
Test transaction metadata
tgmichel Sep 22, 2022
49d196e
Use test runtime api
tgmichel Sep 23, 2022
7b6d8b1
Remove unnecessary generic
tgmichel Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions client/cli/src/frontier_db_cmd/mapping_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pub enum MappingKey {
pub struct MappingDb<'a, C, B: BlockT> {
cmd: &'a FrontierDbCmd,
client: Arc<C>,
backend: Arc<fc_db::Backend<B>>,
backend: Arc<fc_db::Backend<B, C>>,
}

impl<'a, C, B: BlockT> MappingDb<'a, C, B>
Expand All @@ -48,7 +48,7 @@ where
C::Api: EthereumRuntimeRPCApi<B>,
C: sp_blockchain::HeaderBackend<B>,
{
pub fn new(cmd: &'a FrontierDbCmd, client: Arc<C>, backend: Arc<fc_db::Backend<B>>) -> Self {
pub fn new(cmd: &'a FrontierDbCmd, client: Arc<C>, backend: Arc<fc_db::Backend<B, C>>) -> Self {
Self {
cmd,
client,
Expand Down
13 changes: 8 additions & 5 deletions client/cli/src/frontier_db_cmd/meta_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,16 @@ impl FromStr for MetaKey {
}
}

pub struct MetaDb<'a, B: BlockT> {
pub struct MetaDb<'a, B: BlockT, C> {
cmd: &'a FrontierDbCmd,
backend: Arc<fc_db::Backend<B>>,
backend: Arc<fc_db::Backend<B, C>>,
}

impl<'a, B: BlockT> MetaDb<'a, B> {
pub fn new(cmd: &'a FrontierDbCmd, backend: Arc<fc_db::Backend<B>>) -> Self {
impl<'a, B: BlockT, C> MetaDb<'a, B, C>
where
C: sp_blockchain::HeaderBackend<B>,
{
pub fn new(cmd: &'a FrontierDbCmd, backend: Arc<fc_db::Backend<B, C>>) -> Self {
Self { cmd, backend }
}

Expand Down Expand Up @@ -152,4 +155,4 @@ impl<'a, B: BlockT> MetaDb<'a, B> {
}
}

impl<'a, B: BlockT> FrontierDbMessage for MetaDb<'a, B> {}
impl<'a, B: BlockT, C> FrontierDbMessage for MetaDb<'a, B, C> {}
2 changes: 1 addition & 1 deletion client/cli/src/frontier_db_cmd/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ impl FrontierDbCmd {
pub fn run<C, B: BlockT>(
&self,
client: Arc<C>,
backend: Arc<fc_db::Backend<B>>,
backend: Arc<fc_db::Backend<B, C>>,
) -> sc_cli::Result<()>
where
C: sp_api::ProvideRuntimeApi<B>,
Expand Down
Loading