create-dubhe 1.2.0-pre.83 → 1.2.0-pre.85

package/dist/cli.js

@@ -62,7 +62,7 @@ var CHAINS = [
 // package.json
 var package_default = {
   name: "create-dubhe",
-  version: "1.2.0-pre.83",
+  version: "1.2.0-pre.85",
   repository: {
     type: "git",
     url: "https://github.com/0xobelisk/dubhe.git"

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/bin/cli.ts","../src/config/chains.ts","../package.json","../src/exists.ts"],"sourcesContent":["import { fileURLToPath } from 'node:url';\nimport fs from 'node:fs/promises';\nimport path from 'node:path';\nimport glob from 'fast-glob';\nimport yargsInteractive from 'yargs-interactive';\nimport { CHAINS } from '../config/chains';\nimport packageJson from '../../package.json';\nimport { exists } from '../exists';\n\nconst __filename = fileURLToPath(import.meta.url);\nconst __dirname = path.dirname(__filename);\n\nconst cwd = process.cwd();\n\nconst init = async () => {\n  // Prepare chain options\n  const chainChoices = CHAINS.map(({ title, description, value }) => ({\n    name: `${title} - ${description}`,\n    value\n  }));\n\n  // Step 1: Choose project name and chain\n  const firstStep = await yargsInteractive()\n    .usage('$0 [args]')\n    .interactive({\n      interactive: { default: true },\n      projectName: {\n        describe: 'Name your project',\n        type: 'input'\n      },\n      chain: {\n        describe: 'Pick your chain',\n        type: 'list',\n        choices: chainChoices.map((c) => c.value)\n      },\n      dubheVersion: {\n        describe: 'The version of Dubhe packages to use, defaults to latest',\n        type: 'input',\n        default: packageJson.version\n      }\n    });\n\n  const { projectName, chain, dubheVersion } = firstStep;\n  if (!projectName) throw new Error('No project name provided.');\n\n  // Get available templates based on the selected chain\n  const selectedChain = CHAINS.find((c) => c.value === chain);\n  if (!selectedChain) {\n    throw new Error('Invalid chain selection');\n  }\n\n  // Prepare platform options\n  const platformChoices = selectedChain.supportedTemplates.map(({ title, description, value }) => ({\n    name: `${title} - ${description}`,\n    value\n  }));\n\n  // Step 2: Choose platform\n  const secondStep = await yargsInteractive()\n    .usage('$0 [args]')\n    .interactive({\n      interactive: { default: true },\n      platform: {\n        describe: 'Pick your platform',\n        type: 'list',\n        choices: platformChoices.map((c) => c.value)\n      }\n    });\n\n  const { platform } = secondStep;\n\n  const selectedTemplate = selectedChain.supportedTemplates.find((t) => t.value === platform);\n  if (!selectedTemplate) {\n    throw new Error('Invalid platform selection');\n  }\n\n  const pkgInfo = pkgFromUserAgent(process.env.npm_config_user_agent);\n  const pkgManager = pkgInfo ? pkgInfo.name : 'npm';\n\n  const sourceDir = path.join(\n    __dirname,\n    '..',\n    'templates',\n    selectedTemplate.path.replace('{chain}', chain)\n  );\n\n  if (!(await exists(sourceDir))) {\n    throw new Error(`Template directory not found: ${sourceDir}`);\n  }\n\n  const destDir = path.join(process.cwd(), projectName);\n  if (await exists(destDir)) {\n    throw new Error(`Target directory \"${destDir}\" already exists.`);\n  }\n\n  const files = await glob('**/*', { cwd: sourceDir, dot: true });\n\n  for (const filename of files) {\n    const sourceFile = path.join(sourceDir, filename);\n    const destFile = path.join(destDir, filename);\n\n    await fs.mkdir(path.dirname(destFile), { recursive: true });\n\n    if (/package\\.json$/.test(sourceFile)) {\n      const source = await fs.readFile(sourceFile, 'utf-8');\n      await fs.writeFile(destFile, source.replaceAll(/{{dubhe-version}}/g, dubheVersion), 'utf-8');\n    } else if (/\\.gitignore_$/.test(sourceFile)) {\n      await fs.copyFile(sourceFile, destFile.replace(/_$/, ''));\n    } else {\n      await fs.copyFile(sourceFile, destFile);\n    }\n  }\n\n  const cdProjectName = path.relative(cwd, destDir);\n\n  const styles = {\n    success: '\\x1b[32m%s\\x1b[0m',\n    info: '\\x1b[36m%s\\x1b[0m',\n    command: '\\x1b[33m%s\\x1b[0m',\n    separator: '\\x1b[90m%s\\x1b[0m'\n  };\n\n  console.log('\\n' + '='.repeat(60));\n  console.log(styles.success, '🎉 Project creation successful!');\n  console.log(styles.info, `📁 Project location: ${destDir}`);\n  console.log(styles.separator, '-'.repeat(60));\n  console.log(styles.info, 'Next steps:\\n');\n\n  if (destDir !== cwd) {\n    console.log(\n      styles.command,\n      `  cd ${cdProjectName.includes(' ') ? `\"${cdProjectName}\"` : cdProjectName}`\n    );\n  }\n\n  const actualTemplate = selectedTemplate.value;\n\n  switch (actualTemplate) {\n    case '101':\n    case 'web':\n      console.log(styles.command, `  ${pkgManager} install`);\n      console.log(styles.command, `  ${pkgManager} dubhe doctor`);\n      console.log(styles.command, `  ${pkgManager} run dev`);\n      break;\n    case 'contract':\n      console.log(styles.command, `  ${pkgManager} install`);\n      console.log(styles.command, `  ${pkgManager} dubhe doctor`);\n      break;\n  }\n\n  console.log(styles.separator, '\\n' + '='.repeat(60) + '\\n');\n};\n\nfunction pkgFromUserAgent(userAgent: string | undefined) {\n  if (!userAgent) return undefined;\n  const pkgSpec = userAgent.split(' ')[0];\n  const pkgSpecArr = pkgSpec.split('/');\n  return {\n    name: pkgSpecArr[0],\n    version: pkgSpecArr[1]\n  };\n}\n\ninit().catch((e) => {\n  console.error(e);\n});\n","interface Template {\n  title: string;\n  description: string;\n  value: string;\n  path: string;\n}\n\ninterface Chain {\n  title: string;\n  description: string;\n  value: string;\n  supportedTemplates: Template[];\n}\n\nconst TEMPLATES = {\n  QUICK_START: {\n    title: '101',\n    description: 'Quick start',\n    value: '101',\n    path: '101/{chain}-template'\n  },\n  WEB: {\n    title: 'Web',\n    description: 'Web template',\n    value: 'web',\n    path: 'nextjs/{chain}-template'\n  },\n  CONTRACT: {\n    title: 'Contract',\n    description: 'Contract template',\n    value: 'contract',\n    path: 'contract/{chain}-template'\n  }\n} as const;\n\nexport const CHAINS: Chain[] = [\n  {\n    title: 'sui',\n    description: 'Sui',\n    value: 'sui',\n    supportedTemplates: [TEMPLATES.QUICK_START, TEMPLATES.WEB, TEMPLATES.CONTRACT]\n  },\n  {\n    title: 'aptos',\n    description: 'Aptos',\n    value: 'aptos',\n    supportedTemplates: [TEMPLATES.QUICK_START, TEMPLATES.WEB, TEMPLATES.CONTRACT]\n  },\n  {\n    title: 'rooch',\n    description: 'Rooch',\n    value: 'rooch',\n    supportedTemplates: [TEMPLATES.QUICK_START]\n  },\n  {\n    title: 'initia',\n    description: 'Initia',\n    value: 'initia',\n    supportedTemplates: [TEMPLATES.QUICK_START]\n  },\n  {\n    title: 'movement',\n    description: 'Movement',\n    value: 'movement',\n    supportedTemplates: [TEMPLATES.QUICK_START]\n  }\n];\n","{\n  \"name\": \"create-dubhe\",\n  \"version\": \"1.2.0-pre.83\",\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"https://github.com/0xobelisk/dubhe.git\"\n  },\n  \"license\": \"MIT\",\n  \"author\": \"team@obelisk.build\",\n  \"type\": \"module\",\n  \"bin\": \"bin/cli.js\",\n  \"files\": [\n    \"bin\",\n    \"dist\",\n    \"templates\"\n  ],\n  \"scripts\": {\n    \"build\": \"pnpm run type-check && pnpm run build:js\",\n    \"build:js\": \"tsup && pnpm run copy-templates\",\n    \"clean\": \"pnpm run clean:js\",\n    \"clean:js\": \"shx rm -rf dist\",\n    \"cocos-js-build\": \"cd cocos-lib-builder && npm i && browserify aptos.js -p esmify >  ../templates/cocos/aptos-template/assets/lib/dubhe.js && browserify sui.js -p esmify >  ../templates/cocos/sui-template/assets/lib/dubhe.js\",\n    \"copy-templates\": \"tsx ./scripts/copy-templates.ts\",\n    \"dev\": \"tsup --watch\",\n    \"format\": \"prettier --write .\",\n    \"format:check\": \"prettier --check .\",\n    \"lint\": \"eslint . --ext .ts\",\n    \"type-check\": \"tsc --noEmit\",\n    \"validate\": \"pnpm format:check && pnpm lint && pnpm type-check\"\n  },\n  \"dependencies\": {\n    \"browser-resolve\": \"^2.0.0\",\n    \"browser-sync\": \"^2.29.3\",\n    \"fast-glob\": \"^3.3.3\",\n    \"yargs-interactive\": \"^3.0.1\"\n  },\n  \"devDependencies\": {\n    \"@types/cross-spawn\": \"^6.0.2\",\n    \"@types/minimist\": \"^1.2.2\",\n    \"@types/prompts\": \"^2.4.3\",\n    \"@types/yargs-interactive\": \"^2.1.6\",\n    \"browserify\": \"^17.0.0\",\n    \"cross-spawn\": \"^7.0.3\",\n    \"eslint\": \"^9.0.0\",\n    \"eslint-config-prettier\": \"^9.1.0\",\n    \"esmify\": \"^2.1.1\",\n    \"kolorist\": \"^1.7.0\",\n    \"prettier\": \"3.3.3\",\n    \"prompts\": \"^2.4.2\",\n    \"typescript\": \"^5.8.3\"\n  },\n  \"engines\": {\n    \"node\": \">=22.0.0\"\n  },\n  \"publishConfig\": {\n    \"access\": \"public\"\n  }\n}\n","import fs from 'node:fs/promises';\n\nexport async function exists(path: string) {\n  try {\n    await fs.access(path);\n    return true;\n  } catch {\n    return false;\n  }\n}\n"],"mappings":"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","names":["fs","path","fs"]}
+{"version":3,"sources":["../src/bin/cli.ts","../src/config/chains.ts","../package.json","../src/exists.ts"],"sourcesContent":["import { fileURLToPath } from 'node:url';\nimport fs from 'node:fs/promises';\nimport path from 'node:path';\nimport glob from 'fast-glob';\nimport yargsInteractive from 'yargs-interactive';\nimport { CHAINS } from '../config/chains';\nimport packageJson from '../../package.json';\nimport { exists } from '../exists';\n\nconst __filename = fileURLToPath(import.meta.url);\nconst __dirname = path.dirname(__filename);\n\nconst cwd = process.cwd();\n\nconst init = async () => {\n  // Prepare chain options\n  const chainChoices = CHAINS.map(({ title, description, value }) => ({\n    name: `${title} - ${description}`,\n    value\n  }));\n\n  // Step 1: Choose project name and chain\n  const firstStep = await yargsInteractive()\n    .usage('$0 [args]')\n    .interactive({\n      interactive: { default: true },\n      projectName: {\n        describe: 'Name your project',\n        type: 'input'\n      },\n      chain: {\n        describe: 'Pick your chain',\n        type: 'list',\n        choices: chainChoices.map((c) => c.value)\n      },\n      dubheVersion: {\n        describe: 'The version of Dubhe packages to use, defaults to latest',\n        type: 'input',\n        default: packageJson.version\n      }\n    });\n\n  const { projectName, chain, dubheVersion } = firstStep;\n  if (!projectName) throw new Error('No project name provided.');\n\n  // Get available templates based on the selected chain\n  const selectedChain = CHAINS.find((c) => c.value === chain);\n  if (!selectedChain) {\n    throw new Error('Invalid chain selection');\n  }\n\n  // Prepare platform options\n  const platformChoices = selectedChain.supportedTemplates.map(({ title, description, value }) => ({\n    name: `${title} - ${description}`,\n    value\n  }));\n\n  // Step 2: Choose platform\n  const secondStep = await yargsInteractive()\n    .usage('$0 [args]')\n    .interactive({\n      interactive: { default: true },\n      platform: {\n        describe: 'Pick your platform',\n        type: 'list',\n        choices: platformChoices.map((c) => c.value)\n      }\n    });\n\n  const { platform } = secondStep;\n\n  const selectedTemplate = selectedChain.supportedTemplates.find((t) => t.value === platform);\n  if (!selectedTemplate) {\n    throw new Error('Invalid platform selection');\n  }\n\n  const pkgInfo = pkgFromUserAgent(process.env.npm_config_user_agent);\n  const pkgManager = pkgInfo ? pkgInfo.name : 'npm';\n\n  const sourceDir = path.join(\n    __dirname,\n    '..',\n    'templates',\n    selectedTemplate.path.replace('{chain}', chain)\n  );\n\n  if (!(await exists(sourceDir))) {\n    throw new Error(`Template directory not found: ${sourceDir}`);\n  }\n\n  const destDir = path.join(process.cwd(), projectName);\n  if (await exists(destDir)) {\n    throw new Error(`Target directory \"${destDir}\" already exists.`);\n  }\n\n  const files = await glob('**/*', { cwd: sourceDir, dot: true });\n\n  for (const filename of files) {\n    const sourceFile = path.join(sourceDir, filename);\n    const destFile = path.join(destDir, filename);\n\n    await fs.mkdir(path.dirname(destFile), { recursive: true });\n\n    if (/package\\.json$/.test(sourceFile)) {\n      const source = await fs.readFile(sourceFile, 'utf-8');\n      await fs.writeFile(destFile, source.replaceAll(/{{dubhe-version}}/g, dubheVersion), 'utf-8');\n    } else if (/\\.gitignore_$/.test(sourceFile)) {\n      await fs.copyFile(sourceFile, destFile.replace(/_$/, ''));\n    } else {\n      await fs.copyFile(sourceFile, destFile);\n    }\n  }\n\n  const cdProjectName = path.relative(cwd, destDir);\n\n  const styles = {\n    success: '\\x1b[32m%s\\x1b[0m',\n    info: '\\x1b[36m%s\\x1b[0m',\n    command: '\\x1b[33m%s\\x1b[0m',\n    separator: '\\x1b[90m%s\\x1b[0m'\n  };\n\n  console.log('\\n' + '='.repeat(60));\n  console.log(styles.success, '🎉 Project creation successful!');\n  console.log(styles.info, `📁 Project location: ${destDir}`);\n  console.log(styles.separator, '-'.repeat(60));\n  console.log(styles.info, 'Next steps:\\n');\n\n  if (destDir !== cwd) {\n    console.log(\n      styles.command,\n      `  cd ${cdProjectName.includes(' ') ? `\"${cdProjectName}\"` : cdProjectName}`\n    );\n  }\n\n  const actualTemplate = selectedTemplate.value;\n\n  switch (actualTemplate) {\n    case '101':\n    case 'web':\n      console.log(styles.command, `  ${pkgManager} install`);\n      console.log(styles.command, `  ${pkgManager} dubhe doctor`);\n      console.log(styles.command, `  ${pkgManager} run dev`);\n      break;\n    case 'contract':\n      console.log(styles.command, `  ${pkgManager} install`);\n      console.log(styles.command, `  ${pkgManager} dubhe doctor`);\n      break;\n  }\n\n  console.log(styles.separator, '\\n' + '='.repeat(60) + '\\n');\n};\n\nfunction pkgFromUserAgent(userAgent: string | undefined) {\n  if (!userAgent) return undefined;\n  const pkgSpec = userAgent.split(' ')[0];\n  const pkgSpecArr = pkgSpec.split('/');\n  return {\n    name: pkgSpecArr[0],\n    version: pkgSpecArr[1]\n  };\n}\n\ninit().catch((e) => {\n  console.error(e);\n});\n","interface Template {\n  title: string;\n  description: string;\n  value: string;\n  path: string;\n}\n\ninterface Chain {\n  title: string;\n  description: string;\n  value: string;\n  supportedTemplates: Template[];\n}\n\nconst TEMPLATES = {\n  QUICK_START: {\n    title: '101',\n    description: 'Quick start',\n    value: '101',\n    path: '101/{chain}-template'\n  },\n  WEB: {\n    title: 'Web',\n    description: 'Web template',\n    value: 'web',\n    path: 'nextjs/{chain}-template'\n  },\n  CONTRACT: {\n    title: 'Contract',\n    description: 'Contract template',\n    value: 'contract',\n    path: 'contract/{chain}-template'\n  }\n} as const;\n\nexport const CHAINS: Chain[] = [\n  {\n    title: 'sui',\n    description: 'Sui',\n    value: 'sui',\n    supportedTemplates: [TEMPLATES.QUICK_START, TEMPLATES.WEB, TEMPLATES.CONTRACT]\n  },\n  {\n    title: 'aptos',\n    description: 'Aptos',\n    value: 'aptos',\n    supportedTemplates: [TEMPLATES.QUICK_START, TEMPLATES.WEB, TEMPLATES.CONTRACT]\n  },\n  {\n    title: 'rooch',\n    description: 'Rooch',\n    value: 'rooch',\n    supportedTemplates: [TEMPLATES.QUICK_START]\n  },\n  {\n    title: 'initia',\n    description: 'Initia',\n    value: 'initia',\n    supportedTemplates: [TEMPLATES.QUICK_START]\n  },\n  {\n    title: 'movement',\n    description: 'Movement',\n    value: 'movement',\n    supportedTemplates: [TEMPLATES.QUICK_START]\n  }\n];\n","{\n  \"name\": \"create-dubhe\",\n  \"version\": \"1.2.0-pre.85\",\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"https://github.com/0xobelisk/dubhe.git\"\n  },\n  \"license\": \"MIT\",\n  \"author\": \"team@obelisk.build\",\n  \"type\": \"module\",\n  \"bin\": \"bin/cli.js\",\n  \"files\": [\n    \"bin\",\n    \"dist\",\n    \"templates\"\n  ],\n  \"scripts\": {\n    \"build\": \"pnpm run type-check && pnpm run build:js\",\n    \"build:js\": \"tsup && pnpm run copy-templates\",\n    \"clean\": \"pnpm run clean:js\",\n    \"clean:js\": \"shx rm -rf dist\",\n    \"cocos-js-build\": \"cd cocos-lib-builder && npm i && browserify aptos.js -p esmify >  ../templates/cocos/aptos-template/assets/lib/dubhe.js && browserify sui.js -p esmify >  ../templates/cocos/sui-template/assets/lib/dubhe.js\",\n    \"copy-templates\": \"tsx ./scripts/copy-templates.ts\",\n    \"dev\": \"tsup --watch\",\n    \"format\": \"prettier --write .\",\n    \"format:check\": \"prettier --check .\",\n    \"lint\": \"eslint . --ext .ts\",\n    \"type-check\": \"tsc --noEmit\",\n    \"validate\": \"pnpm format:check && pnpm lint && pnpm type-check\"\n  },\n  \"dependencies\": {\n    \"browser-resolve\": \"^2.0.0\",\n    \"browser-sync\": \"^2.29.3\",\n    \"fast-glob\": \"^3.3.3\",\n    \"yargs-interactive\": \"^3.0.1\"\n  },\n  \"devDependencies\": {\n    \"@types/cross-spawn\": \"^6.0.2\",\n    \"@types/minimist\": \"^1.2.2\",\n    \"@types/prompts\": \"^2.4.3\",\n    \"@types/yargs-interactive\": \"^2.1.6\",\n    \"browserify\": \"^17.0.0\",\n    \"cross-spawn\": \"^7.0.3\",\n    \"eslint\": \"^9.0.0\",\n    \"eslint-config-prettier\": \"^9.1.0\",\n    \"esmify\": \"^2.1.1\",\n    \"kolorist\": \"^1.7.0\",\n    \"prettier\": \"3.3.3\",\n    \"prompts\": \"^2.4.2\",\n    \"typescript\": \"^5.8.3\"\n  },\n  \"engines\": {\n    \"node\": \">=22.0.0\"\n  },\n  \"publishConfig\": {\n    \"access\": \"public\"\n  }\n}\n","import fs from 'node:fs/promises';\n\nexport async function exists(path: string) {\n  try {\n    await fs.access(path);\n    return true;\n  } catch {\n    return false;\n  }\n}\n"],"mappings":"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","names":["fs","path","fs"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-dubhe",
-  "version": "1.2.0-pre.83",
+  "version": "1.2.0-pre.85",
   "repository": {
     "type": "git",
     "url": "https://github.com/0xobelisk/dubhe.git"

package/templates/101/sui-template/packages/contracts/src/dubhe/Move.lock

@@ -2,7 +2,7 @@
 
 [move]
 version = 3
-manifest_digest = "F67D57D8267A12BCCF8A98B2566F9B6A8DF5853272672F0EACE1F23EDF0CEAFD"
+manifest_digest = "73896F00312A2E2C47F56DCCABF824967268FF718658DD5D0FFFE2E60824F94A"
 deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
 dependencies = [
   { id = "Sui", name = "Sui" },
@@ -28,5 +28,5 @@ flavor = "sui"
 [env.testnet]
 chain-id = "4c78adac"
 original-published-id = "0xa09cd4137e604ec5a7a88f72c572ecd064b0e713a3fbf705a88456cdbccf36c0"
-latest-published-id = "0xf98fe9c454a40f7d7fa37e19cf3ca5ea8351e24bb6d9fdd2d4da471c694a1796"
-published-version = "2"
+latest-published-id = "0x4613b8a390298cc450fe11360fddf41ba1bde38060163c5ca9f192a25b4f9f2e"
+published-version = "3"

package/templates/101/sui-template/packages/contracts/src/dubhe/Move.toml

@@ -4,7 +4,7 @@ edition = "2024"
 version = "1.0.0"
 license = "apache2.0"
 authors = ["Obelisk Labs"]
-published-at = "0xf98fe9c454a40f7d7fa37e19cf3ca5ea8351e24bb6d9fdd2d4da471c694a1796"
+published-at = "0x4613b8a390298cc450fe11360fddf41ba1bde38060163c5ca9f192a25b4f9f2e"
 
 [dependencies]
 Sui = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "mainnet-v1.46.3" }

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

@@ -82,8 +82,7 @@
     dapp_system::upgrade_dapp(dapp_hub, dapp_key, new_package_id, new_version, ctx);
     // Register new tables
     // ==========================================
-    asset_add_liquidity::register_table(dapp_hub, ctx);
-    asset_remove_liquidity::register_table(dapp_hub, ctx);
+
 // ==========================================
   }
 }

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

@@ -2,7 +2,7 @@ module dubhe::migrate {
   use dubhe::dapp_service::DappHub;
   use dubhe::genesis;
 
-  const ON_CHAIN_VERSION: u32 = 2;
+  const ON_CHAIN_VERSION: u32 = 3;
 
   public fun on_chain_version(): u32 {
     ON_CHAIN_VERSION
@@ -11,4 +11,8 @@ module dubhe::migrate {
   public entry fun migrate_to_v2(dapp_hub: &mut DappHub, new_package_id: address, new_version: u32, ctx: &mut TxContext) {
     genesis::upgrade(dapp_hub, new_package_id, new_version, ctx);
   }
+
+  public entry fun migrate_to_v3(dapp_hub: &mut DappHub, new_package_id: address, new_version: u32, ctx: &mut TxContext) {
+    genesis::upgrade(dapp_hub, new_package_id, new_version, ctx);
+  }
 }

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

@@ -0,0 +1,296 @@
+module dubhe::address_system;
+
+use std::ascii::String;
+use sui::address;
+use sui::hex;
+
+#[test_only]
+use sui::test_scenario;
+
+// TX_HASH signature markers
+const DUBHE_PREFIX: u8 = 0xDB;
+const DUBHE_VERSION: u8 = 0x01;
+const CHAIN_TYPE_EVM: u8 = 0xE1;
+const CHAIN_TYPE_SOLANA: u8 = 0xE2;
+
+// Constants
+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;
+
+/// Detect chain type from tx_hash signature
+/// Returns: 0 = SUI, 1 = EVM, 2 = Solana
+/// Format: [0xDB][0xDB][0x01][CHAIN_TYPE][...28 bytes...]
+fun detect_chain_type_from_tx_hash(tx_hash: &vector<u8>): u8 {
+    if (tx_hash.length() != TX_HASH_LENGTH || 
+        tx_hash[0] != DUBHE_PREFIX || 
+        tx_hash[1] != DUBHE_PREFIX ||
+        tx_hash[2] != DUBHE_VERSION) {
+        return 0
+    };
+    
+    let chain_type = tx_hash[3];
+    if (chain_type == CHAIN_TYPE_EVM) {
+        1
+    } else if (chain_type == CHAIN_TYPE_SOLANA) {
+        2
+    } else {
+        0
+    }
+}
+
+fun hex_string_to_bytes(hex_str: String): vector<u8> {
+    let bytes = hex_str.into_bytes();
+    let hex_bytes = if (bytes.length() >= 2 && bytes[0] == 48 && (bytes[1] == 120 || bytes[1] == 88)) {
+        let mut result = vector[];
+        let mut i = 2;
+        while (i < bytes.length()) {
+            result.push_back(bytes[i]);
+            i = i + 1;
+        };
+        result
+    } else {
+        bytes
+    };
+    hex::decode(hex_bytes)
+}
+
+fun base58_decode(input: String): vector<u8> {
+    let base58_alphabet = b"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+    let input_bytes = input.as_bytes();
+    let len = input_bytes.length();
+    
+    let mut result: vector<u8> = vector[];
+    let mut j = 0;
+    while (j < SOLANA_ADDRESS_LENGTH) {
+        result.push_back(0u8);
+        j = j + 1;
+    };
+    
+    let mut i = 0;
+    while (i < len) {
+        let c = input_bytes[i];
+        let mut char_value: u64 = 0;
+        let mut found = false;
+        let mut k = 0;
+        while (k < 58) {
+            if (base58_alphabet[k] == c) {
+                char_value = k;
+                found = true;
+                break
+            };
+            k = k + 1;
+        };
+        
+        assert!(found, E_INVALID_SOLANA_ADDRESS);
+        
+        let mut carry = char_value;
+        let mut m = (SOLANA_ADDRESS_LENGTH - 1);
+        while (m < SOLANA_ADDRESS_LENGTH) {
+            let byte_ref = vector::borrow_mut(&mut result, m);
+            let tmp = (*byte_ref as u64) * 58 + carry;
+            carry = tmp / 256;
+            *byte_ref = ((tmp % 256) as u8);
+            if (m == 0) break;
+            m = m - 1;
+        };
+        i = i + 1;
+    };
+    result
+}
+
+/// Convert EVM address to SUI address
+/// 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);
+    
+    let mut sui_bytes = vector[];
+    let mut i = 0;
+    while (i < 12) {
+        sui_bytes.push_back(0u8);
+        i = i + 1;
+    };
+    sui_bytes.append(evm_bytes);
+    address::from_bytes(sui_bytes)
+}
+
+/// Convert Solana address to SUI 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);
+    address::from_bytes(solana_bytes)
+}
+
+fun base58_encode(input: vector<u8>): String {
+    let base58_alphabet = b"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+    let mut result = vector::empty<u8>();
+    let mut num = input;
+    
+    let mut leading_zeros = 0;
+    let mut i = 0;
+    while (i < num.length()) {
+        if (num[i] == 0) {
+            leading_zeros = leading_zeros + 1;
+            i = i + 1;
+        } else {
+            break
+        }
+    };
+    
+    while (!is_zero(&num)) {
+        let remainder = div_mod_58(&mut num);
+        result.push_back(base58_alphabet[remainder]);
+    };
+    
+    let mut j = 0;
+    while (j < leading_zeros) {
+        result.push_back(49);
+        j = j + 1;
+    };
+    
+    vector::reverse(&mut result);
+    result.to_ascii_string()
+}
+
+fun is_zero(num: &vector<u8>): bool {
+    let mut i = 0;
+    while (i < num.length()) {
+        if (num[i] != 0) {
+            return false
+        };
+        i = i + 1;
+    };
+    true
+}
+
+fun div_mod_58(num: &mut vector<u8>): u64 {
+    let mut remainder: u64 = 0;
+    let mut i = 0;
+    while (i < num.length()) {
+        let byte_ref = vector::borrow_mut(num, i);
+        let current = (remainder * 256) + (*byte_ref as u64);
+        *byte_ref = ((current / 58) as u8);
+        remainder = current % 58;
+        i = i + 1;
+    };
+    remainder
+}
+
+/// Get original address format based on tx_hash detection
+/// Returns: EVM (0x...), Solana (Base58), or SUI (0x...) format
+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;
+        while (j < TX_HASH_LENGTH) {
+            evm_bytes.push_back(address_bytes[j]);
+            j = j + 1;
+        };
+        let hex_bytes = hex::encode(evm_bytes);
+        let mut result_bytes = b"0x";
+        result_bytes.append(hex_bytes);
+        result_bytes.to_ascii_string()
+    } else if (chain_type == 2) {
+        base58_encode(address_bytes)
+    } else {
+        let hex_bytes = hex::encode(address_bytes);
+        let mut result_bytes = b"0x";
+        result_bytes.append(hex_bytes);
+        result_bytes.to_ascii_string()
+    }
+}
+
+/// Check if transaction is from EVM chain
+public fun is_evm_address(ctx: &TxContext): bool {
+    let tx_hash = ctx.digest();
+    detect_chain_type_from_tx_hash(tx_hash) == 1
+}
+
+/// Check if transaction is from Solana
+public fun is_solana_address(ctx: &TxContext): bool {
+    let tx_hash = ctx.digest();
+    detect_chain_type_from_tx_hash(tx_hash) == 2
+}
+
+/// Check if transaction is native SUI
+public fun is_sui_address(ctx: &TxContext): bool {
+    let tx_hash = ctx.digest();
+    detect_chain_type_from_tx_hash(tx_hash) == 0
+}
+
+// ========== Test Utilities ==========
+
+#[test_only]
+/// Setup test scenario with EVM context
+/// Input: EVM address as byte string, e.g., b"0x9168765EE952de7C6f8fC6FaD5Ec209B960b7622"
+/// Format: [0xDB][0xDB][0x01][0xE1][...28 bytes...]
+public fun setup_evm_scenario(scenario: &mut test_scenario::Scenario, evm_address_bytes: vector<u8>) {
+    use std::ascii;
+    
+    // Convert EVM address string to SUI address
+    let evm_address_str = ascii::string(evm_address_bytes);
+    let sender = evm_to_sui(evm_address_str);
+    
+    // Generate EVM tx_hash with Dubhe prefix at the beginning
+    let mut tx_hash = vector::empty<u8>();
+    
+    // Mark as EVM with Dubhe prefix, version, and chain type
+    tx_hash.push_back(DUBHE_PREFIX);    // 0xDB
+    tx_hash.push_back(DUBHE_PREFIX);    // 0xDB
+    tx_hash.push_back(DUBHE_VERSION);   // 0x01
+    tx_hash.push_back(CHAIN_TYPE_EVM);  // 0xE1
+    
+    // Fill remaining 28 bytes
+    let mut i = 0;
+    while (i < 28) {
+        tx_hash.push_back((i as u8));
+        i = i + 1;
+    };
+    
+    // Set context
+    let ctx = test_scenario::ctx(scenario);
+    *ctx = tx_context::new(sender, tx_hash, 0, 0, 0);
+}
+
+#[test_only]
+/// Setup test scenario with Solana context
+/// Input: Solana address as byte string, e.g., b"3vy8k1NAc3Q9EPvqrAuS4DG4qwbgVqfxznEdtcrL743L"
+/// Format: [0xDB][0xDB][0x01][0xE2][...28 bytes...]
+public fun setup_solana_scenario(scenario: &mut test_scenario::Scenario, solana_address_bytes: vector<u8>) {
+    use std::ascii;
+    
+    // Convert Solana address string to SUI address
+    let solana_address_str = ascii::string(solana_address_bytes);
+    let sender = solana_to_sui(solana_address_str);
+    
+    // Generate Solana tx_hash with Dubhe prefix at the beginning
+    let mut tx_hash = vector::empty<u8>();
+    
+    // Mark as Solana with Dubhe prefix, version, and chain type
+    tx_hash.push_back(DUBHE_PREFIX);       // 0xDB
+    tx_hash.push_back(DUBHE_PREFIX);       // 0xDB
+    tx_hash.push_back(DUBHE_VERSION);      // 0x01
+    tx_hash.push_back(CHAIN_TYPE_SOLANA);  // 0xE2
+    
+    // Fill remaining 28 bytes
+    let mut i = 0;
+    while (i < 28) {
+        tx_hash.push_back(((i + 100) as u8));
+        i = i + 1;
+    };
+    
+    // Set context
+    let ctx = test_scenario::ctx(scenario);
+    *ctx = tx_context::new(sender, tx_hash, 0, 0, 0);
+}

package/templates/101/sui-template/packages/contracts/src/dubhe/sources/tests/address.move

@@ -0,0 +1,55 @@
+#[test_only]
+module dubhe::address_test;
+
+use dubhe::address_system;
+use sui::test_scenario;
+use std::ascii::string;
+
+#[test]
+public fun test_address_conversion() {
+        let sui_sender = @0x1462cab50fe5998f8161378e5265f7920bfd9fbce604d602619962f608837217;
+        let sui_origin_string = string(b"0x1462cab50fe5998f8161378e5265f7920bfd9fbce604d602619962f608837217");
+        let evm_origin_string = string(b"0x9168765ee952de7c6f8fc6fad5ec209b960b7622");
+        let solana_origin_string = string(b"3vy8k1NAc3Q9EPvqrAuS4DG4qwbgVqfxznEdtcrL743L");
+        let mut scenario = test_scenario::begin(sui_sender);
+        
+        // Test EVM address conversion
+        std::debug::print(&string(b"EVM address:"));
+        std::debug::print(&evm_origin_string);
+        let evm_sui_address = address_system::evm_to_sui(evm_origin_string);
+        std::debug::print(&string(b"EVM->SUI:"));
+        std::debug::print(&evm_sui_address.to_ascii_string());
+
+        // Test Solana address conversion
+        let solana_address_str = string(b"3vy8k1NAc3Q9EPvqrAuS4DG4qwbgVqfxznEdtcrL743L");
+        let solana_sui_address = address_system::solana_to_sui(solana_address_str);
+        std::debug::print(&string(b"Solana->SUI:"));
+        std::debug::print(&solana_sui_address.to_ascii_string());
+
+        // Test SUI address detection
+        {
+            let ctx = test_scenario::ctx(&mut scenario);
+            assert!(address_system::is_sui_address(ctx));
+            assert!(address_system::ensure_origin(ctx) == sui_origin_string);
+        };
+
+        // Test EVM address detection
+        address_system::setup_evm_scenario(&mut scenario, b"0x9168765EE952de7C6f8fC6FaD5Ec209B960b7622");
+        {
+            let ctx = test_scenario::ctx(&mut scenario);
+            assert!(address_system::is_evm_address(ctx));
+            std::debug::print(&string(b"evm_origin_string:"));
+            std::debug::print(&address_system::ensure_origin(ctx));
+            assert!(address_system::ensure_origin(ctx) == evm_origin_string);
+        };
+
+        // Test Solana address detection
+        address_system::setup_solana_scenario(&mut scenario, b"3vy8k1NAc3Q9EPvqrAuS4DG4qwbgVqfxznEdtcrL743L");
+        {
+            let ctx = test_scenario::ctx(&mut scenario);
+            assert!(address_system::is_solana_address(ctx));
+            assert!(address_system::ensure_origin(ctx) == solana_origin_string);
+        };
+        
+        scenario.end();
+}

package/templates/contract/sui-template/src/dubhe/Move.lock

@@ -2,7 +2,7 @@
 
 [move]
 version = 3
-manifest_digest = "F67D57D8267A12BCCF8A98B2566F9B6A8DF5853272672F0EACE1F23EDF0CEAFD"
+manifest_digest = "73896F00312A2E2C47F56DCCABF824967268FF718658DD5D0FFFE2E60824F94A"
 deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
 dependencies = [
   { id = "Sui", name = "Sui" },
@@ -28,5 +28,5 @@ flavor = "sui"
 [env.testnet]
 chain-id = "4c78adac"
 original-published-id = "0xa09cd4137e604ec5a7a88f72c572ecd064b0e713a3fbf705a88456cdbccf36c0"
-latest-published-id = "0xf98fe9c454a40f7d7fa37e19cf3ca5ea8351e24bb6d9fdd2d4da471c694a1796"
-published-version = "2"
+latest-published-id = "0x4613b8a390298cc450fe11360fddf41ba1bde38060163c5ca9f192a25b4f9f2e"
+published-version = "3"

package/templates/contract/sui-template/src/dubhe/Move.toml

@@ -4,7 +4,7 @@ edition = "2024"
 version = "1.0.0"
 license = "apache2.0"
 authors = ["Obelisk Labs"]
-published-at = "0xf98fe9c454a40f7d7fa37e19cf3ca5ea8351e24bb6d9fdd2d4da471c694a1796"
+published-at = "0x4613b8a390298cc450fe11360fddf41ba1bde38060163c5ca9f192a25b4f9f2e"
 
 [dependencies]
 Sui = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "mainnet-v1.46.3" }

package/templates/contract/sui-template/src/dubhe/sources/codegen/genesis.move

@@ -82,8 +82,7 @@
     dapp_system::upgrade_dapp(dapp_hub, dapp_key, new_package_id, new_version, ctx);
     // Register new tables
     // ==========================================
-    asset_add_liquidity::register_table(dapp_hub, ctx);
-    asset_remove_liquidity::register_table(dapp_hub, ctx);
+
 // ==========================================
   }
 }

package/templates/contract/sui-template/src/dubhe/sources/scripts/migrate.move

@@ -2,7 +2,7 @@ module dubhe::migrate {
   use dubhe::dapp_service::DappHub;
   use dubhe::genesis;
 
-  const ON_CHAIN_VERSION: u32 = 2;
+  const ON_CHAIN_VERSION: u32 = 3;
 
   public fun on_chain_version(): u32 {
     ON_CHAIN_VERSION
@@ -11,4 +11,8 @@ module dubhe::migrate {
   public entry fun migrate_to_v2(dapp_hub: &mut DappHub, new_package_id: address, new_version: u32, ctx: &mut TxContext) {
     genesis::upgrade(dapp_hub, new_package_id, new_version, ctx);
   }
+
+  public entry fun migrate_to_v3(dapp_hub: &mut DappHub, new_package_id: address, new_version: u32, ctx: &mut TxContext) {
+    genesis::upgrade(dapp_hub, new_package_id, new_version, ctx);
+  }
 }

package/templates/contract/sui-template/src/dubhe/sources/systems/address_system.move

@@ -0,0 +1,296 @@
+module dubhe::address_system;
+
+use std::ascii::String;
+use sui::address;
+use sui::hex;
+
+#[test_only]
+use sui::test_scenario;
+
+// TX_HASH signature markers
+const DUBHE_PREFIX: u8 = 0xDB;
+const DUBHE_VERSION: u8 = 0x01;
+const CHAIN_TYPE_EVM: u8 = 0xE1;
+const CHAIN_TYPE_SOLANA: u8 = 0xE2;
+
+// Constants
+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;
+
+/// Detect chain type from tx_hash signature
+/// Returns: 0 = SUI, 1 = EVM, 2 = Solana
+/// Format: [0xDB][0xDB][0x01][CHAIN_TYPE][...28 bytes...]
+fun detect_chain_type_from_tx_hash(tx_hash: &vector<u8>): u8 {
+    if (tx_hash.length() != TX_HASH_LENGTH || 
+        tx_hash[0] != DUBHE_PREFIX || 
+        tx_hash[1] != DUBHE_PREFIX ||
+        tx_hash[2] != DUBHE_VERSION) {
+        return 0
+    };
+    
+    let chain_type = tx_hash[3];
+    if (chain_type == CHAIN_TYPE_EVM) {
+        1
+    } else if (chain_type == CHAIN_TYPE_SOLANA) {
+        2
+    } else {
+        0
+    }
+}
+
+fun hex_string_to_bytes(hex_str: String): vector<u8> {
+    let bytes = hex_str.into_bytes();
+    let hex_bytes = if (bytes.length() >= 2 && bytes[0] == 48 && (bytes[1] == 120 || bytes[1] == 88)) {
+        let mut result = vector[];
+        let mut i = 2;
+        while (i < bytes.length()) {
+            result.push_back(bytes[i]);
+            i = i + 1;
+        };
+        result
+    } else {
+        bytes
+    };
+    hex::decode(hex_bytes)
+}
+
+fun base58_decode(input: String): vector<u8> {
+    let base58_alphabet = b"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+    let input_bytes = input.as_bytes();
+    let len = input_bytes.length();
+    
+    let mut result: vector<u8> = vector[];
+    let mut j = 0;
+    while (j < SOLANA_ADDRESS_LENGTH) {
+        result.push_back(0u8);
+        j = j + 1;
+    };
+    
+    let mut i = 0;
+    while (i < len) {
+        let c = input_bytes[i];
+        let mut char_value: u64 = 0;
+        let mut found = false;
+        let mut k = 0;
+        while (k < 58) {
+            if (base58_alphabet[k] == c) {
+                char_value = k;
+                found = true;
+                break
+            };
+            k = k + 1;
+        };
+        
+        assert!(found, E_INVALID_SOLANA_ADDRESS);
+        
+        let mut carry = char_value;
+        let mut m = (SOLANA_ADDRESS_LENGTH - 1);
+        while (m < SOLANA_ADDRESS_LENGTH) {
+            let byte_ref = vector::borrow_mut(&mut result, m);
+            let tmp = (*byte_ref as u64) * 58 + carry;
+            carry = tmp / 256;
+            *byte_ref = ((tmp % 256) as u8);
+            if (m == 0) break;
+            m = m - 1;
+        };
+        i = i + 1;
+    };
+    result
+}
+
+/// Convert EVM address to SUI address
+/// 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);
+    
+    let mut sui_bytes = vector[];
+    let mut i = 0;
+    while (i < 12) {
+        sui_bytes.push_back(0u8);
+        i = i + 1;
+    };
+    sui_bytes.append(evm_bytes);
+    address::from_bytes(sui_bytes)
+}
+
+/// Convert Solana address to SUI 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);
+    address::from_bytes(solana_bytes)
+}
+
+fun base58_encode(input: vector<u8>): String {
+    let base58_alphabet = b"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+    let mut result = vector::empty<u8>();
+    let mut num = input;
+    
+    let mut leading_zeros = 0;
+    let mut i = 0;
+    while (i < num.length()) {
+        if (num[i] == 0) {
+            leading_zeros = leading_zeros + 1;
+            i = i + 1;
+        } else {
+            break
+        }
+    };
+    
+    while (!is_zero(&num)) {
+        let remainder = div_mod_58(&mut num);
+        result.push_back(base58_alphabet[remainder]);
+    };
+    
+    let mut j = 0;
+    while (j < leading_zeros) {
+        result.push_back(49);
+        j = j + 1;
+    };
+    
+    vector::reverse(&mut result);
+    result.to_ascii_string()
+}
+
+fun is_zero(num: &vector<u8>): bool {
+    let mut i = 0;
+    while (i < num.length()) {
+        if (num[i] != 0) {
+            return false
+        };
+        i = i + 1;
+    };
+    true
+}
+
+fun div_mod_58(num: &mut vector<u8>): u64 {
+    let mut remainder: u64 = 0;
+    let mut i = 0;
+    while (i < num.length()) {
+        let byte_ref = vector::borrow_mut(num, i);
+        let current = (remainder * 256) + (*byte_ref as u64);
+        *byte_ref = ((current / 58) as u8);
+        remainder = current % 58;
+        i = i + 1;
+    };
+    remainder
+}
+
+/// Get original address format based on tx_hash detection
+/// Returns: EVM (0x...), Solana (Base58), or SUI (0x...) format
+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;
+        while (j < TX_HASH_LENGTH) {
+            evm_bytes.push_back(address_bytes[j]);
+            j = j + 1;
+        };
+        let hex_bytes = hex::encode(evm_bytes);
+        let mut result_bytes = b"0x";
+        result_bytes.append(hex_bytes);
+        result_bytes.to_ascii_string()
+    } else if (chain_type == 2) {
+        base58_encode(address_bytes)
+    } else {
+        let hex_bytes = hex::encode(address_bytes);
+        let mut result_bytes = b"0x";
+        result_bytes.append(hex_bytes);
+        result_bytes.to_ascii_string()
+    }
+}
+
+/// Check if transaction is from EVM chain
+public fun is_evm_address(ctx: &TxContext): bool {
+    let tx_hash = ctx.digest();
+    detect_chain_type_from_tx_hash(tx_hash) == 1
+}
+
+/// Check if transaction is from Solana
+public fun is_solana_address(ctx: &TxContext): bool {
+    let tx_hash = ctx.digest();
+    detect_chain_type_from_tx_hash(tx_hash) == 2
+}
+
+/// Check if transaction is native SUI
+public fun is_sui_address(ctx: &TxContext): bool {
+    let tx_hash = ctx.digest();
+    detect_chain_type_from_tx_hash(tx_hash) == 0
+}
+
+// ========== Test Utilities ==========
+
+#[test_only]
+/// Setup test scenario with EVM context
+/// Input: EVM address as byte string, e.g., b"0x9168765EE952de7C6f8fC6FaD5Ec209B960b7622"
+/// Format: [0xDB][0xDB][0x01][0xE1][...28 bytes...]
+public fun setup_evm_scenario(scenario: &mut test_scenario::Scenario, evm_address_bytes: vector<u8>) {
+    use std::ascii;
+    
+    // Convert EVM address string to SUI address
+    let evm_address_str = ascii::string(evm_address_bytes);
+    let sender = evm_to_sui(evm_address_str);
+    
+    // Generate EVM tx_hash with Dubhe prefix at the beginning
+    let mut tx_hash = vector::empty<u8>();
+    
+    // Mark as EVM with Dubhe prefix, version, and chain type
+    tx_hash.push_back(DUBHE_PREFIX);    // 0xDB
+    tx_hash.push_back(DUBHE_PREFIX);    // 0xDB
+    tx_hash.push_back(DUBHE_VERSION);   // 0x01
+    tx_hash.push_back(CHAIN_TYPE_EVM);  // 0xE1
+    
+    // Fill remaining 28 bytes
+    let mut i = 0;
+    while (i < 28) {
+        tx_hash.push_back((i as u8));
+        i = i + 1;
+    };
+    
+    // Set context
+    let ctx = test_scenario::ctx(scenario);
+    *ctx = tx_context::new(sender, tx_hash, 0, 0, 0);
+}
+
+#[test_only]
+/// Setup test scenario with Solana context
+/// Input: Solana address as byte string, e.g., b"3vy8k1NAc3Q9EPvqrAuS4DG4qwbgVqfxznEdtcrL743L"
+/// Format: [0xDB][0xDB][0x01][0xE2][...28 bytes...]
+public fun setup_solana_scenario(scenario: &mut test_scenario::Scenario, solana_address_bytes: vector<u8>) {
+    use std::ascii;
+    
+    // Convert Solana address string to SUI address
+    let solana_address_str = ascii::string(solana_address_bytes);
+    let sender = solana_to_sui(solana_address_str);
+    
+    // Generate Solana tx_hash with Dubhe prefix at the beginning
+    let mut tx_hash = vector::empty<u8>();
+    
+    // Mark as Solana with Dubhe prefix, version, and chain type
+    tx_hash.push_back(DUBHE_PREFIX);       // 0xDB
+    tx_hash.push_back(DUBHE_PREFIX);       // 0xDB
+    tx_hash.push_back(DUBHE_VERSION);      // 0x01
+    tx_hash.push_back(CHAIN_TYPE_SOLANA);  // 0xE2
+    
+    // Fill remaining 28 bytes
+    let mut i = 0;
+    while (i < 28) {
+        tx_hash.push_back(((i + 100) as u8));
+        i = i + 1;
+    };
+    
+    // Set context
+    let ctx = test_scenario::ctx(scenario);
+    *ctx = tx_context::new(sender, tx_hash, 0, 0, 0);
+}

