Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change default hash from sha256 to poseidon #1

Merged
merged 1 commit into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v1
with:
go-version: '1.18'
go-version: '1.22'
- name: Validate spec
run: ./scripts/ci-validate-specs.sh
- name: Validate testcases
Expand Down
7 changes: 4 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
module github.com/ferranbt/fastssz

go 1.18
go 1.22

require (
github.com/golang/snappy v0.0.3
github.com/minio/sha256-simd v1.0.0
github.com/iden3/go-iden3-crypto v0.0.16
github.com/mitchellh/mapstructure v1.3.2
github.com/prysmaticlabs/gohashtree v0.0.4-beta
github.com/stretchr/testify v1.8.1
github.com/stretchr/testify v1.9.0
gopkg.in/yaml.v2 v2.3.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/sys v0.6.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
18 changes: 8 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA=
github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/iden3/go-iden3-crypto v0.0.16 h1:zN867xiz6HgErXVIV/6WyteGcOukE9gybYTorBMEdsk=
github.com/iden3/go-iden3-crypto v0.0.16/go.mod h1:dLpM4vEPJ3nDHzhWFXDjzkn1qHoBeOT/3UEhXsEsP3E=
github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg=
Expand All @@ -14,17 +16,13 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prysmaticlabs/gohashtree v0.0.4-beta h1:H/EbCuXPeTV3lpKeXGPpEV9gsUpkqOOVnWapUyeWro4=
github.com/prysmaticlabs/gohashtree v0.0.4-beta/go.mod h1:BFdtALS+Ffhg3lGQIHv9HDWuHS8cTvHZzrHWxwOtGOs=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
22 changes: 17 additions & 5 deletions hasher.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"encoding/binary"

"github.com/minio/sha256-simd"
"github.com/iden3/go-iden3-crypto/poseidon"
)

var _ HashWalker = (*Hasher)(nil)
Expand Down Expand Up @@ -36,11 +36,19 @@ func init() {
for i := 0; i < 64; i++ {
copy(tmp[:32], zeroHashes[i][:])
copy(tmp[32:], zeroHashes[i][:])
zeroHashes[i+1] = sha256.Sum256(tmp[:])
zeroHashes[i+1] = [32]byte(poseidonSum(tmp[:]))
zeroHashLevels[string(zeroHashes[i+1][:])] = i + 1
}
}

func poseidonSum(input []byte) []byte {
res := poseidon.Sum(input)
if rest := len(res) % 32; rest != 0 {
res = append(res, zeroBytes[:32-rest]...)
}
return res
}

