Fix of yarn and fabric problems

Author: Tomas-Silva2187

packages/cactus-plugin-satp-hermes/src/main/proto/cacti/satp/v02/common/message.proto

@@ -303,9 +303,9 @@ message NetworkId {
 }
 
 enum ERCTokenStandard {
-    UNSPECIFIED = 0;
-    ERC20 = 1;
-    ERC721 = 2;
-    ERC1155 = 3;
+    ERC_TOKEN_STANDARD_UNSPECIFIED = 0;
+    ERC_TOKEN_STANDARD_ERC20 = 1;
+    ERC_TOKEN_STANDARD_ERC721 = 2;
+    ERC_TOKEN_STANDARD_ERC1155 = 3;
 }
 

packages/cactus-plugin-satp-hermes/src/main/typescript/cross-chain-mechanisms/bridge/leafs/fabric-leaf.ts

@@ -226,8 +226,7 @@ export class FabricLeaf
 
     this.connector = new PluginLedgerConnectorFabric({
       ...options.connectorOptions,
-      dockerNetworkName:
-        /*options.connectorOptions.dockerNetworkName ??*/ "host",
+      dockerNetworkName: options.connectorOptions.dockerNetworkName ?? "host",
     } as IPluginLedgerConnectorFabricOptions);
 
     this.ontologyManager = ontologyManager;
@@ -777,7 +776,6 @@ export class FabricLeaf
             asset.channelName,
             asset.contractName,
             safeStableStringify(interactions),
-            asset.ercTokenStandard.toString(),
           ],
           contractName: this.wrapperContractName,
           invocationType: FabricContractInvocationType.Send,

packages/cactus-plugin-satp-hermes/src/main/typescript/generated/proto/cacti/satp/v02/common/message_pb.ts

@@ -153,7 +153,7 @@ describe("Besu Leaf Test with Fungible Tokens", () => {
         id: BesuTestEnvironment.BESU_NETWORK_ID,
         ledgerType: LedgerType.Besu2X,
       },
-      ercTokenStandard: ERCTokenStandard.ERC20,
+      ercTokenStandard: ERCTokenStandard.ERC_TOKEN_STANDARD_ERC721,
     } as EvmFungibleAsset;
 
     const response = await besuLeaf.wrapAsset(asset);
@@ -434,7 +434,7 @@ describe("Besu Leaf Test with Non Fungible Tokens", () => {
         id: BesuTestEnvironment.BESU_NETWORK_ID,
         ledgerType: LedgerType.Besu2X,
       },
-      ercTokenStandard: ERCTokenStandard.ERC721,
+      ercTokenStandard: ERCTokenStandard.ERC_TOKEN_STANDARD_ERC721,
     } as EvmNonFungibleAsset;
 
     const response = await besuLeaf.wrapAsset(nonFungibleAsset);

packages/cactus-plugin-satp-hermes/src/test/typescript/integration/bridge/besu-leaf.test.ts

@@ -156,7 +156,7 @@ describe("Ethereum Leaf Test with Fungible Tokens", () => {
         id: EthereumTestEnvironment.ETH_NETWORK_ID,
         ledgerType: LedgerType.Ethereum,
       },
-      ercTokenStandard: ERCTokenStandard.ERC20,
+      ercTokenStandard: ERCTokenStandard.ERC_TOKEN_STANDARD_ERC20,
     } as EvmFungibleAsset;
 
     const response = await ethereumLeaf.wrapAsset(asset);
@@ -450,7 +450,7 @@ describe("Ethereum Leaf Non Fungible Test", () => {
         id: EthereumTestEnvironment.ETH_NETWORK_ID,
         ledgerType: LedgerType.Ethereum,
       },
-      ercTokenStandard: ERCTokenStandard.ERC721,
+      ercTokenStandard: ERCTokenStandard.ERC_TOKEN_STANDARD_ERC721,
     } as EvmNonFungibleAsset;
 
     const response = await ethereumLeaf.wrapAsset(nonFungibleAsset);

packages/cactus-plugin-satp-hermes/src/test/typescript/integration/bridge/ethereum-leaf.test.ts

