Add WaitForTrace to SendMessages op

Author: krebernisak

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

@@ -290,6 +290,7 @@ func (a *TonAdapter) Curse() *cldf_ops.Sequence[api.CurseInput, sequences.OnChai
 			// TOOD: improve deps passing
 			opdeps := ton.SendMessagesDeps{
 				Wallet: chain.Wallet,
+				Client: chain.Client,
 			}
 
 			r, err := cldf_ops.ExecuteOperation(b, ton.SendMessages, opdeps, _in)
@@ -385,6 +386,7 @@ func (a *TonAdapter) Uncurse() *cldf_ops.Sequence[api.CurseInput, sequences.OnCh
 			// TOOD: improve deps passing
 			opdeps := ton.SendMessagesDeps{
 				Wallet: chain.Wallet,
+				Client: chain.Client,
 			}
 
 			r, err := cldf_ops.ExecuteOperation(b, ton.SendMessages, opdeps, _in)

deployment/ccip/helpers/execute.go

@@ -9,8 +9,6 @@ import (
 	"github.com/xssnick/tonutils-go/ton"
 	"github.com/xssnick/tonutils-go/ton/wallet"
 
-	"github.com/smartcontractkit/chainlink-ton/pkg/ton/tvm"
-
 	"github.com/smartcontractkit/chainlink-ton/pkg/ton/tracetracking"
 )
 
@@ -19,7 +17,7 @@ func ExecuteProposals(env cldf.Environment, client ton.APIClientWrapped, sender
 	return ExecuteTransactions(env.GetContext(), env.Logger, client, sender, txs)
 }
 
-func ExecuteTransactions(context context.Context, logger logger.Logger, client ton.APIClientWrapped, sender *wallet.Wallet, txs *Transactions) error {
+func ExecuteTransactions(ctx context.Context, logger logger.Logger, client ton.APIClientWrapped, sender *wallet.Wallet, txs *Transactions) error {
 	if txs == nil || txs.IsEmpty() {
 		// nothing to execute
 		return nil
@@ -38,23 +36,11 @@ func ExecuteTransactions(context context.Context, logger logger.Logger, client t
 	}
 
 	logger.Infow("Sending msgs", "msgs", msgs)
-	tx, blockID, err := sender.SendManyWaitTransaction(context, msgs)
+	tx, blockID, err := sender.SendManyWaitTransaction(ctx, msgs)
 	logger.Infow("transaction sent", "blockID", blockID, "tx", tx)
 	if err != nil {
 		return fmt.Errorf("failed to send lane updates: %w", err)
 	}
-	msg, err := tracetracking.MapToReceivedMessage(tx)
-	if err != nil {
-		return fmt.Errorf("failed to map tx to ReceivedMessage: %w", err)
-	}
-	err = msg.WaitForTrace(context, client)
-	if err != nil {
-		return fmt.Errorf("failed to wait for trace: %w", err)
-	}
-
-	if code := msg.OutcomeExitCode(); code != tvm.ExitCodeSuccess {
-		return fmt.Errorf("transaction failed with exit code: %d", code)
-	}
 
-	return nil
+	return tracetracking.WaitForTrace(ctx, client, tx)
 }

deployment/ccip/operation/fee_quoter.go

@@ -23,6 +23,7 @@ type UpdateFeeQuoterDestChainConfigsInput []feequoter.UpdateDestChainConfig
 type UpdateFeeQuoterDestChainConfigsOutput struct {
 }
 
+// TODO: refactor out next
 var UpdateFeeQuoterDestChainConfigsOp = operations.NewOperation(
 	"update-fee-quoter-dest-chain-configs",
 	semver.MustParse("0.1.0"),

deployment/pkg/changesets/ops_sequence.go

@@ -66,6 +66,7 @@ func (cs opsAnySequence) Apply(env cldf.Environment, in opsmcms.TimelockAnySeque
 	deps["chain"] = chain
 	deps[opston.SendMessages.Def().ID] = opston.SendMessagesDeps{
 		Wallet: chain.Wallet,
+		Client: chain.Client,
 	}
 
 	// Resolve (operation) input values

deployment/pkg/ops/lib/versioning/upgradeable/upgrade.go

@@ -52,6 +52,7 @@ func (o UpgradeOutput) GetTransaction() *ton.TransactionInfo {
 type UpgradeDeps struct {
 	ContractProvider ton.ContractCodeProvider
 	Wallet           *wallet.Wallet
+	Client           ton.APIClientWrapped
 }
 
 var Upgrade = operations.NewOperation(
@@ -94,6 +95,7 @@ var Upgrade = operations.NewOperation(
 		// TOOD: improve deps passing
 		opdeps := ton.SendMessagesDeps{
 			Wallet: deps.Wallet,
+			Client: deps.Client,
 		}
 
 		r, err := operations.ExecuteOperation(b, ton.SendMessages, opdeps, _in)

deployment/pkg/ops/ton/deploy.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/xssnick/tonutils-go/tlb"
+	"github.com/xssnick/tonutils-go/ton"
 	"github.com/xssnick/tonutils-go/ton/wallet"
 	"github.com/xssnick/tonutils-go/tvm/cell"
 
@@ -53,6 +54,7 @@ func (o DeployOutput) GetTransaction() *TransactionInfo {
 type DeployDeps struct {
 	ContractProvider ContractCodeProvider
 	Wallet           *wallet.Wallet
+	Client           ton.APIClientWrapped
 }
 
 var Deploy = operations.NewOperation(
@@ -106,6 +108,7 @@ var Deploy = operations.NewOperation(
 		// TOOD: improve deps passing
 		opdeps := SendMessagesDeps{
 			Wallet: deps.Wallet,
+			Client: deps.Client,
 		}
 
 		r, err := operations.ExecuteOperation(b, SendMessages, opdeps, _in)

deployment/pkg/ops/ton/send.go

@@ -7,9 +7,11 @@ import (
 	"github.com/Masterminds/semver/v3"
 
 	"github.com/smartcontractkit/chainlink-deployments-framework/operations"
+	"github.com/smartcontractkit/chainlink-ton/pkg/ton/tracetracking"
 
 	"github.com/xssnick/tonutils-go/address"
 	"github.com/xssnick/tonutils-go/tlb"
+	"github.com/xssnick/tonutils-go/ton"
 	"github.com/xssnick/tonutils-go/ton/wallet"
 )
 
@@ -45,6 +47,7 @@ func (o SendMessagesOutput) GetTransaction() *TransactionInfo {
 
 type SendMessagesDeps struct {
 	Wallet *wallet.Wallet
+	Client ton.APIClientWrapped
 }
 
 type ProviderDeps struct {
@@ -120,6 +123,11 @@ var SendMessages = operations.NewOperation(
 			return SendMessagesOutput{}, fmt.Errorf("failed to send transaction: %w", err)
 		}
 
+		err = tracetracking.WaitForTrace(ctx, deps.Client, tx)
+		if err != nil {
+			return SendMessagesOutput{}, fmt.Errorf("failed to wait for trace: %w", err)
+		}
+
 		return SendMessagesOutput{
 			Plans: plans,
 			Transaction: &TransactionInfo{