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

[DAOSpace] Plugin marketplace remove NFT #186

Merged
merged 3 commits into from
Oct 17, 2022
Merged

[DAOSpace] Plugin marketplace remove NFT #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4bebc1
feat: remove nft from plugin register
yubing744 Oct 15, 2022
97547df
feat: fix int test for plugin register
yubing744 Oct 16, 2022
d9201c2
feat: remove sender of publish_plugin_version
yubing744 Oct 16, 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
5 changes: 5 additions & 0 deletions .starcoin-ide/config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[mpm.package.build]
OPTIONS=["--doc", "--abi", "--force"]

[mpm.integration-test]
OPTIONS=["--current-as-stdlib"]
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 @@ -82,7 +82,7 @@



<pre><code><b>public</b> <b>fun</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin_initialize">initialize</a>(sender: &signer)
<pre><code><b>public</b> <b>fun</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin_initialize">initialize</a>(_sender: &signer)
</code></pre>


Expand All @@ -91,9 +91,11 @@
<summary>Implementation</summary>


<pre><code><b>public</b> <b>fun</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin_initialize">initialize</a>(sender: &signer) {
<pre><code><b>public</b> <b>fun</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin_initialize">initialize</a>(_sender: &signer) {
<b>let</b> witness = <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin">InstallPluginProposalPlugin</a>{};

<a href="DAOPluginMarketplace.md#0x1_DAOPluginMarketplace_register_plugin">DAOPluginMarketplace::register_plugin</a>&lt;<a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin">InstallPluginProposalPlugin</a>&gt;(
sender,
&witness,
b"<a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin">0x1::InstallPluginProposalPlugin</a>",
b"The plugin for install plugin proposal",
<a href="Option.md#0x1_Option_none">Option::none</a>(),
Expand All @@ -102,9 +104,7 @@
<b>let</b> implement_extpoints = <a href="Vector.md#0x1_Vector_empty">Vector::empty</a>&lt;vector&lt;u8&gt;&gt;();
<b>let</b> depend_extpoints = <a href="Vector.md#0x1_Vector_empty">Vector::empty</a>&lt;vector&lt;u8&gt;&gt;();

<b>let</b> witness = <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin">InstallPluginProposalPlugin</a>{};
<a href="DAOPluginMarketplace.md#0x1_DAOPluginMarketplace_publish_plugin_version">DAOPluginMarketplace::publish_plugin_version</a>&lt;<a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin">InstallPluginProposalPlugin</a>&gt;(
sender,
&witness,
b"v0.1.0",
*&implement_extpoints,
Expand Down
10 changes: 5 additions & 5 deletions build/StarcoinFramework/docs/MemberProposalPlugin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@



<pre><code><b>public</b> <b>fun</b> <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin_initialize">initialize</a>(sender: &signer)
<pre><code><b>public</b> <b>fun</b> <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin_initialize">initialize</a>(_sender: &signer)
</code></pre>


Expand All @@ -138,9 +138,11 @@
<summary>Implementation</summary>


<pre><code><b>public</b> <b>fun</b> <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin_initialize">initialize</a>(sender: &signer) {
<pre><code><b>public</b> <b>fun</b> <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin_initialize">initialize</a>(_sender: &signer) {
<b>let</b> witness = <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin">MemberProposalPlugin</a>{};

<a href="DAOPluginMarketplace.md#0x1_DAOPluginMarketplace_register_plugin">DAOPluginMarketplace::register_plugin</a>&lt;<a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin">MemberProposalPlugin</a>&gt;(
sender,
&witness,
b"<a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin">0x1::MemberProposalPlugin</a>",
b"The plugin for member proposal",
<a href="Option.md#0x1_Option_none">Option::none</a>(),
Expand All @@ -149,9 +151,7 @@
<b>let</b> implement_extpoints = <a href="Vector.md#0x1_Vector_empty">Vector::empty</a>&lt;vector&lt;u8&gt;&gt;();
<b>let</b> depend_extpoints = <a href="Vector.md#0x1_Vector_empty">Vector::empty</a>&lt;vector&lt;u8&gt;&gt;();

<b>let</b> witness = <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin">MemberProposalPlugin</a>{};
<a href="DAOPluginMarketplace.md#0x1_DAOPluginMarketplace_publish_plugin_version">DAOPluginMarketplace::publish_plugin_version</a>&lt;<a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin">MemberProposalPlugin</a>&gt;(
sender,
&witness,
b"v0.1.0",
*&implement_extpoints,
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.
16 changes: 8 additions & 8 deletions integration-tests/daospace/dao_grant.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
processed 17 tasks

