feat: Fix generating uuid requiring admin account (#1666)

rodion-lim-partior · web-flow · commit 57fa40388b63 · 2023-08-21T11:26:24.000+01:00
diff --git 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
@@ -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({

Original file line number	Diff line number	Diff line change
`@@ -158,11 +158,6 @@ func (api *PrivateExtensionAPI) GenerateExtensionApprovalUuid(ctx context.Contex`
`158`	`158`	`txa.PrivateFor = append(txa.PrivateFor, participants...)`
`159`	`159`	`}`
`160`	`160`
`161`		`- txArgs, err := api.privacyService.GenerateTransactOptions(txa)`
`162`		`- if err != nil {`
`163`		`- return "", err`
`164`		`- }`
`165`		`-`
`166`	`161`	`psiManagementContractClient := api.privacyService.managementContract(psi)`
`167`	`162`	`defer psiManagementContractClient.Close()`
`168`	`163`	`voterList, err := psiManagementContractClient.GetAllVoters(addressToVoteOn)`
`@@ -176,7 +171,7 @@ func (api *PrivateExtensionAPI) GenerateExtensionApprovalUuid(ctx context.Contex`
`176`	`171`	`if api.checkAlreadyVoted(addressToVoteOn, externalSignerAddress, psi) {`
`177`	`172`	`return "", errors.New("already voted")`
`178`	`173`	`}`
`179`		`- uuid, err := generateUuid(addressToVoteOn, txArgs.PrivateFrom, txArgs.PrivateFor, api.privacyService.ptm)`
	`174`	`+ uuid, err := generateUuid(addressToVoteOn, txa.PrivateFrom, txa.PrivateFor, api.privacyService.ptm)`
`180`	`175`	`if err != nil {`
`181`	`176`	`return "", err`
`182`	`177`	`}`