create-dubhe 0.1.9 → 0.1.10

package/package.json

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

package/template/{nextjs/sui-template/contracts/counter/sources/codegen → 101/sui-template/contracts/counter/sources/codegen/core}/genesis.move

@@ -7,14 +7,13 @@
   use counter::counter_dapp_system;
 
   public entry fun run(clock: &Clock, ctx: &mut TxContext) {
-    // Create a dapp.
-    let mut dapp = counter_dapp_system::create(string(b"counter"),string(b"counter contract"), clock , ctx);
     // Create schemas
     let mut schema = counter::counter_schema::create(ctx);
+    // Setup default storage
+    counter_dapp_system::create(&mut schema, string(b"counter"),string(b"counter contract"), clock , ctx);
     // Logic that needs to be automated once the contract is deployed
     counter::counter_deploy_hook::run(&mut schema, ctx);
     // Authorize schemas and public share objects
-    dapp.add_schema(schema);
-    sui::transfer::public_share_object(dapp);
+    sui::transfer::public_share_object(schema);
   }
 }

package/template/101/sui-template/contracts/counter/sources/{tests/init.move → codegen/core/init_test.move}

@@ -1,21 +1,18 @@
 #[test_only]module counter::counter_init_test {
 
-  use counter::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) {
+  public fun deploy_dapp_for_testing(sender: address): Scenario {
     let mut scenario = test_scenario::begin(sender);
     let ctx = test_scenario::ctx(&mut scenario);
     let clock = clock::create_for_testing(ctx);
     counter::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);
-    (scenario, dapp)
+    scenario
   }
 }

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

