Merge pull request #18 from icon-project/fix-historical-summary-index-calc

Fix historical summary index calculation

Author: eunsoo-icon

chain/eth2/beacon.go

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2023 ICON Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package eth2
+
+import (
+	"fmt"
+
+	"github.com/icon-project/btp2-eth2/chain/eth2/client"
+)
+
+type BeaconNetwork int
+
+const (
+	Mainnet BeaconNetwork = iota + 1
+	Sepolia
+)
+
+var networkNames = []string{
+	"",
+	"mainnet",
+	"sepolia",
+}
+
+func (b BeaconNetwork) String() string {
+	return networkNames[b]
+}
+
+const (
+	mainnetGenesisValidatorsRoot = "0x4b363db94e286120d76eb905340fdd4e54bfe9f06bf33ff6cf5ad27f511bfe95"
+	sepoliaGenesisValidatorsRoot = "0xd8ea171f3c94aea21ebc42a1ed61052acf3f9209c00e4efbaaddac09ed9b8078"
+)
+
+func getBeaconNetwork(c *client.ConsensusLayer) (BeaconNetwork, error) {
+	genesis, err := c.Genesis()
+	if err != nil {
+		return 0, err
+	}
+
+	switch fmt.Sprintf("%#x", genesis.GenesisValidatorsRoot) {
+	case mainnetGenesisValidatorsRoot:
+		return Mainnet, nil
+	case sepoliaGenesisValidatorsRoot:
+		return Sepolia, nil
+	default:
+		return 0, fmt.Errorf("invalid target network")
+	}
+}

chain/eth2/receiver.go

@@ -83,6 +83,7 @@ type receiver struct {
 	l      log.Logger
 	src    types.BtpAddress
 	dst    types.BtpAddress
+	bn     BeaconNetwork
 	cl     *client.ConsensusLayer
 	el     *client.ExecutionLayer
 	bmc    *client.BMC
@@ -114,14 +115,21 @@ func newReceiver(src, dst types.BtpAddress, endpoint string, opt map[string]inte
 		ht: make(map[int64]*ssz.Node),
 		cp: make(map[int64]*phase0.BeaconBlockHeader),
 	}
-	r.el, err = client.NewExecutionLayer(endpoint, l)
-	if err != nil {
-		l.Panicf("failed to connect to %s, %v", endpoint, err)
-	}
+
 	r.cl, err = client.NewConsensusLayer(opt["consensus_endpoint"].(string), l)
 	if err != nil {
 		l.Panicf("failed to connect to %s, %v", opt["consensus_endpoint"].(string), err)
 	}
+	r.bn, err = getBeaconNetwork(r.cl)
+	if err != nil {
+		l.Panicf("fail to get beacon network, %v", err)
+	}
+	r.l.Debugf("Detected beacon network : %s", r.bn.String())
+
+	r.el, err = client.NewExecutionLayer(endpoint, l)
+	if err != nil {
+		l.Panicf("failed to connect to %s, %v", endpoint, err)
+	}
 	r.bmc, err = client.NewBMC(common.HexToAddress(r.src.ContractAddress()), r.el.GetBackend())
 	if err != nil {
 		l.Panicf("fail to get instance of BMC %s, %v", r.src.ContractAddress(), err)
@@ -332,7 +340,7 @@ func (r *receiver) blockProofDataViaBlockRoots(bls *types.BMCLinkStatus, mp *mes
 
 func (r *receiver) blockProofDataViaHistoricalSummaries(bls *types.BMCLinkStatus, mp *messageProofData) (*blockProofData, error) {
 	header := mp.Header.Beacon
-	gindex := proof.HistoricalSummariesIdxToGIndex(SlotToHistoricalSummariesIndex(header.Slot))
+	gindex := proof.HistoricalSummariesIdxToGIndex(SlotToHistoricalSummariesIndex(r.bn, header.Slot))
 	r.l.Debugf("make blockProofData with historicalSummaries. finalized: %d, slot:%d, gIndex:%d",
 		bls.Verifier.Height, header.Slot, gindex)
 	bp, err := r.cl.GetStateProofWithGIndex(strconv.FormatInt(bls.Verifier.Height, 10), gindex)
@@ -363,7 +371,7 @@ func (r *receiver) blockProofDataViaHistoricalSummaries(bls *types.BMCLinkStatus
 
 func (r *receiver) getHistoricalSummariesTrie(slot int64) (*ssz.Node, error) {
 	roots := make([][]byte, SlotPerHistoricalRoot)
-	start := int64(HistoricalSummariesStartSlot(phase0.Slot(slot)))
+	start := int64(HistoricalSummariesStartSlot(r.bn, phase0.Slot(slot)))
 	r.l.Debugf("getHistoricalSummariesTrie slot:%d start:%d", slot, start)
 	if ht, ok := r.ht[start]; !ok {
 		var prevRoot []byte

chain/eth2/receiver_test.go

@@ -230,7 +230,7 @@ func TestReceiver_MessageProof(t *testing.T) {
 	}
 
 	var mp *messageProofData
-	mp, err = r.makeMessageProofData(header)
+	mp, err = r.makeMessageProofData(header, nil)
 	assert.NoError(t, err)
 
 	// verify receiptsRoot

chain/eth2/time.go

@@ -13,7 +13,6 @@ const (
 
 	ForkEpochCapellaSepolia = 56832
 	ForkEpochCapellaMainnet = 194048
-	ForkEpochCapella        = ForkEpochCapellaSepolia
 )
 
 // SlotToEpoch returns the epoch number of the input slot.
@@ -41,10 +40,21 @@ func SlotToBlockRootsIndex(s phase0.Slot) uint64 {
 	return uint64(s % SlotPerHistoricalRoot)
 }
 
-func SlotToHistoricalSummariesIndex(s phase0.Slot) uint64 {
-	return uint64(s-ForkEpochCapella*SlotPerEpoch) / SlotPerHistoricalRoot
+func forkEpochCapella(bn BeaconNetwork) uint64 {
+	switch bn {
+	case Mainnet:
+		return ForkEpochCapellaMainnet
+	case Sepolia:
+		return ForkEpochCapellaSepolia
+	default:
+		return 0
+	}
 }
 
-func HistoricalSummariesStartSlot(s phase0.Slot) phase0.Slot {
-	return phase0.Slot((ForkEpochCapella * SlotPerEpoch) + SlotToHistoricalSummariesIndex(s)*SlotPerHistoricalRoot)
+func SlotToHistoricalSummariesIndex(bn BeaconNetwork, s phase0.Slot) uint64 {
+	return (uint64(s) - forkEpochCapella(bn)*SlotPerEpoch) / SlotPerHistoricalRoot
+}
+
+func HistoricalSummariesStartSlot(bn BeaconNetwork, s phase0.Slot) phase0.Slot {
+	return phase0.Slot((forkEpochCapella(bn) * SlotPerEpoch) + SlotToHistoricalSummariesIndex(bn, s)*SlotPerHistoricalRoot)
 }