update go-ecvrf (#1461)

Author: libotony

block/block_test.go

@@ -8,93 +8,81 @@ package block
 import (
 	"math/big"
 	"testing"
-	"time"
 
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/vechain/thor/v2/thor"
 	"github.com/vechain/thor/v2/tx"
+	"github.com/vechain/thor/v2/vrf"
 )
 
-func TestBlock(t *testing.T) {
+func TestBlockProof(t *testing.T) {
 	tx1 := tx.NewBuilder(tx.TypeLegacy).Clause(tx.NewClause(&thor.Address{})).Clause(tx.NewClause(&thor.Address{})).Build()
 	tx2 := tx.NewBuilder(tx.TypeDynamicFee).Clause(tx.NewClause(nil)).Build()
 
 	privKey := string("dce1443bd2ef0c2631adc1c67e5c93f13dc23a41c18b536effbbdcbcdb96fb65")
-
-	now := uint64(time.Now().UnixNano())
+	alpha := thor.MustParseBytes32("0x68abc4fe6b911dd388eac9252513071dd4edea83e183c4b477dc65dd59359c2c")
 
 	var (
-		gasUsed     uint64 = 1000
-		gasLimit    uint64 = 14000
-		totalScore  uint64 = 101
-		emptyRoot          = thor.BytesToBytes32([]byte("0"))
-		beneficiary        = thor.BytesToAddress([]byte("abc"))
+		emptyRoot   = thor.BytesToBytes32([]byte("0"))
+		beneficiary = thor.BytesToAddress([]byte("abc"))
 	)
 
 	blk := new(Builder).
-		GasUsed(gasUsed).
+		GasUsed(1000).
 		Transaction(tx1).
 		Transaction(tx2).
-		GasLimit(gasLimit).
-		TotalScore(totalScore).
+		GasLimit(14000).
+		TotalScore(101).
 		StateRoot(emptyRoot).
 		ReceiptsRoot(emptyRoot).
-		Timestamp(now).
+		Timestamp(1761554386318816000).
 		BaseFee(big.NewInt(thor.InitialBaseFee)).
 		ParentID(emptyRoot).
+		Alpha(alpha.Bytes()).
 		Beneficiary(beneficiary).
 		Build()
 
-	h := blk.Header()
-
-	txs := blk.Transactions()
-	txsRootHash := txs.RootHash()
-
-	assert.Equal(t, Compose(h, txs), blk)
-	assert.Equal(t, gasLimit, h.GasLimit())
-	assert.Equal(t, gasUsed, h.GasUsed())
-	assert.Equal(t, totalScore, h.TotalScore())
-	assert.Equal(t, emptyRoot, h.StateRoot())
-	assert.Equal(t, emptyRoot, h.ReceiptsRoot())
-	assert.Equal(t, now, h.Timestamp())
-	assert.Equal(t, big.NewInt(thor.InitialBaseFee), h.BaseFee())
-	assert.Equal(t, emptyRoot, h.ParentID())
-	assert.Equal(t, beneficiary, h.Beneficiary())
-	assert.Equal(t, txsRootHash, h.TxsRoot())
-
 	key, _ := crypto.HexToECDSA(privKey)
-	sig, _ := crypto.Sign(blk.Header().SigningHash().Bytes(), key)
-
+	ec, err := crypto.Sign(blk.Header().SigningHash().Bytes(), key)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, proof, err := vrf.Prove(key, alpha.Bytes())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	sig, err := NewComplexSignature(ec, proof)
+	if err != nil {
+		t.Fatal(err)
+	}
 	blk = blk.WithSignature(sig)
 
-	data, _ := rlp.EncodeToBytes(blk)
+	_, err = blk.Header().Beta()
+	assert.Nil(t, err)
 
-	b := Block{}
-	rlp.DecodeBytes(data, &b)
+	newProof := make([]byte, len(proof))
 
-	blk = new(Builder).
-		GasUsed(gasUsed).
-		GasLimit(gasLimit).
-		TotalScore(totalScore).
-		StateRoot(emptyRoot).
-		ReceiptsRoot(emptyRoot).
-		Timestamp(now).
-		ParentID(emptyRoot).
-		BaseFee(big.NewInt(thor.InitialBaseFee)).
-		Beneficiary(beneficiary).
-		TransactionFeatures(1).
-		Build()
+	copy(newProof, proof[0:33])
+	sig, err = NewComplexSignature(ec, newProof)
+	if err != nil {
+		t.Fatal(err)
+	}
+	blk = blk.WithSignature(sig)
+
+	_, err = blk.Header().Beta()
+	assert.ErrorContains(t, err, "invalid proof: value c is zero")
 
-	sig, _ = crypto.Sign(blk.Header().SigningHash().Bytes(), key)
+	copy(newProof, proof[0:47])
+	sig, err = NewComplexSignature(ec, newProof)
+	if err != nil {
+		t.Fatal(err)
+	}
 	blk = blk.WithSignature(sig)
 
-	assert.Equal(t, tx.Features(1), blk.Header().TxsFeatures())
-	data, _ = rlp.EncodeToBytes(blk)
-	var bx Block
-	assert.Nil(t, rlp.DecodeBytes(data, &bx))
-	assert.Equal(t, blk.Header().ID(), bx.Header().ID())
-	assert.Equal(t, blk.Header().TxsFeatures(), bx.Header().TxsFeatures())
+	_, err = blk.Header().Beta()
+	assert.ErrorContains(t, err, "invalid proof: value s is zero")
 }

go.mod

@@ -27,7 +27,7 @@ require (
 	github.com/qianbin/drlp v0.0.0-20240102101024-e0e02518b5f9
 	github.com/stretchr/testify v1.10.0
 	github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a
-	github.com/vechain/go-ecvrf v0.0.0-20220525125849-96fa0442e765
+	github.com/vechain/go-ecvrf v0.0.0-20251023142748-481dd12dec86
 	golang.org/x/crypto v0.36.0
 	golang.org/x/sync v0.17.0
 	gopkg.in/cheggaaa/pb.v1 v1.0.28

go.sum

@@ -154,8 +154,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/vechain/go-ecvrf v0.0.0-20220525125849-96fa0442e765 h1:jvr+TSivjObZmOKVdqlgeLtRhaDG27gE39PMuE2IJ24=
-github.com/vechain/go-ecvrf v0.0.0-20220525125849-96fa0442e765/go.mod h1:cwnTMgAVzMb30xMKnGI1LdU1NjMiPllYb7i3ibj/fzE=
+github.com/vechain/go-ecvrf v0.0.0-20251023142748-481dd12dec86 h1:tcYrv6mkiw2DVF1pKG3wWdwLGeG0R1yCoeKHflXWoRY=
+github.com/vechain/go-ecvrf v0.0.0-20251023142748-481dd12dec86/go.mod h1:cwnTMgAVzMb30xMKnGI1LdU1NjMiPllYb7i3ibj/fzE=
 github.com/vechain/go-ethereum v1.8.15-0.20250708104014-34fea45fc2b7 h1:G+L5+ucSFFgEb8eCbfHtJ1kEZFC9zuLYITnjH2F8zJ0=
 github.com/vechain/go-ethereum v1.8.15-0.20250708104014-34fea45fc2b7/go.mod h1:yPUCNmntAh1PritrMfSi7noK+9vVPStZX3wgh3ieaY0=
 github.com/vechain/goleveldb v1.0.1-0.20220809091043-51eb019c8655 h1:CbHcWpCi7wOYfpoErRABh3Slyq9vO0Ay/EHN5GuJSXQ=