Merge branch 'master' into script-executor-populate-env-values

engine/execution/computation/computer/computer.go

@@ -24,6 +24,7 @@ import (
 	"github.com/onflow/flow-go/module/executiondatasync/provider"
 	"github.com/onflow/flow-go/module/mempool/entity"
 	"github.com/onflow/flow-go/module/trace"
+	"github.com/onflow/flow-go/state/protocol"
 	"github.com/onflow/flow-go/utils/logging"
 )
 
@@ -113,6 +114,7 @@ type blockComputer struct {
 	spockHasher           hash.Hasher
 	receiptHasher         hash.Hasher
 	colResCons            []result.ExecutedCollectionConsumer
+	protocolState         protocol.State
 	maxConcurrency        int
 }
 
@@ -141,6 +143,7 @@ func NewBlockComputer(
 	signer module.Local,
 	executionDataProvider *provider.Provider,
 	colResCons []result.ExecutedCollectionConsumer,
+	state protocol.State,
 	maxConcurrency int,
 ) (BlockComputer, error) {
 	if maxConcurrency < 1 {
@@ -164,6 +167,7 @@ func NewBlockComputer(
 		spockHasher:           utils.NewSPOCKHasher(),
 		receiptHasher:         utils.NewExecutionReceiptHasher(),
 		colResCons:            colResCons,
+		protocolState:         state,
 		maxConcurrency:        maxConcurrency,
 	}, nil
 }
@@ -204,7 +208,15 @@ func (e *blockComputer) queueTransactionRequests(
 
 	collectionCtx := fvm.NewContextFromParent(
 		e.vmCtx,
-		fvm.WithBlockHeader(blockHeader))
+		fvm.WithBlockHeader(blockHeader),
+		// `protocol.Snapshot` implements `EntropyProvider` interface
+		// Note that `Snapshot` possible errors for RandomSource() are:
+		// - storage.ErrNotFound if the QC is unknown.
+		// - state.ErrUnknownSnapshotReference if the snapshot reference block is unknown
+		// However, at this stage, snapshot reference block should be known and the QC should also be known,
+		// so no error is expected in normal operations, as required by `EntropyProvider`.
+		fvm.WithEntropyProvider(e.protocolState.AtBlockID(blockId)),
+	)
 
 	for idx, collection := range rawCollections {
 		collectionLogger := collectionCtx.Logger.With().
@@ -237,7 +249,15 @@ func (e *blockComputer) queueTransactionRequests(
 
 	systemCtx := fvm.NewContextFromParent(
 		e.systemChunkCtx,
-		fvm.WithBlockHeader(blockHeader))
+		fvm.WithBlockHeader(blockHeader),
+		// `protocol.Snapshot` implements `EntropyProvider` interface
+		// Note that `Snapshot` possible errors for RandomSource() are:
+		// - storage.ErrNotFound if the QC is unknown.
+		// - state.ErrUnknownSnapshotReference if the snapshot reference block is unknown
+		// However, at this stage, snapshot reference block should be known and the QC should also be known,
+		// so no error is expected in normal operations, as required by `EntropyProvider`.
+		fvm.WithEntropyProvider(e.protocolState.AtBlockID(blockId)),
+	)
 	systemCollectionLogger := systemCtx.Logger.With().
 		Str("block_id", blockIdStr).
 		Uint64("height", blockHeader.Height).

engine/execution/computation/computer/computer_test.go

@@ -172,6 +172,7 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) {
 			me,
 			prov,
 			nil,
+			testutil.ProtocolStateWithSourceFixture(nil),
 			testMaxConcurrency)
 		require.NoError(t, err)
 
@@ -306,6 +307,7 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) {
 			me,
 			prov,
 			nil,
+			testutil.ProtocolStateWithSourceFixture(nil),
 			testMaxConcurrency)
 		require.NoError(t, err)
 
@@ -403,6 +405,7 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) {
 			me,
 			prov,
 			nil,
+			testutil.ProtocolStateWithSourceFixture(nil),
 			testMaxConcurrency)
 		require.NoError(t, err)
 
@@ -462,6 +465,7 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) {
 			me,
 			prov,
 			nil,
+			testutil.ProtocolStateWithSourceFixture(nil),
 			testMaxConcurrency)
 		require.NoError(t, err)
 
