Merge pull request #60 from scrtlabs/decoy

Get decoys for every balance update

Author: liorbond

Cargo.lock

@@ -32,16 +32,17 @@ backtraces = ["cosmwasm-std/backtraces"]
 
 # debug-print = ["cosmwasm-std/debug-print"]
 [dependencies]
-cosmwasm-std = { package = "secret-cosmwasm-std", version = "1.0.0", default-features = false }
-cosmwasm-storage = { package = "secret-cosmwasm-storage", version = "1.0.0" }
-
-secret-toolkit = { version = "0.7.0",  features = [
+cosmwasm-std = { git = "https://github.com/scrtlabs/cosmwasm/", default-features = false, tag = "v1.1.9-secret" }
+cosmwasm-storage = { git = "https://github.com/scrtlabs/cosmwasm/", tag = "v1.1.9-secret" }
+rand = { version = "0.8.5", default-features = false }
+secret-toolkit = { git = "https://github.com/scrtlabs/secret-toolkit", features = [
   "permit",
   "viewing-key",
 ] }
-secret-toolkit-crypto = { version = "0.7.0", features = ["rand", "hash"]}
-
-#secret-toolkit-crypto = { package = "secret-toolkit-crypto", version = "0.7.0", features = ["rand", "hash"] }
+secret-toolkit-crypto = { git = "https://github.com/scrtlabs/secret-toolkit", features = [
+  "rand",
+  "hash",
+] }
 
 schemars = "0.8.12"
 serde = { version = "1.0.158", default-features = false, features = ["derive"] }

Cargo.toml

@@ -3,14 +3,19 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use cosmwasm_std::{Binary, Uint128};
+use cosmwasm_std::{Addr, Binary, Uint128};
+
+pub trait HasDecoy {
+    fn decoys(&self) -> &Option<Vec<Addr>>;
+}
 
 #[derive(Serialize, Deserialize, JsonSchema, Clone, Debug)]
 #[serde(rename_all = "snake_case")]
 pub struct TransferAction {
     pub recipient: String,
     pub amount: Uint128,
     pub memo: Option<String>,
+    pub decoys: Option<Vec<Addr>>,
 }
 
 #[derive(Serialize, Deserialize, JsonSchema, Clone, Debug)]
@@ -21,6 +26,7 @@ pub struct SendAction {
     pub amount: Uint128,
     pub msg: Option<Binary>,
     pub memo: Option<String>,
+    pub decoys: Option<Vec<Addr>>,
 }
 
 #[derive(Serialize, Deserialize, JsonSchema, Clone, Debug)]
@@ -30,6 +36,7 @@ pub struct TransferFromAction {
     pub recipient: String,
     pub amount: Uint128,
     pub memo: Option<String>,
+    pub decoys: Option<Vec<Addr>>,
 }
 
 #[derive(Serialize, Deserialize, JsonSchema, Clone, Debug)]
@@ -41,6 +48,7 @@ pub struct SendFromAction {
     pub amount: Uint128,
     pub msg: Option<Binary>,
     pub memo: Option<String>,
+    pub decoys: Option<Vec<Addr>>,
 }
 
 #[derive(Serialize, Deserialize, JsonSchema, Clone, Debug)]
@@ -49,6 +57,7 @@ pub struct MintAction {
     pub recipient: String,
     pub amount: Uint128,
     pub memo: Option<String>,
+    pub decoys: Option<Vec<Addr>>,
 }
 
 #[derive(Serialize, Deserialize, JsonSchema, Clone, Debug)]
@@ -57,4 +66,22 @@ pub struct BurnFromAction {
     pub owner: String,
     pub amount: Uint128,
     pub memo: Option<String>,
+    pub decoys: Option<Vec<Addr>>,
 }
+
+macro_rules! impl_decoyable {
+    ($struct:ty) => {
+        impl HasDecoy for $struct {
+            fn decoys(&self) -> &Option<Vec<Addr>> {
+                &self.decoys
+            }
+        }
+    };
+}
+
+impl_decoyable!(BurnFromAction);
+impl_decoyable!(MintAction);
+impl_decoyable!(SendFromAction);
+impl_decoyable!(TransferFromAction);
+impl_decoyable!(TransferAction);
+impl_decoyable!(SendAction);