create-dubhe 0.0.8 → 0.0.10

package/template/{101/sui-template/contracts/counter/sources/script → contract/sui-template/contracts/counter/sources/scripts}/deploy_hook.move

@@ -1,6 +1,6 @@
 #[allow(lint(share_owned))]
-  
-  module counter::deploy_hook {
+
+module counter::deploy_hook {
 
   use dubhe::dapps_schema::Dapps;
 
@@ -12,6 +12,10 @@
 
   use sui::clock::Clock;
 
+  use sui::sui::SUI;
+
+  use sui::coin::Coin;
+
   use sui::package::UpgradeCap;
 
   use sui::transfer::public_share_object;
@@ -24,6 +28,10 @@
 
   #[test_only]
 
+  use sui::coin;
+
+  #[test_only]
+
   use sui::test_scenario;
 
   #[test_only]
@@ -47,15 +55,17 @@
     dapps: &mut Dapps,
     cap: &UpgradeCap,
     clock: &Clock,
+    coin: Coin<SUI>,
     ctx: &mut TxContext,
   ) {
     // Register the dapp to dubhe.
-    dapps_system::register(dapps,cap,string(b"counter"),string(b"counter"),clock,ctx);
+    dapps_system::register(dapps,cap,string(b"counter"),string(b"counter"),clock,coin,ctx);
     // Create schemas
     let mut counter = counter::counter_schema::create(ctx);
     // Logic that needs to be automated once the contract is deployed
 
     counter.borrow_mut_value().set(0);
+
     // Authorize schemas and public share objects
     schema_hub.authorize_schema<Counter>();
     public_share_object(counter);
@@ -66,17 +76,18 @@
   public fun deploy_hook_for_testing(): (Scenario, SchemaHub, Dapps) {
     let mut scenario = test_scenario::begin(@0xA);
     {
-          let ctx = test_scenario::ctx(&mut scenario);
-          dapps_schema::init_dapps_for_testing(ctx);
-          schema_hub::init_schema_hub_for_testing(ctx);
-          test_scenario::next_tx(&mut scenario,@0xA);
-      };
+      let ctx = test_scenario::ctx(&mut scenario);
+      dapps_schema::init_dapps_for_testing(ctx);
+      schema_hub::init_schema_hub_for_testing(ctx);
+      test_scenario::next_tx(&mut scenario,@0xA);
+    };
     let mut dapps = test_scenario::take_shared<Dapps>(&scenario);
     let mut schema_hub = test_scenario::take_shared<SchemaHub>(&scenario);
     let ctx = test_scenario::ctx(&mut scenario);
     let clock = clock::create_for_testing(ctx);
     let upgrade_cap = package::test_publish(@0x42.to_id(), ctx);
-    run(&mut schema_hub, &mut dapps, &upgrade_cap, &clock, ctx);
+    let coin  = coin::mint_for_testing<SUI>(1_000_000_000, ctx);
+    run(&mut schema_hub, &mut dapps, &upgrade_cap, &clock, coin, ctx);
     clock::destroy_for_testing(clock);
     upgrade_cap.make_immutable();
     test_scenario::next_tx(&mut scenario,@0xA);

package/template/contract/sui-template/contracts/dubhe-framework/Move.toml

@@ -0,0 +1,13 @@
+[package]
+name = "Dubhe"
+edition = "2024"
+version = "1.0.0"
+license = "apache2.0"
+authors = ["Obelisk Labs"]
+
+[dependencies]
+Sui = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "mainnet-v1.38.3" }
+
+[addresses]
+dubhe = "0x0"
+

package/template/contract/sui-template/{localnet → contracts}/dubhe-framework/sources/core/dapps/schema.move

@@ -1,5 +1,10 @@
 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;
@@ -12,7 +17,9 @@ module dubhe::dapps_schema {
         metadata: StorageMap<address, DappMetadata>,
         schemas: StorageMap<address, vector<String>>,
         safe_mode: StorageMap<address, bool>,
-        verified: StorageMap<address, bool>
+        verified: StorageMap<address, bool>,
+        reserved: StorageValue<Balance<SUI>>,
+        reserve_amount: StorageValue<u64>,
     }
 
 
@@ -40,6 +47,14 @@ module dubhe::dapps_schema {
         &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
     }
@@ -64,7 +79,20 @@ module dubhe::dapps_schema {
         &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(),
@@ -73,6 +101,8 @@ module dubhe::dapps_schema {
             schemas: storage_map::new(),
             safe_mode: storage_map::new(),
             verified: storage_map::new(),
+            reserved,
+            reserve_amount
         });
     }
 

package/template/contract/sui-template/{localnet → contracts}/dubhe-framework/sources/core/dapps/system.move

