Fixes bugs caused by new proposalID

vocdoni · Nov 3, 2023 · 48a7cd9 · 48a7cd9
1 parent 50efffb
commit 48a7cd9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/packages/js-client/src/internal/interfaces.ts b/packages/js-client/src/internal/interfaces.ts
@@ -79,7 +79,7 @@ export interface IGaslessVotingClientMethods {
     proposalId: string,
     tryExecutio: boolean
   ): AsyncGenerator<ApproveTallyStepValue>;
-  execute(
+  executeProposal(
     proposalId: string
   ): AsyncGenerator<ExecuteProposalStepValue>;
   pinMetadata(params: ProposalMetadata): Promise<string>;
@@ -97,7 +97,7 @@ export interface IGaslessVotingClientEstimation {
     results: bigint[][]
   ): Promise<GasFeeEstimation>;
   approve(proposalId: string): Promise<GasFeeEstimation>;
-  execute(proposalId: string): Promise<GasFeeEstimation>;
+  executeProposal(proposalId: string): Promise<GasFeeEstimation>;
   // Add any estimation methods that you need
 }
 export interface IGaslessVotingClientEncoding {

diff --git a/packages/js-client/src/internal/modules/estimation.ts b/packages/js-client/src/internal/modules/estimation.ts
@@ -89,7 +89,6 @@ export class GaslessVotingClientEstimation
       signer
     );
 
-
     const estimatedGasFee = await gaslessVotingContract.estimateGas.setTally(
       id,
       results
@@ -116,7 +115,7 @@ export class GaslessVotingClientEstimation
     );
 
     const proposalFromSC = toGaslessVotingProposal(
-      await gaslessVotingContract.getProposal(proposalId)
+      await gaslessVotingContract.getProposal(id)
     );
     const vochainProposal = await this.vocdoniSDK.fetchElection(
       proposalFromSC.vochainProposalId
@@ -145,7 +144,7 @@ export class GaslessVotingClientEstimation
    * @return {*}  {Promise<GasFeeEstimation>}
    * @memberof GaslessVotingClientEstimation
    */
-  public async execute(
+  public async executeProposal(
     proposalId: string
   ): Promise<GasFeeEstimation> {
     const signer = this.web3.getConnectedSigner();

diff --git a/packages/js-client/src/internal/modules/methods.ts b/packages/js-client/src/internal/modules/methods.ts
@@ -510,7 +510,7 @@ export class GaslessVotingClientMethods
     );
 
     const proposalFromSC = toGaslessVotingProposal(
-      await gaslessVotingContract.getProposal(proposalId)
+      await gaslessVotingContract.getProposal(id)
     );
     const vochainProposal = await this.vocdoniSDK.fetchElection(
       proposalFromSC.vochainProposalId
@@ -519,7 +519,7 @@ export class GaslessVotingClientMethods
 
     if (proposalFromSC.approvers.length == 0) {
       return this.setTally(
-        encodeProposalId(pluginAddress,id),
+        proposalId,
         vochainResultsToSCResults(vochainProposal)
       );
     }
@@ -552,7 +552,7 @@ export class GaslessVotingClientMethods
       signer
     );
 
-    let tx = await gaslessVotingContract.setTally(proposalId, results);
+    let tx = await gaslessVotingContract.setTally(id, results);
 
     yield {
       key: ApproveTallyStep.EXECUTING,
@@ -614,7 +614,7 @@ export class GaslessVotingClientMethods
    * @return {*}  {AsyncGenerator<ExecuteProposalStepValue>}
    * @memberof GaslessVotingClientMethods
    */
-  public async *execute(
+  public async *executeProposal(
     proposalId: string
   ): AsyncGenerator<ExecuteProposalStepValue> {
     const { pluginAddress, id } = decodeProposalId(proposalId);