From 57fa40388b6343bd6091a1e946cc920b404f12b8 Mon Sep 17 00:00:00 2001
From: Rodion <101709280+rodion-lim-partior@users.noreply.github.com>
Date: Mon, 21 Aug 2023 18:26:24 +0800
Subject: [PATCH] feat: Fix generating uuid requiring admin account (#1666)

---
 extension/api.go            | 7 +------
 internal/web3ext/web3ext.go | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/extension/api.go b/extension/api.go
index 17aaa1a289..f791b2ef0d 100644
--- a/extension/api.go
+++ b/extension/api.go
@@ -158,11 +158,6 @@ func (api *PrivateExtensionAPI) GenerateExtensionApprovalUuid(ctx context.Contex
 		txa.PrivateFor = append(txa.PrivateFor, participants...)
 	}
 
-	txArgs, err := api.privacyService.GenerateTransactOptions(txa)
-	if err != nil {
-		return "", err
-	}
-
 	psiManagementContractClient := api.privacyService.managementContract(psi)
 	defer psiManagementContractClient.Close()
 	voterList, err := psiManagementContractClient.GetAllVoters(addressToVoteOn)
@@ -176,7 +171,7 @@ func (api *PrivateExtensionAPI) GenerateExtensionApprovalUuid(ctx context.Contex
 	if api.checkAlreadyVoted(addressToVoteOn, externalSignerAddress, psi) {
 		return "", errors.New("already voted")
 	}
-	uuid, err := generateUuid(addressToVoteOn, txArgs.PrivateFrom, txArgs.PrivateFor, api.privacyService.ptm)
+	uuid, err := generateUuid(addressToVoteOn, txa.PrivateFrom, txa.PrivateFor, api.privacyService.ptm)
 	if err != nil {
 		return "", err
 	}
diff --git a/internal/web3ext/web3ext.go b/internal/web3ext/web3ext.go
index ee4ca56a8c..2c98543cbd 100644
--- a/internal/web3ext/web3ext.go
+++ b/internal/web3ext/web3ext.go
@@ -1254,7 +1254,7 @@ web3._extend({
 		new web3._extend.Method({
 			name: 'generateExtensionApprovalUuid',
 			call: 'quorumExtension_generateExtensionApprovalUuid',
-			params: 2,
+			params: 3,
 			inputFormatter: [web3._extend.formatters.inputAddressFormatter, web3._extend.formatters.inputAddressFormatter, web3._extend.formatters.inputTransactionFormatter]
 		}),
 		new web3._extend.Method({