Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature] Member Grant Offer #174

Merged
merged 10 commits into from
Oct 12, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/StarcoinFramework/BuildInfo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ compiled_package_info:
? address: "0x00000000000000000000000000000001"
name: YieldFarmingV2
: StarcoinFramework
source_digest: 3977FFB3F8ED44A1FD4AFCBEE2027EFB707611899641612250DBBF23CC6D55EB
source_digest: 655563464268B300E3B546D5F0FC81C0376AD883A9B12A2249F2EDD307D8A931
build_flags:
dev_mode: false
test_mode: false
Expand Down
Binary file modified build/StarcoinFramework/bytecode_modules/MemberProposalPlugin.mv
Binary file not shown.
27 changes: 27 additions & 0 deletions build/StarcoinFramework/docs/MemberProposalPlugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

- [Struct `MemberProposalPlugin`](#0x1_MemberProposalPlugin_MemberProposalPlugin)
- [Struct `MemberJoinAction`](#0x1_MemberProposalPlugin_MemberJoinAction)
- [Constants](#@Constants_0)
- [Function `initialize`](#0x1_MemberProposalPlugin_initialize)
- [Function `required_caps`](#0x1_MemberProposalPlugin_required_caps)
- [Function `create_proposal`](#0x1_MemberProposalPlugin_create_proposal)
Expand All @@ -19,6 +20,7 @@

<pre><code><b>use</b> <a href="DAOPluginMarketplace.md#0x1_DAOPluginMarketplace">0x1::DAOPluginMarketplace</a>;
<b>use</b> <a href="DAOSpace.md#0x1_DAOSpace">0x1::DAOSpace</a>;
<b>use</b> <a href="Errors.md#0x1_Errors">0x1::Errors</a>;
<b>use</b> <a href="GenesisSignerCapability.md#0x1_GenesisSignerCapability">0x1::GenesisSignerCapability</a>;
<b>use</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin">0x1::InstallPluginProposalPlugin</a>;
<b>use</b> <a href="Option.md#0x1_Option">0x1::Option</a>;
Expand Down Expand Up @@ -99,6 +101,29 @@

</details>

<a name="@Constants_0"></a>

## Constants


<a name="0x1_MemberProposalPlugin_ERR_MEMBER_EXIST"></a>



<pre><code><b>const</b> <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin_ERR_MEMBER_EXIST">ERR_MEMBER_EXIST</a>: u64 = 101;
</code></pre>



<a name="0x1_MemberProposalPlugin_ERR_MEMBER_OFFER_EXIST"></a>



<pre><code><b>const</b> <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin_ERR_MEMBER_OFFER_EXIST">ERR_MEMBER_OFFER_EXIST</a>: u64 = 102;
</code></pre>



<a name="0x1_MemberProposalPlugin_initialize"></a>

## Function `initialize`
Expand Down Expand Up @@ -193,6 +218,8 @@
image_data,
image_url
};
<b>assert</b>!(!<a href="DAOSpace.md#0x1_DAOSpace_is_exist_member_offer">DAOSpace::is_exist_member_offer</a>&lt;DAOT&gt;(member), <a href="Errors.md#0x1_Errors_already_published">Errors::already_published</a>(<a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin_ERR_MEMBER_OFFER_EXIST">ERR_MEMBER_OFFER_EXIST</a>));
<b>assert</b>!(!<a href="DAOSpace.md#0x1_DAOSpace_is_member">DAOSpace::is_member</a>&lt;DAOT&gt;(member), <a href="Errors.md#0x1_Errors_already_published">Errors::already_published</a>(<a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin_ERR_MEMBER_EXIST">ERR_MEMBER_EXIST</a>));
<a href="DAOSpace.md#0x1_DAOSpace_create_proposal">DAOSpace::create_proposal</a>(&cap, sender, action, description, action_delay);
}
</code></pre>
Expand Down
Binary file modified build/StarcoinFramework/source_maps/MemberProposalPlugin.mvsm
Binary file not shown.
2 changes: 1 addition & 1 deletion integration-tests/daospace/dao_create.exp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ task 7 'run'. lines 59-67:

task 10 'run'. lines 73-84:
{
"gas_used": 1054080,
"gas_used": 1236985,
"status": "Executed"
}
2 changes: 1 addition & 1 deletion integration-tests/daospace/dao_ext.exp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ processed 9 tasks

task 6 'run'. lines 56-65:
{
"gas_used": 1008684,
"gas_used": 1088133,
"status": "Executed"
}

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/daospace/dao_grant.exp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ processed 17 tasks

task 8 'run'. lines 108-119:
{
"gas_used": 1812265,
"gas_used": 1891714,
"status": "Executed"
}

Expand Down
6 changes: 3 additions & 3 deletions integration-tests/daospace/dao_proposal.exp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ processed 42 tasks

task 7 'run'. lines 158-169:
{
"gas_used": 1809468,
"gas_used": 1888917,
"status": "Executed"
}

Expand All @@ -20,13 +20,13 @@ task 9 'run'. lines 187-212:

task 11 'run'. lines 217-233:
{
"gas_used": 239249,
"gas_used": 342705,
"status": "Executed"
}

task 12 'run'. lines 235-251:
{
"gas_used": 239249,
"gas_used": 342705,
"status": "Executed"
}

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/daospace/dao_proposal_rejected.exp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ processed 40 tasks

task 7 'run'. lines 126-135:
{
"gas_used": 1212834,
"gas_used": 1292283,
"status": {
"MoveAbort": {
"location": {
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/daospace/dao_upgrade.exp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ task 9 'run'. lines 130-144:

task 10 'run'. lines 145-154:
{
"gas_used": 1095207,
"gas_used": 1174656,
"status": "Executed"
}

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/daospace/dao_upgrade_incompatible.exp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ task 9 'run'. lines 117-132:

task 10 'run'. lines 134-143:
{
"gas_used": 1095207,
"gas_used": 1174656,
"status": "Executed"
}

Expand Down
6 changes: 3 additions & 3 deletions integration-tests/daospace/stake_to_sbt_plugin.exp
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ processed 17 tasks

task 5 'run'. lines 71-79:
{
"gas_used": 1758694,
"gas_used": 1838143,
"status": "Executed"
}

task 6 'run'. lines 81-117:
{
"gas_used": 848983,
"gas_used": 984001,
"status": "Executed"
}

Expand Down Expand Up @@ -60,7 +60,7 @@ task 15 'run'. lines 204-219:

task 16 'run'. lines 221-232:
{
"gas_used": 500218,
"gas_used": 635236,
"status": {
"MoveAbort": {
"location": {
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/daospace/xdao.exp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ processed 7 tasks

task 3 'run'. lines 54-61:
{
"gas_used": 1168270,
"gas_used": 1247719,
"status": "Executed"
}

Expand Down
4 changes: 2 additions & 2 deletions integration-tests/daospaceplugin/gas_oracle_plugin.exp
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ task 6 'run'. lines 79-87:

task 7 'run'. lines 89-98:
{
"gas_used": 1233206,
"gas_used": 1312655,
"status": "Executed"
}

task 9 'run'. lines 102-116:
{
"gas_used": 269055,
"gas_used": 373011,
"status": "Executed"
}

Expand Down
4 changes: 2 additions & 2 deletions integration-tests/daospaceplugin/mint_proposal_plugin.exp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ task 8 'run'. lines 71-85:

task 9 'run'. lines 87-96:
{
"gas_used": 1233206,
"gas_used": 1312655,
"status": "Executed"
}

Expand Down Expand Up @@ -37,7 +37,7 @@ task 11 'run'. lines 110-123:

task 12 'run'. lines 125-139:
{
"gas_used": 269055,
"gas_used": 373011,
"status": "Executed"
}

Expand Down
4 changes: 2 additions & 2 deletions integration-tests/daospaceplugin/salary_gov_plugin.exp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ processed 21 tasks

task 7 'run'. lines 251-263:
{
"gas_used": 1767430,
"gas_used": 1846879,
"status": "Executed"
}

Expand All @@ -14,7 +14,7 @@ task 8 'run'. lines 266-274:

task 10 'run'. lines 279-294:
{
"gas_used": 283879,
"gas_used": 387835,
"status": "Executed"
}

Expand Down
8 changes: 4 additions & 4 deletions integration-tests/starcoin_dao/starcoin_onchain_config.exp
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ processed 42 tasks

task 11 'run'. lines 23-37:
{
"gas_used": 783297,
"gas_used": 920315,
"status": "Executed"
}

task 12 'run'. lines 39-53:
{
"gas_used": 783297,
"gas_used": 920315,
"status": "Executed"
}

task 13 'run'. lines 55-69:
{
"gas_used": 783297,
"gas_used": 920315,
"status": "Executed"
}

task 14 'run'. lines 71-85:
{
"gas_used": 783297,
"gas_used": 920315,
"status": "Executed"
}

Expand Down
8 changes: 4 additions & 4 deletions integration-tests/starcoin_dao/starcoin_upgrade_module.exp
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ processed 45 tasks

task 11 'run'. lines 23-37:
{
"gas_used": 783297,
"gas_used": 920315,
"status": "Executed"
}

task 12 'run'. lines 39-53:
{
"gas_used": 783297,
"gas_used": 920315,
"status": "Executed"
}

task 13 'run'. lines 55-69:
{
"gas_used": 783297,
"gas_used": 920315,
"status": "Executed"
}

task 14 'run'. lines 71-85:
{
"gas_used": 783297,
"gas_used": 920315,
"status": "Executed"
}

Expand Down
Loading