package/templates/contract/sui-template/src/dubhe/sources/tests/address.move

@@ -0,0 +1,55 @@
+#[test_only]
+module dubhe::address_test;
+
+use dubhe::address_system;
+use sui::test_scenario;
+use std::ascii::string;
+
+#[test]
+public fun test_address_conversion() {
+        let sui_sender = @0x1462cab50fe5998f8161378e5265f7920bfd9fbce604d602619962f608837217;
+        let sui_origin_string = string(b"0x1462cab50fe5998f8161378e5265f7920bfd9fbce604d602619962f608837217");
+        let evm_origin_string = string(b"0x9168765ee952de7c6f8fc6fad5ec209b960b7622");
+        let solana_origin_string = string(b"3vy8k1NAc3Q9EPvqrAuS4DG4qwbgVqfxznEdtcrL743L");
+        let mut scenario = test_scenario::begin(sui_sender);
+        
+        // Test EVM address conversion
+        std::debug::print(&string(b"EVM address:"));
+        std::debug::print(&evm_origin_string);
+        let evm_sui_address = address_system::evm_to_sui(evm_origin_string);
+        std::debug::print(&string(b"EVM->SUI:"));
+        std::debug::print(&evm_sui_address.to_ascii_string());
+
+        // Test Solana address conversion
+        let solana_address_str = string(b"3vy8k1NAc3Q9EPvqrAuS4DG4qwbgVqfxznEdtcrL743L");
+        let solana_sui_address = address_system::solana_to_sui(solana_address_str);
+        std::debug::print(&string(b"Solana->SUI:"));
+        std::debug::print(&solana_sui_address.to_ascii_string());
+
+        // Test SUI address detection
+        {
+            let ctx = test_scenario::ctx(&mut scenario);
+            assert!(address_system::is_sui_address(ctx));
+            assert!(address_system::ensure_origin(ctx) == sui_origin_string);
+        };
+
+        // Test EVM address detection
+        address_system::setup_evm_scenario(&mut scenario, b"0x9168765EE952de7C6f8fC6FaD5Ec209B960b7622");
+        {
+            let ctx = test_scenario::ctx(&mut scenario);
+            assert!(address_system::is_evm_address(ctx));
+            std::debug::print(&string(b"evm_origin_string:"));
+            std::debug::print(&address_system::ensure_origin(ctx));
+            assert!(address_system::ensure_origin(ctx) == evm_origin_string);
+        };
+
+        // Test Solana address detection
+        address_system::setup_solana_scenario(&mut scenario, b"3vy8k1NAc3Q9EPvqrAuS4DG4qwbgVqfxznEdtcrL743L");
+        {
+            let ctx = test_scenario::ctx(&mut scenario);
+            assert!(address_system::is_solana_address(ctx));
+            assert!(address_system::ensure_origin(ctx) == solana_origin_string);
+        };
+        
+        scenario.end();
+}

