updated wynd query to narrow down error

yieldmos · Nov 22, 2023 · 7146521 · 7146521
1 parent 26502dc
commit 7146521
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/artifacts/checksums.txt b/artifacts/checksums.txt
@@ -1,6 +1,6 @@
 b4d98d4646f14b38eb6156f50a7761838154d1389f9d380c0c586117d68f0e4e  ymos_junodca_outpost-aarch64.wasm
-c10bcfec7f704a3994604e83902bdd82c165eb65f04fa56db21c7e53d9cb523d  ymos_junostake_outpost-aarch64.wasm
-aaace7662106fe10b6420e111c0b7801e2361658716690e628c660ac203d8793  ymos_junowwmarket_outpost-aarch64.wasm
+e8807e9a609751fd138cbf09975b716368caecdc9b98759a602fd17615af31e2  ymos_junostake_outpost-aarch64.wasm
+e6c40ff2513029481d6201e80cc93a563d4a78bc5e38724793d4b17a06fb2ea9  ymos_junowwmarket_outpost-aarch64.wasm
 a192dd17eb2a3f3f77a79c5d1c242dc179ec11851bf3a053d70e4aea89da87c2  ymos_osmostake_outpost-aarch64.wasm
 b89b0f087c799b74df32024288ed95589bf34b46e01b9c39755d012925b3a3da  ymos_wyndlp_outpost-aarch64.wasm
 ea1c8ac5ebd97e519635ee21435a3b80f97d134e4574a9633407ab57bd248bdf  ymos_wyndstake_outpost-aarch64.wasm
diff --git a/artifacts/checksums_intermediate.txt b/artifacts/checksums_intermediate.txt
@@ -1,6 +1,6 @@
 14ed42d96bd7f9f8ae7074ea0445894ebf2903cc24af1201bf5fffc8b4c8e81d  target/wasm32-unknown-unknown/release/ymos_osmostake_outpost.wasm
 10801be91ce9d7dadc8e43a7bf501ff1f6a90f84c2af145d76aa76deb95b8599  target/wasm32-unknown-unknown/release/ymos_wyndlp_outpost.wasm
-73a110f288d53765595888e07f253bed97e9f93eaa2eeb61cddbeac8bb9ff60b  target/wasm32-unknown-unknown/release/ymos_junostake_outpost.wasm
 96cb7dadf79eb4acb5578b9c6276cd4b495764bd01b4958b618c99ef5893f26d  target/wasm32-unknown-unknown/release/ymos_wyndstake_outpost.wasm
 f89cacaf00996be7cf2a3b122bc8f8e67650cf8cc02665b6d947abd3eebc1f1b  target/wasm32-unknown-unknown/release/ymos_junodca_outpost.wasm
-c724f52f2b04613c28141e4e91902f85ab94ba0d5eb4c0a31246980274763f49  target/wasm32-unknown-unknown/release/ymos_junowwmarket_outpost.wasm
+a64f52254d8acfa51fed9c67aa9068f0ec943eb27223eebc0b51ac43d692545b  target/wasm32-unknown-unknown/release/ymos_junostake_outpost.wasm
+f17f89cfc391406ff38b581db4180d91ce26a54f23d4f6cdeb2f54fc08a69d55  target/wasm32-unknown-unknown/release/ymos_junowwmarket_outpost.wasm
diff --git a/contracts/junostake/src/contract.rs b/contracts/junostake/src/contract.rs
@@ -125,7 +125,7 @@ pub fn execute(deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg) -> R
         }) => {
             let addresses = PROJECT_ADDRS.load(deps.storage)?;
 
-            execute::compound(deps, env, info, addresses, delegator_address, comp_prefs, tax_fee)
+            execute::compound(deps, env, info, addresses, user_address, comp_prefs, tax_fee)
         }
     }
 }

diff --git a/contracts/wyndstake/src/error.rs b/contracts/wyndstake/src/error.rs
@@ -3,7 +3,7 @@ use thiserror::Error;
 
 #[derive(Error, Debug)]
 pub enum ContractError {
-    #[error("{0}")]
+    #[error("StdError: {0}")]
     Std(#[from] StdError),
 
     #[error("Outpost Utils Error: &{0}")]
@@ -18,6 +18,9 @@ pub enum ContractError {
     #[error("Semver parsing error: {0}")]
     SemVer(String),
 
+    #[error("Failed to query Wynd Rewards. Err: {0}")]
+    QueryWyndRewardsFailure(String),
+
     #[error("No DCA Compound Preferences found")]
     NoDCACompoundPrefs,
 

diff --git a/contracts/wyndstake/src/helpers.rs b/contracts/wyndstake/src/helpers.rs
@@ -49,12 +49,14 @@ pub fn query_and_generate_wynd_reward_msgs(
         delegator_addr,
         tax_addr,
         wynd_addr,
-        querier.query_wasm_smart(
-            wynd_addr,
-            &to_json_binary(&Rewards {
-                address: delegator_addr.to_string(),
-            })?,
-        )?,
+        querier
+            .query_wasm_smart(
+                wynd_addr,
+                &to_json_binary(&Rewards {
+                    address: delegator_addr.to_string(),
+                })?,
+            )
+            .map_err(|e| ContractError::QueryWyndRewardsFailure(e.to_string()))?,
     )
 }