create-dubhe 1.2.0-pre.98 → 2.0.0

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

@@ -1,21 +1,20 @@
-  // Copyright (c) Obelisk Labs, Inc.
-  // SPDX-License-Identifier: Apache-2.0
-  #[allow(unused_use)]
-  
-  /* Autogenerated file. Do not edit manually. */
-  
-  module dubhe::deploy_hook {
+// Copyright (c) Obelisk Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+#[allow(unused_use)]
+
+/* Autogenerated file. Do not edit manually. */
+
+module dubhe::deploy_hook {
   use dubhe::dapp_service::DappHub;
-  use dubhe::dapp_fee_config;
-  use std::ascii::{string, String};
-  use dubhe::dapp_key;
-  use dubhe::dapp_key::DappKey;
+  use dubhe::dapp_system;
+  use sui::sui::SUI;
 
   public(package) fun run(dapp_hub: &mut DappHub, ctx: &mut TxContext) {
-    // set free credit
-    let free_credit = 10 * 1000000000;
-    let base_fee = 80000;
-    let byte_fee = 500;
-    dapp_fee_config::set(dapp_hub, free_credit, base_fee, byte_fee, ctx);
+    // Initialise the framework fee config once (idempotent).
+    // base_fee  = 80_000 MIST per write  (~0.00008 SUI)
+    // bytes_fee =    500 MIST per byte   (~0.0000005 SUI / byte)
+    // Genesis deployer becomes treasury.
+    // default_write_fee_dapp_share_bps = 3000 (30% to DApp developers by default).
+    dapp_system::initialize_framework_fee<SUI>(dapp_hub, 80_000, 500, ctx.sender(), 3000, ctx);
   }
 }

package/templates/101/sui-template/packages/contracts/src/dubhe/sources/scripts/migrate.move

@@ -1,7 +1,4 @@
 module dubhe::migrate {
-  use dubhe::dapp_service::DappHub;
-  use dubhe::genesis;
-
   const ON_CHAIN_VERSION: u32 = 1;
 
   public fun on_chain_version(): u32 {

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

@@ -3,6 +3,7 @@ module dubhe::address_system;
 use std::ascii::String;
 use sui::address;
 use sui::hex;
+use dubhe::error;
 
 #[test_only]
 use sui::test_scenario;
@@ -18,9 +19,7 @@ const TX_HASH_LENGTH: u64 = 32;
 const SOLANA_ADDRESS_LENGTH: u64 = 32;
 const EVM_ADDRESS_LENGTH: u64 = 20;
 
-// Error codes
-const E_INVALID_EVM_ADDRESS: u64 = 1;
-const E_INVALID_SOLANA_ADDRESS: u64 = 2;
+// Error codes — all delegated to dubhe::error
 
 /// Detect chain type from tx_hash signature
 /// Returns: 0 = SUI, 1 = EVM, 2 = Solana
@@ -86,7 +85,7 @@ fun base58_decode(input: String): vector<u8> {
             k = k + 1;
         };
         
-        assert!(found, E_INVALID_SOLANA_ADDRESS);
+        error::invalid_solana_address(found);
         
         let mut carry = char_value;
         let mut m = (SOLANA_ADDRESS_LENGTH - 1);
@@ -107,11 +106,11 @@ fun base58_decode(input: String): vector<u8> {
 /// Format: [12 zero bytes][20 bytes EVM address]
 public fun evm_to_sui(evm_address_str: String): address {
     let evm_bytes = hex_string_to_bytes(evm_address_str);
-    assert!(evm_bytes.length() == EVM_ADDRESS_LENGTH, E_INVALID_EVM_ADDRESS);
+    error::invalid_evm_address(evm_bytes.length() == EVM_ADDRESS_LENGTH);
     
     let mut sui_bytes = vector[];
-    let mut i = 0;
-    while (i < 12) {
+    let mut i = 0u64;
+    while (i < 12u64) {
         sui_bytes.push_back(0u8);
         i = i + 1;
     };
@@ -123,7 +122,7 @@ public fun evm_to_sui(evm_address_str: String): address {
 /// Direct use of 32 bytes from Base58 decode
 public fun solana_to_sui(solana_address_str: String): address {
     let solana_bytes = base58_decode(solana_address_str);
-    assert!(solana_bytes.length() == SOLANA_ADDRESS_LENGTH, E_INVALID_SOLANA_ADDRESS);
+    error::invalid_solana_address(solana_bytes.length() == SOLANA_ADDRESS_LENGTH);
     address::from_bytes(solana_bytes)
 }
 
@@ -132,8 +131,8 @@ fun base58_encode(input: vector<u8>): String {
     let mut result = vector::empty<u8>();
     let mut num = input;
     
-    let mut leading_zeros = 0;
-    let mut i = 0;
+    let mut leading_zeros = 0u64;
+    let mut i = 0u64;
     while (i < num.length()) {
         if (num[i] == 0) {
             leading_zeros = leading_zeros + 1;
@@ -148,7 +147,7 @@ fun base58_encode(input: vector<u8>): String {
         result.push_back(base58_alphabet[remainder]);
     };
     
-    let mut j = 0;
+    let mut j = 0u64;
     while (j < leading_zeros) {
         result.push_back(49);
         j = j + 1;
@@ -182,14 +181,22 @@ fun div_mod_58(num: &mut vector<u8>): u64 {
     remainder
 }
 
-/// Get original address format based on tx_hash detection
-/// Returns: EVM (hex without 0x), Solana (Base58), or SUI (hex without 0x) format
-public fun ensure_origin(ctx: &TxContext): String { 
+/// Return the caller's identity in its original cross-chain format.
+///
+/// # Chain detection (CVE-D-11)
+///
+/// Dubhe inspects the first 4 bytes of the transaction hash (ctx.digest()):
+///   Byte 0–1 : 0xDB 0xDB  — Dubhe magic prefix
+///   Byte 2   : 0x01       — Dubhe version
+///   Byte 3   : chain type — 0xE1 = EVM, 0xE2 = Solana, else = Sui native
+///
+/// Returns: EVM (hex without 0x), Solana (Base58), or Sui (hex without 0x).
+public fun ensure_origin(ctx: &TxContext): String {
     let sui_address = ctx.sender();
     let address_bytes = address::to_bytes(sui_address);
     let tx_hash = ctx.digest();
     let chain_type = detect_chain_type_from_tx_hash(tx_hash);
-    
+
     if (chain_type == 1) {
         let mut evm_bytes = vector[];
         let mut j = 12;
@@ -202,6 +209,7 @@ public fun ensure_origin(ctx: &TxContext): String {
     } else if (chain_type == 2) {
         base58_encode(address_bytes)
     } else {
+        // Native Sui: return the sender's own address as hex.
         let hex_bytes = hex::encode(address_bytes);
         hex_bytes.to_ascii_string()
     }
@@ -248,7 +256,7 @@ public fun setup_evm_scenario(scenario: &mut test_scenario::Scenario, evm_addres
     tx_hash.push_back(CHAIN_TYPE_EVM);  // 0xE1
     
     // Fill remaining 28 bytes
-    let mut i = 0;
+    let mut i = 0u8;
     while (i < 28) {
         tx_hash.push_back((i as u8));
         i = i + 1;
@@ -280,7 +288,7 @@ public fun setup_solana_scenario(scenario: &mut test_scenario::Scenario, solana_
     tx_hash.push_back(CHAIN_TYPE_SOLANA);  // 0xE2
     
     // Fill remaining 28 bytes
-    let mut i = 0;
+    let mut i = 0u8;
     while (i < 28) {
         tx_hash.push_back(((i + 100) as u8));
         i = i + 1;