some more cleanup

Author: ogtownsend

cmd/chainlink-ton/lock.nix

@@ -1,5 +1,5 @@
 # Notice: `pkgs.lib.fakeHash` can be used as a placeholder,
 #   but `nix-lock-tidy` will only replace actual hashes.
 {pkgs}: {
-  chainlink-ton = "sha256-tqXbFO/Xe+4ySlEMFjDzsnvJJ1JKGxAPnWQGuRBIKrw=";
+  chainlink-ton = "sha256-u8GR1FCnDYy32On/hpVoMzuWrJuZO3Jmjh7TFmbV8kU=";
 }

pkg/ccip/chainaccessor/ton_accessor.go

@@ -263,7 +263,7 @@ func (a *TONAccessor) LatestMessageTo(ctx context.Context, dest ccipocr3.ChainSe
 		SkipBytes(40). // Skip to DestChainSelector
 		FilterBytes(8, query.EQ(binary.BigEndian.AppendUint64(nil, uint64(dest)))).
 		OrderBy(query.SortByTxLT, query.DESC). // sort by transaction LT new to old
-		Limit(1). // only get the last one
+		Limit(1).                              // only get the last one
 		Execute(ctx, a.logPoller.GetStore())
 
 	if err != nil {

pkg/ccip/provider/provider.go

@@ -5,12 +5,13 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
+	"github.com/xssnick/tonutils-go/ton"
+
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
 	"github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
-	"github.com/xssnick/tonutils-go/ton"
 
 	"github.com/smartcontractkit/chainlink-ton/pkg/ccip/chainaccessor"
 	"github.com/smartcontractkit/chainlink-ton/pkg/ccip/codec"
@@ -37,37 +38,41 @@ type Provider struct {
 	services.StateMachine
 }
 
-func NewCCIPProvider(lggr logger.Logger,
+func NewCCIPProvider(
+	lggr logger.Logger,
 	chainSelector ccipocr3.ChainSelector,
 	client ton.APIClientWrapped,
 	txm txm.TxManager,
 	logPoller logpoller.Service,
-	offRampAddr string,
-	pluginType uint32) (*Provider, error) {
-	var err error
+	cargs commontypes.CCIPProviderArgs,
+) (*Provider, error) {
+	addressCodec := codec.NewAddressCodec()
+	offRampAddrStr, err := addressCodec.AddressBytesToString(cargs.OffRampAddress)
+	if err != nil {
+		return nil, fmt.Errorf("failed to decode offRamp address: %w", err)
+	}
+
 	var ct ocr3types.ContractTransmitter[[]byte]
-	switch pluginType {
+	switch cargs.PluginType {
 	case CCIPPluginTypeCommit:
-		ct, err = ocr.NewCCIPTransmitter(txm, lggr, offRampAddr, ocr.CommitCallData)
+		ct, err = ocr.NewCCIPTransmitter(txm, lggr, offRampAddrStr, ocr.CommitCallData)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create a CCIP ContractTransmitter for commit plugin: %w", err)
 		}
 
 	case CCIPPluginTypeExecute:
-		ct, err = ocr.NewCCIPTransmitter(txm, lggr, offRampAddr, ocr.ExecuteCallData)
+		ct, err = ocr.NewCCIPTransmitter(txm, lggr, offRampAddrStr, ocr.ExecuteCallData)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create a CCIP ContractTransmitter for execute plugin: %w", err)
 		}
 	default:
-		return nil, fmt.Errorf("unknown plugin type: %d", pluginType)
+		return nil, fmt.Errorf("unknown plugin type: %d", cargs.PluginType)
 	}
 
-	// TODO this is pretty much ignored in the core, we need to redesign core to resolve the extraDataCodec map issue if we want to use
-	// this codec
 	c := ccipocr3.Codec{
-		ChainSpecificAddressCodec: codec.NewAddressCodec(),
+		ChainSpecificAddressCodec: addressCodec,
 		CommitPluginCodec:         codec.NewCommitPluginCodecV1(),
-		ExecutePluginCodec:        codec.NewExecutePluginCodecV1(nil), // TODO extraDataCodec map can't be empty
+		ExecutePluginCodec:        codec.NewExecutePluginCodecV1(cargs.ExtraDataCodecBundle),
 		TokenDataEncoder:          codec.NewTokenDataEncoder(),
 		SourceChainExtraDataCodec: codec.NewExtraDataDecoder(),
 	}

pkg/relay/relay.go

@@ -114,7 +114,7 @@ func (r *Relayer) TON() (commontypes.TONService, error) {
 	return &r.tonService, nil
 }
 
-func (r *Relayer) NewCCIPProvider(ctx context.Context, rargs commontypes.CCIPProviderArgs) (commontypes.CCIPProvider, error) {
+func (r *Relayer) NewCCIPProvider(ctx context.Context, cargs commontypes.CCIPProviderArgs) (commontypes.CCIPProvider, error) {
 	// TODO: store chainSelector within Chain
 	chainID, err := strconv.ParseInt(r.chain.ID(), 10, 16)
 	if err != nil {
@@ -133,5 +133,12 @@ func (r *Relayer) NewCCIPProvider(ctx context.Context, rargs commontypes.CCIPPro
 	}
 
 	// TODO: check if rargs.ContractID is offramp address ?
-	return provider.NewCCIPProvider(r.lggr, ccipocr3.ChainSelector(chainSelector), client, r.chain.TxManager(), r.chain.LogPoller(), rargs.OffRampAddress, rargs.PluginType)
+	return provider.NewCCIPProvider(
+		r.lggr,
+		ccipocr3.ChainSelector(chainSelector),
+		client,
+		r.chain.TxManager(),
+		r.chain.LogPoller(),
+		cargs,
+	)
 }