create-dubhe 0.0.12 → 0.0.14

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

@@ -1,96 +1,24 @@
-#[allow(lint(share_owned))]
-
-module counter::deploy_hook {
-
-  use dubhe::dapps_schema::Dapps;
-
-  use dubhe::dapps_system;
-
-  use counter::schema_hub::SchemaHub;
+#[allow(lint(share_owned), unused_let_mut)]module counter::deploy_hook {
 
   use std::ascii::string;
 
   use sui::clock::Clock;
 
-  use sui::sui::SUI;
-
-  use sui::coin::Coin;
-
-  use sui::package::UpgradeCap;
-
-  use sui::transfer::public_share_object;
+  use counter::dapp_system;
 
   use counter::counter_schema::Counter;
 
-  #[test_only]
-
-  use sui::clock;
-
-  #[test_only]
-
-  use sui::coin;
-
-  #[test_only]
-
-  use sui::test_scenario;
-
-  #[test_only]
-
-  use sui::package;
-
-  #[test_only]
-
-  use counter::schema_hub;
-
-  #[test_only]
-
-  use dubhe::dapps_schema;
-
-  #[test_only]
-
-  use sui::test_scenario::Scenario;
-
-  public entry fun run(
-    schema_hub: &mut SchemaHub,
-    dapps: &mut Dapps,
-    cap: &UpgradeCap,
-    clock: &Clock,
-    coin: Coin<SUI>,
-    ctx: &mut TxContext,
-  ) {
-    // Register the dapp to dubhe.
-    dapps_system::register(dapps,cap,string(b"counter"),string(b"counter"),clock,coin,ctx);
+  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.borrow_mut_value().set(0);
-
-    // Authorize schemas and public share objects
-    schema_hub.authorize_schema<Counter>();
-    public_share_object(counter);
-  }
-
-  #[test_only]
-
-  public fun deploy_hook_for_testing(): (Scenario, SchemaHub, Dapps) {
-    let mut scenario = test_scenario::begin(@0xA);
     {
-      let ctx = test_scenario::ctx(&mut scenario);
-      dapps_schema::init_dapps_for_testing(ctx);
-      schema_hub::init_schema_hub_for_testing(ctx);
-      test_scenario::next_tx(&mut scenario,@0xA);
+		counter.borrow_mut_value().set(0);
     };
-    let mut dapps = test_scenario::take_shared<Dapps>(&scenario);
-    let mut schema_hub = test_scenario::take_shared<SchemaHub>(&scenario);
-    let ctx = test_scenario::ctx(&mut scenario);
-    let clock = clock::create_for_testing(ctx);
-    let upgrade_cap = package::test_publish(@0x42.to_id(), ctx);
-    let coin  = coin::mint_for_testing<SUI>(1_000_000_000, ctx);
-    run(&mut schema_hub, &mut dapps, &upgrade_cap, &clock, coin, ctx);
-    clock::destroy_for_testing(clock);
-    upgrade_cap.make_immutable();
-    test_scenario::next_tx(&mut scenario,@0xA);
-    (scenario, schema_hub, dapps)
+    // Authorize schemas and public share objects
+    dapp.add_schema<Counter>(counter, ctx);
+    sui::transfer::public_share_object(dapp);
   }
 }

package/template/nextjs/sui-template/contracts/counter/sources/scripts/migrate.move

