Skip to content

Commit b2cacb0

Browse files
sebastiencssebastiencs
authored
Merge pull request #104 from openmina/remove-deps
2 parents ec70d71 + ac48cb9 commit b2cacb0

File tree

11 files changed

+51
-101
lines changed

11 files changed

+51
-101
lines changed

‎.gitmodules

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎Cargo.lock

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ cargo-features = ["named-profiles"]
33
[workspace]
44
members = [
55
"core",
6+
"ledger",
67
"snark",
78
"p2p",
89
"p2p/libp2p-rpc-behaviour",
@@ -16,13 +17,18 @@ members = [
1617
"ledger",
1718
]
1819

19-
exclude = [ "deps/redux-rs" ]
20-
2120
resolver = "2"
2221

2322
[workspace.dependencies]
2423
mina-p2p-messages = { path = "mina-p2p-messages", features = ["hashing"] }
2524
ledger = { path = "ledger", package = "mina-tree" }
25+
mina-hasher = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
26+
mina-signer = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
27+
mina-curves = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
28+
o1-utils = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
29+
kimchi = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
30+
mina-poseidon = {git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4"}
31+
poly-commitment = {git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4"}
2632

2733
[profile.fuzz]
2834
inherits = "release"
@@ -35,38 +41,8 @@ panic = "abort"
3541
incremental = false
3642
codegen-units = 1
3743

38-
[patch.'https://github.com/openmina/algebra']
39-
ark-ff = { path = "deps/algebra/ff" }
40-
ark-ec = { path = "deps/algebra/ec" }
41-
ark-poly = { path = "deps/algebra/poly" }
42-
ark-serialize = { path = "deps/algebra/serialize" }
43-
4444
[patch.crates-io]
45-
ark-ff = { path = "deps/algebra/ff" }
46-
ark-ec = { path = "deps/algebra/ec" }
47-
ark-poly = { path = "deps/algebra/poly" }
48-
ark-serialize = { path = "deps/algebra/serialize" }
49-
50-
[patch.'https://github.com/openmina/proof-systems']
51-
mina-hasher = { path = "deps/proof-systems/hasher" }
52-
mina-signer = { path = "deps/proof-systems/signer" }
53-
mina-curves = { path = "deps/proof-systems/curves" }
54-
o1-utils = { path = "deps/proof-systems/utils" }
55-
kimchi = { path = "deps/proof-systems/kimchi" }
56-
poly-commitment = { path = "deps/proof-systems/poly-commitment" }
57-
mina-poseidon = { path = "deps/proof-systems/poseidon" }
58-
59-
[patch.'https://github.com/o1-labs/proof-systems']
60-
mina-hasher = { path = "deps/proof-systems/hasher" }
61-
mina-signer = { path = "deps/proof-systems/signer" }
62-
mina-curves = { path = "deps/proof-systems/curves" }
63-
o1-utils = { path = "deps/proof-systems/utils" }
64-
kimchi = { path = "deps/proof-systems/kimchi" }
65-
poly-commitment = { path = "deps/proof-systems/poly-commitment" }
66-
mina-poseidon = { path = "deps/proof-systems/poseidon" }
67-
68-
[patch.'https://github.com/openmina/redux-rs']
69-
redux = { path = "deps/redux-rs" }
70-
71-
[patch.'https://github.com/openmina/ledger']
72-
ledger = { path = "ledger", package = "mina-tree" }
45+
ark-ff = { git = "https://github.com/openmina/algebra", branch = "openmina" }
46+
ark-ec = { git = "https://github.com/openmina/algebra", branch = "openmina" }
47+
ark-poly = { git = "https://github.com/openmina/algebra", branch = "openmina" }
48+
ark-serialize = { git = "https://github.com/openmina/algebra", branch = "openmina" }

‎core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ sha2 = "0.10.6"
1212
redux = { git = "https://github.com/openmina/redux-rs.git", features = ["serde"] }
1313
tokio = { version = "1.26", features = ["sync"] }
1414

15-
mina-hasher = { git = "https://github.com/o1-labs/proof-systems" }
15+
mina-hasher = { workspace = true }
1616
mina-p2p-messages = { workspace = true }
1717
ledger = { workspace = true }

‎deps/algebra

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎deps/proof-systems

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎deps/redux-rs

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎ledger/Cargo.toml

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ crate-type = ["staticlib", "cdylib", "lib"]
1616
# https://stackoverflow.com/a/73023306
1717

1818
[dependencies]
19-
mina-hasher = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
20-
mina-signer = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
21-
mina-curves = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
22-
o1-utils = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
23-
kimchi = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
24-
mina-poseidon = {git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4"}
25-
poly-commitment = {git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4"}
19+
mina-hasher = { workspace = true }
20+
mina-signer = { workspace = true }
21+
mina-curves = { workspace = true }
22+
o1-utils = { workspace = true }
23+
kimchi = { workspace = true }
24+
mina-poseidon = { workspace = true }
25+
poly-commitment = { workspace = true }
2626

2727
bs58 = "0.4.0"
2828
mina-p2p-messages = { workspace = true, features = ["hashing"] }
@@ -39,9 +39,6 @@ libc = "0.2"
3939
itertools = "0.10"
4040
tuple-map = "0.4.0"
4141

42-
# ark-ff = { version = "0.3.0", features = [ "parallel", "asm", "std" ] }
43-
# ark-serialize = { version = "0.3.0", features = [ "std" ] }
44-
4542
ark-ff = { git = "https://github.com/openmina/algebra", branch = "openmina", features = [ "parallel", "asm", "std" ] }
4643
ark-ec = { git = "https://github.com/openmina/algebra", branch = "openmina", features = [ "std" ] }
4744
ark-serialize = { git = "https://github.com/openmina/algebra", branch = "openmina", features = [ "std" ] }
@@ -105,29 +102,3 @@ inherits = "release"
105102
debug = true
106103
debug-assertions = true
107104
overflow-checks = true
108-
109-
[patch.crates-io]
110-
ark-ff = { git = "https://github.com/openmina/algebra", branch = "openmina" }
111-
ark-ec = { git = "https://github.com/openmina/algebra", branch = "openmina" }
112-
ark-poly = { git = "https://github.com/openmina/algebra", branch = "openmina" }
113-
ark-serialize = { git = "https://github.com/openmina/algebra", branch = "openmina" }
114-
# ark-ff = { path = "/home/sebastien/github/algebra/ff" }
115-
# ark-ec = { path = "/home/sebastien/github/algebra/ec" }
116-
# ark-poly = { path = "/home/sebastien/github/algebra/poly" }
117-
# ark-serialize = { path = "/home/sebastien/github/algebra/serialize" }
118-
119-
[patch.'https://github.com/o1-labs/proof-systems']
120-
mina-hasher = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
121-
mina-signer = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
122-
mina-curves = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
123-
o1-utils = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
124-
kimchi = { git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4" }
125-
mina-poseidon = {git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4"}
126-
poly-commitment = {git = "https://github.com/openmina/proof-systems", branch = "ledger-newtypes-rampup4"}
127-
128-
# mina-hasher = { path = "/home/sebastien/github/proof-systems/hasher" }
129-
# mina-signer = { path = "/home/sebastien/github/proof-systems/signer" }
130-
# mina-curves = { path = "/home/sebastien/github/proof-systems/curves" }
131-
# o1-utils = { path = "/home/sebastien/github/proof-systems/utils" }
132-
# kimchi = { path = "/home/sebastien/github/proof-systems/kimchi" }
133-
# oracle = { path = "/home/sebastien/github/proof-systems/oracle" }

‎mina-p2p-messages/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ base64 = "0.13.1"
1818
sha2 = { version = "0.10.2", optional = true }
1919
blake2 = { version = "0.10", optional = true }
2020

21-
mina-hasher = {git = "https://github.com/o1-labs/proof-systems", rev = "373a294cf87f94d1bb518a248fbf71364aa73526", optional = true }
22-
mina-curves = {git = "https://github.com/o1-labs/proof-systems", rev = "373a294cf87f94d1bb518a248fbf71364aa73526", optional = true }
23-
mina-signer = {git = "https://github.com/o1-labs/proof-systems", rev = "373a294cf87f94d1bb518a248fbf71364aa73526", optional = true }
24-
mina-poseidon = {git = "https://github.com/o1-labs/proof-systems", rev = "373a294cf87f94d1bb518a248fbf71364aa73526", optional = true }
25-
o1-utils = {git = "https://github.com/o1-labs/proof-systems", rev = "373a294cf87f94d1bb518a248fbf71364aa73526", optional = true }
21+
mina-hasher = { workspace = true, optional = true }
22+
mina-curves = { workspace = true, optional = true }
23+
mina-signer = { workspace = true, optional = true }
24+
mina-poseidon = { workspace = true, optional = true }
25+
o1-utils = { workspace = true, optional = true }
2626

2727
ark-ff = { version = "0.3.0", features = [ "parallel", "asm" ], optional = true }
2828

‎node/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ bincode = "1.3.3"
1919
hex = "0.4.3"
2020
rand = "0.8"
2121
redux = { git = "https://github.com/openmina/redux-rs.git", features = ["serde"] }
22-
mina-hasher = { git = "https://github.com/o1-labs/proof-systems" }
23-
mina-signer = { git = "https://github.com/o1-labs/proof-systems" }
22+
mina-hasher = { workspace = true }
23+
mina-signer = { workspace = true }
2424
ledger = { workspace = true }
2525
mina-p2p-messages = { workspace = true }
2626

0 commit comments

Comments
 (0)