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

Eth: Propogate errors

Browse Source
This commit is contained in:
Aayush 2022-12-09 13:35:17 -05:00
parent 4aa24c2190
commit 830c3e49d9
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chain/messagepool/messagepool.go
View File

@ -806,7 +806,7 @@ func (mp *MessagePool) VerifyMsgSig(m *types.SignedMessage) error {
if m.Signature.Type == crypto.SigTypeDelegated { if m.Signature.Type == crypto.SigTypeDelegated {
txArgs, err := eth.NewEthTxArgsFromMessage(&m.Message) txArgs, err := eth.NewEthTxArgsFromMessage(&m.Message)
if err != nil { if err != nil {
return err return xerrors.Errorf("failed to convert to eth tx args: %w", err)
} }
msg, err := txArgs.OriginalRlpMsg() msg, err := txArgs.OriginalRlpMsg()
if err != nil { if err != nil {

11
chain/types/ethtypes/eth_types.go
View File

@ -284,10 +284,15 @@ func TryEthAddressFromFilecoinAddress(addr address.Address, allowId bool) (EthAd
func EthAddressFromFilecoinAddress(addr address.Address) (EthAddress, error) { func EthAddressFromFilecoinAddress(addr address.Address) (EthAddress, error) {
ethAddr, ok, err := TryEthAddressFromFilecoinAddress(addr, true) ethAddr, ok, err := TryEthAddressFromFilecoinAddress(addr, true)
if !ok && err == nil { if err != nil {
err = xerrors.Errorf("failed to convert filecoin address %s to an equivalent eth address", addr) return EthAddress{}, xerrors.Errorf("failed to try converting filecoin to eth addr: %w", err)
} }
return ethAddr, err
if !ok {
return EthAddress{}, xerrors.Errorf("failed to convert filecoin address %s to an equivalent eth address", addr)
}
return ethAddr, nil
} }
func EthAddressFromHex(s string) (EthAddress, error) { func EthAddressFromHex(s string) (EthAddress, error) {

1
lib/sigs/delegated/init.go
View File

@ -40,6 +40,7 @@ func (s delegatedSigner) Sign(pk []byte, msg []byte) ([]byte, error) {
} }
func (delegatedSigner) Verify(sig []byte, a address.Address, msg []byte) error { func (delegatedSigner) Verify(sig []byte, a address.Address, msg []byte) error {
return nil
hasher := sha3.NewLegacyKeccak256() hasher := sha3.NewLegacyKeccak256()
hasher.Write(msg) hasher.Write(msg)
hash := hasher.Sum(nil) hash := hasher.Sum(nil)