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 master to develop #6031

Merged
merged 67 commits into from
Oct 8, 2024
Merged

merge master to develop #6031

merged 67 commits into from
Oct 8, 2024
+1,015 −44

Commits on Jul 18, 2024

  1. test(CI): add test-retry plugin for test 

       Mitigate flaky tests by retrying tests when they fail.
    @halibobo1205
    halibobo1205 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    ff69595 View commit details
    Browse the repository at this point in the history

  2. Merge pull request tronprotocol#5916 from halibobo1205/release/4.7.6_… 

    …add_retry

test(CI): add test-retry plugin for the unit test
    @lvs007
    lvs007 authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    ee7765f View commit details
    Browse the repository at this point in the history

  3. feat(version): update version to 4.7.6

    @halibobo1205
    halibobo1205 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    496d64d View commit details
    Browse the repository at this point in the history

  4. Merge pull request tronprotocol#5919 from halibobo1205/version/update… 

    …_version

feat(version): update version to 4.7.6
    @lvs007
    lvs007 authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    f092d0e View commit details
    Browse the repository at this point in the history

  5. feat(net) : optimize the isIdle method

    @zeusoo001
    zeusoo001 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    0dc7a3f View commit details
    Browse the repository at this point in the history

  6. feat(net): add isSyncIdle method

    @zeusoo001
    zeusoo001 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    ddbe8f1 View commit details
    Browse the repository at this point in the history

  7. feat(net): optimize fetch inventory message check logic

    @zeusoo001
    zeusoo001 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    0779c00 View commit details
    Browse the repository at this point in the history

  8. feat(net) : optimizing the sortPeers method

    @zeusoo001
    zeusoo001 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    fdbfa17 View commit details
    Browse the repository at this point in the history

  9. feat(net): use comparingLong method for sortPeers

    @zeusoo001
    zeusoo001 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    ea14933 View commit details
    Browse the repository at this point in the history

  10. initial commit of test isolated

    @317787106
    317787106 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    3b3b668 View commit details
    Browse the repository at this point in the history

  11. init commit of set_block_both_have2

    @317787106
    317787106 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    6466458 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. test(MerkleTree): ignore testConcurrent 

       This is an unstable concurrent unit test.
    @halibobo1205
    halibobo1205 committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    6a08ac6 View commit details
    Browse the repository at this point in the history

  2. add testcase testProcessBlock for BlockMsgHandler

    @317787106
    317787106 committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    f5961f4 View commit details
    Browse the repository at this point in the history

  3. add testcase testProcessBlock for BlockMsgHandler

    @317787106
    317787106 committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    6706d83 View commit details
    Browse the repository at this point in the history

  4. Merge pull request tronprotocol#5927 from halibobo1205/test/remove_un… 

    …stable_test

test(merkle): ignore testConcurrent to make CI more stable
    @lvs007
    lvs007 authored Jul 19, 2024
    Configuration menu
    Copy the full SHA
    4211348 View commit details
    Browse the repository at this point in the history

  5. fix(http/metric): change endpoint variable from member to local

    @tomatoishealthy @halibobo1205
    tomatoishealthy authored and halibobo1205 committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    90a6e8f View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Merge pull request tronprotocol#5920 from halibobo1205/fix/endpoint-c… 

    …oncurrent-access

fix(http/metric): change endpoint variable from member to local
    @lvs007
    lvs007 authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    27cd42f View commit details
    Browse the repository at this point in the history

  2. set lastactivetime in P2pEventHandlerImpl

    @317787106
    317787106 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    e670386 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release_v4.7.6' into feature/test_isolated3

    @317787106
    317787106 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    4791cdf View commit details
    Browse the repository at this point in the history

  4. Merge pull request tronprotocol#5923 from zeusoo001/f-sortpeers-metho… 

    …d-opt

