Polish tooling ops (#617)

* Update DefaultOpFinalizationTimeout to 30s

* Transfer ownership adapter default to loaded Timelock addr

* Fix comments

* Transfer ownership - default current owner to deployer address if not provided

* More transfer ownership fixes

* PR feedback

Author: krebernisak

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

@@ -68,24 +68,24 @@ func (a *TonTransferOwnershipAdapter) SequenceTransferOwnershipViaMCMS() *cldfop
 				return sequences.OnChainOutput{}, fmt.Errorf("TON chain with selector %d not found in environment", in.ChainSelector)
 			}
 
-			proposedOwner, err := address.ParseAddr(in.ProposedOwner)
-			if err != nil {
-				return sequences.OnChainOutput{}, fmt.Errorf("failed to parse proposed owner address: %w", err)
-			}
-
 			dp, err := dep.NewDependencyProvider(
 				dep.Provide(chain),
 			)
 			if err != nil {
 				return sequences.OnChainOutput{}, fmt.Errorf("failed to create dependency provider: %w", err)
 			}
 
-			deployerAddr := chain.Wallet.WalletAddress()
+			proposedOwner, err := a.getProposedOwner(in)
+			if err != nil {
+				return sequences.OnChainOutput{}, fmt.Errorf("failed to get proposed owner: %w", err)
+			}
+
 			_inputMCMS := opsmcms.NewSendOrPlanInput(types.ChainSelector(in.ChainSelector))
 
-			currentOwner, err := address.ParseAddr(in.CurrentOwner)
+			deployerAddr := chain.Wallet.WalletAddress()
+			currentOwner, err := a.getCurrentOwner(in, deployerAddr)
 			if err != nil {
-				return sequences.OnChainOutput{}, fmt.Errorf("failed to parse current owner address: %w", err)
+				return sequences.OnChainOutput{}, fmt.Errorf("failed to get current owner: %w", err)
 			}
 
 			for _, contractRef := range in.ContractRef {
@@ -166,18 +166,18 @@ func (a *TonTransferOwnershipAdapter) SequenceAcceptOwnership() *cldfops.Sequenc
 				return sequences.OnChainOutput{}, fmt.Errorf("TON chain with selector %d not found in environment", in.ChainSelector)
 			}
 
-			proposedOwner, err := address.ParseAddr(in.ProposedOwner)
-			if err != nil {
-				return sequences.OnChainOutput{}, fmt.Errorf("failed to parse proposed owner address: %w", err)
-			}
-
 			dp, err := dep.NewDependencyProvider(
 				dep.Provide(chain),
 			)
 			if err != nil {
 				return sequences.OnChainOutput{}, fmt.Errorf("failed to create dependency provider: %w", err)
 			}
 
+			proposedOwner, err := a.getProposedOwner(in)
+			if err != nil {
+				return sequences.OnChainOutput{}, fmt.Errorf("failed to get proposed owner: %w", err)
+			}
+
 			sender := chain.Wallet.WalletAddress()
 			_inputMCMS := opsmcms.NewSendOrPlanInput(types.ChainSelector(in.ChainSelector))
 
@@ -239,9 +239,9 @@ func (a *TonTransferOwnershipAdapter) SequenceAcceptOwnership() *cldfops.Sequenc
 // Returns false when the proposed owner is the deployer (timelock transfers via deferred execution, can't accept in same changeset).
 // Returns false when the proposed owner is unknown
 func (a *TonTransferOwnershipAdapter) ShouldAcceptOwnershipWithTransferOwnership(_ cldf.Environment, in deploy.TransferOwnershipPerChainInput) (bool, error) {
-	proposedOwner, err := address.ParseAddr(in.ProposedOwner)
+	proposedOwner, err := a.getProposedOwner(in)
 	if err != nil {
-		return false, fmt.Errorf("failed to parse proposed owner address: %w", err)
+		return false, fmt.Errorf("failed to get proposed owner: %w", err)
 	}
 
 	timelockAddr, ok := a.timelockAddrs[in.ChainSelector]
@@ -251,3 +251,37 @@ func (a *TonTransferOwnershipAdapter) ShouldAcceptOwnershipWithTransferOwnership
 
 	return false, nil
 }
