@coopenomics/desktop 2025.5.5 → 2025.5.14-1

package/src/processes/process-decisions/index.ts

@@ -10,6 +10,7 @@ import { useVoteAgainstDecision } from 'src/features/Decision/VoteAgainstDecisio
 import { computed } from 'vue'
 import { useAgendaStore } from 'src/entities/Agenda/model'
 import type { IAgenda } from 'src/entities/Agenda/model'
+import { DigitalDocument } from 'src/shared/lib/document'
 
 /**
  * Процесс обработки решений
@@ -19,7 +20,7 @@ export function useDecisionProcessor() {
   const { info } = useSystemStore()
   const session = useSessionStore()
   const agendaStore = useAgendaStore()
-  
+
   // Данные повестки и состояние загрузки
   const decisions = computed(() => agendaStore.agenda)
   const loading = computed(() => agendaStore.loading)
@@ -47,11 +48,11 @@ export function useDecisionProcessor() {
     if (row.documents?.statement?.documentAggregate?.rawDocument?.full_title) {
       return row.documents.statement.documentAggregate.rawDocument.full_title
     }
-    
+
     if (row.documents?.decision?.documentAggregate?.rawDocument?.full_title) {
       return row.documents.decision.documentAggregate.rawDocument.full_title
     }
-    
+
     // Поддержка исходного формата для таблицы
     if (row.table?.statement?.meta && typeof row.table.statement.meta === 'string') {
       try {
@@ -61,7 +62,7 @@ export function useDecisionProcessor() {
         // Игнорируем ошибку парсинга JSON
       }
     }
-    
+
     return 'Вопрос без заголовка'
   }
 
@@ -85,16 +86,16 @@ export function useDecisionProcessor() {
     if (row.documents?.statement?.documentAggregate?.rawDocument?.hash) {
       return row.documents.statement.documentAggregate.rawDocument.hash
     }
-    
+
     if (row.documents?.decision?.documentAggregate?.rawDocument?.hash) {
       return row.documents.decision.documentAggregate.rawDocument.hash
     }
-    
+
     // Поддержка исходного формата для таблицы
     if (row.table?.statement?.hash) {
       return row.table.statement.hash
     }
-    
+
     return null
   }
 
@@ -105,7 +106,7 @@ export function useDecisionProcessor() {
     if (!row.table?.id || !row.table?.username || !row.table?.type) {
       throw new Error('Некорректные данные решения')
     }
-    
+
     const decision_id = Number(row.table.id)
     const username = row.table.username
     const type = row.table.type
@@ -157,27 +158,22 @@ export function useDecisionProcessor() {
     if (!row.table?.id) {
       throw new Error('Некорректные данные решения')
     }
-    
+
     const decision_id = Number(row.table.id)
 
     // Генерируем документ решения
     const document = await generateDecisionDocument(row)
 
-    // Подписываем документ
-    const signed_hash_of_document = useGlobalStore().signDigest(document.hash)
-    const chainDocument: Cooperative.Document.IChainDocument = {
-      hash: document.hash,
-      meta: JSON.stringify(document.meta),
-      signature: signed_hash_of_document.signature,
-      public_key: signed_hash_of_document.public_key,
-    }
+    // Создаем экземпляр класса DigitalDocument и подписываем документ
+    const digitalDocument = new DigitalDocument(document)
+    const signedDocument = await digitalDocument.sign(session.username)
 
     // Подготавливаем данные для транзакций
     const authorizeData: SovietContract.Actions.Decisions.Authorize.IAuthorize = {
       coopname: info.coopname,
       chairman: session.username,
       decision_id,
-      document: chainDocument,
+      document: {...signedDocument, meta: JSON.stringify(signedDocument.meta)},
     }
 
     const execData: SovietContract.Actions.Decisions.Exec.IExec = {
@@ -218,22 +214,29 @@ export function useDecisionProcessor() {
   /**
    * Голосовать "за" решение
    */
