LaconicNetwork/cosmos-sdk
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

move sdk denom validation to top of validateibcdenom (#7917)

Browse Source
This commit is contained in:
colin axnér 2020-11-12 19:44:02 +01:00 committed by GitHub
parent 96f239db1c
commit 956e1cf68f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x/ibc/applications/transfer/types/trace.go
View File

@ -164,6 +164,10 @@ func ValidatePrefixedDenom(denom string) error {
// - A valid base denomination (eg: 'uatom')
// - A valid fungible token representation (i.e 'ibc/{hash}') per ADR 001 https://github.com/cosmos/cosmos-sdk/blob/master/docs/architecture/adr-001-coin-source-tracing.md
func ValidateIBCDenom(denom string) error {
if err := sdk.ValidateDenom(denom); err != nil {
return err
}
denomSplit := strings.SplitN(denom, "/", 2)
switch {
@ -173,7 +177,7 @@ func ValidateIBCDenom(denom string) error {
return sdkerrors.Wrapf(ErrInvalidDenomForTransfer, "denomination should be prefixed with the format 'ibc/{hash(trace + \"/\" + %s)}'", denom)
case denomSplit[0] == denom && strings.TrimSpace(denom) != "":
return sdk.ValidateDenom(denom)
return nil
}
if _, err := ParseHexHash(denomSplit[1]); err != nil {