diff --git a/e2e/tests/ton/executable.go b/e2e/tests/ton/executable.go index 891de8ee..9b65d298 100644 --- a/e2e/tests/ton/executable.go +++ b/e2e/tests/ton/executable.go @@ -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" diff --git a/e2e/tests/ton/inspection.go b/e2e/tests/ton/inspection.go index 996f54b9..d29210b6 100644 --- a/e2e/tests/ton/inspection.go +++ b/e2e/tests/ton/inspection.go @@ -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" diff --git a/e2e/tests/ton/set_config.go b/e2e/tests/ton/set_config.go index 1660a37d..1004f79b 100644 --- a/e2e/tests/ton/set_config.go +++ b/e2e/tests/ton/set_config.go @@ -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" diff --git a/e2e/tests/ton/set_root.go b/e2e/tests/ton/set_root.go index b8699192..476026c9 100644 --- a/e2e/tests/ton/set_root.go +++ b/e2e/tests/ton/set_root.go @@ -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" diff --git a/e2e/tests/ton/timelock_inspection.go b/e2e/tests/ton/timelock_inspection.go index 66be40e6..7a6c83d5 100644 --- a/e2e/tests/ton/timelock_inspection.go +++ b/e2e/tests/ton/timelock_inspection.go @@ -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" diff --git a/go.mod b/go.mod index a36edfc8..c04a107c 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index b083d9f4..c0212a4a 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/sdk/ton/common_test.go b/sdk/ton/common_test.go index 8a77b223..2581dea3 100644 --- a/sdk/ton/common_test.go +++ b/sdk/ton/common_test.go @@ -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 { diff --git a/sdk/ton/config_transformer.go b/sdk/ton/config_transformer.go index 0a7e6eda..f07f61ad 100644 --- a/sdk/ton/config_transformer.go +++ b/sdk/ton/config_transformer.go @@ -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" diff --git a/sdk/ton/config_transformer_test.go b/sdk/ton/config_transformer_test.go index 91df59b5..ff542965 100644 --- a/sdk/ton/config_transformer_test.go +++ b/sdk/ton/config_transformer_test.go @@ -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" ) diff --git a/sdk/ton/configurer.go b/sdk/ton/configurer.go index 717a10c0..c3e81d14 100644 --- a/sdk/ton/configurer.go +++ b/sdk/ton/configurer.go @@ -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" diff --git a/sdk/ton/configurer_test.go b/sdk/ton/configurer_test.go index 4aea3ce8..abc30349 100644 --- a/sdk/ton/configurer_test.go +++ b/sdk/ton/configurer_test.go @@ -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" diff --git a/sdk/ton/decoded_operation.go b/sdk/ton/decoded_operation.go index 0c408484..6dc777c7 100644 --- a/sdk/ton/decoded_operation.go +++ b/sdk/ton/decoded_operation.go @@ -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 { diff --git a/sdk/ton/decoded_operation_test.go b/sdk/ton/decoded_operation_test.go index cb12c6e7..14bd6c95 100644 --- a/sdk/ton/decoded_operation_test.go +++ b/sdk/ton/decoded_operation_test.go @@ -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) { diff --git a/sdk/ton/decoder.go b/sdk/ton/decoder.go index 37a0acbd..70a300f7 100644 --- a/sdk/ton/decoder.go +++ b/sdk/ton/decoder.go @@ -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 { diff --git a/sdk/ton/decoder_test.go b/sdk/ton/decoder_test.go index e8f8df91..813078f5 100644 --- a/sdk/ton/decoder_test.go +++ b/sdk/ton/decoder_test.go @@ -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" diff --git a/sdk/ton/encoder.go b/sdk/ton/encoder.go index 658b1bed..fbfc334a 100644 --- a/sdk/ton/encoder.go +++ b/sdk/ton/encoder.go @@ -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" diff --git a/sdk/ton/executor.go b/sdk/ton/executor.go index 12db95b7..9bf59e49 100644 --- a/sdk/ton/executor.go +++ b/sdk/ton/executor.go @@ -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 diff --git a/sdk/ton/executor_test.go b/sdk/ton/executor_test.go index 91f659ac..f742e5d2 100644 --- a/sdk/ton/executor_test.go +++ b/sdk/ton/executor_test.go @@ -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" diff --git a/sdk/ton/inspector.go b/sdk/ton/inspector.go index bb51faf8..17e9de6b 100644 --- a/sdk/ton/inspector.go +++ b/sdk/ton/inspector.go @@ -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) diff --git a/sdk/ton/inspector_test.go b/sdk/ton/inspector_test.go index a115d3ac..c29f9efe 100644 --- a/sdk/ton/inspector_test.go +++ b/sdk/ton/inspector_test.go @@ -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" diff --git a/sdk/ton/timelock_configurer.go b/sdk/ton/timelock_configurer.go index ce1d8254..1ab0424d 100644 --- a/sdk/ton/timelock_configurer.go +++ b/sdk/ton/timelock_configurer.go @@ -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" diff --git a/sdk/ton/timelock_configurer_test.go b/sdk/ton/timelock_configurer_test.go index 63bd747c..395567ac 100644 --- a/sdk/ton/timelock_configurer_test.go +++ b/sdk/ton/timelock_configurer_test.go @@ -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" diff --git a/sdk/ton/timelock_converter.go b/sdk/ton/timelock_converter.go index 10324c8d..d120d8b2 100644 --- a/sdk/ton/timelock_converter.go +++ b/sdk/ton/timelock_converter.go @@ -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) diff --git a/sdk/ton/timelock_executor.go b/sdk/ton/timelock_executor.go index 57259ebb..c99aaaaf 100644 --- a/sdk/ton/timelock_executor.go +++ b/sdk/ton/timelock_executor.go @@ -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) diff --git a/sdk/ton/timelock_executor_test.go b/sdk/ton/timelock_executor_test.go index d72b946b..0389e249 100644 --- a/sdk/ton/timelock_executor_test.go +++ b/sdk/ton/timelock_executor_test.go @@ -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" diff --git a/sdk/ton/timelock_inspector.go b/sdk/ton/timelock_inspector.go index c51c2487..15402cee 100644 --- a/sdk/ton/timelock_inspector.go +++ b/sdk/ton/timelock_inspector.go @@ -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" ) diff --git a/sdk/ton/timelock_inspector_test.go b/sdk/ton/timelock_inspector_test.go index a5a0c6df..8cdf5b05 100644 --- a/sdk/ton/timelock_inspector_test.go +++ b/sdk/ton/timelock_inspector_test.go @@ -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" diff --git a/sdk/ton/transaction.go b/sdk/ton/transaction.go index e6e5b452..bb8ec651 100644 --- a/sdk/ton/transaction.go +++ b/sdk/ton/transaction.go @@ -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 {