Merge pull request #311 from maticnetwork/arpit/v0.2.14

Arpit/v0.2.14

.goreleaser.yml

@@ -20,7 +20,7 @@ builds:
       - netgo
     ldflags:
       -s -w
-  
+
   - id: darwin-arm64
     main: ./cmd/geth
     binary: bor
@@ -35,7 +35,7 @@ builds:
       - netgo
     ldflags:
       -s -w
-  
+
   - id: linux-amd64
     main: ./cmd/geth
     binary: bor
@@ -49,7 +49,7 @@ builds:
     tags:
       - netgo
     ldflags:
-      # We need to build a static binary because we are building in a glibc based system and running in a musl container 
+      # We need to build a static binary because we are building in a glibc based system and running in a musl container
       -s -w -extldflags "-static"
 
   - id: linux-arm64
@@ -65,7 +65,7 @@ builds:
     tags:
       - netgo
     ldflags:
-      # We need to build a static binary because we are building in a glibc based system and running in a musl container 
+      # We need to build a static binary because we are building in a glibc based system and running in a musl container
       -s -w -extldflags "-static"
 
 nfpms:
@@ -112,7 +112,7 @@ dockers:
     extra_files:
       - builder/files/genesis-mainnet-v1.json
       - builder/files/genesis-testnet-v4.json
-  
+
   - image_templates:
       - 0xpolygon/{{ .ProjectName }}:{{ .Version }}-arm64
     dockerfile: Dockerfile.release

internal/ethapi/api.go

@@ -1422,10 +1422,12 @@ func newRPCTransaction(tx *types.Transaction, blockHash common.Hash, blockNumber
 // newRPCPendingTransaction returns a pending transaction that will serialize to the RPC representation
 func newRPCPendingTransaction(tx *types.Transaction, current *types.Header, config *params.ChainConfig) *RPCTransaction {
 	var baseFee *big.Int
+	blockNumber := uint64(0)
 	if current != nil {
 		baseFee = misc.CalcBaseFee(config, current)
+		blockNumber = current.Number.Uint64()
 	}
-	return newRPCTransaction(tx, common.Hash{}, 0, 0, baseFee, config)
+	return newRPCTransaction(tx, common.Hash{}, blockNumber, 0, baseFee, config)
 }
 
 // newRPCTransactionFromBlockIndex returns a transaction that will serialize to the RPC representation.

params/version.go

@@ -21,9 +21,9 @@ import (
 )
 
 const (
-	VersionMajor = 0       // Major version component of the current release
-	VersionMinor = 2       // Minor version component of the current release
-	VersionPatch = 13      // Patch version component of the current release
+	VersionMajor = 0        // Major version component of the current release
+	VersionMinor = 2        // Minor version component of the current release
+	VersionPatch = 14       // Patch version component of the current release
 	VersionMeta  = "stable" // Version metadata to append to the version string
 )