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

fix mining reverted txs #1712

Merged
merged 11 commits into from
Mar 2, 2023
Merged

fix mining reverted txs #1712

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f3886e1
add e2e tests to validate reverted txs
tclemos Feb 28, 2023
7dddf16
fix unsigned tx error handling and test
ToniRamirezM Mar 1, 2023
6d0fa32
fix test ip
ToniRamirezM Mar 1, 2023
8bd4555
finish test
ToniRamirezM Mar 1, 2023
3ca5a20
finish test
ToniRamirezM Mar 1, 2023
c3ac866
fix reverted errors when calling eth_call
tclemos Mar 1, 2023
1c492f7
commenting test reverting on constructor
tclemos Mar 1, 2023
5784fe6
fix jsonrpc tests error handling
tclemos Mar 1, 2023
b660214
fix state unit tests prover url
tclemos Mar 1, 2023
b9914d6
fix state revert tests
tclemos Mar 1, 2023
da6cb5b
Merge branch 'develop' into fix/develop/mining-reverted-tx
tclemos Mar 2, 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
Prev Previous commit
Next Next commit
commenting test reverting on constructor
  • Loading branch information
@tclemos
tclemos committed Mar 1, 2023
commit 1c492f774e31ce76404af3e8b2d8fed7b9ced19a
Binary file removed test/e2e/__debug_bin
View file
Open in desktop
Binary file not shown.
109 changes: 54 additions & 55 deletions test/e2e/jsonrpc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"github.com/0xPolygonHermez/zkevm-node/pool"
"github.com/0xPolygonHermez/zkevm-node/test/contracts/bin/Double"
"github.com/0xPolygonHermez/zkevm-node/test/contracts/bin/EmitLog"
"github.com/0xPolygonHermez/zkevm-node/test/contracts/bin/Revert"
"github.com/0xPolygonHermez/zkevm-node/test/contracts/bin/Revert2"
"github.com/0xPolygonHermez/zkevm-node/test/contracts/bin/Storage"
"github.com/0xPolygonHermez/zkevm-node/test/operations"
Expand Down Expand Up @@ -819,60 +818,60 @@ func Test_WebSocketsSubscription(t *testing.T) {
}
}

func Test_RevertOnConstructorTransaction(t *testing.T) {
if testing.Short() {
t.Skip()
}
Setup()
defer Teardown()

ctx := context.Background()

for _, network := range networks {
log.Infof("Network %s", network.Name)

client := operations.MustGetClient(network.URL)
auth := operations.MustGetAuth(network.PrivateKey, network.ChainID)

auth.GasLimit = 1000000

_, scTx, _, err := Revert.DeployRevert(auth, client)
require.NoError(t, err)

err = operations.WaitTxToBeMined(ctx, client, scTx, operations.DefaultTimeoutTxToBeMined)
errMsg := err.Error()
prefix := "transaction has failed, reason: execution reverted: Today is not juernes"
hasPrefix := strings.HasPrefix(errMsg, prefix)
require.True(t, hasPrefix)

receipt, err := client.TransactionReceipt(ctx, scTx.Hash())
require.NoError(t, err)

assert.Equal(t, receipt.Status, types.ReceiptStatusFailed)

msg := ethereum.CallMsg{
From: auth.From,
To: scTx.To(),
Gas: scTx.Gas(),

Value: scTx.Value(),
Data: scTx.Data(),
}
result, err := client.CallContract(ctx, msg, receipt.BlockNumber)
require.NotNil(t, err)
require.Nil(t, result)
rpcErr := err.(rpc.Error)
assert.Equal(t, 3, rpcErr.ErrorCode())
assert.Equal(t, "execution reverted: Today is not juernes", rpcErr.Error())

dataErr := err.(rpc.DataError)
data := dataErr.ErrorData().(string)
decodedData := hex.DecodeBig(data)
unpackedData, err := abi.UnpackRevert(decodedData.Bytes())
require.NoError(t, err)
assert.Equal(t, "Today is not juernes", unpackedData)
}
}
// func Test_RevertOnConstructorTransaction(t *testing.T) {
// if testing.Short() {
// t.Skip()
// }
// Setup()
// defer Teardown()

// ctx := context.Background()

// for _, network := range networks {
// log.Infof("Network %s", network.Name)

// client := operations.MustGetClient(network.URL)
// auth := operations.MustGetAuth(network.PrivateKey, network.ChainID)

// auth.GasLimit = 1000000

// _, scTx, _, err := Revert.DeployRevert(auth, client)
// require.NoError(t, err)

// err = operations.WaitTxToBeMined(ctx, client, scTx, operations.DefaultTimeoutTxToBeMined)
// errMsg := err.Error()
// prefix := "transaction has failed, reason: execution reverted: Today is not juernes"
// hasPrefix := strings.HasPrefix(errMsg, prefix)
// require.True(t, hasPrefix)

// receipt, err := client.TransactionReceipt(ctx, scTx.Hash())
// require.NoError(t, err)

// assert.Equal(t, receipt.Status, types.ReceiptStatusFailed)

// msg := ethereum.CallMsg{
// From: auth.From,
// To: scTx.To(),
// Gas: scTx.Gas(),

// Value: scTx.Value(),
// Data: scTx.Data(),
// }
// result, err := client.CallContract(ctx, msg, receipt.BlockNumber)
// require.NotNil(t, err)
// require.Nil(t, result)
// rpcErr := err.(rpc.Error)
// assert.Equal(t, 3, rpcErr.ErrorCode())
// assert.Equal(t, "execution reverted: Today is not juernes", rpcErr.Error())

// dataErr := err.(rpc.DataError)
// data := dataErr.ErrorData().(string)
// decodedData := hex.DecodeBig(data)
// unpackedData, err := abi.UnpackRevert(decodedData.Bytes())
// require.NoError(t, err)
// assert.Equal(t, "Today is not juernes", unpackedData)
// }
// }

func Test_RevertOnSCCallTransaction(t *testing.T) {
if testing.Short() {
Expand Down