lint fix

command/bridge/deploy/deploy.go

@@ -125,7 +125,8 @@ func runCommand(cmd *cobra.Command, _ []string) {
 	defer outputter.WriteOutput()
 
 	outputter.WriteCommandResult(&helper.MessageResult{
-		Message: fmt.Sprintf("%s started... External Chain JSON RPC address %s.", contractsDeploymentTitle, params.externalRPCAddress),
+		Message: fmt.Sprintf("%s started... External Chain JSON RPC address %s.",
+			contractsDeploymentTitle, params.externalRPCAddress),
 	})
 
 	chainConfig, err := chain.ImportFromFile(params.genesisPath)
@@ -145,11 +146,13 @@ func runCommand(cmd *cobra.Command, _ []string) {
 
 	externalChainID, err := externalChainClient.ChainID()
 	if err != nil {
-		outputter.SetError(fmt.Errorf("failed to get chainID for provided IP address: %s: %w", params.externalRPCAddress, err))
+		outputter.SetError(fmt.Errorf("failed to get chainID for provided IP address: %s: %w",
+			params.externalRPCAddress, err))
 	}
 
 	if consensusCfg.Bridge[externalChainID.Uint64()] != nil {
-		code, err := externalChainClient.GetCode(consensusCfg.Bridge[externalChainID.Uint64()].ExternalGatewayAddr, jsonrpc.LatestBlockNumberOrHash)
+		code, err := externalChainClient.GetCode(consensusCfg.Bridge[externalChainID.Uint64()].ExternalGatewayAddr,
+			jsonrpc.LatestBlockNumberOrHash)
 		if err != nil {
 			outputter.SetError(fmt.Errorf("failed to check if rootchain contracts are deployed: %w", err))
 
@@ -213,7 +216,10 @@ func deployContracts(outputter command.OutputFormatter,
 	initialValidators []*validator.GenesisValidator,
 	cmdCtx context.Context) (deploymentResultInfo, error) {
 	var internalTxRelayer txrelayer.TxRelayer
-	externalTxRelayer, err := txrelayer.NewTxRelayer(txrelayer.WithClient(externalChainClient), txrelayer.WithWriter(outputter),
+
+	externalTxRelayer, err := txrelayer.NewTxRelayer(
+		txrelayer.WithClient(externalChainClient),
+		txrelayer.WithWriter(outputter),
 		txrelayer.WithReceiptsTimeout(params.txTimeout))
 	if err != nil {
 		return deploymentResultInfo{BridgeCfg: nil, CommandResults: nil},

command/bridge/deploy/internal_contracts.go

@@ -1,3 +1,4 @@
+//nolint:dupl
 package deploy
 
 import (
@@ -23,7 +24,8 @@ var (
 
 // initInternalContracts initializes the internal contracts
 func initInternalContracts(o command.OutputFormatter, chainCfg *chain.Chain) {
-	useBridgeAllowList, useBridgeBlockList := chainCfg.Params.DoesItUseBridgeAllowList(), chainCfg.Params.DoesItUseBridgeBlockList()
+	useBridgeAllowList, useBridgeBlockList := chainCfg.Params.DoesItUseBridgeAllowList(),
+		chainCfg.Params.DoesItUseBridgeBlockList()
 
 	internalContracts = make([]*contract, 0)
 
@@ -86,7 +88,6 @@ func initInternalContracts(o command.OutputFormatter, chainCfg *chain.Chain) {
 					NewUseBlockList:             useBridgeBlockList,
 					NewOwner:                    chainCfg.Params.GetBridgeOwner(),
 				}
-
 			} else {
 				input = &contractsapi.InitializeChildERC20PredicateFn{
 					NewGateway:                  config.InternalGatewayAddr,
@@ -131,7 +132,6 @@ func initInternalContracts(o command.OutputFormatter, chainCfg *chain.Chain) {
 					NewUseBlockList:             useBridgeBlockList,
 					NewOwner:                    chainCfg.Params.GetBridgeOwner(),
 				}
-
 			} else {
 				input = &contractsapi.InitializeChildERC721PredicateFn{
 					NewGateway:                  config.InternalGatewayAddr,
@@ -175,7 +175,6 @@ func initInternalContracts(o command.OutputFormatter, chainCfg *chain.Chain) {
 					NewUseBlockList:             useBridgeBlockList,
 					NewOwner:                    chainCfg.Params.GetBridgeOwner(),
 				}
-
 			} else {
 				input = &contractsapi.InitializeChildERC1155PredicateFn{
 					NewGateway:                  config.InternalGatewayAddr,
@@ -320,13 +319,12 @@ func initInternalContracts(o command.OutputFormatter, chainCfg *chain.Chain) {
 	})
 }
 
-// preAllocateInternalPredicates pre-allocates internal predicates in genesis if the command is run in bootstrap mode
-func preAllocateInternalPredicates(o command.OutputFormatter, chainCfg *chain.Chain, bridgeCfg *polybft.BridgeConfig) error {
-	if _, err := o.Write([]byte("[BRIDGE - DEPLOY] Pre-allocating internal predicates in bootstrap mode\n")); err != nil {
-		return err
-	}
-
+// preAllocateInternalPredicates pre-allocates internal predicates in genesis
+// if the command is run in bootstrap mode
+func preAllocateInternalPredicates(o command.OutputFormatter,
+	chainCfg *chain.Chain, bridgeCfg *polybft.BridgeConfig) error {
 	predicateBaseProxyAddress := contracts.ChildBridgeContractsBaseAddress
+
 	if consensusCfg.Bridge != nil {
 		for _, bridgeCfg := range consensusCfg.Bridge {
 			heighestAddr := bridgeCfg.GetHeighestInternalAddress()

consensus/polybft/bridge_event_manager.go

@@ -324,7 +324,6 @@ func (b *bridgeEventManager) getAggSignatureForBridgeBatchMessage(blockNumber ui
 
 	var signatures bls.Signatures
 
-	publicKeys := make([][]byte, 0)
 	bmap := bitmap.Bitmap{}
 	signers := make(map[types.Address]struct{}, 0)
 
@@ -339,10 +338,9 @@ func (b *bridgeEventManager) getAggSignatureForBridgeBatchMessage(blockNumber ui
 			return Signature{}, err
 		}
 
-		bmap.Set(uint64(index))
+		bmap.Set(uint64(index)) //nolint:gosec
 
 		signatures = append(signatures, signature)
-		publicKeys = append(publicKeys, validatorsMetadata[index].BlsKey.Marshal())
 		signers[types.StringToAddress(vote.From)] = struct{}{}
 	}
 

consensus/polybft/contracts_initializer.go

@@ -420,7 +420,8 @@ func initERC20ACLPredicateContract(
 		return nil
 	}
 
-	input, err := getInitERC20PredicateACLInput(bcfg, owner, useBridgeAllowList, useBridgeBlockList, childMintable, chainID)
+	input, err := getInitERC20PredicateACLInput(bcfg, owner,
+		useBridgeAllowList, useBridgeBlockList, childMintable, chainID)
 	if err != nil {
 		return err
 	}
@@ -453,7 +454,8 @@ func initERC721ACLPredicateContract(
 		return nil
 	}
 
-	input, err := getInitERC721PredicateACLInput(bcfg, owner, useBridgeAllowList, useBridgeBlockList, childMintable, chainID)
+	input, err := getInitERC721PredicateACLInput(bcfg, owner,
+		useBridgeAllowList, useBridgeBlockList, childMintable, chainID)
 	if err != nil {
 		return err
 	}
@@ -486,7 +488,8 @@ func initERC1155ACLPredicateContract(
 		return nil
 	}
 
-	input, err := getInitERC1155PredicateACLInput(bcfg, owner, useBridgeAllowList, useBridgeBlockList, childMintable, chainID)
+	input, err := getInitERC1155PredicateACLInput(bcfg, owner,
+		useBridgeAllowList, useBridgeBlockList, childMintable, chainID)
 	if err != nil {
 		return err
 	}

consensus/polybft/polybft_config.go

@@ -166,32 +166,32 @@ type BridgeConfig struct {
 
 // GetHeighestInternalAddress returns the highest address among all internal bridge contracts
 func (b *BridgeConfig) GetHeighestInternalAddress() types.Address {
-	heighest := b.InternalGatewayAddr
-	if b.InternalERC20PredicateAddr.Compare(heighest) > 0 {
-		heighest = b.InternalERC20PredicateAddr
+	result := b.InternalGatewayAddr
+	if b.InternalERC20PredicateAddr.Compare(result) > 0 {
+		result = b.InternalERC20PredicateAddr
 	}
 
-	if b.InternalERC721PredicateAddr.Compare(heighest) > 0 {
-		heighest = b.InternalERC721PredicateAddr
+	if b.InternalERC721PredicateAddr.Compare(result) > 0 {
+		result = b.InternalERC721PredicateAddr
 	}
 
-	if b.InternalERC1155PredicateAddr.Compare(heighest) > 0 {
-		heighest = b.InternalERC1155PredicateAddr
+	if b.InternalERC1155PredicateAddr.Compare(result) > 0 {
+		result = b.InternalERC1155PredicateAddr
 	}
 
-	if b.InternalMintableERC20PredicateAddr.Compare(heighest) > 0 {
-		heighest = b.InternalMintableERC20PredicateAddr
+	if b.InternalMintableERC20PredicateAddr.Compare(result) > 0 {
+		result = b.InternalMintableERC20PredicateAddr
 	}
 
-	if b.InternalMintableERC721PredicateAddr.Compare(heighest) > 0 {
-		heighest = b.InternalMintableERC721PredicateAddr
+	if b.InternalMintableERC721PredicateAddr.Compare(result) > 0 {
+		result = b.InternalMintableERC721PredicateAddr
 	}
 
-	if b.InternalMintableERC1155PredicateAddr.Compare(heighest) > 0 {
-		heighest = b.InternalMintableERC1155PredicateAddr
+	if b.InternalMintableERC1155PredicateAddr.Compare(result) > 0 {
+		result = b.InternalMintableERC1155PredicateAddr
 	}
 
-	return heighest
+	return result
 }
 
 func (p *PolyBFTConfig) IsBridgeEnabled() bool {

types/types.go

@@ -201,8 +201,10 @@ func IncrementAddressBy(addr Address, increment uint64) Address {
 	addrBigInt.Add(addrBigInt, big.NewInt(0).SetUint64(increment))
 
 	// Convert back to Address
-	var newAddr Address
-	addrBytes := addrBigInt.Bytes()
+	var (
+		newAddr   Address
+		addrBytes = addrBigInt.Bytes()
+	)
 
 	// Handle overflow by truncating to 20 bytes
 	if len(addrBytes) > 20 {