Skip to content

Commit

Permalink
Move TxMessage to chainlink-protos (#16041)
Browse files Browse the repository at this point in the history
* add proto file from chainlink-protos

* add changeset

* add updated tag

* add svr dependency to integration-tests

* add go mod dependencies
eduard-cl authored Jan 23, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent c682bd7 commit 413e9d1
Showing 15 changed files with 37 additions and 175 deletions.
5 changes: 5 additions & 0 deletions .changeset/few-vans-wait.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

#updated move TxMessage proto files to chainlink-protos.
6 changes: 3 additions & 3 deletions core/chains/evm/txm/metrics.go
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ import (

"github.com/smartcontractkit/chainlink-common/pkg/beholder"
"github.com/smartcontractkit/chainlink-common/pkg/metrics"
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txm/pb"
svrv1 "github.com/smartcontractkit/chainlink-protos/svr/v1"
)

var (
@@ -96,7 +96,7 @@ func (m *txmMetrics) RecordTimeUntilTxConfirmed(ctx context.Context, duration fl
}

func (m *txmMetrics) EmitTxMessage(ctx context.Context, tx common.Hash, fromAddress common.Address, toAddress common.Address, nonce string) error {
message := &pb.TxMessage{
message := &svrv1.TxMessage{
Hash: tx.String(),
FromAddress: fromAddress.String(),
ToAddress: toAddress.String(),
@@ -112,7 +112,7 @@ func (m *txmMetrics) EmitTxMessage(ctx context.Context, tx common.Hash, fromAddr
ctx,
messageBytes,
"beholder_domain", "svr",
"beholder_entity", "pb.TxMessage",
"beholder_entity", "svr.v1.TxMessage",
"beholder_data_schema", "/beholder-tx-message/versions/1",
)
}
159 changes: 0 additions & 159 deletions core/chains/evm/txm/pb/beholder-tx-message.pb.go

This file was deleted.

12 changes: 0 additions & 12 deletions core/chains/evm/txm/pb/beholder-tx-message.proto

This file was deleted.

1 change: 1 addition & 0 deletions core/scripts/go.mod
Original file line number Diff line number Diff line change
@@ -323,6 +323,7 @@ require (
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250121205514-f73e2f86c23b // indirect
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0 // indirect
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 // indirect
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 // indirect
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250121222331-a7010b4b8ce5 // indirect
github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20250117224137-afdcdd75070d // indirect
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
2 changes: 2 additions & 0 deletions core/scripts/go.sum
Original file line number Diff line number Diff line change
@@ -1188,6 +1188,8 @@ github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0 h1:0ewLMbAz3
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 h1:ZBat8EBvE2LpSQR9U1gEbRV6PfAkiFdINmQ8nVnXIAQ=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0/go.mod h1:m/A3lqD7ms/RsQ9BT5P2uceYY0QX5mIt4KQxT2G6qEo=
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 h1:c77Gi/APraqwbBO8fbd/5JY2wW+MSIpYg8Uma9MEZFE=
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo=
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250121222331-a7010b4b8ce5 h1:U49UgM8oEbssmKXDVkp8OpIr4h5YDwSLdpw2XUBsIfA=
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250121222331-a7010b4b8ce5/go.mod h1:51o1f86HFbQb8aovFxjIhOgj2z7v0iLN7pnRKfvBLpQ=
github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20250117224137-afdcdd75070d h1:hf1Ust1ub9r3+PgRgiry3065QXCXmw6P7YImnue1NEw=
1 change: 1 addition & 0 deletions deployment/go.mod
Original file line number Diff line number Diff line change
@@ -422,6 +422,7 @@ require (
github.com/smartcontractkit/chainlink-feeds v0.1.1 // indirect
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250121195549-294ec6a40b92 // indirect
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 // indirect
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 // indirect
github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20250117224137-afdcdd75070d // indirect
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 // indirect
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.5 // indirect
2 changes: 2 additions & 0 deletions deployment/go.sum
Original file line number Diff line number Diff line change
@@ -1414,6 +1414,8 @@ github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0 h1:0ewLMbAz3
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 h1:ZBat8EBvE2LpSQR9U1gEbRV6PfAkiFdINmQ8nVnXIAQ=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0/go.mod h1:m/A3lqD7ms/RsQ9BT5P2uceYY0QX5mIt4KQxT2G6qEo=
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 h1:c77Gi/APraqwbBO8fbd/5JY2wW+MSIpYg8Uma9MEZFE=
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo=
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250121222331-a7010b4b8ce5 h1:U49UgM8oEbssmKXDVkp8OpIr4h5YDwSLdpw2XUBsIfA=
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250121222331-a7010b4b8ce5/go.mod h1:51o1f86HFbQb8aovFxjIhOgj2z7v0iLN7pnRKfvBLpQ=
github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20250117224137-afdcdd75070d h1:hf1Ust1ub9r3+PgRgiry3065QXCXmw6P7YImnue1NEw=
15 changes: 14 additions & 1 deletion go.md
Original file line number Diff line number Diff line change
@@ -43,6 +43,8 @@ flowchart LR
click chainlink-framework/multinode href "https://github.com/smartcontractkit/chainlink-framework"
chainlink-protos/orchestrator --> wsrpc
click chainlink-protos/orchestrator href "https://github.com/smartcontractkit/chainlink-protos"
chainlink-protos/svr
click chainlink-protos/svr href "https://github.com/smartcontractkit/chainlink-protos"
chainlink-solana --> chainlink-framework/multinode
click chainlink-solana href "https://github.com/smartcontractkit/chainlink-solana"
chainlink-starknet/relayer --> chainlink-common
@@ -54,6 +56,7 @@ flowchart LR
chainlink/v2 --> chainlink-feeds
chainlink/v2 --> chainlink-framework/chains
chainlink/v2 --> chainlink-protos/orchestrator
chainlink/v2 --> chainlink-protos/svr
chainlink/v2 --> chainlink-solana
chainlink/v2 --> chainlink-starknet/relayer
chainlink/v2 --> tdh2/go/ocr2/decryptionplugin
@@ -76,14 +79,20 @@ flowchart LR
end
click chainlink-framework-repo href "https://github.com/smartcontractkit/chainlink-framework"
subgraph chainlink-protos-repo[chainlink-protos]
chainlink-protos/orchestrator
chainlink-protos/svr
end
click chainlink-protos-repo href "https://github.com/smartcontractkit/chainlink-protos"
subgraph tdh2-repo[tdh2]
tdh2/go/ocr2/decryptionplugin
tdh2/go/tdh2
end
click tdh2-repo href "https://github.com/smartcontractkit/tdh2"
classDef outline stroke-dasharray:6,fill:none;
class chainlink-framework-repo,tdh2-repo outline
class chainlink-framework-repo,chainlink-protos-repo,tdh2-repo outline
```
## All modules
```mermaid
@@ -135,6 +144,8 @@ flowchart LR
click chainlink-protos/job-distributor href "https://github.com/smartcontractkit/chainlink-protos"
chainlink-protos/orchestrator --> wsrpc
click chainlink-protos/orchestrator href "https://github.com/smartcontractkit/chainlink-protos"
chainlink-protos/svr
click chainlink-protos/svr href "https://github.com/smartcontractkit/chainlink-protos"
chainlink-solana --> chainlink-framework/multinode
click chainlink-solana href "https://github.com/smartcontractkit/chainlink-solana"
chainlink-starknet/relayer --> chainlink-common
@@ -173,6 +184,7 @@ flowchart LR
chainlink/v2 --> chainlink-feeds
chainlink/v2 --> chainlink-framework/chains
chainlink/v2 --> chainlink-protos/orchestrator
chainlink/v2 --> chainlink-protos/svr
chainlink/v2 --> chainlink-solana
chainlink/v2 --> chainlink-starknet/relayer
chainlink/v2 --> tdh2/go/ocr2/decryptionplugin
@@ -215,6 +227,7 @@ flowchart LR
subgraph chainlink-protos-repo[chainlink-protos]
chainlink-protos/job-distributor
chainlink-protos/orchestrator
chainlink-protos/svr
end
click chainlink-protos-repo href "https://github.com/smartcontractkit/chainlink-protos"
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -330,6 +330,7 @@ require (
github.com/sasha-s/go-deadlock v0.3.5 // indirect
github.com/sethvargo/go-retry v0.2.4 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1170,6 +1170,8 @@ github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250121205514-
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250121205514-f73e2f86c23b/go.mod h1:4JqpgFy01LaqG1yM2iFTzwX3ZgcAvW9WdstBZQgPHzU=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 h1:ZBat8EBvE2LpSQR9U1gEbRV6PfAkiFdINmQ8nVnXIAQ=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0/go.mod h1:m/A3lqD7ms/RsQ9BT5P2uceYY0QX5mIt4KQxT2G6qEo=
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 h1:c77Gi/APraqwbBO8fbd/5JY2wW+MSIpYg8Uma9MEZFE=
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo=
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250121222331-a7010b4b8ce5 h1:U49UgM8oEbssmKXDVkp8OpIr4h5YDwSLdpw2XUBsIfA=
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250121222331-a7010b4b8ce5/go.mod h1:51o1f86HFbQb8aovFxjIhOgj2z7v0iLN7pnRKfvBLpQ=
github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20250117224137-afdcdd75070d h1:hf1Ust1ub9r3+PgRgiry3065QXCXmw6P7YImnue1NEw=
1 change: 1 addition & 0 deletions integration-tests/go.mod
Original file line number Diff line number Diff line change
@@ -438,6 +438,7 @@ require (
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250121195549-294ec6a40b92 // indirect
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250121205514-f73e2f86c23b // indirect
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 // indirect
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 // indirect
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250121222331-a7010b4b8ce5 // indirect
github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20250117224137-afdcdd75070d // indirect
github.com/smartcontractkit/chainlink-testing-framework/framework v0.4.2-0.20250110073248-456673e8eea2 // indirect
2 changes: 2 additions & 0 deletions integration-tests/go.sum
Original file line number Diff line number Diff line change
@@ -1438,6 +1438,8 @@ github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0 h1:0ewLMbAz3
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 h1:ZBat8EBvE2LpSQR9U1gEbRV6PfAkiFdINmQ8nVnXIAQ=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0/go.mod h1:m/A3lqD7ms/RsQ9BT5P2uceYY0QX5mIt4KQxT2G6qEo=
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 h1:c77Gi/APraqwbBO8fbd/5JY2wW+MSIpYg8Uma9MEZFE=
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo=
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250121222331-a7010b4b8ce5 h1:U49UgM8oEbssmKXDVkp8OpIr4h5YDwSLdpw2XUBsIfA=
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250121222331-a7010b4b8ce5/go.mod h1:51o1f86HFbQb8aovFxjIhOgj2z7v0iLN7pnRKfvBLpQ=
github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20250117224137-afdcdd75070d h1:hf1Ust1ub9r3+PgRgiry3065QXCXmw6P7YImnue1NEw=
1 change: 1 addition & 0 deletions integration-tests/load/go.mod
Original file line number Diff line number Diff line change
@@ -426,6 +426,7 @@ require (
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250121205514-f73e2f86c23b // indirect
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0 // indirect
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 // indirect
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 // indirect
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250121222331-a7010b4b8ce5 // indirect
github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20250117224137-afdcdd75070d // indirect
github.com/smartcontractkit/chainlink-testing-framework/framework v0.4.2-0.20250110073248-456673e8eea2 // indirect
2 changes: 2 additions & 0 deletions integration-tests/load/go.sum
Original file line number Diff line number Diff line change
@@ -1427,6 +1427,8 @@ github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0 h1:0ewLMbAz3
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 h1:ZBat8EBvE2LpSQR9U1gEbRV6PfAkiFdINmQ8nVnXIAQ=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0/go.mod h1:m/A3lqD7ms/RsQ9BT5P2uceYY0QX5mIt4KQxT2G6qEo=
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 h1:c77Gi/APraqwbBO8fbd/5JY2wW+MSIpYg8Uma9MEZFE=
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo=
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250121222331-a7010b4b8ce5 h1:U49UgM8oEbssmKXDVkp8OpIr4h5YDwSLdpw2XUBsIfA=
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250121222331-a7010b4b8ce5/go.mod h1:51o1f86HFbQb8aovFxjIhOgj2z7v0iLN7pnRKfvBLpQ=
github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20250117224137-afdcdd75070d h1:hf1Ust1ub9r3+PgRgiry3065QXCXmw6P7YImnue1NEw=

0 comments on commit 413e9d1

Please sign in to comment.