@@ -678,6 +682,7 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) {
 				me,
 				prov,
 				nil,
+				testutil.ProtocolStateWithSourceFixture(nil),
 				testMaxConcurrency)
 			require.NoError(t, err)
 
@@ -788,6 +793,7 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) {
 			me,
 			prov,
 			nil,
+			testutil.ProtocolStateWithSourceFixture(nil),
 			testMaxConcurrency)
 		require.NoError(t, err)
 
@@ -900,6 +906,7 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) {
 			me,
 			prov,
 			nil,
+			testutil.ProtocolStateWithSourceFixture(nil),
 			testMaxConcurrency)
 		require.NoError(t, err)
 
@@ -944,6 +951,7 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) {
 			me,
 			prov,
 			nil,
+			testutil.ProtocolStateWithSourceFixture(nil),
 			testMaxConcurrency)
 		require.NoError(t, err)
 
@@ -1263,6 +1271,7 @@ func Test_ExecutingSystemCollection(t *testing.T) {
 		me,
 		prov,
 		nil,
+		testutil.ProtocolStateWithSourceFixture(nil),
 		testMaxConcurrency)
 	require.NoError(t, err)
 

engine/execution/computation/execution_verification_test.go

@@ -781,6 +781,7 @@ func executeBlockAndVerifyWithParameters(t *testing.T,
 		me,
 		prov,
 		nil,
+		testutil.ProtocolStateWithSourceFixture(nil),
 		testVerifyMaxConcurrency)
 	require.NoError(t, err)
 

engine/execution/computation/manager.go

@@ -119,8 +119,7 @@ func New(
 					// Capability Controllers are enabled everywhere except for Mainnet
 					CapabilityControllersEnabled: chainID != flow.Mainnet,
 				},
-			),
-		),
+			)),
 	}
 	if params.ExtensiveTracing {
 		options = append(options, fvm.WithExtensiveTracing())
@@ -138,6 +137,7 @@ func New(
 		me,
 		executionDataProvider,
 		nil, // TODO(ramtin): update me with proper consumers
+		protoState,
 		params.MaxConcurrency,
 	)
 

engine/execution/computation/manager_benchmark_test.go

@@ -201,6 +201,7 @@ func benchmarkComputeBlock(
 		me,
 		prov,
 		nil,
+		testutil.ProtocolStateWithSourceFixture(nil),
 		maxConcurrency)
 	require.NoError(b, err)
 

engine/execution/computation/manager_test.go

@@ -143,6 +143,7 @@ func TestComputeBlockWithStorage(t *testing.T) {
 		me,
 		prov,
 		nil,
+		testutil.ProtocolStateWithSourceFixture(nil),
 		testMaxConcurrency)
 	require.NoError(t, err)
 
@@ -835,6 +836,7 @@ func Test_EventEncodingFailsOnlyTxAndCarriesOn(t *testing.T) {
 		me,
 		prov,
 		nil,
+		testutil.ProtocolStateWithSourceFixture(nil),
 		testMaxConcurrency)
 	require.NoError(t, err)
 

engine/execution/computation/programs_test.go

@@ -138,6 +138,7 @@ func TestPrograms_TestContractUpdates(t *testing.T) {
 		me,
 		prov,
 		nil,
+		testutil.ProtocolStateWithSourceFixture(nil),
 		testMaxConcurrency)
 	require.NoError(t, err)
 
@@ -249,6 +250,7 @@ func TestPrograms_TestBlockForks(t *testing.T) {
 		me,
 		prov,
 		nil,
+		testutil.ProtocolStateWithSourceFixture(nil),
 		testMaxConcurrency)
 	require.NoError(t, err)
 

engine/execution/testutil/fixtures.go

@@ -10,20 +10,25 @@ import (
 	"github.com/onflow/cadence"
 	"github.com/onflow/cadence/encoding/ccf"
 	jsoncdc "github.com/onflow/cadence/encoding/json"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
 	"github.com/onflow/flow-go/crypto"
 	"github.com/onflow/flow-go/crypto/hash"
 	"github.com/onflow/flow-go/engine/execution"
 	"github.com/onflow/flow-go/engine/execution/utils"
 	"github.com/onflow/flow-go/fvm"
+	"github.com/onflow/flow-go/fvm/environment"
+	envMock "github.com/onflow/flow-go/fvm/environment/mock"
 	"github.com/onflow/flow-go/fvm/storage/snapshot"
 	"github.com/onflow/flow-go/ledger"
 	"github.com/onflow/flow-go/ledger/common/pathfinder"
 	"github.com/onflow/flow-go/ledger/complete"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/module/epochs"
 	"github.com/onflow/flow-go/module/executiondatasync/execution_data"
+	"github.com/onflow/flow-go/state/protocol"
+	protocolMock "github.com/onflow/flow-go/state/protocol/mock"
 	"github.com/onflow/flow-go/utils/unittest"
 )
 
@@ -626,3 +631,30 @@ func ComputationResultFixture(t *testing.T) *execution.ComputationResult {
 		},
 	}
 }
