Skip to content

Commit 3ace32f

Browse files
committed
Added transmitter field to CCIP provider args
1 parent 7fdfa8a commit 3ace32f

File tree

6 files changed

+21
-3
lines changed

6 files changed

+21
-3
lines changed

pkg/loop/ccip_provider_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ func TestCCIPChainAccessorSyncPersistence(t *testing.T) {
5858
ChainWriterConfig: []byte("asdf"),
5959
OffRampAddress: "0x1234123412341234123412341234123412341234",
6060
PluginType: 0,
61+
Transmitter: "0x4321432143214321432143214321432143214321",
6162
})
6263
require.NoError(t, err)
6364
require.NotNil(t, ccipProvider)

pkg/loop/internal/pb/relayer.pb.go

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

pkg/loop/internal/pb/relayer.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ message CCIPProviderArgs {
6565
uint32 pluginType = 5;
6666
map<string, bytes> synced_addresses = 6; // map[contract_name]contract_address
6767
uint32 extraDataCodecBundleID = 7; // LOOP service ID for ExtraDataCodecBundle served by core node
68+
string transmitter = 8;
6869
}
6970

7071
// NewContractWriterRequest has request parameters for [github.com/smartcontractkit/chainlink-common/pkg/loop.Relayer.NewContractWriter].

pkg/loop/internal/relayer/relayer.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ func (r *relayerClient) NewCCIPProvider(ctx context.Context, cargs types.CCIPPro
318318
PluginType: uint32(cargs.PluginType),
319319
SyncedAddresses: persistedSyncs,
320320
ExtraDataCodecBundleID: extraDataCodecBundleID,
321+
Transmitter: cargs.Transmitter,
321322
},
322323
})
323324
if err != nil {
@@ -765,6 +766,7 @@ func (r *relayerServer) NewCCIPProvider(ctx context.Context, request *pb.NewCCIP
765766
OffRampAddress: rargs.OffRampAddress,
766767
PluginType: cctypes.PluginType(rargs.PluginType),
767768
ExtraDataCodecBundle: extraDataCodecBundle,
769+
Transmitter: rargs.Transmitter,
768770
}
769771

770772
provider, err := r.impl.NewCCIPProvider(ctx, ccipProviderArgs)

pkg/loop/internal/relayer/test/relayer.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ type staticRelayerConfig struct {
7777
chainWriterConfig []byte
7878
offRampAddress string
7979
pluginType ccipocr3.PluginType
80+
transmitter string
8081
medianProvider testtypes.MedianProviderTester
8182
agnosticProvider testtypes.PluginProviderTester
8283
mercuryProvider mercurytest.MercuryProviderTester
@@ -104,6 +105,7 @@ func newStaticRelayerConfig(lggr logger.Logger, staticChecks bool) staticRelayer
104105
chainWriterConfig: []byte("chainwriterconfig"),
105106
offRampAddress: "fakeAddress",
106107
pluginType: 0,
108+
transmitter: "fakeAddress",
107109
medianProvider: mediantest.MedianProvider(lggr),
108110
mercuryProvider: mercurytest.MercuryProvider(lggr),
109111
executionProvider: cciptest.ExecutionProvider(lggr),
@@ -321,6 +323,7 @@ func (s staticRelayer) NewCCIPProvider(ctx context.Context, r types.CCIPProvider
321323
ChainWriterConfig: s.chainWriterConfig,
322324
OffRampAddress: s.offRampAddress,
323325
PluginType: s.pluginType,
326+
Transmitter: s.transmitter,
324327
}
325328
if s.StaticChecks && !equalCCIPProviderArgs(r, ccipProviderArgs) {
326329
return nil, fmt.Errorf("expected relay args:\n\t%v\nbut got:\n\t%v", s.relayArgs, r)
@@ -479,7 +482,8 @@ func equalCCIPProviderArgs(a, b types.CCIPProviderArgs) bool {
479482
slices.Equal(a.ContractReaderConfig, b.ContractReaderConfig) &&
480483
slices.Equal(a.ChainWriterConfig, b.ChainWriterConfig) &&
481484
a.OffRampAddress == b.OffRampAddress &&
482-
a.PluginType == b.PluginType
485+
a.PluginType == b.PluginType &&
486+
a.Transmitter == b.Transmitter
483487
}
484488

485489
func newRelayArgsWithProviderType(_type types.OCR2PluginType) types.RelayArgs {

pkg/types/provider_ccip.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,5 @@ type CCIPProviderArgs struct {
7171
// The actual bundle instance to serve over LOOP. pb.CCIPProviderArgs equivalent
7272
// is ExtraDataCodecBundleID.
7373
ExtraDataCodecBundle ccipocr3.ExtraDataCodecBundle
74+
Transmitter string
7475
}

0 commit comments

Comments
 (0)