Merge pull request #615 from hyperweb-io/anmol/simplify-eth

feature: simplify eth, add test case for eth-lite, starship client
hyperweb-io · Feb 9, 2025 · c67b58f · c67b58f
2 parents bab1cfc + 6b67078
commit c67b58f
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 196 deletions.
diff --git a/.github/workflows/pr-tests.yaml b/.github/workflows/pr-tests.yaml
@@ -44,6 +44,7 @@ jobs:
           - "multi-validator-starship-faucet.yaml"
           - "one-chain-cometmock.yaml"
           - "one-cosmoshub-starship-faucet.yaml"
+          - "eth-lite.yaml"
       fail-fast: true
       max-parallel: 3
 

diff --git a/clients/js/packages/client/src/client.ts b/clients/js/packages/client/src/client.ts
@@ -11,6 +11,7 @@ import { Chain, Relayer, StarshipConfig } from './config';
 import { Ports } from './config';
 import { dependencies as defaultDependencies, Dependency } from './deps';
 import { readAndParsePackageJson } from './package';
+import {type} from "node:os";
 
 export interface StarshipContext {
   name?: string;
@@ -63,6 +64,10 @@ const defaultPorts: PodPorts = {
     rest: 8080
   },
   chains: {
+    ethereum: {
+      rpc: 8551,
+      rest: 8545,
+    },
     defaultPorts: {
       rpc: 26657,
       grpc: 9090,
@@ -714,11 +719,19 @@ export class StarshipClient implements StarshipClientI {
     localPort: number,
     externalPort: number
   ): void {
+    let podName: string;
+    if (typeof(chain.id) === 'string') {
+      podName = `${formatChainID(chain.id)}-genesis-0`;
+    }
+    else {
+      podName = `${chain.name}-${chain.id}-0`;
+    }
+
     if (localPort !== undefined && externalPort !== undefined) {
       this.exec([
         'kubectl',
         'port-forward',
-        `pods/${formatChainID(chain.id)}-genesis-0`,
+        `pods/${podName}`,
         `${localPort}:${externalPort}`,
         ...this.getArgs(),
         '>',
@@ -728,7 +741,7 @@ export class StarshipClient implements StarshipClientI {
       ]);
       this.log(
         chalk.yellow(
-          `Forwarded ${formatChainID(chain.id)}: local ${localPort} -> target (host) ${externalPort}`
+          `Forwarded ${podName}: local ${localPort} -> target (host) ${externalPort}`
         )
       );
     }
@@ -739,11 +752,19 @@ export class StarshipClient implements StarshipClientI {
     localPort: number,
     externalPort: number
   ): void {
+    let podName: string;
+    if (typeof(chain.id) === 'string') {
+      podName = `${formatChainID(chain.id)}-cometmock-0`;
+    }
+    else {
+      podName = `${chain.name}-${chain.id}-0`;
+    }
+
     if (localPort !== undefined && externalPort !== undefined) {
       this.exec([
         'kubectl',
         'port-forward',
-        `pods/${formatChainID(chain.id)}-cometmock-0`,
+        `pods/${podName}`,
         `${localPort}:${externalPort}`,
         ...this.getArgs(),
         '>',
@@ -753,7 +774,7 @@ export class StarshipClient implements StarshipClientI {
       ]);
       this.log(
         chalk.yellow(
-          `Forwarded ${formatChainID(chain.id)}: local ${localPort} -> target (host) ${externalPort}`
+          `Forwarded ${podName}: local ${localPort} -> target (host) ${externalPort}`
         )
       );
     }

diff --git a/clients/js/packages/client/src/config.ts b/clients/js/packages/client/src/config.ts
@@ -33,7 +33,7 @@ export interface FaucetConfig {
 }
 
 export interface Chain {
-  id: string;
+  id: string | number;
   name: string;
   numValidators: number;
   image?: string;

diff --git a/clients/js/packages/starshipjs/src/config.ts b/clients/js/packages/starshipjs/src/config.ts
@@ -96,7 +96,7 @@ export interface ChainConfig {
     };
   };
   chains: Array<{
-    id: string;
+    id: string | number;
     name: string;
     ports: {
       rpc: number;

diff --git a/starship/charts/devnet/templates/chains/eth/beacon.yaml b/starship/charts/devnet/templates/chains/eth/beacon.yaml
diff --git a/...evnet/templates/chains/eth/execution.yaml → ...et/templates/chains/eth/statefulsets.yaml b/...evnet/templates/chains/eth/execution.yaml → ...et/templates/chains/eth/statefulsets.yaml
diff --git a/starship/tests/e2e/configs/eth-lite.yaml b/starship/tests/e2e/configs/eth-lite.yaml
@@ -0,0 +1,10 @@
+chains:
+  - id: 1337
+    name: ethereum
+    numValidators: 1
+    ports:
+      rest: 8545
+      rpc: 8551
+    resources:
+      cpu: "200m"
+      memory: "200Mi"
diff --git a/starship/tests/e2e/e2e_test.go b/starship/tests/e2e/e2e_test.go
@@ -64,7 +64,7 @@ func (s *TestSuite) TestChains_Status() {
 	s.T().Log("running test for /status endpoint for each chain")
 
 	for _, chain := range s.config.Chains {
-		if chain.Name == "neutron" {
+		if chain.Name == "neutron" || chain.Name == "ethereum" {
 			s.T().Skip("skip tests for neutron")
 		}
 		url := fmt.Sprintf("http://0.0.0.0:%d/status", chain.Ports.Rpc)
@@ -86,7 +86,7 @@ func (s *TestSuite) TestChains_StakingParams() {
 		s.T().Skip("skip staking params test for non rest endpoint")
 	}
 	s.T().Log("running test for /staking/parameters endpoint for each chain")
-	if s.config.Chains[0].Name == "neutron" {
+	if s.config.Chains[0].Name == "neutron" || s.config.Chains[0].Name == "ethereum" {
 		s.T().Skip("skip tests for neutron")
 	}
 

diff --git a/starship/tests/e2e/exposer_test.go b/starship/tests/e2e/exposer_test.go
@@ -30,6 +30,9 @@ func (s *TestSuite) TestExposer_GetNodeID() {
 	s.T().Log("running test for /node_id endpoint for exposer")
 
 	chain := s.config.Chains[0]
+	if chain.Ports.Exposer == 0 {
+		s.T().Skip("skipping /node_id test since no exposer")
+	}
 
 	req, err := http.NewRequest(http.MethodGet, "/node_id", nil)
 	s.Require().NoError(err)
@@ -45,6 +48,9 @@ func (s *TestSuite) TestExposer_GetGenesisFile() {
 	s.T().Log("running test for /genesis endpoint for exposer")
 
 	chain := s.config.Chains[0]
+	if chain.Ports.Exposer == 0 {
+		s.T().Skip("skipping /node_id test since no exposer")
+	}
 
 	req, err := http.NewRequest(http.MethodGet, "/genesis", nil)
 	s.Require().NoError(err)
@@ -62,6 +68,9 @@ func (s *TestSuite) TestExposer_GetPubKey() {
 	s.T().Log("running test for /pub_key endpoint for exposer")
 
 	chain := s.config.Chains[0]
+	if chain.Ports.Exposer == 0 {
+		s.T().Skip("skipping /node_id test since no exposer")
+	}
 	if chain.Cometmock != nil && chain.Cometmock.Enabled {
 		s.T().Skip("skipping tests for cometmock enabled chain")
 	}
@@ -82,6 +91,9 @@ func (s *TestSuite) TestExposer_GetPrivKey() {
 	s.T().Log("running test for /priv_keys endpoint for exposer")
 
 	chain := s.config.Chains[0]
+	if chain.Ports.Exposer == 0 {
+		s.T().Skip("skipping /node_id test since no exposer")
+	}
 
 	req, err := http.NewRequest(http.MethodGet, "/priv_keys", nil)
 	s.Require().NoError(err)
@@ -99,6 +111,9 @@ func (s *TestSuite) TestExposer_GetPrivValState() {
 	s.T().Log("running test for /priv_validator_state endpoint for exposer")
 
 	chain := s.config.Chains[0]
+	if chain.Ports.Exposer == 0 {
+		s.T().Skip("skipping /node_id test since no exposer")
+	}
 
 	req, err := http.NewRequest(http.MethodGet, "/priv_validator_state", nil)
 	s.Require().NoError(err)
@@ -115,6 +130,9 @@ func (s *TestSuite) TestExposer_GetNodeKey() {
 	s.T().Log("running test for /node_key endpoint for exposer")
 
 	chain := s.config.Chains[0]
+	if chain.Ports.Exposer == 0 {
+		s.T().Skip("skipping /node_id test since no exposer")
+	}
 
 	req, err := http.NewRequest(http.MethodGet, "/node_key", nil)
 	s.Require().NoError(err)
@@ -131,6 +149,9 @@ func (s *TestSuite) TestExposer_GetKeys() {
 	s.T().Log("running test for /keys endpoint for exposer")
 
 	chain := s.config.Chains[0]
+	if chain.Ports.Exposer == 0 {
+		s.T().Skip("skipping /node_id test since no exposer")
+	}
 
 	req, err := http.NewRequest(http.MethodGet, "/keys", nil)
 	s.Require().NoError(err)