Skip to content

[WIP] use new cciplib from cl-ton #807

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.

Sign up for GitHub

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

Draft
ogtownsend wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

[WIP] use new cciplib from cl-ton #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f828be
use new cciplib from cl-ton
ogtownsend Jul 2, 2026
9afa7f9
remove local replaces
ogtownsend Jul 2, 2026
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
8 changes: 4 additions & 4 deletions e2e/tests/ton/executable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
"github.com/smartcontractkit/chainlink-ton/pkg/bindings/lib/access/rbac"
"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/mcms"
"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/timelock"
toncommon "github.com/smartcontractkit/chainlink-ton/pkg/ccip/bindings/common"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/hash"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tlbe"
toncommon "github.com/smartcontractkit/chainlink-ton/cciplib/ccip/bindings/common"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/hash"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tracetracking"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"

"github.com/ethereum/go-ethereum/common"

Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/ton/inspection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/xssnick/tonutils-go/ton/wallet"

"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/mcms"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/hash"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/hash"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tracetracking"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"

e2e "github.com/smartcontractkit/mcms/e2e/tests"
"github.com/smartcontractkit/mcms/internal/testutils"
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/ton/set_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"github.com/xssnick/tonutils-go/ton/wallet"

"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/mcms"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/hash"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/hash"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tracetracking"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"

e2e "github.com/smartcontractkit/mcms/e2e/tests"
"github.com/smartcontractkit/mcms/internal/testutils"
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/ton/set_root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
chainsel "github.com/smartcontractkit/chain-selectors"

"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/mcms"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/hash"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/hash"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tracetracking"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"

