Bugfix update account (#43)

* reintroduce index on account

* load index

* load index

* bugfix for account update

* add test asserting bugfix

Author: devbugging

blockchain/projects.go

@@ -158,6 +158,7 @@ func (s *Projects) CreateInitialAccounts(projectID uuid.UUID) ([]*model.Internal
 				ProjectID: projectID,
 			},
 			Address: account.Address,
+			Index:   i,
 		}
 	}
 

controller/accounts.go

@@ -19,8 +19,6 @@
 package controller
 
 import (
-	"fmt"
-
 	"github.com/dapperlabs/flow-playground-api/blockchain"
 	"github.com/dapperlabs/flow-playground-api/model"
 	"github.com/dapperlabs/flow-playground-api/storage"
@@ -88,7 +86,7 @@ func (a *Accounts) Update(input model.UpdateAccount) (*model.Account, error) {
 	var acc model.InternalAccount
 
 	// if we provided draft code then just do a storage update of an account
-	if input.DraftCode != nil {
+	if input.DeployedCode == nil {
 		err := a.store.UpdateAccount(input, &acc)
 		if err != nil {
 			return nil, err
@@ -102,11 +100,6 @@ func (a *Accounts) Update(input model.UpdateAccount) (*model.Account, error) {
 		return nil, err
 	}
 
-	// if deployed code is not provided fail, else continue and deploy new contracts
-	if input.DeployedCode == nil {
-		return nil, fmt.Errorf("must provide either deployed code or draft code for update")
-	}
-
 	account, err := a.blockchain.GetAccount(input.ProjectID, acc.Address)
 	if err != nil {
 		return nil, err

model/account.go

@@ -29,6 +29,7 @@ type InternalAccount struct {
 	ProjectChildID
 	Address   Address
 	DraftCode string
+	Index     int
 }
 
 func (a *InternalAccount) NameKey() *datastore.Key {
@@ -41,6 +42,7 @@ func (a *InternalAccount) Load(ps []datastore.Property) error {
 		ProjectID string
 		Address   []byte
 		DraftCode string
+		Index     int
 	}{}
 
 	if err := datastore.LoadStruct(&tmp, ps); err != nil {
@@ -56,7 +58,7 @@ func (a *InternalAccount) Load(ps []datastore.Property) error {
 	}
 
 	copy(a.Address[:], tmp.Address[:])
-
+	a.Index = tmp.Index
 	a.DraftCode = tmp.DraftCode
 
 	return nil
@@ -80,6 +82,10 @@ func (a *InternalAccount) Save() ([]datastore.Property, error) {
 			Name:  "DraftCode",
 			Value: a.DraftCode,
 		},
+		{
+			Name:  "Index",
+			Value: a.Index,
+		},
 	}, nil
 }
 

playground_test.go

@@ -59,9 +59,10 @@ type Project struct {
 	Persist     bool
 	Version     string
 	Accounts    []struct {
-		ID        string
-		Address   string
-		DraftCode string
+		ID           string
+		Address      string
+		DraftCode    string
+		DeployedCode string
 	}
 	TransactionTemplates []TransactionTemplate
 	Secret               string
@@ -103,6 +104,8 @@ query($projectId: UUID!) {
     accounts {
       id
       address
+      draftCode
+      deployedCode
     }
   }
 }
@@ -1072,9 +1075,9 @@ func TestTransactionExecutions(t *testing.T) {
 		// manually construct resolver
 		store := memory.NewStore()
 
-		chain := blockchain.NewProjects(store, lru.New(128), initAccounts)
+		projects := blockchain.NewProjects(store, lru.New(128), initAccounts)
 		authenticator := auth.NewAuthenticator(store, sessionName)
-		resolver := playground.NewResolver(version, store, authenticator, chain)
+		resolver := playground.NewResolver(version, store, authenticator, projects)
 
 		c := newClientWithResolver(resolver)
 
@@ -1106,7 +1109,7 @@ func TestTransactionExecutions(t *testing.T) {
 			eventA.Values[0],
 		)
 
-		err = chain.Reset(&model.InternalProject{
+		err = projects.Reset(&model.InternalProject{
 			ID: uuid.MustParse(project.ID),
 		})
 		require.NoError(t, err)
@@ -1799,6 +1802,74 @@ func TestAccounts(t *testing.T) {
 		assert.Contains(t, respB.UpdateAccount.DeployedContracts, "Foo")
 	})
 
+	t.Run("Update account and redeploy code", func(t *testing.T) {
+		c := newClient()
+
+		project := createProject(t, c)
+
+		account := project.Accounts[0]
+
+		var respA GetAccountResponse
+
+		err := c.Post(
+			QueryGetAccount,
+			&respA,
+			client.Var("projectId", project.ID),
+			client.Var("accountId", account.ID),
+		)
+		require.NoError(t, err)
+
+		assert.Equal(t, "", respA.Account.DeployedCode)
+
+		var respB UpdateAccountResponse
+
+		const contract = "pub contract Foo {}"
+
+		err = c.Post(
+			MutationUpdateAccountDeployedCode,
+			&respB,
+			client.Var("projectId", project.ID),
+			client.Var("accountId", account.ID),
+			client.Var("code", contract),
+			client.AddCookie(c.SessionCookie()),
+		)
+		require.NoError(t, err)
+
+		assert.Equal(t, contract, respB.UpdateAccount.DeployedCode)
+		assert.Contains(t, respB.UpdateAccount.DeployedContracts, "Foo")
+
+		var respC UpdateAccountResponse
+
+		const contract2 = "pub contract Bar {}"
+
+		err = c.Post(
+			MutationUpdateAccountDeployedCode,
+			&respC,
+			client.Var("projectId", project.ID),
+			client.Var("accountId", account.ID),
+			client.Var("code", contract2),
+			client.AddCookie(c.SessionCookie()),
+		)
+		require.NoError(t, err)
+
+		assert.Equal(t, contract2, respC.UpdateAccount.DeployedCode)
+		assert.Contains(t, respC.UpdateAccount.DeployedContracts, "Bar")
+
+		var resp GetProjectResponse
+
+		err = c.Post(
+			QueryGetProject,
+			&resp,
+			client.Var("projectId", project.ID),
+		)
+		require.NoError(t, err)
+
+		assert.Equal(t, project.ID, resp.Project.ID)
+		assert.Len(t, resp.Project.Accounts, 5)
+
+		assert.Equal(t, contract2, resp.Project.Accounts[0].DeployedCode)
+	})
+
 	t.Run("Update non-existent account", func(t *testing.T) {
 		c := newClient()
 

storage/datastore/store.go

@@ -278,7 +278,7 @@ func (d *Datastore) ResetProjectState(proj *model.InternalProject) error {
 		proj.TransactionCount = 0
 		proj.UpdatedAt = time.Now()
 
-		_, err = tx.Put(proj.NameKey(), &proj)
+		_, err = tx.Put(proj.NameKey(), proj)
 		if err != nil {
 			return err
 		}

storage/memory/store.go

@@ -288,7 +288,7 @@ func (s *Store) getAccountsForProject(projectID uuid.UUID, accs *[]*model.Intern
 
 	// sort results by index
 	sort.Slice(res, func(i, j int) bool {
-		return res[i].Address[len(res[i].Address)-1] < res[j].Address[len(res[j].Address)-1]
+		return res[i].Index < res[j].Index
 	})
 
 	*accs = res