return error when parseLispTuple failed

deployment/ccip/1_6_0/sequences/fastcurse.go

@@ -6,6 +6,7 @@ import (
 	"math/big"
 
 	"github.com/Masterminds/semver/v3"
+	"github.com/samber/lo"
 
 	"github.com/xssnick/tonutils-go/address"
 	"github.com/xssnick/tonutils-go/tlb"
@@ -185,7 +186,11 @@ func (a *TonCurseAdapter) ListConnectedChains(e cldf.Environment, selector uint6
 
 	// Parse result as lisp tuple
 	tuple := result.AsTuple()
-	connectedChains := parser.ParseLispTuple(tuple)
+	selectorsBigInt, err := parser.ParseLispTuple[*big.Int](tuple)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse destChainSelectors result: %w", err)
+	}
+	connectedChains := lo.Map(selectorsBigInt, func(x *big.Int, _ int) uint64 { return x.Uint64() })
 
 	return connectedChains, nil
 }

deployment/go.mod

@@ -2,8 +2,7 @@ module github.com/smartcontractkit/chainlink-ton/deployment
 
 go 1.25.5
 
-// Notice: we pin chainlink-ton root module to avoid conflicts with indirect dependency via CLDF.
-// replace github.com/smartcontractkit/chainlink-ton => ../
+replace github.com/smartcontractkit/chainlink-ton => ../
 
 require (
 	github.com/Masterminds/semver/v3 v3.4.0
@@ -14,7 +13,7 @@ require (
 	github.com/smartcontractkit/chainlink-common v0.9.6-0.20260114142648-bd9e1b483e96
 	github.com/smartcontractkit/chainlink-deployments-framework v0.78.1-0.20260130170219-7f3060452d15
 	github.com/smartcontractkit/chainlink-protos/job-distributor v0.17.0
-	github.com/smartcontractkit/chainlink-ton v0.0.0-20260204140636-bdb7490ffb1d
+	github.com/smartcontractkit/chainlink-ton v0.0.0-20260203021354-31ff357130dc
 	github.com/smartcontractkit/mcms v0.34.1-0.20260130153451-2cd7db171382
 	github.com/stretchr/testify v1.11.1
 	github.com/xssnick/tonutils-go v1.14.1
@@ -38,7 +37,7 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bits-and-blooms/bitset v1.20.0 // indirect
 	github.com/blendle/zapdriver v1.3.1 // indirect
-	github.com/block-vision/sui-go-sdk v1.1.2 // indirect
+	github.com/block-vision/sui-go-sdk v1.1.4 // indirect
 	github.com/btcsuite/btcd v0.24.2 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
 	github.com/btcsuite/btcd/btcutil v1.1.6 // indirect

deployment/go.sum

@@ -75,8 +75,8 @@ github.com/bits-and-blooms/bitset v1.20.0 h1:2F+rfL86jE2d/bmw7OhqUg2Sj/1rURkBn3M
 github.com/bits-and-blooms/bitset v1.20.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
 github.com/blendle/zapdriver v1.3.1 h1:C3dydBOWYRiOk+B8X9IVZ5IOe+7cl+tGOexN4QqHfpE=
 github.com/blendle/zapdriver v1.3.1/go.mod h1:mdXfREi6u5MArG4j9fewC+FGnXaBR+T4Ox4J2u4eHCc=
-github.com/block-vision/sui-go-sdk v1.1.2 h1:p9DPfb51mEcTmF0Lx9ORpH+Nh9Rzg4Sv3Pu5gsJZ2AA=
-github.com/block-vision/sui-go-sdk v1.1.2/go.mod h1:KlibJnwEpWt8qhQkIPxc/2ZE4kwh0Md6LvMHmW5kemA=
+github.com/block-vision/sui-go-sdk v1.1.4 h1:1PPgYxQjo1P9UCgFOPTvDCuGEglRL32NwjKPulR4FQk=
+github.com/block-vision/sui-go-sdk v1.1.4/go.mod h1:t8mWASwfyv+EyqHGO9ZrcDiCJWGOFEXqq50TMJ8GQco=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
 github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
@@ -658,8 +658,6 @@ github.com/smartcontractkit/chainlink-sui v0.0.0-20251104205009-00bd79b81471 h1:
 github.com/smartcontractkit/chainlink-sui v0.0.0-20251104205009-00bd79b81471/go.mod h1:VlyZhVw+a93Sk8rVHOIH6tpiXrMzuWLZrjs1eTIExW8=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.13.14-0.20260202230832-eb33f42188d1 h1:JijOMT/94w/mt2q69vBQodliDlVfe+jqeaSTQJP3uxo=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.13.14-0.20260202230832-eb33f42188d1/go.mod h1:IQC7fXKDsFjD1vb0Jh83WWY4BCFhN1fkcn+z3oSuFIA=
-github.com/smartcontractkit/chainlink-ton v0.0.0-20260204140636-bdb7490ffb1d h1:zviCFzJpf6jk/801HkyysQUaYFCEi3bbLGwXq+C2cQM=
-github.com/smartcontractkit/chainlink-ton v0.0.0-20260204140636-bdb7490ffb1d/go.mod h1:inuV/00WFuYwAXFUNLfXYc5wcHOEgVd2Ne2vwAp0zj0=
 github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250908203554-5bd9d2fe9513 h1:XRNxgcNqagXu6e4smJuS1crRK5cUAcCVd7u+iLduHDM=
 github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250908203554-5bd9d2fe9513/go.mod h1:ccjEgNeqOO+bjPddnL4lUrNLzyCvGCxgBjJdhFX3wa8=
 github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20250422175525-b7575d96bd4d h1:qLmSOOtB/Ogn79eIDkuujOu8M5Jd747V1H7Brk/nTvo=

devenv/go.mod

@@ -7,7 +7,7 @@ replace (
 
 	// Use local chainlink-ton/deployment module,
 	// but pin chainlink-ton root module to avoid conflicts with indirect dependency via CLDF.
-	// github.com/smartcontractkit/chainlink-ton => ../
+	github.com/smartcontractkit/chainlink-ton => ../
 	github.com/smartcontractkit/chainlink-ton/deployment => ../deployment
 )
 
@@ -20,8 +20,8 @@ require (
 	github.com/smartcontractkit/chainlink-common v0.9.6-0.20260114142648-bd9e1b483e96
 	github.com/smartcontractkit/chainlink-deployments-framework v0.78.1-0.20260130170219-7f3060452d15
 	github.com/smartcontractkit/chainlink-testing-framework/framework v0.13.14-0.20260202230832-eb33f42188d1
-	github.com/smartcontractkit/chainlink-ton v0.0.0-20260204140636-bdb7490ffb1d
-	github.com/smartcontractkit/chainlink-ton/deployment v0.0.0-20260204140636-bdb7490ffb1d
+	github.com/smartcontractkit/chainlink-ton v0.0.0-20260203021354-31ff357130dc
+	github.com/smartcontractkit/chainlink-ton/deployment v0.0.0-20260120144738-c9d69aa78a47
 	github.com/xssnick/tonutils-go v1.14.1
 )
 

devenv/go.sum

@@ -664,8 +664,6 @@ github.com/smartcontractkit/chainlink-sui v0.0.0-20251104205009-00bd79b81471 h1:
 github.com/smartcontractkit/chainlink-sui v0.0.0-20251104205009-00bd79b81471/go.mod h1:VlyZhVw+a93Sk8rVHOIH6tpiXrMzuWLZrjs1eTIExW8=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.13.14-0.20260202230832-eb33f42188d1 h1:JijOMT/94w/mt2q69vBQodliDlVfe+jqeaSTQJP3uxo=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.13.14-0.20260202230832-eb33f42188d1/go.mod h1:IQC7fXKDsFjD1vb0Jh83WWY4BCFhN1fkcn+z3oSuFIA=
-github.com/smartcontractkit/chainlink-ton v0.0.0-20260204140636-bdb7490ffb1d h1:zviCFzJpf6jk/801HkyysQUaYFCEi3bbLGwXq+C2cQM=
-github.com/smartcontractkit/chainlink-ton v0.0.0-20260204140636-bdb7490ffb1d/go.mod h1:inuV/00WFuYwAXFUNLfXYc5wcHOEgVd2Ne2vwAp0zj0=
 github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250908203554-5bd9d2fe9513 h1:XRNxgcNqagXu6e4smJuS1crRK5cUAcCVd7u+iLduHDM=
 github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250908203554-5bd9d2fe9513/go.mod h1:ccjEgNeqOO+bjPddnL4lUrNLzyCvGCxgBjJdhFX3wa8=
 github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20250528121202-292529af39df h1:36e3ROIZyV/qE8SvFOACXtXfMOMd9vG4+zY2v2ScXkI=

integration-tests/go.mod

@@ -26,8 +26,8 @@ require (
 	github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260127143834-21d7db9955ee
 	github.com/smartcontractkit/chainlink-protos/job-distributor v0.17.0
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.54.5
-	github.com/smartcontractkit/chainlink-ton v0.0.0-20260204140636-bdb7490ffb1d
-	github.com/smartcontractkit/chainlink-ton/deployment v0.0.0-20260204140636-bdb7490ffb1d
+	github.com/smartcontractkit/chainlink-ton v0.0.0-20260203021354-31ff357130dc
+	github.com/smartcontractkit/chainlink-ton/deployment v0.0.0-20260119210543-276a92092771
 	github.com/smartcontractkit/chainlink/deployment v0.0.0-20260130084452-fe13ee916ee5
 	github.com/smartcontractkit/chainlink/v2 v2.29.1-cre-beta.0.0.20260130084452-fe13ee916ee5
 	github.com/smartcontractkit/mcms v0.34.1-0.20260130153451-2cd7db171382

integration-tests/go.sum

@@ -1363,8 +1363,8 @@ github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.2 h1:cWUHB6Q
 github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.2/go.mod h1:Z4K5VJLjsfqIIaBcZ1Sfccxu0xsCxBjPa6zF+5gtQaM=
 github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.2 h1:ZJ/8Jx6Be5//TyjPi1pS1uotnmcYq5vVkSyISIymSj8=
 github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.2/go.mod h1:kHYJnZUqiPF7/xN5273prV+srrLJkS77GbBXHLKQpx0=
-github.com/smartcontractkit/chainlink-ton v0.0.0-20260204140636-bdb7490ffb1d h1:zviCFzJpf6jk/801HkyysQUaYFCEi3bbLGwXq+C2cQM=
-github.com/smartcontractkit/chainlink-ton v0.0.0-20260204140636-bdb7490ffb1d/go.mod h1:inuV/00WFuYwAXFUNLfXYc5wcHOEgVd2Ne2vwAp0zj0=
+github.com/smartcontractkit/chainlink-ton v0.0.0-20260203021354-31ff357130dc h1:WinY3eJUkutcc1alfQiBy7p2tO/78IpdG10O6oGy9Ks=
+github.com/smartcontractkit/chainlink-ton v0.0.0-20260203021354-31ff357130dc/go.mod h1:inuV/00WFuYwAXFUNLfXYc5wcHOEgVd2Ne2vwAp0zj0=
 github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20251014143056-a0c6328c91e9 h1:7Ut0g+Pdm+gcu2J/Xv8OpQOVf7uLGErMX8yhC4b4tIA=
 github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20251014143056-a0c6328c91e9/go.mod h1:h9hMs6K4hT1+mjYnJD3/SW1o7yC/sKjNi0Qh8hLfiCE=
 github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20251014124537-af6b1684fe15 h1:idp/RjsFznR48JWGfZICsrpcl9JTrnMzoUNVz8MhQMI=

pkg/ccip/bindings/feequoter/fee_quoter.go

@@ -6,6 +6,7 @@ import (
 	"runtime"
 	"sync"
 
+	"github.com/samber/lo"
 	"github.com/xssnick/tonutils-go/address"
 	"github.com/xssnick/tonutils-go/tlb"
 	"github.com/xssnick/tonutils-go/ton"
@@ -319,7 +320,11 @@ func (d *DestChainConfigMap) Fetch(ctx context.Context, client ton.APIClientWrap
 		return err
 	}
 
-	selectorSlice := parser.ParseLispTuple(result.AsTuple())
+	selectorsBigInt, err := parser.ParseLispTuple[*big.Int](result.AsTuple())
+	if err != nil {
+		return err
+	}
+	selectorSlice := lo.Map(selectorsBigInt, func(x *big.Int, _ int) uint64 { return x.Uint64() })
 	eg, egCtx := errgroup.WithContext(ctx)
 
 	var lock sync.Mutex

pkg/ccip/bindings/feequoter/reader.go

@@ -3,6 +3,7 @@ package feequoter
 import (
 	"math/big"
 
+	"github.com/samber/lo"
 	"github.com/xssnick/tonutils-go/address"
 	"github.com/xssnick/tonutils-go/tlb"
 	"github.com/xssnick/tonutils-go/ton"
@@ -194,6 +195,10 @@ var GetStaticConfig = tvm.NewNoArgsGetter(tvm.NoArgsOpts[StaticConfig]{
 var GetDestChainSelectors = tvm.NewNoArgsGetter(tvm.NoArgsOpts[[]uint64]{
 	Name: DestChainsGetter,
 	Decoder: tvm.NewResultDecoder(func(r *ton.ExecutionResult) ([]uint64, error) {
-		return parser.ParseLispTuple(r.AsTuple()), nil
+		selectors, err := parser.ParseLispTuple[*big.Int](r.AsTuple())
+		if err != nil {
+			return nil, err
+		}
+		return lo.Map(selectors, func(x *big.Int, _ int) uint64 { return x.Uint64() }), nil
 	}),
 })

pkg/ccip/bindings/offramp/reader.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/samber/lo"
 	"github.com/xssnick/tonutils-go/tlb"
 	"github.com/xssnick/tonutils-go/ton"
 
@@ -161,14 +162,18 @@ var GetSourceChainConfig = tvm.Getter[uint64, SourceChainConfig]{
 var GetSourceChainSelectors = tvm.NewNoArgsGetter(tvm.NoArgsOpts[[]uint64]{
 	Name: sourceChainSelectorsGetter,
 	Decoder: tvm.NewResultDecoder(func(r *ton.ExecutionResult) ([]uint64, error) {
-		return parser.ParseLispTuple(r.AsTuple()), nil
+		selectors, err := parser.ParseLispTuple[*big.Int](r.AsTuple())
+		if err != nil {
+			return nil, err
+		}
+		return lo.Map(selectors, func(x *big.Int, _ int) uint64 { return x.Uint64() }), nil
 	}),
 })
 
 // GetCursedSubjects gets all cursed subjects from the OffRamp contract
 var GetCursedSubjects = tvm.NewNoArgsGetter(tvm.NoArgsOpts[[]*big.Int]{
 	Name: cursedSubjectsGetter,
 	Decoder: tvm.NewResultDecoder(func(r *ton.ExecutionResult) ([]*big.Int, error) {
-		return parser.ParseLispTupleBigInt(r.AsTuple()), nil
+		return parser.ParseLispTuple[*big.Int](r.AsTuple())
 	}),
 })

pkg/ccip/bindings/onramp/reader.go

@@ -3,6 +3,7 @@ package onramp
 import (
 	"math/big"
 
+	"github.com/samber/lo"
 	"github.com/xssnick/tonutils-go/tlb"
 	"github.com/xssnick/tonutils-go/ton"
 
@@ -110,6 +111,10 @@ var GetStaticConfig = tvm.NewNoArgsGetter(tvm.NoArgsOpts[StaticConfig]{
 var GetDestChainSelectors = tvm.NewNoArgsGetter(tvm.NoArgsOpts[[]uint64]{
 	Name: destChainSelectorsGetter,
 	Decoder: tvm.NewResultDecoder(func(r *ton.ExecutionResult) ([]uint64, error) {
-		return parser.ParseLispTuple(r.AsTuple()), nil
+		selectors, err := parser.ParseLispTuple[*big.Int](r.AsTuple())
+		if err != nil {
+			return nil, err
+		}
+		return lo.Map(selectors, func(x *big.Int, _ int) uint64 { return x.Uint64() }), nil
 	}),
 })

pkg/ccip/bindings/router/reader.go

@@ -1,15 +1,15 @@
 package router
 
 import (
-	"github.com/xssnick/tonutils-go/address"
-	"github.com/xssnick/tonutils-go/ton"
-
 	"fmt"
 	"math/big"
 
+	"github.com/samber/lo"
+	"github.com/xssnick/tonutils-go/address"
+	"github.com/xssnick/tonutils-go/ton"
+
 	"github.com/smartcontractkit/chainlink-ton/pkg/ccip/bindings/ownable2step"
 	"github.com/smartcontractkit/chainlink-ton/pkg/ton/parser"
-
 	"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
 )
 
@@ -38,7 +38,11 @@ var GetOnRamp = tvm.Getter[uint64, *address.Address]{
 var GetDestChainSelectors = tvm.NewNoArgsGetter(tvm.NoArgsOpts[[]uint64]{
 	Name: "destChainSelectors",
 	Decoder: tvm.NewResultDecoder(func(r *ton.ExecutionResult) ([]uint64, error) {
-		return parser.ParseLispTuple(r.AsTuple()), nil
+		selectors, err := parser.ParseLispTuple[*big.Int](r.AsTuple())
+		if err != nil {
+			return nil, err
+		}
+		return lo.Map(selectors, func(x *big.Int, _ int) uint64 { return x.Uint64() }), nil
 	}),
 })
 

pkg/ton/parser/parser.go

@@ -1,60 +1,64 @@
 package parser
 
-import "math/big"
+import (
+	"errors"
+	"math/big"
 
-// ParseLispTuple parses the result of a get method call that returns a Lisp-style list of uint64 selectors.
-func ParseLispTuple(tuple []any) []uint64 {
-	if len(tuple) == 0 {
-		return nil
-	}
-
-	var result []uint64
-	// The first element is the lisp list contains [big.Int, [big.Int, [...]]]
-	rawList := tuple[0]
-	lispList, ok := rawList.([]any)
-	if !ok || lispList == nil {
-		return result
-	}
+	"github.com/xssnick/tonutils-go/tvm/cell"
+)
 
-	var bi *big.Int
-	var next []any
-	for len(lispList) == 2 {
-		if bi, ok = lispList[0].(*big.Int); ok {
-			result = append(result, bi.Uint64())
-		}
-		if next, ok = lispList[1].([]any); !ok || next == nil {
-			break
-		}
-		lispList = next
-	}
-	return result
+// lispTupleItem constrains the types that can be parsed from a lisp tuple.
+// These are the types that ExecutionResult can return.
+type lispTupleItem interface {
+	*big.Int | *cell.Cell | *cell.Slice
 }
 
-// ParseLispTupleBigInt parses the result of a get method call that returns a Lisp-style list of big.Int values.
-// This is useful for values larger than uint64, such as uint128 curse subjects.
-func ParseLispTupleBigInt(tuple []any) []*big.Int {
+// ErrMalformedLispTuple is returned when the tuple structure doesn't match the expected lisp list format.
+var ErrMalformedLispTuple = errors.New("malformed lisp tuple: unexpected type in tuple structure")
+
+// ParseLispTuple parses the result of a get method call that returns a Lisp-style list.
+// T must be one of the types that ExecutionResult returns: *big.Int, *cell.Cell, or *cell.Slice.
+// Returns an error if the tuple structure is malformed (e.g., unexpected types), which can indicate
+// ABI mismatches or contract regressions. An empty input tuple returns nil without error.
+//
+// To convert []*big.Int to []uint64, use lo.Map:
+//
+//	selectors := lo.Map(result, func(x *big.Int, _ int) uint64 { return x.Uint64() })
+func ParseLispTuple[T lispTupleItem](tuple []any) ([]T, error) {
 	if len(tuple) == 0 {
-		return nil
+		return nil, nil
 	}
 
-	var result []*big.Int
-	// The first element is the lisp list contains [big.Int, [big.Int, [...]]]
+	// The first element is the lisp list contains [T, [T, [...]]]
 	rawList := tuple[0]
+
+	// nil first element means an empty list (valid)
+	if rawList == nil {
+		return nil, nil
+	}
+
 	lispList, ok := rawList.([]any)
-	if !ok || lispList == nil {
-		return result
+	if !ok {
+		return nil, ErrMalformedLispTuple
 	}
 
-	var bi *big.Int
+	var result []T
+	var val T
 	var next []any
 	for len(lispList) == 2 {
-		if bi, ok = lispList[0].(*big.Int); ok {
-			result = append(result, bi)
+		if val, ok = lispList[0].(T); !ok {
+			return nil, ErrMalformedLispTuple
 		}
-		if next, ok = lispList[1].([]any); !ok || next == nil {
+		result = append(result, val)
+
+		// nil tail means end of list (valid)
+		if lispList[1] == nil {
 			break
 		}
+		if next, ok = lispList[1].([]any); !ok {
+			return nil, ErrMalformedLispTuple
+		}
 		lispList = next
 	}
-	return result
+	return result, nil
 }