Filter bad beefy keys (#1204)

* Filter out bad keys

* Get AuthoritySet from storage

* Filter invalid validators

* Fix validator root

* Improve slice compare

* Fix empty address

* Log cleanup

* More logs

* Cleanup

* Chore

* Upgrade go-substrate-rpc-client

* Update go.work

* Only syncing mandatory/handover commitments

* Revert config

* Update go.mod

* Update go.mod

---------

Co-authored-by: Vincent Geddes <[email protected]>

Author: yrong

go.work

@@ -1,3 +1,5 @@
-go 1.20
+go 1.21
+
+toolchain go1.21.10
 
 use ./relayer

go.work.sum

@@ -302,6 +302,7 @@ github.com/valyala/fasthttp v1.40.0 h1:CRq/00MfruPGFLTQKY8b+8SfdK60TxNztjRMnH0t1
 github.com/valyala/fasthttp v1.40.0/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+github.com/vedhavyas/go-subkey/v2 v2.0.0 h1:LemDIsrVtRSOkp0FA8HxP6ynfKjeOj3BY2U9UNfeDMA=
 github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
 github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=

relayer/cmd/scan_beefy.go

@@ -23,12 +23,11 @@ func scanBeefyCmd() *cobra.Command {
 	}
 
 	cmd.Flags().StringP("polkadot-url", "p", "ws://127.0.0.1:9944", "Polkadot URL.")
-	cmd.MarkFlagRequired("polkadot-url")
 	cmd.Flags().Uint64P("beefy-block", "b", 0, "Beefy block.")
 	cmd.MarkFlagRequired("beefy-block")
 	cmd.Flags().Uint64P("validator-set-id", "v", 0, "Validator set id.")
 	cmd.MarkFlagRequired("validator-set-id")
-	cmd.Flags().Uint64P("fast-forward-depth", "f", 100, "Fast forward depth.")
+	cmd.Flags().Uint64P("fast-forward-depth", "f", 10000, "Fast forward depth.")
 	return cmd
 }
 

relayer/go.mod

@@ -1,6 +1,8 @@
 module github.com/snowfork/snowbridge/relayer
 
