Merge pull request #87 from CosmWasm/native-balance-refactoring

Native balance refactoring

contracts/cw1-subkeys/schema/all_allowances_response.json

@@ -23,7 +23,7 @@
       ],
       "properties": {
         "balance": {
-          "$ref": "#/definitions/Balance"
+          "$ref": "#/definitions/NativeBalance"
         },
         "expires": {
           "$ref": "#/definitions/Expiration"
@@ -33,12 +33,6 @@
         }
       }
     },
-    "Balance": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/Coin"
-      }
-    },
     "Coin": {
       "type": "object",
       "required": [
@@ -101,6 +95,12 @@
     "HumanAddr": {
       "type": "string"
     },
+    "NativeBalance": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Coin"
+      }
+    },
     "Uint128": {
       "type": "string"
     }

contracts/cw1-subkeys/schema/allowance.json

@@ -8,19 +8,13 @@
   ],
   "properties": {
     "balance": {
-      "$ref": "#/definitions/Balance"
+      "$ref": "#/definitions/NativeBalance"
     },
     "expires": {
       "$ref": "#/definitions/Expiration"
     }
   },
   "definitions": {
-    "Balance": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/Coin"
-      }
-    },
     "Coin": {
       "type": "object",
       "required": [
@@ -80,6 +74,12 @@
         }
       ]
     },
+    "NativeBalance": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Coin"
+      }
+    },
     "Uint128": {
       "type": "string"
     }

contracts/cw1-subkeys/src/contract.rs

