forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 02:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add better error messages

Browse source
This commit is contained in:
Martin Ondejka 2023-04-05 23:58:01 +02:00
parent 55df11555c
commit 33783cb2d6
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
core/vm/mina_contracts.go
View file

@ -14,9 +14,22 @@ import (
var sol_bool, _ = abi.NewType("bool", "", nil) var sol_bool, _ = abi.NewType("bool", "", nil)
var sol_uint8, _ = abi.NewType("uint8", "", nil) var sol_uint8, _ = abi.NewType("uint8", "", nil)
var sol_string, _ = abi.NewType("string", "", nil)
var sol_bytes32, _ = abi.NewType("bytes32", "", nil) var sol_bytes32, _ = abi.NewType("bytes32", "", nil)
var sol_bytes32Arr, _ = abi.NewType("bytes32[]", "", nil) var sol_bytes32Arr, _ = abi.NewType("bytes32[]", "", nil)
var revertSelector = crypto.Keccak256([]byte("Error(string)"))[:4]
func packErr(message string) []byte {
bytes, err := abi.Arguments{{Type: sol_string}}.Pack(message)
if err != nil {
return nil
}
return append(revertSelector, bytes...)
}
type MinaPoseidon struct{} type MinaPoseidon struct{}
func (c *MinaPoseidon) RequiredGas(input []byte) uint64 { func (c *MinaPoseidon) RequiredGas(input []byte) uint64 {
@ -28,7 +41,7 @@ var poseidonHashSignature = crypto.Keccak256([]byte("poseidonHash(uint8,bytes32[
func (c *MinaPoseidon) Run(input []byte) ([]byte, error) { func (c *MinaPoseidon) Run(input []byte) ([]byte, error) {
if len(input) < 4+64 || !bytes.Equal(input[:4], poseidonHashSignature) { if len(input) < 4+64 || !bytes.Equal(input[:4], poseidonHashSignature) {
return nil, ErrExecutionReverted return packErr("Invalid signature"), ErrExecutionReverted
} }
calldata := input[4:] calldata := input[4:]
@ -39,14 +52,14 @@ func (c *MinaPoseidon) Run(input []byte) ([]byte, error) {
}).Unpack(calldata) }).Unpack(calldata)
if err != nil { if err != nil {
return nil, err return packErr("Unable to unpack calldata"), err
} }
networkId := unpacked[0].(uint8) networkId := unpacked[0].(uint8)
fields := unpacked[1].([][32]uint8) fields := unpacked[1].([][32]uint8)
if len(fields) == 0 { if len(fields) == 0 {
return nil, ErrExecutionReverted return packErr("Unable to verify for 0 fields"), ErrExecutionReverted
} }
output_buffer := [32]byte{} output_buffer := [32]byte{}
@ -57,7 +70,7 @@ func (c *MinaPoseidon) Run(input []byte) ([]byte, error) {
C.uintptr_t(len(fields)), C.uintptr_t(len(fields)),
(*C.uint8_t)(&output_buffer[0]), (*C.uint8_t)(&output_buffer[0]),
) { ) {
return nil, ErrExecutionReverted return packErr("Calling Poseidon hash failed"), ErrExecutionReverted
} }
return output_buffer[:], nil return output_buffer[:], nil
@ -74,7 +87,7 @@ var verifySignature = crypto.Keccak256([]byte("verify(uint8,bytes32,bytes32,byte
func (c *MinaSigner) Run(input []byte) ([]byte, error) { func (c *MinaSigner) Run(input []byte) ([]byte, error) {
if len(input) < 4+64 || !bytes.Equal(input[:4], verifySignature) { if len(input) < 4+64 || !bytes.Equal(input[:4], verifySignature) {
return nil, ErrExecutionReverted return packErr("Invalid signature"), ErrExecutionReverted
} }
calldata := input[4:] calldata := input[4:]
@ -89,7 +102,7 @@ func (c *MinaSigner) Run(input []byte) ([]byte, error) {
}).Unpack(calldata) }).Unpack(calldata)
if err != nil { if err != nil {
return nil, err return packErr("Unable to unpack calldata"), err
} }
networkId := unpacked[0].(uint8) networkId := unpacked[0].(uint8)
@ -100,7 +113,7 @@ func (c *MinaSigner) Run(input []byte) ([]byte, error) {
fields := unpacked[5].([][32]uint8) fields := unpacked[5].([][32]uint8)
if len(fields) == 0 { if len(fields) == 0 {
return nil, ErrExecutionReverted return packErr("Unable to verify for 0 fields"), ErrExecutionReverted
} }
output_buffer := false output_buffer := false
@ -115,7 +128,7 @@ func (c *MinaSigner) Run(input []byte) ([]byte, error) {
C.uintptr_t(len(fields)), C.uintptr_t(len(fields)),
(*C.bool)(&output_buffer), (*C.bool)(&output_buffer),
) { ) {
return nil, ErrExecutionReverted return packErr("Calling verify failed"), ErrExecutionReverted
} }
return abi.Arguments{{Type: sol_bool}}.Pack(output_buffer) return abi.Arguments{{Type: sol_bool}}.Pack(output_buffer)