Merge pull request onflow#5515 from onflow/bastian/5514-fix-coa-withdraw

[EVM] Fix withdraw: set UUID FlowToken.Vault

fvm/evm/backends/wrappedEnv.go

@@ -139,6 +139,11 @@ func (we *WrappedEnvironment) Invoke(
 	return val, handleEnvironmentError(err)
 }
 
+func (we *WrappedEnvironment) GenerateUUID() (uint64, error) {
+	uuid, err := we.env.GenerateUUID()
+	return uuid, handleEnvironmentError(err)
+}
+
 func handleEnvironmentError(err error) error {
 	if err == nil {
 		return nil

fvm/evm/handler/handler.go

@@ -349,6 +349,12 @@ func (h *ContractHandler) executeAndHandleCall(
 	return res, h.blockStore.CommitBlockProposal()
 }
 
+func (h *ContractHandler) GenerateResourceUUID() uint64 {
+	uuid, err := h.backend.GenerateUUID()
+	panicOnAnyError(err)
+	return uuid
+}
+
 type Account struct {
 	isAuthorized bool
 	address      types.Address

fvm/evm/stdlib/contract.go

@@ -1544,6 +1544,12 @@ func newInternalEVMTypeWithdrawFunction(
 							return uint64(ufix)
 						}),
 					},
+					{
+						Name: sema.ResourceUUIDFieldName,
+						Value: interpreter.NewUInt64Value(gauge, func() uint64 {
+							return handler.GenerateResourceUUID()
+						}),
+					},
 				},
 				common.ZeroAddress,
 			)

fvm/evm/stdlib/contract_test.go

@@ -25,12 +25,13 @@ import (
 )
 
 type testContractHandler struct {
-	flowTokenAddress   common.Address
-	evmContractAddress common.Address
-	deployCOA          func(uint64) types.Address
-	accountByAddress   func(types.Address, bool) types.Account
-	lastExecutedBlock  func() *types.Block
-	run                func(tx []byte, coinbase types.Address) *types.ResultSummary
+	flowTokenAddress     common.Address
+	evmContractAddress   common.Address
+	deployCOA            func(uint64) types.Address
+	accountByAddress     func(types.Address, bool) types.Account
+	lastExecutedBlock    func() *types.Block
+	run                  func(tx []byte, coinbase types.Address) *types.ResultSummary
+	generateResourceUUID func() uint64
 }
 
 var _ types.ContractHandler = &testContractHandler{}
@@ -73,6 +74,13 @@ func (t *testContractHandler) Run(tx []byte, coinbase types.Address) *types.Resu
 	return t.run(tx, coinbase)
 }
 
+func (t *testContractHandler) GenerateResourceUUID() uint64 {
+	if t.generateResourceUUID == nil {
+		panic("unexpected GenerateResourceUUID")
+	}
+	return t.generateResourceUUID()
+}
+
 type testFlowAccount struct {
 	address  types.Address
 	balance  func() types.Balance
@@ -3380,6 +3388,8 @@ func TestCadenceOwnedAccountWithdraw(t *testing.T) {
 
 	contractsAddress := flow.BytesToAddress([]byte{0x1})
 
+	var nextUUID uint64 = 1
+
 	handler := &testContractHandler{
 		flowTokenAddress: common.Address(contractsAddress),
 		accountByAddress: func(fromAddress types.Address, isAuthorized bool) types.Account {
@@ -3405,6 +3415,11 @@ func TestCadenceOwnedAccountWithdraw(t *testing.T) {
 				},
 			}
 		},
+		generateResourceUUID: func() uint64 {
+			uuid := nextUUID
+			nextUUID++
+			return uuid
+		},
 	}
 
 	transactionEnvironment := newEVMTransactionEnvironment(handler, contractsAddress)
@@ -3429,6 +3444,8 @@ func TestCadenceOwnedAccountWithdraw(t *testing.T) {
 
           let vault2 <- cadenceOwnedAccount.withdraw(balance: EVM.Balance(attoflow: 1230000000000000000))
           let balance = vault2.balance
+          log(vault2.uuid)
+
           destroy cadenceOwnedAccount
           destroy vault2
 
@@ -3438,6 +3455,7 @@ func TestCadenceOwnedAccountWithdraw(t *testing.T) {
 
 	accountCodes := map[common.Location][]byte{}
 	var events []cadence.Event
+	var logs []string
 
 	runtimeInterface := &TestRuntimeInterface{
 		Storage: NewTestLedger(nil, nil),
@@ -3460,6 +3478,9 @@ func TestCadenceOwnedAccountWithdraw(t *testing.T) {
 		OnDecodeArgument: func(b []byte, t cadence.Type) (cadence.Value, error) {
 			return json.Decode(nil, b)
 		},
+		OnProgramLog: func(s string) {
+			logs = append(logs, s)
+		},
 	}
 
 	nextTransactionLocation := NewTransactionLocationGenerator()
@@ -3494,6 +3515,8 @@ func TestCadenceOwnedAccountWithdraw(t *testing.T) {
 	assert.True(t, deposited)
 	assert.True(t, withdrew)
 	assert.Equal(t, expectedWithdrawBalance, result)
+
+	assert.Equal(t, []string{"1"}, logs)
 }
 
 func TestCadenceOwnedAccountDeploy(t *testing.T) {

fvm/evm/testutils/backend.go

@@ -164,6 +164,7 @@ type TestBackend struct {
 	*TestBlockInfo
 	*TestRandomGenerator
 	*TestContractFunctionInvoker
+	*testUUIDGenerator
 }
 
 var _ types.Backend = &TestBackend{}
@@ -463,3 +464,16 @@ func (t *TestContractFunctionInvoker) Invoke(
 	}
 	return t.InvokeFunc(spec, arguments)
 }
+
+type testUUIDGenerator struct {
+	generateUUID func() (uint64, error)
+}
+
+var _ environment.UUIDGenerator = &testUUIDGenerator{}
+
+func (t *testUUIDGenerator) GenerateUUID() (uint64, error) {
+	if t.generateUUID == nil {
+		panic("generateUUID method is not set")
+	}
+	return t.generateUUID()
+}

fvm/evm/types/backend.go

@@ -14,4 +14,5 @@ type Backend interface {
 	environment.BlockInfo
 	environment.RandomGenerator
 	environment.ContractFunctionInvoker
+	environment.UUIDGenerator
 }

fvm/evm/types/handler.go

@@ -42,6 +42,9 @@ type ContractHandler interface {
 
 	// EVMContractAddress returns the address where EVM is deployed
 	EVMContractAddress() common.Address
+
+	// GenerateResourceUUID generates a new UUID for a resource
+	GenerateResourceUUID() uint64
 }
 
 // AddressAllocator allocates addresses, used by the handler