cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Revert "fix: EthGetTransactionCount should not return error"

Browse Source 
This reverts commit ea73fd5b1901c614e7c376fad5952fcbea8d5207.
This commit is contained in:
Kevin Li 2022-10-05 12:31:06 -04:00 committed by vyzo
parent ccbf57165f
commit 2741c961b7
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
node/impl/full/eth.go
View File

@ -175,11 +175,11 @@ func (a *EthModule) EthGetTransactionByHash(ctx context.Context, txHash *api.Eth
func (a *EthModule) EthGetTransactionCount(ctx context.Context, sender api.EthAddress, blkParam string) (api.EthUint64, error) {
addr, err := sender.ToFilecoinAddress()
if err != nil {
return api.EthUint64(0), nil
return api.EthUint64(0), err
}
nonce, err := a.Mpool.GetNonce(ctx, addr, types.EmptyTSK)
if err != nil {
return api.EthUint64(0), nil
return api.EthUint64(0), err
}
return api.EthUint64(nonce), nil
}
@ -415,21 +415,17 @@ func (a *EthModule) EthGasPrice(ctx context.Context) (api.EthBigInt, error) {
}
func (a *EthModule) EthSendRawTransaction(ctx context.Context, rawTx api.EthBytes) (api.EthHash, error) {
fmt.Println(rawTx)
txArgs, err := api.ParseEthTxArgs(rawTx)
fmt.Println("txArgs", txArgs, err)
if err != nil {
return api.EmptyEthHash, err
}
smsg, err := txArgs.ToSignedMessage()
fmt.Println("smsg", smsg, err)
if err != nil {
return api.EmptyEthHash, err
}
cid, err := a.MpoolAPI.MpoolPush(ctx, smsg)
fmt.Println("cid", cid, err)
if err != nil {
return api.EmptyEthHash, err
}