Skip to content

Commit

Permalink
update kona
Browse files Browse the repository at this point in the history
  • Loading branch information
hashcashier committed Dec 20, 2024
1 parent 659da67 commit 842856f
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 48 deletions.
22 changes: 10 additions & 12 deletions Cargo.lock

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

20 changes: 10 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@ kailua-common = { path = "crates/common" }
kailua-contracts = { path = "crates/contracts" }
kailua-host = { path = "bin/host" }

# Kona git = "https://github.com/ethereum-optimism/kona", rev = "2e943f4"
kona-client = { git = "https://github.com/hashcashier/kona", branch = "kailua", default-features = false }
kona-derive = { git = "https://github.com/hashcashier/kona", branch = "kailua", default-features = false, features = ["serde"] }
kona-driver = { git = "https://github.com/hashcashier/kona", branch = "kailua" }
kona-executor = { git = "https://github.com/hashcashier/kona", branch = "kailua" }
kona-host = { git = "https://github.com/hashcashier/kona", branch = "kailua" }
kona-mpt = { git = "https://github.com/hashcashier/kona", branch = "kailua", features = ["serde"] }
kona-preimage = { git = "https://github.com/hashcashier/kona", branch = "kailua", features = ["rkyv"] }
kona-proof = { git = "https://github.com/hashcashier/kona", branch = "kailua" }
kona-std-fpvm = { git = "https://github.com/hashcashier/kona", branch = "kailua" }
# Kona
kona-client = { git = "https://github.com/ethereum-optimism/kona", rev = "7a40d87", default-features = false }
kona-derive = { git = "https://github.com/ethereum-optimism/kona", rev = "7a40d87", default-features = false, features = ["serde"] }
kona-driver = { git = "https://github.com/ethereum-optimism/kona", rev = "7a40d87" }
kona-executor = { git = "https://github.com/ethereum-optimism/kona", rev = "7a40d87" }
kona-host = { git = "https://github.com/ethereum-optimism/kona", rev = "7a40d87" }
kona-mpt = { git = "https://github.com/ethereum-optimism/kona", rev = "7a40d87", features = ["serde"] }
kona-preimage = { git = "https://github.com/ethereum-optimism/kona", rev = "7a40d87", features = ["rkyv"] }
kona-proof = { git = "https://github.com/ethereum-optimism/kona", rev = "7a40d87" }
kona-std-fpvm = { git = "https://github.com/ethereum-optimism/kona", rev = "7a40d87" }

# RISC Zero zkVM
bonsai-sdk = { version = "1.2.0", features = ["non_blocking"] }
Expand Down
32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,29 +27,29 @@ Kailua enables rollup operators to add a new fault proof contract, compatible wi
## Devnet Usage

1. `just devnet-install`
* Fetches `v1.9.1` of the `optimism` monorepo.
* Fetches `v1.9.1` of the `optimism` monorepo.
2. `just devnet-build`
* Builds the local cargo and foundry projects.
* Builds the local cargo and foundry projects.
3. `just devnet-up`
* Starts a local OP Stack devnet using docker.
* Dumps the output into `devnetlog.txt` for inspection.
* Starts a local OP Stack devnet using docker.
* Dumps the output into `devnetlog.txt` for inspection.
4. `just devnet-upgrade`
* Upgrades the devnet to use the `KailuaGame` contract.
* Assumes the default values of the local optimism devnet, but can take parameters.
* Upgrades the devnet to use the `KailuaGame` contract.
* Assumes the default values of the local optimism devnet, but can take parameters.
5. `just devnet-propose`
* Launches the Kailua proposer.
* This runs the sequences, which periodically creates new `KailuaGame` instances.
* Launches the Kailua proposer.
* This runs the sequences, which periodically creates new `KailuaGame` instances.
6. `just devnet-validate`
* Launches the Kailua validator.
* This monitors `KailuaGame` instances for disputes and creates proofs to resolve them.
* Note: Use `RISC0_DEV_MODE=1` to use fake proofs.
* Launches the Kailua validator.
* This monitors `KailuaGame` instances for disputes and creates proofs to resolve them.
* Note: Use `RISC0_DEV_MODE=1` to use fake proofs.
7. `just devnet-fault`
* Deploys a single `KailuaGame` instance with a faulty sequencing proposal.
* Tests the validator's fault proving functionality.
* Tests the proposer's canonical chain tracking functionality.
* Deploys a single `KailuaGame` instance with a faulty sequencing proposal.
* Tests the validator's fault proving functionality.
* Tests the proposer's canonical chain tracking functionality.
8. After you're done:
* `just devnet-down` to stop the running docker containers.
* `just devnet-clean` to cleanup the docker volumes.
* `just devnet-down` to stop the running docker containers.
* `just devnet-clean` to cleanup the docker volumes.

## Questions, Feedback, and Collaborations

Expand Down
2 changes: 0 additions & 2 deletions bin/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@ bincode.workspace = true
bytemuck.workspace = true
c-kzg.workspace = true
clap.workspace = true
pot.workspace = true
rkyv.workspace = true
serde.workspace = true
sha2.workspace = true
tracing.workspace = true
tokio.workspace = true
url.workspace = true

alloy = { workspace = true, features = ["full", "kzg"] }
alloy-primitives = { workspace = true, features = ["map-hashbrown"] }
Expand Down
2 changes: 1 addition & 1 deletion book/src/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ ROLLUP_CONFIG_HASH: 0xF9CDE5599A197A7615D7207E55188D9D1709073A67A8F2D53EB9184400
DISPUTE_GAME_FACTORY: 0x05F9613ADB30026FFD634F38E5C4DFD30A197FA1
OPTIMISM_PORTAL: 0x16FC5058F25648194471939DF75CF27A2FDC48BC
KAILUA_GAME_TYPE: 1337
FPVM_IMAGE_ID: 0xE3982C3BAEE7D567E5D76D90DA4766479B2963F15C3EA2FD6E34A6A08CDF833A
FPVM_IMAGE_ID: 0xA1FC2FD8A2EEE54047591648D90D7692D2E2EA9E5F1160CF7575AF2B03E16BBE
RISC_ZERO_VERIFIER: 0x925D8331DDC0A1F0D96E68CF073DFE1D92B69187
SET_BUILDER_ID: 0x744CCA56CDE6933DEA72752C78B4A6CA894ED620E8AF6437AB05FAD53BCEC40A
CONTROL_ROOT: 0x8CDAD9242664BE3112ABA377C5425A4DF735EB1C6966472B561D2855932C0469
Expand Down
12 changes: 6 additions & 6 deletions build/risczero/fpvm/Cargo.lock

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

2 changes: 1 addition & 1 deletion build/risczero/fpvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ rkyv = "0.8.9"

kailua-common = { path = "../../../crates/common" }

kona-proof = { git = "https://github.com/hashcashier/kona", branch = "kailua" }
kona-proof = { git = "https://github.com/ethereum-optimism/kona", rev = "7a40d87" }

risc0-zkvm = { version = "1.2.0", features = ["std", "heap-embedded-alloc", "unstable"] }

Expand Down

0 comments on commit 842856f

Please sign in to comment.