package/templates/nextjs/sui-template/packages/contracts/src/dubhe/Move.lock

@@ -2,7 +2,7 @@
 
 [move]
 version = 3
-manifest_digest = "F67D57D8267A12BCCF8A98B2566F9B6A8DF5853272672F0EACE1F23EDF0CEAFD"
+manifest_digest = "73896F00312A2E2C47F56DCCABF824967268FF718658DD5D0FFFE2E60824F94A"
 deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
 dependencies = [
   { id = "Sui", name = "Sui" },
@@ -28,5 +28,5 @@ flavor = "sui"
 [env.testnet]
 chain-id = "4c78adac"
 original-published-id = "0xa09cd4137e604ec5a7a88f72c572ecd064b0e713a3fbf705a88456cdbccf36c0"
-latest-published-id = "0xf98fe9c454a40f7d7fa37e19cf3ca5ea8351e24bb6d9fdd2d4da471c694a1796"
-published-version = "2"
+latest-published-id = "0x4613b8a390298cc450fe11360fddf41ba1bde38060163c5ca9f192a25b4f9f2e"
+published-version = "3"

package/templates/nextjs/sui-template/packages/contracts/src/dubhe/Move.toml

@@ -4,7 +4,7 @@ edition = "2024"
 version = "1.0.0"
 license = "apache2.0"
 authors = ["Obelisk Labs"]
-published-at = "0xf98fe9c454a40f7d7fa37e19cf3ca5ea8351e24bb6d9fdd2d4da471c694a1796"
+published-at = "0x4613b8a390298cc450fe11360fddf41ba1bde38060163c5ca9f192a25b4f9f2e"
 
 [dependencies]
 Sui = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "mainnet-v1.46.3" }