@@ -8,10 +8,7 @@ import {
   pruneDockerAllIfGithubAction,
 } from "@hyperledger/cactus-test-tooling";
 
-import {
-  TokenType,
-  ERCTokenStandard,
-} from "../../../../main/typescript/generated/proto/cacti/satp/v02/common/message_pb";
+import { TokenType } from "../../../../main/typescript/generated/proto/cacti/satp/v02/common/message_pb";
 import { ClaimFormat } from "../../../../main/typescript/generated/proto/cacti/satp/v02/common/message_pb";
 import { LedgerType } from "@hyperledger/cactus-core-api";
 import { FabricTestEnvironment } from "../../test-utils";
@@ -135,7 +132,6 @@ describe("Fabric Bridge Test", () => {
         id: FabricTestEnvironment.FABRIC_NETWORK_ID,
         ledgerType: LedgerType.Fabric2,
       },
-      ercTokenStandard: ERCTokenStandard.ERC20,
     } as FabricFungibleAsset;
 
     const response = await fabricLeaf.wrapAsset(asset);

packages/cactus-plugin-satp-hermes/src/test/typescript/integration/bridge/fabric-leaf.test.ts

@@ -273,7 +273,7 @@ describe.skip("Rollback Test stage 0", () => {
       contractName: besuEnv.getTestFungibleContractName(),
       contractAddress: besuEnv.getTestFungibleContractAddress(),
       network: besuEnv.network,
-      ercTokenStandard: ERCTokenStandard.ERC20,
+      ercTokenStandard: ERCTokenStandard.ERC_TOKEN_STANDARD_ERC20,
     };
     const besuReceipt = await besuLeaf.wrapAsset(besuAsset);
     expect(besuReceipt).toBeDefined();
@@ -289,7 +289,7 @@ describe.skip("Rollback Test stage 0", () => {
       mspId: "Org1MSP",
       channelName: fabricEnv.fabricChannelName,
       contractName: fabricEnv.satpContractName,
-      ercTokenStandard: ERCTokenStandard.ERC20,
+      ercTokenStandard: ERCTokenStandard.ERC_TOKEN_STANDARD_ERC20,
     };
 
     const fabricReceipt = await fabricLeaf.wrapAsset(fabricAsset);

packages/cactus-plugin-satp-hermes/src/test/typescript/integration/rollback/rollback-stage-0.test.ts

@@ -283,7 +283,7 @@ describe.skip("Rollback Test stage 2", () => {
       contractName: besuEnv.getTestFungibleContractName(),
       contractAddress: besuEnv.getTestFungibleContractAddress(),
       network: besuEnv.network,
-      ercTokenStandard: ERCTokenStandard.ERC20,
+      ercTokenStandard: ERCTokenStandard.ERC_TOKEN_STANDARD_ERC20,
     };
     const besuReceipt = await besuLeaf.wrapAsset(besuAsset);
     log.info(`Besu Asset Wrapped: ${besuReceipt}`);

packages/cactus-plugin-satp-hermes/src/test/typescript/integration/rollback/rollback-stage-2.test.ts

@@ -296,7 +296,7 @@ describe.skip("Rollback Test stage 3", () => {
       contractName: besuEnv.getTestFungibleContractName(),
       contractAddress: besuEnv.getTestFungibleContractAddress(),
       network: besuEnv.network,
-      ercTokenStandard: ERCTokenStandard.ERC20,
+      ercTokenStandard: ERCTokenStandard.ERC_TOKEN_STANDARD_ERC20,
     };
     const besuReceipt = await besuLeaf.wrapAsset(besuAsset);
     expect(besuReceipt).toBeDefined();
@@ -320,7 +320,7 @@ describe.skip("Rollback Test stage 3", () => {
       mspId: "Org1MSP",
       channelName: fabricEnv.fabricChannelName,
       contractName: fabricEnv.satpContractName,
-      ercTokenStandard: ERCTokenStandard.ERC20,
+      ercTokenStandard: ERCTokenStandard.ERC_TOKEN_STANDARD_ERC20,
     };
 
     const fabricReceipt = await fabricLeaf.wrapAsset(fabricAsset);