diff --git a/Cargo.lock b/Cargo.lock index 45df77b..90f1490 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" dependencies = [ "anyhow", "borsh", @@ -3208,9 +3208,9 @@ dependencies = [ ] [[package]] -name = "sov-modules-rollup-template" +name = "sov-modules-rollup-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" dependencies = [ "anyhow", "async-trait", @@ -3233,7 +3233,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-template" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" dependencies = [ "anyhow", "async-trait", @@ -3302,7 +3302,7 @@ dependencies = [ "sov-ledger-rpc", "sov-mock-da", "sov-modules-api", - "sov-modules-rollup-template", + "sov-modules-rollup-blueprint", "sov-modules-stf-template", "sov-risc0-adapter", "sov-rollup-interface", @@ -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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" dependencies = [ "bytes", "risc0-zkvm", diff --git a/Cargo.toml b/Cargo.toml index d36f764..108cfa2 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 = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-accounts = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-ledger-rpc = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-sequencer-registry = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-modules-stf-template = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-modules-rollup-template = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-db = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-sequencer = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-first-read-last-write-cache = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-cli = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-accounts = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-ledger-rpc = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-sequencer-registry = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-modules-stf-template = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-modules-rollup-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-db = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-sequencer = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-first-read-last-write-cache = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-cli = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } 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 20d8daf..7a0fc13 100644 --- a/crates/provers/risc0/guest-mock/Cargo.lock +++ b/crates/provers/risc0/guest-mock/Cargo.lock @@ -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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" dependencies = [ "anyhow", "borsh", @@ -1038,7 +1038,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-template" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" 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=7cf2e64c1208163b033664c1e14ae6607f2ba10c#7cf2e64c1208163b033664c1e14ae6607f2ba10c" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=a8c36914770b66c6a499a478718a0c5c4dabddc6#a8c36914770b66c6a499a478718a0c5c4dabddc6" dependencies = [ "bytes", "risc0-zkvm", diff --git a/crates/provers/risc0/guest-mock/Cargo.toml b/crates/provers/risc0/guest-mock/Cargo.toml index 7357ea9..6b569b9 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 = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-modules-stf-template = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "7cf2e64c1208163b033664c1e14ae6607f2ba10c" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-modules-stf-template = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "a8c36914770b66c6a499a478718a0c5c4dabddc6" } stf-starter = { path = "../../../stf" } diff --git a/crates/rollup/Cargo.toml b/crates/rollup/Cargo.toml index e17eac9..d36b051 100644 --- a/crates/rollup/Cargo.toml +++ b/crates/rollup/Cargo.toml @@ -17,7 +17,7 @@ sov-accounts = { workspace = true, features = ["native"] } sov-bank = { workspace = true, features = ["native"] } sov-ledger-rpc = { workspace = true, features = ["server"] } sov-sequencer-registry = { workspace = true, features = ["native"] } -sov-modules-rollup-template = { workspace = true } +sov-modules-rollup-blueprint = { workspace = true } sov-modules-stf-template = { workspace = true, features = ["native"] } sov-stf-runner = { workspace = true, features = ["native"] } sov-cli = { workspace = true, optional = true } diff --git a/crates/rollup/src/bin/node.rs b/crates/rollup/src/bin/node.rs index bb9d45e..2c137e8 100644 --- a/crates/rollup/src/bin/node.rs +++ b/crates/rollup/src/bin/node.rs @@ -2,15 +2,15 @@ use anyhow::Context; use clap::Parser; -use sov_modules_rollup_template::{Rollup, RollupProverConfig, RollupTemplate}; use sov_mock_da::MockDaConfig; +use sov_modules_rollup_blueprint::{Rollup, RollupBlueprint, RollupProverConfig}; use sov_rollup_starter::StarterRollup; use sov_stf_runner::{from_toml_path, RollupConfig}; +use std::str::FromStr; use stf_starter::genesis_config::GenesisPaths; use tracing::info; use tracing_subscriber::prelude::*; use tracing_subscriber::{fmt, EnvFilter}; -use std::str::FromStr; #[derive(Parser, Debug)] #[command(author, version, about, long_about = None)] diff --git a/crates/rollup/src/bin/starter_cli_wallet.rs b/crates/rollup/src/bin/starter_cli_wallet.rs index 0e2b72d..c3a45ab 100644 --- a/crates/rollup/src/bin/starter_cli_wallet.rs +++ b/crates/rollup/src/bin/starter_cli_wallet.rs @@ -2,7 +2,7 @@ //! with the rollup. use sov_modules_api::cli::{FileNameArg, JsonStringArg}; -use sov_modules_rollup_template::WalletTemplate; +use sov_modules_rollup_blueprint::WalletBlueprint; use sov_rollup_starter::StarterRollup; use stf_starter::runtime::RuntimeSubcommand; diff --git a/crates/rollup/src/lib.rs b/crates/rollup/src/lib.rs index 7374d7e..d9ace4b 100644 --- a/crates/rollup/src/lib.rs +++ b/crates/rollup/src/lib.rs @@ -3,11 +3,11 @@ use async_trait::async_trait; 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_risc0_adapter::host::Risc0Host; -use sov_mock_da::{MockDaConfig, MockDaService, MockDaSpec}; use sov_rollup_interface::services::da::DaService; use sov_state::config::Config as StorageConfig; use sov_state::{DefaultStorageSpec, ZkStorage}; @@ -20,7 +20,7 @@ pub struct StarterRollup {} /// This is the place, where all the rollup components come together and /// they can be easily swapped with alternative implementations as needed. #[async_trait] -impl sov_modules_rollup_template::RollupTemplate for StarterRollup { +impl sov_modules_rollup_blueprint::RollupBlueprint for StarterRollup { /// This component defines the Data Availability layer. type DaService = MockDaService; /// DaSpec & DaConfig are derived from DaService. @@ -53,7 +53,7 @@ impl sov_modules_rollup_template::RollupTemplate for StarterRollup { ledger_db: &LedgerDB, da_service: &Self::DaService, ) -> anyhow::Result> { - sov_modules_rollup_template::register_rpc::< + sov_modules_rollup_blueprint::register_rpc::< Self::NativeRuntime, Self::NativeContext, Self::DaService, @@ -96,4 +96,4 @@ impl sov_modules_rollup_template::RollupTemplate for StarterRollup { } // Here we get a `free` Wallet implementation. -impl sov_modules_rollup_template::WalletTemplate for StarterRollup {} +impl sov_modules_rollup_blueprint::WalletBlueprint for StarterRollup {} diff --git a/crates/rollup/tests/bank/mod.rs b/crates/rollup/tests/bank/mod.rs index 8b564d9..11fc2ca 100644 --- a/crates/rollup/tests/bank/mod.rs +++ b/crates/rollup/tests/bank/mod.rs @@ -3,12 +3,12 @@ use std::net::SocketAddr; use borsh::BorshSerialize; use jsonrpsee::core::client::{Subscription, SubscriptionClientT}; use jsonrpsee::rpc_params; +use sov_mock_da::MockDaSpec; use sov_modules_api::default_context::DefaultContext; use sov_modules_api::default_signature::private_key::DefaultPrivateKey; use sov_modules_api::transaction::Transaction; use sov_modules_api::{PrivateKey, Spec}; -use sov_modules_rollup_template::RollupProverConfig; -use sov_mock_da::MockDaSpec; +use sov_modules_rollup_blueprint::RollupProverConfig; use sov_sequencer::utils::SimpleClient; use stf_starter::genesis_config::GenesisPaths; use stf_starter::RuntimeCall; diff --git a/crates/rollup/tests/test_helpers.rs b/crates/rollup/tests/test_helpers.rs index 8059f28..8935c32 100644 --- a/crates/rollup/tests/test_helpers.rs +++ b/crates/rollup/tests/test_helpers.rs @@ -1,7 +1,7 @@ use std::net::SocketAddr; -use sov_modules_rollup_template::{RollupProverConfig, RollupTemplate}; use sov_mock_da::{MockAddress, MockDaConfig}; +use sov_modules_rollup_blueprint::{RollupBlueprint, RollupProverConfig}; use sov_rollup_starter::StarterRollup; use sov_stf_runner::{RollupConfig, RpcConfig, RunnerConfig, StorageConfig}; use stf_starter::genesis_config::GenesisPaths;