[Sync] Sync master to feature/dynamic-protocol-state

.github/workflows/bench.yml

@@ -41,7 +41,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           cache: true
 
       - name: Build relic

.github/workflows/cd.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v2
       with:
-        go-version: '1.19'
+        go-version: "1.20"
     - name: Checkout repo
       uses: actions/checkout@v2
     - name: Build relic

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ on:
       - 'v[0-9]+.[0-9]+'
 
 env:
-  GO_VERSION: 1.19
+  GO_VERSION: "1.20"
 
 concurrency: 
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
@@ -47,7 +47,7 @@ jobs:
       uses: golangci/golangci-lint-action@v3
       with:
         # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-        version: v1.49
+        version: v1.51
         args: -v --build-tags relic
         working-directory: ${{ matrix.dir }}
         # https://github.com/golangci/golangci-lint-action/issues/244
@@ -66,8 +66,8 @@ jobs:
           cache: true
       - name: Run tidy
         run: make tidy
-      - name: Emulator no relic check
-        run: make emulator-norelic-check
+      - name: code sanity check
+        run: make code-sanity-check
 
   shell-check:
     name: ShellCheck

.github/workflows/flaky-test-debug.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - '**/*flaky-test-debug*'
 env:
-  GO_VERSION: 1.19
+  GO_VERSION: "1.20"
 
 #concurrency:
 #  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
@@ -36,7 +36,7 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.49
+          version: v1.51
           args: -v --build-tags relic
           working-directory: ${{ matrix.dir }}
           # https://github.com/golangci/golangci-lint-action/issues/244

.github/workflows/test-monitor-flaky.yml

@@ -13,7 +13,7 @@ on:
 env:
   BIGQUERY_DATASET: production_src_flow_test_metrics
   BIGQUERY_TABLE: test_results
-  GO_VERSION: 1.19
+  GO_VERSION: "1.20"
 
 concurrency: 
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}

.github/workflows/test-monitor-regular-skipped.yml

@@ -15,7 +15,7 @@ env:
   BIGQUERY_DATASET: production_src_flow_test_metrics
   BIGQUERY_TABLE: skipped_tests
   BIGQUERY_TABLE2: test_results
-  GO_VERSION: 1.19
+  GO_VERSION: "1.20"
 
 concurrency: 
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}

.github/workflows/tools.yml

@@ -25,7 +25,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v2
       with:
-        go-version: '1.19'
+        go-version: "1.20"
     - name: Set up Google Cloud SDK
       uses: google-github-actions/setup-gcloud@v1
       with:

Makefile

@@ -19,7 +19,7 @@ ifeq (${IMAGE_TAG},)
 IMAGE_TAG := ${SHORT_COMMIT}
 endif
 
-IMAGE_TAG_NO_NETGO := $(IMAGE_TAG)-without_netgo
+IMAGE_TAG_NO_NETGO := $(IMAGE_TAG)-without-netgo
 
 # Name of the cover profile
 COVER_PROFILE := coverage.txt
@@ -87,6 +87,23 @@ emulator-norelic-check:
 	# test the fvm package compiles with Relic library disabled (required for the emulator build)
 	cd ./fvm && go test ./... -run=NoTestHasThisPrefix
 
+.SILENT: go-math-rand-check
+go-math-rand-check:
+	# check that the insecure math/rand Go package isn't used by production code.
+	# `exclude` should only specify non production code (test, bench..).
+	# If this check fails, try updating your code by using:
+	#   - "crypto/rand" or "flow-go/utils/rand" for non-deterministic randomness
+	#   - "flow-go/crypto/random" for deterministic randomness 
+	grep --include=\*.go \
+	--exclude=*test* --exclude=*helper* --exclude=*example* --exclude=*fixture* --exclude=*benchmark* --exclude=*profiler* \
+    --exclude-dir=*test* --exclude-dir=*helper* --exclude-dir=*example* --exclude-dir=*fixture* --exclude-dir=*benchmark* --exclude-dir=*profiler* -rnw '"math/rand"'; \
+    if [ $$? -ne 1 ]; then \
+       echo "[Error] Go production code should not use math/rand package"; exit 1; \
+    fi
+
+.PHONY: code-sanity-check
+code-sanity-check: go-math-rand-check emulator-norelic-check
+
 .PHONY: fuzz-fvm
 fuzz-fvm:
 	# run fuzz tests in the fvm package
@@ -167,7 +184,7 @@ generate-mocks: install-mock-generators
 	rm -rf ./fvm/environment/mock
 	mockery --name '.*' --dir=fvm/environment --case=underscore --output="./fvm/environment/mock" --outpkg="mock"
 	mockery --name '.*' --dir=ledger --case=underscore --output="./ledger/mock" --outpkg="mock"