@@ -437,10 +437,10 @@ pub fn query_all_permissions<S: Storage, A: Api, Q: Querier>(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::balance::Balance;
     use crate::state::Permissions;
     use cosmwasm_std::testing::{mock_dependencies, mock_env, MOCK_CONTRACT_ADDR};
     use cosmwasm_std::{coin, coins, StakingMsg};
+    use cw0::NativeBalance;
     use cw1_whitelist::msg::AdminListResponse;
     use cw2::{get_contract_version, ContractVersion};
 
@@ -550,15 +550,15 @@ mod tests {
         assert_eq!(
             allowance,
             Allowance {
-                balance: Balance(vec![allow1.clone()]),
+                balance: NativeBalance(vec![allow1.clone()]),
                 expires: expires_never.clone(),
             }
         );
         let allowance = query_allowance(&deps, spender2.clone()).unwrap();
         assert_eq!(
             allowance,
             Allowance {
-                balance: Balance(vec![allow1.clone()]),
+                balance: NativeBalance(vec![allow1.clone()]),
                 expires: expires_never.clone(),
             }
         );
@@ -608,15 +608,15 @@ mod tests {
             allowances[0],
             AllowanceInfo {
                 spender: spender1,
-                balance: Balance(initial_allowances.clone()),
+                balance: NativeBalance(initial_allowances.clone()),
                 expires: Expiration::Never {},
             }
         );
         assert_eq!(
             allowances[1],
             AllowanceInfo {
                 spender: spender2.clone(),
-                balance: Balance(initial_allowances.clone()),
+                balance: NativeBalance(initial_allowances.clone()),
                 expires: Expiration::Never {},
             }
         );
@@ -630,7 +630,7 @@ mod tests {
             allowances[0],
             AllowanceInfo {
                 spender: spender3,
-                balance: Balance(initial_allowances.clone()),
+                balance: NativeBalance(initial_allowances.clone()),
                 expires: expires_later,
             }
         );
@@ -934,7 +934,7 @@ mod tests {
         assert_eq!(
             allowance,
             Allowance {
-                balance: Balance(vec![coin(amount1 * 2, &allow1.denom), allow2.clone()]),
+                balance: NativeBalance(vec![coin(amount1 * 2, &allow1.denom), allow2.clone()]),
                 expires: expires_height.clone(),
             }
         );
@@ -952,7 +952,7 @@ mod tests {
         assert_eq!(
             allowance,
             Allowance {
-                balance: Balance(vec![allow1.clone(), allow2.clone(), allow3.clone()]),
+                balance: NativeBalance(vec![allow1.clone(), allow2.clone(), allow3.clone()]),
                 expires: expires_height.clone(),
             }
         );
@@ -970,7 +970,7 @@ mod tests {
         assert_eq!(
             allowance,
             Allowance {
-                balance: Balance(vec![allow1.clone()]),
+                balance: NativeBalance(vec![allow1.clone()]),
                 expires: expires_never.clone(),
             }
         );
@@ -988,7 +988,7 @@ mod tests {
         assert_eq!(
             allowance,
             Allowance {
-                balance: Balance(vec![allow2.clone()]),
+                balance: NativeBalance(vec![allow2.clone()]),
                 expires: expires_time,
             }
         );
@@ -1049,7 +1049,7 @@ mod tests {
         assert_eq!(
             allowance,
             Allowance {
-                balance: Balance(vec![allow1.clone(), allow2.clone()]),
+                balance: NativeBalance(vec![allow1.clone(), allow2.clone()]),
                 expires: expires_height.clone(),
             }
         );
@@ -1067,7 +1067,7 @@ mod tests {
         assert_eq!(
             allowance,
             Allowance {
-                balance: Balance(vec![allow1.clone()]),
+                balance: NativeBalance(vec![allow1.clone()]),
                 expires: expires_never.clone(),
             }
         );
@@ -1085,7 +1085,7 @@ mod tests {
         assert_eq!(
             allowance,
             Allowance {
-                balance: Balance(vec![
+                balance: NativeBalance(vec![
                     coin(amount1 / 2 + (amount1 & 1), denom1),
                     allow2.clone()
                 ]),
@@ -1129,7 +1129,7 @@ mod tests {
         assert_eq!(
             allowance,
             Allowance {
-                balance: Balance(vec![allow2]),
+                balance: NativeBalance(vec![allow2]),
                 expires: expires_height.clone(),
             }
         );
@@ -1378,7 +1378,7 @@ mod tests {
         let coin = coin(amount, denom);
 
         let allow = Allowance {
-            balance: Balance(vec![coin.clone()]),
+            balance: NativeBalance(vec![coin.clone()]),
             expires: Expiration::Never {},
         };
         let perm = Permissions {

contracts/cw1-subkeys/src/lib.rs

@@ -1,4 +1,3 @@
-pub mod balance;
 pub mod contract;
 pub mod msg;
 pub mod state;

contracts/cw1-subkeys/src/msg.rs

@@ -3,9 +3,8 @@ use serde::{Deserialize, Serialize};
 use std::fmt;
 
 use cosmwasm_std::{Coin, CosmosMsg, Empty, HumanAddr};
-use cw0::Expiration;
+use cw0::{Expiration, NativeBalance};
 
-use crate::balance::Balance;
 use crate::state::Permissions;
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
@@ -88,7 +87,7 @@ pub struct AllAllowancesResponse {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct AllowanceInfo {
     pub spender: HumanAddr,
-    pub balance: Balance,
+    pub balance: NativeBalance,
     pub expires: Expiration,
 }
 

contracts/cw1-subkeys/src/state.rs

@@ -3,9 +3,8 @@ use serde::{Deserialize, Serialize};
 
 use cosmwasm_std::{ReadonlyStorage, StdError, Storage};
 use cosmwasm_storage::{bucket, bucket_read, Bucket, ReadonlyBucket};
-use cw0::Expiration;
+use cw0::{Expiration, NativeBalance};
 
-use crate::balance::Balance;
 use std::fmt;
 
 // Permissions struct defines users message execution permissions.
@@ -70,7 +69,7 @@ impl From<PermissionErr> for StdError {
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema, Default)]
 pub struct Allowance {
-    pub balance: Balance,
+    pub balance: NativeBalance,
     pub expires: Expiration,
 }
 

contracts/cw20-atomic-swap/Cargo.toml

@@ -18,6 +18,7 @@ singlepass = ["cosmwasm-vm/default-singlepass"]
 library = []
 
 [dependencies]
+cw0 = { path = "../../packages/cw0", version = "0.2.1" }
 cw2 = { path = "../../packages/cw2", version = "0.2.1" }
 cw20 = { path = "../../packages/cw20", version = "0.2.1" }
 cosmwasm-std = { version = "0.10.0", features = ["iterator"] }

contracts/cw20-atomic-swap/src/balance.rs

@@ -1,27 +1,35 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use cosmwasm_std::Coin;
+use cw0::NativeBalance;
 use cw20::Cw20Coin;
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Balance {
-    Native(Vec<Coin>),
+    Native(NativeBalance),
     Cw20(Cw20Coin),
 }
 
 impl Default for Balance {
     fn default() -> Balance {
-        Balance::Native(vec![])
+        Balance::Native(NativeBalance(vec![]))
     }
 }
 
 impl Balance {
     pub fn is_empty(&self) -> bool {
         match self {
-            Balance::Native(coins) => coins.is_empty(),
+            Balance::Native(balance) => balance.is_empty(),
             Balance::Cw20(coin) => coin.is_empty(),
         }
     }
+
+    /// normalize Wallet
+    pub fn normalize(&mut self) {
+        match self {
+            Balance::Native(balance) => balance.normalize(),
+            Balance::Cw20(_) => {}
+        }
+    }
 }

contracts/cw20-atomic-swap/src/contract.rs

@@ -4,6 +4,7 @@ use cosmwasm_std::{
     from_binary, log, to_binary, Api, BankMsg, Binary, CosmosMsg, Env, Extern, HandleResponse,
     HumanAddr, InitResponse, Querier, StdError, StdResult, Storage, WasmMsg,
 };
+use cw0::NativeBalance;
 use cw2::set_contract_version;
 use cw20::{Cw20Coin, Cw20CoinHuman, Cw20HandleMsg, Cw20ReceiveMsg};
 
@@ -36,7 +37,7 @@ pub fn handle<S: Storage, A: Api, Q: Querier>(
     match msg {
         HandleMsg::Create(msg) => {
             let sent_funds = env.message.sent_funds.clone();
-            try_create(deps, env, msg, Balance::Native(sent_funds))
+            try_create(deps, env, msg, Balance::Native(NativeBalance(sent_funds)))
         }
         HandleMsg::Release { id, preimage } => try_release(deps, env, id, preimage),
         HandleMsg::Refund { id } => try_refund(deps, env, id),
@@ -72,7 +73,7 @@ pub fn try_create<S: Storage, A: Api, Q: Querier>(
         return Err(StdError::generic_err("Invalid atomic swap id"));
     }
 
-    // FIXME: normalize array first (remove zero-valued coins), and then check for empty
+    // this ignores 0 value coins, must have one or more with positive balance
     if balance.is_empty() {
         return Err(StdError::generic_err(
             "Send some coins to create an atomic swap",
@@ -197,7 +198,7 @@ fn send_tokens<A: Api>(
         Ok(vec![])
     } else {
         match amount {
-            Balance::Native(coins) => {
+            Balance::Native(NativeBalance(coins)) => {
                 let msg = BankMsg::Send {
                     from_address: from.into(),
                     to_address: to.into(),
@@ -239,7 +240,7 @@ fn query_details<S: Storage, A: Api, Q: Querier>(
 
     // Convert balance to human balance
     let balance_human = match swap.balance {
-        Balance::Native(coins) => BalanceHuman::Native(coins),
+        Balance::Native(coins) => BalanceHuman::Native(coins.0),
         Balance::Cw20(coin) => BalanceHuman::Cw20(Cw20CoinHuman {
             address: deps.api.human_address(&coin.address)?,
             amount: coin.amount,