feat(VerifierFactory): add connection feature to both of socket.io-ty…

…pe Validator and http-type Validator Signed-off-by: Takuma TAKEUCHI <takeuchi.takuma@fujitsu.com>
hyperledger-cacti · Mar 18, 2021 · d2825cc · d2825cc
1 parent 17fdd94
commit d2825cc
Show file tree

Hide file tree

Showing 63 changed files with 1,313 additions and 54 deletions.
diff --git a/examples/cartrade/AssetManagement.ts b/examples/cartrade/AssetManagement.ts
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2020-2021 Hyperledger Cactus Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * AssetManagement.ts
+ */
+
+import { LPInfoHolder } from '../../packages/routing-interface/util/LPInfoHolder';
+import { VerifierBase } from '../../packages/ledger-plugin/VerifierBase';
+import { ContractInfoHolder } from '../../packages/routing-interface/util/ContractInfoHolder';
+import { ConfigUtil } from '../../packages/routing-interface/util/ConfigUtil';
+
+const fs = require('fs');
+const path = require('path');
+const config: any = ConfigUtil.getConfig();
+import { getLogger } from "log4js";
+const moduleName = 'AssetManagement';
+const logger = getLogger(`${moduleName}`);
+logger.level = config.logLevel;
+
+export class AssetManagement {
+    private connectInfo: LPInfoHolder = null;                   // connection information
+    private contractInfoholder: ContractInfoHolder = null;      // contract information
+    private verifierEthereum: VerifierBase = null;
+
+    constructor() {
+        this.connectInfo = new LPInfoHolder();
+        this.contractInfoholder = new ContractInfoHolder();
+    }
+
+    addAsset(amount: string): Promise<any> {
+        return new Promise((resolve, reject) => {
+            if (this.verifierEthereum === null) {
+                logger.debug("create verifierEthereum");
+                const ledgerPluginInfo: string = this.connectInfo.getLegerPluginInfo("84jUisrs");
+                this.verifierEthereum = new VerifierBase(ledgerPluginInfo);
+            }
+
+            // for Neo
+            const contractInfo: string = this.contractInfoholder.getContractInfo("AssetContract");
+            const contractInfoObj: {} = JSON.parse(contractInfo);
+            const coinbase = contractInfoObj['_eth']['coinbase'];
+            const address = contractInfoObj['address'];
+            const abi = contractInfoObj['abi'];
+            const contract = {
+                "address": address,
+                "abi": abi
+            };
+            const method = {type: "contract", command: "addAsset", function: "sendTransaction"};
+            const args = {"args": [amount, {from: coinbase}]};
+
+            this.verifierEthereum.execSyncFunctionNeo(contract, method, args).then(result => {
+                const response = {
+                    "status": result.status,
+                    "Transaction hash": result.data
+                }
+                resolve(response);
+            }).catch((err) => {
+                logger.error(err);
+                reject(err);
+            });
+
+        });
+    }
+
+    getAsset(): Promise<any> {
+        return new Promise((resolve, reject) => {
+            if (this.verifierEthereum === null) {
+                logger.debug("create verifierEthereum");
+                const ledgerPluginInfo: string = this.connectInfo.getLegerPluginInfo("84jUisrs");
+                this.verifierEthereum = new VerifierBase(ledgerPluginInfo);
+            }
+
+            // for Neo
+            const contractInfo: string = this.contractInfoholder.getContractInfo("AssetContract");
+            const contractInfoObj: {} = JSON.parse(contractInfo);
+            const address = contractInfoObj['address'];
+            const abi = contractInfoObj['abi'];
+            const contract = {
+                "address": address,
+                "abi": abi
+            };
+            const method = {type: "contract", command: "getAsset", function: "call"};
+            const args = {"args": []};
+
+            this.verifierEthereum.execSyncFunctionNeo(contract, method, args).then(result => {
+                const response = {
+                    "status": result.status,
+                    "asset": parseFloat(result.data)
+                }
+                resolve(response);
+            }).catch((err) => {
+                logger.error(err);
+                reject(err);
+            });
+
+        });
+    }
+
+}
diff --git a/examples/cartrade/BalanceManagement.ts b/examples/cartrade/BalanceManagement.ts
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2020-2021 Hyperledger Cactus Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * BalanceManagement.ts
+ */
+
+import { LPInfoHolder } from '../../packages/routing-interface/util/LPInfoHolder';
+import { VerifierBase } from '../../packages/ledger-plugin/VerifierBase';
+import { ConfigUtil } from '../../packages/routing-interface/util/ConfigUtil';
+
+const fs = require('fs');
+const path = require('path');
+const config: any = ConfigUtil.getConfig();
+import { getLogger } from "log4js";
+const moduleName = 'BalanceManagement';
+const logger = getLogger(`${moduleName}`);
+logger.level = config.logLevel;
+
+export class BalanceManagement {
+    private connectInfo: LPInfoHolder = null;                   // connection information
+    private verifierEthereum: VerifierBase = null;
+
+    constructor() {
+        this.connectInfo = new LPInfoHolder();
+    }
+
+    getBalance(account: string): Promise<any> {
+        return new Promise((resolve, reject) => {
+            if (this.verifierEthereum === null) {
+                logger.debug("create verifierEthereum");
+                const ledgerPluginInfo: string = this.connectInfo.getLegerPluginInfo("84jUisrs");
+                this.verifierEthereum = new VerifierBase(ledgerPluginInfo);
+            }
+
+            // for LedgerOperation
+            // const execData = {"referedAddress": account};
+            // const ledgerOperation: LedgerOperation = new LedgerOperation("getNumericBalance", "", execData);
+
+            // for Neo
+            const contract = {}; // NOTE: Since contract does not need to be specified, specify an empty object.
+            const method = {type: "web3Eth", command: "getBalance"};
+            const args = {"args": [account]};
+
+            this.verifierEthereum.execSyncFunctionNeo(contract, method, args).then(result => {
+                const response = {
+                    "status": result.status,
+                    "amount": parseFloat(result.data)
+                }
+                resolve(response);
+            }).catch((err) => {
+                logger.error(err);
+                reject(err);
+            });
+
+        });
+    }
+
+}
diff --git a/examples/cartrade/BusinessLogicCartrade.ts b/examples/cartrade/BusinessLogicCartrade.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Hyperledger Cactus Contributors
+ * Copyright 2020-2021 Hyperledger Cactus Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * BusinessLogicCartrade.ts
@@ -14,6 +14,7 @@ import { TransactionData } from './TransactionData';
 import { BusinessLogicInquireCartradeStatus } from './BusinessLogicInquireCartradeStatus';
 import { TxInfoData } from './TxInfoData';
 import { transactionManagement } from '../../packages/routing-interface/routes/index';
