Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: node update with single node #981

Merged
merged 2 commits into from
Dec 12, 2024
Merged

fix: node update with single node #981

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65ac05b
fix: node update with single node
Ivo-Yankov Dec 11, 2024
019cb2b
fix: refresh nodeClient for multiple nodes
Ivo-Yankov Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/commands/node/tasks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ export class NodeCommandTasks {

// don't try to download from the same node we are deleting, it won't work
const nodeAlias =
ctx.config.nodeAlias === config.existingNodeAliases[0]
ctx.config.nodeAlias === config.existingNodeAliases[0] && config.existingNodeAliases.length > 1
? config.existingNodeAliases[1]
: config.existingNodeAliases[0];

Expand Down Expand Up @@ -1282,17 +1282,17 @@ export class NodeCommandTasks {

const nodeId = Templates.nodeIdFromNodeAlias(config.nodeAlias) - 1;
self.logger.info(`nodeId: ${nodeId}, config.newAccountNumber: ${config.newAccountNumber}`);
await self.accountManager.refreshNodeClient(config.namespace, config.nodeAlias);
config.nodeClient = await this.accountManager.loadNodeClient(config.namespace);
// await self.accountManager.refreshNodeClient(config.namespace, config.nodeAlias);
jeromy-cannon marked this conversation as resolved.
Show resolved Hide resolved
// config.nodeClient = await this.accountManager.loadNodeClient(config.namespace);

try {
const nodeUpdateTx = new NodeUpdateTransaction().setNodeId(nodeId);
let nodeUpdateTx = new NodeUpdateTransaction().setNodeId(nodeId);

if (config.tlsPublicKey && config.tlsPrivateKey) {
self.logger.info(`config.tlsPublicKey: ${config.tlsPublicKey}`);
const tlsCertDer = self._loadPermCertificate(config.tlsPublicKey);
const tlsCertHash = crypto.createHash('sha384').update(tlsCertDer).digest();
nodeUpdateTx.setCertificateHash(tlsCertHash);
nodeUpdateTx = nodeUpdateTx.setCertificateHash(tlsCertHash);

const publicKeyFile = Templates.renderTLSPemPublicKeyFile(config.nodeAlias);
const privateKeyFile = Templates.renderTLSPemPrivateKeyFile(config.nodeAlias);
Expand All @@ -1303,7 +1303,7 @@ export class NodeCommandTasks {
if (config.gossipPublicKey && config.gossipPrivateKey) {
self.logger.info(`config.gossipPublicKey: ${config.gossipPublicKey}`);
const signingCertDer = self._loadPermCertificate(config.gossipPublicKey);
nodeUpdateTx.setGossipCaCertificate(signingCertDer);
nodeUpdateTx = nodeUpdateTx.setGossipCaCertificate(signingCertDer);

const publicKeyFile = Templates.renderGossipPemPublicKeyFile(config.nodeAlias);
const privateKeyFile = Templates.renderGossipPemPrivateKeyFile(config.nodeAlias);
Expand All @@ -1312,19 +1312,19 @@ export class NodeCommandTasks {
}

if (config.newAccountNumber) {
nodeUpdateTx.setAccountId(config.newAccountNumber);
nodeUpdateTx = nodeUpdateTx.setAccountId(config.newAccountNumber);
}

let parsedNewKey;
if (config.newAdminKey) {
parsedNewKey = PrivateKey.fromStringED25519(config.newAdminKey.toString());
nodeUpdateTx.setAdminKey(parsedNewKey.publicKey);
nodeUpdateTx = nodeUpdateTx.setAdminKey(parsedNewKey.publicKey);
}
await nodeUpdateTx.freezeWith(config.nodeClient);
nodeUpdateTx = nodeUpdateTx.freezeWith(config.nodeClient);

// config.adminKey contains the original key, needed to sign the transaction
if (config.newAdminKey) {
await nodeUpdateTx.sign(parsedNewKey);
nodeUpdateTx = await nodeUpdateTx.sign(parsedNewKey);
}
const signedTx = await nodeUpdateTx.sign(config.adminKey);
const txResp = await signedTx.execute(config.nodeClient);
Expand Down
Loading