fix(connector-quorum): transaction with different credentials #1098

Signed-off-by: AzaharaC <[email protected]>
hyperledger-cacti · Nov 5, 2021 · af6c240 · af6c240
1 parent 9022064
commit af6c240
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/...ctus-plugin-ledger-connector-quorum/src/main/typescript/plugin-ledger-connector-quorum.ts b/...ctus-plugin-ledger-connector-quorum/src/main/typescript/plugin-ledger-connector-quorum.ts
@@ -470,6 +470,19 @@ export class PluginLedgerConnectorQuorum
     // the private key that we need to run the transaction.
     const privateKeyHex = await keychainPlugin?.get(keychainEntryKey as string);
 
+    if (!transactionConfig.gas) {
+      this.log.debug(
+        `${fnTag} Gas not specified in the transaction values. Using the estimate from web3`,
+      );
+      transactionConfig.gas = await this.web3.eth.estimateGas(
+        transactionConfig,
+      );
+      this.log.debug(
+        `${fnTag} Gas estimated from web3 is: `,
+        transactionConfig.gas,
+      );
+    }
+
     return this.transactPrivateKey({
       transactionConfig,
       web3SigningCredential: {

diff --git a/...tor-quorum/deploy-contract/v2.3.0-deploy-contract-from-json-json-object-endpoints.test.ts b/...tor-quorum/deploy-contract/v2.3.0-deploy-contract-from-json-json-object-endpoints.test.ts
@@ -326,7 +326,7 @@ test(testCase, async (t: Test) => {
       invocationType: EthContractInvocationType.Call,
       methodName: "getName",
       params: [],
-      gas: 1000000,
+      //  gas: 1000000,
       web3SigningCredential: {
         ethAccount: testEthAccount.address,
         secret: testEthAccount.privateKey,
@@ -345,7 +345,7 @@ test(testCase, async (t: Test) => {
       invocationType: EthContractInvocationType.Send,
       methodName: "getName",
       params: [],
-      gas: 1000000,
+      //gas: 1000000,
       web3SigningCredential: {
         ethAccount: testEthAccount.address,
         secret: testEthAccount.privateKey,

diff --git a/...or-quorum/deploy-contract/v21.4.1-deploy-contract-from-json-json-object-endpoints.test.ts b/...or-quorum/deploy-contract/v21.4.1-deploy-contract-from-json-json-object-endpoints.test.ts
@@ -301,7 +301,7 @@ test(testCase, async (t: Test) => {
         invocationType: EthContractInvocationType.Send,
         methodName: "setName",
         params: [newName],
-        gas: 1000000,
+        //  gas: 1000000,
         web3SigningCredential: {
           ethAccount: testEthAccount.address,
           secret: testEthAccount.privateKey,
@@ -323,7 +323,7 @@ test(testCase, async (t: Test) => {
       invocationType: EthContractInvocationType.Call,
       methodName: "getName",
       params: [],
-      gas: 1000000,
+      //  gas: 1000000,
       web3SigningCredential: {
         ethAccount: testEthAccount.address,
         secret: testEthAccount.privateKey,