package/templates/nextjs/sui-template/packages/contracts/src/dubhe/sources/codegen/genesis.move

@@ -82,8 +82,7 @@
     dapp_system::upgrade_dapp(dapp_hub, dapp_key, new_package_id, new_version, ctx);
     // Register new tables
     // ==========================================
-    asset_add_liquidity::register_table(dapp_hub, ctx);
-    asset_remove_liquidity::register_table(dapp_hub, ctx);
+
 // ==========================================
   }
 }

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

@@ -2,7 +2,7 @@ module dubhe::migrate {
   use dubhe::dapp_service::DappHub;
   use dubhe::genesis;
 
-  const ON_CHAIN_VERSION: u32 = 2;
+  const ON_CHAIN_VERSION: u32 = 3;
 
   public fun on_chain_version(): u32 {
     ON_CHAIN_VERSION
@@ -11,4 +11,8 @@ module dubhe::migrate {
   public entry fun migrate_to_v2(dapp_hub: &mut DappHub, new_package_id: address, new_version: u32, ctx: &mut TxContext) {
     genesis::upgrade(dapp_hub, new_package_id, new_version, ctx);
   }
+
+  public entry fun migrate_to_v3(dapp_hub: &mut DappHub, new_package_id: address, new_version: u32, ctx: &mut TxContext) {
+    genesis::upgrade(dapp_hub, new_package_id, new_version, ctx);
+  }
 }

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

@@ -0,0 +1,296 @@
+module dubhe::address_system;
+
+use std::ascii::String;
+use sui::address;
+use sui::hex;
+
+#[test_only]
+use sui::test_scenario;
+
+// TX_HASH signature markers
+const DUBHE_PREFIX: u8 = 0xDB;
+const DUBHE_VERSION: u8 = 0x01;
+const CHAIN_TYPE_EVM: u8 = 0xE1;
+const CHAIN_TYPE_SOLANA: u8 = 0xE2;
+
+// Constants
+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;
+
+/// Detect chain type from tx_hash signature
+/// Returns: 0 = SUI, 1 = EVM, 2 = Solana
+/// Format: [0xDB][0xDB][0x01][CHAIN_TYPE][...28 bytes...]
+fun detect_chain_type_from_tx_hash(tx_hash: &vector<u8>): u8 {
+    if (tx_hash.length() != TX_HASH_LENGTH || 
+        tx_hash[0] != DUBHE_PREFIX || 
+        tx_hash[1] != DUBHE_PREFIX ||
+        tx_hash[2] != DUBHE_VERSION) {
+        return 0
+    };
+    
+    let chain_type = tx_hash[3];
+    if (chain_type == CHAIN_TYPE_EVM) {
+        1
+    } else if (chain_type == CHAIN_TYPE_SOLANA) {
+        2
+    } else {
+        0
+    }
+}
+
+fun hex_string_to_bytes(hex_str: String): vector<u8> {
+    let bytes = hex_str.into_bytes();
+    let hex_bytes = if (bytes.length() >= 2 && bytes[0] == 48 && (bytes[1] == 120 || bytes[1] == 88)) {
+        let mut result = vector[];
+        let mut i = 2;
+        while (i < bytes.length()) {
+            result.push_back(bytes[i]);
+            i = i + 1;
+        };
+        result
+    } else {
+        bytes
+    };
+    hex::decode(hex_bytes)
+}
+
+fun base58_decode(input: String): vector<u8> {
+    let base58_alphabet = b"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+    let input_bytes = input.as_bytes();
+    let len = input_bytes.length();
+    
+    let mut result: vector<u8> = vector[];
+    let mut j = 0;
+    while (j < SOLANA_ADDRESS_LENGTH) {
+        result.push_back(0u8);
+        j = j + 1;
+    };
+    
+    let mut i = 0;
+    while (i < len) {
+        let c = input_bytes[i];
+        let mut char_value: u64 = 0;
+        let mut found = false;
+        let mut k = 0;
+        while (k < 58) {
+            if (base58_alphabet[k] == c) {
+                char_value = k;
+                found = true;
+                break
+            };
+            k = k + 1;
+        };
+        
+        assert!(found, E_INVALID_SOLANA_ADDRESS);
+        
+        let mut carry = char_value;
+        let mut m = (SOLANA_ADDRESS_LENGTH - 1);
+        while (m < SOLANA_ADDRESS_LENGTH) {
+            let byte_ref = vector::borrow_mut(&mut result, m);
+            let tmp = (*byte_ref as u64) * 58 + carry;
+            carry = tmp / 256;
+            *byte_ref = ((tmp % 256) as u8);
+            if (m == 0) break;
+            m = m - 1;
+        };
+        i = i + 1;
+    };
+    result
+}
+
+/// Convert EVM address to SUI address
+/// 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);
+    
+    let mut sui_bytes = vector[];
+    let mut i = 0;
+    while (i < 12) {
+        sui_bytes.push_back(0u8);
+        i = i + 1;
+    };
+    sui_bytes.append(evm_bytes);
+    address::from_bytes(sui_bytes)
+}
+
+/// Convert Solana address to SUI 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);
+    address::from_bytes(solana_bytes)
+}
+
+fun base58_encode(input: vector<u8>): String {
+    let base58_alphabet = b"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+    let mut result = vector::empty<u8>();
+    let mut num = input;
+    
+    let mut leading_zeros = 0;
+    let mut i = 0;
+    while (i < num.length()) {
+        if (num[i] == 0) {
+            leading_zeros = leading_zeros + 1;
+            i = i + 1;
+        } else {
+            break
+        }
+    };
+    
+    while (!is_zero(&num)) {
+        let remainder = div_mod_58(&mut num);
+        result.push_back(base58_alphabet[remainder]);
+    };
+    
+    let mut j = 0;
+    while (j < leading_zeros) {
+        result.push_back(49);
+        j = j + 1;
+    };
+    
+    vector::reverse(&mut result);
+    result.to_ascii_string()
+}
+
+fun is_zero(num: &vector<u8>): bool {
+    let mut i = 0;
+    while (i < num.length()) {
+        if (num[i] != 0) {
+            return false
+        };
+        i = i + 1;
+    };
+    true
+}
+
+fun div_mod_58(num: &mut vector<u8>): u64 {
+    let mut remainder: u64 = 0;
+    let mut i = 0;
+    while (i < num.length()) {
+        let byte_ref = vector::borrow_mut(num, i);
+        let current = (remainder * 256) + (*byte_ref as u64);
+        *byte_ref = ((current / 58) as u8);
+        remainder = current % 58;
+        i = i + 1;
+    };
+    remainder
+}
+
+/// Get original address format based on tx_hash detection
+/// Returns: EVM (0x...), Solana (Base58), or SUI (0x...) format
+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;
+        while (j < TX_HASH_LENGTH) {
+            evm_bytes.push_back(address_bytes[j]);
+            j = j + 1;
+        };
+        let hex_bytes = hex::encode(evm_bytes);
+        let mut result_bytes = b"0x";
+        result_bytes.append(hex_bytes);
+        result_bytes.to_ascii_string()
+    } else if (chain_type == 2) {
+        base58_encode(address_bytes)
+    } else {
+        let hex_bytes = hex::encode(address_bytes);
+        let mut result_bytes = b"0x";
+        result_bytes.append(hex_bytes);
+        result_bytes.to_ascii_string()
+    }
+}
+
+/// Check if transaction is from EVM chain
+public fun is_evm_address(ctx: &TxContext): bool {
+    let tx_hash = ctx.digest();
+    detect_chain_type_from_tx_hash(tx_hash) == 1
+}
+
+/// Check if transaction is from Solana
+public fun is_solana_address(ctx: &TxContext): bool {
+    let tx_hash = ctx.digest();
+    detect_chain_type_from_tx_hash(tx_hash) == 2
+}
+
+/// Check if transaction is native SUI
+public fun is_sui_address(ctx: &TxContext): bool {
+    let tx_hash = ctx.digest();
+    detect_chain_type_from_tx_hash(tx_hash) == 0
+}
+
+// ========== Test Utilities ==========
+
+#[test_only]
+/// Setup test scenario with EVM context
+/// Input: EVM address as byte string, e.g., b"0x9168765EE952de7C6f8fC6FaD5Ec209B960b7622"
+/// Format: [0xDB][0xDB][0x01][0xE1][...28 bytes...]
+public fun setup_evm_scenario(scenario: &mut test_scenario::Scenario, evm_address_bytes: vector<u8>) {
+    use std::ascii;
+    
+    // Convert EVM address string to SUI address
+    let evm_address_str = ascii::string(evm_address_bytes);
+    let sender = evm_to_sui(evm_address_str);
+    
+    // Generate EVM tx_hash with Dubhe prefix at the beginning
+    let mut tx_hash = vector::empty<u8>();
+    
+    // Mark as EVM with Dubhe prefix, version, and chain type
+    tx_hash.push_back(DUBHE_PREFIX);    // 0xDB
+    tx_hash.push_back(DUBHE_PREFIX);    // 0xDB
+    tx_hash.push_back(DUBHE_VERSION);   // 0x01
+    tx_hash.push_back(CHAIN_TYPE_EVM);  // 0xE1
+    
+    // Fill remaining 28 bytes
+    let mut i = 0;
+    while (i < 28) {
+        tx_hash.push_back((i as u8));
+        i = i + 1;
+    };
+    
+    // Set context
+    let ctx = test_scenario::ctx(scenario);
+    *ctx = tx_context::new(sender, tx_hash, 0, 0, 0);
+}
+
+#[test_only]
+/// Setup test scenario with Solana context
+/// Input: Solana address as byte string, e.g., b"3vy8k1NAc3Q9EPvqrAuS4DG4qwbgVqfxznEdtcrL743L"
+/// Format: [0xDB][0xDB][0x01][0xE2][...28 bytes...]
+public fun setup_solana_scenario(scenario: &mut test_scenario::Scenario, solana_address_bytes: vector<u8>) {
+    use std::ascii;
+    
+    // Convert Solana address string to SUI address
+    let solana_address_str = ascii::string(solana_address_bytes);
+    let sender = solana_to_sui(solana_address_str);
+    
+    // Generate Solana tx_hash with Dubhe prefix at the beginning
+    let mut tx_hash = vector::empty<u8>();
+    
+    // Mark as Solana with Dubhe prefix, version, and chain type
+    tx_hash.push_back(DUBHE_PREFIX);       // 0xDB
+    tx_hash.push_back(DUBHE_PREFIX);       // 0xDB
+    tx_hash.push_back(DUBHE_VERSION);      // 0x01
+    tx_hash.push_back(CHAIN_TYPE_SOLANA);  // 0xE2
+    
+    // Fill remaining 28 bytes
+    let mut i = 0;
+    while (i < 28) {
+        tx_hash.push_back(((i + 100) as u8));
+        i = i + 1;
+    };
+    
+    // Set context
+    let ctx = test_scenario::ctx(scenario);
+    *ctx = tx_context::new(sender, tx_hash, 0, 0, 0);
+}

