deep-stack/laconicd-deprecated
6
0
Fork 0
forked from cerc-io/laconicd-deprecated
Code Pull Requests Activity

rpc: SendTransaction returns error message for invalid tx on broadcast sync mode (#159)

Browse Source 
* SendTransaction returns error message for invalid tx

- use sync broadcast
- treat error response to error return

Closes: #158

* Apply suggestions from code review

Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com>
This commit is contained in:
yihuang 2021-06-22 15:11:53 +08:00 committed by GitHub
parent 04bacbdd1b
commit 6d5a59646a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ethereum/rpc/eth_api.go
View File

@ -403,9 +403,13 @@ func (e *PublicEthAPI) SendTransaction(args rpctypes.SendTxArgs) (common.Hash, e
// Broadcast transaction in sync mode (default) // Broadcast transaction in sync mode (default)
// NOTE: If error is encountered on the node, the broadcast will not return an error // NOTE: If error is encountered on the node, the broadcast will not return an error
asyncCtx := e.clientCtx.WithBroadcastMode(flags.BroadcastAsync) syncCtx := e.clientCtx.WithBroadcastMode(flags.BroadcastSync)
if _, err := asyncCtx.BroadcastTx(txBytes); err != nil { rsp, err := syncCtx.BroadcastTx(txBytes)
e.logger.WithError(err).Errorln("failed to broadcast Eth tx") if err != nil || rsp.Code != 0 {
if err == nil {
err = errors.New(rsp.RawLog)
}
e.logger.WithError(err).Errorln("failed to broadcast tx")
return txHash, err return txHash, err
} }
@ -463,10 +467,13 @@ func (e *PublicEthAPI) SendRawTransaction(data hexutil.Bytes) (common.Hash, erro
tmTx := tmtypes.Tx(txBytes) tmTx := tmtypes.Tx(txBytes)
txHash := common.BytesToHash(tmTx.Hash()) txHash := common.BytesToHash(tmTx.Hash())
asyncCtx := e.clientCtx.WithBroadcastMode(flags.BroadcastAsync) syncCtx := e.clientCtx.WithBroadcastMode(flags.BroadcastSync)
rsp, err := syncCtx.BroadcastTx(txBytes)
if _, err := asyncCtx.BroadcastTx(txBytes); err != nil { if err != nil || rsp.Code != 0 {
e.logger.WithError(err).Errorln("failed to broadcast eth tx") if err == nil {
err = errors.New(rsp.RawLog)
}
e.logger.WithError(err).Errorln("failed to broadcast tx")
return txHash, err return txHash, err
} }