Fix: receive virtual stake msg proper

osmosis-labs · Jun 16, 2023 · e2f05c1 · e2f05c1
1 parent 62e302f
commit e2f05c1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/contracts/provider/external-staking/src/contract.rs b/contracts/provider/external-staking/src/contract.rs
@@ -391,7 +391,7 @@ pub mod cross_staking {
             ctx: ExecCtx,
             owner: String,
             amount: Coin,
-            _tx_id: u64,
+            tx_id: u64,
             msg: Binary,
         ) -> Result<Response, Self::Error> {
             let config = self.config.load(ctx.deps.storage)?;
@@ -436,7 +436,7 @@ pub mod cross_staking {
                 .add_attribute("action", "receive_virtual_stake")
                 .add_attribute("owner", owner)
                 .add_attribute("amount", amount.amount.to_string())
-                .add_attribute("tx_id", msg.tx.to_string());
+                .add_attribute("tx_id", tx_id.to_string());
 
             Ok(resp)
         }

diff --git a/contracts/provider/external-staking/src/msg.rs b/contracts/provider/external-staking/src/msg.rs
@@ -39,8 +39,6 @@ pub struct StakesResponse {
 /// Message to be send as `msg` field on `receive_virtual_staking`
 #[cw_serde]
 pub struct ReceiveVirtualStake {
-    /// Associated transaction id
-    pub tx: u64,
     pub validator: String,
 }
 

diff --git a/contracts/provider/external-staking/src/multitest.rs b/contracts/provider/external-staking/src/multitest.rs
@@ -120,20 +120,20 @@ fn staking() {
             contract.contract_addr.to_string(),
             coin(100, OSMO),
             to_binary(&ReceiveVirtualStake {
-                tx: 1,
                 validator: validators[0].to_string(),
             })
             .unwrap(),
         )
         .call(users[0])
         .unwrap();
 
+    // Need to process / commit IBC tx here
+
     vault
         .stake_remote(
             contract.contract_addr.to_string(),
             coin(100, OSMO),
             to_binary(&ReceiveVirtualStake {
-                tx: 2,
                 validator: validators[1].to_string(),
             })
             .unwrap(),
@@ -146,7 +146,6 @@ fn staking() {
             contract.contract_addr.to_string(),
             coin(100, OSMO),
             to_binary(&ReceiveVirtualStake {
-                tx: 3,
                 validator: validators[0].to_string(),
             })
             .unwrap(),
@@ -159,7 +158,6 @@ fn staking() {
             contract.contract_addr.to_string(),
             coin(200, OSMO),
             to_binary(&ReceiveVirtualStake {
-                tx: 4,
                 validator: validators[1].to_string(),
             })
             .unwrap(),
@@ -172,7 +170,6 @@ fn staking() {
             contract.contract_addr.to_string(),
             coin(100, OSMO),
             to_binary(&ReceiveVirtualStake {
-                tx: 5,
                 validator: validators[0].to_string(),
             })
             .unwrap(),
@@ -299,7 +296,6 @@ fn unstaking() {
             contract.contract_addr.to_string(),
             coin(200, OSMO),
             to_binary(&ReceiveVirtualStake {
-                tx: 1,
                 validator: validators[0].to_string(),
             })
             .unwrap(),
@@ -312,7 +308,6 @@ fn unstaking() {
             contract.contract_addr.to_string(),
             coin(100, OSMO),
             to_binary(&ReceiveVirtualStake {
-                tx: 2,
                 validator: validators[1].to_string(),
             })
             .unwrap(),
@@ -325,7 +320,6 @@ fn unstaking() {
             contract.contract_addr.to_string(),
             coin(300, OSMO),
             to_binary(&ReceiveVirtualStake {
-                tx: 3,
                 validator: validators[0].to_string(),
             })
             .unwrap(),
@@ -585,7 +579,6 @@ fn distribution() {
             contract.contract_addr.to_string(),
             coin(200, OSMO),
             to_binary(&ReceiveVirtualStake {
-                tx: 1,
                 validator: validators[0].to_string(),
             })
             .unwrap(),
@@ -598,7 +591,6 @@ fn distribution() {
             contract.contract_addr.to_string(),
             coin(100, OSMO),
             to_binary(&ReceiveVirtualStake {
-                tx: 2,
                 validator: validators[1].to_string(),
             })
             .unwrap(),
@@ -611,7 +603,6 @@ fn distribution() {
             contract.contract_addr.to_string(),
             coin(300, OSMO),
             to_binary(&ReceiveVirtualStake {
-                tx: 3,
                 validator: validators[0].to_string(),
             })
             .unwrap(),
@@ -829,7 +820,6 @@ fn distribution() {
             contract.contract_addr.to_string(),
             coin(300, OSMO),
             to_binary(&ReceiveVirtualStake {
-                tx: 2,
                 validator: validators[1].to_string(),
             })
             .unwrap(),