+
+// Default proposed owner to timelock address if not provided
+func (a *TonTransferOwnershipAdapter) getProposedOwner(in deploy.TransferOwnershipPerChainInput) (*address.Address, error) {
+	if in.ProposedOwner != "" {
+		proposedOwner, err := address.ParseAddr(in.ProposedOwner)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse proposed owner address: %w", err)
+		}
+
+		return proposedOwner, nil
+	}
+
+	timelockAddr, ok := a.timelockAddrs[in.ChainSelector]
+	if !ok {
+		return nil, fmt.Errorf("timelock address not initialized for chain %d", in.ChainSelector)
+	}
+
+	return timelockAddr, nil
+}
+
+func (a *TonTransferOwnershipAdapter) getCurrentOwner(in deploy.TransferOwnershipPerChainInput, defaultAddr *address.Address) (*address.Address, error) {
+	// Default current owner to deployer address if not provided
+	// Notice: common case where deployer is transferring to timelock
+	if in.CurrentOwner != "" {
+		currentOwner, err := address.ParseAddr(in.CurrentOwner)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse current owner address: %w", err)
+		}
+
+		return currentOwner, nil
+	}
+
+	return defaultAddr, nil
+}

deployment/pkg/ops/mcms/deploy.go

@@ -34,7 +34,7 @@ import (
 
 const (
 	DefaultMinDelay              = 1 * 60 * 60 // 1 hour in seconds
-	DefaultOpFinalizationTimeout = 10          // 10 seconds
+	DefaultOpFinalizationTimeout = 30          // 30 seconds
 
 	// DefaultDeployValueTON is the default amount of TON coins to allocate for MCMS/Timelock contract deployment.
 	// MCMS contracts require more storage and operational capacity, hence the higher allocation compared to CCIP contracts.
@@ -47,7 +47,7 @@ type DeployMCMSSeqInput struct {
 	// Extra TON specific params
 	Value                 *tlb.Coins `json:"value"`                 // value to send with deployment, optional, if not provided, defaults to 1.5 TON
 	ContractID            uint32     `json:"contractID"`            // ID (storage data) to use for the deployed contracts, can be used to derive the address pre-deployment.
-	OpFinalizationTimeout uint32     `json:"opFinalizationTimeout"` // optional, if not provided, defaults to 10 seconds
+	OpFinalizationTimeout uint32     `json:"opFinalizationTimeout"` // optional, if not provided, defaults to 30 seconds
 	// Extra Timelock params
 	// Notice: in.Config.TimelockAdmin is of EVM type common.Address (20 bytes),
 	// which is not compatible with TON address, so we have a separate field for TON address type.
@@ -129,7 +129,7 @@ func deployMCMSSequence(b cldfops.Bundle, dp *dep.DependencyProvider, in DeployM
 	// Notice: we increment the id for each deployment to avoid address collision
 	id := in.ContractID
 
-	opFinalizationTimeout := uint32(DefaultOpFinalizationTimeout) // default to 10 seconds
+	opFinalizationTimeout := uint32(DefaultOpFinalizationTimeout) // default to 30 seconds
 	if in.OpFinalizationTimeout != 0 {
 		opFinalizationTimeout = in.OpFinalizationTimeout
 	}
@@ -268,7 +268,7 @@ func deployMCMSSequence(b cldfops.Bundle, dp *dep.DependencyProvider, in DeployM
 
 			// disable executor role check to allow anyone to execute (TON does not have a CallProxy)
 			ExecutorRoleCheckEnabled: in.TimelockExecutorRoleCheckEnabled,
-			OpFinalizationTimeout:    opFinalizationTimeout, // 10 seconds default, can be updated later
+			OpFinalizationTimeout:    opFinalizationTimeout, // 30 seconds default, can be updated later
 		}
 
 		version := in.ContractsSemverTimelock