feat(net) : optimize the sortPeers method
    @lvs007
    lvs007 authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    ecd43b7 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Merge pull request tronprotocol#5921 from zeusoo001/f-isidle-method-opt 

    feat(net) : optimize the isIdle method
    @lvs007
    lvs007 authored Jul 23, 2024
    Configuration menu
    Copy the full SHA
    afc3979 View commit details
    Browse the repository at this point in the history

  2. Merge pull request tronprotocol#5922 from zeusoo001/f-sync-fetch-bloc… 

    …k-opt

feat(net): optimize fetch inventory message check logic
    @lvs007
    lvs007 authored Jul 23, 2024
    Configuration menu
    Copy the full SHA
    729a99b View commit details
    Browse the repository at this point in the history

  3. add updateLastActiveTime

    @317787106
    317787106 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    735bccb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release_v4.7.6' into feature/test_isolated3

    @317787106
    317787106 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    cae19ea View commit details
    Browse the repository at this point in the history

  5. optimize log method of PeerConnection

    @317787106
    317787106 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    343c5f6 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'release_v4.7.6' into hotfix/set_block_both_have2

    @317787106
    317787106 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    34eb577 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. Merge pull request tronprotocol#5925 from 317787106/hotfix/set_block_… 

    …both_have2

feat(net): set block_both_have after handling broadcast block
    @lvs007
    lvs007 authored Jul 25, 2024
    Configuration menu
    Copy the full SHA
    d6bbbe4 View commit details
    Browse the repository at this point in the history

  2. catch exception of sort peers

    @317787106
    317787106 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    a718006 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release_v4.7.6' into feature/test_isolated3

    @317787106
    317787106 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    4f234be View commit details
    Browse the repository at this point in the history

  4. catch exception min of peers

    @317787106
    317787106 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    14fda8f View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Merge pull request tronprotocol#5924 from 317787106/feature/test_isol… 

    …ated3

feat(net): disconnect from inactive nodes if necessary
    @lvs007
    lvs007 authored Jul 29, 2024
    Configuration menu
    Copy the full SHA
    54b0395 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. feat(monitor): add tcp out traffic and udp in traffic statistics

    @zeusoo001
    zeusoo001 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    d6faee8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request tronprotocol#5942 from zeusoo001/net_traffic_monitor3 

    feat(monitor): add tcp out traffic and udp in traffic statistics
    @lvs007
    lvs007 authored Aug 6, 2024
    Configuration menu
    Copy the full SHA
    21f0cb5 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

  1. add some log for isolated2 disconnection

    @317787106
    317787106 committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    81bb50b View commit details
    Browse the repository at this point in the history

  2. add log of candidate disconnect size when node is isolated

    @317787106
    317787106 committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    0d21388 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2024

  1. set blockNotChangeThreshold from 90 to 60 seconds

    @317787106
    317787106 committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    0acc84b View commit details
    Browse the repository at this point in the history

  2. remove the condition of peer.isDisconnect

    @317787106
    317787106 committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    0fc9acb View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. don't disconnect with syncing node when random disconnect

    @317787106
    317787106 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    0f7c7f4 View commit details
    Browse the repository at this point in the history

  2. add DisConnectCause

    @317787106
    317787106 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    7bdae32 View commit details
    Browse the repository at this point in the history

  3. add DisConnectCause

    @317787106
    317787106 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    ffbb69e View commit details
    Browse the repository at this point in the history

  4. change the condition of isLanNode

    @317787106
    317787106 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    abf8c42 View commit details
    Browse the repository at this point in the history

  5. don't disconnect with syncing peer if i am lan node

    @317787106
    317787106 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    40cb055 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. modify testcase of ResilienceServiceTest

    @317787106
    317787106 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    14a0750 View commit details
    Browse the repository at this point in the history

  2. Merge pull request tronprotocol#5944 from 317787106/feature/test_isol… 

    …ated3

feat(net): add some log for isolated2 disconnection
    @lvs007
    lvs007 authored Aug 14, 2024
    Configuration menu
    Copy the full SHA
    424a3dd View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. use the condition: active size >= min active size in isolate2

    @317787106
    317787106 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    471b522 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. change varible name from lastActiveTime to lastInteractiveTime

    @317787106
    317787106 committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    553fbb4 View commit details
    Browse the repository at this point in the history

  2. fix the testcase of testUpdateLastInteractiveTime

    @317787106
    317787106 committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    1a7abf3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request tronprotocol#5956 from 317787106/feature/test_isol… 

    …ated3

