Skip to content

Commit af80ea0

Browse files
pavel-raykovpavel-raykov
authored
[PRODCRE-1746] Use moved keys from chainlink-common/keystore (#21180)
* Minor. * Minor. # Conflicts: # core/scripts/go.mod # core/services/blockhashstore/delegate_test.go # core/services/keystore/keys/ethkey/models.go # core/services/ocr2/plugins/ocr2keeper/integration_test.go # core/web/presenters/eth_key.go # core/web/presenters/eth_key_test.go # core/web/presenters/job.go # core/web/resolver/eth_key_test.go # deployment/go.mod # go.mod # integration-tests/go.mod # integration-tests/load/go.mod # system-tests/lib/go.mod # system-tests/tests/go.mod * Minor. * Minor. * Minor. * Minor. * Minor. * Minor. * Minor. * Minor. * Minor.
1 parent f39d501 commit af80ea0

File tree

453 files changed

+578
-10097
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

453 files changed

+578
-10097
lines changed

‎core/capabilities/ccip/ccip_integration_tests/integrationhelpers/integration_helpers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ import (
3737
"github.com/smartcontractkit/chainlink-evm/pkg/read"
3838
evmtestutils "github.com/smartcontractkit/chainlink-evm/pkg/testutils"
3939

40+
"github.com/smartcontractkit/chainlink-common/keystore/corekeys/p2pkey"
4041
configsevm "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/configs/evm"
4142
cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
4243
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
4344
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
44-
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
4545
)
4646

4747
const chainID = 1337

‎core/capabilities/ccip/configs/sui/contract_reader.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/smartcontractkit/chainlink-sui/relayer/client"
1414
"github.com/smartcontractkit/chainlink-sui/relayer/codec"
1515

16-
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/suikey"
16+
"github.com/smartcontractkit/chainlink-common/keystore/corekeys/suikey"
1717
)
1818

1919
func PublicKeyToAddress(pubKeyHex string) (string, error) {

‎core/capabilities/ccip/delegate.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ import (
2828
kcr "github.com/smartcontractkit/chainlink-evm/gethwrappers/keystone/generated/capabilities_registry_1_1_0"
2929
"github.com/smartcontractkit/chainlink-evm/pkg/config/toml"
3030

31+
"github.com/smartcontractkit/chainlink-common/keystore/corekeys/ocr2key"
32+
"github.com/smartcontractkit/chainlink-common/keystore/corekeys/p2pkey"
3133
"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common"
3234
configsevm "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/configs/evm"
3335
"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/launcher"
@@ -36,8 +38,6 @@ import (
3638
"github.com/smartcontractkit/chainlink/v2/core/config"
3739
"github.com/smartcontractkit/chainlink/v2/core/services/job"
3840
"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
39-
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
40-
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
4141
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2"
4242
"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
4343
"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"

‎core/capabilities/ccip/launcher/diff_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/stretchr/testify/require"
1111

12-
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
12+
"github.com/smartcontractkit/chainlink-common/keystore/corekeys/p2pkey"
1313
"github.com/smartcontractkit/chainlink/v2/core/services/p2p/types"
1414
"github.com/smartcontractkit/chainlink/v2/core/services/registrysyncer"
1515
)

‎core/capabilities/ccip/launcher/launcher_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import (
1414
ccipreaderpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
1515
"github.com/smartcontractkit/chainlink-common/pkg/logger"
1616

17+
"github.com/smartcontractkit/chainlink-common/keystore/corekeys/p2pkey"
1718
"github.com/smartcontractkit/chainlink-evm/pkg/utils"
1819
cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
1920
"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types/mocks"
2021
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
21-
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
2222
"github.com/smartcontractkit/chainlink/v2/core/services/registrysyncer"
2323
)
2424

‎core/capabilities/ccip/launcher/test_helpers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/smartcontractkit/chainlink-common/pkg/capabilities"
88

9-
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
9+
"github.com/smartcontractkit/chainlink-common/keystore/corekeys/p2pkey"
1010
"github.com/smartcontractkit/chainlink/v2/core/services/registrysyncer"
1111

1212
ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types"

‎core/capabilities/ccip/ocrimpls/contract_transmitter.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/smartcontractkit/chainlink-common/pkg/logger"
1818
commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
1919

20-
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
20+
"github.com/smartcontractkit/chainlink-common/keystore/corekeys/ocr2key"
2121
)
2222

2323
// ToCalldataFunc is a function that takes in the OCR3 report and signature data and processes them.

‎core/capabilities/ccip/ocrimpls/contract_transmitter_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/multi_ocr3_helper"
2727
kschaintype "github.com/smartcontractkit/chainlink-common/keystore/corekeys"
28+
"github.com/smartcontractkit/chainlink-common/keystore/corekeys/ocr2key"
2829
"github.com/smartcontractkit/chainlink-common/pkg/logger"
2930
"github.com/smartcontractkit/chainlink-common/pkg/types/ccip/consts"
3031
"github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
@@ -52,7 +53,6 @@ import (
5253
"github.com/smartcontractkit/chainlink/v2/core/config"
5354
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
5455
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
55-
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
5656
)
5757

5858
func Test_ContractTransmitter_TransmitWithoutSignatures(t *testing.T) {

‎core/capabilities/ccip/ocrimpls/keyring.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/smartcontractkit/chainlink-common/pkg/logger"
1010

11-
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
11+
"github.com/smartcontractkit/chainlink-common/keystore/corekeys/ocr2key"
1212
)
1313

1414
// OCR3SignerVerifierExtra is an extension of OCR3SignerVerifier that

‎core/capabilities/ccip/oraclecreator/create_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import (
2323
ccipreaderpkg "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
2424
cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
2525

26+
"github.com/smartcontractkit/chainlink-common/keystore/corekeys/ocr2key"
27+
"github.com/smartcontractkit/chainlink-common/keystore/corekeys/p2pkey"
2628
ccipcommon "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common"
2729
cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
2830
"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types/mocks"
2931
"github.com/smartcontractkit/chainlink/v2/core/services/job"
30-
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
31-
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
3232
"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
3333
)
3434

0 commit comments

Comments
 (0)