From 1b6a8ce3627a57079abc967f9f1beca3df10825c Mon Sep 17 00:00:00 2001 From: Shivam Sharma Date: Wed, 20 Mar 2024 17:33:21 +0530 Subject: [PATCH 1/4] bump : version to v1.3.0-beta-1 --- packaging/templates/package_scripts/control | 2 +- packaging/templates/package_scripts/control.arm64 | 2 +- packaging/templates/package_scripts/control.profile.amd64 | 2 +- packaging/templates/package_scripts/control.profile.arm64 | 2 +- packaging/templates/package_scripts/control.validator | 2 +- .../templates/package_scripts/control.validator.arm64 | 2 +- params/version.go | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control index e7ace96e72..d6a0d2f9ff 100644 --- 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 diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64 index 2ea263e599..4b2fa87301 100644 --- 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 diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64 index ccc8936dbd..c2e961796c 100644 --- 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 diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64 index 5b4e012780..8d0355d6c1 100644 --- 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 diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator index 5dd2bca4c5..f1733691a3 100644 --- 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 diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64 index 8b45776fde..f4ed4a5c25 100644 --- 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 diff --git a/params/version.go b/params/version.go index 4f2658a99d..142000b21b 100644 --- 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 From ccb8ff6d21138c3bf66d98f0ce21a321f3f7d154 Mon Sep 17 00:00:00 2001 From: bbaktaeho Date: Thu, 16 Nov 2023 23:04:53 +0900 Subject: [PATCH 2/4] fix GetTransactionReceiptsByBlock --- internal/ethapi/api.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index c632cf9971..de80c2e648 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -719,8 +719,13 @@ 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. if len(receipt.PostState) > 0 { fields["root"] = hexutil.Bytes(receipt.PostState) @@ -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 { From 61e8d4148d106568cae35280525835590a1fc027 Mon Sep 17 00:00:00 2001 From: bbaktaeho Date: Fri, 17 Nov 2023 19:34:50 +0900 Subject: [PATCH 3/4] fix: lint --- internal/ethapi/api.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index de80c2e648..2d988ac94e 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -723,8 +723,8 @@ func (s *BlockChainAPI) GetTransactionReceiptsByBlock(ctx context.Context, block } if receipt.EffectiveGasPrice == nil { - fields["effectiveGasPrice"] = new(hexutil.Big) - } + fields["effectiveGasPrice"] = new(hexutil.Big) + } // Assign receipt status or post state. if len(receipt.PostState) > 0 { From f3cf1c14502fad0d3d43e0cdbca05de0ddc7bb94 Mon Sep 17 00:00:00 2001 From: Shivam Sharma Date: Thu, 21 Mar 2024 17:24:56 +0530 Subject: [PATCH 4/4] fix : TestRPCGetTransactionReceiptsByBlock --- internal/ethapi/api_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go index 6d85c4b6f1..5c28022b42 100644 --- 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": [],