Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
58 changes: 45 additions & 13 deletions Cargo.lock

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

19 changes: 10 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,11 @@ kona-genesis = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.0.

# TODO: replace commit hash with tag when available
# celo-kona
celo-driver = { git = "https://github.com/celo-org/celo-kona", rev = "0200f39991ecbf83157e1186b7c214c9b77af4c0" }
celo-proof = { git = "https://github.com/celo-org/celo-kona", rev = "0200f39991ecbf83157e1186b7c214c9b77af4c0" }
celo-host = { git = "https://github.com/celo-org/celo-kona", rev = "0200f39991ecbf83157e1186b7c214c9b77af4c0" }
celo-protocol = { git = "https://github.com/celo-org/celo-kona", rev = "0200f39991ecbf83157e1186b7c214c9b77af4c0", default-features = false }
celo-driver = { git = "https://github.com/celo-org/celo-kona", rev = "86da8c48ee196cec4892c6f4ff360813b143e7c9" }
celo-proof = { git = "https://github.com/celo-org/celo-kona", rev = "86da8c48ee196cec4892c6f4ff360813b143e7c9" }
celo-host = { git = "https://github.com/celo-org/celo-kona", rev = "86da8c48ee196cec4892c6f4ff360813b143e7c9" }
celo-protocol = { git = "https://github.com/celo-org/celo-kona", rev = "86da8c48ee196cec4892c6f4ff360813b143e7c9", default-features = false }
celo-genesis = { git = "https://github.com/celo-org/celo-kona", rev = "86da8c48ee196cec4892c6f4ff360813b143e7c9", default-features = false }

# hana
hana-blobstream = { git = "https://github.com/celestiaorg/hana", rev = "904f086fd7335986e87a0f0432b1f07fe997f690" }
Expand Down Expand Up @@ -144,10 +145,10 @@ op-alloy-rpc-types-engine = { version = "=0.15.4", default-features = false }
op-alloy-network = { version = "=0.15.4", default-features = false }

# Celo Alloy
celo-alloy-consensus = { git = "https://github.com/celo-org/celo-kona", rev = "0200f39991ecbf83157e1186b7c214c9b77af4c0", default-features = false }
celo-alloy-rpc-types = { git = "https://github.com/celo-org/celo-kona", rev = "0200f39991ecbf83157e1186b7c214c9b77af4c0", default-features = false }
celo-alloy-rpc-types-engine = { git = "https://github.com/celo-org/celo-kona", rev = "0200f39991ecbf83157e1186b7c214c9b77af4c0", default-features = false }
celo-alloy-network = { git = "https://github.com/celo-org/celo-kona", rev = "0200f39991ecbf83157e1186b7c214c9b77af4c0", default-features = false }
celo-alloy-consensus = { git = "https://github.com/celo-org/celo-kona", rev = "86da8c48ee196cec4892c6f4ff360813b143e7c9", default-features = false }
celo-alloy-rpc-types = { git = "https://github.com/celo-org/celo-kona", rev = "86da8c48ee196cec4892c6f4ff360813b143e7c9", default-features = false }
celo-alloy-rpc-types-engine = { git = "https://github.com/celo-org/celo-kona", rev = "86da8c48ee196cec4892c6f4ff360813b143e7c9", default-features = false }
celo-alloy-network = { git = "https://github.com/celo-org/celo-kona", rev = "86da8c48ee196cec4892c6f4ff360813b143e7c9", default-features = false }

