Revert tx that migrates data bugfix

state/accountsDB_test.go

@@ -3096,7 +3096,9 @@
 	// save account with data trie that is not migrated
 	userAcc := acc.(state.UserAccountHandler)
 	key := []byte("key")
 	err = userAcc.SaveKeyValue(key, []byte("value"))
+	err = userAcc.SaveKeyValue([]byte("key1"), []byte("value"))
+
 	require.Nil(t, err)
 	err = adb.SaveAccount(userAcc)
 	userAccRootHash := userAcc.GetRootHash()
@@ -3137,7 +3139,7 @@
 
 		return nil
 	}
-	_, err = adb.Commit()
+	_, _ = adb.Commit()
 	require.True(t, markForEvictionCalled)
 }
 

state/trackableDataTrie/trackableDataTrie.go

@@ -241,8 +241,8 @@ func (tdt *trackableDataTrie) updateTrie(dtr state.DataTrie) ([]core.TrieData, e
 
 		index++
 
-		isMigration := oldVal.Version == core.NotSpecified && dataEntry.newVersion == core.AutoBalanceEnabled
-		if isMigration && len(newKey) != 0 {
+		isFirstMigration := oldVal.Version == core.NotSpecified && dataEntry.newVersion == core.AutoBalanceEnabled
+		if isFirstMigration && len(newKey) != 0 {
 			oldValues = append(oldValues, core.TrieData{
 				Key:   newKey,
 				Value: nil,

trie/branchNode.go

@@ -639,6 +639,8 @@ func (bn *branchNode) setNewChild(childPos byte, newNode node) error {
 		bn.setVersionForChild(0, childPos)
 		bn.EncodedChildren[childPos] = nil
 
+		bn.revertChildrenVersionSlice()
+
 		return nil
 	}
 
@@ -647,10 +649,23 @@ func (bn *branchNode) setNewChild(childPos byte, newNode node) error {
 		return err
 	}
 	bn.setVersionForChild(childVersion, childPos)
+	if childVersion == core.NotSpecified {
+		bn.revertChildrenVersionSlice()
+	}
 
 	return nil
 }
 
+func (bn *branchNode) revertChildrenVersionSlice() {
+	for i := range bn.ChildrenVersion {
+		if bn.ChildrenVersion[i] == 1 {
+			return
+		}
+	}
+
+	bn.ChildrenVersion = []byte(nil)
+}
+
 func (bn *branchNode) reduceNode(pos int) (node, bool, error) {
 	newEn, err := newExtensionNode([]byte{byte(pos)}, bn, bn.marsh, bn.hasher)
 	if err != nil {