@@ -4,6 +4,9 @@ module dubhe::dapps_system {
     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;
 
@@ -13,9 +16,9 @@ module dubhe::dapps_system {
         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);
 
@@ -31,8 +34,31 @@ module dubhe::dapps_system {
             )
         );
         dapps.borrow_mut_admin().set(dapp_id, ctx.sender());
-        dapps.borrow_mut_version().set(dapp_id, 0);
+        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>(

package/template/{101/sui-template/localnet → contract/sui-template/contracts}/dubhe-framework/sources/core/dapps/tests.move

@@ -6,9 +6,11 @@ module dubhe::dapps_tests {
     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 {}
 
@@ -26,6 +28,8 @@ module dubhe::dapps_tests {
         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,
@@ -33,17 +37,27 @@ module dubhe::dapps_tests {
             string(b"DappKey"),
             string(b"DappKey"),
             &clock,
-            test_scenario::ctx(&mut scenario)
+            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) == 0, 0);
+        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();

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

@@ -6,22 +6,24 @@
 	"license": "MIT",
 	"scripts": {
 		"// Utility Commands": "----------------",
-		"schema:gen": "pnpm dubhe schemagen --configPath ./dubhe.config.ts",
-		"account:gen": "NODE_NO_WARNINGS=1 ts-node scripts/generateAccount.ts",
-		"start": "pnpm dubhe localnode start",
+		"start": "pnpm dubhe node",
 		"faucet": "pnpm dubhe faucet --network",
+		"deploy": "pnpm dubhe publish --network",
+		"upgrade": "pnpm dubhe upgrade --network",
+		"schema:gen": "pnpm dubhe schemagen",
+		"account:gen": "NODE_NO_WARNINGS=1 ts-node scripts/generateAccount.ts",
 		"check-balance": "NODE_NO_WARNINGS=1 ts-node scripts/checkBalance.ts",
-		"deploy:localnet": "NODE_NO_WARNINGS=1 ts-node scripts/deployment/localnet/deploy.ts",
-		"deploy:testnet": "NODE_NO_WARNINGS=1 ts-node scripts/deployment/testnet/deploy.ts"
+		"deploy:framework": "pnpm dubhe publish --network localnet --contract-name dubhe-framework"
 	},
 	"dependencies": {
-		"@0xobelisk/sui-cli": "^0.5.25",
+		"@0xobelisk/sui-cli": "^0.5.29",
 		"@0xobelisk/sui-client": "^0.5.28",
-		"@0xobelisk/sui-common": "^0.5.21",
+		"@0xobelisk/sui-common": "^0.5.22",
 		"dotenv": "^16.4.5",
 		"chalk": "^4.1.2"
 	},
 	"devDependencies": {
+		"@types/node": "18.16.16",
 		"ts-node": "^10.9.1",
 		"typescript": "5.1.6"
 	}

package/template/nextjs/sui-template/contracts/counter/Move.toml

@@ -1,13 +1,12 @@
 [package]
 name = "counter"
-version = "0.0.1"
-edition = "2024.beta"
+version = "1.0.0"
+edition = "2024"
 
 [dependencies]
-Sui = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "mainnet-v1.36.2" }
-Dubhe = { git = "https://github.com/0xobelisk/dubhe-framework.git", rev = "release-dubhe-v1.0.0-rc1" }
+Sui = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "mainnet-v1.38.3" }
+Dubhe = { local = "../dubhe-framework" }
 
 [addresses]
 sui = "0x2"
-dubhe = "0x417ad1864a56a29ad0b5aaddd2e11bac1eeab6a68883ef53184a4cc5c293fec6"
 counter = "0x0"

package/template/{contract/sui-template/contracts/counter/sources/script → nextjs/sui-template/contracts/counter/sources/scripts}/deploy_hook.move

@@ -1,6 +1,6 @@
 #[allow(lint(share_owned))]
