Skip to content

Commit 1dbd39c

Browse files
Aharoneeid-ms
Aharonee
and
id-ms
authored
StateProofs: New block header field - SHA256 merkle root of the transactions (algorand#3829)
Currently, the TxnRoot block header contains the root of the merkle tree built from the transactions in the block, using the SHA512_256 hash function. Since the Ethereum VM (and others) does not support SHA512_256 natively, we have added a new header, which will be used by the Light Clients deployed on other networks in order to verify Algorand blocks. Co-authored-by: algoidan <[email protected]>
1 parent 3dbb351 commit 1dbd39c

File tree

4 files changed

+176
-60
lines changed

4 files changed

+176
-60
lines changed

‎compactcert/structs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
// Params defines common parameters for the verifier and builder.
2727
type Params struct {
28-
Msg crypto.Hashable // Message to be cerified
28+
Msg crypto.Hashable // Message to be certified
2929
ProvenWeight uint64 // Weight threshold proven by the certificate
3030
SigRound basics.Round // The round for which the ephemeral key is committed to
3131
SecKQ uint64 // Security parameter (k+q) from analysis document

‎hashes.go

+9-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package crypto
1818

1919
import (
20+
"crypto/sha256"
2021
"crypto/sha512"
2122
"errors"
2223
"fmt"
@@ -41,7 +42,7 @@ func (h HashType) Validate() error {
4142
const (
4243
Sha512_256 HashType = iota
4344
Sumhash
44-
45+
Sha256
4546
MaxHashType
4647
)
4748

@@ -53,6 +54,7 @@ const MaxHashDigestSize = SumhashDigestSize
5354
const (
5455
Sha512_256Size = sha512.Size256
5556
SumhashDigestSize = sumhash.Sumhash512DigestSize
57+
Sha256Size = sha256.Size
5658
)
5759

5860
// HashFactory is responsible for generating new hashes accordingly to the type it stores.
@@ -71,6 +73,8 @@ func (h HashType) String() string {
7173
return "sha512_256"
7274
case Sumhash:
7375
return "sumhash"
76+
case Sha256:
77+
return "sha256"
7478
default:
7579
return ""
7680
}
@@ -83,6 +87,8 @@ func UnmarshalHashType(s string) (HashType, error) {
8387
return Sha512_256, nil
8488
case "sumhash":
8589
return Sumhash, nil
90+
case "sha256":
91+
return Sha256, nil
8692
default:
8793
return 0, fmt.Errorf("HashType not supported: %s", s)
8894
}
@@ -96,6 +102,8 @@ func (z HashFactory) NewHash() hash.Hash {
96102
return sha512.New512_256()
97103
case Sumhash:
98104
return sumhash.New512(nil)
105+
case Sha256:
106+
return sha256.New()
99107
// This shouldn't be reached, when creating a new hash, one would know the type of hash they wanted,
100108
// in addition to that, unmarshalling of the hashFactory verifies the HashType of the factory.
101109
default:

‎hashes_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ func TestHashFactoryCreatingNewHashes(t *testing.T) {
3737
a.NotNil(h)
3838
a.Equal(SumhashDigestSize, h.Size())
3939

40+
h = HashFactory{HashType: Sha256}.NewHash()
41+
a.NotNil(h)
42+
a.Equal(Sha256Size, h.Size())
4043
}
4144

4245
func TestHashSum(t *testing.T) {

‎merklearray/merkle_test.go

+163-58
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package merklearray
1818

1919
import (
20+
"encoding/hex"
2021
"fmt"
2122
"hash"
2223
"runtime"
@@ -29,9 +30,10 @@ import (
2930
"github.com/algorand/go-algorand/test/partitiontest"
3031
)
3132

33+
// Hex encoded strings representing the byte arrays
3234
type KATElement struct {
33-
expectedRoot []byte
34-
elements [][]byte
35+
expectedRoot string
36+
elements []string
3537
}
3638

3739
type TestMessage string
@@ -589,101 +591,199 @@ func testMerkelSizeLimits(t *testing.T, hashtype crypto.HashType, size uint64, p
589591
return tree, proof
590592
}
591593

592-
var KATs = []KATElement{
594+
var KATsSHA256 = []KATElement{
593595
{
594-
[]byte{223, 165, 76, 43, 118, 131, 205, 83, 151, 176, 50, 187, 236, 17, 236, 27, 119, 185, 251, 236, 90, 86, 201, 233, 66, 15, 107, 153, 128, 120, 64, 52},
595-
[][]byte{{212, 60, 103, 72, 82, 10, 118, 248, 31, 184, 37, 10, 169, 225, 166, 86, 240, 115, 255, 241, 229, 81, 86, 47, 173, 67, 233, 255, 251, 26, 184, 139}},
596+
"5a7fb9d3fb8976d942feac36d762b8d0530476c022c297582123eca18ad8c7b8",
597+
[]string{
598+
"d43c6748520a76f81fb8250aa9e1a656f073fff1e551562fad43e9fffb1ab88b",
599+
},
600+
},
601+
{
602+
"c9bc24bd5fc8961a8721458fd93044871c9009fe4c66b9614744dd6e9216d93f",
603+
[]string{
604+
"27a9011335fc96dc095f348a6c9347d3c7cdd56c57c650297d87df95d13f770b",
605+
"5878453e4d5bce024b4ee07f6c57186868f3410348f5a7d601c0d9ce1efed239",
606+
},
607+
},
608+
{
609+
"ad1828b8460ec541fdbeee2eb4f9d37cfad9da54c0c3a98b1eb20d24de9af6ce",
610+
[]string{
611+
"44b5606ae49d81bc7f3451c4ff803998a8fe0057e22d6367080e5a155b661008",
612+
"70ce7df8bda42920f5e75ae788ee7b9809826a92701a4e0e490138380ea60f44",
613+
"77b439e99f764a1f6749e669b1361fe3bb5ce41beac4b5cd55fe51aa9efe3c67",
614+
},
615+
},
616+
{
617+
"d78b0c411d1360bd6d49c755a60f9ada519942911411269637287bd0b5c19bab",
618+
[]string{
619+
"faae213dd72151728a24c36f9aa3e07efbe326c058f85f6822c1dc2175e09d99",
620+
"29e90fcc4b1c9513bc155c018db796d07e97c7a5009bd7a5eed4281e93de9413",
621+
"f93c340847344999651c1bd71949cb974c7cad7bd421ccc677670f686ae520cc",
622+
"76a8ebfe26a3353c2702937191dd766215689e5a07bda60fffd48ecfc22084d4",
623+
},
624+
},
625+
{
626+
"f8744f4648d1974c38fca858873006126d93f1a150f0eb7da1072fef83e66341",
627+
[]string{
628+
"fc2d600b2e43457221e35fcf4275221f66d6ce250b8696879d7ce7a4974f975d",
629+
"a3fa0c2e13151fd3c3d002a5450819ae7150a1172decad45e2aa93056ab245b6",
630+
"eb0e437994a16b1c3b8dfee99b6e8630c7bbb12f88759eb774b4e3935c551106",
631+
"3a44dce2fba3f26f0e0ae2c47483e8cb1d815f9d9981f030edc380d4efac4f57",
632+
"52c4079055e96c3ef3114ca93188410e8a8a08aa7e53dfb2bb18c301756faf9e",
633+
},
634+
},
635+
}
636+
637+
var KATsSUMHASH = []KATElement{
638+
{
639+
"a1951e9ec9d630a975fbbdf5fa290f66bf2c55fbf5ec5ad5de08d281a971d97a64a0475d6d93ddda4480b1dbaaf33f7d72f79f9076da029e148fca0ba354b58c",
640+
[]string{
641+
"d43c6748520a76f81fb8250aa9e1a656f073fff1e551562fad43e9fffb1ab88b",
642+
},
643+
},
644+
{
645+
"8b60182211195e366021236b8bd26b004f0773f41de837dff8c483357d26aff1c06c8692b96df11fe30b2c87e6400a005d7f6e71e9b3b1f39207fe4525719cd2",
646+
[]string{
647+
"27a9011335fc96dc095f348a6c9347d3c7cdd56c57c650297d87df95d13f770b",
648+
"5878453e4d5bce024b4ee07f6c57186868f3410348f5a7d601c0d9ce1efed239",
649+
},
650+
},
651+
{
652+
"8c427bfa1723d733b20ac58e2ce6c9791a25e9bdd57e1dc252e98b6b909a089e1c9077cea3852df6495cacbe750f41a777c593e5ce5d132d49b354b2790ae9a8",
653+
[]string{
654+
"44b5606ae49d81bc7f3451c4ff803998a8fe0057e22d6367080e5a155b661008",
655+
"70ce7df8bda42920f5e75ae788ee7b9809826a92701a4e0e490138380ea60f44",
656+
"77b439e99f764a1f6749e669b1361fe3bb5ce41beac4b5cd55fe51aa9efe3c67",
657+
},
596658
},
597659
{
598-
[]byte{117, 207, 58, 54, 89, 80, 47, 147, 38, 223, 250, 114, 218, 81, 102, 235, 222, 29, 19, 246, 82, 156, 146, 35, 36, 135, 70, 68, 244, 183, 97, 110},
599-
[][]byte{
600-
{39, 169, 1, 19, 53, 252, 150, 220, 9, 95, 52, 138, 108, 147, 71, 211, 199, 205, 213, 108, 87, 198, 80, 41, 125, 135, 223, 149, 209, 63, 119, 11},
601-
{88, 120, 69, 62, 77, 91, 206, 2, 75, 78, 224, 127, 108, 87, 24, 104, 104, 243, 65, 3, 72, 245, 167, 214, 1, 192, 217, 206, 30, 254, 210, 57},
660+
"09b34fb15d43b16a22e7830ede8df4f84f4b63f46af2f6843aaf36a08c5652bcdf033162e2002c658265f4395058af1b4cef13dee70ebef4ca2cd8e870bd50c6",
661+
[]string{
662+
"faae213dd72151728a24c36f9aa3e07efbe326c058f85f6822c1dc2175e09d99",
663+
"29e90fcc4b1c9513bc155c018db796d07e97c7a5009bd7a5eed4281e93de9413",
664+
"f93c340847344999651c1bd71949cb974c7cad7bd421ccc677670f686ae520cc",
665+
"76a8ebfe26a3353c2702937191dd766215689e5a07bda60fffd48ecfc22084d4",
602666
},
603667
},
604668
{
605-
[]byte{7, 177, 51, 83, 39, 122, 156, 203, 107, 66, 79, 87, 58, 180, 252, 158, 38, 138, 1, 39, 206, 188, 73, 150, 82, 146, 64, 181, 226, 155, 109, 233},
606-
[][]byte{
607-
{68, 181, 96, 106, 228, 157, 129, 188, 127, 52, 81, 196, 255, 128, 57, 152, 168, 254, 0, 87, 226, 45, 99, 103, 8, 14, 90, 21, 91, 102, 16, 8},
608-
{112, 206, 125, 248, 189, 164, 41, 32, 245, 231, 90, 231, 136, 238, 123, 152, 9, 130, 106, 146, 112, 26, 78, 14, 73, 1, 56, 56, 14, 166, 15, 68},
609-
{119, 180, 57, 233, 159, 118, 74, 31, 103, 73, 230, 105, 177, 54, 31, 227, 187, 92, 228, 27, 234, 196, 181, 205, 85, 254, 81, 170, 158, 254, 60, 103},
669+
"6a55c0f451c211e1c961871cc0bb640c103768f0d25ddfa0b1c1d054e92adcd1480cdca21af805da887540d343fe78a3a515c761becc7e66371b740f6ff13b6b",
670+
[]string{
671+
"fc2d600b2e43457221e35fcf4275221f66d6ce250b8696879d7ce7a4974f975d",
672+
"a3fa0c2e13151fd3c3d002a5450819ae7150a1172decad45e2aa93056ab245b6",
673+
"eb0e437994a16b1c3b8dfee99b6e8630c7bbb12f88759eb774b4e3935c551106",
674+
"3a44dce2fba3f26f0e0ae2c47483e8cb1d815f9d9981f030edc380d4efac4f57",
675+
"52c4079055e96c3ef3114ca93188410e8a8a08aa7e53dfb2bb18c301756faf9e",
676+
},
677+
},
678+
}
679+
680+
var KATsSHA512_256 = []KATElement{
681+
{
682+
"dfa54c2b7683cd5397b032bbec11ec1b77b9fbec5a56c9e9420f6b9980784034",
683+
[]string{
684+
"d43c6748520a76f81fb8250aa9e1a656f073fff1e551562fad43e9fffb1ab88b",
610685
},
611686
},
612687
{
613-
[]byte{50, 251, 85, 206, 75, 56, 190, 244, 154, 96, 138, 178, 226, 117, 12, 255, 22, 50, 26, 246, 34, 43, 225, 20, 151, 233, 26, 249, 252, 146, 165, 63},
614-
[][]byte{
615-
{250, 174, 33, 61, 215, 33, 81, 114, 138, 36, 195, 111, 154, 163, 224, 126, 251, 227, 38, 192, 88, 248, 95, 104, 34, 193, 220, 33, 117, 224, 157, 153},
616-
{41, 233, 15, 204, 75, 28, 149, 19, 188, 21, 92, 1, 141, 183, 150, 208, 126, 151, 199, 165, 0, 155, 215, 165, 238, 212, 40, 30, 147, 222, 148, 19},
617-
{249, 60, 52, 8, 71, 52, 73, 153, 101, 28, 27, 215, 25, 73, 203, 151, 76, 124, 173, 123, 212, 33, 204, 198, 119, 103, 15, 104, 106, 229, 32, 204},
618-
{118, 168, 235, 254, 38, 163, 53, 60, 39, 2, 147, 113, 145, 221, 118, 98, 21, 104, 158, 90, 7, 189, 166, 15, 255, 212, 142, 207, 194, 32, 132, 212},
688+
"75cf3a3659502f9326dffa72da5166ebde1d13f6529c922324874644f4b7616e",
689+
[]string{
690+
"27a9011335fc96dc095f348a6c9347d3c7cdd56c57c650297d87df95d13f770b",
691+
"5878453e4d5bce024b4ee07f6c57186868f3410348f5a7d601c0d9ce1efed239",
619692
},
620693
},
621694
{
622-
[]byte{23, 88, 226, 198, 37, 223, 43, 60, 98, 133, 183, 139, 102, 123, 221, 123, 0, 86, 205, 53, 28, 245, 228, 182, 120, 52, 206, 148, 27, 1, 84, 194},
623-
[][]byte{
624-
{252, 45, 96, 11, 46, 67, 69, 114, 33, 227, 95, 207, 66, 117, 34, 31, 102, 214, 206, 37, 11, 134, 150, 135, 157, 124, 231, 164, 151, 79, 151, 93},
625-
{163, 250, 12, 46, 19, 21, 31, 211, 195, 208, 2, 165, 69, 8, 25, 174, 113, 80, 161, 23, 45, 236, 173, 69, 226, 170, 147, 5, 106, 178, 69, 182},
626-
{235, 14, 67, 121, 148, 161, 107, 28, 59, 141, 254, 233, 155, 110, 134, 48, 199, 187, 177, 47, 136, 117, 158, 183, 116, 180, 227, 147, 92, 85, 17, 6},
627-
{58, 68, 220, 226, 251, 163, 242, 111, 14, 10, 226, 196, 116, 131, 232, 203, 29, 129, 95, 157, 153, 129, 240, 48, 237, 195, 128, 212, 239, 172, 79, 87},
628-
{82, 196, 7, 144, 85, 233, 108, 62, 243, 17, 76, 169, 49, 136, 65, 14, 138, 138, 8, 170, 126, 83, 223, 178, 187, 24, 195, 1, 117, 111, 175, 158},
695+
"07b13353277a9ccb6b424f573ab4fc9e268a0127cebc4996529240b5e29b6de9",
696+
[]string{
697+
"44b5606ae49d81bc7f3451c4ff803998a8fe0057e22d6367080e5a155b661008",
698+
"70ce7df8bda42920f5e75ae788ee7b9809826a92701a4e0e490138380ea60f44",
699+
"77b439e99f764a1f6749e669b1361fe3bb5ce41beac4b5cd55fe51aa9efe3c67",
700+
},
701+
},
702+
{
703+
"32fb55ce4b38bef49a608ab2e2750cff16321af6222be11497e91af9fc92a53f",
704+
[]string{
705+
"faae213dd72151728a24c36f9aa3e07efbe326c058f85f6822c1dc2175e09d99",
706+
"29e90fcc4b1c9513bc155c018db796d07e97c7a5009bd7a5eed4281e93de9413",
707+
"f93c340847344999651c1bd71949cb974c7cad7bd421ccc677670f686ae520cc",
708+
"76a8ebfe26a3353c2702937191dd766215689e5a07bda60fffd48ecfc22084d4",
709+
},
710+
},
711+
{
712+
"1758e2c625df2b3c6285b78b667bdd7b0056cd351cf5e4b67834ce941b0154c2",
713+
[]string{
714+
"fc2d600b2e43457221e35fcf4275221f66d6ce250b8696879d7ce7a4974f975d",
715+
"a3fa0c2e13151fd3c3d002a5450819ae7150a1172decad45e2aa93056ab245b6",
716+
"eb0e437994a16b1c3b8dfee99b6e8630c7bbb12f88759eb774b4e3935c551106",
717+
"3a44dce2fba3f26f0e0ae2c47483e8cb1d815f9d9981f030edc380d4efac4f57",
718+
"52c4079055e96c3ef3114ca93188410e8a8a08aa7e53dfb2bb18c301756faf9e",
629719
},
630720
},
631721
}
632722

633723
var VCKATs = []KATElement{
634724
{
635-
[]byte{223, 165, 76, 43, 118, 131, 205, 83, 151, 176, 50, 187, 236, 17, 236, 27, 119, 185, 251, 236, 90, 86, 201, 233, 66, 15, 107, 153, 128, 120, 64, 52},
636-
[][]byte{{212, 60, 103, 72, 82, 10, 118, 248, 31, 184, 37, 10, 169, 225, 166, 86, 240, 115, 255, 241, 229, 81, 86, 47, 173, 67, 233, 255, 251, 26, 184, 139}},
725+
"dfa54c2b7683cd5397b032bbec11ec1b77b9fbec5a56c9e9420f6b9980784034",
726+
[]string{
727+
"d43c6748520a76f81fb8250aa9e1a656f073fff1e551562fad43e9fffb1ab88b",
728+
},
637729
},
638730
{
639-
[]byte{117, 207, 58, 54, 89, 80, 47, 147, 38, 223, 250, 114, 218, 81, 102, 235, 222, 29, 19, 246, 82, 156, 146, 35, 36, 135, 70, 68, 244, 183, 97, 110},
640-
[][]byte{
641-
{39, 169, 1, 19, 53, 252, 150, 220, 9, 95, 52, 138, 108, 147, 71, 211, 199, 205, 213, 108, 87, 198, 80, 41, 125, 135, 223, 149, 209, 63, 119, 11},
642-
{88, 120, 69, 62, 77, 91, 206, 2, 75, 78, 224, 127, 108, 87, 24, 104, 104, 243, 65, 3, 72, 245, 167, 214, 1, 192, 217, 206, 30, 254, 210, 57},
731+
"75cf3a3659502f9326dffa72da5166ebde1d13f6529c922324874644f4b7616e",
732+
[]string{
733+
"27a9011335fc96dc095f348a6c9347d3c7cdd56c57c650297d87df95d13f770b",
734+
"5878453e4d5bce024b4ee07f6c57186868f3410348f5a7d601c0d9ce1efed239",
643735
},
644736
},
645737
{
646-
[]byte{56, 245, 10, 65, 222, 10, 236, 127, 224, 228, 244, 247, 143, 31, 84, 13, 93, 198, 17, 209, 144, 160, 206, 206, 111, 1, 40, 234, 42, 2, 127, 94},
647-
[][]byte{
648-
{68, 181, 96, 106, 228, 157, 129, 188, 127, 52, 81, 196, 255, 128, 57, 152, 168, 254, 0, 87, 226, 45, 99, 103, 8, 14, 90, 21, 91, 102, 16, 8},
649-
{112, 206, 125, 248, 189, 164, 41, 32, 245, 231, 90, 231, 136, 238, 123, 152, 9, 130, 106, 146, 112, 26, 78, 14, 73, 1, 56, 56, 14, 166, 15, 68},
650-
{119, 180, 57, 233, 159, 118, 74, 31, 103, 73, 230, 105, 177, 54, 31, 227, 187, 92, 228, 27, 234, 196, 181, 205, 85, 254, 81, 170, 158, 254, 60, 103},
738+
"38f50a41de0aec7fe0e4f4f78f1f540d5dc611d190a0cece6f0128ea2a027f5e",
739+
[]string{
740+
"44b5606ae49d81bc7f3451c4ff803998a8fe0057e22d6367080e5a155b661008",
741+
"70ce7df8bda42920f5e75ae788ee7b9809826a92701a4e0e490138380ea60f44",
742+
"77b439e99f764a1f6749e669b1361fe3bb5ce41beac4b5cd55fe51aa9efe3c67",
651743
},
652744
},
653745
{
654-
[]byte{149, 179, 79, 29, 252, 65, 254, 212, 129, 21, 202, 49, 189, 67, 34, 93, 255, 147, 245, 64, 56, 124, 35, 10, 207, 166, 67, 226, 103, 248, 141, 120},
655-
[][]byte{
656-
{250, 174, 33, 61, 215, 33, 81, 114, 138, 36, 195, 111, 154, 163, 224, 126, 251, 227, 38, 192, 88, 248, 95, 104, 34, 193, 220, 33, 117, 224, 157, 153},
657-
{41, 233, 15, 204, 75, 28, 149, 19, 188, 21, 92, 1, 141, 183, 150, 208, 126, 151, 199, 165, 0, 155, 215, 165, 238, 212, 40, 30, 147, 222, 148, 19},
658-
{249, 60, 52, 8, 71, 52, 73, 153, 101, 28, 27, 215, 25, 73, 203, 151, 76, 124, 173, 123, 212, 33, 204, 198, 119, 103, 15, 104, 106, 229, 32, 204},
659-
{118, 168, 235, 254, 38, 163, 53, 60, 39, 2, 147, 113, 145, 221, 118, 98, 21, 104, 158, 90, 7, 189, 166, 15, 255, 212, 142, 207, 194, 32, 132, 212},
746+
"95b34f1dfc41fed48115ca31bd43225dff93f540387c230acfa643e267f88d78",
747+
[]string{
748+
"faae213dd72151728a24c36f9aa3e07efbe326c058f85f6822c1dc2175e09d99",
749+
"29e90fcc4b1c9513bc155c018db796d07e97c7a5009bd7a5eed4281e93de9413",
750+
"f93c340847344999651c1bd71949cb974c7cad7bd421ccc677670f686ae520cc",
751+
"76a8ebfe26a3353c2702937191dd766215689e5a07bda60fffd48ecfc22084d4",
660752
},
661753
},
662754
{
663-
[]byte{151, 119, 38, 117, 253, 236, 112, 179, 1, 14, 240, 139, 87, 243, 203, 241, 230, 247, 178, 63, 65, 17, 80, 118, 188, 195, 74, 221, 141, 140, 10, 27},
664-
[][]byte{
665-
{252, 45, 96, 11, 46, 67, 69, 114, 33, 227, 95, 207, 66, 117, 34, 31, 102, 214, 206, 37, 11, 134, 150, 135, 157, 124, 231, 164, 151, 79, 151, 93},
666-
{163, 250, 12, 46, 19, 21, 31, 211, 195, 208, 2, 165, 69, 8, 25, 174, 113, 80, 161, 23, 45, 236, 173, 69, 226, 170, 147, 5, 106, 178, 69, 182},
667-
{235, 14, 67, 121, 148, 161, 107, 28, 59, 141, 254, 233, 155, 110, 134, 48, 199, 187, 177, 47, 136, 117, 158, 183, 116, 180, 227, 147, 92, 85, 17, 6},
668-
{58, 68, 220, 226, 251, 163, 242, 111, 14, 10, 226, 196, 116, 131, 232, 203, 29, 129, 95, 157, 153, 129, 240, 48, 237, 195, 128, 212, 239, 172, 79, 87},
669-
{82, 196, 7, 144, 85, 233, 108, 62, 243, 17, 76, 169, 49, 136, 65, 14, 138, 138, 8, 170, 126, 83, 223, 178, 187, 24, 195, 1, 117, 111, 175, 158},
755+
"97772675fdec70b3010ef08b57f3cbf1e6f7b23f41115076bcc34add8d8c0a1b",
756+
[]string{
757+
"fc2d600b2e43457221e35fcf4275221f66d6ce250b8696879d7ce7a4974f975d",
758+
"a3fa0c2e13151fd3c3d002a5450819ae7150a1172decad45e2aa93056ab245b6",
759+
"eb0e437994a16b1c3b8dfee99b6e8630c7bbb12f88759eb774b4e3935c551106",
760+
"3a44dce2fba3f26f0e0ae2c47483e8cb1d815f9d9981f030edc380d4efac4f57",
761+
"52c4079055e96c3ef3114ca93188410e8a8a08aa7e53dfb2bb18c301756faf9e",
670762
},
671763
},
672764
}
673765

674766
func TestMerkleTreeKATs(t *testing.T) {
675767
partitiontest.PartitionTest(t)
676768

769+
testMerkleTreeKATsAux(t, KATsSHA512_256, crypto.Sha512_256)
770+
testMerkleTreeKATsAux(t, KATsSUMHASH, crypto.Sumhash)
771+
testMerkleTreeKATsAux(t, KATsSHA256, crypto.Sha256)
772+
}
773+
774+
func testMerkleTreeKATsAux(t *testing.T, KATs []KATElement, hashType crypto.HashType) {
677775
for j := 0; j < len(KATs); j++ {
678776
a := make(TestArray, len(KATs[j].elements))
679777
for i := 0; i < len(KATs[j].elements); i++ {
680-
copy(a[i][:], KATs[j].elements[i])
778+
decodedBytes, err := hex.DecodeString(KATs[j].elements[i])
779+
require.NoError(t, err)
780+
copy(a[i][:], decodedBytes)
681781
}
682782
root := KATs[j].expectedRoot
683-
tree, err := Build(a, crypto.HashFactory{HashType: crypto.Sha512_256})
783+
tree, err := Build(a, crypto.HashFactory{HashType: hashType})
684784
require.NoError(t, err)
685-
root2 := tree.Root()
686-
require.Equal(t, root, []byte(root2), "mismatched roots on KATs index %d", j)
785+
root2 := hex.EncodeToString(tree.Root())
786+
require.Equal(t, root, root2, "mismatched roots on KATs %s index %d", hashType.String(), j)
687787
}
688788
}
689789

@@ -693,13 +793,15 @@ func TestVCKATs(t *testing.T) {
693793
for j := 0; j < len(VCKATs); j++ {
694794
a := make(TestArray, len(VCKATs[j].elements))
695795
for i := 0; i < len(VCKATs[j].elements); i++ {
696-
copy(a[i][:], VCKATs[j].elements[i])
796+
decodedBytes, err := hex.DecodeString(VCKATs[j].elements[i])
797+
require.NoError(t, err)
798+
copy(a[i][:], decodedBytes)
697799
}
698800
root := VCKATs[j].expectedRoot
699801
tree, err := BuildVectorCommitmentTree(a, crypto.HashFactory{HashType: crypto.Sha512_256})
700802
require.NoError(t, err)
701-
root2 := tree.Root()
702-
require.Equal(t, root, []byte(root2), "mismatched roots on KATs index %d", j)
803+
root2 := hex.EncodeToString(tree.Root())
804+
require.Equal(t, root, root2, "mismatched roots on VCKATs index %d", j)
703805
}
704806
}
705807

@@ -1062,6 +1164,7 @@ func TestVCProveSingleLeaf(t *testing.T) {
10621164
func BenchmarkMerkleCommit(b *testing.B) {
10631165
b.Run("sha512_256", func(b *testing.B) { merkleCommitBench(b, crypto.Sha512_256) })
10641166
b.Run("sumhash", func(b *testing.B) { merkleCommitBench(b, crypto.Sumhash) })
1167+
b.Run("sha256", func(b *testing.B) { merkleCommitBench(b, crypto.Sha256) })
10651168
}
10661169

10671170
func merkleCommitBench(b *testing.B, hashType crypto.HashType) {
@@ -1088,6 +1191,7 @@ func merkleCommitBench(b *testing.B, hashType crypto.HashType) {
10881191
func BenchmarkMerkleProve1M(b *testing.B) {
10891192
b.Run("sha512_256", func(b *testing.B) { benchmarkMerkleProve1M(b, crypto.Sha512_256) })
10901193
b.Run("sumhash", func(b *testing.B) { benchmarkMerkleProve1M(b, crypto.Sumhash) })
1194+
b.Run("sha256", func(b *testing.B) { benchmarkMerkleProve1M(b, crypto.Sha256) })
10911195
}
10921196

10931197
func benchmarkMerkleProve1M(b *testing.B, hashType crypto.HashType) {
@@ -1113,6 +1217,7 @@ func benchmarkMerkleProve1M(b *testing.B, hashType crypto.HashType) {
11131217
func BenchmarkMerkleVerify1M(b *testing.B) {
11141218
b.Run("sha512_256", func(b *testing.B) { benchmarkMerkleVerify1M(b, crypto.Sha512_256) })
11151219
b.Run("sumhash", func(b *testing.B) { benchmarkMerkleVerify1M(b, crypto.Sumhash) })
1220+
b.Run("sha256", func(b *testing.B) { benchmarkMerkleVerify1M(b, crypto.Sha256) })
11161221
}
11171222

11181223
func benchmarkMerkleVerify1M(b *testing.B, hashType crypto.HashType) {

0 commit comments

Comments
 (0)