Code

merge master to develop #6031

Code

Merged

lvs007 merged 67 commits intotronprotocol:developtronprotocol/java-tron:developfrom halibobo1205:master_merge_to_develophalibobo1205/java-tron:master_merge_to_developCopy head branch name to clipboardOct 8, 2024

+1,015-44

Commits

Commits on Jul 18, 2024

• test(CI): add test-retry plugin for test

  Show description for ff69595
  halibobo1205

  committed
  ff69595

  Copy full SHA for ff69595

• Merge pull request tronprotocol#5916 from halibobo1205/release/4.7.6_add_retry

  Show description for ee7765f
  lvs007

  authored
  ee7765f

  Copy full SHA for ee7765f

• feat(version): update version to 4.7.6

  halibobo1205

  committed
  496d64d

  Copy full SHA for 496d64d

• Merge pull request tronprotocol#5919 from halibobo1205/version/update_version

  Show description for f092d0e
  lvs007

  authored
  f092d0e

  Copy full SHA for f092d0e

• feat(net) : optimize the isIdle method

  zeusoo001

  committed
  0dc7a3f

  Copy full SHA for 0dc7a3f

• feat(net): add isSyncIdle method

  zeusoo001

  committed
  ddbe8f1

  Copy full SHA for ddbe8f1

• feat(net): optimize fetch inventory message check logic

  zeusoo001

  committed
  0779c00

  Copy full SHA for 0779c00

• feat(net) : optimizing the sortPeers method

  zeusoo001

  committed
  fdbfa17

  Copy full SHA for fdbfa17

• feat(net): use comparingLong method for sortPeers

  zeusoo001

  committed
  ea14933

  Copy full SHA for ea14933

• initial commit of test isolated

  317787106

  committed
  3b3b668

  Copy full SHA for 3b3b668

• init commit of set_block_both_have2

  317787106

  committed
  6466458

  Copy full SHA for 6466458

Commits on Jul 19, 2024

• test(MerkleTree): ignore testConcurrent

  Show description for 6a08ac6
  halibobo1205

  committed
  6a08ac6

  Copy full SHA for 6a08ac6

• add testcase testProcessBlock for BlockMsgHandler

  317787106

  committed
  f5961f4

  Copy full SHA for f5961f4

• add testcase testProcessBlock for BlockMsgHandler

  317787106

  committed
  6706d83

  Copy full SHA for 6706d83

• Merge pull request tronprotocol#5927 from halibobo1205/test/remove_unstable_test

  Show description for 4211348
  lvs007

  authored
  4211348

  Copy full SHA for 4211348

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

  

  tomatoishealthy

  authored and

  halibobo1205

  committed
  90a6e8f

  Copy full SHA for 90a6e8f

Commits on Jul 22, 2024

• Merge pull request tronprotocol#5920 from halibobo1205/fix/endpoint-concurrent-access

  Show description for 27cd42f
  lvs007

  authored
  27cd42f

  Copy full SHA for 27cd42f

• set lastactivetime in P2pEventHandlerImpl

  317787106

  committed
  e670386

  Copy full SHA for e670386

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

  317787106

  committed
  4791cdf

  Copy full SHA for 4791cdf

• Merge pull request tronprotocol#5923 from zeusoo001/f-sortpeers-method-opt

  Show description for ecd43b7
  lvs007

  authored
  ecd43b7

  Copy full SHA for ecd43b7

Commits on Jul 23, 2024

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

  Show description for afc3979
  lvs007

  authored
  afc3979

  Copy full SHA for afc3979

• Merge pull request tronprotocol#5922 from zeusoo001/f-sync-fetch-block-opt

  Show description for 729a99b
  lvs007

  authored
  729a99b

  Copy full SHA for 729a99b

• add updateLastActiveTime

  317787106

  committed
  735bccb

  Copy full SHA for 735bccb

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

  317787106

  committed
  cae19ea

  Copy full SHA for cae19ea

• optimize log method of PeerConnection

  317787106

  committed
  343c5f6

  Copy full SHA for 343c5f6

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

  317787106

  committed
  34eb577

  Copy full SHA for 34eb577

Commits on Jul 25, 2024

• Merge pull request tronprotocol#5925 from 317787106/hotfix/set_block_both_have2

  Show description for d6bbbe4
  lvs007

  authored
  d6bbbe4

  Copy full SHA for d6bbbe4

• catch exception of sort peers

  317787106

  committed
  a718006

  Copy full SHA for a718006

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

  317787106

  committed
  4f234be

  Copy full SHA for 4f234be

• catch exception min of peers

  317787106

  committed
  14fda8f

  Copy full SHA for 14fda8f

Commits on Jul 29, 2024

• Merge pull request tronprotocol#5924 from 317787106/feature/test_isolated3

  Show description for 54b0395
  lvs007

  authored
  54b0395

  Copy full SHA for 54b0395

Commits on Aug 6, 2024

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

  zeusoo001

  committed
  d6faee8

  Copy full SHA for d6faee8

• Merge pull request tronprotocol#5942 from zeusoo001/net_traffic_monitor3

  Show description for 21f0cb5
  lvs007

  authored
  21f0cb5

  Copy full SHA for 21f0cb5

Commits on Aug 7, 2024