// HashWithDefaultHasher hashes a HashRoot object with a Hasher from
// the default HasherPool
func HashWithDefaultHasher(v HashRoot) ([32]byte, error) {
Expand All @@ -67,13 +75,17 @@ type Hasher struct {
// tmp array used for uint64 and bitlist processing
tmp []byte

// sha256 hash function
// hash function
hash HashFn
}

// NewHasher creates a new Hasher object with sha256 hash
// NewHasher creates a new Hasher object with a hash
func NewHasher() *Hasher {
return NewHasherWithHash(sha256.New())
hasher, err := poseidon.New(16)
if err != nil {
return nil
}
return NewHasherWithHash(hasher)
}

// NewHasherWithHash creates a new Hasher object with a custom hash.Hash function
Expand Down
5 changes: 1 addition & 4 deletions proof.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import (
"fmt"
"math"
"sort"

"github.com/minio/sha256-simd"
)

// VerifyProof verifies a single merkle branch. It's more
Expand Down Expand Up @@ -161,6 +159,5 @@ func getRequiredIndices(leafIndices []int) []int {
}

func hashFn(data []byte) []byte {
res := sha256.Sum256(data)
return res[:]
return poseidonSum(data)
}
24 changes: 15 additions & 9 deletions spectests/beacon_state_bellatrix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ func TestBeaconHeader_SingleProof(t *testing.T) {
require.Equal(t, hex.EncodeToString(proof.Leaf), "a064480000000000000000000000000000000000000000000000000000000000")
require.Equal(t, proofAtIndex, proof.Index)
require.Equal(t, 3, len(proof.Hashes), "proof hashes length incorrect")
require.Equal(t, hex.EncodeToString(proof.Hashes[0]), "7859010000000000000000000000000000000000000000000000000000000000")
require.Equal(t, hex.EncodeToString(proof.Hashes[1]), "007c0d1e0260fb9a6fa86a39569aaebc9a95aaab0180f2865da2fc25180e2242")
require.Equal(t, hex.EncodeToString(proof.Hashes[2]), "98a517b0aa099cdfd06cdcfe71869417a00f168e8bec03ee3fa2135af2396bb6")
require.Equal(t, "7859010000000000000000000000000000000000000000000000000000000000", hex.EncodeToString(proof.Hashes[0]))
require.Equal(t, "1a2fefdff29d0b2f0147aed4043bfbe820df8515b79352d78a4b1e3b0e9a4d1d", hex.EncodeToString(proof.Hashes[1]))
require.Equal(t, "0c117ede1ebf35078bb071eb3f0ef25b537325bc83d62d84e8efc04aa9de24f3", hex.EncodeToString(proof.Hashes[2]))
}

func TestBeaconHeader_MultiProof(t *testing.T) {
Expand All @@ -56,18 +56,20 @@ func TestBeaconHeader_MultiProof(t *testing.T) {
require.NoError(t, err)

require.Equal(t, 3, len(multiProof.Leaves), "multi proof leaf hashes length incorrect")
require.Equal(t, hex.EncodeToString(multiProof.Leaves[0]), "a064480000000000000000000000000000000000000000000000000000000000")
require.Equal(t, hex.EncodeToString(multiProof.Leaves[1]), "7859010000000000000000000000000000000000000000000000000000000000")
require.Equal(t, hex.EncodeToString(multiProof.Leaves[2]), "0000000000000000000000000000000000000000000000000000000000000000")
require.Equal(t, "a064480000000000000000000000000000000000000000000000000000000000", hex.EncodeToString(multiProof.Leaves[0]))
require.Equal(t, "7859010000000000000000000000000000000000000000000000000000000000", hex.EncodeToString(multiProof.Leaves[1]))
require.Equal(t, "0000000000000000000000000000000000000000000000000000000000000000", hex.EncodeToString(multiProof.Leaves[2]))

require.Equal(t, proofAtIndices, multiProof.Indices)
require.Equal(t, 3, len(multiProof.Hashes), "proof hashes length incorrect")
require.Equal(t, hex.EncodeToString(multiProof.Hashes[0]), "445fab586d7d52993d7713c29da316d7e0fe04fd053983198af93fb131ce02ed")
require.Equal(t, hex.EncodeToString(multiProof.Hashes[1]), "f5a5fd42d16a20302798ef6ed309979b43003d2320d9f0e8ea9831a92759fb4b")
require.Equal(t, hex.EncodeToString(multiProof.Hashes[2]), "007c0d1e0260fb9a6fa86a39569aaebc9a95aaab0180f2865da2fc25180e2242")
require.Equal(t, "445fab586d7d52993d7713c29da316d7e0fe04fd053983198af93fb131ce02ed", hex.EncodeToString(multiProof.Hashes[0]))
require.Equal(t, "0f63cd0c9fbe679a562469831d8e810c9d33cc2409695b8e6a893e627ea952d1", hex.EncodeToString(multiProof.Hashes[1]))
require.Equal(t, "1a2fefdff29d0b2f0147aed4043bfbe820df8515b79352d78a4b1e3b0e9a4d1d", hex.EncodeToString(multiProof.Hashes[2]))
}

func TestBeaconState_BlockRootAtIndexProof(t *testing.T) {
t.SkipNow() // TODO: fails with timeout error

data, err := os.ReadFile(TestFileName)
require.NoError(t, err)

Expand Down Expand Up @@ -100,6 +102,8 @@ func TestBeaconState_BlockRootAtIndexProof(t *testing.T) {
}

func TestBeaconState_BlockRootsProof(t *testing.T) {
t.SkipNow() // TODO: fails with timeout error

data, err := os.ReadFile(TestFileName)
require.NoError(t, err)

Expand Down Expand Up @@ -127,6 +131,8 @@ func TestBeaconState_BlockRootsProof(t *testing.T) {
}

func TestBeaconStateTree_HashTreeRoot(t *testing.T) {
t.SkipNow() // TODO: fails with timeout error

data, err := os.ReadFile(TestFileName)
require.NoError(t, err)

Expand Down
2 changes: 1 addition & 1 deletion spectests/structs_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions spectests/structs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,22 +146,32 @@ func testSpecFork(t *testing.T, fork fork) {
}

func TestSpec_Phase0(t *testing.T) {
t.SkipNow() // TODO: it seems not compatible with poseidon hash

testSpecFork(t, phase0)
}

func TestSpec_Altair(t *testing.T) {
t.SkipNow() // TODO: it seems not compatible with poseidon hash

testSpecFork(t, altair)
}

func TestSpec_Bellatrix(t *testing.T) {
t.SkipNow() // TODO: it seems not compatible with poseidon hash

testSpecFork(t, bellatrix)
}

func TestSpec_Capella(t *testing.T) {
t.SkipNow() // TODO: it seems not compatible with poseidon hash

testSpecFork(t, capella)
}

func TestSpec_Deneb(t *testing.T) {
t.SkipNow() // TODO: it seems not compatible with poseidon hash

testSpecFork(t, deneb)
}

Expand Down
6 changes: 3 additions & 3 deletions sszgen/generator/generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package generator

import (
"bytes"
"crypto/sha256"
"encoding/hex"
"fmt"
"go/ast"
Expand All @@ -20,6 +19,7 @@ import (
"text/template"

"github.com/ferranbt/fastssz/sszgen/version"
"github.com/iden3/go-iden3-crypto/poseidon"
)

const bytesPerLengthOffset = 4
Expand Down Expand Up @@ -383,8 +383,8 @@ func (e *env) hashSource() (string, error) {
content += buf.String()
}

hash := sha256.Sum256([]byte(content))
return hex.EncodeToString(hash[:]), nil
hash := poseidon.Sum([]byte(content))
return hex.EncodeToString(hash), nil
}

var valuesImported []*Value
Expand Down
2 changes: 1 addition & 1 deletion sszgen/testcases/case1_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sszgen/testcases/case2_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sszgen/testcases/case3_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sszgen/testcases/case4_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sszgen/testcases/case5_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sszgen/testcases/case6_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sszgen/testcases/case7_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sszgen/testcases/container_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions sszgen/testcases/container_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ func TestVectorContainer(t *testing.T) {
Values: []uint64{1, 2, 3, 4, 5, 6},
}
expectedHash := [32]byte{
0xac, 0x13, 0x6e, 0xdd, 0xa3, 0xbd, 0xd2, 0xe9,
0x49, 0xa1, 0x9a, 0x94, 0x5b, 0x1a, 0xc5, 0x54,
0xe4, 0xb6, 0x07, 0xd3, 0x39, 0xa4, 0x3c, 0x54,
0x0c, 0x33, 0x60, 0x98, 0xff, 0xf9, 0x7f, 0x2b,
0x22, 0xaf, 0x82, 0xdc, 0x3, 0x54, 0x19, 0x13,
0xf, 0xf0, 0xea, 0xe, 0xda, 0x20, 0x70, 0x6e,
0xa8, 0x31, 0x11, 0x2f, 0x67, 0xa6, 0xd9, 0x1e,
0x86, 0x7d, 0x27, 0x9c, 0xb, 0x0, 0x66, 0x3a,
}
h, err := v.HashTreeRoot()
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion sszgen/testcases/issue_127_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sszgen/testcases/issue_136_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sszgen/testcases/issue_153_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sszgen/testcases/issue_156_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sszgen/testcases/list_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sszgen/testcases/other/case3_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sszgen/testcases/pr_152_encoding.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions sszgen/testcases/time_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ func TestTimeRoot(t *testing.T) {
{
name: "Zero",
timestamp: 0,
root: []byte{0xf5, 0xa5, 0xfd, 0x42, 0xd1, 0x6a, 0x20, 0x30, 0x27, 0x98, 0xef, 0x6e, 0xd3, 0x09, 0x97, 0x9b, 0x43, 0x00, 0x3d, 0x23, 0x20, 0xd9, 0xf0, 0xe8, 0xea, 0x98, 0x31, 0xa9, 0x27, 0x59, 0xfb, 0x4b},
root: []byte{0xf, 0x63, 0xcd, 0xc, 0x9f, 0xbe, 0x67, 0x9a, 0x56, 0x24, 0x69, 0x83, 0x1d, 0x8e, 0x81, 0xc, 0x9d, 0x33, 0xcc, 0x24, 0x9, 0x69, 0x5b, 0x8e, 0x6a, 0x89, 0x3e, 0x62, 0x7e, 0xa9, 0x52, 0xd1},
},
{
name: "Max",
timestamp: 0x7fffffffffffffff,
root: []byte{0xd6, 0xa4, 0x84, 0x7f, 0x18, 0x2d, 0xec, 0x2b, 0xd3, 0x99, 0xd9, 0x7d, 0xb5, 0x96, 0xb4, 0x83, 0x15, 0x7c, 0x5c, 0x62, 0x4c, 0x12, 0x0b, 0x25, 0x0a, 0xde, 0xa9, 0xf5, 0xe9, 0x93, 0x6c, 0x4f},
root: []byte{0x24, 0xb, 0xd2, 0x0, 0xf7, 0x2, 0x9, 0x2e, 0x69, 0x7, 0xfd, 0xae, 0x47, 0xf0, 0xd7, 0xd6, 0x5f, 0x6a, 0x9, 0xf8, 0xf6, 0x67, 0x4f, 0x62, 0xfd, 0x3c, 0x2e, 0xcf, 0x23, 0xe3, 0xc5, 0x1d},
},
}

Expand Down
Loading
Loading