degate-cli 1.0.0 → 1.0.2

package/cli.js

@@ -32,7 +32,7 @@ const ENV_CONFIG = {
   prod: {
     DG_API: 'https://v1-mainnet-backend.degate.com',
     DEGATE_VERSION: 'V1',
-    EXCHANGE_ADDRESS: '0x5859cCb16DC791f79AAFadD5B9768bC400797A29',
+    EXCHANGE_ADDRESS: '0x9C07A72177c5A05410cA338823e790876E79D73B',
     DEX_CHAIN_ID: 1,
     SIGN_TEMPLATE: 'S3',
     API_SIGN_VALID_ADDRESS: '',
@@ -237,6 +237,15 @@ async function getAccessToken(dgWalletPrivateKey) {
   return resp.data.token;
 }
 
+async function fetchExchangeAddress(client) {
+  try {
+    const resp = await client.get('/order-book-api/v3/configuration');
+    return resp.data?.exchange_address || null;
+  } catch {
+    return null;
+  }
+}
+
 async function fetchChainInfo(client) {
   const resp = await client.get('/order-book-api/intent/chains');
   const { chains } = resp.data;
@@ -293,23 +302,19 @@ async function fetchDAOwner(eoaAddress) {
 }
 
 async function fetchRegisteredDAs(authClient) {
-  try {
-    const resp = await authClient.get('/order-book-api/intent/daAddress');
-    const { key_nonce_when_addr_generate, addresses } = resp.data || {};
-    const das = {};
-    (addresses || []).forEach(item => {
-      const info = item.chain_addresses_info?.[0] || {};
-      das[item.chain_name?.toUpperCase()] = {
-        chain: item.chain_name?.toUpperCase(),
-        address: info.address,
-        publicKey: info.public_key,
-        path: info.address_path,
-      };
-    });
-    return { keyNonce: key_nonce_when_addr_generate, das };
-  } catch {
-    return { keyNonce: null, das: {} };
-  }
+  const resp = await authClient.get('/order-book-api/intent/daAddress');
+  const { key_nonce_when_addr_generate, addresses } = resp.data || {};
+  const das = {};
+  (addresses || []).forEach(item => {
+    const info = item.chain_addresses_info?.[0] || {};
+    das[item.chain_name?.toUpperCase()] = {
+      chain: item.chain_name?.toUpperCase(),
+      address: info.address,
+      publicKey: info.public_key,
+      path: info.address_path,
+    };
+  });
+  return { keyNonce: key_nonce_when_addr_generate, das };
 }
 
 async function signSolanaMessage(message, privateKey) {
@@ -399,6 +404,9 @@ async function intentTryCreate(client, order) {
   const resp = await client.post('/order-book-api/intent/v2/compact_try_create', order, {
     headers: { Version: '0.0.1' },
   });
+  if (!resp.data?.result) {
+    console.log(chalk.yellow('[DEBUG] compact_try_create raw resp.data:'), JSON.stringify(resp.data, null, 2));
+  }
   return resp.data;
 }
 
@@ -493,15 +501,51 @@ async function buildSession(privateKey, keyNonce = 1, env = 'dev') {
     const jwt = await getAccessToken(keys.DGWallet.privateKey);
     const client = createApiClient(jwt);
 
+    spinner.text = '获取链配置 (exchange_address)...';
+    const remoteExchangeAddr = await fetchExchangeAddress(client);
+    if (remoteExchangeAddr) {
+      const cfg = getConfig();
+      if (cfg.EXCHANGE_ADDRESS.toLowerCase() !== remoteExchangeAddr.toLowerCase()) {
+        console.log(chalk.yellow(`\n  [配置修正] EXCHANGE_ADDRESS: ${cfg.EXCHANGE_ADDRESS} → ${remoteExchangeAddr}`));
+        cfg.EXCHANGE_ADDRESS = remoteExchangeAddr;
+      }
+    }
+
     spinner.text = '获取 DA Owner...';
     const da_owner = await fetchDAOwner(keys.eoaAddress) || `${keys.DGWallet.address}_0`;
 
     spinner.text = '检查 DA 注册状态...';
-    const { das: registeredDAs } = await fetchRegisteredDAs(client);
-    const needsSync = !registeredDAs.SOLANA?.address || !registeredDAs.ETHEREUM?.address;
+    let registeredDAs = {};
+    let needsSync = false;
+    try {
+      const result = await fetchRegisteredDAs(client);
+      registeredDAs = result.das;
+      needsSync = !registeredDAs.SOLANA?.address || !registeredDAs.ETHEREUM?.address;
+    } catch {
+      needsSync = true;
+    }
+
     if (needsSync) {
       spinner.text = '注册 DA 地址到后端...';
-      await registerDAs(client, { eoaAddress: keys.eoaAddress, keys, keyNonce });
+      try {
+        await registerDAs(client, { eoaAddress: keys.eoaAddress, keys, keyNonce });
+        spinner.text = 'DA 注册成功';
+      } catch (regErr) {
+        // 注册失败时二次确认 DA 是否已存在（常见于重复 setup）
+        try {
+          const recheck = await fetchRegisteredDAs(client);
+          const alreadyRegistered = recheck.das.SOLANA?.address && recheck.das.ETHEREUM?.address;
+          if (alreadyRegistered) {
+            registeredDAs = recheck.das;
+            needsSync = false;
+            spinner.text = 'DA 已存在，跳过注册';
+          } else {
+            throw regErr;
+          }
+        } catch {
+          throw regErr;
+        }
+      }
     }
 
     spinner.text = '获取链配置...';
@@ -537,6 +581,7 @@ async function buildSession(privateKey, keyNonce = 1, env = 'dev') {
     console.log(chalk.gray(`  DGWallet: ${keys.DGWallet.address}`));
     console.log(chalk.gray(`  DA Owner: ${da_owner}`));
     console.log(chalk.gray(`  Solana DA: ${keys.SOLANA.address}`));
+    console.log(chalk.gray(`  DA 状态: ${needsSync ? '刚注册' : '已存在'}`));
     return session;
   } catch (err) {
     spinner.fail('认证失败');

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "degate-cli",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "DeGate Turbo Range CLI - deposit/withdraw LP positions across Solana & EVM chains",
   "main": "cli.js",
   "bin": {
-    "degate-cli": "./cli.js"
+    "degate-cli": "cli.js"
   },
   "scripts": {
     "start": "node cli.js"