Fix timelock expiration error message

unlock_cond.go

@@ -329,7 +329,7 @@ func (f UnlockConditionSet) TimelocksExpired(futureBoundedSlot SlotIndex) error
 	}
 
 	if futureBoundedSlot < timelock.Slot {
-		return ierrors.WithMessagef(ErrTimelockNotExpired, "slot cond is %d, while tx creation slot could be up to %d", timelock.Slot, futureBoundedSlot)
+		return ierrors.WithMessagef(ErrTimelockNotExpired, "timelock expires in slot %d but the future bounded slot is only %d", timelock.Slot, futureBoundedSlot)
 	}
 
 	return nil

vm/nova/vm.go

@@ -482,7 +482,7 @@ func accountStakingGenesisValidation(vmParams *vm.Params, stakingFeat *iotago.St
 
 	unbondingEpoch := pastBoundedEpoch + vmParams.API.ProtocolParameters().StakingUnbondingPeriod()
 	if stakingFeat.EndEpoch < unbondingEpoch {
-		return ierrors.Wrapf(iotago.ErrStakingEndEpochTooEarly, "end epoch %d should be >= %d", stakingFeat.EndEpoch, unbondingEpoch)
+		return ierrors.WithMessagef(iotago.ErrStakingEndEpochTooEarly, "end epoch %d should be >= %d", stakingFeat.EndEpoch, unbondingEpoch)
 	}
 
 	return nil

vm/vm.go

@@ -769,7 +769,7 @@ func ExecFuncBalancedBaseTokens() ExecFunc {
 // ExecFuncTimelocks validates that the inputs' timelocks are expired.
 func ExecFuncTimelocks() ExecFunc {
 	return func(_ VirtualMachine, vmParams *Params) error {
-		for inputIndex, input := range vmParams.WorkingSet.UTXOInputsSet {
+		for inputID, input := range vmParams.WorkingSet.UTXOInputsSet {
 			if input.UnlockConditionSet().HasTimelockCondition() {
 				commitment := vmParams.WorkingSet.Commitment
 
@@ -778,7 +778,7 @@ func ExecFuncTimelocks() ExecFunc {
 				}
 				futureBoundedIndex := vmParams.FutureBoundedSlotIndex(commitment.Slot)
 				if err := input.UnlockConditionSet().TimelocksExpired(futureBoundedIndex); err != nil {
-					return ierrors.Wrapf(err, "input at index %d's timelocks are not expired", inputIndex)
+					return ierrors.Wrapf(err, "timelock of input %s is not expired", inputID.ToHex())
 				}
 			}
 		}