Fix errcheck issues

Author: jshufro

.golangci.yml

@@ -6,6 +6,7 @@ linters:
     - ineffassign
     - unused
     - staticcheck
+    - errcheck
   settings:
     staticcheck:
       checks:
@@ -21,6 +22,10 @@ linters:
         - -ST1020
         - -ST1021
         - -ST1022
+    errcheck:
+      exclude-functions:
+        - (*os.File).Close
+
 
 formatters:
   enable:

bindings/dao/protocol/verify.go

@@ -248,7 +248,10 @@ func GetMultiChallengeStatesFast(rp *rocketpool.RocketPool, multicallAddress com
 			for j := i; j < max; 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/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

@@ -69,8 +69,14 @@ func GetNodeInfoSnapshotFast(rp *rocketpool.RocketPool, blockNumber uint32, mult
 			for j := i; j < max; 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

@@ -185,7 +185,10 @@ func GetNodeAddressesFast(rp *rocketpool.RocketPool, multicallAddress common.Add
 				return err
 			}
 			for j := i; j < max; j++ {
-				mc.AddCall(rocketNodeManager, &addresses[j], "getNodeAt", big.NewInt(int64(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/utils/state/contracts.go

@@ -194,10 +194,16 @@ func NewNetworkContracts(rp *rocketpool.RocketPool, multicallerAddress common.Ad
 	// Add the address and ABI getters to multicall
 	for i, wrapper := range wrappers {
 		// Add the address getter
-		contracts.Multicaller.AddCall(contracts.RocketStorage, &wrappers[i].address, "getAddress", [32]byte(crypto.Keccak256Hash([]byte("contract.address"), []byte(wrapper.name))))
+		err := contracts.Multicaller.AddCall(contracts.RocketStorage, &wrappers[i].address, "getAddress", [32]byte(crypto.Keccak256Hash([]byte("contract.address"), []byte(wrapper.name))))
+		if err != nil {
+			return nil, fmt.Errorf("error adding address getter for %s: %w", wrapper.name, err)
+		}
 
 		// Add the ABI getter
-		contracts.Multicaller.AddCall(contracts.RocketStorage, &wrappers[i].abiEncoded, "getString", [32]byte(crypto.Keccak256Hash([]byte("contract.abi"), []byte(wrapper.name))))
+		err = contracts.Multicaller.AddCall(contracts.RocketStorage, &wrappers[i].abiEncoded, "getString", [32]byte(crypto.Keccak256Hash([]byte("contract.abi"), []byte(wrapper.name))))
+		if err != nil {
+			return nil, fmt.Errorf("error adding ABI getter for %s: %w", wrapper.name, err)
+		}
 	}
 
 	// Run the multi-getter

bindings/utils/state/megapool.go

@@ -88,7 +88,10 @@ func GetAllMegapoolValidators(rp *rocketpool.RocketPool, contracts *NetworkContr
 			}
 			var dummy *big.Int
 			for j := i; j < max; j++ {
-				mc.AddCall(megapoolManagerContract, &dummy, "getValidatorInfo", big.NewInt(int64(j)))
+				err = mc.AddCall(megapoolManagerContract, &dummy, "getValidatorInfo", big.NewInt(int64(j)))
+				if err != nil {
+					return fmt.Errorf("error adding validator info call for global index %d: %w", j, err)
+				}
 			}
 			responses, err := mc.Execute(true, opts)
 			if err != nil {
@@ -228,7 +231,10 @@ func GetBulkMegapoolDetails(rp *rocketpool.RocketPool, contracts *NetworkContrac
 				megapoolDetails[j].NodeDebt = big.NewInt(0)
 				megapoolDetails[j].BondRequirement = big.NewInt(0)
 				megapoolDetails[j].EthBalance = big.NewInt(0)
-				addMegapoolDetailsCalls(mc, megaContracts[j], &megapoolDetails[j], &lastDistributionTimes[j])
+				err = addMegapoolDetailsCalls(mc, megaContracts[j], &megapoolDetails[j], &lastDistributionTimes[j])
+				if err != nil {
+					return fmt.Errorf("error adding megapool details calls: %w", err)
+				}
 			}
 			_, err = mc.FlexibleCall(true, opts)
 			if err != nil {
@@ -265,8 +271,14 @@ func GetBulkMegapoolDetails(rp *rocketpool.RocketPool, contracts *NetworkContrac
 				if megapoolDetails[j].DelegateExpired {
 					continue
 				}
-				mc.AddCall(megapoolFactory, &delegateExpiries[j], "getDelegateExpiry", megapoolDetails[j].DelegateAddress)
-				mc.AddCall(nodeDeposit, &megapoolDetails[j].BondRequirement, "getBondRequirement", big.NewInt(int64(megapoolDetails[j].ActiveValidatorCount)))
+				err = mc.AddCall(megapoolFactory, &delegateExpiries[j], "getDelegateExpiry", megapoolDetails[j].DelegateAddress)
+				if err != nil {
+					return fmt.Errorf("error adding delegate expiry call for megapool %s: %w", megapoolDetails[j].Address.Hex(), err)
+				}
+				err = mc.AddCall(nodeDeposit, &megapoolDetails[j].BondRequirement, "getBondRequirement", big.NewInt(int64(megapoolDetails[j].ActiveValidatorCount)))
+				if err != nil {
+					return fmt.Errorf("error adding bond requirement call for megapool %s: %w", megapoolDetails[j].Address.Hex(), err)
+				}
 				callCount += 2
 			}
 			if callCount == 0 {
@@ -295,20 +307,31 @@ func GetBulkMegapoolDetails(rp *rocketpool.RocketPool, contracts *NetworkContrac
 }
 
 // Add all independent multicall entries for a single megapool's details
-func addMegapoolDetailsCalls(mc *multicall.MultiCaller, megaContract *rocketpool.Contract, details *NativeMegapoolDetails, lastDistributionTime **big.Int) {
-	mc.AddCall(megaContract, &details.EffectiveDelegateAddress, "getEffectiveDelegate")
-	mc.AddCall(megaContract, &details.DelegateAddress, "getDelegate")
-	mc.AddCall(megaContract, &details.DelegateExpired, "getDelegateExpired")
-	mc.AddCall(megaContract, lastDistributionTime, "getLastDistributionTime")
-	mc.AddCall(megaContract, &details.NodeDebt, "getDebt")
-	mc.AddCall(megaContract, &details.PendingRewards, "getPendingRewards")
-	mc.AddCall(megaContract, &details.RefundValue, "getRefundValue")
-	mc.AddCall(megaContract, &details.ValidatorCount, "getValidatorCount")
-	mc.AddCall(megaContract, &details.ActiveValidatorCount, "getActiveValidatorCount")
-	mc.AddCall(megaContract, &details.LockedValidatorCount, "getLockedValidatorCount")
-	mc.AddCall(megaContract, &details.UseLatestDelegate, "getUseLatestDelegate")
-	mc.AddCall(megaContract, &details.AssignedValue, "getAssignedValue")
-	mc.AddCall(megaContract, &details.NodeBond, "getNodeBond")
-	mc.AddCall(megaContract, &details.UserCapital, "getUserCapital")
-	mc.AddCall(megaContract, &details.NodeQueuedBond, "getNodeQueuedBond")
+func addMegapoolDetailsCalls(mc *multicall.MultiCaller, megaContract *rocketpool.Contract, details *NativeMegapoolDetails, lastDistributionTime **big.Int) error {
+	allErrors := make([]error, 0)
+	addCall := func(contract *rocketpool.Contract, out any, method string, args ...any) {
+		allErrors = append(allErrors, mc.AddCall(contract, out, method, args...))
+	}
+
+	addCall(megaContract, &details.EffectiveDelegateAddress, "getEffectiveDelegate")
+	addCall(megaContract, &details.DelegateAddress, "getDelegate")
+	addCall(megaContract, &details.DelegateExpired, "getDelegateExpired")
+	addCall(megaContract, lastDistributionTime, "getLastDistributionTime")
+	addCall(megaContract, &details.NodeDebt, "getDebt")
+	addCall(megaContract, &details.PendingRewards, "getPendingRewards")
+	addCall(megaContract, &details.RefundValue, "getRefundValue")
+	addCall(megaContract, &details.ValidatorCount, "getValidatorCount")
+	addCall(megaContract, &details.ActiveValidatorCount, "getActiveValidatorCount")
+	addCall(megaContract, &details.LockedValidatorCount, "getLockedValidatorCount")
+	addCall(megaContract, &details.UseLatestDelegate, "getUseLatestDelegate")
+	addCall(megaContract, &details.AssignedValue, "getAssignedValue")
+	addCall(megaContract, &details.NodeBond, "getNodeBond")
+	addCall(megaContract, &details.UserCapital, "getUserCapital")
+	addCall(megaContract, &details.NodeQueuedBond, "getNodeQueuedBond")
+	for _, err := range allErrors {
+		if err != nil {
+			return fmt.Errorf("error adding megapool details calls: %w", err)
+		}
+	}
+	return nil
 }