fix lint

cmd/blockchaincmd/convert.go

@@ -439,7 +439,6 @@
 	} else {
 		ux.Logger.PrintToUser("Initializing Proof of Authority Validator Manager contract on blockchain %s ...", blockchainName)
 		if err := subnetSDK.InitializeProofOfAuthority(
-			aggregatorCtx,
 			app.Log,
 			network.SDKNetwork(),
 			genesisPrivateKey,
@@ -448,7 +447,7 @@
 			managerAddress,
 			useACP99,
 			app.GetSignatureAggregatorBinDir(),
 		); err != nil {
 			return tracked, err
 		}
 		ux.Logger.GreenCheckmarkToUser("Proof of Authority Validator Manager contract successfully initialized on blockchain %s", blockchainName)

cmd/contractcmd/init_validator_manager.go

@@ -17,7 +17,7 @@
 	"github.com/ava-labs/avalanche-cli/pkg/prompts"
 	"github.com/ava-labs/avalanche-cli/pkg/signatureaggregator"
 	"github.com/ava-labs/avalanche-cli/pkg/ux"
 	"github.com/ava-labs/avalanche-cli/pkg/validatormanager"
 	blockchainSDK "github.com/ava-labs/avalanche-cli/sdk/blockchain"
 	sdkutils "github.com/ava-labs/avalanche-cli/sdk/utils"
 	validatormanagerSDK "github.com/ava-labs/avalanche-cli/sdk/validatormanager"
@@ -194,7 +194,6 @@
 		ux.Logger.PrintToUser(logging.Yellow.Wrap("Initializing Proof of Authority Validator Manager contract on blockchain %s"), blockchainName)
 
 		if err := validatormanager.SetupPoA(
-			aggregatorCtx,
 			app.Log,
 			subnetSDK,
 			network,

pkg/signatureaggregator/signature-aggregator.go

@@ -4,15 +4,16 @@ package signatureaggregator
 
 import (
 	"fmt"
+	"path/filepath"
+	"runtime"
+	"strings"
+
 	"github.com/ava-labs/avalanche-cli/pkg/application"
 	"github.com/ava-labs/avalanche-cli/pkg/binutils"
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
 	"github.com/ava-labs/avalanche-cli/pkg/utils"
 	"github.com/ava-labs/avalanche-cli/pkg/ux"
 	"github.com/ava-labs/avalanchego/utils/logging"
-	"path/filepath"
-	"runtime"
-	"strings"
 )
 
 func NewSignatureAggregatorLogger(

pkg/validatormanager/validatormanager.go

@@ -296,7 +296,6 @@
 // [convertSubnetValidators], together with an evm [ownerAddress]
 // to set as the owner of the PoA manager
 func SetupPoA(
-	ctx context.Context,
 	log logging.Logger,
 	subnet blockchainSDK.Subnet,
 	network models.Network,
@@ -307,7 +306,6 @@
 	v2_0_0 bool,
 ) error {
 	return subnet.InitializeProofOfAuthority(
-		ctx,
 		log,
 		network.SDKNetwork(),
 		privateKey,
@@ -315,7 +313,7 @@
 		aggregatorLogger,
 		validatorManagerAddressStr,
 		v2_0_0,
 		"",
 	)
 }
 

sdk/blockchain/blockchain.go

@@ -404,8 +404,6 @@ func (c *Subnet) InitializeProofOfAuthority(
 
 	subnetConversionUnsignedMessage, err := validatormanager.GetPChainSubnetToL1ConversionUnsignedMessage(
 		network,
-		0,
-		aggregatorExtraPeerEndpoints,
 		c.SubnetID,
 		c.BlockchainID,
 		managerAddress,
@@ -417,10 +415,7 @@ func (c *Subnet) InitializeProofOfAuthority(
 	}
 
 	// Create config file for signature aggregator
-	config, err := createSignatureAggregatorConfig(c.SubnetID.String(), network.Endpoint, aggregatorExtraPeerEndpoints)
-	if err != nil {
-		return fmt.Errorf("failed to create signature aggregator config: %w", err)
-	}
+	config := createSignatureAggregatorConfig(c.SubnetID.String(), network.Endpoint, aggregatorExtraPeerEndpoints)
 
 	configPath := filepath.Join(signatureAggregatorBinDir, "config.json")
 	if err := writeSignatureAggregatorConfig(config, configPath); err != nil {
@@ -475,8 +470,8 @@ func startSignatureAggregator(binPath string, configPath string, logFile string,
 	killExistingProcess := func() error {
 		// Try pkill first
 		cmd := exec.Command("pkill", "-f", "signature-aggregator")
-		if err := cmd.Run(); err == nil {
-			return nil
+		if err := cmd.Run(); err != nil {
+			return fmt.Errorf("failed to kill existing signature-aggregator process: %w", err)
 		}
 		return nil
 	}
@@ -517,7 +512,11 @@ func startSignatureAggregator(binPath string, configPath string, logFile string,
 		cmd.Stderr = logWriter
 
 		if err := cmd.Start(); err != nil {
-			logWriter.Close()
+			if closeErr := logWriter.Close(); closeErr != nil {
+				logger.Warn("Failed to close log writer",
+					zap.Error(closeErr),
+				)
+			}
 			if i == maxRetries-1 {
 				return 0, fmt.Errorf("failed to start signature-aggregator after %d attempts: %w", maxRetries, err)
 			}
@@ -690,7 +689,7 @@ type PeerConfig struct {
 	IP string `json:"ip"`
 }
 
-func createSignatureAggregatorConfig(subnetID string, networkEndpoint string, peers []info.Peer) (*SignatureAggregatorConfig, error) {
+func createSignatureAggregatorConfig(subnetID string, networkEndpoint string, peers []info.Peer) *SignatureAggregatorConfig {
 	config := &SignatureAggregatorConfig{
 		LogLevel:             "debug",
 		PChainAPI:            APIConfig{BaseURL: networkEndpoint},
@@ -713,7 +712,7 @@ func createSignatureAggregatorConfig(subnetID string, networkEndpoint string, pe
 		})
 	}
 
-	return config, nil
+	return config
 }
 
 func writeSignatureAggregatorConfig(config *SignatureAggregatorConfig, configPath string) error {
@@ -722,7 +721,7 @@ func writeSignatureAggregatorConfig(config *SignatureAggregatorConfig, configPat
 		return fmt.Errorf("failed to marshal config: %w", err)
 	}
 
-	if err := os.WriteFile(configPath, configBytes, 0600); err != nil {
+	if err := os.WriteFile(configPath, configBytes, 0o600); err != nil {
 		return fmt.Errorf("failed to write config file: %w", err)
 	}
 
@@ -769,7 +768,13 @@ func SignMessage(message, justification, signingSubnetID string, quorumPercentag
 		)
 		return nil, fmt.Errorf("failed to make request: %w", err)
 	}
-	defer resp.Body.Close()
+	defer func() {
+		if closeErr := resp.Body.Close(); closeErr != nil {
+			logger.Warn("Failed to close response body",
+				zap.Error(closeErr),
+			)
+		}
+	}()
 
 	// Read response body
 	body, err := io.ReadAll(resp.Body)

sdk/interchain/signature-aggregator.go

@@ -236,13 +236,6 @@ func (s *SignatureAggregator) Sign(
 	msg *warp.UnsignedMessage,
 	justification []byte,
 ) (*warp.Message, error) {
-	fmt.Printf("msg %s \n", msg)
-	fmt.Printf("msg id %s \n", msg.ID())
-	fmt.Printf("msg id string %s \n", msg.ID().String())
-	fmt.Printf("justificaiton %s \n", justification)
-	fmt.Printf("s.subnetID %s \n", s.subnetID)
-	fmt.Printf("s.quorumPercentage %s \n", s.quorumPercentage)
-
 	if signed, err := s.aggregator.CreateSignedMessage(
 		msg,
 		justification,
@@ -251,7 +244,6 @@ func (s *SignatureAggregator) Sign(
 	); err == nil {
 		return signed, nil
 	}
-	fmt.Printf("we have err here\n")
 	// many times first attempt just fails for connection timeouts (<= 10 secs spent there)
 	return s.aggregator.CreateSignedMessage(
 		msg,

sdk/validatormanager/root.go

@@ -6,6 +6,9 @@ package validatormanager
 import (
 	"context"
 	"fmt"
+	"math/big"
+	"strings"
+
 	"github.com/ava-labs/avalanche-cli/pkg/signatureaggregator"
 	"github.com/ava-labs/avalanche-cli/sdk/interchain"
 	"github.com/ava-labs/avalanche-cli/sdk/network"
@@ -14,8 +17,6 @@ import (
 	"github.com/ava-labs/avalanchego/utils/logging"
 	warpMessage "github.com/ava-labs/avalanchego/vms/platformvm/warp/message"
 	warpPayload "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload"
-	"math/big"
-	"strings"
 
 	"github.com/ava-labs/avalanche-cli/pkg/contract"
 	"github.com/ava-labs/avalanche-cli/sdk/validator"
@@ -270,8 +271,6 @@ func GetPChainSubnetToL1ConversionMessage(
 
 func GetPChainSubnetToL1ConversionUnsignedMessage(
 	network network.Network,
-	aggregatorQuorumPercentage uint64,
-	aggregatorExtraPeerEndpoints []info.Peer,
 	subnetID ids.ID,
 	managerBlockchainID ids.ID,
 	managerAddress common.Address,

tests/e2e/testcases/validatormanager/suite.go

@@ -215,10 +215,9 @@
 			BootstrapValidators: avaGoBootstrapValidators,
 		}
 
-		ctx, cancel := utils.GetSignatureAggregatorContext()
+		_, cancel := utils.GetSignatureAggregatorContext()
 		defer cancel()
 		err = subnetSDK.InitializeProofOfAuthority(
-			ctx,
 			logging.NoLog{},
 			network.SDKNetwork(),
 			k.PrivKeyHex(),
@@ -227,7 +226,7 @@
 			ProxyContractAddress,
 			true,
 			"",
 		)
 		gomega.Expect(err).Should(gomega.BeNil())
 	})
 })