From dada7459243878c5d608a8526d4092de21ccb841 Mon Sep 17 00:00:00 2001 From: Nikolai Golub Date: Wed, 1 Nov 2023 13:44:59 +0100 Subject: [PATCH] Use git hash --- Cargo.toml | 30 +++++++++++----------- crates/provers/risc0/guest-mock/Cargo.toml | 10 ++++---- crates/stf/Cargo.toml | 14 +++++----- sov-rollup-starter.sh | 4 +-- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b1ae5bd..91d3f4a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,21 +16,21 @@ publish = false rust-version = "1.73" [workspace.dependencies] -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-accounts = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-ledger-rpc = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-sequencer-registry = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-modules-stf-template = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-modules-rollup-template = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-db = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-sequencer = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-first-read-last-write-cache = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-cli = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-accounts = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-ledger-rpc = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-sequencer-registry = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-modules-stf-template = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-modules-rollup-template = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-db = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-sequencer = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-first-read-last-write-cache = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-cli = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } stf-starter = { path = "./crates/stf" } serde = { version = "1.0.188", features = ["derive", "rc"] } diff --git a/crates/provers/risc0/guest-mock/Cargo.toml b/crates/provers/risc0/guest-mock/Cargo.toml index 5a50c0f..86eecd7 100644 --- a/crates/provers/risc0/guest-mock/Cargo.toml +++ b/crates/provers/risc0/guest-mock/Cargo.toml @@ -14,11 +14,11 @@ 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", branch = "nightly", features = ["mocks"] } -sov-modules-stf-template = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branch = "nightly" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d", features = ["mocks"] } +sov-modules-stf-template = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "dc3d236c499598b15fbf64c8e78b7f6018b5f13d" } stf-starter = { path = "../../../stf" } diff --git a/crates/stf/Cargo.toml b/crates/stf/Cargo.toml index 5ced42e..2d0f46c 100644 --- a/crates/stf/Cargo.toml +++ b/crates/stf/Cargo.toml @@ -25,7 +25,7 @@ serde = { workspace = true, features = ["derive", "rc"] } serde_json = { workspace = true, optional = true } jsonrpsee = { workspace = true, features = ["jsonrpsee-types"], optional = true } borsh = { workspace = true, features = ["rc", "bytes"] } -clap = {workspace = true , features = ["derive"], optional = true } +clap = { workspace = true, features = ["derive"], optional = true } @@ -33,12 +33,12 @@ clap = {workspace = true , features = ["derive"], optional = true } [features] default = [] native = [ - "sov-modules-api/native", - "sov-accounts/native", - "sov-bank/native", - "sov-sequencer-registry/native", - "sov-modules-stf-template/native", - "sov-stf-runner/native", + "sov-modules-api/native", + "sov-accounts/native", + "sov-bank/native", + "sov-sequencer-registry/native", + "sov-modules-stf-template/native", + "sov-stf-runner/native", "serde_json", "jsonrpsee", "sov-sequencer", diff --git a/sov-rollup-starter.sh b/sov-rollup-starter.sh index d635ed1..a1b8e2c 100755 --- a/sov-rollup-starter.sh +++ b/sov-rollup-starter.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash trap 'jobs -p | xargs -r kill' EXIT -echo 'Running: '\''cd crates/rollup/'\''' -cd crates/rollup/ +echo 'Running: `cd crates/rollup/`' +cd crates/rollup/ || exit if [ $? -ne 0 ]; then echo "Expected exit code 0, got $?" exit 1