feat(satp-hermes): improve satp gateway configuration object

Signed-off-by: Tomas Silva <[email protected]>

Author: Tomas-Silva2187

packages/cactus-plugin-satp-hermes/README.md

@@ -371,7 +371,7 @@ Ethereum-compatible networks use Web3 signing credentials and contract addresses
     "networkId": "besu-mainnet",
     "connectorUrl": "https://besu-connector.example.com:4000",
     "web3SigningCredential": {
-      "ethAccount": "${ETH_ACCOUNT}",
+      "bridgeOwnerAddress": "${ETH_ACCOUNT}",
       "secret": "${ETH_PRIVATE_KEY}",
       "type": "PRIVATE_KEY_HEX"
     },
@@ -381,7 +381,9 @@ Ethereum-compatible networks use Web3 signing credentials and contract addresses
       "http": "https://mainnet.infura.io/v3/${PROJECT_ID}",
       "ws": "wss://mainnet.infura.io/ws/v3/${PROJECT_ID}"
     },
-    "gasLimit": 3000000
+    "gasConfig": {
+      "gasLimit": "3000000"
+    }    
   }
 }
 ```
@@ -613,11 +615,13 @@ const leafConfig = {
     ledgerType: "BESU_2X"                     // Ledger type constant for Besu 2.x
   },
   signingCredential: {
-    ethAccount: "0x736dC9B8258Ec5ab2419DDdffA9e1fa5C201D0b4",           // Ethereum account address
+    bridgeOwnerAddress: "0x736dC9B8258Ec5ab2419DDdffA9e1fa5C201D0b4",           // Ethereum account address of the owner of the bridge
     secret: "0xc31e76f70d6416337d3a7b7a8711a43e30a14963b5ba622fa6c9dbb5b4555986", // Private key in hex
     type: "PRIVATE_KEY_HEX"
   },
-  gas: 999999999999999,                       // Default gas limit for transactions
+  gasConfig: {
+    gasLimit: "6000000",  // Default gas limit for transactions
+  },
   connectorOptions: {
     rpcApiHttpHost: "http://172.20.0.6:8545", // Besu JSON-RPC HTTP endpoint
     rpcApiWsHost: "ws://172.20.0.6:8546"      // Besu JSON-RPC WebSocket endpoint
@@ -635,11 +639,15 @@ const leafConfig = {
     ledgerType: "ETHEREUM"                    // Ledger type constant for Ethereum
   },
   signingCredential: {
-    ethAccount: "0x09D16c22216BC873e53c8D93A38420f48A81dF1B", // Ethereum account address
+    bridgeOwnerAddress: "0x09D16c22216BC873e53c8D93A38420f48A81dF1B", // Ethereum account address
     secret: "test",                                // Key store password or secret
     type: "GETH_KEYCHAIN_PASSWORD"                 // Credential type for geth keychain
   },
-  gas: 5000000,                                   // Default gas limit for transactions
+  gasConfig: {
+    gas: "6721975", // Default gas limit for transactions
+    gasPrice: "20000000000" // Default gas Price
+  }
+                                    
   connectorOptions: {
     rpcApiHttpHost: "http://172.20.0.7:8545",     // Ethereum JSON-RPC HTTP endpoint
     rpcApiWsHost: "ws://172.20.0.7:8546"          // Ethereum JSON-RPC WebSocket endpoint
@@ -656,6 +664,10 @@ const gatewayConfig = {
   gid: {
     id: "gatewayId",
     name: "GatewayWithBesuConnection",
+    identificationCredential: {
+      signingAlgorithm: "SECP256K1",
+      pubKey: "0x03a34e1d66b78e47fa1bba3445a6019acb5b9c87d0c6ad81c09e7d496682ae81fc",
+    }
     version: [{ Core: "v02", Architecture: "v02", Crash: "v02" }],
     proofID: "mockProofID10",
     address: "http://gateway1.satp-hermes",
@@ -675,11 +687,13 @@ const gatewayConfig = {
           ledgerType: "BESU_2X",
         },
         signingCredential: {
-          ethAccount: "0x736dC9B8258Ec5ab2419DDdffA9e1fa5C201D0b4",
+          bridgeOwnerAddress: "0x736dC9B8258Ec5ab2419DDdffA9e1fa5C201D0b4",
           secret: "0xc31e76f70d6416337d3a7b7a8711a43e30a14963b5ba622fa6c9dbb5b4555986",
           type: "PRIVATE_KEY_HEX",
         },
-        gas: 999999999999999,
+        gasConfig: {
+          gasLimit: "6000000",
+        },        
         connectorOptions: {
           rpcApiHttpHost: "http://172.20.0.6:8545",
           rpcApiWsHost: "ws://172.20.0.6:8546",

packages/cactus-plugin-satp-hermes/src/main/typescript/core/types.ts

@@ -140,6 +140,30 @@ export type Address =
   | `https://${string}`
   | `${number}.${number}.${number}.${number}`;
 
