Enable revive linter

.golangci.yml

@@ -1,9 +1,21 @@
 version: "2"
 linters:
-  default: none 
   enable:
-    - staticcheck
+    - revive
   settings:
+    revive:
+      enable-default-rules: true
+      rules:
+        - name: exported
+          disabled: true
+        - name: var-naming
+          disabled: true
+        - name: package-comments
+          disabled: true
+        - name: unused-parameter
+          disabled: true
+        - name: error-strings
+          disabled: true
     staticcheck:
       checks:
         - all
@@ -18,6 +30,10 @@ linters:
         - -ST1020
         - -ST1021
         - -ST1022
+    errcheck:
+      exclude-functions:
+        - (*os.File).Close
+
 
 formatters:
   enable:

bindings/dao/protocol/verify.go

@@ -233,9 +233,9 @@ func GetMultiChallengeStatesFast(rp *rocketpool.RocketPool, multicallAddress com
 	rawStates := make([]uint8, count)
 	for i := uint64(0); i < count; i += challengeStateBatchSize {
 		i := i
-		max := i + challengeStateBatchSize
-		if max > count {
-			max = count
+		m := i + challengeStateBatchSize
+		if m > count {
+			m = count
 		}
 
 		// Load details
@@ -245,10 +245,13 @@ func GetMultiChallengeStatesFast(rp *rocketpool.RocketPool, multicallAddress com
 			if err != nil {
 				return err
 			}
-			for j := i; j < max; j++ {
+			for j := i; j < m; j++ {
 				propID := big.NewInt(int64(proposalIds[j]))
 				challengedIndex := big.NewInt(int64(challengedIndices[j]))
-				mc.AddCall(rocketDAOProtocolVerifier, &rawStates[j], "getChallengeState", propID, challengedIndex)
+				err = mc.AddCall(rocketDAOProtocolVerifier, &rawStates[j], "getChallengeState", propID, challengedIndex)
+				if err != nil {
+					return fmt.Errorf("error adding challenge state call for proposal %d / index %d: %w", proposalIds[j], challengedIndices[j], err)
+				}
 			}
 			_, err = mc.FlexibleCall(true, opts)
 			if err != nil {

bindings/deposit/deposit.go

@@ -73,21 +73,21 @@ func Deposit(rp *rocketpool.RocketPool, opts *bind.TransactOpts) (common.Hash, e
 }
 
 // Estimate the gas of AssignDeposits
-func EstimateAssignDepositsGas(rp *rocketpool.RocketPool, max *big.Int, opts *bind.TransactOpts) (rocketpool.GasInfo, error) {
+func EstimateAssignDepositsGas(rp *rocketpool.RocketPool, m *big.Int, opts *bind.TransactOpts) (rocketpool.GasInfo, error) {
 	rocketDepositPool, err := getRocketDepositPool(rp, nil)
 	if err != nil {
 		return rocketpool.GasInfo{}, err
 	}
-	return rocketDepositPool.GetTransactionGasInfo(opts, "assignDeposits", max)
+	return rocketDepositPool.GetTransactionGasInfo(opts, "assignDeposits", m)
 }
 
 // Assign deposits
-func AssignDeposits(rp *rocketpool.RocketPool, max *big.Int, opts *bind.TransactOpts) (common.Hash, error) {
+func AssignDeposits(rp *rocketpool.RocketPool, m *big.Int, opts *bind.TransactOpts) (common.Hash, error) {
 	rocketDepositPool, err := getRocketDepositPool(rp, nil)
 	if err != nil {
 		return common.Hash{}, err
 	}
-	tx, err := rocketDepositPool.Transact(opts, "assignDeposits", max)
+	tx, err := rocketDepositPool.Transact(opts, "assignDeposits", m)
 	if err != nil {
 		return common.Hash{}, fmt.Errorf("error assigning deposits: %w", err)
 	}

bindings/legacy/v1.0.0/minipool/minipool.go

@@ -544,7 +544,6 @@ func getRocketMinipoolManager(rp *rocketpool.RocketPool, address *common.Address
 	defer rocketMinipoolManagerLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_0_0.GetContract("rocketMinipoolManager", opts)
-	} else {
-		return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketMinipoolManager", *address)
 	}
+	return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketMinipoolManager", *address)
 }

bindings/legacy/v1.0.0/rewards/node.go

@@ -126,7 +126,6 @@ func getRocketClaimNode(rp *rocketpool.RocketPool, address *common.Address, opts
 	defer rocketClaimNodeLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_0_0.GetContract("rocketClaimNode", opts)
-	} else {
-		return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketClaimNode", *address)
 	}
+	return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketClaimNode", *address)
 }

bindings/legacy/v1.0.0/rewards/rewards.go

@@ -151,7 +151,6 @@ func getRocketRewardsPool(rp *rocketpool.RocketPool, address *common.Address, op
 	defer rocketRewardsPoolLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_0_0.GetContract("rocketRewardsPool", opts)
-	} else {
-		return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketRewardsPool", *address)
 	}
+	return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketRewardsPool", *address)
 }

bindings/legacy/v1.0.0/rewards/trusted-node.go

@@ -126,7 +126,6 @@ func getRocketClaimTrustedNode(rp *rocketpool.RocketPool, address *common.Addres
 	defer rocketClaimTrustedNodeLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_0_0.GetContract("rocketClaimTrustedNode", opts)
-	} else {
-		return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketClaimTrustedNode", *address)
 	}
+	return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketClaimTrustedNode", *address)
 }

bindings/legacy/v1.0.0/utils/address_generation.go

@@ -69,7 +69,6 @@ func getRocketMinipoolManager(rp *rocketpool.RocketPool, address *common.Address
 	defer rocketMinipoolManagerLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_0_0.GetContract("rocketMinipoolManager", opts)
-	} else {
-		return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketMinipoolManager", *address)
 	}
+	return rp.VersionManager.V1_0_0.GetContractWithAddress("rocketMinipoolManager", *address)
 }

bindings/legacy/v1.1.0-rc1/rewards/rewards.go

@@ -300,7 +300,6 @@ func getRocketRewardsPool(rp *rocketpool.RocketPool, address *common.Address, op
 	defer rocketRewardsPoolLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_1_0_RC1.GetContract("rocketRewardsPool", opts)
-	} else {
-		return rp.VersionManager.V1_1_0_RC1.GetContractWithAddress("rocketRewardsPool", *address)
 	}
+	return rp.VersionManager.V1_1_0_RC1.GetContractWithAddress("rocketRewardsPool", *address)
 }

bindings/legacy/v1.1.0/minipool/factory.go

@@ -31,7 +31,6 @@ func getRocketMinipoolFactory(rp *rocketpool.RocketPool, address *common.Address
 	defer rocketMinipoolFactoryLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_1_0.GetContract("rocketMinipoolFactory", opts)
-	} else {
-		return rp.VersionManager.V1_1_0.GetContractWithAddress("rocketMinipoolFactory", *address)
 	}
+	return rp.VersionManager.V1_1_0.GetContractWithAddress("rocketMinipoolFactory", *address)
 }

bindings/legacy/v1.1.0/minipool/queue.go

@@ -296,7 +296,6 @@ func getRocketMinipoolQueue(rp *rocketpool.RocketPool, address *common.Address,
 	defer rocketMinipoolQueueLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_1_0.GetContract("rocketMinipoolQueue", opts)
-	} else {
-		return rp.VersionManager.V1_1_0.GetContractWithAddress("rocketMinipoolQueue", *address)
 	}
+	return rp.VersionManager.V1_1_0.GetContractWithAddress("rocketMinipoolQueue", *address)
 }

bindings/legacy/v1.1.0/network/prices.go

@@ -93,7 +93,6 @@ func getRocketNetworkPrices(rp *rocketpool.RocketPool, address *common.Address,
 	defer rocketNetworkPricesLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_1_0.GetContract("rocketNetworkPrices", opts)
-	} else {
-		return rp.VersionManager.V1_1_0.GetContractWithAddress("rocketNetworkPrices", *address)
 	}
+	return rp.VersionManager.V1_1_0.GetContractWithAddress("rocketNetworkPrices", *address)
 }

