Skip to content

Commit 22fdbee

Browse files
karalabekaralabe
authored
Merge pull request #19972 from keep-network/istanbul-eip-152-blake2b-f-precompile
core/vm, crypto/blake2b: add BLAKE2b compression func at 0x09
2 parents 2ed729d + 1bccafe commit 22fdbee

14 files changed

+2844
-3
lines changed

‎core/vm/contracts.go‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ package vm
1818

1919
import (
2020
"crypto/sha256"
21+
"encoding/binary"
2122
"errors"
2223
"math/big"
2324

2425
"github.com/ethereum/go-ethereum/common"
2526
"github.com/ethereum/go-ethereum/common/math"
2627
"github.com/ethereum/go-ethereum/crypto"
28+
"github.com/ethereum/go-ethereum/crypto/blake2b"
2729
"github.com/ethereum/go-ethereum/crypto/bn256"
2830
"github.com/ethereum/go-ethereum/params"
2931
"golang.org/x/crypto/ripemd160"
@@ -70,6 +72,7 @@ var PrecompiledContractsIstanbul = map[common.Address]PrecompiledContract{
7072
common.BytesToAddress([]byte{6}): &bn256AddIstanbul{},
7173
common.BytesToAddress([]byte{7}): &bn256ScalarMulIstanbul{},
7274
common.BytesToAddress([]byte{8}): &bn256PairingIstanbul{},
75+
common.BytesToAddress([]byte{9}): &blake2F{},
7376
}
7477

7578
// RunPrecompiledContract runs and evaluates the output of a precompiled contract.
@@ -431,3 +434,64 @@ func (c *bn256PairingByzantium) RequiredGas(input []byte) uint64 {
431434
func (c *bn256PairingByzantium) Run(input []byte) ([]byte, error) {
432435
return runBn256Pairing(input)
433436
}
437+
438+
type blake2F struct{}
439+
440+
func (c *blake2F) RequiredGas(input []byte) uint64 {
441+
// If the input is malformed, we can't calculate the gas, return 0 and let the
442+
// actual call choke and fault.
443+
if len(input) != blake2FInputLength {
444+
return 0
445+
}
446+
return uint64(binary.BigEndian.Uint32(input[0:4]))
447+
}
448+
449+
const (
450+
blake2FInputLength = 213
451+
blake2FFinalBlockBytes = byte(1)
452+
blake2FNonFinalBlockBytes = byte(0)
453+
)
454+
455+
var (
456+
errBlake2FInvalidInputLength = errors.New("invalid input length")
457+
errBlake2FInvalidFinalFlag = errors.New("invalid final flag")
458+
)
459+
460+
func (c *blake2F) Run(input []byte) ([]byte, error) {
461+
// Make sure the input is valid (correct lenth and final flag)
462+
if len(input) != blake2FInputLength {
463+
return nil, errBlake2FInvalidInputLength
464+
}
465+
if input[212] != blake2FNonFinalBlockBytes && input[212] != blake2FFinalBlockBytes {
466+
return nil, errBlake2FInvalidFinalFlag
467+
}
468+
// Parse the input into the Blake2b call parameters
469+
var (
470+
rounds = binary.BigEndian.Uint32(input[0:4])
471+
final = (input[212] == blake2FFinalBlockBytes)
472+
473+
h [8]uint64
474+
m [16]uint64
475+
t [2]uint64
476+
)
477+
for i := 0; i < 8; i++ {
478+
offset := 4 + i*8
479+
h[i] = binary.LittleEndian.Uint64(input[offset : offset+8])
480+
}
481+
for i := 0; i < 16; i++ {
482+
offset := 68 + i*8
483+
m[i] = binary.LittleEndian.Uint64(input[offset : offset+8])
484+
}
485+
t[0] = binary.LittleEndian.Uint64(input[196:204])
486+
t[1] = binary.LittleEndian.Uint64(input[204:212])
487+
488+
// Execute the compression function, extract and return the result
489+
blake2b.F(&h, m, t, final, rounds)
490+
491+
output := make([]byte, 64)
492+
for i := 0; i < 8; i++ {
493+
offset := i * 8
494+
binary.LittleEndian.PutUint64(output[offset:offset+8], h[i])
495+
}
496+
return output, nil
497+
}

‎core/vm/contracts_test.go‎

Lines changed: 95 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package vm
1919
import (
2020
"fmt"
2121
"math/big"
22+
"reflect"
2223
"testing"
2324

2425
"github.com/ethereum/go-ethereum/common"
@@ -32,6 +33,14 @@ type precompiledTest struct {
3233
noBenchmark bool // Benchmark primarily the worst-cases
3334
}
3435

36+
// precompiledFailureTest defines the input/error pairs for precompiled
37+
// contract failure tests.
38+
type precompiledFailureTest struct {
39+
input string
40+
expectedError error
41+
name string
42+
}
43+
3544
// modexpTests are the test and benchmark data for the modexp precompiled contract.
3645
var modexpTests = []precompiledTest{
3746
{
@@ -336,8 +345,61 @@ var bn256PairingTests = []precompiledTest{
336345
},
337346
}
338347

348+
// EIP-152 test vectors
349+
var blake2FMalformedInputTests = []precompiledFailureTest{
350+
{
351+
input: "",
352+
expectedError: errBlake2FInvalidInputLength,
353+
name: "vector 0: empty input",
354+
},
355+
{
356+
input: "00000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001",
357+
expectedError: errBlake2FInvalidInputLength,
358+
name: "vector 1: less than 213 bytes input",
359+
},
360+
{
361+
input: "000000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001",
362+
expectedError: errBlake2FInvalidInputLength,
363+
name: "vector 2: more than 213 bytes input",
364+
},
365+
{
366+
input: "0000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000002",
367+
expectedError: errBlake2FInvalidFinalFlag,
368+
name: "vector 3: malformed final block indicator flag",
369+
},
370+
}
371+
372+
// EIP-152 test vectors
373+
var blake2FTests = []precompiledTest{
374+
{
375+
input: "0000000048c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001",
376+
expected: "08c9bcf367e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d282e6ad7f520e511f6c3e2b8c68059b9442be0454267ce079217e1319cde05b",
377+
name: "vector 4",
378+
},
379+
{ // https://tools.ietf.org/html/rfc7693#appendix-A
380+
input: "0000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001",
381+
expected: "ba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d17d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923",
382+
name: "vector 5",
383+
},
384+
{
385+
input: "0000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000",
386+
expected: "75ab69d3190a562c51aef8d88f1c2775876944407270c42c9844252c26d2875298743e7f6d5ea2f2d3e8d226039cd31b4e426ac4f2d3d666a610c2116fde4735",
387+
name: "vector 6",
388+
},
389+
{
390+
input: "0000000148c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001",
391+
expected: "b63a380cb2897d521994a85234ee2c181b5f844d2c624c002677e9703449d2fba551b3a8333bcdf5f2f7e08993d53923de3d64fcc68c034e717b9293fed7a421",
392+
name: "vector 7",
393+
},
394+
{
395+
input: "007A120048c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001",
396+
expected: "6d2ce9e534d50e18ff866ae92d70cceba79bbcd14c63819fe48752c8aca87a4bb7dcc230d22a4047f0486cfcfb50a17b24b2899eb8fca370f22240adb5170189",
397+
name: "vector 8",
398+
},
399+
}
400+
339401
func testPrecompiled(addr string, test precompiledTest, t *testing.T) {
340-
p := PrecompiledContractsByzantium[common.HexToAddress(addr)]
402+
p := PrecompiledContractsIstanbul[common.HexToAddress(addr)]
341403
in := common.Hex2Bytes(test.input)
342404
contract := NewContract(AccountRef(common.HexToAddress("1337")),
343405
nil, new(big.Int), p.RequiredGas(in))
@@ -350,11 +412,25 @@ func testPrecompiled(addr string, test precompiledTest, t *testing.T) {
350412
})
351413
}
352414

415+
func testPrecompiledFailure(addr string, test precompiledFailureTest, t *testing.T) {
416+
p := PrecompiledContractsIstanbul[common.HexToAddress(addr)]
417+
in := common.Hex2Bytes(test.input)
418+
contract := NewContract(AccountRef(common.HexToAddress("31337")),
419+
nil, new(big.Int), p.RequiredGas(in))
420+
421+
t.Run(test.name, func(t *testing.T) {
422+
_, err := RunPrecompiledContract(p, in, contract)
423+
if !reflect.DeepEqual(err, test.expectedError) {
424+
t.Errorf("Expected error [%v], got [%v]", test.expectedError, err)
425+
}
426+
})
427+
}
428+
353429
func benchmarkPrecompiled(addr string, test precompiledTest, bench *testing.B) {
354430
if test.noBenchmark {
355431
return
356432
}
357-
p := PrecompiledContractsByzantium[common.HexToAddress(addr)]
433+
p := PrecompiledContractsIstanbul[common.HexToAddress(addr)]
358434
in := common.Hex2Bytes(test.input)
359435
reqGas := p.RequiredGas(in)
360436
contract := NewContract(AccountRef(common.HexToAddress("1337")),
@@ -481,3 +557,20 @@ func BenchmarkPrecompiledBn256Pairing(bench *testing.B) {
481557
benchmarkPrecompiled("08", test, bench)
482558
}
483559
}
560+
func TestPrecompiledBlake2F(t *testing.T) {
561+
for _, test := range blake2FTests {
562+
testPrecompiled("09", test, t)
563+
}
564+
}
565+
566+
func BenchmarkPrecompiledBlake2F(bench *testing.B) {
567+
for _, test := range blake2FTests {
568+
benchmarkPrecompiled("09", test, bench)
569+
}
570+
}
571+
572+
func TestPrecompileBlake2FMalformedInput(t *testing.T) {
573+
for _, test := range blake2FMalformedInputTests {
574+
testPrecompiledFailure("09", test, t)
575+
}
576+
}

0 commit comments

Comments
 (0)