@@ -1,6 +1,6 @@
 module counter::migrate {
 
-  const ON_CHAIN_VERSION: u32 = 0;
+  const ON_CHAIN_VERSION: u32 = 1;
 
   public fun on_chain_version(): u32 {
     ON_CHAIN_VERSION

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

@@ -1,11 +1,20 @@
 module counter::counter_system {
     use counter::counter_schema::Counter;
+    use counter::counter_event_increment;
+    use counter::counter_error_invalid_increment;
 
-    public entry fun inc(counter: &mut Counter) {
-        counter.borrow_mut_value().mutate!(|value| *value = *value + 1);
+    public entry fun inc(counter: &mut Counter, number: u32) {
+        // Check if the increment value is valid.
+        counter_error_invalid_increment::require(number > 0 && number < 100);
+        counter.borrow_mut_value().mutate!(|value| {
+        // Increment the counter value.
+        *value =  *value + number;
+        // Emit an event to notify the increment.
+        counter_event_increment::emit(number);
+        });
     }
 
-    public fun get(counter: &Counter): u32 {
+    public fun get(counter: &Counter) : u32 {
         counter.borrow_value().get()
     }
-}
+}

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

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

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

@@ -0,0 +1,21 @@
+#[test_only]module counter::init_test {
+
+  use counter::dapp_schema::Dapp;
+
+  use sui::clock;
+
+  use sui::test_scenario;
+
+  use sui::test_scenario::Scenario;
+
+  public fun deploy_dapp_for_testing(sender: address): (Scenario, Dapp) {
+    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);
+    clock::destroy_for_testing(clock);
+    test_scenario::next_tx(&mut scenario,sender);
+    let dapp = test_scenario::take_shared<Dapp>(&scenario);
+    (scenario, dapp)
+  }
+}

package/template/nextjs/sui-template/contracts/dubhe-framework/sources/frames/utils/type_info.move

@@ -1,6 +1,7 @@
 module dubhe::type_info {
     use std::ascii::String;
     use std::ascii::string;
+    use std::type_name;
     use sui::address;
     use std::type_name::TypeName;
 
@@ -26,4 +27,10 @@ module dubhe::type_info {
 
         (package_id, module_name, struct_name, struct_name_with_type)
     }
+
+    public fun current_package_id<T>(): address {
+        let type_name = type_name::get<T>();
+        let (package_id, _, _, _) = parse_type_name(type_name);
+        package_id
+    }
 }

package/template/{101/sui-template/contracts/dubhe-framework/sources/storages/migrate.move → nextjs/sui-template/contracts/dubhe-framework/sources/storages/migration.move}

@@ -1,8 +1,8 @@
-module dubhe::storage_migrate {
+module dubhe::storage_migration {
     use sui::dynamic_field as df;
 
-    public fun add_field<StorageType: store>(uid: &mut UID, field_name: vector<u8>, storagr_type: StorageType) {
-        df::add(uid, field_name, storagr_type);
+    public fun add_field<StorageType: store>(uid: &mut UID, field_name: vector<u8>, storagre_type: StorageType) {
+        df::add(uid, field_name, storagre_type);
     }
 
     public fun borrow_field<StorageType: store>(uid: &UID, field_name: vector<u8>): &StorageType {

package/template/nextjs/sui-template/contracts/dubhe-framework/sources/storages/value.move

@@ -51,7 +51,7 @@ module dubhe::storage_value {
         value
     }
 
-    /// Set the `value` of the `StorageValue`.
+    /// Put the `value` of the `StorageValue`.
     public fun put<V: store>(self: &mut StorageValue<V>, value: V) {
         assert!(!self.contains(), EValueAlreadyExist);
         self.contents.push_back(Entry { value });

package/template/nextjs/sui-template/dubhe.config.ts

@@ -1,14 +1,27 @@
 import { DubheConfig } from '@0xobelisk/sui-common';
 
 export const dubheConfig = {
-  name: 'counter',
-  description: 'counter',
-  systems: ['counter'],
-  schemas: {
-    counter: {
-      structure: {
-        value: 'StorageValue<u32>',
-      },
-    },
-  },
+	name: 'counter',
+	description: 'counter contract',
+	schemas: {
+		counter: {
+			structure: {
+				value: 'StorageValue<u32>',
+			},
+			events: [
+				{
+					name: 'Increment',
+					fields: {
+						value: 'u32',
+					},
+				},
+			],
+			errors: [
+				{
+					name: 'InvalidIncrement',
+					message: "Number can't be incremented, must be more than 0",
+				},
+			]
+		},
+	},
 } as DubheConfig;

package/template/nextjs/sui-template/package.json

@@ -25,9 +25,9 @@
     "prod:testnet": "pnpm config:store testnet && pnpm next"
   },
   "dependencies": {
-    "@0xobelisk/sui-cli": "^0.5.34",
+    "@0xobelisk/sui-cli": "^0.5.37",
     "@0xobelisk/sui-client": "^0.5.30",
-    "@0xobelisk/sui-common": "^0.5.23",
+    "@0xobelisk/sui-common": "^0.5.25",
     "@mysten/dapp-kit": "0.14.9",
     "@mysten/sui": "1.7.0",
     "dotenv": "^16.4.5",

package/template/nextjs/sui-template/src/pages/home/index.tsx

@@ -85,7 +85,7 @@ const Home: React.FC = () => {
       const tx = new Transaction();
       await dubhe.tx.counter_system.inc({
         tx,
-        params: [tx.object(Counter_Object_Id)],
+        params: [tx.object(Counter_Object_Id), tx.pure.u32(1)],
         isRaw: true,
       });
       await signAndExecuteTransaction(

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

@@ -1,16 +0,0 @@
-  // Copyright (c) Obelisk Labs, Inc.
-  // SPDX-License-Identifier: MIT
-  #[allow(unused_use)]
-  
-  /* Autogenerated file. Do not edit manually. */
-  
-  module counter::dapp_key {
-
-  /// Authorization token for the app.
-
-  public struct DappKey has drop {}
-
-  public(package) fun new(): DappKey {
-    DappKey {  }
-  }
-}

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

@@ -1,60 +0,0 @@
-  // Copyright (c) Obelisk Labs, Inc.
-  // SPDX-License-Identifier: MIT
-  #[allow(unused_use)]
-  
-  /* Autogenerated file. Do not edit manually. */
-  
-  module counter::schema_hub {
-
-  use sui::transfer::public_share_object;
-
-  use sui::dynamic_field as df;
-
-  public struct SchemaHub has key, store {
-    id: UID,
-    admin: address,
-  }
-
-  public struct SchemaTypeWapper<phantom Schema: key + store> has copy, store, drop {}
-
-  /// Authorize an schema to access protected features of the SchemaHub.
-
-  public(package) fun authorize_schema<Schema: key + store>(self: &mut SchemaHub) {
-    df::add(&mut self.id, SchemaTypeWapper<Schema> {}, true);
-  }
-
-  /// Deauthorize an schema by removing its authorization key.
-
-  public(package) fun deauthorize_schema<Schema: key + store>(self: &mut SchemaHub) {
-    df::remove<SchemaTypeWapper<Schema>, bool>(&mut self.id, SchemaTypeWapper<Schema> {});
-  }
-
-  /// Check if an schema is authorized to access protected features of
-
-  /// the SchemaHub.
-
-  public fun is_schema_authorized<Schema: key + store>(self: &SchemaHub): bool {
-    df::exists_(&self.id, SchemaTypeWapper<Schema> {})
-  }
-
-  /// Assert that an schema is authorized to access protected features of
-
-  /// the SchemaHub. Aborts with `EAppNotAuthorized` if not.
-
-  public fun ensure_schema_authorized<Schema: key + store>(self: &SchemaHub) {
-    assert!(self.is_schema_authorized<Schema>(), 0);
-  }
-
-  fun init(ctx: &mut TxContext) {
-    public_share_object(SchemaHub {
-            id: object::new(ctx),
-            admin: ctx.sender(),
-        });
-  }
-
-  #[test_only]
-
-  public fun init_schema_hub_for_testing(ctx: &mut TxContext) {
-    init(ctx);
-  }
-}

package/template/101/sui-template/contracts/dubhe-framework/sources/core/dapps/metadata.move

@@ -1,96 +0,0 @@
-module dubhe::dapp_metadata {
-    use std::ascii::String;
-
-    public struct DappMetadata has drop, copy, store {
-        name: String,
-        description: String,
-        icon_url: String,
-        website_url: String,
-        created_at: u64,
-        partners: vector<String>,
-    }
-
-    public fun new(
-        name: String,
-        description: String,
-        icon_url: String,
-        website_url: String,
-        created_at: u64,
-        partners: vector<String>,
-    ): DappMetadata {
-        DappMetadata {
-            name,
-            description,
-            icon_url,
-            website_url,
-            created_at,
-            partners,
-        }
-    }
-
-    public fun set(
-        self: &mut DappMetadata,
-        name: String,
-        description: String,
-        icon_url: String,
-        website_url: String,
-        created_at: u64,
-        partners: vector<String>,
-    ) {
-        self.name = name;
-        self.description = description;
-        self.icon_url = icon_url;
-        self.website_url = website_url;
-        self.created_at = created_at;
-        self.partners = partners;
-    }
-
-    public fun set_name(self: &mut DappMetadata, name: String) {
-        self.name = name;
-    }
-
-    public fun set_description(self: &mut DappMetadata, description: String) {
-        self.description = description;
-    }
-
-    public fun set_icon_url(self: &mut DappMetadata, icon_url: String) {
-        self.icon_url = icon_url;
-    }
-
-    public fun set_website_url(self: &mut DappMetadata, website_url: String) {
-        self.website_url = website_url;
-    }
-
-    public fun set_created_at(self: &mut DappMetadata, created_at: u64) {
-        self.created_at = created_at;
-    }
-
-    public fun set_partners(self: &mut DappMetadata, partners: vector<String>) {
-        self.partners = partners;
-    }
-
-    public fun get_name(self: DappMetadata): String {
-        self.name
-    }
-
-    public fun get_description(self: DappMetadata): String {
-        self.description
-    }
-
-    public fun get_icon_url(self: DappMetadata): String {
-        self.icon_url
-    }
-
-    public fun get_website_url(self: DappMetadata): String {
-        self.website_url
-    }
-
-    public fun get_created_at(self: DappMetadata): u64 {
-        self.created_at
-    }
-
-    public fun get_partners(self: DappMetadata): vector<String> {
-        self.partners
-    }
-
-}

package/template/101/sui-template/contracts/dubhe-framework/sources/core/dapps/schema.move

@@ -1,113 +0,0 @@
-module dubhe::dapps_schema {
-    use std::ascii::String;
-    use dubhe::storage_value;
-    use sui::balance::Balance;
-    use sui::sui::SUI;
-    use sui::balance;
-    use dubhe::storage_value::StorageValue;
-    use dubhe::storage_map;
-    use sui::transfer::public_share_object;
-    use dubhe::dapp_metadata::DappMetadata;
-    use dubhe::storage_map::StorageMap;
-
-    public struct Dapps has key, store {
-        id: UID,
-        admin: StorageMap<address, address>,
-        version: StorageMap<address, u32>,
-        metadata: StorageMap<address, DappMetadata>,
-        schemas: StorageMap<address, vector<String>>,
-        safe_mode: StorageMap<address, bool>,
-        verified: StorageMap<address, bool>,
-        reserved: StorageValue<Balance<SUI>>,
-        reserve_amount: StorageValue<u64>,
-    }
-
-
-    public(package) fun borrow_mut_version(self: &mut Dapps): &mut StorageMap<address, u32> {
-        &mut self.version
-    }
-
-    public(package) fun borrow_mut_admin(self: &mut Dapps): &mut StorageMap<address, address> {
-        &mut self.admin
-    }
-
-    public(package) fun borrow_mut_metadata(self: &mut Dapps): &mut StorageMap<address, DappMetadata> {
-        &mut self.metadata
-    }
-
-    public(package) fun borrow_mut_schemas(self: &mut Dapps): &mut StorageMap<address, vector<String>> {
-        &mut self.schemas
-    }
-
-    public(package) fun borrow_mut_safe_mode(self: &mut Dapps): &mut StorageMap<address, bool> {
-        &mut self.safe_mode
-    }
-
-    public(package) fun borrow_mut_verified(self: &mut Dapps): &mut StorageMap<address, bool> {
-        &mut self.verified
-    }
-
-    public(package) fun borrow_mut_reserved(self: &mut Dapps): &mut StorageValue<Balance<SUI>> {
-        &mut self.reserved
-    }
-
-    public(package) fun borrow_mut_reserve_amount(self: &mut Dapps): &mut StorageValue<u64> {
-        &mut self.reserve_amount
-    }
-
-    public fun borrow_admin(self: &Dapps): &StorageMap<address, address> {
-        &self.admin
-    }
-
-    public fun borrow_version(self: &Dapps): &StorageMap<address, u32> {
-        &self.version
-    }
-
-    public fun borrow_metadata(self: &Dapps): &StorageMap<address, DappMetadata> {
-        &self.metadata
-    }
-
-    public fun borrow_schemas(self: &Dapps): &StorageMap<address, vector<String>> {
-        &self.schemas
-    }
-
-    public fun borrow_safe_mode(self: &Dapps): &StorageMap<address, bool> {
-        &self.safe_mode
-    }
-
-    public fun borrow_verified(self: &mut Dapps): &StorageMap<address, bool> {
-        &self.verified
-    }
-
-    public fun borrow_reserved(self: &mut Dapps): &StorageValue<Balance<SUI>> {
-        &self.reserved
-    }
-
-    public fun borrow_reserve_amount(self: &mut Dapps): &StorageValue<u64> {
-        &self.reserve_amount
-    }
-
-    fun init(ctx: &mut TxContext) {
-        let mut reserved = storage_value::new();
-        reserved.put(balance::zero());
-
-        let mut reserve_amount = storage_value::new();
-        reserve_amount.put(1_000_000_000);
-        public_share_object(Dapps {
-            id: object::new(ctx),
-            admin: storage_map::new(),
-            version: storage_map::new(),
-            metadata: storage_map::new(),
-            schemas: storage_map::new(),
-            safe_mode: storage_map::new(),
-            verified: storage_map::new(),
-            reserved,
-            reserve_amount
-        });
-    }
-
-    #[test_only]
-    public fun init_dapps_for_testing(ctx: &mut TxContext){
-        init(ctx)
-    }
-}

package/template/101/sui-template/contracts/dubhe-framework/sources/core/dapps/system.move

@@ -1,101 +0,0 @@
-module dubhe::dapps_system {
-    use std::ascii::String;
-    use std::ascii;
-    use dubhe::root_schema::Root;
-    use dubhe::dapp_metadata;
-    use sui::clock::Clock;
-    use sui::coin;
-    use sui::coin::Coin;
-    use sui::sui::SUI;
-    use dubhe::dapps_schema::Dapps;
-    use dubhe::root_system;
-
-    public entry fun register<UpgradeCap: key>(
-        dapps: &mut Dapps,
-        upgrade_cap: &UpgradeCap,
-        name: String,
-        description: String,
-        clock: &Clock,
-        coin: Coin<SUI>,
-        ctx: &mut TxContext
-    ) {
-        let dapp_id = object::id_address<UpgradeCap>(upgrade_cap);
-        assert!(!dapps.borrow_metadata().contains_key(dapp_id), 0);
-
-        dapps.borrow_mut_metadata().set(
-            dapp_id,
-            dapp_metadata::new(
-                name,
-                description,
-                ascii::string(b""),
-                ascii::string(b""),
-                clock.timestamp_ms(),
-                vector[]
-            )
-        );
-        dapps.borrow_mut_admin().set(dapp_id, ctx.sender());
-        dapps.borrow_mut_version().set(dapp_id, 1);
-        dapps.borrow_mut_safe_mode().set(dapp_id, false);
-
-        let reserve_amount = dapps.borrow_reserve_amount().get();
-        assert!(coin.value() == reserve_amount, 0);
-        dapps.borrow_mut_reserved().borrow_mut().join(coin.into_balance());
-    }
-
-    public entry fun unregister<UpgradeCap: key>(
-        dapps: &mut Dapps,
-        upgrade_cap: &UpgradeCap,
-        ctx: &mut TxContext
-    ) {
-        let dapp_id = object::id_address<UpgradeCap>(upgrade_cap);
-        assert!(dapps.borrow_metadata().contains_key(dapp_id), 0);
-
-        dapps.borrow_mut_metadata().remove(dapp_id);
-        dapps.borrow_mut_admin().remove(dapp_id);
-        dapps.borrow_mut_version().remove(dapp_id);
-        dapps.borrow_mut_safe_mode().remove(dapp_id);
-
-        let reserve_amount = dapps.borrow_reserve_amount().get();
-        let reserve_amount = dapps.borrow_mut_reserved().borrow_mut().split(reserve_amount);
-        let reserve_amount = coin::from_balance(reserve_amount, ctx);
-        transfer::public_transfer(reserve_amount, ctx.sender());
-    }
-
-    public entry fun set_metadata<UpgradeCap: key>(
-        dapps: &mut Dapps,
-        upgrade_cap: &UpgradeCap,
-        name: String,
-        description: String,
-        icon_url: String,
-        website_url: String,
-        partners: vector<String>
-    ) {
-        let dapp_id = object::id_address<UpgradeCap>(upgrade_cap);
-        assert!(dapps.borrow_metadata().contains_key(dapp_id), 0);
-        let created_at = dapps.borrow_mut_metadata().take(dapp_id).get_created_at();
-        dapps.borrow_mut_metadata().set(dapp_id, dapp_metadata::new(name, description, icon_url, website_url, created_at, partners));
-    }
-
-    public entry fun transfer_ownership<UpgradeCap: key>(
-        dapps: &mut Dapps,
-        upgrade_cap: &UpgradeCap,
-        new_admin: address,
-        ctx: &mut TxContext
-    ) {
-        let dapp_id = object::id_address<UpgradeCap>(upgrade_cap);
-        assert!(dapps.borrow_admin().get(dapp_id) == ctx.sender(), 0);
-        dapps.borrow_mut_admin().set(dapp_id, new_admin);
-    }
-
-    public entry fun add_verification(dapps: &mut Dapps, root: &Root, dapp_id: address, ctx: &mut TxContext) {
-        root_system::ensure_root(root, ctx);
-        assert!(dapps.borrow_metadata().contains_key(dapp_id), 0);
-        dapps.borrow_mut_verified().set(dapp_id, true);
-    }
-
-    public entry fun remove_verification(dapps: &mut Dapps, root: &Root, dapp_id: address, ctx: &mut TxContext) {
-        root_system::ensure_root(root, ctx);
-        assert!(dapps.borrow_metadata().contains_key(dapp_id), 0);
-        dapps.borrow_mut_verified().remove(dapp_id);
-    }
-}