Skip to content

Commit e76b90c

Browse files
adecaroadecaro
committed
improvement + updated mathlib
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
1 parent db3ff41 commit e76b90c

File tree

12 files changed

+215
-551
lines changed

12 files changed

+215
-551
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/DATA-DOG/go-sqlmock v1.5.2
99
github.com/IBM/idemix v0.0.2-0.20250313153527-832db18b9478
1010
github.com/IBM/idemix/bccsp/types v0.0.0-20250313153527-832db18b9478
11-
github.com/IBM/mathlib v0.0.3-0.20251201181318-11a3ec7f764f
11+
github.com/IBM/mathlib v0.0.3-0.20251208124832-1dd505f14350
1212
github.com/dgraph-io/ristretto/v2 v2.3.0
1313
github.com/gin-gonic/gin v1.10.0
1414
github.com/hashicorp/go-uuid v1.0.3
@@ -27,7 +27,7 @@ require (
2727
github.com/sourcegraph/conc v0.3.0
2828
github.com/spf13/cobra v1.8.1
2929
github.com/spf13/viper v1.20.1
30-
github.com/stretchr/testify v1.10.0
30+
github.com/stretchr/testify v1.11.1
3131
github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26
3232
github.com/test-go/testify v1.1.4
3333
github.com/thedevsaddam/gojsonq v2.3.0+incompatible
@@ -76,7 +76,7 @@ require (
7676
github.com/cockroachdb/errors v1.12.0 // indirect
7777
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
7878
github.com/cockroachdb/redact v1.1.5 // indirect
79-
github.com/consensys/gnark-crypto v0.18.1 // indirect
79+
github.com/consensys/gnark-crypto v0.19.2 // indirect
8080
github.com/containerd/cgroups v1.1.0 // indirect
8181
github.com/containerd/errdefs v1.0.0 // indirect
8282
github.com/containerd/errdefs/pkg v0.3.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -650,8 +650,8 @@ github.com/IBM/idemix/bccsp/schemes/weak-bb v0.0.0-20250313153527-832db18b9478 h
650650
github.com/IBM/idemix/bccsp/schemes/weak-bb v0.0.0-20250313153527-832db18b9478/go.mod h1:k4Q5EYKRnYC6t80ipSCY3G8H4FdcxRa8jjlsJdGfNCY=
651651
github.com/IBM/idemix/bccsp/types v0.0.0-20250313153527-832db18b9478 h1:Uzmcb4pNb54/fbAjnrZTiJwWV74+twP60N4qBGm4PvU=
652652
github.com/IBM/idemix/bccsp/types v0.0.0-20250313153527-832db18b9478/go.mod h1:Pi1QIuIZ+1OXIbnYe27vNwJOnSq2WvkHRT/sfweTw8E=
653-
github.com/IBM/mathlib v0.0.3-0.20251201181318-11a3ec7f764f h1:UyHWQt3a/XrM8u/x6KukEzyTABzfeVLZJn40hIIclsM=
654-
github.com/IBM/mathlib v0.0.3-0.20251201181318-11a3ec7f764f/go.mod h1:O230ebw6/22B7T4C03b99ZcPtc5XAfBTOp+ZT+xmMCk=
653+
github.com/IBM/mathlib v0.0.3-0.20251208124832-1dd505f14350 h1:1DF5XTkBuJSRRW2gk+mFrcc+uqvMK6SH39t3qCbtPD8=
654+
github.com/IBM/mathlib v0.0.3-0.20251208124832-1dd505f14350/go.mod h1:rq67W1H6L1eorrE7DZ/HcSY/pfMDjbPWOx12SeUfQDk=
655655
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
656656
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
657657
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
@@ -736,8 +736,8 @@ github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZe
736736
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
737737
github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
738738
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
739-
github.com/consensys/gnark-crypto v0.18.1 h1:RyLV6UhPRoYYzaFnPQA4qK3DyuDgkTgskDdoGqFt3fI=
740-
github.com/consensys/gnark-crypto v0.18.1/go.mod h1:L3mXGFTe1ZN+RSJ+CLjUt9x7PNdx8ubaYfDROyp2Z8c=
739+
github.com/consensys/gnark-crypto v0.19.2 h1:qrEAIXq3T4egxqiliFFoNrepkIWVEeIYwt3UL0fvS80=
740+
github.com/consensys/gnark-crypto v0.19.2/go.mod h1:rT23F0XSZqE0mUA0+pRtnL56IbPxs6gp4CeRsBk4XS0=
741741
github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE=
742742
github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
743743
github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
@@ -1532,8 +1532,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
15321532
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
15331533
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
15341534
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
1535-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
1536-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
1535+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
1536+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
15371537
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
15381538
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
15391539
github.com/sykesm/zap-logfmt v0.0.4 h1:U2WzRvmIWG1wDLCFY3sz8UeEmsdHQjHFNlIdmroVFaI=

‎token/core/common/crypto/math/curves.go‎

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,49 +12,32 @@ import (
1212

1313
math "github.com/IBM/mathlib"
1414
"github.com/IBM/mathlib/driver"
15-
"github.com/IBM/mathlib/driver/gurvy"
16-
"github.com/hyperledger-labs/fabric-token-sdk/token/core/common/crypto/math/gurvy/bls12381ext"
15+
"github.com/IBM/mathlib/driver/gurvy/bls12381"
1716
"github.com/hyperledger-labs/fabric-token-sdk/token/core/common/crypto/rng"
1817
)
1918

2019
var (
2120
BLS12_381_BBS_GURVY_FAST_RNG math.CurveID
22-
BLS12_381_BBS_GURVY_EXT math.CurveID
2321
)
2422

2523
func init() {
2624
BLS12_381_BBS_GURVY_FAST_RNG = math.CurveID(len(math.Curves))
27-
BLS12_381_BBS_GURVY_EXT = BLS12_381_BBS_GURVY_FAST_RNG + 1
2825
math.Curves = append(
2926
math.Curves,
3027
math.NewCurve(
31-
NewCurveWithFastRNG(gurvy.NewBls12_381BBS()),
32-
math.NewG1(gurvy.NewBls12_381BBS().GenG1(), BLS12_381_BBS_GURVY_FAST_RNG),
33-
math.NewG2(gurvy.NewBls12_381BBS().GenG2(), BLS12_381_BBS_GURVY_FAST_RNG),
34-
math.NewGt(gurvy.NewBls12_381BBS().GenGt(), BLS12_381_BBS_GURVY_FAST_RNG),
35-
math.NewZr(gurvy.NewBls12_381().GroupOrder(), BLS12_381_BBS_GURVY_FAST_RNG),
36-
gurvy.NewBls12_381BBS().CoordinateByteSize(),
37-
gurvy.NewBls12_381BBS().G1ByteSize(),
38-
gurvy.NewBls12_381BBS().CompressedG1ByteSize(),
39-
gurvy.NewBls12_381BBS().G2ByteSize(),
40-
gurvy.NewBls12_381BBS().CompressedG2ByteSize(),
41-
gurvy.NewBls12_381BBS().ScalarByteSize(),
28+
NewCurveWithFastRNG(bls12381.NewBls12_381BBS()),
29+
math.NewG1(bls12381.NewBls12_381BBS().GenG1(), BLS12_381_BBS_GURVY_FAST_RNG),
30+
math.NewG2(bls12381.NewBls12_381BBS().GenG2(), BLS12_381_BBS_GURVY_FAST_RNG),
31+
math.NewGt(bls12381.NewBls12_381BBS().GenGt(), BLS12_381_BBS_GURVY_FAST_RNG),
32+
math.NewZr(bls12381.NewBls12_381().GroupOrder(), BLS12_381_BBS_GURVY_FAST_RNG),
33+
bls12381.NewBls12_381BBS().CoordinateByteSize(),
34+
bls12381.NewBls12_381BBS().G1ByteSize(),
35+
bls12381.NewBls12_381BBS().CompressedG1ByteSize(),
36+
bls12381.NewBls12_381BBS().G2ByteSize(),
37+
bls12381.NewBls12_381BBS().CompressedG2ByteSize(),
38+
bls12381.NewBls12_381BBS().ScalarByteSize(),
4239
BLS12_381_BBS_GURVY_FAST_RNG,
4340
),
44-
math.NewCurve(
45-
bls12381ext.NewBls12_381BBS(),
46-
math.NewG1(bls12381ext.NewBls12_381BBS().GenG1(), BLS12_381_BBS_GURVY_EXT),
47-
math.NewG2(bls12381ext.NewBls12_381BBS().GenG2(), BLS12_381_BBS_GURVY_EXT),
48-
math.NewGt(bls12381ext.NewBls12_381BBS().GenGt(), BLS12_381_BBS_GURVY_EXT),
49-
math.NewZr(gurvy.NewBls12_381().GroupOrder(), BLS12_381_BBS_GURVY_EXT),
50-
bls12381ext.NewBls12_381BBS().CoordinateByteSize(),
51-
bls12381ext.NewBls12_381BBS().G1ByteSize(),
52-
bls12381ext.NewBls12_381BBS().CompressedG1ByteSize(),
53-
bls12381ext.NewBls12_381BBS().G2ByteSize(),
54-
bls12381ext.NewBls12_381BBS().CompressedG2ByteSize(),
55-
bls12381ext.NewBls12_381BBS().ScalarByteSize(),
56-
BLS12_381_BBS_GURVY_EXT,
57-
),
5841
)
5942
}
6043

0 commit comments

Comments
 (0)