Skip to content

Commit 0088b76

Browse files
fix: bumped json rpc relay to v0.67.0 to fix hiero migration issue (#1845)
Signed-off-by: Jeromy Cannon <[email protected]>
1 parent aa365e3 commit 0088b76

File tree

5 files changed

+61
-45
lines changed

5 files changed

+61
-45
lines changed

src/core/config/remote/remote-config-manager.ts

-2
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,6 @@ export class RemoteConfigManager {
473473
const consensusNodes: ConsensusNode[] = [];
474474

475475
for (const node of Object.values(this.components.consensusNodes)) {
476-
this.logger.debug(`Adding consensus node ${node.name} , node.cluster = ${node.cluster}`);
477-
478476
const cluster = this.clusters[node.cluster];
479477
const context = this.localConfig.clusterRefs[node.cluster];
480478

src/core/constants.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export const SOLO_DEPLOYMENT_CHART = 'solo-deployment';
6161
export const SOLO_CERT_MANAGER_CHART = 'solo-cert-manager';
6262

6363
export const JSON_RPC_RELAY_CHART_URL =
64-
process.env.JSON_RPC_RELAY_CHART_URL ?? 'https://hashgraph.github.io/hedera-json-rpc-relay/charts';
64+
process.env.JSON_RPC_RELAY_CHART_URL ?? 'https://hiero-ledger.github.io/hiero-json-rpc-relay/charts';
6565
export const JSON_RPC_RELAY_CHART = 'hedera-json-rpc-relay';
6666

6767
export const MIRROR_NODE_CHART_URL =

test/e2e/commands/relay.test.ts

+58-40
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
// SPDX-License-Identifier: Apache-2.0
22

3-
import {after, afterEach, describe} from 'mocha';
3+
import {after, describe} from 'mocha';
44
import {expect} from 'chai';
55
import each from 'mocha-each';
66

77
import {Flags as flags} from '../../../src/commands/flags.js';
8-
import {endToEndTestSuite, getTestCluster, HEDERA_PLATFORM_VERSION_TAG} from '../../test-utility.js';
8+
import {
9+
type BootstrapResponse,
10+
endToEndTestSuite,
11+
getTestCluster,
12+
HEDERA_PLATFORM_VERSION_TAG,
13+
} from '../../test-utility.js';
914
import * as version from '../../../version.js';
1015
import {sleep} from '../../../src/core/helpers.js';
1116
import {RelayCommand} from '../../../src/commands/relay.js';
@@ -15,10 +20,12 @@ import {type NetworkNodes} from '../../../src/core/network-nodes.js';
1520
import {container} from 'tsyringe-neo';
1621
import {InjectTokens} from '../../../src/core/dependency-injection/inject-tokens.js';
1722
import {Argv} from '../../helpers/argv-wrapper.js';
23+
import {type ArgvStruct} from '../../../src/types/aliases.js';
24+
import {type SoloLogger} from '../../../src/core/logging/solo-logger.js';
1825

19-
const testName = 'relay-cmd-e2e';
20-
const namespace = NamespaceName.of(testName);
21-
const argv = Argv.getDefaultArgv(namespace);
26+
const testName: string = 'relay-cmd-e2e';
27+
const namespace: NamespaceName = NamespaceName.of(testName);
28+
const argv: Argv = Argv.getDefaultArgv(namespace);
2229
argv.setArg(flags.namespace, namespace.name);
2330
argv.setArg(flags.releaseTag, HEDERA_PLATFORM_VERSION_TAG);
2431
argv.setArg(flags.nodeAliasesUnparsed, 'node1,node2');
@@ -29,54 +36,65 @@ argv.setArg(flags.soloChartVersion, version.SOLO_CHART_VERSION);
2936
argv.setArg(flags.force, true);
3037
argv.setArg(flags.relayReleaseTag, flags.relayReleaseTag.definition.defaultValue);
3138

32-
endToEndTestSuite(testName, argv, {}, bootstrapResp => {
39+
endToEndTestSuite(testName, argv, {}, (bootstrapResp: BootstrapResponse): void => {
3340
const {
3441
opts: {k8Factory, logger, commandInvoker},
3542
} = bootstrapResp;
3643

37-
describe('RelayCommand', async () => {
38-
const relayCmd = new RelayCommand(bootstrapResp.opts);
44+
describe('RelayCommand', async (): Promise<void> => {
45+
const relayCmd: RelayCommand = new RelayCommand(bootstrapResp.opts);
46+
const testLogger: SoloLogger = container.resolve(InjectTokens.SoloLogger);
3947

40-
after(async function () {
48+
afterEach(async (): Promise<void> => {
49+
// wait for k8s to finish destroying containers from relay destroy
50+
await sleep(Duration.ofMillis(5));
51+
});
52+
53+
after(async function (): Promise<void> {
4154
this.timeout(Duration.ofMinutes(5).toMillis());
4255
await container.resolve<NetworkNodes>(InjectTokens.NetworkNodes).getLogs(namespace);
4356
await k8Factory.default().namespaces().delete(namespace);
4457
});
4558

46-
afterEach(async () => await sleep(Duration.ofMillis(5)));
47-
48-
each(['node1', 'node1,node2']).it('relay deploy and destroy should work with $value', async function (relayNodes) {
49-
this.timeout(Duration.ofMinutes(5).toMillis());
59+
each(['node1', 'node1,node2']).describe(
60+
'relay and deploy and destroy for each',
61+
async (relayNodes: string): Promise<void> => {
62+
it(`relay deploy and destroy should work with ${relayNodes}`, async function (): Promise<void> {
63+
testLogger.info(`#### Running relay deploy for: ${relayNodes} ####`);
64+
this.timeout(Duration.ofMinutes(5).toMillis());
5065

51-
argv.setArg(flags.nodeAliasesUnparsed, relayNodes);
66+
argv.setArg(flags.nodeAliasesUnparsed, relayNodes);
5267

53-
try {
54-
await commandInvoker.invoke({
55-
argv: argv,
56-
command: RelayCommand.COMMAND_NAME,
57-
subcommand: 'deploy',
58-
// @ts-expect-error to access private property
59-
callback: async argv => relayCmd.deploy(argv),
60-
});
61-
} catch (error) {
62-
logger.showUserError(error);
63-
expect.fail();
64-
}
65-
await sleep(Duration.ofMillis(500));
68+
try {
69+
await commandInvoker.invoke({
70+
argv: argv,
71+
command: RelayCommand.COMMAND_NAME,
72+
subcommand: 'deploy',
73+
// @ts-expect-error to access private property
74+
callback: async (argv: ArgvStruct): Promise<boolean> => relayCmd.deploy(argv),
75+
});
76+
} catch (error) {
77+
logger.showUserError(error);
78+
expect.fail();
79+
}
80+
await sleep(Duration.ofMillis(500));
6681

67-
// test relay destroy
68-
try {
69-
await commandInvoker.invoke({
70-
argv: argv,
71-
command: RelayCommand.COMMAND_NAME,
72-
subcommand: 'destroy',
73-
// @ts-expect-error to access private modifier
74-
callback: async argv => relayCmd.destroy(argv),
82+
testLogger.info(`#### Running relay destroy for: ${relayNodes} ####`);
83+
try {
84+
await commandInvoker.invoke({
85+
argv: argv,
86+
command: RelayCommand.COMMAND_NAME,
87+
subcommand: 'destroy',
88+
// @ts-expect-error to access private modifier
89+
callback: async (argv: ArgvStruct): Promise<boolean> => relayCmd.destroy(argv),
90+
});
91+
} catch (error) {
92+
logger.showUserError(error);
93+
expect.fail();
94+
}
95+
testLogger.info(`#### Finished relay deploy and destroy for: ${relayNodes} ####`);
7596
});
76-
} catch (error) {
77-
logger.showUserError(error);
78-
expect.fail();
79-
}
80-
});
97+
},
98+
);
8199
});
82100
});

test/test-utility.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ interface TestOptions {
104104
commandInvoker: CommandInvoker;
105105
}
106106

107-
interface BootstrapResponse {
107+
export interface BootstrapResponse {
108108
deployment: string;
109109
namespace: NamespaceName;
110110
opts: TestOptions;

version.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const SOLO_CHART_VERSION = '0.50.0';
1515
export const HEDERA_PLATFORM_VERSION = 'v0.59.5';
1616
export const MIRROR_NODE_VERSION = 'v0.126.0';
1717
export const HEDERA_EXPLORER_VERSION = '24.12.1';
18-
export const HEDERA_JSON_RPC_RELAY_VERSION = 'v0.66.0';
18+
export const HEDERA_JSON_RPC_RELAY_VERSION = 'v0.67.0';
1919
export const INGRESS_CONTROLLER_VERSION = '0.14.5';
2020

2121
export function getSoloVersion(): Version {

0 commit comments

Comments
 (0)