[DataAvailability] add a check for executors passed by a client

cmd/access/node_builder/access_node_builder.go

@@ -1784,6 +1784,7 @@ func (builder *FlowAccessNodeBuilder) buildExecutionResultInfoProvider() *FlowAc
 			node.Logger,
 			node.State,
 			node.Storage.Receipts,
+			node.Storage.Headers,
 			execNodeSelector,
 			operatorCriteria,
 		)

cmd/observer/node_builder/observer_builder.go

@@ -1141,6 +1141,7 @@ func (builder *ObserverServiceBuilder) buildExecutionResultInfoProvider() *Obser
 			node.Logger,
 			node.State,
 			node.Storage.Receipts,
+			node.Storage.Headers,
 			execNodeSelector,
 			operatorCriteria,
 		)

engine/access/rpc/backend/accounts/accounts.go

@@ -127,6 +127,12 @@ func (a *Accounts) GetAccountAtLatestBlock(ctx context.Context, address flow.Add
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
 		case common.IsInsufficientExecutionReceipts(err):
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
+		case optimistic_sync.IsAgreeingExecutorsCountExceededError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsUnknownRequiredExecutorError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsCriteriaNotMetError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
 		default:
 			return nil, nil, access.RequireNoError(ctx, err)
 		}
@@ -181,6 +187,12 @@ func (a *Accounts) GetAccountAtBlockHeight(
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
 		case common.IsInsufficientExecutionReceipts(err):
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
+		case optimistic_sync.IsAgreeingExecutorsCountExceededError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsUnknownRequiredExecutorError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsCriteriaNotMetError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
 		default:
 			return nil, nil, access.RequireNoError(ctx, err)
 		}
@@ -231,6 +243,12 @@ func (a *Accounts) GetAccountBalanceAtLatestBlock(ctx context.Context, address f
 			return 0, nil, access.NewDataNotFoundError("execution data", err)
 		case common.IsInsufficientExecutionReceipts(err):
 			return 0, nil, access.NewDataNotFoundError("execution data", err)
+		case optimistic_sync.IsAgreeingExecutorsCountExceededError(err):
+			return 0, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsUnknownRequiredExecutorError(err):
+			return 0, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsCriteriaNotMetError(err):
+			return 0, nil, access.NewInvalidRequestError(err)
 		default:
 			return 0, nil, access.RequireNoError(ctx, err)
 		}
@@ -285,6 +303,12 @@ func (a *Accounts) GetAccountBalanceAtBlockHeight(
 			return 0, nil, access.NewDataNotFoundError("execution data", err)
 		case common.IsInsufficientExecutionReceipts(err):
 			return 0, nil, access.NewDataNotFoundError("execution data", err)
+		case optimistic_sync.IsAgreeingExecutorsCountExceededError(err):
+			return 0, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsUnknownRequiredExecutorError(err):
+			return 0, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsCriteriaNotMetError(err):
+			return 0, nil, access.NewInvalidRequestError(err)
 		default:
 			return 0, nil, access.RequireNoError(ctx, err)
 		}
@@ -339,6 +363,12 @@ func (a *Accounts) GetAccountKeyAtLatestBlock(
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
 		case common.IsInsufficientExecutionReceipts(err):
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
+		case optimistic_sync.IsAgreeingExecutorsCountExceededError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsUnknownRequiredExecutorError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsCriteriaNotMetError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
 		default:
 			return nil, nil, access.RequireNoError(ctx, err)
 		}
@@ -394,6 +424,12 @@ func (a *Accounts) GetAccountKeyAtBlockHeight(
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
 		case common.IsInsufficientExecutionReceipts(err):
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
+		case optimistic_sync.IsAgreeingExecutorsCountExceededError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsUnknownRequiredExecutorError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsCriteriaNotMetError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
 		default:
 			return nil, nil, access.RequireNoError(ctx, err)
 		}
@@ -447,6 +483,12 @@ func (a *Accounts) GetAccountKeysAtLatestBlock(
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
 		case common.IsInsufficientExecutionReceipts(err):
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
+		case optimistic_sync.IsAgreeingExecutorsCountExceededError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsUnknownRequiredExecutorError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsCriteriaNotMetError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
 		default:
 			return nil, nil, access.RequireNoError(ctx, err)
 		}
@@ -501,6 +543,12 @@ func (a *Accounts) GetAccountKeysAtBlockHeight(
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
 		case common.IsInsufficientExecutionReceipts(err):
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
+		case optimistic_sync.IsAgreeingExecutorsCountExceededError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsUnknownRequiredExecutorError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsCriteriaNotMetError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
 		default:
 			return nil, nil, access.RequireNoError(ctx, err)
 		}

engine/access/rpc/backend/scripts/scripts.go

