Merge pull request #2245 from CosmWasm/mergify/bp/releases/v0.6x/pr-2193

chipshort · web-flow · commit 3fa0a6b85779 · 2025-05-08T16:21:08.000+02:00
Make `validateAddress` cheaper if canonicalization fails (backport #2193)
diff --git a/x/wasm/keeper/api.go b/x/wasm/keeper/api.go
@@ -48,7 +48,7 @@ func canonicalizeAddress(human string) ([]byte, uint64, error) {
 func validateAddress(human string) (uint64, error) {
 	canonicalized, err := sdk.AccAddressFromBech32(human)
 	if err != nil {
-		return costValidate, err
+		return costCanonical, err
 	}
 	// AccAddressFromBech32 already calls VerifyAddressFormat, so we can just humanize and compare
 	if canonicalized.String() != human {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func canonicalizeAddress(human string) ([]byte, uint64, error) {`
`48`	`48`	`func validateAddress(human string) (uint64, error) {`
`49`	`49`	`canonicalized, err := sdk.AccAddressFromBech32(human)`
`50`	`50`	`if err != nil {`
`51`		`- return costValidate, err`
	`51`	`+ return costCanonical, err`
`52`	`52`	`}`
`53`	`53`	`// AccAddressFromBech32 already calls VerifyAddressFormat, so we can just humanize and compare`
`54`	`54`	`if canonicalized.String() != human {`