Add BackendApi::addr_validate

Author: webmaster128

CHANGELOG.md

@@ -80,6 +80,8 @@ and this project adheres to
   queriers directly. ([#1977])
 - cosmwasm-vm: Rename `BackendApi::canonical_address`/`::human_address` to
   `::addr_canonicalize`/`::addr_humanize` for consistency.
+- cosmwasm-vm: Add `BackendApi::addr_validate` to avoid having to do two calls
+  from Rust into Go.
 
 [#1874]: https://github.com/CosmWasm/cosmwasm/pull/1874
 [#1876]: https://github.com/CosmWasm/cosmwasm/pull/1876

packages/vm/src/backend.rs

@@ -166,6 +166,7 @@ pub trait Storage {
 /// These should all be pure (stateless) functions. If you need state, you probably want
 /// to use the Querier.
 pub trait BackendApi: Copy + Clone + Send {
+    fn addr_validate(&self, input: &str) -> BackendResult<()>;
     fn addr_canonicalize(&self, human: &str) -> BackendResult<Vec<u8>>;
     fn addr_humanize(&self, canonical: &[u8]) -> BackendResult<String>;
 }

packages/vm/src/imports.rs

@@ -162,31 +162,15 @@ pub fn do_addr_validate<A: BackendApi + 'static, S: Storage + 'static, Q: Querie
         Err(_) => return write_to_contract(data, &mut store, b"Input is not valid UTF-8"),
     };
 
-    let (result, gas_info) = data.api.addr_canonicalize(&source_string);
-    process_gas_info(data, &mut store, gas_info)?;
-    let canonical = match result {
-        Ok(data) => data,
-        Err(BackendError::UserErr { msg, .. }) => {
-            return write_to_contract(data, &mut store, msg.as_bytes())
-        }
-        Err(err) => return Err(VmError::from(err)),
-    };
-
-    let (result, gas_info) = data.api.addr_humanize(&canonical);
+    let (result, gas_info) = data.api.addr_validate(&source_string);
     process_gas_info(data, &mut store, gas_info)?;
-    let normalized = match result {
-        Ok(addr) => addr,
+    match result {
+        Ok(()) => Ok(0),
         Err(BackendError::UserErr { msg, .. }) => {
-            return write_to_contract(data, &mut store, msg.as_bytes())
+            write_to_contract(data, &mut store, msg.as_bytes())
         }
-        Err(err) => return Err(VmError::from(err)),
-    };
-
-    if normalized != source_string {
-        return write_to_contract(data, &mut store, b"Address is not normalized");
+        Err(err) => Err(VmError::from(err)),
     }
-
-    Ok(0)
 }
 
 pub fn do_addr_canonicalize<A: BackendApi + 'static, S: Storage + 'static, Q: Querier + 'static>(

packages/vm/src/testing/mock.rs

@@ -125,6 +125,36 @@ impl Default for MockApi {
 }
 
 impl BackendApi for MockApi {
+    fn addr_validate(&self, input: &str) -> BackendResult<()> {
+        let mut gas = GasInfo {
+            cost: 0,
+            externally_used: 0,
+        };
+
+        let (result, gas_info) = self.addr_canonicalize(input);
+        gas += gas_info;
+        let canonical = match result {
+            Ok(canonical) => canonical,
+            Err(err) => return (Err(err), gas),
+        };
+
+        let (result, gas_info) = self.addr_humanize(&canonical);
+        gas += gas_info;
+        let normalized = match result {
+            Ok(norm) => norm,
+            Err(err) => return (Err(err), gas),
+        };
+        if input != normalized.as_str() {
+            return (
+                Err(BackendError::user_err(
+                    "Invalid input: address not normalized",
+                )),
+                gas,
+            );
+        }
+        (Ok(()), gas)
+    }
+
     fn addr_canonicalize(&self, input: &str) -> BackendResult<Vec<u8>> {
         let gas_info = GasInfo::with_cost(GAS_COST_CANONICALIZE);