-  async function voteForDecision(decision_id: number) {
-    const { voteForDecision: vote } = useVoteForDecision()
-    await vote(decision_id)
-    return true
+  async function voteForDecision(row: IAgenda) {
+    if (!row.table?.id) {
+      throw new Error('Не удалось получить ID решения');
+    }
+
+    const decision_id = Number(row.table.id);
+    const { voteForDecision: vote } = useVoteForDecision();
+    await vote(decision_id);
+    return true;
   }
 
   /**
    * Голосовать "против" решения
    */
-  async function voteAgainstDecision(decision_id: number) {
-    await useVoteAgainstDecision().voteAgainstDecision({
-      coopname: info.coopname,
-      member: session.username,
-      decision_id,
-    })
-    return true
+  async function voteAgainstDecision(row: IAgenda) {
+    if (!row.table?.id) {
+      throw new Error('Не удалось получить ID решения');
+    }
+
+    const decision_id = Number(row.table.id);
+    const { voteAgainstDecision } = useVoteAgainstDecision();
+    await voteAgainstDecision(decision_id);
+    return true;
   }
 
   /**

package/src/processes/select-branch/index.ts

@@ -47,7 +47,7 @@ export function useSelectBranchProcess() {
   const sign = async () => {
     try {
       isSubmitting.value = true
-      const doc = await digitalDocument.sign()
+      const doc = await digitalDocument.sign<Cooperative.Registry.SelectBranchStatement.Meta>(session.username)
 
       await selectBranch({
         braname: selectedBranch.value,

package/src/shared/api/indexDB.ts

@@ -1,5 +1,4 @@
 import { openDB } from 'idb';
-import { env } from '../config';
 
 async function openIndexedDB(dbName: string, storeName: string) {
 

package/src/shared/lib/document/model/const.ts

@@ -0,0 +1,30 @@
+import type { IDocument } from '../../types/document';
+
+export const fakeDocument: IDocument = {
+  version: '1.0.0',
+  hash: '33CBC662E606F23F332B442BAB84F2D05BD498B66EF61BC918740606B05BD565',
+  doc_hash: '33CBC662E606F23F332B442BAB84F2D05BD498B66EF61BC918740606B05BD565',
+  meta_hash: 'ABCDEF1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF1234567890',
+  meta: {
+    block_num: 1,
+    coopname: 'voskhod',
+    created_at: new Date().toISOString(),
+    generator: 'generator',
+    lang: 'ru',
+    links: [],
+    registry_id: 1,
+    timezone: 'Europe/Moscow',
+    title: 'Фейковый документ',
+    username: 'tester',
+    version: '1.0.0',
+  },
+  signatures: [{
+    id: 1,
+    signed_hash: '33CBC662E606F23F332B442BAB84F2D05BD498B66EF61BC918740606B05BD565',
+    signer: 'tester',
+    public_key: 'PUB_K1_8YWRWjCdUQubPoHzT5ndvfhGKDf1ZL7v7Ge9iHoLtNp7wnVfG1',
+    signature: 'SIG_K1_KWeGQ48n78ybpkuVDf1M7nuGnT8pkPXFbYYMUXtFTFv2dEReMEmwW89r19dKmAVSFZwHTdxdqkB3ZQJeAS9CcQwb92E398',
+    signed_at: new Date().toISOString(),
+    meta: ''
+  }]
+};

package/src/shared/lib/document/model/entity.ts

@@ -1,28 +1,36 @@
 import type { IGenerate, IGeneratedDocument } from './types'
 import { api } from '../api';
 import { useGlobalStore } from 'src/shared/store';
-import type { IObjectedDocument } from 'src/shared/lib/types/document';
+import type { IDocument, IMetaDocument } from 'src/shared/lib/types/document';
 import type { Cooperative } from 'cooptypes';
+import { Classes } from '@coopenomics/sdk';
 
 export type ZGeneratedDocument = Cooperative.Document.ZGeneratedDocument
 
 export const useSignDocument = () => {
   const globalStore = useGlobalStore()
 
-  const signDocument = async(document: ZGeneratedDocument): Promise<Cooperative.Document.ISignedDocument> => {
+  /**
+   * Подписывает документ
+   */
+  const signDocument = async(
+    document: ZGeneratedDocument,
+    account: string,
+    signatureId = 1,
+  ): Promise<Cooperative.Document.ISignedDocument2> => {
     if (!document)
       throw new Error('Документ на подпись не предоставлен')
 
-    const digital_signature = await globalStore.signDigest(document.hash);
+    const wifKey = globalStore.wif?.toString();
+    if (!wifKey)
+      throw new Error('Приватный ключ не установлен');
 
-    const doc = {
-      hash: document.hash,
-      meta: document.meta,
-      public_key: digital_signature.public_key,
-      signature: digital_signature.signature,
-    }
+    // Используем класс из SDK для подписи
+    const docSigner = new Classes.Document(wifKey);
 
-    return doc
+
+    // Получаем доступ к Document классу из SDK
+    return await docSigner.signDocument(document, account, signatureId);
   }
 
   return {
@@ -32,7 +40,7 @@ export const useSignDocument = () => {
 
 export class DigitalDocument {
   public data: IGeneratedDocument | undefined
-  public signedDocument: IObjectedDocument | undefined
+  public signedDocument: IDocument | undefined
 
   constructor(document?: IGeneratedDocument){
     this.data = document
@@ -43,22 +51,26 @@ export class DigitalDocument {
     return this.data;
   }
 
-  async sign(): Promise<Cooperative.Document.ISignedDocument> {
+  /**
+   * Подписывает документ
+   */
+  async sign<T extends IMetaDocument>(account: string, signatureId = 1): Promise<IDocument<T>> {
     const globalStore = useGlobalStore()
     if (!this.data)
       throw new Error('Ошибка генерации документа')
 
-    const digital_signature = await globalStore.signDigest(this.data.hash);
+    const wifKey = globalStore.wif?.toString();
+    if (!wifKey)
+      throw new Error('Приватный ключ не установлен');
 
-    this.signedDocument = {
-      hash: this.data.hash,
-      meta: this.data.meta,
-      public_key: digital_signature.public_key,
-      signature: digital_signature.signature,
-    };
+    // Используем класс из SDK для подписи
+    const docSigner = new Classes.Document(wifKey);
 
-    return this.signedDocument
+    // Подписываем документ с использованием SDK
+    const signedDoc = await docSigner.signDocument<T>(this.data, account, signatureId);
 
-  }
+    this.signedDocument = signedDoc;
 
+    return signedDoc;
+  }
 }

package/src/shared/lib/document/model/index.ts

@@ -1,2 +1,2 @@
-export * from './entity'
 export * from './types'
+export * from './entity'

package/src/shared/lib/document/model/types.ts

@@ -1,9 +1,8 @@
 import { Cooperative } from 'cooptypes';
 
-export type IGeneratedDocument = Cooperative.Document.IGeneratedDocument;
+export type IGeneratedDocument = Cooperative.Document.ZGeneratedDocument;
 export type IGenerate = Cooperative.Document.IGenerate;
 export type IGenerateJoinCoop = Cooperative.Document.IGenerateJoinCoop;
 export type IGenerateJoinCoopDecision =
   Cooperative.Document.IGenerateJoinCoopDecision;
-
-// export type IGenerateWalletAgreement = Cooperative.Document.IGenerateWalletAgreement
+export type IGenerateWalletAgreement = Cooperative.Document.IGenerateWalletAgreement;

package/src/shared/lib/types/document/index.ts

@@ -1,15 +1,13 @@
-import type { Cooperative } from 'cooptypes';
+import type { Zeus } from '@coopenomics/sdk/index';
 
-export interface IObjectedDocument {
-  hash: string;
-  meta: Cooperative.Document.IMetaDocument;
-  public_key: string;
-  signature: string;
-}
-
-export interface IDocument {
-  hash: string;
-  meta: string;
-  public_key: string;
-  signature: string;
+// Добавляю реэкспорты типов документов
+export type IChainDocument2 = Zeus.ModelTypes['SignedBlockchainDocument']
+export type ISignedDocument = Zeus.ModelTypes['SignedDigitalDocumentInput']
+export type ISignatureInfo = Zeus.ModelTypes['SignatureInfo']
+export type IMetaDocument<T = any> = Zeus.ModelTypes['MetaDocumentInput'] & T
+export type IComplexDocument = Zeus.ModelTypes['DocumentPackageAggregate']
+export type IDocument<T = any> = Omit<Zeus.ModelTypes['SignedDigitalDocumentInput'], 'meta'> & {
+  meta: IMetaDocument<T>
 }
+// Для обратной совместимости
+export type IObjectedDocument = IDocument;

package/src/shared/lib/types/user/IUserData.ts

@@ -1,3 +1,4 @@
+import type { Mutations } from '@coopenomics/sdk';
 import { Cooperative } from 'cooptypes';
 
 export type IEntrepreneurData = Cooperative.Users.IEntrepreneurData;
@@ -20,9 +21,7 @@ export interface IUserData {
 
 
 
-export interface ICreateUserData {
-  type: 'individual' | 'entrepreneur' | 'organization';
-  entrepreneur_data?: ICreateEntrepreneurData & {bank_account: Cooperative.Payments.IBankAccount};
-  individual_data?: ICreateIndividualData;
-  organization_data?: ICreateOrganizationData & {bank_account: Cooperative.Payments.IBankAccount};
-}
+export type IRegisterAccount = Mutations.Accounts.RegisterAccount.IInput['data'];
+export type IRegisteredAccountResult = Mutations.Accounts.RegisterAccount.IOutput[typeof Mutations.Accounts.RegisterAccount.name];
+
+

package/src/shared/lib/types/user/index.ts

@@ -1,4 +1,3 @@
-import { IObjectedDocument } from '../document';
 import { Cooperative } from 'cooptypes';
 
 export interface IKeyPair {
@@ -12,7 +11,7 @@ export interface IGeneratedAccount extends IKeyPair {
 
 export interface IToken {
   token: string;
-  expires: Date;
+  expires: unknown;
 }
 
 export interface ITokens {
@@ -42,12 +41,3 @@ export interface ICreatedUser {
   user: IUser;
   tokens: ITokens;
 }
-
-export interface ISendStatement {
-  username: string;
-  statement: IObjectedDocument;
-  wallet_agreement: IObjectedDocument;
-  privacy_agreement: IObjectedDocument;
-  signature_agreement: IObjectedDocument;
-  user_agreement: IObjectedDocument;
-}

package/src/shared/lib/utils/account.ts

@@ -0,0 +1,24 @@
+import {
+  AccountTypes,
+  type IAccount,
+} from 'src/entities/Account/types'
+
+/**
+ * Функция для получения отформатированного имени участника
+ * @param account - объект аккаунта пользователя
+ * @returns форматированное имя/наименование
+ */
+export const getName = (account: IAccount) => {
+  const d = account.private_account
+  if (!d) return ''
+  switch (d.type) {
+    case AccountTypes.individual:
+      return `${d.individual_data?.last_name} ${d.individual_data?.first_name} ${d.individual_data?.middle_name}`
+    case AccountTypes.entrepreneur:
+      return `ИП ${d.entrepreneur_data?.last_name} ${d.entrepreneur_data?.first_name} ${d.entrepreneur_data?.middle_name}`
+    case AccountTypes.organization:
+      return d.organization_data?.short_name
+    default:
+      return ''
+  }
+}

package/src/shared/lib/utils/index.ts

@@ -4,3 +4,5 @@ export * from './notEmptyPhoneRule'
 export * from './notEmptyRule'
 export * from './isDomainRule'
 export * from './validatePersonalNameRule'
+export * from './account'
+export * from './theme'

package/src/shared/lib/utils/theme.ts

@@ -0,0 +1,30 @@
+import { LocalStorage } from 'quasar';
+import { Dark } from 'quasar';
+
+const THEME_KEY = 'theme-mode';
+
+export function saveThemeToStorage(isDark: boolean) {
+  if (process.env.CLIENT) {
+    LocalStorage.set(THEME_KEY, isDark ? 'dark' : 'light');
+  }
+}
+
+export function getThemeFromStorage(): 'dark' | 'light' | null {
+  if (process.env.CLIENT) {
+    const saved = LocalStorage.getItem(THEME_KEY);
+    if (saved === 'dark' || saved === 'light') return saved;
+    return null;
+  }
+  return null;
+}
+
+export function applyThemeFromStorage() {
+  if (process.env.CLIENT) {
+    const saved = getThemeFromStorage();
+    if (saved === 'dark') {
+      Dark.set(true);
+    } else if (saved === 'light') {
+      Dark.set(false);
+    }
+  }
+}

package/src/shared/store/index.ts

@@ -4,7 +4,6 @@ import { defineStore } from 'pinia';
 import { ref, Ref } from 'vue';
 import { decrypt, encrypt, hashSHA256 } from '../api/crypto';
 import { IMessageSignature } from '../lib/types/crypto';
-import { useSessionStore } from 'src/entities/Session';
 import { TransactResult } from '@wharfkit/session';
 import { readBlockchain } from '../api';
 import { ITokens } from '../lib/types/user';
@@ -82,6 +81,9 @@ export const useGlobalStore = defineStore('global', (): IGlobalStore => {
         client.setToken(tokens.value.access.token)
       }
 
+      if (decryptedKey && decryptedUsername) {
+        client.setWif(decryptedUsername, decryptedKey)
+      }
 
     } catch (error: any) {
       await setToIndexedDB(info.coopname, 'store', 'encryptedKey', '');
@@ -161,16 +163,18 @@ export const useGlobalStore = defineStore('global', (): IGlobalStore => {
   };
 
   const sendAction = async (action: any, broadcast: boolean) => {
-    const session = useSessionStore();
+    // Получаем хранилище сессии с помощью импорта, избегая циклической зависимости
+    const sessionStore = (await import('src/entities/Session')).useSessionStore();
     const formedAction = await formActionFromAbi(action);
 
-    return session.session?.transact({
+    return sessionStore.session?.transact({
       action: formedAction,
     }, { broadcast });
   };
 
   const sendActions = async (actions: any[], broadcast: boolean) => {
-    const session = useSessionStore();
+    // Получаем хранилище сессии с помощью импорта, избегая циклической зависимости
+    const sessionStore = (await import('src/entities/Session')).useSessionStore();
     const data: Action[] = [];
 
     for (const action of actions) {
@@ -178,7 +182,7 @@ export const useGlobalStore = defineStore('global', (): IGlobalStore => {
       data.push(formedAction);
     }
 
-    return session.session?.transact({
+    return sessionStore.session?.transact({
       actions: data,
     }, { broadcast });
   };