Revert "[ Feature ] do deposit when proposal state is DEFEATED (#122)"

This reverts commit 3274821.
starcoinorg · Mar 2, 2023 · 6782b16 · 6782b16
1 parent 891fe18
commit 6782b16
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 626 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: B85EC5CCB8E021D9974D19AD20C43DBC20D2AE625A72A096A5BAED676B5D9F1F
+  source_digest: 7CD9E807A29B6AE9D8C370363A262231F0337215FE432C7E16ADE2FD965B7E13
   build_flags:
     dev_mode: false
     test_mode: false

diff --git a/build/StarcoinFramework/bytecode_modules/StdlibUpgradeScripts.mv b/build/StarcoinFramework/bytecode_modules/StdlibUpgradeScripts.mv
diff --git a/build/StarcoinFramework/docs/StdlibUpgradeScripts.md b/build/StarcoinFramework/docs/StdlibUpgradeScripts.md
@@ -391,8 +391,7 @@ deprecated, use <code>do_upgrade_from_v6_to_v7_with_language_version</code>.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="StdlibUpgradeScripts.md#0x1_StdlibUpgradeScripts_do_upgrade_from_v12_to_v12_1">do_upgrade_from_v12_to_v12_1</a>() {
-    //TODO : config rate need mind
-    <a href="StarcoinDAO.md#0x1_StarcoinDAO_create_dao">StarcoinDAO::create_dao</a>( 60000, 120000, 10, 10000, 1000 * 1000 * 1000 * 1000);
+    <a href="StarcoinDAO.md#0x1_StarcoinDAO_create_dao">StarcoinDAO::create_dao</a>( 60000, 120000, 10, 10000, 0);
 }
 </code></pre>
 

diff --git a/build/StarcoinFramework/source_maps/StdlibUpgradeScripts.mvsm b/build/StarcoinFramework/source_maps/StdlibUpgradeScripts.mvsm
diff --git a/integration-tests/daospace/dao_proposal.exp b/integration-tests/daospace/dao_proposal.exp
@@ -109,18 +109,18 @@ task 34 'run'. lines 391-404:
 
 task 36 'run'. lines 409-424:
 {
-  "gas_used": 106454,
+  "gas_used": 106076,
   "status": "Executed"
 }
 
 task 39 'run'. lines 432-442:
 {
-  "gas_used": 115442,
+  "gas_used": 115064,
   "status": "Executed"
 }
 
 task 41 'run'. lines 447-459:
 {
-  "gas_used": 451300,
+  "gas_used": 450922,
   "status": "Executed"
 }
diff --git a/integration-tests/daospace/dao_proposal_rejected.exp b/integration-tests/daospace/dao_proposal_rejected.exp