create-dubhe 0.0.19 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-dubhe",
-  "version": "0.0.19",
+  "version": "0.1.1",
   "type": "module",
   "license": "MIT",
   "author": "team@obelisk.build",

package/template/{nextjs/sui-template/contracts/counter/sources/codegen/schemas/default → 101/sui-template/contracts/counter/sources/codegen}/dapp/metadata.move

@@ -76,27 +76,27 @@
     self.partners = partners;
   }
 
-  public fun get_name(self: DappMetadata): String {
+  public fun get_name(self: &DappMetadata): String {
     self.name
   }
 
-  public fun get_description(self: DappMetadata): String {
+  public fun get_description(self: &DappMetadata): String {
     self.description
   }
 
-  public fun get_icon_url(self: DappMetadata): String {
+  public fun get_icon_url(self: &DappMetadata): String {
     self.icon_url
   }
 
-  public fun get_website_url(self: DappMetadata): String {
+  public fun get_website_url(self: &DappMetadata): String {
     self.website_url
   }
 
-  public fun get_created_at(self: DappMetadata): u64 {
+  public fun get_created_at(self: &DappMetadata): u64 {
     self.created_at
   }
 
-  public fun get_partners(self: DappMetadata): vector<String> {
+  public fun get_partners(self: &DappMetadata): vector<String> {
     self.partners
   }
 }

package/template/101/sui-template/contracts/counter/sources/codegen/dapp/schema.move

@@ -0,0 +1,112 @@
+  // Copyright (c) Obelisk Labs, Inc.
+  // SPDX-License-Identifier: Apache-2.0
+  #[allow(unused_use)]
+  
+  /* Autogenerated file. Do not edit manually. */
+  
+  module counter::dapp_schema {
+
+  use counter::dapp_metadata::DappMetadata;
+
+  use dubhe::storage_value;
+
+  use dubhe::storage_value::StorageValue;
+
+  use dubhe::storage;
+
+  use sui::transfer::public_share_object;
+
+  use dubhe::type_info;
+
+  public struct Dapp has key, store {
+    id: UID,
+  }
+
+  public fun borrow_admin(self: &Dapp): &StorageValue<address> {
+    storage::borrow_field(&self.id, b"admin")
+  }
+
+  public(package) fun admin(self: &mut Dapp): &mut StorageValue<address> {
+    storage::borrow_mut_field(&mut self.id, b"admin")
+  }
+
+  public fun borrow_package_id(self: &Dapp): &StorageValue<address> {
+    storage::borrow_field(&self.id, b"package_id")
+  }
+
+  public(package) fun package_id(self: &mut Dapp): &mut StorageValue<address> {
+    storage::borrow_mut_field(&mut self.id, b"package_id")
+  }
+
+  public fun borrow_version(self: &Dapp): &StorageValue<u32> {
+    storage::borrow_field(&self.id, b"version")
+  }
+
+  public(package) fun version(self: &mut Dapp): &mut StorageValue<u32> {
+    storage::borrow_mut_field(&mut self.id, b"version")
+  }
+
+  public fun borrow_metadata(self: &Dapp): &StorageValue<DappMetadata> {
+    storage::borrow_field(&self.id, b"metadata")
+  }
+
+  public(package) fun metadata(self: &mut Dapp): &mut StorageValue<DappMetadata> {
+    storage::borrow_mut_field(&mut self.id, b"metadata")
+  }
+
+  public fun borrow_safe_mode(self: &Dapp): &StorageValue<bool> {
+    storage::borrow_field(&self.id, b"safe_mode")
+  }
+
+  public(package) fun safe_mode(self: &mut Dapp): &mut StorageValue<bool> {
+    storage::borrow_mut_field(&mut self.id, b"safe_mode")
+  }
+
+  public(package) fun borrow_schemas(self: &Dapp): &StorageValue<vector<address>> {
+    storage::borrow_field(&self.id, b"schemas")
+  }
+
+  public(package) fun schemas(self: &mut Dapp): &mut StorageValue<vector<address>> {
+    storage::borrow_mut_field(&mut self.id, b"schemas")
+  }
+
+  public(package) fun create(ctx: &mut TxContext): Dapp {
+    let mut id = object::new(ctx);
+    storage::add_field<StorageValue<address>>(&mut id, b"admin", storage_value::new(b"admin", ctx));
+    storage::add_field<StorageValue<address>>(&mut id, b"package_id", storage_value::new(b"package_id", ctx));
+    storage::add_field<StorageValue<u32>>(&mut id, b"version", storage_value::new(b"version", ctx));
+    storage::add_field<StorageValue<DappMetadata>>(&mut id, b"metadata", storage_value::new(b"metadata", ctx));
+    storage::add_field<StorageValue<bool>>(&mut id, b"safe_mode", storage_value::new(b"safe_mode", ctx));
+    storage::add_field<StorageValue<vector<address>>>(&mut id, b"schemas", storage_value::new(b"schemas", ctx));
+    Dapp { id }
+  }
+
+  public(package) fun upgrade<DappKey: drop>(dapp: &mut Dapp, ctx: &TxContext) {
+    assert!(dapp.borrow_metadata().contains(), 0);
+    assert!(dapp.borrow_admin().get() == ctx.sender(), 0);
+    let new_package_id = type_info::current_package_id<DappKey>();
+    dapp.package_id().set(new_package_id);
+    let current_version = dapp.version()[];
+    dapp.version().set(current_version + 1);
+  }
+
+  public(package) fun add_schema<Schema: key + store>(dapp: &mut Dapp, schema: Schema) {
+    let mut schemas = dapp.schemas()[];
+    schemas.push_back(object::id_address<Schema>(&schema));
+    dapp.schemas().set(schemas);
+    public_share_object(schema);
+  }
+
+  #[test_only]
+
+  public fun create_dapp_for_testing(ctx: &mut TxContext): Dapp {
+    create(ctx)
+  }
+
+  #[test_only]
+
+  public fun distroy_dapp_for_testing(dapp: Dapp) {
+    let Dapp { id } = dapp;
+    id.delete();
+  }
+}

package/template/{nextjs/sui-template/contracts/counter/sources/codegen/schemas/default → 101/sui-template/contracts/counter/sources/codegen}/dapp/system.move

@@ -23,7 +23,7 @@ module counter::dapp_system {
   public(package) fun create(name: String, description: String, clock: &Clock, ctx: &mut TxContext): Dapp {
     let mut dapp = dapp_schema::create(ctx);
     assert!(!dapp.borrow_metadata().contains(), 0);
-    dapp.borrow_mut_metadata().set(
+    dapp.metadata().set(
             dapp_metadata::new(
                 name,
                 description,
@@ -34,11 +34,11 @@ module counter::dapp_system {
             )
         );
     let package_id = type_info::current_package_id<DappKey>();
-    dapp.borrow_mut_package_id().set(package_id);
-    dapp.borrow_mut_admin().set(ctx.sender());
-    dapp.borrow_mut_version().set(1);
-    dapp.borrow_mut_safe_mode().set(false);
-    dapp.borrow_mut_schemas().set(vector[]);
+    dapp.package_id().set(package_id);
+    dapp.admin().set(ctx.sender());
+    dapp.version().set(1);
+    dapp.safe_mode().set(false);
+    dapp.schemas().set(vector[]);
     dapp
   }
 
@@ -51,10 +51,10 @@ module counter::dapp_system {
     partners: vector<String>,
     ctx: &TxContext,
   ) {
-    assert!(dapp.borrow_admin().contains(), 0);
-    assert!(dapp.borrow_admin().get() == ctx.sender(), 0);
-    let created_at = dapp.borrow_mut_metadata().take().get_created_at();
-    dapp.borrow_mut_metadata().set(
+    let admin = dapp.admin().try_get();
+    assert!(admin == option::some(ctx.sender()), 0);
+    let created_at = dapp.metadata().get().get_created_at();
+    dapp.metadata().set(
             dapp_metadata::new(
                 name,
                 description,
@@ -67,19 +67,19 @@ module counter::dapp_system {
   }
 
   public entry fun transfer_ownership(dapp: &mut Dapp, new_admin: address, ctx: &mut TxContext) {
-    assert!(dapp.borrow_admin().contains(), 0);
-    assert!(dapp.borrow_admin().get() == ctx.sender(), 0);
-    dapp.borrow_mut_admin().set(new_admin);
+    let admin = dapp.admin().try_get();
+    assert!(admin == option::some(ctx.sender()), 0);
+    dapp.admin().set(new_admin);
   }
 
   public entry fun set_safe_mode(dapp: &mut Dapp, safe_mode: bool, ctx: &TxContext) {
-    assert!(dapp.borrow_admin().contains(), 0);
-    assert!(dapp.borrow_admin().get() == ctx.sender(), 0);
-    dapp.borrow_mut_safe_mode().set(safe_mode);
+    let admin = dapp.admin().try_get();
+    assert!(admin == option::some(ctx.sender()), 0);
+    dapp.safe_mode().set(safe_mode);
   }
 
   public fun ensure_no_safe_mode(dapp: &Dapp) {
-    assert!(!dapp.borrow_safe_mode().get(), 0);
+    assert!(!dapp.borrow_safe_mode()[], 0);
   }
 
   public fun ensure_has_authority(dapp: &Dapp, ctx: &TxContext) {

package/template/101/sui-template/contracts/counter/sources/codegen/{events → data}/increment_event.move

@@ -19,10 +19,4 @@
                                    value
                                }
   }
-
-  public fun emit(value: u32) {
-    event::emit(IncrementEvent {
-                                   value
-                               });
-  }
 }

package/template/101/sui-template/contracts/counter/sources/codegen/errors.move

@@ -0,0 +1,16 @@
+  // Copyright (c) Obelisk Labs, Inc.
+  // SPDX-License-Identifier: Apache-2.0
+  #[allow(unused_use)]
+  
+  /* Autogenerated file. Do not edit manually. */
+  
+  module counter::errors {
+
+  #[error]
+
+  const InvalidIncrement: vector<u8> = b"Number can't be incremented, must be more than 0";
+
+  public fun invalid_increment_error(condition: bool) {
+    assert!(condition, InvalidIncrement)
+  }
+}

package/template/101/sui-template/contracts/counter/sources/codegen/events.move

@@ -0,0 +1,23 @@
+  // Copyright (c) Obelisk Labs, Inc.
+  // SPDX-License-Identifier: Apache-2.0
+  #[allow(unused_use)]
+  
+  /* Autogenerated file. Do not edit manually. */
+  
+  module counter::events {
+
+  use std::ascii::{String, string};
+
+  use counter::increment_event::IncrementEvent;
+
+  use counter::increment_event;
+
+  public fun increment_event(value: u32) {
+    dubhe::storage_event::emit_set_record<IncrementEvent, IncrementEvent, IncrementEvent>(
+				string(b"increment_event"),
+				option::none(),
+			  	option::none(),
+			  option::some(increment_event::new(value))
+			  )
+  }
+}

package/template/101/sui-template/contracts/counter/sources/codegen/genesis.move

@@ -0,0 +1,20 @@
+#[allow(lint(share_owned))]module counter::genesis {
+
+  use std::ascii::string;
+
+  use sui::clock::Clock;
+
+  use counter::dapp_system;
+
+  public entry fun run(clock: &Clock, ctx: &mut TxContext) {
+    // Create a dapp.
+    let mut dapp = dapp_system::create(string(b"counter"),string(b"counter contract"), clock , ctx);
+    // Create schemas
+    let mut schema = counter::schema::create(ctx);
+    // Logic that needs to be automated once the contract is deployed
+    counter::deploy_hook::run(&mut schema, ctx);
+    // Authorize schemas and public share objects
+    dapp.add_schema(schema);
+    sui::transfer::public_share_object(dapp);
+  }
+}

package/template/101/sui-template/contracts/counter/sources/codegen/schema.move

@@ -0,0 +1,54 @@
+  // Copyright (c) Obelisk Labs, Inc.
+  // SPDX-License-Identifier: Apache-2.0
+  #[allow(unused_use)]
+  
+  /* Autogenerated file. Do not edit manually. */
+  
+  module counter::schema {
+
+  use std::ascii::String;
+
+  use std::ascii::string;
+
+  use sui::package::UpgradeCap;
+
+  use std::type_name;
+
+  use dubhe::storage;
+
+  use dubhe::storage_value::{Self, StorageValue};
+
+  use dubhe::storage_map::{Self, StorageMap};
+
+  use dubhe::storage_double_map::{Self, StorageDoubleMap};
+
+  use sui::dynamic_field as df;
+
+  public struct Schema has key, store {
+    id: UID,
+  }
+
+  public fun borrow_value(self: &Schema): &StorageValue<u32> {
+    storage::borrow_field(&self.id, b"value")
+  }
+
+  public(package) fun value(self: &mut Schema): &mut StorageValue<u32> {
+    storage::borrow_mut_field(&mut self.id, b"value")
+  }
+
+  public(package) fun create(ctx: &mut TxContext): Schema {
+    let mut id = object::new(ctx);
+    storage::add_field<StorageValue<u32>>(&mut id, b"value", storage_value::new(b"value", ctx));
+    Schema { id }
+  }
+
+  public fun migrate(_schema: &mut Schema, _cap: &UpgradeCap, _ctx: &mut TxContext) {}
+
+  // ======================================== View Functions ========================================
+
+  public fun get_value(self: &Schema): &u32 {
+    self.borrow_value().get()
+  }
+
+  // =========================================================================================================
+}

package/template/101/sui-template/contracts/counter/sources/scripts/deploy_hook.move

@@ -1,24 +1,14 @@
-#[allow(lint(share_owned), unused_let_mut)]module counter::deploy_hook {
-
-  use std::ascii::string;
-
-  use sui::clock::Clock;
-
-  use counter::dapp_system;
-
-  use counter::counter_schema::Counter;
-
-  public entry fun run(clock: &Clock, ctx: &mut TxContext) {
-    // Create a dapp.
-    let mut dapp = dapp_system::create(string(b"counter"),string(b"counter contract"), clock , ctx);
-    // Create schemas
-    let mut counter = counter::counter_schema::create(ctx);
-    // Logic that needs to be automated once the contract is deployed
-    {
-			counter.value().set(0);
-			};
-    // Authorize schemas and public share objects
-    dapp.add_schema<Counter>(counter, ctx);
-    sui::transfer::public_share_object(dapp);
+  // Copyright (c) Obelisk Labs, Inc.
+  // SPDX-License-Identifier: Apache-2.0
+  #[allow(unused_use)]
+  
+  /* Autogenerated file. Do not edit manually. */
+  
+  module counter::deploy_hook {
+
+  use counter::schema::Schema;
+
+  public(package) fun run(_schema: &mut Schema, _ctx: &mut TxContext) {
+    _schema.value().set(0);
   }
 }

package/template/101/sui-template/contracts/counter/sources/systems/counter.move

@@ -1,20 +1,17 @@
 module counter::counter_system {
-    use counter::counter_schema::Counter;
-    use counter::increment_event;
-    use counter::invalid_increment_error;
+    use counter::schema::Schema;
+    use counter::events::increment_event;
+    use counter::errors::invalid_increment_error;
 
-    public entry fun inc(counter: &mut Counter, number: u32) {
+    public entry fun inc(scheam: &mut Schema, number: u32) {
         // Check if the increment value is valid.
-        invalid_increment_error::require(number > 0 && number < 100);
-        counter.value().mutate!(|value| {
-            // Increment the counter value.
-            *value =  *value + number;
-            // Emit an event to notify the increment.
-            increment_event::emit(number);
-        });
+        invalid_increment_error(number > 0 && number < 100);
+        let value = scheam.value()[];
+        scheam.value().set(value + number);
+        increment_event(number);
     }
 
-    public fun get(counter: &Counter) : u32 {
-        counter.borrow_value().get()
+    public fun get(scheam: &Schema): u32 {
+        scheam.borrow_value()[]
     }
 }

package/template/101/sui-template/contracts/counter/sources/tests/counter.move

@@ -2,24 +2,24 @@
 module counter::counter_test {
     use sui::test_scenario;
     use counter::counter_system;
-    use counter::counter_schema::Counter;
     use counter::init_test;
+    use counter::schema::Schema;
 
     #[test]
     public fun inc() {
         let (scenario, dapp)  = init_test::deploy_dapp_for_testing(@0xA);
 
-        let mut counter = test_scenario::take_shared<Counter>(&scenario);
+        let mut schema = test_scenario::take_shared<Schema>(&scenario);
 
-        assert!(counter.borrow_value().get() == 0);
+        assert!(schema.value().get() == 0);
 
-        counter_system::inc(&mut counter, 10);
-        assert!(counter.borrow_value().get() == 10);
+        counter_system::inc(&mut schema, 10);
+        assert!(schema.value().get() == 10);
 
-        counter_system::inc(&mut counter, 10);
-        assert!(counter.borrow_value().get() == 20);
+        counter_system::inc(&mut schema, 10);
+        assert!(schema.value().get() == 20);
 
-        test_scenario::return_shared(counter);
+        test_scenario::return_shared(schema);
         dapp.distroy_dapp_for_testing();
         scenario.end();
     }

package/template/101/sui-template/contracts/counter/sources/tests/init.move

@@ -12,7 +12,7 @@
     let mut scenario = test_scenario::begin(sender);
     let ctx = test_scenario::ctx(&mut scenario);
     let clock = clock::create_for_testing(ctx);
-    counter::deploy_hook::run(&clock, ctx);
+    counter::genesis::run(&clock, ctx);
     clock::destroy_for_testing(clock);
     test_scenario::next_tx(&mut scenario,sender);
     let dapp = test_scenario::take_shared<Dapp>(&scenario);

package/template/101/sui-template/contracts/dubhe-framework/sources/events.move

@@ -0,0 +1,33 @@
+module dubhe::storage_event;
+use std::ascii::String;
+use sui::event;
+
+public struct RemoveRecord<K1: copy + drop, K2: copy + drop> has copy, drop {
+    name: String,
+    key1: Option<K1>,
+    key2: Option<K2>
+}
+
+public struct SetRecord<K1: copy + drop, K2: copy + drop, V: copy + drop> has copy, drop {
+    name: String,
+    key1: Option<K1>,
+    key2: Option<K2>,
+    value: Option<V>
+}
+
+public fun emit_set_record<K1: copy + drop, K2: copy + drop, V: copy + drop>(name: String, key1: Option<K1>, key2: Option<K2>, value: Option<V>) {
+    event::emit(SetRecord {
+        name,
+        key1,
+        key2,
+        value
+    });
+}
+
+public fun emit_remove_record<K1: copy + drop, K2: copy + drop>(name: String, key1: Option<K1>, key2: Option<K2>) {
+    event::emit(RemoveRecord {
+        name,
+        key1,
+        key2,
+    });
+}