Merge commit '16268f660' into xmerge/bor-v1.5.2

openrelayxyz · Oct 30, 2024 · c783dda · c783dda
2 parents 9a37cee + 16268f6
commit c783dda
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -1925,7 +1925,8 @@ func NewTransactionAPI(b Backend, nonceLock *AddrLocker) *TransactionAPI {
 // GetBlockTransactionCountByNumber returns the number of transactions in the block with the given block number.
 func (api *TransactionAPI) GetBlockTransactionCountByNumber(ctx context.Context, blockNr rpc.BlockNumber) *hexutil.Uint {
 	if block, _ := api.b.BlockByNumber(ctx, blockNr); block != nil {
-		n := hexutil.Uint(len(block.Transactions()))
+		txs, _ := api.getAllBlockTransactions(ctx, block)
+		n := hexutil.Uint(len(txs))
 		return &n
 	}
 
@@ -1935,7 +1936,8 @@ func (api *TransactionAPI) GetBlockTransactionCountByNumber(ctx context.Context,
 // GetBlockTransactionCountByHash returns the number of transactions in the block with the given hash.
 func (api *TransactionAPI) GetBlockTransactionCountByHash(ctx context.Context, blockHash common.Hash) *hexutil.Uint {
 	if block, _ := api.b.BlockByHash(ctx, blockHash); block != nil {
-		n := hexutil.Uint(len(block.Transactions()))
+		txs, _ := api.getAllBlockTransactions(ctx, block)
+		n := hexutil.Uint(len(txs))
 		return &n
 	}
 

diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control
@@ -1,5 +1,5 @@
 Source: bor
-Version: 1.5.1
+Version: 1.5.2
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64
@@ -1,5 +1,5 @@
 Source: bor
-Version: 1.5.1
+Version: 1.5.2
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.5.1
+Version: 1.5.2
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.5.1
+Version: 1.5.2
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.5.1
+Version: 1.5.2
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.5.1
+Version: 1.5.2
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/params/version.go b/params/version.go
@@ -23,7 +23,7 @@ import (
 const (
 	VersionMajor = 1  // Major version component of the current release
 	VersionMinor = 5  // Minor version component of the current release
-	VersionPatch = 1  // Patch version component of the current release
+	VersionPatch = 2  // Patch version component of the current release
 	VersionMeta  = "" // Version metadata to append to the version string
 )