Skip to content

Commit 5667a1f

Browse files
committed
Deps: use public arkwork and o1Labs proof-systems
1 parent 4dd76d2 commit 5667a1f

File tree

2 files changed

+45
-64
lines changed

2 files changed

+45
-64
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 19 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -46,31 +46,28 @@ arithmetic_side_effects = "warn"
4646
indexing_slicing = "warn"
4747

4848
[workspace.dependencies]
49-
ledger = { path = "ledger", package = "mina-tree" }
50-
mina-p2p-messages = { path = "mina-p2p-messages" }
51-
poseidon = { path = "poseidon" }
52-
53-
# UNCOMMENTED_IN_CI mina-curves = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203", features = [ "32x9" ] }
54-
kimchi = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203" }
55-
mina-curves = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203" }
56-
mina-hasher = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203" }
57-
mina-poseidon = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203" }
58-
mina-signer = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203" }
59-
o1-utils = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203" }
60-
poly-commitment = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203" }
61-
62-
# kimchi.path = "../deps/proof-systems/kimchi"
63-
# mina-curves.path = "../deps/proof-systems/curves"
64-
# mina-hasher.path = "../deps/proof-systems/hasher"
65-
# mina-poseidon.path = "../deps/proof-systems/poseidon"
66-
# mina-signer.path = "../deps/proof-systems/signer"
67-
# o1-utils.path = "../deps/proof-systems/utils"
68-
# poly-commitment.path = "../deps/proof-systems/poly-commitment"
69-
49+
ark-ec = { version = "0.5.0", features = ["std"] }
50+
ark-ff = { version = "0.5.0", features = ["parallel", "asm", "std"] }
51+
ark-poly = { version = "0.5.0" }
52+
ark-serialize = { version = "0.5.0", features = ["std"] }
53+
graphannis-malloc_size_of = { git = "https://github.com/openmina/graphannis-malloc_size_of.git", rev = "f7da9f6" }
54+
graphannis-malloc_size_of_derive = { git = "https://github.com/openmina/graphannis-malloc_size_of_derive.git" }
7055
juniper = { version = "0.16" }
56+
kimchi = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
57+
ledger = { path = "ledger", package = "mina-tree" }
7158
libp2p = { git = "https://github.com/openmina/rust-libp2p", rev = "5c44c7d9", default-features = false }
7259
linkme = "0.3.22"
60+
mina-curves = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
61+
mina-hasher = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
7362
mina-node-account = { path = "node/account" }
63+
mina-p2p-messages = { path = "mina-p2p-messages" }
64+
mina-poseidon = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
65+
mina-producer-dashboard = { path = "producer-dashboard" }
66+
mina-signer = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
67+
num-bigint = { git = "https://github.com/openmina/num-bigint", branch = "rebase-onstack" } # branch: rebase-onstack
68+
o1-utils = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
69+
poly-commitment = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
70+
poseidon = { path = "poseidon" }
7471
redux = { git = "https://github.com/o1-labs/redux-rs.git", rev = "06c8366", features = [
7572
"serde",
7673
] }
@@ -80,29 +77,9 @@ serde_with = { version = "3.7.0", features = ["hex"] }
8077
static_assertions = "1.1.0"
8178
vrf = { path = "vrf" }
8279

83-
84-
ark-ec = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode", features = [
85-
"std",
86-
] }
87-
ark-ff = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode", features = [
88-
"parallel",
89-
"asm",
90-
"std",
91-
] }
92-
ark-poly = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode" }
93-
ark-serialize = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode", features = [
94-
"std",
95-
] }
96-
97-
num-bigint = { git = "https://github.com/openmina/num-bigint", branch = "rebase-onstack" } # branch: rebase-onstack
98-
80+
# UNCOMMENTED_IN_CI mina-curves = { git = "https://github.com/o1-labs/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203", features = [ "32x9" ] }
9981
# UNCOMMENTED_IN_CI ark-ff = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode", features = ["parallel", "asm", "std", "32x9" ] }
10082

101-
graphannis-malloc_size_of = { git = "https://github.com/openmina/graphannis-malloc_size_of.git", rev = "f7da9f6" }
102-
graphannis-malloc_size_of_derive = { git = "https://github.com/openmina/graphannis-malloc_size_of_derive.git" }
103-
104-
mina-producer-dashboard = { path = "producer-dashboard" }
105-
10683
[profile.fuzz]
10784
inherits = "release"
10885
opt-level = 3
@@ -115,11 +92,6 @@ incremental = false
11592
codegen-units = 1
11693

11794
[patch.crates-io]
118-
ark-ff = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode" }
119-
ark-ec = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode" }
120-
ark-poly = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode" }
121-
ark-serialize = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode" }
122-
12395
num-bigint = { git = "https://github.com/openmina/num-bigint", branch = "rebase-onstack" } # branch: rebase-onstack
12496
num-rational = { git = "https://github.com/openmina/num-rational", branch = "rebase-onstack" } # branch: rebase-onstack
12597

0 commit comments

Comments
 (0)