fix

starcoinorg · Sep 16, 2022 · 4d5ba72 · 4d5ba72
1 parent 7b44ee7
commit 4d5ba72
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/build/StarcoinFramework/BuildInfo.yaml b/build/StarcoinFramework/BuildInfo.yaml
@@ -312,7 +312,7 @@ compiled_package_info:
     ? address: "0x00000000000000000000000000000001"
       name: YieldFarmingV2
     : StarcoinFramework
-  source_digest: 7CD9E807A29B6AE9D8C370363A262231F0337215FE432C7E16ADE2FD965B7E13
+  source_digest: D37C0F2BCF8E494AE8B930EDBAAD0ECA7D6749BB7B5D7D340B743E3B94B17846
   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
@@ -8,13 +8,13 @@ task 5 'run'. lines 61-69:
 
 task 6 'run'. lines 71-107:
 {
-  "gas_used": 652263,
+  "gas_used": 652577,
   "status": "Executed"
 }
 
 task 7 'run'. lines 109-120:
 {
-  "gas_used": 38208,
+  "gas_used": 38522,
   "status": {
     "MoveAbort": {
       "location": {
@@ -30,19 +30,19 @@ task 7 'run'. lines 109-120:
 
 task 9 'run'. lines 124-137:
 {
-  "gas_used": 86008,
+  "gas_used": 86636,
   "status": "Executed"
 }
 
 task 10 'run'. lines 139-155:
 {
-  "gas_used": 419528,
+  "gas_used": 419842,
   "status": "Executed"
 }
 
 task 12 'run'. lines 159-172:
 {
-  "gas_used": 216758,
+  "gas_used": 217386,
   "status": "Executed"
 }
 
@@ -54,7 +54,7 @@ task 13 'run'. lines 174-190:
 
 task 15 'run'. lines 194-209:
 {
-  "gas_used": 225723,
+  "gas_used": 226351,
   "status": "Executed"
 }
 

diff --git a/sources/daospaceplugin/StakeToSBTPlugin.move b/sources/daospaceplugin/StakeToSBTPlugin.move
@@ -24,14 +24,14 @@ module StarcoinFramework::StakeToSBTPlugin {
     struct Stake<phantom DAOT, phantom TokenT> has key, store {
         id: u64,
         token: Token::Token<TokenT>,
-        stake_time: u64,
         // The timestamp when user stake
-        lock_time: u64,
+        stake_time: u64,
         // How long where the user locked
-        weight: u64,
+        lock_time: u64,
         // Which multiplier by the user stake
-        sbt_amount: u128,
+        weight: u64,
         //  The SBT amount that user swap in the token
+        sbt_amount: u128,
     }
 
     struct StakeList<phantom DAOT, phantom TokenT> has key, store {
@@ -215,6 +215,7 @@ module StarcoinFramework::StakeToSBTPlugin {
 
     public fun query_stake<DAOT: store, TokenT: store>(member: address, id: u64)
     : (u64, u64, u64, u128, u128) acquires StakeList {
+        assert!(exists<StakeList<DAOT, TokenT>>(member), Errors::not_published(ERR_PLUGIN_NOT_STAKE));
         let stake_list = borrow_global_mut<StakeList<DAOT, TokenT>>(member);
         let item_index = find_item(id, &stake_list.items);
 
@@ -234,12 +235,14 @@ module StarcoinFramework::StakeToSBTPlugin {
 
     /// Query stake count from stake list
     public fun query_stake_count<DAOT: store, TokenT: store>(member: address): u64 acquires StakeList {
+        assert!(exists<StakeList<DAOT, TokenT>>(member), Errors::not_published(ERR_PLUGIN_NOT_STAKE));
         let stake_list = borrow_global<StakeList<DAOT, TokenT>>(member);
         Vector::length(&stake_list.items)
     }
 
     /// Unstake from staking
     public fun unstake_by_id<DAOT: store, TokenT: store>(member: address, id: u64) acquires StakeList {
+        assert!(exists<StakeList<DAOT, TokenT>>(member), Errors::not_published(ERR_PLUGIN_NOT_STAKE));
         let stake_list = borrow_global_mut<StakeList<DAOT, TokenT>>(member);
         let item_index = find_item(id, &stake_list.items);
 
@@ -276,6 +279,7 @@ module StarcoinFramework::StakeToSBTPlugin {
     /// Unstake all staking items from member address,
     /// No care whether the user is member or not
     public fun unstake_all<DAOT: store, TokenT: store>(member: address) acquires StakeList {
+        assert!(exists<StakeList<DAOT, TokenT>>(member), Errors::not_published(ERR_PLUGIN_NOT_STAKE));
         let stake_list = borrow_global_mut<StakeList<DAOT, TokenT>>(member);
         let len = Vector::length(&mut stake_list.items);