Move underlying getters to chainlink-ton

Author: krebernisak

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a
 	github.com/smartcontractkit/chainlink-sui v0.0.0-20251104205009-00bd79b81471
 	github.com/smartcontractkit/chainlink-testing-framework/framework v0.12.1
-	github.com/smartcontractkit/chainlink-ton v0.0.0-20251216164546-5c01294e67f0
+	github.com/smartcontractkit/chainlink-ton v0.0.0-20251217111141-cb367045c4a0
 	github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e
 	github.com/spf13/cast v1.10.0
 	github.com/stretchr/testify v1.11.1

go.sum

@@ -664,6 +664,14 @@ github.com/smartcontractkit/chainlink-ton v0.0.0-20251216125720-1413fa6ffe65 h1:
 github.com/smartcontractkit/chainlink-ton v0.0.0-20251216125720-1413fa6ffe65/go.mod h1:z27AgU6fEXkkfmUAzcbEH9u3RKz2oaGy3isb7KK6Z2E=
 github.com/smartcontractkit/chainlink-ton v0.0.0-20251216164546-5c01294e67f0 h1:e8C47c6WC/BSFd/joI5kadkmA9twR5ArK7rKisQPZ+k=
 github.com/smartcontractkit/chainlink-ton v0.0.0-20251216164546-5c01294e67f0/go.mod h1:z27AgU6fEXkkfmUAzcbEH9u3RKz2oaGy3isb7KK6Z2E=
+github.com/smartcontractkit/chainlink-ton v0.0.0-20251217103847-dd1d787c2967 h1:4P3Sh1MnrsCq5reySmuAl/cZ/TXgYY70w34EoouEz0o=
+github.com/smartcontractkit/chainlink-ton v0.0.0-20251217103847-dd1d787c2967/go.mod h1:z27AgU6fEXkkfmUAzcbEH9u3RKz2oaGy3isb7KK6Z2E=
+github.com/smartcontractkit/chainlink-ton v0.0.0-20251217105631-b3317865102c h1:lOldYwfqRwMAm4Zq+Dz7jl8Xx9i3OkoB4gzaYeQAw/w=
+github.com/smartcontractkit/chainlink-ton v0.0.0-20251217105631-b3317865102c/go.mod h1:z27AgU6fEXkkfmUAzcbEH9u3RKz2oaGy3isb7KK6Z2E=
+github.com/smartcontractkit/chainlink-ton v0.0.0-20251217110120-33edeaf7c68d h1:cyJ9rjnMD827E86ofJr0csxzijemgnnlg8MUJC8LieQ=
+github.com/smartcontractkit/chainlink-ton v0.0.0-20251217110120-33edeaf7c68d/go.mod h1:z27AgU6fEXkkfmUAzcbEH9u3RKz2oaGy3isb7KK6Z2E=
+github.com/smartcontractkit/chainlink-ton v0.0.0-20251217111141-cb367045c4a0 h1:9O0FfiitHsAhekXJ2LIE6fr5fG1P0GhlSUijEKPCBtc=
+github.com/smartcontractkit/chainlink-ton v0.0.0-20251217111141-cb367045c4a0/go.mod h1:z27AgU6fEXkkfmUAzcbEH9u3RKz2oaGy3isb7KK6Z2E=
 github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e h1:Hv9Mww35LrufCdM9wtS9yVi/rEWGI1UnjHbcKKU0nVY=
 github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e/go.mod h1:T4zH9R8R8lVWKfU7tUvYz2o2jMv1OpGCdpY2j2QZXzU=
 github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs=

sdk/ton/inspector.go

@@ -2,14 +2,12 @@ package ton
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	"github.com/ethereum/go-ethereum/common"
 
 	"github.com/xssnick/tonutils-go/address"
 	"github.com/xssnick/tonutils-go/ton"
-	"github.com/xssnick/tonutils-go/tvm/cell"
 
 	"github.com/smartcontractkit/mcms/sdk"
 	"github.com/smartcontractkit/mcms/types"
@@ -35,7 +33,6 @@ func NewInspector(client ton.APIClientWrapped) sdk.Inspector {
 	}
 }
 