"github.com/xssnick/tonutils-go/address"
"github.com/xssnick/tonutils-go/tlb"
Expand Down
10 changes: 5 additions & 5 deletions e2e/tests/ton/timelock_inspection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ import (
"github.com/smartcontractkit/chainlink-ton/pkg/bindings/examples/counter"
"github.com/smartcontractkit/chainlink-ton/pkg/bindings/lib/access/rbac"
"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/timelock"
toncommon "github.com/smartcontractkit/chainlink-ton/pkg/ccip/bindings/common"
"github.com/smartcontractkit/chainlink-ton/pkg/ccip/bindings/ownable2step"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/hash"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tlbe"
toncommon "github.com/smartcontractkit/chainlink-ton/cciplib/ccip/bindings/common"
"github.com/smartcontractkit/chainlink-ton/cciplib/ccip/bindings/ownable2step"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/hash"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tracetracking"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"

e2e "github.com/smartcontractkit/mcms/e2e/tests"
mcmston "github.com/smartcontractkit/mcms/sdk/ton"
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ require (
github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0 // indirect
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b // indirect
github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260211172625-dff40e83b3c9 // indirect
github.com/smartcontractkit/chainlink-ton/cciplib v0.0.0-00010101000000-000000000000
github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20251014143056-a0c6328c91e9 // indirect
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
github.com/smartcontractkit/libocr v0.0.0-20260304194147-a03701e2c02e // indirect
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,8 +716,6 @@ github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.5 h1:EiQ
github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.5/go.mod h1:nyOjn4ADJGqRMe3+4ZXSV+J/7nWb1H2Vx8Qk57eLRYA=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.5 h1:RwZXxdIAOyjp6cwc9Quxgr38k8r7ACz+Lxh9o/A6oH0=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.5/go.mod h1:kHYJnZUqiPF7/xN5273prV+srrLJkS77GbBXHLKQpx0=
github.com/smartcontractkit/chainlink-ton v1.0.5-0.20260514223130-48bc90aca745 h1:eieKLvYuzwBPh/FdbUS1gnIanI86zgWby1L10o90g4o=
github.com/smartcontractkit/chainlink-ton v1.0.5-0.20260514223130-48bc90aca745/go.mod h1:8vXLeG//BxDF86GWRytzGIy6jc70htD1r/KtPfjrsK0=
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.4 h1:J4qtAo0ZmgX5pIr8Y5mdC+J2rj2e/6CTUC263t6mGOM=
Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ton_test
import (
"github.com/smartcontractkit/mcms/internal/testutils"

"github.com/smartcontractkit/chainlink-ton/pkg/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tlbe"
)

func must[E any](out E, err error) E {
Expand Down
4 changes: 2 additions & 2 deletions sdk/ton/config_transformer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/xssnick/tonutils-go/tvm/cell"

"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/mcms"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"

"github.com/smartcontractkit/mcms/sdk"

Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/config_transformer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/smartcontractkit/mcms/types"

"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/mcms"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tlbe"

mcmston "github.com/smartcontractkit/mcms/sdk/ton"
)
Expand Down
4 changes: 2 additions & 2 deletions sdk/ton/configurer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/smartcontractkit/chainlink-ton/pkg/bindings"
"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/mcms"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"

"github.com/smartcontractkit/mcms/sdk"

Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/configurer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/xssnick/tonutils-go/tvm/cell"

"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/mcms"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"

"github.com/smartcontractkit/mcms/internal/testutils"
"github.com/smartcontractkit/mcms/internal/testutils/chaintest"
Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/decoded_operation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/smartcontractkit/mcms/sdk"

"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"
)

type DecodedOperation struct {
Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/decoded_operation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/smartcontractkit/mcms/sdk/ton"

"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"
)

func TestNewDecodedOperation(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/smartcontractkit/mcms/types"

"github.com/smartcontractkit/chainlink-ton/pkg/ton/codec"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"
)

type decoder struct {
Expand Down
4 changes: 2 additions & 2 deletions sdk/ton/decoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (

"github.com/smartcontractkit/chainlink-ton/pkg/bindings"
"github.com/smartcontractkit/chainlink-ton/pkg/bindings/lib/access/rbac"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"

"github.com/smartcontractkit/mcms/sdk/ton"
"github.com/smartcontractkit/mcms/types"
Expand Down
4 changes: 2 additions & 2 deletions sdk/ton/encoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
chainsel "github.com/smartcontractkit/chain-selectors"

"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/mcms"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"

"github.com/smartcontractkit/mcms/sdk"
sdkerrors "github.com/smartcontractkit/mcms/sdk/errors"
Expand Down
4 changes: 2 additions & 2 deletions sdk/ton/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"github.com/xssnick/tonutils-go/tvm/cell"

"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/mcms"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"
)

const DefaultWaitBuffer = 250 * time.Millisecond
Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"

"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"

"github.com/smartcontractkit/mcms/internal/testutils/chaintest"
"github.com/smartcontractkit/mcms/types"
Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/inspector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/smartcontractkit/mcms/types"

"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/mcms"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"
)

var _ sdk.Inspector = (*Inspector)(nil)
Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/inspector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/stretchr/testify/require"

"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/mcms"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tlbe"

"github.com/smartcontractkit/mcms/internal/testutils"
"github.com/smartcontractkit/mcms/types"
Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/timelock_configurer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"github.com/smartcontractkit/chainlink-ton/pkg/bindings"
"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/timelock"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"

"github.com/smartcontractkit/mcms/sdk"
"github.com/smartcontractkit/mcms/types"
Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/timelock_configurer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/timelock"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/timelock_converter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

"github.com/smartcontractkit/chainlink-ton/pkg/bindings"
"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/timelock"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tlbe"
)

// DefaultSendAmount amount to send with timelock transactions (to cover gas fees)
Expand Down
4 changes: 2 additions & 2 deletions sdk/ton/timelock_executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"github.com/xssnick/tonutils-go/tvm/cell"

"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/timelock"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tlbe"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"
)

var _ sdk.TimelockExecutor = (*timelockExecutor)(nil)
Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/timelock_executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/xssnick/tonutils-go/ton"
"github.com/xssnick/tonutils-go/tvm/cell"

"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"

"github.com/smartcontractkit/mcms/internal/testutils/chaintest"
"github.com/smartcontractkit/mcms/types"
Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/timelock_inspector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/smartcontractkit/chainlink-ton/pkg/bindings/lib/access/rbac"
"github.com/smartcontractkit/chainlink-ton/pkg/bindings/mcms/timelock"
"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"

"github.com/smartcontractkit/mcms/sdk"
)
Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/timelock_inspector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/xssnick/tonutils-go/ton/wallet"
"github.com/xssnick/tonutils-go/tvm/cell"

"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"

"github.com/smartcontractkit/mcms/internal/testutils/chaintest"

Expand Down
2 changes: 1 addition & 1 deletion sdk/ton/transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/smartcontractkit/mcms/types"

"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
"github.com/smartcontractkit/chainlink-ton/cciplib/ton/tvm"
)

func ValidateAdditionalFields(additionalFields json.RawMessage) error {
Expand Down
Loading