Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge release v4.7.4 to master #5765

Merged
merged 77 commits into from
Mar 15, 2024
Merged

merge release v4.7.4 to master #5765

merged 77 commits into from
Mar 15, 2024

Conversation

lvs007
Copy link
Collaborator

@lvs007 lvs007 commented Mar 15, 2024

No description provided.

ss334452 and others added 30 commits September 14, 2023 10:48
@ss334452
test(net): add unit test for peer connection
47099a2
@halibobo1205
Merge pull request #5498 from tronprotocol/release_v4.7.3
de23b55
@ss334452
Merge pull request #5494 from ss3344520/unit-test
ba20e25 
test(net): add unit test for peer connection
@forfreeday
Merge pull request #5556 from tronprotocol/master
942981f 
merge master into develop
@lurais
feat(test): add unit tests of framework module (#5534)
1ec48e1 
Co-authored-by: morgan.peng <morgan.p@qq.com>
@paladim
fix(event):synchronization of sending to zeromq (#5536)
8de354f 
Co-authored-by: paladim <paladim@example.com>
@forfreeday
feat(script): remove useless scripts (#5580)
df52667 
Co-authored-by: liukai <kayle.liu@tron.network>
@317787106
modify default dns tree (#5585)
4557c72
@tomatoishealthy
feat(grpc): add reflection service (#5583)
2d64668
@halibobo1205
dependency(jetty): upgrade for security (#5571)
be07f5c
@lurais
feat(test): add jetty test for CVE-2023-40167 (#5600)
a66316c 
Co-authored-by: morgan.peng <morgan.p@qq.com>
@forfreeday
docs(protobuf): change transaction data structure description (#5602)
3f3ffe9 
Co-authored-by: liukai <kayle.liu@tron.network>
@zbraiterman
fix(docs/readme): minor grammar fixes to the README file (#5606)
5815337
@lurais
feat(checkStyle): use https for dtd links (#5623)
30abf6c 
Co-authored-by: morgan.peng <morgan.p@qq.com>
@forfreeday
docs(README): update the description of signature verification
a75148c
@forfreeday
docs(README): remove redundant descriptions
2ab7a3a
@forfreeday
Merge pull request #5632 from forfreeday/docs/update_edundant_descrip…
e7454f1 
…tions

docs(md): remove redundant descriptions
@forfreeday
Merge pull request #5631 from forfreeday/docs/update_READMME
ce0e0c6 
docs(README): update the description of signature verification
@tomatoishealthy
feat(dependency): refactor gradle dependencies (#5625)
20fc9b9
@317787106
feat(net):fix a concurrency issue for toString in BlockCapsule (#5594)
acfaac8
@halibobo1205
feat(api): print more details for unexpected error (#5601)
565aef5
@halibobo1205
test(plugins/dbLite): add test for merge function (#5603)
a76e177
@halibobo1205
feat(log/api): separate unexpected and expected logs (#5624)
c4d7635
@317787106
feat(net): add codeVersion for HelloMessage (#5584)
989115a
@ss334452
feat(net): stop broadcasting transactions when the block cannot be so…
0d48db4 
…lidified
@317787106
feat(net): delete config item node.discovery.bind.ip (#5597)
a0f431c 
* delete config item node.bind.ip

* remove bindIp method from Args

* get lan ip from libp2p
@ss334452
feat(net): stop broadcasting transactions when the block cannot be so…
79e978e 
…lidified
@ss334452
Merge branch 'develop' of github.com:tronprotocol/java-tron into ww
bf8de17
@forfreeday
feat(LiteFullNode): remove LiteFullNodeTool
d518512
@ss334452
Merge pull request #5643 from ss3344520/block_unsolid_solution
1e2986a 
feat(net): stop tx broadcasting if block cannot solidified
lurais and others added 25 commits January 22, 2024 15:55
@lurais
feat(log):optimize fork block version log (#5687)
b5c6cbd 
Co-authored-by: morgan.peng <morgan.p@qq.com>
@tomatoishealthy
fix(dependency): mock jar version upgrade (#5689)
245ddfb
@317787106
fix(api): fix the bug of determine if triggerConstantContract succeeds (
f0a46ff 
#5688)

* fix(api):fix the bug of determine if get scale factor succeed

* fix(api):fix bug of isShieldedTRC20NoteSpent
@317787106
feat(version):update libp2p version to 2.2.0 (#5692)
8960a6b
@ss334452
feat(dependency):update libp2p version to test-v2.2.2
931de44
@ss334452
Merge pull request #5693 from ss3344520/update_libp2p_version
7489552 
feat(dependency): update libp2p version to test-v2.2.2
@ss334452
feat(dependency): update libp2p version to 2.2.1
9911b05
@ss334452
Merge pull request #5694 from ss3344520/libp2p_version_update
85bf0c3 
feat(dependency): update libp2p version to 2.2.1
@halibobo1205
feat(log): remove unused log for getnodeinfo api (#5697)
baddd4f
@317787106
fix the bug of concurrent usage of toString in TransactionCapsule (#5696
cbf2417 
)
@jwrct
fix(pbft): fix concurrent access issue of srPbftMessage (#5703)
976d6f7 
* fix(pbft): fix the concurrent access issue of srPbftMessage
@jwrct
feat(dependency): update libp2p version to test-v2.2.3
5acf3ef
@Vikingzzu
Merge pull request #5708 from jwrct/op_active_connect
fd852c7 
feat(dependency): update libp2p version to test-v2.2.3
@halibobo1205
feat(api): adjust API services to start first at startup (#5711)
a578e85
@jwrct
Revert "feat(dependency): update libp2p version to test-v2.2.3" (#5712)
dcf1103
@tomatoishealthy
fix(conf): fix the config location of the RPC reflection servive (#5739)
96afa15
@halibobo1205
feat(*): optimize old rewards withdrawal (#5742)
fa46c4f 
* remove useNewRewardAlgorithmFromStart

* code clear

* exit when the calculation task gets an exception

* tools: add `db root` to calculate the data root

* make reward-vi root configurable

* fix race-condition for Merkel root calculation

* optimize proposal design
@317787106
hotfix(net):throw exception if scalingFactor <=0 (#5746)
074e0d6
@halibobo1205
feat(toolkit): show db root error to console (#5748)
eaf2c34
@317787106
feat(conf):delete all bind.ip (#5750)
74c42e3
@ss334452
feat(param): modify the default value of maxUnsolidifiedBlocks (#5751)
45a2af0 
* feat(param): modify the default value of maxUnsolidifiedBlocks
@fyyhtx
feat(net): optimize block processing logic (#5754)
3b5ed16 
feat(net): optimize block processing logic
@halibobo1205
Merge remote-tracking branch 'upstream/master' into release_v4.7.4
038950d 
# Conflicts:
#	framework/src/main/java/org/tron/program/Version.java
#	framework/src/test/java/org/tron/core/db/ManagerTest.java
@halibobo1205
remove unused test
9532bc0
@halibobo1205
Merge pull request #5766 from halibobo1205/release_v4.7.4
ca48980 
Merge remote-tracking branch 'upstream/master' into release_v4.7.4
@codecov-commenter
Copy link

Codecov Report

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

Project coverage is 66.73%. Comparing base (7a6a6d8) to head (ca48980).

Files Patch % Lines
...java/org/tron/core/service/RewardViCalService.java 87.21% 6 Missing and 11 partials ⚠️
...ain/java/org/tron/core/services/RpcApiService.java 16.66% 10 Missing ⚠️
...n/core/net/service/handshake/HandshakeService.java 0.00% 8 Missing ⚠️
framework/src/main/java/org/tron/core/Wallet.java 36.36% 5 Missing and 2 partials ⚠️
.../src/main/java/org/tron/core/config/args/Args.java 69.56% 2 Missing and 5 partials ⚠️
.../tron/core/net/messagehandler/BlockMsgHandler.java 0.00% 7 Missing ⚠️
...ron/core/db/common/iterator/RockStoreIterator.java 78.57% 5 Missing and 1 partial ⚠️
...rg/tron/core/db/common/iterator/StoreIterator.java 81.48% 4 Missing and 1 partial ⚠️
...ava/org/tron/common/parameter/CommonParameter.java 62.50% 3 Missing ⚠️
...a/org/tron/core/db/common/iterator/DBIterator.java 33.33% 1 Missing and 1 partial ⚠️
... and 15 more

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

Additional details and impacted files 
@@             Coverage Diff              @@
##             master    #5765      +/-   ##
============================================
+ Coverage     66.03%   66.73%   +0.69%     
- Complexity    10151    10290     +139     
============================================
  Files           895      889       -6     
  Lines         53834    53726     -108     
  Branches       5930     5937       +7     
============================================
+ Hits          35550    35854     +304     
+ Misses        15509    15083     -426     
- Partials       2775     2789      +14

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

tomatoishealthy
tomatoishealthy approved these changes Mar 15, 2024
View reviewed changes
Copy link
Contributor

@tomatoishealthy tomatoishealthy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@halibobo1205 halibobo1205 merged commit e84a9e7 into master Mar 15, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomatoishealthy tomatoishealthy tomatoishealthy approved these changes

@jwrct jwrct jwrct approved these changes

@halibobo1205 halibobo1205 halibobo1205 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet