Skip to content

Commit 4c63aa3

Browse files
OBrezhnievOBrezhniev
authored
Merge pull request #69 from iden3/develop
Sync develop to master
2 parents 625bf56 + 0fae577 commit 4c63aa3

22 files changed

+809
-1107
lines changed

‎.github/workflows/test.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
on: [ push, pull_request ]
21
name: Test
2+
on:
3+
push:
4+
branches:
5+
- main
6+
pull_request:
37
jobs:
48
test:
59
strategy:
610
matrix:
7-
go-version: [ 1.18.x, 1.19.x, 1.20.x ]
11+
go-version: [ 1.20.x, 1.21.x, 1.22.x , 1.23.x ]
812
goarch: [ "amd64", "386" ]
913
runs-on: ubuntu-latest
1014
steps:

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Go implementation of some cryptographic primitives (that fit inside the SNARK fi
66
* Poseidon hash for BN254
77
* Poseidon hash for Goldilocks
88
* MIMC7
9+
* Pedersen
910

1011
## Contributing
1112

‎babyjub/babyjub.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"math/big"
66

7-
"github.com/iden3/go-iden3-crypto/constants"
8-
"github.com/iden3/go-iden3-crypto/ff"
9-
"github.com/iden3/go-iden3-crypto/utils"
7+
"github.com/iden3/go-iden3-crypto/v2/constants"
8+
"github.com/iden3/go-iden3-crypto/v2/ff"
9+
"github.com/iden3/go-iden3-crypto/v2/utils"
1010
)
1111

1212
// A is one of the babyjub constants.
@@ -34,19 +34,19 @@ var B8 *Point
3434