task 8 'run'. lines 108-119:
task 8 'run'. lines 107-118:
{
"gas_used": 1838748,
"gas_used": 1645442,
"status": "Executed"
}

task 9 'run'. lines 121-140:
task 9 'run'. lines 120-139:
{
"gas_used": 427915,
"status": "Executed"
}

task 10 'run'. lines 142-174:
task 10 'run'. lines 141-173:
{
"gas_used": 630999,
"status": "Executed"
}

task 12 'run'. lines 178-190:
task 12 'run'. lines 177-189:
{
"gas_used": 52853,
"status": {
Expand All @@ -34,19 +34,19 @@ task 12 'run'. lines 178-190:
}
}

task 13 'run'. lines 192-212:
task 13 'run'. lines 191-211:
{
"gas_used": 253287,
"status": "Executed"
}

task 15 'run'. lines 216-236:
task 15 'run'. lines 215-235:
{
"gas_used": 240921,
"status": "Executed"
}

task 16 'run'. lines 238-252:
task 16 'run'. lines 237-251:
{
"gas_used": 345263,
"status": "Executed"
Expand Down
7 changes: 3 additions & 4 deletions integration-tests/daospace/dao_grant.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,10 @@ module creator::DAOHelper {

struct XPlugin has store, drop{}

public fun initialize_x_plugin(sender: &signer) {
public fun initialize_x_plugin(_sender: &signer) {
let witness = XPlugin{};
DAOPluginMarketplace::register_plugin<XPlugin>(
sender,
&witness,
b"0x1::XPlugin",
b"The X plugin.",
Option::none(),
Expand All @@ -69,9 +70,7 @@ module creator::DAOHelper {
let implement_extpoints = Vector::empty<vector<u8>>();
let depend_extpoints = Vector::empty<vector<u8>>();

let witness = XPlugin{};
DAOPluginMarketplace::publish_plugin_version<XPlugin>(
sender,
&witness,
b"v0.1.0",
*&implement_extpoints,
Expand Down
22 changes: 11 additions & 11 deletions integration-tests/daospace/dao_plugin_marketplace_publish_plugin_version.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,19 @@ processed 14 tasks

task 6 'run'. lines 46-54:
{
"gas_used": 381523,
"gas_used": 235944,
"status": "Executed"
}

task 7 'run'. lines 56-64:
{
"gas_used": 93711,
"gas_used": 139939,
"status": "Executed"
}

task 8 'run'. lines 66-74:
{
"gas_used": 82611,
"status": {
"MoveAbort": {
"location": {
Expand All @@ -17,17 +23,11 @@ task 7 'run'. lines 56-64:
"name": "DAOPluginMarketplace"
}
},
"abort_code": "26369"
"abort_code": "27399"
}
}
}

task 8 'run'. lines 66-74:
{
"gas_used": 187303,
"status": "Executed"
}

task 9 'view'. lines 76-76:
store key 0x00000000000000000000000000000001::DAOPluginMarketplace::PluginEntry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestPlugin::TestPlugin> {
id: 11
Expand Down Expand Up @@ -57,7 +57,7 @@ store key 0x00000000000000000000000000000001::DAOPluginMarketplace::PluginEntry<

task 10 'run'. lines 78-91:
{
"gas_used": 1154679,
"gas_used": 870495,
"status": "Executed"
}

Expand Down Expand Up @@ -138,7 +138,7 @@ store key 0x00000000000000000000000000000001::DAOPluginMarketplace::PluginEntry<

task 12 'run'. lines 95-103:
{
"gas_used": 155764,
"gas_used": 98367,
"status": {
"MoveAbort": {
"location": {
Expand Down
8 changes: 4 additions & 4 deletions integration-tests/daospace/dao_plugin_marketplace_publish_plugin_version.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ module creator::TestPlugin {

const NAME: vector<u8> = b"TestPlugin";

public(script) fun register(sender: signer) {
public(script) fun register(_sender: signer) {
let witness = TestPlugin{};
DAOPluginMarketplace::register_plugin<TestPlugin>(
&sender,
&witness,
NAME,
b"ipfs://description",
Option::none(),
);
}

public fun publish_version(sender: &signer, tag: vector<u8>) {
public fun publish_version(_sender: &signer, tag: vector<u8>) {
let vec = Vector::empty<vector<u8>>();
Vector::push_back<vector<u8>>(&mut vec, b"test_plugin");

let witness = TestPlugin{};
DAOPluginMarketplace::publish_plugin_version<TestPlugin>(
sender,
&witness,
tag,
*&vec,
Expand Down
22 changes: 11 additions & 11 deletions integration-tests/daospace/dao_plugin_marketplace_register_plugin.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
processed 13 tasks

task 6 'run'. lines 31-39:
task 6 'run'. lines 32-40:
{
"gas_used": 381523,
"gas_used": 235944,
"status": "Executed"
}

task 7 'run'. lines 41-49:
task 7 'run'. lines 42-50:
{
"gas_used": 33042,
"gas_used": 33113,
"status": {
"MoveAbort": {
"location": {
Expand All @@ -22,9 +22,9 @@ task 7 'run'. lines 41-49:
}
}

task 8 'run'. lines 51-59:
task 8 'run'. lines 52-60:
{
"gas_used": 33042,
"gas_used": 33113,
"status": {
"MoveAbort": {
"location": {
Expand All @@ -38,13 +38,13 @@ task 8 'run'. lines 51-59:
}
}

task 10 'run'. lines 87-95:
task 10 'run'. lines 90-98:
{
"gas_used": 429499,
"gas_used": 283920,
"status": "Executed"
}

task 11 'view'. lines 97-97:
task 11 'view'. lines 100-100:
store key 0x00000000000000000000000000000001::DAOPluginMarketplace::PluginEntry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestPlugin2::TestPlugin2> {
id: 12
name: 54657374506c7567696e32
Expand All @@ -61,9 +61,9 @@ store key 0x00000000000000000000000000000001::DAOPluginMarketplace::PluginEntry<
updated_at: 10
}

task 12 'run'. lines 99-107:
task 12 'run'. lines 102-110:
{
"gas_used": 46958,
"gas_used": 47029,
"status": {
"MoveAbort": {
"location": {
Expand Down
11 changes: 7 additions & 4 deletions integration-tests/daospace/dao_plugin_marketplace_register_plugin.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ module creator::TestPlugin {
const NAME: vector<u8> = b"TestPlugin";

/// directly upgrade the sender account to DAOAccount and create DAO
public(script) fun register(sender: signer) {
public(script) fun register(_sender: signer) {
let witness = TestPlugin{};
DAOPluginMarketplace::register_plugin<TestPlugin>(
&sender,
&witness,
NAME,
b"ipfs://description",
Option::none(),
Expand Down Expand Up @@ -70,13 +71,15 @@ module creator::TestPlugin2 {
const NAME: vector<u8> = b"TestPlugin2";

/// directly upgrade the sender account to DAOAccount and create DAO
public(script) fun register(sender: signer) {
public(script) fun register(_sender: signer) {
let witness = TestPlugin2{};

let labels = Vector::empty<vector<u8>>();
Vector::push_back<vector<u8>>(&mut labels, b"OS=Starcoin");
Vector::push_back<vector<u8>>(&mut labels, b"Store=IPFS");

DAOPluginMarketplace::register_plugin<TestPlugin2>(
&sender,
&witness,
NAME,
b"ipfs://description",
Option::some(labels),
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/daospace/dao_plugin_marketplace_star_plugin.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ processed 14 tasks

task 6 'run'. lines 46-54:
{
"gas_used": 381523,
"gas_used": 235944,
"status": "Executed"
}

Expand Down
8 changes: 4 additions & 4 deletions integration-tests/daospace/dao_plugin_marketplace_star_plugin.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ module creator::TestPlugin {

const NAME: vector<u8> = b"TestPlugin";

public(script) fun register(sender: signer) {
public(script) fun register(_sender: signer) {
let witness = TestPlugin{};
DAOPluginMarketplace::register_plugin<TestPlugin>(
&sender,
&witness,
NAME,
b"ipfs://description",
Option::none(),
);
}

public(script) fun publish_version(sender: signer) {
public(script) fun publish_version(_sender: signer) {
let vec = Vector::empty<vector<u8>>();
Vector::push_back<vector<u8>>(&mut vec, b"test_plugin");

let witness = TestPlugin{};
DAOPluginMarketplace::publish_plugin_version<TestPlugin>(
&sender,
&witness,
b"v0.1.0",
*&vec,
Expand Down
Loading