create-dubhe 1.2.0-pre.98 → 2.0.0

package/templates/101/sui-template/packages/contracts/package.json

@@ -7,19 +7,22 @@
     "// Utility Commands": "----------------",
     "account:gen": "pnpm dubhe generate-key",
     "check-balance": "pnpm dubhe check-balance --network",
-    "config:store": "pnpm dubhe config-store --output-ts-path ./deployment.ts --network",
+    "config:store": "pnpm dubhe store-config --output-ts-path ./deployment.ts --network",
     "deploy": "pnpm dubhe publish --network",
     "faucet": "pnpm dubhe faucet --network",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
+    "generate": "pnpm dubhe generate",
     "graphql": "docker-compose up --remove-orphans",
     "indexer": "dubhe-indexer --database-url postgres://postgres:postgres@localhost:5432/postgres --checkpoint-url .chk --config-json dubhe.config.json",
+    "indexer:mainnet": "dubhe-indexer --database-url postgres://postgres:postgres@localhost:5432/postgres --checkpoint-url https://checkpoints.mainnet.sui.io --config-json dubhe.config.json",
     "indexer:testnet": "dubhe-indexer --database-url postgres://postgres:postgres@localhost:5432/postgres --checkpoint-url https://checkpoints.testnet.sui.io --config-json dubhe.config.json",
     "prod:localnet": "pnpm config:store localnet && pnpm run indexer",
-    "prod:testnet": "pnpm config:store testnet && pnpm run indexer",
-    "schemagen": "pnpm dubhe schemagen",
+    "prod:mainnet": "pnpm config:store mainnet && pnpm run indexer:mainnet",
+    "prod:testnet": "pnpm config:store testnet && pnpm run indexer:testnet",
     "setup:localnet": "pnpm account:gen && pnpm faucet localnet && pnpm run deploy localnet && pnpm run config:store localnet && pnpm run indexer --force",
-    "setup:testnet": "pnpm account:gen && pnpm check-balance testnet && pnpm run deploy testnet && pnpm run config:store testnet && pnpm run indexer --force",
+    "setup:mainnet": "pnpm account:gen && pnpm check-balance mainnet && pnpm run deploy mainnet && pnpm run config:store mainnet && pnpm run indexer:mainnet --force",
+    "setup:testnet": "pnpm account:gen && pnpm check-balance testnet && pnpm run deploy testnet && pnpm run config:store testnet && pnpm run indexer:testnet --force",
     "start:localnet": "pnpm dubhe node",
     "type-check": "tsc --noEmit",
     "upgrade": "pnpm dubhe upgrade --network",

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

