lotus-fountain: make compatible with 0x addresses #10560 #10784
Conversation
cmd/lotus-fountain/main.go
Outdated
| } | ||
| to = filecoinAddress | ||
| } else { | ||
| filecoinAddress, err := address.NewFromString(r.FormValue("address")) |
There was a problem hiding this comment.
| filecoinAddress, err := address.NewFromString(r.FormValue("address")) | |
| filecoinAddress, err := address.NewFromString(addressInput) |
There was a problem hiding this comment.
Good spot, will merge into the commit.
cmd/lotus-fountain/main.go
Outdated
| http.Error(w, err.Error(), http.StatusBadRequest) | ||
| return | ||
| } | ||
| to = filecoinAddress |
There was a problem hiding this comment.
Is it ok to skip the check for empty address with checking filecoinAddress == address.Undef like when its not a 0x address? Can we make the checks for both scenarios the same and maybe refactor the code a bit to use the same error checking code?
There was a problem hiding this comment.
ToFilecoinAddress can return address.Undef but in such case it also returns error so it's not strictly needed because the error is checked here. The point about having the same error handling is legit, will do.
There was a problem hiding this comment.
@fridrik01 Is this the way to go in Go 6c25f21 ? 🙂
maciejwitowski
force-pushed
the
maciej/fountain
branch
from
3bee767
to
6c25f21
Compare
cmd/lotus-fountain/main.go
Outdated
| @@ -193,12 +195,30 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { | |||
| return | |||
| } | |||
|
|
|||
| to, err := address.NewFromString(r.FormValue("address")) | |||
| if err != nil { | |||
| var to address.Address | |||
There was a problem hiding this comment.
We're not setting this anywhere, and using for the send destination, probably want to remove this var, and swap uses of to to filecoinAddress
maciejwitowski
force-pushed
the
maciej/fountain
branch
from
6c25f21
to
08e6e04
Compare
Related Issues
Closes #10560
Proposed Changes
Check if address starts with
Ox. If so, parse it as Eth address. Otherwise, use the previous logic.