Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: smartcontractkit/chainlink
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: smartcontractkit/chainlink
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e6c1999d42cb6a45dc1b671a01896f812144ba27
Choose a head ref
  • 17 commits
  • 127 files changed
  • 1 contributor

Commits on Jan 21, 2025

  1. Minor.

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    672cf95 View commit details
  2. Minor

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    1e04a68 View commit details
  3. Minor

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    a039cab View commit details
  4. Minor.

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    94a947f View commit details
  5. Minor

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    7e39ff7 View commit details
  6. Minor.

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    298084e View commit details
  7. Minor

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    f72a571 View commit details
  8. Minor

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    f179904 View commit details
  9. Minor

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    be4b342 View commit details
  10. Minor.

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    12745d3 View commit details
  11. Minor.

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    1ee36f7 View commit details
  12. Minor proto version.

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    14da2b5 View commit details
  13. Minor

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    85c0921 View commit details
  14. Minor

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    380f816 View commit details
  15. Minor

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    31891c3 View commit details
  16. Minor

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    79e81c1 View commit details
  17. Minor

    pavel-raykov committed Jan 21, 2025
    Copy the full SHA
    e6c1999 View commit details
Showing with 692 additions and 6,018 deletions.
  1. +5 −0 .changeset/polite-spiders-tan.md
  2. +12 −3 .mockery.yaml
  3. +0 −119 common/fees/fees.go
  4. +0 −159 common/headtracker/head_broadcaster.go
  5. +0 −251 common/headtracker/head_listener.go
  6. +0 −23 common/headtracker/head_saver.go
  7. +0 −478 common/headtracker/head_tracker.go
  8. +14 −13 common/headtracker/mocks/head_broadcaster.go
  9. +6 −6 common/headtracker/mocks/head_trackable.go
  10. +13 −13 common/headtracker/mocks/head_tracker.go
  11. +0 −20 common/headtracker/types/client.go
  12. +0 −19 common/headtracker/types/config.go
  13. +0 −15 common/headtracker/types/head.go
  14. +0 −777 common/txmgr/broadcaster.go
  15. +0 −895 common/txmgr/confirmer.go
  16. +96 −95 common/txmgr/mocks/tx_manager.go
  17. +0 −15 common/txmgr/models.go
  18. +0 −116 common/txmgr/reaper.go
  19. +0 −234 common/txmgr/resender.go
  20. +0 −64 common/txmgr/strategies.go
  21. +0 −55 common/txmgr/test_helpers.go
  22. +0 −335 common/txmgr/tracker.go
  23. +0 −847 common/txmgr/txmgr.go
  24. +0 −88 common/txmgr/types/client.go
  25. +0 −72 common/txmgr/types/config.go
  26. +0 −17 common/txmgr/types/finalizer.go
  27. +0 −17 common/txmgr/types/forwarder_manager.go
  28. +0 −21 common/txmgr/types/keystore.go
  29. +13 −13 common/txmgr/types/mocks/forwarder_manager.go
  30. +8 −8 common/txmgr/types/mocks/key_store.go
  31. +94 −93 common/txmgr/types/mocks/tx_attempt_builder.go
  32. +280 −279 common/txmgr/types/mocks/tx_store.go
  33. +1 −1 common/txmgr/types/mocks/tx_strategy.go
  34. +0 −26 common/txmgr/types/sequence_tracker.go
  35. +0 −26 common/txmgr/types/stuck_tx_detector.go
  36. +0 −359 common/txmgr/types/tx.go
  37. +0 −47 common/txmgr/types/tx_attempt_builder.go
  38. +0 −139 common/txmgr/types/tx_store.go
  39. +0 −50 common/txmgr/types/tx_test.go
  40. +0 −16 common/types/chain.go
  41. +0 −12 common/types/hashable.go
  42. +0 −45 common/types/head.go
  43. +0 −16 common/types/subscription.go
  44. +1 −1 core/chains/evm/client/errors.go
  45. +1 −1 core/chains/evm/client/sub_forwarder_test.go
  46. +1 −1 core/chains/evm/gas/arbitrum_estimator.go
  47. +1 −1 core/chains/evm/gas/block_history_estimator.go
  48. +1 −1 core/chains/evm/gas/block_history_estimator_test.go
  49. +1 −1 core/chains/evm/gas/fee_history_estimator.go
  50. +1 −1 core/chains/evm/gas/fee_history_estimator_test.go
  51. +1 −1 core/chains/evm/gas/fixed_price_estimator.go
  52. +1 −1 core/chains/evm/gas/mocks/evm_estimator.go
  53. +1 −1 core/chains/evm/gas/mocks/evm_fee_estimator.go
  54. +2 −2 core/chains/evm/gas/models.go
  55. +1 −1 core/chains/evm/gas/models_test.go
  56. +1 −1 core/chains/evm/gas/suggested_price_estimator.go
  57. +1 −1 core/chains/evm/headtracker/head_broadcaster.go
  58. +1 −1 core/chains/evm/headtracker/head_broadcaster_test.go
  59. +1 −1 core/chains/evm/headtracker/head_listener_test.go
  60. +2 −2 core/chains/evm/headtracker/head_saver.go
  61. +2 −2 core/chains/evm/headtracker/head_tracker.go
  62. +2 −2 core/chains/evm/headtracker/head_tracker_test.go
  63. +2 −2 core/chains/evm/headtracker/types/types.go
  64. +8 −8 core/chains/evm/txm/orchestrator.go
  65. +1 −3 core/chains/evm/txm/storage/inmemory_store.go
  66. +1 −1 core/chains/evm/txm/storage/inmemory_store_test.go
  67. +1 −1 core/chains/evm/txm/types/transaction.go
  68. +3 −3 core/chains/evm/txmgr/attempts.go
  69. +3 −3 core/chains/evm/txmgr/broadcaster_test.go
  70. +2 −2 core/chains/evm/txmgr/builder.go
  71. +1 −1 core/chains/evm/txmgr/config.go
  72. +3 −3 core/chains/evm/txmgr/confirmer_test.go
  73. +2 −2 core/chains/evm/txmgr/evm_tx_store.go
  74. +2 −2 core/chains/evm/txmgr/evm_tx_store_test.go
  75. +2 −2 core/chains/evm/txmgr/finalizer_test.go
  76. +1 −1 core/chains/evm/txmgr/mocks/evm_tx_store.go
  77. +2 −2 core/chains/evm/txmgr/models.go
  78. +1 −1 core/chains/evm/txmgr/reaper_test.go
  79. +1 −1 core/chains/evm/txmgr/strategies_test.go
  80. +3 −3 core/chains/evm/txmgr/stuck_tx_detector.go
  81. +2 −2 core/chains/evm/txmgr/stuck_tx_detector_test.go
  82. +2 −2 core/chains/evm/txmgr/transmitchecker.go
  83. +2 −2 core/chains/evm/txmgr/transmitchecker_test.go
  84. +2 −2 core/chains/evm/txmgr/txmgr_test.go
  85. +2 −2 core/chains/evm/types/models.go
  86. +2 −2 core/chains/legacyevm/mocks/chain.go
  87. +2 −2 core/internal/cltest/factories.go
  88. +2 −1 core/scripts/go.mod
  89. +2 −0 core/scripts/go.sum
  90. +1 −1 core/services/blockhashstore/batch_bhs.go
  91. +1 −1 core/services/blockhashstore/bhs.go
  92. +1 −1 core/services/fluxmonitorv2/delegate.go
  93. +1 −1 core/services/fluxmonitorv2/flux_monitor_test.go
  94. +1 −1 core/services/fluxmonitorv2/orm.go
  95. +1 −1 core/services/headreporter/prometheus_reporter.go
  96. +1 −1 core/services/ocr/delegate.go
  97. +1 −1 core/services/ocr2/plugins/ccip/transmitter/transmitter.go
  98. +1 −1 core/services/ocrcommon/dual_transmitter.go
  99. +1 −1 core/services/ocrcommon/transmitter.go
  100. +1 −1 core/services/pipeline/task.eth_tx.go
  101. +1 −1 core/services/pipeline/task.eth_tx_test.go
  102. +2 −2 core/services/relay/evm/chain_writer.go
  103. +1 −1 core/services/relay/evm/evm.go
  104. +1 −1 core/services/relay/evm/functions.go
  105. +1 −1 core/services/relay/evm/functions/contract_transmitter.go
  106. +1 −1 core/services/vrf/v2/integration_helpers_test.go
  107. +1 −1 core/services/vrf/v2/integration_v2_reverted_txns_test.go
  108. +2 −2 core/services/vrf/v2/integration_v2_test.go
  109. +2 −2 core/services/vrf/v2/listener_v2.go
  110. +2 −2 core/services/vrf/v2/listener_v2_log_processor.go
  111. +2 −2 core/services/vrf/v2/listener_v2_test.go
  112. +1 −1 core/services/vrf/v2/listener_v2_types.go
  113. +1 −1 core/services/vrf/v2/reverted_txns.go
  114. +2 −2 core/services/vrf/vrfcommon/utils.go
  115. +1 −1 core/web/evm_transactions_controller_test.go
  116. +1 −1 core/web/evm_transfer_controller.go
  117. +1 −1 core/web/presenters/eth_tx_test.go
  118. +1 −1 core/web/resolver/eth_transaction_test.go
  119. +2 −1 deployment/go.mod
  120. +2 −0 deployment/go.sum
  121. +20 −4 go.md
  122. +1 −0 go.mod
  123. +2 −0 go.sum
  124. +2 −1 integration-tests/go.mod
  125. +2 −0 integration-tests/go.sum
  126. +2 −1 integration-tests/load/go.mod
  127. +2 −0 integration-tests/load/go.sum