-// TODO (ton): use GetConfig from chainlink-ton/pkg/bindings/mcms/mcms
 func (i Inspector) GetConfig(ctx context.Context, _address string) (*types.Config, error) {
 	// Map to Ton Address type (mcms.address)
 	addr, err := address.ParseAddr(_address)
@@ -48,146 +45,68 @@ func (i Inspector) GetConfig(ctx context.Context, _address string) (*types.Confi
 		return nil, fmt.Errorf("failed to get current masterchain info: %w", err)
 	}
 
-	r, err := i.client.RunGetMethod(ctx, block, addr, "getConfig")
+	_config, err := tvm.CallGetter(ctx, i.client, block, addr, mcms.GetConfig)
 	if err != nil {
-		return nil, fmt.Errorf("error getting getConfig: %w", err)
+		return nil, err
 	}
 
-	rResult := r.AsTuple()
-	if len(rResult) < 3 { //nolint:mnd // 3 expected return values
-		return nil, errors.New("error: getConfig returned less than 3 cells")
-	}
-
-	keySz := uint(tvm.SizeUINT8)
-	signers := cell.NewDict(keySz)
-	if rResult[0] != nil {
-		rc0, err := r.Cell(0)
-		if err != nil {
-			return nil, fmt.Errorf("error getting Config.Signers cell(0): %w", err)
-		}
-
-		if rc0 != nil {
-			signers = rc0.AsDict(keySz)
-		}
-	}
-
-	groupQuorums := cell.NewDict(keySz)
-	if rResult[1] != nil {
-		rc1, err := r.Cell(1)
-		if err != nil {
-			return nil, fmt.Errorf("error getting Config.GroupQuorums cell(1): %w", err)
-		}
-
-		if rc1 != nil {
-			groupQuorums = rc1.AsDict(keySz)
-		}
-	}
-
-	groupParents := cell.NewDict(keySz)
-	if rResult[2] != nil {
-		rc2, err := r.Cell(2) //nolint:mnd // 2 index for 3rd return value
-		if err != nil {
-			return nil, fmt.Errorf("error getting Config.GroupParents cell(2): %w", err)
-		}
-
-		if rc2 != nil {
-			groupParents = rc2.AsDict(keySz)
-		}
-	}
-
-	return i.configTransformer.ToConfig(mcms.Config{
-		Signers:      signers,
-		GroupQuorums: groupQuorums,
-		GroupParents: groupParents,
-	})
+	return i.configTransformer.ToConfig(_config)
 }
 
-// TODO (ton): use GetOpCount from chainlink-ton/pkg/bindings/mcms/mcms
 func (i Inspector) GetOpCount(ctx context.Context, _address string) (uint64, error) {
 	// Map to Ton Address type (mcms.address)
 	addr, err := address.ParseAddr(_address)
 	if err != nil {
 		return 0, fmt.Errorf("invalid mcms address: %w", err)
 	}
 
-	// TODO: mv and import from github.com/smartcontractkit/chainlink-ton/bindings/mcms/mcms
 	block, err := i.client.CurrentMasterchainInfo(ctx)
 	if err != nil {
 		return 0, fmt.Errorf("failed to get current masterchain info: %w", err)
 	}
 
-	r, err := i.client.RunGetMethod(ctx, block, addr, "getOpCount")
-	if err != nil {
-		return 0, fmt.Errorf("error getting getOpCount: %w", err)
-	}
-
-	ri, err := r.Int(0)
-	if err != nil {
-		return 0, fmt.Errorf("error getting opCount slice: %w", err)
-	}
-
-	return ri.Uint64(), nil
+	return tvm.CallGetter(ctx, i.client, block, addr, mcms.GetOpCount)
 }
 
-// TODO (ton): use GetRoot from chainlink-ton/pkg/bindings/mcms/mcms
 func (i Inspector) GetRoot(ctx context.Context, _address string) (common.Hash, uint32, error) {
 	// Map to Ton Address type (mcms.address)
 	addr, err := address.ParseAddr(_address)
 	if err != nil {
 		return [32]byte{}, 0, fmt.Errorf("invalid mcms address: %w", err)
 	}
 
-	// TODO: mv and import from github.com/smartcontractkit/chainlink-ton/bindings/mcms/mcms
 	block, err := i.client.CurrentMasterchainInfo(ctx)
 	if err != nil {
 		return [32]byte{}, 0, fmt.Errorf("failed to get current masterchain info: %w", err)
 	}
 
-	r, err := i.client.RunGetMethod(ctx, block, addr, "getRoot")
-	if err != nil {
-		return [32]byte{}, 0, fmt.Errorf("error getting getRoot: %w", err)
-	}
-
-	root, err := r.Int(0)
+	r, err := tvm.CallGetter(ctx, i.client, block, addr, mcms.GetRoot)
 	if err != nil {
-		return [32]byte{}, 0, fmt.Errorf("error getting Int(0) - root: %w", err)
+		return [32]byte{}, 0, err
 	}
 
-	validUntil, err := r.Int(1)
-	if err != nil {
-		return [32]byte{}, 0, fmt.Errorf("error getting Int(1) - validUntil: %w", err)
-	}
-
-	//nolint:gosec // G115 conversion safe, validUntil is uint32
-	return common.BigToHash(root), uint32(validUntil.Uint64()), nil
+	return common.BigToHash(r.Root), r.ValidUntil, nil
 }
 