• add some log for isolated2 disconnection

  317787106

  committed
  81bb50b

  Copy full SHA for 81bb50b

• add log of candidate disconnect size when node is isolated

  317787106

  committed
  0d21388

  Copy full SHA for 0d21388

Commits on Aug 9, 2024

• set blockNotChangeThreshold from 90 to 60 seconds

  317787106

  committed
  0acc84b

  Copy full SHA for 0acc84b

• remove the condition of peer.isDisconnect

  317787106

  committed
  0fc9acb

  Copy full SHA for 0fc9acb

Commits on Aug 13, 2024

• don't disconnect with syncing node when random disconnect

  317787106

  committed
  0f7c7f4

  Copy full SHA for 0f7c7f4

• add DisConnectCause

  317787106

  committed
  7bdae32

  Copy full SHA for 7bdae32

• add DisConnectCause

  317787106

  committed
  ffbb69e

  Copy full SHA for ffbb69e

• change the condition of isLanNode

  317787106

  committed
  abf8c42

  Copy full SHA for abf8c42

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

  317787106

  committed
  40cb055

  Copy full SHA for 40cb055

Commits on Aug 14, 2024

• modify testcase of ResilienceServiceTest

  317787106

  committed
  14a0750

  Copy full SHA for 14a0750

• Merge pull request tronprotocol#5944 from 317787106/feature/test_isolated3

  Show description for 424a3dd
  lvs007

  authored
  424a3dd

  Copy full SHA for 424a3dd

Commits on Aug 15, 2024

• use the condition: active size >= min active size in isolate2

  317787106

  committed
  471b522

  Copy full SHA for 471b522

Commits on Aug 16, 2024

• change varible name from lastActiveTime to lastInteractiveTime

  317787106

  committed
  553fbb4

  Copy full SHA for 553fbb4

• fix the testcase of testUpdateLastInteractiveTime

  317787106

  committed
  1a7abf3

  Copy full SHA for 1a7abf3

• Merge pull request tronprotocol#5956 from 317787106/feature/test_isolated3

  Show description for ea7ef8e
  lvs007

  authored
  ea7ef8e

  Copy full SHA for ea7ef8e

Commits on Aug 19, 2024

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

  Show description for 31b5d46
  fyyhtx

  authored
  31b5d46

  Copy full SHA for 31b5d46

Commits on Sep 2, 2024

• prefer to disconnect from broadcast nodes when isOpenFullTcpDisconnect is enable

  317787106

  committed
  8d496f8

  Copy full SHA for 8d496f8

Commits on Sep 3, 2024

• adjust ResilienceServiceTest

  317787106

  committed
  f99d216

  Copy full SHA for f99d216

• add testcase PeerStatusCheckTest

  317787106

  committed
  e242ae1

  Copy full SHA for e242ae1

Commits on Sep 4, 2024

• use WeightedRandom to choose broadcast peer

  317787106

  committed
  6c3a526

  Copy full SHA for 6c3a526

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

  317787106

  committed
  59e92c8

  Copy full SHA for 59e92c8

Commits on Sep 5, 2024

• Merge pull request tronprotocol#5984 from 317787106/feature/test_isolated3

  Show description for 1996f7b
  lvs007

  authored
  1996f7b

  Copy full SHA for 1996f7b

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

  jwrct

  committed
  7bdf75e

  Copy full SHA for 7bdf75e

Commits on Sep 12, 2024

• feat(net): delete useless test code

  jwrct

  committed
  6c73ede

  Copy full SHA for 6c73ede

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

  Show description for cdbbb0a
  lvs007

  authored
  cdbbb0a

  Copy full SHA for cdbbb0a

Commits on Sep 27, 2024

• print trx size from pending and repush after generating block

  317787106

  committed
  ddccce4

  Copy full SHA for ddccce4

• add some test case

  317787106

  committed
  450763b

  Copy full SHA for 450763b

• Merge pull request tronprotocol#6017 from 317787106/feature/print_sr_queue_size

  Show description for 9b58a57
  lvs007

  authored
  9b58a57

  Copy full SHA for 9b58a57

Commits on Oct 4, 2024

• feat(dependencies): update dependencies for protobuf-java

  Show description for 98a37b1
  halibobo1205

  committed
  98a37b1

  Copy full SHA for 98a37b1

• Merge pull request tronprotocol#6025 from halibobo1205/feat/update_libp2p

  Show description for 0f39d7a
  lvs007

  authored
  0f39d7a

  Copy full SHA for 0f39d7a

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

  Show description for 4103dfe
  lvs007

  authored
  4103dfe

  Copy full SHA for 4103dfe

• update a new version. version name:GreatVoyage-v4.7.5-64-g4103dfeb63,version code:18372

  halibobo1205

  committed
  8947617

  Copy full SHA for 8947617

• Merge pull request tronprotocol#6026 from halibobo1205/version/GreatVoyage-v4.7.5-64-g4103dfeb63

  Show description for 4d0ad61
  lvs007

  authored
  4d0ad61

  Copy full SHA for 4d0ad61

Commits on Oct 8, 2024

• Merge remote-tracking branch 'upstream/master' into master_merge_to_develop

  Show description for 310c533
  halibobo1205

  committed
  310c533

  Copy full SHA for 310c533