diff --git a/Cargo.lock b/Cargo.lock index 6b647a3..776dd04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3052,7 +3052,7 @@ dependencies = [ [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "borsh", @@ -3069,7 +3069,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "borsh", @@ -3086,7 +3086,7 @@ dependencies = [ [[package]] name = "sov-cli" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "borsh", @@ -3103,7 +3103,7 @@ dependencies = [ [[package]] name = "sov-db" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "bincode", @@ -3120,7 +3120,7 @@ dependencies = [ [[package]] name = "sov-ledger-rpc" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "futures", @@ -3133,7 +3133,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "async-trait", @@ -3149,7 +3149,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "bech32", @@ -3175,7 +3175,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "bech32", @@ -3194,7 +3194,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "borsh", @@ -3210,7 +3210,7 @@ dependencies = [ [[package]] name = "sov-modules-rollup-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "async-trait", @@ -3222,7 +3222,7 @@ dependencies = [ "sov-db", "sov-ledger-rpc", "sov-modules-api", - "sov-modules-stf-template", + "sov-modules-stf-blueprint", "sov-rollup-interface", "sov-sequencer", "sov-state", @@ -3231,9 +3231,9 @@ dependencies = [ ] [[package]] -name = "sov-modules-stf-template" +name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "borsh", @@ -3251,7 +3251,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "bincode", @@ -3268,7 +3268,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "async-trait", @@ -3303,7 +3303,7 @@ dependencies = [ "sov-mock-da", "sov-modules-api", "sov-modules-rollup-blueprint", - "sov-modules-stf-template", + "sov-modules-stf-blueprint", "sov-risc0-adapter", "sov-rollup-interface", "sov-sequencer", @@ -3320,7 +3320,7 @@ dependencies = [ [[package]] name = "sov-schema-db" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "once_cell", @@ -3333,7 +3333,7 @@ dependencies = [ [[package]] name = "sov-sequencer" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "borsh", @@ -3349,7 +3349,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "borsh", @@ -3366,7 +3366,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "bcs", @@ -3385,7 +3385,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "borsh", @@ -3404,7 +3404,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "bytes", "risc0-zkvm", @@ -3452,7 +3452,7 @@ dependencies = [ "sov-accounts", "sov-bank", "sov-modules-api", - "sov-modules-stf-template", + "sov-modules-stf-blueprint", "sov-rollup-interface", "sov-sequencer", "sov-sequencer-registry", diff --git a/Cargo.toml b/Cargo.toml index 13ce19e..63cb7b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,22 +16,22 @@ publish = false rust-version = "1.73" [workspace.dependencies] -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-accounts = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-ledger-rpc = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-sequencer-registry = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-modules-stf-template = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-modules-rollup-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-db = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-sequencer = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-first-read-last-write-cache = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-cli = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-accounts = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-ledger-rpc = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-sequencer-registry = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-modules-rollup-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-db = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-sequencer = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-first-read-last-write-cache = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-cli = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } stf-starter = { path = "./crates/stf" } serde = { version = "1.0.188", features = ["derive", "rc"] } diff --git a/crates/provers/risc0/guest-mock/Cargo.lock b/crates/provers/risc0/guest-mock/Cargo.lock index 2758ee7..f91a50c 100644 --- a/crates/provers/risc0/guest-mock/Cargo.lock +++ b/crates/provers/risc0/guest-mock/Cargo.lock @@ -376,7 +376,7 @@ dependencies = [ "serde", "sov-mock-da", "sov-modules-api", - "sov-modules-stf-template", + "sov-modules-stf-blueprint", "sov-risc0-adapter", "sov-rollup-interface", "sov-state", @@ -942,7 +942,7 @@ checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "borsh", @@ -955,7 +955,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "borsh", @@ -968,7 +968,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "async-trait", @@ -983,7 +983,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "bech32", @@ -1004,7 +1004,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "bech32", @@ -1023,7 +1023,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "borsh", @@ -1036,9 +1036,9 @@ dependencies = [ ] [[package]] -name = "sov-modules-stf-template" +name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "borsh", @@ -1055,7 +1055,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "bincode", @@ -1070,7 +1070,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "async-trait", @@ -1087,7 +1087,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "borsh", @@ -1100,7 +1100,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "bcs", @@ -1118,7 +1118,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "anyhow", "borsh", @@ -1131,7 +1131,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=af459a163208157b36f19708ef6728917c7ce77a#af459a163208157b36f19708ef6728917c7ce77a" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" dependencies = [ "bytes", "risc0-zkvm", @@ -1148,7 +1148,7 @@ dependencies = [ "sov-accounts", "sov-bank", "sov-modules-api", - "sov-modules-stf-template", + "sov-modules-stf-blueprint", "sov-rollup-interface", "sov-sequencer-registry", "sov-state", diff --git a/crates/provers/risc0/guest-mock/Cargo.toml b/crates/provers/risc0/guest-mock/Cargo.toml index 98232ba..ab203f7 100644 --- a/crates/provers/risc0/guest-mock/Cargo.toml +++ b/crates/provers/risc0/guest-mock/Cargo.toml @@ -14,12 +14,12 @@ risc0-zkvm-platform = "0.18" serde = { version = "1.0.188", features = ["derive", "rc"] } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-modules-stf-template = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "af459a163208157b36f19708ef6728917c7ce77a" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } stf-starter = { path = "../../../stf" } diff --git a/crates/provers/risc0/guest-mock/src/bin/mock_da.rs b/crates/provers/risc0/guest-mock/src/bin/mock_da.rs index 8b06490..0b241f8 100644 --- a/crates/provers/risc0/guest-mock/src/bin/mock_da.rs +++ b/crates/provers/risc0/guest-mock/src/bin/mock_da.rs @@ -3,23 +3,23 @@ //! of the zkvm in order to generate proofs for the rollup. use sov_modules_api::default_context::ZkDefaultContext; -use sov_modules_stf_template::kernels::basic::BasicKernel; -use sov_modules_stf_template::AppTemplate; +use sov_modules_stf_blueprint::kernels::basic::BasicKernel; +use sov_modules_stf_blueprint::StfBlueprint; use sov_risc0_adapter::guest::Risc0Guest; use sov_mock_da::MockDaVerifier; use sov_state::ZkStorage; use stf_starter::runtime::Runtime; -use stf_starter::AppVerifier; +use stf_starter::StfVerifier; risc0_zkvm::guest::entry!(main); pub fn main() { let guest = Risc0Guest::new(); let storage = ZkStorage::new(); - let app: AppTemplate, BasicKernel<_>> = - AppTemplate::new(); + let app: StfBlueprint, BasicKernel<_>> = + StfBlueprint::new(); - let mut stf_verifier = AppVerifier::new(app, MockDaVerifier {}); + let mut stf_verifier = StfVerifier::new(app, MockDaVerifier {}); stf_verifier .run_block(guest, storage) diff --git a/crates/rollup/Cargo.toml b/crates/rollup/Cargo.toml index d36b051..279355b 100644 --- a/crates/rollup/Cargo.toml +++ b/crates/rollup/Cargo.toml @@ -18,7 +18,7 @@ sov-bank = { workspace = true, features = ["native"] } sov-ledger-rpc = { workspace = true, features = ["server"] } sov-sequencer-registry = { workspace = true, features = ["native"] } sov-modules-rollup-blueprint = { workspace = true } -sov-modules-stf-template = { workspace = true, features = ["native"] } +sov-modules-stf-blueprint = { workspace = true, features = ["native"] } sov-stf-runner = { workspace = true, features = ["native"] } sov-cli = { workspace = true, optional = true } diff --git a/crates/rollup/src/lib.rs b/crates/rollup/src/lib.rs index d9ace4b..c56c0d8 100644 --- a/crates/rollup/src/lib.rs +++ b/crates/rollup/src/lib.rs @@ -6,7 +6,7 @@ use sov_db::ledger_db::LedgerDB; use sov_mock_da::{MockDaConfig, MockDaService, MockDaSpec}; use sov_modules_api::default_context::{DefaultContext, ZkDefaultContext}; use sov_modules_api::Spec; -use sov_modules_stf_template::kernels::basic::BasicKernel; +use sov_modules_stf_blueprint::kernels::basic::BasicKernel; use sov_risc0_adapter::host::Risc0Host; use sov_rollup_interface::services::da::DaService; use sov_state::config::Config as StorageConfig; diff --git a/crates/stf/Cargo.toml b/crates/stf/Cargo.toml index 2d0f46c..0373326 100644 --- a/crates/stf/Cargo.toml +++ b/crates/stf/Cargo.toml @@ -14,7 +14,7 @@ sov-state = { workspace = true } sov-accounts = { workspace = true } sov-bank = { workspace = true } sov-sequencer-registry = { workspace = true } -sov-modules-stf-template = { workspace = true } +sov-modules-stf-blueprint = { workspace = true } sov-stf-runner = { workspace = true } sov-sequencer = { workspace = true, optional = true } sov-rollup-interface = { workspace = true } @@ -37,7 +37,7 @@ native = [ "sov-accounts/native", "sov-bank/native", "sov-sequencer-registry/native", - "sov-modules-stf-template/native", + "sov-modules-stf-blueprint/native", "sov-stf-runner/native", "serde_json", "jsonrpsee", diff --git a/crates/stf/src/genesis_config.rs b/crates/stf/src/genesis_config.rs index afe51dd..5b0eb5c 100644 --- a/crates/stf/src/genesis_config.rs +++ b/crates/stf/src/genesis_config.rs @@ -4,7 +4,7 @@ use anyhow::{bail, Context as _}; use sov_accounts::AccountConfig; use sov_bank::BankConfig; use sov_modules_api::{Context, DaSpec}; -use sov_modules_stf_template::Runtime as RuntimeTrait; +use sov_modules_stf_blueprint::Runtime as RuntimeTrait; use sov_sequencer_registry::SequencerConfig; use sov_stf_runner::read_json_file; diff --git a/crates/stf/src/hooks.rs b/crates/stf/src/hooks.rs index e77d0cd..bed28fd 100644 --- a/crates/stf/src/hooks.rs +++ b/crates/stf/src/hooks.rs @@ -7,7 +7,7 @@ use sov_modules_api::hooks::{ApplyBlobHooks, FinalizeHook, SlotHooks, TxHooks}; use sov_modules_api::transaction::Transaction; use sov_modules_api::{AccessoryWorkingSet, BlobReaderTrait, Context, DaSpec, Spec, WorkingSet}; -use sov_modules_stf_template::SequencerOutcome; +use sov_modules_stf_blueprint::SequencerOutcome; use sov_sequencer_registry::SequencerRegistry; use sov_state::Storage; use tracing::info; diff --git a/crates/stf/src/lib.rs b/crates/stf/src/lib.rs index 8e1d894..bd40f03 100644 --- a/crates/stf/src/lib.rs +++ b/crates/stf/src/lib.rs @@ -5,10 +5,10 @@ pub mod genesis_config; mod hooks; pub mod runtime; pub use runtime::*; -use sov_modules_stf_template::AppTemplate; +use sov_modules_stf_blueprint::StfBlueprint; use sov_rollup_interface::da::DaVerifier; use sov_stf_runner::verifier::StateTransitionVerifier; /// Alias for StateTransitionVerifier. -pub type AppVerifier = - StateTransitionVerifier::Spec, Vm, RT, K>, DA, Vm>; +pub type StfVerifier = + StateTransitionVerifier::Spec, Vm, RT, K>, DA, Vm>; diff --git a/crates/stf/src/runtime.rs b/crates/stf/src/runtime.rs index d4c13ab..cdeffcb 100644 --- a/crates/stf/src/runtime.rs +++ b/crates/stf/src/runtime.rs @@ -70,7 +70,7 @@ pub struct Runtime { pub sequencer_registry: sov_sequencer_registry::SequencerRegistry, } -impl sov_modules_stf_template::Runtime for Runtime +impl sov_modules_stf_blueprint::Runtime for Runtime where C: Context, Da: DaSpec,