Fix transaction index ordering on rollback (#264)

* Test on staging

* Test on staging

* fix order by index

* Remove testing output

* Update Makefile

Author: DylanTinianov

Makefile

@@ -30,6 +30,7 @@ run:
 .PHONY: run-pg
 run-pg:
 	FLOW_DB_USER=postgres \
+	FLOW_DB_PASSWORD=password \
 	FLOW_DB_PORT=5432 \
 	FLOW_DB_NAME=dapper \
 	FLOW_DB_HOST=localhost \

blockchain/projects.go

@@ -242,13 +242,8 @@ func (p *Projects) DeployContract(
 			return nil, err
 		}
 
-		var exesB []*model.TransactionExecution
-		err = p.store.GetTransactionExecutionsForProject(projectID, &exesB)
-		if err != nil {
-			return nil, err
-		}
-
 		// Reload emulator after block height rollback
+		p.emulatorCache.reset(projectID)
 		em, err = p.load(projectID)
 		if err != nil {
 			return nil, err
@@ -351,7 +346,6 @@ func (p *Projects) load(projectID uuid.UUID) (blockchain, error) {
 
 func (p *Projects) rebuildState(projectID uuid.UUID) (*emulator, error) {
 	var executions []*model.TransactionExecution
-
 	err := p.store.GetTransactionExecutionsForProject(projectID, &executions)
 	if err != nil {
 		return nil, err
@@ -375,7 +369,7 @@ func (p *Projects) rebuildState(projectID uuid.UUID) (*emulator, error) {
 	// This also occurs when a rollback is required due to contract redeployment
 	if height > len(executions) {
 		p.emulatorCache.reset(projectID)
-		em, err = newEmulator()
+		em, err = p.emulatorPool.new()
 		if err != nil {
 			return nil, err
 		}

e2eTest/constants.go

@@ -117,6 +117,33 @@ type GetAccountResponse struct {
 	Account Account
 }
 
+const QueryGetProjectStorage = `
+query($projectId: UUID!) {
+  project(id: $projectId) {
+	accounts {
+		address
+		deployedContracts
+		state
+	}
+	transactionTemplates {
+      id
+      script
+      index
+    }
+	scriptTemplates {
+      id
+      script
+      index
+	}
+	contractTemplates {
+      id
+      script
+      index
+	}
+  }
+}
+`
+
 const QueryGetProject = `
 query($projectId: UUID!) {
   project(id: $projectId) {

e2eTest/contract_deployments_test.go

@@ -299,6 +299,15 @@ func TestContractRedeployment(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, 10, createContractResp.CreateContractDeployment.BlockHeight)
 
+		var projStorage GetProjectResponse
+		err = c.Post(
+			QueryGetProjectStorage,
+			&projStorage,
+			client.Var("projectId", project.ID),
+			client.AddCookie(c.SessionCookie()),
+		)
+		require.NoError(t, err)
+
 		// Rollback block height
 		err = c.Post(
 			MutationCreateContractDeployment,
@@ -311,6 +320,14 @@ func TestContractRedeployment(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, 8, createContractResp.CreateContractDeployment.BlockHeight)
 
+		err = c.Post(
+			QueryGetProjectStorage,
+			&projStorage,
+			client.Var("projectId", project.ID),
+			client.AddCookie(c.SessionCookie()),
+		)
+		require.NoError(t, err)
+
 		// Rollback block height
 		err = c.Post(
 			MutationCreateContractDeployment,
@@ -322,6 +339,14 @@ func TestContractRedeployment(t *testing.T) {
 		)
 		require.NoError(t, err)
 		require.Equal(t, 6, createContractResp.CreateContractDeployment.BlockHeight)
+
+		err = c.Post(
+			QueryGetProjectStorage,
+			&projStorage,
+			client.Var("projectId", project.ID),
+			client.AddCookie(c.SessionCookie()),
+		)
+		require.NoError(t, err)
 	})
 
 }

storage/sql.go

@@ -387,8 +387,8 @@ func (s *SQL) GetFile(id uuid.UUID, pID uuid.UUID, file *model.File) error {
 func (s *SQL) GetFilesForProject(pID uuid.UUID, files *[]*model.File, fileType model.FileType) error {
 	// Note: use map to include zero entries for fileType
 	return s.db.Where(map[string]interface{}{"project_id": pID.String(), "type": fileType}).
-		Find(files).
 		Order("\"index\" asc").
+		Find(files).
 		Error
 }
 
@@ -402,8 +402,8 @@ func (s *SQL) InsertScriptExecution(exe *model.ScriptExecution) error {
 
 func (s *SQL) GetScriptExecutionsForProject(projectID uuid.UUID, exes *[]*model.ScriptExecution) error {
 	return s.db.Where(&model.ScriptExecution{File: model.File{ProjectID: projectID}}).
-		Find(exes).
 		Order("\"index\" asc").
+		Find(exes).
 		Error
 }
 
@@ -466,8 +466,8 @@ func (s *SQL) DeleteContractDeploymentByName(
 
 func (s *SQL) GetContractDeploymentsForProject(projectID uuid.UUID, deployments *[]*model.ContractDeployment) error {
 	return s.db.Where(&model.ContractDeployment{File: model.File{ProjectID: projectID}}).
-		Find(deployments).
 		Order("\"index\" asc").
+		Find(deployments).
 		Error
 }
 
@@ -504,8 +504,8 @@ func (s *SQL) InsertTransactionExecution(exe *model.TransactionExecution) error
 
 func (s *SQL) GetTransactionExecutionsForProject(projectID uuid.UUID, exes *[]*model.TransactionExecution) error {
 	return s.db.Where(&model.TransactionExecution{File: model.File{ProjectID: projectID}}).
-		Find(exes).
 		Order("\"index\" asc").
+		Find(exes).
 		Error
 }