merge release_v4.7.5 to master #5841

halibobo1205 · 2024-05-30T10:18:50Z

No description provided.

* feat(api):fix a concurrency issue for toString in BlockCapsule (#5657) * feat(db):optimize cache settings (#5659) * feat(lite):optimize DbLite tool (#5658)

feat(net): use the proper clearing function

# Conflicts: # framework/src/main/java/org/tron/program/Version.java # framework/src/test/java/org/tron/core/db/ManagerTest.java

merge master to develop

add background,specification,test specification and scope of impact

docs(issue/template): simplify issue template for bug

…Ratio

…object

…ject

…descriptions docs(params): fix parameter descriptions for minTimeRatio and maxTime…

fix(net): solve the problem of concurrent access to fetchBlockInfo object

feat(version): update version to 4.7.5

feat(net): optimize block message processing logic

fix(net): solve the problem of concurrent access to syncBlockToFetch object

…state in which it was opened.

feat(net): remove redundant code

feat(consensus): optimize block production logic

feat(validate): validate account creation transaction size

…imit_big_transaction_size

# Conflicts: # actuator/src/main/java/org/tron/core/utils/ProposalUtil.java # chainbase/src/main/java/org/tron/core/store/DynamicPropertiesStore.java # common/src/main/java/org/tron/common/parameter/CommonParameter.java # framework/src/main/java/org/tron/core/Wallet.java # framework/src/main/java/org/tron/core/consensus/ProposalService.java

…_size feat(validate): limit big transaction size

…emove_redundant_ret # Conflicts: # common/src/main/java/org/tron/core/Constant.java # framework/src/main/java/org/tron/core/db/Manager.java # framework/src/test/java/org/tron/core/db/ManagerTest.java

feat(proposal,tvm): implement TIP-653

feat(*): remove redundant ret for transaction

CodeNinjaEvan

LGTM

codecov-commenter · 2024-05-30T11:57:15Z

Codecov Report

Attention: Patch coverage is 83.76623% with 25 lines in your changes are missing coverage. Please review.

Project coverage is 66.84%. Comparing base (b1fc2f0) to head (fcae37a).

Files	Patch %	Lines
...mework/src/main/java/org/tron/core/db/Manager.java	73.33%	3 Missing and 1 partial ⚠️
...main/java/org/tron/core/db/BandwidthProcessor.java	76.92%	2 Missing and 1 partial ⚠️
...core/net/service/fetchblock/FetchBlockService.java	0.00%	3 Missing ⚠️
...va/org/tron/core/net/service/sync/SyncService.java	0.00%	3 Missing ⚠️
...c/main/java/org/tron/core/actuator/VMActuator.java	0.00%	1 Missing and 1 partial ⚠️
...rc/main/java/org/tron/core/vm/program/Program.java	33.33%	1 Missing and 1 partial ⚠️
...ava/org/tron/common/parameter/CommonParameter.java	50.00%	2 Missing ⚠️
...rc/main/java/org/tron/consensus/dpos/DposTask.java	33.33%	1 Missing and 1 partial ⚠️
...rc/main/java/org/tron/core/utils/ProposalUtil.java	92.30%	0 Missing and 1 partial ⚠️
...java/org/tron/core/capsule/TransactionCapsule.java	94.11%	0 Missing and 1 partial ⚠️
... and 2 more

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@             Coverage Diff              @@
##             master    #5841      +/-   ##
============================================
+ Coverage     66.77%   66.84%   +0.06%     
- Complexity    10295    10336      +41     
============================================
  Files           889      889              
  Lines         53726    53846     +120     
  Branches       5937     5957      +20     
============================================
+ Hits          35874    35991     +117     
+ Misses        15069    15062       -7     
- Partials       2783     2793      +10

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

lurais and others added 30 commits January 12, 2024 19:48

Merge master into develop branch (#5668)

0f5a8de

* feat(api):fix a concurrency issue for toString in BlockCapsule (#5657) * feat(db):optimize cache settings (#5659) * feat(lite):optimize DbLite tool (#5658)

feat(net): use the correct clearing function

9d00aef

Merge pull request #5731 from ss3344520/cache-clear

5b03eb5

feat(net): use the proper clearing function

docs(README):fix code typos (#5730)

e81a5aa

Merge remote-tracking branch 'upstream/master' into develop

faa9d8d

# Conflicts: # framework/src/main/java/org/tron/program/Version.java # framework/src/test/java/org/tron/core/db/ManagerTest.java

Merge pull request #5771 from halibobo1205/develop

b56d044

merge master to develop

docs(issue/template): update issue template for feature (#5774)

88bd634

add background,specification,test specification and scope of impact

feat(docs): Update quickstart.md (#5773)

a126f2e

docs(issue/template): update issue template for bug (#5785)

40d7f26

docs(issue/template): simplify issue template for bug

20f0211

Merge pull request #5803 from halibobo1205/feat/issue_bug_template

e7c8d40

docs(issue/template): simplify issue template for bug

docs(params): fix parameter descriptions for minTimeRatio and maxTime…

963868e

…Ratio

feat(consensus): optimize block production logic

428ede2

fix(net): solve the problem of concurrent access to syncBlockToFetch …

8b4a5dd

…object

feat(net): optimize block message processing logic

934e04b

fix(net): solve the problem of concurrent access to fetchBlockInfo ob…

089fa8a

…ject

Merge pull request #5806 from yanghang8612/fix/tvm_related_parameter_…

76df76c

…descriptions docs(params): fix parameter descriptions for minTimeRatio and maxTime…

feat(consensus): add unit test for DposTask

9cc15de

feat(net): remove redundant code

b311f9a

feat(version): update version to 4.7.5

9378787

Merge pull request #5831 from zeusoo001/f-sove-access-problem-fetch

4c670f9

fix(net): solve the problem of concurrent access to fetchBlockInfo object

Merge pull request #5836 from halibobo1205/version/release_4.7.5

8e32f80

feat(version): update version to 4.7.5

feat(validate): validate account creation transaction size

e434b28

Merge pull request #5830 from zeusoo001/f-block-msg-opt

6949480

feat(net): optimize block message processing logic

Merge pull request #5832 from zeusoo001/f-sove-access-problem-syncblock

ec48b16

fix(net): solve the problem of concurrent access to syncBlockToFetch object

func(proposal,tvm): add energy adjustment proposal and implement

d1f8511

func(proposal): adjust proposal id

2fbb853

fix(proposal): should break for each proposal case

7491af6

func(test): add unit test for energy adjustment proposal

9da13ac

func(proposal): proposal 81th will not be able to be reopened in the …

eb2b880

…state in which it was opened.

yanghang8612 and others added 13 commits May 30, 2024 14:37

func(test): add unit test for getAllowEnergyAdjustment proposal

4058702

Merge pull request #5834 from zeusoo001/code_opt

84198ff

feat(net): remove redundant code

Merge pull request #5833 from zeusoo001/block-produce-opt

2d37b77

feat(consensus): optimize block production logic

Merge pull request #5835 from zeusoo001/feature/vali_account_tx_size

fd3d8f6

feat(validate): validate account creation transaction size

feat(validate): limit big transaction size

4ddd640

Merge remote-tracking branch 'upstream/release_v4.7.5' into feature/l…

7e99a00

…imit_big_transaction_size

test(tvm): add unit test for suicide action

3aa94e0

Merge pull request #5838 from zeusoo001/feature/limit_big_transaction…

b089ca0

…_size feat(validate): limit big transaction size

feat(*): remove redundant ret for transaction

271e3d0

Merge remote-tracking branch 'upstream/release_v4.7.5' into feature/r…

68a3728

…emove_redundant_ret # Conflicts: # common/src/main/java/org/tron/core/Constant.java # framework/src/main/java/org/tron/core/db/Manager.java # framework/src/test/java/org/tron/core/db/ManagerTest.java

Merge pull request #5837 from yanghang8612/feature/implement-TIP653

83a2950

feat(proposal,tvm): implement TIP-653

Merge pull request #5839 from zeusoo001/feature/remove_redundant_ret

fcae37a

feat(*): remove redundant ret for transaction

CodeNinjaEvan approved these changes May 30, 2024

View reviewed changes

lvs007 approved these changes May 30, 2024

View reviewed changes

lvs007 merged commit 8720e06 into master May 30, 2024
7 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge release_v4.7.5 to master #5841

merge release_v4.7.5 to master #5841

halibobo1205 commented May 30, 2024

CodeNinjaEvan left a comment

codecov-commenter commented May 30, 2024

merge release_v4.7.5 to master #5841

merge release_v4.7.5 to master #5841

Conversation

halibobo1205 commented May 30, 2024

CodeNinjaEvan left a comment

Choose a reason for hiding this comment

codecov-commenter commented May 30, 2024

Codecov Report