Code

Consensus changes merge target#401

Code

Merged

systemzax merged 20 commits intomainAntelopeIO/spring:mainfrom consensus_changes_merge_target_2AntelopeIO/spring:consensus_changes_merge_target_2Copy head branch name to clipboardJul 25, 2024

+86-80

Commits

Commits on Jul 24, 2024

• Merge branch 'GH-376-joint-qcs' of https://github.com/antelopeIO/spring into consensus_changes_merge_target

  systemzax

  committed
  a0e0a22

  Copy full SHA for a0e0a22

• Resolved merge conflicts

  systemzax

  committed
  edf1744

  Copy full SHA for edf1744

• Resolved merge conflicts

  systemzax

  committed
  8ded338

  Copy full SHA for 8ded338

• Resolved merge conflicts

  systemzax

  committed
  8741b73

  Copy full SHA for 8741b73

• Updated deep-mind.log

  systemzax

  committed
  11b02dc

  Copy full SHA for 11b02dc

• Merge branch 'GH-376-joint-qcs' of https://github.com/antelopeIO/spring into consensus_changes_merge_target

  systemzax

  committed
  54ec6eb

  Copy full SHA for 54ec6eb

• Cleaned up comments and added additional checks to svnn_ibc_tests

  systemzax

  committed
  bab79b2

  Copy full SHA for bab79b2

• Reverted timestamp commitments to block_timestamp_type

  systemzax

  committed
  db6248f

  Copy full SHA for db6248f

• Updated deep-mind.log

  systemzax

  committed
  2233bbe

  Copy full SHA for 2233bbe

• Merge branch 'GH-376-joint-qcs' of https://github.com/antelopeIO/spring into consensus_changes_merge_target

  systemzax

  committed
  0e5ec63

  Copy full SHA for 0e5ec63

Commits on Jul 25, 2024

• Resolved merge conflicts

  systemzax

  committed
  afcec5d

  Copy full SHA for afcec5d

• Merge branch 'main' of https://github.com/antelopeIO/spring into consensus_changes_merge_target

  systemzax

  committed
  e7a68f8

  Copy full SHA for e7a68f8

• Resolved merge conflicts

  systemzax

  committed
  385e29e

  Copy full SHA for 385e29e

• Resolved merge conflicts

  systemzax

  committed
  d7ee0cb

  Copy full SHA for d7ee0cb

• Resolved merge conflicts

  systemzax

  committed
  9c84df3

  Copy full SHA for 9c84df3

• Clean up

  systemzax

  committed
  a227f26

  Copy full SHA for a227f26

• Clean up

  systemzax

  committed
  8d82fcb

  Copy full SHA for 8d82fcb

• Added back comment

  systemzax

  committed
  d16e096

  Copy full SHA for d16e096

• Fixed comments

  systemzax

  committed
  3cd9ceb

  Copy full SHA for 3cd9ceb

• Added explanation of 2-chains finality

  systemzax

  committed
  779dc47

  Copy full SHA for 779dc47