+import { verifierFactory } from '../../packages/routing-interface/routes/index';
 import { LedgerOperation } from '../../packages/business-logic-plugin/LedgerOperation';
 import { BusinessLogicBase } from '../../packages/business-logic-plugin/BusinessLogicBase';
 import { makeRawTransaction } from './TransactionEthereum'
@@ -106,7 +107,8 @@ export class BusinessLogicCartrade extends BusinessLogicBase {
         // Get Verifier Instance
         logger.debug(`##firstTransaction(): businessLogicID: ${tradeInfo.businessLogicID}`);
         const useValidator = JSON.parse(transactionManagement.getValidatorToUse(tradeInfo.businessLogicID));
-        const verifierEthereum = transactionManagement.getVerifier(useValidator['validatorID'][0]);
+//        const verifierEthereum = transactionManagement.getVerifier(useValidator['validatorID'][0]);
+        const verifierEthereum = verifierFactory.getVerifier(useValidator['validatorID'][0]);
         logger.debug("getVerifierEthereum");
 
         // TODO: get private key from
@@ -156,7 +158,8 @@ export class BusinessLogicCartrade extends BusinessLogicBase {
         // Get Verifier Instance
         logger.debug(`##secondTransaction(): businessLogicID: ${tradeInfo.businessLogicID}`);
         const useValidator = JSON.parse(transactionManagement.getValidatorToUse(tradeInfo.businessLogicID));
-        const verifierFabric = transactionManagement.getVerifier(useValidator['validatorID'][1]);
+//        const verifierFabric = transactionManagement.getVerifier(useValidator['validatorID'][1]);
+        const verifierFabric = verifierFactory.getVerifier(useValidator['validatorID'][1]);
         logger.debug("getVerifierFabric");
 
         // Generate parameters for sendSignedProposal(changeCarOwner)
@@ -195,7 +198,8 @@ export class BusinessLogicCartrade extends BusinessLogicBase {
         // Get Verifier Instance
         logger.debug(`##thirdTransaction(): businessLogicID: ${tradeInfo.businessLogicID}`);
         const useValidator = JSON.parse(transactionManagement.getValidatorToUse(tradeInfo.businessLogicID));
-        const verifierEthereum = transactionManagement.getVerifier(useValidator['validatorID'][0]);
+//        const verifierEthereum = transactionManagement.getVerifier(useValidator['validatorID'][0]);
+        const verifierEthereum = verifierFactory.getVerifier(useValidator['validatorID'][0]);
         logger.debug("getVerifierEthereum");
 
         // TODO: Get address of escrow and set parameter

diff --git a/examples/cartrade/BusinessLogicInquireCartradeStatus.ts b/examples/cartrade/BusinessLogicInquireCartradeStatus.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Hyperledger Cactus Contributors
+ * Copyright 2020-2021 Hyperledger Cactus Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * BusinessLogicInquireCartradeStatus.ts

diff --git a/examples/cartrade/CarsManagement.ts b/examples/cartrade/CarsManagement.ts
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2020-2021 Hyperledger Cactus Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * CarsManagement.ts
+ */
+
+import { LPInfoHolder } from '../../packages/routing-interface/util/LPInfoHolder';
+import { VerifierBase } from '../../packages/ledger-plugin/VerifierBase';
+import { ConfigUtil } from '../../packages/routing-interface/util/ConfigUtil';
+
+const fs = require('fs');
+const path = require('path');
+const config: any = ConfigUtil.getConfig();
+import { getLogger } from "log4js";
+const moduleName = 'CarsManagement';
+const logger = getLogger(`${moduleName}`);
+logger.level = config.logLevel;
+
+export class CarsManagement {
+    private connectInfo: LPInfoHolder = null;                   // connection information
+    private verifierFabric: VerifierBase = null;
+
+    constructor() {
+        this.connectInfo = new LPInfoHolder();
+    }
+
+    queryCar(carID: string): Promise<any> {
+        return new Promise((resolve, reject) => {
+            if (this.verifierFabric === null) {
+                logger.debug("create verifierFabric");
+                const ledgerPluginInfo: string = this.connectInfo.getLegerPluginInfo("r9IS4dDf");
+                this.verifierFabric = new VerifierBase(ledgerPluginInfo);
+            }
+
+            const contract = {"channelName": "mychannel", "contractName": "fabcar"};
+            const method = {type: "evaluateTransaction", command: "queryCar"};
+            const args = {"args": [carID]};
+
+            this.verifierFabric.execSyncFunctionNeo(contract, method, args).then(result => {
+                resolve(result);
+            }).catch((err) => {
+                logger.error(err);
+                reject(err);
+            });
+
+        });
+    }
+
+    queryAllCars(): Promise<any> {
+        return new Promise((resolve, reject) => {
+            if (this.verifierFabric === null) {
+                logger.debug("create verifierFabric");
+                const ledgerPluginInfo: string = this.connectInfo.getLegerPluginInfo("r9IS4dDf");
+                this.verifierFabric = new VerifierBase(ledgerPluginInfo);
+            }
+
+            const contract = {"channelName": "mychannel", "contractName": "fabcar"};
+            const method = {type: "evaluateTransaction", command: "queryAllCars"};
+            const args = {"args": []};
+
+            this.verifierFabric.execSyncFunctionNeo(contract, method, args).then(result => {
+                resolve(result);
+            }).catch((err) => {
+                logger.error(err);
+                reject(err);
+            });
+
+        });
+    }
+
+}
diff --git a/examples/cartrade/ResultTransactionStatusData.ts b/examples/cartrade/ResultTransactionStatusData.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Hyperledger Cactus Contributors
+ * Copyright 2020-2021 Hyperledger Cactus Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * ResultTransactionStatusData.ts

diff --git a/examples/cartrade/TransactionData.ts b/examples/cartrade/TransactionData.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Hyperledger Cactus Contributors
+ * Copyright 2020-2021 Hyperledger Cactus Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * TransactionData.ts

diff --git a/examples/cartrade/TransactionEthereum.ts b/examples/cartrade/TransactionEthereum.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Hyperledger Cactus Contributors
+ * Copyright 2020-2021 Hyperledger Cactus Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * TransactionEthereum.ts

diff --git a/examples/cartrade/TransactionFabric.ts b/examples/cartrade/TransactionFabric.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Hyperledger Cactus Contributors
+ * Copyright 2020-2021 Hyperledger Cactus Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * TransactionFabric.ts

diff --git a/examples/cartrade/TransactionInfo.ts b/examples/cartrade/TransactionInfo.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Hyperledger Cactus Contributors
+ * Copyright 2020-2021 Hyperledger Cactus Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * TransactionInfo.ts

diff --git a/examples/cartrade/TransactionInfoManagement.ts b/examples/cartrade/TransactionInfoManagement.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Hyperledger Cactus Contributors
+ * Copyright 2020-2021 Hyperledger Cactus Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * TransactionInfoManagement.ts

diff --git a/examples/cartrade/TransactionStatus.ts b/examples/cartrade/TransactionStatus.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Hyperledger Cactus Contributors
+ * Copyright 2020-2021 Hyperledger Cactus Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * TransactionStatus.ts

diff --git a/examples/cartrade/TxInfoData.ts b/examples/cartrade/TxInfoData.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Hyperledger Cactus Contributors
+ * Copyright 2020-2021 Hyperledger Cactus Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * TxInfoData.ts