fix polygon snap (#65)

* fix

* upgrade with chainid instead of height

Author: zhiqiangxu

common/config/config.go

@@ -109,7 +109,13 @@ var ETH1559_HEIGHT = map[uint32]uint64{
 	NETWORK_ID_TEST_NET: constants.ETH1559_HEIGHT_TESTNET,
 }
 
-var EXTRA_INFO_HEIGHT_FORK_CHECK bool
+var POLYGON_SNAP_CHAINID = map[uint32]uint32{
+	NETWORK_ID_MAIN_NET: constants.POLYGON_SNAP_CHAINID_MAINNET,
+}
+
+var (
+	EXTRA_INFO_HEIGHT_FORK_CHECK bool
+)
 
 func GetNetworkMagic(id uint32) uint32 {
 	nid, ok := NETWORK_MAGIC[id]
@@ -119,6 +125,11 @@ func GetNetworkMagic(id uint32) uint32 {
 	return id
 }
 
+func GetPolygonSnapChainID(id uint32) uint32 {
+	height := POLYGON_SNAP_CHAINID[id]
+	return height
+}
+
 func GetEth1559Height(id uint32) uint64 {
 	height := ETH1559_HEIGHT[id]
 	if height == 0 {

common/constants/constants.go

@@ -47,3 +47,5 @@ const EXTRA_INFO_HEIGHT_TESTNET = 1664798
 // eth 1559 heigh
 const ETH1559_HEIGHT_MAINNET = 12965000
 const ETH1559_HEIGHT_TESTNET = 10499401
+
+const POLYGON_SNAP_CHAINID_MAINNET = 16

native/service/header_sync/polygon/bor_header_sync.go

@@ -33,6 +33,7 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/polynetwork/poly/common"
+	"github.com/polynetwork/poly/common/config"
 	"github.com/polynetwork/poly/common/log"
 	cstates "github.com/polynetwork/poly/core/states"
 	"github.com/polynetwork/poly/native"
@@ -608,7 +609,13 @@ func validateHeaderExtraFieldWithSpan(native *native.NativeService, headerWOP *H
 	return nil
 }
 
+// only used for test
+var skipVerifySpan bool
+
 func validateHeaderExtraField(native *native.NativeService, headerWOP *HeaderWithOptionalProof, ctx *Context) (err error) {
+	if skipVerifySpan {
+		return
+	}
 	if headerWOP.Proof == nil {
 		var span *Span
 		span, err = getSpan(native, ctx)
@@ -715,9 +722,17 @@ func validatorContains(a []*Validator, x *Validator) (*Validator, bool) {
 	return nil, false
 }
 
+func shouldApplyFix(currentChainID uint64) bool {
+	chainID := config.GetPolygonSnapChainID(config.DefConfig.P2PNode.NetworkId)
+	return uint32(currentChainID) != chainID
+}
+
 func getSnapshot(native *native.NativeService, parent *HeaderWithDifficultySum, ctx *Context) (s *Snapshot, err error) {
 	if parent.HeaderWithOptionalSnap.Snapshot != nil {
 		s = parent.HeaderWithOptionalSnap.Snapshot
+		if shouldApplyFix(ctx.ChainID) {
+			err = s.ValidatorSet.updateTotalVotingPower()
+		}
 		return
 	}
 
@@ -736,6 +751,9 @@ func getSnapshot(native *native.NativeService, parent *HeaderWithDifficultySum,
 	}
 
 	s = snapHeader.HeaderWithOptionalSnap.Snapshot
+	if shouldApplyFix(ctx.ChainID) {
+		err = s.ValidatorSet.updateTotalVotingPower()
+	}
 	return
 }