Skip to content

Commit d7b0707

Browse files
Update poseidon dependencies (#1059)
1 parent 34e7f0e commit d7b0707

File tree

8 files changed

+164
-154
lines changed

8 files changed

+164
-154
lines changed

Cargo.lock

+62-58
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bin/cliain/Cargo.lock

+44-41
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

poseidon/Cargo.toml

+9-9
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ ark-r1cs-std = {version = "^0.3.0" , default-features = false, optional = true }
1818
ark-relations = { version = "^0.3.0", default-features = false, optional = true }
1919
paste = { version = "1.0.11" }
2020

21-
ark-sponge = { git = "https://github.com/penumbra-zone/sponge", branch = "r1cs", default-features = false, features = ["r1cs"], optional = true }
22-
poseidon-parameters = { git = "https://github.com/penumbra-zone/poseidon377", rev = "50699746", default-features = false }
23-
poseidon-permutation = { git = "https://github.com/penumbra-zone/poseidon377", rev = "50699746", default-features = false }
21+
liminal-ark-pnbr-sponge = { version = "0.3.0", default-features = false, features = ["r1cs"], optional = true }
22+
liminal-ark-pnbr-poseidon-parameters = { version = "0.1.0", default-features = false }
23+
liminal-ark-pnbr-poseidon-permutation = { version = "0.1.0", default-features = false }
2424

2525
# For generation only
26-
poseidon-paramgen = { git = "https://github.com/penumbra-zone/poseidon377", rev = "50699746", optional = true }
26+
liminal-ark-pnbr-poseidon-paramgen = { version = "0.1.0", optional = true }
2727

2828
[lib]
2929
name = "liminal_ark_poseidon"
@@ -39,13 +39,13 @@ std = [
3939
"ark-bls12-381/std",
4040
"ark-ff/std",
4141

42-
"poseidon-parameters/std",
43-
"poseidon-permutation/std",
42+
"liminal-ark-pnbr-poseidon-parameters/std",
43+
"liminal-ark-pnbr-poseidon-permutation/std",
4444
]
4545
circuit = [
4646
"ark-r1cs-std",
4747
"ark-relations",
48-
"ark-sponge",
48+
"liminal-ark-pnbr-sponge",
4949
]
5050
circuit-std = [
5151
"circuit",
@@ -54,9 +54,9 @@ circuit-std = [
5454
"ark-r1cs-std/std",
5555
"ark-relations/std",
5656

57-
"ark-sponge/std",
57+
"liminal-ark-pnbr-sponge/std",
5858
]
5959
paramgen = [
6060
"std",
61-
"poseidon-paramgen/std",
61+
"liminal-ark-pnbr-poseidon-paramgen/std",
6262
]

poseidon/src/circuit.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use ark_bls12_381::Fr;
22
use ark_r1cs_std::prelude::AllocVar;
33
use ark_relations::r1cs::{ConstraintSystemRef, SynthesisError};
4-
use ark_sponge::{
4+
use liminal_ark_pnbr_poseidon_parameters::{Alpha, PoseidonParameters};
5+
use liminal_ark_pnbr_sponge::{
56
constraints::CryptographicSpongeVar,
67
poseidon::{constraints::PoseidonSpongeVar, PoseidonParameters as ArkSpongePoseidonParameters},
78
};
89
use paste::paste;
9-
use poseidon_parameters::{Alpha, PoseidonParameters};
1010

1111
use crate::{domain_separator, parameters::*};
1212

poseidon/src/generate_parameters.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::{
99

1010
use ark_bls12_381::{Fr, FrParameters};
1111
use ark_ff::{fields::FpParameters, vec};
12-
use poseidon_paramgen::poseidon_build;
12+
use liminal_ark_pnbr_poseidon_paramgen::poseidon_build;
1313

1414
fn main() {
1515
let security_level = match env::var("SECURITY_LEVEL") {

poseidon/src/hash.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ macro_rules! n_to_one {
1111
#[doc = ":1 Poseidon hash of `input`."]
1212
pub fn [<$n_as_word _to_one_hash>] (input: [Fr; $n]) -> Fr {
1313
let parameters = [<rate_ $n>]::<Fr>();
14-
let mut state = poseidon_permutation::Instance::new(&parameters);
14+
let mut state = liminal_ark_pnbr_poseidon_permutation::Instance::new(&parameters);
1515
state.n_to_1_fixed_hash([ark_ff::vec![domain_separator()], input.to_vec()].concat())
1616
}
1717
}

poseidon/src/parameters.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! This file was generated using `generate_parameters.rs`, do not edit it manually!
22
33
use ark_ff::{vec, PrimeField};
4-
use poseidon_parameters::{
4+
use liminal_ark_pnbr_poseidon_parameters::{
55
Alpha, ArcMatrix, Matrix, MatrixOperations, MdsMatrix, OptimizedArcMatrix,
66
OptimizedMdsMatrices, PoseidonParameters, RoundNumbers, SquareMatrix,
77
};

0 commit comments

Comments
 (0)