# Execution
alloy-evm = { version = "0.6.0", default-features = false, features = ["op"] }
Expand All @@ -157,7 +158,7 @@ revm = { version = "22.0.0", default-features = false, features = ["kzg-rs", "bn
op-revm = { version = "3.0.1", default-features = false }

# Celo Execution
alloy-celo-evm = { git = "https://github.com/celo-org/celo-kona", rev = "0200f39991ecbf83157e1186b7c214c9b77af4c0", default-features = false }
alloy-celo-evm = { git = "https://github.com/celo-org/celo-kona", rev = "86da8c48ee196cec4892c6f4ff360813b143e7c9", default-features = false }

# SP1
sp1-sdk = { version = "5.0.0" }
Expand Down
Binary file modified elf/aggregation-elf
Binary file not shown.
Binary file modified elf/range-elf-embedded
Binary file not shown.
9 changes: 7 additions & 2 deletions fault-proof/src/proposer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ where
.compressed()
.strategy(FulfillmentStrategy::Hosted)
.skip_simulation(true)
.cycle_limit(1_000_000_000_000)
.cycle_limit(1_000_000_000)
.run_async()
.await?
};
Expand Down Expand Up @@ -220,7 +220,12 @@ where
.await?
};

let receipt = game.prove(agg_proof.bytes().into()).send().await?.get_receipt().await?;
let transaction_request = game.prove(agg_proof.bytes().into()).into_transaction_request();

let receipt = self
.signer
.send_transaction_request(self.config.l1_rpc.clone(), transaction_request)
.await?;

Ok(receipt.transaction_hash)
}
Expand Down
3 changes: 1 addition & 2 deletions op-network.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,4 @@ ethereum_package:
"storage": {},
"nonce": "1"
}
}
'
}'
3 changes: 3 additions & 0 deletions programs/range/utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ rkyv.workspace = true
# kona
kona-proof.workspace = true

# celo-kona
celo-genesis.workspace = true

# sp1
sp1-zkvm.workspace = true

Expand Down
11 changes: 10 additions & 1 deletion programs/range/utils/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::sync::Arc;

use celo_genesis::{CeloHardForkConfig, CeloRollupConfig};
use kona_proof::{l1::OracleL1ChainProvider, l2::OracleL2ChainProvider};
use op_succinct_client_utils::{
boot::BootInfoStruct,
Expand Down Expand Up @@ -42,9 +43,17 @@ where
Some((cursor, l1_provider, l2_provider)) => {
let rollup_config = Arc::new(boot_info.rollup_config.clone());

// Wrap RollupConfig with CeloRollupConfig
let celo_rollup_config = CeloRollupConfig {
op_rollup_config: boot_info.rollup_config.clone(),
hardforks: CeloHardForkConfig {
op_hardfork_config: rollup_config.hardforks,
cel2_time: Some(0),
},
};
let pipeline = executor
.create_pipeline(
rollup_config,
Arc::new(celo_rollup_config),
cursor.clone(),
oracle,
beacon,
Expand Down
2 changes: 2 additions & 0 deletions scripts/prove/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ alloy-primitives.workspace = true
# sp1
sp1-sdk.workspace = true

rustls = { version = "0.23.23", features = ["ring"] }

[dev-dependencies]
reqwest = { version = "0.12.4", features = ["json"] }
serde_json.workspace = true
Expand Down
2 changes: 2 additions & 0 deletions scripts/prove/bin/multi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ use tracing::debug;
/// Execute the OP Succinct program for multiple blocks.
#[tokio::main]
async fn main() -> Result<()> {
rustls::crypto::ring::default_provider().install_default().unwrap();

let args = HostExecutorArgs::parse();

dotenv::from_path(&args.env_file)
Expand Down
2 changes: 1 addition & 1 deletion scripts/utils/bin/fetch_rollup_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ async fn update_l2oo_config() -> Result<()> {

let rollup_config = data_fetcher.rollup_config.as_ref().unwrap();
let rollup_config_hash = format!("0x{:x}", hash_rollup_config(rollup_config));
let l2_block_time = rollup_config.block_time;
let l2_block_time = rollup_config.op_rollup_config.block_time;

let submission_interval =
env::var("SUBMISSION_INTERVAL").map(|p| p.parse().unwrap()).unwrap_or(10);
Expand Down
3 changes: 3 additions & 0 deletions utils/celestia/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ kona-genesis.workspace = true
kona-preimage.workspace = true
kona-proof.workspace = true

# celo-kona
celo-genesis.workspace = true

# hana
hana-celestia.workspace = true
hana-oracle.workspace = true
Expand Down
Loading
Loading