- 
- 
+ 
+
+
- 
+ 
-
-
-
+
+
What's Kona? • Overview • - Contributing • + Contributing • Credits
@@ -37,7 +37,7 @@ program! Kona is also used by: - [`op-succinct`][op-succinct] To build your own backend for kona, or build a new application on top of its libraries, -see the [SDK section of the book](https://anton-rs.github.io/kona/sdk/intro.html). +see the [SDK section of the book](https://op-rs.github.io/kona/sdk/intro.html). ### Development Status @@ -53,7 +53,8 @@ see the [SDK section of the book](https://anton-rs.github.io/kona/sdk/intro.html **Build Pipelines** - [`cannon`](./build/cannon): Docker image for compiling to the bare-metal `mips-unknown-none` target. -- [`asterisc`](./build/asterisc): Docker image for compiling to the bare-metal `riscv64gc-unknown-none-elf` target. +- [`asterisc`](./build/asterisc): Docker image for compiling to the bare-metal `riscv64imac-unknown-none-elf` target. + **Protocol** - [`mpt`](./crates/mpt): Utilities for interacting with the Merkle Patricia Trie in the client program. @@ -83,11 +84,11 @@ getting started with building your own programs, and a reference for the librari [op-stack]: https://github.com/ethereum-optimism/optimism [op-program]: https://github.com/ethereum-optimism/optimism/tree/develop/op-program [cannon]: https://github.com/ethereum-optimism/optimism/tree/develop/cannon -[cannon-rs]: https://github.com/anton-rs/cannon-rs +[cannon-rs]: https://github.com/op-rs/cannon-rs [badboi-cannon-rs]: https://github.com/BadBoiLabs/cannon-rs [asterisc]: https://github.com/etheruem-optimism/asterisc [fpp-specs]: https://specs.optimism.io/experimental/fault-proof/index.html -[book]: https://anton-rs.github.io/kona/ +[book]: https://op-rs.github.io/kona/ [op-succinct]: https://github.com/succinctlabs/op-succinct [op-labs]: https://github.com/ethereum-optimism [bad-boi-labs]: https://github.com/BadBoiLabs diff --git a/bin/client/justfile b/bin/client/justfile index 5bd260a295..4964c3aa99 100644 --- a/bin/client/justfile +++ b/bin/client/justfile @@ -14,7 +14,7 @@ run-client-asterisc block_number l1_rpc l1_beacon_rpc l2_rpc rollup_node_rpc ver OP_NODE_ADDRESS="{{rollup_node_rpc}}" HOST_BIN_PATH="./target/release/kona-host" - CLIENT_BIN_PATH="./target/riscv64gc-unknown-none-elf/release-client-lto/kona" + CLIENT_BIN_PATH="./target/riscv64imac-unknown-none-elf/release-client-lto/kona" STATE_PATH="./state.bin.gz" CLAIMED_L2_BLOCK_NUMBER={{block_number}} @@ -140,7 +140,7 @@ run-client-asterisc-offline block_number l2_claim l2_output_root l2_head l1_head #!/usr/bin/env bash HOST_BIN_PATH="./target/release/kona-host" - CLIENT_BIN_PATH="./target/riscv64gc-unknown-none-elf/release-client-lto/kona" + CLIENT_BIN_PATH="./target/riscv64imac-unknown-none-elf/release-client-lto/kona" STATE_PATH="./state.bin.gz" CLAIMED_L2_BLOCK_NUMBER={{block_number}} diff --git a/bin/client/src/kona.rs b/bin/client/src/kona.rs index cf166c1424..2e91cd30e4 100644 --- a/bin/client/src/kona.rs +++ b/bin/client/src/kona.rs @@ -39,7 +39,7 @@ fn main() -> Result<(), String> { .expect("Failed to set tracing subscriber"); } - kona_proof::block_on(kona_client::run( + kona_proof::block_on(kona_client::single::run( ORACLE_READER, HINT_WRITER, Some(precompiles::fpvm_handle_register), diff --git a/bin/client/src/lib.rs b/bin/client/src/lib.rs index 83c4c70cd3..c15be9de25 100644 --- a/bin/client/src/lib.rs +++ b/bin/client/src/lib.rs @@ -7,173 +7,4 @@ extern crate alloc; -use alloc::sync::Arc; -use alloy_consensus::{Header, Sealed}; -use alloy_primitives::B256; -use core::fmt::Debug; -use kona_driver::{Driver, DriverError}; -use kona_executor::{ExecutorError, KonaHandleRegister, TrieDBProvider}; -use kona_preimage::{ - CommsClient, HintWriterClient, PreimageKey, PreimageKeyType, PreimageOracleClient, -}; -use kona_proof::{ - errors::OracleProviderError, - executor::KonaExecutor, - l1::{OracleBlobProvider, OracleL1ChainProvider, OraclePipeline}, - l2::OracleL2ChainProvider, - sync::new_pipeline_cursor, - BootInfo, CachingOracle, HintType, -}; -use thiserror::Error; -use tracing::{error, info, warn}; - -/// An error that can occur when running the fault proof program. -#[derive(Error, Debug)] -pub enum FaultProofProgramError { - /// The claim is invalid. - #[error("Invalid claim. Expected {0}, actual {1}")] - InvalidClaim(B256, B256), - /// An error occurred in the Oracle provider. - #[error(transparent)] - OracleProviderError(#[from] OracleProviderError), - /// An error occurred in the driver. - #[error(transparent)] - Driver(#[from] DriverError
+
> 📖 `kona` is in active development, and is not yet ready for use in production. During development, this book will evolve quickly and may contain inaccuracies.
>
diff --git a/book/src/links.md b/book/src/links.md
index 9d68ad149c..424fb4c78a 100644
--- a/book/src/links.md
+++ b/book/src/links.md
@@ -3,7 +3,7 @@
[op-stack]: https://github.com/ethereum-optimism/optimism
[op-program]: https://github.com/ethereum-optimism/optimism/tree/develop/op-program
[cannon]: https://github.com/ethereum-optimism/optimism/tree/develop/cannon
-[cannon-rs]: https://github.com/anton-rs/cannon-rs
+[cannon-rs]: https://github.com/op-rs/cannon-rs
[asterisc]: https://github.com/ethereum-optimism/asterisc
[fp-specs]: https://specs.optimism.io/experimental/fault-proof/index.html
[fpp-specs]: https://specs.optimism.io/experimental/fault-proof/index.html#fault-proof-program
@@ -15,11 +15,11 @@
-[kona]: https://github.com/anton-rs/kona
-[book]: https://anton-rs.github.io/kona/
-[issues]: https://github.com/anton-rs/kona/issues
-[new-issue]: https://github.com/anton-rs/kona/issues/new
-[contributing]: https://github.com/anton-rs/kona/tree/main/CONTRIBUTING.md
+[kona]: https://github.com/op-rs/kona
+[book]: https://op-rs.github.io/kona/
+[issues]: https://github.com/op-rs/kona/issues
+[new-issue]: https://github.com/op-rs/kona/issues/new
+[contributing]: https://github.com/op-rs/kona/tree/main/CONTRIBUTING.md
diff --git a/book/src/sdk/custom-backend.md b/book/src/sdk/custom-backend.md
index ffafdaf99f..7cb7431384 100644
--- a/book/src/sdk/custom-backend.md
+++ b/book/src/sdk/custom-backend.md
@@ -85,7 +85,7 @@ let pipeline = PipelineBuilder::new()
```
From here, a custom derivation driver is needed to produce the desired execution payload(s). An example of this for
-`kona-client` can be found in the [DerivationDriver](https://github.com/anton-rs/kona/blob/main/bin/client/src/l1/driver.rs#L77).
+`kona-client` can be found in the [DerivationDriver](https://github.com/op-rs/kona/blob/main/bin/client/src/l1/driver.rs#L77).
### `kona-mpt` / `kona-executor` sources
@@ -113,7 +113,7 @@ let header = executor.execute_payload(...).expect("Failed execution");
### Bringing it Together
Once your custom backend traits for both `kona-derive` and `kona-executor` have been implemented,
-your final binary may look something like [that of `kona-client`'s](https://github.com/anton-rs/kona/blob/main/bin/client/src/kona.rs).
+your final binary may look something like [that of `kona-client`'s](https://github.com/op-rs/kona/blob/main/bin/client/src/kona.rs).
Alternatively, if you're looking to prove a wider range of blocks, [`op-succinct`'s `range` program](https://github.com/succinctlabs/op-succinct/tree/main/programs/range)
offers a good example of running the pipeline and executor across a string of contiguous blocks.
diff --git a/book/src/sdk/exec-ext.md b/book/src/sdk/exec-ext.md
index fef15caa9b..8709356347 100644
--- a/book/src/sdk/exec-ext.md
+++ b/book/src/sdk/exec-ext.md
@@ -46,7 +46,7 @@ let cfg = RollupConfig::default();
let provider = ...;
let hinter = ...;
-let executor = StatelessL2BlcokExecutor::builder(&cfg, provider, hinter)
+let executor = StatelessL2BlockExecutor::builder(&cfg, provider, hinter)
.with_parent_header(...)
.with_handle_register(custom_handle_register)
.build();
diff --git a/book/src/sdk/fpvm-backend.md b/book/src/sdk/fpvm-backend.md
index d1fc6725c4..64c08fe253 100644
--- a/book/src/sdk/fpvm-backend.md
+++ b/book/src/sdk/fpvm-backend.md
@@ -100,7 +100,7 @@ Finally, in `kona-proof`, implementations of data source traits from `kona-deriv
to pull in untyped data from the host by `PreimageKey`. These data source traits are covered in more detail within
the [Custom Backend](./custom-backend.md) section, but we'll quickly gloss over them here to build intuition.
-Let's take, for example, [`OracleL1ChainProvider`](https://github.com/anton-rs/kona/blob/40a8d7ec3def4a1eeb26492a1e4338d8b032e428/bin/client/src/l1/chain_provider.rs#L16-L23).
+Let's take, for example, [`OracleL1ChainProvider`](https://github.com/op-rs/kona/blob/40a8d7ec3def4a1eeb26492a1e4338d8b032e428/bin/client/src/l1/chain_provider.rs#L16-L23).
The [`ChainProvider`](https://docs.rs/kona-derive/latest/kona_derive/traits/trait.ChainProvider.html) trait in `kona-derive`
defines a simple interface for fetching information about the L1 chain. In the `OracleL1ChainProvider`, this information
is pulled in over the [PreimageOracle ABI][preimage-specs]. There are many other examples of these data source traits,
diff --git a/book/src/sdk/pipeline/intro.md b/book/src/sdk/pipeline/intro.md
index 146aae8cf8..c88519262b 100644
--- a/book/src/sdk/pipeline/intro.md
+++ b/book/src/sdk/pipeline/intro.md
@@ -182,7 +182,7 @@ use core::iter::Iterator;
let l2_safe_head = L2BlockInfo::default();
loop {
if matches!(pipeline.step(l2_safe_head).await, StepResult::PreparedAttributes) {
- // The pipeline has succesfully prepared payload attributes, break the loop.
+ // The pipeline has successfully prepared payload attributes, break the loop.
break;
}
}
@@ -285,12 +285,12 @@ So, [@clabby][clabby] and [@refcell][refcell] stood up [kona][kona] in a few mon
-[driver]: https://github.com/anton-rs/kona/blob/main/bin/client/src/l1/driver.rs#L74
+[driver]: https://github.com/op-rs/kona/blob/main/bin/client/src/l1/driver.rs#L74
[next]: https://doc.rust-lang.org/nightly/core/iter/trait.Iterator.html#tymethod.next
[builder]: https://docs.rs/kona-derive/latest/kona_derive/pipeline/struct.PipelineBuilder.html
[alloy]: https://github.com/alloy-rs/alloy
[ethers-rs]: https://github.com/gakonst/ethers-rs
-[kona]: https://github.com/anton-rs/kona
+[kona]: https://github.com/op-rs/kona
[clabby]: https://github.com/clabby
[refcell]: https://github.com/refcell
[go]: https://go.dev/
diff --git a/build/README.md b/build/README.md
index a8b70973b9..f8c50cc658 100644
--- a/build/README.md
+++ b/build/README.md
@@ -18,7 +18,7 @@ docker run \
--platform linux/amd64 \
-v `pwd`/:/workdir \
-w="/workdir" \
- ghcr.io/anton-rs/kona/cannon-builder:main cargo build --release -Zbuild-std=core,alloc
+ ghcr.io/op-rs/kona/cannon-builder:main cargo build --release -Zbuild-std=core,alloc
```
**asterisc**
@@ -29,5 +29,5 @@ docker run \
--platform linux/amd64 \
-v `pwd`/:/workdir \
-w="/workdir" \
- ghcr.io/anton-rs/kona/asterisc-builder:main cargo build --release -Zbuild-std=core,alloc
+ ghcr.io/op-rs/kona/asterisc-builder:main cargo build --release -Zbuild-std=core,alloc
```
diff --git a/build/asterisc/asterisc-repro.dockerfile b/build/asterisc/asterisc-repro.dockerfile
index a644df1739..38cc432afd 100644
--- a/build/asterisc/asterisc-repro.dockerfile
+++ b/build/asterisc/asterisc-repro.dockerfile
@@ -29,7 +29,7 @@ RUN git clone https://github.com/ethereum-optimism/asterisc && \
# Build kona-client @ `CLIENT_TAG` #
################################################################
-FROM ghcr.io/anton-rs/kona/asterisc-builder@sha256:523f0455b25b28917a8e7d02cd3ecb8c8af93e5e5b85ec7d7bcf2df4458e65a5 AS client-build
+FROM ghcr.io/op-rs/kona/asterisc-builder@sha256:56c57453ebe09875e96df527d3734d781e987dbdc1e0ce9e813e1e88590036bd AS client-build
SHELL ["/bin/bash", "-c"]
ARG CLIENT_TAG
@@ -47,7 +47,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends git
# Build kona-client on the selected tag
RUN git checkout $CLIENT_TAG && \
cargo build -Zbuild-std=core,alloc --workspace --bin kona --locked --profile release-client-lto --exclude kona-host --exclude kona-derive-alloy && \
- mv ./target/riscv64gc-unknown-none-elf/release-client-lto/kona /kona-client-elf
+ mv ./target/riscv64imac-unknown-none-elf/release-client-lto/kona /kona-client-elf
################################################################
# Build kona-host @ `CLIENT_TAG` #
diff --git a/build/asterisc/asterisc.dockerfile b/build/asterisc/asterisc.dockerfile
index 5e8e4a4c5b..2499758359 100644
--- a/build/asterisc/asterisc.dockerfile
+++ b/build/asterisc/asterisc.dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
clang \
make \
cmake \
- git
+ git
# Install Rustup and Rust
RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain ${RUST_VERSION} --component rust-src
@@ -28,6 +28,6 @@ ENV PATH="/root/.cargo/bin:${PATH}"
ENV CC_riscv64_unknown_none_elf=riscv64-linux-gnu-gcc \
CXX_riscv64_unknown_none_elf=riscv64-linux-gnu-g++ \
CARGO_TARGET_RISCV64_UNKNOWN_NONE_ELF_LINKER=riscv64-linux-gnu-gcc \
- RUSTFLAGS="-Clink-arg=-e_start -Ctarget-feature=-c" \
- CARGO_BUILD_TARGET="riscv64gc-unknown-none-elf" \
+ RUSTFLAGS="-Clink-arg=-e_start -Ctarget-feature=-c,-zicsr,-zifencei,-zicntr,zihpm" \
+ CARGO_BUILD_TARGET="riscv64imac-unknown-none-elf" \
RUSTUP_TOOLCHAIN=${RUST_VERSION}
diff --git a/crates/derive/CHANGELOG.md b/crates/derive/CHANGELOG.md
index 30f89fab4b..f85f5e242a 100644
--- a/crates/derive/CHANGELOG.md
+++ b/crates/derive/CHANGELOG.md
@@ -6,248 +6,248 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
-## [0.2.0](https://github.com/anton-rs/kona/compare/kona-derive-v0.1.0...kona-derive-v0.2.0) - 2024-12-03
+## [0.2.0](https://github.com/op-rs/kona/compare/kona-derive-v0.1.0...kona-derive-v0.2.0) - 2024-12-03
### Added
-- *(workspace)* Isolate FPVM-specific platform code ([#821](https://github.com/anton-rs/kona/pull/821))
+- *(workspace)* Isolate FPVM-specific platform code ([#821](https://github.com/op-rs/kona/pull/821))
### Fixed
-- bump ([#855](https://github.com/anton-rs/kona/pull/855))
-- nightly lint ([#858](https://github.com/anton-rs/kona/pull/858))
+- bump ([#855](https://github.com/op-rs/kona/pull/855))
+- nightly lint ([#858](https://github.com/op-rs/kona/pull/858))
### Other
-- *(derive)* remove indexed blob hash ([#847](https://github.com/anton-rs/kona/pull/847))
+- *(derive)* remove indexed blob hash ([#847](https://github.com/op-rs/kona/pull/847))
-## [0.0.7](https://github.com/anton-rs/kona/compare/kona-derive-v0.0.6...kona-derive-v0.0.7) - 2024-11-20
+## [0.0.7](https://github.com/op-rs/kona/compare/kona-derive-v0.0.6...kona-derive-v0.0.7) - 2024-11-20
### Added
-- *(driver)* Abstract, Default Pipeline ([#796](https://github.com/anton-rs/kona/pull/796))
+- *(driver)* Abstract, Default Pipeline ([#796](https://github.com/op-rs/kona/pull/796))
### Other
-- *(derive)* remove batch reader ([#826](https://github.com/anton-rs/kona/pull/826))
-- op-alloy 0.6.8 ([#830](https://github.com/anton-rs/kona/pull/830))
-- *(driver)* use tracing macros ([#823](https://github.com/anton-rs/kona/pull/823))
-- *(deps)* op-alloy 0.6.7 ([#824](https://github.com/anton-rs/kona/pull/824))
-- v0.6.6 op-alloy ([#804](https://github.com/anton-rs/kona/pull/804))
-- *(workspace)* Migrate back to `thiserror` v2 ([#811](https://github.com/anton-rs/kona/pull/811))
-- *(derive)* Re-export types ([#790](https://github.com/anton-rs/kona/pull/790))
-- Revert "chore: bump alloy deps ([#788](https://github.com/anton-rs/kona/pull/788))" ([#791](https://github.com/anton-rs/kona/pull/791))
+- *(derive)* remove batch reader ([#826](https://github.com/op-rs/kona/pull/826))
+- op-alloy 0.6.8 ([#830](https://github.com/op-rs/kona/pull/830))
+- *(driver)* use tracing macros ([#823](https://github.com/op-rs/kona/pull/823))
+- *(deps)* op-alloy 0.6.7 ([#824](https://github.com/op-rs/kona/pull/824))
+- v0.6.6 op-alloy ([#804](https://github.com/op-rs/kona/pull/804))
+- *(workspace)* Migrate back to `thiserror` v2 ([#811](https://github.com/op-rs/kona/pull/811))
+- *(derive)* Re-export types ([#790](https://github.com/op-rs/kona/pull/790))
+- Revert "chore: bump alloy deps ([#788](https://github.com/op-rs/kona/pull/788))" ([#791](https://github.com/op-rs/kona/pull/791))
-## [0.0.6](https://github.com/anton-rs/kona/compare/kona-derive-v0.0.5...kona-derive-v0.0.6) - 2024-11-06
+## [0.0.6](https://github.com/op-rs/kona/compare/kona-derive-v0.0.5...kona-derive-v0.0.6) - 2024-11-06
### Added
-- *(derive)* `From
+
-
-
+
+
A `no_std` compatible implementation of the OP Stack's [derivation pipeline][derive].
diff --git a/crates/derive/src/attributes/stateful.rs b/crates/derive/src/attributes/stateful.rs
index c9390da662..bba03f247b 100644
--- a/crates/derive/src/attributes/stateful.rs
+++ b/crates/derive/src/attributes/stateful.rs
@@ -1,4 +1,3 @@
-#![allow(clippy::unnecessary_map_or)]
//! The [`AttributesBuilder`] and it's default implementation.
use crate::{
@@ -13,9 +12,9 @@ use alloy_primitives::{address, Address, Bytes, B256};
use alloy_rlp::Encodable;
use alloy_rpc_types_engine::PayloadAttributes;
use async_trait::async_trait;
-use op_alloy_consensus::{Hardfork, Hardforks};
use op_alloy_genesis::RollupConfig;
-use op_alloy_protocol::{decode_deposit, L1BlockInfoTx, L2BlockInfo, DEPOSIT_EVENT_ABI_HASH};
+use op_alloy_protocol::L2BlockInfo;
+use op_alloy_protocol::{decode_deposit, L1BlockInfoTx, DEPOSIT_EVENT_ABI_HASH};
use op_alloy_rpc_types_engine::OpPayloadAttributes;
/// The sequencer fee vault address.
@@ -90,11 +89,7 @@ where
.await
.map_err(|e| PipelineError::BadEncoding(e).crit())?;
sys_config
- .update_with_receipts(
- &receipts,
- self.rollup_cfg.l1_system_config_address,
- self.rollup_cfg.is_ecotone_active(header.timestamp),
- )
+ .update_with_receipts(&receipts, self.rollup_cfg.l1_system_config_address)
.map_err(|e| PipelineError::SystemConfigUpdate(e).crit())?;
l1_header = header;
deposit_transactions = deposits;
@@ -129,18 +124,6 @@ where
));
}
- let mut upgrade_transactions: Vec
where
P: NextBatchProvider + OriginAdvancer + OriginProvider + SignalReceiver + Debug,
- F: L2ChainProvider + Clone + Debug,
{
/// The rollup configuration.
cfg: Arc