create-dubhe 0.0.13 → 0.0.14

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);
-    }
-}

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

@@ -1,66 +0,0 @@
-#[test_only]
-module dubhe::dapps_tests {
-    use dubhe::dapps_schema::Dapps;
-    use dubhe::dapps_schema;
-    use dubhe::dapps_system;
-    use std::ascii::string;
-    use std::debug;
-    use sui::clock;
-    use sui::coin;
-    use sui::test_scenario;
-    use sui::package;
-    use sui::package::UpgradeCap;
-    use sui::sui::SUI;
-
-    public struct DappKey has drop {}
-
-    #[test]
-    public fun dapps_register() {
-        let mut scenario = test_scenario::begin(@0xA);
-        {
-            let ctx = test_scenario::ctx(&mut scenario);
-            dapps_schema::init_dapps_for_testing(ctx);
-            test_scenario::next_tx(&mut scenario,@0xA);
-        };
-
-        let mut dapps = test_scenario::take_shared<Dapps>(&scenario);
-
-        let upgrade_cap = package::test_publish(@0x42.to_id(), scenario.ctx());
-        debug::print(&object::id_address<UpgradeCap>(&upgrade_cap));
-
-        let coin = coin::mint_for_testing<SUI>(1_000_000_000, test_scenario::ctx(&mut scenario));
-
-        let clock = clock::create_for_testing(test_scenario::ctx(&mut scenario));
-        dapps_system::register<UpgradeCap>(
-            &mut dapps,
-            &upgrade_cap,
-            string(b"DappKey"),
-            string(b"DappKey"),
-            &clock,
-            coin,
-            test_scenario::ctx(&mut scenario),
-        );
-
-        test_scenario::next_tx(&mut scenario,@0xA);
-
-        let dapp_id = object::id_address<UpgradeCap>(&upgrade_cap);
-        assert!(dapps.borrow_version().get(dapp_id) == 1, 0);
-        assert!(dapps.borrow_metadata().contains_key(dapp_id));
-        assert!(dapps.borrow_admin().get(dapp_id) == test_scenario::ctx(&mut scenario).sender(), 0);
-        assert!(dapps.borrow_safe_mode().get(dapp_id) == false, 0);
-
-
-        dapps_system::unregister(&mut dapps, &upgrade_cap, test_scenario::ctx(&mut scenario));
-        test_scenario::next_tx(&mut scenario,@0xA);
-
-        assert!(!dapps.borrow_version().contains_key(dapp_id));
-        assert!(!dapps.borrow_metadata().contains_key(dapp_id));
-        assert!(!dapps.borrow_admin().contains_key(dapp_id));
-        assert!(!dapps.borrow_safe_mode().contains_key(dapp_id));
-
-        clock::destroy_for_testing(clock);
-        test_scenario::return_shared<Dapps>(dapps);
-        upgrade_cap.make_immutable();
-        scenario.end();
-    }
-}

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

@@ -1,33 +0,0 @@
-module dubhe::root_schema {
-    use dubhe::storage_value;
-    use dubhe::storage_value::StorageValue;
-    use sui::transfer::public_share_object;
-
-    public struct Root has key, store {
-        id: UID,
-        key: StorageValue<address>,
-    }
-
-
-    public(package) fun borrow_mut_key(self: &mut Root): &mut StorageValue<address> {
-        &mut self.key
-    }
-
-    public fun borrow_key(self: &Root): &StorageValue<address> {
-        &self.key
-    }
-
-    fun init(ctx: &mut TxContext) {
-        let mut key = storage_value::new();
-        key.set(ctx.sender());
-        public_share_object(Root {
-            id: object::new(ctx),
-            key,
-        });
-    }
-
-    #[test_only]
-    public fun init_root_for_testing(ctx: &mut TxContext){
-        init(ctx)
-    }
-}

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

@@ -1,24 +0,0 @@
-module dubhe::root_system {
-    use dubhe::root_schema::Root;
-
-    public entry fun set_key(
-        root: &mut Root,
-        key: address,
-        ctx: &mut TxContext
-    ) {
-        ensure_root(root, ctx);
-        root.borrow_mut_key().set(key);
-    }
-
-    public entry fun remove_key(
-        root: &mut Root,
-        ctx: &mut TxContext
-    ) {
-        ensure_root(root, ctx);
-        root.borrow_mut_key().remove();
-    }
-
-    public fun ensure_root(root: &Root, ctx: &TxContext) {
-        assert!(root.borrow_key().get() == ctx.sender(), 0);
-    }
-}

package/template/101/sui-template/contracts/dubhe-framework/sources/core/root/tests.move

@@ -1,39 +0,0 @@
-#[test_only]
-module dubhe::root_tests {
-    use dubhe::root_schema::Root;
-    use dubhe::root_schema;
-    use dubhe::root_system;
-    use sui::test_scenario;
-
-    public struct USDT has drop {}
-
-    #[test]
-    public fun root_key() {
-        let mut scenario = test_scenario::begin(@0xA);
-        {
-            let ctx = test_scenario::ctx(&mut scenario);
-            root_schema::init_root_for_testing(ctx);
-            test_scenario::next_tx(&mut scenario,@0xA);
-        };
-
-        let mut root = test_scenario::take_shared<Root>(&scenario);
-        assert!(root.borrow_key().get() == @0xA, 0);
-
-        {
-            let ctx = test_scenario::ctx(&mut scenario);
-            root_system::set_key(&mut root, @0xB, ctx);
-            test_scenario::next_tx(&mut scenario,@0xB);
-        };
-        assert!(root.borrow_key().get() == @0xB, 0);
-
-        {
-            let ctx = test_scenario::ctx(&mut scenario);
-            root_system::remove_key(&mut root, ctx);
-            test_scenario::next_tx(&mut scenario,@0xC);
-        };
-        assert!(root.borrow_key().try_get() == option::none<address>(), 0);
-
-        test_scenario::return_shared<Root>(root);
-        scenario.end();
-    }
-}

package/template/101/sui-template/contracts/dubhe-framework/tests/init.move

@@ -1,6 +0,0 @@
-#[test_only]
-module dubhe::init_tests {
-    public fun init_dubhe_for_testing(ctx: &mut TxContext){
-        dubhe::dapps_schema::init_dapps_for_testing(ctx);
-    }
-}

package/template/101/sui-template/contracts/dubhe-framework/tests/obelisk_framework_tests.move

@@ -1,19 +0,0 @@
-/*
-#[test_only]
-module dubhe_framework::dubhe_framework_tests {
-    // uncomment this line to import the module
-    // use dubhe_framework::dubhe_framework;
-
-    const ENotImplemented: u64 = 0;
-
-    #[test]
-    fun test_dubhe_framework() {
-        // pass
-    }
-
-    #[test, expected_failure(abort_code = ::dubhe_framework::dubhe_framework_tests::ENotImplemented)]
-    fun test_dubhe_framework_fail() {
-        abort ENotImplemented
-    }
-}
-*/

package/template/contract/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 {  }
-  }
-}