package/templates/nextjs/sui-template/packages/contracts/src/dubhe/sources/tests/address.move

@@ -0,0 +1,55 @@
+#[test_only]
+module dubhe::address_test;
+
+use dubhe::address_system;
+use sui::test_scenario;
+use std::ascii::string;
+
+#[test]
+public fun test_address_conversion() {
+        let sui_sender = @0x1462cab50fe5998f8161378e5265f7920bfd9fbce604d602619962f608837217;
+        let sui_origin_string = string(b"0x1462cab50fe5998f8161378e5265f7920bfd9fbce604d602619962f608837217");
+        let evm_origin_string = string(b"0x9168765ee952de7c6f8fc6fad5ec209b960b7622");
+        let solana_origin_string = string(b"3vy8k1NAc3Q9EPvqrAuS4DG4qwbgVqfxznEdtcrL743L");
+        let mut scenario = test_scenario::begin(sui_sender);
+        
+        // Test EVM address conversion
+        std::debug::print(&string(b"EVM address:"));
+        std::debug::print(&evm_origin_string);
+        let evm_sui_address = address_system::evm_to_sui(evm_origin_string);
+        std::debug::print(&string(b"EVM->SUI:"));
+        std::debug::print(&evm_sui_address.to_ascii_string());
+
+        // Test Solana address conversion
+        let solana_address_str = string(b"3vy8k1NAc3Q9EPvqrAuS4DG4qwbgVqfxznEdtcrL743L");
+        let solana_sui_address = address_system::solana_to_sui(solana_address_str);
+        std::debug::print(&string(b"Solana->SUI:"));
+        std::debug::print(&solana_sui_address.to_ascii_string());
+
+        // Test SUI address detection
+        {
+            let ctx = test_scenario::ctx(&mut scenario);
+            assert!(address_system::is_sui_address(ctx));
+            assert!(address_system::ensure_origin(ctx) == sui_origin_string);
+        };
+
+        // Test EVM address detection
+        address_system::setup_evm_scenario(&mut scenario, b"0x9168765EE952de7C6f8fC6FaD5Ec209B960b7622");
+        {
+            let ctx = test_scenario::ctx(&mut scenario);
+            assert!(address_system::is_evm_address(ctx));
+            std::debug::print(&string(b"evm_origin_string:"));
+            std::debug::print(&address_system::ensure_origin(ctx));
+            assert!(address_system::ensure_origin(ctx) == evm_origin_string);
+        };
+
+        // Test Solana address detection
+        address_system::setup_solana_scenario(&mut scenario, b"3vy8k1NAc3Q9EPvqrAuS4DG4qwbgVqfxznEdtcrL743L");
+        {
+            let ctx = test_scenario::ctx(&mut scenario);
+            assert!(address_system::is_solana_address(ctx));
+            assert!(address_system::ensure_origin(ctx) == solana_origin_string);
+        };
+        
+        scenario.end();
+}