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

eth api: fix warts

Browse Source
This commit is contained in:
vyzo 2022-11-11 04:52:38 +02:00
parent a9cfaa93cc
commit 18f2a14a00
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/eth_transactions.go
View File

@ -120,7 +120,7 @@ func (tx *EthTxArgs) ToSignedMessage() (*types.SignedMessage, error) {
var to address.Address var to address.Address
var params []byte var params []byte
if tx.To == nil && tx.Input == nil { if tx.To == nil && len(tx.Input) == 0 {
return nil, fmt.Errorf("to and input cannot both be empty") return nil, fmt.Errorf("to and input cannot both be empty")
} }
@ -248,9 +248,6 @@ func (tx *EthTxArgs) OriginalRlpMsg() ([]byte, error) {
} }
func (tx *EthTxArgs) Signature() (*typescrypto.Signature, error) { func (tx *EthTxArgs) Signature() (*typescrypto.Signature, error) {
if tx.V == nil || tx.R == nil || tx.S == nil {
return nil, fmt.Errorf("one of V, R, or S is nil")
}
sig := append([]byte{}, tx.R...) sig := append([]byte{}, tx.R...)
sig = append(sig, tx.S...) sig = append(sig, tx.S...)
sig = append(sig, tx.V...) sig = append(sig, tx.V...)
@ -396,16 +393,25 @@ func parseEip1559Tx(data []byte) (*EthTxArgs, error) {
} }
func ParseEthTxArgs(data []byte) (*EthTxArgs, error) { func ParseEthTxArgs(data []byte) (*EthTxArgs, error) {
if len(data) == 0 {
return nil, fmt.Errorf("empty data")
}
if data[0] > 0x7f { if data[0] > 0x7f {
// legacy transaction // legacy transaction
return nil, fmt.Errorf("legacy transaction is not supported") return nil, fmt.Errorf("legacy transaction is not supported")
} else if data[0] == 1 { }
if data[0] == 1 {
// EIP-2930 // EIP-2930
return nil, fmt.Errorf("EIP-2930 transaction is not supported") return nil, fmt.Errorf("EIP-2930 transaction is not supported")
} else if data[0] == Eip1559TxType { }
if data[0] == Eip1559TxType {
// EIP-1559 // EIP-1559
return parseEip1559Tx(data) return parseEip1559Tx(data)
} }
return nil, fmt.Errorf("unsupported transaction type") return nil, fmt.Errorf("unsupported transaction type")
} }
@ -497,7 +503,7 @@ func parseEthAddr(v interface{}) (*EthAddress, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if b == nil || len(b) == 0 { if len(b) == 0 {
return nil, nil return nil, nil
} }
addr, err := EthAddressFromBytes(b) addr, err := EthAddressFromBytes(b)