feat(iroha): adding checkEmpty param to request

package.json

@@ -58,6 +58,7 @@
     "test:tap:all": "tap",
     "test:all": "yarn test:jest:all && yarn test:tap:all",
     "posttest:all": "tap --no-check-coverage --coverage-report=lcov && codecov",
+    "postinstall": "patch-package",
     "test:unit": "tap --ts --node-arg=--max-old-space-size=4096 --timeout=600 --no-check-coverage \"packages/cactus-*/src/test/typescript/unit/\"",
     "test:benchmark": "tap --ts --jobs=1 --no-timeout --no-check-coverage \"packages/cactus-*/src/test/typescript/benchmark/\"",
     "test:browser": "karma start karma.conf.js",
@@ -123,6 +124,8 @@
     "node-polyfill-webpack-plugin": "1.1.4",
     "npm-run-all": "4.1.5",
     "npm-watch": "0.11.0",
+    "patch-package": "6.4.7",
+    "postinstall-postinstall": "2.1.0",
     "prettier": "2.1.2",
     "protoc-gen-ts": "0.6.0",
     "run-time-error": "1.4.0",

packages/cactus-plugin-ledger-connector-iroha/package.json

@@ -60,8 +60,8 @@
     "@types/google-protobuf": "3.15.5",
     "axios": "0.21.4",
     "express": "4.17.1",
-    "grpc": "1.24.11",
-    "iroha-helpers-ts": "0.9.25-ss",
+    "grpc": "1.24.3",
+    "iroha-helpers": "0.9.3",
     "openapi-types": "7.0.1",
     "prom-client": "13.1.0",
     "typescript-optional": "2.0.1"

packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/plugin-ledger-connector-iroha.ts

@@ -1,15 +1,15 @@
 import { Server } from "http";
 import * as grpc from "grpc";
 import { Server as SecureServer } from "https";
-import { CommandService_v1Client as CommandService } from "iroha-helpers-ts/lib/proto/endpoint_grpc_pb";
-import { QueryService_v1Client as QueryService } from "iroha-helpers-ts/lib/proto/endpoint_grpc_pb";
-import commands from "iroha-helpers-ts/lib/commands/index";
-import queries from "iroha-helpers-ts/lib/queries";
+import { CommandService_v1Client as CommandService } from "iroha-helpers/lib/proto/endpoint_grpc_pb";
+import { QueryService_v1Client as QueryService } from "iroha-helpers/lib/proto/endpoint_grpc_pb";
+import commands from "iroha-helpers/lib/commands";
+import queries from "iroha-helpers/lib/queries";
 import type { Express } from "express";
 import {
   GrantablePermission,
   GrantablePermissionMap,
-} from "iroha-helpers-ts/lib/proto/primitive_pb";
+} from "iroha-helpers/lib/proto/primitive_pb";
 
 import OAS from "../json/openapi.json";
 
@@ -264,7 +264,8 @@ export class PluginLedgerConnectorIroha
               accountId: req.params[0],
               key: req.params[1],
               value: req.params[2],
-              oldValue: req.params[3],
+              oldValue: req.params[3] ? undefined : req.params[3],
+              checkEmpty: req.params[4],
             },
           );
           return { transactionReceipt: response };
@@ -518,6 +519,10 @@ export class PluginLedgerConnectorIroha
           const response = await queries.getPendingTransactions(queryOptions, {
             pageSize: req.params[0],
             firstTxHash: req.params[1],
+            ordering: {
+              field: undefined,
+              direction: undefined,
+            },
           });
           return { transactionReceipt: response };
         } catch (err) {
@@ -530,6 +535,10 @@ export class PluginLedgerConnectorIroha
             accountId: req.params[0],
             pageSize: req.params[1],
             firstTxHash: req.params[2],
+            ordering: {
+              field: undefined,
+              direction: undefined,
+            },
           });
           return { transactionReceipt: response };
         } catch (err) {
@@ -545,6 +554,10 @@ export class PluginLedgerConnectorIroha
               assetId: req.params[1],
               pageSize: req.params[2],
               firstTxHash: req.params[3],
+              ordering: {
+                field: undefined,
+                direction: undefined,
+              },
             },
           );
           return { transactionReceipt: response };

packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/iroha-iroha-transfer-example.test.ts

@@ -33,7 +33,7 @@ import {
   IrohaQuery,
   KeyPair,
 } from "../../../main/typescript/generated/openapi/typescript-axios";
-import cryptoHelper from "iroha-helpers-ts/lib/cryptoHelper";
+import cryptoHelper from "iroha-helpers/lib/cryptoHelper";
 
 const testCase = "runs tx on an Iroha v1.2.0 ledger";
 const logLevel: LogLevelDesc = "ERROR";
@@ -49,7 +49,7 @@ test("BEFORE " + testCase, async (t: Test) => {
 });
 
 // Flaky test, does not always work, fix it once we have time