+/**
+ * Enumeration of supported signing algorithms.
+ *
+ * @description
+ * Defines the cryptographic signing algorithms supported for
+ * gateway identification credentials.
+ */
+export enum SupportedSigningAlgorithms {
+  SECP256K1 = "SECP256K1",
+}
+
+/**
+ * Identification credential structure for gateways.
+ *
+ * @description
+ * Defines the structure for gateway identification credentials
+ * including the signing algorithm used for key generation and 
+ * the respective public key.
+ */
+export type IdentificationCredential = {
+  signingAlgorithm: SupportedSigningAlgorithms;
+  pubKey: string;
+};
+
 /**
  * SATP gateway identity structure.
  *
@@ -150,8 +174,8 @@ export type Address =
 export type GatewayIdentity = {
   /** Unique gateway identifier */
   id: string;
-  /** Optional public key for cryptographic operations */
-  pubKey?: string;
+  /** Optional identification credential for the gateway*/
+  identificationCredential?: IdentificationCredential;
   /** Optional human-readable gateway name */
   name?: string;
   /** Supported SATP draft versions */

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

@@ -40,17 +40,14 @@ import { SATPLoggerProvider as LoggerProvider } from "../../core/satp-logger-pro
 import { SATPLogger as Logger } from "../../core/satp-logger";
 import { BridgeLeaf } from "./bridge-leaf";
 import { LedgerType } from "@hyperledger/cactus-core-api";
-import { BesuLeaf, IBesuLeafNeworkOptions } from "./leafs/besu-leaf";
+import { BesuLeaf } from "./leafs/besu-leaf";
 import {
   DeployLeafError,
   LeafError,
   UnsupportedNetworkError,
   WrapperContractAlreadyCreatedError,
 } from "../common/errors";
-import {
-  EthereumLeaf,
-  IEthereumLeafNeworkOptions,
-} from "./leafs/ethereum-leaf";
+import { EthereumLeaf } from "./leafs/ethereum-leaf";
 import { FabricLeaf, IFabricLeafNeworkOptions } from "./leafs/fabric-leaf";
 import { BridgeManagerAdminInterface } from "./interfaces/bridge-manager-admin-interface";
 import { BridgeManagerClientInterface } from "./interfaces/bridge-manager-client-interface";
@@ -60,7 +57,11 @@ import {
 } from "../../generated/proto/cacti/satp/v02/common/message_pb";
 import { SATPBridgeExecutionLayer } from "./satp-bridge-execution-layer";
 import { SATPBridgeExecutionLayerImpl } from "./satp-bridge-execution-layer-implementation";
-import { INetworkOptions } from "./bridge-types";
+import {
+  IBesuNetworkConfig,
+  IEthereumNetworkConfig,
+  INetworkOptions,
+} from "./bridge-types";
 import {
   IOntologyManagerOptions,
   OntologyManager,
@@ -185,7 +186,7 @@ export class BridgeManager
                 )}`,
               );
               const besuNetworkOptions =
-                leafNetworkOptions as unknown as IBesuLeafNeworkOptions;
+                leafNetworkOptions as unknown as IBesuNetworkConfig;
               if (!this.ontologyManager) {
                 throw new Error(`${fnTag}, Ontology Manager is not defined`);
               }
@@ -215,7 +216,7 @@ export class BridgeManager
                 )}`,
               );
               const ethereumNetworkOptions =
-                leafNetworkOptions as unknown as IEthereumLeafNeworkOptions;
+                leafNetworkOptions as unknown as IEthereumNetworkConfig;
               if (!this.ontologyManager) {
                 throw new Error(`${fnTag}, Ontology Manager is not defined`);
               }