Post rebase fix

Author: krebernisak

cmd/chainlink-ton-extras/lock.nix

@@ -1,5 +1,5 @@
 # Notice: `pkgs.lib.fakeHash` can be used as a placeholder,
 #   but `lock-nix-tidy` will only replace actual hashes.
 {pkgs}: {
-  chainlink-ton-extras = "sha256-m9CNhGr7TU7Fg/vZAzPpIS5H1OBlZJOVx4dRqABQzMQ=";
+  chainlink-ton-extras = "sha256-tzNZ2jnRMcF29DSgFmJCeMhfAEzy5qfynocz5zVqwjU=";
 }

cmd/chainlink-ton/lock.nix

@@ -1,5 +1,5 @@
 # Notice: `pkgs.lib.fakeHash` can be used as a placeholder,
 #   but `lock-nix-tidy` will only replace actual hashes.
 {pkgs}: {
-  chainlink-ton = "sha256-m9CNhGr7TU7Fg/vZAzPpIS5H1OBlZJOVx4dRqABQzMQ=";
+  chainlink-ton = "sha256-tzNZ2jnRMcF29DSgFmJCeMhfAEzy5qfynocz5zVqwjU=";
 }

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

@@ -4,20 +4,21 @@ import (
 	"fmt"
 
 	"github.com/Masterminds/semver/v3"
+	"github.com/xssnick/tonutils-go/ton"
 	"github.com/xssnick/tonutils-go/ton/wallet"
 
 	"github.com/smartcontractkit/chainlink-deployments-framework/operations"
 
 	"github.com/smartcontractkit/chainlink-ton/pkg/bindings/lib/versioning/upgradeable"
 	"github.com/smartcontractkit/chainlink-ton/pkg/ton/codec"
 
-	"github.com/smartcontractkit/chainlink-ton/deployment/pkg/ops/ton"
+	opston "github.com/smartcontractkit/chainlink-ton/deployment/pkg/ops/ton"
 )
 
 var (
-	_ ton.PlannerOption               = UpgradeInput{}
-	_ ton.Planner[ton.MessagePlanRaw] = UpgradeOutput{}
-	_ ton.MessageSender               = UpgradeOutput{}
+	_ opston.PlannerOption                  = UpgradeInput{}
+	_ opston.Planner[opston.MessagePlanRaw] = UpgradeOutput{}
+	_ opston.MessageSender                  = UpgradeOutput{}
 )
 
 type UpgradeInput struct {
@@ -28,29 +29,29 @@ type UpgradeInput struct {
 }
 
 type UpgradeMessage struct {
-	Message      ton.InternalMessage[upgradeable.Upgrade] `json:"message"`
-	ContractMeta ton.ContractMetadata                     `json:"contract_meta"`
+	Message      opston.InternalMessage[upgradeable.Upgrade] `json:"message"`
+	ContractMeta opston.ContractMetadata                     `json:"contract_meta"`
 }
 
 func (in UpgradeInput) IsPlan() bool {
 	return in.Plan
 }
 
 type UpgradeOutput struct {
-	Plans       []ton.MessagePlanRaw `json:"plans"`
-	Transaction *ton.TransactionInfo `json:"transaction,omitempty"`
+	Plans       []opston.MessagePlanRaw `json:"plans"`
+	Transaction *opston.TransactionInfo `json:"transaction,omitempty"`
 }
 
-func (o UpgradeOutput) GetPlans() []ton.MessagePlanRaw {
+func (o UpgradeOutput) GetPlans() []opston.MessagePlanRaw {
 	return o.Plans
 }
 
-func (o UpgradeOutput) GetTransaction() *ton.TransactionInfo {
+func (o UpgradeOutput) GetTransaction() *opston.TransactionInfo {
 	return o.Transaction
 }
 
 type UpgradeDeps struct {
-	ContractProvider ton.ContractCodeProvider
+	ContractProvider opston.ContractCodeProvider
 	Wallet           *wallet.Wallet
 	Client           ton.APIClientWrapped
 }
@@ -60,8 +61,8 @@ var Upgrade = operations.NewOperation(
 	semver.MustParse("0.1.0"),
 	"Upgrades upgradeable contracts to a new implementation",
 	func(b operations.Bundle, deps UpgradeDeps, in UpgradeInput) (UpgradeOutput, error) {
-		// Load contracts and prepare the underlying []ton.InternalMessage[any]
-		_messages := make([]ton.InternalMessage[any], len(in.Messages))
+		// Load contracts and prepare the underlying []opston.InternalMessage[any]
+		_messages := make([]opston.InternalMessage[any], len(in.Messages))
 		for i, u := range in.Messages {
 			c, err := deps.ContractProvider.GetContract(u.ContractMeta)
 			if err != nil {
@@ -74,7 +75,7 @@ var Upgrade = operations.NewOperation(
 			val.Code = c.Code
 			valAny := any(val)
 
-			_messages[i] = ton.InternalMessage[any]{
+			_messages[i] = opston.InternalMessage[any]{
 				Bounce:  m.Bounce,
 				DstAddr: m.DstAddr,
 				Amount:  m.Amount,
@@ -87,18 +88,18 @@ var Upgrade = operations.NewOperation(
 			}
 		}
 
-		_in := ton.SendMessagesInput{
+		_in := opston.SendMessagesInput{
 			Messages: _messages,
 			Plan:     in.Plan,
 		}
 
 		// TOOD: improve deps passing
-		opdeps := ton.SendMessagesDeps{
+		opdeps := opston.SendMessagesDeps{
 			Wallet: deps.Wallet,
 			Client: deps.Client,
 		}
 
-		r, err := operations.ExecuteOperation(b, ton.SendMessages, opdeps, _in)
+		r, err := operations.ExecuteOperation(b, opston.SendMessages, opdeps, _in)
 		if err != nil {
 			return UpgradeOutput{}, fmt.Errorf("failed to exec send messages operation: %w", err)
 		}

scripts/oplint/lock.nix

@@ -1,3 +1,3 @@
 {pkgs}: {
-  oplint = "sha256-m9CNhGr7TU7Fg/vZAzPpIS5H1OBlZJOVx4dRqABQzMQ=";
+  oplint = "sha256-tzNZ2jnRMcF29DSgFmJCeMhfAEzy5qfynocz5zVqwjU=";
 }