Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FVM] beyond EVM part 7 - adding more evm-based contract types for testing #4872

Merged
merged 18 commits into from
Nov 15, 2023
Merged

[FVM] beyond EVM part 7 - adding more evm-based contract types for testing #4872

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6b8b2f0
define direct call types
ramtinms Oct 24, 2023
35916fa
fix test
ramtinms Oct 24, 2023
d7e59b0
minor fix
ramtinms Oct 24, 2023
f8d8a26
capture call hashes
ramtinms Oct 24, 2023
4ca4fe6
update docs
ramtinms Oct 24, 2023
5afe5a9
remove unnecessary event types
ramtinms Oct 24, 2023
2bbf11c
minor fix
ramtinms Oct 24, 2023
44c0288
.
ramtinms Oct 24, 2023
e156cea
add more contract types for testing
ramtinms Oct 25, 2023
ffd4745
define direct call types
ramtinms Oct 24, 2023
9dbd415
update docs
ramtinms Oct 24, 2023
2cee790
remove unnecessary event types
ramtinms Oct 24, 2023
6e6a1ba
.
ramtinms Oct 24, 2023
cd0337a
add more contract types for testing
ramtinms Oct 25, 2023
720d32f
fix tests
ramtinms Nov 14, 2023
7876b16
Merge branch 'ramtin/evm-add-dummy-kitty-contract' of github.com:onfl…
ramtinms Nov 14, 2023
cf7212d
Merge branch 'master' into ramtin/evm-add-dummy-kitty-contract
turbolent Nov 15, 2023
3eab0d8
update tests
ramtinms Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions fvm/evm/emulator/emulator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func TestNativeTokenBridging(t *testing.T) {
})
})
})
t.Run("mint tokens withdraw", func(t *testing.T) {
t.Run("tokens withdraw", func(t *testing.T) {
amount := big.NewInt(1000)
RunWithNewEmulator(t, db, func(env *emulator.Emulator) {
RunWithNewReadOnlyBlockView(t, env, func(blk types.ReadOnlyBlockView) {
Expand Down Expand Up @@ -93,7 +93,7 @@ func TestNativeTokenBridging(t *testing.T) {
func TestContractInteraction(t *testing.T) {
RunWithTestDB(t, func(db types.Database) {

testContract := testutils.GetTestContract(t)
testContract := testutils.GetStorageTestContract(t)

testAccount := types.NewAddressFromString("test")
amount := big.NewInt(0).Mul(big.NewInt(1337), big.NewInt(gethParams.Ether))
Expand Down Expand Up @@ -148,7 +148,7 @@ func TestContractInteraction(t *testing.T) {
types.NewContractCall(
testAccount,
contractAddr,
testContract.MakeStoreCallData(t, num),
testContract.MakeCallData(t, "store", num),
1_000_000,
big.NewInt(0), // this should be zero because the contract doesn't have receiver
),
Expand All @@ -164,7 +164,7 @@ func TestContractInteraction(t *testing.T) {
types.NewContractCall(
testAccount,
contractAddr,
testContract.MakeRetrieveCallData(t),
testContract.MakeCallData(t, "retrieve"),
1_000_000,
big.NewInt(0), // this should be zero because the contract doesn't have receiver
),
Expand All @@ -183,7 +183,7 @@ func TestContractInteraction(t *testing.T) {
types.NewContractCall(
testAccount,
contractAddr,
testContract.MakeBlockNumberCallData(t),
testContract.MakeCallData(t, "blockNumber"),
1_000_000,
big.NewInt(0), // this should be zero because the contract doesn't have receiver
),
Expand Down
9 changes: 6 additions & 3 deletions fvm/evm/evm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package evm_test

Check failure on line 1 in fvm/evm/evm_test.go

View workflow job for this annotation

GitHub Actions / Lint (./) 

: # github.com/onflow/flow-go/fvm/evm_test [github.com/onflow/flow-go/fvm/evm.test]

import (
"fmt"
Expand All @@ -11,6 +11,7 @@

"github.com/onflow/flow-go/fvm"
"github.com/onflow/flow-go/fvm/evm/stdlib"
"github.com/onflow/flow-go/fvm/evm/testutils"
. "github.com/onflow/flow-go/fvm/evm/testutils"

"github.com/onflow/flow-go/fvm/evm/types"
Expand All @@ -26,7 +27,8 @@
t.Run("testing EVM.run (happy case)", func(t *testing.T) {
RunWithTestBackend(t, func(backend types.Backend) {
RunWithTestFlowEVMRootAddress(t, backend, func(rootAddr flow.Address) {
RunWithDeployedContract(t, backend, rootAddr, func(testContract *TestContract) {
tc := testutils.GetStorageTestContract(t)
RunWithDeployedContract(t, tc, backend, rootAddr, func(testContract *TestContract) {
RunWithEOATestAccount(t, backend, rootAddr, func(testAccount *EOATestAccount) {
num := int64(12)
chain := flow.Emulator.Chain()
Expand All @@ -49,7 +51,7 @@

txBytes := testAccount.PrepareSignAndEncodeTx(t,
testContract.DeployedAt.ToCommon(),
testContract.MakeStoreCallData(t, big.NewInt(num)),
testContract.MakeCallData(t, "store", big.NewInt(num)),
big.NewInt(0),
gasLimit,
big.NewInt(0),
Expand Down Expand Up @@ -115,7 +117,8 @@

RunWithTestBackend(t, func(backend types.Backend) {
RunWithTestFlowEVMRootAddress(t, backend, func(rootAddr flow.Address) {
RunWithDeployedContract(t, backend, rootAddr, func(testContract *TestContract) {
tc := testutils.GetStorageTestContract(t)
RunWithDeployedContract(t, tc, backend, rootAddr, func(testContract *TestContract) {
RunWithEOATestAccount(t, backend, rootAddr, func(testAccount *EOATestAccount) {
chain := flow.Emulator.Chain()
RunWithNewTestVM(t, chain, func(ctx fvm.Context, vm fvm.VM, snapshot snapshot.SnapshotTree) {
Expand Down Expand Up @@ -167,7 +170,7 @@

RunWithTestBackend(t, func(backend types.Backend) {
RunWithTestFlowEVMRootAddress(t, backend, func(rootAddr flow.Address) {
RunWithDeployedContract(t, backend, rootAddr, func(testContract *TestContract) {

Check failure on line 173 in fvm/evm/evm_test.go

View workflow job for this annotation

GitHub Actions / Lint (./) 

not enough arguments in call to RunWithDeployedContract

Check failure on line 173 in fvm/evm/evm_test.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm) 

not enough arguments in call to RunWithDeployedContract

Check failure on line 173 in fvm/evm/evm_test.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm) 

not enough arguments in call to RunWithDeployedContract

Check failure on line 173 in fvm/evm/evm_test.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm) 

not enough arguments in call to RunWithDeployedContract

Check failure on line 173 in fvm/evm/evm_test.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm) 

not enough arguments in call to RunWithDeployedContract

Check failure on line 173 in fvm/evm/evm_test.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm) 

not enough arguments in call to RunWithDeployedContract
RunWithEOATestAccount(t, backend, rootAddr, func(testAccount *EOATestAccount) {
chain := flow.Emulator.Chain()
RunWithNewTestVM(t, chain, func(ctx fvm.Context, vm fvm.VM, snapshot snapshot.SnapshotTree) {
Expand Down Expand Up @@ -225,7 +228,7 @@

RunWithTestBackend(t, func(backend types.Backend) {
RunWithTestFlowEVMRootAddress(t, backend, func(rootAddr flow.Address) {
RunWithDeployedContract(t, backend, rootAddr, func(testContract *TestContract) {

Check failure on line 231 in fvm/evm/evm_test.go

View workflow job for this annotation

GitHub Actions / Lint (./) 

not enough arguments in call to RunWithDeployedContract

Check failure on line 231 in fvm/evm/evm_test.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm) 

not enough arguments in call to RunWithDeployedContract

Check failure on line 231 in fvm/evm/evm_test.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm) 

not enough arguments in call to RunWithDeployedContract

Check failure on line 231 in fvm/evm/evm_test.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm) 

not enough arguments in call to RunWithDeployedContract

Check failure on line 231 in fvm/evm/evm_test.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm) 

not enough arguments in call to RunWithDeployedContract

Check failure on line 231 in fvm/evm/evm_test.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm) 

not enough arguments in call to RunWithDeployedContract
RunWithEOATestAccount(t, backend, rootAddr, func(testAccount *EOATestAccount) {
chain := flow.Emulator.Chain()
RunWithNewTestVM(t, chain, func(ctx fvm.Context, vm fvm.VM, snapshot snapshot.SnapshotTree) {
Expand Down
6 changes: 3 additions & 3 deletions fvm/evm/handler/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,21 +517,21 @@ func TestHandler_BridgedAccount(t *testing.T) {
vault := types.NewFlowTokenVault(orgBalance)
foa.Deposit(vault)

testContract := testutils.GetTestContract(t)
testContract := testutils.GetStorageTestContract(t)
addr := foa.Deploy(testContract.ByteCode, math.MaxUint64, types.Balance(0))
require.NotNil(t, addr)

num := big.NewInt(22)

_ = foa.Call(
addr,
testContract.MakeStoreCallData(t, num),
testContract.MakeCallData(t, "store", num),
math.MaxUint64,
types.Balance(0))

ret := foa.Call(
addr,
testContract.MakeRetrieveCallData(t),
testContract.MakeCallData(t, "retrieve"),
math.MaxUint64,
types.Balance(0))

Expand Down
258 changes: 236 additions & 22 deletions fvm/evm/testutils/contract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,35 +26,19 @@ type TestContract struct {
DeployedAt types.Address
}

func (tc *TestContract) MakeStoreCallData(t *testing.T, num *big.Int) []byte {
func (tc *TestContract) MakeCallData(t *testing.T, name string, args ...interface{}) []byte {
abi, err := gethABI.JSON(strings.NewReader(tc.ABI))
require.NoError(t, err)
store, err := abi.Pack("store", num)
call, err := abi.Pack(name, args...)
require.NoError(t, err)
return store
}

func (tc *TestContract) MakeRetrieveCallData(t *testing.T) []byte {
abi, err := gethABI.JSON(strings.NewReader(tc.ABI))
require.NoError(t, err)
retrieve, err := abi.Pack("retrieve")
require.NoError(t, err)
return retrieve
}

func (tc *TestContract) MakeBlockNumberCallData(t *testing.T) []byte {
abi, err := gethABI.JSON(strings.NewReader(tc.ABI))
require.NoError(t, err)
blockNum, err := abi.Pack("blockNumber")
require.NoError(t, err)
return blockNum
return call
}

func (tc *TestContract) SetDeployedAt(deployedAt types.Address) {
tc.DeployedAt = deployedAt
}

func GetTestContract(t *testing.T) *TestContract {
func GetStorageTestContract(t *testing.T) *TestContract {
byteCodes, err := hex.DecodeString("608060405261022c806100136000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80632e64cec11461005c57806348b151661461007a57806357e871e7146100985780636057361d146100b657806385df51fd146100d2575b600080fd5b610064610102565b6040516100719190610149565b60405180910390f35b61008261010b565b60405161008f9190610149565b60405180910390f35b6100a0610113565b6040516100ad9190610149565b60405180910390f35b6100d060048036038101906100cb9190610195565b61011b565b005b6100ec60048036038101906100e79190610195565b610125565b6040516100f991906101db565b60405180910390f35b60008054905090565b600042905090565b600043905090565b8060008190555050565b600081409050919050565b6000819050919050565b61014381610130565b82525050565b600060208201905061015e600083018461013a565b92915050565b600080fd5b61017281610130565b811461017d57600080fd5b50565b60008135905061018f81610169565b92915050565b6000602082840312156101ab576101aa610164565b5b60006101b984828501610180565b91505092915050565b6000819050919050565b6101d5816101c2565b82525050565b60006020820190506101f060008301846101cc565b9291505056fea26469706673582212203ee61567a25f0b1848386ae6b8fdbd7733c8a502c83b5ed305b921b7933f4e8164736f6c63430008120033")
require.NoError(t, err)
return &TestContract{
Expand Down Expand Up @@ -165,8 +149,238 @@ func GetTestContract(t *testing.T) *TestContract {
}
}

func RunWithDeployedContract(t *testing.T, led atree.Ledger, flowEVMRootAddress flow.Address, f func(*TestContract)) {
tc := GetTestContract(t)
func GetDummyKittyTestContract(t *testing.T) *TestContract {
byteCodes, err := hex.DecodeString("608060405234801561001057600080fd5b506107dd806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c8063a45f4bfc14610046578063d0b169d114610076578063ddf252ad146100a6575b600080fd5b610060600480360381019061005b91906104e4565b6100c2565b60405161006d9190610552565b60405180910390f35b610090600480360381019061008b919061056d565b6100f5565b60405161009d91906105e3565b60405180910390f35b6100c060048036038101906100bb919061062a565b610338565b005b60026020528060005260406000206000915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008463ffffffff16851461010957600080fd5b8363ffffffff16841461011b57600080fd5b8261ffff16831461012b57600080fd5b60006040518060a001604052808481526020014267ffffffffffffffff1681526020018763ffffffff1681526020018663ffffffff1681526020018561ffff16815250905060018190806001815401808255809150506001900390600052602060002090600202016000909190919091506000820151816000015560208201518160010160006101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555060408201518160010160086101000a81548163ffffffff021916908363ffffffff160217905550606082015181600101600c6101000a81548163ffffffff021916908363ffffffff16021790555060808201518160010160106101000a81548161ffff021916908361ffff16021790555050507fc1e409485f45287e73ab1623a8f2ef17af5eac1b4c792ee9ec466e8795e7c09133600054836040015163ffffffff16846060015163ffffffff16856000015160405161029995949392919061067d565b60405180910390a13073ffffffffffffffffffffffffffffffffffffffff1663ddf252ad6000336000546040518463ffffffff1660e01b81526004016102e1939291906106d0565b600060405180830381600087803b1580156102fb57600080fd5b505af115801561030f573d6000803e3d6000fd5b5050505060008081548092919061032590610736565b9190505550600054915050949350505050565b600360008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600081548092919061038890610736565b9190505550816002600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161461046957600360008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008154809291906104639061077e565b91905055505b7feaf1c4b3ce0f4f62a2bae7eb3e68225c75f7e6ff4422073b7437b9a78d25f17083838360405161049c939291906106d0565b60405180910390a1505050565b600080fd5b6000819050919050565b6104c1816104ae565b81146104cc57600080fd5b50565b6000813590506104de816104b8565b92915050565b6000602082840312156104fa576104f96104a9565b5b6000610508848285016104cf565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061053c82610511565b9050919050565b61054c81610531565b82525050565b60006020820190506105676000830184610543565b92915050565b60008060008060808587031215610587576105866104a9565b5b6000610595878288016104cf565b94505060206105a6878288016104cf565b93505060406105b7878288016104cf565b92505060606105c8878288016104cf565b91505092959194509250565b6105dd816104ae565b82525050565b60006020820190506105f860008301846105d4565b92915050565b61060781610531565b811461061257600080fd5b50565b600081359050610624816105fe565b92915050565b600080600060608486031215610643576106426104a9565b5b600061065186828701610615565b935050602061066286828701610615565b9250506040610673868287016104cf565b9150509250925092565b600060a0820190506106926000830188610543565b61069f60208301876105d4565b6106ac60408301866105d4565b6106b960608301856105d4565b6106c660808301846105d4565b9695505050505050565b60006060820190506106e56000830186610543565b6106f26020830185610543565b6106ff60408301846105d4565b949350505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000610741826104ae565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361077357610772610707565b5b600182019050919050565b6000610789826104ae565b91506000820361079c5761079b610707565b5b60018203905091905056fea2646970667358221220ab35c07ec72cc064a663de06ec7f5f919b1a499a25cf6ef0c63a45fdd4a1e91e64736f6c63430008120033")
require.NoError(t, err)
return &TestContract{
Code: `
contract DummyKitty {

event BirthEvent(address owner, uint256 kittyId, uint256 matronId, uint256 sireId, uint256 genes);
event TransferEvent(address from, address to, uint256 tokenId);

struct Kitty {
uint256 genes;
uint64 birthTime;
uint32 matronId;
uint32 sireId;
uint16 generation;
}

uint256 idCounter;

// @dev all kitties
Kitty[] kitties;

/// @dev a mapping from cat IDs to the address that owns them.
mapping (uint256 => address) public kittyIndexToOwner;

// @dev a mapping from owner address to count of tokens that address owns.
mapping (address => uint256) ownershipTokenCount;

/// @dev a method to transfer kitty
function Transfer(address _from, address _to, uint256 _tokenId) external {
// Since the number of kittens is capped to 2^32 we can't overflow this
ownershipTokenCount[_to]++;
// transfer ownership
kittyIndexToOwner[_tokenId] = _to;
// When creating new kittens _from is 0x0, but we can't account that address.
if (_from != address(0)) {
ownershipTokenCount[_from]--;
}
// Emit the transfer event.
emit TransferEvent(_from, _to, _tokenId);
}

/// @dev a method callable by anyone to create a kitty
function CreateKitty(
uint256 _matronId,
uint256 _sireId,
uint256 _generation,
uint256 _genes
)
external
returns (uint)
{

require(_matronId == uint256(uint32(_matronId)));
require(_sireId == uint256(uint32(_sireId)));
require(_generation == uint256(uint16(_generation)));

Kitty memory _kitty = Kitty({
genes: _genes,
birthTime: uint64(block.timestamp),
matronId: uint32(_matronId),
sireId: uint32(_sireId),
generation: uint16(_generation)
});

kitties.push(_kitty);

emit BirthEvent(
msg.sender,
idCounter,
uint256(_kitty.matronId),
uint256(_kitty.sireId),
_kitty.genes
);

this.Transfer(address(0), msg.sender, idCounter);

idCounter++;

return idCounter;
}
}
`,

ABI: `
[
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "address",
"name": "owner",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "kittyId",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint256",
"name": "matronId",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint256",
"name": "sireId",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint256",
"name": "genes",
"type": "uint256"
}
],
"name": "BirthEvent",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "address",
"name": "from",
"type": "address"
},
{
"indexed": false,
"internalType": "address",
"name": "to",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "tokenId",
"type": "uint256"
}
],
"name": "TransferEvent",
"type": "event"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "_matronId",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "_sireId",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "_generation",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "_genes",
"type": "uint256"
}
],
"name": "CreateKitty",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "_from",
"type": "address"
},
{
"internalType": "address",
"name": "_to",
"type": "address"
},
{
"internalType": "uint256",
"name": "_tokenId",
"type": "uint256"
}
],
"name": "Transfer",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"name": "kittyIndexToOwner",
"outputs": [
{
"internalType": "address",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
}
]
`,
ByteCode: byteCodes,
}
}

func RunWithDeployedContract(t *testing.T, tc *TestContract, led atree.Ledger, flowEVMRootAddress flow.Address, f func(*TestContract)) {
// deploy contract
db, err := database.NewDatabase(led, flowEVMRootAddress)
require.NoError(t, err)
Expand Down
Loading
Loading