Add identifiers in the config

Author: majecty

ibc.ts/.env.default

@@ -1,6 +1,12 @@
 CHAIN_A_RPC_URL="http://localhost:8080"
 CHAIN_A_NETWORK_ID="tc"
 CHAIN_A_FAUCET_ADDRESS="tccqym6znlgc48qeelrzccehkcaut7yz39wwq96q3y7"
+CHAIN_A_COUNTERPARTY_CLIENT_ID="BClient"
+CHAIN_A_COUNTERPARTY_CONNECTION_ID="BConnection"
+CHAIN_A_COUNTERPARTY_CHANNEL_ID="BChannel"
 CHAIN_B_RPC_URL="http://localhost:8081"
 CHAIN_B_NETWORK_ID="fc"
 CHAIN_B_FAUCET_ADDRESS="fccqyd6clszl2aeq4agrk8sgq8whkty6ktljuemc9y3"
+CHAIN_B_COUNTERPARTY_CLIENT_ID="AClient"
+CHAIN_B_COUNTERPARTY_CONNECTION_ID="AConnection"
+CHAIN_B_COUNTERPARTY_CHANNEL_ID="AChannel"

ibc.ts/src/common/chain.ts

@@ -4,28 +4,47 @@ import { H256, PlatformAddress } from "codechain-primitives";
 import { IBC } from "./foundry/transaction";
 import { delay } from "./util";
 import Debug from "debug";
+import { ClientState } from "./foundry/types";
 
 const debug = Debug("common:tx");
 
+export interface CounterpartyIdentifiers {
+    /**
+     * Identifier for counter party chain's light client saved in this chain
+     */
+    client: string;
+    /**
+     * Identifier for connection with counterparty chain
+     */
+    connection: string;
+    /**
+     * Identifier for channel with counterparty chain
+     */
+    channel: string;
+}
+
 export interface ChainConfig {
     /**
      * Example: "http://localhost:8080"
      */
     server: string;
     networkId: string;
     faucetAddress: PlatformAddress;
+    counterpartyIdentifiers: CounterpartyIdentifiers;
 }
 
 export class Chain {
     private readonly sdk: SDK;
     private readonly faucetAddress: PlatformAddress;
+    private readonly counterpartyIdentifiers: CounterpartyIdentifiers;
 
     public constructor(config: ChainConfig) {
         this.sdk = new SDK({
             server: config.server,
             networkId: config.networkId
         });
         this.faucetAddress = config.faucetAddress;
+        this.counterpartyIdentifiers = config.counterpartyIdentifiers;
     }
 
     public async submitDatagram(datagram: Datagram): Promise<void> {

ibc.ts/src/relayer/config.ts

@@ -11,19 +11,32 @@ interface FoundryChainConfig {
     rpcURL: string;
     networkId: string;
     faucetAddress: string;
+    counterpartyClientId: string;
+    counterpartyConnectionId: string;
+    counterpartyChannelId: string;
 }
 
 export function getConfig(): Config {
     return {
         chainA: {
             rpcURL: getEnv("CHAIN_A_RPC_URL"),
             networkId: getEnv("CHAIN_A_NETWORK_ID"),
-            faucetAddress: getEnv("CHAIN_A_FAUCET_ADDRESS")
+            faucetAddress: getEnv("CHAIN_A_FAUCET_ADDRESS"),
+            counterpartyClientId: getEnv("CHAIN_A_COUNTERPARTY_CLIENT_ID"),
+            counterpartyConnectionId: getEnv(
+                "CHAIN_A_COUNTERPARTY_CONNECTION_ID"
+            ),
+            counterpartyChannelId: getEnv("CHAIN_A_COUNTERPARTY_CHANNEL_ID")
         },
         chainB: {
             rpcURL: getEnv("CHAIN_B_RPC_URL"),
             networkId: getEnv("CHAIN_B_NETWORK_ID"),
-            faucetAddress: getEnv("CHAIN_B_FAUCET_ADDRESS")
+            faucetAddress: getEnv("CHAIN_B_FAUCET_ADDRESS"),
+            counterpartyClientId: getEnv("CHAIN_B_COUNTERPARTY_CLIENT_ID"),
+            counterpartyConnectionId: getEnv(
+                "CHAIN_B_COUNTERPARTY_CONNECTION_ID"
+            ),
+            counterpartyChannelId: getEnv("CHAIN_B_COUNTERPARTY_CHANNEL_ID")
         }
     };
 }

ibc.ts/src/relayer/index.ts

@@ -14,12 +14,22 @@ async function main() {
     const chainA = new Chain({
         server: config.chainA.rpcURL,
         networkId: config.chainA.networkId,
-        faucetAddress: PlatformAddress.fromString(config.chainA.faucetAddress)
+        faucetAddress: PlatformAddress.fromString(config.chainA.faucetAddress),
+        counterpartyIdentifiers: {
+            client: config.chainA.counterpartyClientId,
+            connection: config.chainA.counterpartyConnectionId,
+            channel: config.chainA.counterpartyChannelId
+        }
     });
     const chainB = new Chain({
         server: config.chainB.rpcURL,
         networkId: config.chainB.networkId,
-        faucetAddress: PlatformAddress.fromString(config.chainB.faucetAddress)
+        faucetAddress: PlatformAddress.fromString(config.chainB.faucetAddress),
+        counterpartyIdentifiers: {
+            client: config.chainB.counterpartyClientId,
+            connection: config.chainB.counterpartyConnectionId,
+            channel: config.chainB.counterpartyChannelId
+        }
     });
 
     while (true) {