build: asd

Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
outSH · Jan 20, 2022 · 262b14c · 262b14c
1 parent b3e87f3
commit 262b14c
Show file tree

Hide file tree

Showing 49 changed files with 486 additions and 282 deletions.
diff --git a/etc/cactus/default.yaml b/etc/cactus/default.yaml
@@ -12,7 +12,7 @@ blpRegistry:
 logLevel: debug
 
 applicationHostInfo:
-  hostName: http://aaa.bbb.ccc.ddd # please change hostName to your IP address
+  hostName: http://localhost
   hostPort: 5034
 
 socketOptions:

diff --git a/examples/cartrade/.gitignore b/examples/cartrade/.gitignore
@@ -4,7 +4,7 @@ crypto-config/
 
 # BLP artifacts
 TransactionInfo.json
-wallet/
+etc/
 
 # don't commit package-lock
 package-lock.json
diff --git a/examples/cartrade/AssetManagement.ts b/examples/cartrade/AssetManagement.ts
@@ -5,10 +5,10 @@
  * AssetManagement.ts
  */
 
-import { LPInfoHolder } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/LPInfoHolder";
-import { Verifier } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/verifier/Verifier";
-import { ContractInfoHolder } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/ContractInfoHolder";
-import { ConfigUtil } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/ConfigUtil";
+import { LPInfoHolder } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/LPInfoHolder";
+import { Verifier } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/verifier/Verifier";
+import { ContractInfoHolder } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/ContractInfoHolder";
+import { ConfigUtil } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/ConfigUtil";
 
 const fs = require("fs");
 const path = require("path");

diff --git a/examples/cartrade/BalanceManagement.ts b/examples/cartrade/BalanceManagement.ts
@@ -5,9 +5,9 @@
  * BalanceManagement.ts
  */
 
-import { LPInfoHolder } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/LPInfoHolder";
-import { Verifier } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/verifier/Verifier";
-import { ConfigUtil } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/ConfigUtil";
+import { LPInfoHolder } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/LPInfoHolder";
+import { Verifier } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/verifier/Verifier";
+import { ConfigUtil } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/ConfigUtil";
 
 const fs = require("fs");
 const path = require("path");

diff --git a/examples/cartrade/BusinessLogicCartrade.ts b/examples/cartrade/BusinessLogicCartrade.ts
@@ -6,26 +6,26 @@
  */
 
 import { Request } from "express";
-import { RequestInfo } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/RequestInfo";
-import { TradeInfo } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/TradeInfo";
+import { RequestInfo } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/RequestInfo";
+import { TradeInfo } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/TradeInfo";
 import { TransactionInfoManagement } from "./TransactionInfoManagement";
 import { TransactionInfo } from "./TransactionInfo";
 import { TransactionData } from "./TransactionData";
 import { BusinessLogicInquireCartradeStatus } from "./BusinessLogicInquireCartradeStatus";
 import { TxInfoData } from "./TxInfoData";
-import { transactionManagement } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/routes/index";
-import { verifierFactory } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/routes/index";
-import { LedgerOperation } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/business-logic-plugin/LedgerOperation";
-import { BusinessLogicBase } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/business-logic-plugin/BusinessLogicBase";
+import { transactionManagement } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/routes/index";
+import { verifierFactory } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/routes/index";
+import { LedgerOperation } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/business-logic-plugin/LedgerOperation";
+import { BusinessLogicBase } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/business-logic-plugin/BusinessLogicBase";
 import { makeRawTransaction } from "./TransactionEthereum";
 import { makeSignedProposal } from "./TransactionFabric";
 import {
   ApiInfo,
   LedgerEvent,
-} from "../../packages/cactus-cmd-socketio-server/src/main/typescript/verifier/LedgerPlugin";
-import { json2str } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/verifier/DriverCommon";
+} from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/verifier/LedgerPlugin";
+import { json2str } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/verifier/DriverCommon";
 import { CartradeStatus } from "./define";
-import { RIFUtil } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/RIFUtil";
+import { RIFUtil } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/RIFUtil";
 
 const fs = require("fs");
 const path = require("path");

diff --git a/examples/cartrade/BusinessLogicInquireCartradeStatus.ts b/examples/cartrade/BusinessLogicInquireCartradeStatus.ts
@@ -8,7 +8,7 @@
 import { TransactionInfo } from "./TransactionInfo";
 import { TransactionStatus } from "./TransactionStatus";
 import { ResultTransactionStatusData } from "./ResultTransactionStatusData";