-go 1.20
+go 1.21
+
+toolchain go1.21.10
 
 require (
 	github.com/cbroglie/mustache v1.4.0
@@ -10,10 +12,11 @@ require (
 	github.com/mattn/go-sqlite3 v1.14.22
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/sirupsen/logrus v1.9.3
-	github.com/snowfork/go-substrate-rpc-client/v4 v4.0.1-0.20231109131025-3ece5b994f03
+	github.com/snowfork/go-substrate-rpc-client/v4 v4.0.1-0.20240523155545-4272098ec025
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/viper v1.18.2
 	github.com/stretchr/testify v1.8.4
+	golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e
 	golang.org/x/sync v0.6.0
 )
 
@@ -98,7 +101,6 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.18.0 // indirect
-	golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e // indirect
 	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect

relayer/go.sum

@@ -80,6 +80,31 @@ func (wr *EthereumWriter) Start(ctx context.Context, eg *errgroup.Group, request
 }
 
 func (wr *EthereumWriter) submit(ctx context.Context, task Request) error {
+	callOpts := bind.CallOpts{
+		Context: ctx,
+	}
+
+	latestBeefyBlock, err := wr.contract.LatestBeefyBlock(&callOpts)
+	if err != nil {
+		return err
+	}
+	if uint32(latestBeefyBlock) >= task.SignedCommitment.Commitment.BlockNumber {
+		return nil
+	}
+
+	currentValidatorSet, err := wr.contract.CurrentValidatorSet(&callOpts)
+	if err != nil {
+		return err
+	}
+	nextValidatorSet, err := wr.contract.NextValidatorSet(&callOpts)
+	if err != nil {
+		return err
+	}
+	task.ValidatorsRoot = currentValidatorSet.Root
+	if task.IsHandover {
+		task.ValidatorsRoot = nextValidatorSet.Root
+	}
+
 	// Initial submission
 	tx, initialBitfield, err := wr.doSubmitInitial(ctx, &task)
 	if err != nil {
@@ -148,9 +173,10 @@ func (wr *EthereumWriter) doSubmitInitial(ctx context.Context, task *Request) (*
 	chosenValidator := signedValidators[rand.Intn(len(signedValidators))].Int64()
 
 	log.WithFields(logrus.Fields{
-		"validatorCount":   validatorCount,
-		"signedValidators": signedValidators,
-		"chosenValidator":  chosenValidator,
+		"validatorCount":       validatorCount,
+		"signedValidators":     signedValidators,
+		"signedValidatorCount": len(signedValidators),
+		"chosenValidator":      chosenValidator,
 	}).Info("Creating initial bitfield")
 
 	initialBitfield, err := wr.contract.CreateInitialBitfield(

relayer/relays/beefy/ethereum-writer.go

@@ -10,6 +10,8 @@ import (
 	"github.com/snowfork/snowbridge/relayer/contracts"
 	"github.com/snowfork/snowbridge/relayer/crypto/keccak"
 	"github.com/snowfork/snowbridge/relayer/crypto/merkle"
+	"github.com/snowfork/snowbridge/relayer/relays/util"
+	"golang.org/x/exp/slices"
 )
 
 type InitialRequestParams struct {
@@ -97,19 +99,26 @@ func cleanSignature(input types.BeefySignature) (uint8, [32]byte, [32]byte) {
 }
 
 func (r *Request) generateValidatorAddressProof(validatorIndex int64) ([][32]byte, error) {
-	leaves := make([][]byte, len(r.Validators))
-	for i, rawAddress := range r.Validators {
+	var leaves [][]byte
+	var err error
+	var invalidAddress []string
+	for _, rawAddress := range r.Validators {
 		address, err := rawAddress.IntoEthereumAddress()
 		if err != nil {
-			return nil, fmt.Errorf("convert to ethereum address: %w", err)
+			invalidAddress = append(invalidAddress, util.BytesToHexString(rawAddress[:]))
+			leaves = append(leaves, make([]byte, 0))
+		} else {
+			leaves = append(leaves, address.Bytes())
 		}
-		leaves[i] = address.Bytes()
 	}
-
-	_, _, proof, err := merkle.GenerateMerkleProof(leaves, validatorIndex)
+	_, root, proof, err := merkle.GenerateMerkleProof(leaves, validatorIndex)
 	if err != nil {
 		return nil, err
 	}
+	equal := slices.Equal(r.ValidatorsRoot[:], root)
+	if !equal {
+		return nil, fmt.Errorf("validator root %#x not match calculated root %#x, invalid address are: %s", r.ValidatorsRoot[:], root, invalidAddress)
+	}
 
 	return proof, nil
 }

relayer/relays/beefy/parameters.go

@@ -128,6 +128,10 @@ func scanCommitments(ctx context.Context, api *gsrpc.SubstrateAPI, startBlock ui
 				sendError(fmt.Errorf("fetch block: %w", err))
 				return
 			}
+			log.WithFields(log.Fields{
+				"blockNumber": result.BlockNumber,
+				"depth":       result.Depth,
+			}).Info("fetch block")
 
 			var commitment *types.SignedCommitment
 			for j := range block.Justifications {
@@ -206,6 +210,11 @@ func scanSafeCommitments(ctx context.Context, meta *types.Metadata, api *gsrpc.S
 				sendError(result.Error)
 				return
 			}
+			log.WithFields(log.Fields{
+				"blockNumber": result.BlockNumber,
+				"depth":       result.Depth,
+				"commitment":  result.SignedCommitment.Commitment,
+			}).Info("fetch commitment")
 
 			blockNumber := result.SignedCommitment.Commitment.BlockNumber
 			blockHash, err := api.RPC.Chain.GetBlockHash(uint64(blockNumber))

relayer/relays/beefy/scanner.go

@@ -8,6 +8,7 @@ import (
 
 type Request struct {
 	Validators       []substrate.Authority
+	ValidatorsRoot   [32]byte
 	SignedCommitment types.SignedCommitment
 	Proof            merkle.SimplifiedMMRProof
 	IsHandover       bool

relayer/relays/beefy/task.go

@@ -2,20 +2,17 @@ import { ApiPromise, WsProvider } from "@polkadot/api"
 import { MerkleTree } from "merkletreejs"
 import createKeccakHash from "keccak"
 import { publicKeyConvert } from "secp256k1"
-import type {
-    ValidatorSetId,
-    BeefyId,
-} from "@polkadot/types/interfaces/beefy/types"
+import type { ValidatorSetId, BeefyId } from "@polkadot/types/interfaces/beefy/types"
 import fs from "fs"
 import path from "path"
-import { u32, u64 } from "@polkadot/types-codec";
-import { H256 } from "@polkadot/types/interfaces";
-import { Struct } from "@polkadot/types";
-
-interface NextAuthoritySet extends Struct {
-    id: u64;
-    len: u32;
-    keysetCommitment: H256;
+import { u32, u64 } from "@polkadot/types-codec"
+import { H256 } from "@polkadot/types/interfaces"
+import { Struct } from "@polkadot/types"
+
+interface AuthoritySet extends Struct {
+    id: u64
+    len: u32
+    keysetCommitment: H256
 }
 
 async function generateBeefyCheckpoint() {
@@ -50,23 +47,42 @@ async function generateBeefyCheckpoint() {
     const validatorSetId = await api.query.beefy.validatorSetId<ValidatorSetId>()
     const authorities = await api.query.beefy.authorities<BeefyId[]>()
 
+    console.log("validatorSetId:", validatorSetId)
+    console.log("authority length is:" + authorities.length)
+
     let addrs = []
+
     for (let i = 0; i < authorities.length; i++) {
-        let publicKey = publicKeyConvert(authorities[i], false).slice(1)
-        let publicKeyHashed = createKeccakHash("keccak256").update(Buffer.from(publicKey)).digest()
-        addrs.push(publicKeyHashed.slice(12))
+        console.log("index is:" + i + ",authority is:" + authorities[i])
+        try {
+            let publicKey = publicKeyConvert(authorities[i], false).slice(1)
+            let publicKeyHashed = createKeccakHash("keccak256")
+                .update(Buffer.from(publicKey))
+                .digest()
+            addrs.push(publicKeyHashed.slice(12))
+        } catch (err) {
+            console.log(err)
+        }
     }
 
-    const tree = createMerkleTree(addrs)
+    console.log("valid authority length is:" + addrs.length)
 
-    const nextAuthorities = await api.query.mmrLeaf.beefyNextAuthorities<NextAuthoritySet>()
+    let currentAuthorities, nextAuthorities
+
+    if (process.env.NODE_ENV == "production") {
+        currentAuthorities = await api.query.beefyMmrLeaf.beefyAuthorities<AuthoritySet>()
+        nextAuthorities = await api.query.beefyMmrLeaf.beefyNextAuthorities<AuthoritySet>()
+    } else {
+        currentAuthorities = await api.query.mmrLeaf.beefyAuthorities<AuthoritySet>()
+        nextAuthorities = await api.query.mmrLeaf.beefyNextAuthorities<AuthoritySet>()
+    }
 
     const beefyCheckpoint = {
         startBlock: beefyStartBlock,
         current: {
-            id: validatorSetId.toNumber(),
-            root: tree.getHexRoot(),
-            length: addrs.length,
+            id: currentAuthorities.id.toNumber(),
+            root: currentAuthorities.keysetCommitment.toHex(),
+            length: currentAuthorities.len.toNumber(),
         },
         next: {
             id: nextAuthorities.id.toNumber(),

web/packages/test-helpers/src/generateBeefyCheckpoint.ts

@@ -3,7 +3,6 @@
     "polkadot": {
       "endpoint": "ws://127.0.0.1:9944"
     },
-    "beefy-activation-block": 0,
     "fast-forward-depth": 20,
     "update-period": 0
   },