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.

Sign up for GitHub

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

Jump to bottom

Complete DAOSpace #80

Merged
merged 5 commits into from
Aug 3, 2022
Merged

Complete DAOSpace #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
56f522c
complete DAOSpace MemberEvent
WGB5445 Aug 2, 2022
10718a0
Fix grant event
WGB5445 Aug 2, 2022
1c449b6
add grant plugin tag
WGB5445 Aug 2, 2022
6b7f803
Grant Event Add dao_id
WGB5445 Aug 2, 2022
9116954
reback Grant Event
WGB5445 Aug 3, 2022
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ compiled_package_info:
? address: "0x00000000000000000000000000000001"
name: YieldFarmingV2
: StarcoinFramework
source_digest: F9241307430FF1A2E3FD6619CD353E517FA033F5A7F0BC8E8C0A16FBD164E6D5
source_digest: BA57D9321DEFA9F6B6A7EA79596390061013B6D6E468A682CC3EFAD862776F97
build_flags:
dev_mode: false
test_mode: false
Expand Down
Binary file modified build/StarcoinFramework/bytecode_modules/InstallPluginProposalPlugin.mv
View file
Open in desktop
Binary file not shown.
Binary file modified build/StarcoinFramework/bytecode_modules/MemberProposalPlugin.mv
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions build/StarcoinFramework/docs/InstallPluginProposalPlugin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@



<pre><code><b>struct</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin">InstallPluginProposalPlugin</a> <b>has</b> drop
<pre><code><b>struct</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin">InstallPluginProposalPlugin</a> <b>has</b> drop, store
</code></pre>


Expand Down Expand Up @@ -104,7 +104,7 @@



<pre><code><b>public</b> <b>fun</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin_create_proposal">create_proposal</a>&lt;DAOT: store, ToInstallPluginT&gt;(sender: &signer, required_caps: vector&lt;<a href="DAOSpace.md#0x1_DAOSpace_CapType">DAOSpace::CapType</a>&gt;, action_delay: u64)
<pre><code><b>public</b> <b>fun</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin_create_proposal">create_proposal</a>&lt;DAOT: store, ToInstallPluginT: store&gt;(sender: &signer, required_caps: vector&lt;<a href="DAOSpace.md#0x1_DAOSpace_CapType">DAOSpace::CapType</a>&gt;, action_delay: u64)
</code></pre>


Expand All @@ -113,7 +113,7 @@
<summary>Implementation</summary>


<pre><code><b>public</b> <b>fun</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin_create_proposal">create_proposal</a>&lt;DAOT: store, ToInstallPluginT&gt;(sender: &signer, required_caps: vector&lt;CapType&gt;, action_delay: u64){
<pre><code><b>public</b> <b>fun</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin_create_proposal">create_proposal</a>&lt;DAOT: store, ToInstallPluginT: store&gt;(sender: &signer, required_caps: vector&lt;CapType&gt;, action_delay: u64){
<b>let</b> witness = <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin">InstallPluginProposalPlugin</a>{};

<b>let</b> cap = <a href="DAOSpace.md#0x1_DAOSpace_acquire_proposal_cap">DAOSpace::acquire_proposal_cap</a>&lt;DAOT, <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin">InstallPluginProposalPlugin</a>&gt;(&witness);
Expand All @@ -134,7 +134,7 @@



<pre><code><b>public</b>(<b>script</b>) <b>fun</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin_execute_proposal">execute_proposal</a>&lt;DAOT: store, ToInstallPluginT&gt;(sender: signer, proposal_id: u64)
<pre><code><b>public</b>(<b>script</b>) <b>fun</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin_execute_proposal">execute_proposal</a>&lt;DAOT: store, ToInstallPluginT: store&gt;(sender: signer, proposal_id: u64)
</code></pre>


Expand All @@ -143,7 +143,7 @@
<summary>Implementation</summary>


<pre><code><b>public</b> (<b>script</b>) <b>fun</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin_execute_proposal">execute_proposal</a>&lt;DAOT: store, ToInstallPluginT&gt;(sender: signer, proposal_id: u64){
<pre><code><b>public</b> (<b>script</b>) <b>fun</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin_execute_proposal">execute_proposal</a>&lt;DAOT: store, ToInstallPluginT: store&gt;(sender: signer, proposal_id: u64){
<b>let</b> witness = <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin">InstallPluginProposalPlugin</a>{};
<b>let</b> proposal_cap = <a href="DAOSpace.md#0x1_DAOSpace_acquire_proposal_cap">DAOSpace::acquire_proposal_cap</a>&lt;DAOT, <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin">InstallPluginProposalPlugin</a>&gt;(&witness);
<b>let</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin_InstallPluginAction">InstallPluginAction</a>{required_caps} = <a href="DAOSpace.md#0x1_DAOSpace_execute_proposal">DAOSpace::execute_proposal</a>&lt;DAOT, <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin">InstallPluginProposalPlugin</a>, <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin_InstallPluginAction">InstallPluginAction</a>&lt;ToInstallPluginT&gt;&gt;(&proposal_cap, &sender, proposal_id);
Expand Down
2 changes: 1 addition & 1 deletion build/StarcoinFramework/docs/MemberProposalPlugin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@



