Skip to content

Commit

Permalink
[ Feature ] do deposit when proposal state is DEFEATED (#122)
Browse files Browse the repository at this point in the history
* add clean_up_defeated_proposal

* add  DAO config

* Fix do_proposal_state REJECTED and DEFEATED

* Fix test

* Modify the criteria for determining the DEFEATED status of a proposal

* rename rejected_proposal to reject_proposal
  • Loading branch information
WGB5445 committed Sep 16, 2022
1 parent 7b44ee7 commit 3274821
Show file tree
Hide file tree
Showing 15 changed files with 626 additions and 46 deletions.
2 changes: 1 addition & 1 deletion build/StarcoinFramework/BuildInfo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ compiled_package_info:
? address: "0x00000000000000000000000000000001"
name: YieldFarmingV2
: StarcoinFramework
source_digest: 7CD9E807A29B6AE9D8C370363A262231F0337215FE432C7E16ADE2FD965B7E13
source_digest: B85EC5CCB8E021D9974D19AD20C43DBC20D2AE625A72A096A5BAED676B5D9F1F
build_flags:
dev_mode: false
test_mode: false
Expand Down
Binary file modified build/StarcoinFramework/bytecode_modules/StdlibUpgradeScripts.mv
Binary file not shown.
3 changes: 2 additions & 1 deletion build/StarcoinFramework/docs/StdlibUpgradeScripts.md
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,8 @@ 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>() {
<a href="StarcoinDAO.md#0x1_StarcoinDAO_create_dao">StarcoinDAO::create_dao</a>( 60000, 120000, 10, 10000, 0);
//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);
}
</code></pre>

Expand Down
Binary file modified build/StarcoinFramework/source_maps/StdlibUpgradeScripts.mvsm
Binary file not shown.
6 changes: 3 additions & 3 deletions integration-tests/daospace/dao_proposal.exp
Original file line number Diff line number Diff line change
Expand Up @@ -109,18 +109,18 @@ task 34 'run'. lines 391-404:

task 36 'run'. lines 409-424:
{
"gas_used": 106076,
"gas_used": 106454,
"status": "Executed"
}

task 39 'run'. lines 432-442:
{
"gas_used": 115064,
"gas_used": 115442,
"status": "Executed"
}

task 41 'run'. lines 447-459:
{
"gas_used": 450922,
"gas_used": 451300,
"status": "Executed"
}
120 changes: 120 additions & 0 deletions integration-tests/daospace/dao_proposal_rejected.exp
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
processed 40 tasks

task 7 'run'. lines 126-135:
{
"gas_used": 1192902,
"status": "Executed"
}

task 8 'run'. lines 139-153:
{
"gas_used": 109239,
"status": "Executed"
}

task 9 'run'. lines 155-180:
{
"gas_used": 306386,
"status": "Executed"
}

task 11 'run'. lines 185-201:
{
"gas_used": 235032,
"status": "Executed"
}

task 12 'run'. lines 203-219:
{
"gas_used": 235032,
"status": "Executed"
}

task 16 'run'. lines 227-241:
{
"gas_used": 104944,
"status": "Executed"
}

task 19 'run'. lines 248-261:
{
"gas_used": 532278,
"status": {
"MoveAbort": {
"location": {
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "Block"
}
},
"abort_code": "4609"
}
}
}

task 22 'run'. lines 268-279:
{
"gas_used": 577624,
"status": "Executed"
}

task 23 'run'. lines 282-306:
{
"gas_used": 476235,
"status": "Executed"
}

task 25 'run'. lines 310-319:
{
"gas_used": 11943,
"status": "Executed"
}

task 26 'call'. lines 321-321:
"0xb5d577dc9ce59725e29886632e69ecdf/1/0x00000000000000000000000000000001::IdentifierNFT::IdentifierNFT<0x00000000000000000000000000000001::DAOSpace::DAOMember<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::DAOHelper::X>,0x00000000000000000000000000000001::DAOSpace::DAOMemberBody<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::DAOHelper::X>>"

task 28 'run'. lines 325-344:
{
"gas_used": 6529557,
"status": "Executed"
}

task 29 'call'. lines 347-347:
"0xa7dcef9aef26202fce82a7c7d6672afb/1/0x00000000000000000000000000000001::IdentifierNFT::IdentifierNFT<0x00000000000000000000000000000001::DAOSpace::DAOMember<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::DAOHelper::X>,0x00000000000000000000000000000001::DAOSpace::DAOMemberBody<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::DAOHelper::X>>"

task 31 'run'. lines 351-364:
{
"gas_used": 6192786,
"status": "Executed"
}

task 32 'call'. lines 367-367:
"0x3d4926eeda5b14b0ac979269ee79e40e/1/0x00000000000000000000000000000001::IdentifierNFT::IdentifierNFT<0x00000000000000000000000000000001::DAOSpace::DAOMember<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::DAOHelper::X>,0x00000000000000000000000000000001::DAOSpace::DAOMemberBody<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::DAOHelper::X>>"

task 34 'run'. lines 371-384:
{
"gas_used": 35207,
"status": {
"MoveAbort": {
"location": {
"Module": {
"address": "0x00000000000000000000000000000001",
"name": "DAOSpace"
}
},
"abort_code": "51201"
}
}
}

task 36 'run'. lines 389-404:
{
"gas_used": 105721,
"status": "Executed"
}

task 39 'run'. lines 412-428:
{
"gas_used": 321723,
"status": "Executed"
}
Loading

0 comments on commit 3274821

Please sign in to comment.