@@ -1,32 +1,46 @@
-  // Copyright (c) Obelisk Labs, Inc.
-  // SPDX-License-Identifier: Apache-2.0
-  #[allow(unused_use)]
-  
-  /* Autogenerated file. Do not edit manually. */
-  
-  module counter::dapp_key {
-use std::type_name;
-  use sui::address;
-  use std::ascii::String;
-
-  /// Authorization token for the app.
-
-  public struct DappKey has copy, drop {}
-
-  public(package) fun new(): DappKey {
-    DappKey {  }
-  }
-
-  public fun to_string(): String {
-    type_name::get<DappKey>().into_string()
-  }
-
-  public fun package_id(): address {
-    let package_id_str = type_name::get<DappKey>().get_address();
-    address::from_ascii_bytes(package_id_str.as_bytes())
-  }
-
-  public fun eq<DappKey1: copy + drop, DappKey2: copy + drop>(_: &DappKey1, _: &DappKey2): bool {
-    type_name::get<DappKey1>() == type_name::get<DappKey2>()
-  }
+// Copyright (c) Obelisk Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+/* Autogenerated file. Do not edit manually. */
+
+module counter::dapp_key {
+    use std::type_name;
+    use sui::address;
+    use std::ascii::String;
+
+    /// DappKey — package-level authorization token for this DApp.
+    ///
+    /// SECURITY: `new()` is intentionally `public(package)`.
+    /// Only code compiled into this package can construct a DappKey instance.
+    /// All framework write functions (`set_record`, `set_field`,
+    /// `take_record`, `create_user_storage`, …) require `_auth: DappKey`
+    /// as proof that the call originated from inside this package — an
+    /// external PTB cannot fabricate that proof.
+    ///
+    /// NEVER change `new()` to `public`, and never accept a DappKey
+    /// value as a parameter from an external caller.  Either mistake removes
+    /// every package-level access guard, allowing any PTB to write arbitrary
+    /// user data or register UserStorages without going through the DApp's
+    /// own entry functions.
+
+    public struct DappKey has copy, drop {}
+
+    /// Constructs an authorization token. Callable only from within this package.
+    /// Pass the result as `_auth` to any framework function that requires it.
+    public(package) fun new(): DappKey {
+        DappKey {}
+    }
+
+    public fun to_string(): String {
+        type_name::with_defining_ids<DappKey>().into_string()
+    }
+
+    public fun package_id(): address {
+        let package_id_str = type_name::with_defining_ids<DappKey>().address_string();
+        address::from_ascii_bytes(package_id_str.as_bytes())
+    }
+
+    public fun eq<DappKey1: copy + drop, DappKey2: copy + drop>(_: &DappKey1, _: &DappKey2): bool {
+        type_name::with_defining_ids<DappKey1>() == type_name::with_defining_ids<DappKey2>()
+    }
 }

package/templates/101/sui-template/packages/contracts/src/counter/sources/codegen/error.move

@@ -0,0 +1,8 @@
+// Copyright (c) Obelisk Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+/* Autogenerated file. Do not edit manually. */
+
+module counter::error {
+
+}

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

@@ -1,16 +1,33 @@
-#[allow(lint(share_owned))]module counter::genesis {
-      use sui::clock::Clock;
-      use dubhe::dapp_service::DappHub;
-      use counter::dapp_key;
-      use dubhe::dapp_system;
-      use std::ascii::string;
+#[allow(lint(share_owned))]
+module counter::genesis {
+    use sui::clock::Clock;
+    use dubhe::dapp_service::{DappHub, DappStorage};
+    use counter::dapp_key;
+    use dubhe::dapp_system;
+    use std::ascii::string;
 
-  public entry fun run(dapp_hub: &mut DappHub, clock: &Clock, ctx: &mut TxContext) {
-    // Create Dapp
-    let dapp_key = dapp_key::new();
-    dapp_system::create_dapp(dapp_hub, dapp_key, string(b"counter"), string(b"counter contract"), clock, ctx);
+    // The one-shot guard is enforced inside dapp_system::create_dapp, which
+    // records the DappKey type in DappHub before returning DappStorage.
+    // genesis.move does not need to carry its own guard.
+    public fun run(dapp_hub: &mut DappHub, clock: &Clock, ctx: &mut TxContext) {
+        // create_dapp aborts with dapp_already_initialized_error on repeated calls.
+        let dapp_key = dapp_key::new();
+        let mut ds = dapp_system::create_dapp(dapp_key, dapp_hub, string(b"counter"), string(b"counter contract"), 1, clock, ctx);
 
-    // Logic that needs to be automated once the contract is deployed
-    counter::deploy_hook::run(dapp_hub, ctx);
-  }
+        // Set up initial DApp state (e.g. default resource values).
+        counter::deploy_hook::run(&mut ds, ctx);
+
+        // Share DappStorage so every transaction can access it.
+        transfer::public_share_object(ds);
+    }
+
+    // Called during contract upgrades to register newly added resource tables
+    // and run any custom migration logic. `dubhe upgrade` rewrites the region
+    // between the separator comments; do not edit that block manually.
+    public(package) fun migrate(_dapp_hub: &mut DappHub, _dapp_storage: &mut DappStorage, _ctx: &mut TxContext) {
+        // ==========================================
+        // Add custom migration logic here (e.g. initialise new resource defaults).
+        // migrate_to_vN in migrate.move calls this function automatically.
+        // ==========================================
+    }
 }

package/templates/101/sui-template/packages/contracts/src/counter/sources/codegen/init_test.move

@@ -1,18 +1,23 @@
-#[test_only]module counter::init_test {
-  use sui::clock;
-  use sui::test_scenario;
-  use sui::test_scenario::Scenario;
-  use dubhe::dapp_service::DappHub;
+#[test_only]
+
+module counter::init_test {
   use dubhe::dapp_system;
 
-  public fun deploy_dapp_for_testing(scenario: &mut Scenario): DappHub {
-    let ctx = test_scenario::ctx(scenario);
-    let clock = clock::create_for_testing(ctx);
-    let mut dapp_hub = dapp_system::create_dapp_hub_for_testing(ctx);
-    dubhe::genesis::run(&mut dapp_hub, &clock, ctx);
-    counter::genesis::run(&mut dapp_hub, &clock, ctx);
-    clock::destroy_for_testing(clock);
-    test_scenario::next_tx(scenario, ctx.sender());
-    dapp_hub
+  /// Create a DappHub for testing without sharing it.
+  /// Suitable for unit tests that need a DappHub context.
+  public fun create_dapp_hub_for_testing(ctx: &mut TxContext): dubhe::dapp_service::DappHub {
+    dapp_system::create_dapp_hub_for_testing(ctx)
+  }
+
+  /// Create a DappStorage for this DApp without sharing it.
+  /// Suitable for unit tests that exercise global-resource functions.
+  public fun create_dapp_storage_for_testing(ctx: &mut TxContext): dubhe::dapp_service::DappStorage {
+    dubhe::dapp_system::create_dapp_storage_for_testing<counter::dapp_key::DappKey>(ctx)
+  }
+
+  /// Create a UserStorage for `owner` without sharing it.
+  /// Suitable for unit tests that exercise user-level resource functions.
+  public fun create_user_storage_for_testing(owner: address, ctx: &mut TxContext): dubhe::dapp_service::UserStorage {
+    dubhe::dapp_system::create_user_storage_for_testing<counter::dapp_key::DappKey>(owner, ctx)
   }
 }

package/templates/101/sui-template/packages/contracts/src/counter/sources/codegen/resources/counter2.move

@@ -0,0 +1,198 @@
+// Copyright (c) Obelisk Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+/* Autogenerated file. Do not edit manually. */
+
+module counter::counter2 {
+    use sui::bcs::{to_bytes};
+    use std::ascii::{string, String, into_bytes};
+    use dubhe::dapp_service::UserStorage;
+    use dubhe::dapp_system;
+    use counter::dapp_key;
+    use counter::dapp_key::DappKey;
+
+
+    const TABLE_NAME: vector<u8> = b"counter2";
+    const OFFCHAIN: bool = false;
+
+    public struct Counter2 has copy, drop, store {
+        value: u32,
+        data: u64,
+        key: String,
+    }
+
+    public fun new(value: u32, data: u64, key: String): Counter2 {
+        Counter2 {
+            value,
+            data,
+            key,
+        }
+    }
+
+    public fun value(self: &Counter2): u32 {
+        self.value
+    }
+
+    public fun data(self: &Counter2): u64 {
+        self.data
+    }
+
+    public fun key(self: &Counter2): String {
+        self.key
+    }
+
+    public fun update_value(self: &mut Counter2, value: u32) {
+        self.value = value
+    }
+
+    public fun update_data(self: &mut Counter2, data: u64) {
+        self.data = data
+    }
+
+    public fun update_key(self: &mut Counter2, key: String) {
+        self.key = key
+    }
+
+    public fun has(user_storage: &UserStorage): bool {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        dapp_system::has_record<DappKey>(user_storage, key_tuple)
+    }
+
+    public fun ensure_has(user_storage: &UserStorage) {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        dapp_system::ensure_has_record<DappKey>(user_storage, key_tuple)
+    }
+
+    public fun ensure_has_not(user_storage: &UserStorage) {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        dapp_system::ensure_has_not_record<DappKey>(user_storage, key_tuple)
+    }
+  
+
+    public(package) fun delete(user_storage: &mut UserStorage, ctx: &TxContext) {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        dapp_system::delete_record<DappKey>(dapp_key::new(), user_storage, key_tuple, vector[b"value", b"data", b"key"], ctx);
+    }
+
+    public fun get_value(user_storage: &UserStorage): u32 {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        let value_raw = dapp_system::get_field<DappKey>(user_storage, key_tuple, b"value");
+        let mut value_bcs = sui::bcs::new(value_raw);
+        let value = sui::bcs::peel_u32(&mut value_bcs);
+        value
+    }
+
+    public(package) fun set_value(user_storage: &mut UserStorage, value: u32, ctx: &mut TxContext) {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        let value = to_bytes(&value);
+        dapp_system::set_field<DappKey>(dapp_key::new(), user_storage, key_tuple, b"value", value, ctx);
+    }
+
+    public fun get_data(user_storage: &UserStorage): u64 {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        let data_raw = dapp_system::get_field<DappKey>(user_storage, key_tuple, b"data");
+        let mut data_bcs = sui::bcs::new(data_raw);
+        let data = sui::bcs::peel_u64(&mut data_bcs);
+        data
+    }
+
+    public(package) fun set_data(user_storage: &mut UserStorage, data: u64, ctx: &mut TxContext) {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        let value = to_bytes(&data);
+        dapp_system::set_field<DappKey>(dapp_key::new(), user_storage, key_tuple, b"data", value, ctx);
+    }
+
+    public fun get_key(user_storage: &UserStorage): String {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        let key_raw = dapp_system::get_field<DappKey>(user_storage, key_tuple, b"key");
+        let mut key_bcs = sui::bcs::new(key_raw);
+        let key = dubhe::bcs::peel_string(&mut key_bcs);
+        key
+    }
+
+    public(package) fun set_key(user_storage: &mut UserStorage, key: String, ctx: &mut TxContext) {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        let value = to_bytes(&into_bytes(key));
+        dapp_system::set_field<DappKey>(dapp_key::new(), user_storage, key_tuple, b"key", value, ctx);
+    }
+
+    public fun get(user_storage: &UserStorage): (u32, u64, String) {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        let value_raw = dapp_system::get_field<DappKey>(user_storage, key_tuple, b"value");
+        let mut value_bcs = sui::bcs::new(value_raw);
+        let value = sui::bcs::peel_u32(&mut value_bcs);
+        let data_raw = dapp_system::get_field<DappKey>(user_storage, key_tuple, b"data");
+        let mut data_bcs = sui::bcs::new(data_raw);
+        let data = sui::bcs::peel_u64(&mut data_bcs);
+        let key_raw = dapp_system::get_field<DappKey>(user_storage, key_tuple, b"key");
+        let mut key_bcs = sui::bcs::new(key_raw);
+        let key = dubhe::bcs::peel_string(&mut key_bcs);
+        (value, data, key)
+    }
+
+    public(package) fun set(user_storage: &mut UserStorage, value: u32, data: u64, key: String, ctx: &mut TxContext) {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        let field_names = vector[b"value", b"data", b"key"];
+        let value_tuple = encode(value, data, key);
+        dapp_system::set_record<DappKey>(dapp_key::new(), user_storage, key_tuple, field_names, value_tuple, OFFCHAIN, ctx);
+    }
+
+    public fun get_struct(user_storage: &UserStorage): Counter2 {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        let value_raw = dapp_system::get_field<DappKey>(user_storage, key_tuple, b"value");
+        let mut value_bcs = sui::bcs::new(value_raw);
+        let value = sui::bcs::peel_u32(&mut value_bcs);
+        let data_raw = dapp_system::get_field<DappKey>(user_storage, key_tuple, b"data");
+        let mut data_bcs = sui::bcs::new(data_raw);
+        let data = sui::bcs::peel_u64(&mut data_bcs);
+        let key_raw = dapp_system::get_field<DappKey>(user_storage, key_tuple, b"key");
+        let mut key_bcs = sui::bcs::new(key_raw);
+        let key = dubhe::bcs::peel_string(&mut key_bcs);
+        Counter2 { value, data, key }
+    }
+
+    public(package) fun set_struct(user_storage: &mut UserStorage, counter2: Counter2, ctx: &mut TxContext) {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        let field_names = vector[b"value", b"data", b"key"];
+        let value_tuple = encode_struct(counter2);
+        dapp_system::set_record<DappKey>(dapp_key::new(), user_storage, key_tuple, field_names, value_tuple, OFFCHAIN, ctx);
+    }
+
+    public fun encode(value: u32, data: u64, key: String): vector<vector<u8>> {
+        let mut value_tuple = vector::empty();
+        value_tuple.push_back(to_bytes(&value));
+        value_tuple.push_back(to_bytes(&data));
+        value_tuple.push_back(to_bytes(&into_bytes(key)));
+        value_tuple
+    }
+
+    public fun encode_struct(counter2: Counter2): vector<vector<u8>> {
+        encode(counter2.value, counter2.data, counter2.key)
+    }
+
+    public fun decode(data: vector<u8>): Counter2 {
+        let mut bcs_type = sui::bcs::new(data);
+        let value = sui::bcs::peel_u32(&mut bcs_type);
+        let data = sui::bcs::peel_u64(&mut bcs_type);
+        let key = string(sui::bcs::peel_vec_u8(&mut bcs_type));
+        Counter2 {
+            value,
+            data,
+            key,
+        }
+    }
+}

package/templates/101/sui-template/packages/contracts/src/counter/sources/codegen/resources/counter2withkey.move

@@ -0,0 +1,90 @@
+// Copyright (c) Obelisk Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+/* Autogenerated file. Do not edit manually. */
+
+module counter::counter2withkey {
+    use sui::bcs::{to_bytes};
+    use std::ascii::String;
+    use dubhe::dapp_service::UserStorage;
+    use dubhe::dapp_system;
+    use counter::dapp_key;
+    use counter::dapp_key::DappKey;
+
+
+    const TABLE_NAME: vector<u8> = b"counter2withkey";
+    const OFFCHAIN: bool = false;
+
+    public fun has(user_storage: &UserStorage, data: u64, key: String): bool {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        key_tuple.push_back(to_bytes(&data));
+        key_tuple.push_back(to_bytes(&key));
+        dapp_system::has_record<DappKey>(user_storage, key_tuple)
+    }
+
+    public fun ensure_has(user_storage: &UserStorage, data: u64, key: String) {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        key_tuple.push_back(to_bytes(&data));
+        key_tuple.push_back(to_bytes(&key));
+        dapp_system::ensure_has_record<DappKey>(user_storage, key_tuple)
+    }
+
+    public fun ensure_has_not(user_storage: &UserStorage, data: u64, key: String) {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        key_tuple.push_back(to_bytes(&data));
+        key_tuple.push_back(to_bytes(&key));
+        dapp_system::ensure_has_not_record<DappKey>(user_storage, key_tuple)
+    }
+  
+
+    public(package) fun delete(user_storage: &mut UserStorage, data: u64, key: String, ctx: &TxContext) {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        key_tuple.push_back(to_bytes(&data));
+        key_tuple.push_back(to_bytes(&key));
+        dapp_system::delete_record<DappKey>(dapp_key::new(), user_storage, key_tuple, vector[b"value"], ctx);
+    }
+
+    public fun get(user_storage: &UserStorage, data: u64, key: String): u32 {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        key_tuple.push_back(to_bytes(&data));
+        key_tuple.push_back(to_bytes(&key));
+        let value_raw = dapp_system::get_field<DappKey>(user_storage, key_tuple, b"value");
+        let mut value_bcs = sui::bcs::new(value_raw);
+        let value = sui::bcs::peel_u32(&mut value_bcs);
+        value
+    }
+
+    public(package) fun set(user_storage: &mut UserStorage, data: u64, key: String, value: u32, ctx: &mut TxContext) {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        key_tuple.push_back(to_bytes(&data));
+        key_tuple.push_back(to_bytes(&key));
+        let field_names = vector[b"value"];
+        let value_tuple = encode(value);
+        dapp_system::set_record<DappKey>(dapp_key::new(), user_storage, key_tuple, field_names, value_tuple, OFFCHAIN, ctx);
+    }
+
+    public fun encode(value: u32): vector<vector<u8>> {
+        let mut value_tuple = vector::empty();
+        value_tuple.push_back(to_bytes(&value));
+        value_tuple
+    }
+
+
+    // ─── keys: mint (developer provides keys; framework ensures no duplicate) ─
+    // Choosing the ID strategy (fresh address, counter, coordinate pack, etc.)
+    // is intentionally left to the caller.
+    public(package) fun mint(
+        user_storage: &mut UserStorage,
+        data: u64, key: String, value: u32,
+        ctx: &mut TxContext,
+    ) {
+        ensure_has_not(user_storage, data, key);
+        set(user_storage, data, key, value, ctx);
+    }
+}

package/templates/101/sui-template/packages/contracts/src/counter/sources/codegen/resources/value.move

@@ -1,14 +1,11 @@
-  // Copyright (c) Obelisk Labs, Inc.
-  // SPDX-License-Identifier: Apache-2.0
-  #[allow(unused_use)]
-  
-  /* Autogenerated file. Do not edit manually. */
-  
-  module counter::value { 
+// Copyright (c) Obelisk Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+/* Autogenerated file. Do not edit manually. */
+
+module counter::value {
     use sui::bcs::{to_bytes};
-    use std::ascii::{string, String, into_bytes};
-    use dubhe::table_id;
-    use dubhe::dapp_service::{Self, DappHub};
+    use dubhe::dapp_service::UserStorage;
     use dubhe::dapp_system;
     use counter::dapp_key;
     use counter::dapp_key::DappKey;
@@ -18,32 +15,45 @@
     const OFFCHAIN: bool = false;
 
 
-    public fun has(dapp_hub: &DappHub, resource_account: String): bool {
+    public fun has(user_storage: &UserStorage): bool {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        dapp_system::has_record<DappKey>(user_storage, key_tuple)
+    }
+
+    public fun ensure_has(user_storage: &UserStorage) {
+        let mut key_tuple = vector::empty();
+        key_tuple.push_back(TABLE_NAME);
+        dapp_system::ensure_has_record<DappKey>(user_storage, key_tuple)
+    }
+
+    public fun ensure_has_not(user_storage: &UserStorage) {
         let mut key_tuple = vector::empty();
         key_tuple.push_back(TABLE_NAME);
-        dapp_system::has_record<DappKey>(dapp_hub, resource_account, key_tuple)
+        dapp_system::ensure_has_not_record<DappKey>(user_storage, key_tuple)
     }
 
-    public(package) fun delete(dapp_hub: &mut DappHub, resource_account: String) {
+    public(package) fun delete(user_storage: &mut UserStorage, ctx: &TxContext) {
         let mut key_tuple = vector::empty();
         key_tuple.push_back(TABLE_NAME);
-        dapp_system::delete_record<DappKey>(dapp_hub, dapp_key::new(), key_tuple, resource_account);
+        dapp_system::delete_record<DappKey>(dapp_key::new(), user_storage, key_tuple, vector[b"value"], ctx);
     }
 
-    public fun get(dapp_hub: &DappHub, resource_account: String): (u32) {
+    public fun get(user_storage: &UserStorage): (u32) {
         let mut key_tuple = vector::empty();
         key_tuple.push_back(TABLE_NAME);
-        let value_tuple = dapp_system::get_record<DappKey>(dapp_hub, resource_account, key_tuple);
-        let mut bsc_type = sui::bcs::new(value_tuple);
-        let value = sui::bcs::peel_u32(&mut bsc_type);
+        let value_raw = dapp_system::get_field<DappKey>(user_storage, key_tuple, b"value");
+        let mut value_bcs = sui::bcs::new(value_raw);
+        let value = sui::bcs::peel_u32(&mut value_bcs);
         (value)
     }
 
-    public(package) fun set(dapp_hub: &mut DappHub, resource_account: String, value: u32, ctx: &mut TxContext) {
+    public(package) fun set(user_storage: &mut UserStorage, value: u32, ctx: &mut TxContext) {
         let mut key_tuple = vector::empty();
         key_tuple.push_back(TABLE_NAME);
+        let field_names = vector[b"value"];
         let value_tuple = encode(value);
-        dapp_system::set_record(dapp_hub, dapp_key::new(), key_tuple, value_tuple, resource_account, OFFCHAIN, ctx);
+        dapp_system::set_record<DappKey>(dapp_key::new(), user_storage, key_tuple, field_names, value_tuple, OFFCHAIN, ctx);
     }
 
     public fun encode(value: u32): vector<vector<u8>> {

package/templates/101/sui-template/packages/contracts/src/counter/sources/codegen/user_storage_init.move

@@ -0,0 +1,26 @@
+// Copyright (c) Obelisk Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+/* Autogenerated file. Do not edit manually. */
+
+module counter::user_storage_init {
+  use dubhe::dapp_service::{DappHub, DappStorage};
+  use dubhe::dapp_system;
+  use counter::dapp_key;
+  use counter::dapp_key::DappKey;
+  use counter::migrate;
+
+  /// Create a UserStorage for the transaction sender within this DApp.
+  /// Must be called once before the user can interact with any user-level resources.
+  /// Aborts if the DApp version does not match this package, the DApp is paused,
+  /// or the framework version has advanced.
+  #[allow(lint(public_entry))]
+  public entry fun init_user_storage(
+      dapp_hub: &DappHub,
+      dapp_storage: &mut DappStorage,
+      ctx: &mut TxContext,
+  ) {
+      dapp_system::ensure_latest_version<DappKey>(dapp_storage, migrate::on_chain_version());
+      dapp_system::create_user_storage(dapp_key::new(), dapp_hub, dapp_storage, ctx);
+  }
+}

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

@@ -1,13 +1,8 @@
-  // 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 dubhe::dapp_service::DappHub;
-  use counter::value;
+module counter::deploy_hook {
+    use dubhe::dapp_service::DappStorage;
 
-  public(package) fun run(dapp_hub: &mut DappHub, ctx: &mut TxContext) {
-  }
+    public(package) fun run(_dapp_storage: &mut DappStorage, _ctx: &mut TxContext) {
+        // No global state to initialize for a UserStorage-based counter.
+        // Each user initializes their own storage via user_storage_init::init_user_storage.
+    }
 }

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

@@ -1,16 +1,28 @@
 module counter::counter_system {
-    use counter::errors::invalid_increment_error;
-    use dubhe::dapp_service::DappHub;
+    use dubhe::dapp_service::UserStorage;
     use counter::value;
-    use dubhe::address_system;
 
-    public entry fun inc(dapp_hub: &mut DappHub, number: u32, ctx: &mut TxContext) {
-        let sender = address_system::ensure_origin(ctx);
-        if (value::has(dapp_hub, sender)) {
-            let new_number = value::get(dapp_hub, sender) + number;
-            value::set(dapp_hub, sender, new_number, ctx);
+    #[allow(lint(public_entry))]
+    public entry fun inc(user_storage: &mut UserStorage, ctx: &mut TxContext) {
+        let curr = if (value::has(user_storage)) {
+            value::get(user_storage)
         } else {
-            value::set(dapp_hub, sender, number, ctx);
-        }
+            0u32
+        };
+        value::set(user_storage, curr + 1, ctx);
     }
-}
+
+    /// Guard-only entry function used for testing ensure_latest_version and
+    /// ensure_not_paused enforcement. Performs no writes.
+    #[allow(lint(public_entry))]
+    public entry fun check_version_guard(
+        dapp_storage: &dubhe::dapp_service::DappStorage,
+        _ctx: &mut TxContext
+    ) {
+        dubhe::dapp_system::ensure_latest_version<counter::dapp_key::DappKey>(
+            dapp_storage,
+            counter::migrate::on_chain_version()
+        );
+        dubhe::dapp_system::ensure_not_paused<counter::dapp_key::DappKey>(dapp_storage);
+    }
+}