5 changes: 5 additions & 0 deletions .changeset/polite-spiders-tan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

#updated Move chainlink/common to chainlink-framework/chains.
15 changes: 12 additions & 3 deletions .mockery.yaml
Original file line number Diff line number Diff line change
@@ -3,15 +3,24 @@ mockname: "{{ .InterfaceName }}"
outpkg: mocks
filename: "{{ .InterfaceName | snakecase }}.go"
packages:
github.com/smartcontractkit/chainlink/v2/common/headtracker:
github.com/smartcontractkit/chainlink-framework/chains/headtracker:
config:
dir: common/headtracker/mocks
outpkg: mocks
interfaces:
HeadTrackable:
HeadTracker:
HeadBroadcaster:
github.com/smartcontractkit/chainlink/v2/common/txmgr:
github.com/smartcontractkit/chainlink-framework/chains/txmgr:
config:
dir: common/txmgr/mocks
outpkg: mocks
interfaces:
TxManager:
github.com/smartcontractkit/chainlink/v2/common/txmgr/types:
github.com/smartcontractkit/chainlink-framework/chains/txmgr/types:
config:
dir: common/txmgr/types/mocks
outpkg: mocks
interfaces:
ReaperChainConfig:
config:
119 changes: 0 additions & 119 deletions common/fees/fees.go

This file was deleted.

159 changes: 0 additions & 159 deletions common/headtracker/head_broadcaster.go

This file was deleted.

Loading