web-dc-api 0.1.5 → 0.1.7

package/lib/common/chain.ts

@@ -1,469 +0,0 @@
-/**
- * 区块链相关的方法
- */
-
-import { Multiaddr, multiaddr } from "@multiformats/multiaddr";
-import { ApiPromise, WsProvider } from "@polkadot/api";
-
-import { isUser, sha256,hexToAscii } from "../util/utils";
-import { IAppInfo, User,PeerStatus } from "./types/types";
-
-import { hexToBytes } from "@noble/curves/abstract/utils";
-import { base32 } from "multiformats/bases/base32";
-import * as buffer from "buffer/";
-import { Ed25519PubKey } from "./dc-key/ed25519";
-import { UnibaseDecoder } from "multiformats";
-const { Buffer } = buffer;
-
-export interface StoreunitInfo {  
-  size: number;  
-  utype: number;  
-  peers: Set<string>;  
-  users: Set<string>;  
-  mbusers: Set<string>;//base32 编码的用户
-  logs: Set<string>;  
-}  
-
-
-
-export class ChainUtil {
-  dcchainapi: ApiPromise | undefined;
-  // 连接链节点
-  create = async (blockChainAddr: string) => {
-    const chainProvider = new WsProvider(blockChainAddr);
-    this.dcchainapi = await ApiPromise.create({
-      provider: chainProvider,
-      throwOnConnect: true,
-      throwOnUnknown: true,
-    });
-    if (!this.dcchainapi) {
-      console.error("dcchainapi init failed");
-      return false;
-    }
-    return true;
-  };
-
-  // 获取区块高度
-  async getBlockHeight():  Promise<number> {
-    const lastBlock = await this.dcchainapi?.rpc.chain.getBlock();
-    const blockHeight = lastBlock?.block.header.number.toNumber();
-    return blockHeight || 0;
-  }
-  // 获取用户钱包信息
-  async getUserInfoWithAccount(account: string): Promise<User> {
-    const walletAccountStorage =
-      await (this.dcchainapi?.query as any).dcNode.walletAccountStorage(account);
-    if (!walletAccountStorage) {
-      throw new Error("walletAccountStorage is null");
-    }
-    let userInfo = walletAccountStorage.toJSON();
-    if (userInfo === null) {
-      throw new Error("userInfo is null");
-    }
-   
-   
-    if (!isUser(userInfo)) {
-      throw new Error("walletAccountStorage is not user");
-    }
-    if (userInfo?.parentAccount !== account) {
-      const parentWalletAccountStorage =
-        await (this.dcchainapi?.query as any).dcNode.walletAccountStorage(
-          userInfo?.parentAccount
-        );
-      if (!parentWalletAccountStorage) {
-        throw new Error("parentWalletAccountStorage is null");
-      }
-      const parentUserInfo = parentWalletAccountStorage?.toJSON();
-      if (!parentUserInfo || !isUser(parentUserInfo)) {
-        return userInfo;
-      }
-      userInfo.requestPeers = parentUserInfo.requestPeers;
-      if (userInfo.peers?.length == 0) {
-        //If the sub-account does not have account backup node information (this will happen if the sub-account is not bound to an nft account), the backup node information of the parent account will be obtained.
-        userInfo.peers = parentUserInfo.peers;
-      }
-      userInfo.subscribeSpace = parentUserInfo.subscribeSpace;
-      userInfo.usedSpace = parentUserInfo.usedSpace;
-      userInfo.expireNumber = parentUserInfo.expireNumber;
-      userInfo.purchaseNumber = parentUserInfo.purchaseNumber;
-      // 冻结不为0则更新
-      if(parentUserInfo.commentFrozenStatus != 0){
-        userInfo.commentFrozenStatus = parentUserInfo.commentFrozenStatus;
-      }
-      if(parentUserInfo.spamFrozenStatus != 0){
-        userInfo.spamFrozenStatus = parentUserInfo.spamFrozenStatus;
-      }
-
-    }
-     //peers 进行统一处理
-      for (let i = 0; i < userInfo.peers.length; i++) {
-        userInfo.peers[i] = hexToAscii(userInfo.peers[i]!);
-      }
-      for (let i = 0; i < userInfo.requestPeers.length; i++) {
-        userInfo.requestPeers[i] = hexToAscii(userInfo.requestPeers[i]!);
-      }
-      if (userInfo.dbConfig.length <= 2) {
-        userInfo.dbConfig = ""; // 如果 dbConfig 为空，则设置为 ""
-      }else{
-        userInfo.dbConfigRaw = hexToBytes(userInfo.dbConfig.slice(2));
-      }
-      if (userInfo.encNftAccount.length <= 2) {
-        userInfo.encNftAccount = ""; 
-      }
-   // 对 userInfo.peers 按与用户公钥的 XOR 距离进行排序
-    if (userInfo.peers && Array.isArray(userInfo.peers) && account) {
-        userInfo.peers.sort((peerA, peerB) => {
-        // 将 peer 字符串转换为 Uint8Array (如果需要)
-        const peerABytes = typeof peerA === 'string' ? new TextEncoder().encode(peerA) : peerA;
-        const peerBBytes = typeof peerB === 'string' ? new TextEncoder().encode(peerB) : peerB;
-        //account 是一个0x开头的16进制字符串转换为 Uint8Array
-        const accountBytes = hexToBytes(account.slice(2));
-        // 计算每个 peer 与公钥的 XOR 距离
-        const distance1 = this.calculateDistance(peerABytes, accountBytes);
-        const distance2 = this.calculateDistance(peerBBytes, accountBytes);
-        if (distance1 < distance2) return -1;
-        if (distance1 > distance2) return 1;
-        return 0;
-      });
-    }
-    return userInfo;
-  }
-  // 获取用户钱包信息
-  async getUserInfoWithNftHex(nftHexAccount: string): Promise<User> {
-    const walletAccount =
-      await (this.dcchainapi?.query as any).dcNode.nftToWalletAccount(nftHexAccount);
-    if (!walletAccount || !walletAccount.toString()) {
-      throw new Error("walletAccount is null");
-    }
-    const userInfo = await this.getUserInfoWithAccount(
-      walletAccount.toString()
-    );
-    return userInfo;
-  }
-
-  /**
- * 计算两个字节数组之间的XOR距离
- * @param key1 第一个字节数组
- * @param key2 第二个字节数组
- * @returns 两个键之间的XOR距离，以BigInt表示
- */
- calculateDistance(key1: Uint8Array, key2: Uint8Array): bigint {
-  // 使用两个字节数组的最小长度
-  const minLen = Math.min(key1.length, key2.length);
-  
-  // 创建结果数组存储XOR结果
-  const result = new Uint8Array(minLen);
-  
-  // 按字节计算XOR距离
-  for (let i = 0; i < minLen; i++) {
-    result[i] = key1[i]! ^ key2[i]!;
-  }
-  
-  // 将结果转换为BigInt用于比较
-  // 首先转换为十六进制字符串以处理大数值
-  let hexString = '0x';
-  for (let i = 0; i < result.length; i++) {
-    hexString += result[i]!.toString(16).padStart(2, '0');
-  }
-  
-  // 如果结果为空（全零），返回0n
-  if (hexString === '0x') {
-    return BigInt(0);
-  }
-  
-  return BigInt(hexString);
-}
-
-  // 获取用户钱包信息
-  async getUserInfoWithNft(nftAccount: string): Promise<User | null> {
-    console.log("=========nftAccount", nftAccount);
-    const accountBytes = new TextEncoder().encode(nftAccount);
-    const accountHash = await sha256(accountBytes);
-
-    const nftHexAccount = "0x" + Buffer.from(accountHash).toString("hex");
-    const userInfo = await this.getUserInfoWithNftHex(nftHexAccount);
-    return userInfo;
-  }
-
-
-  async getUserWalletAccount(nftAccount: string): Promise<string | null> {
-    const accountBytes = new TextEncoder().encode(nftAccount);
-    const accountHash = await sha256(accountBytes);
-    const nftHexAccount = "0x" + Buffer.from(accountHash).toString("hex");
-    const walletAccount =
-      await (this.dcchainapi?.query as any).dcNode.nftToWalletAccount(nftHexAccount);
-    if (!walletAccount || !walletAccount.toString()) {
-      throw new Error("walletAccount is null");
-    }
-    return walletAccount.toString();
-  }
-
-  // 获取所有文件存储节点
-  getObjNodes = async (cid: string): Promise<string[] | undefined> => {
-    const fileInfo = (await (this.dcchainapi?.query as any).dcNode.files(cid)) || null;
-    const fileInfoJSON = fileInfo?.toJSON();
-    if (
-      !fileInfoJSON ||
-      typeof fileInfoJSON !== "object" ||
-      (fileInfoJSON as { peers: string[] }).peers.length == 0
-    ) {
-      return;
-    }
-    const peers = (fileInfoJSON as { peers: string[] }).peers || [];
-    return peers;
-  };
-
-  // 获取用户节点列表
-  getAccountPeers = async (account: Uint8Array): Promise<string[] | null> => {
-    try {
-      const hexAccount = "0x" + Buffer.from(account).toString("hex");
-      const userInfo = await this.getUserInfoWithAccount(hexAccount);
-      if (!userInfo || !isUser(userInfo)) {
-        return null;
-      }
-      const peers = userInfo.peers;
-       return peers;
-    }catch (error) {
-      console.error("getAccountPeers error:", error);
-      return null;
-    }
-  };
-
-  // 链上查询节点信息
-  // getDcNodeAddr = async (peerid: string) => {
-  //   const peerInfo = await (this.dcchainapi?.query as any).dcNode.peers(peerid);
-  //   const peerInfoJson = peerInfo?.toJSON();
-  //   if (
-  //     !peerInfoJson ||
-  //     typeof peerInfoJson !== "object" ||
-  //     (peerInfoJson as { ipAddress: string }).ipAddress == ""
-  //   ) {
-  //     console.log("no ip address found for peer: ", peerid);
-  //     return;
-  //   }
-  //   let nodeAddr = Buffer.from(
-  //     (peerInfoJson as { ipAddress: string }).ipAddress.slice(2),
-  //     "hex"
-  //   ).toString("utf8");
-  //   let addrParts = nodeAddr.split(",");
-  //   nodeAddr = addrParts[0];
-  //   //节点ws监听端口号在原来的tcp监听的基础上加10
-  //   let newNodeAddr = "";
-  //   const parts = nodeAddr.split("/");
-  //   for (let i = 0; i < parts.length; i++) {
-  //     if (parts[i] == "tcp" && i < parts.length - 1) {
-  //       const newPort = parseInt(parts[i + 1]) + 10;
-  //       newNodeAddr += parts[i] + "/" + newPort + "/";
-  //       i++;
-  //     } else if (parts[i] == "p2p") {
-  //       newNodeAddr += "ws/" + parts[i] + "/";
-  //     } else {
-  //       newNodeAddr += parts[i] + "/";
-  //     }
-  //   }
-  //   const addr = multiaddr(newNodeAddr);
-  //   console.log("newNodeAddr", newNodeAddr);
-  //   return addr;
-  // };
-  // 链上查询节点webrtc direct的地址信息,
-  // peerid: 节点的peerid
-  // 直接连接节点的地址
-  getDcNodeWebrtcDirectAddr = async (peerid: string): Promise<[Multiaddr | null, PeerStatus]> => {
-    const peerInfo = await (this.dcchainapi?.query as any).dcNode.peers(peerid);
-    const peerInfoJson = peerInfo?.toJSON();
-    if (
-      !peerInfoJson ||
-      typeof peerInfoJson !== "object" ||
-      (peerInfoJson as { ipAddress: string }).ipAddress == ""
-    ) {
-      console.error("no ip address found for peer: ", peerid);
-      return [null, PeerStatus.PeerStatusOffline];
-    }
-    let nodeAddr = Buffer.from(
-      (peerInfoJson as { ipAddress: string }).ipAddress.slice(2),
-      "hex"
-    ).toString("utf8");
-    let addrParts = nodeAddr.split(",");
-    if (addrParts.length < 2) {
-      return [null, PeerStatus.PeerStatusOffline];
-    }
-    const addr = multiaddr(addrParts[1]);
-    const peerStatus = (peerInfoJson as { status: number }).status || PeerStatus.PeerStatusOffline;
-    return [addr, peerStatus];
-  };
-
-  // 链上查询节点列表
-  getDcNodeList = async (): Promise<string[]> => {
-    const peerList = await (this.dcchainapi?.query as any).dcNode.onlineNodesAddress();
-    const peerListJson = peerList?.toJSON();
-    console.log(
-      "peerListJson================================================",
-      peerListJson
-    );
-    if (!peerListJson || typeof peerListJson !== "object") {
-      console.error("no peer list found");
-      return [];
-    }
-    let peers: string[] = [];
-    if (Array.isArray(peerListJson)) {
-      for (let i = 0; i < peerListJson.length; i++) {
-        const peer = peerListJson[i];
-        if (typeof peer === "string") {
-          const peerJson = Buffer.from(peer.slice(2), "hex").toString(
-            "utf8"
-          );
-          peers = peers.concat(peerJson);
-        }
-      }
-    }
-    console.log("peers", peers);
-    return peers;
-  };
-
-  objectState =  async (cid: string): Promise<[StoreunitInfo | null, Error|null]> =>{
-      if (!this.dcchainapi) {  
-          return [null, new Error("dcchainapi is not initialized")];
-      }  
-
-      const fileInfo = await (this.dcchainapi.query as any).dcNode.files(cid);  
-      
-      if (!fileInfo || fileInfo.isEmpty) {  
-          return [null, new Error(`File with CID ${cid} not found`)];  
-      }  
-
-      const data = fileInfo.toJSON();  
-
-      if (!data) {  
-          return [null, new Error(`File with CID ${cid} not found`)];  
-      }  
-    // 构造返回数据  
-    if (typeof data === "object" && data !== null && !Array.isArray(data)) {
-      return [{  
-        size: Number((data as any)['fileSize'] || 0),  
-        utype: Number((data as any)['fileType'] || 0),  
-        peers: new Set(
-          Array.isArray((data as any)['peers']) 
-            ? (data as any)['peers'].map((peer: any) => {
-                try {
-                  return hexToAscii(String(peer));
-                } catch (e) {
-                  console.warn('Failed to convert peer ID format:', e);
-                  return String(peer); // 如果转换失败，保留原格式
-                }
-              })
-            : []
-        ),   
-        users: new Set(Array.isArray((data as any)['users']) ? (data as any)['users'].map(String) : []),  
-        mbusers: new Set(
-          Array.isArray((data as any)['users']) 
-            ? (data as any)['users'].map((user: any) => {
-                try {
-                  const userBytes = hexToBytes(user.slice(2));
-                  const mbUser =  base32.encode(userBytes); 
-                  return mbUser
-                } catch (e) {
-                  console.warn('Failed to convert peer ID format:', e);
-                  return String(user); // 如果转换失败，保留原格式
-                }
-              })
-            : []
-        ),   
-        logs: new Set(
-          Array.isArray((data as any)['dbLog']) 
-            ? (data as any)['dbLog'].map((log: any) => {
-                try {
-                  return hexToAscii(String(log));
-                } catch (e) {
-                  console.warn('Failed to convert peer ID format:', e);
-                  return String(log); // 如果转换失败，保留原格式
-                }
-              })
-            : []
-        ),   
-      }, null];    
-    }
-    return [null, new Error(`File with CID ${cid} not found`)];
-  }
-
-    ifEnoughUserSpace = async (
-      pubkeyRaw: Uint8Array,
-      needSize?: number
-    ): Promise<boolean> => {
-      const hexAccount = "0x" + Buffer.from(pubkeyRaw).toString("hex");
-      // 获取用户存储空间
-      const userInfo = await this.getUserInfoWithAccount(
-        hexAccount
-      );
-      if (!userInfo) {
-        throw new Error("get user info error");
-      }
-  
-      // 用户冻结
-      if (userInfo.commentFrozenStatus != 0 || userInfo.spamFrozenStatus != 0) {
-        return false
-      }
-  
-      // 过期高度判断
-      const blockHeight = (await this.getBlockHeight()) || 0;
-      if (userInfo.expireNumber > 0 && userInfo.expireNumber < blockHeight) {
-        return false
-      }
-  
-      // 用户存储空间判断
-      const needSizeNumber = needSize || 1024 * 1024; // 1M
-      if (userInfo.subscribeSpace - userInfo.usedSpace < needSizeNumber) {
-        return false
-      }
-  
-      return true
-    };
-    refreshUserInfo = async (pubkeyRaw: Uint8Array): Promise<User> => {
-      const hexAccount = "0x" + Buffer.from(pubkeyRaw).toString("hex");
-      const userInfo = await this.getUserInfoWithAccount(hexAccount);
-      return userInfo;
-    };
-
-
-
-  // 获取应用信息
-  getAPPInfo = async (appId: string): Promise<IAppInfo> => {
-    if (!this.dcchainapi || !this.dcchainapi.isReady) {
-      throw new Error("dcchainapi is not initialized");
-    }
-    const appIdBytes = new TextEncoder().encode(appId);
-    const appIdHex = "0x" + Buffer.from(appIdBytes).toString("hex");
-    const appInfoStr = await (this.dcchainapi?.query as any).dcNode.appsInfo(appIdHex);
-    if (!appInfoStr || appInfoStr.isEmpty) {
-      throw new Error(`App info for ${appId} not found`);
-    }
-    const appJsonInfo = appInfoStr.toJSON() as any;
-    if (!appJsonInfo || typeof appJsonInfo !== "object") {
-      throw new Error(`App info for ${appId} is not valid`);
-    }
-    //将 ownerAccount 转换为 Ed25519PubKey
-    const ownerBytes = hexToBytes(appJsonInfo?.ownerAccount.slice(2));
-    const owner = new Ed25519PubKey(ownerBytes);
-    const rewarder = appJsonInfo?.rewardedStash;
-    
-    let domain =  ""
-     if (appJsonInfo?.domain && appJsonInfo?.domain.length > 0) {
-        const domainBytes = hexToBytes(appJsonInfo?.domain.slice(2));
-        domain = new TextDecoder().decode(domainBytes).toString();
-    }
-    
-    let  fid =  "";
-     if (appJsonInfo?.fileId && appJsonInfo?.fileId.length > 0) {
-      const fidBytes = hexToBytes(appJsonInfo?.fileId.slice(2));
-      fid = new TextDecoder().decode(fidBytes).toString();
-    }
-    const appInfo :IAppInfo = {
-      appId: appId,
-      domain: domain,
-      owner: owner.string(),
-      rewarder: rewarder,
-      fid: fid,
-    }
-    return appInfo ;
-  };
-
-}