@@ -11,7 +11,7 @@
   public struct DappMetadata has drop, copy, store {
     name: String,
     description: String,
-    icon_url: String,
+    cover_url: vector<String>,
     website_url: String,
     created_at: u64,
     partners: vector<String>,
@@ -20,7 +20,7 @@
   public fun new(
     name: String,
     description: String,
-    icon_url: String,
+    cover_url: vector<String>,
     website_url: String,
     created_at: u64,
     partners: vector<String>,
@@ -28,7 +28,7 @@
     DappMetadata {
             name,
             description,
-            icon_url,
+            cover_url,
             website_url,
             created_at,
             partners,
@@ -39,14 +39,14 @@
     self: &mut DappMetadata,
     name: String,
     description: String,
-    icon_url: String,
+    cover_url: vector<String>,
     website_url: String,
     created_at: u64,
     partners: vector<String>,
   ) {
     self.name = name;
     self.description = description;
-    self.icon_url = icon_url;
+    self.cover_url = cover_url;
     self.website_url = website_url;
     self.created_at = created_at;
     self.partners = partners;
@@ -60,8 +60,8 @@
     self.description = description;
   }
 
-  public fun set_icon_url(self: &mut DappMetadata, icon_url: String) {
-    self.icon_url = icon_url;
+  public fun set_cover_url(self: &mut DappMetadata, cover_url: vector<String>) {
+    self.cover_url = cover_url;
   }
 
   public fun set_website_url(self: &mut DappMetadata, website_url: String) {
@@ -84,8 +84,8 @@
     self.description
   }
 
-  public fun get_icon_url(self: &DappMetadata): String {
-    self.icon_url
+  public fun get_cover_url(self: &DappMetadata): vector<String> {
+    self.cover_url
   }
 
   public fun get_website_url(self: &DappMetadata): String {

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

@@ -0,0 +1,118 @@
+  // Copyright (c) Obelisk Labs, Inc.
+  // SPDX-License-Identifier: Apache-2.0
+  #[allow(unused_use)]
+  
+  /* Autogenerated file. Do not edit manually. */
+  
+  module counter::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;
+
+  use counter::counter_dapp_metadata::DappMetadata;
+
+  public struct Schema has key, store {
+    id: UID,
+  }
+
+  // Default storage
+
+  public fun borrow_dapp__admin(self: &Schema): &StorageValue<address> {
+    storage::borrow_field(&self.id, b"dapp__admin")
+  }
+
+  public fun borrow_dapp__package_id(self: &Schema): &StorageValue<address> {
+    storage::borrow_field(&self.id, b"dapp__package_id")
+  }
+
+  public fun borrow_dapp__version(self: &Schema): &StorageValue<u32> {
+    storage::borrow_field(&self.id, b"dapp__version")
+  }
+
+  public fun borrow_dapp__metadata(self: &Schema): &StorageValue<DappMetadata> {
+    storage::borrow_field(&self.id, b"dapp__metadata")
+  }
+
+  public fun borrow_dapp__safe_mode(self: &Schema): &StorageValue<bool> {
+    storage::borrow_field(&self.id, b"dapp__safe_mode")
+  }
+
+  public fun borrow_dapp__authorised_schemas(self: &Schema): &StorageValue<vector<address>> {
+    storage::borrow_field(&self.id, b"dapp__authorised_schemas")
+  }
+
+  public fun borrow_dapp__schemas(self: &Schema): &StorageValue<vector<address>> {
+    storage::borrow_field(&self.id, b"dapp__schemas")
+  }
+
+  public(package) fun dapp__admin(self: &mut Schema): &mut StorageValue<address> {
+    storage::borrow_mut_field(&mut self.id, b"dapp__admin")
+  }
+
+  public(package) fun dapp__package_id(self: &mut Schema): &mut StorageValue<address> {
+    storage::borrow_mut_field(&mut self.id, b"dapp__package_id")
+  }
+
+  public(package) fun dapp__version(self: &mut Schema): &mut StorageValue<u32> {
+    storage::borrow_mut_field(&mut self.id, b"dapp__version")
+  }
+
+  public(package) fun dapp__metadata(self: &mut Schema): &mut StorageValue<DappMetadata> {
+    storage::borrow_mut_field(&mut self.id, b"dapp__metadata")
+  }
+
+  public(package) fun dapp__safe_mode(self: &mut Schema): &mut StorageValue<bool> {
+    storage::borrow_mut_field(&mut self.id, b"dapp__safe_mode")
+  }
+
+  public(package) fun dapp__authorised_schemas(self: &mut Schema): &mut StorageValue<vector<address>> {
+    storage::borrow_mut_field(&mut self.id, b"dapp__authorised_schemas")
+  }
+
+  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(package) fun id(self: &mut Schema): &mut UID {
+    &mut self.id
+  }
+
+  public(package) fun borrow_id(self: &Schema): &UID {
+    &self.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/codegen/core/system.move

@@ -0,0 +1,126 @@
+module counter::counter_dapp_system {
+
+  use std::ascii::String;
+
+  use std::ascii;
+
+  use dubhe::type_info;
+
+  use sui::clock::Clock;
+
+  use sui::transfer::public_share_object;
+
+  use counter::counter_schema::Schema;
+
+  use counter::counter_dapp_metadata;
+
+  use counter::counter_dapp_metadata::DappMetadata;
+
+  use dubhe::storage::add_field;
+
+  use dubhe::storage_value;
+
+  use dubhe::storage_value::StorageValue;
+
+  public struct DappKey has drop {}
+
+  public(package) fun new(): DappKey {
+    DappKey {  }
+  }
+
+  public entry fun set_metadata(
+    schema: &mut Schema,
+    name: String,
+    description: String,
+    cover_url: vector<String>,
+    website_url: String,
+    partners: vector<String>,
+    ctx: &TxContext,
+  ) {
+    let admin = schema.dapp__admin().try_get();
+    assert!(admin == option::some(ctx.sender()), 0);
+    let created_at = schema.dapp__metadata().get().get_created_at();
+    schema.dapp__metadata().set(
+            counter_dapp_metadata::new(
+                name,
+                description,
+                cover_url,
+                website_url,
+                created_at,
+                partners
+            )
+        );
+  }
+
+  public entry fun transfer_ownership(schema: &mut Schema, new_admin: address, ctx: &mut TxContext) {
+    let admin = schema.dapp__admin().try_get();
+    assert!(admin == option::some(ctx.sender()), 0);
+    schema.dapp__admin().set(new_admin);
+  }
+
+  public entry fun set_safe_mode(schema: &mut Schema, safe_mode: bool, ctx: &TxContext) {
+    let admin = schema.dapp__admin().try_get();
+    assert!(admin == option::some(ctx.sender()), 0);
+    schema.dapp__safe_mode().set(safe_mode);
+  }
+
+  public fun ensure_no_safe_mode(schema: &mut Schema) {
+    assert!(!schema.dapp__safe_mode()[], 0);
+  }
+
+  public fun ensure_has_authority(schema: &mut Schema, ctx: &TxContext) {
+    assert!(schema.dapp__admin().get() == ctx.sender(), 0);
+  }
+
+  public fun ensure_has_schema<S: key + store>(schema: &mut Schema, new_schema: &S) {
+    let schema_id = object::id_address(new_schema);
+    assert!(schema.dapp__authorised_schemas().get().contains(&schema_id), 0);
+  }
+
+  public(package) fun create(
+    schema: &mut Schema,
+    name: String,
+    description: String,
+    clock: &Clock,
+    ctx: &mut TxContext,
+  ) {
+    add_field<StorageValue<address>>(schema.id(), b"dapp__admin", storage_value::new(b"dapp__admin", ctx));
+    add_field<StorageValue<address>>(schema.id(), b"dapp__package_id", storage_value::new(b"dapp__package_id", ctx));
+    add_field<StorageValue<u32>>(schema.id(), b"dapp__version", storage_value::new(b"dapp__version", ctx));
+    add_field<StorageValue<DappMetadata>>(schema.id(), b"dapp__metadata", storage_value::new(b"dapp__metadata", ctx));
+    add_field<StorageValue<bool>>(schema.id(), b"dapp__safe_mode", storage_value::new(b"dapp__safe_mode", ctx));
+    add_field<StorageValue<vector<address>>>(schema.id(), b"dapp__authorised_schemas", storage_value::new(b"dapp__authorised_schemas", ctx));
+    schema.dapp__metadata().set(
+            counter_dapp_metadata::new(
+                name,
+                description,
+                vector[],
+                ascii::string(b""),
+                clock.timestamp_ms(),
+                vector[]
+            )
+        );
+    let package_id = type_info::current_package_id<DappKey>();
+    schema.dapp__package_id().set(package_id);
+    schema.dapp__admin().set(ctx.sender());
+    schema.dapp__version().set(1);
+    schema.dapp__safe_mode().set(false);
+    schema.dapp__authorised_schemas().set(vector[]);
+  }
+
+  public(package) fun upgrade<DappKey: drop>(schema: &mut Schema, ctx: &TxContext) {
+    assert!(schema.dapp__metadata().contains(), 0);
+    assert!(schema.dapp__admin().get() == ctx.sender(), 0);
+    let new_package_id = type_info::current_package_id<DappKey>();
+    schema.dapp__package_id().set(new_package_id);
+    let current_version = schema.dapp__version()[];
+    schema.dapp__version().set(current_version + 1);
+  }
+
+  public(package) fun add_schema<S: key + store>(schema: &mut Schema, new_schema: S) {
+    let mut schemas = schema.dapp__authorised_schemas()[];
+    schemas.push_back(object::id_address<S>(&new_schema));
+    schema.dapp__authorised_schemas().set(schemas);
+    public_share_object(new_schema);
+  }
+}

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

@@ -7,7 +7,7 @@ module counter::counter_test {
 
     #[test]
     public fun inc() {
-        let (scenario, dapp)  = counter_init_test::deploy_dapp_for_testing(@0xA);
+        let scenario  = counter_init_test::deploy_dapp_for_testing(@0xA);
 
         let mut schema = test_scenario::take_shared<Schema>(&scenario);
 
@@ -20,7 +20,6 @@ module counter::counter_test {
         assert!(schema.value().get() == 20);
 
         test_scenario::return_shared(schema);
-        dapp.distroy_dapp_for_testing();
         scenario.end();
     }
 }

package/template/101/sui-template/package.json

@@ -35,9 +35,9 @@
     "prod:mainnet": "pnpm config:store mainnet && pnpm next"
   },
   "dependencies": {
-    "@0xobelisk/sui-cli": "^1.1.7",
-    "@0xobelisk/sui-client": "^1.1.10",
-    "@0xobelisk/sui-common": "^1.1.8",
+    "@0xobelisk/sui-cli": "^1.1.8",
+    "@0xobelisk/sui-client": "^1.1.11",
+    "@0xobelisk/sui-common": "^1.1.9",
     "@0xobelisk/sui-indexer": "^1.1.13",
     "jotai": "^1.7.2",
     "dotenv": "^16.4.5",

package/template/contract/sui-template/package.json

@@ -15,9 +15,9 @@
     "indexer:sqlite": "pnpm sqlite-indexer --force-regenesis --network"
   },
   "dependencies": {
-    "@0xobelisk/sui-cli": "^1.1.7",
-    "@0xobelisk/sui-client": "^1.1.10",
-    "@0xobelisk/sui-common": "^1.1.8",
+    "@0xobelisk/sui-cli": "^1.1.8",
+    "@0xobelisk/sui-client": "^1.1.11",
+    "@0xobelisk/sui-common": "^1.1.9",
     "@0xobelisk/sui-indexer": "^1.1.13",
     "dotenv": "^16.4.5",
     "chalk": "^4.1.2"

package/template/{101/sui-template/contracts/counter/sources/codegen → nextjs/sui-template/contracts/counter/sources/codegen/core}/genesis.move

@@ -7,14 +7,13 @@
   use counter::counter_dapp_system;
 
   public entry fun run(clock: &Clock, ctx: &mut TxContext) {
-    // Create a dapp.
-    let mut dapp = counter_dapp_system::create(string(b"counter"),string(b"counter contract"), clock , ctx);
     // Create schemas
     let mut schema = counter::counter_schema::create(ctx);
+    // Setup default storage
+    counter_dapp_system::create(&mut schema, string(b"counter"),string(b"counter contract"), clock , ctx);
     // Logic that needs to be automated once the contract is deployed
     counter::counter_deploy_hook::run(&mut schema, ctx);
     // Authorize schemas and public share objects
-    dapp.add_schema(schema);
-    sui::transfer::public_share_object(dapp);
+    sui::transfer::public_share_object(schema);
   }
 }

package/template/nextjs/sui-template/contracts/counter/sources/{tests/init.move → codegen/core/init_test.move}

@@ -1,21 +1,18 @@
 #[test_only]module counter::counter_init_test {
 
-  use counter::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) {
+  public fun deploy_dapp_for_testing(sender: address): Scenario {
     let mut scenario = test_scenario::begin(sender);
     let ctx = test_scenario::ctx(&mut scenario);
     let clock = clock::create_for_testing(ctx);
     counter::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);
-    (scenario, dapp)
+    scenario
   }
 }

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

@@ -11,7 +11,7 @@
   public struct DappMetadata has drop, copy, store {
     name: String,
     description: String,
-    icon_url: String,
+    cover_url: vector<String>,
     website_url: String,
     created_at: u64,
     partners: vector<String>,
@@ -20,7 +20,7 @@
   public fun new(
     name: String,
     description: String,
-    icon_url: String,
+    cover_url: vector<String>,
     website_url: String,
     created_at: u64,
     partners: vector<String>,
@@ -28,7 +28,7 @@
     DappMetadata {
             name,
             description,
-            icon_url,
+            cover_url,
             website_url,
             created_at,
             partners,
@@ -39,14 +39,14 @@
     self: &mut DappMetadata,
     name: String,
     description: String,
-    icon_url: String,
+    cover_url: vector<String>,
     website_url: String,
     created_at: u64,
     partners: vector<String>,
   ) {
     self.name = name;
     self.description = description;
-    self.icon_url = icon_url;
+    self.cover_url = cover_url;
     self.website_url = website_url;
     self.created_at = created_at;
     self.partners = partners;
@@ -60,8 +60,8 @@
     self.description = description;
   }
 
-  public fun set_icon_url(self: &mut DappMetadata, icon_url: String) {
-    self.icon_url = icon_url;
+  public fun set_cover_url(self: &mut DappMetadata, cover_url: vector<String>) {
+    self.cover_url = cover_url;
   }
 
   public fun set_website_url(self: &mut DappMetadata, website_url: String) {
@@ -84,8 +84,8 @@
     self.description
   }
 
-  public fun get_icon_url(self: &DappMetadata): String {
-    self.icon_url
+  public fun get_cover_url(self: &DappMetadata): vector<String> {
+    self.cover_url
   }
 
   public fun get_website_url(self: &DappMetadata): String {

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

@@ -0,0 +1,118 @@
+  // Copyright (c) Obelisk Labs, Inc.
+  // SPDX-License-Identifier: Apache-2.0
+  #[allow(unused_use)]
+  
+  /* Autogenerated file. Do not edit manually. */
+  
+  module counter::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;
+
+  use counter::counter_dapp_metadata::DappMetadata;
+
+  public struct Schema has key, store {
+    id: UID,
+  }
+
+  // Default storage
+
+  public fun borrow_dapp__admin(self: &Schema): &StorageValue<address> {
+    storage::borrow_field(&self.id, b"dapp__admin")
+  }
+
+  public fun borrow_dapp__package_id(self: &Schema): &StorageValue<address> {
+    storage::borrow_field(&self.id, b"dapp__package_id")
+  }
+
+  public fun borrow_dapp__version(self: &Schema): &StorageValue<u32> {
+    storage::borrow_field(&self.id, b"dapp__version")
+  }
+
+  public fun borrow_dapp__metadata(self: &Schema): &StorageValue<DappMetadata> {
+    storage::borrow_field(&self.id, b"dapp__metadata")
+  }
+
+  public fun borrow_dapp__safe_mode(self: &Schema): &StorageValue<bool> {
+    storage::borrow_field(&self.id, b"dapp__safe_mode")
+  }
+
+  public fun borrow_dapp__authorised_schemas(self: &Schema): &StorageValue<vector<address>> {
+    storage::borrow_field(&self.id, b"dapp__authorised_schemas")
+  }
+
+  public fun borrow_dapp__schemas(self: &Schema): &StorageValue<vector<address>> {
+    storage::borrow_field(&self.id, b"dapp__schemas")
+  }
+
+  public(package) fun dapp__admin(self: &mut Schema): &mut StorageValue<address> {
+    storage::borrow_mut_field(&mut self.id, b"dapp__admin")
+  }
+
+  public(package) fun dapp__package_id(self: &mut Schema): &mut StorageValue<address> {
+    storage::borrow_mut_field(&mut self.id, b"dapp__package_id")
+  }
+
+  public(package) fun dapp__version(self: &mut Schema): &mut StorageValue<u32> {
+    storage::borrow_mut_field(&mut self.id, b"dapp__version")
+  }
+
+  public(package) fun dapp__metadata(self: &mut Schema): &mut StorageValue<DappMetadata> {
+    storage::borrow_mut_field(&mut self.id, b"dapp__metadata")
+  }
+
+  public(package) fun dapp__safe_mode(self: &mut Schema): &mut StorageValue<bool> {
+    storage::borrow_mut_field(&mut self.id, b"dapp__safe_mode")
+  }
+
+  public(package) fun dapp__authorised_schemas(self: &mut Schema): &mut StorageValue<vector<address>> {
+    storage::borrow_mut_field(&mut self.id, b"dapp__authorised_schemas")
+  }
+
+  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(package) fun id(self: &mut Schema): &mut UID {
+    &mut self.id
+  }
+
+  public(package) fun borrow_id(self: &Schema): &UID {
+    &self.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/nextjs/sui-template/contracts/counter/sources/codegen/core/system.move

@@ -0,0 +1,126 @@
+module counter::counter_dapp_system {
+
+  use std::ascii::String;
+
+  use std::ascii;
+
+  use dubhe::type_info;
+
+  use sui::clock::Clock;
+
+  use sui::transfer::public_share_object;
+
+  use counter::counter_schema::Schema;
+
+  use counter::counter_dapp_metadata;
+
+  use counter::counter_dapp_metadata::DappMetadata;
+
+  use dubhe::storage::add_field;
+
+  use dubhe::storage_value;
+
+  use dubhe::storage_value::StorageValue;
+
+  public struct DappKey has drop {}
+
+  public(package) fun new(): DappKey {
+    DappKey {  }
+  }
+
+  public entry fun set_metadata(
+    schema: &mut Schema,
+    name: String,
+    description: String,
+    cover_url: vector<String>,
+    website_url: String,
+    partners: vector<String>,
+    ctx: &TxContext,
+  ) {
+    let admin = schema.dapp__admin().try_get();
+    assert!(admin == option::some(ctx.sender()), 0);
+    let created_at = schema.dapp__metadata().get().get_created_at();
+    schema.dapp__metadata().set(
+            counter_dapp_metadata::new(
+                name,
+                description,
+                cover_url,
+                website_url,
+                created_at,
+                partners
+            )
+        );
+  }
+
+  public entry fun transfer_ownership(schema: &mut Schema, new_admin: address, ctx: &mut TxContext) {
+    let admin = schema.dapp__admin().try_get();
+    assert!(admin == option::some(ctx.sender()), 0);
+    schema.dapp__admin().set(new_admin);
+  }
+
+  public entry fun set_safe_mode(schema: &mut Schema, safe_mode: bool, ctx: &TxContext) {
+    let admin = schema.dapp__admin().try_get();
+    assert!(admin == option::some(ctx.sender()), 0);
+    schema.dapp__safe_mode().set(safe_mode);
+  }
+
+  public fun ensure_no_safe_mode(schema: &mut Schema) {
+    assert!(!schema.dapp__safe_mode()[], 0);
+  }
+
+  public fun ensure_has_authority(schema: &mut Schema, ctx: &TxContext) {
+    assert!(schema.dapp__admin().get() == ctx.sender(), 0);
+  }
+
+  public fun ensure_has_schema<S: key + store>(schema: &mut Schema, new_schema: &S) {
+    let schema_id = object::id_address(new_schema);
+    assert!(schema.dapp__authorised_schemas().get().contains(&schema_id), 0);
+  }
+
+  public(package) fun create(
+    schema: &mut Schema,
+    name: String,
+    description: String,
+    clock: &Clock,
+    ctx: &mut TxContext,
+  ) {
+    add_field<StorageValue<address>>(schema.id(), b"dapp__admin", storage_value::new(b"dapp__admin", ctx));
+    add_field<StorageValue<address>>(schema.id(), b"dapp__package_id", storage_value::new(b"dapp__package_id", ctx));
+    add_field<StorageValue<u32>>(schema.id(), b"dapp__version", storage_value::new(b"dapp__version", ctx));
+    add_field<StorageValue<DappMetadata>>(schema.id(), b"dapp__metadata", storage_value::new(b"dapp__metadata", ctx));
+    add_field<StorageValue<bool>>(schema.id(), b"dapp__safe_mode", storage_value::new(b"dapp__safe_mode", ctx));
+    add_field<StorageValue<vector<address>>>(schema.id(), b"dapp__authorised_schemas", storage_value::new(b"dapp__authorised_schemas", ctx));
+    schema.dapp__metadata().set(
+            counter_dapp_metadata::new(
+                name,
+                description,
+                vector[],
+                ascii::string(b""),
+                clock.timestamp_ms(),
+                vector[]
+            )
+        );
+    let package_id = type_info::current_package_id<DappKey>();
+    schema.dapp__package_id().set(package_id);
+    schema.dapp__admin().set(ctx.sender());
+    schema.dapp__version().set(1);
+    schema.dapp__safe_mode().set(false);
+    schema.dapp__authorised_schemas().set(vector[]);
+  }
+
+  public(package) fun upgrade<DappKey: drop>(schema: &mut Schema, ctx: &TxContext) {
+    assert!(schema.dapp__metadata().contains(), 0);
+    assert!(schema.dapp__admin().get() == ctx.sender(), 0);
+    let new_package_id = type_info::current_package_id<DappKey>();
+    schema.dapp__package_id().set(new_package_id);
+    let current_version = schema.dapp__version()[];
+    schema.dapp__version().set(current_version + 1);
+  }
+
+  public(package) fun add_schema<S: key + store>(schema: &mut Schema, new_schema: S) {
+    let mut schemas = schema.dapp__authorised_schemas()[];
+    schemas.push_back(object::id_address<S>(&new_schema));
+    schema.dapp__authorised_schemas().set(schemas);
+    public_share_object(new_schema);
+  }
+}

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

@@ -7,7 +7,7 @@ module counter::counter_test {
 
     #[test]
     public fun inc() {
-        let (scenario, dapp)  = counter_init_test::deploy_dapp_for_testing(@0xA);
+        let scenario = counter_init_test::deploy_dapp_for_testing(@0xA);
 
         let mut schema = test_scenario::take_shared<Schema>(&scenario);
 
@@ -20,7 +20,6 @@ module counter::counter_test {
         assert!(schema.value().get() == 20);
 
         test_scenario::return_shared(schema);
-        dapp.distroy_dapp_for_testing();
         scenario.end();
     }
 }

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

@@ -36,9 +36,9 @@
     "prod:mainnet": "pnpm config:store mainnet && pnpm next"
   },
   "dependencies": {
-    "@0xobelisk/sui-cli": "^1.1.7",
-    "@0xobelisk/sui-client": "^1.1.10",
-    "@0xobelisk/sui-common": "^1.1.8",
+    "@0xobelisk/sui-cli": "^1.1.8",
+    "@0xobelisk/sui-client": "^1.1.11",
+    "@0xobelisk/sui-common": "^1.1.9",
     "@0xobelisk/sui-indexer": "^1.1.13",
     "@mysten/dapp-kit": "0.14.46",
     "@tanstack/react-query": "^5.17.19",

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

@@ -1,112 +0,0 @@
-  // Copyright (c) Obelisk Labs, Inc.
-  // SPDX-License-Identifier: Apache-2.0
-  #[allow(unused_use)]
-  
-  /* Autogenerated file. Do not edit manually. */
-  
-  module counter::counter_dapp_schema {
-
-  use counter::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/101/sui-template/contracts/counter/sources/codegen/dapp/system.move

@@ -1,93 +0,0 @@
-module counter::counter_dapp_system {
-
-  use std::ascii::String;
-
-  use std::ascii;
-
-  use dubhe::type_info;
-
-  use sui::clock::Clock;
-
-  use counter::counter_dapp_schema;
-
-  use counter::counter_dapp_metadata;
-
-  use counter::counter_dapp_schema::Dapp;
-
-  public struct DappKey has drop {}
-
-  public(package) fun new(): DappKey {
-    DappKey {  }
-  }
-
-  public(package) fun create(name: String, description: String, clock: &Clock, ctx: &mut TxContext): Dapp {
-    let mut dapp = counter_dapp_schema::create(ctx);
-    assert!(!dapp.borrow_metadata().contains(), 0);
-    dapp.metadata().set(
-            counter_dapp_metadata::new(
-                name,
-                description,
-                ascii::string(b""),
-                ascii::string(b""),
-                clock.timestamp_ms(),
-                vector[]
-            )
-        );
-    let package_id = type_info::current_package_id<DappKey>();
-    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
-  }
-
-  public entry fun set_metadata(
-    dapp: &mut Dapp,
-    name: String,
-    description: String,
-    icon_url: String,
-    website_url: String,
-    partners: vector<String>,
-    ctx: &TxContext,
-  ) {
-    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(
-            counter_dapp_metadata::new(
-                name,
-                description,
-                icon_url,
-                website_url,
-                created_at,
-                partners
-            )
-        );
-  }
-
-  public entry fun transfer_ownership(dapp: &mut Dapp, new_admin: address, ctx: &mut TxContext) {
-    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) {
-    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()[], 0);
-  }
-
-  public fun ensure_has_authority(dapp: &Dapp, ctx: &TxContext) {
-    assert!(dapp.borrow_admin().get() == ctx.sender(), 0);
-  }
-
-  public fun ensure_has_schema<Schema: key + store>(dapp: &Dapp, schema: &Schema) {
-    let schema_id = object::id_address(schema);
-    assert!(dapp.borrow_schemas().get().contains(&schema_id), 0);
-  }
-}

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

@@ -1,62 +0,0 @@
-  // Copyright (c) Obelisk Labs, Inc.
-  // SPDX-License-Identifier: Apache-2.0
-  #[allow(unused_use)]
-  
-  /* Autogenerated file. Do not edit manually. */
-  
-  module counter::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(package) fun id(self: &mut Schema): &mut UID {
-    &mut self.id
-  }
-
-  public(package) fun borrow_id(self: &Schema): &UID {
-    &self.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/nextjs/sui-template/contracts/counter/sources/codegen/dapp/schema.move

@@ -1,112 +0,0 @@
-  // Copyright (c) Obelisk Labs, Inc.
-  // SPDX-License-Identifier: Apache-2.0
-  #[allow(unused_use)]
-  
-  /* Autogenerated file. Do not edit manually. */
-  
-  module counter::counter_dapp_schema {
-
-  use counter::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/dapp/system.move

@@ -1,93 +0,0 @@
-module counter::counter_dapp_system {
-
-  use std::ascii::String;
-
-  use std::ascii;
-
-  use dubhe::type_info;
-
-  use sui::clock::Clock;
-
-  use counter::counter_dapp_schema;
-
-  use counter::counter_dapp_metadata;
-
-  use counter::counter_dapp_schema::Dapp;
-
-  public struct DappKey has drop {}
-
-  public(package) fun new(): DappKey {
-    DappKey {  }
-  }
-
-  public(package) fun create(name: String, description: String, clock: &Clock, ctx: &mut TxContext): Dapp {
-    let mut dapp = counter_dapp_schema::create(ctx);
-    assert!(!dapp.borrow_metadata().contains(), 0);
-    dapp.metadata().set(
-            counter_dapp_metadata::new(
-                name,
-                description,
-                ascii::string(b""),
-                ascii::string(b""),
-                clock.timestamp_ms(),
-                vector[]
-            )
-        );
-    let package_id = type_info::current_package_id<DappKey>();
-    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
-  }
-
-  public entry fun set_metadata(
-    dapp: &mut Dapp,
-    name: String,
-    description: String,
-    icon_url: String,
-    website_url: String,
-    partners: vector<String>,
-    ctx: &TxContext,
-  ) {
-    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(
-            counter_dapp_metadata::new(
-                name,
-                description,
-                icon_url,
-                website_url,
-                created_at,
-                partners
-            )
-        );
-  }
-
-  public entry fun transfer_ownership(dapp: &mut Dapp, new_admin: address, ctx: &mut TxContext) {
-    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) {
-    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()[], 0);
-  }
-
-  public fun ensure_has_authority(dapp: &Dapp, ctx: &TxContext) {
-    assert!(dapp.borrow_admin().get() == ctx.sender(), 0);
-  }
-
-  public fun ensure_has_schema<Schema: key + store>(dapp: &Dapp, schema: &Schema) {
-    let schema_id = object::id_address(schema);
-    assert!(dapp.borrow_schemas().get().contains(&schema_id), 0);
-  }
-}

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

@@ -1,62 +0,0 @@
-  // Copyright (c) Obelisk Labs, Inc.
-  // SPDX-License-Identifier: Apache-2.0
-  #[allow(unused_use)]
-  
-  /* Autogenerated file. Do not edit manually. */
-  
-  module counter::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(package) fun id(self: &mut Schema): &mut UID {
-    &mut self.id
-  }
-
-  public(package) fun borrow_id(self: &Schema): &UID {
-    &self.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()
-  }
-
-  // =========================================================================================================
-}