Skip to content

Commit

Permalink
Merge pull request #5 from movemntdev/0xmovses/protocol-units-create
Browse files Browse the repository at this point in the history
0xmovses/protocol units create
  • Loading branch information
0xmovses authored Feb 27, 2024
2 parents bd6ebe4 + d84b30a commit 2810ec4
Show file tree
Hide file tree
Showing 21 changed files with 106 additions and 47 deletions.
15 changes: 14 additions & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,23 @@ env:

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
with:
# Fetches the main repo but skips automatic handling of submodules
submodules: false
fetch-depth: 0

# Manually handle submodules
- name: Handle Git Submodules
run: |
# Initialize submodules
git submodule update --init --recursive
# Sync submodules in case .gitmodules has been updated
git submodule sync --recursive
# Attempt to fix any specific submodule fetching issues here, if applicable
- name: Build
run: cargo build --verbose
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
Cargo.lock
methods/guest/Cargo.lock
target/
/protocol-units/zkfp/vendors/*
21 changes: 11 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ license = "Apache-2.0"
[workspace]
resolver = "2"
members = [
"zkfp/host",
"zkfp/methods",
"zkfp/methods/guest"
"protocol-units/data-availability",
"protocol-units/zkfp/host",
"protocol-units/zkfp/methods",
"protocol-units/zkfp/methods/guest"
]

exclude = [
Expand All @@ -25,13 +26,13 @@ serde = "1.0"
tempfile = "3.2.0"

# Move dependencies
move-vm-runtime = { path = "zkfp/vendors/move/language/move-vm/runtime" }
move-vm-test-utils = { path = "zkfp/vendors/move/language/move-vm/test-utils" }
move-binary-format = { path = "zkfp/vendors/move/language/move-binary-format" }
move-vm-types = { path = "zkfp/vendors/move/language/move-vm/types"}
move-core-types = { path= "zkfp/vendors/move/language/move-core/types" }
move-compiler = { path= "zkfp/vendors/move/language/move-compiler" }
move-stdlib = { path= "zkfp/vendors/move/language/move-stdlib" }
move-vm-runtime = { path = "protocol-units/zkfp/vendors/move/language/move-vm/runtime" }
move-vm-test-utils = { path = "protocol-units/zkfp/vendors/move/language/move-vm/test-utils" }
move-binary-format = { path = "protocol-units/zkfp/vendors/move/language/move-binary-format" }
move-vm-types = { path = "protocol-units/zkfp/vendors/move/language/move-vm/types"}
move-core-types = { path = "protocol-units/zkfp/vendors/move/language/move-core/types" }
move-compiler = { path = "protocol-units/zkfp/vendors/move/language/move-compiler" }
move-stdlib = { path = "protocol-units/zkfp/vendors/move/language/move-stdlib" }


# Always optimize; building and running the guest takes much longer without optimization.
Expand Down
39 changes: 39 additions & 0 deletions protocol-units/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
[package]
name = "protocol-units"
version = "0.1.0"
edition = "2021"
description = "Protocol Units for the Movement SDK"

[[bin]]
name = "data-availability"
path = "data-availability/src/main.rs"

[[bin]]
name = "host"
path = "zkfp/host/src/main.rs"

[[bin]]
name = "methods"
path = "zkfp/methods/src/main.rs"

[[bin]]
name = "guest"
path = "zkfp/guest/src/main.rs"

[dependencies]
anyhow = "1.0"
risc0-zkvm = { version = "0.20.1", features = ["std"] }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
tempfile = "3.2.0"
serde = "1.0"

methods = { path = "../methods" }

# Move dependencies.
move-vm-runtime = { workspace = true }
move-vm-test-utils = { workspace = true }
move-binary-format = { workspace = true }
move-vm-types = { workspace = true }
move-core-types = { workspace = true }
move-compiler = { workspace = true }
move-stdlib = { workspace = true }
5 changes: 5 additions & 0 deletions protocol-units/data-availability/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[package]
name = "data-availability"
version = "0.1.0"
edition = "2021"
description = "Data Availability adapters for the Movement SDK"
1 change: 1 addition & 0 deletions protocol-units/data-availability/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fn main() {}
35 changes: 35 additions & 0 deletions protocol-units/zkfp/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[package]
name = "zkfp"
version = "0.1.0"
edition = "2021"
description = "Testing environment for Zero Konwledge Fraud Proofs on Movement"

[[bin]]
name = "host"
path = "host/src/main.rs"

[[bin]]
name = "methods"
path = "methods/src/main.rs"

[[bin]]
name = "guest"
path = "methods/guest/src/main.rs"

[dependencies]
anyhow = "1.0"
risc0-zkvm = { version = "0.20.1", features = ["std"] }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
tempfile = "3.2.0"
serde = "1.0"

methods = { path = "zkfp/methods" }

# Move dependencies.
move-vm-runtime = { workspace = true }
move-vm-test-utils = { workspace = true }
move-binary-format = { workspace = true }
move-vm-types = { workspace = true }
move-core-types = { workspace = true }
move-compiler = { workspace = true }
move-stdlib = { workspace = true }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
35 changes: 0 additions & 35 deletions zkfp/Cargo.toml

This file was deleted.

1 change: 0 additions & 1 deletion zkfp/vendors/move
Submodule move deleted from 6221fe

0 comments on commit 2810ec4

Please sign in to comment.