bindings/legacy/v1.1.0/node/deposit.go

@@ -58,7 +58,6 @@ func getRocketNodeDeposit(rp *rocketpool.RocketPool, address *common.Address, op
 	defer rocketNodeDepositLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_1_0.GetContract("rocketNodeDeposit", opts)
-	} else {
-		return rp.VersionManager.V1_1_0.GetContractWithAddress("rocketNodeDeposit", *address)
 	}
+	return rp.VersionManager.V1_1_0.GetContractWithAddress("rocketNodeDeposit", *address)
 }

bindings/legacy/v1.1.0/node/staking.go

@@ -205,7 +205,6 @@ func getRocketNodeStaking(rp *rocketpool.RocketPool, address *common.Address, op
 	defer rocketNodeStakingLock.Unlock()
 	if address == nil {
 		return rp.VersionManager.V1_1_0.GetContract("rocketNodeStaking", opts)
-	} else {
-		return rp.VersionManager.V1_1_0.GetContractWithAddress("rocketNodeStaking", *address)
 	}
+	return rp.VersionManager.V1_1_0.GetContractWithAddress("rocketNodeStaking", *address)
 }

bindings/minipool/minipool-constructor.go

@@ -3,7 +3,6 @@ package minipool
 import (
 	"fmt"
 	"strings"
-	"sync"
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
@@ -77,12 +76,3 @@ func createMinipoolContractFromAbi(rp *rocketpool.RocketPool, address common.Add
 		Client:   rp.Client,
 	}, nil
 }
