Skip to content

Commit cdd8a92

Browse files
jsignjsign
authored
Remove needing a file persisting precomputed tables (#369)
* config: use tentative go-ipa Signed-off-by: Ignacio Hagopian <[email protected]> * remove precomp references in ci and readme Signed-off-by: Ignacio Hagopian <[email protected]> * config: use sync once to be safe during cold start Signed-off-by: Ignacio Hagopian <[email protected]> * tests: paralellize tests and bugfix Signed-off-by: Ignacio Hagopian <[email protected]> * mod: use tenative go-ipa version Signed-off-by: Ignacio Hagopian <[email protected]> * ci: only remove the precomp deletion Signed-off-by: Ignacio Hagopian <[email protected]> * rebase Signed-off-by: Ignacio Hagopian <[email protected]> * update to go-ipa master Signed-off-by: Ignacio Hagopian <[email protected]> --------- Signed-off-by: Ignacio Hagopian <[email protected]>
1 parent b2d852d commit cdd8a92

15 files changed

+255
-156
lines changed

‎.github/workflows/block_replay.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
- name: Edit geth to use this repo and build it
2727
run: |
2828
cd geth
29-
cp /home/devops/verkle-test-dependencies/precomp .
3029
cp /home/devops/verkle-test-dependencies/fork.txt .
3130
go mod edit -replace=github.com/gballet/go-verkle=$PWD/..
3231
go mod edit -replace=github.com/crate-crypto/go-ipa=github.com/crate-crypto/go-ipa@`grep go-ipa ../go.mod | cut -d'-' -f 5`
@@ -59,4 +58,4 @@ jobs:
5958

6059
- name: Cleanup
6160
if: always()
62-
run: rm -rf geth .ethereum precomp
61+
run: rm -rf geth .ethereum

‎README.md

-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ An implementation of [Verkle trees](https://dankradfeist.de/ethereum/2021/06/18/
1010

1111
Node width is set to 256 children.
1212

13-
### Setup
14-
15-
Download the precomputed Lagrange point file from the [latest release](https://github.com/gballet/go-verkle/releases), and place it in the directory that you will run the program from. While not strictly required (it will be generated upon startup if not present), this will save a lot of startup time when running the tests.
16-
1713
### Running the tests
1814

1915
```

‎config_ipa.go

+24-37
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ package verkle
2727

2828
import (
2929
"encoding/hex"
30-
"os"
30+
"sync"
3131

3232
"github.com/crate-crypto/go-ipa/ipa"
3333
)
@@ -46,41 +46,34 @@ const (
4646
EmptyCodeHashSecondHalfIdx = EmptyCodeHashFirstHalfIdx + 1
4747
)
4848

49-
type IPAConfig struct {
50-
conf *ipa.IPAConfig
51-
}
49+
var (
50+
FrZero Fr
51+
FrOne Fr
5252

53-
type Config = IPAConfig
53+
cfg *Config
54+
onceCfg sync.Once
55+
)
5456

55-
func (ipac *IPAConfig) CommitToPoly(poly []Fr, _ int) *Point {
56-
ret := ipac.conf.Commit(poly)
57-
return &ret
57+
func init() {
58+
FrZero.SetZero()
59+
FrOne.SetOne()
5860
}
5961

60-
var cfg *Config
62+
type IPAConfig struct {
63+
conf *ipa.IPAConfig
64+
}
6165

62-
var precompFileName = "precomp"
66+
type Config = IPAConfig
6367

6468
func GetConfig() *Config {
65-
if cfg == nil {
66-
var ipacfg *ipa.IPAConfig
67-
if precompSer, err := os.ReadFile(precompFileName); err != nil {
68-
ipacfg = ipa.NewIPASettings()
69-
serialized, err := ipacfg.SRSPrecompPoints.SerializeSRSPrecomp()
70-
if err != nil {
71-
panic("error writing serialized precomputed Lagrange points:" + err.Error())
72-
} else if err = os.WriteFile(precompFileName, serialized, 0666); err != nil {
73-
panic("error saving the precomp: " + err.Error())
74-
}
75-
} else {
76-
srs, err := ipa.DeserializeSRSPrecomp(precompSer)
77-
if err != nil {
78-
panic("error deserializing precomputed Lagrange points:" + err.Error())
79-
}
80-
ipacfg = ipa.NewIPASettingsWithSRSPrecomp(srs)
69+
onceCfg.Do(func() {
70+
conf, err := ipa.NewIPASettings()
71+
if err != nil {
72+
panic(err)
8173
}
82-
cfg = &IPAConfig{conf: ipacfg}
74+
cfg = &IPAConfig{conf: conf}
8375

76+
// Initialize the empty code cached values.
8477
emptyHashCode, _ := hex.DecodeString("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470")
8578
values := make([][]byte, NodeWidth)
8679
values[CodeHashVectorPosition] = emptyHashCode
@@ -91,17 +84,11 @@ func GetConfig() *Config {
9184
EmptyCodeHashPoint = *cfg.CommitToPoly(c1poly[:], 0)
9285
EmptyCodeHashFirstHalfValue = c1poly[EmptyCodeHashFirstHalfIdx]
9386
EmptyCodeHashSecondHalfValue = c1poly[EmptyCodeHashSecondHalfIdx]
94-
95-
}
87+
})
9688
return cfg
9789
}
9890

99-
var (
100-
FrZero Fr
101-
FrOne Fr
102-
)
103-
104-
func init() {
105-
FrZero.SetZero()
106-
FrOne.SetOne()
91+
func (conf *IPAConfig) CommitToPoly(poly []Fr, _ int) *Point {
92+
ret := conf.conf.Commit(poly)
93+
return &ret
10794
}

‎config_ipa_test.go

-31
This file was deleted.

‎debug_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ import (
3030
)
3131

3232
func TestJSON(t *testing.T) {
33+
t.Parallel()
34+
3335
root := New()
3436
root.Insert(zeroKeyTest, fourtyKeyTest, nil)
3537
root.Insert(oneKeyTest, zeroKeyTest, nil)

‎empty_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ package verkle
2828
import "testing"
2929

3030
func TestEmptyFuncs(t *testing.T) {
31+
t.Parallel()
32+
3133
var e Empty
3234
err := e.Insert(zeroKeyTest, zeroKeyTest, nil)
3335
if err == nil {

‎encoding_test.go

+6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@ package verkle
33
import "testing"
44

55
func TestParseNodeEmptyPayload(t *testing.T) {
6+
t.Parallel()
7+
68
_, err := ParseNode([]byte{}, 0)
79
if err != errSerializedPayloadTooShort {
810
t.Fatalf("invalid error, got %v, expected %v", err, "unexpected EOF")
911
}
1012
}
1113

1214
func TestLeafStemLength(t *testing.T) {
15+
t.Parallel()
16+
1317
// Serialize a leaf with no values, but whose stem is 32 bytes. The
1418
// serialization should trim the extra byte.
1519
toolong := make([]byte, 32)
@@ -27,6 +31,8 @@ func TestLeafStemLength(t *testing.T) {
2731
}
2832

2933
func TestInvalidNodeEncoding(t *testing.T) {
34+
t.Parallel()
35+
3036
// Test a short payload.
3137
if _, err := ParseNode([]byte{leafRLPType}, 0); err != errSerializedPayloadTooShort {
3238
t.Fatalf("invalid error, got %v, expected %v", err, errSerializedPayloadTooShort)

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/gballet/go-verkle
33
go 1.19
44

55
require (
6-
github.com/crate-crypto/go-ipa v0.0.0-20230710183535-d5eb1c4661bd
6+
github.com/crate-crypto/go-ipa v0.0.0-20230821223925-c39f2ad018b0
77
golang.org/x/sync v0.1.0
88
)
99

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/crate-crypto/go-ipa v0.0.0-20230710183535-d5eb1c4661bd h1:jgf65Q4+jHFuLlhVApaVfTUwcU7dAdXK+GESow2UlaI=
2-
github.com/crate-crypto/go-ipa v0.0.0-20230710183535-d5eb1c4661bd/go.mod h1:gzbVz57IDJgQ9rLQwfSk696JGWof8ftznEL9GoAv3NI=
1+
github.com/crate-crypto/go-ipa v0.0.0-20230821223925-c39f2ad018b0 h1:DWQ1lM0xoumkOwDI5D0gc9mZN84YV+EAjgjqQ9OleZE=
2+
github.com/crate-crypto/go-ipa v0.0.0-20230821223925-c39f2ad018b0/go.mod h1:gzbVz57IDJgQ9rLQwfSk696JGWof8ftznEL9GoAv3NI=
33
github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
44
github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
55
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=

‎hashednode_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ package verkle
2828
import "testing"
2929

3030
func TestHashedNodeFuncs(t *testing.T) {
31+
t.Parallel()
32+
3133
e := HashedNode{}
3234
err := e.Insert(zeroKeyTest, zeroKeyTest, nil)
3335
if err != errInsertIntoHash {

‎ipa_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
)
88

99
func TestFromBytes(t *testing.T) {
10+
t.Parallel()
11+
1012
var fr Fr
1113

1214
var beFortyTwo [8]byte

0 commit comments

Comments
 (0)