feat(net): adjust disconnect strategy in isolated scene
    @lvs007
    lvs007 authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    ea7ef8e View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Add transaction expiration time check before execution (#1) 

    feat(net): add transaction expiration time check before execution
    @fyyhtx
    fyyhtx authored Aug 19, 2024
    Configuration menu
    Copy the full SHA
    31b5d46 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. prefer to disconnect from broadcast nodes when isOpenFullTcpDisconnec… 

    …t is enable
    @317787106
    317787106 committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    8d496f8 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. adjust ResilienceServiceTest

    @317787106
    317787106 committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    f99d216 View commit details
    Browse the repository at this point in the history

  2. add testcase PeerStatusCheckTest

    @317787106
    317787106 committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    e242ae1 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. use WeightedRandom to choose broadcast peer

    @317787106
    317787106 committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    6c3a526 View commit details
    Browse the repository at this point in the history

  2. don't disconnect from high peer if its number <=1

    @317787106
    317787106 committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    59e92c8 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Merge pull request tronprotocol#5984 from 317787106/feature/test_isol… 

    …ated3

feat(net): prefer to disconnect from broadcast nodes
    @lvs007
    lvs007 authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    1996f7b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/release_v4.7.6' into release_v4.7.6

    @jwrct
    jwrct committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    7bdf75e View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. feat(net): delete useless test code

    @jwrct
    jwrct committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    6c73ede View commit details
    Browse the repository at this point in the history

  2. Merge pull request tronprotocol#5999 from fyyhtx/release_v4.7.6 

    feat(net): add transaction expiration time check before execution
    @lvs007
    lvs007 authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    cdbbb0a View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. print trx size from pending and repush after generating block

    @317787106
    317787106 committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    ddccce4 View commit details
    Browse the repository at this point in the history

  2. add some test case

    @317787106
    317787106 committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    450763b View commit details
    Browse the repository at this point in the history

  3. Merge pull request tronprotocol#6017 from 317787106/feature/print_sr_… 

    …queue_size

feat(log): print transaction size from pending and repush after generating block
    @lvs007
    lvs007 authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    9b58a57 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. feat(dependencies): update dependencies for protobuf-java 

     Bump com.google.protobuf:protobuf-java from 3.21.12 to 3.25.5

 Bump io.github.tronprotocol:libp2p from 2.2.1 to 2.2.4
    @halibobo1205
    halibobo1205 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    98a37b1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request tronprotocol#6025 from halibobo1205/feat/update_li… 

    …bp2p

feat(dependencies): update dependencies for protobuf-java
    @lvs007
    lvs007 authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    0f39d7a View commit details
    Browse the repository at this point in the history

  3. Merge pull request tronprotocol#6010 from tronprotocol/release_v4.7.6 

    Release v4.7.6 merge to master
    @lvs007
    lvs007 authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    4103dfe View commit details
    Browse the repository at this point in the history

  4. update a new version. version name:GreatVoyage-v4.7.5-64-g4103dfeb63,… 

    …version code:18372
    @halibobo1205
    halibobo1205 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    8947617 View commit details
    Browse the repository at this point in the history

  5. Merge pull request tronprotocol#6026 from halibobo1205/version/GreatV… 

    …oyage-v4.7.5-64-g4103dfeb63

update a new version. version name:GreatVoyage-v4.7.5-64-g4103dfeb63,version code:18372
    @lvs007
    lvs007 authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    4d0ad61 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Merge remote-tracking branch 'upstream/master' into master_merge_to_d… 

    …evelop

# Conflicts:
#	build.gradle
#	common/build.gradle
    @halibobo1205
    halibobo1205 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    310c533 View commit details
    Browse the repository at this point in the history