From e173dd817b794d2bdadaa7ed45583798aaa91f0d Mon Sep 17 00:00:00 2001 From: benbierens Date: Thu, 8 Aug 2024 14:45:13 +0200 Subject: [PATCH] bumps constantine, updates curves --- poseidon2.nim | 4 ++-- poseidon2.nimble | 2 +- poseidon2/io.nim | 6 +++--- poseidon2/roundfun.nim | 2 +- poseidon2/types.nim | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/poseidon2.nim b/poseidon2.nim index 694f12b..68792f5 100644 --- a/poseidon2.nim +++ b/poseidon2.nim @@ -16,5 +16,5 @@ export elements export types # workaround for "undeclared identifier: 'getCurveOrder'" -import constantine/math/config/curves -export curves +import constantine/named/algebras +export algebras diff --git a/poseidon2.nimble b/poseidon2.nimble index 131eac7..1e7ed96 100644 --- a/poseidon2.nimble +++ b/poseidon2.nimble @@ -3,4 +3,4 @@ author = "nim-poseidon2 authors" description = "Poseidon2 hash function" license = "MIT" -requires "https://github.com/mratsim/constantine#ab6fa6ae1bbbd1b10071a92ec209b381b5d82511" +requires "https://github.com/mratsim/constantine#1e34ec22929eaba7bcf1681350ec21aed8f370f7" diff --git a/poseidon2/io.nim b/poseidon2/io.nim index 68d7157..4ca3f30 100644 --- a/poseidon2/io.nim +++ b/poseidon2/io.nim @@ -2,10 +2,10 @@ import std/options import constantine/math/arithmetic import constantine/math/io/io_bigints import constantine/math/io/io_fields -import constantine/math/config/curves +import constantine/named/algebras import ./types -export curves +export algebras func fromOpenArray(_: type F, bytes: openArray[byte]): F = F.fromBig(B.unmarshal(bytes, littleEndian)) @@ -19,7 +19,7 @@ func fromBytes*(_: type F, bytes: array[32, byte]): Option[F] = ## Converts bytes into a field element. The byte array is interpreted as a ## canonical little-endian big integer. let big = B.unmarshal(bytes, littleEndian) - if bool(big < F.fieldMod()): + if bool(big < F.getModulus()): return some(F.fromBig(big)) func toBytes*(element: F): array[32, byte] = diff --git a/poseidon2/roundfun.nim b/poseidon2/roundfun.nim index 7e9d5a0..dc087aa 100644 --- a/poseidon2/roundfun.nim +++ b/poseidon2/roundfun.nim @@ -1,6 +1,6 @@ import constantine/math/arithmetic, - constantine/math/config/curves + constantine/named/algebras import ./types import ./roundconst diff --git a/poseidon2/types.nim b/poseidon2/types.nim index 2c9fa52..98d567d 100644 --- a/poseidon2/types.nim +++ b/poseidon2/types.nim @@ -3,12 +3,12 @@ import constantine/math/arithmetic, constantine/math/io/io_fields, constantine/math/io/io_bigints, - constantine/math/config/curves + constantine/named/algebras #------------------------------------------------------------------------------- type B* = BigInt[254] -type F* = Fr[BN254Snarks] +type F* = Fr[BN254_Snarks] type S* = (F,F,F) #-------------------------------------------------------------------------------