upgrade and rebase

starcoinorg · Sep 14, 2022 · 0735be9 · 0735be9
1 parent 0749d3a
commit 0735be9
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 14 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: C301E581A89D4E5782A094C0081B80FE51B2171E955BD365A482773E365B9988
+  source_digest: 25ECF2754312EBC49B1DBE3DB09DC2A65003124E9C7037B9377DACB300395E8E
   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,7 +8,7 @@ task 5 'run'. lines 61-69:
 
 task 6 'run'. lines 71-107:
 {
-  "gas_used": 569552,
+  "gas_used": 652263,
   "status": "Executed"
 }
 
@@ -36,7 +36,7 @@ task 9 'run'. lines 124-137:
 
 task 10 'run'. lines 139-155:
 {
-  "gas_used": 336817,
+  "gas_used": 419528,
   "status": "Executed"
 }
 
@@ -48,7 +48,7 @@ task 12 'run'. lines 159-172:
 
 task 13 'run'. lines 174-190:
 {
-  "gas_used": 458338,
+  "gas_used": 541049,
   "status": "Executed"
 }
 

diff --git a/integration-tests/starcoin_dao/starcoin_onchain_config.exp b/integration-tests/starcoin_dao/starcoin_onchain_config.exp
@@ -8,7 +8,7 @@ task 4 'run'. lines 9-17:
 
 task 5 'run'. lines 19-33:
 {
-  "gas_used": 570261,
+  "gas_used": 586891,
   "status": "Executed"
 }
 

diff --git a/integration-tests/starcoin_dao/starcoin_onchain_config.move b/integration-tests/starcoin_dao/starcoin_onchain_config.move
@@ -27,7 +27,7 @@ script {
     fun stake_and_check(sender: signer) {
         let token = Account::withdraw<STC::STC>(
             &sender, 1000 * Token::scaling_factor<STC::STC>());
-        StakeToSBTPlugin::stake<StarcoinDAO, STC::STC>(&sender, token, 100000);
+        StakeToSBTPlugin::stake<StarcoinDAO, STC::STC>(&sender, token, 60000);
     }
 }
 // check: EXECUTED

diff --git a/integration-tests/starcoin_dao/starcoin_upgrade_module.exp b/integration-tests/starcoin_dao/starcoin_upgrade_module.exp
@@ -8,7 +8,7 @@ task 4 'run'. lines 9-17:
 
 task 5 'run'. lines 19-33:
 {
-  "gas_used": 570261,
+  "gas_used": 586891,
   "status": "Executed"
 }
 

diff --git a/integration-tests/starcoin_dao/starcoin_upgrade_module.move b/integration-tests/starcoin_dao/starcoin_upgrade_module.move
@@ -27,7 +27,7 @@ script {
     fun stake_and_check(sender: signer) {
         let token = Account::withdraw<STC::STC>(
             &sender, 1000 * Token::scaling_factor<STC::STC>());
-        StakeToSBTPlugin::stake<StarcoinDAO, STC::STC>(&sender, token, 100000);
+        StakeToSBTPlugin::stake<StarcoinDAO, STC::STC>(&sender, token, 60000);
     }
 }
 // check: EXECUTED

diff --git a/sources/StarcoinDAO.move b/sources/StarcoinDAO.move
@@ -58,7 +58,7 @@ module StarcoinFramework::StarcoinDAO{
 
         DAOSpace::install_plugin_with_root_cap<StarcoinDAO, StakeToSBTPlugin>(&dao_root_cap, StakeToSBTPlugin::required_caps());
         StakeToSBTPlugin::accept_token_with_root_cap<StarcoinDAO, STC>(&dao_root_cap);
-        StakeToSBTPlugin::set_sbt_weight_with_root_cap<StarcoinDAO, STC>(&dao_root_cap, 10, 2000);
+        StakeToSBTPlugin::set_sbt_weight_with_root_cap<StarcoinDAO, STC>(&dao_root_cap, 60000, 1000);
 
         DAOSpace::burn_root_cap(dao_root_cap);
 

diff --git a/sources/daospaceplugin/StakeToSBTPlugin.move b/sources/daospaceplugin/StakeToSBTPlugin.move
@@ -203,11 +203,7 @@ module StarcoinFramework::StakeToSBTPlugin {
                 dao_id: DAOSpace::dao_id(DAOSpace::dao_address<DAOT>()),
                 stake_id: id,
                 token_code: Token::token_code<TokenT>(),
-                amount: 
-
-
-
-                ,
+                amount: sbt_amount,
                 lock_time,
                 weight,
                 sbt_amount,