Skip to content

Commit bd96720

Browse files
jannottijannotti
committed
sha512 opcodes, and access to more header stuff
1 parent e45399e commit bd96720

File tree

9 files changed

+61
-8
lines changed

9 files changed

+61
-8
lines changed

‎data/transactions/logic/assembler_test.go‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,11 @@ pushbytes 0x0123
443443
sumhash512
444444
`
445445

446+
const sha512Nonsense = `
447+
pushbytes 0x0123
448+
sha512
449+
`
450+
446451
const mimcNonsense = `
447452
pushbytes 0x11223344556677889900aabbccddeeff11223344556677889900aabbccddeeff
448453
mimc BLS12_381Mp111
@@ -463,7 +468,7 @@ const v11Nonsense = v10Nonsense + incentiveNonsense + mimcNonsense
463468

464469
const v12Nonsense = v11Nonsense + fvNonsense
465470

466-
const v13Nonsense = v12Nonsense + sumhashNonsense
471+
const v13Nonsense = v12Nonsense + sumhashNonsense + sha512Nonsense
467472

468473
const v6Compiled = "2004010002b7a60c26050242420c68656c6c6f20776f726c6421070123456789abcd208dae2087fbba51304eb02b91f656948397a7946390e8cb70fc9ea4d95f92251d047465737400320032013202320380021234292929292b0431003101310231043105310731083109310a310b310c310d310e310f3111311231133114311533000033000133000233000433000533000733000833000933000a33000b33000c33000d33000e33000f3300113300123300133300143300152d2e01022581f8acd19181cf959a1281f8acd19181cf951a81f8acd19181cf1581f8acd191810f082209240a220b230c240d250e230f2310231123122313231418191a1b1c28171615400003290349483403350222231d4a484848482b50512a632223524100034200004322602261222704634848222862482864286548482228246628226723286828692322700048482371004848361c0037001a0031183119311b311d311e311f312023221e312131223123312431253126312731283129312a312b312c312d312e312f447825225314225427042455220824564c4d4b0222382124391c0081e80780046a6f686e2281d00f23241f880003420001892224902291922494249593a0a1a2a3a4a5a6a7a8a9aaabacadae24af3a00003b003c003d816472064e014f012a57000823810858235b235a2359b03139330039b1b200b322c01a23c1001a2323c21a23c3233e233f8120af06002a494905002a49490700b400b53a03b6b7043cb8033a0c2349c42a9631007300810881088120978101c53a8101c6003a"
469474

@@ -493,7 +498,8 @@ const fvCompiled = "8002abcd494985"
493498
const v12Compiled = v11Compiled + fvCompiled
494499

495500
const sumhashCompiled = "8002012386"
496-
const v13Compiled = v12Compiled + sumhashCompiled
501+
const sha512Compiled = "8002012387"
502+
const v13Compiled = v12Compiled + sumhashCompiled + sha512Compiled
497503

