diff --git a/index.ts b/index.ts index 99992628ba1076fe07e41d42a7256cf7caae4c39..35435c142a3e16ff1e896bbd38c7b3ca8f9e88b1 100644 --- a/index.ts +++ b/index.ts @@ -63,12 +63,16 @@ program.command('main') }) break case 'ADHERENT': + // VOTER POUR UNE PROPOSITION + // CLOTURER ET RESOUDRE LES PROPOSITIONS DONT IL EST LE CREATEUR + // SI A UN TOKEN IL PEUT LE BRULER questions[0].choices = ['Faire une proposition', 'Créer un token', 'Voir mon portefeuille'] await inquirer.prompt(questions).then(async (answers: { choice: string }) => { await handleAdherentChoice(answers.choice, tezos) }) break case 'CONNECTED': + // CREE UNE ASSO SI A UN TOKEN questions[0].choices = ['Rejoindre une association', 'Créer un token', 'Voir les associations', "Voir les détails d'une association", 'Voir mon portefeuille'] await inquirer.prompt(questions).then(async (answers: { choice: string }) => { await handleConnectedChoice(answers.choice, tezos) diff --git a/src/services/association.service.ts b/src/services/association.service.ts index 9e0dc404f148963321ef0447c1494f74e72d7b62..91bf7a0cb7034ad6ef9902db902e58fe92b7824b 100644 --- a/src/services/association.service.ts +++ b/src/services/association.service.ts @@ -2,7 +2,7 @@ import { type Operation, type TezosToolkit } from '@taquito/taquito' import { type Association } from '../types/Association' // NEED UPDATE ADDRESS !! (SMART CONTRACT 1: Registre des associations) -const address = 'KT1P9oYuywTFUNQvFiWhcWN329R2AgpQv2CV' +const address = 'KT1HEyhspXn3Bt2opakTvaRFkwSMZbmqvXGM' const mockAssociations: Association[] = [ { @@ -19,7 +19,9 @@ async function createAssociation (association: Association, tezos: TezosToolkit) const contract = await tezos.contract.at(address) const op: Operation = await contract.methodsObject.registerAssociation(association).send() + await op.confirmation() + console.log(op.hash) } // NEED UPDATE ENTRYPOINT !! @@ -43,15 +45,14 @@ async function getAssociations (tezos: TezosToolkit): Promise<string[]> { } async function getAssociationDetails (associationName: string, tezos: TezosToolkit): Promise<Association> { - // const executionContextParams = { - // viewCaller: '' - // } - // const contract = await tezos.contract.at(address) - // const associationDetails: Association = await contract.contractViews.listDetailsAssociations(associationName).executeView(executionContextParams) - // return associationDetails + const contract = await tezos.contract.at(address) - // MOCK - return mockAssociations.find((association) => association.name === associationName) + const executionContextParams = { + viewCaller: contract.address + } + + const associationDetails: Association = await contract.contractViews.listDetailsAssociations(associationName).executeView(executionContextParams) + return associationDetails } export { createAssociation, joinAssociation, getAssociations, getAssociationDetails } diff --git a/src/utils/getRole.ts b/src/utils/getRole.ts index aa9df95e99233cc2088046047594a962290cb2c3..eb449964ef96bde32ed2b10fb176c8a27832ff93 100644 --- a/src/utils/getRole.ts +++ b/src/utils/getRole.ts @@ -9,5 +9,5 @@ export function getRole (tezos: TezosToolkit): Role { // ELSE -> CONNECTED // TEMPORARY - return 'ADMIN_ASSOCIATION' + return 'CONNECTED' }