add support for eip4345 (#86)

polynetwork · Dec 9, 2021 · 57f9e3a · 57f9e3a
1 parent 07408cf
commit 57f9e3a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/common/config/config.go b/common/config/config.go
@@ -109,6 +109,10 @@ var ETH1559_HEIGHT = map[uint32]uint64{
 	NETWORK_ID_TEST_NET: constants.ETH1559_HEIGHT_TESTNET,
 }
 
+var ETH4345_HEIGHT = map[uint32]uint64{
+	NETWORK_ID_MAIN_NET: constants.ETH4345_HEIGHT_MAINNET,
+}
+
 var HECO120_HEIGHT = map[uint32]uint64{
 	NETWORK_ID_MAIN_NET: constants.HECO120_HEIGHT_MAINNET,
 	NETWORK_ID_TEST_NET: constants.HECO120_HEIGHT_TESTNET,
@@ -135,6 +139,12 @@ func GetPolygonSnapChainID(id uint32) uint32 {
 	return height
 }
 
+func GetEth4345Height(id uint32) uint64 {
+	height := ETH4345_HEIGHT[id]
+
+	return height
+}
+
 func GetEth1559Height(id uint32) uint64 {
 	height := ETH1559_HEIGHT[id]
 	if height == 0 {

diff --git a/common/constants/constants.go b/common/constants/constants.go
@@ -53,3 +53,6 @@ const HECO120_HEIGHT_MAINNET = 8577000
 const HECO120_HEIGHT_TESTNET = 8290000
 
 const POLYGON_SNAP_CHAINID_MAINNET = 16
+
+// eth arrow glacier upgrade
+const ETH4345_HEIGHT_MAINNET = 13_773_000
diff --git a/native/service/header_sync/eth/header1559.go b/native/service/header_sync/eth/header1559.go
@@ -246,6 +246,14 @@ func isLondon(h *Header) bool {
 	return h.BaseFee != nil || h.Number.Uint64() >= config.GetEth1559Height(config.DefConfig.P2PNode.NetworkId)
 }
 
+func isArrowGlacier(h *Header) bool {
+	forkHeight := config.GetEth4345Height(config.DefConfig.P2PNode.NetworkId)
+	if forkHeight == 0 {
+		return false
+	}
+	return h.Number.Uint64() >= forkHeight
+}
+
 // VerifyGaslimit verifies the header gas limit according increase/decrease
 // in relation to the parent gas limit.
 func VerifyGaslimit(parentGasLimit, headerGasLimit uint64) error {

diff --git a/native/service/header_sync/eth/header_sync.go b/native/service/header_sync/eth/header_sync.go
@@ -167,7 +167,9 @@ func (this *ETHHandler) SyncBlockHeader(native *native.NativeService) error {
 
 		//verify difficulty
 		var expected *big.Int
-		if isLondon(&header) {
+		if isArrowGlacier(&header) {
+			expected = makeDifficultyCalculator(big.NewInt(10_700_000))(header.Time, parentHeader)
+		} else if isLondon(&header) {
 			expected = makeDifficultyCalculator(big.NewInt(9700000))(header.Time, parentHeader)
 		} else {
 			expected = difficultyCalculator(new(big.Int).SetUint64(header.Time), parentHeader)