-import { BusinessLogicBase } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/business-logic-plugin/BusinessLogicBase";
+import { BusinessLogicBase } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/business-logic-plugin/BusinessLogicBase";
 import fs = require("fs");
 
 export class BusinessLogicInquireCartradeStatus extends BusinessLogicBase {

diff --git a/examples/cartrade/CarsManagement.ts b/examples/cartrade/CarsManagement.ts
@@ -5,9 +5,9 @@
  * CarsManagement.ts
  */
 
-import { LPInfoHolder } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/LPInfoHolder";
-import { Verifier } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/verifier/Verifier";
-import { ConfigUtil } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/ConfigUtil";
+import { LPInfoHolder } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/LPInfoHolder";
+import { Verifier } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/verifier/Verifier";
+import { ConfigUtil } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/ConfigUtil";
 
 const fs = require("fs");
 const path = require("path");

diff --git a/examples/cartrade/Dockerfile b/examples/cartrade/Dockerfile
@@ -0,0 +1,15 @@
+FROM cactus-cmd-socketio-server:latest
+
+ENV CARTRADE_HOME=/root/cactus
+
+WORKDIR ${CARTRADE_HOME}
+
+COPY ./dist/yarn.lock ./package.json ./run_docker.sh ./
+RUN yarn link "@hyperledger/cactus-cmd-socket-server" && \
+    yarn install --production --non-interactive --cache-folder ./.yarnCache && \
+    rm -rf ./.yarnCache
+
+COPY ./run_docker.sh ./
+COPY ./dist ./dist/
+
+ENTRYPOINT ["bash", "run_docker.sh"]
diff --git a/examples/cartrade/TemplateTradeManagement.ts b/examples/cartrade/TemplateTradeManagement.ts
@@ -6,9 +6,9 @@
  */
 
 import { Request } from "express";
-import { LPInfoHolder } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/LPInfoHolder";
-import { Verifier } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/verifier/Verifier";
-import { ConfigUtil } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/ConfigUtil";
+import { LPInfoHolder } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/LPInfoHolder";
+import { Verifier } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/verifier/Verifier";
+import { ConfigUtil } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/ConfigUtil";
 
 const fs = require("fs");
 const path = require("path");

diff --git a/examples/cartrade/TransactionEthereum.ts b/examples/cartrade/TransactionEthereum.ts
@@ -5,9 +5,9 @@
  * TransactionEthereum.ts
  */
 
-import { LPInfoHolder } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/LPInfoHolder";
-import { Verifier } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/verifier/Verifier";
-import { TransactionSigner } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/util/TransactionSigner";
+import { LPInfoHolder } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/LPInfoHolder";
+import { Verifier } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/verifier/Verifier";
+import { TransactionSigner } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/util/TransactionSigner";
 
 const ethJsCommon = require("ethereumjs-common").default;
 const ethJsTx = require("ethereumjs-tx").Transaction;

diff --git a/examples/cartrade/TransactionFabric.ts b/examples/cartrade/TransactionFabric.ts
@@ -15,8 +15,8 @@
  * In this case, it is used only when transferring assets.
  */
 
-import { TransactionSigner } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/util/TransactionSigner";
-import { Verifier } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/verifier/Verifier";
+import { TransactionSigner } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/util/TransactionSigner";
+import { Verifier } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/verifier/Verifier";
 
 const fs = require("fs");
 const path = require("path");
@@ -76,8 +76,8 @@ export function makeSignedProposal(
       const argsParam: {} = {
         args: {
           transactionProposalReq: transactionProposalReq,
-          certPem: certPem,
-          privateKeyPem: privateKeyPem,
+          // certPem: certPem,
+          // privateKeyPem: privateKeyPem,
         },
       };
       verifierFabric

diff --git a/examples/cartrade/TransactionInfo.ts b/examples/cartrade/TransactionInfo.ts
@@ -5,7 +5,7 @@
  * TransactionInfo.ts
  */
 
-import { RequestInfo } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/RequestInfo";
+import { RequestInfo } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/RequestInfo";
 
 export class TransactionInfo {
   businessLogicID: string;

diff --git a/examples/cartrade/TransactionInfoManagement.ts b/examples/cartrade/TransactionInfoManagement.ts
@@ -8,7 +8,7 @@
 import { TransactionInfo } from "./TransactionInfo";
 import { TransactionData } from "./TransactionData";
 import { TxInfoData } from "./TxInfoData";
-import { TradeInfo } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/TradeInfo";
+import { TradeInfo } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/TradeInfo";
 import { CartradeStatus } from "./define";
 
 const fs = require("fs");

diff --git a/examples/cartrade/asset.ts b/examples/cartrade/asset.ts
@@ -6,13 +6,13 @@
  */
 
 import { Router, NextFunction, Request, Response } from "express";
-import { RIFUtil } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/RIFUtil";
-import { ConfigUtil } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/ConfigUtil";
+import { RIFUtil } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/RIFUtil";
+import { ConfigUtil } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/ConfigUtil";
 import {
   RIFError,
   BadRequestError,
   InternalServerError,
-} from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/RIFError";
+} from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/RIFError";
 import { AssetManagement } from "./AssetManagement";
 
 const fs = require("fs");

diff --git a/examples/cartrade/balance.ts b/examples/cartrade/balance.ts
@@ -6,13 +6,13 @@
  */
 
 import { Router, NextFunction, Request, Response } from "express";
-import { RIFUtil } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/RIFUtil";
-import { ConfigUtil } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/ConfigUtil";
+import { RIFUtil } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/RIFUtil";
+import { ConfigUtil } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/ConfigUtil";
 import {
   RIFError,
   BadRequestError,
   InternalServerError,
-} from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/RIFError";
+} from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/RIFError";
 import { BalanceManagement } from "./BalanceManagement";
 
 const fs = require("fs");

diff --git a/examples/cartrade/cars.ts b/examples/cartrade/cars.ts
@@ -6,13 +6,13 @@
  */
 
 import { Router, NextFunction, Request, Response } from "express";
-import { RIFUtil } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/RIFUtil";
-import { ConfigUtil } from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/util/ConfigUtil";
+import { RIFUtil } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/RIFUtil";
+import { ConfigUtil } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/util/ConfigUtil";
 import {
   RIFError,
   BadRequestError,
   InternalServerError,
-} from "../../packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/RIFError";
+} from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/routing-interface/RIFError";
 import { CarsManagement } from "./CarsManagement";
 
 const fs = require("fs");

