Skip to content

Commit 511b944

Browse files
fernandezlautarofernandezlautaro
authored
PLEX-1727: remove EVM RegisterLogTracking and UnregisterLogTracking (#19340)
* PLEX-1727: remove EVM RegisterLogTracking and UnregisterLogTracking # Conflicts: # core/scripts/go.mod # go.mod # go.sum # system-tests/lib/go.mod * bumping deps * bumping deps * make generate gateway * fix http fake * missing handler gateway connector * missing remove handler again in a different part
1 parent 93657c9 commit 511b944

20 files changed

Lines changed: 120 additions & 77 deletions

File tree

‎core/capabilities/fakes/evm_chain.go‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/ethereum/go-ethereum/common"
1313
"github.com/ethereum/go-ethereum/core/types"
1414
"github.com/ethereum/go-ethereum/ethclient"
15-
"google.golang.org/protobuf/types/known/emptypb"
1615

1716
commonCap "github.com/smartcontractkit/chainlink-common/pkg/capabilities"
1817
evmcappb "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/chain-capabilities/evm"
@@ -460,16 +459,6 @@ func (fc *FakeEVMChain) HeaderByNumber(ctx context.Context, metadata commonCap.R
460459
return &responseAndMetadata, nil
461460
}
462461

463-
func (fc *FakeEVMChain) RegisterLogTracking(gsctx context.Context, metadata commonCap.RequestMetadata, input *evmcappb.RegisterLogTrackingRequest) (*commonCap.ResponseAndMetadata[*emptypb.Empty], error) {
464-
fc.eng.Infow("EVM Chain registered log tracking", "input", input)
465-
return nil, nil
466-
}
467-
468-
func (fc *FakeEVMChain) UnregisterLogTracking(ctx context.Context, metadata commonCap.RequestMetadata, input *evmcappb.UnregisterLogTrackingRequest) (*commonCap.ResponseAndMetadata[*emptypb.Empty], error) {
469-
fc.eng.Infow("EVM Chain unregistered log tracking", "input", input)
470-
return nil, nil
471-
}
472-
473462
func (fc *FakeEVMChain) Name() string {
474463
return fc.ID
475464
}

‎core/capabilities/fakes/http_action.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ func (fh *DirectHTTPAction) SendRequest(ctx context.Context, metadata commonCap.
5353

5454
// Create HTTP client with timeout
5555
timeout := time.Duration(30) * time.Second // default timeout
56-
if input.GetTimeoutMs() > 0 {
57-
timeout = time.Duration(input.GetTimeoutMs()) * time.Millisecond
56+
if input.GetTimeout() != nil {
57+
timeout = input.GetTimeout().AsDuration()
5858
}
5959

6060
client := &http.Client{

‎core/scripts/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ require (
4646
github.com/rs/zerolog v1.33.0
4747
github.com/shopspring/decimal v1.4.0
4848
github.com/smartcontractkit/chainlink-automation v0.8.1
49-
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250903115155-a68d8c28ae1d
50-
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250908133421-f9b356d61ca9
49+
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250910210251-724af8ee41ad
50+
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250911130849-88895489a3a7
5151
github.com/smartcontractkit/chainlink-data-streams v0.1.2
5252
github.com/smartcontractkit/chainlink-deployments-framework v0.44.0
5353
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20250909183314-c46f62fb74f6
5454
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be
55-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250908151016-bf310cf85379
55+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2
5656
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1
5757
github.com/smartcontractkit/chainlink-testing-framework/framework v0.10.23
5858
github.com/smartcontractkit/chainlink-testing-framework/framework/components/dockercompose v0.1.13

‎core/scripts/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,14 +1533,14 @@ github.com/smartcontractkit/chainlink-aptos v0.0.0-20250905094443-ac02b032b32b h
15331533
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250905094443-ac02b032b32b/go.mod h1:zNZ5rtLkbqsGCjDWb1y8n7BRk2zgflkzmj2GjnLnj08=
15341534
github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=
15351535
github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
1536-
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250903115155-a68d8c28ae1d h1:4tEhMQnJW5jndVxukgC+/CVf+FkHVKg3AYygkMtOVUQ=
1537-
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250903115155-a68d8c28ae1d/go.mod h1://SdVNO8EApDtkB+iaexDScAnapRAvcGbxgF3H6ixhY=
1536+
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250910210251-724af8ee41ad h1:d5i6DP5kHf4fg/YLuwxwVQ2U10UON88B51dnYD5ClX0=
1537+
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250910210251-724af8ee41ad/go.mod h1:4djmYiCYf9BfpNcuhANzh/umrMKfhOQRGfnk1ZnL5Io=
15381538
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8184001834b5 h1:GmJQqNrWn5pNc8YTei6l2TOSYjK2fRd4+edFZIifCrU=
15391539
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8184001834b5/go.mod h1:Ve1xD71bl193YIZQEoJMmBqLGQJdNs29bwbuObwvbhQ=
15401540
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250908144012-8184001834b5 h1:QhcYGEhRLInr1/qh/3RJiVdvJ0nxBHKhPe65WLbSBnU=
15411541
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250908144012-8184001834b5/go.mod h1:xtZNi6pOKdC3sLvokDvXOhgHzT+cyBqH/gWwvxTxqrg=
1542-
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250908133421-f9b356d61ca9 h1:ZWE1acA9mP9RlA+wcGm2Q2eF0CXSGcTUwyBVwHiiv24=
1543-
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250908133421-f9b356d61ca9/go.mod h1:b5KI42+P0ZmUXuvOFzSH9uIB8K83wvXq1GNVoY+ePeg=
1542+
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250911130849-88895489a3a7 h1:/2CjhnEg6UT+2usWNTs5ow2L3XSG1rPdtH1OmDs7fsg=
1543+
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250911130849-88895489a3a7/go.mod h1:Sjn789M++//bIH4vC5LYdo+0zvdkGvt0xz1LCxrYx1M=
15441544
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 h1:ca2z5OXgnbBPQRxpwXwBLJsUA1+cAp5ncfW4Ssvd6eY=
15451545
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1/go.mod h1:NZv/qKYGFRnkjOYBouajnDfFoZ+WDa6H2KNmSf1dnKc=
15461546
github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
@@ -1565,8 +1565,8 @@ github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-
15651565
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d/go.mod h1:2JTBNp3FlRdO/nHc4dsc9bfxxMClMO1Qt8sLJgtreBY=
15661566
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250722225531-876fd6b94976 h1:mF3FiDUoV0QbJcks9R2y7ydqntNL1Z0VCPBJgx/Ms+0=
15671567
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250722225531-876fd6b94976/go.mod h1:HHGeDUpAsPa0pmOx7wrByCitjQ0mbUxf0R9v+g67uCA=
1568-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250908151016-bf310cf85379 h1:AeXgr3/rGqQr3XxA0oxdWlTFR1xbpmEkc6sa9Dh4p+w=
1569-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250908151016-bf310cf85379/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q=
1568+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2 h1:1/KdO5AbUr3CmpLjMPuJXPo2wHMbfB8mldKLsg7D4M8=
1569+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q=
15701570
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1 h1:PWwLGimBt37eDzpbfZ9V/ZkW4oCjcwKjKiAwKlSfPc0=
15711571
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
15721572
github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0 h1:0eroOyBwmdoGUwUdvMI0/J7m5wuzNnJDMglSOK1sfNY=

‎core/services/gateway/connector/mocks/gateway_connector.go‎

Lines changed: 47 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core/services/gateway/connector/mocks/gateway_connector_unimplemented.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ func (g *GatewayConnector) AwaitConnection(ctx context.Context, gatewayID string
4343
return g.BaseGatewayConnector.AwaitConnection(ctx, gatewayID)
4444
}
4545

46+
func (g *GatewayConnector) RemoveHandler(ctx context.Context, methods []string) error {
47+
return g.BaseGatewayConnector.RemoveHandler(ctx, methods)
48+
}
49+
4650
func NewGatewayConnector(t interface {
4751
mock.TestingT
4852
Cleanup(func())

‎core/services/standardcapabilities/standard_capabilities_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@ func (g *gatewayConnectorMock) AddHandler(ctx context.Context, methods []string,
125125
return nil
126126
}
127127

128+
func (g *gatewayConnectorMock) RemoveHandler(ctx context.Context, methods []string) error {
129+
return nil
130+
}
131+
128132
func (g *gatewayConnectorMock) SendToGateway(ctx context.Context, gatewayID string, resp *jsonrpc.Response[json.RawMessage]) error {
129133
return nil
130134
}

‎deployment/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ require (
3434
github.com/smartcontractkit/ccip-owner-contracts v0.1.0
3535
github.com/smartcontractkit/chain-selectors v1.0.70
3636
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250905094443-ac02b032b32b
37-
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250903115155-a68d8c28ae1d
37+
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250910210251-724af8ee41ad
3838
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8184001834b5
3939
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250908144012-8184001834b5
40-
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250908133421-f9b356d61ca9
40+
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250911130849-88895489a3a7
4141
github.com/smartcontractkit/chainlink-deployments-framework v0.44.0
4242
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20250909183314-c46f62fb74f6
4343
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be
4444
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d
45-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250908151016-bf310cf85379
45+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2
4646
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1
4747
github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0
4848
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250905170534-87e867e6cf31

‎deployment/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,14 +1267,14 @@ github.com/smartcontractkit/chainlink-aptos v0.0.0-20250905094443-ac02b032b32b h
12671267
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250905094443-ac02b032b32b/go.mod h1:zNZ5rtLkbqsGCjDWb1y8n7BRk2zgflkzmj2GjnLnj08=
12681268
github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=
12691269
github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
1270-
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250903115155-a68d8c28ae1d h1:4tEhMQnJW5jndVxukgC+/CVf+FkHVKg3AYygkMtOVUQ=
1271-
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250903115155-a68d8c28ae1d/go.mod h1://SdVNO8EApDtkB+iaexDScAnapRAvcGbxgF3H6ixhY=
1270+
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250910210251-724af8ee41ad h1:d5i6DP5kHf4fg/YLuwxwVQ2U10UON88B51dnYD5ClX0=
1271+
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250910210251-724af8ee41ad/go.mod h1:4djmYiCYf9BfpNcuhANzh/umrMKfhOQRGfnk1ZnL5Io=
12721272
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8184001834b5 h1:GmJQqNrWn5pNc8YTei6l2TOSYjK2fRd4+edFZIifCrU=
12731273
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8184001834b5/go.mod h1:Ve1xD71bl193YIZQEoJMmBqLGQJdNs29bwbuObwvbhQ=
12741274
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250908144012-8184001834b5 h1:QhcYGEhRLInr1/qh/3RJiVdvJ0nxBHKhPe65WLbSBnU=
12751275
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250908144012-8184001834b5/go.mod h1:xtZNi6pOKdC3sLvokDvXOhgHzT+cyBqH/gWwvxTxqrg=
1276-
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250908133421-f9b356d61ca9 h1:ZWE1acA9mP9RlA+wcGm2Q2eF0CXSGcTUwyBVwHiiv24=
1277-
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250908133421-f9b356d61ca9/go.mod h1:b5KI42+P0ZmUXuvOFzSH9uIB8K83wvXq1GNVoY+ePeg=
1276+
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250911130849-88895489a3a7 h1:/2CjhnEg6UT+2usWNTs5ow2L3XSG1rPdtH1OmDs7fsg=
1277+
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250911130849-88895489a3a7/go.mod h1:Sjn789M++//bIH4vC5LYdo+0zvdkGvt0xz1LCxrYx1M=
12781278
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 h1:ca2z5OXgnbBPQRxpwXwBLJsUA1+cAp5ncfW4Ssvd6eY=
12791279
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1/go.mod h1:NZv/qKYGFRnkjOYBouajnDfFoZ+WDa6H2KNmSf1dnKc=
12801280
github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
@@ -1299,8 +1299,8 @@ github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-
12991299
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d/go.mod h1:2JTBNp3FlRdO/nHc4dsc9bfxxMClMO1Qt8sLJgtreBY=
13001300
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250722225531-876fd6b94976 h1:mF3FiDUoV0QbJcks9R2y7ydqntNL1Z0VCPBJgx/Ms+0=
13011301
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250722225531-876fd6b94976/go.mod h1:HHGeDUpAsPa0pmOx7wrByCitjQ0mbUxf0R9v+g67uCA=
1302-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250908151016-bf310cf85379 h1:AeXgr3/rGqQr3XxA0oxdWlTFR1xbpmEkc6sa9Dh4p+w=
1303-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250908151016-bf310cf85379/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q=
1302+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2 h1:1/KdO5AbUr3CmpLjMPuJXPo2wHMbfB8mldKLsg7D4M8=
1303+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q=
13041304
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1 h1:PWwLGimBt37eDzpbfZ9V/ZkW4oCjcwKjKiAwKlSfPc0=
13051305
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
13061306
github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0 h1:0eroOyBwmdoGUwUdvMI0/J7m5wuzNnJDMglSOK1sfNY=

‎go.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ flowchart LR
2929
chainlink-automation --> chainlink-common
3030
click chainlink-automation href "https://github.com/smartcontractkit/chainlink-automation"
3131
chainlink-ccip --> chainlink-common
32-
chainlink-ccip --> chainlink-common/pkg/values
3332
chainlink-ccip --> chainlink-protos/rmn/v1.6/go
3433
click chainlink-ccip href "https://github.com/smartcontractkit/chainlink-ccip"
3534
chainlink-ccip/chains/solana --> chainlink-ccip

0 commit comments

Comments
 (0)