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

fix(api): eth/id address conversion (#9511)

Browse Source
This commit is contained in:
Steven Allen 2022-10-19 05:52:13 -07:00 committed by vyzo
parent e109be4c6a
commit 420bd34888
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/eth_types.go
View File

@ -282,6 +282,11 @@ func (a *EthAddress) UnmarshalJSON(b []byte) error {
} }
func (a EthAddress) ToFilecoinAddress() (address.Address, error) { func (a EthAddress) ToFilecoinAddress() (address.Address, error) {
expectedPrefix := [12]byte{0xff}
if !bytes.Equal(a[:12], expectedPrefix[:]) {
// TODO: handle f4 once we've added support to go-address.
return address.Address{}, xerrors.Errorf("not a valid id-in-eth address: %s", a)
}
id := binary.BigEndian.Uint64(a[12:]) id := binary.BigEndian.Uint64(a[12:])
return address.NewIDAddress(id) return address.NewIDAddress(id)
} }
@ -291,12 +296,9 @@ func EthAddressFromFilecoinIDAddress(addr address.Address) (EthAddress, error) {
if err != nil { if err != nil {
return EthAddress{}, err return EthAddress{}, err
} }
buf := make([]byte, ETH_ADDRESS_LENGTH)
buf[0] = 0xff
binary.BigEndian.PutUint64(buf[12:], id)
var ethaddr EthAddress var ethaddr EthAddress
copy(ethaddr[:], buf) ethaddr[0] = 0xff
binary.BigEndian.PutUint64(ethaddr[12:], id)
return ethaddr, nil return ethaddr, nil
} }