Merge pull request #143 from covalenthq/develop

Bsp-geth-DTM-RC:v1.4.3-bsp (Withdrawals Fix)
covalenthq · Apr 19, 2023 · ab03cbc · ab03cbc
2 parents d96d7c0 + 8ffa4d3
commit ab03cbc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/core/block_replica.go b/core/block_replica.go
@@ -82,11 +82,14 @@ func (bc *BlockChain) createReplica(block *types.Block, replicaConfig *ReplicaCo
 	}
 
 	// withdrawals
-	withdrawalsExp := make([]*types.WithdrawalForExport, len(block.Withdrawals()))
-	withdrawalsRlp := make([]*types.WithdrawalExportRLP, len(block.Withdrawals()))
-	for i, withdrawal := range block.Withdrawals() {
-		withdrawalsExp[i] = (*types.WithdrawalForExport)(withdrawal)
-		withdrawalsRlp[i] = withdrawalsExp[i].ExportWithdrawal()
+	var withdrawalsRlp []*types.WithdrawalExportRLP = nil
+	if chainConfig.IsShanghai(block.Time()) {
+		withdrawalsExp := make([]*types.WithdrawalForExport, len(block.Withdrawals()))
+		withdrawalsRlp = make([]*types.WithdrawalExportRLP, len(block.Withdrawals()))
+		for i, withdrawal := range block.Withdrawals() {
+			withdrawalsExp[i] = (*types.WithdrawalForExport)(withdrawal)
+			withdrawalsRlp[i] = withdrawalsExp[i].ExportWithdrawal()
+		}
 	}
 
 	//receipts

diff --git a/params/version.go b/params/version.go
@@ -30,7 +30,7 @@ const (
 const (
 	BspVersionMajor = 1 // Major version component of the current release
 	BspVersionMinor = 4 // Minor version component of the current release
-	BspVersionPatch = 2 // Patch version component of the current release
+	BspVersionPatch = 3 // Patch version component of the current release
 )
 
 // Version holds the textual version string.