icon validators hash in bmr config + bsr in ixh.sh

icon-project · Jun 14, 2022 · 4f95bbe · 4f95bbe
1 parent aea0188
commit 4f95bbe
Show file tree

Hide file tree

Showing 5 changed files with 379 additions and 187 deletions.
diff --git a/cmd/btpsimple/chain/icon/receiver.go b/cmd/btpsimple/chain/icon/receiver.go
@@ -18,7 +18,6 @@ package icon
 
 import (
 	"context"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -129,12 +128,7 @@ func (r *receiver) receiveLoop(
 
 	var err error
 
-	// For the base63 encoding of previous header's NextValidatorHash
-	// fetch list of validator addresses and populate cache
-	vHash, err := base64.StdEncoding.DecodeString(r.opts.Verifier.ValidatorHash)
-	if err != nil {
-		return errors.Wrap(err, "receiveLoop; Base64Decode ValidatorHash; Err: ")
-	}
+	vHash := r.opts.Verifier.ValidatorsHash
 	vBytes, err := r.cl.GetDataByHash(&DataHashParam{Hash: NewHexBytes(vHash)})
 	if err != nil {
 		return errors.Wrap(err, "receiveLoop; GetDataByHash Validators; Err: ")

diff --git a/cmd/btpsimple/chain/icon/verifier.go b/cmd/btpsimple/chain/icon/verifier.go
@@ -18,8 +18,8 @@ import (
 )
 
 type VerifierOptions struct {
-	BlockHeight   uint64 `json:"blockHeight"`
-	ValidatorHash string `json:"validatorHash"`
+	BlockHeight    uint64          `json:"blockHeight"`
+	ValidatorsHash common.HexBytes `json:"validatorsHash"`
 }
 
 type commitVoteItem struct {