diff --git a/examples/cartrade/config/BLP_config.ts b/examples/cartrade/config/BLP_config.ts
@@ -5,9 +5,8 @@
  * BLP_config.ts
  */
 
-import { BusinessLogicPlugin } from "../../../packages/cactus-cmd-socketio-server/src/main/typescript/business-logic-plugin/BusinessLogicPlugin";
+import { BusinessLogicPlugin } from "@hyperledger/cactus-cmd-socket-server/src/main/typescript/business-logic-plugin/BusinessLogicPlugin";
 import { BusinessLogicCartrade } from "../BusinessLogicCartrade";
-// import { BusinessLogicCartrade } from '../examples/cartrade/BusinessLogicXxxxTrade';
 
 export function getTargetBLPInstance(
   businessLogicID: string

diff --git a/examples/cartrade/config/contractInfo.yaml b/examples/cartrade/config/contractInfo.yaml
@@ -0,0 +1,27 @@
+contractInfo:
+  - 
+    transactionHash: "0x8387ee93223da535a2cc0177d6f86df0a9dbf56f14573baf11d94cb9c9269fb1"
+    address: "0x89d266156b47c69b8a6f3152c0c56b87b5dea427"
+    abi:
+      - 
+        constant: false
+        inputs:
+          - 
+            name: _addAsset
+            type: uint256
+        name: addAsset
+        outputs: []
+        payable: false
+        stateMutability: nonpayable
+        type: function
+      - 
+        constant: true
+        inputs: []
+        name: getAsset
+        outputs:
+          - 
+            name: ""
+            type: uint256
+        payable: false
+        stateMutability: view
+        type: function
diff --git a/examples/cartrade/config/default.yaml b/examples/cartrade/config/default.yaml
@@ -2,7 +2,7 @@ cartradeInfo:
   fabric:
     validatorID: r9IS4dDf
     mspID: Org1MSP
-    keystore: "./wallet"
+    keystore: "/etc/cactus/cartrade-wallet"
     connUserName: user1
     contractName: fabcar
     peers:

diff --git a/examples/cartrade/config/usersetting.yaml b/examples/cartrade/config/usersetting.yaml
@@ -1,12 +1,12 @@
 blpRegistry:
-  - 
+  -
     businessLogicID: guks32pf
     validatorID: [84jUisrs, r9IS4dDf]
 
 logLevel: debug
 
 applicationHostInfo:
-  hostName: http://aaa.bbb.ccc.ddd # please change hostName to your IP address
+  hostName: http://localhost # please change hostName to your IP address
   hostPort: 5034
 
 socketOptions:
@@ -19,20 +19,15 @@ verifier:
   syncFunctionTimeoutMillisecond: 5000
 
 appRouters:
-  - 
+  -
     path: /api/v1/bl/trades/
-    routerJs: ../../../../../../examples/cartrade/trades.js
-  - 
+    routerJs: /root/cactus/dist/trades.js
+  -
     path: /api/v1/bl/asset/
-    routerJs: ../../../../../../examples/cartrade/asset.js
-  - 
+    routerJs: /root/cactus/dist/asset.js
+  -
     path: /api/v1/bl/balance/
-    routerJs: ../../../../../../examples/cartrade/balance.js
-  - 
+    routerJs: /root/cactus/dist/balance.js
+  -
     path: /api/v1/bl/cars/
-    routerJs: ../../../../../../examples/cartrade/cars.js
-  # abolish template-trade
-  # - 
-    # path: /api/v1/bl/template-trade/
-    # routerJs: ../../../../../../examples/cartrade/template-trade.js
-
+    routerJs: /root/cactus/dist/cars.js