+
+// EntropyProviderFixture returns an entropy provider mock that
+// supports RandomSource().
+// If input is nil, a random source fixture is generated.
+func EntropyProviderFixture(source []byte) environment.EntropyProvider {
+	if source == nil {
+		source = unittest.SignatureFixture()
+	}
+	provider := envMock.EntropyProvider{}
+	provider.On("RandomSource").Return(source, nil)
+	return &provider
+}
+
+// ProtocolStateWithSourceFixture returns a protocol state mock that only
+// supports AtBlockID to return a snapshot mock.
+// The snapshot mock only supports RandomSource().
+// If input is nil, a random source fixture is generated.
+func ProtocolStateWithSourceFixture(source []byte) protocol.State {
+	if source == nil {
+		source = unittest.SignatureFixture()
+	}
+	snapshot := &protocolMock.Snapshot{}
+	snapshot.On("RandomSource").Return(source, nil)
+	state := protocolMock.State{}
+	state.On("AtBlockID", mock.Anything).Return(snapshot)
+	return &state
+}

engine/verification/assigner/blockconsumer/consumer_test.go

@@ -149,7 +149,8 @@ func withConsumer(
 		root, err := s.State.Params().FinalizedRoot()
 		require.NoError(t, err)
 		clusterCommittee := participants.Filter(filter.HasRole(flow.RoleCollection))
-		results := vertestutils.CompleteExecutionReceiptChainFixture(t, root, blockCount/2, vertestutils.WithClusterCommittee(clusterCommittee))
+		sources := unittest.RandomSourcesFixture(110)
+		results := vertestutils.CompleteExecutionReceiptChainFixture(t, root, blockCount/2, sources, vertestutils.WithClusterCommittee(clusterCommittee))
 		blocks := vertestutils.ExtendStateWithFinalizedBlocks(t, results, s.State)
 		// makes sure that we generated a block chain of requested length.
 		require.Len(t, blocks, blockCount)

engine/verification/fetcher/engine.go

@@ -526,8 +526,8 @@ func (e *Engine) pushToVerifier(chunk *flow.Chunk,
 	if err != nil {
 		return fmt.Errorf("could not get block: %w", err)
 	}
-
-	vchunk, err := e.makeVerifiableChunkData(chunk, header, result, chunkDataPack)
+	snapshot := e.state.AtBlockID(header.ID())
+	vchunk, err := e.makeVerifiableChunkData(chunk, header, snapshot, result, chunkDataPack)
 	if err != nil {
 		return fmt.Errorf("could not verify chunk: %w", err)
 	}
@@ -545,6 +545,7 @@ func (e *Engine) pushToVerifier(chunk *flow.Chunk,
 // chunk data to verify it.
 func (e *Engine) makeVerifiableChunkData(chunk *flow.Chunk,
 	header *flow.Header,
+	snapshot protocol.Snapshot,
 	result *flow.ExecutionResult,
 	chunkDataPack *flow.ChunkDataPack,
 ) (*verification.VerifiableChunkData, error) {
@@ -566,6 +567,7 @@ func (e *Engine) makeVerifiableChunkData(chunk *flow.Chunk,
 		IsSystemChunk:     isSystemChunk,
 		Chunk:             chunk,
 		Header:            header,
+		Snapshot:          snapshot,
 		Result:            result,
 		ChunkDataPack:     chunkDataPack,
 		EndState:          endState,