-test.skip(testCase, async (t: Test) => {
+test(testCase, async (t: Test) => {
   const postgres1 = new PostgresTestContainer({ logLevel });
   const postgres2 = new PostgresTestContainer({ logLevel });
   test.onFinish(async () => {
@@ -95,6 +95,12 @@ test.skip(testCase, async (t: Test) => {
     await iroha1.stop();
     await iroha2.stop();
   });
+
+  test.onFailure(async () => {
+    await iroha1.stop();
+    await iroha2.stop();
+  });
+
   await iroha1.start();
   await iroha2.start();
   const irohaHost1 = await internalIpV4();
@@ -188,7 +194,7 @@ test.skip(testCase, async (t: Test) => {
     t.ok(res);
     t.ok(res.data);
     t.equal(res.status, 200);
-    t.equal(res.data.transactionReceipt.status, "COMMITTED");
+    t.equal(res.data.transactionReceipt.status[0], "COMMITTED");
   }
 
   //Verify the generated priv/pub keys are equivalent to those pulled from the ledger.
@@ -221,7 +227,7 @@ test.skip(testCase, async (t: Test) => {
     t.ok(res);
     t.ok(res.data);
     t.equal(res.status, 200);
-    t.equal(res.data.transactionReceipt.status, "COMMITTED");
+    t.equal(res.data.transactionReceipt.status[0], "COMMITTED");
   }
   //Iroha1's admin is initialized with 100 (coolcoin#test).
   {
@@ -242,7 +248,7 @@ test.skip(testCase, async (t: Test) => {
     t.ok(res);
     t.ok(res.data);
     t.equal(res.status, 200);
-    t.equal(res.data.transactionReceipt.status, "COMMITTED");
+    t.equal(res.data.transactionReceipt.status[0], "COMMITTED");
   }
 
   // Iroha1's admin transfers 30 (coolcoin#test) to Iroha2's admin.
@@ -265,7 +271,7 @@ test.skip(testCase, async (t: Test) => {
     t.ok(res);
     t.ok(res.data);
     t.equal(res.status, 200);
-    t.equal(res.data.transactionReceipt.status, "COMMITTED");
+    t.equal(res.data.transactionReceipt.status[0], "COMMITTED");
   }
   //i.e., Iroha2's admin adds 30 (coolcoin#test).
   {
@@ -286,7 +292,7 @@ test.skip(testCase, async (t: Test) => {
     t.ok(res);
     t.ok(res.data);
     t.equal(res.status, 200);
-    t.equal(res.data.transactionReceipt.status, "COMMITTED");
+    t.equal(res.data.transactionReceipt.status[0], "COMMITTED");
   }
   //Verification: iroha1's admin has 70 (coolcoin#test).
   {

packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/openapi/openapi-validation.test.ts

@@ -34,7 +34,7 @@ import {
   KeyPair,
   RunTransactionRequestV1,
 } from "../../../../main/typescript/generated/openapi/typescript-axios";
-import cryptoHelper from "iroha-helpers-ts/lib/cryptoHelper";
+import cryptoHelper from "iroha-helpers/lib/cryptoHelper";
 
 import OAS from "../../../../main/json/openapi.json";
 import { installOpenapiValidationMiddleware } from "@hyperledger/cactus-core";

packages/cactus-plugin-ledger-connector-iroha/src/test/typescript/integration/run-transaction-endpoint-v1.test.ts

@@ -34,7 +34,7 @@ import {
   IrohaQuery,
   KeyPair,
 } from "../../../main/typescript/generated/openapi/typescript-axios";
-import cryptoHelper from "iroha-helpers-ts/lib/cryptoHelper";
+import cryptoHelper from "iroha-helpers/lib/cryptoHelper";
 
 const testCase = "runs tx on an Iroha v1.2.0 ledger";
 const logLevel: LogLevelDesc = "INFO";
@@ -883,7 +883,7 @@ test.skip(testCase, async (t: Test) => {
         timeoutLimit: 5000,
         tls: false,
       },
-      params: [userID, "age", "118", "18"], //change age from 18 to 118
+      params: [userID, "age", "118", "18", true], //change age from 18 to 118
     };
     const res = await apiClient.runTransactionV1(req);
     t.ok(res);

patches/iroha-helpers+0.9.3.patch

@@ -0,0 +1,19 @@
+diff --git a/node_modules/iroha-helpers/lib/util.js b/node_modules/iroha-helpers/lib/util.js
+index 0409412..fd49b69 100644
+--- a/node_modules/iroha-helpers/lib/util.js
++++ b/node_modules/iroha-helpers/lib/util.js
+@@ -113,11 +113,11 @@ function sendTransactions(txs, txClient, timeoutLimit, requiredStatusesStr) {
+                 .map(function (h) { return _streamVerifier(h, txClient, requiredStatusesStr); });
+             Promise.all(requests)
+                 .then(function (res) {
+-                var status = res
+-                    .map(function (r) { return reverseEnum(endpoint_pb_1.TxStatus)[r.tx.getTxStatus()]; });
++                    const status = res.map(r => reverseEnum(endpoint_pb_1.TxStatus)[r.tx.getTxStatus()])
++                    const hash = res.map(r => r.tx.getTxHash())
+                 return res.some(function (r) { return r.error; })
+                     ? reject(new Error("Command response error: expected=" + requiredStatusesStr + ", actual=" + status))
+-                    : resolve();
++                    : resolve({ txHash: hash, status: status })
+             });
+         });
+     });