-// TODO (ton): use GetRootMetadata from chainlink-ton/pkg/bindings/mcms/mcms
 func (i Inspector) GetRootMetadata(ctx context.Context, _address string) (types.ChainMetadata, error) {
 	// Map to Ton Address type (mcms.address)
 	addr, err := address.ParseAddr(_address)
 	if err != nil {
 		return types.ChainMetadata{}, fmt.Errorf("invalid mcms address: %w", err)
 	}
 
-	// TODO: mv and import from github.com/smartcontractkit/chainlink-ton/bindings/mcms/mcms
 	block, err := i.client.CurrentMasterchainInfo(ctx)
 	if err != nil {
 		return types.ChainMetadata{}, fmt.Errorf("failed to get current masterchain info: %w", err)
 	}
 
-	r, err := i.client.RunGetMethod(ctx, block, addr, "getRootMetadata")
-	if err != nil {
-		return types.ChainMetadata{}, fmt.Errorf("error getting getRootMetadata: %w", err)
-	}
-
-	ri, err := r.Int(2) //nolint:mnd // 2 index for 3rd return value
+	rm, err := tvm.CallGetter(ctx, i.client, block, addr, mcms.GetRootMetadata)
 	if err != nil {
-		return types.ChainMetadata{}, fmt.Errorf("error getting preOpCount int: %w", err)
+		return types.ChainMetadata{}, err
 	}
 
 	return types.ChainMetadata{
-		StartingOpCount: ri.Uint64(),
+		StartingOpCount: rm.PreOpCount,
 		MCMAddress:      _address,
 	}, nil
 }

sdk/ton/inspector_test.go

@@ -85,7 +85,7 @@ func TestInspector_GetConfig(t *testing.T) {
 			address:   "EQADa3W6G0nSiTV4a6euRA42fU9QxSEnb-WeDpcrtWzA2jM8",
 			mockError: errors.New("call to contract failed"),
 			want:      nil,
-			wantErr:   errors.New("error getting getConfig: call to contract failed"),
+			wantErr:   errors.New("tvm: failed to run get method \"getConfig\": call to contract failed"),
 		},
 		{
 			name:    "Empty Signers list",
@@ -177,7 +177,7 @@ func TestInspector_GetOpCount(t *testing.T) {
 			address:   "EQADa3W6G0nSiTV4a6euRA42fU9QxSEnb-WeDpcrtWzA2jM8",
 			mockError: errors.New("call to contract failed"),
 			want:      0,
-			wantErr:   errors.New("error getting getOpCount: call to contract failed"),
+			wantErr:   errors.New("tvm: failed to run get method \"getOpCount\": call to contract failed"),
 		},
 	}
 
@@ -252,7 +252,7 @@ func TestInspector_GetRoot(t *testing.T) {
 			name:      "CallContract error",
 			address:   "EQADa3W6G0nSiTV4a6euRA42fU9QxSEnb-WeDpcrtWzA2jM8",
 			mockError: errors.New("call to contract failed"),
-			wantErr:   errors.New("error getting getRoot: call to contract failed"),
+			wantErr:   errors.New("tvm: failed to run get method \"getRoot\": call to contract failed"),
 		},
 	}
 
@@ -332,7 +332,7 @@ func TestInspector_GetRootMetadata(t *testing.T) {
 			name:      "CallContract error",
 			address:   "EQADa3W6G0nSiTV4a6euRA42fU9QxSEnb-WeDpcrtWzA2jM8",
 			mockError: errors.New("call to contract failed"),
-			wantErr:   errors.New("error getting getRootMetadata: call to contract failed"),
+			wantErr:   errors.New("tvm: failed to run get method \"getRootMetadata\": call to contract failed"),
 		},
 	}