Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[KS-373] Call bind in Execute() #13800

Merged
merged 1 commit into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions core/capabilities/targets/write_target.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ type WriteTarget struct {
forwarderAddress string
capabilities.CapabilityInfo
lggr logger.Logger

bound bool
}

func NewWriteTarget(lggr logger.Logger, id string, cr commontypes.ContractReader, cw commontypes.ChainWriter, forwarderAddress string) *WriteTarget {
Expand All @@ -46,6 +48,7 @@ func NewWriteTarget(lggr logger.Logger, id string, cr commontypes.ContractReader
forwarderAddress,
info,
logger,
false,
}
}

Expand Down Expand Up @@ -73,6 +76,21 @@ func success() <-chan capabilities.CapabilityResponse {
}

func (cap *WriteTarget) Execute(ctx context.Context, request capabilities.CapabilityRequest) (<-chan capabilities.CapabilityResponse, error) {
// Bind to the contract address on the write path.
// Bind() requires a connection to the node's RPCs and
// cannot be run during initialization.
if !cap.bound {
cap.lggr.Debugw("Binding to forwarder address")
err := cap.cr.Bind(ctx, []commontypes.BoundContract{{
Address: cap.forwarderAddress,
Name: "forwarder",
}})
if err != nil {
return nil, err
}
cap.bound = true
}

cap.lggr.Debugw("Execute", "request", request)

reqConfig, err := parseConfig(request.Config)
Expand Down
8 changes: 8 additions & 0 deletions core/capabilities/targets/write_target_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/stretchr/testify/require"

"github.com/smartcontractkit/chainlink-common/pkg/capabilities"
"github.com/smartcontractkit/chainlink-common/pkg/types"
"github.com/smartcontractkit/chainlink-common/pkg/values"
"github.com/smartcontractkit/chainlink/v2/core/capabilities/targets"
"github.com/smartcontractkit/chainlink/v2/core/capabilities/targets/mocks"
Expand Down Expand Up @@ -47,6 +48,13 @@ func TestWriteTarget(t *testing.T) {
})
require.NoError(t, err)

cr.On("Bind", mock.Anything, []types.BoundContract{
{
Address: forwarderAddr,
Name: "forwarder",
},
}).Return(nil)

cr.On("GetLatestValue", mock.Anything, "forwarder", "getTransmitter", mock.Anything, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
transmitter := args.Get(4).(*common.Address)
*transmitter = common.HexToAddress("0x0")
Expand Down
3 changes: 3 additions & 0 deletions core/services/registrysyncer/syncer.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ type contractReaderFactory interface {
NewContractReader(context.Context, []byte) (types.ContractReader, error)
}

// NOTE: this can't be called while initializing the syncer and needs to be called in the sync loop.
// This is because Bind() makes an onchain call to verify that the contract address exists, and if
// called during initialization, this results in a "no live nodes" error.
func newReader(ctx context.Context, lggr logger.Logger, relayer contractReaderFactory, remoteRegistryAddress string) (types.ContractReader, error) {
contractReaderConfig := evmrelaytypes.ChainReaderConfig{
Contracts: map[string]evmrelaytypes.ChainContractReader{
Expand Down
8 changes: 0 additions & 8 deletions core/services/relay/evm/write_target.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (

chainselectors "github.com/smartcontractkit/chain-selectors"

commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
"github.com/smartcontractkit/chainlink/v2/core/capabilities/targets"
"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/forwarder"
Expand Down Expand Up @@ -46,13 +45,6 @@ func NewWriteTarget(ctx context.Context, relayer *Relayer, chain legacyevm.Chain
if err != nil {
return nil, err
}
err = cr.Bind(ctx, []commontypes.BoundContract{{
Address: config.ForwarderAddress().String(),
Name: "forwarder",
}})
if err != nil {
return nil, err
}

chainWriterConfig := relayevmtypes.ChainWriterConfig{
Contracts: map[string]*relayevmtypes.ContractConfig{
Expand Down
Loading