<pre><code><b>struct</b> <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin">MemberProposalPlugin</a> <b>has</b> drop
<pre><code><b>struct</b> <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin">MemberProposalPlugin</a> <b>has</b> drop, store
</code></pre>


Expand Down
Binary file modified build/StarcoinFramework/source_maps/InstallPluginProposalPlugin.mvsm
View file
Open in desktop
Binary file not shown.
Binary file modified build/StarcoinFramework/source_maps/MemberProposalPlugin.mvsm
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions integration-tests/daospace/dao_grant.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ task 5 'run'. lines 13-21:

task 8 'run'. lines 99-108:
{
"gas_used": 1160842,
"gas_used": 1157874,
"status": {
"Keep": "Executed"
}
}

task 9 'run'. lines 110-129:
{
"gas_used": 303120,
"gas_used": 315396,
"status": {
"Keep": "Executed"
}
}

task 10 'run'. lines 131-165:
{
"gas_used": 512593,
"gas_used": 561697,
"status": {
"Keep": "Executed"
}
Expand All @@ -52,15 +52,15 @@ task 12 'run'. lines 169-181:

task 13 'run'. lines 183-203:
{
"gas_used": 229093,
"gas_used": 241369,
"status": {
"Keep": "Executed"
}
}

task 15 'run'. lines 207-227:
{
"gas_used": 216727,
"gas_used": 229003,
"status": {
"Keep": "Executed"
}
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/daospace/dao_grant.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ module creator::DAOHelper {

}

struct XPlugin has drop{}
struct XPlugin has store, drop{}

public fun required_caps():vector<CapType>{
let caps = Vector::singleton(DAOSpace::proposal_cap_type());
Expand Down
6 changes: 3 additions & 3 deletions integration-tests/daospace/dao_proposal.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ task 5 'run'. lines 13-21:

task 8 'run'. lines 132-141:
{
"gas_used": 1158045,
"gas_used": 1155077,
"status": {
"Keep": "Executed"
}
Expand All @@ -34,15 +34,15 @@ task 10 'run'. lines 161-186:

task 11 'run'. lines 188-204:
{
"gas_used": 221123,
"gas_used": 221171,
"status": {
"Keep": "Executed"
}
}

task 12 'run'. lines 206-222:
{
"gas_used": 221123,
"gas_used": 221171,
"status": {
"Keep": "Executed"
}
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/daospace/dao_proposal.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ module creator::DAOHelper {

}

struct XPlugin has drop{}
struct XPlugin has store, drop{}

struct XAction<phantom TokenT> has store {
total: u128,
Expand Down
12 changes: 6 additions & 6 deletions integration-tests/daospace/stake_to_sbt_plugin.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ task 4 'run'. lines 9-17:

task 6 'run'. lines 60-68:
{
"gas_used": 1253942,
"gas_used": 1250974,
"status": {
"Keep": "Executed"
}
}

task 7 'run'. lines 70-106:
{
"gas_used": 556343,
"gas_used": 556439,
"status": {
"Keep": "Executed"
}
Expand All @@ -44,31 +44,31 @@ task 8 'run'. lines 108-119:

task 10 'run'. lines 123-136:
{
"gas_used": 249912,
"gas_used": 249960,
"status": {
"Keep": "Executed"
}
}

task 11 'run'. lines 138-154:
{
"gas_used": 337517,
"gas_used": 337565,
"status": {
"Keep": "Executed"
}
}

task 13 'run'. lines 158-171:
{
"gas_used": 288073,
"gas_used": 288121,
"status": {
"Keep": "Executed"
}
}

task 14 'run'. lines 173-189:
{
"gas_used": 459395,
"gas_used": 459491,
"status": {
"Keep": "Executed"
}
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/daospace/xdao.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ task 2 'run'. lines 7-14:

task 4 'run'. lines 53-60:
{
"gas_used": 1039414,
"gas_used": 1036446,
"status": {
"Keep": "Executed"
}
Expand Down
Loading