Merge pull request #1198 from maticnetwork/v1.3.0-beta-candidate

merge "V1.3.0 beta candidate" into develop
maticnetwork · Mar 26, 2024 · 694eadb · 694eadb
2 parents df47eb9 + f3cf1c1
commit 694eadb
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 11 deletions.
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -719,6 +719,11 @@ func (s *BlockChainAPI) GetTransactionReceiptsByBlock(ctx context.Context, block
 			"logs":              receipt.Logs,
 			"logsBloom":         receipt.Bloom,
 			"type":              hexutil.Uint(tx.Type()),
+			"effectiveGasPrice": (*hexutil.Big)(receipt.EffectiveGasPrice),
+		}
+
+		if receipt.EffectiveGasPrice == nil {
+			fields["effectiveGasPrice"] = new(hexutil.Big)
 		}
 
 		// Assign receipt status or post state.
@@ -729,7 +734,7 @@ func (s *BlockChainAPI) GetTransactionReceiptsByBlock(ctx context.Context, block
 		}
 
 		if receipt.Logs == nil {
-			fields["logs"] = [][]*types.Log{}
+			fields["logs"] = []*types.Log{}
 		}
 
 		if borReceipt != nil && idx == len(receipts)-1 {

diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go
@@ -1737,6 +1737,7 @@ func TestRPCGetTransactionReceiptsByBlock(t *testing.T) {
 				"blockNumber": "0x1",
 				"contractAddress": null,
 				"cumulativeGasUsed": "0x5208",
+				"effectiveGasPrice": "0x342770c0",
 				"from": "0x703c4b2bd70c169f5717101caee543299fc946c7",
 				"gasUsed": "0x5208",
 				"logs": [
@@ -1773,6 +1774,7 @@ func TestRPCGetTransactionReceiptsByBlock(t *testing.T) {
 				"blockNumber": "0x1",
 				"contractAddress": "0xae9bea628c4ce503dcfd7e305cab4e29e7476592",
 				"cumulativeGasUsed": "0x12156",
+				"effectiveGasPrice": "0x342770c0",
 				"from": "0x703c4b2bd70c169f5717101caee543299fc946c7",
 				"gasUsed": "0xcf4e",
 				"logs": [],
@@ -1792,6 +1794,7 @@ func TestRPCGetTransactionReceiptsByBlock(t *testing.T) {
 				"blockNumber": "0x1",
 				"contractAddress": null,
 				"cumulativeGasUsed": "0x17f7e",
+				"effectiveGasPrice": "0x342770c0",
 				"from": "0x703c4b2bd70c169f5717101caee543299fc946c7",
 				"gasUsed": "0x5e28",
 				"logs": [
@@ -1827,6 +1830,7 @@ func TestRPCGetTransactionReceiptsByBlock(t *testing.T) {
 				"blockNumber": "0x1",
 				"contractAddress": null,
 				"cumulativeGasUsed": "0x1d30b",
+				"effectiveGasPrice": "0x342772b4",
 				"from": "0x703c4b2bd70c169f5717101caee543299fc946c7",
 				"gasUsed": "0x538d",
 				"logs": [
@@ -1863,6 +1867,7 @@ func TestRPCGetTransactionReceiptsByBlock(t *testing.T) {
 				"blockNumber": "0x1",
 				"contractAddress": "0xfdaa97661a584d977b4d3abb5370766ff5b86a18",
 				"cumulativeGasUsed": "0x2b325",
+				"effectiveGasPrice": "0x342770c0",
 				"from": "0x703c4b2bd70c169f5717101caee543299fc946c7",
 				"gasUsed": "0xe01a",
 				"logs": [],

diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control
@@ -1,5 +1,5 @@
 Source: bor
-Version: 1.2.9-beta
+Version: 1.3.0-beta-1
 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.2.9-beta
+Version: 1.3.0-beta-1
 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.2.9-beta
+Version: 1.3.0-beta-1
 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.2.9-beta
+Version: 1.3.0-beta-1
 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.2.9-beta
+Version: 1.3.0-beta-1
 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.2.9-beta
+Version: 1.3.0-beta-1
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/params/version.go b/params/version.go
@@ -21,10 +21,10 @@ import (
 )
 
 const (
-	VersionMajor = 1      // Major version component of the current release
-	VersionMinor = 2      // Minor version component of the current release
-	VersionPatch = 9      // Patch version component of the current release
-	VersionMeta  = "beta" // Version metadata to append to the version string
+	VersionMajor = 1        // Major version component of the current release
+	VersionMinor = 3        // Minor version component of the current release
+	VersionPatch = 0        // Patch version component of the current release
+	VersionMeta  = "beta-1" // Version metadata to append to the version string
 )
 
 var GitCommit string