Remove decrease SBT when unstake item (#81)

* Remove decrease SBT when unstake item * fix spectest error
starcoinorg · Aug 10, 2022 · d401c37 · d401c37
1 parent 41ad861
commit d401c37
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/build/StarcoinFramework/BuildInfo.yaml b/build/StarcoinFramework/BuildInfo.yaml
@@ -300,7 +300,7 @@ compiled_package_info:
     ? address: "0x00000000000000000000000000000001"
       name: YieldFarmingV2
     : StarcoinFramework
-  source_digest: 6F307AEE1142B5C572B5235CABAE88249D55900EC0E687DD762DF015D0591BB1
+  source_digest: 0E40C59E95BD4C4EAC7E35CCB4EC85127F72EE5F48D70BEE8FBE34B526A11E42
   build_flags:
     dev_mode: false
     test_mode: false

diff --git a/integration-tests/daospace/stake_to_sbt_plugin.exp b/integration-tests/daospace/stake_to_sbt_plugin.exp
@@ -26,7 +26,7 @@ task 7 'run'. lines 70-106:
 
 task 8 'run'. lines 108-119:
 {
-  "gas_used": 38238,
+  "gas_used": 38208,
   "status": {
     "Keep": {
       "MoveAbort": [
@@ -44,7 +44,7 @@ task 8 'run'. lines 108-119:
 
 task 10 'run'. lines 123-136:
 {
-  "gas_used": 249960,
+  "gas_used": 86008,
   "status": {
     "Keep": "Executed"
   }
@@ -60,7 +60,7 @@ task 11 'run'. lines 138-154:
 
 task 13 'run'. lines 158-171:
 {
-  "gas_used": 288121,
+  "gas_used": 124169,
   "status": {
     "Keep": "Executed"
   }
@@ -76,7 +76,7 @@ task 14 'run'. lines 173-189:
 
 task 16 'run'. lines 193-208:
 {
-  "gas_used": 142129,
+  "gas_used": 133134,
   "status": {
     "Keep": "Executed"
   }

diff --git a/sources/daospaceplugin/StakeToSBTPlugin.move b/sources/daospaceplugin/StakeToSBTPlugin.move
@@ -189,25 +189,18 @@ module StarcoinFramework::StakeToSBTPlugin {
     }
 
     /// Unstake a item from a item object
-    fun unstake_item<DAOT: store, TokenT: store>(member: address, item: Stake<DAOT, TokenT>): Token::Token<TokenT> {
+    fun unstake_item<DAOT: store, TokenT: store>(_member: address, item: Stake<DAOT, TokenT>): Token::Token<TokenT> {
         let Stake<DAOT, TokenT> {
             id: _,
             token,
             lock_time,
             stake_time,
             weight: _,
-            sbt_amount,
+            sbt_amount: _,
         } = item;
 
         assert!((Timestamp::now_seconds() - stake_time) > lock_time, Errors::invalid_state(ERR_PLUGIN_STILL_LOCKED));
 
-        // Decrease SBT by weight if the sender is a member
-        if (DAOSpace::is_member<DAOT>(member)) {
-            let witness = StakeToSBTPlugin {};
-            let cap = DAOSpace::acquire_member_cap<DAOT, StakeToSBTPlugin>(&witness);
-            DAOSpace::decrease_member_sbt(&cap, member, sbt_amount);
-        };
-
         token
     }