-
-// Get a minipool contract
-var rocketMinipoolLock sync.Mutex
-
-func getMinipoolContract(rp *rocketpool.RocketPool, minipoolAddress common.Address, opts *bind.CallOpts) (*rocketpool.Contract, error) {
-	rocketMinipoolLock.Lock()
-	defer rocketMinipoolLock.Unlock()
-	return rp.MakeContract("rocketMinipool", minipoolAddress, opts)
-}

bindings/minipool/minipool-contract-v2.go

@@ -575,7 +575,7 @@ func (mp *minipool_v2) GetPrestakeEvent(intervalSize *big.Int, opts *bind.CallOp
 
 	// Decode the event
 	prestakeEvent := new(MinipoolPrestakeEvent)
-	mp.Contract.Contract.UnpackLog(prestakeEvent, "MinipoolPrestaked", log)
+	err = mp.Contract.Contract.UnpackLog(prestakeEvent, "MinipoolPrestaked", log)
 	if err != nil {
 		return PrestakeData{}, fmt.Errorf("Error unpacking prestake data: %w", err)
 	}

bindings/minipool/minipool-contract-v3.go

@@ -616,7 +616,7 @@ func (mp *minipool_v3) GetPrestakeEvent(intervalSize *big.Int, opts *bind.CallOp
 
 	// Decode the event
 	prestakeEvent := new(MinipoolPrestakeEvent)
-	mp.Contract.Contract.UnpackLog(prestakeEvent, "MinipoolPrestaked", log)
+	err = mp.Contract.Contract.UnpackLog(prestakeEvent, "MinipoolPrestaked", log)
 	if err != nil {
 		return PrestakeData{}, fmt.Errorf("Error unpacking prestake data: %w", err)
 	}

bindings/network/voting.go

@@ -54,9 +54,9 @@ func GetNodeInfoSnapshotFast(rp *rocketpool.RocketPool, blockNumber uint32, mult
 	votingInfos := make([]types.NodeVotingInfo, nodeCount)
 	for i := uint64(0); i < nodeCount; i += nodeVotingDetailsBatchSize {
 		i := i
-		max := i + nodeVotingDetailsBatchSize
-		if max > nodeCount {
-			max = nodeCount
+		m := i + nodeVotingDetailsBatchSize
+		if m > nodeCount {
+			m = nodeCount
 		}
 
 		// Load details
@@ -66,11 +66,17 @@ func GetNodeInfoSnapshotFast(rp *rocketpool.RocketPool, blockNumber uint32, mult
 			if err != nil {
 				return err
 			}
-			for j := i; j < max; j++ {
+			for j := i; j < m; j++ {
 				nodeAddress := nodeAddresses[j]
 				votingInfos[j].NodeAddress = nodeAddress
-				mc.AddCall(rocketNetworkVoting, &votingInfos[j].VotingPower, "getVotingPower", nodeAddress, blockNumber)
-				mc.AddCall(rocketNetworkVoting, &votingInfos[j].Delegate, "getDelegate", nodeAddress, blockNumber)
+				err = mc.AddCall(rocketNetworkVoting, &votingInfos[j].VotingPower, "getVotingPower", nodeAddress, blockNumber)
+				if err != nil {
+					return fmt.Errorf("error adding voting power call for node %s: %w", nodeAddress.Hex(), err)
+				}
+				err = mc.AddCall(rocketNetworkVoting, &votingInfos[j].Delegate, "getDelegate", nodeAddress, blockNumber)
+				if err != nil {
+					return fmt.Errorf("error adding delegate call for node %s: %w", nodeAddress.Hex(), err)
+				}
 			}
 			_, err = mc.FlexibleCall(true, opts)
 			if err != nil {

bindings/node/node.go

@@ -173,9 +173,9 @@ func GetNodeAddressesFast(rp *rocketpool.RocketPool, multicallAddress common.Add
 	count := int(nodeCount)
 	for i := 0; i < count; i += nodeAddressFastBatchSize {
 		i := i
-		max := i + nodeAddressFastBatchSize
-		if max > count {
-			max = count
+		m := i + nodeAddressFastBatchSize
+		if m > count {
+			m = count
 		}
 
 		wg.Go(func() error {
@@ -184,8 +184,11 @@ func GetNodeAddressesFast(rp *rocketpool.RocketPool, multicallAddress common.Add
 			if err != nil {
 				return err
 			}
-			for j := i; j < max; j++ {
-				mc.AddCall(rocketNodeManager, &addresses[j], "getNodeAt", big.NewInt(int64(j)))
+			for j := i; j < m; j++ {
+				err = mc.AddCall(rocketNodeManager, &addresses[j], "getNodeAt", big.NewInt(int64(j)))
+				if err != nil {
+					return fmt.Errorf("error adding node at call for index %d: %w", j, err)
+				}
 			}
 			_, err = mc.FlexibleCall(true, opts)
 			if err != nil {

bindings/rocketpool/contract.go

@@ -155,25 +155,6 @@ func (c *Contract) estimateGasLimit(opts *bind.TransactOpts, input []byte) (uint
 
 }
 
-// Wait for a transaction to be mined and get a tx receipt
-func (c *Contract) getTransactionReceipt(tx *types.Transaction) (*types.Receipt, error) {
-
-	// Wait for transaction to be mined
-	txReceipt, err := bind.WaitMined(context.Background(), c.Client, tx)
-	if err != nil {
-		return nil, err
-	}
-
-	// Check transaction status
-	if txReceipt.Status == 0 {
-		return txReceipt, errors.New("Transaction failed with status 0")
-	}
-
-	// Return
-	return txReceipt, nil
-
-}
-
 // Get contract events from a transaction
 // eventPrototype must be an event struct type
 // Returns a slice of untyped values; assert returned events to event struct type

bindings/rocketpool/rocketpool.go

@@ -90,9 +90,8 @@ func (rp *RocketPool) GetAddress(contractName string, opts *bind.CallOpts) (*com
 		if cached, ok := rp.getCachedAddress(contractName); ok {
 			if time.Now().Unix()-cached.time <= CacheTTL {
 				return cached.address, nil
-			} else {
-				rp.deleteCachedAddress(contractName)
 			}
+			rp.deleteCachedAddress(contractName)
 		}
 	}
 
@@ -150,9 +149,8 @@ func (rp *RocketPool) GetABI(contractName string, opts *bind.CallOpts) (*abi.ABI
 		if cached, ok := rp.getCachedABI(contractName); ok {
 			if time.Now().Unix()-cached.time <= CacheTTL {
 				return cached.abi, nil
-			} else {
-				rp.deleteCachedABI(contractName)
 			}
+			rp.deleteCachedABI(contractName)
 		}
 	}
 
@@ -215,9 +213,8 @@ func (rp *RocketPool) GetContract(contractName string, opts *bind.CallOpts) (*Co
 		if cached, ok := rp.getCachedContract(contractName); ok {
 			if time.Now().Unix()-cached.time <= CacheTTL {
 				return cached.contract, nil
-			} else {
-				rp.deleteCachedContract(contractName)
 			}
+			rp.deleteCachedContract(contractName)
 		}
 	}
 

bindings/rocketpool/version-manager.go

@@ -51,9 +51,8 @@ func getLegacyContract(rp *RocketPool, contractName string, m LegacyVersionWrapp
 	if cached, ok := rp.getCachedContract(legacyName); ok {
 		if time.Now().Unix()-cached.time <= CacheTTL {
 			return cached.contract, nil
-		} else {
-			rp.deleteCachedContract(legacyName)
 		}
+		rp.deleteCachedContract(legacyName)
 	}
 
 	// Try to get the legacy address from RocketStorage first