Fix cache invalidation logic

Author: DylanTinianov

blockchain/contracts/contracts.go

@@ -22,7 +22,6 @@ import (
 	"embed"
 	"fmt"
 	"github.com/onflow/flow-cli/flowkit/config"
-	"github.com/onflow/flow-go-sdk"
 )
 
 // Embed all contracts in this folder
@@ -32,44 +31,45 @@ var contracts embed.FS
 
 // Core defines core contract to be embedded, along with their locations in the emulator
 var Core = []config.Contract{
-	{
-		Name: "NonFungibleToken",
-		Aliases: config.Aliases{
-			config.Alias{
-				Network: "emulator",
-				Address: flow.HexToAddress("0xf8d6e0586b0a20c7"),
-			},
-		},
-	},
-	{
-		Name: "FungibleToken",
-		Aliases: config.Aliases{
-			config.Alias{
-				Network: "emulator",
-				Address: flow.HexToAddress("0xee82856bf20e2aa6"),
-			},
-		},
-	},
-	// TODO: Need to support new import schema in order to resolve core contracts
 	/*
 		{
-			Name: "FlowToken",
+			Name: "NonFungibleToken",
 			Aliases: config.Aliases{
 				config.Alias{
 					Network: "emulator",
-					Address: flow.HexToAddress("0x0ae53cb6e3f42a79"),
+					Address: flow.HexToAddress("0xf8d6e0586b0a20c7"),
 				},
 			},
 		},
 		{
-			Name: "MetadataViews",
+			Name: "FungibleToken",
 			Aliases: config.Aliases{
 				config.Alias{
 					Network: "emulator",
-					Address: flow.HexToAddress("0xf8d6e0586b0a20c7"),
+					Address: flow.HexToAddress("0xee82856bf20e2aa6"),
 				},
 			},
 		},
+		// TODO: Need to support new import schema in order to resolve core contracts
+
+			{
+				Name: "FlowToken",
+				Aliases: config.Aliases{
+					config.Alias{
+						Network: "emulator",
+						Address: flow.HexToAddress("0x0ae53cb6e3f42a79"),
+					},
+				},
+			},
+			{
+				Name: "MetadataViews",
+				Aliases: config.Aliases{
+					config.Alias{
+						Network: "emulator",
+						Address: flow.HexToAddress("0xf8d6e0586b0a20c7"),
+					},
+				},
+			},
 	*/
 }
 

blockchain/flowkit.go

@@ -72,6 +72,8 @@ type blockchain interface {
 
 	initBlockHeight() int
 
+	numAccounts() int
+
 	getFlowJson() (string, error)
 }
 
@@ -92,6 +94,7 @@ func newFlowkit() (*flowKit, error) {
 	}
 
 	interceptor := NewInterceptor()
+	emulatorLogger := zerolog.New(interceptor)
 
 	emulator := gateway.NewEmulatorGatewayWithOpts(
 		&gateway.EmulatorKey{
@@ -100,7 +103,7 @@ func newFlowkit() (*flowKit, error) {
 			HashAlgo:  emu.DefaultServiceKeyHashAlgo,
 		},
 		gateway.WithEmulatorOptions(
-			emu.WithLogger(zerolog.New(interceptor)),
+			emu.WithLogger(emulatorLogger),
 			emu.WithStore(memstore.New()),
 			emu.WithTransactionValidationEnabled(false),
 			emu.WithStorageLimitEnabled(false),
@@ -190,6 +193,10 @@ func (fk *flowKit) initBlockHeight() int {
 	return initialAccounts + len(contracts.Included())
 }
 
+func (fk *flowKit) numAccounts() int {
+	return initialAccounts
+}
+
 func (fk *flowKit) getFlowJson() (string, error) {
 	state, err := fk.blockchain.State()
 	if err != nil {

blockchain/projects.go

@@ -344,7 +344,7 @@ func (p *Projects) rebuildState(projectID uuid.UUID) (*flowKit, error) {
 	// This can happen if project was cleared but on another replica, this replica gets the request after
 	// and will get cleared 0 executions from database but has a stale emulator in its own cache
 	// This also occurs when a rollback is required due to contract redeployment
-	if height > len(executions) {
+	if height > len(executions)+len(deployments)+fk.numAccounts() {
 		p.flowKitCache.reset(projectID)
 		fk, err = p.flowKitPool.new()
 		if err != nil {

resolver.go

@@ -20,6 +20,7 @@ package playground
 
 import (
 	"context"
+	"fmt"
 	"github.com/Masterminds/semver"
 	"github.com/dapperlabs/flow-playground-api/adapter"
 	"github.com/dapperlabs/flow-playground-api/auth"
@@ -208,6 +209,7 @@ func (r *mutationResolver) CreateTransactionExecution(
 	ctx context.Context,
 	input model.NewTransactionExecution,
 ) (*model.TransactionExecution, error) {
+	fmt.Println("CreateTransactionExecution()")
 	err := r.authorize(ctx, input.ProjectID)
 	if err != nil {
 		return nil, err
@@ -218,6 +220,8 @@ func (r *mutationResolver) CreateTransactionExecution(
 		return nil, err
 	}
 
+	fmt.Println("TX: ", exe.Logs)
+
 	return adapter.TransactionToAPI(exe), nil
 }