Merge branch 'paradigmxyz:main' into main

astriaorg · Jun 30, 2023 · 4a42537 · 4a42537
2 parents bc033b6 + 3dcc76e
commit 4a42537
Show file tree

Hide file tree

Showing 68 changed files with 619 additions and 378 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -199,9 +199,7 @@ jobs:
           | Payload Builders     | <TODO> |
           | Non-Payload Builders | <TODO>    |
 
-          *See [Update
-          Priorities](https://paradigmxyz.github.io/reth/installation-priorities.html)
-          more information about this table.*
+          *See [Update Priorities](https://paradigmxyz.github.io/reth/installation/priorities.html) for more information about this table.*
 
           ## All Changes
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/reth/src/db/list.rs b/bin/reth/src/db/list.rs
@@ -3,12 +3,7 @@ use clap::Parser;
 
 use super::tui::DbListTUI;
 use eyre::WrapErr;
-use reth_db::{
-    database::Database,
-    mdbx::{Env, NoWriteMap},
-    table::Table,
-    TableType, TableViewer, Tables,
-};
+use reth_db::{database::Database, table::Table, DatabaseEnvRO, TableType, TableViewer, Tables};
 use tracing::error;
 
 const DEFAULT_NUM_ITEMS: &str = "5";
@@ -34,7 +29,7 @@ pub struct Command {
 
 impl Command {
     /// Execute `db list` command
-    pub fn execute(self, tool: &DbTool<'_, Env<NoWriteMap>>) -> eyre::Result<()> {
+    pub fn execute(self, tool: &DbTool<'_, DatabaseEnvRO>) -> eyre::Result<()> {
         if self.table.table_type() == TableType::DupSort {
             error!(target: "reth::cli", "Unsupported table.");
         }
@@ -46,7 +41,7 @@ impl Command {
 }
 
 struct ListTableViewer<'a> {
-    tool: &'a DbTool<'a, Env<NoWriteMap>>,
+    tool: &'a DbTool<'a, DatabaseEnvRO>,
     args: &'a Command,
 }