-  
-  module counter::deploy_hook {
+
+module counter::deploy_hook {
 
   use dubhe::dapps_schema::Dapps;
 
@@ -12,6 +12,10 @@
 
   use sui::clock::Clock;
 
+  use sui::sui::SUI;
+
+  use sui::coin::Coin;
+
   use sui::package::UpgradeCap;
 
   use sui::transfer::public_share_object;
@@ -24,6 +28,10 @@
 
   #[test_only]
 
+  use sui::coin;
+
+  #[test_only]
+
   use sui::test_scenario;
 
   #[test_only]
@@ -47,15 +55,17 @@
     dapps: &mut Dapps,
     cap: &UpgradeCap,
     clock: &Clock,
+    coin: Coin<SUI>,
     ctx: &mut TxContext,
   ) {
     // Register the dapp to dubhe.
-    dapps_system::register(dapps,cap,string(b"counter"),string(b"counter contract"),clock,ctx);
+    dapps_system::register(dapps,cap,string(b"counter"),string(b"counter"),clock,coin,ctx);
     // Create schemas
     let mut counter = counter::counter_schema::create(ctx);
     // Logic that needs to be automated once the contract is deployed
 
     counter.borrow_mut_value().set(0);
+
     // Authorize schemas and public share objects
     schema_hub.authorize_schema<Counter>();
     public_share_object(counter);
@@ -66,17 +76,18 @@
   public fun deploy_hook_for_testing(): (Scenario, SchemaHub, Dapps) {
     let mut scenario = test_scenario::begin(@0xA);
     {
-          let ctx = test_scenario::ctx(&mut scenario);
-          dapps_schema::init_dapps_for_testing(ctx);
-          schema_hub::init_schema_hub_for_testing(ctx);
-          test_scenario::next_tx(&mut scenario,@0xA);
-      };
+      let ctx = test_scenario::ctx(&mut scenario);
+      dapps_schema::init_dapps_for_testing(ctx);
+      schema_hub::init_schema_hub_for_testing(ctx);
+      test_scenario::next_tx(&mut scenario,@0xA);
+    };
     let mut dapps = test_scenario::take_shared<Dapps>(&scenario);
     let mut schema_hub = test_scenario::take_shared<SchemaHub>(&scenario);
     let ctx = test_scenario::ctx(&mut scenario);
     let clock = clock::create_for_testing(ctx);
     let upgrade_cap = package::test_publish(@0x42.to_id(), ctx);
-    run(&mut schema_hub, &mut dapps, &upgrade_cap, &clock, ctx);
+    let coin  = coin::mint_for_testing<SUI>(1_000_000_000, ctx);
+    run(&mut schema_hub, &mut dapps, &upgrade_cap, &clock, coin, ctx);
     clock::destroy_for_testing(clock);
     upgrade_cap.make_immutable();
     test_scenario::next_tx(&mut scenario,@0xA);

package/template/nextjs/sui-template/contracts/dubhe-framework/Move.toml

@@ -0,0 +1,13 @@
+[package]
+name = "Dubhe"
+edition = "2024"
+version = "1.0.0"
+license = "apache2.0"
+authors = ["Obelisk Labs"]
+
+[dependencies]
+Sui = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "mainnet-v1.38.3" }
+
+[addresses]
+dubhe = "0x0"
+

package/template/{101/sui-template/localnet → nextjs/sui-template/contracts}/dubhe-framework/sources/core/dapps/schema.move

@@ -1,5 +1,10 @@
 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;
@@ -12,7 +17,9 @@ module dubhe::dapps_schema {
         metadata: StorageMap<address, DappMetadata>,
         schemas: StorageMap<address, vector<String>>,
         safe_mode: StorageMap<address, bool>,
-        verified: StorageMap<address, bool>
+        verified: StorageMap<address, bool>,
+        reserved: StorageValue<Balance<SUI>>,
+        reserve_amount: StorageValue<u64>,
     }
 
 
@@ -40,6 +47,14 @@ module dubhe::dapps_schema {
         &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
     }
@@ -64,7 +79,20 @@ module dubhe::dapps_schema {
         &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(),
@@ -73,6 +101,8 @@ module dubhe::dapps_schema {
             schemas: storage_map::new(),
             safe_mode: storage_map::new(),
             verified: storage_map::new(),
+            reserved,
+            reserve_amount
         });
     }
 

package/template/{101/sui-template/localnet → nextjs/sui-template/contracts}/dubhe-framework/sources/core/dapps/system.move

@@ -4,6 +4,9 @@ module dubhe::dapps_system {
     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;
 
@@ -13,9 +16,9 @@ module dubhe::dapps_system {
         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);
 
@@ -31,8 +34,31 @@ module dubhe::dapps_system {
             )
         );
         dapps.borrow_mut_admin().set(dapp_id, ctx.sender());
