feat(plugin-satp-hermes): replace IPFS dependency in SATP package

* implement the repository design pattern to make storage technology agnostic * due to the deprecation of the ipfs package, this allows one to choose another storage * refactoring of the tests and the CBDC example that is based on the SATP * implement the remote log storage as a sqlite database * add post build instruction to copy knex files to dist/ closes hyperledger-cacti#2984 Signed-off-by: André Augusto <[email protected]>
AndreAugusto11 · Feb 7, 2024 · f44bad6 · f44bad6
1 parent 4184cf2
commit f44bad6
Show file tree

Hide file tree

Showing 73 changed files with 1,228 additions and 2,182 deletions.
diff --git a/.cspell.json b/.cspell.json
@@ -118,7 +118,7 @@
         "NETWORKSCOPEANYFORTX",
         "NODETXPOOLACK",
         "notok",
-        "Odap",
+        "Satp",
         "Oidc",
         "oneofs",
         "onsi",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -267,7 +267,7 @@ Signed-off-by: Michal Bajer <[email protected]>
 * **core-api:** add weaver protocol buffer definitions [#1523](https://github.com/hyperledger/cactus/issues/1523) ([851c071](https://github.com/hyperledger/cactus/commit/851c071e13e2ed3748a9c52ae9d02fb85d235c9a))
 * **docs:** upated maintainers list ([b5c94dc](https://github.com/hyperledger/cactus/commit/b5c94dc744c48040b5cadd49b8903534ba5998d1))
 * **example:** make cartrade support more environments ([e7e0402](https://github.com/hyperledger/cactus/commit/e7e04026059b7c1dfd1c5bd8c65f052651464966))
-* **odap:** first implemenation for odap plugin and endpoints ([51bf753](https://github.com/hyperledger/cactus/commit/51bf753d421cdd255c178036fe901eb9c1c04130))
+* **satp:** first implemenation for satp plugin and endpoints ([51bf753](https://github.com/hyperledger/cactus/commit/51bf753d421cdd255c178036fe901eb9c1c04130))
 * **test-tooling:** embed couch-db image in the faio ([95d956d](https://github.com/hyperledger/cactus/commit/95d956d9bbfb15b15b043a753f07cbf876c33707))
 * **test-tooling:** env injenction for Besu, Fabric, Quorum AIOs ([bb0352d](https://github.com/hyperledger/cactus/commit/bb0352dad85a1acbb4fc4b34026f39f289cfa9c0)), closes [#1580](https://github.com/hyperledger/cactus/issues/1580)
 * **test-tooling:** faio features and improvements ([794e8b8](https://github.com/hyperledger/cactus/commit/794e8b89aba5a7bc6144343607893bca64affda1))

diff --git a/examples/cactus-example-cbdc-bridging-backend/src/main/typescript/cbdc-bridging-app.ts b/examples/cactus-example-cbdc-bridging-backend/src/main/typescript/cbdc-bridging-app.ts
@@ -17,14 +17,13 @@ import {
 } from "@hyperledger/cactus-cmd-api-server";
 import {
   Configuration,
-  DefaultApi as OdapApi,
   IKeyPair,
-} from "@hyperledger/cactus-plugin-satp-hermes";
+  DefaultApi as SatpApi,
+} from "@hyperledger/cactus-plugin-satp-hermes/";
 import { PluginKeychainMemory } from "@hyperledger/cactus-plugin-keychain-memory";
 import { CbdcBridgingAppDummyInfrastructure } from "./infrastructure/cbdc-bridging-app-dummy-infrastructure";
 import { DefaultApi as FabricApi } from "@hyperledger/cactus-plugin-ledger-connector-fabric";
 import { DefaultApi as BesuApi } from "@hyperledger/cactus-plugin-ledger-connector-besu";
-import { DefaultApi as IpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
 import { FabricSatpGateway } from "./satp-extension/fabric-satp-gateway";
 import { BesuSatpGateway } from "./satp-extension/besu-satp-gateway";
 import CryptoMaterial from "../../crypto-material/crypto-material.json";
@@ -81,8 +80,6 @@ export class CbdcBridgingApp {
     const fabricPlugin =
       await this.infrastructure.createFabricLedgerConnector();
     const besuPlugin = await this.infrastructure.createBesuLedgerConnector();
-    const clientIpfsPlugin = await this.infrastructure.createIPFSConnector();
-    const serverIpfsPlugin = await this.infrastructure.createIPFSConnector();
 
     // Reserve the ports where the API Servers will run
     const httpApiA = await Servers.startOnPort(
@@ -100,16 +97,14 @@ export class CbdcBridgingApp {
     const addressInfoB = httpApiB.address() as AddressInfo;
     const nodeApiHostB = `http://${this.options.apiHost}:${addressInfoB.port}`;
 
-    const fabricOdapGateway = await this.infrastructure.createClientGateway(
+    const fabricSatpGateway = await this.infrastructure.createClientGateway(
       nodeApiHostA,
       this.options.clientGatewayKeyPair,
-      `http://${this.options.apiHost}:${addressInfoA.port}`,
     );
 
-    const besuOdapGateway = await this.infrastructure.createServerGateway(
+    const besuSatpGateway = await this.infrastructure.createServerGateway(
       nodeApiHostB,
       this.options.serverGatewayKeyPair,
-      `http://${this.options.apiHost}:${addressInfoB.port}`,
     );
 
     const clientPluginRegistry = new PluginRegistry({
@@ -132,12 +127,10 @@ export class CbdcBridgingApp {
     });
 
     clientPluginRegistry.add(fabricPlugin);
-    clientPluginRegistry.add(fabricOdapGateway);
-    clientPluginRegistry.add(clientIpfsPlugin);
+    clientPluginRegistry.add(fabricSatpGateway);
 
     serverPluginRegistry.add(besuPlugin);
-    serverPluginRegistry.add(serverIpfsPlugin);
-    serverPluginRegistry.add(besuOdapGateway);
+    serverPluginRegistry.add(besuSatpGateway);
 
     const apiServer1 = await this.startNode(httpApiA, clientPluginRegistry);
     const apiServer2 = await this.startNode(httpApiB, serverPluginRegistry);
@@ -165,17 +158,16 @@ export class CbdcBridgingApp {
     return {
       apiServer1,
       apiServer2,
-      fabricGatewayApi: new OdapApi(
+      fabricGatewayApi: new SatpApi(
         new Configuration({ basePath: nodeApiHostA }),
       ),
-      besuGatewayApi: new OdapApi(
+      besuGatewayApi: new SatpApi(
         new Configuration({ basePath: nodeApiHostB }),
       ),
-      ipfsApiClient: new IpfsApi(new Configuration({ basePath: nodeApiHostA })),
       fabricApiClient,
       besuApiClient,
-      fabricOdapGateway,
-      besuOdapGateway,
+      fabricSatpGateway,
+      besuSatpGateway,
     };
   }
 
@@ -231,11 +223,10 @@ export class CbdcBridgingApp {
 export interface IStartInfo {
   readonly apiServer1: ApiServer;
   readonly apiServer2: ApiServer;
-  readonly fabricGatewayApi: OdapApi;
-  readonly besuGatewayApi: OdapApi;
-  readonly ipfsApiClient: IpfsApi;
+  readonly fabricGatewayApi: SatpApi;
+  readonly besuGatewayApi: SatpApi;
   readonly besuApiClient: BesuApi;
   readonly fabricApiClient: FabricApi;
-  readonly fabricOdapGateway: FabricSatpGateway;
-  readonly besuOdapGateway: BesuSatpGateway;
+  readonly fabricSatpGateway: FabricSatpGateway;
+  readonly besuSatpGateway: BesuSatpGateway;
 }
diff --git a/...ging-backend/src/main/typescript/infrastructure/cbdc-bridging-app-dummy-infrastructure.ts b/...ging-backend/src/main/typescript/infrastructure/cbdc-bridging-app-dummy-infrastructure.ts
@@ -13,7 +13,6 @@ import {
   DEFAULT_FABRIC_2_AIO_IMAGE_NAME,
   DEFAULT_FABRIC_2_AIO_IMAGE_VERSION,
   FabricTestLedgerV1,
-  GoIpfsTestContainer,
 } from "@hyperledger/cactus-test-tooling";
 import { PluginKeychainMemory } from "@hyperledger/cactus-plugin-keychain-memory";
 import {
@@ -35,14 +34,15 @@ import {
   InvokeContractV1Request as BesuInvokeContractV1Request,
 } from "@hyperledger/cactus-plugin-ledger-connector-besu";
 import { PluginRegistry } from "@hyperledger/cactus-core";
-import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
 import AssetReferenceContractJson from "../../../solidity/asset-reference-contract/AssetReferenceContract.json";
 import CBDCcontractJson from "../../../solidity/cbdc-erc-20/CBDCcontract.json";
 import { IKeyPair } from "@hyperledger/cactus-plugin-satp-hermes";
 import { FabricSatpGateway } from "../satp-extension/fabric-satp-gateway";
 import { BesuSatpGateway } from "../satp-extension/besu-satp-gateway";
 import { PluginImportType } from "@hyperledger/cactus-core-api";
 import CryptoMaterial from "../../../crypto-material/crypto-material.json";
+import { ClientHelper } from "../satp-extension/client-helper";
+import { ServerHelper } from "../satp-extension/server-helper";
 
 export interface ICbdcBridgingAppDummyInfrastructureOptions {
   logLevel?: LogLevelDesc;
@@ -56,9 +56,6 @@ export class CbdcBridgingAppDummyInfrastructure {
 
   private readonly besu: BesuTestLedger;
   private readonly fabric: FabricTestLedgerV1;
-  private readonly ipfs: GoIpfsTestContainer;
-  private readonly ipfsParentPath: string;
-
   private readonly log: Logger;
 
   public get className(): string {
@@ -78,8 +75,6 @@ export class CbdcBridgingAppDummyInfrastructure {
     const level = this.options.logLevel || "INFO";
     const label = this.className;
 
-    this.ipfsParentPath = `/${uuidv4()}/${uuidv4()}/`;
-
     this.log = LoggerProvider.getOrCreate({ level, label });
 
     this.besu = new BesuTestLedger({
@@ -97,10 +92,6 @@ export class CbdcBridgingAppDummyInfrastructure {
       ]),
       logLevel: level || "DEBUG",
     });
-
-    this.ipfs = new GoIpfsTestContainer({
-      logLevel: level || "DEBUG",
-    });
   }
 
   public get org1Env(): NodeJS.ProcessEnv & DeploymentTargetOrgFabric2x {
@@ -143,7 +134,6 @@ export class CbdcBridgingAppDummyInfrastructure {
       await Promise.all([
         this.besu.start(),
         this.fabric.start(),
-        this.ipfs.start(),
       ]);
       this.log.info(`Started dummy infrastructure OK`);
     } catch (ex) {
@@ -158,7 +148,6 @@ export class CbdcBridgingAppDummyInfrastructure {
       await Promise.all([
         this.besu.stop().then(() => this.besu.destroy()),
         this.fabric.stop().then(() => this.fabric.destroy()),
-        this.ipfs.stop().then(() => this.ipfs.destroy()),
       ]);
       this.log.info(`Stopped OK`);
     } catch (ex) {
@@ -285,61 +274,43 @@ export class CbdcBridgingAppDummyInfrastructure {
     return besuConnector;
   }
 
-  public async createIPFSConnector(): Promise<PluginObjectStoreIpfs> {
-    this.log.info(`Creating Besu Connector...`);
-
-    const kuboRpcClientModule = await import("kubo-rpc-client");
-    const ipfsClientOrOptions = kuboRpcClientModule.create({
-      url: await this.ipfs.getApiUrl(),
-    });
-
-    return new PluginObjectStoreIpfs({
-      parentDir: this.ipfsParentPath,
-      logLevel: this.options.logLevel,
-      instanceId: uuidv4(),
-      ipfsClientOrOptions,
-    });
-  }
-
   public async createClientGateway(
     nodeApiHost: string,
     keyPair: IKeyPair,
-    ipfsPath: string,
   ): Promise<FabricSatpGateway> {
     this.log.info(`Creating Source Gateway...`);
     const pluginSourceGateway = new FabricSatpGateway({
       name: "cactus-plugin-source#satpGateway",
       dltIDs: ["DLT2"],
       instanceId: uuidv4(),
       keyPair: keyPair,
-      ipfsPath: ipfsPath,
       fabricPath: nodeApiHost,
       fabricSigningCredential: {
         keychainId: CryptoMaterial.keychains.keychain1.id,
         keychainRef: "bridge",
       },
       fabricChannelName: "mychannel",
       fabricContractName: "asset-reference-contract",
+      clientHelper: new ClientHelper(),
+      serverHelper: new ServerHelper({}),
     });
 
-    await pluginSourceGateway.database?.migrate.rollback();
-    await pluginSourceGateway.database?.migrate.latest();
+    await pluginSourceGateway.localRepository?.reset();
+    await pluginSourceGateway.remoteRepository?.reset();
 
     return pluginSourceGateway;
   }
 
   public async createServerGateway(
     nodeApiHost: string,
     keyPair: IKeyPair,
-    ipfsPath: string,
   ): Promise<BesuSatpGateway> {
     this.log.info(`Creating Recipient Gateway...`);
     const pluginRecipientGateway = new BesuSatpGateway({
       name: "cactus-plugin-recipient#satpGateway",
       dltIDs: ["DLT1"],
       instanceId: uuidv4(),
       keyPair: keyPair,
-      ipfsPath: ipfsPath,
       besuPath: nodeApiHost,
       besuWeb3SigningCredential: {
         ethAccount: CryptoMaterial.accounts["bridge"].ethAddress,
@@ -348,10 +319,12 @@ export class CbdcBridgingAppDummyInfrastructure {
       },
       besuContractName: AssetReferenceContractJson.contractName,
       besuKeychainId: CryptoMaterial.keychains.keychain2.id,
+      clientHelper: new ClientHelper(),
+      serverHelper: new ServerHelper({}),
     });
 
-    await pluginRecipientGateway.database?.migrate.rollback();
-    await pluginRecipientGateway.database?.migrate.latest();
+  await pluginRecipientGateway.localRepository?.reset();
+  await pluginRecipientGateway.remoteRepository?.reset();
 
     return pluginRecipientGateway;
   }
@@ -624,19 +597,25 @@ export class CbdcBridgingAppDummyInfrastructure {
           // does the same thing, it just waits 10 seconds for good measure so there
           // might not be a way for us to avoid doing this, but if there is a way we
           // absolutely should not have timeouts like this, anywhere...
-          await new Promise((resolve) => setTimeout(resolve, 10000));
-
-          await fabricApiClient.runTransactionV1({
-            contractName,
-            channelName,
-            params: ["name1", "symbol1", "8"],
-            methodName: "Initialize",
-            invocationType: FabricContractInvocationType.Send,
-            signingCredential: {
-              keychainId: CryptoMaterial.keychains.keychain1.id,
-              keychainRef: "userA",
-            },
-          });
+          let retries_2 = 0
+          while (retries_2 <= 5) {
+            await new Promise((resolve) => setTimeout(resolve, 10000));
+
+            await fabricApiClient.runTransactionV1({
+              contractName,
+              channelName,
+              params: ["name1", "symbol1", "8"],
+              methodName: "Initialize",
+              invocationType: FabricContractInvocationType.Send,
+              signingCredential: {
+                keychainId: CryptoMaterial.keychains.keychain1.id,
+                keychainRef: "userA",
+              },
+            })
+            .then(() => retries_2 = 6)
+            .catch(() => console.log("trying to Initialize fabric contract again"));
+            retries_2++;
+          }
         })
         .catch(() => console.log("trying to deploy fabric contract again"));
       retries++;

diff --git a/...tus-example-cbdc-bridging-backend/src/main/typescript/satp-extension/besu-satp-gateway.ts b/...tus-example-cbdc-bridging-backend/src/main/typescript/satp-extension/besu-satp-gateway.ts
@@ -8,32 +8,17 @@ import {
   InvokeContractV1Request as BesuInvokeContractV1Request,
 } from "@hyperledger/cactus-plugin-ledger-connector-besu";
 import {
-  IKeyPair,
+  IPluginSatpGatewayConstructorOptions,
   PluginSatpGateway,
 } from "@hyperledger/cactus-plugin-satp-hermes";
 import { SessionDataRollbackActionsPerformedEnum } from "@hyperledger/cactus-plugin-satp-hermes";
-import { ClientHelper } from "./client-helper";
-import { ServerHelper } from "./server-helper";
-
-export interface IBesuSatpGatewayConstructorOptions {
-  name: string;
-  dltIDs: string[];
-  instanceId: string;
-  keyPair?: IKeyPair;
-  backupGatewaysAllowed?: string[];
-
-  ipfsPath?: string;
-
-  besuPath?: string;
 
+export interface IBesuSatpGatewayConstructorOptions extends IPluginSatpGatewayConstructorOptions {
   besuContractName?: string;
   besuWeb3SigningCredential?: Web3SigningCredential;
   besuKeychainId?: string;
-  fabricAssetID?: string;
-  fabricAssetSize?: string;
   besuAssetID?: string;
-
-  knexConfig?: Knex.Config;
+  besuPath?: string;
 }
 
 export class BesuSatpGateway extends PluginSatpGateway {
@@ -50,8 +35,10 @@ export class BesuSatpGateway extends PluginSatpGateway {
       keyPair: options.keyPair,
       backupGatewaysAllowed: options.backupGatewaysAllowed,
       ipfsPath: options.ipfsPath,
-      clientHelper: new ClientHelper(),
-      serverHelper: new ServerHelper({}),
+      clientHelper: options.clientHelper,
+      serverHelper: options.serverHelper,
+      knexLocalConfig: options.knexLocalConfig,
+      knexRemoteConfig: options.knexRemoteConfig
     });
 
     if (options.besuPath != undefined) this.defineBesuConnection(options);

diff --git a/.../cactus-example-cbdc-bridging-backend/src/main/typescript/satp-extension/client-helper.ts b/.../cactus-example-cbdc-bridging-backend/src/main/typescript/satp-extension/client-helper.ts
@@ -4,7 +4,7 @@ import {
   TransferInitializationV1Request,
   ClientGatewayHelper,
 } from "@hyperledger/cactus-plugin-satp-hermes";
-import { OdapMessageType } from "@hyperledger/cactus-plugin-satp-hermes";
+import { SatpMessageType } from "@hyperledger/cactus-plugin-satp-hermes";
 import { FabricSatpGateway } from "./fabric-satp-gateway";
 import { BesuSatpGateway } from "./besu-satp-gateway";
 
@@ -51,7 +51,7 @@ export class ClientHelper extends ClientGatewayHelper {
     }
 
     const initializationRequestMessage: TransferInitializationV1Request = {
-      messageType: OdapMessageType.InitializationRequest,
+      messageType: SatpMessageType.InitializationRequest,
       sessionID: sessionData.id,
       version: sessionData.version,
       // developer urn
@@ -132,7 +132,7 @@ export class ClientHelper extends ClientGatewayHelper {
 
     await gateway.makeRequest(
       sessionID,
-      PluginSatpGateway.getOdapAPI(
+      PluginSatpGateway.getSatpAPI(
         sessionData.recipientBasePath,
       ).phase1TransferInitiationRequestV1(initializationRequestMessage),
       "TransferInitializationRequest",