Revert "[DAOSpace] Plugin marketplace remove NFT (#186)"

This reverts commit f186ec8.
starcoinorg · Mar 2, 2023 · e8f4ae1 · e8f4ae1
1 parent 1acc292
commit e8f4ae1
Show file tree

Hide file tree

Showing 36 changed files with 253 additions and 161 deletions.
diff --git a/.starcoin-ide/config b/.starcoin-ide/config
diff --git a/build/StarcoinFramework/bytecode_modules/InstallPluginProposalPlugin.mv b/build/StarcoinFramework/bytecode_modules/InstallPluginProposalPlugin.mv
diff --git a/build/StarcoinFramework/bytecode_modules/MemberProposalPlugin.mv b/build/StarcoinFramework/bytecode_modules/MemberProposalPlugin.mv
diff --git a/build/StarcoinFramework/docs/InstallPluginProposalPlugin.md b/build/StarcoinFramework/docs/InstallPluginProposalPlugin.md
@@ -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>
 
 
@@ -91,11 +91,9 @@
 <summary>Implementation</summary>
 
 
-<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>{};
-
+<pre><code><b>public</b> <b>fun</b> <a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin_initialize">initialize</a>(sender: &signer) {
     <a href="DAOPluginMarketplace.md#0x1_DAOPluginMarketplace_register_plugin">DAOPluginMarketplace::register_plugin</a>&lt;<a href="InstallPluginProposalPlugin.md#0x1_InstallPluginProposalPlugin">InstallPluginProposalPlugin</a>&gt;(
-        &witness,
+        sender,
         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>(),
@@ -104,7 +102,9 @@
     <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,

diff --git a/build/StarcoinFramework/docs/MemberProposalPlugin.md b/build/StarcoinFramework/docs/MemberProposalPlugin.md
@@ -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>
 
 
@@ -138,11 +138,9 @@
 <summary>Implementation</summary>
 
 
-<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>{};
-
+<pre><code><b>public</b> <b>fun</b> <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin_initialize">initialize</a>(sender: &signer) {
     <a href="DAOPluginMarketplace.md#0x1_DAOPluginMarketplace_register_plugin">DAOPluginMarketplace::register_plugin</a>&lt;<a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin">MemberProposalPlugin</a>&gt;(
-        &witness,
+        sender,
         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>(),
@@ -151,7 +149,9 @@
     <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,

diff --git a/build/StarcoinFramework/source_maps/InstallPluginProposalPlugin.mvsm b/build/StarcoinFramework/source_maps/InstallPluginProposalPlugin.mvsm
diff --git a/build/StarcoinFramework/source_maps/MemberProposalPlugin.mvsm b/build/StarcoinFramework/source_maps/MemberProposalPlugin.mvsm
diff --git a/integration-tests/daospace/dao_grant.exp b/integration-tests/daospace/dao_grant.exp
@@ -1,24 +1,24 @@
 processed 17 tasks
 
-task 8 'run'. lines 107-118:
+task 8 'run'. lines 108-119:
 {
-  "gas_used": 1645442,
+  "gas_used": 1838748,
   "status": "Executed"
 }
 
-task 9 'run'. lines 120-139:
+task 9 'run'. lines 121-140:
 {
   "gas_used": 427915,
   "status": "Executed"
 }
 
-task 10 'run'. lines 141-173:
+task 10 'run'. lines 142-174:
 {
   "gas_used": 630999,
   "status": "Executed"
 }
 
-task 12 'run'. lines 177-189:
+task 12 'run'. lines 178-190:
 {
   "gas_used": 52853,
   "status": {
@@ -34,19 +34,19 @@ task 12 'run'. lines 177-189:
   }
 }
 
-task 13 'run'. lines 191-211:
+task 13 'run'. lines 192-212:
 {
   "gas_used": 253287,
   "status": "Executed"
 }
 
-task 15 'run'. lines 215-235:
+task 15 'run'. lines 216-236:
 {
   "gas_used": 240921,
   "status": "Executed"
 }
 
-task 16 'run'. lines 237-251:
+task 16 'run'. lines 238-252:
 {
   "gas_used": 345263,
   "status": "Executed"

diff --git a/integration-tests/daospace/dao_grant.move b/integration-tests/daospace/dao_grant.move
@@ -58,10 +58,9 @@ module creator::DAOHelper {
 
     struct XPlugin has store, drop{}
 
-    public fun initialize_x_plugin(_sender: &signer) {
-        let witness = XPlugin{};
+    public fun initialize_x_plugin(sender: &signer) {
         DAOPluginMarketplace::register_plugin<XPlugin>(
-            &witness,
+            sender,
             b"0x1::XPlugin",
             b"The X plugin.",
             Option::none(),
@@ -70,7 +69,9 @@ 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,

diff --git a/integration-tests/daospace/dao_plugin_marketplace_publish_plugin_version.exp b/integration-tests/daospace/dao_plugin_marketplace_publish_plugin_version.exp
@@ -2,19 +2,13 @@ processed 14 tasks
 
 task 6 'run'. lines 46-54:
 {
-  "gas_used": 235944,
+  "gas_used": 381523,
   "status": "Executed"
 }
 
 task 7 'run'. lines 56-64:
 {
-  "gas_used": 139939,
-  "status": "Executed"
-}
-
-task 8 'run'. lines 66-74:
-{
-  "gas_used": 82611,
+  "gas_used": 93711,
   "status": {
     "MoveAbort": {
       "location": {
@@ -23,11 +17,17 @@ task 8 'run'. lines 66-74:
           "name": "DAOPluginMarketplace"
         }
       },
-      "abort_code": "27399"
+      "abort_code": "26369"
     }
   }
 }
 
+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
@@ -57,7 +57,7 @@ store key 0x00000000000000000000000000000001::DAOPluginMarketplace::PluginEntry<
 
 task 10 'run'. lines 78-91:
 {
-  "gas_used": 870495,
+  "gas_used": 1154679,
   "status": "Executed"
 }
 
@@ -138,7 +138,7 @@ store key 0x00000000000000000000000000000001::DAOPluginMarketplace::PluginEntry<
 
 task 12 'run'. lines 95-103:
 {
-  "gas_used": 98367,
+  "gas_used": 155764,
   "status": {
     "MoveAbort": {
       "location": {

diff --git a/integration-tests/daospace/dao_plugin_marketplace_publish_plugin_version.move b/integration-tests/daospace/dao_plugin_marketplace_publish_plugin_version.move
@@ -18,22 +18,22 @@ module creator::TestPlugin {
 
     const NAME: vector<u8> = b"TestPlugin";
 
-    public(script) fun register(_sender: signer) {
-        let witness = TestPlugin{};
+    public(script) fun register(sender: signer) {
         DAOPluginMarketplace::register_plugin<TestPlugin>(
-            &witness,
+            &sender,
             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, 

diff --git a/integration-tests/daospace/dao_plugin_marketplace_register_plugin.exp b/integration-tests/daospace/dao_plugin_marketplace_register_plugin.exp
@@ -1,14 +1,14 @@
 processed 13 tasks
 
-task 6 'run'. lines 32-40:
+task 6 'run'. lines 31-39:
 {
-  "gas_used": 235944,
+  "gas_used": 381523,
   "status": "Executed"
 }
 
-task 7 'run'. lines 42-50:
+task 7 'run'. lines 41-49:
 {
-  "gas_used": 33113,
+  "gas_used": 33042,
   "status": {
     "MoveAbort": {
       "location": {
@@ -22,9 +22,9 @@ task 7 'run'. lines 42-50:
   }
 }
 
-task 8 'run'. lines 52-60:
+task 8 'run'. lines 51-59:
 {
-  "gas_used": 33113,
+  "gas_used": 33042,
   "status": {
     "MoveAbort": {
       "location": {
@@ -38,13 +38,13 @@ task 8 'run'. lines 52-60:
   }
 }
 
-task 10 'run'. lines 90-98:
+task 10 'run'. lines 87-95:
 {
-  "gas_used": 283920,
+  "gas_used": 429499,
   "status": "Executed"
 }
 
-task 11 'view'. lines 100-100:
+task 11 'view'. lines 97-97:
 store key 0x00000000000000000000000000000001::DAOPluginMarketplace::PluginEntry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestPlugin2::TestPlugin2> {
     id: 12
     name: 54657374506c7567696e32
@@ -61,9 +61,9 @@ store key 0x00000000000000000000000000000001::DAOPluginMarketplace::PluginEntry<
     updated_at: 10
 }
 
-task 12 'run'. lines 102-110:
+task 12 'run'. lines 99-107:
 {
-  "gas_used": 47029,
+  "gas_used": 46958,
   "status": {
     "MoveAbort": {
       "location": {

diff --git a/integration-tests/daospace/dao_plugin_marketplace_register_plugin.move b/integration-tests/daospace/dao_plugin_marketplace_register_plugin.move
@@ -18,10 +18,9 @@ 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) {
-        let witness = TestPlugin{};
+    public(script) fun register(sender: signer) {
         DAOPluginMarketplace::register_plugin<TestPlugin>(
-            &witness,
+            &sender,
             NAME, 
             b"ipfs://description",
             Option::none(),
@@ -71,15 +70,13 @@ 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) {
-        let witness = TestPlugin2{};
-
+    public(script) fun register(sender: signer) {
         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>(
-            &witness,
+            &sender,
             NAME, 
             b"ipfs://description",
             Option::some(labels),

diff --git a/integration-tests/daospace/dao_plugin_marketplace_star_plugin.exp b/integration-tests/daospace/dao_plugin_marketplace_star_plugin.exp
@@ -2,7 +2,7 @@ processed 14 tasks
 
 task 6 'run'. lines 46-54:
 {
-  "gas_used": 235944,
+  "gas_used": 381523,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospace/dao_plugin_marketplace_star_plugin.move b/integration-tests/daospace/dao_plugin_marketplace_star_plugin.move
@@ -18,22 +18,22 @@ module creator::TestPlugin {
 
     const NAME: vector<u8> = b"TestPlugin";
 
-    public(script) fun register(_sender: signer) {
-        let witness = TestPlugin{};
+    public(script) fun register(sender: signer) {
         DAOPluginMarketplace::register_plugin<TestPlugin>(
-            &witness,
+            &sender,
             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,