package/lib/common/commonclient.ts

@@ -1,202 +0,0 @@
-// common/commonClient.ts
-import type { Multiaddr } from "@multiformats/multiaddr";
-import type { Client } from "./dcapi";
-import { keys } from "@libp2p/crypto";
-import { Ed25519PubKey } from "./dc-key/ed25519";
-import {
-  extractPeerIdFromMultiaddr,
-  generateSymKeyForPrikey,
-  extractPublicKeyFromPeerId,
-} from "./dc-key/keyManager";
-import { sha256, getRandomBytes, concatenateUint8Arrays } from "../util/utils";
-import { Encryption } from "../util/curve25519Encryption";
-import { decryptContent } from "../util/dccrypt";
-import { toString as uint8ArrayToString } from "uint8arrays/to-string";
-import { PeerId } from "@libp2p/interface";
-import { Libp2pGrpcClient } from "grpc-libp2p-client";
-
-import { dcnet } from "../proto/dcnet_proto";
-
-interface AccountLoginRequest {
-  accounthashencrypt: Uint8Array;
-  pubkeyencrypt: Uint8Array;
-  loginkeyrandencrypt: Uint8Array;
-}
-
-export class CommonClient {
-  client: Client;
-
-  constructor(dcClient: Client) {
-    this.client = dcClient;
-  }
-
-  // 登陆
-  async accountLogin(
-    nftAccount: string,
-    password: string,
-    safecode: string,
-  ): Promise<string> {
-    //登录
-    const prikey = await this._accountDoLogin(
-      nftAccount,
-      password,
-      safecode,
-      this.client.peerAddr
-    );
-    let mnemonic = "";
-    if (prikey.startsWith("mnemonic:")) {
-      mnemonic = prikey.slice(9);
-      return mnemonic;
-    } 
-    return '';
-  }
-
-  async _accountDoLogin(
-    account: string,
-    password: string,
-    seccode: string,
-    peerAddr: Multiaddr
-  ): Promise<string> {
-    if (this.client.p2pNode == null || this.client.p2pNode.peerId == null) {
-      throw new Error("p2pNode is null or node privateKey is null");
-    }
-    //生成临时ed25519公私钥对
-    const keyPair = await keys.generateKeyPair("Ed25519");
-    // 获取私钥
-    const privateKeyRaw = keyPair.raw;
-    // 获取公钥
-    const publicKey = keyPair.publicKey;
-    const tempEdPubkey = Ed25519PubKey.formEd25519PublicKey(publicKey);
-    //multiaddr 中提取peerid
-    const peerId = await extractPeerIdFromMultiaddr(peerAddr);
-    console.log("peerId:", peerId.toString());
-    // 获取当前节点的peerID,并且获取节点的公钥
-    const localPubkeyBytes = this.client.p2pNode.peerId.publicKey;
-    const req = await generateAccountLoginRequestWithPeerId(
-      peerId,
-      account,
-      password,
-      seccode,
-      tempEdPubkey
-    );
-    const prikeyencrypt2 = await this._accountloginApi(
-      req.accounthashencrypt,
-      req.pubkeyencrypt,
-      req.loginkeyrandencrypt,
-      peerAddr
-    );
-    //从返回的数据中解析出私钥
-    //Decrypt with private key
-    const prikeyEncrypt = await Encryption.decrypt(
-      privateKeyRaw,
-      prikeyencrypt2
-    );
-    const aeskey = await generateSymKeyForPrikey(account, password);
-    //Aes gcm解密
-    const prikey = await decryptContent(prikeyEncrypt, aeskey.raw);
-    return uint8ArrayToString(prikey);
-  }
-
-  async _accountloginApi(
-    accounthashencrypt: Uint8Array,
-    pubkeyencrypt: Uint8Array,
-    loginkeyrandencrypt: Uint8Array,
-    peerAddr: Multiaddr
-  ): Promise<Uint8Array> {
-    try {
-      const grpcClient = new Libp2pGrpcClient(
-        this.client.p2pNode,
-        peerAddr || this.client.peerAddr,
-        this.client.token,
-        this.client.protocol
-      );
-      const message = new dcnet.pb.AccountLoginRequest({});
-      message.accounthashencrypt = accounthashencrypt;
-      message.pubkeyencrypt = pubkeyencrypt;
-      message.loginkeyrandencrypt = loginkeyrandencrypt;
-      const messageBytes =
-        dcnet.pb.AccountLoginRequest.encode(message).finish();
-      const responseData = await grpcClient.unaryCall(
-        "/dcnet.pb.Service/AccountLogin",
-        messageBytes,
-        30000
-      );
-      const decoded = dcnet.pb.AccountLoginReply.decode(responseData);
-      const prikeyencrypt2 = decoded.prikeyencrypt2;
-      return prikeyencrypt2;
-    } catch (err) {
-      console.error("AccountLogin error:", err);
-      throw err;
-    }
-  }
-}
-
-/**
- * 生成账户登录请求
- * @param peerId - 节点ID
- * @param account - 账户名
- * @param password - 密码
- * @param seccode - 安全码
- * @param pk - 返回数据加密用的公钥
- * @returns 登录请求对象
- */
-async function generateAccountLoginRequestWithPeerId(
-  peerId: PeerId,
-  account: string,
-  password: string,
-  seccode: string,
-  pk: Ed25519PubKey
-): Promise<AccountLoginRequest> {
-  try {
-    // 获取节点公钥
-    const peerPubkey = await extractPublicKeyFromPeerId(peerId);
-    const serverPubkey = peerPubkey; // 假设已经做了适当的转换
-
-    // 计算账户哈希
-    const accountBytes = new TextEncoder().encode(account);
-    const accountHash = await sha256(accountBytes);
-
-    // 使用节点公钥加密账户哈希
-    const accountHashCrypt = await Encryption.encrypt(
-      serverPubkey.raw,
-      accountHash
-    );
-    // 获取并加密公钥
-    const pkBytes = pk.raw;
-    const pubkeyEncrypt = await Encryption.encrypt(serverPubkey.raw, pkBytes);
-
-    // 生成随机密钥
-    const randKey = getRandomBytes(32);
-
-    // 计算密码哈希
-    const passwordBytes = new TextEncoder().encode(password);
-    const passwordSlice = passwordBytes.slice(0, 2);
-    const passwordHash = await sha256(passwordSlice);
-    const passwordHashLast2 = passwordHash.slice(-2);
-
-    // 计算登录密钥
-    const seccodeBytes = new TextEncoder().encode(seccode);
-    const loginKeySeed = concatenateUint8Arrays(
-      accountHash,
-      passwordHashLast2,
-      seccodeBytes
-    );
-    const loginkey = await sha256(loginKeySeed);
-
-    // 加密登录密钥和随机密钥
-    const loginkeyRand = concatenateUint8Arrays(loginkey, randKey);
-    const loginkeyRandEncrypt = await Encryption.encrypt(
-      serverPubkey.raw,
-      loginkeyRand
-    );
-
-    // 返回登录请求对象
-    return {
-      accounthashencrypt: accountHashCrypt,
-      pubkeyencrypt: pubkeyEncrypt,
-      loginkeyrandencrypt: loginkeyRandEncrypt,
-    };
-  } catch (error: any) {
-    throw new Error(`Failed to generate login request: ${error.message}`);
-  }
-}