Merge branch 'master' into tarak/optimize-ci-setup

Author: tarakby

Makefile

@@ -156,6 +156,7 @@ generate-mocks: install-mock-generators
 	mockery --name '.*' --dir=engine/execution/computation/computer --case=underscore --output="./engine/execution/computation/computer/mock" --outpkg="mock"
 	mockery --name '.*' --dir=engine/execution/state --case=underscore --output="./engine/execution/state/mock" --outpkg="mock"
 	mockery --name '.*' --dir=engine/collection --case=underscore --output="./engine/collection/mock" --outpkg="mock"
+	mockery --name '.*' --dir=engine/common/follower/cache --case=underscore --output="./engine/common/follower/cache/mock" --outpkg="mock"
 	mockery --name '.*' --dir=engine/consensus --case=underscore --output="./engine/consensus/mock" --outpkg="mock"
 	mockery --name '.*' --dir=engine/consensus/approvals --case=underscore --output="./engine/consensus/approvals/mock" --outpkg="mock"
 	rm -rf ./fvm/mock

cmd/access/node_builder/access_node_builder.go

@@ -1072,7 +1072,7 @@ func (builder *FlowAccessNodeBuilder) enqueuePublicNetworkInit() {
 //   - The passed in private key as the libp2p key
 //   - No connection gater
 //   - Default Flow libp2p pubsub options
-func (builder *FlowAccessNodeBuilder) initLibP2PFactory(networkKey crypto.PrivateKey, bindAddress string, networkMetrics module.LibP2PMetrics) p2pbuilder.LibP2PFactoryFunc {
+func (builder *FlowAccessNodeBuilder) initLibP2PFactory(networkKey crypto.PrivateKey, bindAddress string, networkMetrics module.LibP2PMetrics) p2p.LibP2PFactoryFunc {
 	return func() (p2p.LibP2PNode, error) {
 		connManager, err := connection.NewConnManager(builder.Logger, networkMetrics, builder.ConnectionManagerConfig)
 		if err != nil {
@@ -1113,6 +1113,7 @@ func (builder *FlowAccessNodeBuilder) initLibP2PFactory(networkKey crypto.Privat
 			SetPeerManagerOptions(connection.ConnectionPruningDisabled, builder.PeerUpdateInterval).
 			SetStreamCreationRetryInterval(builder.UnicastCreateStreamRetryDelay).
 			SetGossipSubTracer(meshTracer).
+			SetGossipSubScoreTracerInterval(builder.GossipSubConfig.ScoreTracerInterval).
 			Build()
 
 		if err != nil {

cmd/collection/main.go

@@ -397,7 +397,10 @@ func main() {
 				collectionRequestQueue,
 				collectionProviderWorkers,
 				channels.ProvideCollections,
-				filter.HasRole(flow.RoleAccess, flow.RoleExecution),
+				filter.And(
+					filter.HasWeight(true),
+					filter.HasRole(flow.RoleAccess, flow.RoleExecution),
+				),
 				retrieve,
 			)
 		}).

cmd/execution_builder.go

@@ -49,7 +49,6 @@ import (
 	"github.com/onflow/flow-go/engine/execution/rpc"
 	"github.com/onflow/flow-go/engine/execution/state"
 	"github.com/onflow/flow-go/engine/execution/state/bootstrap"
-	"github.com/onflow/flow-go/engine/execution/state/delta"
 	"github.com/onflow/flow-go/fvm"
 	fvmState "github.com/onflow/flow-go/fvm/state"
 	"github.com/onflow/flow-go/fvm/systemcontracts"
@@ -951,7 +950,10 @@ func (exeNode *ExecutionNode) LoadReceiptProviderEngine(
 		receiptRequestQueue,
 		exeNode.exeConf.receiptRequestWorkers,
 		channels.ProvideReceiptsByBlockID,
-		filter.HasRole(flow.RoleConsensus),
+		filter.And(
+			filter.HasWeight(true),
+			filter.HasRole(flow.RoleConsensus),
+		),
 		retrieve,
 	)
 	return eng, err
@@ -1083,18 +1085,18 @@ func getContractEpochCounter(
 	script := fvm.Script(scriptCode)
 
 	// execute the script
-	err = vm.Run(vmCtx, script, delta.NewDeltaView(snapshot))
+	_, output, err := vm.RunV2(vmCtx, script, snapshot)
 	if err != nil {
 		return 0, fmt.Errorf("could not read epoch counter, internal error while executing script: %w", err)
 	}
-	if script.Err != nil {
-		return 0, fmt.Errorf("could not read epoch counter, script error: %w", script.Err)
+	if output.Err != nil {
+		return 0, fmt.Errorf("could not read epoch counter, script error: %w", output.Err)
 	}
-	if script.Value == nil {
+	if output.Value == nil {
 		return 0, fmt.Errorf("could not read epoch counter, script returned no value")
 	}
 
-	epochCounter := script.Value.ToGoValue().(uint64)
+	epochCounter := output.Value.ToGoValue().(uint64)
 	return epochCounter, nil
 }
 

cmd/observer/node_builder/observer_builder.go

@@ -846,7 +846,7 @@ func (builder *ObserverServiceBuilder) validateParams() error {
 // * No connection manager
 // * No peer manager
 // * Default libp2p pubsub options
-func (builder *ObserverServiceBuilder) initLibP2PFactory(networkKey crypto.PrivateKey) p2pbuilder.LibP2PFactoryFunc {
+func (builder *ObserverServiceBuilder) initLibP2PFactory(networkKey crypto.PrivateKey) p2p.LibP2PFactoryFunc {
 	return func() (p2p.LibP2PNode, error) {
 		var pis []peer.AddrInfo
 
@@ -888,6 +888,7 @@ func (builder *ObserverServiceBuilder) initLibP2PFactory(networkKey crypto.Priva
 			}).
 			SetStreamCreationRetryInterval(builder.UnicastCreateStreamRetryDelay).
 			SetGossipSubTracer(meshTracer).
+			SetGossipSubScoreTracerInterval(builder.GossipSubConfig.ScoreTracerInterval).
 			Build()
 
 		if err != nil {

cmd/scaffold.go

@@ -185,6 +185,7 @@ func (fnb *FlowNodeBuilder) BaseFlags() {
 	fnb.flags.BoolVar(&fnb.BaseConfig.NetworkConnectionPruning, "networking-connection-pruning", defaultConfig.NetworkConnectionPruning, "enabling connection trimming")
 	fnb.flags.BoolVar(&fnb.BaseConfig.GossipSubConfig.PeerScoring, "peer-scoring-enabled", defaultConfig.GossipSubConfig.PeerScoring, "enabling peer scoring on pubsub network")
 	fnb.flags.DurationVar(&fnb.BaseConfig.GossipSubConfig.LocalMeshLogInterval, "gossipsub-local-mesh-logging-interval", defaultConfig.GossipSubConfig.LocalMeshLogInterval, "logging interval for local mesh in gossipsub")
+	fnb.flags.DurationVar(&fnb.BaseConfig.GossipSubConfig.ScoreTracerInterval, "gossipsub-score-tracer-interval", defaultConfig.GossipSubConfig.ScoreTracerInterval, "logging interval for peer score tracer in gossipsub, set to 0 to disable")
 	fnb.flags.UintVar(&fnb.BaseConfig.guaranteesCacheSize, "guarantees-cache-size", bstorage.DefaultCacheSize, "collection guarantees cache size")
 	fnb.flags.UintVar(&fnb.BaseConfig.receiptsCacheSize, "receipts-cache-size", bstorage.DefaultCacheSize, "receipts cache size")
 

cmd/util/ledger/reporters/account_reporter.go

@@ -125,12 +125,12 @@ func (r *AccountReporter) Report(payload []ledger.Payload, commit ledger.State)
 }
 
 type balanceProcessor struct {
-	vm            fvm.VM
-	ctx           fvm.Context
-	view          state.View
-	env           environment.Environment
-	balanceScript []byte
-	momentsScript []byte
+	vm              fvm.VM
+	ctx             fvm.Context
+	storageSnapshot state.StorageSnapshot
+	env             environment.Environment
+	balanceScript   []byte
+	momentsScript   []byte
 
 	accounts environment.Accounts
 
@@ -174,11 +174,11 @@ func NewBalanceReporter(
 		txnState)
 
 	return &balanceProcessor{
-		vm:       vm,
-		ctx:      ctx,
-		view:     view,
-		accounts: accounts,
-		env:      env,
+		vm:              vm,
+		ctx:             ctx,
+		storageSnapshot: snapshot,
+		accounts:        accounts,
+		env:             env,
 	}
 }
 
@@ -343,15 +343,15 @@ func (c *balanceProcessor) balance(address flow.Address) (uint64, bool, error) {
 		jsoncdc.MustEncode(cadence.NewAddress(address)),
 	)
 
-	err := c.vm.Run(c.ctx, script, c.view)
+	_, output, err := c.vm.RunV2(c.ctx, script, c.storageSnapshot)
 	if err != nil {
 		return 0, false, err
 	}
 
 	var balance uint64
 	var hasVault bool
-	if script.Err == nil && script.Value != nil {
-		balance = script.Value.ToGoValue().(uint64)
+	if output.Err == nil && output.Value != nil {
+		balance = output.Value.ToGoValue().(uint64)
 		hasVault = true
 	} else {
 		hasVault = false
@@ -364,14 +364,14 @@ func (c *balanceProcessor) fusdBalance(address flow.Address) (uint64, error) {
 		jsoncdc.MustEncode(cadence.NewAddress(address)),
 	)
 
-	err := c.vm.Run(c.ctx, script, c.view)
+	_, output, err := c.vm.RunV2(c.ctx, script, c.storageSnapshot)
 	if err != nil {
 		return 0, err
 	}
 
 	var balance uint64
-	if script.Err == nil && script.Value != nil {
-		balance = script.Value.ToGoValue().(uint64)
+	if output.Err == nil && output.Value != nil {
+		balance = output.Value.ToGoValue().(uint64)
 	}
 	return balance, nil
 }
@@ -381,14 +381,14 @@ func (c *balanceProcessor) moments(address flow.Address) (int, error) {
 		jsoncdc.MustEncode(cadence.NewAddress(address)),
 	)
 
-	err := c.vm.Run(c.ctx, script, c.view)
+	_, output, err := c.vm.RunV2(c.ctx, script, c.storageSnapshot)
 	if err != nil {
 		return 0, err
 	}
 
 	var m int
-	if script.Err == nil && script.Value != nil {
-		m = script.Value.(cadence.Int).Int()
+	if output.Err == nil && output.Value != nil {
+		m = output.Value.(cadence.Int).Int()
 	}
 	return m, nil
 }

cmd/util/ledger/reporters/fungible_token_tracker_test.go

@@ -65,7 +65,10 @@ func TestFungibleTokenTracker(t *testing.T) {
 		fvm.WithInitialTokenSupply(unittest.GenesisTokenSupply),
 	}
 
-	err := vm.Run(ctx, fvm.Bootstrap(unittest.ServiceAccountPublicKey, bootstrapOptions...), view)
+	snapshot, _, err := vm.RunV2(ctx, fvm.Bootstrap(unittest.ServiceAccountPublicKey, bootstrapOptions...), view)
+	require.NoError(t, err)
+
+	err = view.Merge(snapshot)
 	require.NoError(t, err)
 
 	// deploy wrapper resource
@@ -101,9 +104,12 @@ func TestFungibleTokenTracker(t *testing.T) {
 		AddAuthorizer(chain.ServiceAddress())
 
 	tx := fvm.Transaction(txBody, derivedBlockData.NextTxIndexForTestingOnly())
-	err = vm.Run(ctx, tx, view)
+	snapshot, output, err := vm.RunV2(ctx, tx, view)
+	require.NoError(t, err)
+	require.NoError(t, output.Err)
+
+	err = view.Merge(snapshot)
 	require.NoError(t, err)
-	require.NoError(t, tx.Err)
 
 	wrapTokenScript := []byte(fmt.Sprintf(`
 							import FungibleToken from 0x%s
@@ -127,9 +133,12 @@ func TestFungibleTokenTracker(t *testing.T) {
 		AddAuthorizer(chain.ServiceAddress())
 
 	tx = fvm.Transaction(txBody, derivedBlockData.NextTxIndexForTestingOnly())
-	err = vm.Run(ctx, tx, view)
+	snapshot, output, err = vm.RunV2(ctx, tx, view)
+	require.NoError(t, err)
+	require.NoError(t, output.Err)
+
+	err = view.Merge(snapshot)
 	require.NoError(t, err)
-	require.NoError(t, tx.Err)
 
 	dir := t.TempDir()
 	log := zerolog.Nop()