-	mockery --name 'ViolationsConsumer' --dir=network/slashing --case=underscore --output="./network/mocknetwork" --outpkg="mocknetwork"
+	mockery --name 'ViolationsConsumer' --dir=network --case=underscore --output="./network/mocknetwork" --outpkg="mocknetwork"
 	mockery --name '.*' --dir=network/p2p/ --case=underscore --output="./network/p2p/mock" --outpkg="mockp2p"
 	mockery --name '.*' --dir=network/alsp --case=underscore --output="./network/alsp/mock" --outpkg="mockalsp"
 	mockery --name 'Vertex' --dir="./module/forest" --case=underscore --output="./module/forest/mock" --outpkg="mock"

access/handler.go

@@ -3,17 +3,17 @@ package access
 import (
 	"context"
 
-	"github.com/onflow/flow/protobuf/go/flow/access"
-	"github.com/onflow/flow/protobuf/go/flow/entities"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/onflow/flow-go/consensus/hotstuff"
 	"github.com/onflow/flow-go/consensus/hotstuff/signature"
 	"github.com/onflow/flow-go/engine/common/rpc/convert"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/module"
+
+	"github.com/onflow/flow/protobuf/go/flow/access"
+	"github.com/onflow/flow/protobuf/go/flow/entities"
 )
 
 type Handler struct {
@@ -516,7 +516,7 @@ func (h *Handler) GetEventsForHeightRange(
 		return nil, err
 	}
 
-	resultEvents, err := blockEventsToMessages(results)
+	resultEvents, err := convert.BlockEventsToMessages(results)
 	if err != nil {
 		return nil, err
 	}
@@ -548,7 +548,7 @@ func (h *Handler) GetEventsForBlockIDs(
 		return nil, err
 	}
 
-	resultEvents, err := blockEventsToMessages(results)
+	resultEvents, err := convert.BlockEventsToMessages(results)
 	if err != nil {
 		return nil, err
 	}
@@ -590,6 +590,27 @@ func (h *Handler) GetExecutionResultForBlockID(ctx context.Context, req *access.
 	return executionResultToMessages(result, metadata)
 }
 
+// GetExecutionResultByID returns the execution result for the given ID.
+func (h *Handler) GetExecutionResultByID(ctx context.Context, req *access.GetExecutionResultByIDRequest) (*access.ExecutionResultByIDResponse, error) {
+	metadata := h.buildMetadataResponse()
+
+	blockID := convert.MessageToIdentifier(req.GetId())
+
+	result, err := h.api.GetExecutionResultByID(ctx, blockID)
+	if err != nil {
+		return nil, err
+	}
+
+	execResult, err := convert.ExecutionResultToMessage(result)
+	if err != nil {
+		return nil, err
+	}
+	return &access.ExecutionResultByIDResponse{
+		ExecutionResult: execResult,
+		Metadata:        metadata,
+	}, nil
+}
+
 func (h *Handler) blockResponse(block *flow.Block, fullResponse bool, status flow.BlockStatus) (*access.BlockResponse, error) {
 	metadata := h.buildMetadataResponse()
 
@@ -659,34 +680,6 @@ func executionResultToMessages(er *flow.ExecutionResult, metadata *entities.Meta
 	}, nil
 }
 
-func blockEventsToMessages(blocks []flow.BlockEvents) ([]*access.EventsResponse_Result, error) {
-	results := make([]*access.EventsResponse_Result, len(blocks))
-
-	for i, block := range blocks {
-		event, err := blockEventsToMessage(block)
-		if err != nil {
-			return nil, err
-		}
-		results[i] = event
-	}
-
-	return results, nil
-}
-
-func blockEventsToMessage(block flow.BlockEvents) (*access.EventsResponse_Result, error) {
-	eventMessages := make([]*entities.Event, len(block.Events))
-	for i, event := range block.Events {
-		eventMessages[i] = convert.EventToMessage(event)
-	}
-	timestamp := timestamppb.New(block.BlockTimestamp)
-	return &access.EventsResponse_Result{
-		BlockId:        block.BlockID[:],
-		BlockHeight:    block.BlockHeight,
-		BlockTimestamp: timestamp,
-		Events:         eventMessages,
-	}, nil
-}
-
 // WithBlockSignerDecoder configures the Handler to decode signer indices
 // via the provided hotstuff.BlockSignerDecoder
 func WithBlockSignerDecoder(signerIndicesDecoder hotstuff.BlockSignerDecoder) func(*Handler) {

cmd/Dockerfile

@@ -3,7 +3,7 @@
 
 ####################################
 ## (1) Setup the build environment
-FROM golang:1.19-bullseye AS build-setup
+FROM golang:1.20-bullseye AS build-setup
 
 RUN apt-get update
 RUN apt-get -y install cmake zip
@@ -71,7 +71,7 @@ RUN --mount=type=ssh \
 RUN chmod a+x /app/app
 
 ## (4) Add the statically linked debug binary to a distroless image configured for debugging
-FROM golang:1.19-bullseye as debug
+FROM golang:1.20-bullseye as debug
 
 RUN go install github.com/go-delve/delve/cmd/dlv@latest