@@ -163,6 +163,12 @@ func (b *Scripts) ExecuteScriptAtLatestBlock(
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
 		case common.IsInsufficientExecutionReceipts(err):
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
+		case optimistic_sync.IsAgreeingExecutorsCountExceededError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsUnknownRequiredExecutorError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsCriteriaNotMetError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
 		default:
 			return nil, nil, access.RequireNoError(ctx, err)
 		}
@@ -221,6 +227,12 @@ func (b *Scripts) ExecuteScriptAtBlockID(
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
 		case common.IsInsufficientExecutionReceipts(err):
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
+		case optimistic_sync.IsAgreeingExecutorsCountExceededError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsUnknownRequiredExecutorError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsCriteriaNotMetError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
 		default:
 			return nil, nil, access.RequireNoError(ctx, err)
 		}
@@ -284,6 +296,12 @@ func (b *Scripts) ExecuteScriptAtBlockHeight(
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
 		case common.IsInsufficientExecutionReceipts(err):
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
+		case optimistic_sync.IsAgreeingExecutorsCountExceededError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsUnknownRequiredExecutorError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsCriteriaNotMetError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
 		default:
 			return nil, nil, access.RequireNoError(ctx, err)
 		}

engine/access/state_stream/backend/backend.go

@@ -223,6 +223,12 @@ func (b *StateStreamBackend) GetRegisterValues(
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
 		case common.IsInsufficientExecutionReceipts(err):
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
+		case optimistic_sync.IsAgreeingExecutorsCountExceededError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsUnknownRequiredExecutorError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsCriteriaNotMetError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
 		default:
 			return nil, nil, access.RequireNoError(ctx, err)
 		}

engine/access/state_stream/backend/backend_executiondata.go

@@ -61,6 +61,12 @@ func (b *ExecutionDataBackend) GetExecutionDataByBlockID(
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
 		case common.IsInsufficientExecutionReceipts(err):
 			return nil, nil, access.NewDataNotFoundError("execution data", err)
+		case optimistic_sync.IsAgreeingExecutorsCountExceededError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsUnknownRequiredExecutorError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
+		case optimistic_sync.IsCriteriaNotMetError(err):
+			return nil, nil, access.NewInvalidRequestError(err)
 		default:
 			return nil, nil, access.RequireNoError(ctx, err)
 		}

module/executiondatasync/optimistic_sync/errors.go

@@ -0,0 +1,73 @@
+package optimistic_sync
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/onflow/flow-go/model/flow"
+)
+
+// AgreeingExecutorsCountExceededError indicates that the requested number of agreeing executors
+// exceeds the total available execution nodes.
+type AgreeingExecutorsCountExceededError struct {
+	agreeingExecutorsCount  uint
+	availableExecutorsCount int
+}
+
+func NewAgreeingExecutorsCountExceededError(agreeingExecutorsCount uint, availableExecutorsCount int) *AgreeingExecutorsCountExceededError {
+	return &AgreeingExecutorsCountExceededError{
+		agreeingExecutorsCount:  agreeingExecutorsCount,
+		availableExecutorsCount: availableExecutorsCount,
+	}
+}
+
+func (e *AgreeingExecutorsCountExceededError) Error() string {
+	return fmt.Sprintf("agreeing executors count exceeded: provided %d, available %d", e.agreeingExecutorsCount, e.availableExecutorsCount)
+}
+
+func IsAgreeingExecutorsCountExceededError(err error) bool {
+	var agreeingExecutorsCountExceededError *AgreeingExecutorsCountExceededError
+	return errors.As(err, &agreeingExecutorsCountExceededError)
+}
+
+// UnknownRequiredExecutorError indicates that a required executor ID is not present
+// in the list of active execution nodes.
+type UnknownRequiredExecutorError struct {
+	executorID flow.Identifier
+}
+
+func NewUnknownRequiredExecutorError(executorID flow.Identifier) *UnknownRequiredExecutorError {
+	return &UnknownRequiredExecutorError{
+		executorID: executorID,
+	}
+}
+
+func (e *UnknownRequiredExecutorError) Error() string {
+	return fmt.Sprintf("unknown required executor ID: %s", e.executorID.String())
+}
+
+func IsUnknownRequiredExecutorError(err error) bool {
+	var unknownRequiredExecutor *UnknownRequiredExecutorError
+	return errors.As(err, &unknownRequiredExecutor)
+}
+
+// CriteriaNotMetError indicates that the execution result criteria could not be
+// satisfied for a given block, when the block is already sealed.
+type CriteriaNotMetError struct {
+	blockID flow.Identifier
+}
+
+func NewCriteriaNotMetError(blockID flow.Identifier) *CriteriaNotMetError {
+	return &CriteriaNotMetError{
+		blockID: blockID,
+	}
+}
+
+func (e *CriteriaNotMetError) Error() string {
+	return fmt.Sprintf("block %s is already sealed and no execution result satisfies the criteria", e.blockID)
+}
+
+func IsCriteriaNotMetError(err error) bool {
+	var criteriaNotMetError *CriteriaNotMetError
+	return errors.As(err, &criteriaNotMetError)
+}