chore: upgrade satp to the new fabric-connector

Signed-off-by: Carlos Amaro <[email protected]>

Author: LordKubaya

examples/cactus-example-cbdc-bridging-backend/src/main/typescript/infrastructure/cbdc-bridging-app-dummy-infrastructure.ts

@@ -43,7 +43,7 @@ import {
   DEFAULT_PORT_GATEWAY_SERVER,
   DEFAULT_PORT_GATEWAY_OAPI,
 } from "@hyperledger/cactus-plugin-satp-hermes";
-import { setupGatewayDockerFiles } from "./utils";
+import { getTestConfigFilesDirectory, setupGatewayDockerFiles } from "./utils";
 import {
   ISATPGatewayRunnerConstructorOptions,
   SATPGatewayRunner,
@@ -59,9 +59,9 @@ export class CbdcBridgingAppDummyInfrastructure {
 
   private static readonly networkName = "CDBC_Network";
 
-  private static readonly DOCKER_IMAGE_VERSION = "42f2d28b7-2025-05-28";
+  private static readonly DOCKER_IMAGE_VERSION = "5f190f37f-2025-08-19";
   private static readonly DOCKER_IMAGE_NAME =
-    "aaugusto11/cacti-satp-hermes-gateway";
+    "kubaya/cacti-satp-hermes-gateway";
 
   private readonly log: Logger;
   private readonly logLevel: LogLevelDesc;
@@ -236,7 +236,7 @@ export class CbdcBridgingAppDummyInfrastructure {
     const besuGatewayKeyPair = Secp256k1Keys.generateKeyPairsBuffer();
 
     const fabricGatewayIdentity = {
-      id: "mockID-1",
+      id: "FabricGateway",
       name: "CustomGateway",
       version: [
         {
@@ -260,7 +260,7 @@ export class CbdcBridgingAppDummyInfrastructure {
     } as GatewayIdentity;
 
     const besuGatewayIdentity = {
-      id: "mockID-2",
+      id: "BesuGateway",
       name: "CustomGateway",
       version: [
         {
@@ -283,8 +283,9 @@ export class CbdcBridgingAppDummyInfrastructure {
       pubKey: Buffer.from(besuGatewayKeyPair.publicKey).toString("hex"),
     } as GatewayIdentity;
 
-    const fabricConfig =
-      await this.fabricEnvironment.createFabricDockerConfig();
+    const fabricConfig = await this.fabricEnvironment.createFabricDockerConfig(
+      getTestConfigFilesDirectory(`gateway-info-${fabricGatewayIdentity.id}`),
+    );
 
     const besuConfig = await this.besuEnvironment.createBesuDockerConfig();
 
@@ -346,14 +347,9 @@ export class CbdcBridgingAppDummyInfrastructure {
       ontologyPath: "/opt/cacti/satp-hermes/ontologies",
     };
 
-    const besuGatewayDockerFiles = setupGatewayDockerFiles(
-      besuGatewayOptions,
-      "besu-gateway",
-    );
-    const fabricGatewayDockerFiles = setupGatewayDockerFiles(
-      fabricGatewayOptions,
-      "fabric-gateway",
-    );
+    const besuGatewayDockerFiles = setupGatewayDockerFiles(besuGatewayOptions);
+    const fabricGatewayDockerFiles =
+      setupGatewayDockerFiles(fabricGatewayOptions);
 
     const besuGatewayRunnerOptions: ISATPGatewayRunnerConstructorOptions = {
       containerImageVersion:
@@ -364,7 +360,7 @@ export class CbdcBridgingAppDummyInfrastructure {
       oapiPort: DEFAULT_PORT_GATEWAY_OAPI,
       logLevel: this.logLevel,
       emitContainerLogs: true,
-      configFilePath: besuGatewayDockerFiles.configFilePath,
+      configPath: besuGatewayDockerFiles.configPath,
       logsPath: besuGatewayDockerFiles.logsPath,
       ontologiesPath: besuGatewayDockerFiles.ontologiesPath,
       networkName: CbdcBridgingAppDummyInfrastructure.networkName,
@@ -380,7 +376,7 @@ export class CbdcBridgingAppDummyInfrastructure {
       oapiPort: DEFAULT_PORT_GATEWAY_OAPI + 100,
       logLevel: this.logLevel,
       emitContainerLogs: true,
-      configFilePath: fabricGatewayDockerFiles.configFilePath,
+      configPath: fabricGatewayDockerFiles.configPath,
       logsPath: fabricGatewayDockerFiles.logsPath,
       ontologiesPath: fabricGatewayDockerFiles.ontologiesPath,
       networkName: CbdcBridgingAppDummyInfrastructure.networkName,

examples/cactus-example-cbdc-bridging-backend/src/main/typescript/infrastructure/cbdc-fabric-environment.ts

@@ -14,6 +14,7 @@ import {
   FabricContractInvocationType,
   FabricSigningCredential,
   FileBase64,
+  IPluginLedgerConnectorFabricOptions,
   PluginLedgerConnectorFabric,
 } from "@hyperledger/cactus-plugin-ledger-connector-fabric";
 import {
@@ -39,6 +40,11 @@ import fs from "fs-extra";
 import { getUserFromPseudonim } from "./utils";
 import CryptoMaterial from "../../../crypto-material/crypto-material.json";
 import ExampleOntology from "../../json/ontologies/ontology-satp-erc20-interact-fabric.json";
+import { PeerCerts } from "@hyperledger/cactus-test-tooling/dist/lib/main/typescript/fabric/fabric-test-ledger-v1";
+import {
+  TargetOrganization,
+  FabricConfigJSON,
+} from "@hyperledger/cactus-plugin-satp-hermes";
 
 export class FabricEnvironment {
   public static readonly FABRIC_NETWORK_ID: string = "FabricLedgerNetwork";
@@ -72,6 +78,10 @@ export class FabricEnvironment {
   private fabricKeychainPlugin?: PluginKeychainMemory;
   private approveAddress?: string;
 
+  private peer0Org1Certs: PeerCerts | undefined;
+  private peer0Org2Certs: PeerCerts | undefined;
+  private coreFile: FileBase64 | undefined;
+
   private readonly logLevel: LogLevelDesc;
 
   public constructor(logLevel: LogLevelDesc, network?: string) {
@@ -178,21 +188,17 @@ export class FabricEnvironment {
       asLocalhost: true,
     };
 
-    const connectorOptions = {
+    const connectorOptions: IPluginLedgerConnectorFabricOptions = {
       instanceId: uuidv4(),
-      dockerBinary: "/usr/local/bin/docker",
-      peerBinary: "/fabric-samples/bin/peer",
-      goBinary: "/usr/local/go/bin/go",
       pluginRegistry,
-      cliContainerEnv: FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_1,
-      sshConfig: this.sshConfig,
       logLevel: this.logLevel,
       connectionProfile: this.connectionProfileOrg1,
       discoveryOptions: this.discoveryOptions,
       eventHandlerOptions: {
         strategy: DefaultEventHandlerStrategy.NetworkScopeAllfortx,
         commitTimeout: 300,
       },
+      dockerNetworkName: this.dockerNetwork,
     };
 
     this.connector = new PluginLedgerConnectorFabric(connectorOptions);
@@ -201,6 +207,22 @@ export class FabricEnvironment {
       keychainId: keychainId,
       keychainRef: keychainEntryKey4,
     };
+
+    this.peer0Org1Certs = await this.ledger.getPeerOrgCertsAndConfig(
+      "org1",
+      "peer0",
+    );
+    this.peer0Org2Certs = await this.ledger.getPeerOrgCertsAndConfig(
+      "org2",
+      "peer0",
+    );
+
+    const filePath = path.join(__dirname, "../../yml/resources/core.yml");
+    const buffer = await fs.readFile(filePath);
+    this.coreFile = {
+      body: buffer.toString("base64"),
+      filename: "core.yaml",
+    };
   }
 
   // Deploys smart contracts and sets up configurations for testing
@@ -298,23 +320,43 @@ export class FabricEnvironment {
       });
     }
 
+    if (!this.peer0Org1Certs || !this.peer0Org2Certs || !this.coreFile) {
+      throw new Error("Peer certificates are not defined");
+    }
+
     const res = await this.connector?.deployContract({
       channelId: this.fabricChannelName,
       ccVersion: "1.0.0",
       sourceFiles: satpSourceFiles,
       ccName: FabricEnvironment.SATP_CONTRACT_NAME,
       targetOrganizations: [
-        FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_1,
-        FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_2,
+        {
+          CORE_PEER_LOCALMSPID:
+            FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_1.CORE_PEER_LOCALMSPID,
+          CORE_PEER_ADDRESS:
+            FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_1.CORE_PEER_ADDRESS,
+          CORE_PEER_MSPCONFIG: this.peer0Org1Certs.mspConfig,
+          CORE_PEER_TLS_ROOTCERT: this.peer0Org1Certs.peerTlsCert,
+          ORDERER_TLS_ROOTCERT: this.peer0Org1Certs.ordererTlsRootCert,
+        },
+        {
+          CORE_PEER_LOCALMSPID:
+            FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_2.CORE_PEER_LOCALMSPID,
+          CORE_PEER_ADDRESS:
+            FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_2.CORE_PEER_ADDRESS,
+          CORE_PEER_MSPCONFIG: this.peer0Org2Certs.mspConfig,
+          CORE_PEER_TLS_ROOTCERT: this.peer0Org2Certs.peerTlsCert,
+          ORDERER_TLS_ROOTCERT: this.peer0Org2Certs.ordererTlsRootCert,
+        },
       ],
-      caFile:
-        FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_1.ORDERER_TLS_ROOTCERT_FILE,
+      caFile: this.peer0Org1Certs.ordererTlsRootCert,
       ccLabel: "satp-contract",
       ccLang: ChainCodeProgrammingLanguage.Typescript,
       ccSequence: 1,
       orderer: "orderer.example.com:7050",
       ordererTLSHostnameOverride: "orderer.example.com",
       connTimeout: 60,
+      coreYamlFile: this.coreFile,
     });
 
     if (!res) {
@@ -556,28 +598,133 @@ export class FabricEnvironment {
 
     return parseInt(response.functionOutput);
   }
-  public async createFabricDockerConfig(): Promise<INetworkOptions> {
+
+  public async createFabricDockerConfig(
+    testFilesDirectory: string,
+  ): Promise<FabricConfigJSON & INetworkOptions> {
+    if (!this.peer0Org1Certs || !this.peer0Org2Certs || !this.coreFile) {
+      throw new Error("Peer certificates are not defined");
+    }
+
+    const testFileCerts = path.join(testFilesDirectory, "certs");
+
+    if (!fs.existsSync(testFileCerts)) {
+      fs.mkdirSync(testFileCerts, { recursive: true });
+    }
+
+    for (const org of ["org1", "org2"]) {
+      if (!fs.existsSync(path.join(testFileCerts, "certs", org))) {
+        fs.mkdirSync(path.join(testFileCerts, org), {
+          recursive: true,
+        });
+      } else {
+        // Clear the directory if it already exists
+        fs.emptyDirSync(path.join(testFileCerts, org));
+      }
+    }
+
+    // Write peer certs and core.yaml to files in the testFilesDirectory
+    const org1Dir = path.join(testFileCerts, "org1");
+    const org2Dir = path.join(testFileCerts, "org2");
+    const coreYamlPath = path.join(testFileCerts, "core.yaml");
+
+    // Org1 certs
+    const org1MspConfigPath = path.join(org1Dir, "msp");
+    const org1PeerTlsCertPath = path.join(org1Dir, "peerTlsCert.pem");
+    const org1OrdererTlsRootCertPath = path.join(
+      org1Dir,
+      "ordererTlsRootCert.pem",
+    );
+
+    // Org2 certs
+    const org2MspConfigPath = path.join(org2Dir, "msp");
+    const org2PeerTlsCertPath = path.join(org2Dir, "peerTlsCert.pem");
+    const org2OrdererTlsRootCertPath = path.join(
+      org2Dir,
+      "ordererTlsRootCert.pem",
+    );
+
+    // mspConfig is a folder of files with relative paths, so we need to write each file
+    for (const peerCerts of [
+      { certs: this.peer0Org1Certs, mspPath: org1MspConfigPath },
+      { certs: this.peer0Org2Certs, mspPath: org2MspConfigPath },
+    ]) {
+      for (const file of peerCerts.certs.mspConfig) {
+        const destPath = path.join(
+          peerCerts.mspPath,
+          file.filepath || "",
+          file.filename,
+        );
+        const destDir = path.dirname(destPath);
+        if (!fs.existsSync(destDir)) {
+          fs.mkdirSync(destDir, { recursive: true });
+        }
+        // Ensure fileContent is a string or Buffer
+        await fs.writeFile(destPath, Buffer.from(file.body, "base64"));
+      }
+    }
+
+    await fs.writeFile(org1PeerTlsCertPath, this.peer0Org1Certs.peerTlsCert);
+    await fs.writeFile(
+      org1OrdererTlsRootCertPath,
+      this.peer0Org1Certs.ordererTlsRootCert,
+    );
+
+    await fs.writeFile(org2PeerTlsCertPath, this.peer0Org2Certs.peerTlsCert);
+    await fs.writeFile(
+      org2OrdererTlsRootCertPath,
+      this.peer0Org2Certs.ordererTlsRootCert,
+    );
+
+    // core.yaml
+    await fs.writeFile(coreYamlPath, Buffer.from(this.coreFile.body, "base64"));
+
+    // targetOrganizations array
+    const basePath = path.join("/opt/cacti/satp-hermes/config", "certs");
+    const targetOrganizations: TargetOrganization[] = [
+      {
+        CORE_PEER_LOCALMSPID:
+          FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_1.CORE_PEER_LOCALMSPID,
+        CORE_PEER_ADDRESS:
+          FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_1.CORE_PEER_ADDRESS,
+        CORE_PEER_MSPCONFIG_PATH: path.join(basePath, "org1/msp"),
+        CORE_PEER_TLS_ROOTCERT_PATH: path.join(
+          basePath,
+          "/org1/peerTlsCert.pem",
+        ),
+        ORDERER_TLS_ROOTCERT_PATH: path.join(
+          basePath,
+          "/org1/ordererTlsRootCert.pem",
+        ),
+      },
+      {
+        CORE_PEER_LOCALMSPID:
+          FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_2.CORE_PEER_LOCALMSPID,
+        CORE_PEER_ADDRESS:
+          FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_2.CORE_PEER_ADDRESS,
+        CORE_PEER_MSPCONFIG_PATH: path.join(basePath, "org2/msp"),
+        CORE_PEER_TLS_ROOTCERT_PATH: path.join(
+          basePath,
+          "/org2/peerTlsCert.pem",
+        ),
+        ORDERER_TLS_ROOTCERT_PATH: path.join(
+          basePath,
+          "/org2/ordererTlsRootCert.pem",
+        ),
+      },
+    ];
+    this.peer0Org2Certs;
     return {
       networkIdentification: this.network,
       userIdentity: this.bridgeIdentity,
       channelName: this.fabricChannelName,
-      targetOrganizations: [
-        FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_1,
-        FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_2,
-      ],
-      caFile:
-        FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_2.ORDERER_TLS_ROOTCERT_FILE,
-      ccSequence: 1,
+      targetOrganizations: targetOrganizations,
+      caFilePath: path.join(basePath, "/org2/ordererTlsRootCert.pem"),
       orderer: "orderer.example.com:7050",
       ordererTLSHostnameOverride: "orderer.example.com",
       connTimeout: 60,
       mspId: this.bridgeMSPID,
       connectorOptions: {
-        dockerBinary: "/usr/local/bin/docker",
-        peerBinary: "/fabric-samples/bin/peer",
-        goBinary: "/usr/local/go/bin/go",
-        cliContainerEnv: FABRIC_25_LTS_FABRIC_SAMPLES_ENV_INFO_ORG_1,
-        sshConfig: await this.ledger.getSshConfig(false),
         connectionProfile: await this.ledger.getConnectionProfileOrgX(
           "org2",
           false,
@@ -592,7 +739,8 @@ export class FabricEnvironment {
         },
       },
       claimFormats: [ClaimFormat.DEFAULT],
-    } as INetworkOptions;
+      coreYamlFilePath: path.join(basePath, "core.yaml"),
+    };
   }
 
   public async giveRoleToBridge(mspID: string): Promise<void> {