Merge branch 'gregor/callbacks/metrics' of https://github.com/devbugging/flow-go into gregor/callbacks/metrics

Author: devbugging

fvm/evm/emulator/state/base.go

@@ -356,25 +356,56 @@ func (v *BaseView) PurgeAllSlotsOfAnAccount(addr gethCommon.Address) error {
 	if err != nil {
 		return err
 	}
-	if acc == nil { // if account doesn't exist return
+	// if account doesn't exist, return
+	// len(acc.CollectionID) == 0 means the account is a non smart contract
+	// account, which has no slots to purge, so we naturally return
+	if acc == nil || len(acc.CollectionID) == 0 {
 		return nil
 	}
-	col, err := v.collectionProvider.CollectionByID(acc.CollectionID)
+
+	// remove storage slots
+	col, found := v.slots[addr]
+	if !found {
+		col, err = v.collectionProvider.CollectionByID(acc.CollectionID)
+		if err != nil {
+			return err
+		}
+	}
+
+	delete(v.slots, addr)
+
+	keys := [][]byte{}
+	keysIterator, err := col.ReadOnlyIterator()
 	if err != nil {
 		return err
 	}
-	// delete all slots related to this account (eip-6780)
-	keys, err := col.Destroy()
+
+	key, _, err := keysIterator.Next()
 	if err != nil {
 		return err
 	}
-	delete(v.slots, addr)
-	for _, key := range keys {
+
+	// we need to collect all the keys, before removing them,
+	// as per the ReadOnlyIterator's specification
+	for key != nil {
+		keys = append(keys, key)
 		delete(v.cachedSlots, types.SlotAddress{
 			Address: addr,
 			Key:     gethCommon.BytesToHash(key),
 		})
+		key, _, err = keysIterator.Next()
+		if err != nil {
+			return err
+		}
 	}
+
+	// remove slot keys from account's collection
+	for _, key := range keys {
+		if err = col.Remove(key); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -676,9 +707,6 @@ func (v *BaseView) storeSlot(sk types.SlotAddress, data gethCommon.Hash) error {
 	if acc == nil {
 		return fmt.Errorf("slot belongs to a non-existing account")
 	}
-	if !acc.HasCode() {
-		return fmt.Errorf("slot belongs to a non-smart contract account")
-	}
 	col, err := v.getSlotCollection(acc)
 	if err != nil {
 		return err

fvm/evm/offchain/query/view.go

@@ -277,9 +277,15 @@ func WithStateOverrideState(
 		if err != nil {
 			return err
 		}
+
+		// This forces the account of the slots to be created, otherwise we
+		// might add slots without its owner account being created.
+		if err := setupAccount(addr, baseView); err != nil {
+			return err
+		}
+
 		// purge all the slots
-		err = baseView.PurgeAllSlotsOfAnAccount(addr)
-		if err != nil {
+		if err = baseView.PurgeAllSlotsOfAnAccount(addr); err != nil {
 			return err
 		}
 		// no need to be sorted this is off-chain operation
@@ -307,6 +313,13 @@ func WithStateOverrideStateDiff(
 		if err != nil {
 			return err
 		}
+
+		// This forces the account of the slots to be created, otherwise we
+		// might add slots without its owner account being created.
+		if err := setupAccount(addr, baseView); err != nil {
+			return err
+		}
+
 		// no need to be sorted this is off-chain operation
 		for k, v := range slots {
 			err = baseView.UpdateSlot(types.SlotAddress{
@@ -344,3 +357,31 @@ func WithExtraPrecompiledContracts(pcs []types.PrecompiledContract) DryCallOptio
 		return nil
 	}
 }
+
+// setupAccount updates an account's metadata. If the account does not exist,
+// it will be created and initialized with the proper default values.
+func setupAccount(addr gethCommon.Address, baseView *state.BaseView) error {
+	balance, err := baseView.GetBalance(addr)
+	if err != nil {
+		return err
+	}
+	nonce, err := baseView.GetNonce(addr)
+	if err != nil {
+		return err
+	}
+	code, err := baseView.GetCode(addr)
+	if err != nil {
+		return err
+	}
+	codeHash := gethTypes.EmptyCodeHash
+	if len(code) > 0 {
+		codeHash = gethCrypto.Keccak256Hash(code)
+	}
+
+	err = baseView.UpdateAccount(addr, balance, nonce, code, codeHash)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}