From 19e7d38847709a9b6290b40a86006728454c90eb Mon Sep 17 00:00:00 2001 From: Kristijan Date: Sat, 7 Feb 2026 17:06:40 +0100 Subject: [PATCH] Bump smartcontractkit/chainlink-ton - improve trace tracking --- .changeset/modern-moles-thank.md | 5 +++++ .changeset/salty-grapes-take.md | 5 +++++ e2e/config.ton.toml | 2 +- e2e/tests/ton/executable.go | 14 ++++++++++---- e2e/tests/ton/timelock_inspection.go | 9 +++++---- go.mod | 2 +- go.sum | 6 ++++-- 7 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 .changeset/modern-moles-thank.md create mode 100644 .changeset/salty-grapes-take.md diff --git a/.changeset/modern-moles-thank.md b/.changeset/modern-moles-thank.md new file mode 100644 index 000000000..5dd882461 --- /dev/null +++ b/.changeset/modern-moles-thank.md @@ -0,0 +1,5 @@ +--- +"@smartcontractkit/mcms": patch +--- + +Bump smartcontractkit/chainlink-ton - improve trace tracking diff --git a/.changeset/salty-grapes-take.md b/.changeset/salty-grapes-take.md new file mode 100644 index 000000000..7ccbb55a9 --- /dev/null +++ b/.changeset/salty-grapes-take.md @@ -0,0 +1,5 @@ +--- +"@smartcontractkit/mcms": patch +--- + +Bump ghcr.io/neodix42/mylocalton-docker:v3.99 - speedup diff --git a/e2e/config.ton.toml b/e2e/config.ton.toml index 5d0607301..a613a55d0 100644 --- a/e2e/config.ton.toml +++ b/e2e/config.ton.toml @@ -8,7 +8,7 @@ private_keys = [ [ton_config] chain_id = "-217" type = "ton" -image = "ghcr.io/neodix42/mylocalton-docker:v3.98" +image = "ghcr.io/neodix42/mylocalton-docker:v3.99" [ton_config.out] family = "ton" diff --git a/e2e/tests/ton/executable.go b/e2e/tests/ton/executable.go index edc9c4a2b..510bf4853 100644 --- a/e2e/tests/ton/executable.go +++ b/e2e/tests/ton/executable.go @@ -18,6 +18,7 @@ import ( "github.com/xssnick/tonutils-go/ton/wallet" "github.com/xssnick/tonutils-go/tvm/cell" + "github.com/smartcontractkit/chainlink-ton/pkg/bindings" "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" @@ -700,8 +701,13 @@ func (s *ExecutionTestSuite) TestExecuteProposalMultipleOps() { s.Require().NoError(err) // Prepare (dummy) accounts to grant roles to - accA := NewInitializedAddress(ctx, &s.Suite, s.TonClient, s.wallet) - accB := NewInitializedAddress(ctx, &s.Suite, s.TonClient, s.wallet) + walletA, err := tvm.NewRandomV5R1TestWallet(s.TonClient, -217) + s.Require().NoError(err) + accA := walletA.Address() + + walletB, err := tvm.NewRandomV5R1TestWallet(s.TonClient, -217) + s.Require().NoError(err) + accB := walletB.Address() // Construct a proposal @@ -846,7 +852,7 @@ func (s *ExecutionTestSuite) TestExecuteProposalMultipleOps() { s.Require().NotNil(tx) // Wait and check success - err = tracetracking.WaitForTrace(ctx, s.TonClient, tx) + err = tracetracking.WaitForTrace(ctx, s.TonClient, tx, bindings.DefaultTraceStopCondition) s.Require().NoError(err) // Verify the operation count is updated on chain A @@ -872,7 +878,7 @@ func (s *ExecutionTestSuite) TestExecuteProposalMultipleOps() { s.Require().NotNil(tx) // Wait and check success - err = tracetracking.WaitForTrace(ctx, s.TonClient, tx) + err = tracetracking.WaitForTrace(ctx, s.TonClient, tx, bindings.DefaultTraceStopCondition) s.Require().NoError(err) // Verify the operation count is updated on chain A diff --git a/e2e/tests/ton/timelock_inspection.go b/e2e/tests/ton/timelock_inspection.go index edd61e461..851e032ae 100644 --- a/e2e/tests/ton/timelock_inspection.go +++ b/e2e/tests/ton/timelock_inspection.go @@ -4,7 +4,6 @@ package tone2e import ( "bytes" - "context" "encoding/json" "fmt" "math/big" @@ -21,6 +20,7 @@ import ( "github.com/xssnick/tonutils-go/ton/wallet" "github.com/xssnick/tonutils-go/tvm/cell" + "github.com/smartcontractkit/chainlink-ton/pkg/bindings" "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" @@ -72,7 +72,7 @@ func (s *TimelockInspectionTestSuite) grantRole(role [32]byte, acc *address.Addr s.Require().NoError(err) s.Require().NotNil(tx) - err = tracetracking.WaitForTrace(ctx, s.TonClient, tx) + err = tracetracking.WaitForTrace(ctx, s.TonClient, tx, bindings.DefaultTraceStopCondition) s.Require().NoError(err) } @@ -158,9 +158,10 @@ func (s *TimelockInspectionTestSuite) SetupSuite() { s.Require().NoError(err) // Generate few test wallets + chainID := cselectors.TON_LOCALNET.ChainID s.accounts = []*address.Address{ - NewInitializedAddress(context.Background(), &s.Suite, s.TonClient, s.wallet), - NewInitializedAddress(context.Background(), &s.Suite, s.TonClient, s.wallet), + must(tvm.NewRandomV5R1TestWallet(s.TonClient, chainID)).Address(), + must(tvm.NewRandomV5R1TestWallet(s.TonClient, chainID)).Address(), } // Sort accounts to have deterministic order diff --git a/go.mod b/go.mod index cb0d62c94..b563ee32d 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260129103204-4c8453dd8139 github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9 github.com/smartcontractkit/chainlink-testing-framework/framework v0.12.1 - github.com/smartcontractkit/chainlink-ton v0.0.0-20260204205804-642f6ebe4e7e + github.com/smartcontractkit/chainlink-ton v0.0.0-20260207154723-00693175514d github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e github.com/spf13/cast v1.10.0 github.com/stretchr/testify v1.11.1 diff --git a/go.sum b/go.sum index 6ec8cf9cb..601f23df5 100644 --- a/go.sum +++ b/go.sum @@ -654,8 +654,10 @@ github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9 h1: github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9/go.mod h1:KpEWZJMLwbdMHeHQz9rbkES0vRrx4nk6OQXyhlHb9/8= github.com/smartcontractkit/chainlink-testing-framework/framework v0.12.1 h1:Ld3OrOQfLubJ+os0/oau2V6RISgsEdBg+Q002zkgXpQ= github.com/smartcontractkit/chainlink-testing-framework/framework v0.12.1/go.mod h1:r6KXRM1u9ch5KFR2jspkgtyWEC1X+gxPCL8mR63U990= -github.com/smartcontractkit/chainlink-ton v0.0.0-20260204205804-642f6ebe4e7e h1:0tN41HRIrNAVr5Chr8xynwpJNJaYMqGxqlIu+E7SOG8= -github.com/smartcontractkit/chainlink-ton v0.0.0-20260204205804-642f6ebe4e7e/go.mod h1:IZvH2r16xcQvVLB7AtjU112wnHfEku+29OlI1vCQHCQ= +github.com/smartcontractkit/chainlink-ton v0.0.0-20260207133718-585cc26eeddb h1:1r/ItPIGjajmNd0jqgtWy/iSWxrv0Td2oJ+KaDVCawM= +github.com/smartcontractkit/chainlink-ton v0.0.0-20260207133718-585cc26eeddb/go.mod h1:IZvH2r16xcQvVLB7AtjU112wnHfEku+29OlI1vCQHCQ= +github.com/smartcontractkit/chainlink-ton v0.0.0-20260207154723-00693175514d h1:KKJPjoSDrQ/69EBK3Z1PNyN52sK8mrPbIxWj9AkIAHQ= +github.com/smartcontractkit/chainlink-ton v0.0.0-20260207154723-00693175514d/go.mod h1:IZvH2r16xcQvVLB7AtjU112wnHfEku+29OlI1vCQHCQ= 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=