Merge pull request #75 from ethereum-optimism/rf/fix/kona-type-refactor

fix: Use Refactored Kona Types

Author: 0xKitsune

Cargo.lock

@@ -46,7 +46,8 @@ revm = { version = "12.1", features = ["alloydb", "optimism"] }
 
 # Kona + OP Types
 superchain-registry = "0.2.6"
-kona-derive = { git = "https://github.com/ethereum-optimism/kona", rev = "4e57dd35ea08b31d0baa293c7a12165f28e6cd92", features = ["online"] }
+kona-primitives = { git = "https://github.com/ethereum-optimism/kona", version = "0.0.2", features = ["online"] }
+kona-derive = { git = "https://github.com/ethereum-optimism/kona", version = "0.0.3", features = ["online"] }
 
 # Internal
 op-test-vectors = { path = "crates/op-test-vectors" }

Cargo.toml

@@ -30,5 +30,6 @@ alloy-eips.workspace = true
 
 # OP Types + Kona
 op-test-vectors.workspace = true
+kona-primitives.workspace = true
 kona-derive.workspace = true
 superchain-registry.workspace = true

bin/opdn/Cargo.toml

@@ -9,7 +9,7 @@ use kona_derive::online::{
     OnlineBeaconClient, OnlineBlobProviderWithFallback, SimpleSlotDerivation,
 };
 use kona_derive::traits::BlobProvider;
-use kona_derive::types::{Blob, BlockInfo, IndexedBlobHash};
+use kona_primitives::{Blob, BlockInfo, IndexedBlobHash};
 
 /// Loads blobs for the given block number.
 pub async fn load(

bin/opdn/src/cmd/blobs.rs

@@ -8,7 +8,7 @@ use kona_derive::online::{
     AlloyChainProvider, OnlineBeaconClient, OnlineBlobProviderWithFallback, SimpleSlotDerivation,
 };
 use kona_derive::traits::ChainProvider;
-use kona_derive::types::Blob;
+use kona_primitives::Blob;
 use op_test_vectors::derivation::FixtureBlock;
 
 /// Constructs [FixtureBlock]s for the given L1 blocks.

bin/opdn/src/cmd/fixtures.rs

@@ -6,10 +6,8 @@ use color_eyre::{
     Result,
 };
 use hashbrown::HashMap;
-use kona_derive::{
-    online::*,
-    types::{L2BlockInfo, StageError},
-};
+use kona_derive::{errors::StageError, online::*};
+use kona_primitives::L2BlockInfo;
 use op_test_vectors::derivation::DerivationFixture;
 use reqwest::Url;
 use std::path::PathBuf;

bin/opdn/src/cmd/from_l1.rs

@@ -6,10 +6,8 @@ use color_eyre::{
     Result,
 };
 use hashbrown::HashMap;
-use kona_derive::{
-    online::*,
-    types::{L2BlockInfo, StageError},
-};
+use kona_derive::{errors::StageError, online::*};
+use kona_primitives::L2BlockInfo;
 use op_test_vectors::derivation::DerivationFixture;
 use reqwest::Url;
 use std::path::PathBuf;

bin/opdn/src/cmd/from_l2.rs

@@ -1,6 +1,6 @@
 //! Utilities
 
-use kona_derive::types::{L2ExecutionPayloadEnvelope, L2PayloadAttributes, RawTransaction};
+use kona_primitives::{L2ExecutionPayloadEnvelope, L2PayloadAttributes, RawTransaction};
 
 /// Converts an [L2ExecutionPayloadEnvelope] to an [L2PayloadAttributes].
 pub fn to_payload_attributes(payload: L2ExecutionPayloadEnvelope) -> L2PayloadAttributes {

bin/opdn/src/cmd/util.rs

@@ -27,4 +27,5 @@ alloy-eips.workspace = true
 
 # OP Types + Kona
 kona-derive.workspace = true
+kona-primitives.workspace = true
 superchain-registry.workspace = true

bin/range-finder/Cargo.toml

@@ -2,10 +2,8 @@
 
 use clap::{ArgAction, Parser};
 use color_eyre::eyre::{eyre, Result};
-use kona_derive::{
-    online::*,
-    types::{L2BlockInfo, StageError},
-};
+use kona_derive::{errors::StageError, online::*};
+use kona_primitives::L2BlockInfo;
 use reqwest::Url;
 use std::sync::Arc;
 use superchain_registry::ROLLUP_CONFIGS;