-        dapps.borrow_mut_version().set(dapp_id, 0);
+        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>(

package/template/nextjs/sui-template/{localnet → contracts}/dubhe-framework/sources/core/dapps/tests.move

@@ -6,9 +6,11 @@ module dubhe::dapps_tests {
     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 {}
 
@@ -26,6 +28,8 @@ module dubhe::dapps_tests {
         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,
@@ -33,17 +37,27 @@ module dubhe::dapps_tests {
             string(b"DappKey"),
             string(b"DappKey"),
             &clock,
-            test_scenario::ctx(&mut scenario)
+            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) == 0, 0);
+        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();

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

@@ -6,20 +6,21 @@
   "license": "MIT",
   "scripts": {
     "// Utility Commands": "----------------",
-    "schema:gen": "pnpm dubhe schemagen --configPath ./dubhe.config.ts",
+    "start:localnet": "pnpm dubhe node",
+    "faucet": "pnpm dubhe faucet --network",
+    "deploy": "pnpm dubhe publish --network",
+    "upgrade": "pnpm dubhe upgrade --network",
+    "schema:gen": "pnpm dubhe schemagen",
     "account:gen": "NODE_NO_WARNINGS=1 ts-node scripts/generateAccount.ts",
     "config:store": "ts-node scripts/storeConfig.ts",
-    "start:localnet": "pnpm dubhe localnode start",
-    "faucet": "pnpm dubhe faucet --network",
     "check-balance": "NODE_NO_WARNINGS=1 ts-node scripts/checkBalance.ts",
-    "deploy:localnet": "NODE_NO_WARNINGS=1 ts-node scripts/deployment/localnet/deploy.ts",
-    "deploy:testnet": "NODE_NO_WARNINGS=1 ts-node scripts/deployment/testnet/deploy.ts",
+    "deploy:framework": "pnpm dubhe publish --network localnet --contract-name dubhe-framework",
     "// Development Environment": "----------------",
     "dev": "pnpm dev:localnet",
     "dev:localnet": "pnpm setup:localnet && pnpm next",
     "dev:testnet": "pnpm setup:testnet && pnpm next",
-    "setup:localnet": "pnpm account:gen && pnpm faucet localnet && pnpm deploy:localnet",
-    "setup:testnet": "pnpm account:gen && pnpm check-balance testnet && pnpm deploy:testnet",
+    "setup:localnet": "pnpm account:gen && pnpm faucet localnet && pnpm deploy:framework && pnpm run deploy localnet && pnpm run config:store localnet",
+    "setup:testnet": "pnpm account:gen && pnpm check-balance testnet && pnpm run deploy testnet && pnpm run config:store testnet",
     "build": "next build",
     "start": "next start",
     "// Production Environment": "----------------",
@@ -27,9 +28,9 @@
     "prod:testnet": "pnpm config:store testnet && pnpm next"
   },
   "dependencies": {
-    "@0xobelisk/sui-cli": "^0.5.25",
+    "@0xobelisk/sui-cli": "^0.5.29",
     "@0xobelisk/sui-client": "v0.5.28",
-    "@0xobelisk/sui-common": "^0.5.21",
+    "@0xobelisk/sui-common": "^0.5.22",
     "@mysten/dapp-kit": "0.14.9",
     "@mysten/sui": "1.7.0",
     "dotenv": "^16.4.5",

package/template/nextjs/sui-template/src/chain/config.ts

@@ -1,7 +1,7 @@
 type NetworkType = 'testnet' | 'mainnet' | 'devnet' | 'localnet';
 
-export const NETWORK: NetworkType = 'testnet';
+export const NETWORK: NetworkType = 'localnet';
 
-export const PACKAGE_ID = '0x7dea0ab27de6a4c85ddd1cdede7dd0d1a8e5aa77d3c0e9c9268e8a1eb97e73bc'
+export const PACKAGE_ID = '0xa449868b771214af8bb62414a2e00195664ef295f7fa3f7455aa355eb3e0899e'
 
-export const Counter_Object_Id = '0x5a1b868e71da437ba1eabfe7c7d6ee6ba45de5934bf6d36ff321105b6be8a099'
+export const Counter_Object_Id = '0x4747e58584beefa3495d8affda4e4cdcadf7064c17fea6a3dceefd8d4ebe9c6c'

package/template/101/aptos-template/scripts/formatAccount.ts

@@ -1,35 +0,0 @@
-import { AptosAccount } from 'aptos';
-import * as fs from 'fs';
-import * as dotenv from 'dotenv';
-dotenv.config();
-
-function generateAccount() {
-  const PRIVATE_KEY = process.env.PRIVATE_KEY;
-
-  if (PRIVATE_KEY === undefined) {
-    console.log('Missing PRIVATE_KEY in .env');
-    process.exit(0);
-  }
-
-  const keypair = AptosAccount.fromAptosAccountObject({
-    privateKeyHex: PRIVATE_KEY,
-  });
-  const privateKey = keypair.toPrivateKeyObject().privateKeyHex;
-
-  const path = process.cwd();
-  const chainFolderPath = `${path}/src/chain`;
-  fs.mkdirSync(chainFolderPath, { recursive: true });
-
-  // fs.writeFileSync(`${path}/.env`, `PRIVATE_KEY=${privateKey}`);
-
-  fs.writeFileSync(
-    `${path}/src/chain/key.ts`,
-    `export const PRIVATEKEY = '${privateKey}';
-export const ACCOUNT = '${keypair.address().toString()}';
-`,
-  );
-
-  console.log(`Format env Account: ${keypair.address().toString()}`);
-}
-
-generateAccount();