Merge pull request #104 from openmina/remove-deps

Author: sebastiencs

.gitmodules

@@ -3,6 +3,7 @@ cargo-features = ["named-profiles"]
 [workspace]
 members = [
     "core",
+    "ledger",
     "snark",
     "p2p",
     "p2p/libp2p-rpc-behaviour",
@@ -16,13 +17,18 @@ members = [
     "ledger",
 ]
 
-exclude = [ "deps/redux-rs" ]
-
 resolver = "2"
 
 [workspace.dependencies]
 mina-p2p-messages = { path = "mina-p2p-messages", features = ["hashing"] }
 ledger = { path = "ledger", package = "mina-tree" }
+mina-hasher = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
+mina-signer = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
+mina-curves = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
+o1-utils = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
+kimchi = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
+mina-poseidon = {git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4"}
+poly-commitment = {git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4"}
 
 [profile.fuzz]
 inherits = "release"
@@ -35,38 +41,8 @@ panic = "abort"
 incremental = false
 codegen-units = 1
 
-[patch.'https://github.com/openmina/algebra']
-ark-ff = { path = "deps/algebra/ff" }
-ark-ec = { path = "deps/algebra/ec" }
-ark-poly = { path = "deps/algebra/poly" }
-ark-serialize = { path = "deps/algebra/serialize" }
-
 [patch.crates-io]
-ark-ff = { path = "deps/algebra/ff" }
-ark-ec = { path = "deps/algebra/ec" }
-ark-poly = { path = "deps/algebra/poly" }
-ark-serialize = { path = "deps/algebra/serialize" }
-
-[patch.'https://github.com/openmina/proof-systems']
-mina-hasher = { path = "deps/proof-systems/hasher" }
-mina-signer = { path = "deps/proof-systems/signer" }
-mina-curves = { path = "deps/proof-systems/curves" }
-o1-utils = { path = "deps/proof-systems/utils" }
-kimchi = { path = "deps/proof-systems/kimchi" }
-poly-commitment = { path = "deps/proof-systems/poly-commitment" }
-mina-poseidon = { path = "deps/proof-systems/poseidon" }
-
-[patch.'https://github.com/o1-labs/proof-systems']
-mina-hasher = { path = "deps/proof-systems/hasher" }
-mina-signer = { path = "deps/proof-systems/signer" }
-mina-curves = { path = "deps/proof-systems/curves" }
-o1-utils = { path = "deps/proof-systems/utils" }
-kimchi = { path = "deps/proof-systems/kimchi" }
-poly-commitment = { path = "deps/proof-systems/poly-commitment" }
-mina-poseidon = { path = "deps/proof-systems/poseidon" }
-
-[patch.'https://github.com/openmina/redux-rs']
-redux = { path = "deps/redux-rs" }
-
-[patch.'https://github.com/openmina/ledger']
-ledger = { path = "ledger", package = "mina-tree" }
+ark-ff = { git = "https://github.com/openmina/algebra", branch = "openmina" }
+ark-ec = { git = "https://github.com/openmina/algebra", branch = "openmina" }
+ark-poly = { git = "https://github.com/openmina/algebra", branch = "openmina" }
+ark-serialize = { git = "https://github.com/openmina/algebra", branch = "openmina" }

Cargo.lock

@@ -12,6 +12,6 @@ sha2 = "0.10.6"
 redux = { git = "https://github.com/openmina/redux-rs.git", features = ["serde"] }
 tokio = { version = "1.26", features = ["sync"] }
 
-mina-hasher = { git = "https://github.com/o1-labs/proof-systems" }
+mina-hasher = { workspace = true }
 mina-p2p-messages = { workspace = true }
 ledger = { workspace = true }

Cargo.toml

@@ -16,13 +16,13 @@ crate-type = ["staticlib", "cdylib", "lib"]
 # https://stackoverflow.com/a/73023306
 
 [dependencies]
-mina-hasher = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
-mina-signer = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
-mina-curves = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
-o1-utils = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
-kimchi = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
-mina-poseidon = {git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4"}
-poly-commitment = {git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4"}
+mina-hasher = { workspace = true }
+mina-signer = { workspace = true }
+mina-curves = { workspace = true }
+o1-utils = { workspace = true }
+kimchi = { workspace = true }
+mina-poseidon = { workspace = true }
+poly-commitment = { workspace = true }
 
 bs58 = "0.4.0"
 mina-p2p-messages = { workspace = true, features = ["hashing"] }
@@ -39,9 +39,6 @@ libc = "0.2"
 itertools = "0.10"
 tuple-map = "0.4.0"
 
-# ark-ff = { version = "0.3.0", features = [ "parallel", "asm", "std" ] }
-# ark-serialize = { version = "0.3.0", features = [ "std" ] }
-
 ark-ff = { git = "https://github.com/openmina/algebra", branch = "openmina", features = [ "parallel", "asm", "std" ] }
 ark-ec = { git = "https://github.com/openmina/algebra", branch = "openmina", features = [ "std" ] }
 ark-serialize = { git = "https://github.com/openmina/algebra", branch = "openmina", features = [ "std" ] }
@@ -105,29 +102,3 @@ inherits = "release"
 debug = true
 debug-assertions = true
 overflow-checks = true
-
-[patch.crates-io]
-ark-ff = { git = "https://github.com/openmina/algebra", branch = "openmina" }
-ark-ec = { git = "https://github.com/openmina/algebra", branch = "openmina" }
-ark-poly = { git = "https://github.com/openmina/algebra", branch = "openmina" }
-ark-serialize = { git = "https://github.com/openmina/algebra", branch = "openmina" }
-# ark-ff = { path = "/home/sebastien/github/algebra/ff" }
-# ark-ec = { path = "/home/sebastien/github/algebra/ec" }
-# ark-poly = { path = "/home/sebastien/github/algebra/poly" }
-# ark-serialize = { path = "/home/sebastien/github/algebra/serialize" }
-
-[patch.'https://github.com/o1-labs/proof-systems']
-mina-hasher = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
-mina-signer = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
-mina-curves = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
-o1-utils = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
-kimchi = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
-mina-poseidon = {git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4"}
-poly-commitment = {git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4"}
-
-# mina-hasher = { path = "/home/sebastien/github/proof-systems/hasher" }
-# mina-signer = { path = "/home/sebastien/github/proof-systems/signer" }
-# mina-curves = { path = "/home/sebastien/github/proof-systems/curves" }
-# o1-utils = { path = "/home/sebastien/github/proof-systems/utils" }
-# kimchi = { path = "/home/sebastien/github/proof-systems/kimchi" }
-# oracle = { path = "/home/sebastien/github/proof-systems/oracle" }

core/Cargo.toml

@@ -18,11 +18,11 @@ base64 = "0.13.1"
 sha2 = { version = "0.10.2", optional = true }
 blake2 = { version = "0.10", optional = true }
 
-mina-hasher = {git = "https://github.com/o1-labs/proof-systems", rev = "373a294cf87f94d1bb518a248fbf71364aa73526", optional = true }
-mina-curves = {git = "https://github.com/o1-labs/proof-systems", rev = "373a294cf87f94d1bb518a248fbf71364aa73526", optional = true }
-mina-signer = {git = "https://github.com/o1-labs/proof-systems", rev = "373a294cf87f94d1bb518a248fbf71364aa73526", optional = true }
-mina-poseidon = {git = "https://github.com/o1-labs/proof-systems", rev = "373a294cf87f94d1bb518a248fbf71364aa73526", optional = true }
-o1-utils = {git = "https://github.com/o1-labs/proof-systems", rev = "373a294cf87f94d1bb518a248fbf71364aa73526", optional = true }
+mina-hasher = { workspace = true, optional = true }
+mina-curves = { workspace = true, optional = true }
+mina-signer = { workspace = true, optional = true }
+mina-poseidon = { workspace = true, optional = true }
+o1-utils = { workspace = true, optional = true }
 
 ark-ff = { version = "0.3.0", features = [ "parallel", "asm" ], optional = true }
 

deps/algebra

@@ -19,8 +19,8 @@ bincode = "1.3.3"
 hex = "0.4.3"
 rand = "0.8"
 redux = { git = "https://github.com/openmina/redux-rs.git", features = ["serde"] }
-mina-hasher = { git = "https://github.com/o1-labs/proof-systems" }
-mina-signer = { git = "https://github.com/o1-labs/proof-systems" }
+mina-hasher = { workspace = true }
+mina-signer = { workspace = true }
 ledger = { workspace = true }
 mina-p2p-messages = { workspace = true }