498504
var nonsense = map[uint64]string{
499505
1: v1Nonsense,
@@ -1741,6 +1747,14 @@ global PayoutsPercent
17411747
global PayoutsMinBalance
17421748
global PayoutsMaxBalance
17431749
txn RejectVersion
1750+
pushint 1
1751+
block BlkBranch512
1752+
pushint 1
1753+
block BlkSha512_256TxnCommitment
1754+
pushint 1
1755+
block BlkSha512TxnCommitment
1756+
pushint 1
1757+
block BlkSha256TxnCommitment
17441758
`, AssemblerMaxVersion)
17451759
for _, names := range [][]string{GlobalFieldNames[:], TxnFieldNames[:], blockFieldNames[:]} {
17461760
for _, f := range names {

‎data/transactions/logic/crypto.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,13 @@ func opSumhash512(cx *EvalContext) error {
125125
return nil
126126
}
127127

128+
func opSHA512(cx *EvalContext) error {
129+
last := len(cx.Stack) - 1
130+
hash := sha512.Sum512(cx.Stack[last].Bytes)
131+
cx.Stack[last].Bytes = hash[:]
132+
return nil
133+
}
134+
128135
func opFalconVerify(cx *EvalContext) error {
129136
last := len(cx.Stack) - 1 // index of PK
130137
prev := last - 1 // index of signature

‎data/transactions/logic/crypto_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ int ` + fmt.Sprintf("%d", testLogicBudget-2500-8) + `
793793
}
794794

795795
func BenchmarkHashes(b *testing.B) {
796-
for _, hash := range []string{"sha256", "keccak256" /* skip, same as keccak "sha3_256", */, "sha512_256", "sumhash512", "mimc BN254Mp110", "mimc BLS12_381Mp111"} {
796+
for _, hash := range []string{"sha256", "keccak256" /* skip, same as keccak "sha3_256", */, "sha512_256", "sumhash512", "mimc BN254Mp110", "mimc BLS12_381Mp111", "sha512"} {
797797
for _, size := range []int{0, 32, 128, 512, 1024, 4096} {
798798
if size == 0 && (hash == "mimc BN254Mp110" || hash == "mimc BLS12_381Mp111") {
799799
continue

‎data/transactions/logic/doc.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ var opDescByName = map[string]OpDesc{
3737
"keccak256": {"Keccak256 hash of value A, yields [32]byte", "", nil},
3838
"sha512_256": {"SHA512_256 hash of value A, yields [32]byte", "", nil},
3939
"sha3_256": {"SHA3_256 hash of value A, yields [32]byte", "", nil},
40+
"sha512": {"SHA512 of value A, yields [64]byte", "", nil},
4041

4142
"sumhash512": {"sumhash512 of value A, yields [64]byte", "", nil},
4243
"falcon_verify": {"for (data A, compressed-format signature B, pubkey C) verify the signature of data against the pubkey => {0 or 1}", "", nil},
@@ -361,7 +362,7 @@ var OpGroups = map[string][]string{
361362
"Byte Array Manipulation": {"getbit", "setbit", "getbyte", "setbyte", "concat", "len", "substring", "substring3", "extract", "extract3", "extract_uint16", "extract_uint32", "extract_uint64", "replace2", "replace3", "base64_decode", "json_ref"},
362363
"Byte Array Arithmetic": {"b+", "b-", "b/", "b*", "b<", "b>", "b<=", "b>=", "b==", "b!=", "b%", "bsqrt"},
363364
"Byte Array Logic": {"b|", "b&", "b^", "b~"},
364-
"Cryptography": {"sha256", "keccak256", "sha512_256", "sha3_256", "sumhash512", "falcon_verify", "ed25519verify", "ed25519verify_bare", "ecdsa_verify", "ecdsa_pk_recover", "ecdsa_pk_decompress", "vrf_verify", "ec_add", "ec_scalar_mul", "ec_pairing_check", "ec_multi_scalar_mul", "ec_subgroup_check", "ec_map_to", "mimc"},
365+
"Cryptography": {"sha256", "keccak256", "sha512_256", "sha3_256", "sha512", "sumhash512", "falcon_verify", "ed25519verify", "ed25519verify_bare", "ecdsa_verify", "ecdsa_pk_recover", "ecdsa_pk_decompress", "vrf_verify", "ec_add", "ec_scalar_mul", "ec_pairing_check", "ec_multi_scalar_mul", "ec_subgroup_check", "ec_map_to", "mimc"},
365366
"Loading Values": {"intcblock", "intc", "intc_0", "intc_1", "intc_2", "intc_3", "pushint", "pushints", "bytecblock", "bytec", "bytec_0", "bytec_1", "bytec_2", "bytec_3", "pushbytes", "pushbytess", "bzero", "arg", "arg_0", "arg_1", "arg_2", "arg_3", "args", "txn", "gtxn", "txna", "txnas", "gtxna", "gtxnas", "gtxns", "gtxnsa", "gtxnsas", "global", "load", "loads", "store", "stores", "gload", "gloads", "gloadss", "gaid", "gaids"},
366367
"Flow Control": {"err", "bnz", "bz", "b", "return", "pop", "popn", "dup", "dup2", "dupn", "dig", "bury", "cover", "uncover", "frame_dig", "frame_bury", "swap", "select", "assert", "callsub", "proto", "retsub", "switch", "match"},
367368
"State Access": {"balance", "min_balance", "app_opted_in", "app_local_get", "app_local_get_ex", "app_global_get", "app_global_get_ex", "app_local_put", "app_global_put", "app_local_del", "app_global_del", "asset_holding_get", "asset_params_get", "app_params_get", "acct_params_get", "voter_params_get", "online_stake", "log", "block"},

‎data/transactions/logic/eval.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5828,6 +5828,16 @@ func opBlock(cx *EvalContext) error {
58285828
cx.Stack[last] = stackValue{Uint: hdr.Bonus.Raw}
58295829
case BlkProposerPayout:
58305830
cx.Stack[last] = stackValue{Uint: hdr.ProposerPayout.Raw}
5831+
5832+
case BlkBranch512:
5833+
cx.Stack[last].Bytes = hdr.Branch512[:]
5834+
case BlkSha512_256TxnCommitment:
5835+
cx.Stack[last].Bytes = hdr.NativeSha512_256Commitment[:]
5836+
case BlkSha256TxnCommitment:
5837+
cx.Stack[last].Bytes = hdr.Sha256Commitment[:]
5838+
case BlkSha512TxnCommitment:
5839+
cx.Stack[last].Bytes = hdr.Sha512Commitment[:]
5840+
58315841
default:
58325842
return fmt.Errorf("invalid block field %s", fs.field)
58335843
}

‎data/transactions/logic/fields.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,6 +1075,18 @@ const (
10751075
// BlkProposerPayout is the actual amount moved from feesink to proposer
10761076
BlkProposerPayout
10771077

1078+
// BlkBranch512 is the wider, sha-512 hash of the previous block
1079+
BlkBranch512
1080+
1081+
// BlkSha512_256TxnCommitment is "Algorand Native" txn merkle root
1082+
BlkSha512_256TxnCommitment
1083+
1084+
// BlkSha256TxnCommitment is the sha256 txn merkle root
1085+
BlkSha256TxnCommitment
1086+
1087+
// BlkSha512TxnCommitment is the sha512 txn merkle root
1088+
BlkSha512TxnCommitment
1089+
10781090
invalidBlockField // compile-time constant for number of fields
10791091
)
10801092

@@ -1097,6 +1109,10 @@ var blockFieldSpecs = [...]blockFieldSpec{
10971109
{BlkProtocol, StackBytes, incentiveVersion},
10981110
{BlkTxnCounter, StackUint64, incentiveVersion},
10991111
{BlkProposerPayout, StackUint64, incentiveVersion},
1112+
{BlkBranch512, StackBytes64, 13},
1113+
{BlkSha512_256TxnCommitment, StackBytes32, 13},
1114+
{BlkSha256TxnCommitment, StackBytes32, 13},
1115+
{BlkSha512TxnCommitment, StackBytes64, 13},
11001116
}
11011117

11021118
func blockFieldSpecByField(r BlockField) (blockFieldSpec, bool) {

‎data/transactions/logic/fields_string.go‎

Lines changed: 7 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎data/transactions/logic/opcodes.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,7 @@ var OpSpecs = []OpSpec{
657657
{0x84, "ed25519verify_bare", opEd25519VerifyBare, proto("bb{64}b{32}:T"), 7, costly(1900)},
658658
{0x85, "falcon_verify", opFalconVerify, proto("bb{1232}b{1793}:T"), 12, costly(1700)}, // dynamic for internal hash?
659659
{0x86, "sumhash512", opSumhash512, proto("b:b{64}"), sumhashVersion, costByLength(150, 7, 4, 0)},
660+
{0x87, "sha512", opSHA512, proto("b:b{64}"), 13, costByLength(15, 32, 2, 0)},
660661

661662
// "Function oriented"
662663
{0x88, "callsub", opCallSub, proto(":"), 4, detBranch()},

‎data/transactions/logic/teal.tmLanguage.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
},
7777
{
7878
"name": "keyword.operator.teal",
79-
"match": "^(\\!|\\!\\=|%|\u0026|\u0026\u0026|\\*|\\+|\\-|/|\\\u003c|\\\u003c\\=|\\=\\=|\\\u003e|\\\u003e\\=|\\^|addw|bitlen|btoi|divmodw|divw|exp|expw|itob|mulw|shl|shr|sqrt|\\||\\|\\||\\~|b\\!\\=|b%|b\\*|b\\+|b\\-|b/|b\\\u003c|b\\\u003c\\=|b\\=\\=|b\\\u003e|b\\\u003e\\=|bsqrt|b\u0026|b\\^|b\\||b\\~|base64_decode|concat|extract|extract3|extract_uint16|extract_uint32|extract_uint64|getbit|getbyte|json_ref|len|replace2|replace3|setbit|setbyte|substring|substring3|ec_add|ec_map_to|ec_multi_scalar_mul|ec_pairing_check|ec_scalar_mul|ec_subgroup_check|ecdsa_pk_decompress|ecdsa_pk_recover|ecdsa_verify|ed25519verify|ed25519verify_bare|falcon_verify|keccak256|mimc|sha256|sha3_256|sha512_256|sumhash512|vrf_verify|gitxn|gitxna|gitxnas|itxn|itxn_begin|itxn_field|itxn_next|itxn_submit|itxna|itxnas)\\b"
79+
"match": "^(\\!|\\!\\=|%|\u0026|\u0026\u0026|\\*|\\+|\\-|/|\\\u003c|\\\u003c\\=|\\=\\=|\\\u003e|\\\u003e\\=|\\^|addw|bitlen|btoi|divmodw|divw|exp|expw|itob|mulw|shl|shr|sqrt|\\||\\|\\||\\~|b\\!\\=|b%|b\\*|b\\+|b\\-|b/|b\\\u003c|b\\\u003c\\=|b\\=\\=|b\\\u003e|b\\\u003e\\=|bsqrt|b\u0026|b\\^|b\\||b\\~|base64_decode|concat|extract|extract3|extract_uint16|extract_uint32|extract_uint64|getbit|getbyte|json_ref|len|replace2|replace3|setbit|setbyte|substring|substring3|ec_add|ec_map_to|ec_multi_scalar_mul|ec_pairing_check|ec_scalar_mul|ec_subgroup_check|ecdsa_pk_decompress|ecdsa_pk_recover|ecdsa_verify|ed25519verify|ed25519verify_bare|falcon_verify|keccak256|mimc|sha256|sha3_256|sha512|sha512_256|sumhash512|vrf_verify|gitxn|gitxna|gitxnas|itxn|itxn_begin|itxn_field|itxn_next|itxn_submit|itxna|itxnas)\\b"
8080
}
8181
]
8282
},

0 commit comments

Comments
 (0)