3535
// init initializes global numbers and the subgroup base.
3636
func init() {
37-
A = utils.NewIntFromString("168700")
38-
D = utils.NewIntFromString("168696")
37+
A, _ = utils.NewIntFromString("168700")
38+
D, _ = utils.NewIntFromString("168696")
3939
Aff = ff.NewElement().SetBigInt(A)
4040
Dff = ff.NewElement().SetBigInt(D)
4141

42-
Order = utils.NewIntFromString(
42+
Order, _ = utils.NewIntFromString(
4343
"21888242871839275222246405745257275088614511777268538073601725287587578984328")
4444
SubOrder = new(big.Int).Rsh(Order, 3) //nolint:gomnd
4545

4646
B8 = NewPoint()
47-
B8.X = utils.NewIntFromString(
47+
B8.X, _ = utils.NewIntFromString(
4848
"5299619240641551281634865583518297030282874472190772894086521144482721001553")
49-
B8.Y = utils.NewIntFromString(
49+
B8.Y, _ = utils.NewIntFromString(
5050
"16950150798460657717958625567821834550301663161624707787222815936182638968203")
5151
}
5252

‎babyjub/babyjub_test.go

+41-41
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"math/rand"
77
"testing"
88

9-
"github.com/iden3/go-iden3-crypto/constants"
10-
"github.com/iden3/go-iden3-crypto/utils"
9+
"github.com/iden3/go-iden3-crypto/v2/constants"
10+
"github.com/iden3/go-iden3-crypto/v2/utils"
1111
"github.com/stretchr/testify/assert"
1212
)
1313

@@ -22,15 +22,15 @@ func TestAdd1(t *testing.T) {
2222
}
2323

2424
func TestAdd2(t *testing.T) {
25-
aX := utils.NewIntFromString(
25+
aX, _ := utils.NewIntFromString(
2626
"17777552123799933955779906779655732241715742912184938656739573121738514868268")
27-
aY := utils.NewIntFromString(
27+
aY, _ := utils.NewIntFromString(
2828
"2626589144620713026669568689430873010625803728049924121243784502389097019475")
2929
a := &Point{X: aX, Y: aY}
3030

31-
bX := utils.NewIntFromString(
31+
bX, _ := utils.NewIntFromString(
3232
"17777552123799933955779906779655732241715742912184938656739573121738514868268")
33-
bY := utils.NewIntFromString(
33+
bY, _ := utils.NewIntFromString(
3434
"2626589144620713026669568689430873010625803728049924121243784502389097019475")
3535
b := &Point{X: bX, Y: bY}
3636

@@ -57,15 +57,15 @@ func TestAdd2(t *testing.T) {
5757
}
5858

5959
func TestAdd3(t *testing.T) {
60-
aX := utils.NewIntFromString(
60+
aX, _ := utils.NewIntFromString(
6161
"17777552123799933955779906779655732241715742912184938656739573121738514868268")
62-
aY := utils.NewIntFromString(
62+
aY, _ := utils.NewIntFromString(
6363
"2626589144620713026669568689430873010625803728049924121243784502389097019475")
6464
a := &Point{X: aX, Y: aY}
6565

66-
bX := utils.NewIntFromString(
66+
bX, _ := utils.NewIntFromString(
6767
"16540640123574156134436876038791482806971768689494387082833631921987005038935")
68-
bY := utils.NewIntFromString(
68+
bY, _ := utils.NewIntFromString(
6969
"20819045374670962167435360035096875258406992893633759881276124905556507972311")
7070
b := &Point{X: bX, Y: bY}
7171

@@ -80,15 +80,15 @@ func TestAdd3(t *testing.T) {
8080
}
8181

8282
func TestAdd4(t *testing.T) {
83-
aX := utils.NewIntFromString(
83+
aX, _ := utils.NewIntFromString(
8484
"0")
85-
aY := utils.NewIntFromString(
85+
aY, _ := utils.NewIntFromString(
8686
"1")
8787
a := &Point{X: aX, Y: aY}
8888

89-
bX := utils.NewIntFromString(
89+
bX, _ := utils.NewIntFromString(
9090
"16540640123574156134436876038791482806971768689494387082833631921987005038935")
91-
bY := utils.NewIntFromString(
91+
bY, _ := utils.NewIntFromString(
9292
"20819045374670962167435360035096875258406992893633759881276124905556507972311")
9393
b := &Point{X: bX, Y: bY}
9494

@@ -113,12 +113,12 @@ func TestInCurve2(t *testing.T) {
113113
}
114114

115115
func TestMul0(t *testing.T) {
116-
x := utils.NewIntFromString(
116+
x, _ := utils.NewIntFromString(
117117
"17777552123799933955779906779655732241715742912184938656739573121738514868268")
118-
y := utils.NewIntFromString(
118+
y, _ := utils.NewIntFromString(
119119
"2626589144620713026669568689430873010625803728049924121243784502389097019475")
120120
p := &Point{X: x, Y: y}
121-
s := utils.NewIntFromString("3")
121+
s, _ := utils.NewIntFromString("3")
122122

123123
r2 := NewPoint().Projective().Add(p.Projective(), p.Projective()).Affine()
124124
r2 = NewPoint().Projective().Add(r2.Projective(), p.Projective()).Affine()
@@ -135,12 +135,12 @@ func TestMul0(t *testing.T) {
135135
}
136136

137137
func TestMul1(t *testing.T) {
138-
x := utils.NewIntFromString(
138+
x, _ := utils.NewIntFromString(
139139
"17777552123799933955779906779655732241715742912184938656739573121738514868268")
140-
y := utils.NewIntFromString(
140+
y, _ := utils.NewIntFromString(
141141
"2626589144620713026669568689430873010625803728049924121243784502389097019475")
142142
p := &Point{X: x, Y: y}
143-
s := utils.NewIntFromString(
143+
s, _ := utils.NewIntFromString(
144144
"14035240266687799601661095864649209771790948434046947201833777492504781204499")
145145
r := NewPoint().Mul(s, p)
146146
assert.Equal(t,
@@ -152,12 +152,12 @@ func TestMul1(t *testing.T) {
152152
}
153153

154154
func TestMul2(t *testing.T) {
155-
x := utils.NewIntFromString(
155+
x, _ := utils.NewIntFromString(
156156
"6890855772600357754907169075114257697580319025794532037257385534741338397365")
157-
y := utils.NewIntFromString(
157+
y, _ := utils.NewIntFromString(
158158
"4338620300185947561074059802482547481416142213883829469920100239455078257889")
159159
p := &Point{X: x, Y: y}
160-
s := utils.NewIntFromString(
160+
s, _ := utils.NewIntFromString(
161161
"20819045374670962167435360035096875258406992893633759881276124905556507972311")
162162
r := NewPoint().Mul(s, p)
163163
assert.Equal(t,
@@ -169,45 +169,45 @@ func TestMul2(t *testing.T) {
169169
}
170170

171171
func TestInCurve3(t *testing.T) {
172-
x := utils.NewIntFromString(
172+
x, _ := utils.NewIntFromString(
173173
"17777552123799933955779906779655732241715742912184938656739573121738514868268")
174-
y := utils.NewIntFromString(
174+
y, _ := utils.NewIntFromString(
175175
"2626589144620713026669568689430873010625803728049924121243784502389097019475")
176176
p := &Point{X: x, Y: y}
177177
assert.Equal(t, true, p.InCurve())
178178
}
179179

180180
func TestInCurve4(t *testing.T) {
181-
x := utils.NewIntFromString(
181+
x, _ := utils.NewIntFromString(
182182
"6890855772600357754907169075114257697580319025794532037257385534741338397365")
183-
y := utils.NewIntFromString(
183+
y, _ := utils.NewIntFromString(
184184
"4338620300185947561074059802482547481416142213883829469920100239455078257889")
185185
p := &Point{X: x, Y: y}
186186
assert.Equal(t, true, p.InCurve())
187187
}
188188

189189
func TestInSubGroup1(t *testing.T) {
190-
x := utils.NewIntFromString(
190+
x, _ := utils.NewIntFromString(
191191
"17777552123799933955779906779655732241715742912184938656739573121738514868268")
192-
y := utils.NewIntFromString(
192+
y, _ := utils.NewIntFromString(
193193
"2626589144620713026669568689430873010625803728049924121243784502389097019475")
194194
p := &Point{X: x, Y: y}
195195
assert.Equal(t, true, p.InSubGroup())
196196
}
197197

198198
func TestInSubGroup2(t *testing.T) {
199-
x := utils.NewIntFromString(
199+
x, _ := utils.NewIntFromString(
200200
"6890855772600357754907169075114257697580319025794532037257385534741338397365")
201-
y := utils.NewIntFromString(
201+
y, _ := utils.NewIntFromString(
202202
"4338620300185947561074059802482547481416142213883829469920100239455078257889")
203203
p := &Point{X: x, Y: y}
204204
assert.Equal(t, true, p.InSubGroup())
205205
}
206206

207207
func TestPointFromSignAndy(t *testing.T) {
208-
x := utils.NewIntFromString(
208+
x, _ := utils.NewIntFromString(
209209
"17777552123799933955779906779655732241715742912184938656739573121738514868268")
210-
y := utils.NewIntFromString(
210+
y, _ := utils.NewIntFromString(
211211
"2626589144620713026669568689430873010625803728049924121243784502389097019475")
212212
p := &Point{X: x, Y: y}
213213

@@ -219,9 +219,9 @@ func TestPointFromSignAndy(t *testing.T) {
219219
}
220220

221221
func TestPackAndUnpackSignY(t *testing.T) {
222-
x := utils.NewIntFromString(
222+
x, _ := utils.NewIntFromString(
223223
"17777552123799933955779906779655732241715742912184938656739573121738514868268")
224-
y := utils.NewIntFromString(
224+
y, _ := utils.NewIntFromString(
225225
"2626589144620713026669568689430873010625803728049924121243784502389097019475")
226226
p := &Point{X: x, Y: y}
227227
pComp := p.Compress()
@@ -239,9 +239,9 @@ func TestPackAndUnpackSignY(t *testing.T) {
239239
}
240240

241241
func TestCompressDecompress1(t *testing.T) {
242-
x := utils.NewIntFromString(
242+
x, _ := utils.NewIntFromString(
243243
"17777552123799933955779906779655732241715742912184938656739573121738514868268")
244-
y := utils.NewIntFromString(
244+
y, _ := utils.NewIntFromString(
245245
"2626589144620713026669568689430873010625803728049924121243784502389097019475")
246246
p := &Point{X: x, Y: y}
247247

@@ -257,9 +257,9 @@ func TestCompressDecompress1(t *testing.T) {
257257
}
258258

259259
func TestCompressDecompress2(t *testing.T) {
260-
x := utils.NewIntFromString(
260+
x, _ := utils.NewIntFromString(
261261
"6890855772600357754907169075114257697580319025794532037257385534741338397365")
262-
y := utils.NewIntFromString(
262+
y, _ := utils.NewIntFromString(
263263
"4338620300185947561074059802482547481416142213883829469920100239455078257889")
264264
p := &Point{X: x, Y: y}
265265

@@ -299,9 +299,9 @@ func BenchmarkBabyjub(b *testing.B) {
299299

300300
var points [n]*Point
301301
var pointsProj [n]*PointProjective
302-
baseX := utils.NewIntFromString(
302+
baseX, _ := utils.NewIntFromString(
303303
"17777552123799933955779906779655732241715742912184938656739573121738514868268")
304-
baseY := utils.NewIntFromString(
304+
baseY, _ := utils.NewIntFromString(
305305
"2626589144620713026669568689430873010625803728049924121243784502389097019475")
306306
base := &Point{X: baseX, Y: baseY}
307307
for i := 0; i < n; i++ {

‎babyjub/babyjub_wrapper.go

-81
This file was deleted.

0 commit comments

Comments
 (0)